diff --git a/classes/ChecklistVoucherAdmin.php b/classes/ChecklistVoucherAdmin.php
index 583fc20454..9a3e188b4f 100644
--- a/classes/ChecklistVoucherAdmin.php
+++ b/classes/ChecklistVoucherAdmin.php
@@ -498,16 +498,18 @@ public function addExternalVouchers($tid, $dataAsJson){
 
 	//Data mod functions
 	protected function insertChecklistTaxaLink($tid, $clid = null, $morpho = ''){
-		$status = false;
+		$clTaxaID = false;
 		if(!$clid) $clid = $this->clid;
 		if(is_numeric($tid) && is_numeric($clid)){
 			$inventoryManager = new ImInventories();
 			$inputArr = array('tid' => $tid, 'clid' => $clid);
 			if($morpho) $inputArr['morphoSpecies'] = $morpho;
-			$status = $inventoryManager->insertChecklistTaxaLink($inputArr);
-			if(!$status) $this->errorMessage = $inventoryManager->getErrorMessage();
+			if($inventoryManager->insertChecklistTaxaLink($inputArr)){
+				$clTaxaID = $inventoryManager->getPrimaryKey();
+			}
+			else $this->errorMessage = $inventoryManager->getErrorMessage();
 		}
-		return $status;
+		return $clTaxaID;
 	}
 
 	protected function insertVoucher($clTaxaID, $occid, $editorNotes = null, $notes = null){
diff --git a/classes/GlossaryManager.php b/classes/GlossaryManager.php
index d2f1e496f6..8963e6a46f 100644
--- a/classes/GlossaryManager.php
+++ b/classes/GlossaryManager.php
@@ -1056,9 +1056,9 @@ public function getExportArr($language, $tid, $keyword, $deepSearch=0, $images=0
 			if($r->source && !in_array($r->source, $referencesArr)) $referencesArr[] = $r->source;
 			if($r->translator && !in_array($r->translator, $contributorsArr)) $contributorsArr[] = $r->translator;
 			if($r->author && !in_array($r->author, $contributorsArr)) $contributorsArr[] = $r->author;
-			$retArr[$r->glossid]['term'] = strip_tags($r->term);
-			$retArr[$r->glossid]['searchTerm'] = strip_tags($r->searchterm);
-			if(!$definitions || $definitions != 'nodef') $retArr[$r->glossid]['definition'] = strip_tags($r->definition);
+			$retArr[$r->glossid]['term'] = strip_tags($r->term ?? '');
+			$retArr[$r->glossid]['searchTerm'] = strip_tags($r->searchterm ?? '');
+			if(!$definitions || $definitions != 'nodef') $retArr[$r->glossid]['definition'] = strip_tags($r->definition ?? '');
 			if($r->glossgrpid && $r->glossgrpid != $r->glossid) $groupMap[$r->glossgrpid][] = $r->glossid;
 		}
 		$rs->free();
diff --git a/classes/OccurrenceEditorManager.php b/classes/OccurrenceEditorManager.php
index b8dde554d6..ee8ffff83e 100644
--- a/classes/OccurrenceEditorManager.php
+++ b/classes/OccurrenceEditorManager.php
@@ -1621,9 +1621,10 @@ public function cloneOccurrence($postArr){
 				if($sourceOccid != $this->occid && !in_array($this->occid,$retArr)){
 					$retArr[$this->occid] = $this->occid;
 					if(isset($postArr['assocrelation']) && $postArr['assocrelation']){
-						$sql = 'INSERT INTO omoccurassociations(occid, associationType, occidAssociate, relationship,createdUid) VALUES(?, "internalOccurrence", ?, ?, ?) ';
+						$sql = 'INSERT INTO omoccurassociations(occid, associationType, occidAssociate, relationship, createdUid, RecordID) VALUES(?, "internalOccurrence", ?, ?, ?, ? ) ';
 						if($stmt = $this->conn->prepare($sql)){
-							$stmt->bind_param('iisi', $this->occid, $sourceOccid, $postArr['assocrelation'], $GLOBALS['SYMB_UID']);
+							$guid = UuidFactory::getUuidV4();
+							$stmt->bind_param('iisis', $this->occid, $sourceOccid, $postArr['assocrelation'], $GLOBALS['SYMB_UID'], $guid);
 							$stmt->execute();
 							if($stmt->error){
 								$this->errorArr[] = $LANG['ERROR_ADDING_REL'].': '.$this->conn->error;
diff --git a/classes/OccurrenceExsiccatae.php b/classes/OccurrenceExsiccatae.php
index 397dfb3f5f..4fecfdf1bc 100644
--- a/classes/OccurrenceExsiccatae.php
+++ b/classes/OccurrenceExsiccatae.php
@@ -775,6 +775,7 @@ public function getExsTableRow($occid,$oArr,$omenid,$targetCollid){
 	}
 
 	private function cleanOutStr($str){
+		if(!isset($str)) return null;
 		$newStr = str_replace('"',""",$str);
 		$newStr = str_replace("'","'",$newStr);
 		//$newStr = $this->conn->real_escape_string($newStr);
@@ -788,4 +789,4 @@ private function cleanInStr($str){
 		return $newStr;
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/classes/OccurrenceIndividual.php b/classes/OccurrenceIndividual.php
index 81db408692..4042ba18d6 100644
--- a/classes/OccurrenceIndividual.php
+++ b/classes/OccurrenceIndividual.php
@@ -2,6 +2,7 @@
 include_once('Manager.php');
 include_once('OccurrenceAccessStats.php');
 include_once('ChecklistVoucherAdmin.php');
+include_once($SERVER_ROOT . '/utilities/SymbUtil.php');
 
 class OccurrenceIndividual extends Manager{
 
@@ -75,31 +76,31 @@ public function setGuid($guid){
 		if(!$this->occid){
 			//Check occurrence recordID
 			$sql = 'SELECT occid FROM omoccurrences WHERE (occurrenceid = ?) OR (recordID = ?)';
-			if($stmt = $this->conn->prepare($sql)){
-				$stmt->bind_param('ss', $guid, $guid);
-				$stmt->execute();
-				$stmt->bind_result($this->occid);
-				$stmt->close();
+			if($result = SymbUtil::execute_query($this->conn, $sql, [$guid, $guid])){
+				if($row = $result->fetch_assoc()) {
+					$this->occid = $row['occid'];
+				}
+				$result->free();
 			}
 		}
 		if(!$this->occid){
 			//Check image recordID
 			$sql = 'SELECT occid FROM images WHERE recordID = ?';
-			if($stmt = $this->conn->prepare($sql)){
-				$stmt->bind_param('s', $guid);
-				$stmt->execute();
-				$stmt->bind_result($this->occid);
-				$stmt->close();
+			if($result = SymbUtil::execute_query($this->conn, $sql, [$guid])){
+				if($row = $result->fetch_assoc()) {
+					$this->occid = $row['occid'];
+				}
+				$result->free();
 			}
 		}
 		if(!$this->occid){
 			//Check identification recordID
 			$sql = 'SELECT occid FROM omoccurdeterminations WHERE recordID = ?';
-			if($stmt = $this->conn->prepare($sql)){
-				$stmt->bind_param('s', $guid);
-				$stmt->execute();
-				$stmt->bind_result($this->occid);
-				$stmt->close();
+			if($result = SymbUtil::execute_query($this->conn, $sql, [$guid])){
+				if($row = $result->fetch_assoc()) {
+					$this->occid = $row['occid'];
+				}
+				$result->free();
 			}
 		}
 		return $this->occid;
@@ -422,7 +423,7 @@ private function setOccurrenceRelationships(){
 					$objectID = $r->catalogNumber;
 					if($objectID) {
 						if(strpos($objectID, $r->instCode) === false){
-							//Append institution and collection code to catalogNumber, but only if it is not already included 
+							//Append institution and collection code to catalogNumber, but only if it is not already included
 							$collCode = $r->instCode;
 							if($r->collCode) $collCode .= '-' . $r->collCode;
 							$objectID = $collCode . ':' . $r->catalogNumber;
diff --git a/classes/OccurrenceLabel.php b/classes/OccurrenceLabel.php
index 0b27517a59..08b1eb18d7 100644
--- a/classes/OccurrenceLabel.php
+++ b/classes/OccurrenceLabel.php
@@ -172,7 +172,6 @@ public function getLabelArray($occidArr, $speciesAuthors = false){
 				'INNER JOIN taxa t2 ON ts.parenttid = t2.tid '.
 				$sqlWhere.' AND t.rankid > 220 AND ts.taxauthid = 1 ';
 			if(!$speciesAuthors) $sql1 .= 'AND t.unitname2 = t.unitname3 ';
-			//echo $sql1; exit;
 			if($rs1 = $this->conn->query($sql1)){
 				while($row1 = $rs1->fetch_object()){
 					$authorArr[$row1->occid] = $row1->author ?? '';
@@ -182,12 +181,15 @@ public function getLabelArray($occidArr, $speciesAuthors = false){
 			//Get occurrence records
 			$this->setLabelFieldArr();
 			$sql2 = 'SELECT '.implode(',',$this->labelFieldArr).' FROM omoccurrences o LEFT JOIN taxa t ON o.tidinterpreted = t.tid '.$sqlWhere;
-			//echo 'SQL: '.$sql2;
 			if($rs2 = $this->conn->query($sql2)){
 				while($row2 = $rs2->fetch_assoc()){
-					$row2 = array_change_key_case($row2);
-					if(array_key_exists($row2['occid'],$authorArr)) $row2['parentauthor'] = $authorArr[$row2['occid']];
-					$retArr[$row2['occid']] = $row2;
+					$occid = $row2['occid'];
+					foreach($row2 as $fieldName => $fieldValue){
+						$retArr[$occid][strtolower($fieldName)] = $fieldValue ?? '';
+					}
+					if(array_key_exists($occid, $authorArr)){
+						$retArr[$occid]['parentauthor'] = $authorArr[$occid];
+					}
 				}
 				$rs2->free();
 			}
diff --git a/classes/TaxonomyUpload.php b/classes/TaxonomyUpload.php
index 93cc7ceeee..6fe03b336b 100644
--- a/classes/TaxonomyUpload.php
+++ b/classes/TaxonomyUpload.php
@@ -217,7 +217,7 @@ public function loadFile($fieldMap){
 								if($k == 'author') $sql2 .= ',"'.($inValue?$inValue:'').'"';
 								else $sql2 .= ','.($inValue?'"'.$inValue.'"':'NULL');
 							}
-							$sql = 'INSERT INTO uploadtaxa('.substr($sql1,1).') VALUES('.substr($sql2,1).')';
+							$sql = 'INSERT IGNORE INTO uploadtaxa('.substr($sql1,1).') VALUES('.substr($sql2,1).')';
 							//echo '<div>'.$sql.'</div>';
 							if($this->conn->query($sql)){
 								if($recordCnt%1000 == 0){
@@ -225,6 +225,9 @@ public function loadFile($fieldMap){
 									ob_flush();
 									flush();
 								}
+								if($warnings = $this->conn->get_warnings()){
+									$this->outputMsg('WARNING at line ' . $recordCnt . ': ' . $warnings->message, 2);
+								}
 							}
 							else{
 								$this->outputMsg('ERROR loading taxon: '.$this->conn->error,2);
@@ -249,7 +252,7 @@ public function loadFile($fieldMap){
 						$this->outputMsg('ERROR loading taxonunit: '.$this->conn->error);
 					}
 				}
-				$this->outputMsg($recordCnt.' taxon records pre-processed');
+				$this->outputMsg(($recordCnt - 1) . ' taxon records pre-processed');
 			}
 			else{
 				$this->outputMsg('ERROR: Scientific name is not mapped to &quot;scinameinput&quot;');
diff --git a/collections/editor/includes/resourcetab.php b/collections/editor/includes/resourcetab.php
index 9514158589..8c61c572e4 100644
--- a/collections/editor/includes/resourcetab.php
+++ b/collections/editor/includes/resourcetab.php
@@ -121,12 +121,27 @@ function occidAssociateChanged(radioElem){
 	}
 
 	function validateAssocForm(f){
-		if(f.relationship.value == ""){
-			alert("<?php echo $LANG['DEFINE_REL']; ?>");
-			return false;
+		if(f.associationType.value == "internalOccurrence"){
+			let occidAssocChecked = false;
+			if(f.occidAssociate){
+				let assocRadios = document.querySelector('input[name = "occidAssociate"]:checked');
+				if(assocRadios != null){
+					occidAssocChecked = true;
+				}
+			}
+			if(!occidAssocChecked){
+				alert("<?= $LANG['SELECT_INTERNAL_REL'] ?>");
+				return false;
+			}
+		}
+		else if(f.associationType.value == "observational"){
+			if(f.verbatimsciname.value == ""){
+				alert("<?= $LANG['VERB_SCINAME_EMPTY'] ?>");
+				return false;
+			}
 		}
-		else if(f.resourceurl.value == "" && f.objectid.value == "" && f.verbatimsciname.value == "" && (!f.occidAssociate || f.occidAssociate.value == "")){
-			alert("<?php echo $LANG['REL_NOT_DEFINED']; ?>");
+		else if(f.resourceurl.value == ""){
+			alert("<?= $LANG['RESOURCE_EMPTY'] ?>");
 			return false;
 		}
 		return true;
diff --git a/collections/exsiccati/index.php b/collections/exsiccati/index.php
index 3954af4207..8fe9a3e119 100644
--- a/collections/exsiccati/index.php
+++ b/collections/exsiccati/index.php
@@ -136,7 +136,7 @@ function verifyExsEditForm(f){
 		}
 
 		function verifyExsMergeForm(f){
-			if(t.targetometid == ""){
+			if(!f.targetometid || !f.targetometid.value){
 				alert("You need to select a target exsiccata to merge into");
 				return false;
 			}
@@ -850,4 +850,3 @@ function buildExsSelect(selectObj){
 	include($SERVER_ROOT.'/includes/footer.php');
 	?>
 </body>
-</html>
\ No newline at end of file
diff --git a/collections/harvestparams.php b/collections/harvestparams.php
index f845dcf746..e7e0debfad 100644
--- a/collections/harvestparams.php
+++ b/collections/harvestparams.php
@@ -362,6 +362,7 @@
 				<div><button type="reset" style="width:100%" onclick="resetHarvestParamsForm()"><?php echo isset($LANG['BUTTON_RESET'])?$LANG['BUTTON_RESET']:'Reset Form'; ?></button></div>
 			</div>
 			<div>
+				<input name="comingFrom" type="hidden" value="harvestparams" >
 				<input type="hidden" name="reset" value="1" />
 				<input type="hidden" name="db" value="<?php echo $collManager->getSearchTerm('db'); ?>" />
 			</div>
diff --git a/collections/list.php b/collections/list.php
index e5ad143ea9..caf6931b48 100644
--- a/collections/list.php
+++ b/collections/list.php
@@ -10,12 +10,18 @@
 $cntPerPage = array_key_exists('cntperpage', $_REQUEST) ? filter_var($_REQUEST['cntperpage'], FILTER_SANITIZE_NUMBER_INT) : 100;
 $pageNumber = array_key_exists('page', $_REQUEST) ? filter_var($_REQUEST['page'], FILTER_SANITIZE_NUMBER_INT) : 1;
 $datasetid = array_key_exists('datasetid', $_REQUEST) ? filter_var($_REQUEST['datasetid'], FILTER_SANITIZE_NUMBER_INT) : '';
-$comingFrom = array_key_exists('comingFrom', $_REQUEST) ? htmlspecialchars($_REQUEST['comingFrom'], HTML_SPECIAL_CHARS_FLAGS) : '';
+$comingFrom =  (array_key_exists('comingFrom', $_REQUEST) ? $_REQUEST['comingFrom'] : '');
+if($comingFrom != 'harvestparams' && $comingFrom != 'newsearch'){
+	//If not set via a valid input variable, use setting set within symbini
+	$comingFrom = !empty($SHOULD_USE_HARVESTPARAMS) ? 'harvestparams' : 'newsearch';
+}
+
 $_SESSION['datasetid'] = filter_var($datasetid, FILTER_SANITIZE_NUMBER_INT);
 
 $collManager = new OccurrenceListManager();
 $searchVar = $collManager->getQueryTermStr();
 if ($targetTid && array_key_exists('mode', $_REQUEST)) $searchVar .= '&mode=voucher&targettid=' . $targetTid;
+$searchVar .= '&comingFrom=' . $comingFrom;
 $occurArr = $collManager->getSpecimenMap($pageNumber, $cntPerPage);
 $SHOULD_INCLUDE_CULTIVATED_AS_DEFAULT = $SHOULD_INCLUDE_CULTIVATED_AS_DEFAULT ?? false;
 $SHOULD_USE_HARVESTPARAMS = $SHOULD_USE_HARVESTPARAMS ?? false;
@@ -138,7 +144,7 @@ function displayDatasetTools() {
 	else {
 		echo '<div class="navpath">';
 		echo '<a href="../index.php">' . htmlspecialchars($LANG['NAV_HOME'], ENT_COMPAT | ENT_HTML401 | ENT_SUBSTITUTE) . '</a> &gt;&gt; ';
-		if($comingFrom !== 'search/index.php'){
+		if($comingFrom == 'harvestparams'){
 			echo '<a href="index.php">' . htmlspecialchars($LANG['NAV_COLLECTIONS'], ENT_COMPAT | ENT_HTML401 | ENT_SUBSTITUTE) . '</a> &gt;&gt; ';
 			echo '<a href="' . $CLIENT_ROOT . '/collections/harvestparams.php">' . htmlspecialchars($LANG['NAV_SEARCH'], ENT_COMPAT | ENT_HTML401 | ENT_SUBSTITUTE) . '</a> &gt;&gt; ';
 		} else{
@@ -184,7 +190,7 @@ function displayDatasetTools() {
 						}
 						?>
 						<form action="listtabledisplay.php" method="post" style="float:left">
-							<input name="comingFrom" type="hidden" value="<?php echo $comingFrom; ?>" />
+							<input name="comingFrom" type="hidden" value="<?= $comingFrom; ?>" />
 							<button class="icon-button" aria-label="<?php echo (isset($LANG['TABLE_DISPLAY']) ? $LANG['TABLE_DISPLAY'] : 'Table Display'); ?>" title="<?php echo (isset($LANG['TABLE_DISPLAY']) ? $LANG['TABLE_DISPLAY'] : 'Table Display'); ?>">
 								<svg style="width:1.3em;height:1.3em" alt="<?php echo $LANG['IMG_TABLE_DISPLAY']; ?>" xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M120-200v-560q0-33 23.5-56.5T200-840h560q33 0 56.5 23.5T840-760v560q0 33-23.5 56.5T760-120H200q-33 0-56.5-23.5T120-200Zm80-400h560v-160H200v160Zm213 200h134v-120H413v120Zm0 200h134v-120H413v120ZM200-400h133v-120H200v120Zm427 0h133v-120H627v120ZM200-200h133v-120H200v120Zm427 0h133v-120H627v120Z"/></svg>
 							</button>
diff --git a/collections/listtabledisplay.php b/collections/listtabledisplay.php
index 8a90015fcf..22a9a64f81 100644
--- a/collections/listtabledisplay.php
+++ b/collections/listtabledisplay.php
@@ -5,15 +5,17 @@
 header("Content-Type: text/html; charset=".$CHARSET);
 
 $SHOULD_INCLUDE_CULTIVATED_AS_DEFAULT = $SHOULD_INCLUDE_CULTIVATED_AS_DEFAULT ?? false;
-$SHOULD_USE_HARVESTPARAMS = $SHOULD_USE_HARVESTPARAMS ?? false;
-$actionPage = $SHOULD_USE_HARVESTPARAMS ? "harvestparams.php" : "./search/index.php";
-$comingFrom = array_key_exists('comingFrom', $_REQUEST) ? htmlspecialchars($_REQUEST['comingFrom'], HTML_SPECIAL_CHARS_FLAGS) : '';
 
 $page = array_key_exists('page',$_REQUEST) ? $_REQUEST['page'] : 1;
 $tableCount= array_key_exists('tablecount',$_REQUEST) ? $_REQUEST['tablecount'] : 1000;
 $sortField1 = array_key_exists('sortfield1',$_REQUEST) ? $_REQUEST['sortfield1'] : 'collectionname';
 $sortField2 = array_key_exists('sortfield2',$_REQUEST) ? $_REQUEST['sortfield2'] : '';
 $sortOrder = array_key_exists('sortorder',$_REQUEST) ? $_REQUEST['sortorder'] : '';
+$comingFrom =  (array_key_exists('comingFrom', $_REQUEST) ? $_REQUEST['comingFrom'] : '');
+if($comingFrom != 'harvestparams' && $comingFrom != 'newsearch'){
+	//If not set via a valid input variable, use setting set within symbini
+	$comingFrom = !empty($SHOULD_USE_HARVESTPARAMS) ? 'harvestparams' : 'newsearch';
+}
 
 //Sanitation
 if(!is_numeric($page) || $page < 1) $page = 1;
@@ -24,6 +26,7 @@
 
 $collManager = new OccurrenceListManager();
 $searchVar = $collManager->getQueryTermStr();
+$searchVar .= '&comingFrom=' . $comingFrom;
 ?>
 <!DOCTYPE html>
 <html lang="<?php echo $LANG_TAG ?>">
@@ -68,7 +71,7 @@
 				</div>
 				-->
 				<form action="list.php" method="post" style="float:left">
-					<input name="comingFrom" type="hidden" value="<?php echo $comingFrom; ?>" />
+					<input name="comingFrom" type="hidden" value="<?= $comingFrom; ?>" />
 					<button type="submit" class="icon-button" style="margin:5px;padding:5px;" title="<?php echo (isset($LANG['LIST_DISPLAY']) ? $LANG['LIST_DISPLAY'] : 'List Display'); ?>"  aria-label="<?php echo (isset($LANG['LIST_DISPLAY']) ? $LANG['LIST_DISPLAY'] : 'List Display'); ?>">
 						<svg xmlns="http://www.w3.org/2000/svg" style="width:1.3em;height:1.3em" alt="<?php echo (isset($LANG['LIST_DISPLAY']) ? $LANG['LIST_DISPLAY'] : 'List Display'); ?>" height="24" viewBox="0 -960 960 960" width="24"> <path d="M280-600v-80h560v80H280Zm0 160v-80h560v80H280Zm0 160v-80h560v80H280ZM160-600q-17 0-28.5-11.5T120-640q0-17 11.5-28.5T160-680q17 0 28.5 11.5T200-640q0 17-11.5 28.5T160-600Zm0 160q-17 0-28.5-11.5T120-480q0-17 11.5-28.5T160-520q17 0 28.5 11.5T200-480q0 17-11.5 28.5T160-440Zm0 160q-17 0-28.5-11.5T120-320q0-17 11.5-28.5T160-360q17 0 28.5 11.5T200-320q0 17-11.5 28.5T160-280Z"/></svg>
 					</button>
@@ -160,12 +163,18 @@
 			</div>
 			<div class="navpath">
 				<a href="../index.php"><?php echo htmlspecialchars((isset($LANG['NAV_HOME']) ? $LANG['NAV_HOME'] : 'Home'), ENT_COMPAT | ENT_HTML401 | ENT_SUBSTITUTE); ?></a> &gt;&gt;
-				<?php if($comingFrom !== 'search/index.php'){ ?>
+				<?php
+				if($comingFrom == 'harvestparams'){
+					?>
 					<a href="index.php"><?php echo htmlspecialchars((isset($LANG['NAV_COLLECTIONS']) ? $LANG['NAV_COLLECTIONS'] : 'Collections'), ENT_COMPAT | ENT_HTML401 | ENT_SUBSTITUTE); ?></a> &gt;&gt;
 					<a href="<?php echo $CLIENT_ROOT . '/collections/harvestparams.php' ?>"><?php echo htmlspecialchars((isset($LANG['NAV_SEARCH']) ? $LANG['NAV_SEARCH'] : 'Search Criteria'), ENT_COMPAT | ENT_HTML401 | ENT_SUBSTITUTE); ?></a> &gt;&gt;
-				<?php }else{ ?>
+					<?php
+				}else{
+					?>
 					<a href="<?php echo $CLIENT_ROOT . '/collections/search/index.php' ?>"><?php echo htmlspecialchars((isset($LANG['NAV_SEARCH']) ? $LANG['NAV_SEARCH'] : 'Search Criteria'), ENT_COMPAT | ENT_HTML401 | ENT_SUBSTITUTE); ?></a> &gt;&gt;
-				<?php } ?>
+					<?php
+				}
+				?>
 				<b><?php echo (isset($LANG['SPEC_REC_TAB']) ? $LANG['SPEC_REC_TAB'] : 'Specimen Records Table'); ?></b>
 			</div>
 		</div>
diff --git a/collections/reports/labelsword.php b/collections/reports/labelsword.php
index cdf41c7237..60a50b9065 100644
--- a/collections/reports/labelsword.php
+++ b/collections/reports/labelsword.php
@@ -140,86 +140,86 @@
 			}
 			$dupCnt = $_POST['q-'.$occid];
 			for($i = 0;$i < $dupCnt;$i++){
-				$section->addText(htmlspecialchars(' '),'dividerFont','firstLine');
+				$section->addText(' ', 'dividerFont', 'firstLine');
 				if($headerStr){
 					$section->addText(htmlspecialchars($headerStr),'lheaderFont','lheader');
 				}
 				if($hMid != 4) $section->addText(htmlspecialchars($occArr['family']),'familyFont','family');
 				$textrun = $section->addTextRun('scientificname');
 				if($occArr['identificationqualifier']) $textrun->addText(htmlspecialchars($occArr['identificationqualifier']).' ','scientificnameauthFont');
-				$scinameStr = $occArr['scientificname'];
-				$parentAuthor = (array_key_exists('parentauthor',$occArr)?' '.$occArr['parentauthor']:'');
+				$scinameStr = htmlspecialchars($occArr['scientificname']);
+				$parentAuthor = (array_key_exists('parentauthor',$occArr)?' ' . htmlspecialchars($occArr['parentauthor']) : '');
 				if(strpos($scinameStr,' sp.') !== false){
 					$scinameArr = explode(" sp. ",$scinameStr);
-					$textrun->addText(htmlspecialchars($scinameArr[0]).' ','scientificnameFont');
-					if($parentAuthor) $textrun->addText(htmlspecialchars($parentAuthor).' ','scientificnameauthFont');
+					$textrun->addText($scinameArr[0] . ' ', 'scientificnameFont');
+					if($parentAuthor) $textrun->addText($parentAuthor.' ','scientificnameauthFont');
 					$textrun->addText('sp.','scientificnameinterFont');
 				}
 				elseif(strpos($scinameStr,'subsp.') !== false){
-					$scinameArr = explode(" subsp. ",$scinameStr);
-					$textrun->addText(htmlspecialchars($scinameArr[0]).' ','scientificnameFont');
-					if($parentAuthor) $textrun->addText(htmlspecialchars($parentAuthor).' ','scientificnameauthFont');
+					$scinameArr = explode(" subsp. ", $scinameStr);
+					$textrun->addText($scinameArr[0] . ' ', 'scientificnameFont');
+					if($parentAuthor) $textrun->addText($parentAuthor . ' ', 'scientificnameauthFont');
 					$textrun->addText('subsp. ','scientificnameinterFont');
-					$textrun->addText(htmlspecialchars($scinameArr[1]).' ','scientificnameFont');
+					$textrun->addText($scinameArr[1] . ' ', 'scientificnameFont');
 				}
 				elseif(strpos($scinameStr,'ssp.') !== false){
 					$scinameArr = explode(" ssp. ",$scinameStr);
-					$textrun->addText(htmlspecialchars($scinameArr[0]).' ','scientificnameFont');
-					if($parentAuthor) $textrun->addText(htmlspecialchars($parentAuthor).' ','scientificnameauthFont');
+					$textrun->addText($scinameArr[0] . ' ', 'scientificnameFont');
+					if($parentAuthor) $textrun->addText($parentAuthor . ' ', 'scientificnameauthFont');
 					$textrun->addText('ssp. ','scientificnameinterFont');
-					$textrun->addText(htmlspecialchars($scinameArr[1]).' ','scientificnameFont');
+					$textrun->addText($scinameArr[1] . ' ', 'scientificnameFont');
 				}
 				elseif(strpos($scinameStr,'var.') !== false){
 					$scinameArr = explode(" var. ",$scinameStr);
-					$textrun->addText(htmlspecialchars($scinameArr[0]).' ','scientificnameFont');
-					if($parentAuthor) $textrun->addText(htmlspecialchars($parentAuthor).' ','scientificnameauthFont');
+					$textrun->addText($scinameArr[0] . ' ', 'scientificnameFont');
+					if($parentAuthor) $textrun->addText($parentAuthor . ' ', 'scientificnameauthFont');
 					$textrun->addText('var. ','scientificnameinterFont');
-					$textrun->addText(htmlspecialchars($scinameArr[1]).' ','scientificnameFont');
+					$textrun->addText($scinameArr[1] . ' ', 'scientificnameFont');
 				}
 				elseif(strpos($scinameStr,'variety') !== false){
 					$scinameArr = explode(" variety ",$scinameStr);
-					$textrun->addText(htmlspecialchars($scinameArr[0]).' ','scientificnameFont');
-					if($parentAuthor) $textrun->addText(htmlspecialchars($parentAuthor).' ','scientificnameauthFont');
+					$textrun->addText($scinameArr[0] . ' ', 'scientificnameFont');
+					if($parentAuthor) $textrun->addText($parentAuthor . ' ', 'scientificnameauthFont');
 					$textrun->addText('var. ','scientificnameinterFont');
-					$textrun->addText(htmlspecialchars($scinameArr[1]).' ','scientificnameFont');
+					$textrun->addText($scinameArr[1] . ' ', 'scientificnameFont');
 				}
 				elseif(strpos($scinameStr,'Variety') !== false){
-					$scinameArr = explode(" Variety ",$scinameStr);
-					$textrun->addText(htmlspecialchars($scinameArr[0]).' ','scientificnameFont');
-					if($parentAuthor) $textrun->addText(htmlspecialchars($parentAuthor).' ','scientificnameauthFont');
+					$scinameArr = explode(" Variety ", $scinameStr);
+					$textrun->addText($scinameArr[0] . ' ', 'scientificnameFont');
+					if($parentAuthor) $textrun->addText($parentAuthor . ' ', 'scientificnameauthFont');
 					$textrun->addText('var. ','scientificnameinterFont');
-					$textrun->addText(htmlspecialchars($scinameArr[1]).' ','scientificnameFont');
+					$textrun->addText($scinameArr[1] . ' ', 'scientificnameFont');
 				}
 				elseif(strpos($scinameStr,'v.') !== false){
 					$scinameArr = explode(" v. ",$scinameStr);
-					$textrun->addText(htmlspecialchars($scinameArr[0]).' ','scientificnameFont');
-					if($parentAuthor) $textrun->addText(htmlspecialchars($parentAuthor).' ','scientificnameauthFont');
+					$textrun->addText($scinameArr[0] . ' ', 'scientificnameFont');
+					if($parentAuthor) $textrun->addText($parentAuthor . ' ', 'scientificnameauthFont');
 					$textrun->addText('var. ','scientificnameinterFont');
-					$textrun->addText(htmlspecialchars($scinameArr[1]).' ','scientificnameFont');
+					$textrun->addText($scinameArr[1] . ' ', 'scientificnameFont');
 				}
 				elseif(strpos($scinameStr,' f.') !== false){
 					$scinameArr = explode(" f. ",$scinameStr);
-					$textrun->addText(htmlspecialchars($scinameArr[0]).' ','scientificnameFont');
-					if($parentAuthor) $textrun->addText(htmlspecialchars($parentAuthor).' ','scientificnameauthFont');
+					$textrun->addText($scinameArr[0] . ' ', 'scientificnameFont');
+					if($parentAuthor) $textrun->addText($parentAuthor . ' ', 'scientificnameauthFont');
 					$textrun->addText('f. ','scientificnameinterFont');
-					$textrun->addText(htmlspecialchars($scinameArr[1]).' ','scientificnameFont');
+					$textrun->addText($scinameArr[1] . ' ', 'scientificnameFont');
 				}
 				elseif(strpos($scinameStr,'cf.') !== false){
 					$scinameArr = explode(" cf. ",$scinameStr);
-					$textrun->addText(htmlspecialchars($scinameArr[0]).' ','scientificnameFont');
-					if($parentAuthor) $textrun->addText(htmlspecialchars($parentAuthor).' ','scientificnameauthFont');
+					$textrun->addText($scinameArr[0] . ' ', 'scientificnameFont');
+					if($parentAuthor) $textrun->addText($parentAuthor . ' ', 'scientificnameauthFont');
 					$textrun->addText('cf. ','scientificnameinterFont');
-					$textrun->addText(htmlspecialchars($scinameArr[1]).' ','scientificnameFont');
+					$textrun->addText($scinameArr[1] . ' ', 'scientificnameFont');
 				}
 				elseif(strpos($scinameStr,'aff.') !== false){
 					$scinameArr = explode(" aff. ",$scinameStr);
-					$textrun->addText(htmlspecialchars($scinameArr[0]).' ','scientificnameFont');
-					if($parentAuthor) $textrun->addText(htmlspecialchars($parentAuthor).' ','scientificnameauthFont');
+					$textrun->addText($scinameArr[0] . ' ', 'scientificnameFont');
+					if($parentAuthor) $textrun->addText($parentAuthor . ' ', 'scientificnameauthFont');
 					$textrun->addText('aff. ','scientificnameinterFont');
-					$textrun->addText(htmlspecialchars($scinameArr[1]).' ','scientificnameFont');
+					$textrun->addText($scinameArr[1] . ' ', 'scientificnameFont');
 				}
 				else{
-					$textrun->addText(htmlspecialchars($scinameStr).' ','scientificnameFont');
+					$textrun->addText($scinameStr . ' ', 'scientificnameFont');
 				}
 				$textrun->addText(htmlspecialchars($occArr['scientificnameauthorship']),'scientificnameauthFont');
 				if($occArr['identifiedby']){
@@ -277,8 +277,8 @@
 				if($occArr['verbatimattributes'] || $occArr['establishmentmeans']){
 					$textrun = $section->addTextRun('other');
 					$textrun->addText(htmlspecialchars($occArr['verbatimattributes']),'otherFont');
-					if($occArr['verbatimattributes'] && $occArr['establishmentmeans']) $textrun->addText(htmlspecialchars('; '),'otherFont');
-					$textrun->addText(htmlspecialchars($occArr['establishmentmeans']),'otherFont');
+					if($occArr['verbatimattributes'] && $occArr['establishmentmeans']) $textrun->addText('; ','otherFont');
+					$textrun->addText($occArr['establishmentmeans'], 'otherFont');
 				}
 				if($occArr['associatedtaxa']){
 					$textrun = $section->addTextRun('other');
@@ -338,7 +338,7 @@
 					}
 					imagedestroy($bc);
 				}
-				$section->addText(htmlspecialchars(' '),'dividerFont','lastLine');
+				$section->addText(' ', 'dividerFont', 'lastLine');
 			}
 		}
 	}
diff --git a/collections/search/index.php b/collections/search/index.php
index 4f097c7d45..c051c408e0 100644
--- a/collections/search/index.php
+++ b/collections/search/index.php
@@ -557,7 +557,7 @@
 	include($SERVER_ROOT . '/includes/footer.php');
 	?>
 </body>
-<script src="js/searchform.js" type="text/javascript"></script>
+<script src="js/searchform.js?ver=1" type="text/javascript"></script>
 <script src="<?php echo $CLIENT_ROOT . '/collections/search/js/alerts.js?v=202107'; ?>" type="text/javascript"></script>
 <script src="<?php echo $CLIENT_ROOT . '/js/symb/api.taxonomy.taxasuggest.js'; ?>" type="text/javascript"></script>
 <script src="<?php echo $CLIENT_ROOT . '/js/symb/collections.index.js?ver=20171215' ?>" type="text/javascript"></script>
diff --git a/collections/search/js/searchform.js b/collections/search/js/searchform.js
index 88065676f7..88158856b6 100644
--- a/collections/search/js/searchform.js
+++ b/collections/search/js/searchform.js
@@ -582,7 +582,7 @@ function getSearchUrl() {
     baseUrl.searchParams.append(key, paramsArr[key]);
   });
 
-  baseUrl.searchParams.append("comingFrom", "search/index.php");
+  baseUrl.searchParams.append("comingFrom", "newsearch");
 
   return baseUrl.href;
 }
diff --git a/composer.json b/composer.json
index 6972575b16..d0be574670 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,8 @@
 {
-    "require": {
-        "phpoffice/phpword": "^0.18.2",
-        "phpoffice/phpspreadsheet": "^1.18",
-        "jumbojett/openid-connect-php": "^0.9.10"
-    }
+  "require": {
+    "phpoffice/phpword": "^1.3.0",
+    "phpoffice/phpspreadsheet": "^3.3.0",
+    "jumbojett/openid-connect-php": "^1.0",
+    "phpseclib/phpseclib": "^3.0.42"
+  }
 }
diff --git a/composer.lock b/composer.lock
index 24e010aa4c..da6e503f9a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,86 +4,32 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "8dd9c6e7b084f7562ea0700066219e2b",
+    "content-hash": "b6b045b3e13e4c2c7b50544ae9f6234a",
     "packages": [
-        {
-            "name": "ezyang/htmlpurifier",
-            "version": "v4.13.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/ezyang/htmlpurifier.git",
-                "reference": "08e27c97e4c6ed02f37c5b2b20488046c8d90d75"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/08e27c97e4c6ed02f37c5b2b20488046c8d90d75",
-                "reference": "08e27c97e4c6ed02f37c5b2b20488046c8d90d75",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.2"
-            },
-            "require-dev": {
-                "simpletest/simpletest": "dev-master#72de02a7b80c6bb8864ef9bf66d41d2f58f826bd"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "HTMLPurifier": "library/"
-                },
-                "files": [
-                    "library/HTMLPurifier.composer.php"
-                ],
-                "exclude-from-classmap": [
-                    "/library/HTMLPurifier/Language/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "LGPL-2.1-or-later"
-            ],
-            "authors": [
-                {
-                    "name": "Edward Z. Yang",
-                    "email": "admin@htmlpurifier.org",
-                    "homepage": "http://ezyang.com"
-                }
-            ],
-            "description": "Standards compliant HTML filter written in PHP",
-            "homepage": "http://htmlpurifier.org/",
-            "keywords": [
-                "html"
-            ],
-            "support": {
-                "issues": "https://github.com/ezyang/htmlpurifier/issues",
-                "source": "https://github.com/ezyang/htmlpurifier/tree/master"
-            },
-            "time": "2020-06-29T00:56:53+00:00"
-        },
         {
             "name": "jumbojett/openid-connect-php",
-            "version": "v0.9.10",
+            "version": "v1.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/jumbojett/OpenID-Connect-PHP.git",
-                "reference": "45aac47b525f0483dd4db3324bb1f1cab4666061"
+                "reference": "f327e7eb0626d55ddb6abc7b7c9e6ad3af4e5d51"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/jumbojett/OpenID-Connect-PHP/zipball/45aac47b525f0483dd4db3324bb1f1cab4666061",
-                "reference": "45aac47b525f0483dd4db3324bb1f1cab4666061",
+                "url": "https://api.github.com/repos/jumbojett/OpenID-Connect-PHP/zipball/f327e7eb0626d55ddb6abc7b7c9e6ad3af4e5d51",
+                "reference": "f327e7eb0626d55ddb6abc7b7c9e6ad3af4e5d51",
                 "shasum": ""
             },
             "require": {
                 "ext-curl": "*",
                 "ext-json": "*",
-                "paragonie/random_compat": ">=2",
-                "php": ">=5.4",
-                "phpseclib/phpseclib": "~2.0 || ^3.0"
+                "php": ">=7.0",
+                "phpseclib/phpseclib": "^3.0.7"
             },
             "require-dev": {
-                "roave/security-advisories": "dev-master",
-                "yoast/phpunit-polyfills": "^1.0"
+                "phpunit/phpunit": "<10",
+                "roave/security-advisories": "dev-latest",
+                "yoast/phpunit-polyfills": "^2.0"
             },
             "type": "library",
             "autoload": {
@@ -98,160 +44,41 @@
             "description": "Bare-bones OpenID Connect client",
             "support": {
                 "issues": "https://github.com/jumbojett/OpenID-Connect-PHP/issues",
-                "source": "https://github.com/jumbojett/OpenID-Connect-PHP/tree/v0.9.10"
+                "source": "https://github.com/jumbojett/OpenID-Connect-PHP/tree/v1.0.2"
             },
-            "time": "2022-09-30T12:34:46+00:00"
-        },
-        {
-            "name": "laminas/laminas-escaper",
-            "version": "2.8.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-escaper.git",
-                "reference": "2d6dce99668b413610e9544183fa10392437f542"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/2d6dce99668b413610e9544183fa10392437f542",
-                "reference": "2d6dce99668b413610e9544183fa10392437f542",
-                "shasum": ""
-            },
-            "require": {
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^7.3 || ~8.0.0"
-            },
-            "replace": {
-                "zendframework/zend-escaper": "^2.6.1"
-            },
-            "require-dev": {
-                "laminas/laminas-coding-standard": "~2.3.0",
-                "phpunit/phpunit": "^9.3",
-                "psalm/plugin-phpunit": "^0.12.2",
-                "vimeo/psalm": "^3.16"
-            },
-            "suggest": {
-                "ext-iconv": "*",
-                "ext-mbstring": "*"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Laminas\\Escaper\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "Securely and safely escape HTML, HTML attributes, JavaScript, CSS, and URLs",
-            "homepage": "https://laminas.dev",
-            "keywords": [
-                "escaper",
-                "laminas"
-            ],
-            "support": {
-                "chat": "https://laminas.dev/chat",
-                "docs": "https://docs.laminas.dev/laminas-escaper/",
-                "forum": "https://discourse.laminas.dev",
-                "issues": "https://github.com/laminas/laminas-escaper/issues",
-                "rss": "https://github.com/laminas/laminas-escaper/releases.atom",
-                "source": "https://github.com/laminas/laminas-escaper"
-            },
-            "funding": [
-                {
-                    "url": "https://funding.communitybridge.org/projects/laminas-project",
-                    "type": "community_bridge"
-                }
-            ],
-            "time": "2021-06-26T14:26:08+00:00"
-        },
-        {
-            "name": "laminas/laminas-zendframework-bridge",
-            "version": "1.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-zendframework-bridge.git",
-                "reference": "13af2502d9bb6f7d33be2de4b51fb68c6cdb476e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/13af2502d9bb6f7d33be2de4b51fb68c6cdb476e",
-                "reference": "13af2502d9bb6f7d33be2de4b51fb68c6cdb476e",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.3 || ^8.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.1 || ^9.3",
-                "psalm/plugin-phpunit": "^0.15.1",
-                "squizlabs/php_codesniffer": "^3.5",
-                "vimeo/psalm": "^4.6"
-            },
-            "type": "library",
-            "extra": {
-                "laminas": {
-                    "module": "Laminas\\ZendFrameworkBridge"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "src/autoload.php"
-                ],
-                "psr-4": {
-                    "Laminas\\ZendFrameworkBridge\\": "src//"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "Alias legacy ZF class names to Laminas Project equivalents.",
-            "keywords": [
-                "ZendFramework",
-                "autoloading",
-                "laminas",
-                "zf"
-            ],
-            "support": {
-                "forum": "https://discourse.laminas.dev/",
-                "issues": "https://github.com/laminas/laminas-zendframework-bridge/issues",
-                "rss": "https://github.com/laminas/laminas-zendframework-bridge/releases.atom",
-                "source": "https://github.com/laminas/laminas-zendframework-bridge"
-            },
-            "funding": [
-                {
-                    "url": "https://funding.communitybridge.org/projects/laminas-project",
-                    "type": "community_bridge"
-                }
-            ],
-            "time": "2021-06-24T12:49:22+00:00"
+            "time": "2024-09-13T07:08:11+00:00"
         },
         {
             "name": "maennchen/zipstream-php",
-            "version": "2.1.0",
+            "version": "3.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/maennchen/ZipStream-PHP.git",
-                "reference": "c4c5803cc1f93df3d2448478ef79394a5981cc58"
+                "reference": "6187e9cc4493da94b9b63eb2315821552015fca9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/c4c5803cc1f93df3d2448478ef79394a5981cc58",
-                "reference": "c4c5803cc1f93df3d2448478ef79394a5981cc58",
+                "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/6187e9cc4493da94b9b63eb2315821552015fca9",
+                "reference": "6187e9cc4493da94b9b63eb2315821552015fca9",
                 "shasum": ""
             },
             "require": {
-                "myclabs/php-enum": "^1.5",
-                "php": ">= 7.1",
-                "psr/http-message": "^1.0",
-                "symfony/polyfill-mbstring": "^1.0"
+                "ext-mbstring": "*",
+                "ext-zlib": "*",
+                "php-64bit": "^8.1"
             },
             "require-dev": {
                 "ext-zip": "*",
-                "guzzlehttp/guzzle": ">= 6.3",
+                "friendsofphp/php-cs-fixer": "^3.16",
+                "guzzlehttp/guzzle": "^7.5",
                 "mikey179/vfsstream": "^1.6",
-                "phpunit/phpunit": ">= 7.5"
+                "php-coveralls/php-coveralls": "^2.5",
+                "phpunit/phpunit": "^10.0",
+                "vimeo/psalm": "^5.0"
+            },
+            "suggest": {
+                "guzzlehttp/psr7": "^2.4",
+                "psr/http-message": "^2.0"
             },
             "type": "library",
             "autoload": {
@@ -288,88 +115,44 @@
             ],
             "support": {
                 "issues": "https://github.com/maennchen/ZipStream-PHP/issues",
-                "source": "https://github.com/maennchen/ZipStream-PHP/tree/master"
+                "source": "https://github.com/maennchen/ZipStream-PHP/tree/3.1.1"
             },
             "funding": [
                 {
-                    "url": "https://opencollective.com/zipstream",
-                    "type": "open_collective"
+                    "url": "https://github.com/maennchen",
+                    "type": "github"
                 }
             ],
-            "time": "2020-05-30T13:11:16+00:00"
+            "time": "2024-10-10T12:33:01+00:00"
         },
         {
             "name": "markbaker/complex",
-            "version": "2.0.3",
+            "version": "3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/MarkBaker/PHPComplex.git",
-                "reference": "6f724d7e04606fd8adaa4e3bb381c3e9db09c946"
+                "reference": "95c56caa1cf5c766ad6d65b6344b807c1e8405b9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/MarkBaker/PHPComplex/zipball/6f724d7e04606fd8adaa4e3bb381c3e9db09c946",
-                "reference": "6f724d7e04606fd8adaa4e3bb381c3e9db09c946",
+                "url": "https://api.github.com/repos/MarkBaker/PHPComplex/zipball/95c56caa1cf5c766ad6d65b6344b807c1e8405b9",
+                "reference": "95c56caa1cf5c766ad6d65b6344b807c1e8405b9",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2 || ^8.0"
             },
             "require-dev": {
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
-                "phpcompatibility/php-compatibility": "^9.0",
-                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.3",
-                "squizlabs/php_codesniffer": "^3.4"
+                "dealerdirect/phpcodesniffer-composer-installer": "dev-master",
+                "phpcompatibility/php-compatibility": "^9.3",
+                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
+                "squizlabs/php_codesniffer": "^3.7"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
                     "Complex\\": "classes/src/"
-                },
-                "files": [
-                    "classes/src/functions/abs.php",
-                    "classes/src/functions/acos.php",
-                    "classes/src/functions/acosh.php",
-                    "classes/src/functions/acot.php",
-                    "classes/src/functions/acoth.php",
-                    "classes/src/functions/acsc.php",
-                    "classes/src/functions/acsch.php",
-                    "classes/src/functions/argument.php",
-                    "classes/src/functions/asec.php",
-                    "classes/src/functions/asech.php",
-                    "classes/src/functions/asin.php",
-                    "classes/src/functions/asinh.php",
-                    "classes/src/functions/atan.php",
-                    "classes/src/functions/atanh.php",
-                    "classes/src/functions/conjugate.php",
-                    "classes/src/functions/cos.php",
-                    "classes/src/functions/cosh.php",
-                    "classes/src/functions/cot.php",
-                    "classes/src/functions/coth.php",
-                    "classes/src/functions/csc.php",
-                    "classes/src/functions/csch.php",
-                    "classes/src/functions/exp.php",
-                    "classes/src/functions/inverse.php",
-                    "classes/src/functions/ln.php",
-                    "classes/src/functions/log2.php",
-                    "classes/src/functions/log10.php",
-                    "classes/src/functions/negative.php",
-                    "classes/src/functions/pow.php",
-                    "classes/src/functions/rho.php",
-                    "classes/src/functions/sec.php",
-                    "classes/src/functions/sech.php",
-                    "classes/src/functions/sin.php",
-                    "classes/src/functions/sinh.php",
-                    "classes/src/functions/sqrt.php",
-                    "classes/src/functions/tan.php",
-                    "classes/src/functions/tanh.php",
-                    "classes/src/functions/theta.php",
-                    "classes/src/operations/add.php",
-                    "classes/src/operations/subtract.php",
-                    "classes/src/operations/multiply.php",
-                    "classes/src/operations/divideby.php",
-                    "classes/src/operations/divideinto.php"
-                ]
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -389,60 +172,42 @@
             ],
             "support": {
                 "issues": "https://github.com/MarkBaker/PHPComplex/issues",
-                "source": "https://github.com/MarkBaker/PHPComplex/tree/2.0.3"
+                "source": "https://github.com/MarkBaker/PHPComplex/tree/3.0.2"
             },
-            "time": "2021-06-02T09:44:11+00:00"
+            "time": "2022-12-06T16:21:08+00:00"
         },
         {
             "name": "markbaker/matrix",
-            "version": "2.1.3",
+            "version": "3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/MarkBaker/PHPMatrix.git",
-                "reference": "174395a901b5ba0925f1d790fa91bab531074b61"
+                "reference": "728434227fe21be27ff6d86621a1b13107a2562c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/MarkBaker/PHPMatrix/zipball/174395a901b5ba0925f1d790fa91bab531074b61",
-                "reference": "174395a901b5ba0925f1d790fa91bab531074b61",
+                "url": "https://api.github.com/repos/MarkBaker/PHPMatrix/zipball/728434227fe21be27ff6d86621a1b13107a2562c",
+                "reference": "728434227fe21be27ff6d86621a1b13107a2562c",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1 || ^8.0"
             },
             "require-dev": {
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
-                "phpcompatibility/php-compatibility": "^9.0",
+                "dealerdirect/phpcodesniffer-composer-installer": "dev-master",
+                "phpcompatibility/php-compatibility": "^9.3",
                 "phpdocumentor/phpdocumentor": "2.*",
                 "phploc/phploc": "^4.0",
                 "phpmd/phpmd": "2.*",
-                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.3",
+                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
                 "sebastian/phpcpd": "^4.0",
-                "squizlabs/php_codesniffer": "^3.4"
+                "squizlabs/php_codesniffer": "^3.7"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
                     "Matrix\\": "classes/src/"
-                },
-                "files": [
-                    "classes/src/Functions/adjoint.php",
-                    "classes/src/Functions/antidiagonal.php",
-                    "classes/src/Functions/cofactors.php",
-                    "classes/src/Functions/determinant.php",
-                    "classes/src/Functions/diagonal.php",
-                    "classes/src/Functions/identity.php",
-                    "classes/src/Functions/inverse.php",
-                    "classes/src/Functions/minors.php",
-                    "classes/src/Functions/trace.php",
-                    "classes/src/Functions/transpose.php",
-                    "classes/src/Operations/add.php",
-                    "classes/src/Operations/directsum.php",
-                    "classes/src/Operations/subtract.php",
-                    "classes/src/Operations/multiply.php",
-                    "classes/src/Operations/divideby.php",
-                    "classes/src/Operations/divideinto.php"
-                ]
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -463,90 +228,30 @@
             ],
             "support": {
                 "issues": "https://github.com/MarkBaker/PHPMatrix/issues",
-                "source": "https://github.com/MarkBaker/PHPMatrix/tree/2.1.3"
-            },
-            "time": "2021-05-25T15:42:17+00:00"
-        },
-        {
-            "name": "myclabs/php-enum",
-            "version": "1.8.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/myclabs/php-enum.git",
-                "reference": "b942d263c641ddb5190929ff840c68f78713e937"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/php-enum/zipball/b942d263c641ddb5190929ff840c68f78713e937",
-                "reference": "b942d263c641ddb5190929ff840c68f78713e937",
-                "shasum": ""
+                "source": "https://github.com/MarkBaker/PHPMatrix/tree/3.0.1"
             },
-            "require": {
-                "ext-json": "*",
-                "php": "^7.3 || ^8.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.5",
-                "squizlabs/php_codesniffer": "1.*",
-                "vimeo/psalm": "^4.6.2"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "MyCLabs\\Enum\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP Enum contributors",
-                    "homepage": "https://github.com/myclabs/php-enum/graphs/contributors"
-                }
-            ],
-            "description": "PHP Enum implementation",
-            "homepage": "http://github.com/myclabs/php-enum",
-            "keywords": [
-                "enum"
-            ],
-            "support": {
-                "issues": "https://github.com/myclabs/php-enum/issues",
-                "source": "https://github.com/myclabs/php-enum/tree/1.8.3"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/mnapoli",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/myclabs/php-enum",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2021-07-05T08:18:36+00:00"
+            "time": "2022-12-02T22:17:43+00:00"
         },
         {
             "name": "paragonie/constant_time_encoding",
-            "version": "v2.6.3",
+            "version": "v3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paragonie/constant_time_encoding.git",
-                "reference": "58c3f47f650c94ec05a151692652a868995d2938"
+                "reference": "df1e7fde177501eee2037dd159cf04f5f301a512"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/58c3f47f650c94ec05a151692652a868995d2938",
-                "reference": "58c3f47f650c94ec05a151692652a868995d2938",
+                "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/df1e7fde177501eee2037dd159cf04f5f301a512",
+                "reference": "df1e7fde177501eee2037dd159cf04f5f301a512",
                 "shasum": ""
             },
             "require": {
-                "php": "^7|^8"
+                "php": "^8"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6|^7|^8|^9",
-                "vimeo/psalm": "^1|^2|^3|^4"
+                "phpunit/phpunit": "^9",
+                "vimeo/psalm": "^4|^5"
             },
             "type": "library",
             "autoload": {
@@ -592,7 +297,7 @@
                 "issues": "https://github.com/paragonie/constant_time_encoding/issues",
                 "source": "https://github.com/paragonie/constant_time_encoding"
             },
-            "time": "2022-06-14T06:56:20+00:00"
+            "time": "2024-05-08T12:36:18+00:00"
         },
         {
             "name": "paragonie/random_compat",
@@ -644,18 +349,70 @@
             },
             "time": "2020-10-15T08:29:30+00:00"
         },
+        {
+            "name": "phpoffice/math",
+            "version": "0.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHPOffice/Math.git",
+                "reference": "fc2eb6d1a61b058d5dac77197059db30ee3c8329"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHPOffice/Math/zipball/fc2eb6d1a61b058d5dac77197059db30ee3c8329",
+                "reference": "fc2eb6d1a61b058d5dac77197059db30ee3c8329",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-xml": "*",
+                "php": "^7.1|^8.0"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^0.12.88 || ^1.0.0",
+                "phpunit/phpunit": "^7.0 || ^9.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "PhpOffice\\Math\\": "src/Math/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Progi1984",
+                    "homepage": "https://lefevre.dev"
+                }
+            ],
+            "description": "Math - Manipulate Math Formula",
+            "homepage": "https://phpoffice.github.io/Math/",
+            "keywords": [
+                "MathML",
+                "officemathml",
+                "php"
+            ],
+            "support": {
+                "issues": "https://github.com/PHPOffice/Math/issues",
+                "source": "https://github.com/PHPOffice/Math/tree/0.2.0"
+            },
+            "time": "2024-08-12T07:30:45+00:00"
+        },
         {
             "name": "phpoffice/phpspreadsheet",
-            "version": "1.18.0",
+            "version": "3.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPOffice/PhpSpreadsheet.git",
-                "reference": "418cd304e8e6b417ea79c3b29126a25dc4b1170c"
+                "reference": "87ddd21eb0b6b7ad20a11d314348ef307475f547"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/418cd304e8e6b417ea79c3b29126a25dc4b1170c",
-                "reference": "418cd304e8e6b417ea79c3b29126a25dc4b1170c",
+                "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/87ddd21eb0b6b7ad20a11d314348ef307475f547",
+                "reference": "87ddd21eb0b6b7ad20a11d314348ef307475f547",
                 "shasum": ""
             },
             "require": {
@@ -672,33 +429,33 @@
                 "ext-xmlwriter": "*",
                 "ext-zip": "*",
                 "ext-zlib": "*",
-                "ezyang/htmlpurifier": "^4.13",
-                "maennchen/zipstream-php": "^2.1",
-                "markbaker/complex": "^2.0",
-                "markbaker/matrix": "^2.0",
-                "php": "^7.2 || ^8.0",
+                "maennchen/zipstream-php": "^2.1 || ^3.0",
+                "markbaker/complex": "^3.0",
+                "markbaker/matrix": "^3.0",
+                "php": "^8.1",
                 "psr/http-client": "^1.0",
                 "psr/http-factory": "^1.0",
-                "psr/simple-cache": "^1.0"
+                "psr/simple-cache": "^1.0 || ^2.0 || ^3.0"
             },
             "require-dev": {
-                "dealerdirect/phpcodesniffer-composer-installer": "dev-master",
-                "dompdf/dompdf": "^1.0",
-                "friendsofphp/php-cs-fixer": "^2.18",
-                "jpgraph/jpgraph": "^4.0",
-                "mpdf/mpdf": "^8.0",
+                "dealerdirect/phpcodesniffer-composer-installer": "dev-main",
+                "dompdf/dompdf": "^2.0 || ^3.0",
+                "friendsofphp/php-cs-fixer": "^3.2",
+                "mitoteam/jpgraph": "^10.3",
+                "mpdf/mpdf": "^8.1.1",
                 "phpcompatibility/php-compatibility": "^9.3",
-                "phpstan/phpstan": "^0.12.82",
-                "phpstan/phpstan-phpunit": "^0.12.18",
-                "phpunit/phpunit": "^8.5",
-                "squizlabs/php_codesniffer": "^3.5",
-                "tecnickcom/tcpdf": "^6.3"
+                "phpstan/phpstan": "^1.1",
+                "phpstan/phpstan-phpunit": "^1.0",
+                "phpunit/phpunit": "^9.6 || ^10.5",
+                "squizlabs/php_codesniffer": "^3.7",
+                "tecnickcom/tcpdf": "^6.5"
             },
             "suggest": {
-                "dompdf/dompdf": "Option for rendering PDF with PDF Writer (doesn't yet support PHP8)",
-                "jpgraph/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers",
+                "dompdf/dompdf": "Option for rendering PDF with PDF Writer",
+                "ext-intl": "PHP Internationalization Functions",
+                "mitoteam/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers",
                 "mpdf/mpdf": "Option for rendering PDF with PDF Writer",
-                "tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer (doesn't yet support PHP8)"
+                "tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer"
             },
             "type": "library",
             "autoload": {
@@ -744,41 +501,43 @@
             ],
             "support": {
                 "issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues",
-                "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.18.0"
+                "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/3.3.0"
             },
-            "time": "2021-05-31T18:21:15+00:00"
+            "time": "2024-09-29T07:04:07+00:00"
         },
         {
             "name": "phpoffice/phpword",
-            "version": "0.18.2",
+            "version": "1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPOffice/PHPWord.git",
-                "reference": "aca10785cf68dc95d7f6fac4fe854979fef3f8db"
+                "reference": "8392134ce4b5dba65130ba956231a1602b848b7f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPOffice/PHPWord/zipball/aca10785cf68dc95d7f6fac4fe854979fef3f8db",
-                "reference": "aca10785cf68dc95d7f6fac4fe854979fef3f8db",
+                "url": "https://api.github.com/repos/PHPOffice/PHPWord/zipball/8392134ce4b5dba65130ba956231a1602b848b7f",
+                "reference": "8392134ce4b5dba65130ba956231a1602b848b7f",
                 "shasum": ""
             },
             "require": {
+                "ext-dom": "*",
+                "ext-json": "*",
                 "ext-xml": "*",
-                "laminas/laminas-escaper": "^2.2",
-                "php": "^5.3.3 || ^7.0 || ^8.0"
+                "php": "^7.1|^8.0",
+                "phpoffice/math": "^0.2"
             },
             "require-dev": {
-                "dompdf/dompdf": "0.8.* || 1.0.*",
+                "dompdf/dompdf": "^2.0",
                 "ext-gd": "*",
+                "ext-libxml": "*",
                 "ext-zip": "*",
-                "friendsofphp/php-cs-fixer": "^2.2",
-                "mpdf/mpdf": "5.7.4 || 6.* || 7.* || 8.*",
-                "php-coveralls/php-coveralls": "1.1.0 || ^2.0",
-                "phploc/phploc": "2.* || 3.* || 4.* || 5.* || 6.* || 7.*",
-                "phpmd/phpmd": "2.*",
-                "phpunit/phpunit": "^4.8.36 || ^7.0",
-                "squizlabs/php_codesniffer": "^2.9 || ^3.5",
-                "tecnickcom/tcpdf": "6.*"
+                "friendsofphp/php-cs-fixer": "^3.3",
+                "mpdf/mpdf": "^8.1",
+                "phpmd/phpmd": "^2.13",
+                "phpstan/phpstan-phpunit": "@stable",
+                "phpunit/phpunit": ">=7.0",
+                "symfony/process": "^4.4 || ^5.0",
+                "tecnickcom/tcpdf": "^6.5"
             },
             "suggest": {
                 "dompdf/dompdf": "Allows writing PDF",
@@ -788,11 +547,6 @@
                 "ext-zip": "Allows writing OOXML and ODF"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-develop": "0.19-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "PhpOffice\\PhpWord\\": "src/PhpWord"
@@ -828,7 +582,7 @@
                 }
             ],
             "description": "PHPWord - A pure PHP library for reading and writing word processing documents (OOXML, ODF, RTF, HTML, PDF)",
-            "homepage": "http://phpoffice.github.io",
+            "homepage": "https://phpoffice.github.io/PHPWord/",
             "keywords": [
                 "ISO IEC 29500",
                 "OOXML",
@@ -856,26 +610,26 @@
             ],
             "support": {
                 "issues": "https://github.com/PHPOffice/PHPWord/issues",
-                "source": "https://github.com/PHPOffice/PHPWord/tree/0.18.2"
+                "source": "https://github.com/PHPOffice/PHPWord/tree/1.3.0"
             },
-            "time": "2021-06-04T20:58:45+00:00"
+            "time": "2024-08-30T18:03:42+00:00"
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "3.0.33",
+            "version": "3.0.42",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "33fa69b2514a61138dd48e7a49f99445711e0ad0"
+                "reference": "db92f1b1987b12b13f248fe76c3a52cadb67bb98"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/33fa69b2514a61138dd48e7a49f99445711e0ad0",
-                "reference": "33fa69b2514a61138dd48e7a49f99445711e0ad0",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/db92f1b1987b12b13f248fe76c3a52cadb67bb98",
+                "reference": "db92f1b1987b12b13f248fe76c3a52cadb67bb98",
                 "shasum": ""
             },
             "require": {
-                "paragonie/constant_time_encoding": "^1|^2",
+                "paragonie/constant_time_encoding": "^1|^2|^3",
                 "paragonie/random_compat": "^1.4|^2.0|^9.99.99",
                 "php": ">=5.6.1"
             },
@@ -952,7 +706,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpseclib/phpseclib/issues",
-                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.33"
+                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.42"
             },
             "funding": [
                 {
@@ -968,25 +722,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-10-21T14:00:39+00:00"
+            "time": "2024-09-16T03:06:04+00:00"
         },
         {
             "name": "psr/http-client",
-            "version": "1.0.1",
+            "version": "1.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/http-client.git",
-                "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621"
+                "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
-                "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
+                "url": "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90",
+                "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.0 || ^8.0",
-                "psr/http-message": "^1.0"
+                "psr/http-message": "^1.0 || ^2.0"
             },
             "type": "library",
             "extra": {
@@ -1006,7 +760,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common interface for HTTP clients",
@@ -1018,27 +772,27 @@
                 "psr-18"
             ],
             "support": {
-                "source": "https://github.com/php-fig/http-client/tree/master"
+                "source": "https://github.com/php-fig/http-client"
             },
-            "time": "2020-06-29T06:28:15+00:00"
+            "time": "2023-09-23T14:17:50+00:00"
         },
         {
             "name": "psr/http-factory",
-            "version": "1.0.1",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/http-factory.git",
-                "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be"
+                "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
-                "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
+                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
+                "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0.0",
-                "psr/http-message": "^1.0"
+                "php": ">=7.1",
+                "psr/http-message": "^1.0 || ^2.0"
             },
             "type": "library",
             "extra": {
@@ -1058,10 +812,10 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
-            "description": "Common interfaces for PSR-7 HTTP message factories",
+            "description": "PSR-17: Common interfaces for PSR-7 HTTP message factories",
             "keywords": [
                 "factory",
                 "http",
@@ -1073,31 +827,31 @@
                 "response"
             ],
             "support": {
-                "source": "https://github.com/php-fig/http-factory/tree/master"
+                "source": "https://github.com/php-fig/http-factory"
             },
-            "time": "2019-04-30T12:38:16+00:00"
+            "time": "2024-04-15T12:06:14+00:00"
         },
         {
             "name": "psr/http-message",
-            "version": "1.0.1",
+            "version": "2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/http-message.git",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
+                "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71",
+                "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": "^7.2 || ^8.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "2.0.x-dev"
                 }
             },
             "autoload": {
@@ -1112,7 +866,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common interface for HTTP messages",
@@ -1126,31 +880,31 @@
                 "response"
             ],
             "support": {
-                "source": "https://github.com/php-fig/http-message/tree/master"
+                "source": "https://github.com/php-fig/http-message/tree/2.0"
             },
-            "time": "2016-08-06T14:39:51+00:00"
+            "time": "2023-04-04T09:54:51+00:00"
         },
         {
             "name": "psr/simple-cache",
-            "version": "1.0.1",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/simple-cache.git",
-                "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b"
+                "reference": "764e0b3939f5ca87cb904f570ef9be2d78a07865"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
-                "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
+                "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/764e0b3939f5ca87cb904f570ef9be2d78a07865",
+                "reference": "764e0b3939f5ca87cb904f570ef9be2d78a07865",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": ">=8.0.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "3.0.x-dev"
                 }
             },
             "autoload": {
@@ -1165,7 +919,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common interfaces for simple caching",
@@ -1177,98 +931,18 @@
                 "simple-cache"
             ],
             "support": {
-                "source": "https://github.com/php-fig/simple-cache/tree/master"
-            },
-            "time": "2017-10-23T01:57:42+00:00"
-        },
-        {
-            "name": "symfony/polyfill-mbstring",
-            "version": "v1.23.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2df51500adbaebdc4c38dea4c89a2e131c45c8a1",
-                "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "suggest": {
-                "ext-mbstring": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for the Mbstring extension",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "mbstring",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.0"
+                "source": "https://github.com/php-fig/simple-cache/tree/3.0.0"
             },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2021-05-27T09:27:20+00:00"
+            "time": "2021-10-29T13:26:27+00:00"
         }
     ],
     "packages-dev": [],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {},
     "prefer-stable": false,
     "prefer-lowest": false,
-    "platform": [],
-    "platform-dev": [],
-    "plugin-api-version": "2.2.0"
+    "platform": {},
+    "platform-dev": {},
+    "plugin-api-version": "2.6.0"
 }
diff --git a/config/symbbase.php b/config/symbbase.php
index c19d1bb577..a8380f535e 100644
--- a/config/symbbase.php
+++ b/config/symbbase.php
@@ -2,7 +2,7 @@
 header('X-Frame-Options: DENY');
 header('Cache-control: private'); // IE 6 FIX
 date_default_timezone_set('America/Phoenix');
-$CODE_VERSION = '3.1.3';
+$CODE_VERSION = '3.1.4';
 
 set_include_path(get_include_path() . PATH_SEPARATOR . $SERVER_ROOT . PATH_SEPARATOR . $SERVER_ROOT.'/config/' . PATH_SEPARATOR . $SERVER_ROOT.'/classes/');
 
diff --git a/content/lang/collections/editor/includes/resourcetab.en.php b/content/lang/collections/editor/includes/resourcetab.en.php
index bc9b8af644..21e50c7715 100644
--- a/content/lang/collections/editor/includes/resourcetab.en.php
+++ b/content/lang/collections/editor/includes/resourcetab.en.php
@@ -7,8 +7,9 @@
 
 $LANG['NO_RESULTS'] = 'No results returned';
 $LANG['ERROR_UNABLE_RESULTS'] = 'ERROR: Unable to get results';
-$LANG['DEFINE_REL'] = 'Relationship needs to be defined';
-$LANG['REL_NOT_DEFINED'] = 'Related occurrence is not defined!';
+$LANG['SELECT_INTERNAL_REL'] = 'You need to search for an select an internal occurrence instance';
+$LANG['VERB_SCINAME_EMPTY'] = 'Verbatim Scientific Name needs a value';
+$LANG['RESOURCE_EMPTY'] = 'Resource URL needs needs a value';
 $LANG['SELECT_CHECKLIST'] = 'Select a checklist to which you want to link the voucher';
 $LANG['VOUCHER_CANNOT_LINK'] = 'Voucher cannot be linked to a checklist until the taxonomic name has been resolved (e.g. name not linked to taxonomic thesaurus';
 $LANG['SURE_UNLINK'] = 'Are you sure you want to unlink the record as a duplicate?';
diff --git a/content/lang/collections/editor/includes/resourcetab.es.php b/content/lang/collections/editor/includes/resourcetab.es.php
index af0c9ebdc1..698ae29dd4 100644
--- a/content/lang/collections/editor/includes/resourcetab.es.php
+++ b/content/lang/collections/editor/includes/resourcetab.es.php
@@ -2,15 +2,14 @@
 /*
 ------------------
 Language: Español (Spanish)
-Translated by: Samanta Orellana
-Date Translated: 2021-10-29
+Translated by: Samanta Orellana (2021-10-29)
 ------------------
 */
-
 $LANG['NO_RESULTS'] = 'Sin resultados';
 $LANG['ERROR_UNABLE_RESULTS'] = 'ERROR: No fue posible obtener resultados';
-$LANG['DEFINE_REL'] = 'Relaciones necesitan ser definidas';
-$LANG['REL_NOT_DEFINED'] = '¡Ocurrencia relacionada no está definida!';
+$LANG['SELECT_INTERNAL_REL'] = 'Debe buscar y seleccionar una instancia de ocurrencia interna';
+$LANG['VERB_SCINAME_EMPTY'] = 'Nombre Científico Literal necesita un valor';
+$LANG['RESOURCE_EMPTY'] = 'URL del Recurso necesita un valor';
 $LANG['SELECT_CHECKLIST'] = 'Seleccionar un listado de especies al que quiera enlazar el voucher';
 $LANG['VOUCHER_CANNOT_LINK'] = 'El voucher no puede ser vinculado a un listado de especies hasta que el nombre taxonómico haya sido resuelto (e.g. nombre no vinculado al tesauro taxonómico';
 $LANG['SURE_UNLINK'] = '¿Está seguro que quiere desvincular el registro como duplicado?';
diff --git a/content/lang/collections/editor/includes/resourcetab.fr.php b/content/lang/collections/editor/includes/resourcetab.fr.php
index 7e58dfe1ef..d0c3b0498e 100644
--- a/content/lang/collections/editor/includes/resourcetab.fr.php
+++ b/content/lang/collections/editor/includes/resourcetab.fr.php
@@ -7,8 +7,9 @@
 
 $LANG['NO_RESULTS'] = 'Aucun résultat renvoyé';
 $LANG['ERROR_UNABLE_RESULTS'] ="'ERREUR: Impossible d'obtenir résultats";
-$LANG['DEFINE_REL'] = 'Relation doit être définie';
-$LANG['REL_NOT_DEFINED'] = "Occurrence associée n'est pas définie!";
+$LANG['SELECT_INTERNAL_REL'] = "Vous devez rechercher et sélectionner une instance d'occurrence interne";
+$LANG['VERB_SCINAME_EMPTY'] = 'Le nom scientifique verbatim nécessite une valeur';
+$LANG['RESOURCE_EMPTY'] = "L'URL de la ressource a besoin d'une valeur";
 $LANG['SELECT_CHECKLIST'] = 'Sélectionnez une liste à laquelle vous souhaitez lier le échantillon';
 $LANG['VOUCHER_CANNOT_LINK'] = "Le échantillon ne peut pas être lié à une liste tant que le nom taxonomique n'a pas été résolu (par exemple, le nom n'est pas lié au thésaurus taxonomique";
 $LANG['SURE_UNLINK'] = 'Voulez-vous vraiment dissocier enregistrement en tant que doublon?';
diff --git a/docs/INSTALL.md b/docs/INSTALL.md
index 7b0491ce33..b8fef0e38f 100644
--- a/docs/INSTALL.md
+++ b/docs/INSTALL.md
@@ -8,7 +8,7 @@
   - Recommended configuration adjustments: upload_max_filesize = 100M (or expected file size upload), max_input_vars = 2000, memory_limit = 256M, post_max_size = 100M
   - Optional: Pear package Image_Barcode2 (https://pear.php.net/package/Image_Barcode2) – enables barcodes on specimen labels
   - Optional: Install Pear Mail for SMTP mail support: https://pear.php.net/package/Mail/redirected
-- MariaDB (v10.3+) Development and testing performed using MariaDB. If you are using Oracle MySQL instead, please [report any issues](https://github.com/BioKIC/Symbiota/issues/new).
+- MariaDB (v10.3+) or MySQL (v8.0+) - Development and testing performed using MariaDB. If you are using Oracle MySQL instead, please [report any issues](https://github.com/BioKIC/Symbiota/issues/new).
 - GIT Client - not required, though recommend for installation and updating source code
 
 ## INSTRUCTIONS
diff --git a/vendor/autoload.php b/vendor/autoload.php
index 2999b212d1..8015e0b382 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -2,6 +2,24 @@
 
 // autoload.php @generated by Composer
 
+if (PHP_VERSION_ID < 50600) {
+    if (!headers_sent()) {
+        header('HTTP/1.1 500 Internal Server Error');
+    }
+    $err = 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    if (!ini_get('display_errors')) {
+        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
+            fwrite(STDERR, $err);
+        } elseif (!headers_sent()) {
+            echo $err;
+        }
+    }
+    trigger_error(
+        $err,
+        E_USER_ERROR
+    );
+}
+
 require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInit61c5b8c463cdaa6cee3bdb4483ab7dbb::getLoader();
diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php
index afef3fa2ad..7824d8f7ea 100644
--- a/vendor/composer/ClassLoader.php
+++ b/vendor/composer/ClassLoader.php
@@ -42,35 +42,37 @@
  */
 class ClassLoader
 {
-    /** @var ?string */
+    /** @var \Closure(string):void */
+    private static $includeFile;
+
+    /** @var string|null */
     private $vendorDir;
 
     // PSR-4
     /**
-     * @var array[]
-     * @psalm-var array<string, array<string, int>>
+     * @var array<string, array<string, int>>
      */
     private $prefixLengthsPsr4 = array();
     /**
-     * @var array[]
-     * @psalm-var array<string, array<int, string>>
+     * @var array<string, list<string>>
      */
     private $prefixDirsPsr4 = array();
     /**
-     * @var array[]
-     * @psalm-var array<string, string>
+     * @var list<string>
      */
     private $fallbackDirsPsr4 = array();
 
     // PSR-0
     /**
-     * @var array[]
-     * @psalm-var array<string, array<string, string[]>>
+     * List of PSR-0 prefixes
+     *
+     * Structured as array('F (first letter)' => array('Foo\Bar (full prefix)' => array('path', 'path2')))
+     *
+     * @var array<string, array<string, list<string>>>
      */
     private $prefixesPsr0 = array();
     /**
-     * @var array[]
-     * @psalm-var array<string, string>
+     * @var list<string>
      */
     private $fallbackDirsPsr0 = array();
 
@@ -78,8 +80,7 @@ class ClassLoader
     private $useIncludePath = false;
 
     /**
-     * @var string[]
-     * @psalm-var array<string, string>
+     * @var array<string, string>
      */
     private $classMap = array();
 
@@ -87,29 +88,29 @@ class ClassLoader
     private $classMapAuthoritative = false;
 
     /**
-     * @var bool[]
-     * @psalm-var array<string, bool>
+     * @var array<string, bool>
      */
     private $missingClasses = array();
 
-    /** @var ?string */
+    /** @var string|null */
     private $apcuPrefix;
 
     /**
-     * @var self[]
+     * @var array<string, self>
      */
     private static $registeredLoaders = array();
 
     /**
-     * @param ?string $vendorDir
+     * @param string|null $vendorDir
      */
     public function __construct($vendorDir = null)
     {
         $this->vendorDir = $vendorDir;
+        self::initializeIncludeClosure();
     }
 
     /**
-     * @return string[]
+     * @return array<string, list<string>>
      */
     public function getPrefixes()
     {
@@ -121,8 +122,7 @@ public function getPrefixes()
     }
 
     /**
-     * @return array[]
-     * @psalm-return array<string, array<int, string>>
+     * @return array<string, list<string>>
      */
     public function getPrefixesPsr4()
     {
@@ -130,8 +130,7 @@ public function getPrefixesPsr4()
     }
 
     /**
-     * @return array[]
-     * @psalm-return array<string, string>
+     * @return list<string>
      */
     public function getFallbackDirs()
     {
@@ -139,8 +138,7 @@ public function getFallbackDirs()
     }
 
     /**
-     * @return array[]
-     * @psalm-return array<string, string>
+     * @return list<string>
      */
     public function getFallbackDirsPsr4()
     {
@@ -148,8 +146,7 @@ public function getFallbackDirsPsr4()
     }
 
     /**
-     * @return string[] Array of classname => path
-     * @psalm-return array<string, string>
+     * @return array<string, string> Array of classname => path
      */
     public function getClassMap()
     {
@@ -157,8 +154,7 @@ public function getClassMap()
     }
 
     /**
-     * @param string[] $classMap Class to filename map
-     * @psalm-param array<string, string> $classMap
+     * @param array<string, string> $classMap Class to filename map
      *
      * @return void
      */
@@ -175,24 +171,25 @@ public function addClassMap(array $classMap)
      * Registers a set of PSR-0 directories for a given prefix, either
      * appending or prepending to the ones previously set for this prefix.
      *
-     * @param string          $prefix  The prefix
-     * @param string[]|string $paths   The PSR-0 root directories
-     * @param bool            $prepend Whether to prepend the directories
+     * @param string              $prefix  The prefix
+     * @param list<string>|string $paths   The PSR-0 root directories
+     * @param bool                $prepend Whether to prepend the directories
      *
      * @return void
      */
     public function add($prefix, $paths, $prepend = false)
     {
+        $paths = (array) $paths;
         if (!$prefix) {
             if ($prepend) {
                 $this->fallbackDirsPsr0 = array_merge(
-                    (array) $paths,
+                    $paths,
                     $this->fallbackDirsPsr0
                 );
             } else {
                 $this->fallbackDirsPsr0 = array_merge(
                     $this->fallbackDirsPsr0,
-                    (array) $paths
+                    $paths
                 );
             }
 
@@ -201,19 +198,19 @@ public function add($prefix, $paths, $prepend = false)
 
         $first = $prefix[0];
         if (!isset($this->prefixesPsr0[$first][$prefix])) {
-            $this->prefixesPsr0[$first][$prefix] = (array) $paths;
+            $this->prefixesPsr0[$first][$prefix] = $paths;
 
             return;
         }
         if ($prepend) {
             $this->prefixesPsr0[$first][$prefix] = array_merge(
-                (array) $paths,
+                $paths,
                 $this->prefixesPsr0[$first][$prefix]
             );
         } else {
             $this->prefixesPsr0[$first][$prefix] = array_merge(
                 $this->prefixesPsr0[$first][$prefix],
-                (array) $paths
+                $paths
             );
         }
     }
@@ -222,9 +219,9 @@ public function add($prefix, $paths, $prepend = false)
      * Registers a set of PSR-4 directories for a given namespace, either
      * appending or prepending to the ones previously set for this namespace.
      *
-     * @param string          $prefix  The prefix/namespace, with trailing '\\'
-     * @param string[]|string $paths   The PSR-4 base directories
-     * @param bool            $prepend Whether to prepend the directories
+     * @param string              $prefix  The prefix/namespace, with trailing '\\'
+     * @param list<string>|string $paths   The PSR-4 base directories
+     * @param bool                $prepend Whether to prepend the directories
      *
      * @throws \InvalidArgumentException
      *
@@ -232,17 +229,18 @@ public function add($prefix, $paths, $prepend = false)
      */
     public function addPsr4($prefix, $paths, $prepend = false)
     {
+        $paths = (array) $paths;
         if (!$prefix) {
             // Register directories for the root namespace.
             if ($prepend) {
                 $this->fallbackDirsPsr4 = array_merge(
-                    (array) $paths,
+                    $paths,
                     $this->fallbackDirsPsr4
                 );
             } else {
                 $this->fallbackDirsPsr4 = array_merge(
                     $this->fallbackDirsPsr4,
-                    (array) $paths
+                    $paths
                 );
             }
         } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
@@ -252,18 +250,18 @@ public function addPsr4($prefix, $paths, $prepend = false)
                 throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
             }
             $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
-            $this->prefixDirsPsr4[$prefix] = (array) $paths;
+            $this->prefixDirsPsr4[$prefix] = $paths;
         } elseif ($prepend) {
             // Prepend directories for an already registered namespace.
             $this->prefixDirsPsr4[$prefix] = array_merge(
-                (array) $paths,
+                $paths,
                 $this->prefixDirsPsr4[$prefix]
             );
         } else {
             // Append directories for an already registered namespace.
             $this->prefixDirsPsr4[$prefix] = array_merge(
                 $this->prefixDirsPsr4[$prefix],
-                (array) $paths
+                $paths
             );
         }
     }
@@ -272,8 +270,8 @@ public function addPsr4($prefix, $paths, $prepend = false)
      * Registers a set of PSR-0 directories for a given prefix,
      * replacing any others previously set for this prefix.
      *
-     * @param string          $prefix The prefix
-     * @param string[]|string $paths  The PSR-0 base directories
+     * @param string              $prefix The prefix
+     * @param list<string>|string $paths  The PSR-0 base directories
      *
      * @return void
      */
@@ -290,8 +288,8 @@ public function set($prefix, $paths)
      * Registers a set of PSR-4 directories for a given namespace,
      * replacing any others previously set for this namespace.
      *
-     * @param string          $prefix The prefix/namespace, with trailing '\\'
-     * @param string[]|string $paths  The PSR-4 base directories
+     * @param string              $prefix The prefix/namespace, with trailing '\\'
+     * @param list<string>|string $paths  The PSR-4 base directories
      *
      * @throws \InvalidArgumentException
      *
@@ -425,7 +423,8 @@ public function unregister()
     public function loadClass($class)
     {
         if ($file = $this->findFile($class)) {
-            includeFile($file);
+            $includeFile = self::$includeFile;
+            $includeFile($file);
 
             return true;
         }
@@ -476,9 +475,9 @@ public function findFile($class)
     }
 
     /**
-     * Returns the currently registered loaders indexed by their corresponding vendor directories.
+     * Returns the currently registered loaders keyed by their corresponding vendor directories.
      *
-     * @return self[]
+     * @return array<string, self>
      */
     public static function getRegisteredLoaders()
     {
@@ -555,18 +554,26 @@ private function findFileWithExtension($class, $ext)
 
         return false;
     }
-}
 
-/**
- * Scope isolated include.
- *
- * Prevents access to $this/self from included files.
- *
- * @param  string $file
- * @return void
- * @private
- */
-function includeFile($file)
-{
-    include $file;
+    /**
+     * @return void
+     */
+    private static function initializeIncludeClosure()
+    {
+        if (self::$includeFile !== null) {
+            return;
+        }
+
+        /**
+         * Scope isolated include.
+         *
+         * Prevents access to $this/self from included files.
+         *
+         * @param  string $file
+         * @return void
+         */
+        self::$includeFile = \Closure::bind(static function($file) {
+            include $file;
+        }, null, null);
+    }
 }
diff --git a/vendor/composer/InstalledVersions.php b/vendor/composer/InstalledVersions.php
index d50e0c9fcc..51e734a774 100644
--- a/vendor/composer/InstalledVersions.php
+++ b/vendor/composer/InstalledVersions.php
@@ -21,12 +21,14 @@
  * See also https://getcomposer.org/doc/07-runtime.md#installed-versions
  *
  * To require its presence, you can require `composer-runtime-api ^2.0`
+ *
+ * @final
  */
 class InstalledVersions
 {
     /**
      * @var mixed[]|null
-     * @psalm-var array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}|array{}|null
+     * @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}|array{}|null
      */
     private static $installed;
 
@@ -37,7 +39,7 @@ class InstalledVersions
 
     /**
      * @var array[]
-     * @psalm-var array<string, array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
+     * @psalm-var array<string, array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
      */
     private static $installedByVendor = array();
 
@@ -96,7 +98,7 @@ public static function isInstalled($packageName, $includeDevRequirements = true)
     {
         foreach (self::getInstalled() as $installed) {
             if (isset($installed['versions'][$packageName])) {
-                return $includeDevRequirements || empty($installed['versions'][$packageName]['dev_requirement']);
+                return $includeDevRequirements || !isset($installed['versions'][$packageName]['dev_requirement']) || $installed['versions'][$packageName]['dev_requirement'] === false;
             }
         }
 
@@ -117,7 +119,7 @@ public static function isInstalled($packageName, $includeDevRequirements = true)
      */
     public static function satisfies(VersionParser $parser, $packageName, $constraint)
     {
-        $constraint = $parser->parseConstraints($constraint);
+        $constraint = $parser->parseConstraints((string) $constraint);
         $provided = $parser->parseConstraints(self::getVersionRanges($packageName));
 
         return $provided->matches($constraint);
@@ -241,7 +243,7 @@ public static function getInstallPath($packageName)
 
     /**
      * @return array
-     * @psalm-return array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}
+     * @psalm-return array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}
      */
     public static function getRootPackage()
     {
@@ -255,7 +257,7 @@ public static function getRootPackage()
      *
      * @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect.
      * @return array[]
-     * @psalm-return array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}
+     * @psalm-return array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}
      */
     public static function getRawData()
     {
@@ -278,7 +280,7 @@ public static function getRawData()
      * Returns the raw data of all installed.php which are currently loaded for custom implementations
      *
      * @return array[]
-     * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
+     * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
      */
     public static function getAllRawData()
     {
@@ -301,7 +303,7 @@ public static function getAllRawData()
      * @param  array[] $data A vendor/composer/installed.php data set
      * @return void
      *
-     * @psalm-param array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>} $data
+     * @psalm-param array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $data
      */
     public static function reload($data)
     {
@@ -311,7 +313,7 @@ public static function reload($data)
 
     /**
      * @return array[]
-     * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
+     * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
      */
     private static function getInstalled()
     {
@@ -326,7 +328,9 @@ private static function getInstalled()
                 if (isset(self::$installedByVendor[$vendorDir])) {
                     $installed[] = self::$installedByVendor[$vendorDir];
                 } elseif (is_file($vendorDir.'/composer/installed.php')) {
-                    $installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php';
+                    /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
+                    $required = require $vendorDir.'/composer/installed.php';
+                    $installed[] = self::$installedByVendor[$vendorDir] = $required;
                     if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
                         self::$installed = $installed[count($installed) - 1];
                     }
@@ -338,12 +342,17 @@ private static function getInstalled()
             // only require the installed.php file if this file is loaded from its dumped location,
             // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
             if (substr(__DIR__, -8, 1) !== 'C') {
-                self::$installed = require __DIR__ . '/installed.php';
+                /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
+                $required = require __DIR__ . '/installed.php';
+                self::$installed = $required;
             } else {
                 self::$installed = array();
             }
         }
-        $installed[] = self::$installed;
+
+        if (self::$installed !== array()) {
+            $installed[] = self::$installed;
+        }
 
         return $installed;
     }
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index 122c39cfd8..d3bfaaf817 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -2,7 +2,7 @@
 
 // autoload_classmap.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(
diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php
index cb7c5ff813..eec29ec9d8 100644
--- a/vendor/composer/autoload_files.php
+++ b/vendor/composer/autoload_files.php
@@ -2,70 +2,9 @@
 
 // autoload_files.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(
-    '7e9bd612cc444b3eed788ebbe46263a0' => $vendorDir . '/laminas/laminas-zendframework-bridge/src/autoload.php',
-    '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
-    '2cffec82183ee1cea088009cef9a6fc3' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier.composer.php',
-    'abede361264e2ae69ec1eee813a101af' => $vendorDir . '/markbaker/complex/classes/src/functions/abs.php',
-    '21a5860fbef5be28db5ddfbc3cca67c4' => $vendorDir . '/markbaker/complex/classes/src/functions/acos.php',
-    '1546e3f9d127f2a9bb2d1b6c31c26ef1' => $vendorDir . '/markbaker/complex/classes/src/functions/acosh.php',
-    'd2516f7f4fba5ea5905f494b4a8262e0' => $vendorDir . '/markbaker/complex/classes/src/functions/acot.php',
-    '4511163d560956219b96882c0980b65e' => $vendorDir . '/markbaker/complex/classes/src/functions/acoth.php',
-    'c361f5616dc2a8da4fa3e137077cd4ea' => $vendorDir . '/markbaker/complex/classes/src/functions/acsc.php',
-    '02d68920fc98da71991ce569c91df0f6' => $vendorDir . '/markbaker/complex/classes/src/functions/acsch.php',
-    '88e19525eae308b4a6aa3419364875d3' => $vendorDir . '/markbaker/complex/classes/src/functions/argument.php',
-    '60e8e2d0827b58bfc904f13957e51849' => $vendorDir . '/markbaker/complex/classes/src/functions/asec.php',
-    '13d2f040713999eab66c359b4d79871d' => $vendorDir . '/markbaker/complex/classes/src/functions/asech.php',
-    '838ab38beb32c68a79d3cd2c007d5a04' => $vendorDir . '/markbaker/complex/classes/src/functions/asin.php',
-    'bb28eccd0f8f008333a1b3c163d604ac' => $vendorDir . '/markbaker/complex/classes/src/functions/asinh.php',
-    '9e483de83558c98f7d3feaa402c78cb3' => $vendorDir . '/markbaker/complex/classes/src/functions/atan.php',
-    '36b74b5b765ded91ee58c8ee3c0e85e3' => $vendorDir . '/markbaker/complex/classes/src/functions/atanh.php',
-    '05c15ee9510da7fd6bf6136f436500c0' => $vendorDir . '/markbaker/complex/classes/src/functions/conjugate.php',
-    'd3208dfbce2505e370788f9f22f6785f' => $vendorDir . '/markbaker/complex/classes/src/functions/cos.php',
-    '141cf1fb3a3046f8b64534b0ebab33ca' => $vendorDir . '/markbaker/complex/classes/src/functions/cosh.php',
-    'be660df75fd0dbe7fa7c03b7434b3294' => $vendorDir . '/markbaker/complex/classes/src/functions/cot.php',
-    '01e31ea298a51bc9e91517e3ce6b9e76' => $vendorDir . '/markbaker/complex/classes/src/functions/coth.php',
-    '803ddd97f7b1da68982a7b087c3476f6' => $vendorDir . '/markbaker/complex/classes/src/functions/csc.php',
-    '3001cdfd101ec3c32da34ee43c2e149b' => $vendorDir . '/markbaker/complex/classes/src/functions/csch.php',
-    '77b2d7629ef2a93fabb8c56754a91051' => $vendorDir . '/markbaker/complex/classes/src/functions/exp.php',
-    '4a4471296dec796c21d4f4b6552396a9' => $vendorDir . '/markbaker/complex/classes/src/functions/inverse.php',
-    'c3e9897e1744b88deb56fcdc39d34d85' => $vendorDir . '/markbaker/complex/classes/src/functions/ln.php',
-    'a83cacf2de942cff288de15a83afd26d' => $vendorDir . '/markbaker/complex/classes/src/functions/log2.php',
-    '6a861dacc9ee2f3061241d4c7772fa21' => $vendorDir . '/markbaker/complex/classes/src/functions/log10.php',
-    '4d2522d968c8ba78d6c13548a1b4200e' => $vendorDir . '/markbaker/complex/classes/src/functions/negative.php',
-    'fd587ca933fc0447fa5ab4843bdd97f7' => $vendorDir . '/markbaker/complex/classes/src/functions/pow.php',
-    '383ef01c62028fc78cd4388082fce3c2' => $vendorDir . '/markbaker/complex/classes/src/functions/rho.php',
-    '150fbd1b95029dc47292da97ecab9375' => $vendorDir . '/markbaker/complex/classes/src/functions/sec.php',
-    '549abd9bae174286d660bdaa07407c68' => $vendorDir . '/markbaker/complex/classes/src/functions/sech.php',
-    '6bfbf5eaea6b17a0ed85cb21ba80370c' => $vendorDir . '/markbaker/complex/classes/src/functions/sin.php',
-    '22efe13f1a497b8e199540ae2d9dc59c' => $vendorDir . '/markbaker/complex/classes/src/functions/sinh.php',
-    'e90135ab8e787795a509ed7147de207d' => $vendorDir . '/markbaker/complex/classes/src/functions/sqrt.php',
-    'bb0a7923ffc6a90919cd64ec54ff06bc' => $vendorDir . '/markbaker/complex/classes/src/functions/tan.php',
-    '2d302f32ce0fd4e433dd91c5bb404a28' => $vendorDir . '/markbaker/complex/classes/src/functions/tanh.php',
-    '24dd4658a952171a4ee79218c4f9fd06' => $vendorDir . '/markbaker/complex/classes/src/functions/theta.php',
-    'e49b7876281d6f5bc39536dde96d1f4a' => $vendorDir . '/markbaker/complex/classes/src/operations/add.php',
-    '47596e02b43cd6da7700134fd08f88cf' => $vendorDir . '/markbaker/complex/classes/src/operations/subtract.php',
-    '883af48563631547925fa4c3b48ead07' => $vendorDir . '/markbaker/complex/classes/src/operations/multiply.php',
-    'f190e3308e6ca23234a2875edc985c03' => $vendorDir . '/markbaker/complex/classes/src/operations/divideby.php',
-    'ac9e33ce6841aa5bf5d16d465a2f03a7' => $vendorDir . '/markbaker/complex/classes/src/operations/divideinto.php',
-    '3af723442581d6c310bf44543f9f5c60' => $vendorDir . '/markbaker/matrix/classes/src/Functions/adjoint.php',
-    'd803221834c8b57fec95debb5406a797' => $vendorDir . '/markbaker/matrix/classes/src/Functions/antidiagonal.php',
-    '4714cafbd3be4c72c274a25eae9396bb' => $vendorDir . '/markbaker/matrix/classes/src/Functions/cofactors.php',
-    '89719dc7c77436609d1c1c31f0797b8f' => $vendorDir . '/markbaker/matrix/classes/src/Functions/determinant.php',
-    'c28af79ec7730859d83f2d4310b8dd0b' => $vendorDir . '/markbaker/matrix/classes/src/Functions/diagonal.php',
-    'c5d82bf1ac485e445f911e55789ab4e6' => $vendorDir . '/markbaker/matrix/classes/src/Functions/identity.php',
-    '0d2d594de24a247f7a33499e933aa21e' => $vendorDir . '/markbaker/matrix/classes/src/Functions/inverse.php',
-    'f37c25880804a014ef40c8bffbab1b10' => $vendorDir . '/markbaker/matrix/classes/src/Functions/minors.php',
-    'd6e4e42171df0dbea253b3067fefda38' => $vendorDir . '/markbaker/matrix/classes/src/Functions/trace.php',
-    '2c9b19fa954fd3e6fcc7e7a1383caddd' => $vendorDir . '/markbaker/matrix/classes/src/Functions/transpose.php',
-    '0a538fc9b897450ec362480ebbebe94f' => $vendorDir . '/markbaker/matrix/classes/src/Operations/add.php',
-    'f0843f7f4089ec2343c7445544356385' => $vendorDir . '/markbaker/matrix/classes/src/Operations/directsum.php',
-    'ad3e8c29aa16d134661a414265677b61' => $vendorDir . '/markbaker/matrix/classes/src/Operations/subtract.php',
-    '8d37dad4703fab45bfec9dd0bbf3278e' => $vendorDir . '/markbaker/matrix/classes/src/Operations/multiply.php',
-    '4888a6f58c08148ebe17682f9ce9b2a8' => $vendorDir . '/markbaker/matrix/classes/src/Operations/divideby.php',
-    'eef6fa3879d3efa347cd24d5eb348f85' => $vendorDir . '/markbaker/matrix/classes/src/Operations/divideinto.php',
     'decc78cc4436b1292c6c0d151b19445c' => $vendorDir . '/phpseclib/phpseclib/phpseclib/bootstrap.php',
 );
diff --git a/vendor/composer/autoload_namespaces.php b/vendor/composer/autoload_namespaces.php
index 1ee7a397c2..15a2ff3ad6 100644
--- a/vendor/composer/autoload_namespaces.php
+++ b/vendor/composer/autoload_namespaces.php
@@ -2,9 +2,8 @@
 
 // autoload_namespaces.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(
-    'HTMLPurifier' => array($vendorDir . '/ezyang/htmlpurifier/library'),
 );
diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php
index c57d9df19c..b55d4e65a2 100644
--- a/vendor/composer/autoload_psr4.php
+++ b/vendor/composer/autoload_psr4.php
@@ -2,22 +2,19 @@
 
 // autoload_psr4.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(
     'phpseclib3\\' => array($vendorDir . '/phpseclib/phpseclib/phpseclib'),
     'ZipStream\\' => array($vendorDir . '/maennchen/zipstream-php/src'),
-    'Symfony\\Polyfill\\Mbstring\\' => array($vendorDir . '/symfony/polyfill-mbstring'),
     'Psr\\SimpleCache\\' => array($vendorDir . '/psr/simple-cache/src'),
     'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-factory/src', $vendorDir . '/psr/http-message/src'),
     'Psr\\Http\\Client\\' => array($vendorDir . '/psr/http-client/src'),
     'PhpOffice\\PhpWord\\' => array($vendorDir . '/phpoffice/phpword/src/PhpWord'),
     'PhpOffice\\PhpSpreadsheet\\' => array($vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet'),
+    'PhpOffice\\Math\\' => array($vendorDir . '/phpoffice/math/src/Math'),
     'ParagonIE\\ConstantTime\\' => array($vendorDir . '/paragonie/constant_time_encoding/src'),
-    'MyCLabs\\Enum\\' => array($vendorDir . '/myclabs/php-enum/src'),
     'Matrix\\' => array($vendorDir . '/markbaker/matrix/classes/src'),
-    'Laminas\\ZendFrameworkBridge\\' => array($vendorDir . '/laminas/laminas-zendframework-bridge/src'),
-    'Laminas\\Escaper\\' => array($vendorDir . '/laminas/laminas-escaper/src'),
     'Complex\\' => array($vendorDir . '/markbaker/complex/classes/src'),
 );
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index 0ee17f1353..259d881201 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -25,56 +25,26 @@ public static function getLoader()
         require __DIR__ . '/platform_check.php';
 
         spl_autoload_register(array('ComposerAutoloaderInit61c5b8c463cdaa6cee3bdb4483ab7dbb', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
         spl_autoload_unregister(array('ComposerAutoloaderInit61c5b8c463cdaa6cee3bdb4483ab7dbb', 'loadClassLoader'));
 
-        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
-        if ($useStaticLoader) {
-            require __DIR__ . '/autoload_static.php';
+        require __DIR__ . '/autoload_static.php';
+        call_user_func(\Composer\Autoload\ComposerStaticInit61c5b8c463cdaa6cee3bdb4483ab7dbb::getInitializer($loader));
 
-            call_user_func(\Composer\Autoload\ComposerStaticInit61c5b8c463cdaa6cee3bdb4483ab7dbb::getInitializer($loader));
-        } else {
-            $map = require __DIR__ . '/autoload_namespaces.php';
-            foreach ($map as $namespace => $path) {
-                $loader->set($namespace, $path);
-            }
+        $loader->register(true);
 
-            $map = require __DIR__ . '/autoload_psr4.php';
-            foreach ($map as $namespace => $path) {
-                $loader->setPsr4($namespace, $path);
-            }
+        $filesToLoad = \Composer\Autoload\ComposerStaticInit61c5b8c463cdaa6cee3bdb4483ab7dbb::$files;
+        $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
+            if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
+                $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
 
-            $classMap = require __DIR__ . '/autoload_classmap.php';
-            if ($classMap) {
-                $loader->addClassMap($classMap);
+                require $file;
             }
-        }
-
-        $loader->register(true);
-
-        if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInit61c5b8c463cdaa6cee3bdb4483ab7dbb::$files;
-        } else {
-            $includeFiles = require __DIR__ . '/autoload_files.php';
-        }
-        foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire61c5b8c463cdaa6cee3bdb4483ab7dbb($fileIdentifier, $file);
+        }, null, null);
+        foreach ($filesToLoad as $fileIdentifier => $file) {
+            $requireFile($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
-
-/**
- * @param string $fileIdentifier
- * @param string $file
- * @return void
- */
-function composerRequire61c5b8c463cdaa6cee3bdb4483ab7dbb($fileIdentifier, $file)
-{
-    if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
-        $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
-
-        require $file;
-    }
-}
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index f3e7f3d2a1..1465cb8663 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -7,67 +7,6 @@
 class ComposerStaticInit61c5b8c463cdaa6cee3bdb4483ab7dbb
 {
     public static $files = array (
-        '7e9bd612cc444b3eed788ebbe46263a0' => __DIR__ . '/..' . '/laminas/laminas-zendframework-bridge/src/autoload.php',
-        '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
-        '2cffec82183ee1cea088009cef9a6fc3' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier.composer.php',
-        'abede361264e2ae69ec1eee813a101af' => __DIR__ . '/..' . '/markbaker/complex/classes/src/functions/abs.php',
-        '21a5860fbef5be28db5ddfbc3cca67c4' => __DIR__ . '/..' . '/markbaker/complex/classes/src/functions/acos.php',
-        '1546e3f9d127f2a9bb2d1b6c31c26ef1' => __DIR__ . '/..' . '/markbaker/complex/classes/src/functions/acosh.php',
-        'd2516f7f4fba5ea5905f494b4a8262e0' => __DIR__ . '/..' . '/markbaker/complex/classes/src/functions/acot.php',
-        '4511163d560956219b96882c0980b65e' => __DIR__ . '/..' . '/markbaker/complex/classes/src/functions/acoth.php',
-        'c361f5616dc2a8da4fa3e137077cd4ea' => __DIR__ . '/..' . '/markbaker/complex/classes/src/functions/acsc.php',
-        '02d68920fc98da71991ce569c91df0f6' => __DIR__ . '/..' . '/markbaker/complex/classes/src/functions/acsch.php',
-        '88e19525eae308b4a6aa3419364875d3' => __DIR__ . '/..' . '/markbaker/complex/classes/src/functions/argument.php',
-        '60e8e2d0827b58bfc904f13957e51849' => __DIR__ . '/..' . '/markbaker/complex/classes/src/functions/asec.php',
-        '13d2f040713999eab66c359b4d79871d' => __DIR__ . '/..' . '/markbaker/complex/classes/src/functions/asech.php',
-        '838ab38beb32c68a79d3cd2c007d5a04' => __DIR__ . '/..' . '/markbaker/complex/classes/src/functions/asin.php',
-        'bb28eccd0f8f008333a1b3c163d604ac' => __DIR__ . '/..' . '/markbaker/complex/classes/src/functions/asinh.php',
-        '9e483de83558c98f7d3feaa402c78cb3' => __DIR__ . '/..' . '/markbaker/complex/classes/src/functions/atan.php',
-        '36b74b5b765ded91ee58c8ee3c0e85e3' => __DIR__ . '/..' . '/markbaker/complex/classes/src/functions/atanh.php',
-        '05c15ee9510da7fd6bf6136f436500c0' => __DIR__ . '/..' . '/markbaker/complex/classes/src/functions/conjugate.php',
-        'd3208dfbce2505e370788f9f22f6785f' => __DIR__ . '/..' . '/markbaker/complex/classes/src/functions/cos.php',
-        '141cf1fb3a3046f8b64534b0ebab33ca' => __DIR__ . '/..' . '/markbaker/complex/classes/src/functions/cosh.php',
-        'be660df75fd0dbe7fa7c03b7434b3294' => __DIR__ . '/..' . '/markbaker/complex/classes/src/functions/cot.php',
-        '01e31ea298a51bc9e91517e3ce6b9e76' => __DIR__ . '/..' . '/markbaker/complex/classes/src/functions/coth.php',
-        '803ddd97f7b1da68982a7b087c3476f6' => __DIR__ . '/..' . '/markbaker/complex/classes/src/functions/csc.php',
-        '3001cdfd101ec3c32da34ee43c2e149b' => __DIR__ . '/..' . '/markbaker/complex/classes/src/functions/csch.php',
-        '77b2d7629ef2a93fabb8c56754a91051' => __DIR__ . '/..' . '/markbaker/complex/classes/src/functions/exp.php',
-        '4a4471296dec796c21d4f4b6552396a9' => __DIR__ . '/..' . '/markbaker/complex/classes/src/functions/inverse.php',
-        'c3e9897e1744b88deb56fcdc39d34d85' => __DIR__ . '/..' . '/markbaker/complex/classes/src/functions/ln.php',
-        'a83cacf2de942cff288de15a83afd26d' => __DIR__ . '/..' . '/markbaker/complex/classes/src/functions/log2.php',
-        '6a861dacc9ee2f3061241d4c7772fa21' => __DIR__ . '/..' . '/markbaker/complex/classes/src/functions/log10.php',
-        '4d2522d968c8ba78d6c13548a1b4200e' => __DIR__ . '/..' . '/markbaker/complex/classes/src/functions/negative.php',
-        'fd587ca933fc0447fa5ab4843bdd97f7' => __DIR__ . '/..' . '/markbaker/complex/classes/src/functions/pow.php',
-        '383ef01c62028fc78cd4388082fce3c2' => __DIR__ . '/..' . '/markbaker/complex/classes/src/functions/rho.php',
-        '150fbd1b95029dc47292da97ecab9375' => __DIR__ . '/..' . '/markbaker/complex/classes/src/functions/sec.php',
-        '549abd9bae174286d660bdaa07407c68' => __DIR__ . '/..' . '/markbaker/complex/classes/src/functions/sech.php',
-        '6bfbf5eaea6b17a0ed85cb21ba80370c' => __DIR__ . '/..' . '/markbaker/complex/classes/src/functions/sin.php',
-        '22efe13f1a497b8e199540ae2d9dc59c' => __DIR__ . '/..' . '/markbaker/complex/classes/src/functions/sinh.php',
-        'e90135ab8e787795a509ed7147de207d' => __DIR__ . '/..' . '/markbaker/complex/classes/src/functions/sqrt.php',
-        'bb0a7923ffc6a90919cd64ec54ff06bc' => __DIR__ . '/..' . '/markbaker/complex/classes/src/functions/tan.php',
-        '2d302f32ce0fd4e433dd91c5bb404a28' => __DIR__ . '/..' . '/markbaker/complex/classes/src/functions/tanh.php',
-        '24dd4658a952171a4ee79218c4f9fd06' => __DIR__ . '/..' . '/markbaker/complex/classes/src/functions/theta.php',
-        'e49b7876281d6f5bc39536dde96d1f4a' => __DIR__ . '/..' . '/markbaker/complex/classes/src/operations/add.php',
-        '47596e02b43cd6da7700134fd08f88cf' => __DIR__ . '/..' . '/markbaker/complex/classes/src/operations/subtract.php',
-        '883af48563631547925fa4c3b48ead07' => __DIR__ . '/..' . '/markbaker/complex/classes/src/operations/multiply.php',
-        'f190e3308e6ca23234a2875edc985c03' => __DIR__ . '/..' . '/markbaker/complex/classes/src/operations/divideby.php',
-        'ac9e33ce6841aa5bf5d16d465a2f03a7' => __DIR__ . '/..' . '/markbaker/complex/classes/src/operations/divideinto.php',
-        '3af723442581d6c310bf44543f9f5c60' => __DIR__ . '/..' . '/markbaker/matrix/classes/src/Functions/adjoint.php',
-        'd803221834c8b57fec95debb5406a797' => __DIR__ . '/..' . '/markbaker/matrix/classes/src/Functions/antidiagonal.php',
-        '4714cafbd3be4c72c274a25eae9396bb' => __DIR__ . '/..' . '/markbaker/matrix/classes/src/Functions/cofactors.php',
-        '89719dc7c77436609d1c1c31f0797b8f' => __DIR__ . '/..' . '/markbaker/matrix/classes/src/Functions/determinant.php',
-        'c28af79ec7730859d83f2d4310b8dd0b' => __DIR__ . '/..' . '/markbaker/matrix/classes/src/Functions/diagonal.php',
-        'c5d82bf1ac485e445f911e55789ab4e6' => __DIR__ . '/..' . '/markbaker/matrix/classes/src/Functions/identity.php',
-        '0d2d594de24a247f7a33499e933aa21e' => __DIR__ . '/..' . '/markbaker/matrix/classes/src/Functions/inverse.php',
-        'f37c25880804a014ef40c8bffbab1b10' => __DIR__ . '/..' . '/markbaker/matrix/classes/src/Functions/minors.php',
-        'd6e4e42171df0dbea253b3067fefda38' => __DIR__ . '/..' . '/markbaker/matrix/classes/src/Functions/trace.php',
-        '2c9b19fa954fd3e6fcc7e7a1383caddd' => __DIR__ . '/..' . '/markbaker/matrix/classes/src/Functions/transpose.php',
-        '0a538fc9b897450ec362480ebbebe94f' => __DIR__ . '/..' . '/markbaker/matrix/classes/src/Operations/add.php',
-        'f0843f7f4089ec2343c7445544356385' => __DIR__ . '/..' . '/markbaker/matrix/classes/src/Operations/directsum.php',
-        'ad3e8c29aa16d134661a414265677b61' => __DIR__ . '/..' . '/markbaker/matrix/classes/src/Operations/subtract.php',
-        '8d37dad4703fab45bfec9dd0bbf3278e' => __DIR__ . '/..' . '/markbaker/matrix/classes/src/Operations/multiply.php',
-        '4888a6f58c08148ebe17682f9ce9b2a8' => __DIR__ . '/..' . '/markbaker/matrix/classes/src/Operations/divideby.php',
-        'eef6fa3879d3efa347cd24d5eb348f85' => __DIR__ . '/..' . '/markbaker/matrix/classes/src/Operations/divideinto.php',
         'decc78cc4436b1292c6c0d151b19445c' => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib/bootstrap.php',
     );
 
@@ -80,10 +19,6 @@ class ComposerStaticInit61c5b8c463cdaa6cee3bdb4483ab7dbb
         array (
             'ZipStream\\' => 10,
         ),
-        'S' => 
-        array (
-            'Symfony\\Polyfill\\Mbstring\\' => 26,
-        ),
         'P' => 
         array (
             'Psr\\SimpleCache\\' => 16,
@@ -91,18 +26,13 @@ class ComposerStaticInit61c5b8c463cdaa6cee3bdb4483ab7dbb
             'Psr\\Http\\Client\\' => 16,
             'PhpOffice\\PhpWord\\' => 18,
             'PhpOffice\\PhpSpreadsheet\\' => 25,
+            'PhpOffice\\Math\\' => 15,
             'ParagonIE\\ConstantTime\\' => 23,
         ),
         'M' => 
         array (
-            'MyCLabs\\Enum\\' => 13,
             'Matrix\\' => 7,
         ),
-        'L' => 
-        array (
-            'Laminas\\ZendFrameworkBridge\\' => 28,
-            'Laminas\\Escaper\\' => 16,
-        ),
         'C' => 
         array (
             'Complex\\' => 8,
@@ -118,10 +48,6 @@ class ComposerStaticInit61c5b8c463cdaa6cee3bdb4483ab7dbb
         array (
             0 => __DIR__ . '/..' . '/maennchen/zipstream-php/src',
         ),
-        'Symfony\\Polyfill\\Mbstring\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/symfony/polyfill-mbstring',
-        ),
         'Psr\\SimpleCache\\' => 
         array (
             0 => __DIR__ . '/..' . '/psr/simple-cache/src',
@@ -143,42 +69,24 @@ class ComposerStaticInit61c5b8c463cdaa6cee3bdb4483ab7dbb
         array (
             0 => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet',
         ),
-        'ParagonIE\\ConstantTime\\' => 
+        'PhpOffice\\Math\\' => 
         array (
-            0 => __DIR__ . '/..' . '/paragonie/constant_time_encoding/src',
+            0 => __DIR__ . '/..' . '/phpoffice/math/src/Math',
         ),
-        'MyCLabs\\Enum\\' => 
+        'ParagonIE\\ConstantTime\\' => 
         array (
-            0 => __DIR__ . '/..' . '/myclabs/php-enum/src',
+            0 => __DIR__ . '/..' . '/paragonie/constant_time_encoding/src',
         ),
         'Matrix\\' => 
         array (
             0 => __DIR__ . '/..' . '/markbaker/matrix/classes/src',
         ),
-        'Laminas\\ZendFrameworkBridge\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/laminas/laminas-zendframework-bridge/src',
-        ),
-        'Laminas\\Escaper\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/laminas/laminas-escaper/src',
-        ),
         'Complex\\' => 
         array (
             0 => __DIR__ . '/..' . '/markbaker/complex/classes/src',
         ),
     );
 
-    public static $prefixesPsr0 = array (
-        'H' => 
-        array (
-            'HTMLPurifier' => 
-            array (
-                0 => __DIR__ . '/..' . '/ezyang/htmlpurifier/library',
-            ),
-        ),
-    );
-
     public static $classMap = array (
         'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
         'Jumbojett\\OpenIDConnectClient' => __DIR__ . '/..' . '/jumbojett/openid-connect-php/src/OpenIDConnectClient.php',
@@ -190,7 +98,6 @@ public static function getInitializer(ClassLoader $loader)
         return \Closure::bind(function () use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInit61c5b8c463cdaa6cee3bdb4483ab7dbb::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInit61c5b8c463cdaa6cee3bdb4483ab7dbb::$prefixDirsPsr4;
-            $loader->prefixesPsr0 = ComposerStaticInit61c5b8c463cdaa6cee3bdb4483ab7dbb::$prefixesPsr0;
             $loader->classMap = ComposerStaticInit61c5b8c463cdaa6cee3bdb4483ab7dbb::$classMap;
 
         }, null, ClassLoader::class);
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index ae205a4043..beba7fbac1 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1,89 +1,32 @@
 {
     "packages": [
-        {
-            "name": "ezyang/htmlpurifier",
-            "version": "v4.13.0",
-            "version_normalized": "4.13.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/ezyang/htmlpurifier.git",
-                "reference": "08e27c97e4c6ed02f37c5b2b20488046c8d90d75"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/08e27c97e4c6ed02f37c5b2b20488046c8d90d75",
-                "reference": "08e27c97e4c6ed02f37c5b2b20488046c8d90d75",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.2"
-            },
-            "require-dev": {
-                "simpletest/simpletest": "dev-master#72de02a7b80c6bb8864ef9bf66d41d2f58f826bd"
-            },
-            "time": "2020-06-29T00:56:53+00:00",
-            "type": "library",
-            "installation-source": "dist",
-            "autoload": {
-                "psr-0": {
-                    "HTMLPurifier": "library/"
-                },
-                "files": [
-                    "library/HTMLPurifier.composer.php"
-                ],
-                "exclude-from-classmap": [
-                    "/library/HTMLPurifier/Language/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "LGPL-2.1-or-later"
-            ],
-            "authors": [
-                {
-                    "name": "Edward Z. Yang",
-                    "email": "admin@htmlpurifier.org",
-                    "homepage": "http://ezyang.com"
-                }
-            ],
-            "description": "Standards compliant HTML filter written in PHP",
-            "homepage": "http://htmlpurifier.org/",
-            "keywords": [
-                "html"
-            ],
-            "support": {
-                "issues": "https://github.com/ezyang/htmlpurifier/issues",
-                "source": "https://github.com/ezyang/htmlpurifier/tree/master"
-            },
-            "install-path": "../ezyang/htmlpurifier"
-        },
         {
             "name": "jumbojett/openid-connect-php",
-            "version": "v0.9.10",
-            "version_normalized": "0.9.10.0",
+            "version": "v1.0.2",
+            "version_normalized": "1.0.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/jumbojett/OpenID-Connect-PHP.git",
-                "reference": "45aac47b525f0483dd4db3324bb1f1cab4666061"
+                "reference": "f327e7eb0626d55ddb6abc7b7c9e6ad3af4e5d51"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/jumbojett/OpenID-Connect-PHP/zipball/45aac47b525f0483dd4db3324bb1f1cab4666061",
-                "reference": "45aac47b525f0483dd4db3324bb1f1cab4666061",
+                "url": "https://api.github.com/repos/jumbojett/OpenID-Connect-PHP/zipball/f327e7eb0626d55ddb6abc7b7c9e6ad3af4e5d51",
+                "reference": "f327e7eb0626d55ddb6abc7b7c9e6ad3af4e5d51",
                 "shasum": ""
             },
             "require": {
                 "ext-curl": "*",
                 "ext-json": "*",
-                "paragonie/random_compat": ">=2",
-                "php": ">=5.4",
-                "phpseclib/phpseclib": "~2.0 || ^3.0"
+                "php": ">=7.0",
+                "phpseclib/phpseclib": "^3.0.7"
             },
             "require-dev": {
-                "roave/security-advisories": "dev-master",
-                "yoast/phpunit-polyfills": "^1.0"
+                "phpunit/phpunit": "<10",
+                "roave/security-advisories": "dev-latest",
+                "yoast/phpunit-polyfills": "^2.0"
             },
-            "time": "2022-09-30T12:34:46+00:00",
+            "time": "2024-09-13T07:08:11+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -98,169 +41,44 @@
             "description": "Bare-bones OpenID Connect client",
             "support": {
                 "issues": "https://github.com/jumbojett/OpenID-Connect-PHP/issues",
-                "source": "https://github.com/jumbojett/OpenID-Connect-PHP/tree/v0.9.10"
+                "source": "https://github.com/jumbojett/OpenID-Connect-PHP/tree/v1.0.2"
             },
             "install-path": "../jumbojett/openid-connect-php"
         },
-        {
-            "name": "laminas/laminas-escaper",
-            "version": "2.8.0",
-            "version_normalized": "2.8.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-escaper.git",
-                "reference": "2d6dce99668b413610e9544183fa10392437f542"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/2d6dce99668b413610e9544183fa10392437f542",
-                "reference": "2d6dce99668b413610e9544183fa10392437f542",
-                "shasum": ""
-            },
-            "require": {
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^7.3 || ~8.0.0"
-            },
-            "replace": {
-                "zendframework/zend-escaper": "^2.6.1"
-            },
-            "require-dev": {
-                "laminas/laminas-coding-standard": "~2.3.0",
-                "phpunit/phpunit": "^9.3",
-                "psalm/plugin-phpunit": "^0.12.2",
-                "vimeo/psalm": "^3.16"
-            },
-            "suggest": {
-                "ext-iconv": "*",
-                "ext-mbstring": "*"
-            },
-            "time": "2021-06-26T14:26:08+00:00",
-            "type": "library",
-            "installation-source": "dist",
-            "autoload": {
-                "psr-4": {
-                    "Laminas\\Escaper\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "Securely and safely escape HTML, HTML attributes, JavaScript, CSS, and URLs",
-            "homepage": "https://laminas.dev",
-            "keywords": [
-                "escaper",
-                "laminas"
-            ],
-            "support": {
-                "chat": "https://laminas.dev/chat",
-                "docs": "https://docs.laminas.dev/laminas-escaper/",
-                "forum": "https://discourse.laminas.dev",
-                "issues": "https://github.com/laminas/laminas-escaper/issues",
-                "rss": "https://github.com/laminas/laminas-escaper/releases.atom",
-                "source": "https://github.com/laminas/laminas-escaper"
-            },
-            "funding": [
-                {
-                    "url": "https://funding.communitybridge.org/projects/laminas-project",
-                    "type": "community_bridge"
-                }
-            ],
-            "install-path": "../laminas/laminas-escaper"
-        },
-        {
-            "name": "laminas/laminas-zendframework-bridge",
-            "version": "1.3.0",
-            "version_normalized": "1.3.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-zendframework-bridge.git",
-                "reference": "13af2502d9bb6f7d33be2de4b51fb68c6cdb476e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/13af2502d9bb6f7d33be2de4b51fb68c6cdb476e",
-                "reference": "13af2502d9bb6f7d33be2de4b51fb68c6cdb476e",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.3 || ^8.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.1 || ^9.3",
-                "psalm/plugin-phpunit": "^0.15.1",
-                "squizlabs/php_codesniffer": "^3.5",
-                "vimeo/psalm": "^4.6"
-            },
-            "time": "2021-06-24T12:49:22+00:00",
-            "type": "library",
-            "extra": {
-                "laminas": {
-                    "module": "Laminas\\ZendFrameworkBridge"
-                }
-            },
-            "installation-source": "dist",
-            "autoload": {
-                "files": [
-                    "src/autoload.php"
-                ],
-                "psr-4": {
-                    "Laminas\\ZendFrameworkBridge\\": "src//"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "Alias legacy ZF class names to Laminas Project equivalents.",
-            "keywords": [
-                "ZendFramework",
-                "autoloading",
-                "laminas",
-                "zf"
-            ],
-            "support": {
-                "forum": "https://discourse.laminas.dev/",
-                "issues": "https://github.com/laminas/laminas-zendframework-bridge/issues",
-                "rss": "https://github.com/laminas/laminas-zendframework-bridge/releases.atom",
-                "source": "https://github.com/laminas/laminas-zendframework-bridge"
-            },
-            "funding": [
-                {
-                    "url": "https://funding.communitybridge.org/projects/laminas-project",
-                    "type": "community_bridge"
-                }
-            ],
-            "install-path": "../laminas/laminas-zendframework-bridge"
-        },
         {
             "name": "maennchen/zipstream-php",
-            "version": "2.1.0",
-            "version_normalized": "2.1.0.0",
+            "version": "3.1.1",
+            "version_normalized": "3.1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/maennchen/ZipStream-PHP.git",
-                "reference": "c4c5803cc1f93df3d2448478ef79394a5981cc58"
+                "reference": "6187e9cc4493da94b9b63eb2315821552015fca9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/c4c5803cc1f93df3d2448478ef79394a5981cc58",
-                "reference": "c4c5803cc1f93df3d2448478ef79394a5981cc58",
+                "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/6187e9cc4493da94b9b63eb2315821552015fca9",
+                "reference": "6187e9cc4493da94b9b63eb2315821552015fca9",
                 "shasum": ""
             },
             "require": {
-                "myclabs/php-enum": "^1.5",
-                "php": ">= 7.1",
-                "psr/http-message": "^1.0",
-                "symfony/polyfill-mbstring": "^1.0"
+                "ext-mbstring": "*",
+                "ext-zlib": "*",
+                "php-64bit": "^8.1"
             },
             "require-dev": {
                 "ext-zip": "*",
-                "guzzlehttp/guzzle": ">= 6.3",
+                "friendsofphp/php-cs-fixer": "^3.16",
+                "guzzlehttp/guzzle": "^7.5",
                 "mikey179/vfsstream": "^1.6",
-                "phpunit/phpunit": ">= 7.5"
+                "php-coveralls/php-coveralls": "^2.5",
+                "phpunit/phpunit": "^10.0",
+                "vimeo/psalm": "^5.0"
             },
-            "time": "2020-05-30T13:11:16+00:00",
+            "suggest": {
+                "guzzlehttp/psr7": "^2.4",
+                "psr/http-message": "^2.0"
+            },
+            "time": "2024-10-10T12:33:01+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -297,91 +115,47 @@
             ],
             "support": {
                 "issues": "https://github.com/maennchen/ZipStream-PHP/issues",
-                "source": "https://github.com/maennchen/ZipStream-PHP/tree/master"
+                "source": "https://github.com/maennchen/ZipStream-PHP/tree/3.1.1"
             },
             "funding": [
                 {
-                    "url": "https://opencollective.com/zipstream",
-                    "type": "open_collective"
+                    "url": "https://github.com/maennchen",
+                    "type": "github"
                 }
             ],
             "install-path": "../maennchen/zipstream-php"
         },
         {
             "name": "markbaker/complex",
-            "version": "2.0.3",
-            "version_normalized": "2.0.3.0",
+            "version": "3.0.2",
+            "version_normalized": "3.0.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/MarkBaker/PHPComplex.git",
-                "reference": "6f724d7e04606fd8adaa4e3bb381c3e9db09c946"
+                "reference": "95c56caa1cf5c766ad6d65b6344b807c1e8405b9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/MarkBaker/PHPComplex/zipball/6f724d7e04606fd8adaa4e3bb381c3e9db09c946",
-                "reference": "6f724d7e04606fd8adaa4e3bb381c3e9db09c946",
+                "url": "https://api.github.com/repos/MarkBaker/PHPComplex/zipball/95c56caa1cf5c766ad6d65b6344b807c1e8405b9",
+                "reference": "95c56caa1cf5c766ad6d65b6344b807c1e8405b9",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2 || ^8.0"
             },
             "require-dev": {
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
-                "phpcompatibility/php-compatibility": "^9.0",
-                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.3",
-                "squizlabs/php_codesniffer": "^3.4"
+                "dealerdirect/phpcodesniffer-composer-installer": "dev-master",
+                "phpcompatibility/php-compatibility": "^9.3",
+                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
+                "squizlabs/php_codesniffer": "^3.7"
             },
-            "time": "2021-06-02T09:44:11+00:00",
+            "time": "2022-12-06T16:21:08+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
                 "psr-4": {
                     "Complex\\": "classes/src/"
-                },
-                "files": [
-                    "classes/src/functions/abs.php",
-                    "classes/src/functions/acos.php",
-                    "classes/src/functions/acosh.php",
-                    "classes/src/functions/acot.php",
-                    "classes/src/functions/acoth.php",
-                    "classes/src/functions/acsc.php",
-                    "classes/src/functions/acsch.php",
-                    "classes/src/functions/argument.php",
-                    "classes/src/functions/asec.php",
-                    "classes/src/functions/asech.php",
-                    "classes/src/functions/asin.php",
-                    "classes/src/functions/asinh.php",
-                    "classes/src/functions/atan.php",
-                    "classes/src/functions/atanh.php",
-                    "classes/src/functions/conjugate.php",
-                    "classes/src/functions/cos.php",
-                    "classes/src/functions/cosh.php",
-                    "classes/src/functions/cot.php",
-                    "classes/src/functions/coth.php",
-                    "classes/src/functions/csc.php",
-                    "classes/src/functions/csch.php",
-                    "classes/src/functions/exp.php",
-                    "classes/src/functions/inverse.php",
-                    "classes/src/functions/ln.php",
-                    "classes/src/functions/log2.php",
-                    "classes/src/functions/log10.php",
-                    "classes/src/functions/negative.php",
-                    "classes/src/functions/pow.php",
-                    "classes/src/functions/rho.php",
-                    "classes/src/functions/sec.php",
-                    "classes/src/functions/sech.php",
-                    "classes/src/functions/sin.php",
-                    "classes/src/functions/sinh.php",
-                    "classes/src/functions/sqrt.php",
-                    "classes/src/functions/tan.php",
-                    "classes/src/functions/tanh.php",
-                    "classes/src/functions/theta.php",
-                    "classes/src/operations/add.php",
-                    "classes/src/operations/subtract.php",
-                    "classes/src/operations/multiply.php",
-                    "classes/src/operations/divideby.php",
-                    "classes/src/operations/divideinto.php"
-                ]
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -401,63 +175,45 @@
             ],
             "support": {
                 "issues": "https://github.com/MarkBaker/PHPComplex/issues",
-                "source": "https://github.com/MarkBaker/PHPComplex/tree/2.0.3"
+                "source": "https://github.com/MarkBaker/PHPComplex/tree/3.0.2"
             },
             "install-path": "../markbaker/complex"
         },
         {
             "name": "markbaker/matrix",
-            "version": "2.1.3",
-            "version_normalized": "2.1.3.0",
+            "version": "3.0.1",
+            "version_normalized": "3.0.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/MarkBaker/PHPMatrix.git",
-                "reference": "174395a901b5ba0925f1d790fa91bab531074b61"
+                "reference": "728434227fe21be27ff6d86621a1b13107a2562c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/MarkBaker/PHPMatrix/zipball/174395a901b5ba0925f1d790fa91bab531074b61",
-                "reference": "174395a901b5ba0925f1d790fa91bab531074b61",
+                "url": "https://api.github.com/repos/MarkBaker/PHPMatrix/zipball/728434227fe21be27ff6d86621a1b13107a2562c",
+                "reference": "728434227fe21be27ff6d86621a1b13107a2562c",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1 || ^8.0"
             },
             "require-dev": {
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
-                "phpcompatibility/php-compatibility": "^9.0",
+                "dealerdirect/phpcodesniffer-composer-installer": "dev-master",
+                "phpcompatibility/php-compatibility": "^9.3",
                 "phpdocumentor/phpdocumentor": "2.*",
                 "phploc/phploc": "^4.0",
                 "phpmd/phpmd": "2.*",
-                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.3",
+                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
                 "sebastian/phpcpd": "^4.0",
-                "squizlabs/php_codesniffer": "^3.4"
+                "squizlabs/php_codesniffer": "^3.7"
             },
-            "time": "2021-05-25T15:42:17+00:00",
+            "time": "2022-12-02T22:17:43+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
                 "psr-4": {
                     "Matrix\\": "classes/src/"
-                },
-                "files": [
-                    "classes/src/Functions/adjoint.php",
-                    "classes/src/Functions/antidiagonal.php",
-                    "classes/src/Functions/cofactors.php",
-                    "classes/src/Functions/determinant.php",
-                    "classes/src/Functions/diagonal.php",
-                    "classes/src/Functions/identity.php",
-                    "classes/src/Functions/inverse.php",
-                    "classes/src/Functions/minors.php",
-                    "classes/src/Functions/trace.php",
-                    "classes/src/Functions/transpose.php",
-                    "classes/src/Operations/add.php",
-                    "classes/src/Operations/directsum.php",
-                    "classes/src/Operations/subtract.php",
-                    "classes/src/Operations/multiply.php",
-                    "classes/src/Operations/divideby.php",
-                    "classes/src/Operations/divideinto.php"
-                ]
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -478,96 +234,33 @@
             ],
             "support": {
                 "issues": "https://github.com/MarkBaker/PHPMatrix/issues",
-                "source": "https://github.com/MarkBaker/PHPMatrix/tree/2.1.3"
+                "source": "https://github.com/MarkBaker/PHPMatrix/tree/3.0.1"
             },
             "install-path": "../markbaker/matrix"
         },
-        {
-            "name": "myclabs/php-enum",
-            "version": "1.8.3",
-            "version_normalized": "1.8.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/myclabs/php-enum.git",
-                "reference": "b942d263c641ddb5190929ff840c68f78713e937"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/php-enum/zipball/b942d263c641ddb5190929ff840c68f78713e937",
-                "reference": "b942d263c641ddb5190929ff840c68f78713e937",
-                "shasum": ""
-            },
-            "require": {
-                "ext-json": "*",
-                "php": "^7.3 || ^8.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.5",
-                "squizlabs/php_codesniffer": "1.*",
-                "vimeo/psalm": "^4.6.2"
-            },
-            "time": "2021-07-05T08:18:36+00:00",
-            "type": "library",
-            "installation-source": "dist",
-            "autoload": {
-                "psr-4": {
-                    "MyCLabs\\Enum\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP Enum contributors",
-                    "homepage": "https://github.com/myclabs/php-enum/graphs/contributors"
-                }
-            ],
-            "description": "PHP Enum implementation",
-            "homepage": "http://github.com/myclabs/php-enum",
-            "keywords": [
-                "enum"
-            ],
-            "support": {
-                "issues": "https://github.com/myclabs/php-enum/issues",
-                "source": "https://github.com/myclabs/php-enum/tree/1.8.3"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/mnapoli",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/myclabs/php-enum",
-                    "type": "tidelift"
-                }
-            ],
-            "install-path": "../myclabs/php-enum"
-        },
         {
             "name": "paragonie/constant_time_encoding",
-            "version": "v2.6.3",
-            "version_normalized": "2.6.3.0",
+            "version": "v3.0.0",
+            "version_normalized": "3.0.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paragonie/constant_time_encoding.git",
-                "reference": "58c3f47f650c94ec05a151692652a868995d2938"
+                "reference": "df1e7fde177501eee2037dd159cf04f5f301a512"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/58c3f47f650c94ec05a151692652a868995d2938",
-                "reference": "58c3f47f650c94ec05a151692652a868995d2938",
+                "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/df1e7fde177501eee2037dd159cf04f5f301a512",
+                "reference": "df1e7fde177501eee2037dd159cf04f5f301a512",
                 "shasum": ""
             },
             "require": {
-                "php": "^7|^8"
+                "php": "^8"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6|^7|^8|^9",
-                "vimeo/psalm": "^1|^2|^3|^4"
+                "phpunit/phpunit": "^9",
+                "vimeo/psalm": "^4|^5"
             },
-            "time": "2022-06-14T06:56:20+00:00",
+            "time": "2024-05-08T12:36:18+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -668,19 +361,74 @@
             },
             "install-path": "../paragonie/random_compat"
         },
+        {
+            "name": "phpoffice/math",
+            "version": "0.2.0",
+            "version_normalized": "0.2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHPOffice/Math.git",
+                "reference": "fc2eb6d1a61b058d5dac77197059db30ee3c8329"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHPOffice/Math/zipball/fc2eb6d1a61b058d5dac77197059db30ee3c8329",
+                "reference": "fc2eb6d1a61b058d5dac77197059db30ee3c8329",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-xml": "*",
+                "php": "^7.1|^8.0"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^0.12.88 || ^1.0.0",
+                "phpunit/phpunit": "^7.0 || ^9.0"
+            },
+            "time": "2024-08-12T07:30:45+00:00",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "PhpOffice\\Math\\": "src/Math/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Progi1984",
+                    "homepage": "https://lefevre.dev"
+                }
+            ],
+            "description": "Math - Manipulate Math Formula",
+            "homepage": "https://phpoffice.github.io/Math/",
+            "keywords": [
+                "MathML",
+                "officemathml",
+                "php"
+            ],
+            "support": {
+                "issues": "https://github.com/PHPOffice/Math/issues",
+                "source": "https://github.com/PHPOffice/Math/tree/0.2.0"
+            },
+            "install-path": "../phpoffice/math"
+        },
         {
             "name": "phpoffice/phpspreadsheet",
-            "version": "1.18.0",
-            "version_normalized": "1.18.0.0",
+            "version": "3.3.0",
+            "version_normalized": "3.3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPOffice/PhpSpreadsheet.git",
-                "reference": "418cd304e8e6b417ea79c3b29126a25dc4b1170c"
+                "reference": "87ddd21eb0b6b7ad20a11d314348ef307475f547"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/418cd304e8e6b417ea79c3b29126a25dc4b1170c",
-                "reference": "418cd304e8e6b417ea79c3b29126a25dc4b1170c",
+                "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/87ddd21eb0b6b7ad20a11d314348ef307475f547",
+                "reference": "87ddd21eb0b6b7ad20a11d314348ef307475f547",
                 "shasum": ""
             },
             "require": {
@@ -697,35 +445,35 @@
                 "ext-xmlwriter": "*",
                 "ext-zip": "*",
                 "ext-zlib": "*",
-                "ezyang/htmlpurifier": "^4.13",
-                "maennchen/zipstream-php": "^2.1",
-                "markbaker/complex": "^2.0",
-                "markbaker/matrix": "^2.0",
-                "php": "^7.2 || ^8.0",
+                "maennchen/zipstream-php": "^2.1 || ^3.0",
+                "markbaker/complex": "^3.0",
+                "markbaker/matrix": "^3.0",
+                "php": "^8.1",
                 "psr/http-client": "^1.0",
                 "psr/http-factory": "^1.0",
-                "psr/simple-cache": "^1.0"
+                "psr/simple-cache": "^1.0 || ^2.0 || ^3.0"
             },
             "require-dev": {
-                "dealerdirect/phpcodesniffer-composer-installer": "dev-master",
-                "dompdf/dompdf": "^1.0",
-                "friendsofphp/php-cs-fixer": "^2.18",
-                "jpgraph/jpgraph": "^4.0",
-                "mpdf/mpdf": "^8.0",
+                "dealerdirect/phpcodesniffer-composer-installer": "dev-main",
+                "dompdf/dompdf": "^2.0 || ^3.0",
+                "friendsofphp/php-cs-fixer": "^3.2",
+                "mitoteam/jpgraph": "^10.3",
+                "mpdf/mpdf": "^8.1.1",
                 "phpcompatibility/php-compatibility": "^9.3",
-                "phpstan/phpstan": "^0.12.82",
-                "phpstan/phpstan-phpunit": "^0.12.18",
-                "phpunit/phpunit": "^8.5",
-                "squizlabs/php_codesniffer": "^3.5",
-                "tecnickcom/tcpdf": "^6.3"
+                "phpstan/phpstan": "^1.1",
+                "phpstan/phpstan-phpunit": "^1.0",
+                "phpunit/phpunit": "^9.6 || ^10.5",
+                "squizlabs/php_codesniffer": "^3.7",
+                "tecnickcom/tcpdf": "^6.5"
             },
             "suggest": {
-                "dompdf/dompdf": "Option for rendering PDF with PDF Writer (doesn't yet support PHP8)",
-                "jpgraph/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers",
+                "dompdf/dompdf": "Option for rendering PDF with PDF Writer",
+                "ext-intl": "PHP Internationalization Functions",
+                "mitoteam/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers",
                 "mpdf/mpdf": "Option for rendering PDF with PDF Writer",
-                "tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer (doesn't yet support PHP8)"
+                "tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer"
             },
-            "time": "2021-05-31T18:21:15+00:00",
+            "time": "2024-09-29T07:04:07+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -771,42 +519,44 @@
             ],
             "support": {
                 "issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues",
-                "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.18.0"
+                "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/3.3.0"
             },
             "install-path": "../phpoffice/phpspreadsheet"
         },
         {
             "name": "phpoffice/phpword",
-            "version": "0.18.2",
-            "version_normalized": "0.18.2.0",
+            "version": "1.3.0",
+            "version_normalized": "1.3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPOffice/PHPWord.git",
-                "reference": "aca10785cf68dc95d7f6fac4fe854979fef3f8db"
+                "reference": "8392134ce4b5dba65130ba956231a1602b848b7f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPOffice/PHPWord/zipball/aca10785cf68dc95d7f6fac4fe854979fef3f8db",
-                "reference": "aca10785cf68dc95d7f6fac4fe854979fef3f8db",
+                "url": "https://api.github.com/repos/PHPOffice/PHPWord/zipball/8392134ce4b5dba65130ba956231a1602b848b7f",
+                "reference": "8392134ce4b5dba65130ba956231a1602b848b7f",
                 "shasum": ""
             },
             "require": {
+                "ext-dom": "*",
+                "ext-json": "*",
                 "ext-xml": "*",
-                "laminas/laminas-escaper": "^2.2",
-                "php": "^5.3.3 || ^7.0 || ^8.0"
+                "php": "^7.1|^8.0",
+                "phpoffice/math": "^0.2"
             },
             "require-dev": {
-                "dompdf/dompdf": "0.8.* || 1.0.*",
+                "dompdf/dompdf": "^2.0",
                 "ext-gd": "*",
+                "ext-libxml": "*",
                 "ext-zip": "*",
-                "friendsofphp/php-cs-fixer": "^2.2",
-                "mpdf/mpdf": "5.7.4 || 6.* || 7.* || 8.*",
-                "php-coveralls/php-coveralls": "1.1.0 || ^2.0",
-                "phploc/phploc": "2.* || 3.* || 4.* || 5.* || 6.* || 7.*",
-                "phpmd/phpmd": "2.*",
-                "phpunit/phpunit": "^4.8.36 || ^7.0",
-                "squizlabs/php_codesniffer": "^2.9 || ^3.5",
-                "tecnickcom/tcpdf": "6.*"
+                "friendsofphp/php-cs-fixer": "^3.3",
+                "mpdf/mpdf": "^8.1",
+                "phpmd/phpmd": "^2.13",
+                "phpstan/phpstan-phpunit": "@stable",
+                "phpunit/phpunit": ">=7.0",
+                "symfony/process": "^4.4 || ^5.0",
+                "tecnickcom/tcpdf": "^6.5"
             },
             "suggest": {
                 "dompdf/dompdf": "Allows writing PDF",
@@ -815,13 +565,8 @@
                 "ext-xsl": "Allows applying XSL style sheet to headers, to main document part, and to footers of an OOXML template",
                 "ext-zip": "Allows writing OOXML and ODF"
             },
-            "time": "2021-06-04T20:58:45+00:00",
+            "time": "2024-08-30T18:03:42+00:00",
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-develop": "0.19-dev"
-                }
-            },
             "installation-source": "dist",
             "autoload": {
                 "psr-4": {
@@ -858,7 +603,7 @@
                 }
             ],
             "description": "PHPWord - A pure PHP library for reading and writing word processing documents (OOXML, ODF, RTF, HTML, PDF)",
-            "homepage": "http://phpoffice.github.io",
+            "homepage": "https://phpoffice.github.io/PHPWord/",
             "keywords": [
                 "ISO IEC 29500",
                 "OOXML",
@@ -886,27 +631,27 @@
             ],
             "support": {
                 "issues": "https://github.com/PHPOffice/PHPWord/issues",
-                "source": "https://github.com/PHPOffice/PHPWord/tree/0.18.2"
+                "source": "https://github.com/PHPOffice/PHPWord/tree/1.3.0"
             },
             "install-path": "../phpoffice/phpword"
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "3.0.33",
-            "version_normalized": "3.0.33.0",
+            "version": "3.0.42",
+            "version_normalized": "3.0.42.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "33fa69b2514a61138dd48e7a49f99445711e0ad0"
+                "reference": "db92f1b1987b12b13f248fe76c3a52cadb67bb98"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/33fa69b2514a61138dd48e7a49f99445711e0ad0",
-                "reference": "33fa69b2514a61138dd48e7a49f99445711e0ad0",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/db92f1b1987b12b13f248fe76c3a52cadb67bb98",
+                "reference": "db92f1b1987b12b13f248fe76c3a52cadb67bb98",
                 "shasum": ""
             },
             "require": {
-                "paragonie/constant_time_encoding": "^1|^2",
+                "paragonie/constant_time_encoding": "^1|^2|^3",
                 "paragonie/random_compat": "^1.4|^2.0|^9.99.99",
                 "php": ">=5.6.1"
             },
@@ -920,7 +665,7 @@
                 "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.",
                 "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations."
             },
-            "time": "2023-10-21T14:00:39+00:00",
+            "time": "2024-09-16T03:06:04+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -985,7 +730,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpseclib/phpseclib/issues",
-                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.33"
+                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.42"
             },
             "funding": [
                 {
@@ -1005,24 +750,24 @@
         },
         {
             "name": "psr/http-client",
-            "version": "1.0.1",
-            "version_normalized": "1.0.1.0",
+            "version": "1.0.3",
+            "version_normalized": "1.0.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/http-client.git",
-                "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621"
+                "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
-                "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
+                "url": "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90",
+                "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.0 || ^8.0",
-                "psr/http-message": "^1.0"
+                "psr/http-message": "^1.0 || ^2.0"
             },
-            "time": "2020-06-29T06:28:15+00:00",
+            "time": "2023-09-23T14:17:50+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -1042,7 +787,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common interface for HTTP clients",
@@ -1054,30 +799,30 @@
                 "psr-18"
             ],
             "support": {
-                "source": "https://github.com/php-fig/http-client/tree/master"
+                "source": "https://github.com/php-fig/http-client"
             },
             "install-path": "../psr/http-client"
         },
         {
             "name": "psr/http-factory",
-            "version": "1.0.1",
-            "version_normalized": "1.0.1.0",
+            "version": "1.1.0",
+            "version_normalized": "1.1.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/http-factory.git",
-                "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be"
+                "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
-                "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
+                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
+                "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0.0",
-                "psr/http-message": "^1.0"
+                "php": ">=7.1",
+                "psr/http-message": "^1.0 || ^2.0"
             },
-            "time": "2019-04-30T12:38:16+00:00",
+            "time": "2024-04-15T12:06:14+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -1097,10 +842,10 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
-            "description": "Common interfaces for PSR-7 HTTP message factories",
+            "description": "PSR-17: Common interfaces for PSR-7 HTTP message factories",
             "keywords": [
                 "factory",
                 "http",
@@ -1112,33 +857,33 @@
                 "response"
             ],
             "support": {
-                "source": "https://github.com/php-fig/http-factory/tree/master"
+                "source": "https://github.com/php-fig/http-factory"
             },
             "install-path": "../psr/http-factory"
         },
         {
             "name": "psr/http-message",
-            "version": "1.0.1",
-            "version_normalized": "1.0.1.0",
+            "version": "2.0",
+            "version_normalized": "2.0.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/http-message.git",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
+                "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71",
+                "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": "^7.2 || ^8.0"
             },
-            "time": "2016-08-06T14:39:51+00:00",
+            "time": "2023-04-04T09:54:51+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "2.0.x-dev"
                 }
             },
             "installation-source": "dist",
@@ -1154,7 +899,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common interface for HTTP messages",
@@ -1168,33 +913,33 @@
                 "response"
             ],
             "support": {
-                "source": "https://github.com/php-fig/http-message/tree/master"
+                "source": "https://github.com/php-fig/http-message/tree/2.0"
             },
             "install-path": "../psr/http-message"
         },
         {
             "name": "psr/simple-cache",
-            "version": "1.0.1",
-            "version_normalized": "1.0.1.0",
+            "version": "3.0.0",
+            "version_normalized": "3.0.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/simple-cache.git",
-                "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b"
+                "reference": "764e0b3939f5ca87cb904f570ef9be2d78a07865"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
-                "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
+                "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/764e0b3939f5ca87cb904f570ef9be2d78a07865",
+                "reference": "764e0b3939f5ca87cb904f570ef9be2d78a07865",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": ">=8.0.0"
             },
-            "time": "2017-10-23T01:57:42+00:00",
+            "time": "2021-10-29T13:26:27+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "3.0.x-dev"
                 }
             },
             "installation-source": "dist",
@@ -1210,7 +955,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common interfaces for simple caching",
@@ -1222,92 +967,9 @@
                 "simple-cache"
             ],
             "support": {
-                "source": "https://github.com/php-fig/simple-cache/tree/master"
+                "source": "https://github.com/php-fig/simple-cache/tree/3.0.0"
             },
             "install-path": "../psr/simple-cache"
-        },
-        {
-            "name": "symfony/polyfill-mbstring",
-            "version": "v1.23.0",
-            "version_normalized": "1.23.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2df51500adbaebdc4c38dea4c89a2e131c45c8a1",
-                "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "suggest": {
-                "ext-mbstring": "For best performance"
-            },
-            "time": "2021-05-27T09:27:20+00:00",
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "installation-source": "dist",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for the Mbstring extension",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "mbstring",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "install-path": "../symfony/polyfill-mbstring"
         }
     ],
     "dev": true,
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index 113c8bd726..bb7037f95f 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -1,191 +1,149 @@
 <?php return array(
     'root' => array(
+        'name' => '__root__',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
+        'reference' => '7894a4a232c9c12728cdce3472e8ebbbc6c3e13a',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => '1eff5bb05289c476c70bb3b118d63f98d9761718',
-        'name' => '__root__',
         'dev' => true,
     ),
     'versions' => array(
         '__root__' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
+            'reference' => '7894a4a232c9c12728cdce3472e8ebbbc6c3e13a',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => '1eff5bb05289c476c70bb3b118d63f98d9761718',
-            'dev_requirement' => false,
-        ),
-        'ezyang/htmlpurifier' => array(
-            'pretty_version' => 'v4.13.0',
-            'version' => '4.13.0.0',
-            'type' => 'library',
-            'install_path' => __DIR__ . '/../ezyang/htmlpurifier',
-            'aliases' => array(),
-            'reference' => '08e27c97e4c6ed02f37c5b2b20488046c8d90d75',
             'dev_requirement' => false,
         ),
         'jumbojett/openid-connect-php' => array(
-            'pretty_version' => 'v0.9.10',
-            'version' => '0.9.10.0',
+            'pretty_version' => 'v1.0.2',
+            'version' => '1.0.2.0',
+            'reference' => 'f327e7eb0626d55ddb6abc7b7c9e6ad3af4e5d51',
             'type' => 'library',
             'install_path' => __DIR__ . '/../jumbojett/openid-connect-php',
             'aliases' => array(),
-            'reference' => '45aac47b525f0483dd4db3324bb1f1cab4666061',
-            'dev_requirement' => false,
-        ),
-        'laminas/laminas-escaper' => array(
-            'pretty_version' => '2.8.0',
-            'version' => '2.8.0.0',
-            'type' => 'library',
-            'install_path' => __DIR__ . '/../laminas/laminas-escaper',
-            'aliases' => array(),
-            'reference' => '2d6dce99668b413610e9544183fa10392437f542',
-            'dev_requirement' => false,
-        ),
-        'laminas/laminas-zendframework-bridge' => array(
-            'pretty_version' => '1.3.0',
-            'version' => '1.3.0.0',
-            'type' => 'library',
-            'install_path' => __DIR__ . '/../laminas/laminas-zendframework-bridge',
-            'aliases' => array(),
-            'reference' => '13af2502d9bb6f7d33be2de4b51fb68c6cdb476e',
             'dev_requirement' => false,
         ),
         'maennchen/zipstream-php' => array(
-            'pretty_version' => '2.1.0',
-            'version' => '2.1.0.0',
+            'pretty_version' => '3.1.1',
+            'version' => '3.1.1.0',
+            'reference' => '6187e9cc4493da94b9b63eb2315821552015fca9',
             'type' => 'library',
             'install_path' => __DIR__ . '/../maennchen/zipstream-php',
             'aliases' => array(),
-            'reference' => 'c4c5803cc1f93df3d2448478ef79394a5981cc58',
             'dev_requirement' => false,
         ),
         'markbaker/complex' => array(
-            'pretty_version' => '2.0.3',
-            'version' => '2.0.3.0',
+            'pretty_version' => '3.0.2',
+            'version' => '3.0.2.0',
+            'reference' => '95c56caa1cf5c766ad6d65b6344b807c1e8405b9',
             'type' => 'library',
             'install_path' => __DIR__ . '/../markbaker/complex',
             'aliases' => array(),
-            'reference' => '6f724d7e04606fd8adaa4e3bb381c3e9db09c946',
             'dev_requirement' => false,
         ),
         'markbaker/matrix' => array(
-            'pretty_version' => '2.1.3',
-            'version' => '2.1.3.0',
+            'pretty_version' => '3.0.1',
+            'version' => '3.0.1.0',
+            'reference' => '728434227fe21be27ff6d86621a1b13107a2562c',
             'type' => 'library',
             'install_path' => __DIR__ . '/../markbaker/matrix',
             'aliases' => array(),
-            'reference' => '174395a901b5ba0925f1d790fa91bab531074b61',
-            'dev_requirement' => false,
-        ),
-        'myclabs/php-enum' => array(
-            'pretty_version' => '1.8.3',
-            'version' => '1.8.3.0',
-            'type' => 'library',
-            'install_path' => __DIR__ . '/../myclabs/php-enum',
-            'aliases' => array(),
-            'reference' => 'b942d263c641ddb5190929ff840c68f78713e937',
             'dev_requirement' => false,
         ),
         'paragonie/constant_time_encoding' => array(
-            'pretty_version' => 'v2.6.3',
-            'version' => '2.6.3.0',
+            'pretty_version' => 'v3.0.0',
+            'version' => '3.0.0.0',
+            'reference' => 'df1e7fde177501eee2037dd159cf04f5f301a512',
             'type' => 'library',
             'install_path' => __DIR__ . '/../paragonie/constant_time_encoding',
             'aliases' => array(),
-            'reference' => '58c3f47f650c94ec05a151692652a868995d2938',
             'dev_requirement' => false,
         ),
         'paragonie/random_compat' => array(
             'pretty_version' => 'v9.99.100',
             'version' => '9.99.100.0',
+            'reference' => '996434e5492cb4c3edcb9168db6fbb1359ef965a',
             'type' => 'library',
             'install_path' => __DIR__ . '/../paragonie/random_compat',
             'aliases' => array(),
-            'reference' => '996434e5492cb4c3edcb9168db6fbb1359ef965a',
+            'dev_requirement' => false,
+        ),
+        'phpoffice/math' => array(
+            'pretty_version' => '0.2.0',
+            'version' => '0.2.0.0',
+            'reference' => 'fc2eb6d1a61b058d5dac77197059db30ee3c8329',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../phpoffice/math',
+            'aliases' => array(),
             'dev_requirement' => false,
         ),
         'phpoffice/phpspreadsheet' => array(
-            'pretty_version' => '1.18.0',
-            'version' => '1.18.0.0',
+            'pretty_version' => '3.3.0',
+            'version' => '3.3.0.0',
+            'reference' => '87ddd21eb0b6b7ad20a11d314348ef307475f547',
             'type' => 'library',
             'install_path' => __DIR__ . '/../phpoffice/phpspreadsheet',
             'aliases' => array(),
-            'reference' => '418cd304e8e6b417ea79c3b29126a25dc4b1170c',
             'dev_requirement' => false,
         ),
         'phpoffice/phpword' => array(
-            'pretty_version' => '0.18.2',
-            'version' => '0.18.2.0',
+            'pretty_version' => '1.3.0',
+            'version' => '1.3.0.0',
+            'reference' => '8392134ce4b5dba65130ba956231a1602b848b7f',
             'type' => 'library',
             'install_path' => __DIR__ . '/../phpoffice/phpword',
             'aliases' => array(),
-            'reference' => 'aca10785cf68dc95d7f6fac4fe854979fef3f8db',
             'dev_requirement' => false,
         ),
         'phpseclib/phpseclib' => array(
-            'pretty_version' => '3.0.33',
-            'version' => '3.0.33.0',
+            'pretty_version' => '3.0.42',
+            'version' => '3.0.42.0',
+            'reference' => 'db92f1b1987b12b13f248fe76c3a52cadb67bb98',
             'type' => 'library',
             'install_path' => __DIR__ . '/../phpseclib/phpseclib',
             'aliases' => array(),
-            'reference' => '33fa69b2514a61138dd48e7a49f99445711e0ad0',
             'dev_requirement' => false,
         ),
         'psr/http-client' => array(
-            'pretty_version' => '1.0.1',
-            'version' => '1.0.1.0',
+            'pretty_version' => '1.0.3',
+            'version' => '1.0.3.0',
+            'reference' => 'bb5906edc1c324c9a05aa0873d40117941e5fa90',
             'type' => 'library',
             'install_path' => __DIR__ . '/../psr/http-client',
             'aliases' => array(),
-            'reference' => '2dfb5f6c5eff0e91e20e913f8c5452ed95b86621',
             'dev_requirement' => false,
         ),
         'psr/http-factory' => array(
-            'pretty_version' => '1.0.1',
-            'version' => '1.0.1.0',
+            'pretty_version' => '1.1.0',
+            'version' => '1.1.0.0',
+            'reference' => '2b4765fddfe3b508ac62f829e852b1501d3f6e8a',
             'type' => 'library',
             'install_path' => __DIR__ . '/../psr/http-factory',
             'aliases' => array(),
-            'reference' => '12ac7fcd07e5b077433f5f2bee95b3a771bf61be',
             'dev_requirement' => false,
         ),
         'psr/http-message' => array(
-            'pretty_version' => '1.0.1',
-            'version' => '1.0.1.0',
+            'pretty_version' => '2.0',
+            'version' => '2.0.0.0',
+            'reference' => '402d35bcb92c70c026d1a6a9883f06b2ead23d71',
             'type' => 'library',
             'install_path' => __DIR__ . '/../psr/http-message',
             'aliases' => array(),
-            'reference' => 'f6561bf28d520154e4b0ec72be95418abe6d9363',
             'dev_requirement' => false,
         ),
         'psr/simple-cache' => array(
-            'pretty_version' => '1.0.1',
-            'version' => '1.0.1.0',
+            'pretty_version' => '3.0.0',
+            'version' => '3.0.0.0',
+            'reference' => '764e0b3939f5ca87cb904f570ef9be2d78a07865',
             'type' => 'library',
             'install_path' => __DIR__ . '/../psr/simple-cache',
             'aliases' => array(),
-            'reference' => '408d5eafb83c57f6365a3ca330ff23aa4a5fa39b',
-            'dev_requirement' => false,
-        ),
-        'symfony/polyfill-mbstring' => array(
-            'pretty_version' => 'v1.23.0',
-            'version' => '1.23.0.0',
-            'type' => 'library',
-            'install_path' => __DIR__ . '/../symfony/polyfill-mbstring',
-            'aliases' => array(),
-            'reference' => '2df51500adbaebdc4c38dea4c89a2e131c45c8a1',
-            'dev_requirement' => false,
-        ),
-        'zendframework/zend-escaper' => array(
             'dev_requirement' => false,
-            'replaced' => array(
-                0 => '^2.6.1',
-            ),
         ),
     ),
 );
diff --git a/vendor/composer/platform_check.php b/vendor/composer/platform_check.php
index 92370c5a0c..f71b2f899c 100644
--- a/vendor/composer/platform_check.php
+++ b/vendor/composer/platform_check.php
@@ -4,8 +4,12 @@
 
 $issues = array();
 
-if (!(PHP_VERSION_ID >= 70300)) {
-    $issues[] = 'Your Composer dependencies require a PHP version ">= 7.3.0". You are running ' . PHP_VERSION . '.';
+if (!(PHP_VERSION_ID >= 80100)) {
+    $issues[] = 'Your Composer dependencies require a PHP version ">= 8.1.0". You are running ' . PHP_VERSION . '.';
+}
+
+if (PHP_INT_SIZE !== 8) {
+    $issues[] = 'Your Composer dependencies require a 64-bit build of PHP.';
 }
 
 if ($issues) {
diff --git a/vendor/ezyang/htmlpurifier/CREDITS b/vendor/ezyang/htmlpurifier/CREDITS
deleted file mode 100644
index 7921b45af7..0000000000
--- a/vendor/ezyang/htmlpurifier/CREDITS
+++ /dev/null
@@ -1,9 +0,0 @@
-
-CREDITS
-
-Almost everything written by Edward Z. Yang (Ambush Commander).  Lots of thanks
-to the DevNetwork Community for their help (see docs/ref-devnetwork.html for
-more details), Feyd especially (namely IPv6 and optimization).  Thanks to RSnake
-for letting me package his fantastic XSS cheatsheet for a smoketest.
-
-    vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/LICENSE b/vendor/ezyang/htmlpurifier/LICENSE
deleted file mode 100644
index 8c88a20d45..0000000000
--- a/vendor/ezyang/htmlpurifier/LICENSE
+++ /dev/null
@@ -1,504 +0,0 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-    vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/README.md b/vendor/ezyang/htmlpurifier/README.md
deleted file mode 100644
index 9e0becc0ae..0000000000
--- a/vendor/ezyang/htmlpurifier/README.md
+++ /dev/null
@@ -1,29 +0,0 @@
-HTML Purifier [![Build Status](https://secure.travis-ci.org/ezyang/htmlpurifier.svg?branch=master)](http://travis-ci.org/ezyang/htmlpurifier)
-=============
-
-HTML Purifier is an HTML filtering solution that uses a unique combination
-of robust whitelists and aggressive parsing to ensure that not only are
-XSS attacks thwarted, but the resulting HTML is standards compliant.
-
-HTML Purifier is oriented towards richly formatted documents from
-untrusted sources that require CSS and a full tag-set.  This library can
-be configured to accept a more restrictive set of tags, but it won't be
-as efficient as more bare-bones parsers. It will, however, do the job
-right, which may be more important.
-
-Places to go:
-
-* See INSTALL for a quick installation guide
-* See docs/ for developer-oriented documentation, code examples and
-  an in-depth installation guide.
-* See WYSIWYG for information on editors like TinyMCE and FCKeditor
-
-HTML Purifier can be found on the web at: [http://htmlpurifier.org/](http://htmlpurifier.org/)
-
-## Installation
-
-Package available on [Composer](https://packagist.org/packages/ezyang/htmlpurifier).
-
-If you're using Composer to manage dependencies, you can use
-
-    $ composer require ezyang/htmlpurifier
diff --git a/vendor/ezyang/htmlpurifier/VERSION b/vendor/ezyang/htmlpurifier/VERSION
deleted file mode 100644
index 01b73abe55..0000000000
--- a/vendor/ezyang/htmlpurifier/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-4.13.0
\ No newline at end of file
diff --git a/vendor/ezyang/htmlpurifier/composer.json b/vendor/ezyang/htmlpurifier/composer.json
deleted file mode 100644
index 0ff86b5df4..0000000000
--- a/vendor/ezyang/htmlpurifier/composer.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    "name": "ezyang/htmlpurifier",
-    "description": "Standards compliant HTML filter written in PHP",
-    "type": "library",
-    "keywords": ["html"],
-    "homepage": "http://htmlpurifier.org/",
-    "license": "LGPL-2.1-or-later",
-    "authors": [
-        {
-            "name": "Edward Z. Yang",
-            "email": "admin@htmlpurifier.org",
-            "homepage": "http://ezyang.com"
-        }
-    ],
-    "require": {
-        "php": ">=5.2"
-    },
-    "require-dev": {
-        "simpletest/simpletest": "dev-master#72de02a7b80c6bb8864ef9bf66d41d2f58f826bd"
-    },
-    "autoload": {
-        "psr-0": { "HTMLPurifier": "library/" },
-        "files": ["library/HTMLPurifier.composer.php"],
-        "exclude-from-classmap": [
-            "/library/HTMLPurifier/Language/"
-        ]
-    }
-}
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier.auto.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier.auto.php
deleted file mode 100644
index 1960c399f8..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier.auto.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-/**
- * This is a stub include that automatically configures the include path.
- */
-
-set_include_path(dirname(__FILE__) . PATH_SEPARATOR . get_include_path() );
-require_once 'HTMLPurifier/Bootstrap.php';
-require_once 'HTMLPurifier.autoload.php';
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier.autoload-legacy.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier.autoload-legacy.php
deleted file mode 100644
index c271cd1588..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier.autoload-legacy.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-/**
- * @file
- * Legacy autoloader for systems lacking spl_autoload_register
- *
- * Must be separate to prevent deprecation warning on PHP 7.2
- */
-
-function __autoload($class)
-{
-    return HTMLPurifier_Bootstrap::autoload($class);
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier.autoload.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier.autoload.php
deleted file mode 100644
index 9d8d299261..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier.autoload.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * @file
- * Convenience file that registers autoload handler for HTML Purifier.
- * It also does some sanity checks.
- */
-
-if (function_exists('spl_autoload_register') && function_exists('spl_autoload_unregister')) {
-    // We need unregister for our pre-registering functionality
-    HTMLPurifier_Bootstrap::registerAutoload();
-    if (function_exists('__autoload')) {
-        // Be polite and ensure that userland autoload gets retained
-        spl_autoload_register('__autoload');
-    }
-} elseif (!function_exists('__autoload')) {
-    require dirname(__FILE__) . '/HTMLPurifier.autoload-legacy.php';
-}
-
-if (ini_get('zend.ze1_compatibility_mode')) {
-    trigger_error("HTML Purifier is not compatible with zend.ze1_compatibility_mode; please turn it off", E_USER_ERROR);
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier.composer.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier.composer.php
deleted file mode 100644
index 52acc56b0d..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier.composer.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-if (!defined('HTMLPURIFIER_PREFIX')) {
-    define('HTMLPURIFIER_PREFIX', dirname(__FILE__));
-}
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier.func.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier.func.php
deleted file mode 100644
index 64b140bec2..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier.func.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * @file
- * Defines a function wrapper for HTML Purifier for quick use.
- * @note ''HTMLPurifier()'' is NOT the same as ''new HTMLPurifier()''
- */
-
-/**
- * Purify HTML.
- * @param string $html String HTML to purify
- * @param mixed $config Configuration to use, can be any value accepted by
- *        HTMLPurifier_Config::create()
- * @return string
- */
-function HTMLPurifier($html, $config = null)
-{
-    static $purifier = false;
-    if (!$purifier) {
-        $purifier = new HTMLPurifier();
-    }
-    return $purifier->purify($html, $config);
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier.includes.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier.includes.php
deleted file mode 100644
index 151e6752df..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier.includes.php
+++ /dev/null
@@ -1,234 +0,0 @@
-<?php
-
-/**
- * @file
- * This file was auto-generated by generate-includes.php and includes all of
- * the core files required by HTML Purifier. Use this if performance is a
- * primary concern and you are using an opcode cache. PLEASE DO NOT EDIT THIS
- * FILE, changes will be overwritten the next time the script is run.
- *
- * @version 4.13.0
- *
- * @warning
- *      You must *not* include any other HTML Purifier files before this file,
- *      because 'require' not 'require_once' is used.
- *
- * @warning
- *      This file requires that the include path contains the HTML Purifier
- *      library directory; this is not auto-set.
- */
-
-require 'HTMLPurifier.php';
-require 'HTMLPurifier/Arborize.php';
-require 'HTMLPurifier/AttrCollections.php';
-require 'HTMLPurifier/AttrDef.php';
-require 'HTMLPurifier/AttrTransform.php';
-require 'HTMLPurifier/AttrTypes.php';
-require 'HTMLPurifier/AttrValidator.php';
-require 'HTMLPurifier/Bootstrap.php';
-require 'HTMLPurifier/Definition.php';
-require 'HTMLPurifier/CSSDefinition.php';
-require 'HTMLPurifier/ChildDef.php';
-require 'HTMLPurifier/Config.php';
-require 'HTMLPurifier/ConfigSchema.php';
-require 'HTMLPurifier/ContentSets.php';
-require 'HTMLPurifier/Context.php';
-require 'HTMLPurifier/DefinitionCache.php';
-require 'HTMLPurifier/DefinitionCacheFactory.php';
-require 'HTMLPurifier/Doctype.php';
-require 'HTMLPurifier/DoctypeRegistry.php';
-require 'HTMLPurifier/ElementDef.php';
-require 'HTMLPurifier/Encoder.php';
-require 'HTMLPurifier/EntityLookup.php';
-require 'HTMLPurifier/EntityParser.php';
-require 'HTMLPurifier/ErrorCollector.php';
-require 'HTMLPurifier/ErrorStruct.php';
-require 'HTMLPurifier/Exception.php';
-require 'HTMLPurifier/Filter.php';
-require 'HTMLPurifier/Generator.php';
-require 'HTMLPurifier/HTMLDefinition.php';
-require 'HTMLPurifier/HTMLModule.php';
-require 'HTMLPurifier/HTMLModuleManager.php';
-require 'HTMLPurifier/IDAccumulator.php';
-require 'HTMLPurifier/Injector.php';
-require 'HTMLPurifier/Language.php';
-require 'HTMLPurifier/LanguageFactory.php';
-require 'HTMLPurifier/Length.php';
-require 'HTMLPurifier/Lexer.php';
-require 'HTMLPurifier/Node.php';
-require 'HTMLPurifier/PercentEncoder.php';
-require 'HTMLPurifier/PropertyList.php';
-require 'HTMLPurifier/PropertyListIterator.php';
-require 'HTMLPurifier/Queue.php';
-require 'HTMLPurifier/Strategy.php';
-require 'HTMLPurifier/StringHash.php';
-require 'HTMLPurifier/StringHashParser.php';
-require 'HTMLPurifier/TagTransform.php';
-require 'HTMLPurifier/Token.php';
-require 'HTMLPurifier/TokenFactory.php';
-require 'HTMLPurifier/URI.php';
-require 'HTMLPurifier/URIDefinition.php';
-require 'HTMLPurifier/URIFilter.php';
-require 'HTMLPurifier/URIParser.php';
-require 'HTMLPurifier/URIScheme.php';
-require 'HTMLPurifier/URISchemeRegistry.php';
-require 'HTMLPurifier/UnitConverter.php';
-require 'HTMLPurifier/VarParser.php';
-require 'HTMLPurifier/VarParserException.php';
-require 'HTMLPurifier/Zipper.php';
-require 'HTMLPurifier/AttrDef/CSS.php';
-require 'HTMLPurifier/AttrDef/Clone.php';
-require 'HTMLPurifier/AttrDef/Enum.php';
-require 'HTMLPurifier/AttrDef/Integer.php';
-require 'HTMLPurifier/AttrDef/Lang.php';
-require 'HTMLPurifier/AttrDef/Switch.php';
-require 'HTMLPurifier/AttrDef/Text.php';
-require 'HTMLPurifier/AttrDef/URI.php';
-require 'HTMLPurifier/AttrDef/CSS/Number.php';
-require 'HTMLPurifier/AttrDef/CSS/AlphaValue.php';
-require 'HTMLPurifier/AttrDef/CSS/Background.php';
-require 'HTMLPurifier/AttrDef/CSS/BackgroundPosition.php';
-require 'HTMLPurifier/AttrDef/CSS/Border.php';
-require 'HTMLPurifier/AttrDef/CSS/Color.php';
-require 'HTMLPurifier/AttrDef/CSS/Composite.php';
-require 'HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php';
-require 'HTMLPurifier/AttrDef/CSS/Filter.php';
-require 'HTMLPurifier/AttrDef/CSS/Font.php';
-require 'HTMLPurifier/AttrDef/CSS/FontFamily.php';
-require 'HTMLPurifier/AttrDef/CSS/Ident.php';
-require 'HTMLPurifier/AttrDef/CSS/ImportantDecorator.php';
-require 'HTMLPurifier/AttrDef/CSS/Length.php';
-require 'HTMLPurifier/AttrDef/CSS/ListStyle.php';
-require 'HTMLPurifier/AttrDef/CSS/Multiple.php';
-require 'HTMLPurifier/AttrDef/CSS/Percentage.php';
-require 'HTMLPurifier/AttrDef/CSS/TextDecoration.php';
-require 'HTMLPurifier/AttrDef/CSS/URI.php';
-require 'HTMLPurifier/AttrDef/HTML/Bool.php';
-require 'HTMLPurifier/AttrDef/HTML/Nmtokens.php';
-require 'HTMLPurifier/AttrDef/HTML/Class.php';
-require 'HTMLPurifier/AttrDef/HTML/Color.php';
-require 'HTMLPurifier/AttrDef/HTML/FrameTarget.php';
-require 'HTMLPurifier/AttrDef/HTML/ID.php';
-require 'HTMLPurifier/AttrDef/HTML/Pixels.php';
-require 'HTMLPurifier/AttrDef/HTML/Length.php';
-require 'HTMLPurifier/AttrDef/HTML/LinkTypes.php';
-require 'HTMLPurifier/AttrDef/HTML/MultiLength.php';
-require 'HTMLPurifier/AttrDef/URI/Email.php';
-require 'HTMLPurifier/AttrDef/URI/Host.php';
-require 'HTMLPurifier/AttrDef/URI/IPv4.php';
-require 'HTMLPurifier/AttrDef/URI/IPv6.php';
-require 'HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php';
-require 'HTMLPurifier/AttrTransform/Background.php';
-require 'HTMLPurifier/AttrTransform/BdoDir.php';
-require 'HTMLPurifier/AttrTransform/BgColor.php';
-require 'HTMLPurifier/AttrTransform/BoolToCSS.php';
-require 'HTMLPurifier/AttrTransform/Border.php';
-require 'HTMLPurifier/AttrTransform/EnumToCSS.php';
-require 'HTMLPurifier/AttrTransform/ImgRequired.php';
-require 'HTMLPurifier/AttrTransform/ImgSpace.php';
-require 'HTMLPurifier/AttrTransform/Input.php';
-require 'HTMLPurifier/AttrTransform/Lang.php';
-require 'HTMLPurifier/AttrTransform/Length.php';
-require 'HTMLPurifier/AttrTransform/Name.php';
-require 'HTMLPurifier/AttrTransform/NameSync.php';
-require 'HTMLPurifier/AttrTransform/Nofollow.php';
-require 'HTMLPurifier/AttrTransform/SafeEmbed.php';
-require 'HTMLPurifier/AttrTransform/SafeObject.php';
-require 'HTMLPurifier/AttrTransform/SafeParam.php';
-require 'HTMLPurifier/AttrTransform/ScriptRequired.php';
-require 'HTMLPurifier/AttrTransform/TargetBlank.php';
-require 'HTMLPurifier/AttrTransform/TargetNoopener.php';
-require 'HTMLPurifier/AttrTransform/TargetNoreferrer.php';
-require 'HTMLPurifier/AttrTransform/Textarea.php';
-require 'HTMLPurifier/ChildDef/Chameleon.php';
-require 'HTMLPurifier/ChildDef/Custom.php';
-require 'HTMLPurifier/ChildDef/Empty.php';
-require 'HTMLPurifier/ChildDef/List.php';
-require 'HTMLPurifier/ChildDef/Required.php';
-require 'HTMLPurifier/ChildDef/Optional.php';
-require 'HTMLPurifier/ChildDef/StrictBlockquote.php';
-require 'HTMLPurifier/ChildDef/Table.php';
-require 'HTMLPurifier/DefinitionCache/Decorator.php';
-require 'HTMLPurifier/DefinitionCache/Null.php';
-require 'HTMLPurifier/DefinitionCache/Serializer.php';
-require 'HTMLPurifier/DefinitionCache/Decorator/Cleanup.php';
-require 'HTMLPurifier/DefinitionCache/Decorator/Memory.php';
-require 'HTMLPurifier/HTMLModule/Bdo.php';
-require 'HTMLPurifier/HTMLModule/CommonAttributes.php';
-require 'HTMLPurifier/HTMLModule/Edit.php';
-require 'HTMLPurifier/HTMLModule/Forms.php';
-require 'HTMLPurifier/HTMLModule/Hypertext.php';
-require 'HTMLPurifier/HTMLModule/Iframe.php';
-require 'HTMLPurifier/HTMLModule/Image.php';
-require 'HTMLPurifier/HTMLModule/Legacy.php';
-require 'HTMLPurifier/HTMLModule/List.php';
-require 'HTMLPurifier/HTMLModule/Name.php';
-require 'HTMLPurifier/HTMLModule/Nofollow.php';
-require 'HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php';
-require 'HTMLPurifier/HTMLModule/Object.php';
-require 'HTMLPurifier/HTMLModule/Presentation.php';
-require 'HTMLPurifier/HTMLModule/Proprietary.php';
-require 'HTMLPurifier/HTMLModule/Ruby.php';
-require 'HTMLPurifier/HTMLModule/SafeEmbed.php';
-require 'HTMLPurifier/HTMLModule/SafeObject.php';
-require 'HTMLPurifier/HTMLModule/SafeScripting.php';
-require 'HTMLPurifier/HTMLModule/Scripting.php';
-require 'HTMLPurifier/HTMLModule/StyleAttribute.php';
-require 'HTMLPurifier/HTMLModule/Tables.php';
-require 'HTMLPurifier/HTMLModule/Target.php';
-require 'HTMLPurifier/HTMLModule/TargetBlank.php';
-require 'HTMLPurifier/HTMLModule/TargetNoopener.php';
-require 'HTMLPurifier/HTMLModule/TargetNoreferrer.php';
-require 'HTMLPurifier/HTMLModule/Text.php';
-require 'HTMLPurifier/HTMLModule/Tidy.php';
-require 'HTMLPurifier/HTMLModule/XMLCommonAttributes.php';
-require 'HTMLPurifier/HTMLModule/Tidy/Name.php';
-require 'HTMLPurifier/HTMLModule/Tidy/Proprietary.php';
-require 'HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php';
-require 'HTMLPurifier/HTMLModule/Tidy/Strict.php';
-require 'HTMLPurifier/HTMLModule/Tidy/Transitional.php';
-require 'HTMLPurifier/HTMLModule/Tidy/XHTML.php';
-require 'HTMLPurifier/Injector/AutoParagraph.php';
-require 'HTMLPurifier/Injector/DisplayLinkURI.php';
-require 'HTMLPurifier/Injector/Linkify.php';
-require 'HTMLPurifier/Injector/PurifierLinkify.php';
-require 'HTMLPurifier/Injector/RemoveEmpty.php';
-require 'HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php';
-require 'HTMLPurifier/Injector/SafeObject.php';
-require 'HTMLPurifier/Lexer/DOMLex.php';
-require 'HTMLPurifier/Lexer/DirectLex.php';
-require 'HTMLPurifier/Node/Comment.php';
-require 'HTMLPurifier/Node/Element.php';
-require 'HTMLPurifier/Node/Text.php';
-require 'HTMLPurifier/Strategy/Composite.php';
-require 'HTMLPurifier/Strategy/Core.php';
-require 'HTMLPurifier/Strategy/FixNesting.php';
-require 'HTMLPurifier/Strategy/MakeWellFormed.php';
-require 'HTMLPurifier/Strategy/RemoveForeignElements.php';
-require 'HTMLPurifier/Strategy/ValidateAttributes.php';
-require 'HTMLPurifier/TagTransform/Font.php';
-require 'HTMLPurifier/TagTransform/Simple.php';
-require 'HTMLPurifier/Token/Comment.php';
-require 'HTMLPurifier/Token/Tag.php';
-require 'HTMLPurifier/Token/Empty.php';
-require 'HTMLPurifier/Token/End.php';
-require 'HTMLPurifier/Token/Start.php';
-require 'HTMLPurifier/Token/Text.php';
-require 'HTMLPurifier/URIFilter/DisableExternal.php';
-require 'HTMLPurifier/URIFilter/DisableExternalResources.php';
-require 'HTMLPurifier/URIFilter/DisableResources.php';
-require 'HTMLPurifier/URIFilter/HostBlacklist.php';
-require 'HTMLPurifier/URIFilter/MakeAbsolute.php';
-require 'HTMLPurifier/URIFilter/Munge.php';
-require 'HTMLPurifier/URIFilter/SafeIframe.php';
-require 'HTMLPurifier/URIScheme/data.php';
-require 'HTMLPurifier/URIScheme/file.php';
-require 'HTMLPurifier/URIScheme/ftp.php';
-require 'HTMLPurifier/URIScheme/http.php';
-require 'HTMLPurifier/URIScheme/https.php';
-require 'HTMLPurifier/URIScheme/mailto.php';
-require 'HTMLPurifier/URIScheme/news.php';
-require 'HTMLPurifier/URIScheme/nntp.php';
-require 'HTMLPurifier/URIScheme/tel.php';
-require 'HTMLPurifier/VarParser/Flexible.php';
-require 'HTMLPurifier/VarParser/Native.php';
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier.kses.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier.kses.php
deleted file mode 100644
index 752290077f..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier.kses.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/**
- * @file
- * Emulation layer for code that used kses(), substituting in HTML Purifier.
- */
-
-require_once dirname(__FILE__) . '/HTMLPurifier.auto.php';
-
-function kses($string, $allowed_html, $allowed_protocols = null)
-{
-    $config = HTMLPurifier_Config::createDefault();
-    $allowed_elements = array();
-    $allowed_attributes = array();
-    foreach ($allowed_html as $element => $attributes) {
-        $allowed_elements[$element] = true;
-        foreach ($attributes as $attribute => $x) {
-            $allowed_attributes["$element.$attribute"] = true;
-        }
-    }
-    $config->set('HTML.AllowedElements', $allowed_elements);
-    $config->set('HTML.AllowedAttributes', $allowed_attributes);
-    if ($allowed_protocols !== null) {
-        $config->set('URI.AllowedSchemes', $allowed_protocols);
-    }
-    $purifier = new HTMLPurifier($config);
-    return $purifier->purify($string);
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier.path.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier.path.php
deleted file mode 100644
index 39b1b65319..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier.path.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-/**
- * @file
- * Convenience stub file that adds HTML Purifier's library file to the path
- * without any other side-effects.
- */
-
-set_include_path(dirname(__FILE__) . PATH_SEPARATOR . get_include_path() );
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier.php
deleted file mode 100644
index 3c0f8a0ece..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier.php
+++ /dev/null
@@ -1,297 +0,0 @@
-<?php
-
-/*! @mainpage
- *
- * HTML Purifier is an HTML filter that will take an arbitrary snippet of
- * HTML and rigorously test, validate and filter it into a version that
- * is safe for output onto webpages. It achieves this by:
- *
- *  -# Lexing (parsing into tokens) the document,
- *  -# Executing various strategies on the tokens:
- *      -# Removing all elements not in the whitelist,
- *      -# Making the tokens well-formed,
- *      -# Fixing the nesting of the nodes, and
- *      -# Validating attributes of the nodes; and
- *  -# Generating HTML from the purified tokens.
- *
- * However, most users will only need to interface with the HTMLPurifier
- * and HTMLPurifier_Config.
- */
-
-/*
-    HTML Purifier 4.13.0 - Standards Compliant HTML Filtering
-    Copyright (C) 2006-2008 Edward Z. Yang
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-/**
- * Facade that coordinates HTML Purifier's subsystems in order to purify HTML.
- *
- * @note There are several points in which configuration can be specified
- *       for HTML Purifier.  The precedence of these (from lowest to
- *       highest) is as follows:
- *          -# Instance: new HTMLPurifier($config)
- *          -# Invocation: purify($html, $config)
- *       These configurations are entirely independent of each other and
- *       are *not* merged (this behavior may change in the future).
- *
- * @todo We need an easier way to inject strategies using the configuration
- *       object.
- */
-class HTMLPurifier
-{
-
-    /**
-     * Version of HTML Purifier.
-     * @type string
-     */
-    public $version = '4.13.0';
-
-    /**
-     * Constant with version of HTML Purifier.
-     */
-    const VERSION = '4.13.0';
-
-    /**
-     * Global configuration object.
-     * @type HTMLPurifier_Config
-     */
-    public $config;
-
-    /**
-     * Array of extra filter objects to run on HTML,
-     * for backwards compatibility.
-     * @type HTMLPurifier_Filter[]
-     */
-    private $filters = array();
-
-    /**
-     * Single instance of HTML Purifier.
-     * @type HTMLPurifier
-     */
-    private static $instance;
-
-    /**
-     * @type HTMLPurifier_Strategy_Core
-     */
-    protected $strategy;
-
-    /**
-     * @type HTMLPurifier_Generator
-     */
-    protected $generator;
-
-    /**
-     * Resultant context of last run purification.
-     * Is an array of contexts if the last called method was purifyArray().
-     * @type HTMLPurifier_Context
-     */
-    public $context;
-
-    /**
-     * Initializes the purifier.
-     *
-     * @param HTMLPurifier_Config|mixed $config Optional HTMLPurifier_Config object
-     *                for all instances of the purifier, if omitted, a default
-     *                configuration is supplied (which can be overridden on a
-     *                per-use basis).
-     *                The parameter can also be any type that
-     *                HTMLPurifier_Config::create() supports.
-     */
-    public function __construct($config = null)
-    {
-        $this->config = HTMLPurifier_Config::create($config);
-        $this->strategy = new HTMLPurifier_Strategy_Core();
-    }
-
-    /**
-     * Adds a filter to process the output. First come first serve
-     *
-     * @param HTMLPurifier_Filter $filter HTMLPurifier_Filter object
-     */
-    public function addFilter($filter)
-    {
-        trigger_error(
-            'HTMLPurifier->addFilter() is deprecated, use configuration directives' .
-            ' in the Filter namespace or Filter.Custom',
-            E_USER_WARNING
-        );
-        $this->filters[] = $filter;
-    }
-
-    /**
-     * Filters an HTML snippet/document to be XSS-free and standards-compliant.
-     *
-     * @param string $html String of HTML to purify
-     * @param HTMLPurifier_Config $config Config object for this operation,
-     *                if omitted, defaults to the config object specified during this
-     *                object's construction. The parameter can also be any type
-     *                that HTMLPurifier_Config::create() supports.
-     *
-     * @return string Purified HTML
-     */
-    public function purify($html, $config = null)
-    {
-        // :TODO: make the config merge in, instead of replace
-        $config = $config ? HTMLPurifier_Config::create($config) : $this->config;
-
-        // implementation is partially environment dependant, partially
-        // configuration dependant
-        $lexer = HTMLPurifier_Lexer::create($config);
-
-        $context = new HTMLPurifier_Context();
-
-        // setup HTML generator
-        $this->generator = new HTMLPurifier_Generator($config, $context);
-        $context->register('Generator', $this->generator);
-
-        // set up global context variables
-        if ($config->get('Core.CollectErrors')) {
-            // may get moved out if other facilities use it
-            $language_factory = HTMLPurifier_LanguageFactory::instance();
-            $language = $language_factory->create($config, $context);
-            $context->register('Locale', $language);
-
-            $error_collector = new HTMLPurifier_ErrorCollector($context);
-            $context->register('ErrorCollector', $error_collector);
-        }
-
-        // setup id_accumulator context, necessary due to the fact that
-        // AttrValidator can be called from many places
-        $id_accumulator = HTMLPurifier_IDAccumulator::build($config, $context);
-        $context->register('IDAccumulator', $id_accumulator);
-
-        $html = HTMLPurifier_Encoder::convertToUTF8($html, $config, $context);
-
-        // setup filters
-        $filter_flags = $config->getBatch('Filter');
-        $custom_filters = $filter_flags['Custom'];
-        unset($filter_flags['Custom']);
-        $filters = array();
-        foreach ($filter_flags as $filter => $flag) {
-            if (!$flag) {
-                continue;
-            }
-            if (strpos($filter, '.') !== false) {
-                continue;
-            }
-            $class = "HTMLPurifier_Filter_$filter";
-            $filters[] = new $class;
-        }
-        foreach ($custom_filters as $filter) {
-            // maybe "HTMLPurifier_Filter_$filter", but be consistent with AutoFormat
-            $filters[] = $filter;
-        }
-        $filters = array_merge($filters, $this->filters);
-        // maybe prepare(), but later
-
-        for ($i = 0, $filter_size = count($filters); $i < $filter_size; $i++) {
-            $html = $filters[$i]->preFilter($html, $config, $context);
-        }
-
-        // purified HTML
-        $html =
-            $this->generator->generateFromTokens(
-                // list of tokens
-                $this->strategy->execute(
-                    // list of un-purified tokens
-                    $lexer->tokenizeHTML(
-                        // un-purified HTML
-                        $html,
-                        $config,
-                        $context
-                    ),
-                    $config,
-                    $context
-                )
-            );
-
-        for ($i = $filter_size - 1; $i >= 0; $i--) {
-            $html = $filters[$i]->postFilter($html, $config, $context);
-        }
-
-        $html = HTMLPurifier_Encoder::convertFromUTF8($html, $config, $context);
-        $this->context =& $context;
-        return $html;
-    }
-
-    /**
-     * Filters an array of HTML snippets
-     *
-     * @param string[] $array_of_html Array of html snippets
-     * @param HTMLPurifier_Config $config Optional config object for this operation.
-     *                See HTMLPurifier::purify() for more details.
-     *
-     * @return string[] Array of purified HTML
-     */
-    public function purifyArray($array_of_html, $config = null)
-    {
-        $context_array = array();
-        $array = array();
-        foreach($array_of_html as $key=>$value){
-            if (is_array($value)) {
-                $array[$key] = $this->purifyArray($value, $config);
-            } else {
-                $array[$key] = $this->purify($value, $config);
-            }
-            $context_array[$key] = $this->context;
-        }
-        $this->context = $context_array;
-        return $array;
-    }
-
-    /**
-     * Singleton for enforcing just one HTML Purifier in your system
-     *
-     * @param HTMLPurifier|HTMLPurifier_Config $prototype Optional prototype
-     *                   HTMLPurifier instance to overload singleton with,
-     *                   or HTMLPurifier_Config instance to configure the
-     *                   generated version with.
-     *
-     * @return HTMLPurifier
-     */
-    public static function instance($prototype = null)
-    {
-        if (!self::$instance || $prototype) {
-            if ($prototype instanceof HTMLPurifier) {
-                self::$instance = $prototype;
-            } elseif ($prototype) {
-                self::$instance = new HTMLPurifier($prototype);
-            } else {
-                self::$instance = new HTMLPurifier();
-            }
-        }
-        return self::$instance;
-    }
-
-    /**
-     * Singleton for enforcing just one HTML Purifier in your system
-     *
-     * @param HTMLPurifier|HTMLPurifier_Config $prototype Optional prototype
-     *                   HTMLPurifier instance to overload singleton with,
-     *                   or HTMLPurifier_Config instance to configure the
-     *                   generated version with.
-     *
-     * @return HTMLPurifier
-     * @note Backwards compatibility, see instance()
-     */
-    public static function getInstance($prototype = null)
-    {
-        return HTMLPurifier::instance($prototype);
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier.safe-includes.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier.safe-includes.php
deleted file mode 100644
index a3261f8a32..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier.safe-includes.php
+++ /dev/null
@@ -1,228 +0,0 @@
-<?php
-
-/**
- * @file
- * This file was auto-generated by generate-includes.php and includes all of
- * the core files required by HTML Purifier. This is a convenience stub that
- * includes all files using dirname(__FILE__) and require_once. PLEASE DO NOT
- * EDIT THIS FILE, changes will be overwritten the next time the script is run.
- *
- * Changes to include_path are not necessary.
- */
-
-$__dir = dirname(__FILE__);
-
-require_once $__dir . '/HTMLPurifier.php';
-require_once $__dir . '/HTMLPurifier/Arborize.php';
-require_once $__dir . '/HTMLPurifier/AttrCollections.php';
-require_once $__dir . '/HTMLPurifier/AttrDef.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform.php';
-require_once $__dir . '/HTMLPurifier/AttrTypes.php';
-require_once $__dir . '/HTMLPurifier/AttrValidator.php';
-require_once $__dir . '/HTMLPurifier/Bootstrap.php';
-require_once $__dir . '/HTMLPurifier/Definition.php';
-require_once $__dir . '/HTMLPurifier/CSSDefinition.php';
-require_once $__dir . '/HTMLPurifier/ChildDef.php';
-require_once $__dir . '/HTMLPurifier/Config.php';
-require_once $__dir . '/HTMLPurifier/ConfigSchema.php';
-require_once $__dir . '/HTMLPurifier/ContentSets.php';
-require_once $__dir . '/HTMLPurifier/Context.php';
-require_once $__dir . '/HTMLPurifier/DefinitionCache.php';
-require_once $__dir . '/HTMLPurifier/DefinitionCacheFactory.php';
-require_once $__dir . '/HTMLPurifier/Doctype.php';
-require_once $__dir . '/HTMLPurifier/DoctypeRegistry.php';
-require_once $__dir . '/HTMLPurifier/ElementDef.php';
-require_once $__dir . '/HTMLPurifier/Encoder.php';
-require_once $__dir . '/HTMLPurifier/EntityLookup.php';
-require_once $__dir . '/HTMLPurifier/EntityParser.php';
-require_once $__dir . '/HTMLPurifier/ErrorCollector.php';
-require_once $__dir . '/HTMLPurifier/ErrorStruct.php';
-require_once $__dir . '/HTMLPurifier/Exception.php';
-require_once $__dir . '/HTMLPurifier/Filter.php';
-require_once $__dir . '/HTMLPurifier/Generator.php';
-require_once $__dir . '/HTMLPurifier/HTMLDefinition.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule.php';
-require_once $__dir . '/HTMLPurifier/HTMLModuleManager.php';
-require_once $__dir . '/HTMLPurifier/IDAccumulator.php';
-require_once $__dir . '/HTMLPurifier/Injector.php';
-require_once $__dir . '/HTMLPurifier/Language.php';
-require_once $__dir . '/HTMLPurifier/LanguageFactory.php';
-require_once $__dir . '/HTMLPurifier/Length.php';
-require_once $__dir . '/HTMLPurifier/Lexer.php';
-require_once $__dir . '/HTMLPurifier/Node.php';
-require_once $__dir . '/HTMLPurifier/PercentEncoder.php';
-require_once $__dir . '/HTMLPurifier/PropertyList.php';
-require_once $__dir . '/HTMLPurifier/PropertyListIterator.php';
-require_once $__dir . '/HTMLPurifier/Queue.php';
-require_once $__dir . '/HTMLPurifier/Strategy.php';
-require_once $__dir . '/HTMLPurifier/StringHash.php';
-require_once $__dir . '/HTMLPurifier/StringHashParser.php';
-require_once $__dir . '/HTMLPurifier/TagTransform.php';
-require_once $__dir . '/HTMLPurifier/Token.php';
-require_once $__dir . '/HTMLPurifier/TokenFactory.php';
-require_once $__dir . '/HTMLPurifier/URI.php';
-require_once $__dir . '/HTMLPurifier/URIDefinition.php';
-require_once $__dir . '/HTMLPurifier/URIFilter.php';
-require_once $__dir . '/HTMLPurifier/URIParser.php';
-require_once $__dir . '/HTMLPurifier/URIScheme.php';
-require_once $__dir . '/HTMLPurifier/URISchemeRegistry.php';
-require_once $__dir . '/HTMLPurifier/UnitConverter.php';
-require_once $__dir . '/HTMLPurifier/VarParser.php';
-require_once $__dir . '/HTMLPurifier/VarParserException.php';
-require_once $__dir . '/HTMLPurifier/Zipper.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/Clone.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/Enum.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/Integer.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/Lang.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/Switch.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/Text.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/URI.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Number.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/AlphaValue.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Background.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Border.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Color.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Composite.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Filter.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Font.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/FontFamily.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Ident.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Length.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/ListStyle.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Multiple.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Percentage.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/TextDecoration.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/URI.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Bool.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Nmtokens.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Class.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Color.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/FrameTarget.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/ID.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Pixels.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Length.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/LinkTypes.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/MultiLength.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/URI/Email.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/URI/Host.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/URI/IPv4.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/URI/IPv6.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/Background.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/BdoDir.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/BgColor.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/BoolToCSS.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/Border.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/EnumToCSS.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/ImgRequired.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/ImgSpace.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/Input.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/Lang.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/Length.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/Name.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/NameSync.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/Nofollow.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/SafeEmbed.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/SafeObject.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/SafeParam.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/ScriptRequired.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/TargetBlank.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/TargetNoopener.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/TargetNoreferrer.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/Textarea.php';
-require_once $__dir . '/HTMLPurifier/ChildDef/Chameleon.php';
-require_once $__dir . '/HTMLPurifier/ChildDef/Custom.php';
-require_once $__dir . '/HTMLPurifier/ChildDef/Empty.php';
-require_once $__dir . '/HTMLPurifier/ChildDef/List.php';
-require_once $__dir . '/HTMLPurifier/ChildDef/Required.php';
-require_once $__dir . '/HTMLPurifier/ChildDef/Optional.php';
-require_once $__dir . '/HTMLPurifier/ChildDef/StrictBlockquote.php';
-require_once $__dir . '/HTMLPurifier/ChildDef/Table.php';
-require_once $__dir . '/HTMLPurifier/DefinitionCache/Decorator.php';
-require_once $__dir . '/HTMLPurifier/DefinitionCache/Null.php';
-require_once $__dir . '/HTMLPurifier/DefinitionCache/Serializer.php';
-require_once $__dir . '/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php';
-require_once $__dir . '/HTMLPurifier/DefinitionCache/Decorator/Memory.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Bdo.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/CommonAttributes.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Edit.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Forms.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Hypertext.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Iframe.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Image.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Legacy.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/List.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Name.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Nofollow.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Object.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Presentation.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Proprietary.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Ruby.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/SafeEmbed.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/SafeObject.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/SafeScripting.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Scripting.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/StyleAttribute.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Tables.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Target.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/TargetBlank.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/TargetNoopener.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/TargetNoreferrer.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Text.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/XMLCommonAttributes.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/Name.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/Proprietary.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/Strict.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/Transitional.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/XHTML.php';
-require_once $__dir . '/HTMLPurifier/Injector/AutoParagraph.php';
-require_once $__dir . '/HTMLPurifier/Injector/DisplayLinkURI.php';
-require_once $__dir . '/HTMLPurifier/Injector/Linkify.php';
-require_once $__dir . '/HTMLPurifier/Injector/PurifierLinkify.php';
-require_once $__dir . '/HTMLPurifier/Injector/RemoveEmpty.php';
-require_once $__dir . '/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php';
-require_once $__dir . '/HTMLPurifier/Injector/SafeObject.php';
-require_once $__dir . '/HTMLPurifier/Lexer/DOMLex.php';
-require_once $__dir . '/HTMLPurifier/Lexer/DirectLex.php';
-require_once $__dir . '/HTMLPurifier/Node/Comment.php';
-require_once $__dir . '/HTMLPurifier/Node/Element.php';
-require_once $__dir . '/HTMLPurifier/Node/Text.php';
-require_once $__dir . '/HTMLPurifier/Strategy/Composite.php';
-require_once $__dir . '/HTMLPurifier/Strategy/Core.php';
-require_once $__dir . '/HTMLPurifier/Strategy/FixNesting.php';
-require_once $__dir . '/HTMLPurifier/Strategy/MakeWellFormed.php';
-require_once $__dir . '/HTMLPurifier/Strategy/RemoveForeignElements.php';
-require_once $__dir . '/HTMLPurifier/Strategy/ValidateAttributes.php';
-require_once $__dir . '/HTMLPurifier/TagTransform/Font.php';
-require_once $__dir . '/HTMLPurifier/TagTransform/Simple.php';
-require_once $__dir . '/HTMLPurifier/Token/Comment.php';
-require_once $__dir . '/HTMLPurifier/Token/Tag.php';
-require_once $__dir . '/HTMLPurifier/Token/Empty.php';
-require_once $__dir . '/HTMLPurifier/Token/End.php';
-require_once $__dir . '/HTMLPurifier/Token/Start.php';
-require_once $__dir . '/HTMLPurifier/Token/Text.php';
-require_once $__dir . '/HTMLPurifier/URIFilter/DisableExternal.php';
-require_once $__dir . '/HTMLPurifier/URIFilter/DisableExternalResources.php';
-require_once $__dir . '/HTMLPurifier/URIFilter/DisableResources.php';
-require_once $__dir . '/HTMLPurifier/URIFilter/HostBlacklist.php';
-require_once $__dir . '/HTMLPurifier/URIFilter/MakeAbsolute.php';
-require_once $__dir . '/HTMLPurifier/URIFilter/Munge.php';
-require_once $__dir . '/HTMLPurifier/URIFilter/SafeIframe.php';
-require_once $__dir . '/HTMLPurifier/URIScheme/data.php';
-require_once $__dir . '/HTMLPurifier/URIScheme/file.php';
-require_once $__dir . '/HTMLPurifier/URIScheme/ftp.php';
-require_once $__dir . '/HTMLPurifier/URIScheme/http.php';
-require_once $__dir . '/HTMLPurifier/URIScheme/https.php';
-require_once $__dir . '/HTMLPurifier/URIScheme/mailto.php';
-require_once $__dir . '/HTMLPurifier/URIScheme/news.php';
-require_once $__dir . '/HTMLPurifier/URIScheme/nntp.php';
-require_once $__dir . '/HTMLPurifier/URIScheme/tel.php';
-require_once $__dir . '/HTMLPurifier/VarParser/Flexible.php';
-require_once $__dir . '/HTMLPurifier/VarParser/Native.php';
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Arborize.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Arborize.php
deleted file mode 100644
index d2e9d22a20..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Arborize.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-/**
- * Converts a stream of HTMLPurifier_Token into an HTMLPurifier_Node,
- * and back again.
- *
- * @note This transformation is not an equivalence.  We mutate the input
- * token stream to make it so; see all [MUT] markers in code.
- */
-class HTMLPurifier_Arborize
-{
-    public static function arborize($tokens, $config, $context) {
-        $definition = $config->getHTMLDefinition();
-        $parent = new HTMLPurifier_Token_Start($definition->info_parent);
-        $stack = array($parent->toNode());
-        foreach ($tokens as $token) {
-            $token->skip = null; // [MUT]
-            $token->carryover = null; // [MUT]
-            if ($token instanceof HTMLPurifier_Token_End) {
-                $token->start = null; // [MUT]
-                $r = array_pop($stack);
-                //assert($r->name === $token->name);
-                //assert(empty($token->attr));
-                $r->endCol = $token->col;
-                $r->endLine = $token->line;
-                $r->endArmor = $token->armor;
-                continue;
-            }
-            $node = $token->toNode();
-            $stack[count($stack)-1]->children[] = $node;
-            if ($token instanceof HTMLPurifier_Token_Start) {
-                $stack[] = $node;
-            }
-        }
-        //assert(count($stack) == 1);
-        return $stack[0];
-    }
-
-    public static function flatten($node, $config, $context) {
-        $level = 0;
-        $nodes = array($level => new HTMLPurifier_Queue(array($node)));
-        $closingTokens = array();
-        $tokens = array();
-        do {
-            while (!$nodes[$level]->isEmpty()) {
-                $node = $nodes[$level]->shift(); // FIFO
-                list($start, $end) = $node->toTokenPair();
-                if ($level > 0) {
-                    $tokens[] = $start;
-                }
-                if ($end !== NULL) {
-                    $closingTokens[$level][] = $end;
-                }
-                if ($node instanceof HTMLPurifier_Node_Element) {
-                    $level++;
-                    $nodes[$level] = new HTMLPurifier_Queue();
-                    foreach ($node->children as $childNode) {
-                        $nodes[$level]->push($childNode);
-                    }
-                }
-            }
-            $level--;
-            if ($level && isset($closingTokens[$level])) {
-                while ($token = array_pop($closingTokens[$level])) {
-                    $tokens[] = $token;
-                }
-            }
-        } while ($level > 0);
-        return $tokens;
-    }
-}
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrCollections.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrCollections.php
deleted file mode 100644
index c7b17cf144..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrCollections.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-
-/**
- * Defines common attribute collections that modules reference
- */
-
-class HTMLPurifier_AttrCollections
-{
-
-    /**
-     * Associative array of attribute collections, indexed by name.
-     * @type array
-     */
-    public $info = array();
-
-    /**
-     * Performs all expansions on internal data for use by other inclusions
-     * It also collects all attribute collection extensions from
-     * modules
-     * @param HTMLPurifier_AttrTypes $attr_types HTMLPurifier_AttrTypes instance
-     * @param HTMLPurifier_HTMLModule[] $modules Hash array of HTMLPurifier_HTMLModule members
-     */
-    public function __construct($attr_types, $modules)
-    {
-        $this->doConstruct($attr_types, $modules);
-    }
-
-    public function doConstruct($attr_types, $modules)
-    {
-        // load extensions from the modules
-        foreach ($modules as $module) {
-            foreach ($module->attr_collections as $coll_i => $coll) {
-                if (!isset($this->info[$coll_i])) {
-                    $this->info[$coll_i] = array();
-                }
-                foreach ($coll as $attr_i => $attr) {
-                    if ($attr_i === 0 && isset($this->info[$coll_i][$attr_i])) {
-                        // merge in includes
-                        $this->info[$coll_i][$attr_i] = array_merge(
-                            $this->info[$coll_i][$attr_i],
-                            $attr
-                        );
-                        continue;
-                    }
-                    $this->info[$coll_i][$attr_i] = $attr;
-                }
-            }
-        }
-        // perform internal expansions and inclusions
-        foreach ($this->info as $name => $attr) {
-            // merge attribute collections that include others
-            $this->performInclusions($this->info[$name]);
-            // replace string identifiers with actual attribute objects
-            $this->expandIdentifiers($this->info[$name], $attr_types);
-        }
-    }
-
-    /**
-     * Takes a reference to an attribute associative array and performs
-     * all inclusions specified by the zero index.
-     * @param array &$attr Reference to attribute array
-     */
-    public function performInclusions(&$attr)
-    {
-        if (!isset($attr[0])) {
-            return;
-        }
-        $merge = $attr[0];
-        $seen  = array(); // recursion guard
-        // loop through all the inclusions
-        for ($i = 0; isset($merge[$i]); $i++) {
-            if (isset($seen[$merge[$i]])) {
-                continue;
-            }
-            $seen[$merge[$i]] = true;
-            // foreach attribute of the inclusion, copy it over
-            if (!isset($this->info[$merge[$i]])) {
-                continue;
-            }
-            foreach ($this->info[$merge[$i]] as $key => $value) {
-                if (isset($attr[$key])) {
-                    continue;
-                } // also catches more inclusions
-                $attr[$key] = $value;
-            }
-            if (isset($this->info[$merge[$i]][0])) {
-                // recursion
-                $merge = array_merge($merge, $this->info[$merge[$i]][0]);
-            }
-        }
-        unset($attr[0]);
-    }
-
-    /**
-     * Expands all string identifiers in an attribute array by replacing
-     * them with the appropriate values inside HTMLPurifier_AttrTypes
-     * @param array &$attr Reference to attribute array
-     * @param HTMLPurifier_AttrTypes $attr_types HTMLPurifier_AttrTypes instance
-     */
-    public function expandIdentifiers(&$attr, $attr_types)
-    {
-        // because foreach will process new elements we add, make sure we
-        // skip duplicates
-        $processed = array();
-
-        foreach ($attr as $def_i => $def) {
-            // skip inclusions
-            if ($def_i === 0) {
-                continue;
-            }
-
-            if (isset($processed[$def_i])) {
-                continue;
-            }
-
-            // determine whether or not attribute is required
-            if ($required = (strpos($def_i, '*') !== false)) {
-                // rename the definition
-                unset($attr[$def_i]);
-                $def_i = trim($def_i, '*');
-                $attr[$def_i] = $def;
-            }
-
-            $processed[$def_i] = true;
-
-            // if we've already got a literal object, move on
-            if (is_object($def)) {
-                // preserve previous required
-                $attr[$def_i]->required = ($required || $attr[$def_i]->required);
-                continue;
-            }
-
-            if ($def === false) {
-                unset($attr[$def_i]);
-                continue;
-            }
-
-            if ($t = $attr_types->get($def)) {
-                $attr[$def_i] = $t;
-                $attr[$def_i]->required = $required;
-            } else {
-                unset($attr[$def_i]);
-            }
-        }
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef.php
deleted file mode 100644
index 739646fa7c..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-
-/**
- * Base class for all validating attribute definitions.
- *
- * This family of classes forms the core for not only HTML attribute validation,
- * but also any sort of string that needs to be validated or cleaned (which
- * means CSS properties and composite definitions are defined here too).
- * Besides defining (through code) what precisely makes the string valid,
- * subclasses are also responsible for cleaning the code if possible.
- */
-
-abstract class HTMLPurifier_AttrDef
-{
-
-    /**
-     * Tells us whether or not an HTML attribute is minimized.
-     * Has no meaning in other contexts.
-     * @type bool
-     */
-    public $minimized = false;
-
-    /**
-     * Tells us whether or not an HTML attribute is required.
-     * Has no meaning in other contexts
-     * @type bool
-     */
-    public $required = false;
-
-    /**
-     * Validates and cleans passed string according to a definition.
-     *
-     * @param string $string String to be validated and cleaned.
-     * @param HTMLPurifier_Config $config Mandatory HTMLPurifier_Config object.
-     * @param HTMLPurifier_Context $context Mandatory HTMLPurifier_Context object.
-     */
-    abstract public function validate($string, $config, $context);
-
-    /**
-     * Convenience method that parses a string as if it were CDATA.
-     *
-     * This method process a string in the manner specified at
-     * <http://www.w3.org/TR/html4/types.html#h-6.2> by removing
-     * leading and trailing whitespace, ignoring line feeds, and replacing
-     * carriage returns and tabs with spaces.  While most useful for HTML
-     * attributes specified as CDATA, it can also be applied to most CSS
-     * values.
-     *
-     * @note This method is not entirely standards compliant, as trim() removes
-     *       more types of whitespace than specified in the spec. In practice,
-     *       this is rarely a problem, as those extra characters usually have
-     *       already been removed by HTMLPurifier_Encoder.
-     *
-     * @warning This processing is inconsistent with XML's whitespace handling
-     *          as specified by section 3.3.3 and referenced XHTML 1.0 section
-     *          4.7.  However, note that we are NOT necessarily
-     *          parsing XML, thus, this behavior may still be correct. We
-     *          assume that newlines have been normalized.
-     */
-    public function parseCDATA($string)
-    {
-        $string = trim($string);
-        $string = str_replace(array("\n", "\t", "\r"), ' ', $string);
-        return $string;
-    }
-
-    /**
-     * Factory method for creating this class from a string.
-     * @param string $string String construction info
-     * @return HTMLPurifier_AttrDef Created AttrDef object corresponding to $string
-     */
-    public function make($string)
-    {
-        // default implementation, return a flyweight of this object.
-        // If $string has an effect on the returned object (i.e. you
-        // need to overload this method), it is best
-        // to clone or instantiate new copies. (Instantiation is safer.)
-        return $this;
-    }
-
-    /**
-     * Removes spaces from rgb(0, 0, 0) so that shorthand CSS properties work
-     * properly. THIS IS A HACK!
-     * @param string $string a CSS colour definition
-     * @return string
-     */
-    protected function mungeRgb($string)
-    {
-        $p = '\s*(\d+(\.\d+)?([%]?))\s*';
-
-        if (preg_match('/(rgba|hsla)\(/', $string)) {
-            return preg_replace('/(rgba|hsla)\('.$p.','.$p.','.$p.','.$p.'\)/', '\1(\2,\5,\8,\11)', $string);
-        }
-
-        return preg_replace('/(rgb|hsl)\('.$p.','.$p.','.$p.'\)/', '\1(\2,\5,\8)', $string);
-    }
-
-    /**
-     * Parses a possibly escaped CSS string and returns the "pure"
-     * version of it.
-     */
-    protected function expandCSSEscape($string)
-    {
-        // flexibly parse it
-        $ret = '';
-        for ($i = 0, $c = strlen($string); $i < $c; $i++) {
-            if ($string[$i] === '\\') {
-                $i++;
-                if ($i >= $c) {
-                    $ret .= '\\';
-                    break;
-                }
-                if (ctype_xdigit($string[$i])) {
-                    $code = $string[$i];
-                    for ($a = 1, $i++; $i < $c && $a < 6; $i++, $a++) {
-                        if (!ctype_xdigit($string[$i])) {
-                            break;
-                        }
-                        $code .= $string[$i];
-                    }
-                    // We have to be extremely careful when adding
-                    // new characters, to make sure we're not breaking
-                    // the encoding.
-                    $char = HTMLPurifier_Encoder::unichr(hexdec($code));
-                    if (HTMLPurifier_Encoder::cleanUTF8($char) === '') {
-                        continue;
-                    }
-                    $ret .= $char;
-                    if ($i < $c && trim($string[$i]) !== '') {
-                        $i--;
-                    }
-                    continue;
-                }
-                if ($string[$i] === "\n") {
-                    continue;
-                }
-            }
-            $ret .= $string[$i];
-        }
-        return $ret;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS.php
deleted file mode 100644
index ad2cb90ad1..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-
-/**
- * Validates the HTML attribute style, otherwise known as CSS.
- * @note We don't implement the whole CSS specification, so it might be
- *       difficult to reuse this component in the context of validating
- *       actual stylesheet declarations.
- * @note If we were really serious about validating the CSS, we would
- *       tokenize the styles and then parse the tokens. Obviously, we
- *       are not doing that. Doing that could seriously harm performance,
- *       but would make these components a lot more viable for a CSS
- *       filtering solution.
- */
-class HTMLPurifier_AttrDef_CSS extends HTMLPurifier_AttrDef
-{
-
-    /**
-     * @param string $css
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($css, $config, $context)
-    {
-        $css = $this->parseCDATA($css);
-
-        $definition = $config->getCSSDefinition();
-        $allow_duplicates = $config->get("CSS.AllowDuplicates");
-
-
-        // According to the CSS2.1 spec, the places where a
-        // non-delimiting semicolon can appear are in strings
-        // escape sequences.   So here is some dumb hack to
-        // handle quotes.
-        $len = strlen($css);
-        $accum = "";
-        $declarations = array();
-        $quoted = false;
-        for ($i = 0; $i < $len; $i++) {
-            $c = strcspn($css, ";'\"", $i);
-            $accum .= substr($css, $i, $c);
-            $i += $c;
-            if ($i == $len) break;
-            $d = $css[$i];
-            if ($quoted) {
-                $accum .= $d;
-                if ($d == $quoted) {
-                    $quoted = false;
-                }
-            } else {
-                if ($d == ";") {
-                    $declarations[] = $accum;
-                    $accum = "";
-                } else {
-                    $accum .= $d;
-                    $quoted = $d;
-                }
-            }
-        }
-        if ($accum != "") $declarations[] = $accum;
-
-        $propvalues = array();
-        $new_declarations = '';
-
-        /**
-         * Name of the current CSS property being validated.
-         */
-        $property = false;
-        $context->register('CurrentCSSProperty', $property);
-
-        foreach ($declarations as $declaration) {
-            if (!$declaration) {
-                continue;
-            }
-            if (!strpos($declaration, ':')) {
-                continue;
-            }
-            list($property, $value) = explode(':', $declaration, 2);
-            $property = trim($property);
-            $value = trim($value);
-            $ok = false;
-            do {
-                if (isset($definition->info[$property])) {
-                    $ok = true;
-                    break;
-                }
-                if (ctype_lower($property)) {
-                    break;
-                }
-                $property = strtolower($property);
-                if (isset($definition->info[$property])) {
-                    $ok = true;
-                    break;
-                }
-            } while (0);
-            if (!$ok) {
-                continue;
-            }
-            // inefficient call, since the validator will do this again
-            if (strtolower(trim($value)) !== 'inherit') {
-                // inherit works for everything (but only on the base property)
-                $result = $definition->info[$property]->validate(
-                    $value,
-                    $config,
-                    $context
-                );
-            } else {
-                $result = 'inherit';
-            }
-            if ($result === false) {
-                continue;
-            }
-            if ($allow_duplicates) {
-                $new_declarations .= "$property:$result;";
-            } else {
-                $propvalues[$property] = $result;
-            }
-        }
-
-        $context->destroy('CurrentCSSProperty');
-
-        // procedure does not write the new CSS simultaneously, so it's
-        // slightly inefficient, but it's the only way of getting rid of
-        // duplicates. Perhaps config to optimize it, but not now.
-
-        foreach ($propvalues as $prop => $value) {
-            $new_declarations .= "$prop:$value;";
-        }
-
-        return $new_declarations ? $new_declarations : false;
-
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php
deleted file mode 100644
index af2b83dff8..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-class HTMLPurifier_AttrDef_CSS_AlphaValue extends HTMLPurifier_AttrDef_CSS_Number
-{
-
-    public function __construct()
-    {
-        parent::__construct(false); // opacity is non-negative, but we will clamp it
-    }
-
-    /**
-     * @param string $number
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return string
-     */
-    public function validate($number, $config, $context)
-    {
-        $result = parent::validate($number, $config, $context);
-        if ($result === false) {
-            return $result;
-        }
-        $float = (float)$result;
-        if ($float < 0.0) {
-            $result = '0';
-        }
-        if ($float > 1.0) {
-            $result = '1';
-        }
-        return $result;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Background.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Background.php
deleted file mode 100644
index 7f1ea3b0f1..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Background.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-/**
- * Validates shorthand CSS property background.
- * @warning Does not support url tokens that have internal spaces.
- */
-class HTMLPurifier_AttrDef_CSS_Background extends HTMLPurifier_AttrDef
-{
-
-    /**
-     * Local copy of component validators.
-     * @type HTMLPurifier_AttrDef[]
-     * @note See HTMLPurifier_AttrDef_Font::$info for a similar impl.
-     */
-    protected $info;
-
-    /**
-     * @param HTMLPurifier_Config $config
-     */
-    public function __construct($config)
-    {
-        $def = $config->getCSSDefinition();
-        $this->info['background-color'] = $def->info['background-color'];
-        $this->info['background-image'] = $def->info['background-image'];
-        $this->info['background-repeat'] = $def->info['background-repeat'];
-        $this->info['background-attachment'] = $def->info['background-attachment'];
-        $this->info['background-position'] = $def->info['background-position'];
-    }
-
-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
-        // regular pre-processing
-        $string = $this->parseCDATA($string);
-        if ($string === '') {
-            return false;
-        }
-
-        // munge rgb() decl if necessary
-        $string = $this->mungeRgb($string);
-
-        // assumes URI doesn't have spaces in it
-        $bits = explode(' ', $string); // bits to process
-
-        $caught = array();
-        $caught['color'] = false;
-        $caught['image'] = false;
-        $caught['repeat'] = false;
-        $caught['attachment'] = false;
-        $caught['position'] = false;
-
-        $i = 0; // number of catches
-
-        foreach ($bits as $bit) {
-            if ($bit === '') {
-                continue;
-            }
-            foreach ($caught as $key => $status) {
-                if ($key != 'position') {
-                    if ($status !== false) {
-                        continue;
-                    }
-                    $r = $this->info['background-' . $key]->validate($bit, $config, $context);
-                } else {
-                    $r = $bit;
-                }
-                if ($r === false) {
-                    continue;
-                }
-                if ($key == 'position') {
-                    if ($caught[$key] === false) {
-                        $caught[$key] = '';
-                    }
-                    $caught[$key] .= $r . ' ';
-                } else {
-                    $caught[$key] = $r;
-                }
-                $i++;
-                break;
-            }
-        }
-
-        if (!$i) {
-            return false;
-        }
-        if ($caught['position'] !== false) {
-            $caught['position'] = $this->info['background-position']->
-                validate($caught['position'], $config, $context);
-        }
-
-        $ret = array();
-        foreach ($caught as $value) {
-            if ($value === false) {
-                continue;
-            }
-            $ret[] = $value;
-        }
-
-        if (empty($ret)) {
-            return false;
-        }
-        return implode(' ', $ret);
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
deleted file mode 100644
index 4580ef5a91..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-
-/* W3C says:
-    [ // adjective and number must be in correct order, even if
-      // you could switch them without introducing ambiguity.
-      // some browsers support that syntax
-        [
-            <percentage> | <length> | left | center | right
-        ]
-        [
-            <percentage> | <length> | top | center | bottom
-        ]?
-    ] |
-    [ // this signifies that the vertical and horizontal adjectives
-      // can be arbitrarily ordered, however, there can only be two,
-      // one of each, or none at all
-        [
-            left | center | right
-        ] ||
-        [
-            top | center | bottom
-        ]
-    ]
-    top, left = 0%
-    center, (none) = 50%
-    bottom, right = 100%
-*/
-
-/* QuirksMode says:
-    keyword + length/percentage must be ordered correctly, as per W3C
-
-    Internet Explorer and Opera, however, support arbitrary ordering. We
-    should fix it up.
-
-    Minor issue though, not strictly necessary.
-*/
-
-// control freaks may appreciate the ability to convert these to
-// percentages or something, but it's not necessary
-
-/**
- * Validates the value of background-position.
- */
-class HTMLPurifier_AttrDef_CSS_BackgroundPosition extends HTMLPurifier_AttrDef
-{
-
-    /**
-     * @type HTMLPurifier_AttrDef_CSS_Length
-     */
-    protected $length;
-
-    /**
-     * @type HTMLPurifier_AttrDef_CSS_Percentage
-     */
-    protected $percentage;
-
-    public function __construct()
-    {
-        $this->length = new HTMLPurifier_AttrDef_CSS_Length();
-        $this->percentage = new HTMLPurifier_AttrDef_CSS_Percentage();
-    }
-
-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
-        $string = $this->parseCDATA($string);
-        $bits = explode(' ', $string);
-
-        $keywords = array();
-        $keywords['h'] = false; // left, right
-        $keywords['v'] = false; // top, bottom
-        $keywords['ch'] = false; // center (first word)
-        $keywords['cv'] = false; // center (second word)
-        $measures = array();
-
-        $i = 0;
-
-        $lookup = array(
-            'top' => 'v',
-            'bottom' => 'v',
-            'left' => 'h',
-            'right' => 'h',
-            'center' => 'c'
-        );
-
-        foreach ($bits as $bit) {
-            if ($bit === '') {
-                continue;
-            }
-
-            // test for keyword
-            $lbit = ctype_lower($bit) ? $bit : strtolower($bit);
-            if (isset($lookup[$lbit])) {
-                $status = $lookup[$lbit];
-                if ($status == 'c') {
-                    if ($i == 0) {
-                        $status = 'ch';
-                    } else {
-                        $status = 'cv';
-                    }
-                }
-                $keywords[$status] = $lbit;
-                $i++;
-            }
-
-            // test for length
-            $r = $this->length->validate($bit, $config, $context);
-            if ($r !== false) {
-                $measures[] = $r;
-                $i++;
-            }
-
-            // test for percentage
-            $r = $this->percentage->validate($bit, $config, $context);
-            if ($r !== false) {
-                $measures[] = $r;
-                $i++;
-            }
-        }
-
-        if (!$i) {
-            return false;
-        } // no valid values were caught
-
-        $ret = array();
-
-        // first keyword
-        if ($keywords['h']) {
-            $ret[] = $keywords['h'];
-        } elseif ($keywords['ch']) {
-            $ret[] = $keywords['ch'];
-            $keywords['cv'] = false; // prevent re-use: center = center center
-        } elseif (count($measures)) {
-            $ret[] = array_shift($measures);
-        }
-
-        if ($keywords['v']) {
-            $ret[] = $keywords['v'];
-        } elseif ($keywords['cv']) {
-            $ret[] = $keywords['cv'];
-        } elseif (count($measures)) {
-            $ret[] = array_shift($measures);
-        }
-
-        if (empty($ret)) {
-            return false;
-        }
-        return implode(' ', $ret);
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Border.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Border.php
deleted file mode 100644
index 16243ba1ed..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Border.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/**
- * Validates the border property as defined by CSS.
- */
-class HTMLPurifier_AttrDef_CSS_Border extends HTMLPurifier_AttrDef
-{
-
-    /**
-     * Local copy of properties this property is shorthand for.
-     * @type HTMLPurifier_AttrDef[]
-     */
-    protected $info = array();
-
-    /**
-     * @param HTMLPurifier_Config $config
-     */
-    public function __construct($config)
-    {
-        $def = $config->getCSSDefinition();
-        $this->info['border-width'] = $def->info['border-width'];
-        $this->info['border-style'] = $def->info['border-style'];
-        $this->info['border-top-color'] = $def->info['border-top-color'];
-    }
-
-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
-        $string = $this->parseCDATA($string);
-        $string = $this->mungeRgb($string);
-        $bits = explode(' ', $string);
-        $done = array(); // segments we've finished
-        $ret = ''; // return value
-        foreach ($bits as $bit) {
-            foreach ($this->info as $propname => $validator) {
-                if (isset($done[$propname])) {
-                    continue;
-                }
-                $r = $validator->validate($bit, $config, $context);
-                if ($r !== false) {
-                    $ret .= $r . ' ';
-                    $done[$propname] = true;
-                    break;
-                }
-            }
-        }
-        return rtrim($ret);
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Color.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Color.php
deleted file mode 100644
index d7287a00c2..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Color.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-
-/**
- * Validates Color as defined by CSS.
- */
-class HTMLPurifier_AttrDef_CSS_Color extends HTMLPurifier_AttrDef
-{
-
-    /**
-     * @type HTMLPurifier_AttrDef_CSS_AlphaValue
-     */
-    protected $alpha;
-
-    public function __construct()
-    {
-        $this->alpha = new HTMLPurifier_AttrDef_CSS_AlphaValue();
-    }
-
-    /**
-     * @param string $color
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($color, $config, $context)
-    {
-        static $colors = null;
-        if ($colors === null) {
-            $colors = $config->get('Core.ColorKeywords');
-        }
-
-        $color = trim($color);
-        if ($color === '') {
-            return false;
-        }
-
-        $lower = strtolower($color);
-        if (isset($colors[$lower])) {
-            return $colors[$lower];
-        }
-
-        if (preg_match('#(rgb|rgba|hsl|hsla)\(#', $color, $matches) === 1) {
-            $length = strlen($color);
-            if (strpos($color, ')') !== $length - 1) {
-                return false;
-            }
-
-            // get used function : rgb, rgba, hsl or hsla
-            $function = $matches[1];
-
-            $parameters_size = 3;
-            $alpha_channel = false;
-            if (substr($function, -1) === 'a') {
-                $parameters_size = 4;
-                $alpha_channel = true;
-            }
-
-            /*
-             * Allowed types for values :
-             * parameter_position => [type => max_value]
-             */
-            $allowed_types = array(
-                1 => array('percentage' => 100, 'integer' => 255),
-                2 => array('percentage' => 100, 'integer' => 255),
-                3 => array('percentage' => 100, 'integer' => 255),
-            );
-            $allow_different_types = false;
-
-            if (strpos($function, 'hsl') !== false) {
-                $allowed_types = array(
-                    1 => array('integer' => 360),
-                    2 => array('percentage' => 100),
-                    3 => array('percentage' => 100),
-                );
-                $allow_different_types = true;
-            }
-
-            $values = trim(str_replace($function, '', $color), ' ()');
-
-            $parts = explode(',', $values);
-            if (count($parts) !== $parameters_size) {
-                return false;
-            }
-
-            $type = false;
-            $new_parts = array();
-            $i = 0;
-
-            foreach ($parts as $part) {
-                $i++;
-                $part = trim($part);
-
-                if ($part === '') {
-                    return false;
-                }
-
-                // different check for alpha channel
-                if ($alpha_channel === true && $i === count($parts)) {
-                    $result = $this->alpha->validate($part, $config, $context);
-
-                    if ($result === false) {
-                        return false;
-                    }
-
-                    $new_parts[] = (string)$result;
-                    continue;
-                }
-
-                if (substr($part, -1) === '%') {
-                    $current_type = 'percentage';
-                } else {
-                    $current_type = 'integer';
-                }
-
-                if (!array_key_exists($current_type, $allowed_types[$i])) {
-                    return false;
-                }
-
-                if (!$type) {
-                    $type = $current_type;
-                }
-
-                if ($allow_different_types === false && $type != $current_type) {
-                    return false;
-                }
-
-                $max_value = $allowed_types[$i][$current_type];
-
-                if ($current_type == 'integer') {
-                    // Return value between range 0 -> $max_value
-                    $new_parts[] = (int)max(min($part, $max_value), 0);
-                } elseif ($current_type == 'percentage') {
-                    $new_parts[] = (float)max(min(rtrim($part, '%'), $max_value), 0) . '%';
-                }
-            }
-
-            $new_values = implode(',', $new_parts);
-
-            $color = $function . '(' . $new_values . ')';
-        } else {
-            // hexadecimal handling
-            if ($color[0] === '#') {
-                $hex = substr($color, 1);
-            } else {
-                $hex = $color;
-                $color = '#' . $color;
-            }
-            $length = strlen($hex);
-            if ($length !== 3 && $length !== 6) {
-                return false;
-            }
-            if (!ctype_xdigit($hex)) {
-                return false;
-            }
-        }
-        return $color;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Composite.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Composite.php
deleted file mode 100644
index 9c1750554f..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Composite.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- * Allows multiple validators to attempt to validate attribute.
- *
- * Composite is just what it sounds like: a composite of many validators.
- * This means that multiple HTMLPurifier_AttrDef objects will have a whack
- * at the string.  If one of them passes, that's what is returned.  This is
- * especially useful for CSS values, which often are a choice between
- * an enumerated set of predefined values or a flexible data type.
- */
-class HTMLPurifier_AttrDef_CSS_Composite extends HTMLPurifier_AttrDef
-{
-
-    /**
-     * List of objects that may process strings.
-     * @type HTMLPurifier_AttrDef[]
-     * @todo Make protected
-     */
-    public $defs;
-
-    /**
-     * @param HTMLPurifier_AttrDef[] $defs List of HTMLPurifier_AttrDef objects
-     */
-    public function __construct($defs)
-    {
-        $this->defs = $defs;
-    }
-
-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
-        foreach ($this->defs as $i => $def) {
-            $result = $this->defs[$i]->validate($string, $config, $context);
-            if ($result !== false) {
-                return $result;
-            }
-        }
-        return false;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php
deleted file mode 100644
index 9d77cc9aaf..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * Decorator which enables CSS properties to be disabled for specific elements.
- */
-class HTMLPurifier_AttrDef_CSS_DenyElementDecorator extends HTMLPurifier_AttrDef
-{
-    /**
-     * @type HTMLPurifier_AttrDef
-     */
-    public $def;
-    /**
-     * @type string
-     */
-    public $element;
-
-    /**
-     * @param HTMLPurifier_AttrDef $def Definition to wrap
-     * @param string $element Element to deny
-     */
-    public function __construct($def, $element)
-    {
-        $this->def = $def;
-        $this->element = $element;
-    }
-
-    /**
-     * Checks if CurrentToken is set and equal to $this->element
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
-        $token = $context->get('CurrentToken', true);
-        if ($token && $token->name == $this->element) {
-            return false;
-        }
-        return $this->def->validate($string, $config, $context);
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Filter.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Filter.php
deleted file mode 100644
index bde4c3301f..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Filter.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-/**
- * Microsoft's proprietary filter: CSS property
- * @note Currently supports the alpha filter. In the future, this will
- *       probably need an extensible framework
- */
-class HTMLPurifier_AttrDef_CSS_Filter extends HTMLPurifier_AttrDef
-{
-    /**
-     * @type HTMLPurifier_AttrDef_Integer
-     */
-    protected $intValidator;
-
-    public function __construct()
-    {
-        $this->intValidator = new HTMLPurifier_AttrDef_Integer();
-    }
-
-    /**
-     * @param string $value
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($value, $config, $context)
-    {
-        $value = $this->parseCDATA($value);
-        if ($value === 'none') {
-            return $value;
-        }
-        // if we looped this we could support multiple filters
-        $function_length = strcspn($value, '(');
-        $function = trim(substr($value, 0, $function_length));
-        if ($function !== 'alpha' &&
-            $function !== 'Alpha' &&
-            $function !== 'progid:DXImageTransform.Microsoft.Alpha'
-        ) {
-            return false;
-        }
-        $cursor = $function_length + 1;
-        $parameters_length = strcspn($value, ')', $cursor);
-        $parameters = substr($value, $cursor, $parameters_length);
-        $params = explode(',', $parameters);
-        $ret_params = array();
-        $lookup = array();
-        foreach ($params as $param) {
-            list($key, $value) = explode('=', $param);
-            $key = trim($key);
-            $value = trim($value);
-            if (isset($lookup[$key])) {
-                continue;
-            }
-            if ($key !== 'opacity') {
-                continue;
-            }
-            $value = $this->intValidator->validate($value, $config, $context);
-            if ($value === false) {
-                continue;
-            }
-            $int = (int)$value;
-            if ($int > 100) {
-                $value = '100';
-            }
-            if ($int < 0) {
-                $value = '0';
-            }
-            $ret_params[] = "$key=$value";
-            $lookup[$key] = true;
-        }
-        $ret_parameters = implode(',', $ret_params);
-        $ret_function = "$function($ret_parameters)";
-        return $ret_function;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Font.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Font.php
deleted file mode 100644
index 579b97ef1c..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Font.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-
-/**
- * Validates shorthand CSS property font.
- */
-class HTMLPurifier_AttrDef_CSS_Font extends HTMLPurifier_AttrDef
-{
-
-    /**
-     * Local copy of validators
-     * @type HTMLPurifier_AttrDef[]
-     * @note If we moved specific CSS property definitions to their own
-     *       classes instead of having them be assembled at run time by
-     *       CSSDefinition, this wouldn't be necessary.  We'd instantiate
-     *       our own copies.
-     */
-    protected $info = array();
-
-    /**
-     * @param HTMLPurifier_Config $config
-     */
-    public function __construct($config)
-    {
-        $def = $config->getCSSDefinition();
-        $this->info['font-style'] = $def->info['font-style'];
-        $this->info['font-variant'] = $def->info['font-variant'];
-        $this->info['font-weight'] = $def->info['font-weight'];
-        $this->info['font-size'] = $def->info['font-size'];
-        $this->info['line-height'] = $def->info['line-height'];
-        $this->info['font-family'] = $def->info['font-family'];
-    }
-
-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
-        static $system_fonts = array(
-            'caption' => true,
-            'icon' => true,
-            'menu' => true,
-            'message-box' => true,
-            'small-caption' => true,
-            'status-bar' => true
-        );
-
-        // regular pre-processing
-        $string = $this->parseCDATA($string);
-        if ($string === '') {
-            return false;
-        }
-
-        // check if it's one of the keywords
-        $lowercase_string = strtolower($string);
-        if (isset($system_fonts[$lowercase_string])) {
-            return $lowercase_string;
-        }
-
-        $bits = explode(' ', $string); // bits to process
-        $stage = 0; // this indicates what we're looking for
-        $caught = array(); // which stage 0 properties have we caught?
-        $stage_1 = array('font-style', 'font-variant', 'font-weight');
-        $final = ''; // output
-
-        for ($i = 0, $size = count($bits); $i < $size; $i++) {
-            if ($bits[$i] === '') {
-                continue;
-            }
-            switch ($stage) {
-                case 0: // attempting to catch font-style, font-variant or font-weight
-                    foreach ($stage_1 as $validator_name) {
-                        if (isset($caught[$validator_name])) {
-                            continue;
-                        }
-                        $r = $this->info[$validator_name]->validate(
-                            $bits[$i],
-                            $config,
-                            $context
-                        );
-                        if ($r !== false) {
-                            $final .= $r . ' ';
-                            $caught[$validator_name] = true;
-                            break;
-                        }
-                    }
-                    // all three caught, continue on
-                    if (count($caught) >= 3) {
-                        $stage = 1;
-                    }
-                    if ($r !== false) {
-                        break;
-                    }
-                case 1: // attempting to catch font-size and perhaps line-height
-                    $found_slash = false;
-                    if (strpos($bits[$i], '/') !== false) {
-                        list($font_size, $line_height) =
-                            explode('/', $bits[$i]);
-                        if ($line_height === '') {
-                            // ooh, there's a space after the slash!
-                            $line_height = false;
-                            $found_slash = true;
-                        }
-                    } else {
-                        $font_size = $bits[$i];
-                        $line_height = false;
-                    }
-                    $r = $this->info['font-size']->validate(
-                        $font_size,
-                        $config,
-                        $context
-                    );
-                    if ($r !== false) {
-                        $final .= $r;
-                        // attempt to catch line-height
-                        if ($line_height === false) {
-                            // we need to scroll forward
-                            for ($j = $i + 1; $j < $size; $j++) {
-                                if ($bits[$j] === '') {
-                                    continue;
-                                }
-                                if ($bits[$j] === '/') {
-                                    if ($found_slash) {
-                                        return false;
-                                    } else {
-                                        $found_slash = true;
-                                        continue;
-                                    }
-                                }
-                                $line_height = $bits[$j];
-                                break;
-                            }
-                        } else {
-                            // slash already found
-                            $found_slash = true;
-                            $j = $i;
-                        }
-                        if ($found_slash) {
-                            $i = $j;
-                            $r = $this->info['line-height']->validate(
-                                $line_height,
-                                $config,
-                                $context
-                            );
-                            if ($r !== false) {
-                                $final .= '/' . $r;
-                            }
-                        }
-                        $final .= ' ';
-                        $stage = 2;
-                        break;
-                    }
-                    return false;
-                case 2: // attempting to catch font-family
-                    $font_family =
-                        implode(' ', array_slice($bits, $i, $size - $i));
-                    $r = $this->info['font-family']->validate(
-                        $font_family,
-                        $config,
-                        $context
-                    );
-                    if ($r !== false) {
-                        $final .= $r . ' ';
-                        // processing completed successfully
-                        return rtrim($final);
-                    }
-                    return false;
-            }
-        }
-        return false;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/FontFamily.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/FontFamily.php
deleted file mode 100644
index 74e24c8816..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/FontFamily.php
+++ /dev/null
@@ -1,219 +0,0 @@
-<?php
-
-/**
- * Validates a font family list according to CSS spec
- */
-class HTMLPurifier_AttrDef_CSS_FontFamily extends HTMLPurifier_AttrDef
-{
-
-    protected $mask = null;
-
-    public function __construct()
-    {
-        $this->mask = '_- ';
-        for ($c = 'a'; $c <= 'z'; $c++) {
-            $this->mask .= $c;
-        }
-        for ($c = 'A'; $c <= 'Z'; $c++) {
-            $this->mask .= $c;
-        }
-        for ($c = '0'; $c <= '9'; $c++) {
-            $this->mask .= $c;
-        } // cast-y, but should be fine
-        // special bytes used by UTF-8
-        for ($i = 0x80; $i <= 0xFF; $i++) {
-            // We don't bother excluding invalid bytes in this range,
-            // because the our restriction of well-formed UTF-8 will
-            // prevent these from ever occurring.
-            $this->mask .= chr($i);
-        }
-
-        /*
-            PHP's internal strcspn implementation is
-            O(length of string * length of mask), making it inefficient
-            for large masks.  However, it's still faster than
-            preg_match 8)
-          for (p = s1;;) {
-            spanp = s2;
-            do {
-              if (*spanp == c || p == s1_end) {
-                return p - s1;
-              }
-            } while (spanp++ < (s2_end - 1));
-            c = *++p;
-          }
-         */
-        // possible optimization: invert the mask.
-    }
-
-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
-        static $generic_names = array(
-            'serif' => true,
-            'sans-serif' => true,
-            'monospace' => true,
-            'fantasy' => true,
-            'cursive' => true
-        );
-        $allowed_fonts = $config->get('CSS.AllowedFonts');
-
-        // assume that no font names contain commas in them
-        $fonts = explode(',', $string);
-        $final = '';
-        foreach ($fonts as $font) {
-            $font = trim($font);
-            if ($font === '') {
-                continue;
-            }
-            // match a generic name
-            if (isset($generic_names[$font])) {
-                if ($allowed_fonts === null || isset($allowed_fonts[$font])) {
-                    $final .= $font . ', ';
-                }
-                continue;
-            }
-            // match a quoted name
-            if ($font[0] === '"' || $font[0] === "'") {
-                $length = strlen($font);
-                if ($length <= 2) {
-                    continue;
-                }
-                $quote = $font[0];
-                if ($font[$length - 1] !== $quote) {
-                    continue;
-                }
-                $font = substr($font, 1, $length - 2);
-            }
-
-            $font = $this->expandCSSEscape($font);
-
-            // $font is a pure representation of the font name
-
-            if ($allowed_fonts !== null && !isset($allowed_fonts[$font])) {
-                continue;
-            }
-
-            if (ctype_alnum($font) && $font !== '') {
-                // very simple font, allow it in unharmed
-                $final .= $font . ', ';
-                continue;
-            }
-
-            // bugger out on whitespace.  form feed (0C) really
-            // shouldn't show up regardless
-            $font = str_replace(array("\n", "\t", "\r", "\x0C"), ' ', $font);
-
-            // Here, there are various classes of characters which need
-            // to be treated differently:
-            //  - Alphanumeric characters are essentially safe.  We
-            //    handled these above.
-            //  - Spaces require quoting, though most parsers will do
-            //    the right thing if there aren't any characters that
-            //    can be misinterpreted
-            //  - Dashes rarely occur, but they fairly unproblematic
-            //    for parsing/rendering purposes.
-            //  The above characters cover the majority of Western font
-            //  names.
-            //  - Arbitrary Unicode characters not in ASCII.  Because
-            //    most parsers give little thought to Unicode, treatment
-            //    of these codepoints is basically uniform, even for
-            //    punctuation-like codepoints.  These characters can
-            //    show up in non-Western pages and are supported by most
-            //    major browsers, for example: "ＭＳ 明朝" is a
-            //    legitimate font-name
-            //    <http://ja.wikipedia.org/wiki/MS_明朝>.  See
-            //    the CSS3 spec for more examples:
-            //    <http://www.w3.org/TR/2011/WD-css3-fonts-20110324/localizedfamilynames.png>
-            //    You can see live samples of these on the Internet:
-            //    <http://www.google.co.jp/search?q=font-family+ＭＳ+明朝|ゴシック>
-            //    However, most of these fonts have ASCII equivalents:
-            //    for example, 'MS Mincho', and it's considered
-            //    professional to use ASCII font names instead of
-            //    Unicode font names.  Thanks Takeshi Terada for
-            //    providing this information.
-            //  The following characters, to my knowledge, have not been
-            //  used to name font names.
-            //  - Single quote.  While theoretically you might find a
-            //    font name that has a single quote in its name (serving
-            //    as an apostrophe, e.g. Dave's Scribble), I haven't
-            //    been able to find any actual examples of this.
-            //    Internet Explorer's cssText translation (which I
-            //    believe is invoked by innerHTML) normalizes any
-            //    quoting to single quotes, and fails to escape single
-            //    quotes.  (Note that this is not IE's behavior for all
-            //    CSS properties, just some sort of special casing for
-            //    font-family).  So a single quote *cannot* be used
-            //    safely in the font-family context if there will be an
-            //    innerHTML/cssText translation.  Note that Firefox 3.x
-            //    does this too.
-            //  - Double quote.  In IE, these get normalized to
-            //    single-quotes, no matter what the encoding.  (Fun
-            //    fact, in IE8, the 'content' CSS property gained
-            //    support, where they special cased to preserve encoded
-            //    double quotes, but still translate unadorned double
-            //    quotes into single quotes.)  So, because their
-            //    fixpoint behavior is identical to single quotes, they
-            //    cannot be allowed either.  Firefox 3.x displays
-            //    single-quote style behavior.
-            //  - Backslashes are reduced by one (so \\ -> \) every
-            //    iteration, so they cannot be used safely.  This shows
-            //    up in IE7, IE8 and FF3
-            //  - Semicolons, commas and backticks are handled properly.
-            //  - The rest of the ASCII punctuation is handled properly.
-            // We haven't checked what browsers do to unadorned
-            // versions, but this is not important as long as the
-            // browser doesn't /remove/ surrounding quotes (as IE does
-            // for HTML).
-            //
-            // With these results in hand, we conclude that there are
-            // various levels of safety:
-            //  - Paranoid: alphanumeric, spaces and dashes(?)
-            //  - International: Paranoid + non-ASCII Unicode
-            //  - Edgy: Everything except quotes, backslashes
-            //  - NoJS: Standards compliance, e.g. sod IE. Note that
-            //    with some judicious character escaping (since certain
-            //    types of escaping doesn't work) this is theoretically
-            //    OK as long as innerHTML/cssText is not called.
-            // We believe that international is a reasonable default
-            // (that we will implement now), and once we do more
-            // extensive research, we may feel comfortable with dropping
-            // it down to edgy.
-
-            // Edgy: alphanumeric, spaces, dashes, underscores and Unicode.  Use of
-            // str(c)spn assumes that the string was already well formed
-            // Unicode (which of course it is).
-            if (strspn($font, $this->mask) !== strlen($font)) {
-                continue;
-            }
-
-            // Historical:
-            // In the absence of innerHTML/cssText, these ugly
-            // transforms don't pose a security risk (as \\ and \"
-            // might--these escapes are not supported by most browsers).
-            // We could try to be clever and use single-quote wrapping
-            // when there is a double quote present, but I have choosen
-            // not to implement that.  (NOTE: you can reduce the amount
-            // of escapes by one depending on what quoting style you use)
-            // $font = str_replace('\\', '\\5C ', $font);
-            // $font = str_replace('"',  '\\22 ', $font);
-            // $font = str_replace("'",  '\\27 ', $font);
-
-            // font possibly with spaces, requires quoting
-            $final .= "'$font', ";
-        }
-        $final = rtrim($final, ', ');
-        if ($final === '') {
-            return false;
-        }
-        return $final;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Ident.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Ident.php
deleted file mode 100644
index 973002c17f..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Ident.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * Validates based on {ident} CSS grammar production
- */
-class HTMLPurifier_AttrDef_CSS_Ident extends HTMLPurifier_AttrDef
-{
-
-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
-        $string = trim($string);
-
-        // early abort: '' and '0' (strings that convert to false) are invalid
-        if (!$string) {
-            return false;
-        }
-
-        $pattern = '/^(-?[A-Za-z_][A-Za-z_\-0-9]*)$/';
-        if (!preg_match($pattern, $string)) {
-            return false;
-        }
-        return $string;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php
deleted file mode 100644
index ffc989fe80..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/**
- * Decorator which enables !important to be used in CSS values.
- */
-class HTMLPurifier_AttrDef_CSS_ImportantDecorator extends HTMLPurifier_AttrDef
-{
-    /**
-     * @type HTMLPurifier_AttrDef
-     */
-    public $def;
-    /**
-     * @type bool
-     */
-    public $allow;
-
-    /**
-     * @param HTMLPurifier_AttrDef $def Definition to wrap
-     * @param bool $allow Whether or not to allow !important
-     */
-    public function __construct($def, $allow = false)
-    {
-        $this->def = $def;
-        $this->allow = $allow;
-    }
-
-    /**
-     * Intercepts and removes !important if necessary
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
-        // test for ! and important tokens
-        $string = trim($string);
-        $is_important = false;
-        // :TODO: optimization: test directly for !important and ! important
-        if (strlen($string) >= 9 && substr($string, -9) === 'important') {
-            $temp = rtrim(substr($string, 0, -9));
-            // use a temp, because we might want to restore important
-            if (strlen($temp) >= 1 && substr($temp, -1) === '!') {
-                $string = rtrim(substr($temp, 0, -1));
-                $is_important = true;
-            }
-        }
-        $string = $this->def->validate($string, $config, $context);
-        if ($this->allow && $is_important) {
-            $string .= ' !important';
-        }
-        return $string;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Length.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Length.php
deleted file mode 100644
index f12453a04a..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Length.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-/**
- * Represents a Length as defined by CSS.
- */
-class HTMLPurifier_AttrDef_CSS_Length extends HTMLPurifier_AttrDef
-{
-
-    /**
-     * @type HTMLPurifier_Length|string
-     */
-    protected $min;
-
-    /**
-     * @type HTMLPurifier_Length|string
-     */
-    protected $max;
-
-    /**
-     * @param HTMLPurifier_Length|string $min Minimum length, or null for no bound. String is also acceptable.
-     * @param HTMLPurifier_Length|string $max Maximum length, or null for no bound. String is also acceptable.
-     */
-    public function __construct($min = null, $max = null)
-    {
-        $this->min = $min !== null ? HTMLPurifier_Length::make($min) : null;
-        $this->max = $max !== null ? HTMLPurifier_Length::make($max) : null;
-    }
-
-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
-        $string = $this->parseCDATA($string);
-
-        // Optimizations
-        if ($string === '') {
-            return false;
-        }
-        if ($string === '0') {
-            return '0';
-        }
-        if (strlen($string) === 1) {
-            return false;
-        }
-
-        $length = HTMLPurifier_Length::make($string);
-        if (!$length->isValid()) {
-            return false;
-        }
-
-        if ($this->min) {
-            $c = $length->compareTo($this->min);
-            if ($c === false) {
-                return false;
-            }
-            if ($c < 0) {
-                return false;
-            }
-        }
-        if ($this->max) {
-            $c = $length->compareTo($this->max);
-            if ($c === false) {
-                return false;
-            }
-            if ($c > 0) {
-                return false;
-            }
-        }
-        return $length->toString();
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/ListStyle.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/ListStyle.php
deleted file mode 100644
index e74d42654e..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/ListStyle.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-
-/**
- * Validates shorthand CSS property list-style.
- * @warning Does not support url tokens that have internal spaces.
- */
-class HTMLPurifier_AttrDef_CSS_ListStyle extends HTMLPurifier_AttrDef
-{
-
-    /**
-     * Local copy of validators.
-     * @type HTMLPurifier_AttrDef[]
-     * @note See HTMLPurifier_AttrDef_CSS_Font::$info for a similar impl.
-     */
-    protected $info;
-
-    /**
-     * @param HTMLPurifier_Config $config
-     */
-    public function __construct($config)
-    {
-        $def = $config->getCSSDefinition();
-        $this->info['list-style-type'] = $def->info['list-style-type'];
-        $this->info['list-style-position'] = $def->info['list-style-position'];
-        $this->info['list-style-image'] = $def->info['list-style-image'];
-    }
-
-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
-        // regular pre-processing
-        $string = $this->parseCDATA($string);
-        if ($string === '') {
-            return false;
-        }
-
-        // assumes URI doesn't have spaces in it
-        $bits = explode(' ', strtolower($string)); // bits to process
-
-        $caught = array();
-        $caught['type'] = false;
-        $caught['position'] = false;
-        $caught['image'] = false;
-
-        $i = 0; // number of catches
-        $none = false;
-
-        foreach ($bits as $bit) {
-            if ($i >= 3) {
-                return;
-            } // optimization bit
-            if ($bit === '') {
-                continue;
-            }
-            foreach ($caught as $key => $status) {
-                if ($status !== false) {
-                    continue;
-                }
-                $r = $this->info['list-style-' . $key]->validate($bit, $config, $context);
-                if ($r === false) {
-                    continue;
-                }
-                if ($r === 'none') {
-                    if ($none) {
-                        continue;
-                    } else {
-                        $none = true;
-                    }
-                    if ($key == 'image') {
-                        continue;
-                    }
-                }
-                $caught[$key] = $r;
-                $i++;
-                break;
-            }
-        }
-
-        if (!$i) {
-            return false;
-        }
-
-        $ret = array();
-
-        // construct type
-        if ($caught['type']) {
-            $ret[] = $caught['type'];
-        }
-
-        // construct image
-        if ($caught['image']) {
-            $ret[] = $caught['image'];
-        }
-
-        // construct position
-        if ($caught['position']) {
-            $ret[] = $caught['position'];
-        }
-
-        if (empty($ret)) {
-            return false;
-        }
-        return implode(' ', $ret);
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Multiple.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Multiple.php
deleted file mode 100644
index e707f871ca..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Multiple.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-/**
- * Framework class for strings that involve multiple values.
- *
- * Certain CSS properties such as border-width and margin allow multiple
- * lengths to be specified.  This class can take a vanilla border-width
- * definition and multiply it, usually into a max of four.
- *
- * @note Even though the CSS specification isn't clear about it, inherit
- *       can only be used alone: it will never manifest as part of a multi
- *       shorthand declaration.  Thus, this class does not allow inherit.
- */
-class HTMLPurifier_AttrDef_CSS_Multiple extends HTMLPurifier_AttrDef
-{
-    /**
-     * Instance of component definition to defer validation to.
-     * @type HTMLPurifier_AttrDef
-     * @todo Make protected
-     */
-    public $single;
-
-    /**
-     * Max number of values allowed.
-     * @todo Make protected
-     */
-    public $max;
-
-    /**
-     * @param HTMLPurifier_AttrDef $single HTMLPurifier_AttrDef to multiply
-     * @param int $max Max number of values allowed (usually four)
-     */
-    public function __construct($single, $max = 4)
-    {
-        $this->single = $single;
-        $this->max = $max;
-    }
-
-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
-        $string = $this->mungeRgb($this->parseCDATA($string));
-        if ($string === '') {
-            return false;
-        }
-        $parts = explode(' ', $string); // parseCDATA replaced \r, \t and \n
-        $length = count($parts);
-        $final = '';
-        for ($i = 0, $num = 0; $i < $length && $num < $this->max; $i++) {
-            if (ctype_space($parts[$i])) {
-                continue;
-            }
-            $result = $this->single->validate($parts[$i], $config, $context);
-            if ($result !== false) {
-                $final .= $result . ' ';
-                $num++;
-            }
-        }
-        if ($final === '') {
-            return false;
-        }
-        return rtrim($final);
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Number.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Number.php
deleted file mode 100644
index ef49d20fdd..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Number.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-/**
- * Validates a number as defined by the CSS spec.
- */
-class HTMLPurifier_AttrDef_CSS_Number extends HTMLPurifier_AttrDef
-{
-
-    /**
-     * Indicates whether or not only positive values are allowed.
-     * @type bool
-     */
-    protected $non_negative = false;
-
-    /**
-     * @param bool $non_negative indicates whether negatives are forbidden
-     */
-    public function __construct($non_negative = false)
-    {
-        $this->non_negative = $non_negative;
-    }
-
-    /**
-     * @param string $number
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return string|bool
-     * @warning Some contexts do not pass $config, $context. These
-     *          variables should not be used without checking HTMLPurifier_Length
-     */
-    public function validate($number, $config, $context)
-    {
-        $number = $this->parseCDATA($number);
-
-        if ($number === '') {
-            return false;
-        }
-        if ($number === '0') {
-            return '0';
-        }
-
-        $sign = '';
-        switch ($number[0]) {
-            case '-':
-                if ($this->non_negative) {
-                    return false;
-                }
-                $sign = '-';
-            case '+':
-                $number = substr($number, 1);
-        }
-
-        if (ctype_digit($number)) {
-            $number = ltrim($number, '0');
-            return $number ? $sign . $number : '0';
-        }
-
-        // Period is the only non-numeric character allowed
-        if (strpos($number, '.') === false) {
-            return false;
-        }
-
-        list($left, $right) = explode('.', $number, 2);
-
-        if ($left === '' && $right === '') {
-            return false;
-        }
-        if ($left !== '' && !ctype_digit($left)) {
-            return false;
-        }
-
-        // Remove leading zeros until positive number or a zero stays left
-        if (ltrim($left, '0') != '') {
-            $left = ltrim($left, '0');
-        } else {
-            $left = '0';
-        }
-
-        $right = rtrim($right, '0');
-
-        if ($right === '') {
-            return $left ? $sign . $left : '0';
-        } elseif (!ctype_digit($right)) {
-            return false;
-        }
-        return $sign . $left . '.' . $right;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Percentage.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Percentage.php
deleted file mode 100644
index f0f25c50a8..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Percentage.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/**
- * Validates a Percentage as defined by the CSS spec.
- */
-class HTMLPurifier_AttrDef_CSS_Percentage extends HTMLPurifier_AttrDef
-{
-
-    /**
-     * Instance to defer number validation to.
-     * @type HTMLPurifier_AttrDef_CSS_Number
-     */
-    protected $number_def;
-
-    /**
-     * @param bool $non_negative Whether to forbid negative values
-     */
-    public function __construct($non_negative = false)
-    {
-        $this->number_def = new HTMLPurifier_AttrDef_CSS_Number($non_negative);
-    }
-
-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
-        $string = $this->parseCDATA($string);
-
-        if ($string === '') {
-            return false;
-        }
-        $length = strlen($string);
-        if ($length === 1) {
-            return false;
-        }
-        if ($string[$length - 1] !== '%') {
-            return false;
-        }
-
-        $number = substr($string, 0, $length - 1);
-        $number = $this->number_def->validate($number, $config, $context);
-
-        if ($number === false) {
-            return false;
-        }
-        return "$number%";
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php
deleted file mode 100644
index 5fd4b7f7b4..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- * Validates the value for the CSS property text-decoration
- * @note This class could be generalized into a version that acts sort of
- *       like Enum except you can compound the allowed values.
- */
-class HTMLPurifier_AttrDef_CSS_TextDecoration extends HTMLPurifier_AttrDef
-{
-
-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
-        static $allowed_values = array(
-            'line-through' => true,
-            'overline' => true,
-            'underline' => true,
-        );
-
-        $string = strtolower($this->parseCDATA($string));
-
-        if ($string === 'none') {
-            return $string;
-        }
-
-        $parts = explode(' ', $string);
-        $final = '';
-        foreach ($parts as $part) {
-            if (isset($allowed_values[$part])) {
-                $final .= $part . ' ';
-            }
-        }
-        $final = rtrim($final);
-        if ($final === '') {
-            return false;
-        }
-        return $final;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/URI.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/URI.php
deleted file mode 100644
index 6617acace5..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/URI.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-/**
- * Validates a URI in CSS syntax, which uses url('http://example.com')
- * @note While theoretically speaking a URI in a CSS document could
- *       be non-embedded, as of CSS2 there is no such usage so we're
- *       generalizing it. This may need to be changed in the future.
- * @warning Since HTMLPurifier_AttrDef_CSS blindly uses semicolons as
- *          the separator, you cannot put a literal semicolon in
- *          in the URI. Try percent encoding it, in that case.
- */
-class HTMLPurifier_AttrDef_CSS_URI extends HTMLPurifier_AttrDef_URI
-{
-
-    public function __construct()
-    {
-        parent::__construct(true); // always embedded
-    }
-
-    /**
-     * @param string $uri_string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($uri_string, $config, $context)
-    {
-        // parse the URI out of the string and then pass it onto
-        // the parent object
-
-        $uri_string = $this->parseCDATA($uri_string);
-        if (strpos($uri_string, 'url(') !== 0) {
-            return false;
-        }
-        $uri_string = substr($uri_string, 4);
-        if (strlen($uri_string) == 0) {
-            return false;
-        }
-        $new_length = strlen($uri_string) - 1;
-        if ($uri_string[$new_length] != ')') {
-            return false;
-        }
-        $uri = trim(substr($uri_string, 0, $new_length));
-
-        if (!empty($uri) && ($uri[0] == "'" || $uri[0] == '"')) {
-            $quote = $uri[0];
-            $new_length = strlen($uri) - 1;
-            if ($uri[$new_length] !== $quote) {
-                return false;
-            }
-            $uri = substr($uri, 1, $new_length - 1);
-        }
-
-        $uri = $this->expandCSSEscape($uri);
-
-        $result = parent::validate($uri, $config, $context);
-
-        if ($result === false) {
-            return false;
-        }
-
-        // extra sanity check; should have been done by URI
-        $result = str_replace(array('"', "\\", "\n", "\x0c", "\r"), "", $result);
-
-        // suspicious characters are ()'; we're going to percent encode
-        // them for safety.
-        $result = str_replace(array('(', ')', "'"), array('%28', '%29', '%27'), $result);
-
-        // there's an extra bug where ampersands lose their escaping on
-        // an innerHTML cycle, so a very unlucky query parameter could
-        // then change the meaning of the URL.  Unfortunately, there's
-        // not much we can do about that...
-        return "url(\"$result\")";
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Clone.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Clone.php
deleted file mode 100644
index 6698a00c01..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Clone.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * Dummy AttrDef that mimics another AttrDef, BUT it generates clones
- * with make.
- */
-class HTMLPurifier_AttrDef_Clone extends HTMLPurifier_AttrDef
-{
-    /**
-     * What we're cloning.
-     * @type HTMLPurifier_AttrDef
-     */
-    protected $clone;
-
-    /**
-     * @param HTMLPurifier_AttrDef $clone
-     */
-    public function __construct($clone)
-    {
-        $this->clone = $clone;
-    }
-
-    /**
-     * @param string $v
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($v, $config, $context)
-    {
-        return $this->clone->validate($v, $config, $context);
-    }
-
-    /**
-     * @param string $string
-     * @return HTMLPurifier_AttrDef
-     */
-    public function make($string)
-    {
-        return clone $this->clone;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Enum.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Enum.php
deleted file mode 100644
index 8abda7f6e2..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Enum.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-// Enum = Enumerated
-/**
- * Validates a keyword against a list of valid values.
- * @warning The case-insensitive compare of this function uses PHP's
- *          built-in strtolower and ctype_lower functions, which may
- *          cause problems with international comparisons
- */
-class HTMLPurifier_AttrDef_Enum extends HTMLPurifier_AttrDef
-{
-
-    /**
-     * Lookup table of valid values.
-     * @type array
-     * @todo Make protected
-     */
-    public $valid_values = array();
-
-    /**
-     * Bool indicating whether or not enumeration is case sensitive.
-     * @note In general this is always case insensitive.
-     */
-    protected $case_sensitive = false; // values according to W3C spec
-
-    /**
-     * @param array $valid_values List of valid values
-     * @param bool $case_sensitive Whether or not case sensitive
-     */
-    public function __construct($valid_values = array(), $case_sensitive = false)
-    {
-        $this->valid_values = array_flip($valid_values);
-        $this->case_sensitive = $case_sensitive;
-    }
-
-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
-        $string = trim($string);
-        if (!$this->case_sensitive) {
-            // we may want to do full case-insensitive libraries
-            $string = ctype_lower($string) ? $string : strtolower($string);
-        }
-        $result = isset($this->valid_values[$string]);
-
-        return $result ? $string : false;
-    }
-
-    /**
-     * @param string $string In form of comma-delimited list of case-insensitive
-     *      valid values. Example: "foo,bar,baz". Prepend "s:" to make
-     *      case sensitive
-     * @return HTMLPurifier_AttrDef_Enum
-     */
-    public function make($string)
-    {
-        if (strlen($string) > 2 && $string[0] == 's' && $string[1] == ':') {
-            $string = substr($string, 2);
-            $sensitive = true;
-        } else {
-            $sensitive = false;
-        }
-        $values = explode(',', $string);
-        return new HTMLPurifier_AttrDef_Enum($values, $sensitive);
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Bool.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Bool.php
deleted file mode 100644
index be3bbc8dc0..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Bool.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- * Validates a boolean attribute
- */
-class HTMLPurifier_AttrDef_HTML_Bool extends HTMLPurifier_AttrDef
-{
-
-    /**
-     * @type string
-     */
-    protected $name;
-
-    /**
-     * @type bool
-     */
-    public $minimized = true;
-
-    /**
-     * @param bool|string $name
-     */
-    public function __construct($name = false)
-    {
-        $this->name = $name;
-    }
-
-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
-        return $this->name;
-    }
-
-    /**
-     * @param string $string Name of attribute
-     * @return HTMLPurifier_AttrDef_HTML_Bool
-     */
-    public function make($string)
-    {
-        return new HTMLPurifier_AttrDef_HTML_Bool($string);
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Class.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Class.php
deleted file mode 100644
index d5013488fc..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Class.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- * Implements special behavior for class attribute (normally NMTOKENS)
- */
-class HTMLPurifier_AttrDef_HTML_Class extends HTMLPurifier_AttrDef_HTML_Nmtokens
-{
-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    protected function split($string, $config, $context)
-    {
-        // really, this twiddle should be lazy loaded
-        $name = $config->getDefinition('HTML')->doctype->name;
-        if ($name == "XHTML 1.1" || $name == "XHTML 2.0") {
-            return parent::split($string, $config, $context);
-        } else {
-            return preg_split('/\s+/', $string);
-        }
-    }
-
-    /**
-     * @param array $tokens
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    protected function filter($tokens, $config, $context)
-    {
-        $allowed = $config->get('Attr.AllowedClasses');
-        $forbidden = $config->get('Attr.ForbiddenClasses');
-        $ret = array();
-        foreach ($tokens as $token) {
-            if (($allowed === null || isset($allowed[$token])) &&
-                !isset($forbidden[$token]) &&
-                // We need this O(n) check because of PHP's array
-                // implementation that casts -0 to 0.
-                !in_array($token, $ret, true)
-            ) {
-                $ret[] = $token;
-            }
-        }
-        return $ret;
-    }
-}
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Color.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Color.php
deleted file mode 100644
index 946ebb7820..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Color.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * Validates a color according to the HTML spec.
- */
-class HTMLPurifier_AttrDef_HTML_Color extends HTMLPurifier_AttrDef
-{
-
-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
-        static $colors = null;
-        if ($colors === null) {
-            $colors = $config->get('Core.ColorKeywords');
-        }
-
-        $string = trim($string);
-
-        if (empty($string)) {
-            return false;
-        }
-        $lower = strtolower($string);
-        if (isset($colors[$lower])) {
-            return $colors[$lower];
-        }
-        if ($string[0] === '#') {
-            $hex = substr($string, 1);
-        } else {
-            $hex = $string;
-        }
-
-        $length = strlen($hex);
-        if ($length !== 3 && $length !== 6) {
-            return false;
-        }
-        if (!ctype_xdigit($hex)) {
-            return false;
-        }
-        if ($length === 3) {
-            $hex = $hex[0] . $hex[0] . $hex[1] . $hex[1] . $hex[2] . $hex[2];
-        }
-        return "#$hex";
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php
deleted file mode 100644
index d79ba12b3f..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/**
- * Special-case enum attribute definition that lazy loads allowed frame targets
- */
-class HTMLPurifier_AttrDef_HTML_FrameTarget extends HTMLPurifier_AttrDef_Enum
-{
-
-    /**
-     * @type array
-     */
-    public $valid_values = false; // uninitialized value
-
-    /**
-     * @type bool
-     */
-    protected $case_sensitive = false;
-
-    public function __construct()
-    {
-    }
-
-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
-        if ($this->valid_values === false) {
-            $this->valid_values = $config->get('Attr.AllowedFrameTargets');
-        }
-        return parent::validate($string, $config, $context);
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/ID.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/ID.php
deleted file mode 100644
index 4ba45610fe..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/ID.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-
-/**
- * Validates the HTML attribute ID.
- * @warning Even though this is the id processor, it
- *          will ignore the directive Attr:IDBlacklist, since it will only
- *          go according to the ID accumulator. Since the accumulator is
- *          automatically generated, it will have already absorbed the
- *          blacklist. If you're hacking around, make sure you use load()!
- */
-
-class HTMLPurifier_AttrDef_HTML_ID extends HTMLPurifier_AttrDef
-{
-
-    // selector is NOT a valid thing to use for IDREFs, because IDREFs
-    // *must* target IDs that exist, whereas selector #ids do not.
-
-    /**
-     * Determines whether or not we're validating an ID in a CSS
-     * selector context.
-     * @type bool
-     */
-    protected $selector;
-
-    /**
-     * @param bool $selector
-     */
-    public function __construct($selector = false)
-    {
-        $this->selector = $selector;
-    }
-
-    /**
-     * @param string $id
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($id, $config, $context)
-    {
-        if (!$this->selector && !$config->get('Attr.EnableID')) {
-            return false;
-        }
-
-        $id = trim($id); // trim it first
-
-        if ($id === '') {
-            return false;
-        }
-
-        $prefix = $config->get('Attr.IDPrefix');
-        if ($prefix !== '') {
-            $prefix .= $config->get('Attr.IDPrefixLocal');
-            // prevent re-appending the prefix
-            if (strpos($id, $prefix) !== 0) {
-                $id = $prefix . $id;
-            }
-        } elseif ($config->get('Attr.IDPrefixLocal') !== '') {
-            trigger_error(
-                '%Attr.IDPrefixLocal cannot be used unless ' .
-                '%Attr.IDPrefix is set',
-                E_USER_WARNING
-            );
-        }
-
-        if (!$this->selector) {
-            $id_accumulator =& $context->get('IDAccumulator');
-            if (isset($id_accumulator->ids[$id])) {
-                return false;
-            }
-        }
-
-        // we purposely avoid using regex, hopefully this is faster
-
-        if ($config->get('Attr.ID.HTML5') === true) {
-            if (preg_match('/[\t\n\x0b\x0c ]/', $id)) {
-                return false;
-            }
-        } else {
-            if (ctype_alpha($id)) {
-                // OK
-            } else {
-                if (!ctype_alpha(@$id[0])) {
-                    return false;
-                }
-                // primitive style of regexps, I suppose
-                $trim = trim(
-                    $id,
-                    'A..Za..z0..9:-._'
-                );
-                if ($trim !== '') {
-                    return false;
-                }
-            }
-        }
-
-        $regexp = $config->get('Attr.IDBlacklistRegexp');
-        if ($regexp && preg_match($regexp, $id)) {
-            return false;
-        }
-
-        if (!$this->selector) {
-            $id_accumulator->add($id);
-        }
-
-        // if no change was made to the ID, return the result
-        // else, return the new id if stripping whitespace made it
-        //     valid, or return false.
-        return $id;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Length.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Length.php
deleted file mode 100644
index 1c4006fbbd..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Length.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/**
- * Validates the HTML type length (not to be confused with CSS's length).
- *
- * This accepts integer pixels or percentages as lengths for certain
- * HTML attributes.
- */
-
-class HTMLPurifier_AttrDef_HTML_Length extends HTMLPurifier_AttrDef_HTML_Pixels
-{
-
-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
-        $string = trim($string);
-        if ($string === '') {
-            return false;
-        }
-
-        $parent_result = parent::validate($string, $config, $context);
-        if ($parent_result !== false) {
-            return $parent_result;
-        }
-
-        $length = strlen($string);
-        $last_char = $string[$length - 1];
-
-        if ($last_char !== '%') {
-            return false;
-        }
-
-        $points = substr($string, 0, $length - 1);
-
-        if (!is_numeric($points)) {
-            return false;
-        }
-
-        $points = (int)$points;
-
-        if ($points < 0) {
-            return '0%';
-        }
-        if ($points > 100) {
-            return '100%';
-        }
-        return ((string)$points) . '%';
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php
deleted file mode 100644
index 63fa04c15c..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-/**
- * Validates a rel/rev link attribute against a directive of allowed values
- * @note We cannot use Enum because link types allow multiple
- *       values.
- * @note Assumes link types are ASCII text
- */
-class HTMLPurifier_AttrDef_HTML_LinkTypes extends HTMLPurifier_AttrDef
-{
-
-    /**
-     * Name config attribute to pull.
-     * @type string
-     */
-    protected $name;
-
-    /**
-     * @param string $name
-     */
-    public function __construct($name)
-    {
-        $configLookup = array(
-            'rel' => 'AllowedRel',
-            'rev' => 'AllowedRev'
-        );
-        if (!isset($configLookup[$name])) {
-            trigger_error(
-                'Unrecognized attribute name for link ' .
-                'relationship.',
-                E_USER_ERROR
-            );
-            return;
-        }
-        $this->name = $configLookup[$name];
-    }
-
-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
-        $allowed = $config->get('Attr.' . $this->name);
-        if (empty($allowed)) {
-            return false;
-        }
-
-        $string = $this->parseCDATA($string);
-        $parts = explode(' ', $string);
-
-        // lookup to prevent duplicates
-        $ret_lookup = array();
-        foreach ($parts as $part) {
-            $part = strtolower(trim($part));
-            if (!isset($allowed[$part])) {
-                continue;
-            }
-            $ret_lookup[$part] = true;
-        }
-
-        if (empty($ret_lookup)) {
-            return false;
-        }
-        $string = implode(' ', array_keys($ret_lookup));
-        return $string;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/MultiLength.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/MultiLength.php
deleted file mode 100644
index bbb20f2f80..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/MultiLength.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/**
- * Validates a MultiLength as defined by the HTML spec.
- *
- * A multilength is either a integer (pixel count), a percentage, or
- * a relative number.
- */
-class HTMLPurifier_AttrDef_HTML_MultiLength extends HTMLPurifier_AttrDef_HTML_Length
-{
-
-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
-        $string = trim($string);
-        if ($string === '') {
-            return false;
-        }
-
-        $parent_result = parent::validate($string, $config, $context);
-        if ($parent_result !== false) {
-            return $parent_result;
-        }
-
-        $length = strlen($string);
-        $last_char = $string[$length - 1];
-
-        if ($last_char !== '*') {
-            return false;
-        }
-
-        $int = substr($string, 0, $length - 1);
-
-        if ($int == '') {
-            return '*';
-        }
-        if (!is_numeric($int)) {
-            return false;
-        }
-
-        $int = (int)$int;
-        if ($int < 0) {
-            return false;
-        }
-        if ($int == 0) {
-            return '0';
-        }
-        if ($int == 1) {
-            return '*';
-        }
-        return ((string)$int) . '*';
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php
deleted file mode 100644
index f79683b4fc..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-/**
- * Validates contents based on NMTOKENS attribute type.
- */
-class HTMLPurifier_AttrDef_HTML_Nmtokens extends HTMLPurifier_AttrDef
-{
-
-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
-        $string = trim($string);
-
-        // early abort: '' and '0' (strings that convert to false) are invalid
-        if (!$string) {
-            return false;
-        }
-
-        $tokens = $this->split($string, $config, $context);
-        $tokens = $this->filter($tokens, $config, $context);
-        if (empty($tokens)) {
-            return false;
-        }
-        return implode(' ', $tokens);
-    }
-
-    /**
-     * Splits a space separated list of tokens into its constituent parts.
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    protected function split($string, $config, $context)
-    {
-        // OPTIMIZABLE!
-        // do the preg_match, capture all subpatterns for reformulation
-
-        // we don't support U+00A1 and up codepoints or
-        // escaping because I don't know how to do that with regexps
-        // and plus it would complicate optimization efforts (you never
-        // see that anyway).
-        $pattern = '/(?:(?<=\s)|\A)' . // look behind for space or string start
-            '((?:--|-?[A-Za-z_])[A-Za-z_\-0-9]*)' .
-            '(?:(?=\s)|\z)/'; // look ahead for space or string end
-        preg_match_all($pattern, $string, $matches);
-        return $matches[1];
-    }
-
-    /**
-     * Template method for removing certain tokens based on arbitrary criteria.
-     * @note If we wanted to be really functional, we'd do an array_filter
-     *       with a callback. But... we're not.
-     * @param array $tokens
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    protected function filter($tokens, $config, $context)
-    {
-        return $tokens;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Pixels.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Pixels.php
deleted file mode 100644
index a1d019e095..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Pixels.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-/**
- * Validates an integer representation of pixels according to the HTML spec.
- */
-class HTMLPurifier_AttrDef_HTML_Pixels extends HTMLPurifier_AttrDef
-{
-
-    /**
-     * @type int
-     */
-    protected $max;
-
-    /**
-     * @param int $max
-     */
-    public function __construct($max = null)
-    {
-        $this->max = $max;
-    }
-
-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
-        $string = trim($string);
-        if ($string === '0') {
-            return $string;
-        }
-        if ($string === '') {
-            return false;
-        }
-        $length = strlen($string);
-        if (substr($string, $length - 2) == 'px') {
-            $string = substr($string, 0, $length - 2);
-        }
-        if (!is_numeric($string)) {
-            return false;
-        }
-        $int = (int)$string;
-
-        if ($int < 0) {
-            return '0';
-        }
-
-        // upper-bound value, extremely high values can
-        // crash operating systems, see <http://ha.ckers.org/imagecrash.html>
-        // WARNING, above link WILL crash you if you're using Windows
-
-        if ($this->max !== null && $int > $this->max) {
-            return (string)$this->max;
-        }
-        return (string)$int;
-    }
-
-    /**
-     * @param string $string
-     * @return HTMLPurifier_AttrDef
-     */
-    public function make($string)
-    {
-        if ($string === '') {
-            $max = null;
-        } else {
-            $max = (int)$string;
-        }
-        $class = get_class($this);
-        return new $class($max);
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Integer.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Integer.php
deleted file mode 100644
index 400e707d2f..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Integer.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-/**
- * Validates an integer.
- * @note While this class was modeled off the CSS definition, no currently
- *       allowed CSS uses this type.  The properties that do are: widows,
- *       orphans, z-index, counter-increment, counter-reset.  Some of the
- *       HTML attributes, however, find use for a non-negative version of this.
- */
-class HTMLPurifier_AttrDef_Integer extends HTMLPurifier_AttrDef
-{
-
-    /**
-     * Whether or not negative values are allowed.
-     * @type bool
-     */
-    protected $negative = true;
-
-    /**
-     * Whether or not zero is allowed.
-     * @type bool
-     */
-    protected $zero = true;
-
-    /**
-     * Whether or not positive values are allowed.
-     * @type bool
-     */
-    protected $positive = true;
-
-    /**
-     * @param $negative Bool indicating whether or not negative values are allowed
-     * @param $zero Bool indicating whether or not zero is allowed
-     * @param $positive Bool indicating whether or not positive values are allowed
-     */
-    public function __construct($negative = true, $zero = true, $positive = true)
-    {
-        $this->negative = $negative;
-        $this->zero = $zero;
-        $this->positive = $positive;
-    }
-
-    /**
-     * @param string $integer
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($integer, $config, $context)
-    {
-        $integer = $this->parseCDATA($integer);
-        if ($integer === '') {
-            return false;
-        }
-
-        // we could possibly simply typecast it to integer, but there are
-        // certain fringe cases that must not return an integer.
-
-        // clip leading sign
-        if ($this->negative && $integer[0] === '-') {
-            $digits = substr($integer, 1);
-            if ($digits === '0') {
-                $integer = '0';
-            } // rm minus sign for zero
-        } elseif ($this->positive && $integer[0] === '+') {
-            $digits = $integer = substr($integer, 1); // rm unnecessary plus
-        } else {
-            $digits = $integer;
-        }
-
-        // test if it's numeric
-        if (!ctype_digit($digits)) {
-            return false;
-        }
-
-        // perform scope tests
-        if (!$this->zero && $integer == 0) {
-            return false;
-        }
-        if (!$this->positive && $integer > 0) {
-            return false;
-        }
-        if (!$this->negative && $integer < 0) {
-            return false;
-        }
-
-        return $integer;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Lang.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Lang.php
deleted file mode 100644
index 2a55cea642..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Lang.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-/**
- * Validates the HTML attribute lang, effectively a language code.
- * @note Built according to RFC 3066, which obsoleted RFC 1766
- */
-class HTMLPurifier_AttrDef_Lang extends HTMLPurifier_AttrDef
-{
-
-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
-        $string = trim($string);
-        if (!$string) {
-            return false;
-        }
-
-        $subtags = explode('-', $string);
-        $num_subtags = count($subtags);
-
-        if ($num_subtags == 0) { // sanity check
-            return false;
-        }
-
-        // process primary subtag : $subtags[0]
-        $length = strlen($subtags[0]);
-        switch ($length) {
-            case 0:
-                return false;
-            case 1:
-                if (!($subtags[0] == 'x' || $subtags[0] == 'i')) {
-                    return false;
-                }
-                break;
-            case 2:
-            case 3:
-                if (!ctype_alpha($subtags[0])) {
-                    return false;
-                } elseif (!ctype_lower($subtags[0])) {
-                    $subtags[0] = strtolower($subtags[0]);
-                }
-                break;
-            default:
-                return false;
-        }
-
-        $new_string = $subtags[0];
-        if ($num_subtags == 1) {
-            return $new_string;
-        }
-
-        // process second subtag : $subtags[1]
-        $length = strlen($subtags[1]);
-        if ($length == 0 || ($length == 1 && $subtags[1] != 'x') || $length > 8 || !ctype_alnum($subtags[1])) {
-            return $new_string;
-        }
-        if (!ctype_lower($subtags[1])) {
-            $subtags[1] = strtolower($subtags[1]);
-        }
-
-        $new_string .= '-' . $subtags[1];
-        if ($num_subtags == 2) {
-            return $new_string;
-        }
-
-        // process all other subtags, index 2 and up
-        for ($i = 2; $i < $num_subtags; $i++) {
-            $length = strlen($subtags[$i]);
-            if ($length == 0 || $length > 8 || !ctype_alnum($subtags[$i])) {
-                return $new_string;
-            }
-            if (!ctype_lower($subtags[$i])) {
-                $subtags[$i] = strtolower($subtags[$i]);
-            }
-            $new_string .= '-' . $subtags[$i];
-        }
-        return $new_string;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Switch.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Switch.php
deleted file mode 100644
index c7eb3199a4..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Switch.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/**
- * Decorator that, depending on a token, switches between two definitions.
- */
-class HTMLPurifier_AttrDef_Switch
-{
-
-    /**
-     * @type string
-     */
-    protected $tag;
-
-    /**
-     * @type HTMLPurifier_AttrDef
-     */
-    protected $withTag;
-
-    /**
-     * @type HTMLPurifier_AttrDef
-     */
-    protected $withoutTag;
-
-    /**
-     * @param string $tag Tag name to switch upon
-     * @param HTMLPurifier_AttrDef $with_tag Call if token matches tag
-     * @param HTMLPurifier_AttrDef $without_tag Call if token doesn't match, or there is no token
-     */
-    public function __construct($tag, $with_tag, $without_tag)
-    {
-        $this->tag = $tag;
-        $this->withTag = $with_tag;
-        $this->withoutTag = $without_tag;
-    }
-
-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
-        $token = $context->get('CurrentToken', true);
-        if (!$token || $token->name !== $this->tag) {
-            return $this->withoutTag->validate($string, $config, $context);
-        } else {
-            return $this->withTag->validate($string, $config, $context);
-        }
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Text.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Text.php
deleted file mode 100644
index 4553a4ea9b..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/Text.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/**
- * Validates arbitrary text according to the HTML spec.
- */
-class HTMLPurifier_AttrDef_Text extends HTMLPurifier_AttrDef
-{
-
-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
-        return $this->parseCDATA($string);
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI.php
deleted file mode 100644
index c1cd89772c..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-/**
- * Validates a URI as defined by RFC 3986.
- * @note Scheme-specific mechanics deferred to HTMLPurifier_URIScheme
- */
-class HTMLPurifier_AttrDef_URI extends HTMLPurifier_AttrDef
-{
-
-    /**
-     * @type HTMLPurifier_URIParser
-     */
-    protected $parser;
-
-    /**
-     * @type bool
-     */
-    protected $embedsResource;
-
-    /**
-     * @param bool $embeds_resource Does the URI here result in an extra HTTP request?
-     */
-    public function __construct($embeds_resource = false)
-    {
-        $this->parser = new HTMLPurifier_URIParser();
-        $this->embedsResource = (bool)$embeds_resource;
-    }
-
-    /**
-     * @param string $string
-     * @return HTMLPurifier_AttrDef_URI
-     */
-    public function make($string)
-    {
-        $embeds = ($string === 'embedded');
-        return new HTMLPurifier_AttrDef_URI($embeds);
-    }
-
-    /**
-     * @param string $uri
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($uri, $config, $context)
-    {
-        if ($config->get('URI.Disable')) {
-            return false;
-        }
-
-        $uri = $this->parseCDATA($uri);
-
-        // parse the URI
-        $uri = $this->parser->parse($uri);
-        if ($uri === false) {
-            return false;
-        }
-
-        // add embedded flag to context for validators
-        $context->register('EmbeddedURI', $this->embedsResource);
-
-        $ok = false;
-        do {
-
-            // generic validation
-            $result = $uri->validate($config, $context);
-            if (!$result) {
-                break;
-            }
-
-            // chained filtering
-            $uri_def = $config->getDefinition('URI');
-            $result = $uri_def->filter($uri, $config, $context);
-            if (!$result) {
-                break;
-            }
-
-            // scheme-specific validation
-            $scheme_obj = $uri->getSchemeObj($config, $context);
-            if (!$scheme_obj) {
-                break;
-            }
-            if ($this->embedsResource && !$scheme_obj->browsable) {
-                break;
-            }
-            $result = $scheme_obj->validate($uri, $config, $context);
-            if (!$result) {
-                break;
-            }
-
-            // Post chained filtering
-            $result = $uri_def->postFilter($uri, $config, $context);
-            if (!$result) {
-                break;
-            }
-
-            // survived gauntlet
-            $ok = true;
-
-        } while (false);
-
-        $context->destroy('EmbeddedURI');
-        if (!$ok) {
-            return false;
-        }
-        // back to string
-        return $uri->toString();
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Email.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Email.php
deleted file mode 100644
index daf32b7643..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Email.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-abstract class HTMLPurifier_AttrDef_URI_Email extends HTMLPurifier_AttrDef
-{
-
-    /**
-     * Unpacks a mailbox into its display-name and address
-     * @param string $string
-     * @return mixed
-     */
-    public function unpack($string)
-    {
-        // needs to be implemented
-    }
-
-}
-
-// sub-implementations
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php
deleted file mode 100644
index 52c0d59683..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * Primitive email validation class based on the regexp found at
- * http://www.regular-expressions.info/email.html
- */
-class HTMLPurifier_AttrDef_URI_Email_SimpleCheck extends HTMLPurifier_AttrDef_URI_Email
-{
-
-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
-        // no support for named mailboxes i.e. "Bob <bob@example.com>"
-        // that needs more percent encoding to be done
-        if ($string == '') {
-            return false;
-        }
-        $string = trim($string);
-        $result = preg_match('/^[A-Z0-9._%-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i', $string);
-        return $result ? $string : false;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Host.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Host.php
deleted file mode 100644
index 1beeaa5d22..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Host.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-
-/**
- * Validates a host according to the IPv4, IPv6 and DNS (future) specifications.
- */
-class HTMLPurifier_AttrDef_URI_Host extends HTMLPurifier_AttrDef
-{
-
-    /**
-     * IPv4 sub-validator.
-     * @type HTMLPurifier_AttrDef_URI_IPv4
-     */
-    protected $ipv4;
-
-    /**
-     * IPv6 sub-validator.
-     * @type HTMLPurifier_AttrDef_URI_IPv6
-     */
-    protected $ipv6;
-
-    public function __construct()
-    {
-        $this->ipv4 = new HTMLPurifier_AttrDef_URI_IPv4();
-        $this->ipv6 = new HTMLPurifier_AttrDef_URI_IPv6();
-    }
-
-    /**
-     * @param string $string
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($string, $config, $context)
-    {
-        $length = strlen($string);
-        // empty hostname is OK; it's usually semantically equivalent:
-        // the default host as defined by a URI scheme is used:
-        //
-        //      If the URI scheme defines a default for host, then that
-        //      default applies when the host subcomponent is undefined
-        //      or when the registered name is empty (zero length).
-        if ($string === '') {
-            return '';
-        }
-        if ($length > 1 && $string[0] === '[' && $string[$length - 1] === ']') {
-            //IPv6
-            $ip = substr($string, 1, $length - 2);
-            $valid = $this->ipv6->validate($ip, $config, $context);
-            if ($valid === false) {
-                return false;
-            }
-            return '[' . $valid . ']';
-        }
-
-        // need to do checks on unusual encodings too
-        $ipv4 = $this->ipv4->validate($string, $config, $context);
-        if ($ipv4 !== false) {
-            return $ipv4;
-        }
-
-        // A regular domain name.
-
-        // This doesn't match I18N domain names, but we don't have proper IRI support,
-        // so force users to insert Punycode.
-
-        // There is not a good sense in which underscores should be
-        // allowed, since it's technically not! (And if you go as
-        // far to allow everything as specified by the DNS spec...
-        // well, that's literally everything, modulo some space limits
-        // for the components and the overall name (which, by the way,
-        // we are NOT checking!).  So we (arbitrarily) decide this:
-        // let's allow underscores wherever we would have allowed
-        // hyphens, if they are enabled.  This is a pretty good match
-        // for browser behavior, for example, a large number of browsers
-        // cannot handle foo_.example.com, but foo_bar.example.com is
-        // fairly well supported.
-        $underscore = $config->get('Core.AllowHostnameUnderscore') ? '_' : '';
-
-        // Based off of RFC 1738, but amended so that
-        // as per RFC 3696, the top label need only not be all numeric.
-        // The productions describing this are:
-        $a   = '[a-z]';     // alpha
-        $an  = '[a-z0-9]';  // alphanum
-        $and = "[a-z0-9-$underscore]"; // alphanum | "-"
-        // domainlabel = alphanum | alphanum *( alphanum | "-" ) alphanum
-        $domainlabel = "$an(?:$and*$an)?";
-        // AMENDED as per RFC 3696
-        // toplabel    = alphanum | alphanum *( alphanum | "-" ) alphanum
-        //      side condition: not all numeric
-        $toplabel = "$an(?:$and*$an)?";
-        // hostname    = *( domainlabel "." ) toplabel [ "." ]
-        if (preg_match("/^(?:$domainlabel\.)*($toplabel)\.?$/i", $string, $matches)) {
-            if (!ctype_digit($matches[1])) {
-                return $string;
-            }
-        }
-
-        // PHP 5.3 and later support this functionality natively
-        if (function_exists('idn_to_ascii')) {
-            if (defined('IDNA_NONTRANSITIONAL_TO_ASCII') && defined('INTL_IDNA_VARIANT_UTS46')) {
-                $string = idn_to_ascii($string, IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46);
-            } else {
-                $string = idn_to_ascii($string);
-            }
-
-        // If we have Net_IDNA2 support, we can support IRIs by
-        // punycoding them. (This is the most portable thing to do,
-        // since otherwise we have to assume browsers support
-        } elseif ($config->get('Core.EnableIDNA')) {
-            $idna = new Net_IDNA2(array('encoding' => 'utf8', 'overlong' => false, 'strict' => true));
-            // we need to encode each period separately
-            $parts = explode('.', $string);
-            try {
-                $new_parts = array();
-                foreach ($parts as $part) {
-                    $encodable = false;
-                    for ($i = 0, $c = strlen($part); $i < $c; $i++) {
-                        if (ord($part[$i]) > 0x7a) {
-                            $encodable = true;
-                            break;
-                        }
-                    }
-                    if (!$encodable) {
-                        $new_parts[] = $part;
-                    } else {
-                        $new_parts[] = $idna->encode($part);
-                    }
-                }
-                $string = implode('.', $new_parts);
-            } catch (Exception $e) {
-                // XXX error reporting
-            }
-        }
-        // Try again
-        if (preg_match("/^($domainlabel\.)*$toplabel\.?$/i", $string)) {
-            return $string;
-        }
-        return false;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/IPv4.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/IPv4.php
deleted file mode 100644
index 30ac16c9e7..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/IPv4.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
- * Validates an IPv4 address
- * @author Feyd @ forums.devnetwork.net (public domain)
- */
-class HTMLPurifier_AttrDef_URI_IPv4 extends HTMLPurifier_AttrDef
-{
-
-    /**
-     * IPv4 regex, protected so that IPv6 can reuse it.
-     * @type string
-     */
-    protected $ip4;
-
-    /**
-     * @param string $aIP
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($aIP, $config, $context)
-    {
-        if (!$this->ip4) {
-            $this->_loadRegex();
-        }
-
-        if (preg_match('#^' . $this->ip4 . '$#s', $aIP)) {
-            return $aIP;
-        }
-        return false;
-    }
-
-    /**
-     * Lazy load function to prevent regex from being stuffed in
-     * cache.
-     */
-    protected function _loadRegex()
-    {
-        $oct = '(?:25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]|[0-9])'; // 0-255
-        $this->ip4 = "(?:{$oct}\\.{$oct}\\.{$oct}\\.{$oct})";
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/IPv6.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/IPv6.php
deleted file mode 100644
index f243793eeb..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/IPv6.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-/**
- * Validates an IPv6 address.
- * @author Feyd @ forums.devnetwork.net (public domain)
- * @note This function requires brackets to have been removed from address
- *       in URI.
- */
-class HTMLPurifier_AttrDef_URI_IPv6 extends HTMLPurifier_AttrDef_URI_IPv4
-{
-
-    /**
-     * @param string $aIP
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string
-     */
-    public function validate($aIP, $config, $context)
-    {
-        if (!$this->ip4) {
-            $this->_loadRegex();
-        }
-
-        $original = $aIP;
-
-        $hex = '[0-9a-fA-F]';
-        $blk = '(?:' . $hex . '{1,4})';
-        $pre = '(?:/(?:12[0-8]|1[0-1][0-9]|[1-9][0-9]|[0-9]))'; // /0 - /128
-
-        //      prefix check
-        if (strpos($aIP, '/') !== false) {
-            if (preg_match('#' . $pre . '$#s', $aIP, $find)) {
-                $aIP = substr($aIP, 0, 0 - strlen($find[0]));
-                unset($find);
-            } else {
-                return false;
-            }
-        }
-
-        //      IPv4-compatiblity check
-        if (preg_match('#(?<=:' . ')' . $this->ip4 . '$#s', $aIP, $find)) {
-            $aIP = substr($aIP, 0, 0 - strlen($find[0]));
-            $ip = explode('.', $find[0]);
-            $ip = array_map('dechex', $ip);
-            $aIP .= $ip[0] . $ip[1] . ':' . $ip[2] . $ip[3];
-            unset($find, $ip);
-        }
-
-        //      compression check
-        $aIP = explode('::', $aIP);
-        $c = count($aIP);
-        if ($c > 2) {
-            return false;
-        } elseif ($c == 2) {
-            list($first, $second) = $aIP;
-            $first = explode(':', $first);
-            $second = explode(':', $second);
-
-            if (count($first) + count($second) > 8) {
-                return false;
-            }
-
-            while (count($first) < 8) {
-                array_push($first, '0');
-            }
-
-            array_splice($first, 8 - count($second), 8, $second);
-            $aIP = $first;
-            unset($first, $second);
-        } else {
-            $aIP = explode(':', $aIP[0]);
-        }
-        $c = count($aIP);
-
-        if ($c != 8) {
-            return false;
-        }
-
-        //      All the pieces should be 16-bit hex strings. Are they?
-        foreach ($aIP as $piece) {
-            if (!preg_match('#^[0-9a-fA-F]{4}$#s', sprintf('%04s', $piece))) {
-                return false;
-            }
-        }
-        return $original;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform.php
deleted file mode 100644
index b428331f15..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/**
- * Processes an entire attribute array for corrections needing multiple values.
- *
- * Occasionally, a certain attribute will need to be removed and popped onto
- * another value.  Instead of creating a complex return syntax for
- * HTMLPurifier_AttrDef, we just pass the whole attribute array to a
- * specialized object and have that do the special work.  That is the
- * family of HTMLPurifier_AttrTransform.
- *
- * An attribute transformation can be assigned to run before or after
- * HTMLPurifier_AttrDef validation.  See HTMLPurifier_HTMLDefinition for
- * more details.
- */
-
-abstract class HTMLPurifier_AttrTransform
-{
-
-    /**
-     * Abstract: makes changes to the attributes dependent on multiple values.
-     *
-     * @param array $attr Assoc array of attributes, usually from
-     *              HTMLPurifier_Token_Tag::$attr
-     * @param HTMLPurifier_Config $config Mandatory HTMLPurifier_Config object.
-     * @param HTMLPurifier_Context $context Mandatory HTMLPurifier_Context object
-     * @return array Processed attribute array.
-     */
-    abstract public function transform($attr, $config, $context);
-
-    /**
-     * Prepends CSS properties to the style attribute, creating the
-     * attribute if it doesn't exist.
-     * @param array &$attr Attribute array to process (passed by reference)
-     * @param string $css CSS to prepend
-     */
-    public function prependCSS(&$attr, $css)
-    {
-        $attr['style'] = isset($attr['style']) ? $attr['style'] : '';
-        $attr['style'] = $css . $attr['style'];
-    }
-
-    /**
-     * Retrieves and removes an attribute
-     * @param array &$attr Attribute array to process (passed by reference)
-     * @param mixed $key Key of attribute to confiscate
-     * @return mixed
-     */
-    public function confiscateAttr(&$attr, $key)
-    {
-        if (!isset($attr[$key])) {
-            return null;
-        }
-        $value = $attr[$key];
-        unset($attr[$key]);
-        return $value;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Background.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Background.php
deleted file mode 100644
index 2f72869a5e..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Background.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * Pre-transform that changes proprietary background attribute to CSS.
- */
-class HTMLPurifier_AttrTransform_Background extends HTMLPurifier_AttrTransform
-{
-    /**
-     * @param array $attr
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function transform($attr, $config, $context)
-    {
-        if (!isset($attr['background'])) {
-            return $attr;
-        }
-
-        $background = $this->confiscateAttr($attr, 'background');
-        // some validation should happen here
-
-        $this->prependCSS($attr, "background-image:url($background);");
-        return $attr;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/BdoDir.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/BdoDir.php
deleted file mode 100644
index d66c04a5b8..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/BdoDir.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-// this MUST be placed in post, as it assumes that any value in dir is valid
-
-/**
- * Post-trasnform that ensures that bdo tags have the dir attribute set.
- */
-class HTMLPurifier_AttrTransform_BdoDir extends HTMLPurifier_AttrTransform
-{
-
-    /**
-     * @param array $attr
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function transform($attr, $config, $context)
-    {
-        if (isset($attr['dir'])) {
-            return $attr;
-        }
-        $attr['dir'] = $config->get('Attr.DefaultTextDir');
-        return $attr;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/BgColor.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/BgColor.php
deleted file mode 100644
index 0f51fd2cec..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/BgColor.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * Pre-transform that changes deprecated bgcolor attribute to CSS.
- */
-class HTMLPurifier_AttrTransform_BgColor extends HTMLPurifier_AttrTransform
-{
-    /**
-     * @param array $attr
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function transform($attr, $config, $context)
-    {
-        if (!isset($attr['bgcolor'])) {
-            return $attr;
-        }
-
-        $bgcolor = $this->confiscateAttr($attr, 'bgcolor');
-        // some validation should happen here
-
-        $this->prependCSS($attr, "background-color:$bgcolor;");
-        return $attr;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/BoolToCSS.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/BoolToCSS.php
deleted file mode 100644
index f25cd01955..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/BoolToCSS.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/**
- * Pre-transform that changes converts a boolean attribute to fixed CSS
- */
-class HTMLPurifier_AttrTransform_BoolToCSS extends HTMLPurifier_AttrTransform
-{
-    /**
-     * Name of boolean attribute that is trigger.
-     * @type string
-     */
-    protected $attr;
-
-    /**
-     * CSS declarations to add to style, needs trailing semicolon.
-     * @type string
-     */
-    protected $css;
-
-    /**
-     * @param string $attr attribute name to convert from
-     * @param string $css CSS declarations to add to style (needs semicolon)
-     */
-    public function __construct($attr, $css)
-    {
-        $this->attr = $attr;
-        $this->css = $css;
-    }
-
-    /**
-     * @param array $attr
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function transform($attr, $config, $context)
-    {
-        if (!isset($attr[$this->attr])) {
-            return $attr;
-        }
-        unset($attr[$this->attr]);
-        $this->prependCSS($attr, $this->css);
-        return $attr;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Border.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Border.php
deleted file mode 100644
index 057dc017fa..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Border.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * Pre-transform that changes deprecated border attribute to CSS.
- */
-class HTMLPurifier_AttrTransform_Border extends HTMLPurifier_AttrTransform
-{
-    /**
-     * @param array $attr
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function transform($attr, $config, $context)
-    {
-        if (!isset($attr['border'])) {
-            return $attr;
-        }
-        $border_width = $this->confiscateAttr($attr, 'border');
-        // some validation should happen here
-        $this->prependCSS($attr, "border:{$border_width}px solid;");
-        return $attr;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/EnumToCSS.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/EnumToCSS.php
deleted file mode 100644
index 7ccd0e3fb7..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/EnumToCSS.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-/**
- * Generic pre-transform that converts an attribute with a fixed number of
- * values (enumerated) to CSS.
- */
-class HTMLPurifier_AttrTransform_EnumToCSS extends HTMLPurifier_AttrTransform
-{
-    /**
-     * Name of attribute to transform from.
-     * @type string
-     */
-    protected $attr;
-
-    /**
-     * Lookup array of attribute values to CSS.
-     * @type array
-     */
-    protected $enumToCSS = array();
-
-    /**
-     * Case sensitivity of the matching.
-     * @type bool
-     * @warning Currently can only be guaranteed to work with ASCII
-     *          values.
-     */
-    protected $caseSensitive = false;
-
-    /**
-     * @param string $attr Attribute name to transform from
-     * @param array $enum_to_css Lookup array of attribute values to CSS
-     * @param bool $case_sensitive Case sensitivity indicator, default false
-     */
-    public function __construct($attr, $enum_to_css, $case_sensitive = false)
-    {
-        $this->attr = $attr;
-        $this->enumToCSS = $enum_to_css;
-        $this->caseSensitive = (bool)$case_sensitive;
-    }
-
-    /**
-     * @param array $attr
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function transform($attr, $config, $context)
-    {
-        if (!isset($attr[$this->attr])) {
-            return $attr;
-        }
-
-        $value = trim($attr[$this->attr]);
-        unset($attr[$this->attr]);
-
-        if (!$this->caseSensitive) {
-            $value = strtolower($value);
-        }
-
-        if (!isset($this->enumToCSS[$value])) {
-            return $attr;
-        }
-        $this->prependCSS($attr, $this->enumToCSS[$value]);
-        return $attr;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/ImgRequired.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/ImgRequired.php
deleted file mode 100644
index 235ebb34b6..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/ImgRequired.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-// must be called POST validation
-
-/**
- * Transform that supplies default values for the src and alt attributes
- * in img tags, as well as prevents the img tag from being removed
- * because of a missing alt tag. This needs to be registered as both
- * a pre and post attribute transform.
- */
-class HTMLPurifier_AttrTransform_ImgRequired extends HTMLPurifier_AttrTransform
-{
-
-    /**
-     * @param array $attr
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function transform($attr, $config, $context)
-    {
-        $src = true;
-        if (!isset($attr['src'])) {
-            if ($config->get('Core.RemoveInvalidImg')) {
-                return $attr;
-            }
-            $attr['src'] = $config->get('Attr.DefaultInvalidImage');
-            $src = false;
-        }
-
-        if (!isset($attr['alt'])) {
-            if ($src) {
-                $alt = $config->get('Attr.DefaultImageAlt');
-                if ($alt === null) {
-                    $attr['alt'] = basename($attr['src']);
-                } else {
-                    $attr['alt'] = $alt;
-                }
-            } else {
-                $attr['alt'] = $config->get('Attr.DefaultInvalidImageAlt');
-            }
-        }
-        return $attr;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/ImgSpace.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/ImgSpace.php
deleted file mode 100644
index 350b3358fc..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/ImgSpace.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/**
- * Pre-transform that changes deprecated hspace and vspace attributes to CSS
- */
-class HTMLPurifier_AttrTransform_ImgSpace extends HTMLPurifier_AttrTransform
-{
-    /**
-     * @type string
-     */
-    protected $attr;
-
-    /**
-     * @type array
-     */
-    protected $css = array(
-        'hspace' => array('left', 'right'),
-        'vspace' => array('top', 'bottom')
-    );
-
-    /**
-     * @param string $attr
-     */
-    public function __construct($attr)
-    {
-        $this->attr = $attr;
-        if (!isset($this->css[$attr])) {
-            trigger_error(htmlspecialchars($attr) . ' is not valid space attribute');
-        }
-    }
-
-    /**
-     * @param array $attr
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function transform($attr, $config, $context)
-    {
-        if (!isset($attr[$this->attr])) {
-            return $attr;
-        }
-
-        $width = $this->confiscateAttr($attr, $this->attr);
-        // some validation could happen here
-
-        if (!isset($this->css[$this->attr])) {
-            return $attr;
-        }
-
-        $style = '';
-        foreach ($this->css[$this->attr] as $suffix) {
-            $property = "margin-$suffix";
-            $style .= "$property:{$width}px;";
-        }
-        $this->prependCSS($attr, $style);
-        return $attr;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Input.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Input.php
deleted file mode 100644
index 3ab47ed8c9..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Input.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/**
- * Performs miscellaneous cross attribute validation and filtering for
- * input elements. This is meant to be a post-transform.
- */
-class HTMLPurifier_AttrTransform_Input extends HTMLPurifier_AttrTransform
-{
-    /**
-     * @type HTMLPurifier_AttrDef_HTML_Pixels
-     */
-    protected $pixels;
-
-    public function __construct()
-    {
-        $this->pixels = new HTMLPurifier_AttrDef_HTML_Pixels();
-    }
-
-    /**
-     * @param array $attr
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function transform($attr, $config, $context)
-    {
-        if (!isset($attr['type'])) {
-            $t = 'text';
-        } else {
-            $t = strtolower($attr['type']);
-        }
-        if (isset($attr['checked']) && $t !== 'radio' && $t !== 'checkbox') {
-            unset($attr['checked']);
-        }
-        if (isset($attr['maxlength']) && $t !== 'text' && $t !== 'password') {
-            unset($attr['maxlength']);
-        }
-        if (isset($attr['size']) && $t !== 'text' && $t !== 'password') {
-            $result = $this->pixels->validate($attr['size'], $config, $context);
-            if ($result === false) {
-                unset($attr['size']);
-            } else {
-                $attr['size'] = $result;
-            }
-        }
-        if (isset($attr['src']) && $t !== 'image') {
-            unset($attr['src']);
-        }
-        if (!isset($attr['value']) && ($t === 'radio' || $t === 'checkbox')) {
-            $attr['value'] = '';
-        }
-        return $attr;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Lang.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Lang.php
deleted file mode 100644
index 5b0aff0e40..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Lang.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- * Post-transform that copies lang's value to xml:lang (and vice-versa)
- * @note Theoretically speaking, this could be a pre-transform, but putting
- *       post is more efficient.
- */
-class HTMLPurifier_AttrTransform_Lang extends HTMLPurifier_AttrTransform
-{
-
-    /**
-     * @param array $attr
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function transform($attr, $config, $context)
-    {
-        $lang = isset($attr['lang']) ? $attr['lang'] : false;
-        $xml_lang = isset($attr['xml:lang']) ? $attr['xml:lang'] : false;
-
-        if ($lang !== false && $xml_lang === false) {
-            $attr['xml:lang'] = $lang;
-        } elseif ($xml_lang !== false) {
-            $attr['lang'] = $xml_lang;
-        }
-        return $attr;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Length.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Length.php
deleted file mode 100644
index 853f33549b..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Length.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
- * Class for handling width/height length attribute transformations to CSS
- */
-class HTMLPurifier_AttrTransform_Length extends HTMLPurifier_AttrTransform
-{
-
-    /**
-     * @type string
-     */
-    protected $name;
-
-    /**
-     * @type string
-     */
-    protected $cssName;
-
-    public function __construct($name, $css_name = null)
-    {
-        $this->name = $name;
-        $this->cssName = $css_name ? $css_name : $name;
-    }
-
-    /**
-     * @param array $attr
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function transform($attr, $config, $context)
-    {
-        if (!isset($attr[$this->name])) {
-            return $attr;
-        }
-        $length = $this->confiscateAttr($attr, $this->name);
-        if (ctype_digit($length)) {
-            $length .= 'px';
-        }
-        $this->prependCSS($attr, $this->cssName . ":$length;");
-        return $attr;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Name.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Name.php
deleted file mode 100644
index 63cce6837a..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Name.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * Pre-transform that changes deprecated name attribute to ID if necessary
- */
-class HTMLPurifier_AttrTransform_Name extends HTMLPurifier_AttrTransform
-{
-
-    /**
-     * @param array $attr
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function transform($attr, $config, $context)
-    {
-        // Abort early if we're using relaxed definition of name
-        if ($config->get('HTML.Attr.Name.UseCDATA')) {
-            return $attr;
-        }
-        if (!isset($attr['name'])) {
-            return $attr;
-        }
-        $id = $this->confiscateAttr($attr, 'name');
-        if (isset($attr['id'])) {
-            return $attr;
-        }
-        $attr['id'] = $id;
-        return $attr;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/NameSync.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/NameSync.php
deleted file mode 100644
index 36079b786f..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/NameSync.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/**
- * Post-transform that performs validation to the name attribute; if
- * it is present with an equivalent id attribute, it is passed through;
- * otherwise validation is performed.
- */
-class HTMLPurifier_AttrTransform_NameSync extends HTMLPurifier_AttrTransform
-{
-
-    public function __construct()
-    {
-        $this->idDef = new HTMLPurifier_AttrDef_HTML_ID();
-    }
-
-    /**
-     * @param array $attr
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function transform($attr, $config, $context)
-    {
-        if (!isset($attr['name'])) {
-            return $attr;
-        }
-        $name = $attr['name'];
-        if (isset($attr['id']) && $attr['id'] === $name) {
-            return $attr;
-        }
-        $result = $this->idDef->validate($name, $config, $context);
-        if ($result === false) {
-            unset($attr['name']);
-        } else {
-            $attr['name'] = $result;
-        }
-        return $attr;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Nofollow.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Nofollow.php
deleted file mode 100644
index 1057ebee1b..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Nofollow.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-// must be called POST validation
-
-/**
- * Adds rel="nofollow" to all outbound links.  This transform is
- * only attached if Attr.Nofollow is TRUE.
- */
-class HTMLPurifier_AttrTransform_Nofollow extends HTMLPurifier_AttrTransform
-{
-    /**
-     * @type HTMLPurifier_URIParser
-     */
-    private $parser;
-
-    public function __construct()
-    {
-        $this->parser = new HTMLPurifier_URIParser();
-    }
-
-    /**
-     * @param array $attr
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function transform($attr, $config, $context)
-    {
-        if (!isset($attr['href'])) {
-            return $attr;
-        }
-
-        // XXX Kind of inefficient
-        $url = $this->parser->parse($attr['href']);
-        $scheme = $url->getSchemeObj($config, $context);
-
-        if ($scheme->browsable && !$url->isLocal($config, $context)) {
-            if (isset($attr['rel'])) {
-                $rels = explode(' ', $attr['rel']);
-                if (!in_array('nofollow', $rels)) {
-                    $rels[] = 'nofollow';
-                }
-                $attr['rel'] = implode(' ', $rels);
-            } else {
-                $attr['rel'] = 'nofollow';
-            }
-        }
-        return $attr;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeEmbed.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeEmbed.php
deleted file mode 100644
index 231c81a3f0..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeEmbed.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-class HTMLPurifier_AttrTransform_SafeEmbed extends HTMLPurifier_AttrTransform
-{
-    /**
-     * @type string
-     */
-    public $name = "SafeEmbed";
-
-    /**
-     * @param array $attr
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function transform($attr, $config, $context)
-    {
-        $attr['allowscriptaccess'] = 'never';
-        $attr['allownetworking'] = 'internal';
-        $attr['type'] = 'application/x-shockwave-flash';
-        return $attr;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeObject.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeObject.php
deleted file mode 100644
index d1f3a4d2ed..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeObject.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * Writes default type for all objects. Currently only supports flash.
- */
-class HTMLPurifier_AttrTransform_SafeObject extends HTMLPurifier_AttrTransform
-{
-    /**
-     * @type string
-     */
-    public $name = "SafeObject";
-
-    /**
-     * @param array $attr
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function transform($attr, $config, $context)
-    {
-        if (!isset($attr['type'])) {
-            $attr['type'] = 'application/x-shockwave-flash';
-        }
-        return $attr;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeParam.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeParam.php
deleted file mode 100644
index 1143b4b493..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeParam.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-/**
- * Validates name/value pairs in param tags to be used in safe objects. This
- * will only allow name values it recognizes, and pre-fill certain attributes
- * with required values.
- *
- * @note
- *      This class only supports Flash. In the future, Quicktime support
- *      may be added.
- *
- * @warning
- *      This class expects an injector to add the necessary parameters tags.
- */
-class HTMLPurifier_AttrTransform_SafeParam extends HTMLPurifier_AttrTransform
-{
-    /**
-     * @type string
-     */
-    public $name = "SafeParam";
-
-    /**
-     * @type HTMLPurifier_AttrDef_URI
-     */
-    private $uri;
-
-    public function __construct()
-    {
-        $this->uri = new HTMLPurifier_AttrDef_URI(true); // embedded
-        $this->wmode = new HTMLPurifier_AttrDef_Enum(array('window', 'opaque', 'transparent'));
-    }
-
-    /**
-     * @param array $attr
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function transform($attr, $config, $context)
-    {
-        // If we add support for other objects, we'll need to alter the
-        // transforms.
-        switch ($attr['name']) {
-            // application/x-shockwave-flash
-            // Keep this synchronized with Injector/SafeObject.php
-            case 'allowScriptAccess':
-                $attr['value'] = 'never';
-                break;
-            case 'allowNetworking':
-                $attr['value'] = 'internal';
-                break;
-            case 'allowFullScreen':
-                if ($config->get('HTML.FlashAllowFullScreen')) {
-                    $attr['value'] = ($attr['value'] == 'true') ? 'true' : 'false';
-                } else {
-                    $attr['value'] = 'false';
-                }
-                break;
-            case 'wmode':
-                $attr['value'] = $this->wmode->validate($attr['value'], $config, $context);
-                break;
-            case 'movie':
-            case 'src':
-                $attr['name'] = "movie";
-                $attr['value'] = $this->uri->validate($attr['value'], $config, $context);
-                break;
-            case 'flashvars':
-                // we're going to allow arbitrary inputs to the SWF, on
-                // the reasoning that it could only hack the SWF, not us.
-                break;
-            // add other cases to support other param name/value pairs
-            default:
-                $attr['name'] = $attr['value'] = null;
-        }
-        return $attr;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/ScriptRequired.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/ScriptRequired.php
deleted file mode 100644
index b7057bbf8e..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/ScriptRequired.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * Implements required attribute stipulation for <script>
- */
-class HTMLPurifier_AttrTransform_ScriptRequired extends HTMLPurifier_AttrTransform
-{
-    /**
-     * @param array $attr
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function transform($attr, $config, $context)
-    {
-        if (!isset($attr['type'])) {
-            $attr['type'] = 'text/javascript';
-        }
-        return $attr;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/TargetBlank.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/TargetBlank.php
deleted file mode 100644
index dd63ea89cb..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/TargetBlank.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-// must be called POST validation
-
-/**
- * Adds target="blank" to all outbound links.  This transform is
- * only attached if Attr.TargetBlank is TRUE.  This works regardless
- * of whether or not Attr.AllowedFrameTargets
- */
-class HTMLPurifier_AttrTransform_TargetBlank extends HTMLPurifier_AttrTransform
-{
-    /**
-     * @type HTMLPurifier_URIParser
-     */
-    private $parser;
-
-    public function __construct()
-    {
-        $this->parser = new HTMLPurifier_URIParser();
-    }
-
-    /**
-     * @param array $attr
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function transform($attr, $config, $context)
-    {
-        if (!isset($attr['href'])) {
-            return $attr;
-        }
-
-        // XXX Kind of inefficient
-        $url = $this->parser->parse($attr['href']);
-        $scheme = $url->getSchemeObj($config, $context);
-
-        if ($scheme->browsable && !$url->isBenign($config, $context)) {
-            $attr['target'] = '_blank';
-        }
-        return $attr;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/TargetNoopener.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/TargetNoopener.php
deleted file mode 100644
index 1db3c6c09e..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/TargetNoopener.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-// must be called POST validation
-
-/**
- * Adds rel="noopener" to any links which target a different window
- * than the current one.  This is used to prevent malicious websites
- * from silently replacing the original window, which could be used
- * to do phishing.
- * This transform is controlled by %HTML.TargetNoopener.
- */
-class HTMLPurifier_AttrTransform_TargetNoopener extends HTMLPurifier_AttrTransform
-{
-    /**
-     * @param array $attr
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function transform($attr, $config, $context)
-    {
-        if (isset($attr['rel'])) {
-            $rels = explode(' ', $attr['rel']);
-        } else {
-            $rels = array();
-        }
-        if (isset($attr['target']) && !in_array('noopener', $rels)) {
-            $rels[] = 'noopener';
-        }
-        if (!empty($rels) || isset($attr['rel'])) {
-            $attr['rel'] = implode(' ', $rels);
-        }
-
-        return $attr;
-    }
-}
-
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/TargetNoreferrer.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/TargetNoreferrer.php
deleted file mode 100644
index 587dc2e079..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/TargetNoreferrer.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-// must be called POST validation
-
-/**
- * Adds rel="noreferrer" to any links which target a different window
- * than the current one.  This is used to prevent malicious websites
- * from silently replacing the original window, which could be used
- * to do phishing.
- * This transform is controlled by %HTML.TargetNoreferrer.
- */
-class HTMLPurifier_AttrTransform_TargetNoreferrer extends HTMLPurifier_AttrTransform
-{
-    /**
-     * @param array $attr
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function transform($attr, $config, $context)
-    {
-        if (isset($attr['rel'])) {
-            $rels = explode(' ', $attr['rel']);
-        } else {
-            $rels = array();
-        }
-        if (isset($attr['target']) && !in_array('noreferrer', $rels)) {
-            $rels[] = 'noreferrer';
-        }
-        if (!empty($rels) || isset($attr['rel'])) {
-            $attr['rel'] = implode(' ', $rels);
-        }
-
-        return $attr;
-    }
-}
-
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Textarea.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Textarea.php
deleted file mode 100644
index 6a9f33a0c8..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/Textarea.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * Sets height/width defaults for <textarea>
- */
-class HTMLPurifier_AttrTransform_Textarea extends HTMLPurifier_AttrTransform
-{
-    /**
-     * @param array $attr
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function transform($attr, $config, $context)
-    {
-        // Calculated from Firefox
-        if (!isset($attr['cols'])) {
-            $attr['cols'] = '22';
-        }
-        if (!isset($attr['rows'])) {
-            $attr['rows'] = '3';
-        }
-        return $attr;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTypes.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTypes.php
deleted file mode 100644
index 3b70520b6a..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTypes.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-/**
- * Provides lookup array of attribute types to HTMLPurifier_AttrDef objects
- */
-class HTMLPurifier_AttrTypes
-{
-    /**
-     * Lookup array of attribute string identifiers to concrete implementations.
-     * @type HTMLPurifier_AttrDef[]
-     */
-    protected $info = array();
-
-    /**
-     * Constructs the info array, supplying default implementations for attribute
-     * types.
-     */
-    public function __construct()
-    {
-        // XXX This is kind of poor, since we don't actually /clone/
-        // instances; instead, we use the supplied make() attribute. So,
-        // the underlying class must know how to deal with arguments.
-        // With the old implementation of Enum, that ignored its
-        // arguments when handling a make dispatch, the IAlign
-        // definition wouldn't work.
-
-        // pseudo-types, must be instantiated via shorthand
-        $this->info['Enum']    = new HTMLPurifier_AttrDef_Enum();
-        $this->info['Bool']    = new HTMLPurifier_AttrDef_HTML_Bool();
-
-        $this->info['CDATA']    = new HTMLPurifier_AttrDef_Text();
-        $this->info['ID']       = new HTMLPurifier_AttrDef_HTML_ID();
-        $this->info['Length']   = new HTMLPurifier_AttrDef_HTML_Length();
-        $this->info['MultiLength'] = new HTMLPurifier_AttrDef_HTML_MultiLength();
-        $this->info['NMTOKENS'] = new HTMLPurifier_AttrDef_HTML_Nmtokens();
-        $this->info['Pixels']   = new HTMLPurifier_AttrDef_HTML_Pixels();
-        $this->info['Text']     = new HTMLPurifier_AttrDef_Text();
-        $this->info['URI']      = new HTMLPurifier_AttrDef_URI();
-        $this->info['LanguageCode'] = new HTMLPurifier_AttrDef_Lang();
-        $this->info['Color']    = new HTMLPurifier_AttrDef_HTML_Color();
-        $this->info['IAlign']   = self::makeEnum('top,middle,bottom,left,right');
-        $this->info['LAlign']   = self::makeEnum('top,bottom,left,right');
-        $this->info['FrameTarget'] = new HTMLPurifier_AttrDef_HTML_FrameTarget();
-
-        // unimplemented aliases
-        $this->info['ContentType'] = new HTMLPurifier_AttrDef_Text();
-        $this->info['ContentTypes'] = new HTMLPurifier_AttrDef_Text();
-        $this->info['Charsets'] = new HTMLPurifier_AttrDef_Text();
-        $this->info['Character'] = new HTMLPurifier_AttrDef_Text();
-
-        // "proprietary" types
-        $this->info['Class'] = new HTMLPurifier_AttrDef_HTML_Class();
-
-        // number is really a positive integer (one or more digits)
-        // FIXME: ^^ not always, see start and value of list items
-        $this->info['Number']   = new HTMLPurifier_AttrDef_Integer(false, false, true);
-    }
-
-    private static function makeEnum($in)
-    {
-        return new HTMLPurifier_AttrDef_Clone(new HTMLPurifier_AttrDef_Enum(explode(',', $in)));
-    }
-
-    /**
-     * Retrieves a type
-     * @param string $type String type name
-     * @return HTMLPurifier_AttrDef Object AttrDef for type
-     */
-    public function get($type)
-    {
-        // determine if there is any extra info tacked on
-        if (strpos($type, '#') !== false) {
-            list($type, $string) = explode('#', $type, 2);
-        } else {
-            $string = '';
-        }
-
-        if (!isset($this->info[$type])) {
-            trigger_error('Cannot retrieve undefined attribute type ' . $type, E_USER_ERROR);
-            return;
-        }
-        return $this->info[$type]->make($string);
-    }
-
-    /**
-     * Sets a new implementation for a type
-     * @param string $type String type name
-     * @param HTMLPurifier_AttrDef $impl Object AttrDef for type
-     */
-    public function set($type, $impl)
-    {
-        $this->info[$type] = $impl;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrValidator.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrValidator.php
deleted file mode 100644
index f97dc93edd..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrValidator.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<?php
-
-/**
- * Validates the attributes of a token. Doesn't manage required attributes
- * very well. The only reason we factored this out was because RemoveForeignElements
- * also needed it besides ValidateAttributes.
- */
-class HTMLPurifier_AttrValidator
-{
-
-    /**
-     * Validates the attributes of a token, mutating it as necessary.
-     * that has valid tokens
-     * @param HTMLPurifier_Token $token Token to validate.
-     * @param HTMLPurifier_Config $config Instance of HTMLPurifier_Config
-     * @param HTMLPurifier_Context $context Instance of HTMLPurifier_Context
-     */
-    public function validateToken($token, $config, $context)
-    {
-        $definition = $config->getHTMLDefinition();
-        $e =& $context->get('ErrorCollector', true);
-
-        // initialize IDAccumulator if necessary
-        $ok =& $context->get('IDAccumulator', true);
-        if (!$ok) {
-            $id_accumulator = HTMLPurifier_IDAccumulator::build($config, $context);
-            $context->register('IDAccumulator', $id_accumulator);
-        }
-
-        // initialize CurrentToken if necessary
-        $current_token =& $context->get('CurrentToken', true);
-        if (!$current_token) {
-            $context->register('CurrentToken', $token);
-        }
-
-        if (!$token instanceof HTMLPurifier_Token_Start &&
-            !$token instanceof HTMLPurifier_Token_Empty
-        ) {
-            return;
-        }
-
-        // create alias to global definition array, see also $defs
-        // DEFINITION CALL
-        $d_defs = $definition->info_global_attr;
-
-        // don't update token until the very end, to ensure an atomic update
-        $attr = $token->attr;
-
-        // do global transformations (pre)
-        // nothing currently utilizes this
-        foreach ($definition->info_attr_transform_pre as $transform) {
-            $attr = $transform->transform($o = $attr, $config, $context);
-            if ($e) {
-                if ($attr != $o) {
-                    $e->send(E_NOTICE, 'AttrValidator: Attributes transformed', $o, $attr);
-                }
-            }
-        }
-
-        // do local transformations only applicable to this element (pre)
-        // ex. <p align="right"> to <p style="text-align:right;">
-        foreach ($definition->info[$token->name]->attr_transform_pre as $transform) {
-            $attr = $transform->transform($o = $attr, $config, $context);
-            if ($e) {
-                if ($attr != $o) {
-                    $e->send(E_NOTICE, 'AttrValidator: Attributes transformed', $o, $attr);
-                }
-            }
-        }
-
-        // create alias to this element's attribute definition array, see
-        // also $d_defs (global attribute definition array)
-        // DEFINITION CALL
-        $defs = $definition->info[$token->name]->attr;
-
-        $attr_key = false;
-        $context->register('CurrentAttr', $attr_key);
-
-        // iterate through all the attribute keypairs
-        // Watch out for name collisions: $key has previously been used
-        foreach ($attr as $attr_key => $value) {
-
-            // call the definition
-            if (isset($defs[$attr_key])) {
-                // there is a local definition defined
-                if ($defs[$attr_key] === false) {
-                    // We've explicitly been told not to allow this element.
-                    // This is usually when there's a global definition
-                    // that must be overridden.
-                    // Theoretically speaking, we could have a
-                    // AttrDef_DenyAll, but this is faster!
-                    $result = false;
-                } else {
-                    // validate according to the element's definition
-                    $result = $defs[$attr_key]->validate(
-                        $value,
-                        $config,
-                        $context
-                    );
-                }
-            } elseif (isset($d_defs[$attr_key])) {
-                // there is a global definition defined, validate according
-                // to the global definition
-                $result = $d_defs[$attr_key]->validate(
-                    $value,
-                    $config,
-                    $context
-                );
-            } else {
-                // system never heard of the attribute? DELETE!
-                $result = false;
-            }
-
-            // put the results into effect
-            if ($result === false || $result === null) {
-                // this is a generic error message that should replaced
-                // with more specific ones when possible
-                if ($e) {
-                    $e->send(E_ERROR, 'AttrValidator: Attribute removed');
-                }
-
-                // remove the attribute
-                unset($attr[$attr_key]);
-            } elseif (is_string($result)) {
-                // generally, if a substitution is happening, there
-                // was some sort of implicit correction going on. We'll
-                // delegate it to the attribute classes to say exactly what.
-
-                // simple substitution
-                $attr[$attr_key] = $result;
-            } else {
-                // nothing happens
-            }
-
-            // we'd also want slightly more complicated substitution
-            // involving an array as the return value,
-            // although we're not sure how colliding attributes would
-            // resolve (certain ones would be completely overriden,
-            // others would prepend themselves).
-        }
-
-        $context->destroy('CurrentAttr');
-
-        // post transforms
-
-        // global (error reporting untested)
-        foreach ($definition->info_attr_transform_post as $transform) {
-            $attr = $transform->transform($o = $attr, $config, $context);
-            if ($e) {
-                if ($attr != $o) {
-                    $e->send(E_NOTICE, 'AttrValidator: Attributes transformed', $o, $attr);
-                }
-            }
-        }
-
-        // local (error reporting untested)
-        foreach ($definition->info[$token->name]->attr_transform_post as $transform) {
-            $attr = $transform->transform($o = $attr, $config, $context);
-            if ($e) {
-                if ($attr != $o) {
-                    $e->send(E_NOTICE, 'AttrValidator: Attributes transformed', $o, $attr);
-                }
-            }
-        }
-
-        $token->attr = $attr;
-
-        // destroy CurrentToken if we made it ourselves
-        if (!$current_token) {
-            $context->destroy('CurrentToken');
-        }
-
-    }
-
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Bootstrap.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Bootstrap.php
deleted file mode 100644
index 707122bb29..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Bootstrap.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-
-// constants are slow, so we use as few as possible
-if (!defined('HTMLPURIFIER_PREFIX')) {
-    define('HTMLPURIFIER_PREFIX', realpath(dirname(__FILE__) . '/..'));
-}
-
-// accomodations for versions earlier than 5.0.2
-// borrowed from PHP_Compat, LGPL licensed, by Aidan Lister <aidan@php.net>
-if (!defined('PHP_EOL')) {
-    switch (strtoupper(substr(PHP_OS, 0, 3))) {
-        case 'WIN':
-            define('PHP_EOL', "\r\n");
-            break;
-        case 'DAR':
-            define('PHP_EOL', "\r");
-            break;
-        default:
-            define('PHP_EOL', "\n");
-    }
-}
-
-/**
- * Bootstrap class that contains meta-functionality for HTML Purifier such as
- * the autoload function.
- *
- * @note
- *      This class may be used without any other files from HTML Purifier.
- */
-class HTMLPurifier_Bootstrap
-{
-
-    /**
-     * Autoload function for HTML Purifier
-     * @param string $class Class to load
-     * @return bool
-     */
-    public static function autoload($class)
-    {
-        $file = HTMLPurifier_Bootstrap::getPath($class);
-        if (!$file) {
-            return false;
-        }
-        // Technically speaking, it should be ok and more efficient to
-        // just do 'require', but Antonio Parraga reports that with
-        // Zend extensions such as Zend debugger and APC, this invariant
-        // may be broken.  Since we have efficient alternatives, pay
-        // the cost here and avoid the bug.
-        require_once HTMLPURIFIER_PREFIX . '/' . $file;
-        return true;
-    }
-
-    /**
-     * Returns the path for a specific class.
-     * @param string $class Class path to get
-     * @return string
-     */
-    public static function getPath($class)
-    {
-        if (strncmp('HTMLPurifier', $class, 12) !== 0) {
-            return false;
-        }
-        // Custom implementations
-        if (strncmp('HTMLPurifier_Language_', $class, 22) === 0) {
-            $code = str_replace('_', '-', substr($class, 22));
-            $file = 'HTMLPurifier/Language/classes/' . $code . '.php';
-        } else {
-            $file = str_replace('_', '/', $class) . '.php';
-        }
-        if (!file_exists(HTMLPURIFIER_PREFIX . '/' . $file)) {
-            return false;
-        }
-        return $file;
-    }
-
-    /**
-     * "Pre-registers" our autoloader on the SPL stack.
-     */
-    public static function registerAutoload()
-    {
-        $autoload = array('HTMLPurifier_Bootstrap', 'autoload');
-        if (($funcs = spl_autoload_functions()) === false) {
-            spl_autoload_register($autoload);
-        } elseif (function_exists('spl_autoload_unregister')) {
-            if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
-                // prepend flag exists, no need for shenanigans
-                spl_autoload_register($autoload, true, true);
-            } else {
-                $buggy  = version_compare(PHP_VERSION, '5.2.11', '<');
-                $compat = version_compare(PHP_VERSION, '5.1.2', '<=') &&
-                          version_compare(PHP_VERSION, '5.1.0', '>=');
-                foreach ($funcs as $func) {
-                    if ($buggy && is_array($func)) {
-                        // :TRICKY: There are some compatibility issues and some
-                        // places where we need to error out
-                        $reflector = new ReflectionMethod($func[0], $func[1]);
-                        if (!$reflector->isStatic()) {
-                            throw new Exception(
-                                'HTML Purifier autoloader registrar is not compatible
-                                with non-static object methods due to PHP Bug #44144;
-                                Please do not use HTMLPurifier.autoload.php (or any
-                                file that includes this file); instead, place the code:
-                                spl_autoload_register(array(\'HTMLPurifier_Bootstrap\', \'autoload\'))
-                                after your own autoloaders.'
-                            );
-                        }
-                        // Suprisingly, spl_autoload_register supports the
-                        // Class::staticMethod callback format, although call_user_func doesn't
-                        if ($compat) {
-                            $func = implode('::', $func);
-                        }
-                    }
-                    spl_autoload_unregister($func);
-                }
-                spl_autoload_register($autoload);
-                foreach ($funcs as $func) {
-                    spl_autoload_register($func);
-                }
-            }
-        }
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/CSSDefinition.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/CSSDefinition.php
deleted file mode 100644
index 21f1a5899d..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/CSSDefinition.php
+++ /dev/null
@@ -1,533 +0,0 @@
-<?php
-
-/**
- * Defines allowed CSS attributes and what their values are.
- * @see HTMLPurifier_HTMLDefinition
- */
-class HTMLPurifier_CSSDefinition extends HTMLPurifier_Definition
-{
-
-    public $type = 'CSS';
-
-    /**
-     * Assoc array of attribute name to definition object.
-     * @type HTMLPurifier_AttrDef[]
-     */
-    public $info = array();
-
-    /**
-     * Constructs the info array.  The meat of this class.
-     * @param HTMLPurifier_Config $config
-     */
-    protected function doSetup($config)
-    {
-        $this->info['text-align'] = new HTMLPurifier_AttrDef_Enum(
-            array('left', 'right', 'center', 'justify'),
-            false
-        );
-
-        $border_style =
-            $this->info['border-bottom-style'] =
-            $this->info['border-right-style'] =
-            $this->info['border-left-style'] =
-            $this->info['border-top-style'] = new HTMLPurifier_AttrDef_Enum(
-                array(
-                    'none',
-                    'hidden',
-                    'dotted',
-                    'dashed',
-                    'solid',
-                    'double',
-                    'groove',
-                    'ridge',
-                    'inset',
-                    'outset'
-                ),
-                false
-            );
-
-        $this->info['border-style'] = new HTMLPurifier_AttrDef_CSS_Multiple($border_style);
-
-        $this->info['clear'] = new HTMLPurifier_AttrDef_Enum(
-            array('none', 'left', 'right', 'both'),
-            false
-        );
-        $this->info['float'] = new HTMLPurifier_AttrDef_Enum(
-            array('none', 'left', 'right'),
-            false
-        );
-        $this->info['font-style'] = new HTMLPurifier_AttrDef_Enum(
-            array('normal', 'italic', 'oblique'),
-            false
-        );
-        $this->info['font-variant'] = new HTMLPurifier_AttrDef_Enum(
-            array('normal', 'small-caps'),
-            false
-        );
-
-        $uri_or_none = new HTMLPurifier_AttrDef_CSS_Composite(
-            array(
-                new HTMLPurifier_AttrDef_Enum(array('none')),
-                new HTMLPurifier_AttrDef_CSS_URI()
-            )
-        );
-
-        $this->info['list-style-position'] = new HTMLPurifier_AttrDef_Enum(
-            array('inside', 'outside'),
-            false
-        );
-        $this->info['list-style-type'] = new HTMLPurifier_AttrDef_Enum(
-            array(
-                'disc',
-                'circle',
-                'square',
-                'decimal',
-                'lower-roman',
-                'upper-roman',
-                'lower-alpha',
-                'upper-alpha',
-                'none'
-            ),
-            false
-        );
-        $this->info['list-style-image'] = $uri_or_none;
-
-        $this->info['list-style'] = new HTMLPurifier_AttrDef_CSS_ListStyle($config);
-
-        $this->info['text-transform'] = new HTMLPurifier_AttrDef_Enum(
-            array('capitalize', 'uppercase', 'lowercase', 'none'),
-            false
-        );
-        $this->info['color'] = new HTMLPurifier_AttrDef_CSS_Color();
-
-        $this->info['background-image'] = $uri_or_none;
-        $this->info['background-repeat'] = new HTMLPurifier_AttrDef_Enum(
-            array('repeat', 'repeat-x', 'repeat-y', 'no-repeat')
-        );
-        $this->info['background-attachment'] = new HTMLPurifier_AttrDef_Enum(
-            array('scroll', 'fixed')
-        );
-        $this->info['background-position'] = new HTMLPurifier_AttrDef_CSS_BackgroundPosition();
-
-        $border_color =
-            $this->info['border-top-color'] =
-            $this->info['border-bottom-color'] =
-            $this->info['border-left-color'] =
-            $this->info['border-right-color'] =
-            $this->info['background-color'] = new HTMLPurifier_AttrDef_CSS_Composite(
-                array(
-                    new HTMLPurifier_AttrDef_Enum(array('transparent')),
-                    new HTMLPurifier_AttrDef_CSS_Color()
-                )
-            );
-
-        $this->info['background'] = new HTMLPurifier_AttrDef_CSS_Background($config);
-
-        $this->info['border-color'] = new HTMLPurifier_AttrDef_CSS_Multiple($border_color);
-
-        $border_width =
-            $this->info['border-top-width'] =
-            $this->info['border-bottom-width'] =
-            $this->info['border-left-width'] =
-            $this->info['border-right-width'] = new HTMLPurifier_AttrDef_CSS_Composite(
-                array(
-                    new HTMLPurifier_AttrDef_Enum(array('thin', 'medium', 'thick')),
-                    new HTMLPurifier_AttrDef_CSS_Length('0') //disallow negative
-                )
-            );
-
-        $this->info['border-width'] = new HTMLPurifier_AttrDef_CSS_Multiple($border_width);
-
-        $this->info['letter-spacing'] = new HTMLPurifier_AttrDef_CSS_Composite(
-            array(
-                new HTMLPurifier_AttrDef_Enum(array('normal')),
-                new HTMLPurifier_AttrDef_CSS_Length()
-            )
-        );
-
-        $this->info['word-spacing'] = new HTMLPurifier_AttrDef_CSS_Composite(
-            array(
-                new HTMLPurifier_AttrDef_Enum(array('normal')),
-                new HTMLPurifier_AttrDef_CSS_Length()
-            )
-        );
-
-        $this->info['font-size'] = new HTMLPurifier_AttrDef_CSS_Composite(
-            array(
-                new HTMLPurifier_AttrDef_Enum(
-                    array(
-                        'xx-small',
-                        'x-small',
-                        'small',
-                        'medium',
-                        'large',
-                        'x-large',
-                        'xx-large',
-                        'larger',
-                        'smaller'
-                    )
-                ),
-                new HTMLPurifier_AttrDef_CSS_Percentage(),
-                new HTMLPurifier_AttrDef_CSS_Length()
-            )
-        );
-
-        $this->info['line-height'] = new HTMLPurifier_AttrDef_CSS_Composite(
-            array(
-                new HTMLPurifier_AttrDef_Enum(array('normal')),
-                new HTMLPurifier_AttrDef_CSS_Number(true), // no negatives
-                new HTMLPurifier_AttrDef_CSS_Length('0'),
-                new HTMLPurifier_AttrDef_CSS_Percentage(true)
-            )
-        );
-
-        $margin =
-            $this->info['margin-top'] =
-            $this->info['margin-bottom'] =
-            $this->info['margin-left'] =
-            $this->info['margin-right'] = new HTMLPurifier_AttrDef_CSS_Composite(
-                array(
-                    new HTMLPurifier_AttrDef_CSS_Length(),
-                    new HTMLPurifier_AttrDef_CSS_Percentage(),
-                    new HTMLPurifier_AttrDef_Enum(array('auto'))
-                )
-            );
-
-        $this->info['margin'] = new HTMLPurifier_AttrDef_CSS_Multiple($margin);
-
-        // non-negative
-        $padding =
-            $this->info['padding-top'] =
-            $this->info['padding-bottom'] =
-            $this->info['padding-left'] =
-            $this->info['padding-right'] = new HTMLPurifier_AttrDef_CSS_Composite(
-                array(
-                    new HTMLPurifier_AttrDef_CSS_Length('0'),
-                    new HTMLPurifier_AttrDef_CSS_Percentage(true)
-                )
-            );
-
-        $this->info['padding'] = new HTMLPurifier_AttrDef_CSS_Multiple($padding);
-
-        $this->info['text-indent'] = new HTMLPurifier_AttrDef_CSS_Composite(
-            array(
-                new HTMLPurifier_AttrDef_CSS_Length(),
-                new HTMLPurifier_AttrDef_CSS_Percentage()
-            )
-        );
-
-        $trusted_wh = new HTMLPurifier_AttrDef_CSS_Composite(
-            array(
-                new HTMLPurifier_AttrDef_CSS_Length('0'),
-                new HTMLPurifier_AttrDef_CSS_Percentage(true),
-                new HTMLPurifier_AttrDef_Enum(array('auto', 'initial', 'inherit'))
-            )
-        );
-        $trusted_min_wh = new HTMLPurifier_AttrDef_CSS_Composite(
-            array(
-                new HTMLPurifier_AttrDef_CSS_Length('0'),
-                new HTMLPurifier_AttrDef_CSS_Percentage(true),
-                new HTMLPurifier_AttrDef_Enum(array('initial', 'inherit'))
-            )
-        );
-        $trusted_max_wh = new HTMLPurifier_AttrDef_CSS_Composite(
-            array(
-                new HTMLPurifier_AttrDef_CSS_Length('0'),
-                new HTMLPurifier_AttrDef_CSS_Percentage(true),
-                new HTMLPurifier_AttrDef_Enum(array('none', 'initial', 'inherit'))
-            )
-        );
-        $max = $config->get('CSS.MaxImgLength');
-
-        $this->info['width'] =
-        $this->info['height'] =
-            $max === null ?
-                $trusted_wh :
-                new HTMLPurifier_AttrDef_Switch(
-                    'img',
-                    // For img tags:
-                    new HTMLPurifier_AttrDef_CSS_Composite(
-                        array(
-                            new HTMLPurifier_AttrDef_CSS_Length('0', $max),
-                            new HTMLPurifier_AttrDef_Enum(array('auto'))
-                        )
-                    ),
-                    // For everyone else:
-                    $trusted_wh
-                );
-        $this->info['min-width'] =
-        $this->info['min-height'] =
-            $max === null ?
-                $trusted_min_wh :
-                new HTMLPurifier_AttrDef_Switch(
-                    'img',
-                    // For img tags:
-                    new HTMLPurifier_AttrDef_CSS_Composite(
-                        array(
-                            new HTMLPurifier_AttrDef_CSS_Length('0', $max),
-                            new HTMLPurifier_AttrDef_Enum(array('initial', 'inherit'))
-                        )
-                    ),
-                    // For everyone else:
-                    $trusted_min_wh
-                );
-        $this->info['max-width'] =
-        $this->info['max-height'] =
-            $max === null ?
-                $trusted_max_wh :
-                new HTMLPurifier_AttrDef_Switch(
-                    'img',
-                    // For img tags:
-                    new HTMLPurifier_AttrDef_CSS_Composite(
-                        array(
-                            new HTMLPurifier_AttrDef_CSS_Length('0', $max),
-                            new HTMLPurifier_AttrDef_Enum(array('none', 'initial', 'inherit'))
-                        )
-                    ),
-                    // For everyone else:
-                    $trusted_max_wh
-                );
-
-        $this->info['text-decoration'] = new HTMLPurifier_AttrDef_CSS_TextDecoration();
-
-        $this->info['font-family'] = new HTMLPurifier_AttrDef_CSS_FontFamily();
-
-        // this could use specialized code
-        $this->info['font-weight'] = new HTMLPurifier_AttrDef_Enum(
-            array(
-                'normal',
-                'bold',
-                'bolder',
-                'lighter',
-                '100',
-                '200',
-                '300',
-                '400',
-                '500',
-                '600',
-                '700',
-                '800',
-                '900'
-            ),
-            false
-        );
-
-        // MUST be called after other font properties, as it references
-        // a CSSDefinition object
-        $this->info['font'] = new HTMLPurifier_AttrDef_CSS_Font($config);
-
-        // same here
-        $this->info['border'] =
-        $this->info['border-bottom'] =
-        $this->info['border-top'] =
-        $this->info['border-left'] =
-        $this->info['border-right'] = new HTMLPurifier_AttrDef_CSS_Border($config);
-
-        $this->info['border-collapse'] = new HTMLPurifier_AttrDef_Enum(
-            array('collapse', 'separate')
-        );
-
-        $this->info['caption-side'] = new HTMLPurifier_AttrDef_Enum(
-            array('top', 'bottom')
-        );
-
-        $this->info['table-layout'] = new HTMLPurifier_AttrDef_Enum(
-            array('auto', 'fixed')
-        );
-
-        $this->info['vertical-align'] = new HTMLPurifier_AttrDef_CSS_Composite(
-            array(
-                new HTMLPurifier_AttrDef_Enum(
-                    array(
-                        'baseline',
-                        'sub',
-                        'super',
-                        'top',
-                        'text-top',
-                        'middle',
-                        'bottom',
-                        'text-bottom'
-                    )
-                ),
-                new HTMLPurifier_AttrDef_CSS_Length(),
-                new HTMLPurifier_AttrDef_CSS_Percentage()
-            )
-        );
-
-        $this->info['border-spacing'] = new HTMLPurifier_AttrDef_CSS_Multiple(new HTMLPurifier_AttrDef_CSS_Length(), 2);
-
-        // These CSS properties don't work on many browsers, but we live
-        // in THE FUTURE!
-        $this->info['white-space'] = new HTMLPurifier_AttrDef_Enum(
-            array('nowrap', 'normal', 'pre', 'pre-wrap', 'pre-line')
-        );
-
-        if ($config->get('CSS.Proprietary')) {
-            $this->doSetupProprietary($config);
-        }
-
-        if ($config->get('CSS.AllowTricky')) {
-            $this->doSetupTricky($config);
-        }
-
-        if ($config->get('CSS.Trusted')) {
-            $this->doSetupTrusted($config);
-        }
-
-        $allow_important = $config->get('CSS.AllowImportant');
-        // wrap all attr-defs with decorator that handles !important
-        foreach ($this->info as $k => $v) {
-            $this->info[$k] = new HTMLPurifier_AttrDef_CSS_ImportantDecorator($v, $allow_important);
-        }
-
-        $this->setupConfigStuff($config);
-    }
-
-    /**
-     * @param HTMLPurifier_Config $config
-     */
-    protected function doSetupProprietary($config)
-    {
-        // Internet Explorer only scrollbar colors
-        $this->info['scrollbar-arrow-color'] = new HTMLPurifier_AttrDef_CSS_Color();
-        $this->info['scrollbar-base-color'] = new HTMLPurifier_AttrDef_CSS_Color();
-        $this->info['scrollbar-darkshadow-color'] = new HTMLPurifier_AttrDef_CSS_Color();
-        $this->info['scrollbar-face-color'] = new HTMLPurifier_AttrDef_CSS_Color();
-        $this->info['scrollbar-highlight-color'] = new HTMLPurifier_AttrDef_CSS_Color();
-        $this->info['scrollbar-shadow-color'] = new HTMLPurifier_AttrDef_CSS_Color();
-
-        // vendor specific prefixes of opacity
-        $this->info['-moz-opacity'] = new HTMLPurifier_AttrDef_CSS_AlphaValue();
-        $this->info['-khtml-opacity'] = new HTMLPurifier_AttrDef_CSS_AlphaValue();
-
-        // only opacity, for now
-        $this->info['filter'] = new HTMLPurifier_AttrDef_CSS_Filter();
-
-        // more CSS3
-        $this->info['page-break-after'] =
-        $this->info['page-break-before'] = new HTMLPurifier_AttrDef_Enum(
-            array(
-                'auto',
-                'always',
-                'avoid',
-                'left',
-                'right'
-            )
-        );
-        $this->info['page-break-inside'] = new HTMLPurifier_AttrDef_Enum(array('auto', 'avoid'));
-
-        $border_radius = new HTMLPurifier_AttrDef_CSS_Composite(
-            array(
-                new HTMLPurifier_AttrDef_CSS_Percentage(true), // disallow negative
-                new HTMLPurifier_AttrDef_CSS_Length('0') // disallow negative
-            ));
-
-        $this->info['border-top-left-radius'] =
-        $this->info['border-top-right-radius'] =
-        $this->info['border-bottom-right-radius'] =
-        $this->info['border-bottom-left-radius'] = new HTMLPurifier_AttrDef_CSS_Multiple($border_radius, 2);
-        // TODO: support SLASH syntax
-        $this->info['border-radius'] = new HTMLPurifier_AttrDef_CSS_Multiple($border_radius, 4);
-
-    }
-
-    /**
-     * @param HTMLPurifier_Config $config
-     */
-    protected function doSetupTricky($config)
-    {
-        $this->info['display'] = new HTMLPurifier_AttrDef_Enum(
-            array(
-                'inline',
-                'block',
-                'list-item',
-                'run-in',
-                'compact',
-                'marker',
-                'table',
-                'inline-block',
-                'inline-table',
-                'table-row-group',
-                'table-header-group',
-                'table-footer-group',
-                'table-row',
-                'table-column-group',
-                'table-column',
-                'table-cell',
-                'table-caption',
-                'none'
-            )
-        );
-        $this->info['visibility'] = new HTMLPurifier_AttrDef_Enum(
-            array('visible', 'hidden', 'collapse')
-        );
-        $this->info['overflow'] = new HTMLPurifier_AttrDef_Enum(array('visible', 'hidden', 'auto', 'scroll'));
-        $this->info['opacity'] = new HTMLPurifier_AttrDef_CSS_AlphaValue();
-    }
-
-    /**
-     * @param HTMLPurifier_Config $config
-     */
-    protected function doSetupTrusted($config)
-    {
-        $this->info['position'] = new HTMLPurifier_AttrDef_Enum(
-            array('static', 'relative', 'absolute', 'fixed')
-        );
-        $this->info['top'] =
-        $this->info['left'] =
-        $this->info['right'] =
-        $this->info['bottom'] = new HTMLPurifier_AttrDef_CSS_Composite(
-            array(
-                new HTMLPurifier_AttrDef_CSS_Length(),
-                new HTMLPurifier_AttrDef_CSS_Percentage(),
-                new HTMLPurifier_AttrDef_Enum(array('auto')),
-            )
-        );
-        $this->info['z-index'] = new HTMLPurifier_AttrDef_CSS_Composite(
-            array(
-                new HTMLPurifier_AttrDef_Integer(),
-                new HTMLPurifier_AttrDef_Enum(array('auto')),
-            )
-        );
-    }
-
-    /**
-     * Performs extra config-based processing. Based off of
-     * HTMLPurifier_HTMLDefinition.
-     * @param HTMLPurifier_Config $config
-     * @todo Refactor duplicate elements into common class (probably using
-     *       composition, not inheritance).
-     */
-    protected function setupConfigStuff($config)
-    {
-        // setup allowed elements
-        $support = "(for information on implementing this, see the " .
-            "support forums) ";
-        $allowed_properties = $config->get('CSS.AllowedProperties');
-        if ($allowed_properties !== null) {
-            foreach ($this->info as $name => $d) {
-                if (!isset($allowed_properties[$name])) {
-                    unset($this->info[$name]);
-                }
-                unset($allowed_properties[$name]);
-            }
-            // emit errors
-            foreach ($allowed_properties as $name => $d) {
-                // :TODO: Is this htmlspecialchars() call really necessary?
-                $name = htmlspecialchars($name);
-                trigger_error("Style attribute '$name' is not supported $support", E_USER_WARNING);
-            }
-        }
-
-        $forbidden_properties = $config->get('CSS.ForbiddenProperties');
-        if ($forbidden_properties !== null) {
-            foreach ($this->info as $name => $d) {
-                if (isset($forbidden_properties[$name])) {
-                    unset($this->info[$name]);
-                }
-            }
-        }
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef.php
deleted file mode 100644
index 8eb17b82e1..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-/**
- * Defines allowed child nodes and validates nodes against it.
- */
-abstract class HTMLPurifier_ChildDef
-{
-    /**
-     * Type of child definition, usually right-most part of class name lowercase.
-     * Used occasionally in terms of context.
-     * @type string
-     */
-    public $type;
-
-    /**
-     * Indicates whether or not an empty array of children is okay.
-     *
-     * This is necessary for redundant checking when changes affecting
-     * a child node may cause a parent node to now be disallowed.
-     * @type bool
-     */
-    public $allow_empty;
-
-    /**
-     * Lookup array of all elements that this definition could possibly allow.
-     * @type array
-     */
-    public $elements = array();
-
-    /**
-     * Get lookup of tag names that should not close this element automatically.
-     * All other elements will do so.
-     * @param HTMLPurifier_Config $config HTMLPurifier_Config object
-     * @return array
-     */
-    public function getAllowedElements($config)
-    {
-        return $this->elements;
-    }
-
-    /**
-     * Validates nodes according to definition and returns modification.
-     *
-     * @param HTMLPurifier_Node[] $children Array of HTMLPurifier_Node
-     * @param HTMLPurifier_Config $config HTMLPurifier_Config object
-     * @param HTMLPurifier_Context $context HTMLPurifier_Context object
-     * @return bool|array true to leave nodes as is, false to remove parent node, array of replacement children
-     */
-    abstract public function validateChildren($children, $config, $context);
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Chameleon.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Chameleon.php
deleted file mode 100644
index 7439be26b6..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Chameleon.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-/**
- * Definition that uses different definitions depending on context.
- *
- * The del and ins tags are notable because they allow different types of
- * elements depending on whether or not they're in a block or inline context.
- * Chameleon allows this behavior to happen by using two different
- * definitions depending on context.  While this somewhat generalized,
- * it is specifically intended for those two tags.
- */
-class HTMLPurifier_ChildDef_Chameleon extends HTMLPurifier_ChildDef
-{
-
-    /**
-     * Instance of the definition object to use when inline. Usually stricter.
-     * @type HTMLPurifier_ChildDef_Optional
-     */
-    public $inline;
-
-    /**
-     * Instance of the definition object to use when block.
-     * @type HTMLPurifier_ChildDef_Optional
-     */
-    public $block;
-
-    /**
-     * @type string
-     */
-    public $type = 'chameleon';
-
-    /**
-     * @param array $inline List of elements to allow when inline.
-     * @param array $block List of elements to allow when block.
-     */
-    public function __construct($inline, $block)
-    {
-        $this->inline = new HTMLPurifier_ChildDef_Optional($inline);
-        $this->block = new HTMLPurifier_ChildDef_Optional($block);
-        $this->elements = $this->block->elements;
-    }
-
-    /**
-     * @param HTMLPurifier_Node[] $children
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool
-     */
-    public function validateChildren($children, $config, $context)
-    {
-        if ($context->get('IsInline') === false) {
-            return $this->block->validateChildren(
-                $children,
-                $config,
-                $context
-            );
-        } else {
-            return $this->inline->validateChildren(
-                $children,
-                $config,
-                $context
-            );
-        }
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Custom.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Custom.php
deleted file mode 100644
index f515888a1d..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Custom.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-/**
- * Custom validation class, accepts DTD child definitions
- *
- * @warning Currently this class is an all or nothing proposition, that is,
- *          it will only give a bool return value.
- */
-class HTMLPurifier_ChildDef_Custom extends HTMLPurifier_ChildDef
-{
-    /**
-     * @type string
-     */
-    public $type = 'custom';
-
-    /**
-     * @type bool
-     */
-    public $allow_empty = false;
-
-    /**
-     * Allowed child pattern as defined by the DTD.
-     * @type string
-     */
-    public $dtd_regex;
-
-    /**
-     * PCRE regex derived from $dtd_regex.
-     * @type string
-     */
-    private $_pcre_regex;
-
-    /**
-     * @param $dtd_regex Allowed child pattern from the DTD
-     */
-    public function __construct($dtd_regex)
-    {
-        $this->dtd_regex = $dtd_regex;
-        $this->_compileRegex();
-    }
-
-    /**
-     * Compiles the PCRE regex from a DTD regex ($dtd_regex to $_pcre_regex)
-     */
-    protected function _compileRegex()
-    {
-        $raw = str_replace(' ', '', $this->dtd_regex);
-        if ($raw[0] != '(') {
-            $raw = "($raw)";
-        }
-        $el = '[#a-zA-Z0-9_.-]+';
-        $reg = $raw;
-
-        // COMPLICATED! AND MIGHT BE BUGGY! I HAVE NO CLUE WHAT I'M
-        // DOING! Seriously: if there's problems, please report them.
-
-        // collect all elements into the $elements array
-        preg_match_all("/$el/", $reg, $matches);
-        foreach ($matches[0] as $match) {
-            $this->elements[$match] = true;
-        }
-
-        // setup all elements as parentheticals with leading commas
-        $reg = preg_replace("/$el/", '(,\\0)', $reg);
-
-        // remove commas when they were not solicited
-        $reg = preg_replace("/([^,(|]\(+),/", '\\1', $reg);
-
-        // remove all non-paranthetical commas: they are handled by first regex
-        $reg = preg_replace("/,\(/", '(', $reg);
-
-        $this->_pcre_regex = $reg;
-    }
-
-    /**
-     * @param HTMLPurifier_Node[] $children
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool
-     */
-    public function validateChildren($children, $config, $context)
-    {
-        $list_of_children = '';
-        $nesting = 0; // depth into the nest
-        foreach ($children as $node) {
-            if (!empty($node->is_whitespace)) {
-                continue;
-            }
-            $list_of_children .= $node->name . ',';
-        }
-        // add leading comma to deal with stray comma declarations
-        $list_of_children = ',' . rtrim($list_of_children, ',');
-        $okay =
-            preg_match(
-                '/^,?' . $this->_pcre_regex . '$/',
-                $list_of_children
-            );
-        return (bool)$okay;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Empty.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Empty.php
deleted file mode 100644
index a8a6cbdd2c..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Empty.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/**
- * Definition that disallows all elements.
- * @warning validateChildren() in this class is actually never called, because
- *          empty elements are corrected in HTMLPurifier_Strategy_MakeWellFormed
- *          before child definitions are parsed in earnest by
- *          HTMLPurifier_Strategy_FixNesting.
- */
-class HTMLPurifier_ChildDef_Empty extends HTMLPurifier_ChildDef
-{
-    /**
-     * @type bool
-     */
-    public $allow_empty = true;
-
-    /**
-     * @type string
-     */
-    public $type = 'empty';
-
-    public function __construct()
-    {
-    }
-
-    /**
-     * @param HTMLPurifier_Node[] $children
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function validateChildren($children, $config, $context)
-    {
-        return array();
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/List.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/List.php
deleted file mode 100644
index 4fc70e0efa..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/List.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-/**
- * Definition for list containers ul and ol.
- *
- * What does this do?  The big thing is to handle ol/ul at the top
- * level of list nodes, which should be handled specially by /folding/
- * them into the previous list node.  We generally shouldn't ever
- * see other disallowed elements, because the autoclose behavior
- * in MakeWellFormed handles it.
- */
-class HTMLPurifier_ChildDef_List extends HTMLPurifier_ChildDef
-{
-    /**
-     * @type string
-     */
-    public $type = 'list';
-    /**
-     * @type array
-     */
-    // lying a little bit, so that we can handle ul and ol ourselves
-    // XXX: This whole business with 'wrap' is all a bit unsatisfactory
-    public $elements = array('li' => true, 'ul' => true, 'ol' => true);
-
-    /**
-     * @param array $children
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function validateChildren($children, $config, $context)
-    {
-        // Flag for subclasses
-        $this->whitespace = false;
-
-        // if there are no tokens, delete parent node
-        if (empty($children)) {
-            return false;
-        }
-
-        // if li is not allowed, delete parent node
-        if (!isset($config->getHTMLDefinition()->info['li'])) {
-            trigger_error("Cannot allow ul/ol without allowing li", E_USER_WARNING);
-            return false;
-        }
-
-        // the new set of children
-        $result = array();
-
-        // a little sanity check to make sure it's not ALL whitespace
-        $all_whitespace = true;
-
-        $current_li = null;
-
-        foreach ($children as $node) {
-            if (!empty($node->is_whitespace)) {
-                $result[] = $node;
-                continue;
-            }
-            $all_whitespace = false; // phew, we're not talking about whitespace
-
-            if ($node->name === 'li') {
-                // good
-                $current_li = $node;
-                $result[] = $node;
-            } else {
-                // we want to tuck this into the previous li
-                // Invariant: we expect the node to be ol/ul
-                // ToDo: Make this more robust in the case of not ol/ul
-                // by distinguishing between existing li and li created
-                // to handle non-list elements; non-list elements should
-                // not be appended to an existing li; only li created
-                // for non-list. This distinction is not currently made.
-                if ($current_li === null) {
-                    $current_li = new HTMLPurifier_Node_Element('li');
-                    $result[] = $current_li;
-                }
-                $current_li->children[] = $node;
-                $current_li->empty = false; // XXX fascinating! Check for this error elsewhere ToDo
-            }
-        }
-        if (empty($result)) {
-            return false;
-        }
-        if ($all_whitespace) {
-            return false;
-        }
-        return $result;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Optional.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Optional.php
deleted file mode 100644
index b9468063b1..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Optional.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
- * Definition that allows a set of elements, and allows no children.
- * @note This is a hack to reuse code from HTMLPurifier_ChildDef_Required,
- *       really, one shouldn't inherit from the other.  Only altered behavior
- *       is to overload a returned false with an array.  Thus, it will never
- *       return false.
- */
-class HTMLPurifier_ChildDef_Optional extends HTMLPurifier_ChildDef_Required
-{
-    /**
-     * @type bool
-     */
-    public $allow_empty = true;
-
-    /**
-     * @type string
-     */
-    public $type = 'optional';
-
-    /**
-     * @param array $children
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function validateChildren($children, $config, $context)
-    {
-        $result = parent::validateChildren($children, $config, $context);
-        // we assume that $children is not modified
-        if ($result === false) {
-            if (empty($children)) {
-                return true;
-            } elseif ($this->whitespace) {
-                return $children;
-            } else {
-                return array();
-            }
-        }
-        return $result;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Required.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Required.php
deleted file mode 100644
index 0d1c8f5f39..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Required.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-
-/**
- * Definition that allows a set of elements, but disallows empty children.
- */
-class HTMLPurifier_ChildDef_Required extends HTMLPurifier_ChildDef
-{
-    /**
-     * Lookup table of allowed elements.
-     * @type array
-     */
-    public $elements = array();
-
-    /**
-     * Whether or not the last passed node was all whitespace.
-     * @type bool
-     */
-    protected $whitespace = false;
-
-    /**
-     * @param array|string $elements List of allowed element names (lowercase).
-     */
-    public function __construct($elements)
-    {
-        if (is_string($elements)) {
-            $elements = str_replace(' ', '', $elements);
-            $elements = explode('|', $elements);
-        }
-        $keys = array_keys($elements);
-        if ($keys == array_keys($keys)) {
-            $elements = array_flip($elements);
-            foreach ($elements as $i => $x) {
-                $elements[$i] = true;
-                if (empty($i)) {
-                    unset($elements[$i]);
-                } // remove blank
-            }
-        }
-        $this->elements = $elements;
-    }
-
-    /**
-     * @type bool
-     */
-    public $allow_empty = false;
-
-    /**
-     * @type string
-     */
-    public $type = 'required';
-
-    /**
-     * @param array $children
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function validateChildren($children, $config, $context)
-    {
-        // Flag for subclasses
-        $this->whitespace = false;
-
-        // if there are no tokens, delete parent node
-        if (empty($children)) {
-            return false;
-        }
-
-        // the new set of children
-        $result = array();
-
-        // whether or not parsed character data is allowed
-        // this controls whether or not we silently drop a tag
-        // or generate escaped HTML from it
-        $pcdata_allowed = isset($this->elements['#PCDATA']);
-
-        // a little sanity check to make sure it's not ALL whitespace
-        $all_whitespace = true;
-
-        $stack = array_reverse($children);
-        while (!empty($stack)) {
-            $node = array_pop($stack);
-            if (!empty($node->is_whitespace)) {
-                $result[] = $node;
-                continue;
-            }
-            $all_whitespace = false; // phew, we're not talking about whitespace
-
-            if (!isset($this->elements[$node->name])) {
-                // special case text
-                // XXX One of these ought to be redundant or something
-                if ($pcdata_allowed && $node instanceof HTMLPurifier_Node_Text) {
-                    $result[] = $node;
-                    continue;
-                }
-                // spill the child contents in
-                // ToDo: Make configurable
-                if ($node instanceof HTMLPurifier_Node_Element) {
-                    for ($i = count($node->children) - 1; $i >= 0; $i--) {
-                        $stack[] = $node->children[$i];
-                    }
-                    continue;
-                }
-                continue;
-            }
-            $result[] = $node;
-        }
-        if (empty($result)) {
-            return false;
-        }
-        if ($all_whitespace) {
-            $this->whitespace = true;
-            return false;
-        }
-        return $result;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/StrictBlockquote.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/StrictBlockquote.php
deleted file mode 100644
index 3270a46e1b..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/StrictBlockquote.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-
-/**
- * Takes the contents of blockquote when in strict and reformats for validation.
- */
-class HTMLPurifier_ChildDef_StrictBlockquote extends HTMLPurifier_ChildDef_Required
-{
-    /**
-     * @type array
-     */
-    protected $real_elements;
-
-    /**
-     * @type array
-     */
-    protected $fake_elements;
-
-    /**
-     * @type bool
-     */
-    public $allow_empty = true;
-
-    /**
-     * @type string
-     */
-    public $type = 'strictblockquote';
-
-    /**
-     * @type bool
-     */
-    protected $init = false;
-
-    /**
-     * @param HTMLPurifier_Config $config
-     * @return array
-     * @note We don't want MakeWellFormed to auto-close inline elements since
-     *       they might be allowed.
-     */
-    public function getAllowedElements($config)
-    {
-        $this->init($config);
-        return $this->fake_elements;
-    }
-
-    /**
-     * @param array $children
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function validateChildren($children, $config, $context)
-    {
-        $this->init($config);
-
-        // trick the parent class into thinking it allows more
-        $this->elements = $this->fake_elements;
-        $result = parent::validateChildren($children, $config, $context);
-        $this->elements = $this->real_elements;
-
-        if ($result === false) {
-            return array();
-        }
-        if ($result === true) {
-            $result = $children;
-        }
-
-        $def = $config->getHTMLDefinition();
-        $block_wrap_name = $def->info_block_wrapper;
-        $block_wrap = false;
-        $ret = array();
-
-        foreach ($result as $node) {
-            if ($block_wrap === false) {
-                if (($node instanceof HTMLPurifier_Node_Text && !$node->is_whitespace) ||
-                    ($node instanceof HTMLPurifier_Node_Element && !isset($this->elements[$node->name]))) {
-                        $block_wrap = new HTMLPurifier_Node_Element($def->info_block_wrapper);
-                        $ret[] = $block_wrap;
-                }
-            } else {
-                if ($node instanceof HTMLPurifier_Node_Element && isset($this->elements[$node->name])) {
-                    $block_wrap = false;
-
-                }
-            }
-            if ($block_wrap) {
-                $block_wrap->children[] = $node;
-            } else {
-                $ret[] = $node;
-            }
-        }
-        return $ret;
-    }
-
-    /**
-     * @param HTMLPurifier_Config $config
-     */
-    private function init($config)
-    {
-        if (!$this->init) {
-            $def = $config->getHTMLDefinition();
-            // allow all inline elements
-            $this->real_elements = $this->elements;
-            $this->fake_elements = $def->info_content_sets['Flow'];
-            $this->fake_elements['#PCDATA'] = true;
-            $this->init = true;
-        }
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Table.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Table.php
deleted file mode 100644
index cb6b3e6cdc..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Table.php
+++ /dev/null
@@ -1,224 +0,0 @@
-<?php
-
-/**
- * Definition for tables.  The general idea is to extract out all of the
- * essential bits, and then reconstruct it later.
- *
- * This is a bit confusing, because the DTDs and the W3C
- * validators seem to disagree on the appropriate definition. The
- * DTD claims:
- *
- *      (CAPTION?, (COL*|COLGROUP*), THEAD?, TFOOT?, TBODY+)
- *
- * But actually, the HTML4 spec then has this to say:
- *
- *      The TBODY start tag is always required except when the table
- *      contains only one table body and no table head or foot sections.
- *      The TBODY end tag may always be safely omitted.
- *
- * So the DTD is kind of wrong.  The validator is, unfortunately, kind
- * of on crack.
- *
- * The definition changed again in XHTML1.1; and in my opinion, this
- * formulation makes the most sense.
- *
- *      caption?, ( col* | colgroup* ), (( thead?, tfoot?, tbody+ ) | ( tr+ ))
- *
- * Essentially, we have two modes: thead/tfoot/tbody mode, and tr mode.
- * If we encounter a thead, tfoot or tbody, we are placed in the former
- * mode, and we *must* wrap any stray tr segments with a tbody. But if
- * we don't run into any of them, just have tr tags is OK.
- */
-class HTMLPurifier_ChildDef_Table extends HTMLPurifier_ChildDef
-{
-    /**
-     * @type bool
-     */
-    public $allow_empty = false;
-
-    /**
-     * @type string
-     */
-    public $type = 'table';
-
-    /**
-     * @type array
-     */
-    public $elements = array(
-        'tr' => true,
-        'tbody' => true,
-        'thead' => true,
-        'tfoot' => true,
-        'caption' => true,
-        'colgroup' => true,
-        'col' => true
-    );
-
-    public function __construct()
-    {
-    }
-
-    /**
-     * @param array $children
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array
-     */
-    public function validateChildren($children, $config, $context)
-    {
-        if (empty($children)) {
-            return false;
-        }
-
-        // only one of these elements is allowed in a table
-        $caption = false;
-        $thead = false;
-        $tfoot = false;
-
-        // whitespace
-        $initial_ws = array();
-        $after_caption_ws = array();
-        $after_thead_ws = array();
-        $after_tfoot_ws = array();
-
-        // as many of these as you want
-        $cols = array();
-        $content = array();
-
-        $tbody_mode = false; // if true, then we need to wrap any stray
-                             // <tr>s with a <tbody>.
-
-        $ws_accum =& $initial_ws;
-
-        foreach ($children as $node) {
-            if ($node instanceof HTMLPurifier_Node_Comment) {
-                $ws_accum[] = $node;
-                continue;
-            }
-            switch ($node->name) {
-            case 'tbody':
-                $tbody_mode = true;
-                // fall through
-            case 'tr':
-                $content[] = $node;
-                $ws_accum =& $content;
-                break;
-            case 'caption':
-                // there can only be one caption!
-                if ($caption !== false)  break;
-                $caption = $node;
-                $ws_accum =& $after_caption_ws;
-                break;
-            case 'thead':
-                $tbody_mode = true;
-                // XXX This breaks rendering properties with
-                // Firefox, which never floats a <thead> to
-                // the top. Ever. (Our scheme will float the
-                // first <thead> to the top.)  So maybe
-                // <thead>s that are not first should be
-                // turned into <tbody>? Very tricky, indeed.
-                if ($thead === false) {
-                    $thead = $node;
-                    $ws_accum =& $after_thead_ws;
-                } else {
-                    // Oops, there's a second one! What
-                    // should we do?  Current behavior is to
-                    // transmutate the first and last entries into
-                    // tbody tags, and then put into content.
-                    // Maybe a better idea is to *attach
-                    // it* to the existing thead or tfoot?
-                    // We don't do this, because Firefox
-                    // doesn't float an extra tfoot to the
-                    // bottom like it does for the first one.
-                    $node->name = 'tbody';
-                    $content[] = $node;
-                    $ws_accum =& $content;
-                }
-                break;
-            case 'tfoot':
-                // see above for some aveats
-                $tbody_mode = true;
-                if ($tfoot === false) {
-                    $tfoot = $node;
-                    $ws_accum =& $after_tfoot_ws;
-                } else {
-                    $node->name = 'tbody';
-                    $content[] = $node;
-                    $ws_accum =& $content;
-                }
-                break;
-            case 'colgroup':
-            case 'col':
-                $cols[] = $node;
-                $ws_accum =& $cols;
-                break;
-            case '#PCDATA':
-                // How is whitespace handled? We treat is as sticky to
-                // the *end* of the previous element. So all of the
-                // nonsense we have worked on is to keep things
-                // together.
-                if (!empty($node->is_whitespace)) {
-                    $ws_accum[] = $node;
-                }
-                break;
-            }
-        }
-
-        if (empty($content)) {
-            return false;
-        }
-
-        $ret = $initial_ws;
-        if ($caption !== false) {
-            $ret[] = $caption;
-            $ret = array_merge($ret, $after_caption_ws);
-        }
-        if ($cols !== false) {
-            $ret = array_merge($ret, $cols);
-        }
-        if ($thead !== false) {
-            $ret[] = $thead;
-            $ret = array_merge($ret, $after_thead_ws);
-        }
-        if ($tfoot !== false) {
-            $ret[] = $tfoot;
-            $ret = array_merge($ret, $after_tfoot_ws);
-        }
-
-        if ($tbody_mode) {
-            // we have to shuffle tr into tbody
-            $current_tr_tbody = null;
-
-            foreach($content as $node) {
-                switch ($node->name) {
-                case 'tbody':
-                    $current_tr_tbody = null;
-                    $ret[] = $node;
-                    break;
-                case 'tr':
-                    if ($current_tr_tbody === null) {
-                        $current_tr_tbody = new HTMLPurifier_Node_Element('tbody');
-                        $ret[] = $current_tr_tbody;
-                    }
-                    $current_tr_tbody->children[] = $node;
-                    break;
-                case '#PCDATA':
-                    //assert($node->is_whitespace);
-                    if ($current_tr_tbody === null) {
-                        $ret[] = $node;
-                    } else {
-                        $current_tr_tbody->children[] = $node;
-                    }
-                    break;
-                }
-            }
-        } else {
-            $ret = array_merge($ret, $content);
-        }
-
-        return $ret;
-
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Config.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Config.php
deleted file mode 100644
index 3133d8a4ff..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Config.php
+++ /dev/null
@@ -1,920 +0,0 @@
-<?php
-
-/**
- * Configuration object that triggers customizable behavior.
- *
- * @warning This class is strongly defined: that means that the class
- *          will fail if an undefined directive is retrieved or set.
- *
- * @note Many classes that could (although many times don't) use the
- *       configuration object make it a mandatory parameter.  This is
- *       because a configuration object should always be forwarded,
- *       otherwise, you run the risk of missing a parameter and then
- *       being stumped when a configuration directive doesn't work.
- *
- * @todo Reconsider some of the public member variables
- */
-class HTMLPurifier_Config
-{
-
-    /**
-     * HTML Purifier's version
-     * @type string
-     */
-    public $version = '4.13.0';
-
-    /**
-     * Whether or not to automatically finalize
-     * the object if a read operation is done.
-     * @type bool
-     */
-    public $autoFinalize = true;
-
-    // protected member variables
-
-    /**
-     * Namespace indexed array of serials for specific namespaces.
-     * @see getSerial() for more info.
-     * @type string[]
-     */
-    protected $serials = array();
-
-    /**
-     * Serial for entire configuration object.
-     * @type string
-     */
-    protected $serial;
-
-    /**
-     * Parser for variables.
-     * @type HTMLPurifier_VarParser_Flexible
-     */
-    protected $parser = null;
-
-    /**
-     * Reference HTMLPurifier_ConfigSchema for value checking.
-     * @type HTMLPurifier_ConfigSchema
-     * @note This is public for introspective purposes. Please don't
-     *       abuse!
-     */
-    public $def;
-
-    /**
-     * Indexed array of definitions.
-     * @type HTMLPurifier_Definition[]
-     */
-    protected $definitions;
-
-    /**
-     * Whether or not config is finalized.
-     * @type bool
-     */
-    protected $finalized = false;
-
-    /**
-     * Property list containing configuration directives.
-     * @type array
-     */
-    protected $plist;
-
-    /**
-     * Whether or not a set is taking place due to an alias lookup.
-     * @type bool
-     */
-    private $aliasMode;
-
-    /**
-     * Set to false if you do not want line and file numbers in errors.
-     * (useful when unit testing).  This will also compress some errors
-     * and exceptions.
-     * @type bool
-     */
-    public $chatty = true;
-
-    /**
-     * Current lock; only gets to this namespace are allowed.
-     * @type string
-     */
-    private $lock;
-
-    /**
-     * Constructor
-     * @param HTMLPurifier_ConfigSchema $definition ConfigSchema that defines
-     * what directives are allowed.
-     * @param HTMLPurifier_PropertyList $parent
-     */
-    public function __construct($definition, $parent = null)
-    {
-        $parent = $parent ? $parent : $definition->defaultPlist;
-        $this->plist = new HTMLPurifier_PropertyList($parent);
-        $this->def = $definition; // keep a copy around for checking
-        $this->parser = new HTMLPurifier_VarParser_Flexible();
-    }
-
-    /**
-     * Convenience constructor that creates a config object based on a mixed var
-     * @param mixed $config Variable that defines the state of the config
-     *                      object. Can be: a HTMLPurifier_Config() object,
-     *                      an array of directives based on loadArray(),
-     *                      or a string filename of an ini file.
-     * @param HTMLPurifier_ConfigSchema $schema Schema object
-     * @return HTMLPurifier_Config Configured object
-     */
-    public static function create($config, $schema = null)
-    {
-        if ($config instanceof HTMLPurifier_Config) {
-            // pass-through
-            return $config;
-        }
-        if (!$schema) {
-            $ret = HTMLPurifier_Config::createDefault();
-        } else {
-            $ret = new HTMLPurifier_Config($schema);
-        }
-        if (is_string($config)) {
-            $ret->loadIni($config);
-        } elseif (is_array($config)) $ret->loadArray($config);
-        return $ret;
-    }
-
-    /**
-     * Creates a new config object that inherits from a previous one.
-     * @param HTMLPurifier_Config $config Configuration object to inherit from.
-     * @return HTMLPurifier_Config object with $config as its parent.
-     */
-    public static function inherit(HTMLPurifier_Config $config)
-    {
-        return new HTMLPurifier_Config($config->def, $config->plist);
-    }
-
-    /**
-     * Convenience constructor that creates a default configuration object.
-     * @return HTMLPurifier_Config default object.
-     */
-    public static function createDefault()
-    {
-        $definition = HTMLPurifier_ConfigSchema::instance();
-        $config = new HTMLPurifier_Config($definition);
-        return $config;
-    }
-
-    /**
-     * Retrieves a value from the configuration.
-     *
-     * @param string $key String key
-     * @param mixed $a
-     *
-     * @return mixed
-     */
-    public function get($key, $a = null)
-    {
-        if ($a !== null) {
-            $this->triggerError(
-                "Using deprecated API: use \$config->get('$key.$a') instead",
-                E_USER_WARNING
-            );
-            $key = "$key.$a";
-        }
-        if (!$this->finalized) {
-            $this->autoFinalize();
-        }
-        if (!isset($this->def->info[$key])) {
-            // can't add % due to SimpleTest bug
-            $this->triggerError(
-                'Cannot retrieve value of undefined directive ' . htmlspecialchars($key),
-                E_USER_WARNING
-            );
-            return;
-        }
-        if (isset($this->def->info[$key]->isAlias)) {
-            $d = $this->def->info[$key];
-            $this->triggerError(
-                'Cannot get value from aliased directive, use real name ' . $d->key,
-                E_USER_ERROR
-            );
-            return;
-        }
-        if ($this->lock) {
-            list($ns) = explode('.', $key);
-            if ($ns !== $this->lock) {
-                $this->triggerError(
-                    'Cannot get value of namespace ' . $ns . ' when lock for ' .
-                    $this->lock .
-                    ' is active, this probably indicates a Definition setup method ' .
-                    'is accessing directives that are not within its namespace',
-                    E_USER_ERROR
-                );
-                return;
-            }
-        }
-        return $this->plist->get($key);
-    }
-
-    /**
-     * Retrieves an array of directives to values from a given namespace
-     *
-     * @param string $namespace String namespace
-     *
-     * @return array
-     */
-    public function getBatch($namespace)
-    {
-        if (!$this->finalized) {
-            $this->autoFinalize();
-        }
-        $full = $this->getAll();
-        if (!isset($full[$namespace])) {
-            $this->triggerError(
-                'Cannot retrieve undefined namespace ' .
-                htmlspecialchars($namespace),
-                E_USER_WARNING
-            );
-            return;
-        }
-        return $full[$namespace];
-    }
-
-    /**
-     * Returns a SHA-1 signature of a segment of the configuration object
-     * that uniquely identifies that particular configuration
-     *
-     * @param string $namespace Namespace to get serial for
-     *
-     * @return string
-     * @note Revision is handled specially and is removed from the batch
-     *       before processing!
-     */
-    public function getBatchSerial($namespace)
-    {
-        if (empty($this->serials[$namespace])) {
-            $batch = $this->getBatch($namespace);
-            unset($batch['DefinitionRev']);
-            $this->serials[$namespace] = sha1(serialize($batch));
-        }
-        return $this->serials[$namespace];
-    }
-
-    /**
-     * Returns a SHA-1 signature for the entire configuration object
-     * that uniquely identifies that particular configuration
-     *
-     * @return string
-     */
-    public function getSerial()
-    {
-        if (empty($this->serial)) {
-            $this->serial = sha1(serialize($this->getAll()));
-        }
-        return $this->serial;
-    }
-
-    /**
-     * Retrieves all directives, organized by namespace
-     *
-     * @warning This is a pretty inefficient function, avoid if you can
-     */
-    public function getAll()
-    {
-        if (!$this->finalized) {
-            $this->autoFinalize();
-        }
-        $ret = array();
-        foreach ($this->plist->squash() as $name => $value) {
-            list($ns, $key) = explode('.', $name, 2);
-            $ret[$ns][$key] = $value;
-        }
-        return $ret;
-    }
-
-    /**
-     * Sets a value to configuration.
-     *
-     * @param string $key key
-     * @param mixed $value value
-     * @param mixed $a
-     */
-    public function set($key, $value, $a = null)
-    {
-        if (strpos($key, '.') === false) {
-            $namespace = $key;
-            $directive = $value;
-            $value = $a;
-            $key = "$key.$directive";
-            $this->triggerError("Using deprecated API: use \$config->set('$key', ...) instead", E_USER_NOTICE);
-        } else {
-            list($namespace) = explode('.', $key);
-        }
-        if ($this->isFinalized('Cannot set directive after finalization')) {
-            return;
-        }
-        if (!isset($this->def->info[$key])) {
-            $this->triggerError(
-                'Cannot set undefined directive ' . htmlspecialchars($key) . ' to value',
-                E_USER_WARNING
-            );
-            return;
-        }
-        $def = $this->def->info[$key];
-
-        if (isset($def->isAlias)) {
-            if ($this->aliasMode) {
-                $this->triggerError(
-                    'Double-aliases not allowed, please fix '.
-                    'ConfigSchema bug with' . $key,
-                    E_USER_ERROR
-                );
-                return;
-            }
-            $this->aliasMode = true;
-            $this->set($def->key, $value);
-            $this->aliasMode = false;
-            $this->triggerError("$key is an alias, preferred directive name is {$def->key}", E_USER_NOTICE);
-            return;
-        }
-
-        // Raw type might be negative when using the fully optimized form
-        // of stdClass, which indicates allow_null == true
-        $rtype = is_int($def) ? $def : $def->type;
-        if ($rtype < 0) {
-            $type = -$rtype;
-            $allow_null = true;
-        } else {
-            $type = $rtype;
-            $allow_null = isset($def->allow_null);
-        }
-
-        try {
-            $value = $this->parser->parse($value, $type, $allow_null);
-        } catch (HTMLPurifier_VarParserException $e) {
-            $this->triggerError(
-                'Value for ' . $key . ' is of invalid type, should be ' .
-                HTMLPurifier_VarParser::getTypeName($type),
-                E_USER_WARNING
-            );
-            return;
-        }
-        if (is_string($value) && is_object($def)) {
-            // resolve value alias if defined
-            if (isset($def->aliases[$value])) {
-                $value = $def->aliases[$value];
-            }
-            // check to see if the value is allowed
-            if (isset($def->allowed) && !isset($def->allowed[$value])) {
-                $this->triggerError(
-                    'Value not supported, valid values are: ' .
-                    $this->_listify($def->allowed),
-                    E_USER_WARNING
-                );
-                return;
-            }
-        }
-        $this->plist->set($key, $value);
-
-        // reset definitions if the directives they depend on changed
-        // this is a very costly process, so it's discouraged
-        // with finalization
-        if ($namespace == 'HTML' || $namespace == 'CSS' || $namespace == 'URI') {
-            $this->definitions[$namespace] = null;
-        }
-
-        $this->serials[$namespace] = false;
-    }
-
-    /**
-     * Convenience function for error reporting
-     *
-     * @param array $lookup
-     *
-     * @return string
-     */
-    private function _listify($lookup)
-    {
-        $list = array();
-        foreach ($lookup as $name => $b) {
-            $list[] = $name;
-        }
-        return implode(', ', $list);
-    }
-
-    /**
-     * Retrieves object reference to the HTML definition.
-     *
-     * @param bool $raw Return a copy that has not been setup yet. Must be
-     *             called before it's been setup, otherwise won't work.
-     * @param bool $optimized If true, this method may return null, to
-     *             indicate that a cached version of the modified
-     *             definition object is available and no further edits
-     *             are necessary.  Consider using
-     *             maybeGetRawHTMLDefinition, which is more explicitly
-     *             named, instead.
-     *
-     * @return HTMLPurifier_HTMLDefinition|null
-     */
-    public function getHTMLDefinition($raw = false, $optimized = false)
-    {
-        return $this->getDefinition('HTML', $raw, $optimized);
-    }
-
-    /**
-     * Retrieves object reference to the CSS definition
-     *
-     * @param bool $raw Return a copy that has not been setup yet. Must be
-     *             called before it's been setup, otherwise won't work.
-     * @param bool $optimized If true, this method may return null, to
-     *             indicate that a cached version of the modified
-     *             definition object is available and no further edits
-     *             are necessary.  Consider using
-     *             maybeGetRawCSSDefinition, which is more explicitly
-     *             named, instead.
-     *
-     * @return HTMLPurifier_CSSDefinition|null
-     */
-    public function getCSSDefinition($raw = false, $optimized = false)
-    {
-        return $this->getDefinition('CSS', $raw, $optimized);
-    }
-
-    /**
-     * Retrieves object reference to the URI definition
-     *
-     * @param bool $raw Return a copy that has not been setup yet. Must be
-     *             called before it's been setup, otherwise won't work.
-     * @param bool $optimized If true, this method may return null, to
-     *             indicate that a cached version of the modified
-     *             definition object is available and no further edits
-     *             are necessary.  Consider using
-     *             maybeGetRawURIDefinition, which is more explicitly
-     *             named, instead.
-     *
-     * @return HTMLPurifier_URIDefinition|null
-     */
-    public function getURIDefinition($raw = false, $optimized = false)
-    {
-        return $this->getDefinition('URI', $raw, $optimized);
-    }
-
-    /**
-     * Retrieves a definition
-     *
-     * @param string $type Type of definition: HTML, CSS, etc
-     * @param bool $raw Whether or not definition should be returned raw
-     * @param bool $optimized Only has an effect when $raw is true.  Whether
-     *        or not to return null if the result is already present in
-     *        the cache.  This is off by default for backwards
-     *        compatibility reasons, but you need to do things this
-     *        way in order to ensure that caching is done properly.
-     *        Check out enduser-customize.html for more details.
-     *        We probably won't ever change this default, as much as the
-     *        maybe semantics is the "right thing to do."
-     *
-     * @throws HTMLPurifier_Exception
-     * @return HTMLPurifier_Definition|null
-     */
-    public function getDefinition($type, $raw = false, $optimized = false)
-    {
-        if ($optimized && !$raw) {
-            throw new HTMLPurifier_Exception("Cannot set optimized = true when raw = false");
-        }
-        if (!$this->finalized) {
-            $this->autoFinalize();
-        }
-        // temporarily suspend locks, so we can handle recursive definition calls
-        $lock = $this->lock;
-        $this->lock = null;
-        $factory = HTMLPurifier_DefinitionCacheFactory::instance();
-        $cache = $factory->create($type, $this);
-        $this->lock = $lock;
-        if (!$raw) {
-            // full definition
-            // ---------------
-            // check if definition is in memory
-            if (!empty($this->definitions[$type])) {
-                $def = $this->definitions[$type];
-                // check if the definition is setup
-                if ($def->setup) {
-                    return $def;
-                } else {
-                    $def->setup($this);
-                    if ($def->optimized) {
-                        $cache->add($def, $this);
-                    }
-                    return $def;
-                }
-            }
-            // check if definition is in cache
-            $def = $cache->get($this);
-            if ($def) {
-                // definition in cache, save to memory and return it
-                $this->definitions[$type] = $def;
-                return $def;
-            }
-            // initialize it
-            $def = $this->initDefinition($type);
-            // set it up
-            $this->lock = $type;
-            $def->setup($this);
-            $this->lock = null;
-            // save in cache
-            $cache->add($def, $this);
-            // return it
-            return $def;
-        } else {
-            // raw definition
-            // --------------
-            // check preconditions
-            $def = null;
-            if ($optimized) {
-                if (is_null($this->get($type . '.DefinitionID'))) {
-                    // fatally error out if definition ID not set
-                    throw new HTMLPurifier_Exception(
-                        "Cannot retrieve raw version without specifying %$type.DefinitionID"
-                    );
-                }
-            }
-            if (!empty($this->definitions[$type])) {
-                $def = $this->definitions[$type];
-                if ($def->setup && !$optimized) {
-                    $extra = $this->chatty ?
-                        " (try moving this code block earlier in your initialization)" :
-                        "";
-                    throw new HTMLPurifier_Exception(
-                        "Cannot retrieve raw definition after it has already been setup" .
-                        $extra
-                    );
-                }
-                if ($def->optimized === null) {
-                    $extra = $this->chatty ? " (try flushing your cache)" : "";
-                    throw new HTMLPurifier_Exception(
-                        "Optimization status of definition is unknown" . $extra
-                    );
-                }
-                if ($def->optimized !== $optimized) {
-                    $msg = $optimized ? "optimized" : "unoptimized";
-                    $extra = $this->chatty ?
-                        " (this backtrace is for the first inconsistent call, which was for a $msg raw definition)"
-                        : "";
-                    throw new HTMLPurifier_Exception(
-                        "Inconsistent use of optimized and unoptimized raw definition retrievals" . $extra
-                    );
-                }
-            }
-            // check if definition was in memory
-            if ($def) {
-                if ($def->setup) {
-                    // invariant: $optimized === true (checked above)
-                    return null;
-                } else {
-                    return $def;
-                }
-            }
-            // if optimized, check if definition was in cache
-            // (because we do the memory check first, this formulation
-            // is prone to cache slamming, but I think
-            // guaranteeing that either /all/ of the raw
-            // setup code or /none/ of it is run is more important.)
-            if ($optimized) {
-                // This code path only gets run once; once we put
-                // something in $definitions (which is guaranteed by the
-                // trailing code), we always short-circuit above.
-                $def = $cache->get($this);
-                if ($def) {
-                    // save the full definition for later, but don't
-                    // return it yet
-                    $this->definitions[$type] = $def;
-                    return null;
-                }
-            }
-            // check invariants for creation
-            if (!$optimized) {
-                if (!is_null($this->get($type . '.DefinitionID'))) {
-                    if ($this->chatty) {
-                        $this->triggerError(
-                            'Due to a documentation error in previous version of HTML Purifier, your ' .
-                            'definitions are not being cached.  If this is OK, you can remove the ' .
-                            '%$type.DefinitionRev and %$type.DefinitionID declaration.  Otherwise, ' .
-                            'modify your code to use maybeGetRawDefinition, and test if the returned ' .
-                            'value is null before making any edits (if it is null, that means that a ' .
-                            'cached version is available, and no raw operations are necessary).  See ' .
-                            '<a href="http://htmlpurifier.org/docs/enduser-customize.html#optimized">' .
-                            'Customize</a> for more details',
-                            E_USER_WARNING
-                        );
-                    } else {
-                        $this->triggerError(
-                            "Useless DefinitionID declaration",
-                            E_USER_WARNING
-                        );
-                    }
-                }
-            }
-            // initialize it
-            $def = $this->initDefinition($type);
-            $def->optimized = $optimized;
-            return $def;
-        }
-        throw new HTMLPurifier_Exception("The impossible happened!");
-    }
-
-    /**
-     * Initialise definition
-     *
-     * @param string $type What type of definition to create
-     *
-     * @return HTMLPurifier_CSSDefinition|HTMLPurifier_HTMLDefinition|HTMLPurifier_URIDefinition
-     * @throws HTMLPurifier_Exception
-     */
-    private function initDefinition($type)
-    {
-        // quick checks failed, let's create the object
-        if ($type == 'HTML') {
-            $def = new HTMLPurifier_HTMLDefinition();
-        } elseif ($type == 'CSS') {
-            $def = new HTMLPurifier_CSSDefinition();
-        } elseif ($type == 'URI') {
-            $def = new HTMLPurifier_URIDefinition();
-        } else {
-            throw new HTMLPurifier_Exception(
-                "Definition of $type type not supported"
-            );
-        }
-        $this->definitions[$type] = $def;
-        return $def;
-    }
-
-    public function maybeGetRawDefinition($name)
-    {
-        return $this->getDefinition($name, true, true);
-    }
-
-    /**
-     * @return HTMLPurifier_HTMLDefinition|null
-     */
-    public function maybeGetRawHTMLDefinition()
-    {
-        return $this->getDefinition('HTML', true, true);
-    }
-    
-    /**
-     * @return HTMLPurifier_CSSDefinition|null
-     */
-    public function maybeGetRawCSSDefinition()
-    {
-        return $this->getDefinition('CSS', true, true);
-    }
-    
-    /**
-     * @return HTMLPurifier_URIDefinition|null
-     */
-    public function maybeGetRawURIDefinition()
-    {
-        return $this->getDefinition('URI', true, true);
-    }
-
-    /**
-     * Loads configuration values from an array with the following structure:
-     * Namespace.Directive => Value
-     *
-     * @param array $config_array Configuration associative array
-     */
-    public function loadArray($config_array)
-    {
-        if ($this->isFinalized('Cannot load directives after finalization')) {
-            return;
-        }
-        foreach ($config_array as $key => $value) {
-            $key = str_replace('_', '.', $key);
-            if (strpos($key, '.') !== false) {
-                $this->set($key, $value);
-            } else {
-                $namespace = $key;
-                $namespace_values = $value;
-                foreach ($namespace_values as $directive => $value2) {
-                    $this->set($namespace .'.'. $directive, $value2);
-                }
-            }
-        }
-    }
-
-    /**
-     * Returns a list of array(namespace, directive) for all directives
-     * that are allowed in a web-form context as per an allowed
-     * namespaces/directives list.
-     *
-     * @param array $allowed List of allowed namespaces/directives
-     * @param HTMLPurifier_ConfigSchema $schema Schema to use, if not global copy
-     *
-     * @return array
-     */
-    public static function getAllowedDirectivesForForm($allowed, $schema = null)
-    {
-        if (!$schema) {
-            $schema = HTMLPurifier_ConfigSchema::instance();
-        }
-        if ($allowed !== true) {
-            if (is_string($allowed)) {
-                $allowed = array($allowed);
-            }
-            $allowed_ns = array();
-            $allowed_directives = array();
-            $blacklisted_directives = array();
-            foreach ($allowed as $ns_or_directive) {
-                if (strpos($ns_or_directive, '.') !== false) {
-                    // directive
-                    if ($ns_or_directive[0] == '-') {
-                        $blacklisted_directives[substr($ns_or_directive, 1)] = true;
-                    } else {
-                        $allowed_directives[$ns_or_directive] = true;
-                    }
-                } else {
-                    // namespace
-                    $allowed_ns[$ns_or_directive] = true;
-                }
-            }
-        }
-        $ret = array();
-        foreach ($schema->info as $key => $def) {
-            list($ns, $directive) = explode('.', $key, 2);
-            if ($allowed !== true) {
-                if (isset($blacklisted_directives["$ns.$directive"])) {
-                    continue;
-                }
-                if (!isset($allowed_directives["$ns.$directive"]) && !isset($allowed_ns[$ns])) {
-                    continue;
-                }
-            }
-            if (isset($def->isAlias)) {
-                continue;
-            }
-            if ($directive == 'DefinitionID' || $directive == 'DefinitionRev') {
-                continue;
-            }
-            $ret[] = array($ns, $directive);
-        }
-        return $ret;
-    }
-
-    /**
-     * Loads configuration values from $_GET/$_POST that were posted
-     * via ConfigForm
-     *
-     * @param array $array $_GET or $_POST array to import
-     * @param string|bool $index Index/name that the config variables are in
-     * @param array|bool $allowed List of allowed namespaces/directives
-     * @param bool $mq_fix Boolean whether or not to enable magic quotes fix
-     * @param HTMLPurifier_ConfigSchema $schema Schema to use, if not global copy
-     *
-     * @return mixed
-     */
-    public static function loadArrayFromForm($array, $index = false, $allowed = true, $mq_fix = true, $schema = null)
-    {
-        $ret = HTMLPurifier_Config::prepareArrayFromForm($array, $index, $allowed, $mq_fix, $schema);
-        $config = HTMLPurifier_Config::create($ret, $schema);
-        return $config;
-    }
-
-    /**
-     * Merges in configuration values from $_GET/$_POST to object. NOT STATIC.
-     *
-     * @param array $array $_GET or $_POST array to import
-     * @param string|bool $index Index/name that the config variables are in
-     * @param array|bool $allowed List of allowed namespaces/directives
-     * @param bool $mq_fix Boolean whether or not to enable magic quotes fix
-     */
-    public function mergeArrayFromForm($array, $index = false, $allowed = true, $mq_fix = true)
-    {
-         $ret = HTMLPurifier_Config::prepareArrayFromForm($array, $index, $allowed, $mq_fix, $this->def);
-         $this->loadArray($ret);
-    }
-
-    /**
-     * Prepares an array from a form into something usable for the more
-     * strict parts of HTMLPurifier_Config
-     *
-     * @param array $array $_GET or $_POST array to import
-     * @param string|bool $index Index/name that the config variables are in
-     * @param array|bool $allowed List of allowed namespaces/directives
-     * @param bool $mq_fix Boolean whether or not to enable magic quotes fix
-     * @param HTMLPurifier_ConfigSchema $schema Schema to use, if not global copy
-     *
-     * @return array
-     */
-    public static function prepareArrayFromForm($array, $index = false, $allowed = true, $mq_fix = true, $schema = null)
-    {
-        if ($index !== false) {
-            $array = (isset($array[$index]) && is_array($array[$index])) ? $array[$index] : array();
-        }
-        $mq = $mq_fix && function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc();
-
-        $allowed = HTMLPurifier_Config::getAllowedDirectivesForForm($allowed, $schema);
-        $ret = array();
-        foreach ($allowed as $key) {
-            list($ns, $directive) = $key;
-            $skey = "$ns.$directive";
-            if (!empty($array["Null_$skey"])) {
-                $ret[$ns][$directive] = null;
-                continue;
-            }
-            if (!isset($array[$skey])) {
-                continue;
-            }
-            $value = $mq ? stripslashes($array[$skey]) : $array[$skey];
-            $ret[$ns][$directive] = $value;
-        }
-        return $ret;
-    }
-
-    /**
-     * Loads configuration values from an ini file
-     *
-     * @param string $filename Name of ini file
-     */
-    public function loadIni($filename)
-    {
-        if ($this->isFinalized('Cannot load directives after finalization')) {
-            return;
-        }
-        $array = parse_ini_file($filename, true);
-        $this->loadArray($array);
-    }
-
-    /**
-     * Checks whether or not the configuration object is finalized.
-     *
-     * @param string|bool $error String error message, or false for no error
-     *
-     * @return bool
-     */
-    public function isFinalized($error = false)
-    {
-        if ($this->finalized && $error) {
-            $this->triggerError($error, E_USER_ERROR);
-        }
-        return $this->finalized;
-    }
-
-    /**
-     * Finalizes configuration only if auto finalize is on and not
-     * already finalized
-     */
-    public function autoFinalize()
-    {
-        if ($this->autoFinalize) {
-            $this->finalize();
-        } else {
-            $this->plist->squash(true);
-        }
-    }
-
-    /**
-     * Finalizes a configuration object, prohibiting further change
-     */
-    public function finalize()
-    {
-        $this->finalized = true;
-        $this->parser = null;
-    }
-
-    /**
-     * Produces a nicely formatted error message by supplying the
-     * stack frame information OUTSIDE of HTMLPurifier_Config.
-     *
-     * @param string $msg An error message
-     * @param int $no An error number
-     */
-    protected function triggerError($msg, $no)
-    {
-        // determine previous stack frame
-        $extra = '';
-        if ($this->chatty) {
-            $trace = debug_backtrace();
-            // zip(tail(trace), trace) -- but PHP is not Haskell har har
-            for ($i = 0, $c = count($trace); $i < $c - 1; $i++) {
-                // XXX this is not correct on some versions of HTML Purifier
-                if (isset($trace[$i + 1]['class']) && $trace[$i + 1]['class'] === 'HTMLPurifier_Config') {
-                    continue;
-                }
-                $frame = $trace[$i];
-                $extra = " invoked on line {$frame['line']} in file {$frame['file']}";
-                break;
-            }
-        }
-        trigger_error($msg . $extra, $no);
-    }
-
-    /**
-     * Returns a serialized form of the configuration object that can
-     * be reconstituted.
-     *
-     * @return string
-     */
-    public function serialize()
-    {
-        $this->getDefinition('HTML');
-        $this->getDefinition('CSS');
-        $this->getDefinition('URI');
-        return serialize($this);
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema.php
deleted file mode 100644
index c3fe8cd4ab..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-
-/**
- * Configuration definition, defines directives and their defaults.
- */
-class HTMLPurifier_ConfigSchema
-{
-    /**
-     * Defaults of the directives and namespaces.
-     * @type array
-     * @note This shares the exact same structure as HTMLPurifier_Config::$conf
-     */
-    public $defaults = array();
-
-    /**
-     * The default property list. Do not edit this property list.
-     * @type array
-     */
-    public $defaultPlist;
-
-    /**
-     * Definition of the directives.
-     * The structure of this is:
-     *
-     *  array(
-     *      'Namespace' => array(
-     *          'Directive' => new stdClass(),
-     *      )
-     *  )
-     *
-     * The stdClass may have the following properties:
-     *
-     *  - If isAlias isn't set:
-     *      - type: Integer type of directive, see HTMLPurifier_VarParser for definitions
-     *      - allow_null: If set, this directive allows null values
-     *      - aliases: If set, an associative array of value aliases to real values
-     *      - allowed: If set, a lookup array of allowed (string) values
-     *  - If isAlias is set:
-     *      - namespace: Namespace this directive aliases to
-     *      - name: Directive name this directive aliases to
-     *
-     * In certain degenerate cases, stdClass will actually be an integer. In
-     * that case, the value is equivalent to an stdClass with the type
-     * property set to the integer. If the integer is negative, type is
-     * equal to the absolute value of integer, and allow_null is true.
-     *
-     * This class is friendly with HTMLPurifier_Config. If you need introspection
-     * about the schema, you're better of using the ConfigSchema_Interchange,
-     * which uses more memory but has much richer information.
-     * @type array
-     */
-    public $info = array();
-
-    /**
-     * Application-wide singleton
-     * @type HTMLPurifier_ConfigSchema
-     */
-    protected static $singleton;
-
-    public function __construct()
-    {
-        $this->defaultPlist = new HTMLPurifier_PropertyList();
-    }
-
-    /**
-     * Unserializes the default ConfigSchema.
-     * @return HTMLPurifier_ConfigSchema
-     */
-    public static function makeFromSerial()
-    {
-        $contents = file_get_contents(HTMLPURIFIER_PREFIX . '/HTMLPurifier/ConfigSchema/schema.ser');
-        $r = unserialize($contents);
-        if (!$r) {
-            $hash = sha1($contents);
-            trigger_error("Unserialization of configuration schema failed, sha1 of file was $hash", E_USER_ERROR);
-        }
-        return $r;
-    }
-
-    /**
-     * Retrieves an instance of the application-wide configuration definition.
-     * @param HTMLPurifier_ConfigSchema $prototype
-     * @return HTMLPurifier_ConfigSchema
-     */
-    public static function instance($prototype = null)
-    {
-        if ($prototype !== null) {
-            HTMLPurifier_ConfigSchema::$singleton = $prototype;
-        } elseif (HTMLPurifier_ConfigSchema::$singleton === null || $prototype === true) {
-            HTMLPurifier_ConfigSchema::$singleton = HTMLPurifier_ConfigSchema::makeFromSerial();
-        }
-        return HTMLPurifier_ConfigSchema::$singleton;
-    }
-
-    /**
-     * Defines a directive for configuration
-     * @warning Will fail of directive's namespace is defined.
-     * @warning This method's signature is slightly different from the legacy
-     *          define() static method! Beware!
-     * @param string $key Name of directive
-     * @param mixed $default Default value of directive
-     * @param string $type Allowed type of the directive. See
-     *      HTMLPurifier_VarParser::$types for allowed values
-     * @param bool $allow_null Whether or not to allow null values
-     */
-    public function add($key, $default, $type, $allow_null)
-    {
-        $obj = new stdClass();
-        $obj->type = is_int($type) ? $type : HTMLPurifier_VarParser::$types[$type];
-        if ($allow_null) {
-            $obj->allow_null = true;
-        }
-        $this->info[$key] = $obj;
-        $this->defaults[$key] = $default;
-        $this->defaultPlist->set($key, $default);
-    }
-
-    /**
-     * Defines a directive value alias.
-     *
-     * Directive value aliases are convenient for developers because it lets
-     * them set a directive to several values and get the same result.
-     * @param string $key Name of Directive
-     * @param array $aliases Hash of aliased values to the real alias
-     */
-    public function addValueAliases($key, $aliases)
-    {
-        if (!isset($this->info[$key]->aliases)) {
-            $this->info[$key]->aliases = array();
-        }
-        foreach ($aliases as $alias => $real) {
-            $this->info[$key]->aliases[$alias] = $real;
-        }
-    }
-
-    /**
-     * Defines a set of allowed values for a directive.
-     * @warning This is slightly different from the corresponding static
-     *          method definition.
-     * @param string $key Name of directive
-     * @param array $allowed Lookup array of allowed values
-     */
-    public function addAllowedValues($key, $allowed)
-    {
-        $this->info[$key]->allowed = $allowed;
-    }
-
-    /**
-     * Defines a directive alias for backwards compatibility
-     * @param string $key Directive that will be aliased
-     * @param string $new_key Directive that the alias will be to
-     */
-    public function addAlias($key, $new_key)
-    {
-        $obj = new stdClass;
-        $obj->key = $new_key;
-        $obj->isAlias = true;
-        $this->info[$key] = $obj;
-    }
-
-    /**
-     * Replaces any stdClass that only has the type property with type integer.
-     */
-    public function postProcess()
-    {
-        foreach ($this->info as $key => $v) {
-            if (count((array) $v) == 1) {
-                $this->info[$key] = $v->type;
-            } elseif (count((array) $v) == 2 && isset($v->allow_null)) {
-                $this->info[$key] = -$v->type;
-            }
-        }
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php
deleted file mode 100644
index d5906cd46d..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- * Converts HTMLPurifier_ConfigSchema_Interchange to our runtime
- * representation used to perform checks on user configuration.
- */
-class HTMLPurifier_ConfigSchema_Builder_ConfigSchema
-{
-
-    /**
-     * @param HTMLPurifier_ConfigSchema_Interchange $interchange
-     * @return HTMLPurifier_ConfigSchema
-     */
-    public function build($interchange)
-    {
-        $schema = new HTMLPurifier_ConfigSchema();
-        foreach ($interchange->directives as $d) {
-            $schema->add(
-                $d->id->key,
-                $d->default,
-                $d->type,
-                $d->typeAllowsNull
-            );
-            if ($d->allowed !== null) {
-                $schema->addAllowedValues(
-                    $d->id->key,
-                    $d->allowed
-                );
-            }
-            foreach ($d->aliases as $alias) {
-                $schema->addAlias(
-                    $alias->key,
-                    $d->id->key
-                );
-            }
-            if ($d->valueAliases !== null) {
-                $schema->addValueAliases(
-                    $d->id->key,
-                    $d->valueAliases
-                );
-            }
-        }
-        $schema->postProcess();
-        return $schema;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Builder/Xml.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Builder/Xml.php
deleted file mode 100644
index 5fa56f7ddb..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Builder/Xml.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-
-/**
- * Converts HTMLPurifier_ConfigSchema_Interchange to an XML format,
- * which can be further processed to generate documentation.
- */
-class HTMLPurifier_ConfigSchema_Builder_Xml extends XMLWriter
-{
-
-    /**
-     * @type HTMLPurifier_ConfigSchema_Interchange
-     */
-    protected $interchange;
-
-    /**
-     * @type string
-     */
-    private $namespace;
-
-    /**
-     * @param string $html
-     */
-    protected function writeHTMLDiv($html)
-    {
-        $this->startElement('div');
-
-        $purifier = HTMLPurifier::getInstance();
-        $html = $purifier->purify($html);
-        $this->writeAttribute('xmlns', 'http://www.w3.org/1999/xhtml');
-        $this->writeRaw($html);
-
-        $this->endElement(); // div
-    }
-
-    /**
-     * @param mixed $var
-     * @return string
-     */
-    protected function export($var)
-    {
-        if ($var === array()) {
-            return 'array()';
-        }
-        return var_export($var, true);
-    }
-
-    /**
-     * @param HTMLPurifier_ConfigSchema_Interchange $interchange
-     */
-    public function build($interchange)
-    {
-        // global access, only use as last resort
-        $this->interchange = $interchange;
-
-        $this->setIndent(true);
-        $this->startDocument('1.0', 'UTF-8');
-        $this->startElement('configdoc');
-        $this->writeElement('title', $interchange->name);
-
-        foreach ($interchange->directives as $directive) {
-            $this->buildDirective($directive);
-        }
-
-        if ($this->namespace) {
-            $this->endElement();
-        } // namespace
-
-        $this->endElement(); // configdoc
-        $this->flush();
-    }
-
-    /**
-     * @param HTMLPurifier_ConfigSchema_Interchange_Directive $directive
-     */
-    public function buildDirective($directive)
-    {
-        // Kludge, although I suppose having a notion of a "root namespace"
-        // certainly makes things look nicer when documentation is built.
-        // Depends on things being sorted.
-        if (!$this->namespace || $this->namespace !== $directive->id->getRootNamespace()) {
-            if ($this->namespace) {
-                $this->endElement();
-            } // namespace
-            $this->namespace = $directive->id->getRootNamespace();
-            $this->startElement('namespace');
-            $this->writeAttribute('id', $this->namespace);
-            $this->writeElement('name', $this->namespace);
-        }
-
-        $this->startElement('directive');
-        $this->writeAttribute('id', $directive->id->toString());
-
-        $this->writeElement('name', $directive->id->getDirective());
-
-        $this->startElement('aliases');
-        foreach ($directive->aliases as $alias) {
-            $this->writeElement('alias', $alias->toString());
-        }
-        $this->endElement(); // aliases
-
-        $this->startElement('constraints');
-        if ($directive->version) {
-            $this->writeElement('version', $directive->version);
-        }
-        $this->startElement('type');
-        if ($directive->typeAllowsNull) {
-            $this->writeAttribute('allow-null', 'yes');
-        }
-        $this->text($directive->type);
-        $this->endElement(); // type
-        if ($directive->allowed) {
-            $this->startElement('allowed');
-            foreach ($directive->allowed as $value => $x) {
-                $this->writeElement('value', $value);
-            }
-            $this->endElement(); // allowed
-        }
-        $this->writeElement('default', $this->export($directive->default));
-        $this->writeAttribute('xml:space', 'preserve');
-        if ($directive->external) {
-            $this->startElement('external');
-            foreach ($directive->external as $project) {
-                $this->writeElement('project', $project);
-            }
-            $this->endElement();
-        }
-        $this->endElement(); // constraints
-
-        if ($directive->deprecatedVersion) {
-            $this->startElement('deprecated');
-            $this->writeElement('version', $directive->deprecatedVersion);
-            $this->writeElement('use', $directive->deprecatedUse->toString());
-            $this->endElement(); // deprecated
-        }
-
-        $this->startElement('description');
-        $this->writeHTMLDiv($directive->description);
-        $this->endElement(); // description
-
-        $this->endElement(); // directive
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Exception.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Exception.php
deleted file mode 100644
index 2671516c58..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Exception.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-/**
- * Exceptions related to configuration schema
- */
-class HTMLPurifier_ConfigSchema_Exception extends HTMLPurifier_Exception
-{
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange.php
deleted file mode 100644
index 0e08ae8fe7..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/**
- * Generic schema interchange format that can be converted to a runtime
- * representation (HTMLPurifier_ConfigSchema) or HTML documentation. Members
- * are completely validated.
- */
-class HTMLPurifier_ConfigSchema_Interchange
-{
-
-    /**
-     * Name of the application this schema is describing.
-     * @type string
-     */
-    public $name;
-
-    /**
-     * Array of Directive ID => array(directive info)
-     * @type HTMLPurifier_ConfigSchema_Interchange_Directive[]
-     */
-    public $directives = array();
-
-    /**
-     * Adds a directive array to $directives
-     * @param HTMLPurifier_ConfigSchema_Interchange_Directive $directive
-     * @throws HTMLPurifier_ConfigSchema_Exception
-     */
-    public function addDirective($directive)
-    {
-        if (isset($this->directives[$i = $directive->id->toString()])) {
-            throw new HTMLPurifier_ConfigSchema_Exception("Cannot redefine directive '$i'");
-        }
-        $this->directives[$i] = $directive;
-    }
-
-    /**
-     * Convenience function to perform standard validation. Throws exception
-     * on failed validation.
-     */
-    public function validate()
-    {
-        $validator = new HTMLPurifier_ConfigSchema_Validator();
-        return $validator->validate($this);
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange/Directive.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange/Directive.php
deleted file mode 100644
index 127a39a673..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange/Directive.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-/**
- * Interchange component class describing configuration directives.
- */
-class HTMLPurifier_ConfigSchema_Interchange_Directive
-{
-
-    /**
-     * ID of directive.
-     * @type HTMLPurifier_ConfigSchema_Interchange_Id
-     */
-    public $id;
-
-    /**
-     * Type, e.g. 'integer' or 'istring'.
-     * @type string
-     */
-    public $type;
-
-    /**
-     * Default value, e.g. 3 or 'DefaultVal'.
-     * @type mixed
-     */
-    public $default;
-
-    /**
-     * HTML description.
-     * @type string
-     */
-    public $description;
-
-    /**
-     * Whether or not null is allowed as a value.
-     * @type bool
-     */
-    public $typeAllowsNull = false;
-
-    /**
-     * Lookup table of allowed scalar values.
-     * e.g. array('allowed' => true).
-     * Null if all values are allowed.
-     * @type array
-     */
-    public $allowed;
-
-    /**
-     * List of aliases for the directive.
-     * e.g. array(new HTMLPurifier_ConfigSchema_Interchange_Id('Ns', 'Dir'))).
-     * @type HTMLPurifier_ConfigSchema_Interchange_Id[]
-     */
-    public $aliases = array();
-
-    /**
-     * Hash of value aliases, e.g. array('alt' => 'real'). Null if value
-     * aliasing is disabled (necessary for non-scalar types).
-     * @type array
-     */
-    public $valueAliases;
-
-    /**
-     * Version of HTML Purifier the directive was introduced, e.g. '1.3.1'.
-     * Null if the directive has always existed.
-     * @type string
-     */
-    public $version;
-
-    /**
-     * ID of directive that supercedes this old directive.
-     * Null if not deprecated.
-     * @type HTMLPurifier_ConfigSchema_Interchange_Id
-     */
-    public $deprecatedUse;
-
-    /**
-     * Version of HTML Purifier this directive was deprecated. Null if not
-     * deprecated.
-     * @type string
-     */
-    public $deprecatedVersion;
-
-    /**
-     * List of external projects this directive depends on, e.g. array('CSSTidy').
-     * @type array
-     */
-    public $external = array();
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange/Id.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange/Id.php
deleted file mode 100644
index 126f09d957..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange/Id.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * Represents a directive ID in the interchange format.
- */
-class HTMLPurifier_ConfigSchema_Interchange_Id
-{
-
-    /**
-     * @type string
-     */
-    public $key;
-
-    /**
-     * @param string $key
-     */
-    public function __construct($key)
-    {
-        $this->key = $key;
-    }
-
-    /**
-     * @return string
-     * @warning This is NOT magic, to ensure that people don't abuse SPL and
-     *          cause problems for PHP 5.0 support.
-     */
-    public function toString()
-    {
-        return $this->key;
-    }
-
-    /**
-     * @return string
-     */
-    public function getRootNamespace()
-    {
-        return substr($this->key, 0, strpos($this->key, "."));
-    }
-
-    /**
-     * @return string
-     */
-    public function getDirective()
-    {
-        return substr($this->key, strpos($this->key, ".") + 1);
-    }
-
-    /**
-     * @param string $id
-     * @return HTMLPurifier_ConfigSchema_Interchange_Id
-     */
-    public static function make($id)
-    {
-        return new HTMLPurifier_ConfigSchema_Interchange_Id($id);
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php
deleted file mode 100644
index 655e6dd1b9..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php
+++ /dev/null
@@ -1,226 +0,0 @@
-<?php
-
-class HTMLPurifier_ConfigSchema_InterchangeBuilder
-{
-
-    /**
-     * Used for processing DEFAULT, nothing else.
-     * @type HTMLPurifier_VarParser
-     */
-    protected $varParser;
-
-    /**
-     * @param HTMLPurifier_VarParser $varParser
-     */
-    public function __construct($varParser = null)
-    {
-        $this->varParser = $varParser ? $varParser : new HTMLPurifier_VarParser_Native();
-    }
-
-    /**
-     * @param string $dir
-     * @return HTMLPurifier_ConfigSchema_Interchange
-     */
-    public static function buildFromDirectory($dir = null)
-    {
-        $builder = new HTMLPurifier_ConfigSchema_InterchangeBuilder();
-        $interchange = new HTMLPurifier_ConfigSchema_Interchange();
-        return $builder->buildDir($interchange, $dir);
-    }
-
-    /**
-     * @param HTMLPurifier_ConfigSchema_Interchange $interchange
-     * @param string $dir
-     * @return HTMLPurifier_ConfigSchema_Interchange
-     */
-    public function buildDir($interchange, $dir = null)
-    {
-        if (!$dir) {
-            $dir = HTMLPURIFIER_PREFIX . '/HTMLPurifier/ConfigSchema/schema';
-        }
-        if (file_exists($dir . '/info.ini')) {
-            $info = parse_ini_file($dir . '/info.ini');
-            $interchange->name = $info['name'];
-        }
-
-        $files = array();
-        $dh = opendir($dir);
-        while (false !== ($file = readdir($dh))) {
-            if (!$file || $file[0] == '.' || strrchr($file, '.') !== '.txt') {
-                continue;
-            }
-            $files[] = $file;
-        }
-        closedir($dh);
-
-        sort($files);
-        foreach ($files as $file) {
-            $this->buildFile($interchange, $dir . '/' . $file);
-        }
-        return $interchange;
-    }
-
-    /**
-     * @param HTMLPurifier_ConfigSchema_Interchange $interchange
-     * @param string $file
-     */
-    public function buildFile($interchange, $file)
-    {
-        $parser = new HTMLPurifier_StringHashParser();
-        $this->build(
-            $interchange,
-            new HTMLPurifier_StringHash($parser->parseFile($file))
-        );
-    }
-
-    /**
-     * Builds an interchange object based on a hash.
-     * @param HTMLPurifier_ConfigSchema_Interchange $interchange HTMLPurifier_ConfigSchema_Interchange object to build
-     * @param HTMLPurifier_StringHash $hash source data
-     * @throws HTMLPurifier_ConfigSchema_Exception
-     */
-    public function build($interchange, $hash)
-    {
-        if (!$hash instanceof HTMLPurifier_StringHash) {
-            $hash = new HTMLPurifier_StringHash($hash);
-        }
-        if (!isset($hash['ID'])) {
-            throw new HTMLPurifier_ConfigSchema_Exception('Hash does not have any ID');
-        }
-        if (strpos($hash['ID'], '.') === false) {
-            if (count($hash) == 2 && isset($hash['DESCRIPTION'])) {
-                $hash->offsetGet('DESCRIPTION'); // prevent complaining
-            } else {
-                throw new HTMLPurifier_ConfigSchema_Exception('All directives must have a namespace');
-            }
-        } else {
-            $this->buildDirective($interchange, $hash);
-        }
-        $this->_findUnused($hash);
-    }
-
-    /**
-     * @param HTMLPurifier_ConfigSchema_Interchange $interchange
-     * @param HTMLPurifier_StringHash $hash
-     * @throws HTMLPurifier_ConfigSchema_Exception
-     */
-    public function buildDirective($interchange, $hash)
-    {
-        $directive = new HTMLPurifier_ConfigSchema_Interchange_Directive();
-
-        // These are required elements:
-        $directive->id = $this->id($hash->offsetGet('ID'));
-        $id = $directive->id->toString(); // convenience
-
-        if (isset($hash['TYPE'])) {
-            $type = explode('/', $hash->offsetGet('TYPE'));
-            if (isset($type[1])) {
-                $directive->typeAllowsNull = true;
-            }
-            $directive->type = $type[0];
-        } else {
-            throw new HTMLPurifier_ConfigSchema_Exception("TYPE in directive hash '$id' not defined");
-        }
-
-        if (isset($hash['DEFAULT'])) {
-            try {
-                $directive->default = $this->varParser->parse(
-                    $hash->offsetGet('DEFAULT'),
-                    $directive->type,
-                    $directive->typeAllowsNull
-                );
-            } catch (HTMLPurifier_VarParserException $e) {
-                throw new HTMLPurifier_ConfigSchema_Exception($e->getMessage() . " in DEFAULT in directive hash '$id'");
-            }
-        }
-
-        if (isset($hash['DESCRIPTION'])) {
-            $directive->description = $hash->offsetGet('DESCRIPTION');
-        }
-
-        if (isset($hash['ALLOWED'])) {
-            $directive->allowed = $this->lookup($this->evalArray($hash->offsetGet('ALLOWED')));
-        }
-
-        if (isset($hash['VALUE-ALIASES'])) {
-            $directive->valueAliases = $this->evalArray($hash->offsetGet('VALUE-ALIASES'));
-        }
-
-        if (isset($hash['ALIASES'])) {
-            $raw_aliases = trim($hash->offsetGet('ALIASES'));
-            $aliases = preg_split('/\s*,\s*/', $raw_aliases);
-            foreach ($aliases as $alias) {
-                $directive->aliases[] = $this->id($alias);
-            }
-        }
-
-        if (isset($hash['VERSION'])) {
-            $directive->version = $hash->offsetGet('VERSION');
-        }
-
-        if (isset($hash['DEPRECATED-USE'])) {
-            $directive->deprecatedUse = $this->id($hash->offsetGet('DEPRECATED-USE'));
-        }
-
-        if (isset($hash['DEPRECATED-VERSION'])) {
-            $directive->deprecatedVersion = $hash->offsetGet('DEPRECATED-VERSION');
-        }
-
-        if (isset($hash['EXTERNAL'])) {
-            $directive->external = preg_split('/\s*,\s*/', trim($hash->offsetGet('EXTERNAL')));
-        }
-
-        $interchange->addDirective($directive);
-    }
-
-    /**
-     * Evaluates an array PHP code string without array() wrapper
-     * @param string $contents
-     */
-    protected function evalArray($contents)
-    {
-        return eval('return array(' . $contents . ');');
-    }
-
-    /**
-     * Converts an array list into a lookup array.
-     * @param array $array
-     * @return array
-     */
-    protected function lookup($array)
-    {
-        $ret = array();
-        foreach ($array as $val) {
-            $ret[$val] = true;
-        }
-        return $ret;
-    }
-
-    /**
-     * Convenience function that creates an HTMLPurifier_ConfigSchema_Interchange_Id
-     * object based on a string Id.
-     * @param string $id
-     * @return HTMLPurifier_ConfigSchema_Interchange_Id
-     */
-    protected function id($id)
-    {
-        return HTMLPurifier_ConfigSchema_Interchange_Id::make($id);
-    }
-
-    /**
-     * Triggers errors for any unused keys passed in the hash; such keys
-     * may indicate typos, missing values, etc.
-     * @param HTMLPurifier_StringHash $hash Hash to check.
-     */
-    protected function _findUnused($hash)
-    {
-        $accessed = $hash->getAccessed();
-        foreach ($hash as $k => $v) {
-            if (!isset($accessed[$k])) {
-                trigger_error("String hash key '$k' not used by builder", E_USER_NOTICE);
-            }
-        }
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Validator.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Validator.php
deleted file mode 100644
index fb31277889..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/Validator.php
+++ /dev/null
@@ -1,248 +0,0 @@
-<?php
-
-/**
- * Performs validations on HTMLPurifier_ConfigSchema_Interchange
- *
- * @note If you see '// handled by InterchangeBuilder', that means a
- *       design decision in that class would prevent this validation from
- *       ever being necessary. We have them anyway, however, for
- *       redundancy.
- */
-class HTMLPurifier_ConfigSchema_Validator
-{
-
-    /**
-     * @type HTMLPurifier_ConfigSchema_Interchange
-     */
-    protected $interchange;
-
-    /**
-     * @type array
-     */
-    protected $aliases;
-
-    /**
-     * Context-stack to provide easy to read error messages.
-     * @type array
-     */
-    protected $context = array();
-
-    /**
-     * to test default's type.
-     * @type HTMLPurifier_VarParser
-     */
-    protected $parser;
-
-    public function __construct()
-    {
-        $this->parser = new HTMLPurifier_VarParser();
-    }
-
-    /**
-     * Validates a fully-formed interchange object.
-     * @param HTMLPurifier_ConfigSchema_Interchange $interchange
-     * @return bool
-     */
-    public function validate($interchange)
-    {
-        $this->interchange = $interchange;
-        $this->aliases = array();
-        // PHP is a bit lax with integer <=> string conversions in
-        // arrays, so we don't use the identical !== comparison
-        foreach ($interchange->directives as $i => $directive) {
-            $id = $directive->id->toString();
-            if ($i != $id) {
-                $this->error(false, "Integrity violation: key '$i' does not match internal id '$id'");
-            }
-            $this->validateDirective($directive);
-        }
-        return true;
-    }
-
-    /**
-     * Validates a HTMLPurifier_ConfigSchema_Interchange_Id object.
-     * @param HTMLPurifier_ConfigSchema_Interchange_Id $id
-     */
-    public function validateId($id)
-    {
-        $id_string = $id->toString();
-        $this->context[] = "id '$id_string'";
-        if (!$id instanceof HTMLPurifier_ConfigSchema_Interchange_Id) {
-            // handled by InterchangeBuilder
-            $this->error(false, 'is not an instance of HTMLPurifier_ConfigSchema_Interchange_Id');
-        }
-        // keys are now unconstrained (we might want to narrow down to A-Za-z0-9.)
-        // we probably should check that it has at least one namespace
-        $this->with($id, 'key')
-            ->assertNotEmpty()
-            ->assertIsString(); // implicit assertIsString handled by InterchangeBuilder
-        array_pop($this->context);
-    }
-
-    /**
-     * Validates a HTMLPurifier_ConfigSchema_Interchange_Directive object.
-     * @param HTMLPurifier_ConfigSchema_Interchange_Directive $d
-     */
-    public function validateDirective($d)
-    {
-        $id = $d->id->toString();
-        $this->context[] = "directive '$id'";
-        $this->validateId($d->id);
-
-        $this->with($d, 'description')
-            ->assertNotEmpty();
-
-        // BEGIN - handled by InterchangeBuilder
-        $this->with($d, 'type')
-            ->assertNotEmpty();
-        $this->with($d, 'typeAllowsNull')
-            ->assertIsBool();
-        try {
-            // This also tests validity of $d->type
-            $this->parser->parse($d->default, $d->type, $d->typeAllowsNull);
-        } catch (HTMLPurifier_VarParserException $e) {
-            $this->error('default', 'had error: ' . $e->getMessage());
-        }
-        // END - handled by InterchangeBuilder
-
-        if (!is_null($d->allowed) || !empty($d->valueAliases)) {
-            // allowed and valueAliases require that we be dealing with
-            // strings, so check for that early.
-            $d_int = HTMLPurifier_VarParser::$types[$d->type];
-            if (!isset(HTMLPurifier_VarParser::$stringTypes[$d_int])) {
-                $this->error('type', 'must be a string type when used with allowed or value aliases');
-            }
-        }
-
-        $this->validateDirectiveAllowed($d);
-        $this->validateDirectiveValueAliases($d);
-        $this->validateDirectiveAliases($d);
-
-        array_pop($this->context);
-    }
-
-    /**
-     * Extra validation if $allowed member variable of
-     * HTMLPurifier_ConfigSchema_Interchange_Directive is defined.
-     * @param HTMLPurifier_ConfigSchema_Interchange_Directive $d
-     */
-    public function validateDirectiveAllowed($d)
-    {
-        if (is_null($d->allowed)) {
-            return;
-        }
-        $this->with($d, 'allowed')
-            ->assertNotEmpty()
-            ->assertIsLookup(); // handled by InterchangeBuilder
-        if (is_string($d->default) && !isset($d->allowed[$d->default])) {
-            $this->error('default', 'must be an allowed value');
-        }
-        $this->context[] = 'allowed';
-        foreach ($d->allowed as $val => $x) {
-            if (!is_string($val)) {
-                $this->error("value $val", 'must be a string');
-            }
-        }
-        array_pop($this->context);
-    }
-
-    /**
-     * Extra validation if $valueAliases member variable of
-     * HTMLPurifier_ConfigSchema_Interchange_Directive is defined.
-     * @param HTMLPurifier_ConfigSchema_Interchange_Directive $d
-     */
-    public function validateDirectiveValueAliases($d)
-    {
-        if (is_null($d->valueAliases)) {
-            return;
-        }
-        $this->with($d, 'valueAliases')
-            ->assertIsArray(); // handled by InterchangeBuilder
-        $this->context[] = 'valueAliases';
-        foreach ($d->valueAliases as $alias => $real) {
-            if (!is_string($alias)) {
-                $this->error("alias $alias", 'must be a string');
-            }
-            if (!is_string($real)) {
-                $this->error("alias target $real from alias '$alias'", 'must be a string');
-            }
-            if ($alias === $real) {
-                $this->error("alias '$alias'", "must not be an alias to itself");
-            }
-        }
-        if (!is_null($d->allowed)) {
-            foreach ($d->valueAliases as $alias => $real) {
-                if (isset($d->allowed[$alias])) {
-                    $this->error("alias '$alias'", 'must not be an allowed value');
-                } elseif (!isset($d->allowed[$real])) {
-                    $this->error("alias '$alias'", 'must be an alias to an allowed value');
-                }
-            }
-        }
-        array_pop($this->context);
-    }
-
-    /**
-     * Extra validation if $aliases member variable of
-     * HTMLPurifier_ConfigSchema_Interchange_Directive is defined.
-     * @param HTMLPurifier_ConfigSchema_Interchange_Directive $d
-     */
-    public function validateDirectiveAliases($d)
-    {
-        $this->with($d, 'aliases')
-            ->assertIsArray(); // handled by InterchangeBuilder
-        $this->context[] = 'aliases';
-        foreach ($d->aliases as $alias) {
-            $this->validateId($alias);
-            $s = $alias->toString();
-            if (isset($this->interchange->directives[$s])) {
-                $this->error("alias '$s'", 'collides with another directive');
-            }
-            if (isset($this->aliases[$s])) {
-                $other_directive = $this->aliases[$s];
-                $this->error("alias '$s'", "collides with alias for directive '$other_directive'");
-            }
-            $this->aliases[$s] = $d->id->toString();
-        }
-        array_pop($this->context);
-    }
-
-    // protected helper functions
-
-    /**
-     * Convenience function for generating HTMLPurifier_ConfigSchema_ValidatorAtom
-     * for validating simple member variables of objects.
-     * @param $obj
-     * @param $member
-     * @return HTMLPurifier_ConfigSchema_ValidatorAtom
-     */
-    protected function with($obj, $member)
-    {
-        return new HTMLPurifier_ConfigSchema_ValidatorAtom($this->getFormattedContext(), $obj, $member);
-    }
-
-    /**
-     * Emits an error, providing helpful context.
-     * @throws HTMLPurifier_ConfigSchema_Exception
-     */
-    protected function error($target, $msg)
-    {
-        if ($target !== false) {
-            $prefix = ucfirst($target) . ' in ' . $this->getFormattedContext();
-        } else {
-            $prefix = ucfirst($this->getFormattedContext());
-        }
-        throw new HTMLPurifier_ConfigSchema_Exception(trim($prefix . ' ' . $msg));
-    }
-
-    /**
-     * Returns a formatted context string.
-     * @return string
-     */
-    protected function getFormattedContext()
-    {
-        return implode(' in ', array_reverse($this->context));
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/ValidatorAtom.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/ValidatorAtom.php
deleted file mode 100644
index c9aa3644af..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/ValidatorAtom.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-
-/**
- * Fluent interface for validating the contents of member variables.
- * This should be immutable. See HTMLPurifier_ConfigSchema_Validator for
- * use-cases. We name this an 'atom' because it's ONLY for validations that
- * are independent and usually scalar.
- */
-class HTMLPurifier_ConfigSchema_ValidatorAtom
-{
-    /**
-     * @type string
-     */
-    protected $context;
-
-    /**
-     * @type object
-     */
-    protected $obj;
-
-    /**
-     * @type string
-     */
-    protected $member;
-
-    /**
-     * @type mixed
-     */
-    protected $contents;
-
-    public function __construct($context, $obj, $member)
-    {
-        $this->context = $context;
-        $this->obj = $obj;
-        $this->member = $member;
-        $this->contents =& $obj->$member;
-    }
-
-    /**
-     * @return HTMLPurifier_ConfigSchema_ValidatorAtom
-     */
-    public function assertIsString()
-    {
-        if (!is_string($this->contents)) {
-            $this->error('must be a string');
-        }
-        return $this;
-    }
-
-    /**
-     * @return HTMLPurifier_ConfigSchema_ValidatorAtom
-     */
-    public function assertIsBool()
-    {
-        if (!is_bool($this->contents)) {
-            $this->error('must be a boolean');
-        }
-        return $this;
-    }
-
-    /**
-     * @return HTMLPurifier_ConfigSchema_ValidatorAtom
-     */
-    public function assertIsArray()
-    {
-        if (!is_array($this->contents)) {
-            $this->error('must be an array');
-        }
-        return $this;
-    }
-
-    /**
-     * @return HTMLPurifier_ConfigSchema_ValidatorAtom
-     */
-    public function assertNotNull()
-    {
-        if ($this->contents === null) {
-            $this->error('must not be null');
-        }
-        return $this;
-    }
-
-    /**
-     * @return HTMLPurifier_ConfigSchema_ValidatorAtom
-     */
-    public function assertAlnum()
-    {
-        $this->assertIsString();
-        if (!ctype_alnum($this->contents)) {
-            $this->error('must be alphanumeric');
-        }
-        return $this;
-    }
-
-    /**
-     * @return HTMLPurifier_ConfigSchema_ValidatorAtom
-     */
-    public function assertNotEmpty()
-    {
-        if (empty($this->contents)) {
-            $this->error('must not be empty');
-        }
-        return $this;
-    }
-
-    /**
-     * @return HTMLPurifier_ConfigSchema_ValidatorAtom
-     */
-    public function assertIsLookup()
-    {
-        $this->assertIsArray();
-        foreach ($this->contents as $v) {
-            if ($v !== true) {
-                $this->error('must be a lookup array');
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * @param string $msg
-     * @throws HTMLPurifier_ConfigSchema_Exception
-     */
-    protected function error($msg)
-    {
-        throw new HTMLPurifier_ConfigSchema_Exception(ucfirst($this->member) . ' in ' . $this->context . ' ' . $msg);
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema.ser b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema.ser
deleted file mode 100644
index a5426c7366..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema.ser
+++ /dev/null
@@ -1 +0,0 @@
-O:25:"HTMLPurifier_ConfigSchema":3:{s:8:"defaults";a:127:{s:19:"Attr.AllowedClasses";N;s:24:"Attr.AllowedFrameTargets";a:0:{}s:15:"Attr.AllowedRel";a:0:{}s:15:"Attr.AllowedRev";a:0:{}s:18:"Attr.ClassUseCDATA";N;s:20:"Attr.DefaultImageAlt";N;s:24:"Attr.DefaultInvalidImage";s:0:"";s:27:"Attr.DefaultInvalidImageAlt";s:13:"Invalid image";s:19:"Attr.DefaultTextDir";s:3:"ltr";s:13:"Attr.EnableID";b:0;s:21:"Attr.ForbiddenClasses";a:0:{}s:13:"Attr.ID.HTML5";N;s:16:"Attr.IDBlacklist";a:0:{}s:22:"Attr.IDBlacklistRegexp";N;s:13:"Attr.IDPrefix";s:0:"";s:18:"Attr.IDPrefixLocal";s:0:"";s:24:"AutoFormat.AutoParagraph";b:0;s:17:"AutoFormat.Custom";a:0:{}s:25:"AutoFormat.DisplayLinkURI";b:0;s:18:"AutoFormat.Linkify";b:0;s:33:"AutoFormat.PurifierLinkify.DocURL";s:3:"#%s";s:26:"AutoFormat.PurifierLinkify";b:0;s:32:"AutoFormat.RemoveEmpty.Predicate";a:4:{s:8:"colgroup";a:0:{}s:2:"th";a:0:{}s:2:"td";a:0:{}s:6:"iframe";a:1:{i:0;s:3:"src";}}s:44:"AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions";a:2:{s:2:"td";b:1;s:2:"th";b:1;}s:33:"AutoFormat.RemoveEmpty.RemoveNbsp";b:0;s:22:"AutoFormat.RemoveEmpty";b:0;s:39:"AutoFormat.RemoveSpansWithoutAttributes";b:0;s:19:"CSS.AllowDuplicates";b:0;s:18:"CSS.AllowImportant";b:0;s:15:"CSS.AllowTricky";b:0;s:16:"CSS.AllowedFonts";N;s:21:"CSS.AllowedProperties";N;s:17:"CSS.DefinitionRev";i:1;s:23:"CSS.ForbiddenProperties";a:0:{}s:16:"CSS.MaxImgLength";s:6:"1200px";s:15:"CSS.Proprietary";b:0;s:11:"CSS.Trusted";b:0;s:20:"Cache.DefinitionImpl";s:10:"Serializer";s:20:"Cache.SerializerPath";N;s:27:"Cache.SerializerPermissions";i:493;s:22:"Core.AggressivelyFixLt";b:1;s:29:"Core.AggressivelyRemoveScript";b:1;s:28:"Core.AllowHostnameUnderscore";b:0;s:23:"Core.AllowParseManyTags";b:0;s:18:"Core.CollectErrors";b:0;s:18:"Core.ColorKeywords";a:148:{s:9:"aliceblue";s:7:"#F0F8FF";s:12:"antiquewhite";s:7:"#FAEBD7";s:4:"aqua";s:7:"#00FFFF";s:10:"aquamarine";s:7:"#7FFFD4";s:5:"azure";s:7:"#F0FFFF";s:5:"beige";s:7:"#F5F5DC";s:6:"bisque";s:7:"#FFE4C4";s:5:"black";s:7:"#000000";s:14:"blanchedalmond";s:7:"#FFEBCD";s:4:"blue";s:7:"#0000FF";s:10:"blueviolet";s:7:"#8A2BE2";s:5:"brown";s:7:"#A52A2A";s:9:"burlywood";s:7:"#DEB887";s:9:"cadetblue";s:7:"#5F9EA0";s:10:"chartreuse";s:7:"#7FFF00";s:9:"chocolate";s:7:"#D2691E";s:5:"coral";s:7:"#FF7F50";s:14:"cornflowerblue";s:7:"#6495ED";s:8:"cornsilk";s:7:"#FFF8DC";s:7:"crimson";s:7:"#DC143C";s:4:"cyan";s:7:"#00FFFF";s:8:"darkblue";s:7:"#00008B";s:8:"darkcyan";s:7:"#008B8B";s:13:"darkgoldenrod";s:7:"#B8860B";s:8:"darkgray";s:7:"#A9A9A9";s:8:"darkgrey";s:7:"#A9A9A9";s:9:"darkgreen";s:7:"#006400";s:9:"darkkhaki";s:7:"#BDB76B";s:11:"darkmagenta";s:7:"#8B008B";s:14:"darkolivegreen";s:7:"#556B2F";s:10:"darkorange";s:7:"#FF8C00";s:10:"darkorchid";s:7:"#9932CC";s:7:"darkred";s:7:"#8B0000";s:10:"darksalmon";s:7:"#E9967A";s:12:"darkseagreen";s:7:"#8FBC8F";s:13:"darkslateblue";s:7:"#483D8B";s:13:"darkslategray";s:7:"#2F4F4F";s:13:"darkslategrey";s:7:"#2F4F4F";s:13:"darkturquoise";s:7:"#00CED1";s:10:"darkviolet";s:7:"#9400D3";s:8:"deeppink";s:7:"#FF1493";s:11:"deepskyblue";s:7:"#00BFFF";s:7:"dimgray";s:7:"#696969";s:7:"dimgrey";s:7:"#696969";s:10:"dodgerblue";s:7:"#1E90FF";s:9:"firebrick";s:7:"#B22222";s:11:"floralwhite";s:7:"#FFFAF0";s:11:"forestgreen";s:7:"#228B22";s:7:"fuchsia";s:7:"#FF00FF";s:9:"gainsboro";s:7:"#DCDCDC";s:10:"ghostwhite";s:7:"#F8F8FF";s:4:"gold";s:7:"#FFD700";s:9:"goldenrod";s:7:"#DAA520";s:4:"gray";s:7:"#808080";s:4:"grey";s:7:"#808080";s:5:"green";s:7:"#008000";s:11:"greenyellow";s:7:"#ADFF2F";s:8:"honeydew";s:7:"#F0FFF0";s:7:"hotpink";s:7:"#FF69B4";s:9:"indianred";s:7:"#CD5C5C";s:6:"indigo";s:7:"#4B0082";s:5:"ivory";s:7:"#FFFFF0";s:5:"khaki";s:7:"#F0E68C";s:8:"lavender";s:7:"#E6E6FA";s:13:"lavenderblush";s:7:"#FFF0F5";s:9:"lawngreen";s:7:"#7CFC00";s:12:"lemonchiffon";s:7:"#FFFACD";s:9:"lightblue";s:7:"#ADD8E6";s:10:"lightcoral";s:7:"#F08080";s:9:"lightcyan";s:7:"#E0FFFF";s:20:"lightgoldenrodyellow";s:7:"#FAFAD2";s:9:"lightgray";s:7:"#D3D3D3";s:9:"lightgrey";s:7:"#D3D3D3";s:10:"lightgreen";s:7:"#90EE90";s:9:"lightpink";s:7:"#FFB6C1";s:11:"lightsalmon";s:7:"#FFA07A";s:13:"lightseagreen";s:7:"#20B2AA";s:12:"lightskyblue";s:7:"#87CEFA";s:14:"lightslategray";s:7:"#778899";s:14:"lightslategrey";s:7:"#778899";s:14:"lightsteelblue";s:7:"#B0C4DE";s:11:"lightyellow";s:7:"#FFFFE0";s:4:"lime";s:7:"#00FF00";s:9:"limegreen";s:7:"#32CD32";s:5:"linen";s:7:"#FAF0E6";s:7:"magenta";s:7:"#FF00FF";s:6:"maroon";s:7:"#800000";s:16:"mediumaquamarine";s:7:"#66CDAA";s:10:"mediumblue";s:7:"#0000CD";s:12:"mediumorchid";s:7:"#BA55D3";s:12:"mediumpurple";s:7:"#9370DB";s:14:"mediumseagreen";s:7:"#3CB371";s:15:"mediumslateblue";s:7:"#7B68EE";s:17:"mediumspringgreen";s:7:"#00FA9A";s:15:"mediumturquoise";s:7:"#48D1CC";s:15:"mediumvioletred";s:7:"#C71585";s:12:"midnightblue";s:7:"#191970";s:9:"mintcream";s:7:"#F5FFFA";s:9:"mistyrose";s:7:"#FFE4E1";s:8:"moccasin";s:7:"#FFE4B5";s:11:"navajowhite";s:7:"#FFDEAD";s:4:"navy";s:7:"#000080";s:7:"oldlace";s:7:"#FDF5E6";s:5:"olive";s:7:"#808000";s:9:"olivedrab";s:7:"#6B8E23";s:6:"orange";s:7:"#FFA500";s:9:"orangered";s:7:"#FF4500";s:6:"orchid";s:7:"#DA70D6";s:13:"palegoldenrod";s:7:"#EEE8AA";s:9:"palegreen";s:7:"#98FB98";s:13:"paleturquoise";s:7:"#AFEEEE";s:13:"palevioletred";s:7:"#DB7093";s:10:"papayawhip";s:7:"#FFEFD5";s:9:"peachpuff";s:7:"#FFDAB9";s:4:"peru";s:7:"#CD853F";s:4:"pink";s:7:"#FFC0CB";s:4:"plum";s:7:"#DDA0DD";s:10:"powderblue";s:7:"#B0E0E6";s:6:"purple";s:7:"#800080";s:13:"rebeccapurple";s:7:"#663399";s:3:"red";s:7:"#FF0000";s:9:"rosybrown";s:7:"#BC8F8F";s:9:"royalblue";s:7:"#4169E1";s:11:"saddlebrown";s:7:"#8B4513";s:6:"salmon";s:7:"#FA8072";s:10:"sandybrown";s:7:"#F4A460";s:8:"seagreen";s:7:"#2E8B57";s:8:"seashell";s:7:"#FFF5EE";s:6:"sienna";s:7:"#A0522D";s:6:"silver";s:7:"#C0C0C0";s:7:"skyblue";s:7:"#87CEEB";s:9:"slateblue";s:7:"#6A5ACD";s:9:"slategray";s:7:"#708090";s:9:"slategrey";s:7:"#708090";s:4:"snow";s:7:"#FFFAFA";s:11:"springgreen";s:7:"#00FF7F";s:9:"steelblue";s:7:"#4682B4";s:3:"tan";s:7:"#D2B48C";s:4:"teal";s:7:"#008080";s:7:"thistle";s:7:"#D8BFD8";s:6:"tomato";s:7:"#FF6347";s:9:"turquoise";s:7:"#40E0D0";s:6:"violet";s:7:"#EE82EE";s:5:"wheat";s:7:"#F5DEB3";s:5:"white";s:7:"#FFFFFF";s:10:"whitesmoke";s:7:"#F5F5F5";s:6:"yellow";s:7:"#FFFF00";s:11:"yellowgreen";s:7:"#9ACD32";}s:30:"Core.ConvertDocumentToFragment";b:1;s:36:"Core.DirectLexLineNumberSyncInterval";i:0;s:20:"Core.DisableExcludes";b:0;s:15:"Core.EnableIDNA";b:0;s:13:"Core.Encoding";s:5:"utf-8";s:26:"Core.EscapeInvalidChildren";b:0;s:22:"Core.EscapeInvalidTags";b:0;s:29:"Core.EscapeNonASCIICharacters";b:0;s:19:"Core.HiddenElements";a:2:{s:6:"script";b:1;s:5:"style";b:1;}s:13:"Core.Language";s:2:"en";s:24:"Core.LegacyEntityDecoder";b:0;s:14:"Core.LexerImpl";N;s:24:"Core.MaintainLineNumbers";N;s:22:"Core.NormalizeNewlines";b:1;s:21:"Core.RemoveInvalidImg";b:1;s:33:"Core.RemoveProcessingInstructions";b:0;s:25:"Core.RemoveScriptContents";N;s:13:"Filter.Custom";a:0:{}s:34:"Filter.ExtractStyleBlocks.Escaping";b:1;s:31:"Filter.ExtractStyleBlocks.Scope";N;s:34:"Filter.ExtractStyleBlocks.TidyImpl";N;s:25:"Filter.ExtractStyleBlocks";b:0;s:14:"Filter.YouTube";b:0;s:12:"HTML.Allowed";N;s:22:"HTML.AllowedAttributes";N;s:20:"HTML.AllowedComments";a:0:{}s:26:"HTML.AllowedCommentsRegexp";N;s:20:"HTML.AllowedElements";N;s:19:"HTML.AllowedModules";N;s:23:"HTML.Attr.Name.UseCDATA";b:0;s:17:"HTML.BlockWrapper";s:1:"p";s:16:"HTML.CoreModules";a:7:{s:9:"Structure";b:1;s:4:"Text";b:1;s:9:"Hypertext";b:1;s:4:"List";b:1;s:22:"NonXMLCommonAttributes";b:1;s:19:"XMLCommonAttributes";b:1;s:16:"CommonAttributes";b:1;}s:18:"HTML.CustomDoctype";N;s:17:"HTML.DefinitionID";N;s:18:"HTML.DefinitionRev";i:1;s:12:"HTML.Doctype";N;s:25:"HTML.FlashAllowFullScreen";b:0;s:24:"HTML.ForbiddenAttributes";a:0:{}s:22:"HTML.ForbiddenElements";a:0:{}s:10:"HTML.Forms";b:0;s:17:"HTML.MaxImgLength";i:1200;s:13:"HTML.Nofollow";b:0;s:11:"HTML.Parent";s:3:"div";s:16:"HTML.Proprietary";b:0;s:14:"HTML.SafeEmbed";b:0;s:15:"HTML.SafeIframe";b:0;s:15:"HTML.SafeObject";b:0;s:18:"HTML.SafeScripting";a:0:{}s:11:"HTML.Strict";b:0;s:16:"HTML.TargetBlank";b:0;s:19:"HTML.TargetNoopener";b:1;s:21:"HTML.TargetNoreferrer";b:1;s:12:"HTML.TidyAdd";a:0:{}s:14:"HTML.TidyLevel";s:6:"medium";s:15:"HTML.TidyRemove";a:0:{}s:12:"HTML.Trusted";b:0;s:10:"HTML.XHTML";b:1;s:28:"Output.CommentScriptContents";b:1;s:19:"Output.FixInnerHTML";b:1;s:18:"Output.FlashCompat";b:0;s:14:"Output.Newline";N;s:15:"Output.SortAttr";b:0;s:17:"Output.TidyFormat";b:0;s:17:"Test.ForceNoIconv";b:0;s:18:"URI.AllowedSchemes";a:7:{s:4:"http";b:1;s:5:"https";b:1;s:6:"mailto";b:1;s:3:"ftp";b:1;s:4:"nntp";b:1;s:4:"news";b:1;s:3:"tel";b:1;}s:8:"URI.Base";N;s:17:"URI.DefaultScheme";s:4:"http";s:16:"URI.DefinitionID";N;s:17:"URI.DefinitionRev";i:1;s:11:"URI.Disable";b:0;s:19:"URI.DisableExternal";b:0;s:28:"URI.DisableExternalResources";b:0;s:20:"URI.DisableResources";b:0;s:8:"URI.Host";N;s:17:"URI.HostBlacklist";a:0:{}s:16:"URI.MakeAbsolute";b:0;s:9:"URI.Munge";N;s:18:"URI.MungeResources";b:0;s:18:"URI.MungeSecretKey";N;s:26:"URI.OverrideAllowedSchemes";b:1;s:20:"URI.SafeIframeRegexp";N;}s:12:"defaultPlist";O:25:"HTMLPurifier_PropertyList":3:{s:7:"*data";a:127:{s:19:"Attr.AllowedClasses";N;s:24:"Attr.AllowedFrameTargets";a:0:{}s:15:"Attr.AllowedRel";a:0:{}s:15:"Attr.AllowedRev";a:0:{}s:18:"Attr.ClassUseCDATA";N;s:20:"Attr.DefaultImageAlt";N;s:24:"Attr.DefaultInvalidImage";s:0:"";s:27:"Attr.DefaultInvalidImageAlt";s:13:"Invalid image";s:19:"Attr.DefaultTextDir";s:3:"ltr";s:13:"Attr.EnableID";b:0;s:21:"Attr.ForbiddenClasses";a:0:{}s:13:"Attr.ID.HTML5";N;s:16:"Attr.IDBlacklist";a:0:{}s:22:"Attr.IDBlacklistRegexp";N;s:13:"Attr.IDPrefix";s:0:"";s:18:"Attr.IDPrefixLocal";s:0:"";s:24:"AutoFormat.AutoParagraph";b:0;s:17:"AutoFormat.Custom";a:0:{}s:25:"AutoFormat.DisplayLinkURI";b:0;s:18:"AutoFormat.Linkify";b:0;s:33:"AutoFormat.PurifierLinkify.DocURL";s:3:"#%s";s:26:"AutoFormat.PurifierLinkify";b:0;s:32:"AutoFormat.RemoveEmpty.Predicate";a:4:{s:8:"colgroup";a:0:{}s:2:"th";a:0:{}s:2:"td";a:0:{}s:6:"iframe";a:1:{i:0;s:3:"src";}}s:44:"AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions";a:2:{s:2:"td";b:1;s:2:"th";b:1;}s:33:"AutoFormat.RemoveEmpty.RemoveNbsp";b:0;s:22:"AutoFormat.RemoveEmpty";b:0;s:39:"AutoFormat.RemoveSpansWithoutAttributes";b:0;s:19:"CSS.AllowDuplicates";b:0;s:18:"CSS.AllowImportant";b:0;s:15:"CSS.AllowTricky";b:0;s:16:"CSS.AllowedFonts";N;s:21:"CSS.AllowedProperties";N;s:17:"CSS.DefinitionRev";i:1;s:23:"CSS.ForbiddenProperties";a:0:{}s:16:"CSS.MaxImgLength";s:6:"1200px";s:15:"CSS.Proprietary";b:0;s:11:"CSS.Trusted";b:0;s:20:"Cache.DefinitionImpl";s:10:"Serializer";s:20:"Cache.SerializerPath";N;s:27:"Cache.SerializerPermissions";i:493;s:22:"Core.AggressivelyFixLt";b:1;s:29:"Core.AggressivelyRemoveScript";b:1;s:28:"Core.AllowHostnameUnderscore";b:0;s:23:"Core.AllowParseManyTags";b:0;s:18:"Core.CollectErrors";b:0;s:18:"Core.ColorKeywords";a:148:{s:9:"aliceblue";s:7:"#F0F8FF";s:12:"antiquewhite";s:7:"#FAEBD7";s:4:"aqua";s:7:"#00FFFF";s:10:"aquamarine";s:7:"#7FFFD4";s:5:"azure";s:7:"#F0FFFF";s:5:"beige";s:7:"#F5F5DC";s:6:"bisque";s:7:"#FFE4C4";s:5:"black";s:7:"#000000";s:14:"blanchedalmond";s:7:"#FFEBCD";s:4:"blue";s:7:"#0000FF";s:10:"blueviolet";s:7:"#8A2BE2";s:5:"brown";s:7:"#A52A2A";s:9:"burlywood";s:7:"#DEB887";s:9:"cadetblue";s:7:"#5F9EA0";s:10:"chartreuse";s:7:"#7FFF00";s:9:"chocolate";s:7:"#D2691E";s:5:"coral";s:7:"#FF7F50";s:14:"cornflowerblue";s:7:"#6495ED";s:8:"cornsilk";s:7:"#FFF8DC";s:7:"crimson";s:7:"#DC143C";s:4:"cyan";s:7:"#00FFFF";s:8:"darkblue";s:7:"#00008B";s:8:"darkcyan";s:7:"#008B8B";s:13:"darkgoldenrod";s:7:"#B8860B";s:8:"darkgray";s:7:"#A9A9A9";s:8:"darkgrey";s:7:"#A9A9A9";s:9:"darkgreen";s:7:"#006400";s:9:"darkkhaki";s:7:"#BDB76B";s:11:"darkmagenta";s:7:"#8B008B";s:14:"darkolivegreen";s:7:"#556B2F";s:10:"darkorange";s:7:"#FF8C00";s:10:"darkorchid";s:7:"#9932CC";s:7:"darkred";s:7:"#8B0000";s:10:"darksalmon";s:7:"#E9967A";s:12:"darkseagreen";s:7:"#8FBC8F";s:13:"darkslateblue";s:7:"#483D8B";s:13:"darkslategray";s:7:"#2F4F4F";s:13:"darkslategrey";s:7:"#2F4F4F";s:13:"darkturquoise";s:7:"#00CED1";s:10:"darkviolet";s:7:"#9400D3";s:8:"deeppink";s:7:"#FF1493";s:11:"deepskyblue";s:7:"#00BFFF";s:7:"dimgray";s:7:"#696969";s:7:"dimgrey";s:7:"#696969";s:10:"dodgerblue";s:7:"#1E90FF";s:9:"firebrick";s:7:"#B22222";s:11:"floralwhite";s:7:"#FFFAF0";s:11:"forestgreen";s:7:"#228B22";s:7:"fuchsia";s:7:"#FF00FF";s:9:"gainsboro";s:7:"#DCDCDC";s:10:"ghostwhite";s:7:"#F8F8FF";s:4:"gold";s:7:"#FFD700";s:9:"goldenrod";s:7:"#DAA520";s:4:"gray";s:7:"#808080";s:4:"grey";s:7:"#808080";s:5:"green";s:7:"#008000";s:11:"greenyellow";s:7:"#ADFF2F";s:8:"honeydew";s:7:"#F0FFF0";s:7:"hotpink";s:7:"#FF69B4";s:9:"indianred";s:7:"#CD5C5C";s:6:"indigo";s:7:"#4B0082";s:5:"ivory";s:7:"#FFFFF0";s:5:"khaki";s:7:"#F0E68C";s:8:"lavender";s:7:"#E6E6FA";s:13:"lavenderblush";s:7:"#FFF0F5";s:9:"lawngreen";s:7:"#7CFC00";s:12:"lemonchiffon";s:7:"#FFFACD";s:9:"lightblue";s:7:"#ADD8E6";s:10:"lightcoral";s:7:"#F08080";s:9:"lightcyan";s:7:"#E0FFFF";s:20:"lightgoldenrodyellow";s:7:"#FAFAD2";s:9:"lightgray";s:7:"#D3D3D3";s:9:"lightgrey";s:7:"#D3D3D3";s:10:"lightgreen";s:7:"#90EE90";s:9:"lightpink";s:7:"#FFB6C1";s:11:"lightsalmon";s:7:"#FFA07A";s:13:"lightseagreen";s:7:"#20B2AA";s:12:"lightskyblue";s:7:"#87CEFA";s:14:"lightslategray";s:7:"#778899";s:14:"lightslategrey";s:7:"#778899";s:14:"lightsteelblue";s:7:"#B0C4DE";s:11:"lightyellow";s:7:"#FFFFE0";s:4:"lime";s:7:"#00FF00";s:9:"limegreen";s:7:"#32CD32";s:5:"linen";s:7:"#FAF0E6";s:7:"magenta";s:7:"#FF00FF";s:6:"maroon";s:7:"#800000";s:16:"mediumaquamarine";s:7:"#66CDAA";s:10:"mediumblue";s:7:"#0000CD";s:12:"mediumorchid";s:7:"#BA55D3";s:12:"mediumpurple";s:7:"#9370DB";s:14:"mediumseagreen";s:7:"#3CB371";s:15:"mediumslateblue";s:7:"#7B68EE";s:17:"mediumspringgreen";s:7:"#00FA9A";s:15:"mediumturquoise";s:7:"#48D1CC";s:15:"mediumvioletred";s:7:"#C71585";s:12:"midnightblue";s:7:"#191970";s:9:"mintcream";s:7:"#F5FFFA";s:9:"mistyrose";s:7:"#FFE4E1";s:8:"moccasin";s:7:"#FFE4B5";s:11:"navajowhite";s:7:"#FFDEAD";s:4:"navy";s:7:"#000080";s:7:"oldlace";s:7:"#FDF5E6";s:5:"olive";s:7:"#808000";s:9:"olivedrab";s:7:"#6B8E23";s:6:"orange";s:7:"#FFA500";s:9:"orangered";s:7:"#FF4500";s:6:"orchid";s:7:"#DA70D6";s:13:"palegoldenrod";s:7:"#EEE8AA";s:9:"palegreen";s:7:"#98FB98";s:13:"paleturquoise";s:7:"#AFEEEE";s:13:"palevioletred";s:7:"#DB7093";s:10:"papayawhip";s:7:"#FFEFD5";s:9:"peachpuff";s:7:"#FFDAB9";s:4:"peru";s:7:"#CD853F";s:4:"pink";s:7:"#FFC0CB";s:4:"plum";s:7:"#DDA0DD";s:10:"powderblue";s:7:"#B0E0E6";s:6:"purple";s:7:"#800080";s:13:"rebeccapurple";s:7:"#663399";s:3:"red";s:7:"#FF0000";s:9:"rosybrown";s:7:"#BC8F8F";s:9:"royalblue";s:7:"#4169E1";s:11:"saddlebrown";s:7:"#8B4513";s:6:"salmon";s:7:"#FA8072";s:10:"sandybrown";s:7:"#F4A460";s:8:"seagreen";s:7:"#2E8B57";s:8:"seashell";s:7:"#FFF5EE";s:6:"sienna";s:7:"#A0522D";s:6:"silver";s:7:"#C0C0C0";s:7:"skyblue";s:7:"#87CEEB";s:9:"slateblue";s:7:"#6A5ACD";s:9:"slategray";s:7:"#708090";s:9:"slategrey";s:7:"#708090";s:4:"snow";s:7:"#FFFAFA";s:11:"springgreen";s:7:"#00FF7F";s:9:"steelblue";s:7:"#4682B4";s:3:"tan";s:7:"#D2B48C";s:4:"teal";s:7:"#008080";s:7:"thistle";s:7:"#D8BFD8";s:6:"tomato";s:7:"#FF6347";s:9:"turquoise";s:7:"#40E0D0";s:6:"violet";s:7:"#EE82EE";s:5:"wheat";s:7:"#F5DEB3";s:5:"white";s:7:"#FFFFFF";s:10:"whitesmoke";s:7:"#F5F5F5";s:6:"yellow";s:7:"#FFFF00";s:11:"yellowgreen";s:7:"#9ACD32";}s:30:"Core.ConvertDocumentToFragment";b:1;s:36:"Core.DirectLexLineNumberSyncInterval";i:0;s:20:"Core.DisableExcludes";b:0;s:15:"Core.EnableIDNA";b:0;s:13:"Core.Encoding";s:5:"utf-8";s:26:"Core.EscapeInvalidChildren";b:0;s:22:"Core.EscapeInvalidTags";b:0;s:29:"Core.EscapeNonASCIICharacters";b:0;s:19:"Core.HiddenElements";a:2:{s:6:"script";b:1;s:5:"style";b:1;}s:13:"Core.Language";s:2:"en";s:24:"Core.LegacyEntityDecoder";b:0;s:14:"Core.LexerImpl";N;s:24:"Core.MaintainLineNumbers";N;s:22:"Core.NormalizeNewlines";b:1;s:21:"Core.RemoveInvalidImg";b:1;s:33:"Core.RemoveProcessingInstructions";b:0;s:25:"Core.RemoveScriptContents";N;s:13:"Filter.Custom";a:0:{}s:34:"Filter.ExtractStyleBlocks.Escaping";b:1;s:31:"Filter.ExtractStyleBlocks.Scope";N;s:34:"Filter.ExtractStyleBlocks.TidyImpl";N;s:25:"Filter.ExtractStyleBlocks";b:0;s:14:"Filter.YouTube";b:0;s:12:"HTML.Allowed";N;s:22:"HTML.AllowedAttributes";N;s:20:"HTML.AllowedComments";a:0:{}s:26:"HTML.AllowedCommentsRegexp";N;s:20:"HTML.AllowedElements";N;s:19:"HTML.AllowedModules";N;s:23:"HTML.Attr.Name.UseCDATA";b:0;s:17:"HTML.BlockWrapper";s:1:"p";s:16:"HTML.CoreModules";a:7:{s:9:"Structure";b:1;s:4:"Text";b:1;s:9:"Hypertext";b:1;s:4:"List";b:1;s:22:"NonXMLCommonAttributes";b:1;s:19:"XMLCommonAttributes";b:1;s:16:"CommonAttributes";b:1;}s:18:"HTML.CustomDoctype";N;s:17:"HTML.DefinitionID";N;s:18:"HTML.DefinitionRev";i:1;s:12:"HTML.Doctype";N;s:25:"HTML.FlashAllowFullScreen";b:0;s:24:"HTML.ForbiddenAttributes";a:0:{}s:22:"HTML.ForbiddenElements";a:0:{}s:10:"HTML.Forms";b:0;s:17:"HTML.MaxImgLength";i:1200;s:13:"HTML.Nofollow";b:0;s:11:"HTML.Parent";s:3:"div";s:16:"HTML.Proprietary";b:0;s:14:"HTML.SafeEmbed";b:0;s:15:"HTML.SafeIframe";b:0;s:15:"HTML.SafeObject";b:0;s:18:"HTML.SafeScripting";a:0:{}s:11:"HTML.Strict";b:0;s:16:"HTML.TargetBlank";b:0;s:19:"HTML.TargetNoopener";b:1;s:21:"HTML.TargetNoreferrer";b:1;s:12:"HTML.TidyAdd";a:0:{}s:14:"HTML.TidyLevel";s:6:"medium";s:15:"HTML.TidyRemove";a:0:{}s:12:"HTML.Trusted";b:0;s:10:"HTML.XHTML";b:1;s:28:"Output.CommentScriptContents";b:1;s:19:"Output.FixInnerHTML";b:1;s:18:"Output.FlashCompat";b:0;s:14:"Output.Newline";N;s:15:"Output.SortAttr";b:0;s:17:"Output.TidyFormat";b:0;s:17:"Test.ForceNoIconv";b:0;s:18:"URI.AllowedSchemes";a:7:{s:4:"http";b:1;s:5:"https";b:1;s:6:"mailto";b:1;s:3:"ftp";b:1;s:4:"nntp";b:1;s:4:"news";b:1;s:3:"tel";b:1;}s:8:"URI.Base";N;s:17:"URI.DefaultScheme";s:4:"http";s:16:"URI.DefinitionID";N;s:17:"URI.DefinitionRev";i:1;s:11:"URI.Disable";b:0;s:19:"URI.DisableExternal";b:0;s:28:"URI.DisableExternalResources";b:0;s:20:"URI.DisableResources";b:0;s:8:"URI.Host";N;s:17:"URI.HostBlacklist";a:0:{}s:16:"URI.MakeAbsolute";b:0;s:9:"URI.Munge";N;s:18:"URI.MungeResources";b:0;s:18:"URI.MungeSecretKey";N;s:26:"URI.OverrideAllowedSchemes";b:1;s:20:"URI.SafeIframeRegexp";N;}s:9:"*parent";N;s:8:"*cache";N;}s:4:"info";a:140:{s:19:"Attr.AllowedClasses";i:-8;s:24:"Attr.AllowedFrameTargets";i:8;s:15:"Attr.AllowedRel";i:8;s:15:"Attr.AllowedRev";i:8;s:18:"Attr.ClassUseCDATA";i:-7;s:20:"Attr.DefaultImageAlt";i:-1;s:24:"Attr.DefaultInvalidImage";i:1;s:27:"Attr.DefaultInvalidImageAlt";i:1;s:19:"Attr.DefaultTextDir";O:8:"stdClass":2:{s:4:"type";i:1;s:7:"allowed";a:2:{s:3:"ltr";b:1;s:3:"rtl";b:1;}}s:13:"Attr.EnableID";i:7;s:17:"HTML.EnableAttrID";O:8:"stdClass":2:{s:3:"key";s:13:"Attr.EnableID";s:7:"isAlias";b:1;}s:21:"Attr.ForbiddenClasses";i:8;s:13:"Attr.ID.HTML5";i:-7;s:16:"Attr.IDBlacklist";i:9;s:22:"Attr.IDBlacklistRegexp";i:-1;s:13:"Attr.IDPrefix";i:1;s:18:"Attr.IDPrefixLocal";i:1;s:24:"AutoFormat.AutoParagraph";i:7;s:17:"AutoFormat.Custom";i:9;s:25:"AutoFormat.DisplayLinkURI";i:7;s:18:"AutoFormat.Linkify";i:7;s:33:"AutoFormat.PurifierLinkify.DocURL";i:1;s:37:"AutoFormatParam.PurifierLinkifyDocURL";O:8:"stdClass":2:{s:3:"key";s:33:"AutoFormat.PurifierLinkify.DocURL";s:7:"isAlias";b:1;}s:26:"AutoFormat.PurifierLinkify";i:7;s:32:"AutoFormat.RemoveEmpty.Predicate";i:10;s:44:"AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions";i:8;s:33:"AutoFormat.RemoveEmpty.RemoveNbsp";i:7;s:22:"AutoFormat.RemoveEmpty";i:7;s:39:"AutoFormat.RemoveSpansWithoutAttributes";i:7;s:19:"CSS.AllowDuplicates";i:7;s:18:"CSS.AllowImportant";i:7;s:15:"CSS.AllowTricky";i:7;s:16:"CSS.AllowedFonts";i:-8;s:21:"CSS.AllowedProperties";i:-8;s:17:"CSS.DefinitionRev";i:5;s:23:"CSS.ForbiddenProperties";i:8;s:16:"CSS.MaxImgLength";i:-1;s:15:"CSS.Proprietary";i:7;s:11:"CSS.Trusted";i:7;s:20:"Cache.DefinitionImpl";i:-1;s:20:"Core.DefinitionCache";O:8:"stdClass":2:{s:3:"key";s:20:"Cache.DefinitionImpl";s:7:"isAlias";b:1;}s:20:"Cache.SerializerPath";i:-1;s:27:"Cache.SerializerPermissions";i:-5;s:22:"Core.AggressivelyFixLt";i:7;s:29:"Core.AggressivelyRemoveScript";i:7;s:28:"Core.AllowHostnameUnderscore";i:7;s:23:"Core.AllowParseManyTags";i:7;s:18:"Core.CollectErrors";i:7;s:18:"Core.ColorKeywords";i:10;s:30:"Core.ConvertDocumentToFragment";i:7;s:24:"Core.AcceptFullDocuments";O:8:"stdClass":2:{s:3:"key";s:30:"Core.ConvertDocumentToFragment";s:7:"isAlias";b:1;}s:36:"Core.DirectLexLineNumberSyncInterval";i:5;s:20:"Core.DisableExcludes";i:7;s:15:"Core.EnableIDNA";i:7;s:13:"Core.Encoding";i:2;s:26:"Core.EscapeInvalidChildren";i:7;s:22:"Core.EscapeInvalidTags";i:7;s:29:"Core.EscapeNonASCIICharacters";i:7;s:19:"Core.HiddenElements";i:8;s:13:"Core.Language";i:1;s:24:"Core.LegacyEntityDecoder";i:7;s:14:"Core.LexerImpl";i:-11;s:24:"Core.MaintainLineNumbers";i:-7;s:22:"Core.NormalizeNewlines";i:7;s:21:"Core.RemoveInvalidImg";i:7;s:33:"Core.RemoveProcessingInstructions";i:7;s:25:"Core.RemoveScriptContents";i:-7;s:13:"Filter.Custom";i:9;s:34:"Filter.ExtractStyleBlocks.Escaping";i:7;s:33:"Filter.ExtractStyleBlocksEscaping";O:8:"stdClass":2:{s:3:"key";s:34:"Filter.ExtractStyleBlocks.Escaping";s:7:"isAlias";b:1;}s:38:"FilterParam.ExtractStyleBlocksEscaping";O:8:"stdClass":2:{s:3:"key";s:34:"Filter.ExtractStyleBlocks.Escaping";s:7:"isAlias";b:1;}s:31:"Filter.ExtractStyleBlocks.Scope";i:-1;s:30:"Filter.ExtractStyleBlocksScope";O:8:"stdClass":2:{s:3:"key";s:31:"Filter.ExtractStyleBlocks.Scope";s:7:"isAlias";b:1;}s:35:"FilterParam.ExtractStyleBlocksScope";O:8:"stdClass":2:{s:3:"key";s:31:"Filter.ExtractStyleBlocks.Scope";s:7:"isAlias";b:1;}s:34:"Filter.ExtractStyleBlocks.TidyImpl";i:-11;s:38:"FilterParam.ExtractStyleBlocksTidyImpl";O:8:"stdClass":2:{s:3:"key";s:34:"Filter.ExtractStyleBlocks.TidyImpl";s:7:"isAlias";b:1;}s:25:"Filter.ExtractStyleBlocks";i:7;s:14:"Filter.YouTube";i:7;s:12:"HTML.Allowed";i:-4;s:22:"HTML.AllowedAttributes";i:-8;s:20:"HTML.AllowedComments";i:8;s:26:"HTML.AllowedCommentsRegexp";i:-1;s:20:"HTML.AllowedElements";i:-8;s:19:"HTML.AllowedModules";i:-8;s:23:"HTML.Attr.Name.UseCDATA";i:7;s:17:"HTML.BlockWrapper";i:1;s:16:"HTML.CoreModules";i:8;s:18:"HTML.CustomDoctype";i:-1;s:17:"HTML.DefinitionID";i:-1;s:18:"HTML.DefinitionRev";i:5;s:12:"HTML.Doctype";O:8:"stdClass":3:{s:4:"type";i:1;s:10:"allow_null";b:1;s:7:"allowed";a:5:{s:22:"HTML 4.01 Transitional";b:1;s:16:"HTML 4.01 Strict";b:1;s:22:"XHTML 1.0 Transitional";b:1;s:16:"XHTML 1.0 Strict";b:1;s:9:"XHTML 1.1";b:1;}}s:25:"HTML.FlashAllowFullScreen";i:7;s:24:"HTML.ForbiddenAttributes";i:8;s:22:"HTML.ForbiddenElements";i:8;s:10:"HTML.Forms";i:7;s:17:"HTML.MaxImgLength";i:-5;s:13:"HTML.Nofollow";i:7;s:11:"HTML.Parent";i:1;s:16:"HTML.Proprietary";i:7;s:14:"HTML.SafeEmbed";i:7;s:15:"HTML.SafeIframe";i:7;s:15:"HTML.SafeObject";i:7;s:18:"HTML.SafeScripting";i:8;s:11:"HTML.Strict";i:7;s:16:"HTML.TargetBlank";i:7;s:19:"HTML.TargetNoopener";i:7;s:21:"HTML.TargetNoreferrer";i:7;s:12:"HTML.TidyAdd";i:8;s:14:"HTML.TidyLevel";O:8:"stdClass":2:{s:4:"type";i:1;s:7:"allowed";a:4:{s:4:"none";b:1;s:5:"light";b:1;s:6:"medium";b:1;s:5:"heavy";b:1;}}s:15:"HTML.TidyRemove";i:8;s:12:"HTML.Trusted";i:7;s:10:"HTML.XHTML";i:7;s:10:"Core.XHTML";O:8:"stdClass":2:{s:3:"key";s:10:"HTML.XHTML";s:7:"isAlias";b:1;}s:28:"Output.CommentScriptContents";i:7;s:26:"Core.CommentScriptContents";O:8:"stdClass":2:{s:3:"key";s:28:"Output.CommentScriptContents";s:7:"isAlias";b:1;}s:19:"Output.FixInnerHTML";i:7;s:18:"Output.FlashCompat";i:7;s:14:"Output.Newline";i:-1;s:15:"Output.SortAttr";i:7;s:17:"Output.TidyFormat";i:7;s:15:"Core.TidyFormat";O:8:"stdClass":2:{s:3:"key";s:17:"Output.TidyFormat";s:7:"isAlias";b:1;}s:17:"Test.ForceNoIconv";i:7;s:18:"URI.AllowedSchemes";i:8;s:8:"URI.Base";i:-1;s:17:"URI.DefaultScheme";i:-1;s:16:"URI.DefinitionID";i:-1;s:17:"URI.DefinitionRev";i:5;s:11:"URI.Disable";i:7;s:15:"Attr.DisableURI";O:8:"stdClass":2:{s:3:"key";s:11:"URI.Disable";s:7:"isAlias";b:1;}s:19:"URI.DisableExternal";i:7;s:28:"URI.DisableExternalResources";i:7;s:20:"URI.DisableResources";i:7;s:8:"URI.Host";i:-1;s:17:"URI.HostBlacklist";i:9;s:16:"URI.MakeAbsolute";i:7;s:9:"URI.Munge";i:-1;s:18:"URI.MungeResources";i:7;s:18:"URI.MungeSecretKey";i:-1;s:26:"URI.OverrideAllowedSchemes";i:7;s:20:"URI.SafeIframeRegexp";i:-1;}}
\ No newline at end of file
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt
deleted file mode 100644
index 0517fed0a1..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Attr.AllowedClasses
-TYPE: lookup/null
-VERSION: 4.0.0
-DEFAULT: null
---DESCRIPTION--
-List of allowed class values in the class attribute. By default, this is null,
-which means all classes are allowed.
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt
deleted file mode 100644
index 249edd647b..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Attr.AllowedFrameTargets
-TYPE: lookup
-DEFAULT: array()
---DESCRIPTION--
-Lookup table of all allowed link frame targets.  Some commonly used link
-targets include _blank, _self, _parent and _top. Values should be
-lowercase, as validation will be done in a case-sensitive manner despite
-W3C's recommendation. XHTML 1.0 Strict does not permit the target attribute
-so this directive will have no effect in that doctype. XHTML 1.1 does not
-enable the Target module by default, you will have to manually enable it
-(see the module documentation for more details.)
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt
deleted file mode 100644
index 9a8fa6a2e2..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Attr.AllowedRel
-TYPE: lookup
-VERSION: 1.6.0
-DEFAULT: array()
---DESCRIPTION--
-List of allowed forward document relationships in the rel attribute. Common
-values may be nofollow or print. By default, this is empty, meaning that no
-document relationships are allowed.
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt
deleted file mode 100644
index b017883485..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Attr.AllowedRev
-TYPE: lookup
-VERSION: 1.6.0
-DEFAULT: array()
---DESCRIPTION--
-List of allowed reverse document relationships in the rev attribute. This
-attribute is a bit of an edge-case; if you don't know what it is for, stay
-away.
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt
deleted file mode 100644
index e774b823b1..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Attr.ClassUseCDATA
-TYPE: bool/null
-DEFAULT: null
-VERSION: 4.0.0
---DESCRIPTION--
-If null, class will auto-detect the doctype and, if matching XHTML 1.1 or
-XHTML 2.0, will use the restrictive NMTOKENS specification of class. Otherwise,
-it will use a relaxed CDATA definition.  If true, the relaxed CDATA definition
-is forced; if false, the NMTOKENS definition is forced.  To get behavior
-of HTML Purifier prior to 4.0.0, set this directive to false.
-
-Some rational behind the auto-detection:
-in previous versions of HTML Purifier, it was assumed that the form of
-class was NMTOKENS, as specified by the XHTML Modularization (representing
-XHTML 1.1 and XHTML 2.0).  The DTDs for HTML 4.01 and XHTML 1.0, however
-specify class as CDATA.  HTML 5 effectively defines it as CDATA, but
-with the additional constraint that each name should be unique (this is not
-explicitly outlined in previous specifications).
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt
deleted file mode 100644
index 533165e175..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Attr.DefaultImageAlt
-TYPE: string/null
-DEFAULT: null
-VERSION: 3.2.0
---DESCRIPTION--
-This is the content of the alt tag of an image if the user had not
-previously specified an alt attribute.  This applies to all images without
-a valid alt attribute, as opposed to %Attr.DefaultInvalidImageAlt, which
-only applies to invalid images, and overrides in the case of an invalid image.
-Default behavior with null is to use the basename of the src tag for the alt.
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt
deleted file mode 100644
index 9eb7e38469..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Attr.DefaultInvalidImage
-TYPE: string
-DEFAULT: ''
---DESCRIPTION--
-This is the default image an img tag will be pointed to if it does not have
-a valid src attribute.  In future versions, we may allow the image tag to
-be removed completely, but due to design issues, this is not possible right
-now.
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt
deleted file mode 100644
index 2f17bf477a..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Attr.DefaultInvalidImageAlt
-TYPE: string
-DEFAULT: 'Invalid image'
---DESCRIPTION--
-This is the content of the alt tag of an invalid image if the user had not
-previously specified an alt attribute.  It has no effect when the image is
-valid but there was no alt attribute present.
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt
deleted file mode 100644
index 52654b53ae..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Attr.DefaultTextDir
-TYPE: string
-DEFAULT: 'ltr'
---DESCRIPTION--
-Defines the default text direction (ltr or rtl) of the document being
-parsed.  This generally is the same as the value of the dir attribute in
-HTML, or ltr if that is not specified.
---ALLOWED--
-'ltr', 'rtl'
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt
deleted file mode 100644
index 6440d21032..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Attr.EnableID
-TYPE: bool
-DEFAULT: false
-VERSION: 1.2.0
---DESCRIPTION--
-Allows the ID attribute in HTML.  This is disabled by default due to the
-fact that without proper configuration user input can easily break the
-validation of a webpage by specifying an ID that is already on the
-surrounding HTML.  If you don't mind throwing caution to the wind, enable
-this directive, but I strongly recommend you also consider blacklisting IDs
-you use (%Attr.IDBlacklist) or prefixing all user supplied IDs
-(%Attr.IDPrefix).  When set to true HTML Purifier reverts to the behavior of
-pre-1.2.0 versions.
---ALIASES--
-HTML.EnableAttrID
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt
deleted file mode 100644
index f31d226f58..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Attr.ForbiddenClasses
-TYPE: lookup
-VERSION: 4.0.0
-DEFAULT: array()
---DESCRIPTION--
-List of forbidden class values in the class attribute. By default, this is
-empty, which means that no classes are forbidden. See also %Attr.AllowedClasses.
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.ID.HTML5.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.ID.HTML5.txt
deleted file mode 100644
index 735d4b7a10..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.ID.HTML5.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Attr.ID.HTML5
-TYPE: bool/null
-DEFAULT: null
-VERSION: 4.8.0
---DESCRIPTION--
-In HTML5, restrictions on the format of the id attribute have been significantly
-relaxed, such that any string is valid so long as it contains no spaces and
-is at least one character.  In lieu of a general HTML5 compatibility flag,
-set this configuration directive to true to use the relaxed rules.
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt
deleted file mode 100644
index 5f2b5e3d2c..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Attr.IDBlacklist
-TYPE: list
-DEFAULT: array()
-DESCRIPTION: Array of IDs not allowed in the document.
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt
deleted file mode 100644
index 6f5824586e..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Attr.IDBlacklistRegexp
-TYPE: string/null
-VERSION: 1.6.0
-DEFAULT: NULL
---DESCRIPTION--
-PCRE regular expression to be matched against all IDs. If the expression is
-matches, the ID is rejected. Use this with care: may cause significant
-degradation. ID matching is done after all other validation.
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt
deleted file mode 100644
index cc49d43fd0..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Attr.IDPrefix
-TYPE: string
-VERSION: 1.2.0
-DEFAULT: ''
---DESCRIPTION--
-String to prefix to IDs.  If you have no idea what IDs your pages may use,
-you may opt to simply add a prefix to all user-submitted ID attributes so
-that they are still usable, but will not conflict with core page IDs.
-Example: setting the directive to 'user_' will result in a user submitted
-'foo' to become 'user_foo'  Be sure to set %HTML.EnableAttrID to true
-before using this.
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt
deleted file mode 100644
index 2c5924a7ad..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Attr.IDPrefixLocal
-TYPE: string
-VERSION: 1.2.0
-DEFAULT: ''
---DESCRIPTION--
-Temporary prefix for IDs used in conjunction with %Attr.IDPrefix.  If you
-need to allow multiple sets of user content on web page, you may need to
-have a seperate prefix that changes with each iteration.  This way,
-seperately submitted user content displayed on the same page doesn't
-clobber each other. Ideal values are unique identifiers for the content it
-represents (i.e. the id of the row in the database). Be sure to add a
-seperator (like an underscore) at the end.  Warning: this directive will
-not work unless %Attr.IDPrefix is set to a non-empty value!
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt
deleted file mode 100644
index d5caa1bb97..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-AutoFormat.AutoParagraph
-TYPE: bool
-VERSION: 2.0.1
-DEFAULT: false
---DESCRIPTION--
-
-<p>
-  This directive turns on auto-paragraphing, where double newlines are
-  converted in to paragraphs whenever possible. Auto-paragraphing:
-</p>
-<ul>
-  <li>Always applies to inline elements or text in the root node,</li>
-  <li>Applies to inline elements or text with double newlines in nodes
-      that allow paragraph tags,</li>
-  <li>Applies to double newlines in paragraph tags</li>
-</ul>
-<p>
-  <code>p</code> tags must be allowed for this directive to take effect.
-  We do not use <code>br</code> tags for paragraphing, as that is
-  semantically incorrect.
-</p>
-<p>
-  To prevent auto-paragraphing as a content-producer, refrain from using
-  double-newlines except to specify a new paragraph or in contexts where
-  it has special meaning (whitespace usually has no meaning except in
-  tags like <code>pre</code>, so this should not be difficult.) To prevent
-  the paragraphing of inline text adjacent to block elements, wrap them
-  in <code>div</code> tags (the behavior is slightly different outside of
-  the root node.)
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt
deleted file mode 100644
index 2a476481af..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-AutoFormat.Custom
-TYPE: list
-VERSION: 2.0.1
-DEFAULT: array()
---DESCRIPTION--
-
-<p>
-  This directive can be used to add custom auto-format injectors.
-  Specify an array of injector names (class name minus the prefix)
-  or concrete implementations. Injector class must exist.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt
deleted file mode 100644
index 663064a344..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-AutoFormat.DisplayLinkURI
-TYPE: bool
-VERSION: 3.2.0
-DEFAULT: false
---DESCRIPTION--
-<p>
-  This directive turns on the in-text display of URIs in &lt;a&gt; tags, and disables
-  those links. For example, <a href="http://example.com">example</a> becomes
-  example (<a>http://example.com</a>).
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt
deleted file mode 100644
index 3a48ba960e..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-AutoFormat.Linkify
-TYPE: bool
-VERSION: 2.0.1
-DEFAULT: false
---DESCRIPTION--
-
-<p>
-  This directive turns on linkification, auto-linking http, ftp and
-  https URLs. <code>a</code> tags with the <code>href</code> attribute
-  must be allowed.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt
deleted file mode 100644
index db58b13464..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-AutoFormat.PurifierLinkify.DocURL
-TYPE: string
-VERSION: 2.0.1
-DEFAULT: '#%s'
-ALIASES: AutoFormatParam.PurifierLinkifyDocURL
---DESCRIPTION--
-<p>
-  Location of configuration documentation to link to, let %s substitute
-  into the configuration's namespace and directive names sans the percent
-  sign.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt
deleted file mode 100644
index 7996488be0..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-AutoFormat.PurifierLinkify
-TYPE: bool
-VERSION: 2.0.1
-DEFAULT: false
---DESCRIPTION--
-
-<p>
-  Internal auto-formatter that converts configuration directives in
-  syntax <a>%Namespace.Directive</a> to links. <code>a</code> tags
-  with the <code>href</code> attribute must be allowed.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.Predicate.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.Predicate.txt
deleted file mode 100644
index 6367fe23c9..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.Predicate.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-AutoFormat.RemoveEmpty.Predicate
-TYPE: hash
-VERSION: 4.7.0
-DEFAULT: array('colgroup' => array(), 'th' => array(), 'td' => array(), 'iframe' => array('src'))
---DESCRIPTION--
-<p>
-  Given that an element has no contents, it will be removed by default, unless
-  this predicate dictates otherwise.  The predicate can either be an associative
-  map from tag name to list of attributes that must be present for the element
-  to be considered preserved: thus, the default always preserves <code>colgroup</code>,
-  <code>th</code> and <code>td</code>, and also <code>iframe</code> if it
-  has a <code>src</code>.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt
deleted file mode 100644
index 35c393b4e6..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions
-TYPE: lookup
-VERSION: 4.0.0
-DEFAULT: array('td' => true, 'th' => true)
---DESCRIPTION--
-<p>
-  When %AutoFormat.RemoveEmpty and %AutoFormat.RemoveEmpty.RemoveNbsp
-  are enabled, this directive defines what HTML elements should not be
-  removede if they have only a non-breaking space in them.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt
deleted file mode 100644
index 9228dee228..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-AutoFormat.RemoveEmpty.RemoveNbsp
-TYPE: bool
-VERSION: 4.0.0
-DEFAULT: false
---DESCRIPTION--
-<p>
-  When enabled, HTML Purifier will treat any elements that contain only
-  non-breaking spaces as well as regular whitespace as empty, and remove
-  them when %AutoFormat.RemoveEmpty is enabled.
-</p>
-<p>
-  See %AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions for a list of elements
-  that don't have this behavior applied to them.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt
deleted file mode 100644
index 34657ba47b..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-AutoFormat.RemoveEmpty
-TYPE: bool
-VERSION: 3.2.0
-DEFAULT: false
---DESCRIPTION--
-<p>
-  When enabled, HTML Purifier will attempt to remove empty elements that
-  contribute no semantic information to the document. The following types
-  of nodes will be removed:
-</p>
-<ul><li>
-    Tags with no attributes and no content, and that are not empty
-    elements (remove <code>&lt;a&gt;&lt;/a&gt;</code> but not
-    <code>&lt;br /&gt;</code>), and
-  </li>
-  <li>
-    Tags with no content, except for:<ul>
-      <li>The <code>colgroup</code> element, or</li>
-      <li>
-        Elements with the <code>id</code> or <code>name</code> attribute,
-        when those attributes are permitted on those elements.
-      </li>
-    </ul></li>
-</ul>
-<p>
-  Please be very careful when using this functionality; while it may not
-  seem that empty elements contain useful information, they can alter the
-  layout of a document given appropriate styling. This directive is most
-  useful when you are processing machine-generated HTML, please avoid using
-  it on regular user HTML.
-</p>
-<p>
-  Elements that contain only whitespace will be treated as empty. Non-breaking
-  spaces, however, do not count as whitespace. See
-  %AutoFormat.RemoveEmpty.RemoveNbsp for alternate behavior.
-</p>
-<p>
-  This algorithm is not perfect; you may still notice some empty tags,
-  particularly if a node had elements, but those elements were later removed
-  because they were not permitted in that context, or tags that, after
-  being auto-closed by another tag, where empty. This is for safety reasons
-  to prevent clever code from breaking validation. The general rule of thumb:
-  if a tag looked empty on the way in, it will get removed; if HTML Purifier
-  made it empty, it will stay.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt
deleted file mode 100644
index dde990ab26..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-AutoFormat.RemoveSpansWithoutAttributes
-TYPE: bool
-VERSION: 4.0.1
-DEFAULT: false
---DESCRIPTION--
-<p>
-  This directive causes <code>span</code> tags without any attributes
-  to be removed. It will also remove spans that had all attributes
-  removed during processing.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowDuplicates.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowDuplicates.txt
deleted file mode 100644
index 4d054b1f07..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowDuplicates.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-CSS.AllowDuplicates
-TYPE: bool
-DEFAULT: false
-VERSION: 4.8.0
---DESCRIPTION--
-<p>
-  By default, HTML Purifier removes duplicate CSS properties,
-  like <code>color:red; color:blue</code>.  If this is set to
-  true, duplicate properties are allowed.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt
deleted file mode 100644
index b324608f76..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-CSS.AllowImportant
-TYPE: bool
-DEFAULT: false
-VERSION: 3.1.0
---DESCRIPTION--
-This parameter determines whether or not !important cascade modifiers should
-be allowed in user CSS. If false, !important will stripped.
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt
deleted file mode 100644
index 748be0eec8..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-CSS.AllowTricky
-TYPE: bool
-DEFAULT: false
-VERSION: 3.1.0
---DESCRIPTION--
-This parameter determines whether or not to allow "tricky" CSS properties and
-values. Tricky CSS properties/values can drastically modify page layout or
-be used for deceptive practices but do not directly constitute a security risk.
-For example, <code>display:none;</code> is considered a tricky property that
-will only be allowed if this directive is set to true.
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedFonts.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedFonts.txt
deleted file mode 100644
index 3fd4654065..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedFonts.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-CSS.AllowedFonts
-TYPE: lookup/null
-VERSION: 4.3.0
-DEFAULT: NULL
---DESCRIPTION--
-<p>
-    Allows you to manually specify a set of allowed fonts.  If
-    <code>NULL</code>, all fonts are allowed.  This directive
-    affects generic names (serif, sans-serif, monospace, cursive,
-    fantasy) as well as specific font families.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt
deleted file mode 100644
index 460112ebe0..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-CSS.AllowedProperties
-TYPE: lookup/null
-VERSION: 3.1.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
-    If HTML Purifier's style attributes set is unsatisfactory for your needs,
-    you can overload it with your own list of tags to allow.  Note that this
-    method is subtractive: it does its job by taking away from HTML Purifier
-    usual feature set, so you cannot add an attribute that HTML Purifier never
-    supported in the first place.
-</p>
-<p>
-    <strong>Warning:</strong> If another directive conflicts with the
-    elements here, <em>that</em> directive will win and override.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt
deleted file mode 100644
index 5cb7dda3ba..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-CSS.DefinitionRev
-TYPE: int
-VERSION: 2.0.0
-DEFAULT: 1
---DESCRIPTION--
-
-<p>
-    Revision identifier for your custom definition. See
-    %HTML.DefinitionRev for details.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.ForbiddenProperties.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.ForbiddenProperties.txt
deleted file mode 100644
index f1f5c5f12b..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.ForbiddenProperties.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-CSS.ForbiddenProperties
-TYPE: lookup
-VERSION: 4.2.0
-DEFAULT: array()
---DESCRIPTION--
-<p>
-    This is the logical inverse of %CSS.AllowedProperties, and it will
-    override that directive or any other directive.  If possible,
-    %CSS.AllowedProperties is recommended over this directive,
-    because it can sometimes be difficult to tell whether or not you've
-    forbidden all of the CSS properties you truly would like to disallow.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt
deleted file mode 100644
index 7a3291470c..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-CSS.MaxImgLength
-TYPE: string/null
-DEFAULT: '1200px'
-VERSION: 3.1.1
---DESCRIPTION--
-<p>
- This parameter sets the maximum allowed length on <code>img</code> tags,
- effectively the <code>width</code> and <code>height</code> properties.
- Only absolute units of measurement (in, pt, pc, mm, cm) and pixels (px) are allowed. This is
- in place to prevent imagecrash attacks, disable with null at your own risk.
- This directive is similar to %HTML.MaxImgLength, and both should be
- concurrently edited, although there are
- subtle differences in the input format (the CSS max is a number with
- a unit).
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt
deleted file mode 100644
index 148eedb8be..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-CSS.Proprietary
-TYPE: bool
-VERSION: 3.0.0
-DEFAULT: false
---DESCRIPTION--
-
-<p>
-    Whether or not to allow safe, proprietary CSS values.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.Trusted.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.Trusted.txt
deleted file mode 100644
index e733a61e8a..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.Trusted.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-CSS.Trusted
-TYPE: bool
-VERSION: 4.2.1
-DEFAULT: false
---DESCRIPTION--
-Indicates whether or not the user's CSS input is trusted or not. If the
-input is trusted, a more expansive set of allowed properties.  See
-also %HTML.Trusted.
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt
deleted file mode 100644
index c486724c88..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Cache.DefinitionImpl
-TYPE: string/null
-VERSION: 2.0.0
-DEFAULT: 'Serializer'
---DESCRIPTION--
-
-This directive defines which method to use when caching definitions,
-the complex data-type that makes HTML Purifier tick. Set to null
-to disable caching (not recommended, as you will see a definite
-performance degradation).
-
---ALIASES--
-Core.DefinitionCache
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt
deleted file mode 100644
index 54036507d6..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Cache.SerializerPath
-TYPE: string/null
-VERSION: 2.0.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
-    Absolute path with no trailing slash to store serialized definitions in.
-    Default is within the
-    HTML Purifier library inside DefinitionCache/Serializer. This
-    path must be writable by the webserver.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPermissions.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPermissions.txt
deleted file mode 100644
index 2e0cc81044..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPermissions.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Cache.SerializerPermissions
-TYPE: int/null
-VERSION: 4.3.0
-DEFAULT: 0755
---DESCRIPTION--
-
-<p>
-    Directory permissions of the files and directories created inside
-    the DefinitionCache/Serializer or other custom serializer path.
-</p>
-<p>
-    In HTML Purifier 4.8.0, this also supports <code>NULL</code>,
-    which means that no chmod'ing or directory creation shall
-    occur.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt
deleted file mode 100644
index 568cbf3b32..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-Core.AggressivelyFixLt
-TYPE: bool
-VERSION: 2.1.0
-DEFAULT: true
---DESCRIPTION--
-<p>
-    This directive enables aggressive pre-filter fixes HTML Purifier can
-    perform in order to ensure that open angled-brackets do not get killed
-    during parsing stage. Enabling this will result in two preg_replace_callback
-    calls and at least two preg_replace calls for every HTML document parsed;
-    if your users make very well-formed HTML, you can set this directive false.
-    This has no effect when DirectLex is used.
-</p>
-<p>
-    <strong>Notice:</strong> This directive's default turned from false to true
-    in HTML Purifier 3.2.0.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyRemoveScript.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyRemoveScript.txt
deleted file mode 100644
index b2b6ab1496..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyRemoveScript.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Core.AggressivelyRemoveScript
-TYPE: bool
-VERSION: 4.9.0
-DEFAULT: true
---DESCRIPTION--
-<p>
-    This directive enables aggressive pre-filter removal of
-    script tags.  This is not necessary for security,
-    but it can help work around a bug in libxml where embedded
-    HTML elements inside script sections cause the parser to
-    choke.  To revert to pre-4.9.0 behavior, set this to false.
-    This directive has no effect if %Core.Trusted is true,
-    %Core.RemoveScriptContents is false, or %Core.HiddenElements
-    does not contain script.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.AllowHostnameUnderscore.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.AllowHostnameUnderscore.txt
deleted file mode 100644
index 2c910cc7de..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.AllowHostnameUnderscore.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Core.AllowHostnameUnderscore
-TYPE: bool
-VERSION: 4.6.0
-DEFAULT: false
---DESCRIPTION--
-<p>
-    By RFC 1123, underscores are not permitted in host names.
-    (This is in contrast to the specification for DNS, RFC
-    2181, which allows underscores.)
-    However, most browsers do the right thing when faced with
-    an underscore in the host name, and so some poorly written
-    websites are written with the expectation this should work.
-    Setting this parameter to true relaxes our allowed character
-    check so that underscores are permitted.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.AllowParseManyTags.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.AllowParseManyTags.txt
deleted file mode 100644
index 06278f82a1..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.AllowParseManyTags.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Core.AllowParseManyTags
-TYPE: bool
-DEFAULT: false
-VERSION: 4.10.1
---DESCRIPTION--
-<p>
-    This directive allows parsing of many nested tags.
-    If you set true, relaxes any hardcoded limit from the parser.
-    However, in that case it may cause a Dos attack.
-    Be careful when enabling it.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt
deleted file mode 100644
index d7317911fa..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Core.CollectErrors
-TYPE: bool
-VERSION: 2.0.0
-DEFAULT: false
---DESCRIPTION--
-
-Whether or not to collect errors found while filtering the document. This
-is a useful way to give feedback to your users. <strong>Warning:</strong>
-Currently this feature is very patchy and experimental, with lots of
-possible error messages not yet implemented. It will not cause any
-problems, but it may not help your users either.
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt
deleted file mode 100644
index a75844cd58..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt
+++ /dev/null
@@ -1,160 +0,0 @@
-Core.ColorKeywords
-TYPE: hash
-VERSION: 2.0.0
---DEFAULT--
-array (
-  'aliceblue' => '#F0F8FF',
-  'antiquewhite' => '#FAEBD7',
-  'aqua' => '#00FFFF',
-  'aquamarine' => '#7FFFD4',
-  'azure' => '#F0FFFF',
-  'beige' => '#F5F5DC',
-  'bisque' => '#FFE4C4',
-  'black' => '#000000',
-  'blanchedalmond' => '#FFEBCD',
-  'blue' => '#0000FF',
-  'blueviolet' => '#8A2BE2',
-  'brown' => '#A52A2A',
-  'burlywood' => '#DEB887',
-  'cadetblue' => '#5F9EA0',
-  'chartreuse' => '#7FFF00',
-  'chocolate' => '#D2691E',
-  'coral' => '#FF7F50',
-  'cornflowerblue' => '#6495ED',
-  'cornsilk' => '#FFF8DC',
-  'crimson' => '#DC143C',
-  'cyan' => '#00FFFF',
-  'darkblue' => '#00008B',
-  'darkcyan' => '#008B8B',
-  'darkgoldenrod' => '#B8860B',
-  'darkgray' => '#A9A9A9',
-  'darkgrey' => '#A9A9A9',
-  'darkgreen' => '#006400',
-  'darkkhaki' => '#BDB76B',
-  'darkmagenta' => '#8B008B',
-  'darkolivegreen' => '#556B2F',
-  'darkorange' => '#FF8C00',
-  'darkorchid' => '#9932CC',
-  'darkred' => '#8B0000',
-  'darksalmon' => '#E9967A',
-  'darkseagreen' => '#8FBC8F',
-  'darkslateblue' => '#483D8B',
-  'darkslategray' => '#2F4F4F',
-  'darkslategrey' => '#2F4F4F',
-  'darkturquoise' => '#00CED1',
-  'darkviolet' => '#9400D3',
-  'deeppink' => '#FF1493',
-  'deepskyblue' => '#00BFFF',
-  'dimgray' => '#696969',
-  'dimgrey' => '#696969',
-  'dodgerblue' => '#1E90FF',
-  'firebrick' => '#B22222',
-  'floralwhite' => '#FFFAF0',
-  'forestgreen' => '#228B22',
-  'fuchsia' => '#FF00FF',
-  'gainsboro' => '#DCDCDC',
-  'ghostwhite' => '#F8F8FF',
-  'gold' => '#FFD700',
-  'goldenrod' => '#DAA520',
-  'gray' => '#808080',
-  'grey' => '#808080',
-  'green' => '#008000',
-  'greenyellow' => '#ADFF2F',
-  'honeydew' => '#F0FFF0',
-  'hotpink' => '#FF69B4',
-  'indianred' => '#CD5C5C',
-  'indigo' => '#4B0082',
-  'ivory' => '#FFFFF0',
-  'khaki' => '#F0E68C',
-  'lavender' => '#E6E6FA',
-  'lavenderblush' => '#FFF0F5',
-  'lawngreen' => '#7CFC00',
-  'lemonchiffon' => '#FFFACD',
-  'lightblue' => '#ADD8E6',
-  'lightcoral' => '#F08080',
-  'lightcyan' => '#E0FFFF',
-  'lightgoldenrodyellow' => '#FAFAD2',
-  'lightgray' => '#D3D3D3',
-  'lightgrey' => '#D3D3D3',
-  'lightgreen' => '#90EE90',
-  'lightpink' => '#FFB6C1',
-  'lightsalmon' => '#FFA07A',
-  'lightseagreen' => '#20B2AA',
-  'lightskyblue' => '#87CEFA',
-  'lightslategray' => '#778899',
-  'lightslategrey' => '#778899',
-  'lightsteelblue' => '#B0C4DE',
-  'lightyellow' => '#FFFFE0',
-  'lime' => '#00FF00',
-  'limegreen' => '#32CD32',
-  'linen' => '#FAF0E6',
-  'magenta' => '#FF00FF',
-  'maroon' => '#800000',
-  'mediumaquamarine' => '#66CDAA',
-  'mediumblue' => '#0000CD',
-  'mediumorchid' => '#BA55D3',
-  'mediumpurple' => '#9370DB',
-  'mediumseagreen' => '#3CB371',
-  'mediumslateblue' => '#7B68EE',
-  'mediumspringgreen' => '#00FA9A',
-  'mediumturquoise' => '#48D1CC',
-  'mediumvioletred' => '#C71585',
-  'midnightblue' => '#191970',
-  'mintcream' => '#F5FFFA',
-  'mistyrose' => '#FFE4E1',
-  'moccasin' => '#FFE4B5',
-  'navajowhite' => '#FFDEAD',
-  'navy' => '#000080',
-  'oldlace' => '#FDF5E6',
-  'olive' => '#808000',
-  'olivedrab' => '#6B8E23',
-  'orange' => '#FFA500',
-  'orangered' => '#FF4500',
-  'orchid' => '#DA70D6',
-  'palegoldenrod' => '#EEE8AA',
-  'palegreen' => '#98FB98',
-  'paleturquoise' => '#AFEEEE',
-  'palevioletred' => '#DB7093',
-  'papayawhip' => '#FFEFD5',
-  'peachpuff' => '#FFDAB9',
-  'peru' => '#CD853F',
-  'pink' => '#FFC0CB',
-  'plum' => '#DDA0DD',
-  'powderblue' => '#B0E0E6',
-  'purple' => '#800080',
-  'rebeccapurple' => '#663399',
-  'red' => '#FF0000',
-  'rosybrown' => '#BC8F8F',
-  'royalblue' => '#4169E1',
-  'saddlebrown' => '#8B4513',
-  'salmon' => '#FA8072',
-  'sandybrown' => '#F4A460',
-  'seagreen' => '#2E8B57',
-  'seashell' => '#FFF5EE',
-  'sienna' => '#A0522D',
-  'silver' => '#C0C0C0',
-  'skyblue' => '#87CEEB',
-  'slateblue' => '#6A5ACD',
-  'slategray' => '#708090',
-  'slategrey' => '#708090',
-  'snow' => '#FFFAFA',
-  'springgreen' => '#00FF7F',
-  'steelblue' => '#4682B4',
-  'tan' => '#D2B48C',
-  'teal' => '#008080',
-  'thistle' => '#D8BFD8',
-  'tomato' => '#FF6347',
-  'turquoise' => '#40E0D0',
-  'violet' => '#EE82EE',
-  'wheat' => '#F5DEB3',
-  'white' => '#FFFFFF',
-  'whitesmoke' => '#F5F5F5',
-  'yellow' => '#FFFF00',
-  'yellowgreen' => '#9ACD32'
-)
---DESCRIPTION--
-
-Lookup array of color names to six digit hexadecimal number corresponding
-to color, with preceding hash mark. Used when parsing colors.  The lookup
-is done in a case-insensitive manner.
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt
deleted file mode 100644
index 64b114fce2..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Core.ConvertDocumentToFragment
-TYPE: bool
-DEFAULT: true
---DESCRIPTION--
-
-This parameter determines whether or not the filter should convert
-input that is a full document with html and body tags to a fragment
-of just the contents of a body tag. This parameter is simply something
-HTML Purifier can do during an edge-case: for most inputs, this
-processing is not necessary.
-
---ALIASES--
-Core.AcceptFullDocuments
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt
deleted file mode 100644
index 36f16e07ea..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Core.DirectLexLineNumberSyncInterval
-TYPE: int
-VERSION: 2.0.0
-DEFAULT: 0
---DESCRIPTION--
-
-<p>
-  Specifies the number of tokens the DirectLex line number tracking
-  implementations should process before attempting to resyncronize the
-  current line count by manually counting all previous new-lines. When
-  at 0, this functionality is disabled. Lower values will decrease
-  performance, and this is only strictly necessary if the counting
-  algorithm is buggy (in which case you should report it as a bug).
-  This has no effect when %Core.MaintainLineNumbers is disabled or DirectLex is
-  not being used.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.DisableExcludes.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.DisableExcludes.txt
deleted file mode 100644
index 1cd4c2c964..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.DisableExcludes.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Core.DisableExcludes
-TYPE: bool
-DEFAULT: false
-VERSION: 4.5.0
---DESCRIPTION--
-<p>
-  This directive disables SGML-style exclusions, e.g. the exclusion of
-  <code>&lt;object&gt;</code> in any descendant of a
-  <code>&lt;pre&gt;</code> tag.  Disabling excludes will allow some
-  invalid documents to pass through HTML Purifier, but HTML Purifier
-  will also be less likely to accidentally remove large documents during
-  processing.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EnableIDNA.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EnableIDNA.txt
deleted file mode 100644
index ce243c35dc..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EnableIDNA.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Core.EnableIDNA
-TYPE: bool
-DEFAULT: false
-VERSION: 4.4.0
---DESCRIPTION--
-Allows international domain names in URLs.  This configuration option
-requires the PEAR Net_IDNA2 module to be installed.  It operates by
-punycoding any internationalized host names for maximum portability.
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt
deleted file mode 100644
index 8bfb47c3ac..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Core.Encoding
-TYPE: istring
-DEFAULT: 'utf-8'
---DESCRIPTION--
-If for some reason you are unable to convert all webpages to UTF-8, you can
-use this directive as a stop-gap compatibility change to let HTML Purifier
-deal with non UTF-8 input.  This technique has notable deficiencies:
-absolutely no characters outside of the selected character encoding will be
-preserved, not even the ones that have been ampersand escaped (this is due
-to a UTF-8 specific <em>feature</em> that automatically resolves all
-entities), making it pretty useless for anything except the most I18N-blind
-applications, although %Core.EscapeNonASCIICharacters offers fixes this
-trouble with another tradeoff. This directive only accepts ISO-8859-1 if
-iconv is not enabled.
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt
deleted file mode 100644
index a3881be75c..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Core.EscapeInvalidChildren
-TYPE: bool
-DEFAULT: false
---DESCRIPTION--
-<p><strong>Warning:</strong> this configuration option is no longer does anything as of 4.6.0.</p>
-
-<p>When true, a child is found that is not allowed in the context of the
-parent element will be transformed into text as if it were ASCII. When
-false, that element and all internal tags will be dropped, though text will
-be preserved.  There is no option for dropping the element but preserving
-child nodes.</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt
deleted file mode 100644
index a7a5b249bb..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Core.EscapeInvalidTags
-TYPE: bool
-DEFAULT: false
---DESCRIPTION--
-When true, invalid tags will be written back to the document as plain text.
-Otherwise, they are silently dropped.
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt
deleted file mode 100644
index abb499948a..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Core.EscapeNonASCIICharacters
-TYPE: bool
-VERSION: 1.4.0
-DEFAULT: false
---DESCRIPTION--
-This directive overcomes a deficiency in %Core.Encoding by blindly
-converting all non-ASCII characters into decimal numeric entities before
-converting it to its native encoding. This means that even characters that
-can be expressed in the non-UTF-8 encoding will be entity-ized, which can
-be a real downer for encodings like Big5. It also assumes that the ASCII
-repetoire is available, although this is the case for almost all encodings.
-Anyway, use UTF-8!
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt
deleted file mode 100644
index 915391edb7..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Core.HiddenElements
-TYPE: lookup
---DEFAULT--
-array (
-  'script' => true,
-  'style' => true,
-)
---DESCRIPTION--
-
-<p>
-  This directive is a lookup array of elements which should have their
-  contents removed when they are not allowed by the HTML definition.
-  For example, the contents of a <code>script</code> tag are not
-  normally shown in a document, so if script tags are to be removed,
-  their contents should be removed to. This is opposed to a <code>b</code>
-  tag, which defines some presentational changes but does not hide its
-  contents.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.Language.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.Language.txt
deleted file mode 100644
index 233fca14f8..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.Language.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Core.Language
-TYPE: string
-VERSION: 2.0.0
-DEFAULT: 'en'
---DESCRIPTION--
-
-ISO 639 language code for localizable things in HTML Purifier to use,
-which is mainly error reporting. There is currently only an English (en)
-translation, so this directive is currently useless.
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.LegacyEntityDecoder.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.LegacyEntityDecoder.txt
deleted file mode 100644
index 392b436493..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.LegacyEntityDecoder.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-Core.LegacyEntityDecoder
-TYPE: bool
-VERSION: 4.9.0
-DEFAULT: false
---DESCRIPTION--
-<p>
-    Prior to HTML Purifier 4.9.0, entities were decoded by performing
-    a global search replace for all entities whose decoded versions
-    did not have special meanings under HTML, and replaced them with
-    their decoded versions.  We would match all entities, even if they did
-    not have a trailing semicolon, but only if there weren't any trailing
-    alphanumeric characters.
-</p>
-<table>
-<tr><th>Original</th><th>Text</th><th>Attribute</th></tr>
-<tr><td>&amp;yen;</td><td>&yen;</td><td>&yen;</td></tr>
-<tr><td>&amp;yen</td><td>&yen;</td><td>&yen;</td></tr>
-<tr><td>&amp;yena</td><td>&amp;yena</td><td>&amp;yena</td></tr>
-<tr><td>&amp;yen=</td><td>&yen;=</td><td>&yen;=</td></tr>
-</table>
-<p>
-    In HTML Purifier 4.9.0, we changed the behavior of entity parsing
-    to match entities that had missing trailing semicolons in less
-    cases, to more closely match HTML5 parsing behavior:
-</p>
-<table>
-<tr><th>Original</th><th>Text</th><th>Attribute</th></tr>
-<tr><td>&amp;yen;</td><td>&yen;</td><td>&yen;</td></tr>
-<tr><td>&amp;yen</td><td>&yen;</td><td>&yen;</td></tr>
-<tr><td>&amp;yena</td><td>&yen;a</td><td>&amp;yena</td></tr>
-<tr><td>&amp;yen=</td><td>&yen;=</td><td>&amp;yen=</td></tr>
-</table>
-<p>
-    This flag reverts back to pre-HTML Purifier 4.9.0 behavior.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt
deleted file mode 100644
index 8983e2cca9..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-Core.LexerImpl
-TYPE: mixed/null
-VERSION: 2.0.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
-  This parameter determines what lexer implementation can be used. The
-  valid values are:
-</p>
-<dl>
-  <dt><em>null</em></dt>
-  <dd>
-    Recommended, the lexer implementation will be auto-detected based on
-    your PHP-version and configuration.
-  </dd>
-  <dt><em>string</em> lexer identifier</dt>
-  <dd>
-    This is a slim way of manually overridding the implementation.
-    Currently recognized values are: DOMLex (the default PHP5
-implementation)
-    and DirectLex (the default PHP4 implementation). Only use this if
-    you know what you are doing: usually, the auto-detection will
-    manage things for cases you aren't even aware of.
-  </dd>
-  <dt><em>object</em> lexer instance</dt>
-  <dd>
-    Super-advanced: you can specify your own, custom, implementation that
-    implements the interface defined by <code>HTMLPurifier_Lexer</code>.
-    I may remove this option simply because I don't expect anyone
-    to use it.
-  </dd>
-</dl>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt
deleted file mode 100644
index eb841a7597..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Core.MaintainLineNumbers
-TYPE: bool/null
-VERSION: 2.0.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
-  If true, HTML Purifier will add line number information to all tokens.
-  This is useful when error reporting is turned on, but can result in
-  significant performance degradation and should not be used when
-  unnecessary. This directive must be used with the DirectLex lexer,
-  as the DOMLex lexer does not (yet) support this functionality.
-  If the value is null, an appropriate value will be selected based
-  on other configuration.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.NormalizeNewlines.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.NormalizeNewlines.txt
deleted file mode 100644
index d77f5360d7..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.NormalizeNewlines.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Core.NormalizeNewlines
-TYPE: bool
-VERSION: 4.2.0
-DEFAULT: true
---DESCRIPTION--
-<p>
-    Whether or not to normalize newlines to the operating
-    system default.  When <code>false</code>, HTML Purifier
-    will attempt to preserve mixed newline files.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt
deleted file mode 100644
index 4070c2a0de..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Core.RemoveInvalidImg
-TYPE: bool
-DEFAULT: true
-VERSION: 1.3.0
---DESCRIPTION--
-
-<p>
-  This directive enables pre-emptive URI checking in <code>img</code>
-  tags, as the attribute validation strategy is not authorized to
-  remove elements from the document. Revert to pre-1.3.0 behavior by setting to false.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveProcessingInstructions.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveProcessingInstructions.txt
deleted file mode 100644
index 3397d9f71f..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveProcessingInstructions.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Core.RemoveProcessingInstructions
-TYPE: bool
-VERSION: 4.2.0
-DEFAULT: false
---DESCRIPTION--
-Instead of escaping processing instructions in the form <code>&lt;? ...
-?&gt;</code>, remove it out-right.  This may be useful if the HTML
-you are validating contains XML processing instruction gunk, however,
-it can also be user-unfriendly for people attempting to post PHP
-snippets.
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt
deleted file mode 100644
index a4cd966df8..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Core.RemoveScriptContents
-TYPE: bool/null
-DEFAULT: NULL
-VERSION: 2.0.0
-DEPRECATED-VERSION: 2.1.0
-DEPRECATED-USE: Core.HiddenElements
---DESCRIPTION--
-<p>
-  This directive enables HTML Purifier to remove not only script tags
-  but all of their contents.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt
deleted file mode 100644
index 3db50ef204..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Filter.Custom
-TYPE: list
-VERSION: 3.1.0
-DEFAULT: array()
---DESCRIPTION--
-<p>
-  This directive can be used to add custom filters; it is nearly the
-  equivalent of the now deprecated <code>HTMLPurifier-&gt;addFilter()</code>
-  method. Specify an array of concrete implementations.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt
deleted file mode 100644
index 16829bcda0..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Filter.ExtractStyleBlocks.Escaping
-TYPE: bool
-VERSION: 3.0.0
-DEFAULT: true
-ALIASES: Filter.ExtractStyleBlocksEscaping, FilterParam.ExtractStyleBlocksEscaping
---DESCRIPTION--
-
-<p>
-  Whether or not to escape the dangerous characters &lt;, &gt; and &amp;
-  as \3C, \3E and \26, respectively. This is can be safely set to false
-  if the contents of StyleBlocks will be placed in an external stylesheet,
-  where there is no risk of it being interpreted as HTML.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt
deleted file mode 100644
index 7f95f54d12..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-Filter.ExtractStyleBlocks.Scope
-TYPE: string/null
-VERSION: 3.0.0
-DEFAULT: NULL
-ALIASES: Filter.ExtractStyleBlocksScope, FilterParam.ExtractStyleBlocksScope
---DESCRIPTION--
-
-<p>
-  If you would like users to be able to define external stylesheets, but
-  only allow them to specify CSS declarations for a specific node and
-  prevent them from fiddling with other elements, use this directive.
-  It accepts any valid CSS selector, and will prepend this to any
-  CSS declaration extracted from the document. For example, if this
-  directive is set to <code>#user-content</code> and a user uses the
-  selector <code>a:hover</code>, the final selector will be
-  <code>#user-content a:hover</code>.
-</p>
-<p>
-  The comma shorthand may be used; consider the above example, with
-  <code>#user-content, #user-content2</code>, the final selector will
-  be <code>#user-content a:hover, #user-content2 a:hover</code>.
-</p>
-<p>
-  <strong>Warning:</strong> It is possible for users to bypass this measure
-  using a naughty + selector. This is a bug in CSS Tidy 1.3, not HTML
-  Purifier, and I am working to get it fixed. Until then, HTML Purifier
-  performs a basic check to prevent this.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt
deleted file mode 100644
index 6c231b2d7f..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Filter.ExtractStyleBlocks.TidyImpl
-TYPE: mixed/null
-VERSION: 3.1.0
-DEFAULT: NULL
-ALIASES: FilterParam.ExtractStyleBlocksTidyImpl
---DESCRIPTION--
-<p>
-  If left NULL, HTML Purifier will attempt to instantiate a <code>csstidy</code>
-  class to use for internal cleaning. This will usually be good enough.
-</p>
-<p>
-  However, for trusted user input, you can set this to <code>false</code> to
-  disable cleaning. In addition, you can supply your own concrete implementation
-  of Tidy's interface to use, although I don't know why you'd want to do that.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt
deleted file mode 100644
index 078d087417..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-Filter.ExtractStyleBlocks
-TYPE: bool
-VERSION: 3.1.0
-DEFAULT: false
-EXTERNAL: CSSTidy
---DESCRIPTION--
-<p>
-  This directive turns on the style block extraction filter, which removes
-  <code>style</code> blocks from input HTML, cleans them up with CSSTidy,
-  and places them in the <code>StyleBlocks</code> context variable, for further
-  use by you, usually to be placed in an external stylesheet, or a
-  <code>style</code> block in the <code>head</code> of your document.
-</p>
-<p>
-  Sample usage:
-</p>
-<pre><![CDATA[
-<?php
-    header('Content-type: text/html; charset=utf-8');
-    echo '<?xml version="1.0" encoding="UTF-8"?>';
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-  <title>Filter.ExtractStyleBlocks</title>
-<?php
-    require_once '/path/to/library/HTMLPurifier.auto.php';
-    require_once '/path/to/csstidy.class.php';
-
-    $dirty = '<style>body {color:#F00;}</style> Some text';
-
-    $config = HTMLPurifier_Config::createDefault();
-    $config->set('Filter', 'ExtractStyleBlocks', true);
-    $purifier = new HTMLPurifier($config);
-
-    $html = $purifier->purify($dirty);
-
-    // This implementation writes the stylesheets to the styles/ directory.
-    // You can also echo the styles inside the document, but it's a bit
-    // more difficult to make sure they get interpreted properly by
-    // browsers; try the usual CSS armoring techniques.
-    $styles = $purifier->context->get('StyleBlocks');
-    $dir = 'styles/';
-    if (!is_dir($dir)) mkdir($dir);
-    $hash = sha1($_GET['html']);
-    foreach ($styles as $i => $style) {
-        file_put_contents($name = $dir . $hash . "_$i");
-        echo '<link rel="stylesheet" type="text/css" href="'.$name.'" />';
-    }
-?>
-</head>
-<body>
-  <div>
-    <?php echo $html; ?>
-  </div>
-</b]]><![CDATA[ody>
-</html>
-]]></pre>
-<p>
-  <strong>Warning:</strong> It is possible for a user to mount an
-  imagecrash attack using this CSS. Counter-measures are difficult;
-  it is not simply enough to limit the range of CSS lengths (using
-  relative lengths with many nesting levels allows for large values
-  to be attained without actually specifying them in the stylesheet),
-  and the flexible nature of selectors makes it difficult to selectively
-  disable lengths on image tags (HTML Purifier, however, does disable
-  CSS width and height in inline styling). There are probably two effective
-  counter measures: an explicit width and height set to auto in all
-  images in your document (unlikely) or the disabling of width and
-  height (somewhat reasonable). Whether or not these measures should be
-  used is left to the reader.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt
deleted file mode 100644
index 321eaa2d80..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Filter.YouTube
-TYPE: bool
-VERSION: 3.1.0
-DEFAULT: false
---DESCRIPTION--
-<p>
-  <strong>Warning:</strong> Deprecated in favor of %HTML.SafeObject and
-  %Output.FlashCompat (turn both on to allow YouTube videos and other
-  Flash content).
-</p>
-<p>
-  This directive enables YouTube video embedding in HTML Purifier. Check
-  <a href="http://htmlpurifier.org/docs/enduser-youtube.html">this document
-  on embedding videos</a> for more information on what this filter does.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt
deleted file mode 100644
index 0b2c106da5..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-HTML.Allowed
-TYPE: itext/null
-VERSION: 2.0.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
-    This is a preferred convenience directive that combines
-    %HTML.AllowedElements and %HTML.AllowedAttributes.
-    Specify elements and attributes that are allowed using:
-    <code>element1[attr1|attr2],element2...</code>.  For example,
-    if you would like to only allow paragraphs and links, specify
-    <code>a[href],p</code>.  You can specify attributes that apply
-    to all elements using an asterisk, e.g. <code>*[lang]</code>.
-    You can also use newlines instead of commas to separate elements.
-</p>
-<p>
-    <strong>Warning</strong>:
-    All of the constraints on the component directives are still enforced.
-    The syntax is a <em>subset</em> of TinyMCE's <code>valid_elements</code>
-    whitelist: directly copy-pasting it here will probably result in
-    broken whitelists. If %HTML.AllowedElements or %HTML.AllowedAttributes
-    are set, this directive has no effect.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt
deleted file mode 100644
index fcf093f17d..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-HTML.AllowedAttributes
-TYPE: lookup/null
-VERSION: 1.3.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
-    If HTML Purifier's attribute set is unsatisfactory, overload it!
-    The syntax is "tag.attr" or "*.attr" for the global attributes
-    (style, id, class, dir, lang, xml:lang).
-</p>
-<p>
-    <strong>Warning:</strong> If another directive conflicts with the
-    elements here, <em>that</em> directive will win and override. For
-    example, %HTML.EnableAttrID will take precedence over *.id in this
-    directive.  You must set that directive to true before you can use
-    IDs at all.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedComments.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedComments.txt
deleted file mode 100644
index 140e21423e..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedComments.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-HTML.AllowedComments
-TYPE: lookup
-VERSION: 4.4.0
-DEFAULT: array()
---DESCRIPTION--
-A whitelist which indicates what explicit comment bodies should be
-allowed, modulo leading and trailing whitespace.  See also %HTML.AllowedCommentsRegexp
-(these directives are union'ed together, so a comment is considered
-valid if any directive deems it valid.)
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedCommentsRegexp.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedCommentsRegexp.txt
deleted file mode 100644
index f22e977d43..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedCommentsRegexp.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-HTML.AllowedCommentsRegexp
-TYPE: string/null
-VERSION: 4.4.0
-DEFAULT: NULL
---DESCRIPTION--
-A regexp, which if it matches the body of a comment, indicates that
-it should be allowed. Trailing and leading spaces are removed prior
-to running this regular expression.
-<strong>Warning:</strong> Make sure you specify
-correct anchor metacharacters <code>^regex$</code>, otherwise you may accept
-comments that you did not mean to! In particular, the regex <code>/foo|bar/</code>
-is probably not sufficiently strict, since it also allows <code>foobar</code>.
-See also %HTML.AllowedComments (these directives are union'ed together,
-so a comment is considered valid if any directive deems it valid.)
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt
deleted file mode 100644
index 1d3fa7907d..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-HTML.AllowedElements
-TYPE: lookup/null
-VERSION: 1.3.0
-DEFAULT: NULL
---DESCRIPTION--
-<p>
-    If HTML Purifier's tag set is unsatisfactory for your needs, you can
-    overload it with your own list of tags to allow.  If you change
-    this, you probably also want to change %HTML.AllowedAttributes; see
-    also %HTML.Allowed which lets you set allowed elements and
-    attributes at the same time.
-</p>
-<p>
-    If you attempt to allow an element that HTML Purifier does not know
-    about, HTML Purifier will raise an error.  You will need to manually
-    tell HTML Purifier about this element by using the
-    <a href="http://htmlpurifier.org/docs/enduser-customize.html">advanced customization features.</a>
-</p>
-<p>
-    <strong>Warning:</strong> If another directive conflicts with the
-    elements here, <em>that</em> directive will win and override.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt
deleted file mode 100644
index 5a59a55c08..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-HTML.AllowedModules
-TYPE: lookup/null
-VERSION: 2.0.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
-    A doctype comes with a set of usual modules to use. Without having
-    to mucking about with the doctypes, you can quickly activate or
-    disable these modules by specifying which modules you wish to allow
-    with this directive. This is most useful for unit testing specific
-    modules, although end users may find it useful for their own ends.
-</p>
-<p>
-    If you specify a module that does not exist, the manager will silently
-    fail to use it, so be careful! User-defined modules are not affected
-    by this directive. Modules defined in %HTML.CoreModules are not
-    affected by this directive.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt
deleted file mode 100644
index 151fb7b826..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-HTML.Attr.Name.UseCDATA
-TYPE: bool
-DEFAULT: false
-VERSION: 4.0.0
---DESCRIPTION--
-The W3C specification DTD defines the name attribute to be CDATA, not ID, due
-to limitations of DTD.  In certain documents, this relaxed behavior is desired,
-whether it is to specify duplicate names, or to specify names that would be
-illegal IDs (for example, names that begin with a digit.) Set this configuration
-directive to true to use the relaxed parsing rules.
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt
deleted file mode 100644
index 45ae469ec9..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-HTML.BlockWrapper
-TYPE: string
-VERSION: 1.3.0
-DEFAULT: 'p'
---DESCRIPTION--
-
-<p>
-    String name of element to wrap inline elements that are inside a block
-    context.  This only occurs in the children of blockquote in strict mode.
-</p>
-<p>
-    Example: by default value,
-    <code>&lt;blockquote&gt;Foo&lt;/blockquote&gt;</code> would become
-    <code>&lt;blockquote&gt;&lt;p&gt;Foo&lt;/p&gt;&lt;/blockquote&gt;</code>.
-    The <code>&lt;p&gt;</code> tags can be replaced with whatever you desire,
-    as long as it is a block level element.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt
deleted file mode 100644
index 5246188795..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-HTML.CoreModules
-TYPE: lookup
-VERSION: 2.0.0
---DEFAULT--
-array (
-  'Structure' => true,
-  'Text' => true,
-  'Hypertext' => true,
-  'List' => true,
-  'NonXMLCommonAttributes' => true,
-  'XMLCommonAttributes' => true,
-  'CommonAttributes' => true,
-)
---DESCRIPTION--
-
-<p>
-    Certain modularized doctypes (XHTML, namely), have certain modules
-    that must be included for the doctype to be an conforming document
-    type: put those modules here. By default, XHTML's core modules
-    are used. You can set this to a blank array to disable core module
-    protection, but this is not recommended.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt
deleted file mode 100644
index 6ed70b599f..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-HTML.CustomDoctype
-TYPE: string/null
-VERSION: 2.0.1
-DEFAULT: NULL
---DESCRIPTION--
-
-A custom doctype for power-users who defined their own document
-type. This directive only applies when %HTML.Doctype is blank.
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt
deleted file mode 100644
index 103db754a2..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-HTML.DefinitionID
-TYPE: string/null
-DEFAULT: NULL
-VERSION: 2.0.0
---DESCRIPTION--
-
-<p>
-    Unique identifier for a custom-built HTML definition. If you edit
-    the raw version of the HTMLDefinition, introducing changes that the
-    configuration object does not reflect, you must specify this variable.
-    If you change your custom edits, you should change this directive, or
-    clear your cache. Example:
-</p>
-<pre>
-$config = HTMLPurifier_Config::createDefault();
-$config->set('HTML', 'DefinitionID', '1');
-$def = $config->getHTMLDefinition();
-$def->addAttribute('a', 'tabindex', 'Number');
-</pre>
-<p>
-    In the above example, the configuration is still at the defaults, but
-    using the advanced API, an extra attribute has been added. The
-    configuration object normally has no way of knowing that this change
-    has taken place, so it needs an extra directive: %HTML.DefinitionID.
-    If someone else attempts to use the default configuration, these two
-    pieces of code will not clobber each other in the cache, since one has
-    an extra directive attached to it.
-</p>
-<p>
-    You <em>must</em> specify a value to this directive to use the
-    advanced API features.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt
deleted file mode 100644
index 229ae0267a..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-HTML.DefinitionRev
-TYPE: int
-VERSION: 2.0.0
-DEFAULT: 1
---DESCRIPTION--
-
-<p>
-    Revision identifier for your custom definition specified in
-    %HTML.DefinitionID.  This serves the same purpose: uniquely identifying
-    your custom definition, but this one does so in a chronological
-    context: revision 3 is more up-to-date then revision 2.  Thus, when
-    this gets incremented, the cache handling is smart enough to clean
-    up any older revisions of your definition as well as flush the
-    cache.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt
deleted file mode 100644
index 9dab497f2f..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-HTML.Doctype
-TYPE: string/null
-DEFAULT: NULL
---DESCRIPTION--
-Doctype to use during filtering. Technically speaking this is not actually
-a doctype (as it does not identify a corresponding DTD), but we are using
-this name for sake of simplicity. When non-blank, this will override any
-older directives like %HTML.XHTML or %HTML.Strict.
---ALLOWED--
-'HTML 4.01 Transitional', 'HTML 4.01 Strict', 'XHTML 1.0 Transitional', 'XHTML 1.0 Strict', 'XHTML 1.1'
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.FlashAllowFullScreen.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.FlashAllowFullScreen.txt
deleted file mode 100644
index 7878dc0bf6..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.FlashAllowFullScreen.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-HTML.FlashAllowFullScreen
-TYPE: bool
-VERSION: 4.2.0
-DEFAULT: false
---DESCRIPTION--
-<p>
-    Whether or not to permit embedded Flash content from
-    %HTML.SafeObject to expand to the full screen.  Corresponds to
-    the <code>allowFullScreen</code> parameter.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt
deleted file mode 100644
index 57358f9bad..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-HTML.ForbiddenAttributes
-TYPE: lookup
-VERSION: 3.1.0
-DEFAULT: array()
---DESCRIPTION--
-<p>
-    While this directive is similar to %HTML.AllowedAttributes, for
-    forwards-compatibility with XML, this attribute has a different syntax. Instead of
-    <code>tag.attr</code>, use <code>tag@attr</code>. To disallow <code>href</code>
-    attributes in <code>a</code> tags, set this directive to
-    <code>a@href</code>. You can also disallow an attribute globally with
-    <code>attr</code> or <code>*@attr</code> (either syntax is fine; the latter
-    is provided for consistency with %HTML.AllowedAttributes).
-</p>
-<p>
-    <strong>Warning:</strong> This directive complements %HTML.ForbiddenElements,
-    accordingly, check
-    out that directive for a discussion of why you
-    should think twice before using this directive.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt
deleted file mode 100644
index 93a53e14fb..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-HTML.ForbiddenElements
-TYPE: lookup
-VERSION: 3.1.0
-DEFAULT: array()
---DESCRIPTION--
-<p>
-    This was, perhaps, the most requested feature ever in HTML
-    Purifier. Please don't abuse it! This is the logical inverse of
-    %HTML.AllowedElements, and it will override that directive, or any
-    other directive.
-</p>
-<p>
-    If possible, %HTML.Allowed is recommended over this directive, because it
-    can sometimes be difficult to tell whether or not you've forbidden all of
-    the behavior you would like to disallow. If you forbid <code>img</code>
-    with the expectation of preventing images on your site, you'll be in for
-    a nasty surprise when people start using the <code>background-image</code>
-    CSS property.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Forms.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Forms.txt
deleted file mode 100644
index 4a432d89b7..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Forms.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-HTML.Forms
-TYPE: bool
-VERSION: 4.13.0
-DEFAULT: false
---DESCRIPTION--
-<p>
-    Whether or not to permit form elements in the user input, regardless of
-    %HTML.Trusted value. Please be very careful when using this functionality, as
-    enabling forms in untrusted documents may allow for phishing attacks.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt
deleted file mode 100644
index e424c386ec..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-HTML.MaxImgLength
-TYPE: int/null
-DEFAULT: 1200
-VERSION: 3.1.1
---DESCRIPTION--
-<p>
- This directive controls the maximum number of pixels in the width and
- height attributes in <code>img</code> tags. This is
- in place to prevent imagecrash attacks, disable with null at your own risk.
- This directive is similar to %CSS.MaxImgLength, and both should be
- concurrently edited, although there are
- subtle differences in the input format (the HTML max is an integer).
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Nofollow.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Nofollow.txt
deleted file mode 100644
index 700b30924a..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Nofollow.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-HTML.Nofollow
-TYPE: bool
-VERSION: 4.3.0
-DEFAULT: FALSE
---DESCRIPTION--
-If enabled, nofollow rel attributes are added to all outgoing links.
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt
deleted file mode 100644
index 62e8e160c7..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-HTML.Parent
-TYPE: string
-VERSION: 1.3.0
-DEFAULT: 'div'
---DESCRIPTION--
-
-<p>
-    String name of element that HTML fragment passed to library will be
-    inserted in.  An interesting variation would be using span as the
-    parent element, meaning that only inline tags would be allowed.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt
deleted file mode 100644
index dfb720496d..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-HTML.Proprietary
-TYPE: bool
-VERSION: 3.1.0
-DEFAULT: false
---DESCRIPTION--
-<p>
-    Whether or not to allow proprietary elements and attributes in your
-    documents, as per <code>HTMLPurifier_HTMLModule_Proprietary</code>.
-    <strong>Warning:</strong> This can cause your documents to stop
-    validating!
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt
deleted file mode 100644
index cdda09a4c5..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-HTML.SafeEmbed
-TYPE: bool
-VERSION: 3.1.1
-DEFAULT: false
---DESCRIPTION--
-<p>
-    Whether or not to permit embed tags in documents, with a number of extra
-    security features added to prevent script execution. This is similar to
-    what websites like MySpace do to embed tags. Embed is a proprietary
-    element and will cause your website to stop validating; you should
-    see if you can use %Output.FlashCompat with %HTML.SafeObject instead
-    first.</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeIframe.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeIframe.txt
deleted file mode 100644
index 5eb6ec2b5a..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeIframe.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-HTML.SafeIframe
-TYPE: bool
-VERSION: 4.4.0
-DEFAULT: false
---DESCRIPTION--
-<p>
-    Whether or not to permit iframe tags in untrusted documents.  This
-    directive must be accompanied by a whitelist of permitted iframes,
-    such as %URI.SafeIframeRegexp, otherwise it will fatally error.
-    This directive has no effect on strict doctypes, as iframes are not
-    valid.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt
deleted file mode 100644
index ceb342e22b..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-HTML.SafeObject
-TYPE: bool
-VERSION: 3.1.1
-DEFAULT: false
---DESCRIPTION--
-<p>
-    Whether or not to permit object tags in documents, with a number of extra
-    security features added to prevent script execution. This is similar to
-    what websites like MySpace do to object tags.  You should also enable
-    %Output.FlashCompat in order to generate Internet Explorer
-    compatibility code for your object tags.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeScripting.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeScripting.txt
deleted file mode 100644
index 5ebc7a19d5..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeScripting.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-HTML.SafeScripting
-TYPE: lookup
-VERSION: 4.5.0
-DEFAULT: array()
---DESCRIPTION--
-<p>
-    Whether or not to permit script tags to external scripts in documents.
-    Inline scripting is not allowed, and the script must match an explicit whitelist.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt
deleted file mode 100644
index a8b1de56be..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-HTML.Strict
-TYPE: bool
-VERSION: 1.3.0
-DEFAULT: false
-DEPRECATED-VERSION: 1.7.0
-DEPRECATED-USE: HTML.Doctype
---DESCRIPTION--
-Determines whether or not to use Transitional (loose) or Strict rulesets.
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TargetBlank.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TargetBlank.txt
deleted file mode 100644
index 587a16778b..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TargetBlank.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-HTML.TargetBlank
-TYPE: bool
-VERSION: 4.4.0
-DEFAULT: FALSE
---DESCRIPTION--
-If enabled, <code>target=blank</code> attributes are added to all outgoing links.
-(This includes links from an HTTPS version of a page to an HTTP version.)
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TargetNoopener.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TargetNoopener.txt
deleted file mode 100644
index dd514c0def..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TargetNoopener.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---# vim: et sw=4 sts=4
-HTML.TargetNoopener
-TYPE: bool
-VERSION: 4.8.0
-DEFAULT: TRUE
---DESCRIPTION--
-If enabled, noopener rel attributes are added to links which have
-a target attribute associated with them.  This prevents malicious
-destinations from overwriting the original window.
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TargetNoreferrer.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TargetNoreferrer.txt
deleted file mode 100644
index cb5a0b0e5e..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TargetNoreferrer.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-HTML.TargetNoreferrer
-TYPE: bool
-VERSION: 4.8.0
-DEFAULT: TRUE
---DESCRIPTION--
-If enabled, noreferrer rel attributes are added to links which have
-a target attribute associated with them.  This prevents malicious
-destinations from overwriting the original window.
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt
deleted file mode 100644
index b4c271b7fa..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-HTML.TidyAdd
-TYPE: lookup
-VERSION: 2.0.0
-DEFAULT: array()
---DESCRIPTION--
-
-Fixes to add to the default set of Tidy fixes as per your level.
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt
deleted file mode 100644
index 4186ccd0d1..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-HTML.TidyLevel
-TYPE: string
-VERSION: 2.0.0
-DEFAULT: 'medium'
---DESCRIPTION--
-
-<p>General level of cleanliness the Tidy module should enforce.
-There are four allowed values:</p>
-<dl>
-    <dt>none</dt>
-    <dd>No extra tidying should be done</dd>
-    <dt>light</dt>
-    <dd>Only fix elements that would be discarded otherwise due to
-    lack of support in doctype</dd>
-    <dt>medium</dt>
-    <dd>Enforce best practices</dd>
-    <dt>heavy</dt>
-    <dd>Transform all deprecated elements and attributes to standards
-    compliant equivalents</dd>
-</dl>
-
---ALLOWED--
-'none', 'light', 'medium', 'heavy'
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt
deleted file mode 100644
index 996762bd1d..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-HTML.TidyRemove
-TYPE: lookup
-VERSION: 2.0.0
-DEFAULT: array()
---DESCRIPTION--
-
-Fixes to remove from the default set of Tidy fixes as per your level.
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt
deleted file mode 100644
index 1db9237e9e..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-HTML.Trusted
-TYPE: bool
-VERSION: 2.0.0
-DEFAULT: false
---DESCRIPTION--
-Indicates whether or not the user input is trusted or not. If the input is
-trusted, a more expansive set of allowed tags and attributes will be used.
-See also %CSS.Trusted.
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt
deleted file mode 100644
index 2a47e384f4..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-HTML.XHTML
-TYPE: bool
-DEFAULT: true
-VERSION: 1.1.0
-DEPRECATED-VERSION: 1.7.0
-DEPRECATED-USE: HTML.Doctype
---DESCRIPTION--
-Determines whether or not output is XHTML 1.0 or HTML 4.01 flavor.
---ALIASES--
-Core.XHTML
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt
deleted file mode 100644
index 08921fde70..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Output.CommentScriptContents
-TYPE: bool
-VERSION: 2.0.0
-DEFAULT: true
---DESCRIPTION--
-Determines whether or not HTML Purifier should attempt to fix up the
-contents of script tags for legacy browsers with comments.
---ALIASES--
-Core.CommentScriptContents
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.FixInnerHTML.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.FixInnerHTML.txt
deleted file mode 100644
index d6f0d9f295..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.FixInnerHTML.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Output.FixInnerHTML
-TYPE: bool
-VERSION: 4.3.0
-DEFAULT: true
---DESCRIPTION--
-<p>
-  If true, HTML Purifier will protect against Internet Explorer's
-  mishandling of the <code>innerHTML</code> attribute by appending
-  a space to any attribute that does not contain angled brackets, spaces
-  or quotes, but contains a backtick.  This slightly changes the
-  semantics of any given attribute, so if this is unacceptable and
-  you do not use <code>innerHTML</code> on any of your pages, you can
-  turn this directive off.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt
deleted file mode 100644
index 93398e8598..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Output.FlashCompat
-TYPE: bool
-VERSION: 4.1.0
-DEFAULT: false
---DESCRIPTION--
-<p>
-  If true, HTML Purifier will generate Internet Explorer compatibility
-  code for all object code.  This is highly recommended if you enable
-  %HTML.SafeObject.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt
deleted file mode 100644
index 79f8ad82cf..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Output.Newline
-TYPE: string/null
-VERSION: 2.0.1
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
-    Newline string to format final output with. If left null, HTML Purifier
-    will auto-detect the default newline type of the system and use that;
-    you can manually override it here. Remember, \r\n is Windows, \r
-    is Mac, and \n is Unix.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt
deleted file mode 100644
index 232b02362a..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Output.SortAttr
-TYPE: bool
-VERSION: 3.2.0
-DEFAULT: false
---DESCRIPTION--
-<p>
-  If true, HTML Purifier will sort attributes by name before writing them back
-  to the document, converting a tag like: <code>&lt;el b="" a="" c="" /&gt;</code>
-  to <code>&lt;el a="" b="" c="" /&gt;</code>. This is a workaround for
-  a bug in FCKeditor which causes it to swap attributes order, adding noise
-  to text diffs. If you're not seeing this bug, chances are, you don't need
-  this directive.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt
deleted file mode 100644
index 06bab00a0a..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Output.TidyFormat
-TYPE: bool
-VERSION: 1.1.1
-DEFAULT: false
---DESCRIPTION--
-<p>
-    Determines whether or not to run Tidy on the final output for pretty
-    formatting reasons, such as indentation and wrap.
-</p>
-<p>
-    This can greatly improve readability for editors who are hand-editing
-    the HTML, but is by no means necessary as HTML Purifier has already
-    fixed all major errors the HTML may have had. Tidy is a non-default
-    extension, and this directive will silently fail if Tidy is not
-    available.
-</p>
-<p>
-    If you are looking to make the overall look of your page's source
-    better, I recommend running Tidy on the entire page rather than just
-    user-content (after all, the indentation relative to the containing
-    blocks will be incorrect).
-</p>
---ALIASES--
-Core.TidyFormat
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt
deleted file mode 100644
index 071bc0295d..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Test.ForceNoIconv
-TYPE: bool
-DEFAULT: false
---DESCRIPTION--
-When set to true, HTMLPurifier_Encoder will act as if iconv does not exist
-and use only pure PHP implementations.
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt
deleted file mode 100644
index eb97307e20..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-URI.AllowedSchemes
-TYPE: lookup
---DEFAULT--
-array (
-  'http' => true,
-  'https' => true,
-  'mailto' => true,
-  'ftp' => true,
-  'nntp' => true,
-  'news' => true,
-  'tel' => true,
-)
---DESCRIPTION--
-Whitelist that defines the schemes that a URI is allowed to have.  This
-prevents XSS attacks from using pseudo-schemes like javascript or mocha.
-There is also support for the <code>data</code> and <code>file</code>
-URI schemes, but they are not enabled by default.
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Base.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Base.txt
deleted file mode 100644
index 876f0680cf..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Base.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-URI.Base
-TYPE: string/null
-VERSION: 2.1.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
-    The base URI is the URI of the document this purified HTML will be
-    inserted into.  This information is important if HTML Purifier needs
-    to calculate absolute URIs from relative URIs, such as when %URI.MakeAbsolute
-    is on.  You may use a non-absolute URI for this value, but behavior
-    may vary (%URI.MakeAbsolute deals nicely with both absolute and
-    relative paths, but forwards-compatibility is not guaranteed).
-    <strong>Warning:</strong> If set, the scheme on this URI
-    overrides the one specified by %URI.DefaultScheme.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt
deleted file mode 100644
index 834bc08c0b..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-URI.DefaultScheme
-TYPE: string/null
-DEFAULT: 'http'
---DESCRIPTION--
-
-<p>
-    Defines through what scheme the output will be served, in order to
-    select the proper object validator when no scheme information is present.
-</p>
-
-<p>
-    Starting with HTML Purifier 4.9.0, the default scheme can be null, in
-    which case we reject all URIs which do not have explicit schemes.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt
deleted file mode 100644
index f05312ba86..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-URI.DefinitionID
-TYPE: string/null
-VERSION: 2.1.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
-    Unique identifier for a custom-built URI definition. If you  want
-    to add custom URIFilters, you must specify this value.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt
deleted file mode 100644
index 80cfea93f7..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-URI.DefinitionRev
-TYPE: int
-VERSION: 2.1.0
-DEFAULT: 1
---DESCRIPTION--
-
-<p>
-    Revision identifier for your custom definition. See
-    %HTML.DefinitionRev for details.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt
deleted file mode 100644
index 71ce025a2d..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-URI.Disable
-TYPE: bool
-VERSION: 1.3.0
-DEFAULT: false
---DESCRIPTION--
-
-<p>
-    Disables all URIs in all forms. Not sure why you'd want to do that
-    (after all, the Internet's founded on the notion of a hyperlink).
-</p>
-
---ALIASES--
-Attr.DisableURI
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt
deleted file mode 100644
index 13c122c8ce..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-URI.DisableExternal
-TYPE: bool
-VERSION: 1.2.0
-DEFAULT: false
---DESCRIPTION--
-Disables links to external websites.  This is a highly effective anti-spam
-and anti-pagerank-leech measure, but comes at a hefty price: nolinks or
-images outside of your domain will be allowed.  Non-linkified URIs will
-still be preserved.  If you want to be able to link to subdomains or use
-absolute URIs, specify %URI.Host for your website.
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt
deleted file mode 100644
index abcc1efd61..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-URI.DisableExternalResources
-TYPE: bool
-VERSION: 1.3.0
-DEFAULT: false
---DESCRIPTION--
-Disables the embedding of external resources, preventing users from
-embedding things like images from other hosts. This prevents access
-tracking (good for email viewers), bandwidth leeching, cross-site request
-forging, goatse.cx posting, and other nasties, but also results in a loss
-of end-user functionality (they can't directly post a pic they posted from
-Flickr anymore). Use it if you don't have a robust user-content moderation
-team.
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt
deleted file mode 100644
index f891de4996..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-URI.DisableResources
-TYPE: bool
-VERSION: 4.2.0
-DEFAULT: false
---DESCRIPTION--
-<p>
-    Disables embedding resources, essentially meaning no pictures. You can
-    still link to them though. See %URI.DisableExternalResources for why
-    this might be a good idea.
-</p>
-<p>
-    <em>Note:</em> While this directive has been available since 1.3.0,
-    it didn't actually start doing anything until 4.2.0.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Host.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Host.txt
deleted file mode 100644
index ee83b121de..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Host.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-URI.Host
-TYPE: string/null
-VERSION: 1.2.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
-    Defines the domain name of the server, so we can determine whether or
-    an absolute URI is from your website or not.  Not strictly necessary,
-    as users should be using relative URIs to reference resources on your
-    website.  It will, however, let you use absolute URIs to link to
-    subdomains of the domain you post here: i.e. example.com will allow
-    sub.example.com.  However, higher up domains will still be excluded:
-    if you set %URI.Host to sub.example.com, example.com will be blocked.
-    <strong>Note:</strong> This directive overrides %URI.Base because
-    a given page may be on a sub-domain, but you wish HTML Purifier to be
-    more relaxed and allow some of the parent domains too.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt
deleted file mode 100644
index 0b6df7625d..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-URI.HostBlacklist
-TYPE: list
-VERSION: 1.3.0
-DEFAULT: array()
---DESCRIPTION--
-List of strings that are forbidden in the host of any URI. Use it to kill
-domain names of spam, etc. Note that it will catch anything in the domain,
-so <tt>moo.com</tt> will catch <tt>moo.com.example.com</tt>.
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt
deleted file mode 100644
index 4214900a59..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-URI.MakeAbsolute
-TYPE: bool
-VERSION: 2.1.0
-DEFAULT: false
---DESCRIPTION--
-
-<p>
-    Converts all URIs into absolute forms. This is useful when the HTML
-    being filtered assumes a specific base path, but will actually be
-    viewed in a different context (and setting an alternate base URI is
-    not possible). %URI.Base must be set for this directive to work.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt
deleted file mode 100644
index 58c81dcc44..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-URI.Munge
-TYPE: string/null
-VERSION: 1.3.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
-    Munges all browsable (usually http, https and ftp)
-    absolute URIs into another URI, usually a URI redirection service.
-    This directive accepts a URI, formatted with a <code>%s</code> where
-    the url-encoded original URI should be inserted (sample:
-    <code>http://www.google.com/url?q=%s</code>).
-</p>
-<p>
-    Uses for this directive:
-</p>
-<ul>
-    <li>
-        Prevent PageRank leaks, while being fairly transparent
-        to users (you may also want to add some client side JavaScript to
-        override the text in the statusbar). <strong>Notice</strong>:
-        Many security experts believe that this form of protection does not deter spam-bots.
-    </li>
-    <li>
-        Redirect users to a splash page telling them they are leaving your
-        website. While this is poor usability practice, it is often mandated
-        in corporate environments.
-    </li>
-</ul>
-<p>
-    Prior to HTML Purifier 3.1.1, this directive also enabled the munging
-    of browsable external resources, which could break things if your redirection
-    script was a splash page or used <code>meta</code> tags. To revert to
-    previous behavior, please use %URI.MungeResources.
-</p>
-<p>
-    You may want to also use %URI.MungeSecretKey along with this directive
-    in order to enforce what URIs your redirector script allows. Open
-    redirector scripts can be a security risk and negatively affect the
-    reputation of your domain name.
-</p>
-<p>
-    Starting with HTML Purifier 3.1.1, there is also these substitutions:
-</p>
-<table>
-    <thead>
-        <tr>
-            <th>Key</th>
-            <th>Description</th>
-            <th>Example <code>&lt;a href=""&gt;</code></th>
-        </tr>
-    </thead>
-    <tbody>
-        <tr>
-            <td>%r</td>
-            <td>1 - The URI embeds a resource<br />(blank) - The URI is merely a link</td>
-            <td></td>
-        </tr>
-        <tr>
-            <td>%n</td>
-            <td>The name of the tag this URI came from</td>
-            <td>a</td>
-        </tr>
-        <tr>
-            <td>%m</td>
-            <td>The name of the attribute this URI came from</td>
-            <td>href</td>
-        </tr>
-        <tr>
-            <td>%p</td>
-            <td>The name of the CSS property this URI came from, or blank if irrelevant</td>
-            <td></td>
-        </tr>
-    </tbody>
-</table>
-<p>
-    Admittedly, these letters are somewhat arbitrary; the only stipulation
-    was that they couldn't be a through f. r is for resource (I would have preferred
-    e, but you take what you can get), n is for name, m
-    was picked because it came after n (and I couldn't use a), p is for
-    property.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt
deleted file mode 100644
index 6fce0fdc37..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-URI.MungeResources
-TYPE: bool
-VERSION: 3.1.1
-DEFAULT: false
---DESCRIPTION--
-<p>
-    If true, any URI munging directives like %URI.Munge
-    will also apply to embedded resources, such as <code>&lt;img src=""&gt;</code>.
-    Be careful enabling this directive if you have a redirector script
-    that does not use the <code>Location</code> HTTP header; all of your images
-    and other embedded resources will break.
-</p>
-<p>
-    <strong>Warning:</strong> It is strongly advised you use this in conjunction
-    %URI.MungeSecretKey to mitigate the security risk of an open redirector.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt
deleted file mode 100644
index 1e17c1d461..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-URI.MungeSecretKey
-TYPE: string/null
-VERSION: 3.1.1
-DEFAULT: NULL
---DESCRIPTION--
-<p>
-    This directive enables secure checksum generation along with %URI.Munge.
-    It should be set to a secure key that is not shared with anyone else.
-    The checksum can be placed in the URI using %t. Use of this checksum
-    affords an additional level of protection by allowing a redirector
-    to check if a URI has passed through HTML Purifier with this line:
-</p>
-
-<pre>$checksum === hash_hmac("sha256", $url, $secret_key)</pre>
-
-<p>
-    If the output is TRUE, the redirector script should accept the URI.
-</p>
-
-<p>
-    Please note that it would still be possible for an attacker to procure
-    secure hashes en-mass by abusing your website's Preview feature or the
-    like, but this service affords an additional level of protection
-    that should be combined with website blacklisting.
-</p>
-
-<p>
-    Remember this has no effect if %URI.Munge is not on.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt
deleted file mode 100644
index 23331a4e79..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-URI.OverrideAllowedSchemes
-TYPE: bool
-DEFAULT: true
---DESCRIPTION--
-If this is set to true (which it is by default), you can override
-%URI.AllowedSchemes by simply registering a HTMLPurifier_URIScheme to the
-registry.  If false, you will also have to update that directive in order
-to add more schemes.
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.SafeIframeRegexp.txt b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.SafeIframeRegexp.txt
deleted file mode 100644
index 79084832be..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.SafeIframeRegexp.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-URI.SafeIframeRegexp
-TYPE: string/null
-VERSION: 4.4.0
-DEFAULT: NULL
---DESCRIPTION--
-<p>
-    A PCRE regular expression that will be matched against an iframe URI.  This is
-    a relatively inflexible scheme, but works well enough for the most common
-    use-case of iframes: embedded video.  This directive only has an effect if
-    %HTML.SafeIframe is enabled.  Here are some example values:
-</p>
-<ul>
-    <li><code>%^http://www.youtube.com/embed/%</code> - Allow YouTube videos</li>
-    <li><code>%^http://player.vimeo.com/video/%</code> - Allow Vimeo videos</li>
-    <li><code>%^http://(www.youtube.com/embed/|player.vimeo.com/video/)%</code> - Allow both</li>
-</ul>
-<p>
-    Note that this directive does not give you enough granularity to, say, disable
-    all <code>autoplay</code> videos.  Pipe up on the HTML Purifier forums if this
-    is a capability you want.
-</p>
---# vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/info.ini b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/info.ini
deleted file mode 100644
index 5de4505e1b..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/info.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-name = "HTML Purifier"
-
-; vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ContentSets.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ContentSets.php
deleted file mode 100644
index 543e3f8f11..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ContentSets.php
+++ /dev/null
@@ -1,170 +0,0 @@
-<?php
-
-/**
- * @todo Unit test
- */
-class HTMLPurifier_ContentSets
-{
-
-    /**
-     * List of content set strings (pipe separators) indexed by name.
-     * @type array
-     */
-    public $info = array();
-
-    /**
-     * List of content set lookups (element => true) indexed by name.
-     * @type array
-     * @note This is in HTMLPurifier_HTMLDefinition->info_content_sets
-     */
-    public $lookup = array();
-
-    /**
-     * Synchronized list of defined content sets (keys of info).
-     * @type array
-     */
-    protected $keys = array();
-    /**
-     * Synchronized list of defined content values (values of info).
-     * @type array
-     */
-    protected $values = array();
-
-    /**
-     * Merges in module's content sets, expands identifiers in the content
-     * sets and populates the keys, values and lookup member variables.
-     * @param HTMLPurifier_HTMLModule[] $modules List of HTMLPurifier_HTMLModule
-     */
-    public function __construct($modules)
-    {
-        if (!is_array($modules)) {
-            $modules = array($modules);
-        }
-        // populate content_sets based on module hints
-        // sorry, no way of overloading
-        foreach ($modules as $module) {
-            foreach ($module->content_sets as $key => $value) {
-                $temp = $this->convertToLookup($value);
-                if (isset($this->lookup[$key])) {
-                    // add it into the existing content set
-                    $this->lookup[$key] = array_merge($this->lookup[$key], $temp);
-                } else {
-                    $this->lookup[$key] = $temp;
-                }
-            }
-        }
-        $old_lookup = false;
-        while ($old_lookup !== $this->lookup) {
-            $old_lookup = $this->lookup;
-            foreach ($this->lookup as $i => $set) {
-                $add = array();
-                foreach ($set as $element => $x) {
-                    if (isset($this->lookup[$element])) {
-                        $add += $this->lookup[$element];
-                        unset($this->lookup[$i][$element]);
-                    }
-                }
-                $this->lookup[$i] += $add;
-            }
-        }
-
-        foreach ($this->lookup as $key => $lookup) {
-            $this->info[$key] = implode(' | ', array_keys($lookup));
-        }
-        $this->keys   = array_keys($this->info);
-        $this->values = array_values($this->info);
-    }
-
-    /**
-     * Accepts a definition; generates and assigns a ChildDef for it
-     * @param HTMLPurifier_ElementDef $def HTMLPurifier_ElementDef reference
-     * @param HTMLPurifier_HTMLModule $module Module that defined the ElementDef
-     */
-    public function generateChildDef(&$def, $module)
-    {
-        if (!empty($def->child)) { // already done!
-            return;
-        }
-        $content_model = $def->content_model;
-        if (is_string($content_model)) {
-            // Assume that $this->keys is alphanumeric
-            $def->content_model = preg_replace_callback(
-                '/\b(' . implode('|', $this->keys) . ')\b/',
-                array($this, 'generateChildDefCallback'),
-                $content_model
-            );
-            //$def->content_model = str_replace(
-            //    $this->keys, $this->values, $content_model);
-        }
-        $def->child = $this->getChildDef($def, $module);
-    }
-
-    public function generateChildDefCallback($matches)
-    {
-        return $this->info[$matches[0]];
-    }
-
-    /**
-     * Instantiates a ChildDef based on content_model and content_model_type
-     * member variables in HTMLPurifier_ElementDef
-     * @note This will also defer to modules for custom HTMLPurifier_ChildDef
-     *       subclasses that need content set expansion
-     * @param HTMLPurifier_ElementDef $def HTMLPurifier_ElementDef to have ChildDef extracted
-     * @param HTMLPurifier_HTMLModule $module Module that defined the ElementDef
-     * @return HTMLPurifier_ChildDef corresponding to ElementDef
-     */
-    public function getChildDef($def, $module)
-    {
-        $value = $def->content_model;
-        if (is_object($value)) {
-            trigger_error(
-                'Literal object child definitions should be stored in '.
-                'ElementDef->child not ElementDef->content_model',
-                E_USER_NOTICE
-            );
-            return $value;
-        }
-        switch ($def->content_model_type) {
-            case 'required':
-                return new HTMLPurifier_ChildDef_Required($value);
-            case 'optional':
-                return new HTMLPurifier_ChildDef_Optional($value);
-            case 'empty':
-                return new HTMLPurifier_ChildDef_Empty();
-            case 'custom':
-                return new HTMLPurifier_ChildDef_Custom($value);
-        }
-        // defer to its module
-        $return = false;
-        if ($module->defines_child_def) { // save a func call
-            $return = $module->getChildDef($def);
-        }
-        if ($return !== false) {
-            return $return;
-        }
-        // error-out
-        trigger_error(
-            'Could not determine which ChildDef class to instantiate',
-            E_USER_ERROR
-        );
-        return false;
-    }
-
-    /**
-     * Converts a string list of elements separated by pipes into
-     * a lookup array.
-     * @param string $string List of elements
-     * @return array Lookup array of elements
-     */
-    protected function convertToLookup($string)
-    {
-        $array = explode('|', str_replace(' ', '', $string));
-        $ret = array();
-        foreach ($array as $k) {
-            $ret[$k] = true;
-        }
-        return $ret;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Context.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Context.php
deleted file mode 100644
index 00e509c85c..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Context.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-
-/**
- * Registry object that contains information about the current context.
- * @warning Is a bit buggy when variables are set to null: it thinks
- *          they don't exist! So use false instead, please.
- * @note Since the variables Context deals with may not be objects,
- *       references are very important here! Do not remove!
- */
-class HTMLPurifier_Context
-{
-
-    /**
-     * Private array that stores the references.
-     * @type array
-     */
-    private $_storage = array();
-
-    /**
-     * Registers a variable into the context.
-     * @param string $name String name
-     * @param mixed $ref Reference to variable to be registered
-     */
-    public function register($name, &$ref)
-    {
-        if (array_key_exists($name, $this->_storage)) {
-            trigger_error(
-                "Name $name produces collision, cannot re-register",
-                E_USER_ERROR
-            );
-            return;
-        }
-        $this->_storage[$name] =& $ref;
-    }
-
-    /**
-     * Retrieves a variable reference from the context.
-     * @param string $name String name
-     * @param bool $ignore_error Boolean whether or not to ignore error
-     * @return mixed
-     */
-    public function &get($name, $ignore_error = false)
-    {
-        if (!array_key_exists($name, $this->_storage)) {
-            if (!$ignore_error) {
-                trigger_error(
-                    "Attempted to retrieve non-existent variable $name",
-                    E_USER_ERROR
-                );
-            }
-            $var = null; // so we can return by reference
-            return $var;
-        }
-        return $this->_storage[$name];
-    }
-
-    /**
-     * Destroys a variable in the context.
-     * @param string $name String name
-     */
-    public function destroy($name)
-    {
-        if (!array_key_exists($name, $this->_storage)) {
-            trigger_error(
-                "Attempted to destroy non-existent variable $name",
-                E_USER_ERROR
-            );
-            return;
-        }
-        unset($this->_storage[$name]);
-    }
-
-    /**
-     * Checks whether or not the variable exists.
-     * @param string $name String name
-     * @return bool
-     */
-    public function exists($name)
-    {
-        return array_key_exists($name, $this->_storage);
-    }
-
-    /**
-     * Loads a series of variables from an associative array
-     * @param array $context_array Assoc array of variables to load
-     */
-    public function loadArray($context_array)
-    {
-        foreach ($context_array as $key => $discard) {
-            $this->register($key, $context_array[$key]);
-        }
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Definition.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Definition.php
deleted file mode 100644
index bc6d433647..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Definition.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/**
- * Super-class for definition datatype objects, implements serialization
- * functions for the class.
- */
-abstract class HTMLPurifier_Definition
-{
-
-    /**
-     * Has setup() been called yet?
-     * @type bool
-     */
-    public $setup = false;
-
-    /**
-     * If true, write out the final definition object to the cache after
-     * setup.  This will be true only if all invocations to get a raw
-     * definition object are also optimized.  This does not cause file
-     * system thrashing because on subsequent calls the cached object
-     * is used and any writes to the raw definition object are short
-     * circuited.  See enduser-customize.html for the high-level
-     * picture.
-     * @type bool
-     */
-    public $optimized = null;
-
-    /**
-     * What type of definition is it?
-     * @type string
-     */
-    public $type;
-
-    /**
-     * Sets up the definition object into the final form, something
-     * not done by the constructor
-     * @param HTMLPurifier_Config $config
-     */
-    abstract protected function doSetup($config);
-
-    /**
-     * Setup function that aborts if already setup
-     * @param HTMLPurifier_Config $config
-     */
-    public function setup($config)
-    {
-        if ($this->setup) {
-            return;
-        }
-        $this->setup = true;
-        $this->doSetup($config);
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache.php
deleted file mode 100644
index 9aa8ff354f..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-
-/**
- * Abstract class representing Definition cache managers that implements
- * useful common methods and is a factory.
- * @todo Create a separate maintenance file advanced users can use to
- *       cache their custom HTMLDefinition, which can be loaded
- *       via a configuration directive
- * @todo Implement memcached
- */
-abstract class HTMLPurifier_DefinitionCache
-{
-    /**
-     * @type string
-     */
-    public $type;
-
-    /**
-     * @param string $type Type of definition objects this instance of the
-     *      cache will handle.
-     */
-    public function __construct($type)
-    {
-        $this->type = $type;
-    }
-
-    /**
-     * Generates a unique identifier for a particular configuration
-     * @param HTMLPurifier_Config $config Instance of HTMLPurifier_Config
-     * @return string
-     */
-    public function generateKey($config)
-    {
-        return $config->version . ',' . // possibly replace with function calls
-               $config->getBatchSerial($this->type) . ',' .
-               $config->get($this->type . '.DefinitionRev');
-    }
-
-    /**
-     * Tests whether or not a key is old with respect to the configuration's
-     * version and revision number.
-     * @param string $key Key to test
-     * @param HTMLPurifier_Config $config Instance of HTMLPurifier_Config to test against
-     * @return bool
-     */
-    public function isOld($key, $config)
-    {
-        if (substr_count($key, ',') < 2) {
-            return true;
-        }
-        list($version, $hash, $revision) = explode(',', $key, 3);
-        $compare = version_compare($version, $config->version);
-        // version mismatch, is always old
-        if ($compare != 0) {
-            return true;
-        }
-        // versions match, ids match, check revision number
-        if ($hash == $config->getBatchSerial($this->type) &&
-            $revision < $config->get($this->type . '.DefinitionRev')) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Checks if a definition's type jives with the cache's type
-     * @note Throws an error on failure
-     * @param HTMLPurifier_Definition $def Definition object to check
-     * @return bool true if good, false if not
-     */
-    public function checkDefType($def)
-    {
-        if ($def->type !== $this->type) {
-            trigger_error("Cannot use definition of type {$def->type} in cache for {$this->type}");
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Adds a definition object to the cache
-     * @param HTMLPurifier_Definition $def
-     * @param HTMLPurifier_Config $config
-     */
-    abstract public function add($def, $config);
-
-    /**
-     * Unconditionally saves a definition object to the cache
-     * @param HTMLPurifier_Definition $def
-     * @param HTMLPurifier_Config $config
-     */
-    abstract public function set($def, $config);
-
-    /**
-     * Replace an object in the cache
-     * @param HTMLPurifier_Definition $def
-     * @param HTMLPurifier_Config $config
-     */
-    abstract public function replace($def, $config);
-
-    /**
-     * Retrieves a definition object from the cache
-     * @param HTMLPurifier_Config $config
-     */
-    abstract public function get($config);
-
-    /**
-     * Removes a definition object to the cache
-     * @param HTMLPurifier_Config $config
-     */
-    abstract public function remove($config);
-
-    /**
-     * Clears all objects from cache
-     * @param HTMLPurifier_Config $config
-     */
-    abstract public function flush($config);
-
-    /**
-     * Clears all expired (older version or revision) objects from cache
-     * @note Be careful implementing this method as flush. Flush must
-     *       not interfere with other Definition types, and cleanup()
-     *       should not be repeatedly called by userland code.
-     * @param HTMLPurifier_Config $config
-     */
-    abstract public function cleanup($config);
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator.php
deleted file mode 100644
index b57a51b6cb..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-
-class HTMLPurifier_DefinitionCache_Decorator extends HTMLPurifier_DefinitionCache
-{
-
-    /**
-     * Cache object we are decorating
-     * @type HTMLPurifier_DefinitionCache
-     */
-    public $cache;
-
-    /**
-     * The name of the decorator
-     * @var string
-     */
-    public $name;
-
-    public function __construct()
-    {
-    }
-
-    /**
-     * Lazy decorator function
-     * @param HTMLPurifier_DefinitionCache $cache Reference to cache object to decorate
-     * @return HTMLPurifier_DefinitionCache_Decorator
-     */
-    public function decorate(&$cache)
-    {
-        $decorator = $this->copy();
-        // reference is necessary for mocks in PHP 4
-        $decorator->cache =& $cache;
-        $decorator->type = $cache->type;
-        return $decorator;
-    }
-
-    /**
-     * Cross-compatible clone substitute
-     * @return HTMLPurifier_DefinitionCache_Decorator
-     */
-    public function copy()
-    {
-        return new HTMLPurifier_DefinitionCache_Decorator();
-    }
-
-    /**
-     * @param HTMLPurifier_Definition $def
-     * @param HTMLPurifier_Config $config
-     * @return mixed
-     */
-    public function add($def, $config)
-    {
-        return $this->cache->add($def, $config);
-    }
-
-    /**
-     * @param HTMLPurifier_Definition $def
-     * @param HTMLPurifier_Config $config
-     * @return mixed
-     */
-    public function set($def, $config)
-    {
-        return $this->cache->set($def, $config);
-    }
-
-    /**
-     * @param HTMLPurifier_Definition $def
-     * @param HTMLPurifier_Config $config
-     * @return mixed
-     */
-    public function replace($def, $config)
-    {
-        return $this->cache->replace($def, $config);
-    }
-
-    /**
-     * @param HTMLPurifier_Config $config
-     * @return mixed
-     */
-    public function get($config)
-    {
-        return $this->cache->get($config);
-    }
-
-    /**
-     * @param HTMLPurifier_Config $config
-     * @return mixed
-     */
-    public function remove($config)
-    {
-        return $this->cache->remove($config);
-    }
-
-    /**
-     * @param HTMLPurifier_Config $config
-     * @return mixed
-     */
-    public function flush($config)
-    {
-        return $this->cache->flush($config);
-    }
-
-    /**
-     * @param HTMLPurifier_Config $config
-     * @return mixed
-     */
-    public function cleanup($config)
-    {
-        return $this->cache->cleanup($config);
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php
deleted file mode 100644
index 4991777ce1..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-/**
- * Definition cache decorator class that cleans up the cache
- * whenever there is a cache miss.
- */
-class HTMLPurifier_DefinitionCache_Decorator_Cleanup extends HTMLPurifier_DefinitionCache_Decorator
-{
-    /**
-     * @type string
-     */
-    public $name = 'Cleanup';
-
-    /**
-     * @return HTMLPurifier_DefinitionCache_Decorator_Cleanup
-     */
-    public function copy()
-    {
-        return new HTMLPurifier_DefinitionCache_Decorator_Cleanup();
-    }
-
-    /**
-     * @param HTMLPurifier_Definition $def
-     * @param HTMLPurifier_Config $config
-     * @return mixed
-     */
-    public function add($def, $config)
-    {
-        $status = parent::add($def, $config);
-        if (!$status) {
-            parent::cleanup($config);
-        }
-        return $status;
-    }
-
-    /**
-     * @param HTMLPurifier_Definition $def
-     * @param HTMLPurifier_Config $config
-     * @return mixed
-     */
-    public function set($def, $config)
-    {
-        $status = parent::set($def, $config);
-        if (!$status) {
-            parent::cleanup($config);
-        }
-        return $status;
-    }
-
-    /**
-     * @param HTMLPurifier_Definition $def
-     * @param HTMLPurifier_Config $config
-     * @return mixed
-     */
-    public function replace($def, $config)
-    {
-        $status = parent::replace($def, $config);
-        if (!$status) {
-            parent::cleanup($config);
-        }
-        return $status;
-    }
-
-    /**
-     * @param HTMLPurifier_Config $config
-     * @return mixed
-     */
-    public function get($config)
-    {
-        $ret = parent::get($config);
-        if (!$ret) {
-            parent::cleanup($config);
-        }
-        return $ret;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php
deleted file mode 100644
index d529dce48d..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/**
- * Definition cache decorator class that saves all cache retrievals
- * to PHP's memory; good for unit tests or circumstances where
- * there are lots of configuration objects floating around.
- */
-class HTMLPurifier_DefinitionCache_Decorator_Memory extends HTMLPurifier_DefinitionCache_Decorator
-{
-    /**
-     * @type array
-     */
-    protected $definitions;
-
-    /**
-     * @type string
-     */
-    public $name = 'Memory';
-
-    /**
-     * @return HTMLPurifier_DefinitionCache_Decorator_Memory
-     */
-    public function copy()
-    {
-        return new HTMLPurifier_DefinitionCache_Decorator_Memory();
-    }
-
-    /**
-     * @param HTMLPurifier_Definition $def
-     * @param HTMLPurifier_Config $config
-     * @return mixed
-     */
-    public function add($def, $config)
-    {
-        $status = parent::add($def, $config);
-        if ($status) {
-            $this->definitions[$this->generateKey($config)] = $def;
-        }
-        return $status;
-    }
-
-    /**
-     * @param HTMLPurifier_Definition $def
-     * @param HTMLPurifier_Config $config
-     * @return mixed
-     */
-    public function set($def, $config)
-    {
-        $status = parent::set($def, $config);
-        if ($status) {
-            $this->definitions[$this->generateKey($config)] = $def;
-        }
-        return $status;
-    }
-
-    /**
-     * @param HTMLPurifier_Definition $def
-     * @param HTMLPurifier_Config $config
-     * @return mixed
-     */
-    public function replace($def, $config)
-    {
-        $status = parent::replace($def, $config);
-        if ($status) {
-            $this->definitions[$this->generateKey($config)] = $def;
-        }
-        return $status;
-    }
-
-    /**
-     * @param HTMLPurifier_Config $config
-     * @return mixed
-     */
-    public function get($config)
-    {
-        $key = $this->generateKey($config);
-        if (isset($this->definitions[$key])) {
-            return $this->definitions[$key];
-        }
-        $this->definitions[$key] = parent::get($config);
-        return $this->definitions[$key];
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Template.php.in b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Template.php.in
deleted file mode 100644
index b1fec8d367..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Template.php.in
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-require_once 'HTMLPurifier/DefinitionCache/Decorator.php';
-
-/**
- * Definition cache decorator template.
- */
-class HTMLPurifier_DefinitionCache_Decorator_Template extends HTMLPurifier_DefinitionCache_Decorator
-{
-
-    /**
-     * @type string
-     */
-    public $name = 'Template'; // replace this
-
-    public function copy()
-    {
-        // replace class name with yours
-        return new HTMLPurifier_DefinitionCache_Decorator_Template();
-    }
-
-    // remove methods you don't need
-
-    /**
-     * @param HTMLPurifier_Definition $def
-     * @param HTMLPurifier_Config $config
-     * @return mixed
-     */
-    public function add($def, $config)
-    {
-        return parent::add($def, $config);
-    }
-
-    /**
-     * @param HTMLPurifier_Definition $def
-     * @param HTMLPurifier_Config $config
-     * @return mixed
-     */
-    public function set($def, $config)
-    {
-        return parent::set($def, $config);
-    }
-
-    /**
-     * @param HTMLPurifier_Definition $def
-     * @param HTMLPurifier_Config $config
-     * @return mixed
-     */
-    public function replace($def, $config)
-    {
-        return parent::replace($def, $config);
-    }
-
-    /**
-     * @param HTMLPurifier_Config $config
-     * @return mixed
-     */
-    public function get($config)
-    {
-        return parent::get($config);
-    }
-
-    /**
-     * @param HTMLPurifier_Config $config
-     * @return mixed
-     */
-    public function flush($config)
-    {
-        return parent::flush($config);
-    }
-
-    /**
-     * @param HTMLPurifier_Config $config
-     * @return mixed
-     */
-    public function cleanup($config)
-    {
-        return parent::cleanup($config);
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Null.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Null.php
deleted file mode 100644
index d9a75ce227..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Null.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-/**
- * Null cache object to use when no caching is on.
- */
-class HTMLPurifier_DefinitionCache_Null extends HTMLPurifier_DefinitionCache
-{
-
-    /**
-     * @param HTMLPurifier_Definition $def
-     * @param HTMLPurifier_Config $config
-     * @return bool
-     */
-    public function add($def, $config)
-    {
-        return false;
-    }
-
-    /**
-     * @param HTMLPurifier_Definition $def
-     * @param HTMLPurifier_Config $config
-     * @return bool
-     */
-    public function set($def, $config)
-    {
-        return false;
-    }
-
-    /**
-     * @param HTMLPurifier_Definition $def
-     * @param HTMLPurifier_Config $config
-     * @return bool
-     */
-    public function replace($def, $config)
-    {
-        return false;
-    }
-
-    /**
-     * @param HTMLPurifier_Config $config
-     * @return bool
-     */
-    public function remove($config)
-    {
-        return false;
-    }
-
-    /**
-     * @param HTMLPurifier_Config $config
-     * @return bool
-     */
-    public function get($config)
-    {
-        return false;
-    }
-
-    /**
-     * @param HTMLPurifier_Config $config
-     * @return bool
-     */
-    public function flush($config)
-    {
-        return false;
-    }
-
-    /**
-     * @param HTMLPurifier_Config $config
-     * @return bool
-     */
-    public function cleanup($config)
-    {
-        return false;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer.php
deleted file mode 100644
index b82c6bb201..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer.php
+++ /dev/null
@@ -1,311 +0,0 @@
-<?php
-
-class HTMLPurifier_DefinitionCache_Serializer extends HTMLPurifier_DefinitionCache
-{
-
-    /**
-     * @param HTMLPurifier_Definition $def
-     * @param HTMLPurifier_Config $config
-     * @return int|bool
-     */
-    public function add($def, $config)
-    {
-        if (!$this->checkDefType($def)) {
-            return;
-        }
-        $file = $this->generateFilePath($config);
-        if (file_exists($file)) {
-            return false;
-        }
-        if (!$this->_prepareDir($config)) {
-            return false;
-        }
-        return $this->_write($file, serialize($def), $config);
-    }
-
-    /**
-     * @param HTMLPurifier_Definition $def
-     * @param HTMLPurifier_Config $config
-     * @return int|bool
-     */
-    public function set($def, $config)
-    {
-        if (!$this->checkDefType($def)) {
-            return;
-        }
-        $file = $this->generateFilePath($config);
-        if (!$this->_prepareDir($config)) {
-            return false;
-        }
-        return $this->_write($file, serialize($def), $config);
-    }
-
-    /**
-     * @param HTMLPurifier_Definition $def
-     * @param HTMLPurifier_Config $config
-     * @return int|bool
-     */
-    public function replace($def, $config)
-    {
-        if (!$this->checkDefType($def)) {
-            return;
-        }
-        $file = $this->generateFilePath($config);
-        if (!file_exists($file)) {
-            return false;
-        }
-        if (!$this->_prepareDir($config)) {
-            return false;
-        }
-        return $this->_write($file, serialize($def), $config);
-    }
-
-    /**
-     * @param HTMLPurifier_Config $config
-     * @return bool|HTMLPurifier_Config
-     */
-    public function get($config)
-    {
-        $file = $this->generateFilePath($config);
-        if (!file_exists($file)) {
-            return false;
-        }
-        return unserialize(file_get_contents($file));
-    }
-
-    /**
-     * @param HTMLPurifier_Config $config
-     * @return bool
-     */
-    public function remove($config)
-    {
-        $file = $this->generateFilePath($config);
-        if (!file_exists($file)) {
-            return false;
-        }
-        return unlink($file);
-    }
-
-    /**
-     * @param HTMLPurifier_Config $config
-     * @return bool
-     */
-    public function flush($config)
-    {
-        if (!$this->_prepareDir($config)) {
-            return false;
-        }
-        $dir = $this->generateDirectoryPath($config);
-        $dh = opendir($dir);
-        // Apparently, on some versions of PHP, readdir will return
-        // an empty string if you pass an invalid argument to readdir.
-        // So you need this test.  See #49.
-        if (false === $dh) {
-            return false;
-        }
-        while (false !== ($filename = readdir($dh))) {
-            if (empty($filename)) {
-                continue;
-            }
-            if ($filename[0] === '.') {
-                continue;
-            }
-            unlink($dir . '/' . $filename);
-        }
-        closedir($dh);
-        return true;
-    }
-
-    /**
-     * @param HTMLPurifier_Config $config
-     * @return bool
-     */
-    public function cleanup($config)
-    {
-        if (!$this->_prepareDir($config)) {
-            return false;
-        }
-        $dir = $this->generateDirectoryPath($config);
-        $dh = opendir($dir);
-        // See #49 (and above).
-        if (false === $dh) {
-            return false;
-        }
-        while (false !== ($filename = readdir($dh))) {
-            if (empty($filename)) {
-                continue;
-            }
-            if ($filename[0] === '.') {
-                continue;
-            }
-            $key = substr($filename, 0, strlen($filename) - 4);
-            if ($this->isOld($key, $config)) {
-                unlink($dir . '/' . $filename);
-            }
-        }
-        closedir($dh);
-        return true;
-    }
-
-    /**
-     * Generates the file path to the serial file corresponding to
-     * the configuration and definition name
-     * @param HTMLPurifier_Config $config
-     * @return string
-     * @todo Make protected
-     */
-    public function generateFilePath($config)
-    {
-        $key = $this->generateKey($config);
-        return $this->generateDirectoryPath($config) . '/' . $key . '.ser';
-    }
-
-    /**
-     * Generates the path to the directory contain this cache's serial files
-     * @param HTMLPurifier_Config $config
-     * @return string
-     * @note No trailing slash
-     * @todo Make protected
-     */
-    public function generateDirectoryPath($config)
-    {
-        $base = $this->generateBaseDirectoryPath($config);
-        return $base . '/' . $this->type;
-    }
-
-    /**
-     * Generates path to base directory that contains all definition type
-     * serials
-     * @param HTMLPurifier_Config $config
-     * @return mixed|string
-     * @todo Make protected
-     */
-    public function generateBaseDirectoryPath($config)
-    {
-        $base = $config->get('Cache.SerializerPath');
-        $base = is_null($base) ? HTMLPURIFIER_PREFIX . '/HTMLPurifier/DefinitionCache/Serializer' : $base;
-        return $base;
-    }
-
-    /**
-     * Convenience wrapper function for file_put_contents
-     * @param string $file File name to write to
-     * @param string $data Data to write into file
-     * @param HTMLPurifier_Config $config
-     * @return int|bool Number of bytes written if success, or false if failure.
-     */
-    private function _write($file, $data, $config)
-    {
-        $result = file_put_contents($file, $data);
-        if ($result !== false) {
-            // set permissions of the new file (no execute)
-            $chmod = $config->get('Cache.SerializerPermissions');
-            if ($chmod !== null) {
-                chmod($file, $chmod & 0666);
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * Prepares the directory that this type stores the serials in
-     * @param HTMLPurifier_Config $config
-     * @return bool True if successful
-     */
-    private function _prepareDir($config)
-    {
-        $directory = $this->generateDirectoryPath($config);
-        $chmod = $config->get('Cache.SerializerPermissions');
-        if ($chmod === null) {
-            if (!@mkdir($directory) && !is_dir($directory)) {
-                trigger_error(
-                    'Could not create directory ' . $directory . '',
-                    E_USER_WARNING
-                );
-                return false;
-            }
-            return true;
-        }
-        if (!is_dir($directory)) {
-            $base = $this->generateBaseDirectoryPath($config);
-            if (!is_dir($base)) {
-                trigger_error(
-                    'Base directory ' . $base . ' does not exist,
-                    please create or change using %Cache.SerializerPath',
-                    E_USER_WARNING
-                );
-                return false;
-            } elseif (!$this->_testPermissions($base, $chmod)) {
-                return false;
-            }
-            if (!@mkdir($directory, $chmod) && !is_dir($directory)) {
-                trigger_error(
-                    'Could not create directory ' . $directory . '',
-                    E_USER_WARNING
-                );
-                return false;
-            }
-            if (!$this->_testPermissions($directory, $chmod)) {
-                return false;
-            }
-        } elseif (!$this->_testPermissions($directory, $chmod)) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Tests permissions on a directory and throws out friendly
-     * error messages and attempts to chmod it itself if possible
-     * @param string $dir Directory path
-     * @param int $chmod Permissions
-     * @return bool True if directory is writable
-     */
-    private function _testPermissions($dir, $chmod)
-    {
-        // early abort, if it is writable, everything is hunky-dory
-        if (is_writable($dir)) {
-            return true;
-        }
-        if (!is_dir($dir)) {
-            // generally, you'll want to handle this beforehand
-            // so a more specific error message can be given
-            trigger_error(
-                'Directory ' . $dir . ' does not exist',
-                E_USER_WARNING
-            );
-            return false;
-        }
-        if (function_exists('posix_getuid') && $chmod !== null) {
-            // POSIX system, we can give more specific advice
-            if (fileowner($dir) === posix_getuid()) {
-                // we can chmod it ourselves
-                $chmod = $chmod | 0700;
-                if (chmod($dir, $chmod)) {
-                    return true;
-                }
-            } elseif (filegroup($dir) === posix_getgid()) {
-                $chmod = $chmod | 0070;
-            } else {
-                // PHP's probably running as nobody, so we'll
-                // need to give global permissions
-                $chmod = $chmod | 0777;
-            }
-            trigger_error(
-                'Directory ' . $dir . ' not writable, ' .
-                'please chmod to ' . decoct($chmod),
-                E_USER_WARNING
-            );
-        } else {
-            // generic error message
-            trigger_error(
-                'Directory ' . $dir . ' not writable, ' .
-                'please alter file permissions',
-                E_USER_WARNING
-            );
-        }
-        return false;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer/README b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer/README
deleted file mode 100644
index 2e35c1c3d0..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer/README
+++ /dev/null
@@ -1,3 +0,0 @@
-This is a dummy file to prevent Git from ignoring this empty directory.
-
-    vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCacheFactory.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCacheFactory.php
deleted file mode 100644
index fd1cc9be46..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCacheFactory.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-/**
- * Responsible for creating definition caches.
- */
-class HTMLPurifier_DefinitionCacheFactory
-{
-    /**
-     * @type array
-     */
-    protected $caches = array('Serializer' => array());
-
-    /**
-     * @type array
-     */
-    protected $implementations = array();
-
-    /**
-     * @type HTMLPurifier_DefinitionCache_Decorator[]
-     */
-    protected $decorators = array();
-
-    /**
-     * Initialize default decorators
-     */
-    public function setup()
-    {
-        $this->addDecorator('Cleanup');
-    }
-
-    /**
-     * Retrieves an instance of global definition cache factory.
-     * @param HTMLPurifier_DefinitionCacheFactory $prototype
-     * @return HTMLPurifier_DefinitionCacheFactory
-     */
-    public static function instance($prototype = null)
-    {
-        static $instance;
-        if ($prototype !== null) {
-            $instance = $prototype;
-        } elseif ($instance === null || $prototype === true) {
-            $instance = new HTMLPurifier_DefinitionCacheFactory();
-            $instance->setup();
-        }
-        return $instance;
-    }
-
-    /**
-     * Registers a new definition cache object
-     * @param string $short Short name of cache object, for reference
-     * @param string $long Full class name of cache object, for construction
-     */
-    public function register($short, $long)
-    {
-        $this->implementations[$short] = $long;
-    }
-
-    /**
-     * Factory method that creates a cache object based on configuration
-     * @param string $type Name of definitions handled by cache
-     * @param HTMLPurifier_Config $config Config instance
-     * @return mixed
-     */
-    public function create($type, $config)
-    {
-        $method = $config->get('Cache.DefinitionImpl');
-        if ($method === null) {
-            return new HTMLPurifier_DefinitionCache_Null($type);
-        }
-        if (!empty($this->caches[$method][$type])) {
-            return $this->caches[$method][$type];
-        }
-        if (isset($this->implementations[$method]) &&
-            class_exists($class = $this->implementations[$method], false)) {
-            $cache = new $class($type);
-        } else {
-            if ($method != 'Serializer') {
-                trigger_error("Unrecognized DefinitionCache $method, using Serializer instead", E_USER_WARNING);
-            }
-            $cache = new HTMLPurifier_DefinitionCache_Serializer($type);
-        }
-        foreach ($this->decorators as $decorator) {
-            $new_cache = $decorator->decorate($cache);
-            // prevent infinite recursion in PHP 4
-            unset($cache);
-            $cache = $new_cache;
-        }
-        $this->caches[$method][$type] = $cache;
-        return $this->caches[$method][$type];
-    }
-
-    /**
-     * Registers a decorator to add to all new cache objects
-     * @param HTMLPurifier_DefinitionCache_Decorator|string $decorator An instance or the name of a decorator
-     */
-    public function addDecorator($decorator)
-    {
-        if (is_string($decorator)) {
-            $class = "HTMLPurifier_DefinitionCache_Decorator_$decorator";
-            $decorator = new $class;
-        }
-        $this->decorators[$decorator->name] = $decorator;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Doctype.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Doctype.php
deleted file mode 100644
index 4acd06e5bd..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Doctype.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-/**
- * Represents a document type, contains information on which modules
- * need to be loaded.
- * @note This class is inspected by Printer_HTMLDefinition->renderDoctype.
- *       If structure changes, please update that function.
- */
-class HTMLPurifier_Doctype
-{
-    /**
-     * Full name of doctype
-     * @type string
-     */
-    public $name;
-
-    /**
-     * List of standard modules (string identifiers or literal objects)
-     * that this doctype uses
-     * @type array
-     */
-    public $modules = array();
-
-    /**
-     * List of modules to use for tidying up code
-     * @type array
-     */
-    public $tidyModules = array();
-
-    /**
-     * Is the language derived from XML (i.e. XHTML)?
-     * @type bool
-     */
-    public $xml = true;
-
-    /**
-     * List of aliases for this doctype
-     * @type array
-     */
-    public $aliases = array();
-
-    /**
-     * Public DTD identifier
-     * @type string
-     */
-    public $dtdPublic;
-
-    /**
-     * System DTD identifier
-     * @type string
-     */
-    public $dtdSystem;
-
-    public function __construct(
-        $name = null,
-        $xml = true,
-        $modules = array(),
-        $tidyModules = array(),
-        $aliases = array(),
-        $dtd_public = null,
-        $dtd_system = null
-    ) {
-        $this->name         = $name;
-        $this->xml          = $xml;
-        $this->modules      = $modules;
-        $this->tidyModules  = $tidyModules;
-        $this->aliases      = $aliases;
-        $this->dtdPublic    = $dtd_public;
-        $this->dtdSystem    = $dtd_system;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DoctypeRegistry.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DoctypeRegistry.php
deleted file mode 100644
index acc1d64a62..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DoctypeRegistry.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-
-class HTMLPurifier_DoctypeRegistry
-{
-
-    /**
-     * Hash of doctype names to doctype objects.
-     * @type array
-     */
-    protected $doctypes;
-
-    /**
-     * Lookup table of aliases to real doctype names.
-     * @type array
-     */
-    protected $aliases;
-
-    /**
-     * Registers a doctype to the registry
-     * @note Accepts a fully-formed doctype object, or the
-     *       parameters for constructing a doctype object
-     * @param string $doctype Name of doctype or literal doctype object
-     * @param bool $xml
-     * @param array $modules Modules doctype will load
-     * @param array $tidy_modules Modules doctype will load for certain modes
-     * @param array $aliases Alias names for doctype
-     * @param string $dtd_public
-     * @param string $dtd_system
-     * @return HTMLPurifier_Doctype Editable registered doctype
-     */
-    public function register(
-        $doctype,
-        $xml = true,
-        $modules = array(),
-        $tidy_modules = array(),
-        $aliases = array(),
-        $dtd_public = null,
-        $dtd_system = null
-    ) {
-        if (!is_array($modules)) {
-            $modules = array($modules);
-        }
-        if (!is_array($tidy_modules)) {
-            $tidy_modules = array($tidy_modules);
-        }
-        if (!is_array($aliases)) {
-            $aliases = array($aliases);
-        }
-        if (!is_object($doctype)) {
-            $doctype = new HTMLPurifier_Doctype(
-                $doctype,
-                $xml,
-                $modules,
-                $tidy_modules,
-                $aliases,
-                $dtd_public,
-                $dtd_system
-            );
-        }
-        $this->doctypes[$doctype->name] = $doctype;
-        $name = $doctype->name;
-        // hookup aliases
-        foreach ($doctype->aliases as $alias) {
-            if (isset($this->doctypes[$alias])) {
-                continue;
-            }
-            $this->aliases[$alias] = $name;
-        }
-        // remove old aliases
-        if (isset($this->aliases[$name])) {
-            unset($this->aliases[$name]);
-        }
-        return $doctype;
-    }
-
-    /**
-     * Retrieves reference to a doctype of a certain name
-     * @note This function resolves aliases
-     * @note When possible, use the more fully-featured make()
-     * @param string $doctype Name of doctype
-     * @return HTMLPurifier_Doctype Editable doctype object
-     */
-    public function get($doctype)
-    {
-        if (isset($this->aliases[$doctype])) {
-            $doctype = $this->aliases[$doctype];
-        }
-        if (!isset($this->doctypes[$doctype])) {
-            trigger_error('Doctype ' . htmlspecialchars($doctype) . ' does not exist', E_USER_ERROR);
-            $anon = new HTMLPurifier_Doctype($doctype);
-            return $anon;
-        }
-        return $this->doctypes[$doctype];
-    }
-
-    /**
-     * Creates a doctype based on a configuration object,
-     * will perform initialization on the doctype
-     * @note Use this function to get a copy of doctype that config
-     *       can hold on to (this is necessary in order to tell
-     *       Generator whether or not the current document is XML
-     *       based or not).
-     * @param HTMLPurifier_Config $config
-     * @return HTMLPurifier_Doctype
-     */
-    public function make($config)
-    {
-        return clone $this->get($this->getDoctypeFromConfig($config));
-    }
-
-    /**
-     * Retrieves the doctype from the configuration object
-     * @param HTMLPurifier_Config $config
-     * @return string
-     */
-    public function getDoctypeFromConfig($config)
-    {
-        // recommended test
-        $doctype = $config->get('HTML.Doctype');
-        if (!empty($doctype)) {
-            return $doctype;
-        }
-        $doctype = $config->get('HTML.CustomDoctype');
-        if (!empty($doctype)) {
-            return $doctype;
-        }
-        // backwards-compatibility
-        if ($config->get('HTML.XHTML')) {
-            $doctype = 'XHTML 1.0';
-        } else {
-            $doctype = 'HTML 4.01';
-        }
-        if ($config->get('HTML.Strict')) {
-            $doctype .= ' Strict';
-        } else {
-            $doctype .= ' Transitional';
-        }
-        return $doctype;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ElementDef.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ElementDef.php
deleted file mode 100644
index d5311cedcf..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ElementDef.php
+++ /dev/null
@@ -1,216 +0,0 @@
-<?php
-
-/**
- * Structure that stores an HTML element definition. Used by
- * HTMLPurifier_HTMLDefinition and HTMLPurifier_HTMLModule.
- * @note This class is inspected by HTMLPurifier_Printer_HTMLDefinition.
- *       Please update that class too.
- * @warning If you add new properties to this class, you MUST update
- *          the mergeIn() method.
- */
-class HTMLPurifier_ElementDef
-{
-    /**
-     * Does the definition work by itself, or is it created solely
-     * for the purpose of merging into another definition?
-     * @type bool
-     */
-    public $standalone = true;
-
-    /**
-     * Associative array of attribute name to HTMLPurifier_AttrDef.
-     * @type array
-     * @note Before being processed by HTMLPurifier_AttrCollections
-     *       when modules are finalized during
-     *       HTMLPurifier_HTMLDefinition->setup(), this array may also
-     *       contain an array at index 0 that indicates which attribute
-     *       collections to load into the full array. It may also
-     *       contain string indentifiers in lieu of HTMLPurifier_AttrDef,
-     *       see HTMLPurifier_AttrTypes on how they are expanded during
-     *       HTMLPurifier_HTMLDefinition->setup() processing.
-     */
-    public $attr = array();
-
-    // XXX: Design note: currently, it's not possible to override
-    // previously defined AttrTransforms without messing around with
-    // the final generated config. This is by design; a previous version
-    // used an associated list of attr_transform, but it was extremely
-    // easy to accidentally override other attribute transforms by
-    // forgetting to specify an index (and just using 0.)  While we
-    // could check this by checking the index number and complaining,
-    // there is a second problem which is that it is not at all easy to
-    // tell when something is getting overridden. Combine this with a
-    // codebase where this isn't really being used, and it's perfect for
-    // nuking.
-
-    /**
-     * List of tags HTMLPurifier_AttrTransform to be done before validation.
-     * @type array
-     */
-    public $attr_transform_pre = array();
-
-    /**
-     * List of tags HTMLPurifier_AttrTransform to be done after validation.
-     * @type array
-     */
-    public $attr_transform_post = array();
-
-    /**
-     * HTMLPurifier_ChildDef of this tag.
-     * @type HTMLPurifier_ChildDef
-     */
-    public $child;
-
-    /**
-     * Abstract string representation of internal ChildDef rules.
-     * @see HTMLPurifier_ContentSets for how this is parsed and then transformed
-     * into an HTMLPurifier_ChildDef.
-     * @warning This is a temporary variable that is not available after
-     *      being processed by HTMLDefinition
-     * @type string
-     */
-    public $content_model;
-
-    /**
-     * Value of $child->type, used to determine which ChildDef to use,
-     * used in combination with $content_model.
-     * @warning This must be lowercase
-     * @warning This is a temporary variable that is not available after
-     *      being processed by HTMLDefinition
-     * @type string
-     */
-    public $content_model_type;
-
-    /**
-     * Does the element have a content model (#PCDATA | Inline)*? This
-     * is important for chameleon ins and del processing in
-     * HTMLPurifier_ChildDef_Chameleon. Dynamically set: modules don't
-     * have to worry about this one.
-     * @type bool
-     */
-    public $descendants_are_inline = false;
-
-    /**
-     * List of the names of required attributes this element has.
-     * Dynamically populated by HTMLPurifier_HTMLDefinition::getElement()
-     * @type array
-     */
-    public $required_attr = array();
-
-    /**
-     * Lookup table of tags excluded from all descendants of this tag.
-     * @type array
-     * @note SGML permits exclusions for all descendants, but this is
-     *       not possible with DTDs or XML Schemas. W3C has elected to
-     *       use complicated compositions of content_models to simulate
-     *       exclusion for children, but we go the simpler, SGML-style
-     *       route of flat-out exclusions, which correctly apply to
-     *       all descendants and not just children. Note that the XHTML
-     *       Modularization Abstract Modules are blithely unaware of such
-     *       distinctions.
-     */
-    public $excludes = array();
-
-    /**
-     * This tag is explicitly auto-closed by the following tags.
-     * @type array
-     */
-    public $autoclose = array();
-
-    /**
-     * If a foreign element is found in this element, test if it is
-     * allowed by this sub-element; if it is, instead of closing the
-     * current element, place it inside this element.
-     * @type string
-     */
-    public $wrap;
-
-    /**
-     * Whether or not this is a formatting element affected by the
-     * "Active Formatting Elements" algorithm.
-     * @type bool
-     */
-    public $formatting;
-
-    /**
-     * Low-level factory constructor for creating new standalone element defs
-     */
-    public static function create($content_model, $content_model_type, $attr)
-    {
-        $def = new HTMLPurifier_ElementDef();
-        $def->content_model = $content_model;
-        $def->content_model_type = $content_model_type;
-        $def->attr = $attr;
-        return $def;
-    }
-
-    /**
-     * Merges the values of another element definition into this one.
-     * Values from the new element def take precedence if a value is
-     * not mergeable.
-     * @param HTMLPurifier_ElementDef $def
-     */
-    public function mergeIn($def)
-    {
-        // later keys takes precedence
-        foreach ($def->attr as $k => $v) {
-            if ($k === 0) {
-                // merge in the includes
-                // sorry, no way to override an include
-                foreach ($v as $v2) {
-                    $this->attr[0][] = $v2;
-                }
-                continue;
-            }
-            if ($v === false) {
-                if (isset($this->attr[$k])) {
-                    unset($this->attr[$k]);
-                }
-                continue;
-            }
-            $this->attr[$k] = $v;
-        }
-        $this->_mergeAssocArray($this->excludes, $def->excludes);
-        $this->attr_transform_pre = array_merge($this->attr_transform_pre, $def->attr_transform_pre);
-        $this->attr_transform_post = array_merge($this->attr_transform_post, $def->attr_transform_post);
-
-        if (!empty($def->content_model)) {
-            $this->content_model =
-                str_replace("#SUPER", $this->content_model, $def->content_model);
-            $this->child = false;
-        }
-        if (!empty($def->content_model_type)) {
-            $this->content_model_type = $def->content_model_type;
-            $this->child = false;
-        }
-        if (!is_null($def->child)) {
-            $this->child = $def->child;
-        }
-        if (!is_null($def->formatting)) {
-            $this->formatting = $def->formatting;
-        }
-        if ($def->descendants_are_inline) {
-            $this->descendants_are_inline = $def->descendants_are_inline;
-        }
-    }
-
-    /**
-     * Merges one array into another, removes values which equal false
-     * @param $a1 Array by reference that is merged into
-     * @param $a2 Array that merges into $a1
-     */
-    private function _mergeAssocArray(&$a1, $a2)
-    {
-        foreach ($a2 as $k => $v) {
-            if ($v === false) {
-                if (isset($a1[$k])) {
-                    unset($a1[$k]);
-                }
-                continue;
-            }
-            $a1[$k] = $v;
-        }
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Encoder.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Encoder.php
deleted file mode 100644
index 40a24266a4..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Encoder.php
+++ /dev/null
@@ -1,617 +0,0 @@
-<?php
-
-/**
- * A UTF-8 specific character encoder that handles cleaning and transforming.
- * @note All functions in this class should be static.
- */
-class HTMLPurifier_Encoder
-{
-
-    /**
-     * Constructor throws fatal error if you attempt to instantiate class
-     */
-    private function __construct()
-    {
-        trigger_error('Cannot instantiate encoder, call methods statically', E_USER_ERROR);
-    }
-
-    /**
-     * Error-handler that mutes errors, alternative to shut-up operator.
-     */
-    public static function muteErrorHandler()
-    {
-    }
-
-    /**
-     * iconv wrapper which mutes errors, but doesn't work around bugs.
-     * @param string $in Input encoding
-     * @param string $out Output encoding
-     * @param string $text The text to convert
-     * @return string
-     */
-    public static function unsafeIconv($in, $out, $text)
-    {
-        set_error_handler(array('HTMLPurifier_Encoder', 'muteErrorHandler'));
-        $r = iconv($in, $out, $text);
-        restore_error_handler();
-        return $r;
-    }
-
-    /**
-     * iconv wrapper which mutes errors and works around bugs.
-     * @param string $in Input encoding
-     * @param string $out Output encoding
-     * @param string $text The text to convert
-     * @param int $max_chunk_size
-     * @return string
-     */
-    public static function iconv($in, $out, $text, $max_chunk_size = 8000)
-    {
-        $code = self::testIconvTruncateBug();
-        if ($code == self::ICONV_OK) {
-            return self::unsafeIconv($in, $out, $text);
-        } elseif ($code == self::ICONV_TRUNCATES) {
-            // we can only work around this if the input character set
-            // is utf-8
-            if ($in == 'utf-8') {
-                if ($max_chunk_size < 4) {
-                    trigger_error('max_chunk_size is too small', E_USER_WARNING);
-                    return false;
-                }
-                // split into 8000 byte chunks, but be careful to handle
-                // multibyte boundaries properly
-                if (($c = strlen($text)) <= $max_chunk_size) {
-                    return self::unsafeIconv($in, $out, $text);
-                }
-                $r = '';
-                $i = 0;
-                while (true) {
-                    if ($i + $max_chunk_size >= $c) {
-                        $r .= self::unsafeIconv($in, $out, substr($text, $i));
-                        break;
-                    }
-                    // wibble the boundary
-                    if (0x80 != (0xC0 & ord($text[$i + $max_chunk_size]))) {
-                        $chunk_size = $max_chunk_size;
-                    } elseif (0x80 != (0xC0 & ord($text[$i + $max_chunk_size - 1]))) {
-                        $chunk_size = $max_chunk_size - 1;
-                    } elseif (0x80 != (0xC0 & ord($text[$i + $max_chunk_size - 2]))) {
-                        $chunk_size = $max_chunk_size - 2;
-                    } elseif (0x80 != (0xC0 & ord($text[$i + $max_chunk_size - 3]))) {
-                        $chunk_size = $max_chunk_size - 3;
-                    } else {
-                        return false; // rather confusing UTF-8...
-                    }
-                    $chunk = substr($text, $i, $chunk_size); // substr doesn't mind overlong lengths
-                    $r .= self::unsafeIconv($in, $out, $chunk);
-                    $i += $chunk_size;
-                }
-                return $r;
-            } else {
-                return false;
-            }
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Cleans a UTF-8 string for well-formedness and SGML validity
-     *
-     * It will parse according to UTF-8 and return a valid UTF8 string, with
-     * non-SGML codepoints excluded.
-     *
-     * Specifically, it will permit:
-     * \x{9}\x{A}\x{D}\x{20}-\x{7E}\x{A0}-\x{D7FF}\x{E000}-\x{FFFD}\x{10000}-\x{10FFFF}
-     * Source: https://www.w3.org/TR/REC-xml/#NT-Char
-     * Arguably this function should be modernized to the HTML5 set
-     * of allowed characters:
-     * https://www.w3.org/TR/html5/syntax.html#preprocessing-the-input-stream
-     * which simultaneously expand and restrict the set of allowed characters.
-     *
-     * @param string $str The string to clean
-     * @param bool $force_php
-     * @return string
-     *
-     * @note Just for reference, the non-SGML code points are 0 to 31 and
-     *       127 to 159, inclusive.  However, we allow code points 9, 10
-     *       and 13, which are the tab, line feed and carriage return
-     *       respectively. 128 and above the code points map to multibyte
-     *       UTF-8 representations.
-     *
-     * @note Fallback code adapted from utf8ToUnicode by Henri Sivonen and
-     *       hsivonen@iki.fi at <http://iki.fi/hsivonen/php-utf8/> under the
-     *       LGPL license.  Notes on what changed are inside, but in general,
-     *       the original code transformed UTF-8 text into an array of integer
-     *       Unicode codepoints. Understandably, transforming that back to
-     *       a string would be somewhat expensive, so the function was modded to
-     *       directly operate on the string.  However, this discourages code
-     *       reuse, and the logic enumerated here would be useful for any
-     *       function that needs to be able to understand UTF-8 characters.
-     *       As of right now, only smart lossless character encoding converters
-     *       would need that, and I'm probably not going to implement them.
-     */
-    public static function cleanUTF8($str, $force_php = false)
-    {
-        // UTF-8 validity is checked since PHP 4.3.5
-        // This is an optimization: if the string is already valid UTF-8, no
-        // need to do PHP stuff. 99% of the time, this will be the case.
-        if (preg_match(
-            '/^[\x{9}\x{A}\x{D}\x{20}-\x{7E}\x{A0}-\x{D7FF}\x{E000}-\x{FFFD}\x{10000}-\x{10FFFF}]*$/Du',
-            $str
-        )) {
-            return $str;
-        }
-
-        $mState = 0; // cached expected number of octets after the current octet
-                     // until the beginning of the next UTF8 character sequence
-        $mUcs4  = 0; // cached Unicode character
-        $mBytes = 1; // cached expected number of octets in the current sequence
-
-        // original code involved an $out that was an array of Unicode
-        // codepoints.  Instead of having to convert back into UTF-8, we've
-        // decided to directly append valid UTF-8 characters onto a string
-        // $out once they're done.  $char accumulates raw bytes, while $mUcs4
-        // turns into the Unicode code point, so there's some redundancy.
-
-        $out = '';
-        $char = '';
-
-        $len = strlen($str);
-        for ($i = 0; $i < $len; $i++) {
-            $in = ord($str[$i]);
-            $char .= $str[$i]; // append byte to char
-            if (0 == $mState) {
-                // When mState is zero we expect either a US-ASCII character
-                // or a multi-octet sequence.
-                if (0 == (0x80 & ($in))) {
-                    // US-ASCII, pass straight through.
-                    if (($in <= 31 || $in == 127) &&
-                        !($in == 9 || $in == 13 || $in == 10) // save \r\t\n
-                    ) {
-                        // control characters, remove
-                    } else {
-                        $out .= $char;
-                    }
-                    // reset
-                    $char = '';
-                    $mBytes = 1;
-                } elseif (0xC0 == (0xE0 & ($in))) {
-                    // First octet of 2 octet sequence
-                    $mUcs4 = ($in);
-                    $mUcs4 = ($mUcs4 & 0x1F) << 6;
-                    $mState = 1;
-                    $mBytes = 2;
-                } elseif (0xE0 == (0xF0 & ($in))) {
-                    // First octet of 3 octet sequence
-                    $mUcs4 = ($in);
-                    $mUcs4 = ($mUcs4 & 0x0F) << 12;
-                    $mState = 2;
-                    $mBytes = 3;
-                } elseif (0xF0 == (0xF8 & ($in))) {
-                    // First octet of 4 octet sequence
-                    $mUcs4 = ($in);
-                    $mUcs4 = ($mUcs4 & 0x07) << 18;
-                    $mState = 3;
-                    $mBytes = 4;
-                } elseif (0xF8 == (0xFC & ($in))) {
-                    // First octet of 5 octet sequence.
-                    //
-                    // This is illegal because the encoded codepoint must be
-                    // either:
-                    // (a) not the shortest form or
-                    // (b) outside the Unicode range of 0-0x10FFFF.
-                    // Rather than trying to resynchronize, we will carry on
-                    // until the end of the sequence and let the later error
-                    // handling code catch it.
-                    $mUcs4 = ($in);
-                    $mUcs4 = ($mUcs4 & 0x03) << 24;
-                    $mState = 4;
-                    $mBytes = 5;
-                } elseif (0xFC == (0xFE & ($in))) {
-                    // First octet of 6 octet sequence, see comments for 5
-                    // octet sequence.
-                    $mUcs4 = ($in);
-                    $mUcs4 = ($mUcs4 & 1) << 30;
-                    $mState = 5;
-                    $mBytes = 6;
-                } else {
-                    // Current octet is neither in the US-ASCII range nor a
-                    // legal first octet of a multi-octet sequence.
-                    $mState = 0;
-                    $mUcs4  = 0;
-                    $mBytes = 1;
-                    $char = '';
-                }
-            } else {
-                // When mState is non-zero, we expect a continuation of the
-                // multi-octet sequence
-                if (0x80 == (0xC0 & ($in))) {
-                    // Legal continuation.
-                    $shift = ($mState - 1) * 6;
-                    $tmp = $in;
-                    $tmp = ($tmp & 0x0000003F) << $shift;
-                    $mUcs4 |= $tmp;
-
-                    if (0 == --$mState) {
-                        // End of the multi-octet sequence. mUcs4 now contains
-                        // the final Unicode codepoint to be output
-
-                        // Check for illegal sequences and codepoints.
-
-                        // From Unicode 3.1, non-shortest form is illegal
-                        if (((2 == $mBytes) && ($mUcs4 < 0x0080)) ||
-                            ((3 == $mBytes) && ($mUcs4 < 0x0800)) ||
-                            ((4 == $mBytes) && ($mUcs4 < 0x10000)) ||
-                            (4 < $mBytes) ||
-                            // From Unicode 3.2, surrogate characters = illegal
-                            (($mUcs4 & 0xFFFFF800) == 0xD800) ||
-                            // Codepoints outside the Unicode range are illegal
-                            ($mUcs4 > 0x10FFFF)
-                        ) {
-
-                        } elseif (0xFEFF != $mUcs4 && // omit BOM
-                            // check for valid Char unicode codepoints
-                            (
-                                0x9 == $mUcs4 ||
-                                0xA == $mUcs4 ||
-                                0xD == $mUcs4 ||
-                                (0x20 <= $mUcs4 && 0x7E >= $mUcs4) ||
-                                // 7F-9F is not strictly prohibited by XML,
-                                // but it is non-SGML, and thus we don't allow it
-                                (0xA0 <= $mUcs4 && 0xD7FF >= $mUcs4) ||
-                                (0xE000 <= $mUcs4 && 0xFFFD >= $mUcs4) ||
-                                (0x10000 <= $mUcs4 && 0x10FFFF >= $mUcs4)
-                            )
-                        ) {
-                            $out .= $char;
-                        }
-                        // initialize UTF8 cache (reset)
-                        $mState = 0;
-                        $mUcs4  = 0;
-                        $mBytes = 1;
-                        $char = '';
-                    }
-                } else {
-                    // ((0xC0 & (*in) != 0x80) && (mState != 0))
-                    // Incomplete multi-octet sequence.
-                    // used to result in complete fail, but we'll reset
-                    $mState = 0;
-                    $mUcs4  = 0;
-                    $mBytes = 1;
-                    $char ='';
-                }
-            }
-        }
-        return $out;
-    }
-
-    /**
-     * Translates a Unicode codepoint into its corresponding UTF-8 character.
-     * @note Based on Feyd's function at
-     *       <http://forums.devnetwork.net/viewtopic.php?p=191404#191404>,
-     *       which is in public domain.
-     * @note While we're going to do code point parsing anyway, a good
-     *       optimization would be to refuse to translate code points that
-     *       are non-SGML characters.  However, this could lead to duplication.
-     * @note This is very similar to the unichr function in
-     *       maintenance/generate-entity-file.php (although this is superior,
-     *       due to its sanity checks).
-     */
-
-    // +----------+----------+----------+----------+
-    // | 33222222 | 22221111 | 111111   |          |
-    // | 10987654 | 32109876 | 54321098 | 76543210 | bit
-    // +----------+----------+----------+----------+
-    // |          |          |          | 0xxxxxxx | 1 byte 0x00000000..0x0000007F
-    // |          |          | 110yyyyy | 10xxxxxx | 2 byte 0x00000080..0x000007FF
-    // |          | 1110zzzz | 10yyyyyy | 10xxxxxx | 3 byte 0x00000800..0x0000FFFF
-    // | 11110www | 10wwzzzz | 10yyyyyy | 10xxxxxx | 4 byte 0x00010000..0x0010FFFF
-    // +----------+----------+----------+----------+
-    // | 00000000 | 00011111 | 11111111 | 11111111 | Theoretical upper limit of legal scalars: 2097151 (0x001FFFFF)
-    // | 00000000 | 00010000 | 11111111 | 11111111 | Defined upper limit of legal scalar codes
-    // +----------+----------+----------+----------+
-
-    public static function unichr($code)
-    {
-        if ($code > 1114111 or $code < 0 or
-          ($code >= 55296 and $code <= 57343) ) {
-            // bits are set outside the "valid" range as defined
-            // by UNICODE 4.1.0
-            return '';
-        }
-
-        $x = $y = $z = $w = 0;
-        if ($code < 128) {
-            // regular ASCII character
-            $x = $code;
-        } else {
-            // set up bits for UTF-8
-            $x = ($code & 63) | 128;
-            if ($code < 2048) {
-                $y = (($code & 2047) >> 6) | 192;
-            } else {
-                $y = (($code & 4032) >> 6) | 128;
-                if ($code < 65536) {
-                    $z = (($code >> 12) & 15) | 224;
-                } else {
-                    $z = (($code >> 12) & 63) | 128;
-                    $w = (($code >> 18) & 7)  | 240;
-                }
-            }
-        }
-        // set up the actual character
-        $ret = '';
-        if ($w) {
-            $ret .= chr($w);
-        }
-        if ($z) {
-            $ret .= chr($z);
-        }
-        if ($y) {
-            $ret .= chr($y);
-        }
-        $ret .= chr($x);
-
-        return $ret;
-    }
-
-    /**
-     * @return bool
-     */
-    public static function iconvAvailable()
-    {
-        static $iconv = null;
-        if ($iconv === null) {
-            $iconv = function_exists('iconv') && self::testIconvTruncateBug() != self::ICONV_UNUSABLE;
-        }
-        return $iconv;
-    }
-
-    /**
-     * Convert a string to UTF-8 based on configuration.
-     * @param string $str The string to convert
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return string
-     */
-    public static function convertToUTF8($str, $config, $context)
-    {
-        $encoding = $config->get('Core.Encoding');
-        if ($encoding === 'utf-8') {
-            return $str;
-        }
-        static $iconv = null;
-        if ($iconv === null) {
-            $iconv = self::iconvAvailable();
-        }
-        if ($iconv && !$config->get('Test.ForceNoIconv')) {
-            // unaffected by bugs, since UTF-8 support all characters
-            $str = self::unsafeIconv($encoding, 'utf-8//IGNORE', $str);
-            if ($str === false) {
-                // $encoding is not a valid encoding
-                trigger_error('Invalid encoding ' . $encoding, E_USER_ERROR);
-                return '';
-            }
-            // If the string is bjorked by Shift_JIS or a similar encoding
-            // that doesn't support all of ASCII, convert the naughty
-            // characters to their true byte-wise ASCII/UTF-8 equivalents.
-            $str = strtr($str, self::testEncodingSupportsASCII($encoding));
-            return $str;
-        } elseif ($encoding === 'iso-8859-1') {
-            $str = utf8_encode($str);
-            return $str;
-        }
-        $bug = HTMLPurifier_Encoder::testIconvTruncateBug();
-        if ($bug == self::ICONV_OK) {
-            trigger_error('Encoding not supported, please install iconv', E_USER_ERROR);
-        } else {
-            trigger_error(
-                'You have a buggy version of iconv, see https://bugs.php.net/bug.php?id=48147 ' .
-                'and http://sourceware.org/bugzilla/show_bug.cgi?id=13541',
-                E_USER_ERROR
-            );
-        }
-    }
-
-    /**
-     * Converts a string from UTF-8 based on configuration.
-     * @param string $str The string to convert
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return string
-     * @note Currently, this is a lossy conversion, with unexpressable
-     *       characters being omitted.
-     */
-    public static function convertFromUTF8($str, $config, $context)
-    {
-        $encoding = $config->get('Core.Encoding');
-        if ($escape = $config->get('Core.EscapeNonASCIICharacters')) {
-            $str = self::convertToASCIIDumbLossless($str);
-        }
-        if ($encoding === 'utf-8') {
-            return $str;
-        }
-        static $iconv = null;
-        if ($iconv === null) {
-            $iconv = self::iconvAvailable();
-        }
-        if ($iconv && !$config->get('Test.ForceNoIconv')) {
-            // Undo our previous fix in convertToUTF8, otherwise iconv will barf
-            $ascii_fix = self::testEncodingSupportsASCII($encoding);
-            if (!$escape && !empty($ascii_fix)) {
-                $clear_fix = array();
-                foreach ($ascii_fix as $utf8 => $native) {
-                    $clear_fix[$utf8] = '';
-                }
-                $str = strtr($str, $clear_fix);
-            }
-            $str = strtr($str, array_flip($ascii_fix));
-            // Normal stuff
-            $str = self::iconv('utf-8', $encoding . '//IGNORE', $str);
-            return $str;
-        } elseif ($encoding === 'iso-8859-1') {
-            $str = utf8_decode($str);
-            return $str;
-        }
-        trigger_error('Encoding not supported', E_USER_ERROR);
-        // You might be tempted to assume that the ASCII representation
-        // might be OK, however, this is *not* universally true over all
-        // encodings.  So we take the conservative route here, rather
-        // than forcibly turn on %Core.EscapeNonASCIICharacters
-    }
-
-    /**
-     * Lossless (character-wise) conversion of HTML to ASCII
-     * @param string $str UTF-8 string to be converted to ASCII
-     * @return string ASCII encoded string with non-ASCII character entity-ized
-     * @warning Adapted from MediaWiki, claiming fair use: this is a common
-     *       algorithm. If you disagree with this license fudgery,
-     *       implement it yourself.
-     * @note Uses decimal numeric entities since they are best supported.
-     * @note This is a DUMB function: it has no concept of keeping
-     *       character entities that the projected character encoding
-     *       can allow. We could possibly implement a smart version
-     *       but that would require it to also know which Unicode
-     *       codepoints the charset supported (not an easy task).
-     * @note Sort of with cleanUTF8() but it assumes that $str is
-     *       well-formed UTF-8
-     */
-    public static function convertToASCIIDumbLossless($str)
-    {
-        $bytesleft = 0;
-        $result = '';
-        $working = 0;
-        $len = strlen($str);
-        for ($i = 0; $i < $len; $i++) {
-            $bytevalue = ord($str[$i]);
-            if ($bytevalue <= 0x7F) { //0xxx xxxx
-                $result .= chr($bytevalue);
-                $bytesleft = 0;
-            } elseif ($bytevalue <= 0xBF) { //10xx xxxx
-                $working = $working << 6;
-                $working += ($bytevalue & 0x3F);
-                $bytesleft--;
-                if ($bytesleft <= 0) {
-                    $result .= "&#" . $working . ";";
-                }
-            } elseif ($bytevalue <= 0xDF) { //110x xxxx
-                $working = $bytevalue & 0x1F;
-                $bytesleft = 1;
-            } elseif ($bytevalue <= 0xEF) { //1110 xxxx
-                $working = $bytevalue & 0x0F;
-                $bytesleft = 2;
-            } else { //1111 0xxx
-                $working = $bytevalue & 0x07;
-                $bytesleft = 3;
-            }
-        }
-        return $result;
-    }
-
-    /** No bugs detected in iconv. */
-    const ICONV_OK = 0;
-
-    /** Iconv truncates output if converting from UTF-8 to another
-     *  character set with //IGNORE, and a non-encodable character is found */
-    const ICONV_TRUNCATES = 1;
-
-    /** Iconv does not support //IGNORE, making it unusable for
-     *  transcoding purposes */
-    const ICONV_UNUSABLE = 2;
-
-    /**
-     * glibc iconv has a known bug where it doesn't handle the magic
-     * //IGNORE stanza correctly.  In particular, rather than ignore
-     * characters, it will return an EILSEQ after consuming some number
-     * of characters, and expect you to restart iconv as if it were
-     * an E2BIG.  Old versions of PHP did not respect the errno, and
-     * returned the fragment, so as a result you would see iconv
-     * mysteriously truncating output. We can work around this by
-     * manually chopping our input into segments of about 8000
-     * characters, as long as PHP ignores the error code.  If PHP starts
-     * paying attention to the error code, iconv becomes unusable.
-     *
-     * @return int Error code indicating severity of bug.
-     */
-    public static function testIconvTruncateBug()
-    {
-        static $code = null;
-        if ($code === null) {
-            // better not use iconv, otherwise infinite loop!
-            $r = self::unsafeIconv('utf-8', 'ascii//IGNORE', "\xCE\xB1" . str_repeat('a', 9000));
-            if ($r === false) {
-                $code = self::ICONV_UNUSABLE;
-            } elseif (($c = strlen($r)) < 9000) {
-                $code = self::ICONV_TRUNCATES;
-            } elseif ($c > 9000) {
-                trigger_error(
-                    'Your copy of iconv is extremely buggy. Please notify HTML Purifier maintainers: ' .
-                    'include your iconv version as per phpversion()',
-                    E_USER_ERROR
-                );
-            } else {
-                $code = self::ICONV_OK;
-            }
-        }
-        return $code;
-    }
-
-    /**
-     * This expensive function tests whether or not a given character
-     * encoding supports ASCII. 7/8-bit encodings like Shift_JIS will
-     * fail this test, and require special processing. Variable width
-     * encodings shouldn't ever fail.
-     *
-     * @param string $encoding Encoding name to test, as per iconv format
-     * @param bool $bypass Whether or not to bypass the precompiled arrays.
-     * @return Array of UTF-8 characters to their corresponding ASCII,
-     *      which can be used to "undo" any overzealous iconv action.
-     */
-    public static function testEncodingSupportsASCII($encoding, $bypass = false)
-    {
-        // All calls to iconv here are unsafe, proof by case analysis:
-        // If ICONV_OK, no difference.
-        // If ICONV_TRUNCATE, all calls involve one character inputs,
-        // so bug is not triggered.
-        // If ICONV_UNUSABLE, this call is irrelevant
-        static $encodings = array();
-        if (!$bypass) {
-            if (isset($encodings[$encoding])) {
-                return $encodings[$encoding];
-            }
-            $lenc = strtolower($encoding);
-            switch ($lenc) {
-                case 'shift_jis':
-                    return array("\xC2\xA5" => '\\', "\xE2\x80\xBE" => '~');
-                case 'johab':
-                    return array("\xE2\x82\xA9" => '\\');
-            }
-            if (strpos($lenc, 'iso-8859-') === 0) {
-                return array();
-            }
-        }
-        $ret = array();
-        if (self::unsafeIconv('UTF-8', $encoding, 'a') === false) {
-            return false;
-        }
-        for ($i = 0x20; $i <= 0x7E; $i++) { // all printable ASCII chars
-            $c = chr($i); // UTF-8 char
-            $r = self::unsafeIconv('UTF-8', "$encoding//IGNORE", $c); // initial conversion
-            if ($r === '' ||
-                // This line is needed for iconv implementations that do not
-                // omit characters that do not exist in the target character set
-                ($r === $c && self::unsafeIconv($encoding, 'UTF-8//IGNORE', $r) !== $c)
-            ) {
-                // Reverse engineer: what's the UTF-8 equiv of this byte
-                // sequence? This assumes that there's no variable width
-                // encoding that doesn't support ASCII.
-                $ret[self::unsafeIconv($encoding, 'UTF-8//IGNORE', $c)] = $c;
-            }
-        }
-        $encodings[$encoding] = $ret;
-        return $ret;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/EntityLookup.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/EntityLookup.php
deleted file mode 100644
index f12ff13a35..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/EntityLookup.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- * Object that provides entity lookup table from entity name to character
- */
-class HTMLPurifier_EntityLookup
-{
-    /**
-     * Assoc array of entity name to character represented.
-     * @type array
-     */
-    public $table;
-
-    /**
-     * Sets up the entity lookup table from the serialized file contents.
-     * @param bool $file
-     * @note The serialized contents are versioned, but were generated
-     *       using the maintenance script generate_entity_file.php
-     * @warning This is not in constructor to help enforce the Singleton
-     */
-    public function setup($file = false)
-    {
-        if (!$file) {
-            $file = HTMLPURIFIER_PREFIX . '/HTMLPurifier/EntityLookup/entities.ser';
-        }
-        $this->table = unserialize(file_get_contents($file));
-    }
-
-    /**
-     * Retrieves sole instance of the object.
-     * @param bool|HTMLPurifier_EntityLookup $prototype Optional prototype of custom lookup table to overload with.
-     * @return HTMLPurifier_EntityLookup
-     */
-    public static function instance($prototype = false)
-    {
-        // no references, since PHP doesn't copy unless modified
-        static $instance = null;
-        if ($prototype) {
-            $instance = $prototype;
-        } elseif (!$instance) {
-            $instance = new HTMLPurifier_EntityLookup();
-            $instance->setup();
-        }
-        return $instance;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/EntityLookup/entities.ser b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/EntityLookup/entities.ser
deleted file mode 100644
index e8b08128be..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/EntityLookup/entities.ser
+++ /dev/null
@@ -1 +0,0 @@
-a:253:{s:4:"fnof";s:2:"ƒ";s:5:"Alpha";s:2:"Α";s:4:"Beta";s:2:"Β";s:5:"Gamma";s:2:"Γ";s:5:"Delta";s:2:"Δ";s:7:"Epsilon";s:2:"Ε";s:4:"Zeta";s:2:"Ζ";s:3:"Eta";s:2:"Η";s:5:"Theta";s:2:"Θ";s:4:"Iota";s:2:"Ι";s:5:"Kappa";s:2:"Κ";s:6:"Lambda";s:2:"Λ";s:2:"Mu";s:2:"Μ";s:2:"Nu";s:2:"Ν";s:2:"Xi";s:2:"Ξ";s:7:"Omicron";s:2:"Ο";s:2:"Pi";s:2:"Π";s:3:"Rho";s:2:"Ρ";s:5:"Sigma";s:2:"Σ";s:3:"Tau";s:2:"Τ";s:7:"Upsilon";s:2:"Υ";s:3:"Phi";s:2:"Φ";s:3:"Chi";s:2:"Χ";s:3:"Psi";s:2:"Ψ";s:5:"Omega";s:2:"Ω";s:5:"alpha";s:2:"α";s:4:"beta";s:2:"β";s:5:"gamma";s:2:"γ";s:5:"delta";s:2:"δ";s:7:"epsilon";s:2:"ε";s:4:"zeta";s:2:"ζ";s:3:"eta";s:2:"η";s:5:"theta";s:2:"θ";s:4:"iota";s:2:"ι";s:5:"kappa";s:2:"κ";s:6:"lambda";s:2:"λ";s:2:"mu";s:2:"μ";s:2:"nu";s:2:"ν";s:2:"xi";s:2:"ξ";s:7:"omicron";s:2:"ο";s:2:"pi";s:2:"π";s:3:"rho";s:2:"ρ";s:6:"sigmaf";s:2:"ς";s:5:"sigma";s:2:"σ";s:3:"tau";s:2:"τ";s:7:"upsilon";s:2:"υ";s:3:"phi";s:2:"φ";s:3:"chi";s:2:"χ";s:3:"psi";s:2:"ψ";s:5:"omega";s:2:"ω";s:8:"thetasym";s:2:"ϑ";s:5:"upsih";s:2:"ϒ";s:3:"piv";s:2:"ϖ";s:4:"bull";s:3:"•";s:6:"hellip";s:3:"…";s:5:"prime";s:3:"′";s:5:"Prime";s:3:"″";s:5:"oline";s:3:"‾";s:5:"frasl";s:3:"⁄";s:6:"weierp";s:3:"℘";s:5:"image";s:3:"ℑ";s:4:"real";s:3:"ℜ";s:5:"trade";s:3:"™";s:7:"alefsym";s:3:"ℵ";s:4:"larr";s:3:"←";s:4:"uarr";s:3:"↑";s:4:"rarr";s:3:"→";s:4:"darr";s:3:"↓";s:4:"harr";s:3:"↔";s:5:"crarr";s:3:"↵";s:4:"lArr";s:3:"⇐";s:4:"uArr";s:3:"⇑";s:4:"rArr";s:3:"⇒";s:4:"dArr";s:3:"⇓";s:4:"hArr";s:3:"⇔";s:6:"forall";s:3:"∀";s:4:"part";s:3:"∂";s:5:"exist";s:3:"∃";s:5:"empty";s:3:"∅";s:5:"nabla";s:3:"∇";s:4:"isin";s:3:"∈";s:5:"notin";s:3:"∉";s:2:"ni";s:3:"∋";s:4:"prod";s:3:"∏";s:3:"sum";s:3:"∑";s:5:"minus";s:3:"−";s:6:"lowast";s:3:"∗";s:5:"radic";s:3:"√";s:4:"prop";s:3:"∝";s:5:"infin";s:3:"∞";s:3:"ang";s:3:"∠";s:3:"and";s:3:"∧";s:2:"or";s:3:"∨";s:3:"cap";s:3:"∩";s:3:"cup";s:3:"∪";s:3:"int";s:3:"∫";s:6:"there4";s:3:"∴";s:3:"sim";s:3:"∼";s:4:"cong";s:3:"≅";s:5:"asymp";s:3:"≈";s:2:"ne";s:3:"≠";s:5:"equiv";s:3:"≡";s:2:"le";s:3:"≤";s:2:"ge";s:3:"≥";s:3:"sub";s:3:"⊂";s:3:"sup";s:3:"⊃";s:4:"nsub";s:3:"⊄";s:4:"sube";s:3:"⊆";s:4:"supe";s:3:"⊇";s:5:"oplus";s:3:"⊕";s:6:"otimes";s:3:"⊗";s:4:"perp";s:3:"⊥";s:4:"sdot";s:3:"⋅";s:5:"lceil";s:3:"⌈";s:5:"rceil";s:3:"⌉";s:6:"lfloor";s:3:"⌊";s:6:"rfloor";s:3:"⌋";s:4:"lang";s:3:"〈";s:4:"rang";s:3:"〉";s:3:"loz";s:3:"◊";s:6:"spades";s:3:"♠";s:5:"clubs";s:3:"♣";s:6:"hearts";s:3:"♥";s:5:"diams";s:3:"♦";s:4:"quot";s:1:""";s:3:"amp";s:1:"&";s:2:"lt";s:1:"<";s:2:"gt";s:1:">";s:4:"apos";s:1:"'";s:5:"OElig";s:2:"Œ";s:5:"oelig";s:2:"œ";s:6:"Scaron";s:2:"Š";s:6:"scaron";s:2:"š";s:4:"Yuml";s:2:"Ÿ";s:4:"circ";s:2:"ˆ";s:5:"tilde";s:2:"˜";s:4:"ensp";s:3:" ";s:4:"emsp";s:3:" ";s:6:"thinsp";s:3:" ";s:4:"zwnj";s:3:"‌";s:3:"zwj";s:3:"‍";s:3:"lrm";s:3:"‎";s:3:"rlm";s:3:"‏";s:5:"ndash";s:3:"–";s:5:"mdash";s:3:"—";s:5:"lsquo";s:3:"‘";s:5:"rsquo";s:3:"’";s:5:"sbquo";s:3:"‚";s:5:"ldquo";s:3:"“";s:5:"rdquo";s:3:"”";s:5:"bdquo";s:3:"„";s:6:"dagger";s:3:"†";s:6:"Dagger";s:3:"‡";s:6:"permil";s:3:"‰";s:6:"lsaquo";s:3:"‹";s:6:"rsaquo";s:3:"›";s:4:"euro";s:3:"€";s:4:"nbsp";s:2:" ";s:5:"iexcl";s:2:"¡";s:4:"cent";s:2:"¢";s:5:"pound";s:2:"£";s:6:"curren";s:2:"¤";s:3:"yen";s:2:"¥";s:6:"brvbar";s:2:"¦";s:4:"sect";s:2:"§";s:3:"uml";s:2:"¨";s:4:"copy";s:2:"©";s:4:"ordf";s:2:"ª";s:5:"laquo";s:2:"«";s:3:"not";s:2:"¬";s:3:"shy";s:2:"­";s:3:"reg";s:2:"®";s:4:"macr";s:2:"¯";s:3:"deg";s:2:"°";s:6:"plusmn";s:2:"±";s:4:"sup2";s:2:"²";s:4:"sup3";s:2:"³";s:5:"acute";s:2:"´";s:5:"micro";s:2:"µ";s:4:"para";s:2:"¶";s:6:"middot";s:2:"·";s:5:"cedil";s:2:"¸";s:4:"sup1";s:2:"¹";s:4:"ordm";s:2:"º";s:5:"raquo";s:2:"»";s:6:"frac14";s:2:"¼";s:6:"frac12";s:2:"½";s:6:"frac34";s:2:"¾";s:6:"iquest";s:2:"¿";s:6:"Agrave";s:2:"À";s:6:"Aacute";s:2:"Á";s:5:"Acirc";s:2:"Â";s:6:"Atilde";s:2:"Ã";s:4:"Auml";s:2:"Ä";s:5:"Aring";s:2:"Å";s:5:"AElig";s:2:"Æ";s:6:"Ccedil";s:2:"Ç";s:6:"Egrave";s:2:"È";s:6:"Eacute";s:2:"É";s:5:"Ecirc";s:2:"Ê";s:4:"Euml";s:2:"Ë";s:6:"Igrave";s:2:"Ì";s:6:"Iacute";s:2:"Í";s:5:"Icirc";s:2:"Î";s:4:"Iuml";s:2:"Ï";s:3:"ETH";s:2:"Ð";s:6:"Ntilde";s:2:"Ñ";s:6:"Ograve";s:2:"Ò";s:6:"Oacute";s:2:"Ó";s:5:"Ocirc";s:2:"Ô";s:6:"Otilde";s:2:"Õ";s:4:"Ouml";s:2:"Ö";s:5:"times";s:2:"×";s:6:"Oslash";s:2:"Ø";s:6:"Ugrave";s:2:"Ù";s:6:"Uacute";s:2:"Ú";s:5:"Ucirc";s:2:"Û";s:4:"Uuml";s:2:"Ü";s:6:"Yacute";s:2:"Ý";s:5:"THORN";s:2:"Þ";s:5:"szlig";s:2:"ß";s:6:"agrave";s:2:"à";s:6:"aacute";s:2:"á";s:5:"acirc";s:2:"â";s:6:"atilde";s:2:"ã";s:4:"auml";s:2:"ä";s:5:"aring";s:2:"å";s:5:"aelig";s:2:"æ";s:6:"ccedil";s:2:"ç";s:6:"egrave";s:2:"è";s:6:"eacute";s:2:"é";s:5:"ecirc";s:2:"ê";s:4:"euml";s:2:"ë";s:6:"igrave";s:2:"ì";s:6:"iacute";s:2:"í";s:5:"icirc";s:2:"î";s:4:"iuml";s:2:"ï";s:3:"eth";s:2:"ð";s:6:"ntilde";s:2:"ñ";s:6:"ograve";s:2:"ò";s:6:"oacute";s:2:"ó";s:5:"ocirc";s:2:"ô";s:6:"otilde";s:2:"õ";s:4:"ouml";s:2:"ö";s:6:"divide";s:2:"÷";s:6:"oslash";s:2:"ø";s:6:"ugrave";s:2:"ù";s:6:"uacute";s:2:"ú";s:5:"ucirc";s:2:"û";s:4:"uuml";s:2:"ü";s:6:"yacute";s:2:"ý";s:5:"thorn";s:2:"þ";s:4:"yuml";s:2:"ÿ";}
\ No newline at end of file
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/EntityParser.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/EntityParser.php
deleted file mode 100644
index 3ef2d09ec6..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/EntityParser.php
+++ /dev/null
@@ -1,285 +0,0 @@
-<?php
-
-// if want to implement error collecting here, we'll need to use some sort
-// of global data (probably trigger_error) because it's impossible to pass
-// $config or $context to the callback functions.
-
-/**
- * Handles referencing and derefencing character entities
- */
-class HTMLPurifier_EntityParser
-{
-
-    /**
-     * Reference to entity lookup table.
-     * @type HTMLPurifier_EntityLookup
-     */
-    protected $_entity_lookup;
-
-    /**
-     * Callback regex string for entities in text.
-     * @type string
-     */
-    protected $_textEntitiesRegex;
-
-    /**
-     * Callback regex string for entities in attributes.
-     * @type string
-     */
-    protected $_attrEntitiesRegex;
-
-    /**
-     * Tests if the beginning of a string is a semi-optional regex
-     */
-    protected $_semiOptionalPrefixRegex;
-
-    public function __construct() {
-        // From
-        // http://stackoverflow.com/questions/15532252/why-is-reg-being-rendered-as-without-the-bounding-semicolon
-        $semi_optional = "quot|QUOT|lt|LT|gt|GT|amp|AMP|AElig|Aacute|Acirc|Agrave|Aring|Atilde|Auml|COPY|Ccedil|ETH|Eacute|Ecirc|Egrave|Euml|Iacute|Icirc|Igrave|Iuml|Ntilde|Oacute|Ocirc|Ograve|Oslash|Otilde|Ouml|REG|THORN|Uacute|Ucirc|Ugrave|Uuml|Yacute|aacute|acirc|acute|aelig|agrave|aring|atilde|auml|brvbar|ccedil|cedil|cent|copy|curren|deg|divide|eacute|ecirc|egrave|eth|euml|frac12|frac14|frac34|iacute|icirc|iexcl|igrave|iquest|iuml|laquo|macr|micro|middot|nbsp|not|ntilde|oacute|ocirc|ograve|ordf|ordm|oslash|otilde|ouml|para|plusmn|pound|raquo|reg|sect|shy|sup1|sup2|sup3|szlig|thorn|times|uacute|ucirc|ugrave|uml|uuml|yacute|yen|yuml";
-
-        // NB: three empty captures to put the fourth match in the right
-        // place
-        $this->_semiOptionalPrefixRegex = "/&()()()($semi_optional)/";
-
-        $this->_textEntitiesRegex =
-            '/&(?:'.
-            // hex
-            '[#]x([a-fA-F0-9]+);?|'.
-            // dec
-            '[#]0*(\d+);?|'.
-            // string (mandatory semicolon)
-            // NB: order matters: match semicolon preferentially
-            '([A-Za-z_:][A-Za-z0-9.\-_:]*);|'.
-            // string (optional semicolon)
-            "($semi_optional)".
-            ')/';
-
-        $this->_attrEntitiesRegex =
-            '/&(?:'.
-            // hex
-            '[#]x([a-fA-F0-9]+);?|'.
-            // dec
-            '[#]0*(\d+);?|'.
-            // string (mandatory semicolon)
-            // NB: order matters: match semicolon preferentially
-            '([A-Za-z_:][A-Za-z0-9.\-_:]*);|'.
-            // string (optional semicolon)
-            // don't match if trailing is equals or alphanumeric (URL
-            // like)
-            "($semi_optional)(?![=;A-Za-z0-9])".
-            ')/';
-
-    }
-
-    /**
-     * Substitute entities with the parsed equivalents.  Use this on
-     * textual data in an HTML document (as opposed to attributes.)
-     *
-     * @param string $string String to have entities parsed.
-     * @return string Parsed string.
-     */
-    public function substituteTextEntities($string)
-    {
-        return preg_replace_callback(
-            $this->_textEntitiesRegex,
-            array($this, 'entityCallback'),
-            $string
-        );
-    }
-
-    /**
-     * Substitute entities with the parsed equivalents.  Use this on
-     * attribute contents in documents.
-     *
-     * @param string $string String to have entities parsed.
-     * @return string Parsed string.
-     */
-    public function substituteAttrEntities($string)
-    {
-        return preg_replace_callback(
-            $this->_attrEntitiesRegex,
-            array($this, 'entityCallback'),
-            $string
-        );
-    }
-
-    /**
-     * Callback function for substituteNonSpecialEntities() that does the work.
-     *
-     * @param array $matches  PCRE matches array, with 0 the entire match, and
-     *                  either index 1, 2 or 3 set with a hex value, dec value,
-     *                  or string (respectively).
-     * @return string Replacement string.
-     */
-
-    protected function entityCallback($matches)
-    {
-        $entity = $matches[0];
-        $hex_part = @$matches[1];
-        $dec_part = @$matches[2];
-        $named_part = empty($matches[3]) ? (empty($matches[4]) ? "" : $matches[4]) : $matches[3];
-        if ($hex_part !== NULL && $hex_part !== "") {
-            return HTMLPurifier_Encoder::unichr(hexdec($hex_part));
-        } elseif ($dec_part !== NULL && $dec_part !== "") {
-            return HTMLPurifier_Encoder::unichr((int) $dec_part);
-        } else {
-            if (!$this->_entity_lookup) {
-                $this->_entity_lookup = HTMLPurifier_EntityLookup::instance();
-            }
-            if (isset($this->_entity_lookup->table[$named_part])) {
-                return $this->_entity_lookup->table[$named_part];
-            } else {
-                // exact match didn't match anything, so test if
-                // any of the semicolon optional match the prefix.
-                // Test that this is an EXACT match is important to
-                // prevent infinite loop
-                if (!empty($matches[3])) {
-                    return preg_replace_callback(
-                        $this->_semiOptionalPrefixRegex,
-                        array($this, 'entityCallback'),
-                        $entity
-                    );
-                }
-                return $entity;
-            }
-        }
-    }
-
-    // LEGACY CODE BELOW
-
-    /**
-     * Callback regex string for parsing entities.
-     * @type string
-     */
-    protected $_substituteEntitiesRegex =
-        '/&(?:[#]x([a-fA-F0-9]+)|[#]0*(\d+)|([A-Za-z_:][A-Za-z0-9.\-_:]*));?/';
-        //     1. hex             2. dec      3. string (XML style)
-
-    /**
-     * Decimal to parsed string conversion table for special entities.
-     * @type array
-     */
-    protected $_special_dec2str =
-            array(
-                    34 => '"',
-                    38 => '&',
-                    39 => "'",
-                    60 => '<',
-                    62 => '>'
-            );
-
-    /**
-     * Stripped entity names to decimal conversion table for special entities.
-     * @type array
-     */
-    protected $_special_ent2dec =
-            array(
-                    'quot' => 34,
-                    'amp'  => 38,
-                    'lt'   => 60,
-                    'gt'   => 62
-            );
-
-    /**
-     * Substitutes non-special entities with their parsed equivalents. Since
-     * running this whenever you have parsed character is t3h 5uck, we run
-     * it before everything else.
-     *
-     * @param string $string String to have non-special entities parsed.
-     * @return string Parsed string.
-     */
-    public function substituteNonSpecialEntities($string)
-    {
-        // it will try to detect missing semicolons, but don't rely on it
-        return preg_replace_callback(
-            $this->_substituteEntitiesRegex,
-            array($this, 'nonSpecialEntityCallback'),
-            $string
-        );
-    }
-
-    /**
-     * Callback function for substituteNonSpecialEntities() that does the work.
-     *
-     * @param array $matches  PCRE matches array, with 0 the entire match, and
-     *                  either index 1, 2 or 3 set with a hex value, dec value,
-     *                  or string (respectively).
-     * @return string Replacement string.
-     */
-
-    protected function nonSpecialEntityCallback($matches)
-    {
-        // replaces all but big five
-        $entity = $matches[0];
-        $is_num = (@$matches[0][1] === '#');
-        if ($is_num) {
-            $is_hex = (@$entity[2] === 'x');
-            $code = $is_hex ? hexdec($matches[1]) : (int) $matches[2];
-            // abort for special characters
-            if (isset($this->_special_dec2str[$code])) {
-                return $entity;
-            }
-            return HTMLPurifier_Encoder::unichr($code);
-        } else {
-            if (isset($this->_special_ent2dec[$matches[3]])) {
-                return $entity;
-            }
-            if (!$this->_entity_lookup) {
-                $this->_entity_lookup = HTMLPurifier_EntityLookup::instance();
-            }
-            if (isset($this->_entity_lookup->table[$matches[3]])) {
-                return $this->_entity_lookup->table[$matches[3]];
-            } else {
-                return $entity;
-            }
-        }
-    }
-
-    /**
-     * Substitutes only special entities with their parsed equivalents.
-     *
-     * @notice We try to avoid calling this function because otherwise, it
-     * would have to be called a lot (for every parsed section).
-     *
-     * @param string $string String to have non-special entities parsed.
-     * @return string Parsed string.
-     */
-    public function substituteSpecialEntities($string)
-    {
-        return preg_replace_callback(
-            $this->_substituteEntitiesRegex,
-            array($this, 'specialEntityCallback'),
-            $string
-        );
-    }
-
-    /**
-     * Callback function for substituteSpecialEntities() that does the work.
-     *
-     * This callback has same syntax as nonSpecialEntityCallback().
-     *
-     * @param array $matches  PCRE-style matches array, with 0 the entire match, and
-     *                  either index 1, 2 or 3 set with a hex value, dec value,
-     *                  or string (respectively).
-     * @return string Replacement string.
-     */
-    protected function specialEntityCallback($matches)
-    {
-        $entity = $matches[0];
-        $is_num = (@$matches[0][1] === '#');
-        if ($is_num) {
-            $is_hex = (@$entity[2] === 'x');
-            $int = $is_hex ? hexdec($matches[1]) : (int) $matches[2];
-            return isset($this->_special_dec2str[$int]) ?
-                $this->_special_dec2str[$int] :
-                $entity;
-        } else {
-            return isset($this->_special_ent2dec[$matches[3]]) ?
-                $this->_special_dec2str[$this->_special_ent2dec[$matches[3]]] :
-                $entity;
-        }
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ErrorCollector.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ErrorCollector.php
deleted file mode 100644
index d47e3f2e24..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ErrorCollector.php
+++ /dev/null
@@ -1,244 +0,0 @@
-<?php
-
-/**
- * Error collection class that enables HTML Purifier to report HTML
- * problems back to the user
- */
-class HTMLPurifier_ErrorCollector
-{
-
-    /**
-     * Identifiers for the returned error array. These are purposely numeric
-     * so list() can be used.
-     */
-    const LINENO   = 0;
-    const SEVERITY = 1;
-    const MESSAGE  = 2;
-    const CHILDREN = 3;
-
-    /**
-     * @type array
-     */
-    protected $errors;
-
-    /**
-     * @type array
-     */
-    protected $_current;
-
-    /**
-     * @type array
-     */
-    protected $_stacks = array(array());
-
-    /**
-     * @type HTMLPurifier_Language
-     */
-    protected $locale;
-
-    /**
-     * @type HTMLPurifier_Generator
-     */
-    protected $generator;
-
-    /**
-     * @type HTMLPurifier_Context
-     */
-    protected $context;
-
-    /**
-     * @type array
-     */
-    protected $lines = array();
-
-    /**
-     * @param HTMLPurifier_Context $context
-     */
-    public function __construct($context)
-    {
-        $this->locale    =& $context->get('Locale');
-        $this->context   = $context;
-        $this->_current  =& $this->_stacks[0];
-        $this->errors    =& $this->_stacks[0];
-    }
-
-    /**
-     * Sends an error message to the collector for later use
-     * @param int $severity Error severity, PHP error style (don't use E_USER_)
-     * @param string $msg Error message text
-     */
-    public function send($severity, $msg)
-    {
-        $args = array();
-        if (func_num_args() > 2) {
-            $args = func_get_args();
-            array_shift($args);
-            unset($args[0]);
-        }
-
-        $token = $this->context->get('CurrentToken', true);
-        $line  = $token ? $token->line : $this->context->get('CurrentLine', true);
-        $col   = $token ? $token->col  : $this->context->get('CurrentCol', true);
-        $attr  = $this->context->get('CurrentAttr', true);
-
-        // perform special substitutions, also add custom parameters
-        $subst = array();
-        if (!is_null($token)) {
-            $args['CurrentToken'] = $token;
-        }
-        if (!is_null($attr)) {
-            $subst['$CurrentAttr.Name'] = $attr;
-            if (isset($token->attr[$attr])) {
-                $subst['$CurrentAttr.Value'] = $token->attr[$attr];
-            }
-        }
-
-        if (empty($args)) {
-            $msg = $this->locale->getMessage($msg);
-        } else {
-            $msg = $this->locale->formatMessage($msg, $args);
-        }
-
-        if (!empty($subst)) {
-            $msg = strtr($msg, $subst);
-        }
-
-        // (numerically indexed)
-        $error = array(
-            self::LINENO   => $line,
-            self::SEVERITY => $severity,
-            self::MESSAGE  => $msg,
-            self::CHILDREN => array()
-        );
-        $this->_current[] = $error;
-
-        // NEW CODE BELOW ...
-        // Top-level errors are either:
-        //  TOKEN type, if $value is set appropriately, or
-        //  "syntax" type, if $value is null
-        $new_struct = new HTMLPurifier_ErrorStruct();
-        $new_struct->type = HTMLPurifier_ErrorStruct::TOKEN;
-        if ($token) {
-            $new_struct->value = clone $token;
-        }
-        if (is_int($line) && is_int($col)) {
-            if (isset($this->lines[$line][$col])) {
-                $struct = $this->lines[$line][$col];
-            } else {
-                $struct = $this->lines[$line][$col] = $new_struct;
-            }
-            // These ksorts may present a performance problem
-            ksort($this->lines[$line], SORT_NUMERIC);
-        } else {
-            if (isset($this->lines[-1])) {
-                $struct = $this->lines[-1];
-            } else {
-                $struct = $this->lines[-1] = $new_struct;
-            }
-        }
-        ksort($this->lines, SORT_NUMERIC);
-
-        // Now, check if we need to operate on a lower structure
-        if (!empty($attr)) {
-            $struct = $struct->getChild(HTMLPurifier_ErrorStruct::ATTR, $attr);
-            if (!$struct->value) {
-                $struct->value = array($attr, 'PUT VALUE HERE');
-            }
-        }
-        if (!empty($cssprop)) {
-            $struct = $struct->getChild(HTMLPurifier_ErrorStruct::CSSPROP, $cssprop);
-            if (!$struct->value) {
-                // if we tokenize CSS this might be a little more difficult to do
-                $struct->value = array($cssprop, 'PUT VALUE HERE');
-            }
-        }
-
-        // Ok, structs are all setup, now time to register the error
-        $struct->addError($severity, $msg);
-    }
-
-    /**
-     * Retrieves raw error data for custom formatter to use
-     */
-    public function getRaw()
-    {
-        return $this->errors;
-    }
-
-    /**
-     * Default HTML formatting implementation for error messages
-     * @param HTMLPurifier_Config $config Configuration, vital for HTML output nature
-     * @param array $errors Errors array to display; used for recursion.
-     * @return string
-     */
-    public function getHTMLFormatted($config, $errors = null)
-    {
-        $ret = array();
-
-        $this->generator = new HTMLPurifier_Generator($config, $this->context);
-        if ($errors === null) {
-            $errors = $this->errors;
-        }
-
-        // 'At line' message needs to be removed
-
-        // generation code for new structure goes here. It needs to be recursive.
-        foreach ($this->lines as $line => $col_array) {
-            if ($line == -1) {
-                continue;
-            }
-            foreach ($col_array as $col => $struct) {
-                $this->_renderStruct($ret, $struct, $line, $col);
-            }
-        }
-        if (isset($this->lines[-1])) {
-            $this->_renderStruct($ret, $this->lines[-1]);
-        }
-
-        if (empty($errors)) {
-            return '<p>' . $this->locale->getMessage('ErrorCollector: No errors') . '</p>';
-        } else {
-            return '<ul><li>' . implode('</li><li>', $ret) . '</li></ul>';
-        }
-
-    }
-
-    private function _renderStruct(&$ret, $struct, $line = null, $col = null)
-    {
-        $stack = array($struct);
-        $context_stack = array(array());
-        while ($current = array_pop($stack)) {
-            $context = array_pop($context_stack);
-            foreach ($current->errors as $error) {
-                list($severity, $msg) = $error;
-                $string = '';
-                $string .= '<div>';
-                // W3C uses an icon to indicate the severity of the error.
-                $error = $this->locale->getErrorName($severity);
-                $string .= "<span class=\"error e$severity\"><strong>$error</strong></span> ";
-                if (!is_null($line) && !is_null($col)) {
-                    $string .= "<em class=\"location\">Line $line, Column $col: </em> ";
-                } else {
-                    $string .= '<em class="location">End of Document: </em> ';
-                }
-                $string .= '<strong class="description">' . $this->generator->escape($msg) . '</strong> ';
-                $string .= '</div>';
-                // Here, have a marker for the character on the column appropriate.
-                // Be sure to clip extremely long lines.
-                //$string .= '<pre>';
-                //$string .= '';
-                //$string .= '</pre>';
-                $ret[] = $string;
-            }
-            foreach ($current->children as $array) {
-                $context[] = $current;
-                $stack = array_merge($stack, array_reverse($array, true));
-                for ($i = count($array); $i > 0; $i--) {
-                    $context_stack[] = $context;
-                }
-            }
-        }
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ErrorStruct.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ErrorStruct.php
deleted file mode 100644
index cf869d3212..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ErrorStruct.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-/**
- * Records errors for particular segments of an HTML document such as tokens,
- * attributes or CSS properties. They can contain error structs (which apply
- * to components of what they represent), but their main purpose is to hold
- * errors applying to whatever struct is being used.
- */
-class HTMLPurifier_ErrorStruct
-{
-
-    /**
-     * Possible values for $children first-key. Note that top-level structures
-     * are automatically token-level.
-     */
-    const TOKEN     = 0;
-    const ATTR      = 1;
-    const CSSPROP   = 2;
-
-    /**
-     * Type of this struct.
-     * @type string
-     */
-    public $type;
-
-    /**
-     * Value of the struct we are recording errors for. There are various
-     * values for this:
-     *  - TOKEN: Instance of HTMLPurifier_Token
-     *  - ATTR: array('attr-name', 'value')
-     *  - CSSPROP: array('prop-name', 'value')
-     * @type mixed
-     */
-    public $value;
-
-    /**
-     * Errors registered for this structure.
-     * @type array
-     */
-    public $errors = array();
-
-    /**
-     * Child ErrorStructs that are from this structure. For example, a TOKEN
-     * ErrorStruct would contain ATTR ErrorStructs. This is a multi-dimensional
-     * array in structure: [TYPE]['identifier']
-     * @type array
-     */
-    public $children = array();
-
-    /**
-     * @param string $type
-     * @param string $id
-     * @return mixed
-     */
-    public function getChild($type, $id)
-    {
-        if (!isset($this->children[$type][$id])) {
-            $this->children[$type][$id] = new HTMLPurifier_ErrorStruct();
-            $this->children[$type][$id]->type = $type;
-        }
-        return $this->children[$type][$id];
-    }
-
-    /**
-     * @param int $severity
-     * @param string $message
-     */
-    public function addError($severity, $message)
-    {
-        $this->errors[] = array($severity, $message);
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Exception.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Exception.php
deleted file mode 100644
index be85b4c560..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Exception.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-/**
- * Global exception class for HTML Purifier; any exceptions we throw
- * are from here.
- */
-class HTMLPurifier_Exception extends Exception
-{
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Filter.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Filter.php
deleted file mode 100644
index c1f41ee162..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Filter.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/**
- * Represents a pre or post processing filter on HTML Purifier's output
- *
- * Sometimes, a little ad-hoc fixing of HTML has to be done before
- * it gets sent through HTML Purifier: you can use filters to acheive
- * this effect. For instance, YouTube videos can be preserved using
- * this manner. You could have used a decorator for this task, but
- * PHP's support for them is not terribly robust, so we're going
- * to just loop through the filters.
- *
- * Filters should be exited first in, last out. If there are three filters,
- * named 1, 2 and 3, the order of execution should go 1->preFilter,
- * 2->preFilter, 3->preFilter, purify, 3->postFilter, 2->postFilter,
- * 1->postFilter.
- *
- * @note Methods are not declared abstract as it is perfectly legitimate
- *       for an implementation not to want anything to happen on a step
- */
-
-class HTMLPurifier_Filter
-{
-
-    /**
-     * Name of the filter for identification purposes.
-     * @type string
-     */
-    public $name;
-
-    /**
-     * Pre-processor function, handles HTML before HTML Purifier
-     * @param string $html
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return string
-     */
-    public function preFilter($html, $config, $context)
-    {
-        return $html;
-    }
-
-    /**
-     * Post-processor function, handles HTML after HTML Purifier
-     * @param string $html
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return string
-     */
-    public function postFilter($html, $config, $context)
-    {
-        return $html;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Filter/ExtractStyleBlocks.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Filter/ExtractStyleBlocks.php
deleted file mode 100644
index 66f70b0fc0..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Filter/ExtractStyleBlocks.php
+++ /dev/null
@@ -1,341 +0,0 @@
-<?php
-
-// why is this a top level function? Because PHP 5.2.0 doesn't seem to
-// understand how to interpret this filter if it's a static method.
-// It's all really silly, but if we go this route it might be reasonable
-// to coalesce all of these methods into one.
-function htmlpurifier_filter_extractstyleblocks_muteerrorhandler()
-{
-}
-
-/**
- * This filter extracts <style> blocks from input HTML, cleans them up
- * using CSSTidy, and then places them in $purifier->context->get('StyleBlocks')
- * so they can be used elsewhere in the document.
- *
- * @note
- *      See tests/HTMLPurifier/Filter/ExtractStyleBlocksTest.php for
- *      sample usage.
- *
- * @note
- *      This filter can also be used on stylesheets not included in the
- *      document--something purists would probably prefer. Just directly
- *      call HTMLPurifier_Filter_ExtractStyleBlocks->cleanCSS()
- */
-class HTMLPurifier_Filter_ExtractStyleBlocks extends HTMLPurifier_Filter
-{
-    /**
-     * @type string
-     */
-    public $name = 'ExtractStyleBlocks';
-
-    /**
-     * @type array
-     */
-    private $_styleMatches = array();
-
-    /**
-     * @type csstidy
-     */
-    private $_tidy;
-
-    /**
-     * @type HTMLPurifier_AttrDef_HTML_ID
-     */
-    private $_id_attrdef;
-
-    /**
-     * @type HTMLPurifier_AttrDef_CSS_Ident
-     */
-    private $_class_attrdef;
-
-    /**
-     * @type HTMLPurifier_AttrDef_Enum
-     */
-    private $_enum_attrdef;
-
-    public function __construct()
-    {
-        $this->_tidy = new csstidy();
-        $this->_tidy->set_cfg('lowercase_s', false);
-        $this->_id_attrdef = new HTMLPurifier_AttrDef_HTML_ID(true);
-        $this->_class_attrdef = new HTMLPurifier_AttrDef_CSS_Ident();
-        $this->_enum_attrdef = new HTMLPurifier_AttrDef_Enum(
-            array(
-                'first-child',
-                'link',
-                'visited',
-                'active',
-                'hover',
-                'focus'
-            )
-        );
-    }
-
-    /**
-     * Save the contents of CSS blocks to style matches
-     * @param array $matches preg_replace style $matches array
-     */
-    protected function styleCallback($matches)
-    {
-        $this->_styleMatches[] = $matches[1];
-    }
-
-    /**
-     * Removes inline <style> tags from HTML, saves them for later use
-     * @param string $html
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return string
-     * @todo Extend to indicate non-text/css style blocks
-     */
-    public function preFilter($html, $config, $context)
-    {
-        $tidy = $config->get('Filter.ExtractStyleBlocks.TidyImpl');
-        if ($tidy !== null) {
-            $this->_tidy = $tidy;
-        }
-        // NB: this must be NON-greedy because if we have
-        // <style>foo</style>  <style>bar</style>
-        // we must not grab foo</style>  <style>bar
-        $html = preg_replace_callback('#<style(?:\s.*)?>(.*)<\/style>#isU', array($this, 'styleCallback'), $html);
-        $style_blocks = $this->_styleMatches;
-        $this->_styleMatches = array(); // reset
-        $context->register('StyleBlocks', $style_blocks); // $context must not be reused
-        if ($this->_tidy) {
-            foreach ($style_blocks as &$style) {
-                $style = $this->cleanCSS($style, $config, $context);
-            }
-        }
-        return $html;
-    }
-
-    /**
-     * Takes CSS (the stuff found in <style>) and cleans it.
-     * @warning Requires CSSTidy <http://csstidy.sourceforge.net/>
-     * @param string $css CSS styling to clean
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @throws HTMLPurifier_Exception
-     * @return string Cleaned CSS
-     */
-    public function cleanCSS($css, $config, $context)
-    {
-        // prepare scope
-        $scope = $config->get('Filter.ExtractStyleBlocks.Scope');
-        if ($scope !== null) {
-            $scopes = array_map('trim', explode(',', $scope));
-        } else {
-            $scopes = array();
-        }
-        // remove comments from CSS
-        $css = trim($css);
-        if (strncmp('<!--', $css, 4) === 0) {
-            $css = substr($css, 4);
-        }
-        if (strlen($css) > 3 && substr($css, -3) == '-->') {
-            $css = substr($css, 0, -3);
-        }
-        $css = trim($css);
-        set_error_handler('htmlpurifier_filter_extractstyleblocks_muteerrorhandler');
-        $this->_tidy->parse($css);
-        restore_error_handler();
-        $css_definition = $config->getDefinition('CSS');
-        $html_definition = $config->getDefinition('HTML');
-        $new_css = array();
-        foreach ($this->_tidy->css as $k => $decls) {
-            // $decls are all CSS declarations inside an @ selector
-            $new_decls = array();
-            foreach ($decls as $selector => $style) {
-                $selector = trim($selector);
-                if ($selector === '') {
-                    continue;
-                } // should not happen
-                // Parse the selector
-                // Here is the relevant part of the CSS grammar:
-                //
-                // ruleset
-                //   : selector [ ',' S* selector ]* '{' ...
-                // selector
-                //   : simple_selector [ combinator selector | S+ [ combinator? selector ]? ]?
-                // combinator
-                //   : '+' S*
-                //   : '>' S*
-                // simple_selector
-                //   : element_name [ HASH | class | attrib | pseudo ]*
-                //   | [ HASH | class | attrib | pseudo ]+
-                // element_name
-                //   : IDENT | '*'
-                //   ;
-                // class
-                //   : '.' IDENT
-                //   ;
-                // attrib
-                //   : '[' S* IDENT S* [ [ '=' | INCLUDES | DASHMATCH ] S*
-                //     [ IDENT | STRING ] S* ]? ']'
-                //   ;
-                // pseudo
-                //   : ':' [ IDENT | FUNCTION S* [IDENT S*]? ')' ]
-                //   ;
-                //
-                // For reference, here are the relevant tokens:
-                //
-                // HASH         #{name}
-                // IDENT        {ident}
-                // INCLUDES     ==
-                // DASHMATCH    |=
-                // STRING       {string}
-                // FUNCTION     {ident}\(
-                //
-                // And the lexical scanner tokens
-                //
-                // name         {nmchar}+
-                // nmchar       [_a-z0-9-]|{nonascii}|{escape}
-                // nonascii     [\240-\377]
-                // escape       {unicode}|\\[^\r\n\f0-9a-f]
-                // unicode      \\{h}}{1,6}(\r\n|[ \t\r\n\f])?
-                // ident        -?{nmstart}{nmchar*}
-                // nmstart      [_a-z]|{nonascii}|{escape}
-                // string       {string1}|{string2}
-                // string1      \"([^\n\r\f\\"]|\\{nl}|{escape})*\"
-                // string2      \'([^\n\r\f\\"]|\\{nl}|{escape})*\'
-                //
-                // We'll implement a subset (in order to reduce attack
-                // surface); in particular:
-                //
-                //      - No Unicode support
-                //      - No escapes support
-                //      - No string support (by proxy no attrib support)
-                //      - element_name is matched against allowed
-                //        elements (some people might find this
-                //        annoying...)
-                //      - Pseudo-elements one of :first-child, :link,
-                //        :visited, :active, :hover, :focus
-
-                // handle ruleset
-                $selectors = array_map('trim', explode(',', $selector));
-                $new_selectors = array();
-                foreach ($selectors as $sel) {
-                    // split on +, > and spaces
-                    $basic_selectors = preg_split('/\s*([+> ])\s*/', $sel, -1, PREG_SPLIT_DELIM_CAPTURE);
-                    // even indices are chunks, odd indices are
-                    // delimiters
-                    $nsel = null;
-                    $delim = null; // guaranteed to be non-null after
-                    // two loop iterations
-                    for ($i = 0, $c = count($basic_selectors); $i < $c; $i++) {
-                        $x = $basic_selectors[$i];
-                        if ($i % 2) {
-                            // delimiter
-                            if ($x === ' ') {
-                                $delim = ' ';
-                            } else {
-                                $delim = ' ' . $x . ' ';
-                            }
-                        } else {
-                            // simple selector
-                            $components = preg_split('/([#.:])/', $x, -1, PREG_SPLIT_DELIM_CAPTURE);
-                            $sdelim = null;
-                            $nx = null;
-                            for ($j = 0, $cc = count($components); $j < $cc; $j++) {
-                                $y = $components[$j];
-                                if ($j === 0) {
-                                    if ($y === '*' || isset($html_definition->info[$y = strtolower($y)])) {
-                                        $nx = $y;
-                                    } else {
-                                        // $nx stays null; this matters
-                                        // if we don't manage to find
-                                        // any valid selector content,
-                                        // in which case we ignore the
-                                        // outer $delim
-                                    }
-                                } elseif ($j % 2) {
-                                    // set delimiter
-                                    $sdelim = $y;
-                                } else {
-                                    $attrdef = null;
-                                    if ($sdelim === '#') {
-                                        $attrdef = $this->_id_attrdef;
-                                    } elseif ($sdelim === '.') {
-                                        $attrdef = $this->_class_attrdef;
-                                    } elseif ($sdelim === ':') {
-                                        $attrdef = $this->_enum_attrdef;
-                                    } else {
-                                        throw new HTMLPurifier_Exception('broken invariant sdelim and preg_split');
-                                    }
-                                    $r = $attrdef->validate($y, $config, $context);
-                                    if ($r !== false) {
-                                        if ($r !== true) {
-                                            $y = $r;
-                                        }
-                                        if ($nx === null) {
-                                            $nx = '';
-                                        }
-                                        $nx .= $sdelim . $y;
-                                    }
-                                }
-                            }
-                            if ($nx !== null) {
-                                if ($nsel === null) {
-                                    $nsel = $nx;
-                                } else {
-                                    $nsel .= $delim . $nx;
-                                }
-                            } else {
-                                // delimiters to the left of invalid
-                                // basic selector ignored
-                            }
-                        }
-                    }
-                    if ($nsel !== null) {
-                        if (!empty($scopes)) {
-                            foreach ($scopes as $s) {
-                                $new_selectors[] = "$s $nsel";
-                            }
-                        } else {
-                            $new_selectors[] = $nsel;
-                        }
-                    }
-                }
-                if (empty($new_selectors)) {
-                    continue;
-                }
-                $selector = implode(', ', $new_selectors);
-                foreach ($style as $name => $value) {
-                    if (!isset($css_definition->info[$name])) {
-                        unset($style[$name]);
-                        continue;
-                    }
-                    $def = $css_definition->info[$name];
-                    $ret = $def->validate($value, $config, $context);
-                    if ($ret === false) {
-                        unset($style[$name]);
-                    } else {
-                        $style[$name] = $ret;
-                    }
-                }
-                $new_decls[$selector] = $style;
-            }
-            $new_css[$k] = $new_decls;
-        }
-        // remove stuff that shouldn't be used, could be reenabled
-        // after security risks are analyzed
-        $this->_tidy->css = $new_css;
-        $this->_tidy->import = array();
-        $this->_tidy->charset = null;
-        $this->_tidy->namespace = null;
-        $css = $this->_tidy->print->plain();
-        // we are going to escape any special characters <>& to ensure
-        // that no funny business occurs (i.e. </style> in a font-family prop).
-        if ($config->get('Filter.ExtractStyleBlocks.Escaping')) {
-            $css = str_replace(
-                array('<', '>', '&'),
-                array('\3C ', '\3E ', '\26 '),
-                $css
-            );
-        }
-        return $css;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Filter/YouTube.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Filter/YouTube.php
deleted file mode 100644
index 276d8362fa..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Filter/YouTube.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-class HTMLPurifier_Filter_YouTube extends HTMLPurifier_Filter
-{
-
-    /**
-     * @type string
-     */
-    public $name = 'YouTube';
-
-    /**
-     * @param string $html
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return string
-     */
-    public function preFilter($html, $config, $context)
-    {
-        $pre_regex = '#<object[^>]+>.+?' .
-            '(?:http:)?//www.youtube.com/((?:v|cp)/[A-Za-z0-9\-_=]+).+?</object>#s';
-        $pre_replace = '<span class="youtube-embed">\1</span>';
-        return preg_replace($pre_regex, $pre_replace, $html);
-    }
-
-    /**
-     * @param string $html
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return string
-     */
-    public function postFilter($html, $config, $context)
-    {
-        $post_regex = '#<span class="youtube-embed">((?:v|cp)/[A-Za-z0-9\-_=]+)</span>#';
-        return preg_replace_callback($post_regex, array($this, 'postFilterCallback'), $html);
-    }
-
-    /**
-     * @param $url
-     * @return string
-     */
-    protected function armorUrl($url)
-    {
-        return str_replace('--', '-&#45;', $url);
-    }
-
-    /**
-     * @param array $matches
-     * @return string
-     */
-    protected function postFilterCallback($matches)
-    {
-        $url = $this->armorUrl($matches[1]);
-        return '<object width="425" height="350" type="application/x-shockwave-flash" ' .
-        'data="//www.youtube.com/' . $url . '">' .
-        '<param name="movie" value="//www.youtube.com/' . $url . '"></param>' .
-        '<!--[if IE]>' .
-        '<embed src="//www.youtube.com/' . $url . '"' .
-        'type="application/x-shockwave-flash"' .
-        'wmode="transparent" width="425" height="350" />' .
-        '<![endif]-->' .
-        '</object>';
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Generator.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Generator.php
deleted file mode 100644
index eb56e2dfa2..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Generator.php
+++ /dev/null
@@ -1,286 +0,0 @@
-<?php
-
-/**
- * Generates HTML from tokens.
- * @todo Refactor interface so that configuration/context is determined
- *       upon instantiation, no need for messy generateFromTokens() calls
- * @todo Make some of the more internal functions protected, and have
- *       unit tests work around that
- */
-class HTMLPurifier_Generator
-{
-
-    /**
-     * Whether or not generator should produce XML output.
-     * @type bool
-     */
-    private $_xhtml = true;
-
-    /**
-     * :HACK: Whether or not generator should comment the insides of <script> tags.
-     * @type bool
-     */
-    private $_scriptFix = false;
-
-    /**
-     * Cache of HTMLDefinition during HTML output to determine whether or
-     * not attributes should be minimized.
-     * @type HTMLPurifier_HTMLDefinition
-     */
-    private $_def;
-
-    /**
-     * Cache of %Output.SortAttr.
-     * @type bool
-     */
-    private $_sortAttr;
-
-    /**
-     * Cache of %Output.FlashCompat.
-     * @type bool
-     */
-    private $_flashCompat;
-
-    /**
-     * Cache of %Output.FixInnerHTML.
-     * @type bool
-     */
-    private $_innerHTMLFix;
-
-    /**
-     * Stack for keeping track of object information when outputting IE
-     * compatibility code.
-     * @type array
-     */
-    private $_flashStack = array();
-
-    /**
-     * Configuration for the generator
-     * @type HTMLPurifier_Config
-     */
-    protected $config;
-
-    /**
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     */
-    public function __construct($config, $context)
-    {
-        $this->config = $config;
-        $this->_scriptFix = $config->get('Output.CommentScriptContents');
-        $this->_innerHTMLFix = $config->get('Output.FixInnerHTML');
-        $this->_sortAttr = $config->get('Output.SortAttr');
-        $this->_flashCompat = $config->get('Output.FlashCompat');
-        $this->_def = $config->getHTMLDefinition();
-        $this->_xhtml = $this->_def->doctype->xml;
-    }
-
-    /**
-     * Generates HTML from an array of tokens.
-     * @param HTMLPurifier_Token[] $tokens Array of HTMLPurifier_Token
-     * @return string Generated HTML
-     */
-    public function generateFromTokens($tokens)
-    {
-        if (!$tokens) {
-            return '';
-        }
-
-        // Basic algorithm
-        $html = '';
-        for ($i = 0, $size = count($tokens); $i < $size; $i++) {
-            if ($this->_scriptFix && $tokens[$i]->name === 'script'
-                && $i + 2 < $size && $tokens[$i+2] instanceof HTMLPurifier_Token_End) {
-                // script special case
-                // the contents of the script block must be ONE token
-                // for this to work.
-                $html .= $this->generateFromToken($tokens[$i++]);
-                $html .= $this->generateScriptFromToken($tokens[$i++]);
-            }
-            $html .= $this->generateFromToken($tokens[$i]);
-        }
-
-        // Tidy cleanup
-        if (extension_loaded('tidy') && $this->config->get('Output.TidyFormat')) {
-            $tidy = new Tidy;
-            $tidy->parseString(
-                $html,
-                array(
-                   'indent'=> true,
-                   'output-xhtml' => $this->_xhtml,
-                   'show-body-only' => true,
-                   'indent-spaces' => 2,
-                   'wrap' => 68,
-                ),
-                'utf8'
-            );
-            $tidy->cleanRepair();
-            $html = (string) $tidy; // explicit cast necessary
-        }
-
-        // Normalize newlines to system defined value
-        if ($this->config->get('Core.NormalizeNewlines')) {
-            $nl = $this->config->get('Output.Newline');
-            if ($nl === null) {
-                $nl = PHP_EOL;
-            }
-            if ($nl !== "\n") {
-                $html = str_replace("\n", $nl, $html);
-            }
-        }
-        return $html;
-    }
-
-    /**
-     * Generates HTML from a single token.
-     * @param HTMLPurifier_Token $token HTMLPurifier_Token object.
-     * @return string Generated HTML
-     */
-    public function generateFromToken($token)
-    {
-        if (!$token instanceof HTMLPurifier_Token) {
-            trigger_error('Cannot generate HTML from non-HTMLPurifier_Token object', E_USER_WARNING);
-            return '';
-
-        } elseif ($token instanceof HTMLPurifier_Token_Start) {
-            $attr = $this->generateAttributes($token->attr, $token->name);
-            if ($this->_flashCompat) {
-                if ($token->name == "object") {
-                    $flash = new stdClass();
-                    $flash->attr = $token->attr;
-                    $flash->param = array();
-                    $this->_flashStack[] = $flash;
-                }
-            }
-            return '<' . $token->name . ($attr ? ' ' : '') . $attr . '>';
-
-        } elseif ($token instanceof HTMLPurifier_Token_End) {
-            $_extra = '';
-            if ($this->_flashCompat) {
-                if ($token->name == "object" && !empty($this->_flashStack)) {
-                    // doesn't do anything for now
-                }
-            }
-            return $_extra . '</' . $token->name . '>';
-
-        } elseif ($token instanceof HTMLPurifier_Token_Empty) {
-            if ($this->_flashCompat && $token->name == "param" && !empty($this->_flashStack)) {
-                $this->_flashStack[count($this->_flashStack)-1]->param[$token->attr['name']] = $token->attr['value'];
-            }
-            $attr = $this->generateAttributes($token->attr, $token->name);
-             return '<' . $token->name . ($attr ? ' ' : '') . $attr .
-                ( $this->_xhtml ? ' /': '' ) // <br /> v. <br>
-                . '>';
-
-        } elseif ($token instanceof HTMLPurifier_Token_Text) {
-            return $this->escape($token->data, ENT_NOQUOTES);
-
-        } elseif ($token instanceof HTMLPurifier_Token_Comment) {
-            return '<!--' . $token->data . '-->';
-        } else {
-            return '';
-
-        }
-    }
-
-    /**
-     * Special case processor for the contents of script tags
-     * @param HTMLPurifier_Token $token HTMLPurifier_Token object.
-     * @return string
-     * @warning This runs into problems if there's already a literal
-     *          --> somewhere inside the script contents.
-     */
-    public function generateScriptFromToken($token)
-    {
-        if (!$token instanceof HTMLPurifier_Token_Text) {
-            return $this->generateFromToken($token);
-        }
-        // Thanks <http://lachy.id.au/log/2005/05/script-comments>
-        $data = preg_replace('#//\s*$#', '', $token->data);
-        return '<!--//--><![CDATA[//><!--' . "\n" . trim($data) . "\n" . '//--><!]]>';
-    }
-
-    /**
-     * Generates attribute declarations from attribute array.
-     * @note This does not include the leading or trailing space.
-     * @param array $assoc_array_of_attributes Attribute array
-     * @param string $element Name of element attributes are for, used to check
-     *        attribute minimization.
-     * @return string Generated HTML fragment for insertion.
-     */
-    public function generateAttributes($assoc_array_of_attributes, $element = '')
-    {
-        $html = '';
-        if ($this->_sortAttr) {
-            ksort($assoc_array_of_attributes);
-        }
-        foreach ($assoc_array_of_attributes as $key => $value) {
-            if (!$this->_xhtml) {
-                // Remove namespaced attributes
-                if (strpos($key, ':') !== false) {
-                    continue;
-                }
-                // Check if we should minimize the attribute: val="val" -> val
-                if ($element && !empty($this->_def->info[$element]->attr[$key]->minimized)) {
-                    $html .= $key . ' ';
-                    continue;
-                }
-            }
-            // Workaround for Internet Explorer innerHTML bug.
-            // Essentially, Internet Explorer, when calculating
-            // innerHTML, omits quotes if there are no instances of
-            // angled brackets, quotes or spaces.  However, when parsing
-            // HTML (for example, when you assign to innerHTML), it
-            // treats backticks as quotes.  Thus,
-            //      <img alt="``" />
-            // becomes
-            //      <img alt=`` />
-            // becomes
-            //      <img alt='' />
-            // Fortunately, all we need to do is trigger an appropriate
-            // quoting style, which we do by adding an extra space.
-            // This also is consistent with the W3C spec, which states
-            // that user agents may ignore leading or trailing
-            // whitespace (in fact, most don't, at least for attributes
-            // like alt, but an extra space at the end is barely
-            // noticeable).  Still, we have a configuration knob for
-            // this, since this transformation is not necesary if you
-            // don't process user input with innerHTML or you don't plan
-            // on supporting Internet Explorer.
-            if ($this->_innerHTMLFix) {
-                if (strpos($value, '`') !== false) {
-                    // check if correct quoting style would not already be
-                    // triggered
-                    if (strcspn($value, '"\' <>') === strlen($value)) {
-                        // protect!
-                        $value .= ' ';
-                    }
-                }
-            }
-            $html .= $key.'="'.$this->escape($value).'" ';
-        }
-        return rtrim($html);
-    }
-
-    /**
-     * Escapes raw text data.
-     * @todo This really ought to be protected, but until we have a facility
-     *       for properly generating HTML here w/o using tokens, it stays
-     *       public.
-     * @param string $string String data to escape for HTML.
-     * @param int $quote Quoting style, like htmlspecialchars. ENT_NOQUOTES is
-     *               permissible for non-attribute output.
-     * @return string escaped data.
-     */
-    public function escape($string, $quote = null)
-    {
-        // Workaround for APC bug on Mac Leopard reported by sidepodcast
-        // http://htmlpurifier.org/phorum/read.php?3,4823,4846
-        if ($quote === null) {
-            $quote = ENT_COMPAT;
-        }
-        return htmlspecialchars($string, $quote, 'UTF-8');
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLDefinition.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLDefinition.php
deleted file mode 100644
index 9b7b334dd9..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLDefinition.php
+++ /dev/null
@@ -1,493 +0,0 @@
-<?php
-
-/**
- * Definition of the purified HTML that describes allowed children,
- * attributes, and many other things.
- *
- * Conventions:
- *
- * All member variables that are prefixed with info
- * (including the main $info array) are used by HTML Purifier internals
- * and should not be directly edited when customizing the HTMLDefinition.
- * They can usually be set via configuration directives or custom
- * modules.
- *
- * On the other hand, member variables without the info prefix are used
- * internally by the HTMLDefinition and MUST NOT be used by other HTML
- * Purifier internals. Many of them, however, are public, and may be
- * edited by userspace code to tweak the behavior of HTMLDefinition.
- *
- * @note This class is inspected by Printer_HTMLDefinition; please
- *       update that class if things here change.
- *
- * @warning Directives that change this object's structure must be in
- *          the HTML or Attr namespace!
- */
-class HTMLPurifier_HTMLDefinition extends HTMLPurifier_Definition
-{
-
-    // FULLY-PUBLIC VARIABLES ---------------------------------------------
-
-    /**
-     * Associative array of element names to HTMLPurifier_ElementDef.
-     * @type HTMLPurifier_ElementDef[]
-     */
-    public $info = array();
-
-    /**
-     * Associative array of global attribute name to attribute definition.
-     * @type array
-     */
-    public $info_global_attr = array();
-
-    /**
-     * String name of parent element HTML will be going into.
-     * @type string
-     */
-    public $info_parent = 'div';
-
-    /**
-     * Definition for parent element, allows parent element to be a
-     * tag that's not allowed inside the HTML fragment.
-     * @type HTMLPurifier_ElementDef
-     */
-    public $info_parent_def;
-
-    /**
-     * String name of element used to wrap inline elements in block context.
-     * @type string
-     * @note This is rarely used except for BLOCKQUOTEs in strict mode
-     */
-    public $info_block_wrapper = 'p';
-
-    /**
-     * Associative array of deprecated tag name to HTMLPurifier_TagTransform.
-     * @type array
-     */
-    public $info_tag_transform = array();
-
-    /**
-     * Indexed list of HTMLPurifier_AttrTransform to be performed before validation.
-     * @type HTMLPurifier_AttrTransform[]
-     */
-    public $info_attr_transform_pre = array();
-
-    /**
-     * Indexed list of HTMLPurifier_AttrTransform to be performed after validation.
-     * @type HTMLPurifier_AttrTransform[]
-     */
-    public $info_attr_transform_post = array();
-
-    /**
-     * Nested lookup array of content set name (Block, Inline) to
-     * element name to whether or not it belongs in that content set.
-     * @type array
-     */
-    public $info_content_sets = array();
-
-    /**
-     * Indexed list of HTMLPurifier_Injector to be used.
-     * @type HTMLPurifier_Injector[]
-     */
-    public $info_injector = array();
-
-    /**
-     * Doctype object
-     * @type HTMLPurifier_Doctype
-     */
-    public $doctype;
-
-
-
-    // RAW CUSTOMIZATION STUFF --------------------------------------------
-
-    /**
-     * Adds a custom attribute to a pre-existing element
-     * @note This is strictly convenience, and does not have a corresponding
-     *       method in HTMLPurifier_HTMLModule
-     * @param string $element_name Element name to add attribute to
-     * @param string $attr_name Name of attribute
-     * @param mixed $def Attribute definition, can be string or object, see
-     *             HTMLPurifier_AttrTypes for details
-     */
-    public function addAttribute($element_name, $attr_name, $def)
-    {
-        $module = $this->getAnonymousModule();
-        if (!isset($module->info[$element_name])) {
-            $element = $module->addBlankElement($element_name);
-        } else {
-            $element = $module->info[$element_name];
-        }
-        $element->attr[$attr_name] = $def;
-    }
-
-    /**
-     * Adds a custom element to your HTML definition
-     * @see HTMLPurifier_HTMLModule::addElement() for detailed
-     *       parameter and return value descriptions.
-     */
-    public function addElement($element_name, $type, $contents, $attr_collections, $attributes = array())
-    {
-        $module = $this->getAnonymousModule();
-        // assume that if the user is calling this, the element
-        // is safe. This may not be a good idea
-        $element = $module->addElement($element_name, $type, $contents, $attr_collections, $attributes);
-        return $element;
-    }
-
-    /**
-     * Adds a blank element to your HTML definition, for overriding
-     * existing behavior
-     * @param string $element_name
-     * @return HTMLPurifier_ElementDef
-     * @see HTMLPurifier_HTMLModule::addBlankElement() for detailed
-     *       parameter and return value descriptions.
-     */
-    public function addBlankElement($element_name)
-    {
-        $module  = $this->getAnonymousModule();
-        $element = $module->addBlankElement($element_name);
-        return $element;
-    }
-
-    /**
-     * Retrieves a reference to the anonymous module, so you can
-     * bust out advanced features without having to make your own
-     * module.
-     * @return HTMLPurifier_HTMLModule
-     */
-    public function getAnonymousModule()
-    {
-        if (!$this->_anonModule) {
-            $this->_anonModule = new HTMLPurifier_HTMLModule();
-            $this->_anonModule->name = 'Anonymous';
-        }
-        return $this->_anonModule;
-    }
-
-    private $_anonModule = null;
-
-    // PUBLIC BUT INTERNAL VARIABLES --------------------------------------
-
-    /**
-     * @type string
-     */
-    public $type = 'HTML';
-
-    /**
-     * @type HTMLPurifier_HTMLModuleManager
-     */
-    public $manager;
-
-    /**
-     * Performs low-cost, preliminary initialization.
-     */
-    public function __construct()
-    {
-        $this->manager = new HTMLPurifier_HTMLModuleManager();
-    }
-
-    /**
-     * @param HTMLPurifier_Config $config
-     */
-    protected function doSetup($config)
-    {
-        $this->processModules($config);
-        $this->setupConfigStuff($config);
-        unset($this->manager);
-
-        // cleanup some of the element definitions
-        foreach ($this->info as $k => $v) {
-            unset($this->info[$k]->content_model);
-            unset($this->info[$k]->content_model_type);
-        }
-    }
-
-    /**
-     * Extract out the information from the manager
-     * @param HTMLPurifier_Config $config
-     */
-    protected function processModules($config)
-    {
-        if ($this->_anonModule) {
-            // for user specific changes
-            // this is late-loaded so we don't have to deal with PHP4
-            // reference wonky-ness
-            $this->manager->addModule($this->_anonModule);
-            unset($this->_anonModule);
-        }
-
-        $this->manager->setup($config);
-        $this->doctype = $this->manager->doctype;
-
-        foreach ($this->manager->modules as $module) {
-            foreach ($module->info_tag_transform as $k => $v) {
-                if ($v === false) {
-                    unset($this->info_tag_transform[$k]);
-                } else {
-                    $this->info_tag_transform[$k] = $v;
-                }
-            }
-            foreach ($module->info_attr_transform_pre as $k => $v) {
-                if ($v === false) {
-                    unset($this->info_attr_transform_pre[$k]);
-                } else {
-                    $this->info_attr_transform_pre[$k] = $v;
-                }
-            }
-            foreach ($module->info_attr_transform_post as $k => $v) {
-                if ($v === false) {
-                    unset($this->info_attr_transform_post[$k]);
-                } else {
-                    $this->info_attr_transform_post[$k] = $v;
-                }
-            }
-            foreach ($module->info_injector as $k => $v) {
-                if ($v === false) {
-                    unset($this->info_injector[$k]);
-                } else {
-                    $this->info_injector[$k] = $v;
-                }
-            }
-        }
-        $this->info = $this->manager->getElements();
-        $this->info_content_sets = $this->manager->contentSets->lookup;
-    }
-
-    /**
-     * Sets up stuff based on config. We need a better way of doing this.
-     * @param HTMLPurifier_Config $config
-     */
-    protected function setupConfigStuff($config)
-    {
-        $block_wrapper = $config->get('HTML.BlockWrapper');
-        if (isset($this->info_content_sets['Block'][$block_wrapper])) {
-            $this->info_block_wrapper = $block_wrapper;
-        } else {
-            trigger_error(
-                'Cannot use non-block element as block wrapper',
-                E_USER_ERROR
-            );
-        }
-
-        $parent = $config->get('HTML.Parent');
-        $def = $this->manager->getElement($parent, true);
-        if ($def) {
-            $this->info_parent = $parent;
-            $this->info_parent_def = $def;
-        } else {
-            trigger_error(
-                'Cannot use unrecognized element as parent',
-                E_USER_ERROR
-            );
-            $this->info_parent_def = $this->manager->getElement($this->info_parent, true);
-        }
-
-        // support template text
-        $support = "(for information on implementing this, see the support forums) ";
-
-        // setup allowed elements -----------------------------------------
-
-        $allowed_elements = $config->get('HTML.AllowedElements');
-        $allowed_attributes = $config->get('HTML.AllowedAttributes'); // retrieve early
-
-        if (!is_array($allowed_elements) && !is_array($allowed_attributes)) {
-            $allowed = $config->get('HTML.Allowed');
-            if (is_string($allowed)) {
-                list($allowed_elements, $allowed_attributes) = $this->parseTinyMCEAllowedList($allowed);
-            }
-        }
-
-        if (is_array($allowed_elements)) {
-            foreach ($this->info as $name => $d) {
-                if (!isset($allowed_elements[$name])) {
-                    unset($this->info[$name]);
-                }
-                unset($allowed_elements[$name]);
-            }
-            // emit errors
-            foreach ($allowed_elements as $element => $d) {
-                $element = htmlspecialchars($element); // PHP doesn't escape errors, be careful!
-                trigger_error("Element '$element' is not supported $support", E_USER_WARNING);
-            }
-        }
-
-        // setup allowed attributes ---------------------------------------
-
-        $allowed_attributes_mutable = $allowed_attributes; // by copy!
-        if (is_array($allowed_attributes)) {
-            // This actually doesn't do anything, since we went away from
-            // global attributes. It's possible that userland code uses
-            // it, but HTMLModuleManager doesn't!
-            foreach ($this->info_global_attr as $attr => $x) {
-                $keys = array($attr, "*@$attr", "*.$attr");
-                $delete = true;
-                foreach ($keys as $key) {
-                    if ($delete && isset($allowed_attributes[$key])) {
-                        $delete = false;
-                    }
-                    if (isset($allowed_attributes_mutable[$key])) {
-                        unset($allowed_attributes_mutable[$key]);
-                    }
-                }
-                if ($delete) {
-                    unset($this->info_global_attr[$attr]);
-                }
-            }
-
-            foreach ($this->info as $tag => $info) {
-                foreach ($info->attr as $attr => $x) {
-                    $keys = array("$tag@$attr", $attr, "*@$attr", "$tag.$attr", "*.$attr");
-                    $delete = true;
-                    foreach ($keys as $key) {
-                        if ($delete && isset($allowed_attributes[$key])) {
-                            $delete = false;
-                        }
-                        if (isset($allowed_attributes_mutable[$key])) {
-                            unset($allowed_attributes_mutable[$key]);
-                        }
-                    }
-                    if ($delete) {
-                        if ($this->info[$tag]->attr[$attr]->required) {
-                            trigger_error(
-                                "Required attribute '$attr' in element '$tag' " .
-                                "was not allowed, which means '$tag' will not be allowed either",
-                                E_USER_WARNING
-                            );
-                        }
-                        unset($this->info[$tag]->attr[$attr]);
-                    }
-                }
-            }
-            // emit errors
-            foreach ($allowed_attributes_mutable as $elattr => $d) {
-                $bits = preg_split('/[.@]/', $elattr, 2);
-                $c = count($bits);
-                switch ($c) {
-                    case 2:
-                        if ($bits[0] !== '*') {
-                            $element = htmlspecialchars($bits[0]);
-                            $attribute = htmlspecialchars($bits[1]);
-                            if (!isset($this->info[$element])) {
-                                trigger_error(
-                                    "Cannot allow attribute '$attribute' if element " .
-                                    "'$element' is not allowed/supported $support"
-                                );
-                            } else {
-                                trigger_error(
-                                    "Attribute '$attribute' in element '$element' not supported $support",
-                                    E_USER_WARNING
-                                );
-                            }
-                            break;
-                        }
-                        // otherwise fall through
-                    case 1:
-                        $attribute = htmlspecialchars($bits[0]);
-                        trigger_error(
-                            "Global attribute '$attribute' is not ".
-                            "supported in any elements $support",
-                            E_USER_WARNING
-                        );
-                        break;
-                }
-            }
-        }
-
-        // setup forbidden elements ---------------------------------------
-
-        $forbidden_elements   = $config->get('HTML.ForbiddenElements');
-        $forbidden_attributes = $config->get('HTML.ForbiddenAttributes');
-
-        foreach ($this->info as $tag => $info) {
-            if (isset($forbidden_elements[$tag])) {
-                unset($this->info[$tag]);
-                continue;
-            }
-            foreach ($info->attr as $attr => $x) {
-                if (isset($forbidden_attributes["$tag@$attr"]) ||
-                    isset($forbidden_attributes["*@$attr"]) ||
-                    isset($forbidden_attributes[$attr])
-                ) {
-                    unset($this->info[$tag]->attr[$attr]);
-                    continue;
-                } elseif (isset($forbidden_attributes["$tag.$attr"])) { // this segment might get removed eventually
-                    // $tag.$attr are not user supplied, so no worries!
-                    trigger_error(
-                        "Error with $tag.$attr: tag.attr syntax not supported for " .
-                        "HTML.ForbiddenAttributes; use tag@attr instead",
-                        E_USER_WARNING
-                    );
-                }
-            }
-        }
-        foreach ($forbidden_attributes as $key => $v) {
-            if (strlen($key) < 2) {
-                continue;
-            }
-            if ($key[0] != '*') {
-                continue;
-            }
-            if ($key[1] == '.') {
-                trigger_error(
-                    "Error with $key: *.attr syntax not supported for HTML.ForbiddenAttributes; use attr instead",
-                    E_USER_WARNING
-                );
-            }
-        }
-
-        // setup injectors -----------------------------------------------------
-        foreach ($this->info_injector as $i => $injector) {
-            if ($injector->checkNeeded($config) !== false) {
-                // remove injector that does not have it's required
-                // elements/attributes present, and is thus not needed.
-                unset($this->info_injector[$i]);
-            }
-        }
-    }
-
-    /**
-     * Parses a TinyMCE-flavored Allowed Elements and Attributes list into
-     * separate lists for processing. Format is element[attr1|attr2],element2...
-     * @warning Although it's largely drawn from TinyMCE's implementation,
-     *      it is different, and you'll probably have to modify your lists
-     * @param array $list String list to parse
-     * @return array
-     * @todo Give this its own class, probably static interface
-     */
-    public function parseTinyMCEAllowedList($list)
-    {
-        $list = str_replace(array(' ', "\t"), '', $list);
-
-        $elements = array();
-        $attributes = array();
-
-        $chunks = preg_split('/(,|[\n\r]+)/', $list);
-        foreach ($chunks as $chunk) {
-            if (empty($chunk)) {
-                continue;
-            }
-            // remove TinyMCE element control characters
-            if (!strpos($chunk, '[')) {
-                $element = $chunk;
-                $attr = false;
-            } else {
-                list($element, $attr) = explode('[', $chunk);
-            }
-            if ($element !== '*') {
-                $elements[$element] = true;
-            }
-            if (!$attr) {
-                continue;
-            }
-            $attr = substr($attr, 0, strlen($attr) - 1); // remove trailing ]
-            $attr = explode('|', $attr);
-            foreach ($attr as $key) {
-                $attributes["$element.$key"] = true;
-            }
-        }
-        return array($elements, $attributes);
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule.php
deleted file mode 100644
index 6d898f80cd..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule.php
+++ /dev/null
@@ -1,284 +0,0 @@
-<?php
-
-/**
- * Represents an XHTML 1.1 module, with information on elements, tags
- * and attributes.
- * @note Even though this is technically XHTML 1.1, it is also used for
- *       regular HTML parsing. We are using modulization as a convenient
- *       way to represent the internals of HTMLDefinition, and our
- *       implementation is by no means conforming and does not directly
- *       use the normative DTDs or XML schemas.
- * @note The public variables in a module should almost directly
- *       correspond to the variables in HTMLPurifier_HTMLDefinition.
- *       However, the prefix info carries no special meaning in these
- *       objects (include it anyway if that's the correspondence though).
- * @todo Consider making some member functions protected
- */
-
-class HTMLPurifier_HTMLModule
-{
-
-    // -- Overloadable ----------------------------------------------------
-
-    /**
-     * Short unique string identifier of the module.
-     * @type string
-     */
-    public $name;
-
-    /**
-     * Informally, a list of elements this module changes.
-     * Not used in any significant way.
-     * @type array
-     */
-    public $elements = array();
-
-    /**
-     * Associative array of element names to element definitions.
-     * Some definitions may be incomplete, to be merged in later
-     * with the full definition.
-     * @type array
-     */
-    public $info = array();
-
-    /**
-     * Associative array of content set names to content set additions.
-     * This is commonly used to, say, add an A element to the Inline
-     * content set. This corresponds to an internal variable $content_sets
-     * and NOT info_content_sets member variable of HTMLDefinition.
-     * @type array
-     */
-    public $content_sets = array();
-
-    /**
-     * Associative array of attribute collection names to attribute
-     * collection additions. More rarely used for adding attributes to
-     * the global collections. Example is the StyleAttribute module adding
-     * the style attribute to the Core. Corresponds to HTMLDefinition's
-     * attr_collections->info, since the object's data is only info,
-     * with extra behavior associated with it.
-     * @type array
-     */
-    public $attr_collections = array();
-
-    /**
-     * Associative array of deprecated tag name to HTMLPurifier_TagTransform.
-     * @type array
-     */
-    public $info_tag_transform = array();
-
-    /**
-     * List of HTMLPurifier_AttrTransform to be performed before validation.
-     * @type array
-     */
-    public $info_attr_transform_pre = array();
-
-    /**
-     * List of HTMLPurifier_AttrTransform to be performed after validation.
-     * @type array
-     */
-    public $info_attr_transform_post = array();
-
-    /**
-     * List of HTMLPurifier_Injector to be performed during well-formedness fixing.
-     * An injector will only be invoked if all of it's pre-requisites are met;
-     * if an injector fails setup, there will be no error; it will simply be
-     * silently disabled.
-     * @type array
-     */
-    public $info_injector = array();
-
-    /**
-     * Boolean flag that indicates whether or not getChildDef is implemented.
-     * For optimization reasons: may save a call to a function. Be sure
-     * to set it if you do implement getChildDef(), otherwise it will have
-     * no effect!
-     * @type bool
-     */
-    public $defines_child_def = false;
-
-    /**
-     * Boolean flag whether or not this module is safe. If it is not safe, all
-     * of its members are unsafe. Modules are safe by default (this might be
-     * slightly dangerous, but it doesn't make much sense to force HTML Purifier,
-     * which is based off of safe HTML, to explicitly say, "This is safe," even
-     * though there are modules which are "unsafe")
-     *
-     * @type bool
-     * @note Previously, safety could be applied at an element level granularity.
-     *       We've removed this ability, so in order to add "unsafe" elements
-     *       or attributes, a dedicated module with this property set to false
-     *       must be used.
-     */
-    public $safe = true;
-
-    /**
-     * Retrieves a proper HTMLPurifier_ChildDef subclass based on
-     * content_model and content_model_type member variables of
-     * the HTMLPurifier_ElementDef class. There is a similar function
-     * in HTMLPurifier_HTMLDefinition.
-     * @param HTMLPurifier_ElementDef $def
-     * @return HTMLPurifier_ChildDef subclass
-     */
-    public function getChildDef($def)
-    {
-        return false;
-    }
-
-    // -- Convenience -----------------------------------------------------
-
-    /**
-     * Convenience function that sets up a new element
-     * @param string $element Name of element to add
-     * @param string|bool $type What content set should element be registered to?
-     *              Set as false to skip this step.
-     * @param string|HTMLPurifier_ChildDef $contents Allowed children in form of:
-     *              "$content_model_type: $content_model"
-     * @param array|string $attr_includes What attribute collections to register to
-     *              element?
-     * @param array $attr What unique attributes does the element define?
-     * @see HTMLPurifier_ElementDef:: for in-depth descriptions of these parameters.
-     * @return HTMLPurifier_ElementDef Created element definition object, so you
-     *         can set advanced parameters
-     */
-    public function addElement($element, $type, $contents, $attr_includes = array(), $attr = array())
-    {
-        $this->elements[] = $element;
-        // parse content_model
-        list($content_model_type, $content_model) = $this->parseContents($contents);
-        // merge in attribute inclusions
-        $this->mergeInAttrIncludes($attr, $attr_includes);
-        // add element to content sets
-        if ($type) {
-            $this->addElementToContentSet($element, $type);
-        }
-        // create element
-        $this->info[$element] = HTMLPurifier_ElementDef::create(
-            $content_model,
-            $content_model_type,
-            $attr
-        );
-        // literal object $contents means direct child manipulation
-        if (!is_string($contents)) {
-            $this->info[$element]->child = $contents;
-        }
-        return $this->info[$element];
-    }
-
-    /**
-     * Convenience function that creates a totally blank, non-standalone
-     * element.
-     * @param string $element Name of element to create
-     * @return HTMLPurifier_ElementDef Created element
-     */
-    public function addBlankElement($element)
-    {
-        if (!isset($this->info[$element])) {
-            $this->elements[] = $element;
-            $this->info[$element] = new HTMLPurifier_ElementDef();
-            $this->info[$element]->standalone = false;
-        } else {
-            trigger_error("Definition for $element already exists in module, cannot redefine");
-        }
-        return $this->info[$element];
-    }
-
-    /**
-     * Convenience function that registers an element to a content set
-     * @param string $element Element to register
-     * @param string $type Name content set (warning: case sensitive, usually upper-case
-     *        first letter)
-     */
-    public function addElementToContentSet($element, $type)
-    {
-        if (!isset($this->content_sets[$type])) {
-            $this->content_sets[$type] = '';
-        } else {
-            $this->content_sets[$type] .= ' | ';
-        }
-        $this->content_sets[$type] .= $element;
-    }
-
-    /**
-     * Convenience function that transforms single-string contents
-     * into separate content model and content model type
-     * @param string $contents Allowed children in form of:
-     *                  "$content_model_type: $content_model"
-     * @return array
-     * @note If contents is an object, an array of two nulls will be
-     *       returned, and the callee needs to take the original $contents
-     *       and use it directly.
-     */
-    public function parseContents($contents)
-    {
-        if (!is_string($contents)) {
-            return array(null, null);
-        } // defer
-        switch ($contents) {
-            // check for shorthand content model forms
-            case 'Empty':
-                return array('empty', '');
-            case 'Inline':
-                return array('optional', 'Inline | #PCDATA');
-            case 'Flow':
-                return array('optional', 'Flow | #PCDATA');
-        }
-        list($content_model_type, $content_model) = explode(':', $contents);
-        $content_model_type = strtolower(trim($content_model_type));
-        $content_model = trim($content_model);
-        return array($content_model_type, $content_model);
-    }
-
-    /**
-     * Convenience function that merges a list of attribute includes into
-     * an attribute array.
-     * @param array $attr Reference to attr array to modify
-     * @param array $attr_includes Array of includes / string include to merge in
-     */
-    public function mergeInAttrIncludes(&$attr, $attr_includes)
-    {
-        if (!is_array($attr_includes)) {
-            if (empty($attr_includes)) {
-                $attr_includes = array();
-            } else {
-                $attr_includes = array($attr_includes);
-            }
-        }
-        $attr[0] = $attr_includes;
-    }
-
-    /**
-     * Convenience function that generates a lookup table with boolean
-     * true as value.
-     * @param string $list List of values to turn into a lookup
-     * @note You can also pass an arbitrary number of arguments in
-     *       place of the regular argument
-     * @return array array equivalent of list
-     */
-    public function makeLookup($list)
-    {
-        if (is_string($list)) {
-            $list = func_get_args();
-        }
-        $ret = array();
-        foreach ($list as $value) {
-            if (is_null($value)) {
-                continue;
-            }
-            $ret[$value] = true;
-        }
-        return $ret;
-    }
-
-    /**
-     * Lazy load construction of the module after determining whether
-     * or not it's needed, and also when a finalized configuration object
-     * is available.
-     * @param HTMLPurifier_Config $config
-     */
-    public function setup($config)
-    {
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Bdo.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Bdo.php
deleted file mode 100644
index 1e67c790d0..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Bdo.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * XHTML 1.1 Bi-directional Text Module, defines elements that
- * declare directionality of content. Text Extension Module.
- */
-class HTMLPurifier_HTMLModule_Bdo extends HTMLPurifier_HTMLModule
-{
-
-    /**
-     * @type string
-     */
-    public $name = 'Bdo';
-
-    /**
-     * @type array
-     */
-    public $attr_collections = array(
-        'I18N' => array('dir' => false)
-    );
-
-    /**
-     * @param HTMLPurifier_Config $config
-     */
-    public function setup($config)
-    {
-        $bdo = $this->addElement(
-            'bdo',
-            'Inline',
-            'Inline',
-            array('Core', 'Lang'),
-            array(
-                'dir' => 'Enum#ltr,rtl', // required
-                // The Abstract Module specification has the attribute
-                // inclusions wrong for bdo: bdo allows Lang
-            )
-        );
-        $bdo->attr_transform_post[] = new HTMLPurifier_AttrTransform_BdoDir();
-
-        $this->attr_collections['I18N']['dir'] = 'Enum#ltr,rtl';
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/CommonAttributes.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/CommonAttributes.php
deleted file mode 100644
index a96ab1bef1..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/CommonAttributes.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-class HTMLPurifier_HTMLModule_CommonAttributes extends HTMLPurifier_HTMLModule
-{
-    /**
-     * @type string
-     */
-    public $name = 'CommonAttributes';
-
-    /**
-     * @type array
-     */
-    public $attr_collections = array(
-        'Core' => array(
-            0 => array('Style'),
-            // 'xml:space' => false,
-            'class' => 'Class',
-            'id' => 'ID',
-            'title' => 'CDATA',
-        ),
-        'Lang' => array(),
-        'I18N' => array(
-            0 => array('Lang'), // proprietary, for xml:lang/lang
-        ),
-        'Common' => array(
-            0 => array('Core', 'I18N')
-        )
-    );
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Edit.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Edit.php
deleted file mode 100644
index a9042a3577..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Edit.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/**
- * XHTML 1.1 Edit Module, defines editing-related elements. Text Extension
- * Module.
- */
-class HTMLPurifier_HTMLModule_Edit extends HTMLPurifier_HTMLModule
-{
-
-    /**
-     * @type string
-     */
-    public $name = 'Edit';
-
-    /**
-     * @param HTMLPurifier_Config $config
-     */
-    public function setup($config)
-    {
-        $contents = 'Chameleon: #PCDATA | Inline ! #PCDATA | Flow';
-        $attr = array(
-            'cite' => 'URI',
-            // 'datetime' => 'Datetime', // not implemented
-        );
-        $this->addElement('del', 'Inline', $contents, 'Common', $attr);
-        $this->addElement('ins', 'Inline', $contents, 'Common', $attr);
-    }
-
-    // HTML 4.01 specifies that ins/del must not contain block
-    // elements when used in an inline context, chameleon is
-    // a complicated workaround to acheive this effect
-
-    // Inline context ! Block context (exclamation mark is
-    // separator, see getChildDef for parsing)
-
-    /**
-     * @type bool
-     */
-    public $defines_child_def = true;
-
-    /**
-     * @param HTMLPurifier_ElementDef $def
-     * @return HTMLPurifier_ChildDef_Chameleon
-     */
-    public function getChildDef($def)
-    {
-        if ($def->content_model_type != 'chameleon') {
-            return false;
-        }
-        $value = explode('!', $def->content_model);
-        return new HTMLPurifier_ChildDef_Chameleon($value[0], $value[1]);
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Forms.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Forms.php
deleted file mode 100644
index eb0edcffd5..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Forms.php
+++ /dev/null
@@ -1,194 +0,0 @@
-<?php
-
-/**
- * XHTML 1.1 Forms module, defines all form-related elements found in HTML 4.
- */
-class HTMLPurifier_HTMLModule_Forms extends HTMLPurifier_HTMLModule
-{
-    /**
-     * @type string
-     */
-    public $name = 'Forms';
-
-    /**
-     * @type bool
-     */
-    public $safe = false;
-
-    /**
-     * @type array
-     */
-    public $content_sets = array(
-        'Block' => 'Form',
-        'Inline' => 'Formctrl',
-    );
-
-    /**
-     * @param HTMLPurifier_Config $config
-     */
-    public function setup($config)
-    {
-        if ($config->get('HTML.Forms')) {
-            $this->safe = true;
-        }
-
-        $form = $this->addElement(
-            'form',
-            'Form',
-            'Required: Heading | List | Block | fieldset',
-            'Common',
-            array(
-                'accept' => 'ContentTypes',
-                'accept-charset' => 'Charsets',
-                'action*' => 'URI',
-                'method' => 'Enum#get,post',
-                // really ContentType, but these two are the only ones used today
-                'enctype' => 'Enum#application/x-www-form-urlencoded,multipart/form-data',
-            )
-        );
-        $form->excludes = array('form' => true);
-
-        $input = $this->addElement(
-            'input',
-            'Formctrl',
-            'Empty',
-            'Common',
-            array(
-                'accept' => 'ContentTypes',
-                'accesskey' => 'Character',
-                'alt' => 'Text',
-                'checked' => 'Bool#checked',
-                'disabled' => 'Bool#disabled',
-                'maxlength' => 'Number',
-                'name' => 'CDATA',
-                'readonly' => 'Bool#readonly',
-                'size' => 'Number',
-                'src' => 'URI#embedded',
-                'tabindex' => 'Number',
-                'type' => 'Enum#text,password,checkbox,button,radio,submit,reset,file,hidden,image',
-                'value' => 'CDATA',
-            )
-        );
-        $input->attr_transform_post[] = new HTMLPurifier_AttrTransform_Input();
-
-        $this->addElement(
-            'select',
-            'Formctrl',
-            'Required: optgroup | option',
-            'Common',
-            array(
-                'disabled' => 'Bool#disabled',
-                'multiple' => 'Bool#multiple',
-                'name' => 'CDATA',
-                'size' => 'Number',
-                'tabindex' => 'Number',
-            )
-        );
-
-        $this->addElement(
-            'option',
-            false,
-            'Optional: #PCDATA',
-            'Common',
-            array(
-                'disabled' => 'Bool#disabled',
-                'label' => 'Text',
-                'selected' => 'Bool#selected',
-                'value' => 'CDATA',
-            )
-        );
-        // It's illegal for there to be more than one selected, but not
-        // be multiple. Also, no selected means undefined behavior. This might
-        // be difficult to implement; perhaps an injector, or a context variable.
-
-        $textarea = $this->addElement(
-            'textarea',
-            'Formctrl',
-            'Optional: #PCDATA',
-            'Common',
-            array(
-                'accesskey' => 'Character',
-                'cols*' => 'Number',
-                'disabled' => 'Bool#disabled',
-                'name' => 'CDATA',
-                'readonly' => 'Bool#readonly',
-                'rows*' => 'Number',
-                'tabindex' => 'Number',
-            )
-        );
-        $textarea->attr_transform_pre[] = new HTMLPurifier_AttrTransform_Textarea();
-
-        $button = $this->addElement(
-            'button',
-            'Formctrl',
-            'Optional: #PCDATA | Heading | List | Block | Inline',
-            'Common',
-            array(
-                'accesskey' => 'Character',
-                'disabled' => 'Bool#disabled',
-                'name' => 'CDATA',
-                'tabindex' => 'Number',
-                'type' => 'Enum#button,submit,reset',
-                'value' => 'CDATA',
-            )
-        );
-
-        // For exclusions, ideally we'd specify content sets, not literal elements
-        $button->excludes = $this->makeLookup(
-            'form',
-            'fieldset', // Form
-            'input',
-            'select',
-            'textarea',
-            'label',
-            'button', // Formctrl
-            'a', // as per HTML 4.01 spec, this is omitted by modularization
-            'isindex',
-            'iframe' // legacy items
-        );
-
-        // Extra exclusion: img usemap="" is not permitted within this element.
-        // We'll omit this for now, since we don't have any good way of
-        // indicating it yet.
-
-        // This is HIGHLY user-unfriendly; we need a custom child-def for this
-        $this->addElement('fieldset', 'Form', 'Custom: (#WS?,legend,(Flow|#PCDATA)*)', 'Common');
-
-        $label = $this->addElement(
-            'label',
-            'Formctrl',
-            'Optional: #PCDATA | Inline',
-            'Common',
-            array(
-                'accesskey' => 'Character',
-                // 'for' => 'IDREF', // IDREF not implemented, cannot allow
-            )
-        );
-        $label->excludes = array('label' => true);
-
-        $this->addElement(
-            'legend',
-            false,
-            'Optional: #PCDATA | Inline',
-            'Common',
-            array(
-                'accesskey' => 'Character',
-            )
-        );
-
-        $this->addElement(
-            'optgroup',
-            false,
-            'Required: option',
-            'Common',
-            array(
-                'disabled' => 'Bool#disabled',
-                'label*' => 'Text',
-            )
-        );
-        // Don't forget an injector for <isindex>. This one's a little complex
-        // because it maps to multiple elements.
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Hypertext.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Hypertext.php
deleted file mode 100644
index 72d7a31e68..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Hypertext.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * XHTML 1.1 Hypertext Module, defines hypertext links. Core Module.
- */
-class HTMLPurifier_HTMLModule_Hypertext extends HTMLPurifier_HTMLModule
-{
-
-    /**
-     * @type string
-     */
-    public $name = 'Hypertext';
-
-    /**
-     * @param HTMLPurifier_Config $config
-     */
-    public function setup($config)
-    {
-        $a = $this->addElement(
-            'a',
-            'Inline',
-            'Inline',
-            'Common',
-            array(
-                // 'accesskey' => 'Character',
-                // 'charset' => 'Charset',
-                'href' => 'URI',
-                // 'hreflang' => 'LanguageCode',
-                'rel' => new HTMLPurifier_AttrDef_HTML_LinkTypes('rel'),
-                'rev' => new HTMLPurifier_AttrDef_HTML_LinkTypes('rev'),
-                // 'tabindex' => 'Number',
-                // 'type' => 'ContentType',
-            )
-        );
-        $a->formatting = true;
-        $a->excludes = array('a' => true);
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Iframe.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Iframe.php
deleted file mode 100644
index f7e7c91c02..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Iframe.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * XHTML 1.1 Iframe Module provides inline frames.
- *
- * @note This module is not considered safe unless an Iframe
- * whitelisting mechanism is specified.  Currently, the only
- * such mechanism is %URL.SafeIframeRegexp
- */
-class HTMLPurifier_HTMLModule_Iframe extends HTMLPurifier_HTMLModule
-{
-
-    /**
-     * @type string
-     */
-    public $name = 'Iframe';
-
-    /**
-     * @type bool
-     */
-    public $safe = false;
-
-    /**
-     * @param HTMLPurifier_Config $config
-     */
-    public function setup($config)
-    {
-        if ($config->get('HTML.SafeIframe')) {
-            $this->safe = true;
-        }
-        $this->addElement(
-            'iframe',
-            'Inline',
-            'Flow',
-            'Common',
-            array(
-                'src' => 'URI#embedded',
-                'width' => 'Length',
-                'height' => 'Length',
-                'name' => 'ID',
-                'scrolling' => 'Enum#yes,no,auto',
-                'frameborder' => 'Enum#0,1',
-                'longdesc' => 'URI',
-                'marginheight' => 'Pixels',
-                'marginwidth' => 'Pixels',
-            )
-        );
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Image.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Image.php
deleted file mode 100644
index 0f5fdb3baf..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Image.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/**
- * XHTML 1.1 Image Module provides basic image embedding.
- * @note There is specialized code for removing empty images in
- *       HTMLPurifier_Strategy_RemoveForeignElements
- */
-class HTMLPurifier_HTMLModule_Image extends HTMLPurifier_HTMLModule
-{
-
-    /**
-     * @type string
-     */
-    public $name = 'Image';
-
-    /**
-     * @param HTMLPurifier_Config $config
-     */
-    public function setup($config)
-    {
-        $max = $config->get('HTML.MaxImgLength');
-        $img = $this->addElement(
-            'img',
-            'Inline',
-            'Empty',
-            'Common',
-            array(
-                'alt*' => 'Text',
-                // According to the spec, it's Length, but percents can
-                // be abused, so we allow only Pixels.
-                'height' => 'Pixels#' . $max,
-                'width' => 'Pixels#' . $max,
-                'longdesc' => 'URI',
-                'src*' => new HTMLPurifier_AttrDef_URI(true), // embedded
-            )
-        );
-        if ($max === null || $config->get('HTML.Trusted')) {
-            $img->attr['height'] =
-            $img->attr['width'] = 'Length';
-        }
-
-        // kind of strange, but splitting things up would be inefficient
-        $img->attr_transform_pre[] =
-        $img->attr_transform_post[] =
-            new HTMLPurifier_AttrTransform_ImgRequired();
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Legacy.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Legacy.php
deleted file mode 100644
index 86b5299579..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Legacy.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-
-/**
- * XHTML 1.1 Legacy module defines elements that were previously
- * deprecated.
- *
- * @note Not all legacy elements have been implemented yet, which
- *       is a bit of a reverse problem as compared to browsers! In
- *       addition, this legacy module may implement a bit more than
- *       mandated by XHTML 1.1.
- *
- * This module can be used in combination with TransformToStrict in order
- * to transform as many deprecated elements as possible, but retain
- * questionably deprecated elements that do not have good alternatives
- * as well as transform elements that don't have an implementation.
- * See docs/ref-strictness.txt for more details.
- */
-
-class HTMLPurifier_HTMLModule_Legacy extends HTMLPurifier_HTMLModule
-{
-    /**
-     * @type string
-     */
-    public $name = 'Legacy';
-
-    /**
-     * @param HTMLPurifier_Config $config
-     */
-    public function setup($config)
-    {
-        $this->addElement(
-            'basefont',
-            'Inline',
-            'Empty',
-            null,
-            array(
-                'color' => 'Color',
-                'face' => 'Text', // extremely broad, we should
-                'size' => 'Text', // tighten it
-                'id' => 'ID'
-            )
-        );
-        $this->addElement('center', 'Block', 'Flow', 'Common');
-        $this->addElement(
-            'dir',
-            'Block',
-            'Required: li',
-            'Common',
-            array(
-                'compact' => 'Bool#compact'
-            )
-        );
-        $this->addElement(
-            'font',
-            'Inline',
-            'Inline',
-            array('Core', 'I18N'),
-            array(
-                'color' => 'Color',
-                'face' => 'Text', // extremely broad, we should
-                'size' => 'Text', // tighten it
-            )
-        );
-        $this->addElement(
-            'menu',
-            'Block',
-            'Required: li',
-            'Common',
-            array(
-                'compact' => 'Bool#compact'
-            )
-        );
-
-        $s = $this->addElement('s', 'Inline', 'Inline', 'Common');
-        $s->formatting = true;
-
-        $strike = $this->addElement('strike', 'Inline', 'Inline', 'Common');
-        $strike->formatting = true;
-
-        $u = $this->addElement('u', 'Inline', 'Inline', 'Common');
-        $u->formatting = true;
-
-        // setup modifications to old elements
-
-        $align = 'Enum#left,right,center,justify';
-
-        $address = $this->addBlankElement('address');
-        $address->content_model = 'Inline | #PCDATA | p';
-        $address->content_model_type = 'optional';
-        $address->child = false;
-
-        $blockquote = $this->addBlankElement('blockquote');
-        $blockquote->content_model = 'Flow | #PCDATA';
-        $blockquote->content_model_type = 'optional';
-        $blockquote->child = false;
-
-        $br = $this->addBlankElement('br');
-        $br->attr['clear'] = 'Enum#left,all,right,none';
-
-        $caption = $this->addBlankElement('caption');
-        $caption->attr['align'] = 'Enum#top,bottom,left,right';
-
-        $div = $this->addBlankElement('div');
-        $div->attr['align'] = $align;
-
-        $dl = $this->addBlankElement('dl');
-        $dl->attr['compact'] = 'Bool#compact';
-
-        for ($i = 1; $i <= 6; $i++) {
-            $h = $this->addBlankElement("h$i");
-            $h->attr['align'] = $align;
-        }
-
-        $hr = $this->addBlankElement('hr');
-        $hr->attr['align'] = $align;
-        $hr->attr['noshade'] = 'Bool#noshade';
-        $hr->attr['size'] = 'Pixels';
-        $hr->attr['width'] = 'Length';
-
-        $img = $this->addBlankElement('img');
-        $img->attr['align'] = 'IAlign';
-        $img->attr['border'] = 'Pixels';
-        $img->attr['hspace'] = 'Pixels';
-        $img->attr['vspace'] = 'Pixels';
-
-        // figure out this integer business
-
-        $li = $this->addBlankElement('li');
-        $li->attr['value'] = new HTMLPurifier_AttrDef_Integer();
-        $li->attr['type'] = 'Enum#s:1,i,I,a,A,disc,square,circle';
-
-        $ol = $this->addBlankElement('ol');
-        $ol->attr['compact'] = 'Bool#compact';
-        $ol->attr['start'] = new HTMLPurifier_AttrDef_Integer();
-        $ol->attr['type'] = 'Enum#s:1,i,I,a,A';
-
-        $p = $this->addBlankElement('p');
-        $p->attr['align'] = $align;
-
-        $pre = $this->addBlankElement('pre');
-        $pre->attr['width'] = 'Number';
-
-        // script omitted
-
-        $table = $this->addBlankElement('table');
-        $table->attr['align'] = 'Enum#left,center,right';
-        $table->attr['bgcolor'] = 'Color';
-
-        $tr = $this->addBlankElement('tr');
-        $tr->attr['bgcolor'] = 'Color';
-
-        $th = $this->addBlankElement('th');
-        $th->attr['bgcolor'] = 'Color';
-        $th->attr['height'] = 'Length';
-        $th->attr['nowrap'] = 'Bool#nowrap';
-        $th->attr['width'] = 'Length';
-
-        $td = $this->addBlankElement('td');
-        $td->attr['bgcolor'] = 'Color';
-        $td->attr['height'] = 'Length';
-        $td->attr['nowrap'] = 'Bool#nowrap';
-        $td->attr['width'] = 'Length';
-
-        $ul = $this->addBlankElement('ul');
-        $ul->attr['compact'] = 'Bool#compact';
-        $ul->attr['type'] = 'Enum#square,disc,circle';
-
-        // "safe" modifications to "unsafe" elements
-        // WARNING: If you want to add support for an unsafe, legacy
-        // attribute, make a new TrustedLegacy module with the trusted
-        // bit set appropriately
-
-        $form = $this->addBlankElement('form');
-        $form->content_model = 'Flow | #PCDATA';
-        $form->content_model_type = 'optional';
-        $form->attr['target'] = 'FrameTarget';
-
-        $input = $this->addBlankElement('input');
-        $input->attr['align'] = 'IAlign';
-
-        $legend = $this->addBlankElement('legend');
-        $legend->attr['align'] = 'LAlign';
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/List.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/List.php
deleted file mode 100644
index 7a20ff701c..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/List.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * XHTML 1.1 List Module, defines list-oriented elements. Core Module.
- */
-class HTMLPurifier_HTMLModule_List extends HTMLPurifier_HTMLModule
-{
-    /**
-     * @type string
-     */
-    public $name = 'List';
-
-    // According to the abstract schema, the List content set is a fully formed
-    // one or more expr, but it invariably occurs in an optional declaration
-    // so we're not going to do that subtlety. It might cause trouble
-    // if a user defines "List" and expects that multiple lists are
-    // allowed to be specified, but then again, that's not very intuitive.
-    // Furthermore, the actual XML Schema may disagree. Regardless,
-    // we don't have support for such nested expressions without using
-    // the incredibly inefficient and draconic Custom ChildDef.
-
-    /**
-     * @type array
-     */
-    public $content_sets = array('Flow' => 'List');
-
-    /**
-     * @param HTMLPurifier_Config $config
-     */
-    public function setup($config)
-    {
-        $ol = $this->addElement('ol', 'List', new HTMLPurifier_ChildDef_List(), 'Common');
-        $ul = $this->addElement('ul', 'List', new HTMLPurifier_ChildDef_List(), 'Common');
-        // XXX The wrap attribute is handled by MakeWellFormed.  This is all
-        // quite unsatisfactory, because we generated this
-        // *specifically* for lists, and now a big chunk of the handling
-        // is done properly by the List ChildDef.  So actually, we just
-        // want enough information to make autoclosing work properly,
-        // and then hand off the tricky stuff to the ChildDef.
-        $ol->wrap = 'li';
-        $ul->wrap = 'li';
-        $this->addElement('dl', 'List', 'Required: dt | dd', 'Common');
-
-        $this->addElement('li', false, 'Flow', 'Common');
-
-        $this->addElement('dd', false, 'Flow', 'Common');
-        $this->addElement('dt', false, 'Inline', 'Common');
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Name.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Name.php
deleted file mode 100644
index 60c0545154..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Name.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-class HTMLPurifier_HTMLModule_Name extends HTMLPurifier_HTMLModule
-{
-    /**
-     * @type string
-     */
-    public $name = 'Name';
-
-    /**
-     * @param HTMLPurifier_Config $config
-     */
-    public function setup($config)
-    {
-        $elements = array('a', 'applet', 'form', 'frame', 'iframe', 'img', 'map');
-        foreach ($elements as $name) {
-            $element = $this->addBlankElement($name);
-            $element->attr['name'] = 'CDATA';
-            if (!$config->get('HTML.Attr.Name.UseCDATA')) {
-                $element->attr_transform_post[] = new HTMLPurifier_AttrTransform_NameSync();
-            }
-        }
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Nofollow.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Nofollow.php
deleted file mode 100644
index dc9410a895..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Nofollow.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * Module adds the nofollow attribute transformation to a tags.  It
- * is enabled by HTML.Nofollow
- */
-class HTMLPurifier_HTMLModule_Nofollow extends HTMLPurifier_HTMLModule
-{
-
-    /**
-     * @type string
-     */
-    public $name = 'Nofollow';
-
-    /**
-     * @param HTMLPurifier_Config $config
-     */
-    public function setup($config)
-    {
-        $a = $this->addBlankElement('a');
-        $a->attr_transform_post[] = new HTMLPurifier_AttrTransform_Nofollow();
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php
deleted file mode 100644
index da722253ac..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-class HTMLPurifier_HTMLModule_NonXMLCommonAttributes extends HTMLPurifier_HTMLModule
-{
-    /**
-     * @type string
-     */
-    public $name = 'NonXMLCommonAttributes';
-
-    /**
-     * @type array
-     */
-    public $attr_collections = array(
-        'Lang' => array(
-            'lang' => 'LanguageCode',
-        )
-    );
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Object.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Object.php
deleted file mode 100644
index 2f9efc5c88..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Object.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
- * XHTML 1.1 Object Module, defines elements for generic object inclusion
- * @warning Users will commonly use <embed> to cater to legacy browsers: this
- *      module does not allow this sort of behavior
- */
-class HTMLPurifier_HTMLModule_Object extends HTMLPurifier_HTMLModule
-{
-    /**
-     * @type string
-     */
-    public $name = 'Object';
-
-    /**
-     * @type bool
-     */
-    public $safe = false;
-
-    /**
-     * @param HTMLPurifier_Config $config
-     */
-    public function setup($config)
-    {
-        $this->addElement(
-            'object',
-            'Inline',
-            'Optional: #PCDATA | Flow | param',
-            'Common',
-            array(
-                'archive' => 'URI',
-                'classid' => 'URI',
-                'codebase' => 'URI',
-                'codetype' => 'Text',
-                'data' => 'URI',
-                'declare' => 'Bool#declare',
-                'height' => 'Length',
-                'name' => 'CDATA',
-                'standby' => 'Text',
-                'tabindex' => 'Number',
-                'type' => 'ContentType',
-                'width' => 'Length'
-            )
-        );
-
-        $this->addElement(
-            'param',
-            false,
-            'Empty',
-            null,
-            array(
-                'id' => 'ID',
-                'name*' => 'Text',
-                'type' => 'Text',
-                'value' => 'Text',
-                'valuetype' => 'Enum#data,ref,object'
-            )
-        );
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Presentation.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Presentation.php
deleted file mode 100644
index 6458ce9d88..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Presentation.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * XHTML 1.1 Presentation Module, defines simple presentation-related
- * markup. Text Extension Module.
- * @note The official XML Schema and DTD specs further divide this into
- *       two modules:
- *          - Block Presentation (hr)
- *          - Inline Presentation (b, big, i, small, sub, sup, tt)
- *       We have chosen not to heed this distinction, as content_sets
- *       provides satisfactory disambiguation.
- */
-class HTMLPurifier_HTMLModule_Presentation extends HTMLPurifier_HTMLModule
-{
-
-    /**
-     * @type string
-     */
-    public $name = 'Presentation';
-
-    /**
-     * @param HTMLPurifier_Config $config
-     */
-    public function setup($config)
-    {
-        $this->addElement('hr', 'Block', 'Empty', 'Common');
-        $this->addElement('sub', 'Inline', 'Inline', 'Common');
-        $this->addElement('sup', 'Inline', 'Inline', 'Common');
-        $b = $this->addElement('b', 'Inline', 'Inline', 'Common');
-        $b->formatting = true;
-        $big = $this->addElement('big', 'Inline', 'Inline', 'Common');
-        $big->formatting = true;
-        $i = $this->addElement('i', 'Inline', 'Inline', 'Common');
-        $i->formatting = true;
-        $small = $this->addElement('small', 'Inline', 'Inline', 'Common');
-        $small->formatting = true;
-        $tt = $this->addElement('tt', 'Inline', 'Inline', 'Common');
-        $tt->formatting = true;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Proprietary.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Proprietary.php
deleted file mode 100644
index 5ee3c8e67f..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Proprietary.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * Module defines proprietary tags and attributes in HTML.
- * @warning If this module is enabled, standards-compliance is off!
- */
-class HTMLPurifier_HTMLModule_Proprietary extends HTMLPurifier_HTMLModule
-{
-    /**
-     * @type string
-     */
-    public $name = 'Proprietary';
-
-    /**
-     * @param HTMLPurifier_Config $config
-     */
-    public function setup($config)
-    {
-        $this->addElement(
-            'marquee',
-            'Inline',
-            'Flow',
-            'Common',
-            array(
-                'direction' => 'Enum#left,right,up,down',
-                'behavior' => 'Enum#alternate',
-                'width' => 'Length',
-                'height' => 'Length',
-                'scrolldelay' => 'Number',
-                'scrollamount' => 'Number',
-                'loop' => 'Number',
-                'bgcolor' => 'Color',
-                'hspace' => 'Pixels',
-                'vspace' => 'Pixels',
-            )
-        );
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Ruby.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Ruby.php
deleted file mode 100644
index a0d48924da..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Ruby.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * XHTML 1.1 Ruby Annotation Module, defines elements that indicate
- * short runs of text alongside base text for annotation or pronounciation.
- */
-class HTMLPurifier_HTMLModule_Ruby extends HTMLPurifier_HTMLModule
-{
-
-    /**
-     * @type string
-     */
-    public $name = 'Ruby';
-
-    /**
-     * @param HTMLPurifier_Config $config
-     */
-    public function setup($config)
-    {
-        $this->addElement(
-            'ruby',
-            'Inline',
-            'Custom: ((rb, (rt | (rp, rt, rp))) | (rbc, rtc, rtc?))',
-            'Common'
-        );
-        $this->addElement('rbc', false, 'Required: rb', 'Common');
-        $this->addElement('rtc', false, 'Required: rt', 'Common');
-        $rb = $this->addElement('rb', false, 'Inline', 'Common');
-        $rb->excludes = array('ruby' => true);
-        $rt = $this->addElement('rt', false, 'Inline', 'Common', array('rbspan' => 'Number'));
-        $rt->excludes = array('ruby' => true);
-        $this->addElement('rp', false, 'Optional: #PCDATA', 'Common');
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeEmbed.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeEmbed.php
deleted file mode 100644
index 04e6689ea6..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeEmbed.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * A "safe" embed module. See SafeObject. This is a proprietary element.
- */
-class HTMLPurifier_HTMLModule_SafeEmbed extends HTMLPurifier_HTMLModule
-{
-    /**
-     * @type string
-     */
-    public $name = 'SafeEmbed';
-
-    /**
-     * @param HTMLPurifier_Config $config
-     */
-    public function setup($config)
-    {
-        $max = $config->get('HTML.MaxImgLength');
-        $embed = $this->addElement(
-            'embed',
-            'Inline',
-            'Empty',
-            'Common',
-            array(
-                'src*' => 'URI#embedded',
-                'type' => 'Enum#application/x-shockwave-flash',
-                'width' => 'Pixels#' . $max,
-                'height' => 'Pixels#' . $max,
-                'allowscriptaccess' => 'Enum#never',
-                'allownetworking' => 'Enum#internal',
-                'flashvars' => 'Text',
-                'wmode' => 'Enum#window,transparent,opaque',
-                'name' => 'ID',
-            )
-        );
-        $embed->attr_transform_post[] = new HTMLPurifier_AttrTransform_SafeEmbed();
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeObject.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeObject.php
deleted file mode 100644
index 1297f80a39..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeObject.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
- * A "safe" object module. In theory, objects permitted by this module will
- * be safe, and untrusted users can be allowed to embed arbitrary flash objects
- * (maybe other types too, but only Flash is supported as of right now).
- * Highly experimental.
- */
-class HTMLPurifier_HTMLModule_SafeObject extends HTMLPurifier_HTMLModule
-{
-    /**
-     * @type string
-     */
-    public $name = 'SafeObject';
-
-    /**
-     * @param HTMLPurifier_Config $config
-     */
-    public function setup($config)
-    {
-        // These definitions are not intrinsically safe: the attribute transforms
-        // are a vital part of ensuring safety.
-
-        $max = $config->get('HTML.MaxImgLength');
-        $object = $this->addElement(
-            'object',
-            'Inline',
-            'Optional: param | Flow | #PCDATA',
-            'Common',
-            array(
-                // While technically not required by the spec, we're forcing
-                // it to this value.
-                'type' => 'Enum#application/x-shockwave-flash',
-                'width' => 'Pixels#' . $max,
-                'height' => 'Pixels#' . $max,
-                'data' => 'URI#embedded',
-                'codebase' => new HTMLPurifier_AttrDef_Enum(
-                    array(
-                        'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0'
-                    )
-                ),
-            )
-        );
-        $object->attr_transform_post[] = new HTMLPurifier_AttrTransform_SafeObject();
-
-        $param = $this->addElement(
-            'param',
-            false,
-            'Empty',
-            false,
-            array(
-                'id' => 'ID',
-                'name*' => 'Text',
-                'value' => 'Text'
-            )
-        );
-        $param->attr_transform_post[] = new HTMLPurifier_AttrTransform_SafeParam();
-        $this->info_injector[] = 'SafeObject';
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeScripting.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeScripting.php
deleted file mode 100644
index aea7584c37..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeScripting.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * A "safe" script module. No inline JS is allowed, and pointed to JS
- * files must match whitelist.
- */
-class HTMLPurifier_HTMLModule_SafeScripting extends HTMLPurifier_HTMLModule
-{
-    /**
-     * @type string
-     */
-    public $name = 'SafeScripting';
-
-    /**
-     * @param HTMLPurifier_Config $config
-     */
-    public function setup($config)
-    {
-        // These definitions are not intrinsically safe: the attribute transforms
-        // are a vital part of ensuring safety.
-
-        $allowed = $config->get('HTML.SafeScripting');
-        $script = $this->addElement(
-            'script',
-            'Inline',
-            'Optional:', // Not `Empty` to not allow to autoclose the <script /> tag @see https://www.w3.org/TR/html4/interact/scripts.html
-            null,
-            array(
-                // While technically not required by the spec, we're forcing
-                // it to this value.
-                'type' => 'Enum#text/javascript',
-                'src*' => new HTMLPurifier_AttrDef_Enum(array_keys($allowed), /*case sensitive*/ true)
-            )
-        );
-        $script->attr_transform_pre[] =
-        $script->attr_transform_post[] = new HTMLPurifier_AttrTransform_ScriptRequired();
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Scripting.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Scripting.php
deleted file mode 100644
index 8b28a7b7ea..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Scripting.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-/*
-
-WARNING: THIS MODULE IS EXTREMELY DANGEROUS AS IT ENABLES INLINE SCRIPTING
-INSIDE HTML PURIFIER DOCUMENTS. USE ONLY WITH TRUSTED USER INPUT!!!
-
-*/
-
-/**
- * XHTML 1.1 Scripting module, defines elements that are used to contain
- * information pertaining to executable scripts or the lack of support
- * for executable scripts.
- * @note This module does not contain inline scripting elements
- */
-class HTMLPurifier_HTMLModule_Scripting extends HTMLPurifier_HTMLModule
-{
-    /**
-     * @type string
-     */
-    public $name = 'Scripting';
-
-    /**
-     * @type array
-     */
-    public $elements = array('script', 'noscript');
-
-    /**
-     * @type array
-     */
-    public $content_sets = array('Block' => 'script | noscript', 'Inline' => 'script | noscript');
-
-    /**
-     * @type bool
-     */
-    public $safe = false;
-
-    /**
-     * @param HTMLPurifier_Config $config
-     */
-    public function setup($config)
-    {
-        // TODO: create custom child-definition for noscript that
-        // auto-wraps stray #PCDATA in a similar manner to
-        // blockquote's custom definition (we would use it but
-        // blockquote's contents are optional while noscript's contents
-        // are required)
-
-        // TODO: convert this to new syntax, main problem is getting
-        // both content sets working
-
-        // In theory, this could be safe, but I don't see any reason to
-        // allow it.
-        $this->info['noscript'] = new HTMLPurifier_ElementDef();
-        $this->info['noscript']->attr = array(0 => array('Common'));
-        $this->info['noscript']->content_model = 'Heading | List | Block';
-        $this->info['noscript']->content_model_type = 'required';
-
-        $this->info['script'] = new HTMLPurifier_ElementDef();
-        $this->info['script']->attr = array(
-            'defer' => new HTMLPurifier_AttrDef_Enum(array('defer')),
-            'src' => new HTMLPurifier_AttrDef_URI(true),
-            'type' => new HTMLPurifier_AttrDef_Enum(array('text/javascript'))
-        );
-        $this->info['script']->content_model = '#PCDATA';
-        $this->info['script']->content_model_type = 'optional';
-        $this->info['script']->attr_transform_pre[] =
-        $this->info['script']->attr_transform_post[] =
-            new HTMLPurifier_AttrTransform_ScriptRequired();
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/StyleAttribute.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/StyleAttribute.php
deleted file mode 100644
index 497b832ae2..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/StyleAttribute.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * XHTML 1.1 Edit Module, defines editing-related elements. Text Extension
- * Module.
- */
-class HTMLPurifier_HTMLModule_StyleAttribute extends HTMLPurifier_HTMLModule
-{
-    /**
-     * @type string
-     */
-    public $name = 'StyleAttribute';
-
-    /**
-     * @type array
-     */
-    public $attr_collections = array(
-        // The inclusion routine differs from the Abstract Modules but
-        // is in line with the DTD and XML Schemas.
-        'Style' => array('style' => false), // see constructor
-        'Core' => array(0 => array('Style'))
-    );
-
-    /**
-     * @param HTMLPurifier_Config $config
-     */
-    public function setup($config)
-    {
-        $this->attr_collections['Style']['style'] = new HTMLPurifier_AttrDef_CSS();
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tables.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tables.php
deleted file mode 100644
index 8a0b3b4616..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tables.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-/**
- * XHTML 1.1 Tables Module, fully defines accessible table elements.
- */
-class HTMLPurifier_HTMLModule_Tables extends HTMLPurifier_HTMLModule
-{
-    /**
-     * @type string
-     */
-    public $name = 'Tables';
-
-    /**
-     * @param HTMLPurifier_Config $config
-     */
-    public function setup($config)
-    {
-        $this->addElement('caption', false, 'Inline', 'Common');
-
-        $this->addElement(
-            'table',
-            'Block',
-            new HTMLPurifier_ChildDef_Table(),
-            'Common',
-            array(
-                'border' => 'Pixels',
-                'cellpadding' => 'Length',
-                'cellspacing' => 'Length',
-                'frame' => 'Enum#void,above,below,hsides,lhs,rhs,vsides,box,border',
-                'rules' => 'Enum#none,groups,rows,cols,all',
-                'summary' => 'Text',
-                'width' => 'Length'
-            )
-        );
-
-        // common attributes
-        $cell_align = array(
-            'align' => 'Enum#left,center,right,justify,char',
-            'charoff' => 'Length',
-            'valign' => 'Enum#top,middle,bottom,baseline',
-        );
-
-        $cell_t = array_merge(
-            array(
-                'abbr' => 'Text',
-                'colspan' => 'Number',
-                'rowspan' => 'Number',
-                // Apparently, as of HTML5 this attribute only applies
-                // to 'th' elements.
-                'scope' => 'Enum#row,col,rowgroup,colgroup',
-            ),
-            $cell_align
-        );
-        $this->addElement('td', false, 'Flow', 'Common', $cell_t);
-        $this->addElement('th', false, 'Flow', 'Common', $cell_t);
-
-        $this->addElement('tr', false, 'Required: td | th', 'Common', $cell_align);
-
-        $cell_col = array_merge(
-            array(
-                'span' => 'Number',
-                'width' => 'MultiLength',
-            ),
-            $cell_align
-        );
-        $this->addElement('col', false, 'Empty', 'Common', $cell_col);
-        $this->addElement('colgroup', false, 'Optional: col', 'Common', $cell_col);
-
-        $this->addElement('tbody', false, 'Required: tr', 'Common', $cell_align);
-        $this->addElement('thead', false, 'Required: tr', 'Common', $cell_align);
-        $this->addElement('tfoot', false, 'Required: tr', 'Common', $cell_align);
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Target.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Target.php
deleted file mode 100644
index b188ac9369..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Target.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * XHTML 1.1 Target Module, defines target attribute in link elements.
- */
-class HTMLPurifier_HTMLModule_Target extends HTMLPurifier_HTMLModule
-{
-    /**
-     * @type string
-     */
-    public $name = 'Target';
-
-    /**
-     * @param HTMLPurifier_Config $config
-     */
-    public function setup($config)
-    {
-        $elements = array('a');
-        foreach ($elements as $name) {
-            $e = $this->addBlankElement($name);
-            $e->attr = array(
-                'target' => new HTMLPurifier_AttrDef_HTML_FrameTarget()
-            );
-        }
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/TargetBlank.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/TargetBlank.php
deleted file mode 100644
index 58ccc68941..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/TargetBlank.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * Module adds the target=blank attribute transformation to a tags.  It
- * is enabled by HTML.TargetBlank
- */
-class HTMLPurifier_HTMLModule_TargetBlank extends HTMLPurifier_HTMLModule
-{
-    /**
-     * @type string
-     */
-    public $name = 'TargetBlank';
-
-    /**
-     * @param HTMLPurifier_Config $config
-     */
-    public function setup($config)
-    {
-        $a = $this->addBlankElement('a');
-        $a->attr_transform_post[] = new HTMLPurifier_AttrTransform_TargetBlank();
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/TargetNoopener.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/TargetNoopener.php
deleted file mode 100644
index b967ff566b..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/TargetNoopener.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/**
- * Module adds the target-based noopener attribute transformation to a tags.  It
- * is enabled by HTML.TargetNoopener
- */
-class HTMLPurifier_HTMLModule_TargetNoopener extends HTMLPurifier_HTMLModule
-{
-    /**
-     * @type string
-     */
-    public $name = 'TargetNoopener';
-
-    /**
-     * @param HTMLPurifier_Config $config
-     */
-    public function setup($config) {
-        $a = $this->addBlankElement('a');
-        $a->attr_transform_post[] = new HTMLPurifier_AttrTransform_TargetNoopener();
-    }
-}
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/TargetNoreferrer.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/TargetNoreferrer.php
deleted file mode 100644
index 32484d6019..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/TargetNoreferrer.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/**
- * Module adds the target-based noreferrer attribute transformation to a tags.  It
- * is enabled by HTML.TargetNoreferrer
- */
-class HTMLPurifier_HTMLModule_TargetNoreferrer extends HTMLPurifier_HTMLModule
-{
-    /**
-     * @type string
-     */
-    public $name = 'TargetNoreferrer';
-
-    /**
-     * @param HTMLPurifier_Config $config
-     */
-    public function setup($config) {
-        $a = $this->addBlankElement('a');
-        $a->attr_transform_post[] = new HTMLPurifier_AttrTransform_TargetNoreferrer();
-    }
-}
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Text.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Text.php
deleted file mode 100644
index 7a65e0048f..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Text.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-/**
- * XHTML 1.1 Text Module, defines basic text containers. Core Module.
- * @note In the normative XML Schema specification, this module
- *       is further abstracted into the following modules:
- *          - Block Phrasal (address, blockquote, pre, h1, h2, h3, h4, h5, h6)
- *          - Block Structural (div, p)
- *          - Inline Phrasal (abbr, acronym, cite, code, dfn, em, kbd, q, samp, strong, var)
- *          - Inline Structural (br, span)
- *       This module, functionally, does not distinguish between these
- *       sub-modules, but the code is internally structured to reflect
- *       these distinctions.
- */
-class HTMLPurifier_HTMLModule_Text extends HTMLPurifier_HTMLModule
-{
-    /**
-     * @type string
-     */
-    public $name = 'Text';
-
-    /**
-     * @type array
-     */
-    public $content_sets = array(
-        'Flow' => 'Heading | Block | Inline'
-    );
-
-    /**
-     * @param HTMLPurifier_Config $config
-     */
-    public function setup($config)
-    {
-        // Inline Phrasal -------------------------------------------------
-        $this->addElement('abbr', 'Inline', 'Inline', 'Common');
-        $this->addElement('acronym', 'Inline', 'Inline', 'Common');
-        $this->addElement('cite', 'Inline', 'Inline', 'Common');
-        $this->addElement('dfn', 'Inline', 'Inline', 'Common');
-        $this->addElement('kbd', 'Inline', 'Inline', 'Common');
-        $this->addElement('q', 'Inline', 'Inline', 'Common', array('cite' => 'URI'));
-        $this->addElement('samp', 'Inline', 'Inline', 'Common');
-        $this->addElement('var', 'Inline', 'Inline', 'Common');
-
-        $em = $this->addElement('em', 'Inline', 'Inline', 'Common');
-        $em->formatting = true;
-
-        $strong = $this->addElement('strong', 'Inline', 'Inline', 'Common');
-        $strong->formatting = true;
-
-        $code = $this->addElement('code', 'Inline', 'Inline', 'Common');
-        $code->formatting = true;
-
-        // Inline Structural ----------------------------------------------
-        $this->addElement('span', 'Inline', 'Inline', 'Common');
-        $this->addElement('br', 'Inline', 'Empty', 'Core');
-
-        // Block Phrasal --------------------------------------------------
-        $this->addElement('address', 'Block', 'Inline', 'Common');
-        $this->addElement('blockquote', 'Block', 'Optional: Heading | Block | List', 'Common', array('cite' => 'URI'));
-        $pre = $this->addElement('pre', 'Block', 'Inline', 'Common');
-        $pre->excludes = $this->makeLookup(
-            'img',
-            'big',
-            'small',
-            'object',
-            'applet',
-            'font',
-            'basefont'
-        );
-        $this->addElement('h1', 'Heading', 'Inline', 'Common');
-        $this->addElement('h2', 'Heading', 'Inline', 'Common');
-        $this->addElement('h3', 'Heading', 'Inline', 'Common');
-        $this->addElement('h4', 'Heading', 'Inline', 'Common');
-        $this->addElement('h5', 'Heading', 'Inline', 'Common');
-        $this->addElement('h6', 'Heading', 'Inline', 'Common');
-
-        // Block Structural -----------------------------------------------
-        $p = $this->addElement('p', 'Block', 'Inline', 'Common');
-        $p->autoclose = array_flip(
-            array("address", "blockquote", "center", "dir", "div", "dl", "fieldset", "ol", "p", "ul")
-        );
-
-        $this->addElement('div', 'Block', 'Flow', 'Common');
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy.php
deleted file mode 100644
index 08aa232470..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy.php
+++ /dev/null
@@ -1,230 +0,0 @@
-<?php
-
-/**
- * Abstract class for a set of proprietary modules that clean up (tidy)
- * poorly written HTML.
- * @todo Figure out how to protect some of these methods/properties
- */
-class HTMLPurifier_HTMLModule_Tidy extends HTMLPurifier_HTMLModule
-{
-    /**
-     * List of supported levels.
-     * Index zero is a special case "no fixes" level.
-     * @type array
-     */
-    public $levels = array(0 => 'none', 'light', 'medium', 'heavy');
-
-    /**
-     * Default level to place all fixes in.
-     * Disabled by default.
-     * @type string
-     */
-    public $defaultLevel = null;
-
-    /**
-     * Lists of fixes used by getFixesForLevel().
-     * Format is:
-     *      HTMLModule_Tidy->fixesForLevel[$level] = array('fix-1', 'fix-2');
-     * @type array
-     */
-    public $fixesForLevel = array(
-        'light' => array(),
-        'medium' => array(),
-        'heavy' => array()
-    );
-
-    /**
-     * Lazy load constructs the module by determining the necessary
-     * fixes to create and then delegating to the populate() function.
-     * @param HTMLPurifier_Config $config
-     * @todo Wildcard matching and error reporting when an added or
-     *       subtracted fix has no effect.
-     */
-    public function setup($config)
-    {
-        // create fixes, initialize fixesForLevel
-        $fixes = $this->makeFixes();
-        $this->makeFixesForLevel($fixes);
-
-        // figure out which fixes to use
-        $level = $config->get('HTML.TidyLevel');
-        $fixes_lookup = $this->getFixesForLevel($level);
-
-        // get custom fix declarations: these need namespace processing
-        $add_fixes = $config->get('HTML.TidyAdd');
-        $remove_fixes = $config->get('HTML.TidyRemove');
-
-        foreach ($fixes as $name => $fix) {
-            // needs to be refactored a little to implement globbing
-            if (isset($remove_fixes[$name]) ||
-                (!isset($add_fixes[$name]) && !isset($fixes_lookup[$name]))) {
-                unset($fixes[$name]);
-            }
-        }
-
-        // populate this module with necessary fixes
-        $this->populate($fixes);
-    }
-
-    /**
-     * Retrieves all fixes per a level, returning fixes for that specific
-     * level as well as all levels below it.
-     * @param string $level level identifier, see $levels for valid values
-     * @return array Lookup up table of fixes
-     */
-    public function getFixesForLevel($level)
-    {
-        if ($level == $this->levels[0]) {
-            return array();
-        }
-        $activated_levels = array();
-        for ($i = 1, $c = count($this->levels); $i < $c; $i++) {
-            $activated_levels[] = $this->levels[$i];
-            if ($this->levels[$i] == $level) {
-                break;
-            }
-        }
-        if ($i == $c) {
-            trigger_error(
-                'Tidy level ' . htmlspecialchars($level) . ' not recognized',
-                E_USER_WARNING
-            );
-            return array();
-        }
-        $ret = array();
-        foreach ($activated_levels as $level) {
-            foreach ($this->fixesForLevel[$level] as $fix) {
-                $ret[$fix] = true;
-            }
-        }
-        return $ret;
-    }
-
-    /**
-     * Dynamically populates the $fixesForLevel member variable using
-     * the fixes array. It may be custom overloaded, used in conjunction
-     * with $defaultLevel, or not used at all.
-     * @param array $fixes
-     */
-    public function makeFixesForLevel($fixes)
-    {
-        if (!isset($this->defaultLevel)) {
-            return;
-        }
-        if (!isset($this->fixesForLevel[$this->defaultLevel])) {
-            trigger_error(
-                'Default level ' . $this->defaultLevel . ' does not exist',
-                E_USER_ERROR
-            );
-            return;
-        }
-        $this->fixesForLevel[$this->defaultLevel] = array_keys($fixes);
-    }
-
-    /**
-     * Populates the module with transforms and other special-case code
-     * based on a list of fixes passed to it
-     * @param array $fixes Lookup table of fixes to activate
-     */
-    public function populate($fixes)
-    {
-        foreach ($fixes as $name => $fix) {
-            // determine what the fix is for
-            list($type, $params) = $this->getFixType($name);
-            switch ($type) {
-                case 'attr_transform_pre':
-                case 'attr_transform_post':
-                    $attr = $params['attr'];
-                    if (isset($params['element'])) {
-                        $element = $params['element'];
-                        if (empty($this->info[$element])) {
-                            $e = $this->addBlankElement($element);
-                        } else {
-                            $e = $this->info[$element];
-                        }
-                    } else {
-                        $type = "info_$type";
-                        $e = $this;
-                    }
-                    // PHP does some weird parsing when I do
-                    // $e->$type[$attr], so I have to assign a ref.
-                    $f =& $e->$type;
-                    $f[$attr] = $fix;
-                    break;
-                case 'tag_transform':
-                    $this->info_tag_transform[$params['element']] = $fix;
-                    break;
-                case 'child':
-                case 'content_model_type':
-                    $element = $params['element'];
-                    if (empty($this->info[$element])) {
-                        $e = $this->addBlankElement($element);
-                    } else {
-                        $e = $this->info[$element];
-                    }
-                    $e->$type = $fix;
-                    break;
-                default:
-                    trigger_error("Fix type $type not supported", E_USER_ERROR);
-                    break;
-            }
-        }
-    }
-
-    /**
-     * Parses a fix name and determines what kind of fix it is, as well
-     * as other information defined by the fix
-     * @param $name String name of fix
-     * @return array(string $fix_type, array $fix_parameters)
-     * @note $fix_parameters is type dependant, see populate() for usage
-     *       of these parameters
-     */
-    public function getFixType($name)
-    {
-        // parse it
-        $property = $attr = null;
-        if (strpos($name, '#') !== false) {
-            list($name, $property) = explode('#', $name);
-        }
-        if (strpos($name, '@') !== false) {
-            list($name, $attr) = explode('@', $name);
-        }
-
-        // figure out the parameters
-        $params = array();
-        if ($name !== '') {
-            $params['element'] = $name;
-        }
-        if (!is_null($attr)) {
-            $params['attr'] = $attr;
-        }
-
-        // special case: attribute transform
-        if (!is_null($attr)) {
-            if (is_null($property)) {
-                $property = 'pre';
-            }
-            $type = 'attr_transform_' . $property;
-            return array($type, $params);
-        }
-
-        // special case: tag transform
-        if (is_null($property)) {
-            return array('tag_transform', $params);
-        }
-
-        return array($property, $params);
-
-    }
-
-    /**
-     * Defines all fixes the module will perform in a compact
-     * associative array of fix name to fix implementation.
-     * @return array
-     */
-    public function makeFixes()
-    {
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Name.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Name.php
deleted file mode 100644
index a995161b28..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Name.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * Name is deprecated, but allowed in strict doctypes, so onl
- */
-class HTMLPurifier_HTMLModule_Tidy_Name extends HTMLPurifier_HTMLModule_Tidy
-{
-    /**
-     * @type string
-     */
-    public $name = 'Tidy_Name';
-
-    /**
-     * @type string
-     */
-    public $defaultLevel = 'heavy';
-
-    /**
-     * @return array
-     */
-    public function makeFixes()
-    {
-        $r = array();
-        // @name for img, a -----------------------------------------------
-        // Technically, it's allowed even on strict, so we allow authors to use
-        // it. However, it's deprecated in future versions of XHTML.
-        $r['img@name'] =
-        $r['a@name'] = new HTMLPurifier_AttrTransform_Name();
-        return $r;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php
deleted file mode 100644
index 3326438216..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-class HTMLPurifier_HTMLModule_Tidy_Proprietary extends HTMLPurifier_HTMLModule_Tidy
-{
-
-    /**
-     * @type string
-     */
-    public $name = 'Tidy_Proprietary';
-
-    /**
-     * @type string
-     */
-    public $defaultLevel = 'light';
-
-    /**
-     * @return array
-     */
-    public function makeFixes()
-    {
-        $r = array();
-        $r['table@background'] = new HTMLPurifier_AttrTransform_Background();
-        $r['td@background']    = new HTMLPurifier_AttrTransform_Background();
-        $r['th@background']    = new HTMLPurifier_AttrTransform_Background();
-        $r['tr@background']    = new HTMLPurifier_AttrTransform_Background();
-        $r['thead@background'] = new HTMLPurifier_AttrTransform_Background();
-        $r['tfoot@background'] = new HTMLPurifier_AttrTransform_Background();
-        $r['tbody@background'] = new HTMLPurifier_AttrTransform_Background();
-        $r['table@height']     = new HTMLPurifier_AttrTransform_Length('height');
-        return $r;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Strict.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Strict.php
deleted file mode 100644
index 803c44fabd..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Strict.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-class HTMLPurifier_HTMLModule_Tidy_Strict extends HTMLPurifier_HTMLModule_Tidy_XHTMLAndHTML4
-{
-    /**
-     * @type string
-     */
-    public $name = 'Tidy_Strict';
-
-    /**
-     * @type string
-     */
-    public $defaultLevel = 'light';
-
-    /**
-     * @return array
-     */
-    public function makeFixes()
-    {
-        $r = parent::makeFixes();
-        $r['blockquote#content_model_type'] = 'strictblockquote';
-        return $r;
-    }
-
-    /**
-     * @type bool
-     */
-    public $defines_child_def = true;
-
-    /**
-     * @param HTMLPurifier_ElementDef $def
-     * @return HTMLPurifier_ChildDef_StrictBlockquote
-     */
-    public function getChildDef($def)
-    {
-        if ($def->content_model_type != 'strictblockquote') {
-            return parent::getChildDef($def);
-        }
-        return new HTMLPurifier_ChildDef_StrictBlockquote($def->content_model);
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Transitional.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Transitional.php
deleted file mode 100644
index c095ad9745..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Transitional.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-class HTMLPurifier_HTMLModule_Tidy_Transitional extends HTMLPurifier_HTMLModule_Tidy_XHTMLAndHTML4
-{
-    /**
-     * @type string
-     */
-    public $name = 'Tidy_Transitional';
-
-    /**
-     * @type string
-     */
-    public $defaultLevel = 'heavy';
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php
deleted file mode 100644
index 3ecddc434b..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-class HTMLPurifier_HTMLModule_Tidy_XHTML extends HTMLPurifier_HTMLModule_Tidy
-{
-    /**
-     * @type string
-     */
-    public $name = 'Tidy_XHTML';
-
-    /**
-     * @type string
-     */
-    public $defaultLevel = 'medium';
-
-    /**
-     * @return array
-     */
-    public function makeFixes()
-    {
-        $r = array();
-        $r['@lang'] = new HTMLPurifier_AttrTransform_Lang();
-        return $r;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php
deleted file mode 100644
index 700a25dbce..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php
+++ /dev/null
@@ -1,180 +0,0 @@
-<?php
-
-class HTMLPurifier_HTMLModule_Tidy_XHTMLAndHTML4 extends HTMLPurifier_HTMLModule_Tidy
-{
-
-    /**
-     * @return array
-     */
-    public function makeFixes()
-    {
-        $r = array();
-
-        // == deprecated tag transforms ===================================
-
-        $r['font'] = new HTMLPurifier_TagTransform_Font();
-        $r['menu'] = new HTMLPurifier_TagTransform_Simple('ul');
-        $r['dir'] = new HTMLPurifier_TagTransform_Simple('ul');
-        $r['center'] = new HTMLPurifier_TagTransform_Simple('div', 'text-align:center;');
-        $r['u'] = new HTMLPurifier_TagTransform_Simple('span', 'text-decoration:underline;');
-        $r['s'] = new HTMLPurifier_TagTransform_Simple('span', 'text-decoration:line-through;');
-        $r['strike'] = new HTMLPurifier_TagTransform_Simple('span', 'text-decoration:line-through;');
-
-        // == deprecated attribute transforms =============================
-
-        $r['caption@align'] =
-            new HTMLPurifier_AttrTransform_EnumToCSS(
-                'align',
-                array(
-                    // we're following IE's behavior, not Firefox's, due
-                    // to the fact that no one supports caption-side:right,
-                    // W3C included (with CSS 2.1). This is a slightly
-                    // unreasonable attribute!
-                    'left' => 'text-align:left;',
-                    'right' => 'text-align:right;',
-                    'top' => 'caption-side:top;',
-                    'bottom' => 'caption-side:bottom;' // not supported by IE
-                )
-            );
-
-        // @align for img -------------------------------------------------
-        $r['img@align'] =
-            new HTMLPurifier_AttrTransform_EnumToCSS(
-                'align',
-                array(
-                    'left' => 'float:left;',
-                    'right' => 'float:right;',
-                    'top' => 'vertical-align:top;',
-                    'middle' => 'vertical-align:middle;',
-                    'bottom' => 'vertical-align:baseline;',
-                )
-            );
-
-        // @align for table -----------------------------------------------
-        $r['table@align'] =
-            new HTMLPurifier_AttrTransform_EnumToCSS(
-                'align',
-                array(
-                    'left' => 'float:left;',
-                    'center' => 'margin-left:auto;margin-right:auto;',
-                    'right' => 'float:right;'
-                )
-            );
-
-        // @align for hr -----------------------------------------------
-        $r['hr@align'] =
-            new HTMLPurifier_AttrTransform_EnumToCSS(
-                'align',
-                array(
-                    // we use both text-align and margin because these work
-                    // for different browsers (IE and Firefox, respectively)
-                    // and the melange makes for a pretty cross-compatible
-                    // solution
-                    'left' => 'margin-left:0;margin-right:auto;text-align:left;',
-                    'center' => 'margin-left:auto;margin-right:auto;text-align:center;',
-                    'right' => 'margin-left:auto;margin-right:0;text-align:right;'
-                )
-            );
-
-        // @align for h1, h2, h3, h4, h5, h6, p, div ----------------------
-        // {{{
-        $align_lookup = array();
-        $align_values = array('left', 'right', 'center', 'justify');
-        foreach ($align_values as $v) {
-            $align_lookup[$v] = "text-align:$v;";
-        }
-        // }}}
-        $r['h1@align'] =
-        $r['h2@align'] =
-        $r['h3@align'] =
-        $r['h4@align'] =
-        $r['h5@align'] =
-        $r['h6@align'] =
-        $r['p@align'] =
-        $r['div@align'] =
-            new HTMLPurifier_AttrTransform_EnumToCSS('align', $align_lookup);
-
-        // @bgcolor for table, tr, td, th ---------------------------------
-        $r['table@bgcolor'] =
-        $r['tr@bgcolor'] =
-        $r['td@bgcolor'] =
-        $r['th@bgcolor'] =
-            new HTMLPurifier_AttrTransform_BgColor();
-
-        // @border for img ------------------------------------------------
-        $r['img@border'] = new HTMLPurifier_AttrTransform_Border();
-
-        // @clear for br --------------------------------------------------
-        $r['br@clear'] =
-            new HTMLPurifier_AttrTransform_EnumToCSS(
-                'clear',
-                array(
-                    'left' => 'clear:left;',
-                    'right' => 'clear:right;',
-                    'all' => 'clear:both;',
-                    'none' => 'clear:none;',
-                )
-            );
-
-        // @height for td, th ---------------------------------------------
-        $r['td@height'] =
-        $r['th@height'] =
-            new HTMLPurifier_AttrTransform_Length('height');
-
-        // @hspace for img ------------------------------------------------
-        $r['img@hspace'] = new HTMLPurifier_AttrTransform_ImgSpace('hspace');
-
-        // @noshade for hr ------------------------------------------------
-        // this transformation is not precise but often good enough.
-        // different browsers use different styles to designate noshade
-        $r['hr@noshade'] =
-            new HTMLPurifier_AttrTransform_BoolToCSS(
-                'noshade',
-                'color:#808080;background-color:#808080;border:0;'
-            );
-
-        // @nowrap for td, th ---------------------------------------------
-        $r['td@nowrap'] =
-        $r['th@nowrap'] =
-            new HTMLPurifier_AttrTransform_BoolToCSS(
-                'nowrap',
-                'white-space:nowrap;'
-            );
-
-        // @size for hr  --------------------------------------------------
-        $r['hr@size'] = new HTMLPurifier_AttrTransform_Length('size', 'height');
-
-        // @type for li, ol, ul -------------------------------------------
-        // {{{
-        $ul_types = array(
-            'disc' => 'list-style-type:disc;',
-            'square' => 'list-style-type:square;',
-            'circle' => 'list-style-type:circle;'
-        );
-        $ol_types = array(
-            '1' => 'list-style-type:decimal;',
-            'i' => 'list-style-type:lower-roman;',
-            'I' => 'list-style-type:upper-roman;',
-            'a' => 'list-style-type:lower-alpha;',
-            'A' => 'list-style-type:upper-alpha;'
-        );
-        $li_types = $ul_types + $ol_types;
-        // }}}
-
-        $r['ul@type'] = new HTMLPurifier_AttrTransform_EnumToCSS('type', $ul_types);
-        $r['ol@type'] = new HTMLPurifier_AttrTransform_EnumToCSS('type', $ol_types, true);
-        $r['li@type'] = new HTMLPurifier_AttrTransform_EnumToCSS('type', $li_types, true);
-
-        // @vspace for img ------------------------------------------------
-        $r['img@vspace'] = new HTMLPurifier_AttrTransform_ImgSpace('vspace');
-
-        // @width for hr, td, th ------------------------------------------
-        $r['td@width'] =
-        $r['th@width'] =
-        $r['hr@width'] = new HTMLPurifier_AttrTransform_Length('width');
-
-        return $r;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/XMLCommonAttributes.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/XMLCommonAttributes.php
deleted file mode 100644
index 01dbe9deb6..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/XMLCommonAttributes.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-class HTMLPurifier_HTMLModule_XMLCommonAttributes extends HTMLPurifier_HTMLModule
-{
-    /**
-     * @type string
-     */
-    public $name = 'XMLCommonAttributes';
-
-    /**
-     * @type array
-     */
-    public $attr_collections = array(
-        'Lang' => array(
-            'xml:lang' => 'LanguageCode',
-        )
-    );
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModuleManager.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModuleManager.php
deleted file mode 100644
index 38c058fe23..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModuleManager.php
+++ /dev/null
@@ -1,467 +0,0 @@
-<?php
-
-class HTMLPurifier_HTMLModuleManager
-{
-
-    /**
-     * @type HTMLPurifier_DoctypeRegistry
-     */
-    public $doctypes;
-
-    /**
-     * Instance of current doctype.
-     * @type string
-     */
-    public $doctype;
-
-    /**
-     * @type HTMLPurifier_AttrTypes
-     */
-    public $attrTypes;
-
-    /**
-     * Active instances of modules for the specified doctype are
-     * indexed, by name, in this array.
-     * @type HTMLPurifier_HTMLModule[]
-     */
-    public $modules = array();
-
-    /**
-     * Array of recognized HTMLPurifier_HTMLModule instances,
-     * indexed by module's class name. This array is usually lazy loaded, but a
-     * user can overload a module by pre-emptively registering it.
-     * @type HTMLPurifier_HTMLModule[]
-     */
-    public $registeredModules = array();
-
-    /**
-     * List of extra modules that were added by the user
-     * using addModule(). These get unconditionally merged into the current doctype, whatever
-     * it may be.
-     * @type HTMLPurifier_HTMLModule[]
-     */
-    public $userModules = array();
-
-    /**
-     * Associative array of element name to list of modules that have
-     * definitions for the element; this array is dynamically filled.
-     * @type array
-     */
-    public $elementLookup = array();
-
-    /**
-     * List of prefixes we should use for registering small names.
-     * @type array
-     */
-    public $prefixes = array('HTMLPurifier_HTMLModule_');
-
-    /**
-     * @type HTMLPurifier_ContentSets
-     */
-    public $contentSets;
-
-    /**
-     * @type HTMLPurifier_AttrCollections
-     */
-    public $attrCollections;
-
-    /**
-     * If set to true, unsafe elements and attributes will be allowed.
-     * @type bool
-     */
-    public $trusted = false;
-
-    public function __construct()
-    {
-        // editable internal objects
-        $this->attrTypes = new HTMLPurifier_AttrTypes();
-        $this->doctypes  = new HTMLPurifier_DoctypeRegistry();
-
-        // setup basic modules
-        $common = array(
-            'CommonAttributes', 'Text', 'Hypertext', 'List',
-            'Presentation', 'Edit', 'Bdo', 'Tables', 'Image',
-            'StyleAttribute',
-            // Unsafe:
-            'Scripting', 'Object', 'Forms',
-            // Sorta legacy, but present in strict:
-            'Name',
-        );
-        $transitional = array('Legacy', 'Target', 'Iframe');
-        $xml = array('XMLCommonAttributes');
-        $non_xml = array('NonXMLCommonAttributes');
-
-        // setup basic doctypes
-        $this->doctypes->register(
-            'HTML 4.01 Transitional',
-            false,
-            array_merge($common, $transitional, $non_xml),
-            array('Tidy_Transitional', 'Tidy_Proprietary'),
-            array(),
-            '-//W3C//DTD HTML 4.01 Transitional//EN',
-            'http://www.w3.org/TR/html4/loose.dtd'
-        );
-
-        $this->doctypes->register(
-            'HTML 4.01 Strict',
-            false,
-            array_merge($common, $non_xml),
-            array('Tidy_Strict', 'Tidy_Proprietary', 'Tidy_Name'),
-            array(),
-            '-//W3C//DTD HTML 4.01//EN',
-            'http://www.w3.org/TR/html4/strict.dtd'
-        );
-
-        $this->doctypes->register(
-            'XHTML 1.0 Transitional',
-            true,
-            array_merge($common, $transitional, $xml, $non_xml),
-            array('Tidy_Transitional', 'Tidy_XHTML', 'Tidy_Proprietary', 'Tidy_Name'),
-            array(),
-            '-//W3C//DTD XHTML 1.0 Transitional//EN',
-            'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'
-        );
-
-        $this->doctypes->register(
-            'XHTML 1.0 Strict',
-            true,
-            array_merge($common, $xml, $non_xml),
-            array('Tidy_Strict', 'Tidy_XHTML', 'Tidy_Strict', 'Tidy_Proprietary', 'Tidy_Name'),
-            array(),
-            '-//W3C//DTD XHTML 1.0 Strict//EN',
-            'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'
-        );
-
-        $this->doctypes->register(
-            'XHTML 1.1',
-            true,
-            // Iframe is a real XHTML 1.1 module, despite being
-            // "transitional"!
-            array_merge($common, $xml, array('Ruby', 'Iframe')),
-            array('Tidy_Strict', 'Tidy_XHTML', 'Tidy_Proprietary', 'Tidy_Strict', 'Tidy_Name'), // Tidy_XHTML1_1
-            array(),
-            '-//W3C//DTD XHTML 1.1//EN',
-            'http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd'
-        );
-
-    }
-
-    /**
-     * Registers a module to the recognized module list, useful for
-     * overloading pre-existing modules.
-     * @param $module Mixed: string module name, with or without
-     *                HTMLPurifier_HTMLModule prefix, or instance of
-     *                subclass of HTMLPurifier_HTMLModule.
-     * @param $overload Boolean whether or not to overload previous modules.
-     *                  If this is not set, and you do overload a module,
-     *                  HTML Purifier will complain with a warning.
-     * @note This function will not call autoload, you must instantiate
-     *       (and thus invoke) autoload outside the method.
-     * @note If a string is passed as a module name, different variants
-     *       will be tested in this order:
-     *          - Check for HTMLPurifier_HTMLModule_$name
-     *          - Check all prefixes with $name in order they were added
-     *          - Check for literal object name
-     *          - Throw fatal error
-     *       If your object name collides with an internal class, specify
-     *       your module manually. All modules must have been included
-     *       externally: registerModule will not perform inclusions for you!
-     */
-    public function registerModule($module, $overload = false)
-    {
-        if (is_string($module)) {
-            // attempt to load the module
-            $original_module = $module;
-            $ok = false;
-            foreach ($this->prefixes as $prefix) {
-                $module = $prefix . $original_module;
-                if (class_exists($module)) {
-                    $ok = true;
-                    break;
-                }
-            }
-            if (!$ok) {
-                $module = $original_module;
-                if (!class_exists($module)) {
-                    trigger_error(
-                        $original_module . ' module does not exist',
-                        E_USER_ERROR
-                    );
-                    return;
-                }
-            }
-            $module = new $module();
-        }
-        if (empty($module->name)) {
-            trigger_error('Module instance of ' . get_class($module) . ' must have name');
-            return;
-        }
-        if (!$overload && isset($this->registeredModules[$module->name])) {
-            trigger_error('Overloading ' . $module->name . ' without explicit overload parameter', E_USER_WARNING);
-        }
-        $this->registeredModules[$module->name] = $module;
-    }
-
-    /**
-     * Adds a module to the current doctype by first registering it,
-     * and then tacking it on to the active doctype
-     */
-    public function addModule($module)
-    {
-        $this->registerModule($module);
-        if (is_object($module)) {
-            $module = $module->name;
-        }
-        $this->userModules[] = $module;
-    }
-
-    /**
-     * Adds a class prefix that registerModule() will use to resolve a
-     * string name to a concrete class
-     */
-    public function addPrefix($prefix)
-    {
-        $this->prefixes[] = $prefix;
-    }
-
-    /**
-     * Performs processing on modules, after being called you may
-     * use getElement() and getElements()
-     * @param HTMLPurifier_Config $config
-     */
-    public function setup($config)
-    {
-        $this->trusted = $config->get('HTML.Trusted');
-
-        // generate
-        $this->doctype = $this->doctypes->make($config);
-        $modules = $this->doctype->modules;
-
-        // take out the default modules that aren't allowed
-        $lookup = $config->get('HTML.AllowedModules');
-        $special_cases = $config->get('HTML.CoreModules');
-
-        if (is_array($lookup)) {
-            foreach ($modules as $k => $m) {
-                if (isset($special_cases[$m])) {
-                    continue;
-                }
-                if (!isset($lookup[$m])) {
-                    unset($modules[$k]);
-                }
-            }
-        }
-
-        // custom modules
-        if ($config->get('HTML.Proprietary')) {
-            $modules[] = 'Proprietary';
-        }
-        if ($config->get('HTML.SafeObject')) {
-            $modules[] = 'SafeObject';
-        }
-        if ($config->get('HTML.SafeEmbed')) {
-            $modules[] = 'SafeEmbed';
-        }
-        if ($config->get('HTML.SafeScripting') !== array()) {
-            $modules[] = 'SafeScripting';
-        }
-        if ($config->get('HTML.Nofollow')) {
-            $modules[] = 'Nofollow';
-        }
-        if ($config->get('HTML.TargetBlank')) {
-            $modules[] = 'TargetBlank';
-        }
-        // NB: HTML.TargetNoreferrer and HTML.TargetNoopener must be AFTER HTML.TargetBlank
-        // so that its post-attr-transform gets run afterwards.
-        if ($config->get('HTML.TargetNoreferrer')) {
-            $modules[] = 'TargetNoreferrer';
-        }
-        if ($config->get('HTML.TargetNoopener')) {
-            $modules[] = 'TargetNoopener';
-        }
-
-        // merge in custom modules
-        $modules = array_merge($modules, $this->userModules);
-
-        foreach ($modules as $module) {
-            $this->processModule($module);
-            $this->modules[$module]->setup($config);
-        }
-
-        foreach ($this->doctype->tidyModules as $module) {
-            $this->processModule($module);
-            $this->modules[$module]->setup($config);
-        }
-
-        // prepare any injectors
-        foreach ($this->modules as $module) {
-            $n = array();
-            foreach ($module->info_injector as $injector) {
-                if (!is_object($injector)) {
-                    $class = "HTMLPurifier_Injector_$injector";
-                    $injector = new $class;
-                }
-                $n[$injector->name] = $injector;
-            }
-            $module->info_injector = $n;
-        }
-
-        // setup lookup table based on all valid modules
-        foreach ($this->modules as $module) {
-            foreach ($module->info as $name => $def) {
-                if (!isset($this->elementLookup[$name])) {
-                    $this->elementLookup[$name] = array();
-                }
-                $this->elementLookup[$name][] = $module->name;
-            }
-        }
-
-        // note the different choice
-        $this->contentSets = new HTMLPurifier_ContentSets(
-            // content set assembly deals with all possible modules,
-            // not just ones deemed to be "safe"
-            $this->modules
-        );
-        $this->attrCollections = new HTMLPurifier_AttrCollections(
-            $this->attrTypes,
-            // there is no way to directly disable a global attribute,
-            // but using AllowedAttributes or simply not including
-            // the module in your custom doctype should be sufficient
-            $this->modules
-        );
-    }
-
-    /**
-     * Takes a module and adds it to the active module collection,
-     * registering it if necessary.
-     */
-    public function processModule($module)
-    {
-        if (!isset($this->registeredModules[$module]) || is_object($module)) {
-            $this->registerModule($module);
-        }
-        $this->modules[$module] = $this->registeredModules[$module];
-    }
-
-    /**
-     * Retrieves merged element definitions.
-     * @return Array of HTMLPurifier_ElementDef
-     */
-    public function getElements()
-    {
-        $elements = array();
-        foreach ($this->modules as $module) {
-            if (!$this->trusted && !$module->safe) {
-                continue;
-            }
-            foreach ($module->info as $name => $v) {
-                if (isset($elements[$name])) {
-                    continue;
-                }
-                $elements[$name] = $this->getElement($name);
-            }
-        }
-
-        // remove dud elements, this happens when an element that
-        // appeared to be safe actually wasn't
-        foreach ($elements as $n => $v) {
-            if ($v === false) {
-                unset($elements[$n]);
-            }
-        }
-
-        return $elements;
-
-    }
-
-    /**
-     * Retrieves a single merged element definition
-     * @param string $name Name of element
-     * @param bool $trusted Boolean trusted overriding parameter: set to true
-     *                 if you want the full version of an element
-     * @return HTMLPurifier_ElementDef Merged HTMLPurifier_ElementDef
-     * @note You may notice that modules are getting iterated over twice (once
-     *       in getElements() and once here). This
-     *       is because
-     */
-    public function getElement($name, $trusted = null)
-    {
-        if (!isset($this->elementLookup[$name])) {
-            return false;
-        }
-
-        // setup global state variables
-        $def = false;
-        if ($trusted === null) {
-            $trusted = $this->trusted;
-        }
-
-        // iterate through each module that has registered itself to this
-        // element
-        foreach ($this->elementLookup[$name] as $module_name) {
-            $module = $this->modules[$module_name];
-
-            // refuse to create/merge from a module that is deemed unsafe--
-            // pretend the module doesn't exist--when trusted mode is not on.
-            if (!$trusted && !$module->safe) {
-                continue;
-            }
-
-            // clone is used because, ideally speaking, the original
-            // definition should not be modified. Usually, this will
-            // make no difference, but for consistency's sake
-            $new_def = clone $module->info[$name];
-
-            if (!$def && $new_def->standalone) {
-                $def = $new_def;
-            } elseif ($def) {
-                // This will occur even if $new_def is standalone. In practice,
-                // this will usually result in a full replacement.
-                $def->mergeIn($new_def);
-            } else {
-                // :TODO:
-                // non-standalone definitions that don't have a standalone
-                // to merge into could be deferred to the end
-                // HOWEVER, it is perfectly valid for a non-standalone
-                // definition to lack a standalone definition, even
-                // after all processing: this allows us to safely
-                // specify extra attributes for elements that may not be
-                // enabled all in one place.  In particular, this might
-                // be the case for trusted elements.  WARNING: care must
-                // be taken that the /extra/ definitions are all safe.
-                continue;
-            }
-
-            // attribute value expansions
-            $this->attrCollections->performInclusions($def->attr);
-            $this->attrCollections->expandIdentifiers($def->attr, $this->attrTypes);
-
-            // descendants_are_inline, for ChildDef_Chameleon
-            if (is_string($def->content_model) &&
-                strpos($def->content_model, 'Inline') !== false) {
-                if ($name != 'del' && $name != 'ins') {
-                    // this is for you, ins/del
-                    $def->descendants_are_inline = true;
-                }
-            }
-
-            $this->contentSets->generateChildDef($def, $module);
-        }
-
-        // This can occur if there is a blank definition, but no base to
-        // mix it in with
-        if (!$def) {
-            return false;
-        }
-
-        // add information on required attributes
-        foreach ($def->attr as $attr_name => $attr_def) {
-            if ($attr_def->required) {
-                $def->required_attr[] = $attr_name;
-            }
-        }
-        return $def;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/IDAccumulator.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/IDAccumulator.php
deleted file mode 100644
index 65c902c076..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/IDAccumulator.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/**
- * Component of HTMLPurifier_AttrContext that accumulates IDs to prevent dupes
- * @note In Slashdot-speak, dupe means duplicate.
- * @note The default constructor does not accept $config or $context objects:
- *       use must use the static build() factory method to perform initialization.
- */
-class HTMLPurifier_IDAccumulator
-{
-
-    /**
-     * Lookup table of IDs we've accumulated.
-     * @public
-     */
-    public $ids = array();
-
-    /**
-     * Builds an IDAccumulator, also initializing the default blacklist
-     * @param HTMLPurifier_Config $config Instance of HTMLPurifier_Config
-     * @param HTMLPurifier_Context $context Instance of HTMLPurifier_Context
-     * @return HTMLPurifier_IDAccumulator Fully initialized HTMLPurifier_IDAccumulator
-     */
-    public static function build($config, $context)
-    {
-        $id_accumulator = new HTMLPurifier_IDAccumulator();
-        $id_accumulator->load($config->get('Attr.IDBlacklist'));
-        return $id_accumulator;
-    }
-
-    /**
-     * Add an ID to the lookup table.
-     * @param string $id ID to be added.
-     * @return bool status, true if success, false if there's a dupe
-     */
-    public function add($id)
-    {
-        if (isset($this->ids[$id])) {
-            return false;
-        }
-        return $this->ids[$id] = true;
-    }
-
-    /**
-     * Load a list of IDs into the lookup table
-     * @param $array_of_ids Array of IDs to load
-     * @note This function doesn't care about duplicates
-     */
-    public function load($array_of_ids)
-    {
-        foreach ($array_of_ids as $id) {
-            $this->ids[$id] = true;
-        }
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector.php
deleted file mode 100644
index 116b470c37..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector.php
+++ /dev/null
@@ -1,283 +0,0 @@
-<?php
-
-/**
- * Injects tokens into the document while parsing for well-formedness.
- * This enables "formatter-like" functionality such as auto-paragraphing,
- * smiley-ification and linkification to take place.
- *
- * A note on how handlers create changes; this is done by assigning a new
- * value to the $token reference. These values can take a variety of forms and
- * are best described HTMLPurifier_Strategy_MakeWellFormed->processToken()
- * documentation.
- *
- * @todo Allow injectors to request a re-run on their output. This
- *       would help if an operation is recursive.
- */
-abstract class HTMLPurifier_Injector
-{
-
-    /**
-     * Advisory name of injector, this is for friendly error messages.
-     * @type string
-     */
-    public $name;
-
-    /**
-     * @type HTMLPurifier_HTMLDefinition
-     */
-    protected $htmlDefinition;
-
-    /**
-     * Reference to CurrentNesting variable in Context. This is an array
-     * list of tokens that we are currently "inside"
-     * @type array
-     */
-    protected $currentNesting;
-
-    /**
-     * Reference to current token.
-     * @type HTMLPurifier_Token
-     */
-    protected $currentToken;
-
-    /**
-     * Reference to InputZipper variable in Context.
-     * @type HTMLPurifier_Zipper
-     */
-    protected $inputZipper;
-
-    /**
-     * Array of elements and attributes this injector creates and therefore
-     * need to be allowed by the definition. Takes form of
-     * array('element' => array('attr', 'attr2'), 'element2')
-     * @type array
-     */
-    public $needed = array();
-
-    /**
-     * Number of elements to rewind backwards (relative).
-     * @type bool|int
-     */
-    protected $rewindOffset = false;
-
-    /**
-     * Rewind to a spot to re-perform processing. This is useful if you
-     * deleted a node, and now need to see if this change affected any
-     * earlier nodes. Rewinding does not affect other injectors, and can
-     * result in infinite loops if not used carefully.
-     * @param bool|int $offset
-     * @warning HTML Purifier will prevent you from fast-forwarding with this
-     *          function.
-     */
-    public function rewindOffset($offset)
-    {
-        $this->rewindOffset = $offset;
-    }
-
-    /**
-     * Retrieves rewind offset, and then unsets it.
-     * @return bool|int
-     */
-    public function getRewindOffset()
-    {
-        $r = $this->rewindOffset;
-        $this->rewindOffset = false;
-        return $r;
-    }
-
-    /**
-     * Prepares the injector by giving it the config and context objects:
-     * this allows references to important variables to be made within
-     * the injector. This function also checks if the HTML environment
-     * will work with the Injector (see checkNeeded()).
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool|string Boolean false if success, string of missing needed element/attribute if failure
-     */
-    public function prepare($config, $context)
-    {
-        $this->htmlDefinition = $config->getHTMLDefinition();
-        // Even though this might fail, some unit tests ignore this and
-        // still test checkNeeded, so be careful. Maybe get rid of that
-        // dependency.
-        $result = $this->checkNeeded($config);
-        if ($result !== false) {
-            return $result;
-        }
-        $this->currentNesting =& $context->get('CurrentNesting');
-        $this->currentToken   =& $context->get('CurrentToken');
-        $this->inputZipper    =& $context->get('InputZipper');
-        return false;
-    }
-
-    /**
-     * This function checks if the HTML environment
-     * will work with the Injector: if p tags are not allowed, the
-     * Auto-Paragraphing injector should not be enabled.
-     * @param HTMLPurifier_Config $config
-     * @return bool|string Boolean false if success, string of missing needed element/attribute if failure
-     */
-    public function checkNeeded($config)
-    {
-        $def = $config->getHTMLDefinition();
-        foreach ($this->needed as $element => $attributes) {
-            if (is_int($element)) {
-                $element = $attributes;
-            }
-            if (!isset($def->info[$element])) {
-                return $element;
-            }
-            if (!is_array($attributes)) {
-                continue;
-            }
-            foreach ($attributes as $name) {
-                if (!isset($def->info[$element]->attr[$name])) {
-                    return "$element.$name";
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Tests if the context node allows a certain element
-     * @param string $name Name of element to test for
-     * @return bool True if element is allowed, false if it is not
-     */
-    public function allowsElement($name)
-    {
-        if (!empty($this->currentNesting)) {
-            $parent_token = array_pop($this->currentNesting);
-            $this->currentNesting[] = $parent_token;
-            $parent = $this->htmlDefinition->info[$parent_token->name];
-        } else {
-            $parent = $this->htmlDefinition->info_parent_def;
-        }
-        if (!isset($parent->child->elements[$name]) || isset($parent->excludes[$name])) {
-            return false;
-        }
-        // check for exclusion
-        if (!empty($this->currentNesting)) {
-            for ($i = count($this->currentNesting) - 2; $i >= 0; $i--) {
-                $node = $this->currentNesting[$i];
-                $def  = $this->htmlDefinition->info[$node->name];
-                if (isset($def->excludes[$name])) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Iterator function, which starts with the next token and continues until
-     * you reach the end of the input tokens.
-     * @warning Please prevent previous references from interfering with this
-     *          functions by setting $i = null beforehand!
-     * @param int $i Current integer index variable for inputTokens
-     * @param HTMLPurifier_Token $current Current token variable.
-     *          Do NOT use $token, as that variable is also a reference
-     * @return bool
-     */
-    protected function forward(&$i, &$current)
-    {
-        if ($i === null) {
-            $i = count($this->inputZipper->back) - 1;
-        } else {
-            $i--;
-        }
-        if ($i < 0) {
-            return false;
-        }
-        $current = $this->inputZipper->back[$i];
-        return true;
-    }
-
-    /**
-     * Similar to _forward, but accepts a third parameter $nesting (which
-     * should be initialized at 0) and stops when we hit the end tag
-     * for the node $this->inputIndex starts in.
-     * @param int $i Current integer index variable for inputTokens
-     * @param HTMLPurifier_Token $current Current token variable.
-     *          Do NOT use $token, as that variable is also a reference
-     * @param int $nesting
-     * @return bool
-     */
-    protected function forwardUntilEndToken(&$i, &$current, &$nesting)
-    {
-        $result = $this->forward($i, $current);
-        if (!$result) {
-            return false;
-        }
-        if ($nesting === null) {
-            $nesting = 0;
-        }
-        if ($current instanceof HTMLPurifier_Token_Start) {
-            $nesting++;
-        } elseif ($current instanceof HTMLPurifier_Token_End) {
-            if ($nesting <= 0) {
-                return false;
-            }
-            $nesting--;
-        }
-        return true;
-    }
-
-    /**
-     * Iterator function, starts with the previous token and continues until
-     * you reach the beginning of input tokens.
-     * @warning Please prevent previous references from interfering with this
-     *          functions by setting $i = null beforehand!
-     * @param int $i Current integer index variable for inputTokens
-     * @param HTMLPurifier_Token $current Current token variable.
-     *          Do NOT use $token, as that variable is also a reference
-     * @return bool
-     */
-    protected function backward(&$i, &$current)
-    {
-        if ($i === null) {
-            $i = count($this->inputZipper->front) - 1;
-        } else {
-            $i--;
-        }
-        if ($i < 0) {
-            return false;
-        }
-        $current = $this->inputZipper->front[$i];
-        return true;
-    }
-
-    /**
-     * Handler that is called when a text token is processed
-     */
-    public function handleText(&$token)
-    {
-    }
-
-    /**
-     * Handler that is called when a start or empty token is processed
-     */
-    public function handleElement(&$token)
-    {
-    }
-
-    /**
-     * Handler that is called when an end token is processed
-     */
-    public function handleEnd(&$token)
-    {
-        $this->notifyEnd($token);
-    }
-
-    /**
-     * Notifier that is called when an end token is processed
-     * @param HTMLPurifier_Token $token Current token variable.
-     * @note This differs from handlers in that the token is read-only
-     * @deprecated
-     */
-    public function notifyEnd($token)
-    {
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/AutoParagraph.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/AutoParagraph.php
deleted file mode 100644
index 4afdd128d5..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/AutoParagraph.php
+++ /dev/null
@@ -1,356 +0,0 @@
-<?php
-
-/**
- * Injector that auto paragraphs text in the root node based on
- * double-spacing.
- * @todo Ensure all states are unit tested, including variations as well.
- * @todo Make a graph of the flow control for this Injector.
- */
-class HTMLPurifier_Injector_AutoParagraph extends HTMLPurifier_Injector
-{
-    /**
-     * @type string
-     */
-    public $name = 'AutoParagraph';
-
-    /**
-     * @type array
-     */
-    public $needed = array('p');
-
-    /**
-     * @return HTMLPurifier_Token_Start
-     */
-    private function _pStart()
-    {
-        $par = new HTMLPurifier_Token_Start('p');
-        $par->armor['MakeWellFormed_TagClosedError'] = true;
-        return $par;
-    }
-
-    /**
-     * @param HTMLPurifier_Token_Text $token
-     */
-    public function handleText(&$token)
-    {
-        $text = $token->data;
-        // Does the current parent allow <p> tags?
-        if ($this->allowsElement('p')) {
-            if (empty($this->currentNesting) || strpos($text, "\n\n") !== false) {
-                // Note that we have differing behavior when dealing with text
-                // in the anonymous root node, or a node inside the document.
-                // If the text as a double-newline, the treatment is the same;
-                // if it doesn't, see the next if-block if you're in the document.
-
-                $i = $nesting = null;
-                if (!$this->forwardUntilEndToken($i, $current, $nesting) && $token->is_whitespace) {
-                    // State 1.1: ...    ^ (whitespace, then document end)
-                    //               ----
-                    // This is a degenerate case
-                } else {
-                    if (!$token->is_whitespace || $this->_isInline($current)) {
-                        // State 1.2: PAR1
-                        //            ----
-
-                        // State 1.3: PAR1\n\nPAR2
-                        //            ------------
-
-                        // State 1.4: <div>PAR1\n\nPAR2 (see State 2)
-                        //                 ------------
-                        $token = array($this->_pStart());
-                        $this->_splitText($text, $token);
-                    } else {
-                        // State 1.5: \n<hr />
-                        //            --
-                    }
-                }
-            } else {
-                // State 2:   <div>PAR1... (similar to 1.4)
-                //                 ----
-
-                // We're in an element that allows paragraph tags, but we're not
-                // sure if we're going to need them.
-                if ($this->_pLookAhead()) {
-                    // State 2.1: <div>PAR1<b>PAR1\n\nPAR2
-                    //                 ----
-                    // Note: This will always be the first child, since any
-                    // previous inline element would have triggered this very
-                    // same routine, and found the double newline. One possible
-                    // exception would be a comment.
-                    $token = array($this->_pStart(), $token);
-                } else {
-                    // State 2.2.1: <div>PAR1<div>
-                    //                   ----
-
-                    // State 2.2.2: <div>PAR1<b>PAR1</b></div>
-                    //                   ----
-                }
-            }
-            // Is the current parent a <p> tag?
-        } elseif (!empty($this->currentNesting) &&
-            $this->currentNesting[count($this->currentNesting) - 1]->name == 'p') {
-            // State 3.1: ...<p>PAR1
-            //                  ----
-
-            // State 3.2: ...<p>PAR1\n\nPAR2
-            //                  ------------
-            $token = array();
-            $this->_splitText($text, $token);
-            // Abort!
-        } else {
-            // State 4.1: ...<b>PAR1
-            //                  ----
-
-            // State 4.2: ...<b>PAR1\n\nPAR2
-            //                  ------------
-        }
-    }
-
-    /**
-     * @param HTMLPurifier_Token $token
-     */
-    public function handleElement(&$token)
-    {
-        // We don't have to check if we're already in a <p> tag for block
-        // tokens, because the tag would have been autoclosed by MakeWellFormed.
-        if ($this->allowsElement('p')) {
-            if (!empty($this->currentNesting)) {
-                if ($this->_isInline($token)) {
-                    // State 1: <div>...<b>
-                    //                  ---
-                    // Check if this token is adjacent to the parent token
-                    // (seek backwards until token isn't whitespace)
-                    $i = null;
-                    $this->backward($i, $prev);
-
-                    if (!$prev instanceof HTMLPurifier_Token_Start) {
-                        // Token wasn't adjacent
-                        if ($prev instanceof HTMLPurifier_Token_Text &&
-                            substr($prev->data, -2) === "\n\n"
-                        ) {
-                            // State 1.1.4: <div><p>PAR1</p>\n\n<b>
-                            //                                  ---
-                            // Quite frankly, this should be handled by splitText
-                            $token = array($this->_pStart(), $token);
-                        } else {
-                            // State 1.1.1: <div><p>PAR1</p><b>
-                            //                              ---
-                            // State 1.1.2: <div><br /><b>
-                            //                         ---
-                            // State 1.1.3: <div>PAR<b>
-                            //                      ---
-                        }
-                    } else {
-                        // State 1.2.1: <div><b>
-                        //                   ---
-                        // Lookahead to see if <p> is needed.
-                        if ($this->_pLookAhead()) {
-                            // State 1.3.1: <div><b>PAR1\n\nPAR2
-                            //                   ---
-                            $token = array($this->_pStart(), $token);
-                        } else {
-                            // State 1.3.2: <div><b>PAR1</b></div>
-                            //                   ---
-
-                            // State 1.3.3: <div><b>PAR1</b><div></div>\n\n</div>
-                            //                   ---
-                        }
-                    }
-                } else {
-                    // State 2.3: ...<div>
-                    //               -----
-                }
-            } else {
-                if ($this->_isInline($token)) {
-                    // State 3.1: <b>
-                    //            ---
-                    // This is where the {p} tag is inserted, not reflected in
-                    // inputTokens yet, however.
-                    $token = array($this->_pStart(), $token);
-                } else {
-                    // State 3.2: <div>
-                    //            -----
-                }
-
-                $i = null;
-                if ($this->backward($i, $prev)) {
-                    if (!$prev instanceof HTMLPurifier_Token_Text) {
-                        // State 3.1.1: ...</p>{p}<b>
-                        //                        ---
-                        // State 3.2.1: ...</p><div>
-                        //                     -----
-                        if (!is_array($token)) {
-                            $token = array($token);
-                        }
-                        array_unshift($token, new HTMLPurifier_Token_Text("\n\n"));
-                    } else {
-                        // State 3.1.2: ...</p>\n\n{p}<b>
-                        //                            ---
-                        // State 3.2.2: ...</p>\n\n<div>
-                        //                         -----
-                        // Note: PAR<ELEM> cannot occur because PAR would have been
-                        // wrapped in <p> tags.
-                    }
-                }
-            }
-        } else {
-            // State 2.2: <ul><li>
-            //                ----
-            // State 2.4: <p><b>
-            //               ---
-        }
-    }
-
-    /**
-     * Splits up a text in paragraph tokens and appends them
-     * to the result stream that will replace the original
-     * @param string $data String text data that will be processed
-     *    into paragraphs
-     * @param HTMLPurifier_Token[] $result Reference to array of tokens that the
-     *    tags will be appended onto
-     */
-    private function _splitText($data, &$result)
-    {
-        $raw_paragraphs = explode("\n\n", $data);
-        $paragraphs = array(); // without empty paragraphs
-        $needs_start = false;
-        $needs_end = false;
-
-        $c = count($raw_paragraphs);
-        if ($c == 1) {
-            // There were no double-newlines, abort quickly. In theory this
-            // should never happen.
-            $result[] = new HTMLPurifier_Token_Text($data);
-            return;
-        }
-        for ($i = 0; $i < $c; $i++) {
-            $par = $raw_paragraphs[$i];
-            if (trim($par) !== '') {
-                $paragraphs[] = $par;
-            } else {
-                if ($i == 0) {
-                    // Double newline at the front
-                    if (empty($result)) {
-                        // The empty result indicates that the AutoParagraph
-                        // injector did not add any start paragraph tokens.
-                        // This means that we have been in a paragraph for
-                        // a while, and the newline means we should start a new one.
-                        $result[] = new HTMLPurifier_Token_End('p');
-                        $result[] = new HTMLPurifier_Token_Text("\n\n");
-                        // However, the start token should only be added if
-                        // there is more processing to be done (i.e. there are
-                        // real paragraphs in here). If there are none, the
-                        // next start paragraph tag will be handled by the
-                        // next call to the injector
-                        $needs_start = true;
-                    } else {
-                        // We just started a new paragraph!
-                        // Reinstate a double-newline for presentation's sake, since
-                        // it was in the source code.
-                        array_unshift($result, new HTMLPurifier_Token_Text("\n\n"));
-                    }
-                } elseif ($i + 1 == $c) {
-                    // Double newline at the end
-                    // There should be a trailing </p> when we're finally done.
-                    $needs_end = true;
-                }
-            }
-        }
-
-        // Check if this was just a giant blob of whitespace. Move this earlier,
-        // perhaps?
-        if (empty($paragraphs)) {
-            return;
-        }
-
-        // Add the start tag indicated by \n\n at the beginning of $data
-        if ($needs_start) {
-            $result[] = $this->_pStart();
-        }
-
-        // Append the paragraphs onto the result
-        foreach ($paragraphs as $par) {
-            $result[] = new HTMLPurifier_Token_Text($par);
-            $result[] = new HTMLPurifier_Token_End('p');
-            $result[] = new HTMLPurifier_Token_Text("\n\n");
-            $result[] = $this->_pStart();
-        }
-
-        // Remove trailing start token; Injector will handle this later if
-        // it was indeed needed. This prevents from needing to do a lookahead,
-        // at the cost of a lookbehind later.
-        array_pop($result);
-
-        // If there is no need for an end tag, remove all of it and let
-        // MakeWellFormed close it later.
-        if (!$needs_end) {
-            array_pop($result); // removes \n\n
-            array_pop($result); // removes </p>
-        }
-    }
-
-    /**
-     * Returns true if passed token is inline (and, ergo, allowed in
-     * paragraph tags)
-     * @param HTMLPurifier_Token $token
-     * @return bool
-     */
-    private function _isInline($token)
-    {
-        return isset($this->htmlDefinition->info['p']->child->elements[$token->name]);
-    }
-
-    /**
-     * Looks ahead in the token list and determines whether or not we need
-     * to insert a <p> tag.
-     * @return bool
-     */
-    private function _pLookAhead()
-    {
-        if ($this->currentToken instanceof HTMLPurifier_Token_Start) {
-            $nesting = 1;
-        } else {
-            $nesting = 0;
-        }
-        $ok = false;
-        $i = null;
-        while ($this->forwardUntilEndToken($i, $current, $nesting)) {
-            $result = $this->_checkNeedsP($current);
-            if ($result !== null) {
-                $ok = $result;
-                break;
-            }
-        }
-        return $ok;
-    }
-
-    /**
-     * Determines if a particular token requires an earlier inline token
-     * to get a paragraph. This should be used with _forwardUntilEndToken
-     * @param HTMLPurifier_Token $current
-     * @return bool
-     */
-    private function _checkNeedsP($current)
-    {
-        if ($current instanceof HTMLPurifier_Token_Start) {
-            if (!$this->_isInline($current)) {
-                // <div>PAR1<div>
-                //      ----
-                // Terminate early, since we hit a block element
-                return false;
-            }
-        } elseif ($current instanceof HTMLPurifier_Token_Text) {
-            if (strpos($current->data, "\n\n") !== false) {
-                // <div>PAR1<b>PAR1\n\nPAR2
-                //      ----
-                return true;
-            } else {
-                // <div>PAR1<b>PAR1...
-                //      ----
-            }
-        }
-        return null;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/DisplayLinkURI.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/DisplayLinkURI.php
deleted file mode 100644
index c19b1bc271..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/DisplayLinkURI.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * Injector that displays the URL of an anchor instead of linking to it, in addition to showing the text of the link.
- */
-class HTMLPurifier_Injector_DisplayLinkURI extends HTMLPurifier_Injector
-{
-    /**
-     * @type string
-     */
-    public $name = 'DisplayLinkURI';
-
-    /**
-     * @type array
-     */
-    public $needed = array('a');
-
-    /**
-     * @param $token
-     */
-    public function handleElement(&$token)
-    {
-    }
-
-    /**
-     * @param HTMLPurifier_Token $token
-     */
-    public function handleEnd(&$token)
-    {
-        if (isset($token->start->attr['href'])) {
-            $url = $token->start->attr['href'];
-            unset($token->start->attr['href']);
-            $token = array($token, new HTMLPurifier_Token_Text(" ($url)"));
-        } else {
-            // nothing to display
-        }
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/Linkify.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/Linkify.php
deleted file mode 100644
index 74f83eaa7d..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/Linkify.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/**
- * Injector that converts http, https and ftp text URLs to actual links.
- */
-class HTMLPurifier_Injector_Linkify extends HTMLPurifier_Injector
-{
-    /**
-     * @type string
-     */
-    public $name = 'Linkify';
-
-    /**
-     * @type array
-     */
-    public $needed = array('a' => array('href'));
-
-    /**
-     * @param HTMLPurifier_Token $token
-     */
-    public function handleText(&$token)
-    {
-        if (!$this->allowsElement('a')) {
-            return;
-        }
-
-        if (strpos($token->data, '://') === false) {
-            // our really quick heuristic failed, abort
-            // this may not work so well if we want to match things like
-            // "google.com", but then again, most people don't
-            return;
-        }
-
-        // there is/are URL(s). Let's split the string.
-        // We use this regex:
-        // https://gist.github.com/gruber/249502
-        // but with @cscott's backtracking fix and also
-        // the Unicode characters un-Unicodified.
-        $bits = preg_split(
-            '/\\b((?:[a-z][\\w\\-]+:(?:\\/{1,3}|[a-z0-9%])|www\\d{0,3}[.]|[a-z0-9.\\-]+[.][a-z]{2,4}\\/)(?:[^\\s()<>]|\\((?:[^\\s()<>]|(?:\\([^\\s()<>]+\\)))*\\))+(?:\\((?:[^\\s()<>]|(?:\\([^\\s()<>]+\\)))*\\)|[^\\s`!()\\[\\]{};:\'".,<>?\x{00ab}\x{00bb}\x{201c}\x{201d}\x{2018}\x{2019}]))/iu',
-            $token->data, -1, PREG_SPLIT_DELIM_CAPTURE);
-
-
-        $token = array();
-
-        // $i = index
-        // $c = count
-        // $l = is link
-        for ($i = 0, $c = count($bits), $l = false; $i < $c; $i++, $l = !$l) {
-            if (!$l) {
-                if ($bits[$i] === '') {
-                    continue;
-                }
-                $token[] = new HTMLPurifier_Token_Text($bits[$i]);
-            } else {
-                $token[] = new HTMLPurifier_Token_Start('a', array('href' => $bits[$i]));
-                $token[] = new HTMLPurifier_Token_Text($bits[$i]);
-                $token[] = new HTMLPurifier_Token_End('a');
-            }
-        }
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/PurifierLinkify.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/PurifierLinkify.php
deleted file mode 100644
index cb9046f334..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/PurifierLinkify.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-/**
- * Injector that converts configuration directive syntax %Namespace.Directive
- * to links
- */
-class HTMLPurifier_Injector_PurifierLinkify extends HTMLPurifier_Injector
-{
-    /**
-     * @type string
-     */
-    public $name = 'PurifierLinkify';
-
-    /**
-     * @type string
-     */
-    public $docURL;
-
-    /**
-     * @type array
-     */
-    public $needed = array('a' => array('href'));
-
-    /**
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return string
-     */
-    public function prepare($config, $context)
-    {
-        $this->docURL = $config->get('AutoFormat.PurifierLinkify.DocURL');
-        return parent::prepare($config, $context);
-    }
-
-    /**
-     * @param HTMLPurifier_Token $token
-     */
-    public function handleText(&$token)
-    {
-        if (!$this->allowsElement('a')) {
-            return;
-        }
-        if (strpos($token->data, '%') === false) {
-            return;
-        }
-
-        $bits = preg_split('#%([a-z0-9]+\.[a-z0-9]+)#Si', $token->data, -1, PREG_SPLIT_DELIM_CAPTURE);
-        $token = array();
-
-        // $i = index
-        // $c = count
-        // $l = is link
-        for ($i = 0, $c = count($bits), $l = false; $i < $c; $i++, $l = !$l) {
-            if (!$l) {
-                if ($bits[$i] === '') {
-                    continue;
-                }
-                $token[] = new HTMLPurifier_Token_Text($bits[$i]);
-            } else {
-                $token[] = new HTMLPurifier_Token_Start(
-                    'a',
-                    array('href' => str_replace('%s', $bits[$i], $this->docURL))
-                );
-                $token[] = new HTMLPurifier_Token_Text('%' . $bits[$i]);
-                $token[] = new HTMLPurifier_Token_End('a');
-            }
-        }
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/RemoveEmpty.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/RemoveEmpty.php
deleted file mode 100644
index 0ebc477c68..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/RemoveEmpty.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-
-class HTMLPurifier_Injector_RemoveEmpty extends HTMLPurifier_Injector
-{
-    /**
-     * @type HTMLPurifier_Context
-     */
-    private $context;
-
-    /**
-     * @type HTMLPurifier_Config
-     */
-    private $config;
-
-    /**
-     * @type HTMLPurifier_AttrValidator
-     */
-    private $attrValidator;
-
-    /**
-     * @type bool
-     */
-    private $removeNbsp;
-
-    /**
-     * @type bool
-     */
-    private $removeNbspExceptions;
-
-    /**
-     * Cached contents of %AutoFormat.RemoveEmpty.Predicate
-     * @type array
-     */
-    private $exclude;
-
-    /**
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return void
-     */
-    public function prepare($config, $context)
-    {
-        parent::prepare($config, $context);
-        $this->config = $config;
-        $this->context = $context;
-        $this->removeNbsp = $config->get('AutoFormat.RemoveEmpty.RemoveNbsp');
-        $this->removeNbspExceptions = $config->get('AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions');
-        $this->exclude = $config->get('AutoFormat.RemoveEmpty.Predicate');
-        foreach ($this->exclude as $key => $attrs) {
-            if (!is_array($attrs)) {
-                // HACK, see HTMLPurifier/Printer/ConfigForm.php
-                $this->exclude[$key] = explode(';', $attrs);
-            }
-        }
-        $this->attrValidator = new HTMLPurifier_AttrValidator();
-    }
-
-    /**
-     * @param HTMLPurifier_Token $token
-     */
-    public function handleElement(&$token)
-    {
-        if (!$token instanceof HTMLPurifier_Token_Start) {
-            return;
-        }
-        $next = false;
-        $deleted = 1; // the current tag
-        for ($i = count($this->inputZipper->back) - 1; $i >= 0; $i--, $deleted++) {
-            $next = $this->inputZipper->back[$i];
-            if ($next instanceof HTMLPurifier_Token_Text) {
-                if ($next->is_whitespace) {
-                    continue;
-                }
-                if ($this->removeNbsp && !isset($this->removeNbspExceptions[$token->name])) {
-                    $plain = str_replace("\xC2\xA0", "", $next->data);
-                    $isWsOrNbsp = $plain === '' || ctype_space($plain);
-                    if ($isWsOrNbsp) {
-                        continue;
-                    }
-                }
-            }
-            break;
-        }
-        if (!$next || ($next instanceof HTMLPurifier_Token_End && $next->name == $token->name)) {
-            $this->attrValidator->validateToken($token, $this->config, $this->context);
-            $token->armor['ValidateAttributes'] = true;
-            if (isset($this->exclude[$token->name])) {
-                $r = true;
-                foreach ($this->exclude[$token->name] as $elem) {
-                    if (!isset($token->attr[$elem])) $r = false;
-                }
-                if ($r) return;
-            }
-            if (isset($token->attr['id']) || isset($token->attr['name'])) {
-                return;
-            }
-            $token = $deleted + 1;
-            for ($b = 0, $c = count($this->inputZipper->front); $b < $c; $b++) {
-                $prev = $this->inputZipper->front[$b];
-                if ($prev instanceof HTMLPurifier_Token_Text && $prev->is_whitespace) {
-                    continue;
-                }
-                break;
-            }
-            // This is safe because we removed the token that triggered this.
-            $this->rewindOffset($b+$deleted);
-            return;
-        }
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php
deleted file mode 100644
index 9ee7aa84d7..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-/**
- * Injector that removes spans with no attributes
- */
-class HTMLPurifier_Injector_RemoveSpansWithoutAttributes extends HTMLPurifier_Injector
-{
-    /**
-     * @type string
-     */
-    public $name = 'RemoveSpansWithoutAttributes';
-
-    /**
-     * @type array
-     */
-    public $needed = array('span');
-
-    /**
-     * @type HTMLPurifier_AttrValidator
-     */
-    private $attrValidator;
-
-    /**
-     * Used by AttrValidator.
-     * @type HTMLPurifier_Config
-     */
-    private $config;
-
-    /**
-     * @type HTMLPurifier_Context
-     */
-    private $context;
-
-    public function prepare($config, $context)
-    {
-        $this->attrValidator = new HTMLPurifier_AttrValidator();
-        $this->config = $config;
-        $this->context = $context;
-        return parent::prepare($config, $context);
-    }
-
-    /**
-     * @param HTMLPurifier_Token $token
-     */
-    public function handleElement(&$token)
-    {
-        if ($token->name !== 'span' || !$token instanceof HTMLPurifier_Token_Start) {
-            return;
-        }
-
-        // We need to validate the attributes now since this doesn't normally
-        // happen until after MakeWellFormed. If all the attributes are removed
-        // the span needs to be removed too.
-        $this->attrValidator->validateToken($token, $this->config, $this->context);
-        $token->armor['ValidateAttributes'] = true;
-
-        if (!empty($token->attr)) {
-            return;
-        }
-
-        $nesting = 0;
-        while ($this->forwardUntilEndToken($i, $current, $nesting)) {
-        }
-
-        if ($current instanceof HTMLPurifier_Token_End && $current->name === 'span') {
-            // Mark closing span tag for deletion
-            $current->markForDeletion = true;
-            // Delete open span tag
-            $token = false;
-        }
-    }
-
-    /**
-     * @param HTMLPurifier_Token $token
-     */
-    public function handleEnd(&$token)
-    {
-        if ($token->markForDeletion) {
-            $token = false;
-        }
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/SafeObject.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/SafeObject.php
deleted file mode 100644
index 317f7864dd..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/SafeObject.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-
-/**
- * Adds important param elements to inside of object in order to make
- * things safe.
- */
-class HTMLPurifier_Injector_SafeObject extends HTMLPurifier_Injector
-{
-    /**
-     * @type string
-     */
-    public $name = 'SafeObject';
-
-    /**
-     * @type array
-     */
-    public $needed = array('object', 'param');
-
-    /**
-     * @type array
-     */
-    protected $objectStack = array();
-
-    /**
-     * @type array
-     */
-    protected $paramStack = array();
-
-    /**
-     * Keep this synchronized with AttrTransform/SafeParam.php.
-     * @type array
-     */
-    protected $addParam = array(
-        'allowScriptAccess' => 'never',
-        'allowNetworking' => 'internal',
-    );
-
-    /**
-     * These are all lower-case keys.
-     * @type array
-     */
-    protected $allowedParam = array(
-        'wmode' => true,
-        'movie' => true,
-        'flashvars' => true,
-        'src' => true,
-        'allowfullscreen' => true, // if omitted, assume to be 'false'
-    );
-
-    /**
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return void
-     */
-    public function prepare($config, $context)
-    {
-        parent::prepare($config, $context);
-    }
-
-    /**
-     * @param HTMLPurifier_Token $token
-     */
-    public function handleElement(&$token)
-    {
-        if ($token->name == 'object') {
-            $this->objectStack[] = $token;
-            $this->paramStack[] = array();
-            $new = array($token);
-            foreach ($this->addParam as $name => $value) {
-                $new[] = new HTMLPurifier_Token_Empty('param', array('name' => $name, 'value' => $value));
-            }
-            $token = $new;
-        } elseif ($token->name == 'param') {
-            $nest = count($this->currentNesting) - 1;
-            if ($nest >= 0 && $this->currentNesting[$nest]->name === 'object') {
-                $i = count($this->objectStack) - 1;
-                if (!isset($token->attr['name'])) {
-                    $token = false;
-                    return;
-                }
-                $n = $token->attr['name'];
-                // We need this fix because YouTube doesn't supply a data
-                // attribute, which we need if a type is specified. This is
-                // *very* Flash specific.
-                if (!isset($this->objectStack[$i]->attr['data']) &&
-                    ($token->attr['name'] == 'movie' || $token->attr['name'] == 'src')
-                ) {
-                    $this->objectStack[$i]->attr['data'] = $token->attr['value'];
-                }
-                // Check if the parameter is the correct value but has not
-                // already been added
-                if (!isset($this->paramStack[$i][$n]) &&
-                    isset($this->addParam[$n]) &&
-                    $token->attr['name'] === $this->addParam[$n]) {
-                    // keep token, and add to param stack
-                    $this->paramStack[$i][$n] = true;
-                } elseif (isset($this->allowedParam[strtolower($n)])) {
-                    // keep token, don't do anything to it
-                    // (could possibly check for duplicates here)
-                    // Note: In principle, parameters should be case sensitive.
-                    // But it seems they are not really; so accept any case.
-                } else {
-                    $token = false;
-                }
-            } else {
-                // not directly inside an object, DENY!
-                $token = false;
-            }
-        }
-    }
-
-    public function handleEnd(&$token)
-    {
-        // This is the WRONG way of handling the object and param stacks;
-        // we should be inserting them directly on the relevant object tokens
-        // so that the global stack handling handles it.
-        if ($token->name == 'object') {
-            array_pop($this->objectStack);
-            array_pop($this->paramStack);
-        }
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Language.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Language.php
deleted file mode 100644
index 65277dd43c..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Language.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-
-/**
- * Represents a language and defines localizable string formatting and
- * other functions, as well as the localized messages for HTML Purifier.
- */
-class HTMLPurifier_Language
-{
-
-    /**
-     * ISO 639 language code of language. Prefers shortest possible version.
-     * @type string
-     */
-    public $code = 'en';
-
-    /**
-     * Fallback language code.
-     * @type bool|string
-     */
-    public $fallback = false;
-
-    /**
-     * Array of localizable messages.
-     * @type array
-     */
-    public $messages = array();
-
-    /**
-     * Array of localizable error codes.
-     * @type array
-     */
-    public $errorNames = array();
-
-    /**
-     * True if no message file was found for this language, so English
-     * is being used instead. Check this if you'd like to notify the
-     * user that they've used a non-supported language.
-     * @type bool
-     */
-    public $error = false;
-
-    /**
-     * Has the language object been loaded yet?
-     * @type bool
-     * @todo Make it private, fix usage in HTMLPurifier_LanguageTest
-     */
-    public $_loaded = false;
-
-    /**
-     * @type HTMLPurifier_Config
-     */
-    protected $config;
-
-    /**
-     * @type HTMLPurifier_Context
-     */
-    protected $context;
-
-    /**
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     */
-    public function __construct($config, $context)
-    {
-        $this->config  = $config;
-        $this->context = $context;
-    }
-
-    /**
-     * Loads language object with necessary info from factory cache
-     * @note This is a lazy loader
-     */
-    public function load()
-    {
-        if ($this->_loaded) {
-            return;
-        }
-        $factory = HTMLPurifier_LanguageFactory::instance();
-        $factory->loadLanguage($this->code);
-        foreach ($factory->keys as $key) {
-            $this->$key = $factory->cache[$this->code][$key];
-        }
-        $this->_loaded = true;
-    }
-
-    /**
-     * Retrieves a localised message.
-     * @param string $key string identifier of message
-     * @return string localised message
-     */
-    public function getMessage($key)
-    {
-        if (!$this->_loaded) {
-            $this->load();
-        }
-        if (!isset($this->messages[$key])) {
-            return "[$key]";
-        }
-        return $this->messages[$key];
-    }
-
-    /**
-     * Retrieves a localised error name.
-     * @param int $int error number, corresponding to PHP's error reporting
-     * @return string localised message
-     */
-    public function getErrorName($int)
-    {
-        if (!$this->_loaded) {
-            $this->load();
-        }
-        if (!isset($this->errorNames[$int])) {
-            return "[Error: $int]";
-        }
-        return $this->errorNames[$int];
-    }
-
-    /**
-     * Converts an array list into a string readable representation
-     * @param array $array
-     * @return string
-     */
-    public function listify($array)
-    {
-        $sep      = $this->getMessage('Item separator');
-        $sep_last = $this->getMessage('Item separator last');
-        $ret = '';
-        for ($i = 0, $c = count($array); $i < $c; $i++) {
-            if ($i == 0) {
-            } elseif ($i + 1 < $c) {
-                $ret .= $sep;
-            } else {
-                $ret .= $sep_last;
-            }
-            $ret .= $array[$i];
-        }
-        return $ret;
-    }
-
-    /**
-     * Formats a localised message with passed parameters
-     * @param string $key string identifier of message
-     * @param array $args Parameters to substitute in
-     * @return string localised message
-     * @todo Implement conditionals? Right now, some messages make
-     *     reference to line numbers, but those aren't always available
-     */
-    public function formatMessage($key, $args = array())
-    {
-        if (!$this->_loaded) {
-            $this->load();
-        }
-        if (!isset($this->messages[$key])) {
-            return "[$key]";
-        }
-        $raw = $this->messages[$key];
-        $subst = array();
-        $generator = false;
-        foreach ($args as $i => $value) {
-            if (is_object($value)) {
-                if ($value instanceof HTMLPurifier_Token) {
-                    // factor this out some time
-                    if (!$generator) {
-                        $generator = $this->context->get('Generator');
-                    }
-                    if (isset($value->name)) {
-                        $subst['$'.$i.'.Name'] = $value->name;
-                    }
-                    if (isset($value->data)) {
-                        $subst['$'.$i.'.Data'] = $value->data;
-                    }
-                    $subst['$'.$i.'.Compact'] =
-                    $subst['$'.$i.'.Serialized'] = $generator->generateFromToken($value);
-                    // a more complex algorithm for compact representation
-                    // could be introduced for all types of tokens. This
-                    // may need to be factored out into a dedicated class
-                    if (!empty($value->attr)) {
-                        $stripped_token = clone $value;
-                        $stripped_token->attr = array();
-                        $subst['$'.$i.'.Compact'] = $generator->generateFromToken($stripped_token);
-                    }
-                    $subst['$'.$i.'.Line'] = $value->line ? $value->line : 'unknown';
-                }
-                continue;
-            } elseif (is_array($value)) {
-                $keys = array_keys($value);
-                if (array_keys($keys) === $keys) {
-                    // list
-                    $subst['$'.$i] = $this->listify($value);
-                } else {
-                    // associative array
-                    // no $i implementation yet, sorry
-                    $subst['$'.$i.'.Keys'] = $this->listify($keys);
-                    $subst['$'.$i.'.Values'] = $this->listify(array_values($value));
-                }
-                continue;
-            }
-            $subst['$' . $i] = $value;
-        }
-        return strtr($raw, $subst);
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Language/messages/en.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Language/messages/en.php
deleted file mode 100644
index c7f197e1e1..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Language/messages/en.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-$fallback = false;
-
-$messages = array(
-
-    'HTMLPurifier' => 'HTML Purifier',
-// for unit testing purposes
-    'LanguageFactoryTest: Pizza' => 'Pizza',
-    'LanguageTest: List' => '$1',
-    'LanguageTest: Hash' => '$1.Keys; $1.Values',
-    'Item separator' => ', ',
-    'Item separator last' => ' and ', // non-Harvard style
-
-    'ErrorCollector: No errors' => 'No errors detected. However, because error reporting is still incomplete, there may have been errors that the error collector was not notified of; please inspect the output HTML carefully.',
-    'ErrorCollector: At line' => ' at line $line',
-    'ErrorCollector: Incidental errors' => 'Incidental errors',
-    'Lexer: Unclosed comment' => 'Unclosed comment',
-    'Lexer: Unescaped lt' => 'Unescaped less-than sign (<) should be &lt;',
-    'Lexer: Missing gt' => 'Missing greater-than sign (>), previous less-than sign (<) should be escaped',
-    'Lexer: Missing attribute key' => 'Attribute declaration has no key',
-    'Lexer: Missing end quote' => 'Attribute declaration has no end quote',
-    'Lexer: Extracted body' => 'Removed document metadata tags',
-    'Strategy_RemoveForeignElements: Tag transform' => '<$1> element transformed into $CurrentToken.Serialized',
-    'Strategy_RemoveForeignElements: Missing required attribute' => '$CurrentToken.Compact element missing required attribute $1',
-    'Strategy_RemoveForeignElements: Foreign element to text' => 'Unrecognized $CurrentToken.Serialized tag converted to text',
-    'Strategy_RemoveForeignElements: Foreign element removed' => 'Unrecognized $CurrentToken.Serialized tag removed',
-    'Strategy_RemoveForeignElements: Comment removed' => 'Comment containing "$CurrentToken.Data" removed',
-    'Strategy_RemoveForeignElements: Foreign meta element removed' => 'Unrecognized $CurrentToken.Serialized meta tag and all descendants removed',
-    'Strategy_RemoveForeignElements: Token removed to end' => 'Tags and text starting from $1 element where removed to end',
-    'Strategy_RemoveForeignElements: Trailing hyphen in comment removed' => 'Trailing hyphen(s) in comment removed',
-    'Strategy_RemoveForeignElements: Hyphens in comment collapsed' => 'Double hyphens in comments are not allowed, and were collapsed into single hyphens',
-    'Strategy_MakeWellFormed: Unnecessary end tag removed' => 'Unnecessary $CurrentToken.Serialized tag removed',
-    'Strategy_MakeWellFormed: Unnecessary end tag to text' => 'Unnecessary $CurrentToken.Serialized tag converted to text',
-    'Strategy_MakeWellFormed: Tag auto closed' => '$1.Compact started on line $1.Line auto-closed by $CurrentToken.Compact',
-    'Strategy_MakeWellFormed: Tag carryover' => '$1.Compact started on line $1.Line auto-continued into $CurrentToken.Compact',
-    'Strategy_MakeWellFormed: Stray end tag removed' => 'Stray $CurrentToken.Serialized tag removed',
-    'Strategy_MakeWellFormed: Stray end tag to text' => 'Stray $CurrentToken.Serialized tag converted to text',
-    'Strategy_MakeWellFormed: Tag closed by element end' => '$1.Compact tag started on line $1.Line closed by end of $CurrentToken.Serialized',
-    'Strategy_MakeWellFormed: Tag closed by document end' => '$1.Compact tag started on line $1.Line closed by end of document',
-    'Strategy_FixNesting: Node removed' => '$CurrentToken.Compact node removed',
-    'Strategy_FixNesting: Node excluded' => '$CurrentToken.Compact node removed due to descendant exclusion by ancestor element',
-    'Strategy_FixNesting: Node reorganized' => 'Contents of $CurrentToken.Compact node reorganized to enforce its content model',
-    'Strategy_FixNesting: Node contents removed' => 'Contents of $CurrentToken.Compact node removed',
-    'AttrValidator: Attributes transformed' => 'Attributes on $CurrentToken.Compact transformed from $1.Keys to $2.Keys',
-    'AttrValidator: Attribute removed' => '$CurrentAttr.Name attribute on $CurrentToken.Compact removed',
-);
-
-$errorNames = array(
-    E_ERROR => 'Error',
-    E_WARNING => 'Warning',
-    E_NOTICE => 'Notice'
-);
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/LanguageFactory.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/LanguageFactory.php
deleted file mode 100644
index 4e35272d87..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/LanguageFactory.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?php
-
-/**
- * Class responsible for generating HTMLPurifier_Language objects, managing
- * caching and fallbacks.
- * @note Thanks to MediaWiki for the general logic, although this version
- *       has been entirely rewritten
- * @todo Serialized cache for languages
- */
-class HTMLPurifier_LanguageFactory
-{
-
-    /**
-     * Cache of language code information used to load HTMLPurifier_Language objects.
-     * Structure is: $factory->cache[$language_code][$key] = $value
-     * @type array
-     */
-    public $cache;
-
-    /**
-     * Valid keys in the HTMLPurifier_Language object. Designates which
-     * variables to slurp out of a message file.
-     * @type array
-     */
-    public $keys = array('fallback', 'messages', 'errorNames');
-
-    /**
-     * Instance to validate language codes.
-     * @type HTMLPurifier_AttrDef_Lang
-     *
-     */
-    protected $validator;
-
-    /**
-     * Cached copy of dirname(__FILE__), directory of current file without
-     * trailing slash.
-     * @type string
-     */
-    protected $dir;
-
-    /**
-     * Keys whose contents are a hash map and can be merged.
-     * @type array
-     */
-    protected $mergeable_keys_map = array('messages' => true, 'errorNames' => true);
-
-    /**
-     * Keys whose contents are a list and can be merged.
-     * @value array lookup
-     */
-    protected $mergeable_keys_list = array();
-
-    /**
-     * Retrieve sole instance of the factory.
-     * @param HTMLPurifier_LanguageFactory $prototype Optional prototype to overload sole instance with,
-     *                   or bool true to reset to default factory.
-     * @return HTMLPurifier_LanguageFactory
-     */
-    public static function instance($prototype = null)
-    {
-        static $instance = null;
-        if ($prototype !== null) {
-            $instance = $prototype;
-        } elseif ($instance === null || $prototype == true) {
-            $instance = new HTMLPurifier_LanguageFactory();
-            $instance->setup();
-        }
-        return $instance;
-    }
-
-    /**
-     * Sets up the singleton, much like a constructor
-     * @note Prevents people from getting this outside of the singleton
-     */
-    public function setup()
-    {
-        $this->validator = new HTMLPurifier_AttrDef_Lang();
-        $this->dir = HTMLPURIFIER_PREFIX . '/HTMLPurifier';
-    }
-
-    /**
-     * Creates a language object, handles class fallbacks
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @param bool|string $code Code to override configuration with. Private parameter.
-     * @return HTMLPurifier_Language
-     */
-    public function create($config, $context, $code = false)
-    {
-        // validate language code
-        if ($code === false) {
-            $code = $this->validator->validate(
-                $config->get('Core.Language'),
-                $config,
-                $context
-            );
-        } else {
-            $code = $this->validator->validate($code, $config, $context);
-        }
-        if ($code === false) {
-            $code = 'en'; // malformed code becomes English
-        }
-
-        $pcode = str_replace('-', '_', $code); // make valid PHP classname
-        static $depth = 0; // recursion protection
-
-        if ($code == 'en') {
-            $lang = new HTMLPurifier_Language($config, $context);
-        } else {
-            $class = 'HTMLPurifier_Language_' . $pcode;
-            $file  = $this->dir . '/Language/classes/' . $code . '.php';
-            if (file_exists($file) || class_exists($class, false)) {
-                $lang = new $class($config, $context);
-            } else {
-                // Go fallback
-                $raw_fallback = $this->getFallbackFor($code);
-                $fallback = $raw_fallback ? $raw_fallback : 'en';
-                $depth++;
-                $lang = $this->create($config, $context, $fallback);
-                if (!$raw_fallback) {
-                    $lang->error = true;
-                }
-                $depth--;
-            }
-        }
-        $lang->code = $code;
-        return $lang;
-    }
-
-    /**
-     * Returns the fallback language for language
-     * @note Loads the original language into cache
-     * @param string $code language code
-     * @return string|bool
-     */
-    public function getFallbackFor($code)
-    {
-        $this->loadLanguage($code);
-        return $this->cache[$code]['fallback'];
-    }
-
-    /**
-     * Loads language into the cache, handles message file and fallbacks
-     * @param string $code language code
-     */
-    public function loadLanguage($code)
-    {
-        static $languages_seen = array(); // recursion guard
-
-        // abort if we've already loaded it
-        if (isset($this->cache[$code])) {
-            return;
-        }
-
-        // generate filename
-        $filename = $this->dir . '/Language/messages/' . $code . '.php';
-
-        // default fallback : may be overwritten by the ensuing include
-        $fallback = ($code != 'en') ? 'en' : false;
-
-        // load primary localisation
-        if (!file_exists($filename)) {
-            // skip the include: will rely solely on fallback
-            $filename = $this->dir . '/Language/messages/en.php';
-            $cache = array();
-        } else {
-            include $filename;
-            $cache = compact($this->keys);
-        }
-
-        // load fallback localisation
-        if (!empty($fallback)) {
-
-            // infinite recursion guard
-            if (isset($languages_seen[$code])) {
-                trigger_error(
-                    'Circular fallback reference in language ' .
-                    $code,
-                    E_USER_ERROR
-                );
-                $fallback = 'en';
-            }
-            $language_seen[$code] = true;
-
-            // load the fallback recursively
-            $this->loadLanguage($fallback);
-            $fallback_cache = $this->cache[$fallback];
-
-            // merge fallback with current language
-            foreach ($this->keys as $key) {
-                if (isset($cache[$key]) && isset($fallback_cache[$key])) {
-                    if (isset($this->mergeable_keys_map[$key])) {
-                        $cache[$key] = $cache[$key] + $fallback_cache[$key];
-                    } elseif (isset($this->mergeable_keys_list[$key])) {
-                        $cache[$key] = array_merge($fallback_cache[$key], $cache[$key]);
-                    }
-                } else {
-                    $cache[$key] = $fallback_cache[$key];
-                }
-            }
-        }
-
-        // save to cache for later retrieval
-        $this->cache[$code] = $cache;
-        return;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Length.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Length.php
deleted file mode 100644
index e70da55a92..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Length.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-
-/**
- * Represents a measurable length, with a string numeric magnitude
- * and a unit. This object is immutable.
- */
-class HTMLPurifier_Length
-{
-
-    /**
-     * String numeric magnitude.
-     * @type string
-     */
-    protected $n;
-
-    /**
-     * String unit. False is permitted if $n = 0.
-     * @type string|bool
-     */
-    protected $unit;
-
-    /**
-     * Whether or not this length is valid. Null if not calculated yet.
-     * @type bool
-     */
-    protected $isValid;
-
-    /**
-     * Array Lookup array of units recognized by CSS 3
-     * @type array
-     */
-    protected static $allowedUnits = array(
-        'em' => true, 'ex' => true, 'px' => true, 'in' => true,
-        'cm' => true, 'mm' => true, 'pt' => true, 'pc' => true,
-        'ch' => true, 'rem' => true, 'vw' => true, 'vh' => true,
-        'vmin' => true, 'vmax' => true
-    );
-
-    /**
-     * @param string $n Magnitude
-     * @param bool|string $u Unit
-     */
-    public function __construct($n = '0', $u = false)
-    {
-        $this->n = (string) $n;
-        $this->unit = $u !== false ? (string) $u : false;
-    }
-
-    /**
-     * @param string $s Unit string, like '2em' or '3.4in'
-     * @return HTMLPurifier_Length
-     * @warning Does not perform validation.
-     */
-    public static function make($s)
-    {
-        if ($s instanceof HTMLPurifier_Length) {
-            return $s;
-        }
-        $n_length = strspn($s, '1234567890.+-');
-        $n = substr($s, 0, $n_length);
-        $unit = substr($s, $n_length);
-        if ($unit === '') {
-            $unit = false;
-        }
-        return new HTMLPurifier_Length($n, $unit);
-    }
-
-    /**
-     * Validates the number and unit.
-     * @return bool
-     */
-    protected function validate()
-    {
-        // Special case:
-        if ($this->n === '+0' || $this->n === '-0') {
-            $this->n = '0';
-        }
-        if ($this->n === '0' && $this->unit === false) {
-            return true;
-        }
-        if (!ctype_lower($this->unit)) {
-            $this->unit = strtolower($this->unit);
-        }
-        if (!isset(HTMLPurifier_Length::$allowedUnits[$this->unit])) {
-            return false;
-        }
-        // Hack:
-        $def = new HTMLPurifier_AttrDef_CSS_Number();
-        $result = $def->validate($this->n, false, false);
-        if ($result === false) {
-            return false;
-        }
-        $this->n = $result;
-        return true;
-    }
-
-    /**
-     * Returns string representation of number.
-     * @return string
-     */
-    public function toString()
-    {
-        if (!$this->isValid()) {
-            return false;
-        }
-        return $this->n . $this->unit;
-    }
-
-    /**
-     * Retrieves string numeric magnitude.
-     * @return string
-     */
-    public function getN()
-    {
-        return $this->n;
-    }
-
-    /**
-     * Retrieves string unit.
-     * @return string
-     */
-    public function getUnit()
-    {
-        return $this->unit;
-    }
-
-    /**
-     * Returns true if this length unit is valid.
-     * @return bool
-     */
-    public function isValid()
-    {
-        if ($this->isValid === null) {
-            $this->isValid = $this->validate();
-        }
-        return $this->isValid;
-    }
-
-    /**
-     * Compares two lengths, and returns 1 if greater, -1 if less and 0 if equal.
-     * @param HTMLPurifier_Length $l
-     * @return int
-     * @warning If both values are too large or small, this calculation will
-     *          not work properly
-     */
-    public function compareTo($l)
-    {
-        if ($l === false) {
-            return false;
-        }
-        if ($l->unit !== $this->unit) {
-            $converter = new HTMLPurifier_UnitConverter();
-            $l = $converter->convert($l, $this->unit);
-            if ($l === false) {
-                return false;
-            }
-        }
-        return $this->n - $l->n;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer.php
deleted file mode 100644
index e9da3ed5e9..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer.php
+++ /dev/null
@@ -1,382 +0,0 @@
-<?php
-
-/**
- * Forgivingly lexes HTML (SGML-style) markup into tokens.
- *
- * A lexer parses a string of SGML-style markup and converts them into
- * corresponding tokens.  It doesn't check for well-formedness, although its
- * internal mechanism may make this automatic (such as the case of
- * HTMLPurifier_Lexer_DOMLex).  There are several implementations to choose
- * from.
- *
- * A lexer is HTML-oriented: it might work with XML, but it's not
- * recommended, as we adhere to a subset of the specification for optimization
- * reasons. This might change in the future. Also, most tokenizers are not
- * expected to handle DTDs or PIs.
- *
- * This class should not be directly instantiated, but you may use create() to
- * retrieve a default copy of the lexer.  Being a supertype, this class
- * does not actually define any implementation, but offers commonly used
- * convenience functions for subclasses.
- *
- * @note The unit tests will instantiate this class for testing purposes, as
- *       many of the utility functions require a class to be instantiated.
- *       This means that, even though this class is not runnable, it will
- *       not be declared abstract.
- *
- * @par
- *
- * @note
- * We use tokens rather than create a DOM representation because DOM would:
- *
- * @par
- *  -# Require more processing and memory to create,
- *  -# Is not streamable, and
- *  -# Has the entire document structure (html and body not needed).
- *
- * @par
- * However, DOM is helpful in that it makes it easy to move around nodes
- * without a lot of lookaheads to see when a tag is closed. This is a
- * limitation of the token system and some workarounds would be nice.
- */
-class HTMLPurifier_Lexer
-{
-
-    /**
-     * Whether or not this lexer implements line-number/column-number tracking.
-     * If it does, set to true.
-     */
-    public $tracksLineNumbers = false;
-
-    // -- STATIC ----------------------------------------------------------
-
-    /**
-     * Retrieves or sets the default Lexer as a Prototype Factory.
-     *
-     * By default HTMLPurifier_Lexer_DOMLex will be returned. There are
-     * a few exceptions involving special features that only DirectLex
-     * implements.
-     *
-     * @note The behavior of this class has changed, rather than accepting
-     *       a prototype object, it now accepts a configuration object.
-     *       To specify your own prototype, set %Core.LexerImpl to it.
-     *       This change in behavior de-singletonizes the lexer object.
-     *
-     * @param HTMLPurifier_Config $config
-     * @return HTMLPurifier_Lexer
-     * @throws HTMLPurifier_Exception
-     */
-    public static function create($config)
-    {
-        if (!($config instanceof HTMLPurifier_Config)) {
-            $lexer = $config;
-            trigger_error(
-                "Passing a prototype to
-                HTMLPurifier_Lexer::create() is deprecated, please instead
-                use %Core.LexerImpl",
-                E_USER_WARNING
-            );
-        } else {
-            $lexer = $config->get('Core.LexerImpl');
-        }
-
-        $needs_tracking =
-            $config->get('Core.MaintainLineNumbers') ||
-            $config->get('Core.CollectErrors');
-
-        $inst = null;
-        if (is_object($lexer)) {
-            $inst = $lexer;
-        } else {
-            if (is_null($lexer)) {
-                do {
-                    // auto-detection algorithm
-                    if ($needs_tracking) {
-                        $lexer = 'DirectLex';
-                        break;
-                    }
-
-                    if (class_exists('DOMDocument', false) &&
-                        method_exists('DOMDocument', 'loadHTML') &&
-                        !extension_loaded('domxml')
-                    ) {
-                        // check for DOM support, because while it's part of the
-                        // core, it can be disabled compile time. Also, the PECL
-                        // domxml extension overrides the default DOM, and is evil
-                        // and nasty and we shan't bother to support it
-                        $lexer = 'DOMLex';
-                    } else {
-                        $lexer = 'DirectLex';
-                    }
-                } while (0);
-            } // do..while so we can break
-
-            // instantiate recognized string names
-            switch ($lexer) {
-                case 'DOMLex':
-                    $inst = new HTMLPurifier_Lexer_DOMLex();
-                    break;
-                case 'DirectLex':
-                    $inst = new HTMLPurifier_Lexer_DirectLex();
-                    break;
-                case 'PH5P':
-                    $inst = new HTMLPurifier_Lexer_PH5P();
-                    break;
-                default:
-                    throw new HTMLPurifier_Exception(
-                        "Cannot instantiate unrecognized Lexer type " .
-                        htmlspecialchars($lexer)
-                    );
-            }
-        }
-
-        if (!$inst) {
-            throw new HTMLPurifier_Exception('No lexer was instantiated');
-        }
-
-        // once PHP DOM implements native line numbers, or we
-        // hack out something using XSLT, remove this stipulation
-        if ($needs_tracking && !$inst->tracksLineNumbers) {
-            throw new HTMLPurifier_Exception(
-                'Cannot use lexer that does not support line numbers with ' .
-                'Core.MaintainLineNumbers or Core.CollectErrors (use DirectLex instead)'
-            );
-        }
-
-        return $inst;
-
-    }
-
-    // -- CONVENIENCE MEMBERS ---------------------------------------------
-
-    public function __construct()
-    {
-        $this->_entity_parser = new HTMLPurifier_EntityParser();
-    }
-
-    /**
-     * Most common entity to raw value conversion table for special entities.
-     * @type array
-     */
-    protected $_special_entity2str =
-        array(
-            '&quot;' => '"',
-            '&amp;' => '&',
-            '&lt;' => '<',
-            '&gt;' => '>',
-            '&#39;' => "'",
-            '&#039;' => "'",
-            '&#x27;' => "'"
-        );
-
-    public function parseText($string, $config) {
-        return $this->parseData($string, false, $config);
-    }
-
-    public function parseAttr($string, $config) {
-        return $this->parseData($string, true, $config);
-    }
-
-    /**
-     * Parses special entities into the proper characters.
-     *
-     * This string will translate escaped versions of the special characters
-     * into the correct ones.
-     *
-     * @param string $string String character data to be parsed.
-     * @return string Parsed character data.
-     */
-    public function parseData($string, $is_attr, $config)
-    {
-        // following functions require at least one character
-        if ($string === '') {
-            return '';
-        }
-
-        // subtracts amps that cannot possibly be escaped
-        $num_amp = substr_count($string, '&') - substr_count($string, '& ') -
-            ($string[strlen($string) - 1] === '&' ? 1 : 0);
-
-        if (!$num_amp) {
-            return $string;
-        } // abort if no entities
-        $num_esc_amp = substr_count($string, '&amp;');
-        $string = strtr($string, $this->_special_entity2str);
-
-        // code duplication for sake of optimization, see above
-        $num_amp_2 = substr_count($string, '&') - substr_count($string, '& ') -
-            ($string[strlen($string) - 1] === '&' ? 1 : 0);
-
-        if ($num_amp_2 <= $num_esc_amp) {
-            return $string;
-        }
-
-        // hmm... now we have some uncommon entities. Use the callback.
-        if ($config->get('Core.LegacyEntityDecoder')) {
-            $string = $this->_entity_parser->substituteSpecialEntities($string);
-        } else {
-            if ($is_attr) {
-                $string = $this->_entity_parser->substituteAttrEntities($string);
-            } else {
-                $string = $this->_entity_parser->substituteTextEntities($string);
-            }
-        }
-        return $string;
-    }
-
-    /**
-     * Lexes an HTML string into tokens.
-     * @param $string String HTML.
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return HTMLPurifier_Token[] array representation of HTML.
-     */
-    public function tokenizeHTML($string, $config, $context)
-    {
-        trigger_error('Call to abstract class', E_USER_ERROR);
-    }
-
-    /**
-     * Translates CDATA sections into regular sections (through escaping).
-     * @param string $string HTML string to process.
-     * @return string HTML with CDATA sections escaped.
-     */
-    protected static function escapeCDATA($string)
-    {
-        return preg_replace_callback(
-            '/<!\[CDATA\[(.+?)\]\]>/s',
-            array('HTMLPurifier_Lexer', 'CDATACallback'),
-            $string
-        );
-    }
-
-    /**
-     * Special CDATA case that is especially convoluted for <script>
-     * @param string $string HTML string to process.
-     * @return string HTML with CDATA sections escaped.
-     */
-    protected static function escapeCommentedCDATA($string)
-    {
-        return preg_replace_callback(
-            '#<!--//--><!\[CDATA\[//><!--(.+?)//--><!\]\]>#s',
-            array('HTMLPurifier_Lexer', 'CDATACallback'),
-            $string
-        );
-    }
-
-    /**
-     * Special Internet Explorer conditional comments should be removed.
-     * @param string $string HTML string to process.
-     * @return string HTML with conditional comments removed.
-     */
-    protected static function removeIEConditional($string)
-    {
-        return preg_replace(
-            '#<!--\[if [^>]+\]>.*?<!\[endif\]-->#si', // probably should generalize for all strings
-            '',
-            $string
-        );
-    }
-
-    /**
-     * Callback function for escapeCDATA() that does the work.
-     *
-     * @warning Though this is public in order to let the callback happen,
-     *          calling it directly is not recommended.
-     * @param array $matches PCRE matches array, with index 0 the entire match
-     *                  and 1 the inside of the CDATA section.
-     * @return string Escaped internals of the CDATA section.
-     */
-    protected static function CDATACallback($matches)
-    {
-        // not exactly sure why the character set is needed, but whatever
-        return htmlspecialchars($matches[1], ENT_COMPAT, 'UTF-8');
-    }
-
-    /**
-     * Takes a piece of HTML and normalizes it by converting entities, fixing
-     * encoding, extracting bits, and other good stuff.
-     * @param string $html HTML.
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return string
-     * @todo Consider making protected
-     */
-    public function normalize($html, $config, $context)
-    {
-        // normalize newlines to \n
-        if ($config->get('Core.NormalizeNewlines')) {
-            $html = str_replace("\r\n", "\n", $html);
-            $html = str_replace("\r", "\n", $html);
-        }
-
-        if ($config->get('HTML.Trusted')) {
-            // escape convoluted CDATA
-            $html = $this->escapeCommentedCDATA($html);
-        }
-
-        // escape CDATA
-        $html = $this->escapeCDATA($html);
-
-        $html = $this->removeIEConditional($html);
-
-        // extract body from document if applicable
-        if ($config->get('Core.ConvertDocumentToFragment')) {
-            $e = false;
-            if ($config->get('Core.CollectErrors')) {
-                $e =& $context->get('ErrorCollector');
-            }
-            $new_html = $this->extractBody($html);
-            if ($e && $new_html != $html) {
-                $e->send(E_WARNING, 'Lexer: Extracted body');
-            }
-            $html = $new_html;
-        }
-
-        // expand entities that aren't the big five
-        if ($config->get('Core.LegacyEntityDecoder')) {
-            $html = $this->_entity_parser->substituteNonSpecialEntities($html);
-        }
-
-        // clean into wellformed UTF-8 string for an SGML context: this has
-        // to be done after entity expansion because the entities sometimes
-        // represent non-SGML characters (horror, horror!)
-        $html = HTMLPurifier_Encoder::cleanUTF8($html);
-
-        // if processing instructions are to removed, remove them now
-        if ($config->get('Core.RemoveProcessingInstructions')) {
-            $html = preg_replace('#<\?.+?\?>#s', '', $html);
-        }
-
-        $hidden_elements = $config->get('Core.HiddenElements');
-        if ($config->get('Core.AggressivelyRemoveScript') &&
-            !($config->get('HTML.Trusted') || !$config->get('Core.RemoveScriptContents')
-            || empty($hidden_elements["script"]))) {
-            $html = preg_replace('#<script[^>]*>.*?</script>#i', '', $html);
-        }
-
-        return $html;
-    }
-
-    /**
-     * Takes a string of HTML (fragment or document) and returns the content
-     * @todo Consider making protected
-     */
-    public function extractBody($html)
-    {
-        $matches = array();
-        $result = preg_match('|(.*?)<body[^>]*>(.*)</body>|is', $html, $matches);
-        if ($result) {
-            // Make sure it's not in a comment
-            $comment_start = strrpos($matches[1], '<!--');
-            $comment_end   = strrpos($matches[1], '-->');
-            if ($comment_start === false ||
-                ($comment_end !== false && $comment_end > $comment_start)) {
-                return $matches[2];
-            }
-        }
-        return $html;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/DOMLex.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/DOMLex.php
deleted file mode 100644
index ca5f25b849..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/DOMLex.php
+++ /dev/null
@@ -1,338 +0,0 @@
-<?php
-
-/**
- * Parser that uses PHP 5's DOM extension (part of the core).
- *
- * In PHP 5, the DOM XML extension was revamped into DOM and added to the core.
- * It gives us a forgiving HTML parser, which we use to transform the HTML
- * into a DOM, and then into the tokens.  It is blazingly fast (for large
- * documents, it performs twenty times faster than
- * HTMLPurifier_Lexer_DirectLex,and is the default choice for PHP 5.
- *
- * @note Any empty elements will have empty tokens associated with them, even if
- * this is prohibited by the spec. This is cannot be fixed until the spec
- * comes into play.
- *
- * @note PHP's DOM extension does not actually parse any entities, we use
- *       our own function to do that.
- *
- * @warning DOM tends to drop whitespace, which may wreak havoc on indenting.
- *          If this is a huge problem, due to the fact that HTML is hand
- *          edited and you are unable to get a parser cache that caches the
- *          the output of HTML Purifier while keeping the original HTML lying
- *          around, you may want to run Tidy on the resulting output or use
- *          HTMLPurifier_DirectLex
- */
-
-class HTMLPurifier_Lexer_DOMLex extends HTMLPurifier_Lexer
-{
-
-    /**
-     * @type HTMLPurifier_TokenFactory
-     */
-    private $factory;
-
-    public function __construct()
-    {
-        // setup the factory
-        parent::__construct();
-        $this->factory = new HTMLPurifier_TokenFactory();
-    }
-
-    /**
-     * @param string $html
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return HTMLPurifier_Token[]
-     */
-    public function tokenizeHTML($html, $config, $context)
-    {
-        $html = $this->normalize($html, $config, $context);
-
-        // attempt to armor stray angled brackets that cannot possibly
-        // form tags and thus are probably being used as emoticons
-        if ($config->get('Core.AggressivelyFixLt')) {
-            $char = '[^a-z!\/]';
-            $comment = "/<!--(.*?)(-->|\z)/is";
-            $html = preg_replace_callback($comment, array($this, 'callbackArmorCommentEntities'), $html);
-            do {
-                $old = $html;
-                $html = preg_replace("/<($char)/i", '&lt;\\1', $html);
-            } while ($html !== $old);
-            $html = preg_replace_callback($comment, array($this, 'callbackUndoCommentSubst'), $html); // fix comments
-        }
-
-        // preprocess html, essential for UTF-8
-        $html = $this->wrapHTML($html, $config, $context);
-
-        $doc = new DOMDocument();
-        $doc->encoding = 'UTF-8'; // theoretically, the above has this covered
-
-        $options = 0;
-        if ($config->get('Core.AllowParseManyTags') && defined('LIBXML_PARSEHUGE')) {
-            $options |= LIBXML_PARSEHUGE;
-        }
-
-        set_error_handler(array($this, 'muteErrorHandler'));
-        // loadHTML() fails on PHP 5.3 when second parameter is given
-        if ($options) {
-            $doc->loadHTML($html, $options);
-        } else {
-            $doc->loadHTML($html);
-        }
-        restore_error_handler();
-
-        $body = $doc->getElementsByTagName('html')->item(0)-> // <html>
-                      getElementsByTagName('body')->item(0);  // <body>
-
-        $div = $body->getElementsByTagName('div')->item(0); // <div>
-        $tokens = array();
-        $this->tokenizeDOM($div, $tokens, $config);
-        // If the div has a sibling, that means we tripped across
-        // a premature </div> tag.  So remove the div we parsed,
-        // and then tokenize the rest of body.  We can't tokenize
-        // the sibling directly as we'll lose the tags in that case.
-        if ($div->nextSibling) {
-            $body->removeChild($div);
-            $this->tokenizeDOM($body, $tokens, $config);
-        }
-        return $tokens;
-    }
-
-    /**
-     * Iterative function that tokenizes a node, putting it into an accumulator.
-     * To iterate is human, to recurse divine - L. Peter Deutsch
-     * @param DOMNode $node DOMNode to be tokenized.
-     * @param HTMLPurifier_Token[] $tokens   Array-list of already tokenized tokens.
-     * @return HTMLPurifier_Token of node appended to previously passed tokens.
-     */
-    protected function tokenizeDOM($node, &$tokens, $config)
-    {
-        $level = 0;
-        $nodes = array($level => new HTMLPurifier_Queue(array($node)));
-        $closingNodes = array();
-        do {
-            while (!$nodes[$level]->isEmpty()) {
-                $node = $nodes[$level]->shift(); // FIFO
-                $collect = $level > 0 ? true : false;
-                $needEndingTag = $this->createStartNode($node, $tokens, $collect, $config);
-                if ($needEndingTag) {
-                    $closingNodes[$level][] = $node;
-                }
-                if ($node->childNodes && $node->childNodes->length) {
-                    $level++;
-                    $nodes[$level] = new HTMLPurifier_Queue();
-                    foreach ($node->childNodes as $childNode) {
-                        $nodes[$level]->push($childNode);
-                    }
-                }
-            }
-            $level--;
-            if ($level && isset($closingNodes[$level])) {
-                while ($node = array_pop($closingNodes[$level])) {
-                    $this->createEndNode($node, $tokens);
-                }
-            }
-        } while ($level > 0);
-    }
-
-    /**
-     * Portably retrieve the tag name of a node; deals with older versions
-     * of libxml like 2.7.6
-     * @param DOMNode $node
-     */
-    protected function getTagName($node)
-    {
-        if (isset($node->tagName)) {
-            return $node->tagName;
-        } else if (isset($node->nodeName)) {
-            return $node->nodeName;
-        } else if (isset($node->localName)) {
-            return $node->localName;
-        }
-        return null;
-    }
-
-    /**
-     * Portably retrieve the data of a node; deals with older versions
-     * of libxml like 2.7.6
-     * @param DOMNode $node
-     */
-    protected function getData($node)
-    {
-        if (isset($node->data)) {
-            return $node->data;
-        } else if (isset($node->nodeValue)) {
-            return $node->nodeValue;
-        } else if (isset($node->textContent)) {
-            return $node->textContent;
-        }
-        return null;
-    }
-
-
-    /**
-     * @param DOMNode $node DOMNode to be tokenized.
-     * @param HTMLPurifier_Token[] $tokens   Array-list of already tokenized tokens.
-     * @param bool $collect  Says whether or start and close are collected, set to
-     *                    false at first recursion because it's the implicit DIV
-     *                    tag you're dealing with.
-     * @return bool if the token needs an endtoken
-     * @todo data and tagName properties don't seem to exist in DOMNode?
-     */
-    protected function createStartNode($node, &$tokens, $collect, $config)
-    {
-        // intercept non element nodes. WE MUST catch all of them,
-        // but we're not getting the character reference nodes because
-        // those should have been preprocessed
-        if ($node->nodeType === XML_TEXT_NODE) {
-            $data = $this->getData($node); // Handle variable data property
-            if ($data !== null) {
-              $tokens[] = $this->factory->createText($data);
-            }
-            return false;
-        } elseif ($node->nodeType === XML_CDATA_SECTION_NODE) {
-            // undo libxml's special treatment of <script> and <style> tags
-            $last = end($tokens);
-            $data = $node->data;
-            // (note $node->tagname is already normalized)
-            if ($last instanceof HTMLPurifier_Token_Start && ($last->name == 'script' || $last->name == 'style')) {
-                $new_data = trim($data);
-                if (substr($new_data, 0, 4) === '<!--') {
-                    $data = substr($new_data, 4);
-                    if (substr($data, -3) === '-->') {
-                        $data = substr($data, 0, -3);
-                    } else {
-                        // Highly suspicious! Not sure what to do...
-                    }
-                }
-            }
-            $tokens[] = $this->factory->createText($this->parseText($data, $config));
-            return false;
-        } elseif ($node->nodeType === XML_COMMENT_NODE) {
-            // this is code is only invoked for comments in script/style in versions
-            // of libxml pre-2.6.28 (regular comments, of course, are still
-            // handled regularly)
-            $tokens[] = $this->factory->createComment($node->data);
-            return false;
-        } elseif ($node->nodeType !== XML_ELEMENT_NODE) {
-            // not-well tested: there may be other nodes we have to grab
-            return false;
-        }
-        $attr = $node->hasAttributes() ? $this->transformAttrToAssoc($node->attributes) : array();
-        $tag_name = $this->getTagName($node); // Handle variable tagName property
-        if (empty($tag_name)) {
-            return (bool) $node->childNodes->length;
-        }
-        // We still have to make sure that the element actually IS empty
-        if (!$node->childNodes->length) {
-            if ($collect) {
-                $tokens[] = $this->factory->createEmpty($tag_name, $attr);
-            }
-            return false;
-        } else {
-            if ($collect) {
-                $tokens[] = $this->factory->createStart($tag_name, $attr);
-            }
-            return true;
-        }
-    }
-
-    /**
-     * @param DOMNode $node
-     * @param HTMLPurifier_Token[] $tokens
-     */
-    protected function createEndNode($node, &$tokens)
-    {
-        $tag_name = $this->getTagName($node); // Handle variable tagName property
-        $tokens[] = $this->factory->createEnd($tag_name);
-    }
-
-    /**
-     * Converts a DOMNamedNodeMap of DOMAttr objects into an assoc array.
-     *
-     * @param DOMNamedNodeMap $node_map DOMNamedNodeMap of DOMAttr objects.
-     * @return array Associative array of attributes.
-     */
-    protected function transformAttrToAssoc($node_map)
-    {
-        // NamedNodeMap is documented very well, so we're using undocumented
-        // features, namely, the fact that it implements Iterator and
-        // has a ->length attribute
-        if ($node_map->length === 0) {
-            return array();
-        }
-        $array = array();
-        foreach ($node_map as $attr) {
-            $array[$attr->name] = $attr->value;
-        }
-        return $array;
-    }
-
-    /**
-     * An error handler that mutes all errors
-     * @param int $errno
-     * @param string $errstr
-     */
-    public function muteErrorHandler($errno, $errstr)
-    {
-    }
-
-    /**
-     * Callback function for undoing escaping of stray angled brackets
-     * in comments
-     * @param array $matches
-     * @return string
-     */
-    public function callbackUndoCommentSubst($matches)
-    {
-        return '<!--' . strtr($matches[1], array('&amp;' => '&', '&lt;' => '<')) . $matches[2];
-    }
-
-    /**
-     * Callback function that entity-izes ampersands in comments so that
-     * callbackUndoCommentSubst doesn't clobber them
-     * @param array $matches
-     * @return string
-     */
-    public function callbackArmorCommentEntities($matches)
-    {
-        return '<!--' . str_replace('&', '&amp;', $matches[1]) . $matches[2];
-    }
-
-    /**
-     * Wraps an HTML fragment in the necessary HTML
-     * @param string $html
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return string
-     */
-    protected function wrapHTML($html, $config, $context, $use_div = true)
-    {
-        $def = $config->getDefinition('HTML');
-        $ret = '';
-
-        if (!empty($def->doctype->dtdPublic) || !empty($def->doctype->dtdSystem)) {
-            $ret .= '<!DOCTYPE html ';
-            if (!empty($def->doctype->dtdPublic)) {
-                $ret .= 'PUBLIC "' . $def->doctype->dtdPublic . '" ';
-            }
-            if (!empty($def->doctype->dtdSystem)) {
-                $ret .= '"' . $def->doctype->dtdSystem . '" ';
-            }
-            $ret .= '>';
-        }
-
-        $ret .= '<html><head>';
-        $ret .= '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />';
-        // No protection if $html contains a stray </div>!
-        $ret .= '</head><body>';
-        if ($use_div) $ret .= '<div>';
-        $ret .= $html;
-        if ($use_div) $ret .= '</div>';
-        $ret .= '</body></html>';
-        return $ret;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/DirectLex.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/DirectLex.php
deleted file mode 100644
index 6f1308966b..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/DirectLex.php
+++ /dev/null
@@ -1,539 +0,0 @@
-<?php
-
-/**
- * Our in-house implementation of a parser.
- *
- * A pure PHP parser, DirectLex has absolutely no dependencies, making
- * it a reasonably good default for PHP4.  Written with efficiency in mind,
- * it can be four times faster than HTMLPurifier_Lexer_PEARSax3, although it
- * pales in comparison to HTMLPurifier_Lexer_DOMLex.
- *
- * @todo Reread XML spec and document differences.
- */
-class HTMLPurifier_Lexer_DirectLex extends HTMLPurifier_Lexer
-{
-    /**
-     * @type bool
-     */
-    public $tracksLineNumbers = true;
-
-    /**
-     * Whitespace characters for str(c)spn.
-     * @type string
-     */
-    protected $_whitespace = "\x20\x09\x0D\x0A";
-
-    /**
-     * Callback function for script CDATA fudge
-     * @param array $matches, in form of array(opening tag, contents, closing tag)
-     * @return string
-     */
-    protected function scriptCallback($matches)
-    {
-        return $matches[1] . htmlspecialchars($matches[2], ENT_COMPAT, 'UTF-8') . $matches[3];
-    }
-
-    /**
-     * @param String $html
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array|HTMLPurifier_Token[]
-     */
-    public function tokenizeHTML($html, $config, $context)
-    {
-        // special normalization for script tags without any armor
-        // our "armor" heurstic is a < sign any number of whitespaces after
-        // the first script tag
-        if ($config->get('HTML.Trusted')) {
-            $html = preg_replace_callback(
-                '#(<script[^>]*>)(\s*[^<].+?)(</script>)#si',
-                array($this, 'scriptCallback'),
-                $html
-            );
-        }
-
-        $html = $this->normalize($html, $config, $context);
-
-        $cursor = 0; // our location in the text
-        $inside_tag = false; // whether or not we're parsing the inside of a tag
-        $array = array(); // result array
-
-        // This is also treated to mean maintain *column* numbers too
-        $maintain_line_numbers = $config->get('Core.MaintainLineNumbers');
-
-        if ($maintain_line_numbers === null) {
-            // automatically determine line numbering by checking
-            // if error collection is on
-            $maintain_line_numbers = $config->get('Core.CollectErrors');
-        }
-
-        if ($maintain_line_numbers) {
-            $current_line = 1;
-            $current_col = 0;
-            $length = strlen($html);
-        } else {
-            $current_line = false;
-            $current_col = false;
-            $length = false;
-        }
-        $context->register('CurrentLine', $current_line);
-        $context->register('CurrentCol', $current_col);
-        $nl = "\n";
-        // how often to manually recalculate. This will ALWAYS be right,
-        // but it's pretty wasteful. Set to 0 to turn off
-        $synchronize_interval = $config->get('Core.DirectLexLineNumberSyncInterval');
-
-        $e = false;
-        if ($config->get('Core.CollectErrors')) {
-            $e =& $context->get('ErrorCollector');
-        }
-
-        // for testing synchronization
-        $loops = 0;
-
-        while (++$loops) {
-            // $cursor is either at the start of a token, or inside of
-            // a tag (i.e. there was a < immediately before it), as indicated
-            // by $inside_tag
-
-            if ($maintain_line_numbers) {
-                // $rcursor, however, is always at the start of a token.
-                $rcursor = $cursor - (int)$inside_tag;
-
-                // Column number is cheap, so we calculate it every round.
-                // We're interested at the *end* of the newline string, so
-                // we need to add strlen($nl) == 1 to $nl_pos before subtracting it
-                // from our "rcursor" position.
-                $nl_pos = strrpos($html, $nl, $rcursor - $length);
-                $current_col = $rcursor - (is_bool($nl_pos) ? 0 : $nl_pos + 1);
-
-                // recalculate lines
-                if ($synchronize_interval && // synchronization is on
-                    $cursor > 0 && // cursor is further than zero
-                    $loops % $synchronize_interval === 0) { // time to synchronize!
-                    $current_line = 1 + $this->substrCount($html, $nl, 0, $cursor);
-                }
-            }
-
-            $position_next_lt = strpos($html, '<', $cursor);
-            $position_next_gt = strpos($html, '>', $cursor);
-
-            // triggers on "<b>asdf</b>" but not "asdf <b></b>"
-            // special case to set up context
-            if ($position_next_lt === $cursor) {
-                $inside_tag = true;
-                $cursor++;
-            }
-
-            if (!$inside_tag && $position_next_lt !== false) {
-                // We are not inside tag and there still is another tag to parse
-                $token = new
-                HTMLPurifier_Token_Text(
-                    $this->parseText(
-                        substr(
-                            $html,
-                            $cursor,
-                            $position_next_lt - $cursor
-                        ), $config
-                    )
-                );
-                if ($maintain_line_numbers) {
-                    $token->rawPosition($current_line, $current_col);
-                    $current_line += $this->substrCount($html, $nl, $cursor, $position_next_lt - $cursor);
-                }
-                $array[] = $token;
-                $cursor = $position_next_lt + 1;
-                $inside_tag = true;
-                continue;
-            } elseif (!$inside_tag) {
-                // We are not inside tag but there are no more tags
-                // If we're already at the end, break
-                if ($cursor === strlen($html)) {
-                    break;
-                }
-                // Create Text of rest of string
-                $token = new
-                HTMLPurifier_Token_Text(
-                    $this->parseText(
-                        substr(
-                            $html,
-                            $cursor
-                        ), $config
-                    )
-                );
-                if ($maintain_line_numbers) {
-                    $token->rawPosition($current_line, $current_col);
-                }
-                $array[] = $token;
-                break;
-            } elseif ($inside_tag && $position_next_gt !== false) {
-                // We are in tag and it is well formed
-                // Grab the internals of the tag
-                $strlen_segment = $position_next_gt - $cursor;
-
-                if ($strlen_segment < 1) {
-                    // there's nothing to process!
-                    $token = new HTMLPurifier_Token_Text('<');
-                    $cursor++;
-                    continue;
-                }
-
-                $segment = substr($html, $cursor, $strlen_segment);
-
-                if ($segment === false) {
-                    // somehow, we attempted to access beyond the end of
-                    // the string, defense-in-depth, reported by Nate Abele
-                    break;
-                }
-
-                // Check if it's a comment
-                if (substr($segment, 0, 3) === '!--') {
-                    // re-determine segment length, looking for -->
-                    $position_comment_end = strpos($html, '-->', $cursor);
-                    if ($position_comment_end === false) {
-                        // uh oh, we have a comment that extends to
-                        // infinity. Can't be helped: set comment
-                        // end position to end of string
-                        if ($e) {
-                            $e->send(E_WARNING, 'Lexer: Unclosed comment');
-                        }
-                        $position_comment_end = strlen($html);
-                        $end = true;
-                    } else {
-                        $end = false;
-                    }
-                    $strlen_segment = $position_comment_end - $cursor;
-                    $segment = substr($html, $cursor, $strlen_segment);
-                    $token = new
-                    HTMLPurifier_Token_Comment(
-                        substr(
-                            $segment,
-                            3,
-                            $strlen_segment - 3
-                        )
-                    );
-                    if ($maintain_line_numbers) {
-                        $token->rawPosition($current_line, $current_col);
-                        $current_line += $this->substrCount($html, $nl, $cursor, $strlen_segment);
-                    }
-                    $array[] = $token;
-                    $cursor = $end ? $position_comment_end : $position_comment_end + 3;
-                    $inside_tag = false;
-                    continue;
-                }
-
-                // Check if it's an end tag
-                $is_end_tag = (strpos($segment, '/') === 0);
-                if ($is_end_tag) {
-                    $type = substr($segment, 1);
-                    $token = new HTMLPurifier_Token_End($type);
-                    if ($maintain_line_numbers) {
-                        $token->rawPosition($current_line, $current_col);
-                        $current_line += $this->substrCount($html, $nl, $cursor, $position_next_gt - $cursor);
-                    }
-                    $array[] = $token;
-                    $inside_tag = false;
-                    $cursor = $position_next_gt + 1;
-                    continue;
-                }
-
-                // Check leading character is alnum, if not, we may
-                // have accidently grabbed an emoticon. Translate into
-                // text and go our merry way
-                if (!ctype_alpha($segment[0])) {
-                    // XML:  $segment[0] !== '_' && $segment[0] !== ':'
-                    if ($e) {
-                        $e->send(E_NOTICE, 'Lexer: Unescaped lt');
-                    }
-                    $token = new HTMLPurifier_Token_Text('<');
-                    if ($maintain_line_numbers) {
-                        $token->rawPosition($current_line, $current_col);
-                        $current_line += $this->substrCount($html, $nl, $cursor, $position_next_gt - $cursor);
-                    }
-                    $array[] = $token;
-                    $inside_tag = false;
-                    continue;
-                }
-
-                // Check if it is explicitly self closing, if so, remove
-                // trailing slash. Remember, we could have a tag like <br>, so
-                // any later token processing scripts must convert improperly
-                // classified EmptyTags from StartTags.
-                $is_self_closing = (strrpos($segment, '/') === $strlen_segment - 1);
-                if ($is_self_closing) {
-                    $strlen_segment--;
-                    $segment = substr($segment, 0, $strlen_segment);
-                }
-
-                // Check if there are any attributes
-                $position_first_space = strcspn($segment, $this->_whitespace);
-
-                if ($position_first_space >= $strlen_segment) {
-                    if ($is_self_closing) {
-                        $token = new HTMLPurifier_Token_Empty($segment);
-                    } else {
-                        $token = new HTMLPurifier_Token_Start($segment);
-                    }
-                    if ($maintain_line_numbers) {
-                        $token->rawPosition($current_line, $current_col);
-                        $current_line += $this->substrCount($html, $nl, $cursor, $position_next_gt - $cursor);
-                    }
-                    $array[] = $token;
-                    $inside_tag = false;
-                    $cursor = $position_next_gt + 1;
-                    continue;
-                }
-
-                // Grab out all the data
-                $type = substr($segment, 0, $position_first_space);
-                $attribute_string =
-                    trim(
-                        substr(
-                            $segment,
-                            $position_first_space
-                        )
-                    );
-                if ($attribute_string) {
-                    $attr = $this->parseAttributeString(
-                        $attribute_string,
-                        $config,
-                        $context
-                    );
-                } else {
-                    $attr = array();
-                }
-
-                if ($is_self_closing) {
-                    $token = new HTMLPurifier_Token_Empty($type, $attr);
-                } else {
-                    $token = new HTMLPurifier_Token_Start($type, $attr);
-                }
-                if ($maintain_line_numbers) {
-                    $token->rawPosition($current_line, $current_col);
-                    $current_line += $this->substrCount($html, $nl, $cursor, $position_next_gt - $cursor);
-                }
-                $array[] = $token;
-                $cursor = $position_next_gt + 1;
-                $inside_tag = false;
-                continue;
-            } else {
-                // inside tag, but there's no ending > sign
-                if ($e) {
-                    $e->send(E_WARNING, 'Lexer: Missing gt');
-                }
-                $token = new
-                HTMLPurifier_Token_Text(
-                    '<' .
-                    $this->parseText(
-                        substr($html, $cursor), $config
-                    )
-                );
-                if ($maintain_line_numbers) {
-                    $token->rawPosition($current_line, $current_col);
-                }
-                // no cursor scroll? Hmm...
-                $array[] = $token;
-                break;
-            }
-            break;
-        }
-
-        $context->destroy('CurrentLine');
-        $context->destroy('CurrentCol');
-        return $array;
-    }
-
-    /**
-     * PHP 5.0.x compatible substr_count that implements offset and length
-     * @param string $haystack
-     * @param string $needle
-     * @param int $offset
-     * @param int $length
-     * @return int
-     */
-    protected function substrCount($haystack, $needle, $offset, $length)
-    {
-        static $oldVersion;
-        if ($oldVersion === null) {
-            $oldVersion = version_compare(PHP_VERSION, '5.1', '<');
-        }
-        if ($oldVersion) {
-            $haystack = substr($haystack, $offset, $length);
-            return substr_count($haystack, $needle);
-        } else {
-            return substr_count($haystack, $needle, $offset, $length);
-        }
-    }
-
-    /**
-     * Takes the inside of an HTML tag and makes an assoc array of attributes.
-     *
-     * @param string $string Inside of tag excluding name.
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array Assoc array of attributes.
-     */
-    public function parseAttributeString($string, $config, $context)
-    {
-        $string = (string)$string; // quick typecast
-
-        if ($string == '') {
-            return array();
-        } // no attributes
-
-        $e = false;
-        if ($config->get('Core.CollectErrors')) {
-            $e =& $context->get('ErrorCollector');
-        }
-
-        // let's see if we can abort as quickly as possible
-        // one equal sign, no spaces => one attribute
-        $num_equal = substr_count($string, '=');
-        $has_space = strpos($string, ' ');
-        if ($num_equal === 0 && !$has_space) {
-            // bool attribute
-            return array($string => $string);
-        } elseif ($num_equal === 1 && !$has_space) {
-            // only one attribute
-            list($key, $quoted_value) = explode('=', $string);
-            $quoted_value = trim($quoted_value);
-            if (!$key) {
-                if ($e) {
-                    $e->send(E_ERROR, 'Lexer: Missing attribute key');
-                }
-                return array();
-            }
-            if (!$quoted_value) {
-                return array($key => '');
-            }
-            $first_char = @$quoted_value[0];
-            $last_char = @$quoted_value[strlen($quoted_value) - 1];
-
-            $same_quote = ($first_char == $last_char);
-            $open_quote = ($first_char == '"' || $first_char == "'");
-
-            if ($same_quote && $open_quote) {
-                // well behaved
-                $value = substr($quoted_value, 1, strlen($quoted_value) - 2);
-            } else {
-                // not well behaved
-                if ($open_quote) {
-                    if ($e) {
-                        $e->send(E_ERROR, 'Lexer: Missing end quote');
-                    }
-                    $value = substr($quoted_value, 1);
-                } else {
-                    $value = $quoted_value;
-                }
-            }
-            if ($value === false) {
-                $value = '';
-            }
-            return array($key => $this->parseAttr($value, $config));
-        }
-
-        // setup loop environment
-        $array = array(); // return assoc array of attributes
-        $cursor = 0; // current position in string (moves forward)
-        $size = strlen($string); // size of the string (stays the same)
-
-        // if we have unquoted attributes, the parser expects a terminating
-        // space, so let's guarantee that there's always a terminating space.
-        $string .= ' ';
-
-        $old_cursor = -1;
-        while ($cursor < $size) {
-            if ($old_cursor >= $cursor) {
-                throw new Exception("Infinite loop detected");
-            }
-            $old_cursor = $cursor;
-
-            $cursor += ($value = strspn($string, $this->_whitespace, $cursor));
-            // grab the key
-
-            $key_begin = $cursor; //we're currently at the start of the key
-
-            // scroll past all characters that are the key (not whitespace or =)
-            $cursor += strcspn($string, $this->_whitespace . '=', $cursor);
-
-            $key_end = $cursor; // now at the end of the key
-
-            $key = substr($string, $key_begin, $key_end - $key_begin);
-
-            if (!$key) {
-                if ($e) {
-                    $e->send(E_ERROR, 'Lexer: Missing attribute key');
-                }
-                $cursor += 1 + strcspn($string, $this->_whitespace, $cursor + 1); // prevent infinite loop
-                continue; // empty key
-            }
-
-            // scroll past all whitespace
-            $cursor += strspn($string, $this->_whitespace, $cursor);
-
-            if ($cursor >= $size) {
-                $array[$key] = $key;
-                break;
-            }
-
-            // if the next character is an equal sign, we've got a regular
-            // pair, otherwise, it's a bool attribute
-            $first_char = @$string[$cursor];
-
-            if ($first_char == '=') {
-                // key="value"
-
-                $cursor++;
-                $cursor += strspn($string, $this->_whitespace, $cursor);
-
-                if ($cursor === false) {
-                    $array[$key] = '';
-                    break;
-                }
-
-                // we might be in front of a quote right now
-
-                $char = @$string[$cursor];
-
-                if ($char == '"' || $char == "'") {
-                    // it's quoted, end bound is $char
-                    $cursor++;
-                    $value_begin = $cursor;
-                    $cursor = strpos($string, $char, $cursor);
-                    $value_end = $cursor;
-                } else {
-                    // it's not quoted, end bound is whitespace
-                    $value_begin = $cursor;
-                    $cursor += strcspn($string, $this->_whitespace, $cursor);
-                    $value_end = $cursor;
-                }
-
-                // we reached a premature end
-                if ($cursor === false) {
-                    $cursor = $size;
-                    $value_end = $cursor;
-                }
-
-                $value = substr($string, $value_begin, $value_end - $value_begin);
-                if ($value === false) {
-                    $value = '';
-                }
-                $array[$key] = $this->parseAttr($value, $config);
-                $cursor++;
-            } else {
-                // boolattr
-                if ($key !== '') {
-                    $array[$key] = $key;
-                } else {
-                    // purely theoretical
-                    if ($e) {
-                        $e->send(E_ERROR, 'Lexer: Missing attribute key');
-                    }
-                }
-            }
-        }
-        return $array;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/PH5P.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/PH5P.php
deleted file mode 100644
index 72476ddf32..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/PH5P.php
+++ /dev/null
@@ -1,4788 +0,0 @@
-<?php
-
-/**
- * Experimental HTML5-based parser using Jeroen van der Meer's PH5P library.
- * Occupies space in the HTML5 pseudo-namespace, which may cause conflicts.
- *
- * @note
- *    Recent changes to PHP's DOM extension have resulted in some fatal
- *    error conditions with the original version of PH5P. Pending changes,
- *    this lexer will punt to DirectLex if DOM throws an exception.
- */
-
-class HTMLPurifier_Lexer_PH5P extends HTMLPurifier_Lexer_DOMLex
-{
-    /**
-     * @param string $html
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return HTMLPurifier_Token[]
-     */
-    public function tokenizeHTML($html, $config, $context)
-    {
-        $new_html = $this->normalize($html, $config, $context);
-        $new_html = $this->wrapHTML($new_html, $config, $context, false /* no div */);
-        try {
-            $parser = new HTML5($new_html);
-            $doc = $parser->save();
-        } catch (DOMException $e) {
-            // Uh oh, it failed. Punt to DirectLex.
-            $lexer = new HTMLPurifier_Lexer_DirectLex();
-            $context->register('PH5PError', $e); // save the error, so we can detect it
-            return $lexer->tokenizeHTML($html, $config, $context); // use original HTML
-        }
-        $tokens = array();
-        $this->tokenizeDOM(
-            $doc->getElementsByTagName('html')->item(0)-> // <html>
-                  getElementsByTagName('body')->item(0) //   <body>
-            ,
-            $tokens, $config
-        );
-        return $tokens;
-    }
-}
-
-/*
-
-Copyright 2007 Jeroen van der Meer <http://jero.net/>
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*/
-
-class HTML5
-{
-    private $data;
-    private $char;
-    private $EOF;
-    private $state;
-    private $tree;
-    private $token;
-    private $content_model;
-    private $escape = false;
-    private $entities = array(
-        'AElig;',
-        'AElig',
-        'AMP;',
-        'AMP',
-        'Aacute;',
-        'Aacute',
-        'Acirc;',
-        'Acirc',
-        'Agrave;',
-        'Agrave',
-        'Alpha;',
-        'Aring;',
-        'Aring',
-        'Atilde;',
-        'Atilde',
-        'Auml;',
-        'Auml',
-        'Beta;',
-        'COPY;',
-        'COPY',
-        'Ccedil;',
-        'Ccedil',
-        'Chi;',
-        'Dagger;',
-        'Delta;',
-        'ETH;',
-        'ETH',
-        'Eacute;',
-        'Eacute',
-        'Ecirc;',
-        'Ecirc',
-        'Egrave;',
-        'Egrave',
-        'Epsilon;',
-        'Eta;',
-        'Euml;',
-        'Euml',
-        'GT;',
-        'GT',
-        'Gamma;',
-        'Iacute;',
-        'Iacute',
-        'Icirc;',
-        'Icirc',
-        'Igrave;',
-        'Igrave',
-        'Iota;',
-        'Iuml;',
-        'Iuml',
-        'Kappa;',
-        'LT;',
-        'LT',
-        'Lambda;',
-        'Mu;',
-        'Ntilde;',
-        'Ntilde',
-        'Nu;',
-        'OElig;',
-        'Oacute;',
-        'Oacute',
-        'Ocirc;',
-        'Ocirc',
-        'Ograve;',
-        'Ograve',
-        'Omega;',
-        'Omicron;',
-        'Oslash;',
-        'Oslash',
-        'Otilde;',
-        'Otilde',
-        'Ouml;',
-        'Ouml',
-        'Phi;',
-        'Pi;',
-        'Prime;',
-        'Psi;',
-        'QUOT;',
-        'QUOT',
-        'REG;',
-        'REG',
-        'Rho;',
-        'Scaron;',
-        'Sigma;',
-        'THORN;',
-        'THORN',
-        'TRADE;',
-        'Tau;',
-        'Theta;',
-        'Uacute;',
-        'Uacute',
-        'Ucirc;',
-        'Ucirc',
-        'Ugrave;',
-        'Ugrave',
-        'Upsilon;',
-        'Uuml;',
-        'Uuml',
-        'Xi;',
-        'Yacute;',
-        'Yacute',
-        'Yuml;',
-        'Zeta;',
-        'aacute;',
-        'aacute',
-        'acirc;',
-        'acirc',
-        'acute;',
-        'acute',
-        'aelig;',
-        'aelig',
-        'agrave;',
-        'agrave',
-        'alefsym;',
-        'alpha;',
-        'amp;',
-        'amp',
-        'and;',
-        'ang;',
-        'apos;',
-        'aring;',
-        'aring',
-        'asymp;',
-        'atilde;',
-        'atilde',
-        'auml;',
-        'auml',
-        'bdquo;',
-        'beta;',
-        'brvbar;',
-        'brvbar',
-        'bull;',
-        'cap;',
-        'ccedil;',
-        'ccedil',
-        'cedil;',
-        'cedil',
-        'cent;',
-        'cent',
-        'chi;',
-        'circ;',
-        'clubs;',
-        'cong;',
-        'copy;',
-        'copy',
-        'crarr;',
-        'cup;',
-        'curren;',
-        'curren',
-        'dArr;',
-        'dagger;',
-        'darr;',
-        'deg;',
-        'deg',
-        'delta;',
-        'diams;',
-        'divide;',
-        'divide',
-        'eacute;',
-        'eacute',
-        'ecirc;',
-        'ecirc',
-        'egrave;',
-        'egrave',
-        'empty;',
-        'emsp;',
-        'ensp;',
-        'epsilon;',
-        'equiv;',
-        'eta;',
-        'eth;',
-        'eth',
-        'euml;',
-        'euml',
-        'euro;',
-        'exist;',
-        'fnof;',
-        'forall;',
-        'frac12;',
-        'frac12',
-        'frac14;',
-        'frac14',
-        'frac34;',
-        'frac34',
-        'frasl;',
-        'gamma;',
-        'ge;',
-        'gt;',
-        'gt',
-        'hArr;',
-        'harr;',
-        'hearts;',
-        'hellip;',
-        'iacute;',
-        'iacute',
-        'icirc;',
-        'icirc',
-        'iexcl;',
-        'iexcl',
-        'igrave;',
-        'igrave',
-        'image;',
-        'infin;',
-        'int;',
-        'iota;',
-        'iquest;',
-        'iquest',
-        'isin;',
-        'iuml;',
-        'iuml',
-        'kappa;',
-        'lArr;',
-        'lambda;',
-        'lang;',
-        'laquo;',
-        'laquo',
-        'larr;',
-        'lceil;',
-        'ldquo;',
-        'le;',
-        'lfloor;',
-        'lowast;',
-        'loz;',
-        'lrm;',
-        'lsaquo;',
-        'lsquo;',
-        'lt;',
-        'lt',
-        'macr;',
-        'macr',
-        'mdash;',
-        'micro;',
-        'micro',
-        'middot;',
-        'middot',
-        'minus;',
-        'mu;',
-        'nabla;',
-        'nbsp;',
-        'nbsp',
-        'ndash;',
-        'ne;',
-        'ni;',
-        'not;',
-        'not',
-        'notin;',
-        'nsub;',
-        'ntilde;',
-        'ntilde',
-        'nu;',
-        'oacute;',
-        'oacute',
-        'ocirc;',
-        'ocirc',
-        'oelig;',
-        'ograve;',
-        'ograve',
-        'oline;',
-        'omega;',
-        'omicron;',
-        'oplus;',
-        'or;',
-        'ordf;',
-        'ordf',
-        'ordm;',
-        'ordm',
-        'oslash;',
-        'oslash',
-        'otilde;',
-        'otilde',
-        'otimes;',
-        'ouml;',
-        'ouml',
-        'para;',
-        'para',
-        'part;',
-        'permil;',
-        'perp;',
-        'phi;',
-        'pi;',
-        'piv;',
-        'plusmn;',
-        'plusmn',
-        'pound;',
-        'pound',
-        'prime;',
-        'prod;',
-        'prop;',
-        'psi;',
-        'quot;',
-        'quot',
-        'rArr;',
-        'radic;',
-        'rang;',
-        'raquo;',
-        'raquo',
-        'rarr;',
-        'rceil;',
-        'rdquo;',
-        'real;',
-        'reg;',
-        'reg',
-        'rfloor;',
-        'rho;',
-        'rlm;',
-        'rsaquo;',
-        'rsquo;',
-        'sbquo;',
-        'scaron;',
-        'sdot;',
-        'sect;',
-        'sect',
-        'shy;',
-        'shy',
-        'sigma;',
-        'sigmaf;',
-        'sim;',
-        'spades;',
-        'sub;',
-        'sube;',
-        'sum;',
-        'sup1;',
-        'sup1',
-        'sup2;',
-        'sup2',
-        'sup3;',
-        'sup3',
-        'sup;',
-        'supe;',
-        'szlig;',
-        'szlig',
-        'tau;',
-        'there4;',
-        'theta;',
-        'thetasym;',
-        'thinsp;',
-        'thorn;',
-        'thorn',
-        'tilde;',
-        'times;',
-        'times',
-        'trade;',
-        'uArr;',
-        'uacute;',
-        'uacute',
-        'uarr;',
-        'ucirc;',
-        'ucirc',
-        'ugrave;',
-        'ugrave',
-        'uml;',
-        'uml',
-        'upsih;',
-        'upsilon;',
-        'uuml;',
-        'uuml',
-        'weierp;',
-        'xi;',
-        'yacute;',
-        'yacute',
-        'yen;',
-        'yen',
-        'yuml;',
-        'yuml',
-        'zeta;',
-        'zwj;',
-        'zwnj;'
-    );
-
-    const PCDATA = 0;
-    const RCDATA = 1;
-    const CDATA = 2;
-    const PLAINTEXT = 3;
-
-    const DOCTYPE = 0;
-    const STARTTAG = 1;
-    const ENDTAG = 2;
-    const COMMENT = 3;
-    const CHARACTR = 4;
-    const EOF = 5;
-
-    public function __construct($data)
-    {
-        $this->data = $data;
-        $this->char = -1;
-        $this->EOF = strlen($data);
-        $this->tree = new HTML5TreeConstructer;
-        $this->content_model = self::PCDATA;
-
-        $this->state = 'data';
-
-        while ($this->state !== null) {
-            $this->{$this->state . 'State'}();
-        }
-    }
-
-    public function save()
-    {
-        return $this->tree->save();
-    }
-
-    private function char()
-    {
-        return ($this->char < $this->EOF)
-            ? $this->data[$this->char]
-            : false;
-    }
-
-    private function character($s, $l = 0)
-    {
-        if ($s + $l < $this->EOF) {
-            if ($l === 0) {
-                return $this->data[$s];
-            } else {
-                return substr($this->data, $s, $l);
-            }
-        }
-    }
-
-    private function characters($char_class, $start)
-    {
-        return preg_replace('#^([' . $char_class . ']+).*#s', '\\1', substr($this->data, $start));
-    }
-
-    private function dataState()
-    {
-        // Consume the next input character
-        $this->char++;
-        $char = $this->char();
-
-        if ($char === '&' && ($this->content_model === self::PCDATA || $this->content_model === self::RCDATA)) {
-            /* U+0026 AMPERSAND (&)
-            When the content model flag is set to one of the PCDATA or RCDATA
-            states: switch to the entity data state. Otherwise: treat it as per
-            the "anything else"    entry below. */
-            $this->state = 'entityData';
-
-        } elseif ($char === '-') {
-            /* If the content model flag is set to either the RCDATA state or
-            the CDATA state, and the escape flag is false, and there are at
-            least three characters before this one in the input stream, and the
-            last four characters in the input stream, including this one, are
-            U+003C LESS-THAN SIGN, U+0021 EXCLAMATION MARK, U+002D HYPHEN-MINUS,
-            and U+002D HYPHEN-MINUS ("<!--"), then set the escape flag to true. */
-            if (($this->content_model === self::RCDATA || $this->content_model ===
-                    self::CDATA) && $this->escape === false &&
-                $this->char >= 3 && $this->character($this->char - 4, 4) === '<!--'
-            ) {
-                $this->escape = true;
-            }
-
-            /* In any case, emit the input character as a character token. Stay
-            in the data state. */
-            $this->emitToken(
-                array(
-                    'type' => self::CHARACTR,
-                    'data' => $char
-                )
-            );
-
-            /* U+003C LESS-THAN SIGN (<) */
-        } elseif ($char === '<' && ($this->content_model === self::PCDATA ||
-                (($this->content_model === self::RCDATA ||
-                        $this->content_model === self::CDATA) && $this->escape === false))
-        ) {
-            /* When the content model flag is set to the PCDATA state: switch
-            to the tag open state.
-
-            When the content model flag is set to either the RCDATA state or
-            the CDATA state and the escape flag is false: switch to the tag
-            open state.
-
-            Otherwise: treat it as per the "anything else" entry below. */
-            $this->state = 'tagOpen';
-
-            /* U+003E GREATER-THAN SIGN (>) */
-        } elseif ($char === '>') {
-            /* If the content model flag is set to either the RCDATA state or
-            the CDATA state, and the escape flag is true, and the last three
-            characters in the input stream including this one are U+002D
-            HYPHEN-MINUS, U+002D HYPHEN-MINUS, U+003E GREATER-THAN SIGN ("-->"),
-            set the escape flag to false. */
-            if (($this->content_model === self::RCDATA ||
-                    $this->content_model === self::CDATA) && $this->escape === true &&
-                $this->character($this->char, 3) === '-->'
-            ) {
-                $this->escape = false;
-            }
-
-            /* In any case, emit the input character as a character token.
-            Stay in the data state. */
-            $this->emitToken(
-                array(
-                    'type' => self::CHARACTR,
-                    'data' => $char
-                )
-            );
-
-        } elseif ($this->char === $this->EOF) {
-            /* EOF
-            Emit an end-of-file token. */
-            $this->EOF();
-
-        } elseif ($this->content_model === self::PLAINTEXT) {
-            /* When the content model flag is set to the PLAINTEXT state
-            THIS DIFFERS GREATLY FROM THE SPEC: Get the remaining characters of
-            the text and emit it as a character token. */
-            $this->emitToken(
-                array(
-                    'type' => self::CHARACTR,
-                    'data' => substr($this->data, $this->char)
-                )
-            );
-
-            $this->EOF();
-
-        } else {
-            /* Anything else
-            THIS DIFFERS GREATLY FROM THE SPEC: Get as many character that
-            otherwise would also be treated as a character token and emit it
-            as a single character token. Stay in the data state. */
-            $len = strcspn($this->data, '<&', $this->char);
-            $char = substr($this->data, $this->char, $len);
-            $this->char += $len - 1;
-
-            $this->emitToken(
-                array(
-                    'type' => self::CHARACTR,
-                    'data' => $char
-                )
-            );
-
-            $this->state = 'data';
-        }
-    }
-
-    private function entityDataState()
-    {
-        // Attempt to consume an entity.
-        $entity = $this->entity();
-
-        // If nothing is returned, emit a U+0026 AMPERSAND character token.
-        // Otherwise, emit the character token that was returned.
-        $char = (!$entity) ? '&' : $entity;
-        $this->emitToken(
-            array(
-                'type' => self::CHARACTR,
-                'data' => $char
-            )
-        );
-
-        // Finally, switch to the data state.
-        $this->state = 'data';
-    }
-
-    private function tagOpenState()
-    {
-        switch ($this->content_model) {
-            case self::RCDATA:
-            case self::CDATA:
-                /* If the next input character is a U+002F SOLIDUS (/) character,
-                consume it and switch to the close tag open state. If the next
-                input character is not a U+002F SOLIDUS (/) character, emit a
-                U+003C LESS-THAN SIGN character token and switch to the data
-                state to process the next input character. */
-                if ($this->character($this->char + 1) === '/') {
-                    $this->char++;
-                    $this->state = 'closeTagOpen';
-
-                } else {
-                    $this->emitToken(
-                        array(
-                            'type' => self::CHARACTR,
-                            'data' => '<'
-                        )
-                    );
-
-                    $this->state = 'data';
-                }
-                break;
-
-            case self::PCDATA:
-                // If the content model flag is set to the PCDATA state
-                // Consume the next input character:
-                $this->char++;
-                $char = $this->char();
-
-                if ($char === '!') {
-                    /* U+0021 EXCLAMATION MARK (!)
-                    Switch to the markup declaration open state. */
-                    $this->state = 'markupDeclarationOpen';
-
-                } elseif ($char === '/') {
-                    /* U+002F SOLIDUS (/)
-                    Switch to the close tag open state. */
-                    $this->state = 'closeTagOpen';
-
-                } elseif (preg_match('/^[A-Za-z]$/', $char)) {
-                    /* U+0041 LATIN LETTER A through to U+005A LATIN LETTER Z
-                    Create a new start tag token, set its tag name to the lowercase
-                    version of the input character (add 0x0020 to the character's code
-                    point), then switch to the tag name state. (Don't emit the token
-                    yet; further details will be filled in before it is emitted.) */
-                    $this->token = array(
-                        'name' => strtolower($char),
-                        'type' => self::STARTTAG,
-                        'attr' => array()
-                    );
-
-                    $this->state = 'tagName';
-
-                } elseif ($char === '>') {
-                    /* U+003E GREATER-THAN SIGN (>)
-                    Parse error. Emit a U+003C LESS-THAN SIGN character token and a
-                    U+003E GREATER-THAN SIGN character token. Switch to the data state. */
-                    $this->emitToken(
-                        array(
-                            'type' => self::CHARACTR,
-                            'data' => '<>'
-                        )
-                    );
-
-                    $this->state = 'data';
-
-                } elseif ($char === '?') {
-                    /* U+003F QUESTION MARK (?)
-                    Parse error. Switch to the bogus comment state. */
-                    $this->state = 'bogusComment';
-
-                } else {
-                    /* Anything else
-                    Parse error. Emit a U+003C LESS-THAN SIGN character token and
-                    reconsume the current input character in the data state. */
-                    $this->emitToken(
-                        array(
-                            'type' => self::CHARACTR,
-                            'data' => '<'
-                        )
-                    );
-
-                    $this->char--;
-                    $this->state = 'data';
-                }
-                break;
-        }
-    }
-
-    private function closeTagOpenState()
-    {
-        $next_node = strtolower($this->characters('A-Za-z', $this->char + 1));
-        $the_same = count($this->tree->stack) > 0 && $next_node === end($this->tree->stack)->nodeName;
-
-        if (($this->content_model === self::RCDATA || $this->content_model === self::CDATA) &&
-            (!$the_same || ($the_same && (!preg_match(
-                            '/[\t\n\x0b\x0c >\/]/',
-                            $this->character($this->char + 1 + strlen($next_node))
-                        ) || $this->EOF === $this->char)))
-        ) {
-            /* If the content model flag is set to the RCDATA or CDATA states then
-            examine the next few characters. If they do not match the tag name of
-            the last start tag token emitted (case insensitively), or if they do but
-            they are not immediately followed by one of the following characters:
-                * U+0009 CHARACTER TABULATION
-                * U+000A LINE FEED (LF)
-                * U+000B LINE TABULATION
-                * U+000C FORM FEED (FF)
-                * U+0020 SPACE
-                * U+003E GREATER-THAN SIGN (>)
-                * U+002F SOLIDUS (/)
-                * EOF
-            ...then there is a parse error. Emit a U+003C LESS-THAN SIGN character
-            token, a U+002F SOLIDUS character token, and switch to the data state
-            to process the next input character. */
-            $this->emitToken(
-                array(
-                    'type' => self::CHARACTR,
-                    'data' => '</'
-                )
-            );
-
-            $this->state = 'data';
-
-        } else {
-            /* Otherwise, if the content model flag is set to the PCDATA state,
-            or if the next few characters do match that tag name, consume the
-            next input character: */
-            $this->char++;
-            $char = $this->char();
-
-            if (preg_match('/^[A-Za-z]$/', $char)) {
-                /* U+0041 LATIN LETTER A through to U+005A LATIN LETTER Z
-                Create a new end tag token, set its tag name to the lowercase version
-                of the input character (add 0x0020 to the character's code point), then
-                switch to the tag name state. (Don't emit the token yet; further details
-                will be filled in before it is emitted.) */
-                $this->token = array(
-                    'name' => strtolower($char),
-                    'type' => self::ENDTAG
-                );
-
-                $this->state = 'tagName';
-
-            } elseif ($char === '>') {
-                /* U+003E GREATER-THAN SIGN (>)
-                Parse error. Switch to the data state. */
-                $this->state = 'data';
-
-            } elseif ($this->char === $this->EOF) {
-                /* EOF
-                Parse error. Emit a U+003C LESS-THAN SIGN character token and a U+002F
-                SOLIDUS character token. Reconsume the EOF character in the data state. */
-                $this->emitToken(
-                    array(
-                        'type' => self::CHARACTR,
-                        'data' => '</'
-                    )
-                );
-
-                $this->char--;
-                $this->state = 'data';
-
-            } else {
-                /* Parse error. Switch to the bogus comment state. */
-                $this->state = 'bogusComment';
-            }
-        }
-    }
-
-    private function tagNameState()
-    {
-        // Consume the next input character:
-        $this->char++;
-        $char = $this->character($this->char);
-
-        if (preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
-            /* U+0009 CHARACTER TABULATION
-            U+000A LINE FEED (LF)
-            U+000B LINE TABULATION
-            U+000C FORM FEED (FF)
-            U+0020 SPACE
-            Switch to the before attribute name state. */
-            $this->state = 'beforeAttributeName';
-
-        } elseif ($char === '>') {
-            /* U+003E GREATER-THAN SIGN (>)
-            Emit the current tag token. Switch to the data state. */
-            $this->emitToken($this->token);
-            $this->state = 'data';
-
-        } elseif ($this->char === $this->EOF) {
-            /* EOF
-            Parse error. Emit the current tag token. Reconsume the EOF
-            character in the data state. */
-            $this->emitToken($this->token);
-
-            $this->char--;
-            $this->state = 'data';
-
-        } elseif ($char === '/') {
-            /* U+002F SOLIDUS (/)
-            Parse error unless this is a permitted slash. Switch to the before
-            attribute name state. */
-            $this->state = 'beforeAttributeName';
-
-        } else {
-            /* Anything else
-            Append the current input character to the current tag token's tag name.
-            Stay in the tag name state. */
-            $this->token['name'] .= strtolower($char);
-            $this->state = 'tagName';
-        }
-    }
-
-    private function beforeAttributeNameState()
-    {
-        // Consume the next input character:
-        $this->char++;
-        $char = $this->character($this->char);
-
-        if (preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
-            /* U+0009 CHARACTER TABULATION
-            U+000A LINE FEED (LF)
-            U+000B LINE TABULATION
-            U+000C FORM FEED (FF)
-            U+0020 SPACE
-            Stay in the before attribute name state. */
-            $this->state = 'beforeAttributeName';
-
-        } elseif ($char === '>') {
-            /* U+003E GREATER-THAN SIGN (>)
-            Emit the current tag token. Switch to the data state. */
-            $this->emitToken($this->token);
-            $this->state = 'data';
-
-        } elseif ($char === '/') {
-            /* U+002F SOLIDUS (/)
-            Parse error unless this is a permitted slash. Stay in the before
-            attribute name state. */
-            $this->state = 'beforeAttributeName';
-
-        } elseif ($this->char === $this->EOF) {
-            /* EOF
-            Parse error. Emit the current tag token. Reconsume the EOF
-            character in the data state. */
-            $this->emitToken($this->token);
-
-            $this->char--;
-            $this->state = 'data';
-
-        } else {
-            /* Anything else
-            Start a new attribute in the current tag token. Set that attribute's
-            name to the current input character, and its value to the empty string.
-            Switch to the attribute name state. */
-            $this->token['attr'][] = array(
-                'name' => strtolower($char),
-                'value' => null
-            );
-
-            $this->state = 'attributeName';
-        }
-    }
-
-    private function attributeNameState()
-    {
-        // Consume the next input character:
-        $this->char++;
-        $char = $this->character($this->char);
-
-        if (preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
-            /* U+0009 CHARACTER TABULATION
-            U+000A LINE FEED (LF)
-            U+000B LINE TABULATION
-            U+000C FORM FEED (FF)
-            U+0020 SPACE
-            Stay in the before attribute name state. */
-            $this->state = 'afterAttributeName';
-
-        } elseif ($char === '=') {
-            /* U+003D EQUALS SIGN (=)
-            Switch to the before attribute value state. */
-            $this->state = 'beforeAttributeValue';
-
-        } elseif ($char === '>') {
-            /* U+003E GREATER-THAN SIGN (>)
-            Emit the current tag token. Switch to the data state. */
-            $this->emitToken($this->token);
-            $this->state = 'data';
-
-        } elseif ($char === '/' && $this->character($this->char + 1) !== '>') {
-            /* U+002F SOLIDUS (/)
-            Parse error unless this is a permitted slash. Switch to the before
-            attribute name state. */
-            $this->state = 'beforeAttributeName';
-
-        } elseif ($this->char === $this->EOF) {
-            /* EOF
-            Parse error. Emit the current tag token. Reconsume the EOF
-            character in the data state. */
-            $this->emitToken($this->token);
-
-            $this->char--;
-            $this->state = 'data';
-
-        } else {
-            /* Anything else
-            Append the current input character to the current attribute's name.
-            Stay in the attribute name state. */
-            $last = count($this->token['attr']) - 1;
-            $this->token['attr'][$last]['name'] .= strtolower($char);
-
-            $this->state = 'attributeName';
-        }
-    }
-
-    private function afterAttributeNameState()
-    {
-        // Consume the next input character:
-        $this->char++;
-        $char = $this->character($this->char);
-
-        if (preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
-            /* U+0009 CHARACTER TABULATION
-            U+000A LINE FEED (LF)
-            U+000B LINE TABULATION
-            U+000C FORM FEED (FF)
-            U+0020 SPACE
-            Stay in the after attribute name state. */
-            $this->state = 'afterAttributeName';
-
-        } elseif ($char === '=') {
-            /* U+003D EQUALS SIGN (=)
-            Switch to the before attribute value state. */
-            $this->state = 'beforeAttributeValue';
-
-        } elseif ($char === '>') {
-            /* U+003E GREATER-THAN SIGN (>)
-            Emit the current tag token. Switch to the data state. */
-            $this->emitToken($this->token);
-            $this->state = 'data';
-
-        } elseif ($char === '/' && $this->character($this->char + 1) !== '>') {
-            /* U+002F SOLIDUS (/)
-            Parse error unless this is a permitted slash. Switch to the
-            before attribute name state. */
-            $this->state = 'beforeAttributeName';
-
-        } elseif ($this->char === $this->EOF) {
-            /* EOF
-            Parse error. Emit the current tag token. Reconsume the EOF
-            character in the data state. */
-            $this->emitToken($this->token);
-
-            $this->char--;
-            $this->state = 'data';
-
-        } else {
-            /* Anything else
-            Start a new attribute in the current tag token. Set that attribute's
-            name to the current input character, and its value to the empty string.
-            Switch to the attribute name state. */
-            $this->token['attr'][] = array(
-                'name' => strtolower($char),
-                'value' => null
-            );
-
-            $this->state = 'attributeName';
-        }
-    }
-
-    private function beforeAttributeValueState()
-    {
-        // Consume the next input character:
-        $this->char++;
-        $char = $this->character($this->char);
-
-        if (preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
-            /* U+0009 CHARACTER TABULATION
-            U+000A LINE FEED (LF)
-            U+000B LINE TABULATION
-            U+000C FORM FEED (FF)
-            U+0020 SPACE
-            Stay in the before attribute value state. */
-            $this->state = 'beforeAttributeValue';
-
-        } elseif ($char === '"') {
-            /* U+0022 QUOTATION MARK (")
-            Switch to the attribute value (double-quoted) state. */
-            $this->state = 'attributeValueDoubleQuoted';
-
-        } elseif ($char === '&') {
-            /* U+0026 AMPERSAND (&)
-            Switch to the attribute value (unquoted) state and reconsume
-            this input character. */
-            $this->char--;
-            $this->state = 'attributeValueUnquoted';
-
-        } elseif ($char === '\'') {
-            /* U+0027 APOSTROPHE (')
-            Switch to the attribute value (single-quoted) state. */
-            $this->state = 'attributeValueSingleQuoted';
-
-        } elseif ($char === '>') {
-            /* U+003E GREATER-THAN SIGN (>)
-            Emit the current tag token. Switch to the data state. */
-            $this->emitToken($this->token);
-            $this->state = 'data';
-
-        } else {
-            /* Anything else
-            Append the current input character to the current attribute's value.
-            Switch to the attribute value (unquoted) state. */
-            $last = count($this->token['attr']) - 1;
-            $this->token['attr'][$last]['value'] .= $char;
-
-            $this->state = 'attributeValueUnquoted';
-        }
-    }
-
-    private function attributeValueDoubleQuotedState()
-    {
-        // Consume the next input character:
-        $this->char++;
-        $char = $this->character($this->char);
-
-        if ($char === '"') {
-            /* U+0022 QUOTATION MARK (")
-            Switch to the before attribute name state. */
-            $this->state = 'beforeAttributeName';
-
-        } elseif ($char === '&') {
-            /* U+0026 AMPERSAND (&)
-            Switch to the entity in attribute value state. */
-            $this->entityInAttributeValueState('double');
-
-        } elseif ($this->char === $this->EOF) {
-            /* EOF
-            Parse error. Emit the current tag token. Reconsume the character
-            in the data state. */
-            $this->emitToken($this->token);
-
-            $this->char--;
-            $this->state = 'data';
-
-        } else {
-            /* Anything else
-            Append the current input character to the current attribute's value.
-            Stay in the attribute value (double-quoted) state. */
-            $last = count($this->token['attr']) - 1;
-            $this->token['attr'][$last]['value'] .= $char;
-
-            $this->state = 'attributeValueDoubleQuoted';
-        }
-    }
-
-    private function attributeValueSingleQuotedState()
-    {
-        // Consume the next input character:
-        $this->char++;
-        $char = $this->character($this->char);
-
-        if ($char === '\'') {
-            /* U+0022 QUOTATION MARK (')
-            Switch to the before attribute name state. */
-            $this->state = 'beforeAttributeName';
-
-        } elseif ($char === '&') {
-            /* U+0026 AMPERSAND (&)
-            Switch to the entity in attribute value state. */
-            $this->entityInAttributeValueState('single');
-
-        } elseif ($this->char === $this->EOF) {
-            /* EOF
-            Parse error. Emit the current tag token. Reconsume the character
-            in the data state. */
-            $this->emitToken($this->token);
-
-            $this->char--;
-            $this->state = 'data';
-
-        } else {
-            /* Anything else
-            Append the current input character to the current attribute's value.
-            Stay in the attribute value (single-quoted) state. */
-            $last = count($this->token['attr']) - 1;
-            $this->token['attr'][$last]['value'] .= $char;
-
-            $this->state = 'attributeValueSingleQuoted';
-        }
-    }
-
-    private function attributeValueUnquotedState()
-    {
-        // Consume the next input character:
-        $this->char++;
-        $char = $this->character($this->char);
-
-        if (preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
-            /* U+0009 CHARACTER TABULATION
-            U+000A LINE FEED (LF)
-            U+000B LINE TABULATION
-            U+000C FORM FEED (FF)
-            U+0020 SPACE
-            Switch to the before attribute name state. */
-            $this->state = 'beforeAttributeName';
-
-        } elseif ($char === '&') {
-            /* U+0026 AMPERSAND (&)
-            Switch to the entity in attribute value state. */
-            $this->entityInAttributeValueState();
-
-        } elseif ($char === '>') {
-            /* U+003E GREATER-THAN SIGN (>)
-            Emit the current tag token. Switch to the data state. */
-            $this->emitToken($this->token);
-            $this->state = 'data';
-
-        } else {
-            /* Anything else
-            Append the current input character to the current attribute's value.
-            Stay in the attribute value (unquoted) state. */
-            $last = count($this->token['attr']) - 1;
-            $this->token['attr'][$last]['value'] .= $char;
-
-            $this->state = 'attributeValueUnquoted';
-        }
-    }
-
-    private function entityInAttributeValueState()
-    {
-        // Attempt to consume an entity.
-        $entity = $this->entity();
-
-        // If nothing is returned, append a U+0026 AMPERSAND character to the
-        // current attribute's value. Otherwise, emit the character token that
-        // was returned.
-        $char = (!$entity)
-            ? '&'
-            : $entity;
-
-        $last = count($this->token['attr']) - 1;
-        $this->token['attr'][$last]['value'] .= $char;
-    }
-
-    private function bogusCommentState()
-    {
-        /* Consume every character up to the first U+003E GREATER-THAN SIGN
-        character (>) or the end of the file (EOF), whichever comes first. Emit
-        a comment token whose data is the concatenation of all the characters
-        starting from and including the character that caused the state machine
-        to switch into the bogus comment state, up to and including the last
-        consumed character before the U+003E character, if any, or up to the
-        end of the file otherwise. (If the comment was started by the end of
-        the file (EOF), the token is empty.) */
-        $data = $this->characters('^>', $this->char);
-        $this->emitToken(
-            array(
-                'data' => $data,
-                'type' => self::COMMENT
-            )
-        );
-
-        $this->char += strlen($data);
-
-        /* Switch to the data state. */
-        $this->state = 'data';
-
-        /* If the end of the file was reached, reconsume the EOF character. */
-        if ($this->char === $this->EOF) {
-            $this->char = $this->EOF - 1;
-        }
-    }
-
-    private function markupDeclarationOpenState()
-    {
-        /* If the next two characters are both U+002D HYPHEN-MINUS (-)
-        characters, consume those two characters, create a comment token whose
-        data is the empty string, and switch to the comment state. */
-        if ($this->character($this->char + 1, 2) === '--') {
-            $this->char += 2;
-            $this->state = 'comment';
-            $this->token = array(
-                'data' => null,
-                'type' => self::COMMENT
-            );
-
-            /* Otherwise if the next seven chacacters are a case-insensitive match
-            for the word "DOCTYPE", then consume those characters and switch to the
-            DOCTYPE state. */
-        } elseif (strtolower($this->character($this->char + 1, 7)) === 'doctype') {
-            $this->char += 7;
-            $this->state = 'doctype';
-
-            /* Otherwise, is is a parse error. Switch to the bogus comment state.
-            The next character that is consumed, if any, is the first character
-            that will be in the comment. */
-        } else {
-            $this->char++;
-            $this->state = 'bogusComment';
-        }
-    }
-
-    private function commentState()
-    {
-        /* Consume the next input character: */
-        $this->char++;
-        $char = $this->char();
-
-        /* U+002D HYPHEN-MINUS (-) */
-        if ($char === '-') {
-            /* Switch to the comment dash state  */
-            $this->state = 'commentDash';
-
-            /* EOF */
-        } elseif ($this->char === $this->EOF) {
-            /* Parse error. Emit the comment token. Reconsume the EOF character
-            in the data state. */
-            $this->emitToken($this->token);
-            $this->char--;
-            $this->state = 'data';
-
-            /* Anything else */
-        } else {
-            /* Append the input character to the comment token's data. Stay in
-            the comment state. */
-            $this->token['data'] .= $char;
-        }
-    }
-
-    private function commentDashState()
-    {
-        /* Consume the next input character: */
-        $this->char++;
-        $char = $this->char();
-
-        /* U+002D HYPHEN-MINUS (-) */
-        if ($char === '-') {
-            /* Switch to the comment end state  */
-            $this->state = 'commentEnd';
-
-            /* EOF */
-        } elseif ($this->char === $this->EOF) {
-            /* Parse error. Emit the comment token. Reconsume the EOF character
-            in the data state. */
-            $this->emitToken($this->token);
-            $this->char--;
-            $this->state = 'data';
-
-            /* Anything else */
-        } else {
-            /* Append a U+002D HYPHEN-MINUS (-) character and the input
-            character to the comment token's data. Switch to the comment state. */
-            $this->token['data'] .= '-' . $char;
-            $this->state = 'comment';
-        }
-    }
-
-    private function commentEndState()
-    {
-        /* Consume the next input character: */
-        $this->char++;
-        $char = $this->char();
-
-        if ($char === '>') {
-            $this->emitToken($this->token);
-            $this->state = 'data';
-
-        } elseif ($char === '-') {
-            $this->token['data'] .= '-';
-
-        } elseif ($this->char === $this->EOF) {
-            $this->emitToken($this->token);
-            $this->char--;
-            $this->state = 'data';
-
-        } else {
-            $this->token['data'] .= '--' . $char;
-            $this->state = 'comment';
-        }
-    }
-
-    private function doctypeState()
-    {
-        /* Consume the next input character: */
-        $this->char++;
-        $char = $this->char();
-
-        if (preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
-            $this->state = 'beforeDoctypeName';
-
-        } else {
-            $this->char--;
-            $this->state = 'beforeDoctypeName';
-        }
-    }
-
-    private function beforeDoctypeNameState()
-    {
-        /* Consume the next input character: */
-        $this->char++;
-        $char = $this->char();
-
-        if (preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
-            // Stay in the before DOCTYPE name state.
-
-        } elseif (preg_match('/^[a-z]$/', $char)) {
-            $this->token = array(
-                'name' => strtoupper($char),
-                'type' => self::DOCTYPE,
-                'error' => true
-            );
-
-            $this->state = 'doctypeName';
-
-        } elseif ($char === '>') {
-            $this->emitToken(
-                array(
-                    'name' => null,
-                    'type' => self::DOCTYPE,
-                    'error' => true
-                )
-            );
-
-            $this->state = 'data';
-
-        } elseif ($this->char === $this->EOF) {
-            $this->emitToken(
-                array(
-                    'name' => null,
-                    'type' => self::DOCTYPE,
-                    'error' => true
-                )
-            );
-
-            $this->char--;
-            $this->state = 'data';
-
-        } else {
-            $this->token = array(
-                'name' => $char,
-                'type' => self::DOCTYPE,
-                'error' => true
-            );
-
-            $this->state = 'doctypeName';
-        }
-    }
-
-    private function doctypeNameState()
-    {
-        /* Consume the next input character: */
-        $this->char++;
-        $char = $this->char();
-
-        if (preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
-            $this->state = 'AfterDoctypeName';
-
-        } elseif ($char === '>') {
-            $this->emitToken($this->token);
-            $this->state = 'data';
-
-        } elseif (preg_match('/^[a-z]$/', $char)) {
-            $this->token['name'] .= strtoupper($char);
-
-        } elseif ($this->char === $this->EOF) {
-            $this->emitToken($this->token);
-            $this->char--;
-            $this->state = 'data';
-
-        } else {
-            $this->token['name'] .= $char;
-        }
-
-        $this->token['error'] = ($this->token['name'] === 'HTML')
-            ? false
-            : true;
-    }
-
-    private function afterDoctypeNameState()
-    {
-        /* Consume the next input character: */
-        $this->char++;
-        $char = $this->char();
-
-        if (preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
-            // Stay in the DOCTYPE name state.
-
-        } elseif ($char === '>') {
-            $this->emitToken($this->token);
-            $this->state = 'data';
-
-        } elseif ($this->char === $this->EOF) {
-            $this->emitToken($this->token);
-            $this->char--;
-            $this->state = 'data';
-
-        } else {
-            $this->token['error'] = true;
-            $this->state = 'bogusDoctype';
-        }
-    }
-
-    private function bogusDoctypeState()
-    {
-        /* Consume the next input character: */
-        $this->char++;
-        $char = $this->char();
-
-        if ($char === '>') {
-            $this->emitToken($this->token);
-            $this->state = 'data';
-
-        } elseif ($this->char === $this->EOF) {
-            $this->emitToken($this->token);
-            $this->char--;
-            $this->state = 'data';
-
-        } else {
-            // Stay in the bogus DOCTYPE state.
-        }
-    }
-
-    private function entity()
-    {
-        $start = $this->char;
-
-        // This section defines how to consume an entity. This definition is
-        // used when parsing entities in text and in attributes.
-
-        // The behaviour depends on the identity of the next character (the
-        // one immediately after the U+0026 AMPERSAND character):
-
-        switch ($this->character($this->char + 1)) {
-            // U+0023 NUMBER SIGN (#)
-            case '#':
-
-                // The behaviour further depends on the character after the
-                // U+0023 NUMBER SIGN:
-                switch ($this->character($this->char + 1)) {
-                    // U+0078 LATIN SMALL LETTER X
-                    // U+0058 LATIN CAPITAL LETTER X
-                    case 'x':
-                    case 'X':
-                        // Follow the steps below, but using the range of
-                        // characters U+0030 DIGIT ZERO through to U+0039 DIGIT
-                        // NINE, U+0061 LATIN SMALL LETTER A through to U+0066
-                        // LATIN SMALL LETTER F, and U+0041 LATIN CAPITAL LETTER
-                        // A, through to U+0046 LATIN CAPITAL LETTER F (in other
-                        // words, 0-9, A-F, a-f).
-                        $char = 1;
-                        $char_class = '0-9A-Fa-f';
-                        break;
-
-                    // Anything else
-                    default:
-                        // Follow the steps below, but using the range of
-                        // characters U+0030 DIGIT ZERO through to U+0039 DIGIT
-                        // NINE (i.e. just 0-9).
-                        $char = 0;
-                        $char_class = '0-9';
-                        break;
-                }
-
-                // Consume as many characters as match the range of characters
-                // given above.
-                $this->char++;
-                $e_name = $this->characters($char_class, $this->char + $char + 1);
-                $entity = $this->character($start, $this->char);
-                $cond = strlen($e_name) > 0;
-
-                // The rest of the parsing happens below.
-                break;
-
-            // Anything else
-            default:
-                // Consume the maximum number of characters possible, with the
-                // consumed characters case-sensitively matching one of the
-                // identifiers in the first column of the entities table.
-
-                $e_name = $this->characters('0-9A-Za-z;', $this->char + 1);
-                $len = strlen($e_name);
-
-                for ($c = 1; $c <= $len; $c++) {
-                    $id = substr($e_name, 0, $c);
-                    $this->char++;
-
-                    if (in_array($id, $this->entities)) {
-                        if ($e_name[$c - 1] !== ';') {
-                            if ($c < $len && $e_name[$c] == ';') {
-                                $this->char++; // consume extra semicolon
-                            }
-                        }
-                        $entity = $id;
-                        break;
-                    }
-                }
-
-                $cond = isset($entity);
-                // The rest of the parsing happens below.
-                break;
-        }
-
-        if (!$cond) {
-            // If no match can be made, then this is a parse error. No
-            // characters are consumed, and nothing is returned.
-            $this->char = $start;
-            return false;
-        }
-
-        // Return a character token for the character corresponding to the
-        // entity name (as given by the second column of the entities table).
-        return html_entity_decode('&' . rtrim($entity, ';') . ';', ENT_QUOTES, 'UTF-8');
-    }
-
-    private function emitToken($token)
-    {
-        $emit = $this->tree->emitToken($token);
-
-        if (is_int($emit)) {
-            $this->content_model = $emit;
-
-        } elseif ($token['type'] === self::ENDTAG) {
-            $this->content_model = self::PCDATA;
-        }
-    }
-
-    private function EOF()
-    {
-        $this->state = null;
-        $this->tree->emitToken(
-            array(
-                'type' => self::EOF
-            )
-        );
-    }
-}
-
-class HTML5TreeConstructer
-{
-    public $stack = array();
-
-    private $phase;
-    private $mode;
-    private $dom;
-    private $foster_parent = null;
-    private $a_formatting = array();
-
-    private $head_pointer = null;
-    private $form_pointer = null;
-
-    private $scoping = array('button', 'caption', 'html', 'marquee', 'object', 'table', 'td', 'th');
-    private $formatting = array(
-        'a',
-        'b',
-        'big',
-        'em',
-        'font',
-        'i',
-        'nobr',
-        's',
-        'small',
-        'strike',
-        'strong',
-        'tt',
-        'u'
-    );
-    private $special = array(
-        'address',
-        'area',
-        'base',
-        'basefont',
-        'bgsound',
-        'blockquote',
-        'body',
-        'br',
-        'center',
-        'col',
-        'colgroup',
-        'dd',
-        'dir',
-        'div',
-        'dl',
-        'dt',
-        'embed',
-        'fieldset',
-        'form',
-        'frame',
-        'frameset',
-        'h1',
-        'h2',
-        'h3',
-        'h4',
-        'h5',
-        'h6',
-        'head',
-        'hr',
-        'iframe',
-        'image',
-        'img',
-        'input',
-        'isindex',
-        'li',
-        'link',
-        'listing',
-        'menu',
-        'meta',
-        'noembed',
-        'noframes',
-        'noscript',
-        'ol',
-        'optgroup',
-        'option',
-        'p',
-        'param',
-        'plaintext',
-        'pre',
-        'script',
-        'select',
-        'spacer',
-        'style',
-        'tbody',
-        'textarea',
-        'tfoot',
-        'thead',
-        'title',
-        'tr',
-        'ul',
-        'wbr'
-    );
-
-    // The different phases.
-    const INIT_PHASE = 0;
-    const ROOT_PHASE = 1;
-    const MAIN_PHASE = 2;
-    const END_PHASE = 3;
-
-    // The different insertion modes for the main phase.
-    const BEFOR_HEAD = 0;
-    const IN_HEAD = 1;
-    const AFTER_HEAD = 2;
-    const IN_BODY = 3;
-    const IN_TABLE = 4;
-    const IN_CAPTION = 5;
-    const IN_CGROUP = 6;
-    const IN_TBODY = 7;
-    const IN_ROW = 8;
-    const IN_CELL = 9;
-    const IN_SELECT = 10;
-    const AFTER_BODY = 11;
-    const IN_FRAME = 12;
-    const AFTR_FRAME = 13;
-
-    // The different types of elements.
-    const SPECIAL = 0;
-    const SCOPING = 1;
-    const FORMATTING = 2;
-    const PHRASING = 3;
-
-    const MARKER = 0;
-
-    public function __construct()
-    {
-        $this->phase = self::INIT_PHASE;
-        $this->mode = self::BEFOR_HEAD;
-        $this->dom = new DOMDocument;
-
-        $this->dom->encoding = 'UTF-8';
-        $this->dom->preserveWhiteSpace = true;
-        $this->dom->substituteEntities = true;
-        $this->dom->strictErrorChecking = false;
-    }
-
-    // Process tag tokens
-    public function emitToken($token)
-    {
-        switch ($this->phase) {
-            case self::INIT_PHASE:
-                return $this->initPhase($token);
-                break;
-            case self::ROOT_PHASE:
-                return $this->rootElementPhase($token);
-                break;
-            case self::MAIN_PHASE:
-                return $this->mainPhase($token);
-                break;
-            case self::END_PHASE :
-                return $this->trailingEndPhase($token);
-                break;
-        }
-    }
-
-    private function initPhase($token)
-    {
-        /* Initially, the tree construction stage must handle each token
-        emitted from the tokenisation stage as follows: */
-
-        /* A DOCTYPE token that is marked as being in error
-        A comment token
-        A start tag token
-        An end tag token
-        A character token that is not one of one of U+0009 CHARACTER TABULATION,
-            U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
-            or U+0020 SPACE
-        An end-of-file token */
-        if ((isset($token['error']) && $token['error']) ||
-            $token['type'] === HTML5::COMMENT ||
-            $token['type'] === HTML5::STARTTAG ||
-            $token['type'] === HTML5::ENDTAG ||
-            $token['type'] === HTML5::EOF ||
-            ($token['type'] === HTML5::CHARACTR && isset($token['data']) &&
-                !preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data']))
-        ) {
-            /* This specification does not define how to handle this case. In
-            particular, user agents may ignore the entirety of this specification
-            altogether for such documents, and instead invoke special parse modes
-            with a greater emphasis on backwards compatibility. */
-
-            $this->phase = self::ROOT_PHASE;
-            return $this->rootElementPhase($token);
-
-            /* A DOCTYPE token marked as being correct */
-        } elseif (isset($token['error']) && !$token['error']) {
-            /* Append a DocumentType node to the Document  node, with the name
-            attribute set to the name given in the DOCTYPE token (which will be
-            "HTML"), and the other attributes specific to DocumentType objects
-            set to null, empty lists, or the empty string as appropriate. */
-            $doctype = new DOMDocumentType(null, null, 'HTML');
-
-            /* Then, switch to the root element phase of the tree construction
-            stage. */
-            $this->phase = self::ROOT_PHASE;
-
-            /* A character token that is one of one of U+0009 CHARACTER TABULATION,
-            U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
-            or U+0020 SPACE */
-        } elseif (isset($token['data']) && preg_match(
-                '/^[\t\n\x0b\x0c ]+$/',
-                $token['data']
-            )
-        ) {
-            /* Append that character  to the Document node. */
-            $text = $this->dom->createTextNode($token['data']);
-            $this->dom->appendChild($text);
-        }
-    }
-
-    private function rootElementPhase($token)
-    {
-        /* After the initial phase, as each token is emitted from the tokenisation
-        stage, it must be processed as described in this section. */
-
-        /* A DOCTYPE token */
-        if ($token['type'] === HTML5::DOCTYPE) {
-            // Parse error. Ignore the token.
-
-            /* A comment token */
-        } elseif ($token['type'] === HTML5::COMMENT) {
-            /* Append a Comment node to the Document object with the data
-            attribute set to the data given in the comment token. */
-            $comment = $this->dom->createComment($token['data']);
-            $this->dom->appendChild($comment);
-
-            /* A character token that is one of one of U+0009 CHARACTER TABULATION,
-            U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
-            or U+0020 SPACE */
-        } elseif ($token['type'] === HTML5::CHARACTR &&
-            preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])
-        ) {
-            /* Append that character  to the Document node. */
-            $text = $this->dom->createTextNode($token['data']);
-            $this->dom->appendChild($text);
-
-            /* A character token that is not one of U+0009 CHARACTER TABULATION,
-                U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED
-                (FF), or U+0020 SPACE
-            A start tag token
-            An end tag token
-            An end-of-file token */
-        } elseif (($token['type'] === HTML5::CHARACTR &&
-                !preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) ||
-            $token['type'] === HTML5::STARTTAG ||
-            $token['type'] === HTML5::ENDTAG ||
-            $token['type'] === HTML5::EOF
-        ) {
-            /* Create an HTMLElement node with the tag name html, in the HTML
-            namespace. Append it to the Document object. Switch to the main
-            phase and reprocess the current token. */
-            $html = $this->dom->createElement('html');
-            $this->dom->appendChild($html);
-            $this->stack[] = $html;
-
-            $this->phase = self::MAIN_PHASE;
-            return $this->mainPhase($token);
-        }
-    }
-
-    private function mainPhase($token)
-    {
-        /* Tokens in the main phase must be handled as follows: */
-
-        /* A DOCTYPE token */
-        if ($token['type'] === HTML5::DOCTYPE) {
-            // Parse error. Ignore the token.
-
-            /* A start tag token with the tag name "html" */
-        } elseif ($token['type'] === HTML5::STARTTAG && $token['name'] === 'html') {
-            /* If this start tag token was not the first start tag token, then
-            it is a parse error. */
-
-            /* For each attribute on the token, check to see if the attribute
-            is already present on the top element of the stack of open elements.
-            If it is not, add the attribute and its corresponding value to that
-            element. */
-            foreach ($token['attr'] as $attr) {
-                if (!$this->stack[0]->hasAttribute($attr['name'])) {
-                    $this->stack[0]->setAttribute($attr['name'], $attr['value']);
-                }
-            }
-
-            /* An end-of-file token */
-        } elseif ($token['type'] === HTML5::EOF) {
-            /* Generate implied end tags. */
-            $this->generateImpliedEndTags();
-
-            /* Anything else. */
-        } else {
-            /* Depends on the insertion mode: */
-            switch ($this->mode) {
-                case self::BEFOR_HEAD:
-                    return $this->beforeHead($token);
-                    break;
-                case self::IN_HEAD:
-                    return $this->inHead($token);
-                    break;
-                case self::AFTER_HEAD:
-                    return $this->afterHead($token);
-                    break;
-                case self::IN_BODY:
-                    return $this->inBody($token);
-                    break;
-                case self::IN_TABLE:
-                    return $this->inTable($token);
-                    break;
-                case self::IN_CAPTION:
-                    return $this->inCaption($token);
-                    break;
-                case self::IN_CGROUP:
-                    return $this->inColumnGroup($token);
-                    break;
-                case self::IN_TBODY:
-                    return $this->inTableBody($token);
-                    break;
-                case self::IN_ROW:
-                    return $this->inRow($token);
-                    break;
-                case self::IN_CELL:
-                    return $this->inCell($token);
-                    break;
-                case self::IN_SELECT:
-                    return $this->inSelect($token);
-                    break;
-                case self::AFTER_BODY:
-                    return $this->afterBody($token);
-                    break;
-                case self::IN_FRAME:
-                    return $this->inFrameset($token);
-                    break;
-                case self::AFTR_FRAME:
-                    return $this->afterFrameset($token);
-                    break;
-                case self::END_PHASE:
-                    return $this->trailingEndPhase($token);
-                    break;
-            }
-        }
-    }
-
-    private function beforeHead($token)
-    {
-        /* Handle the token as follows: */
-
-        /* A character token that is one of one of U+0009 CHARACTER TABULATION,
-        U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
-        or U+0020 SPACE */
-        if ($token['type'] === HTML5::CHARACTR &&
-            preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])
-        ) {
-            /* Append the character to the current node. */
-            $this->insertText($token['data']);
-
-            /* A comment token */
-        } elseif ($token['type'] === HTML5::COMMENT) {
-            /* Append a Comment node to the current node with the data attribute
-            set to the data given in the comment token. */
-            $this->insertComment($token['data']);
-
-            /* A start tag token with the tag name "head" */
-        } elseif ($token['type'] === HTML5::STARTTAG && $token['name'] === 'head') {
-            /* Create an element for the token, append the new element to the
-            current node and push it onto the stack of open elements. */
-            $element = $this->insertElement($token);
-
-            /* Set the head element pointer to this new element node. */
-            $this->head_pointer = $element;
-
-            /* Change the insertion mode to "in head". */
-            $this->mode = self::IN_HEAD;
-
-            /* A start tag token whose tag name is one of: "base", "link", "meta",
-            "script", "style", "title". Or an end tag with the tag name "html".
-            Or a character token that is not one of U+0009 CHARACTER TABULATION,
-            U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
-            or U+0020 SPACE. Or any other start tag token */
-        } elseif ($token['type'] === HTML5::STARTTAG ||
-            ($token['type'] === HTML5::ENDTAG && $token['name'] === 'html') ||
-            ($token['type'] === HTML5::CHARACTR && !preg_match(
-                    '/^[\t\n\x0b\x0c ]$/',
-                    $token['data']
-                ))
-        ) {
-            /* Act as if a start tag token with the tag name "head" and no
-            attributes had been seen, then reprocess the current token. */
-            $this->beforeHead(
-                array(
-                    'name' => 'head',
-                    'type' => HTML5::STARTTAG,
-                    'attr' => array()
-                )
-            );
-
-            return $this->inHead($token);
-
-            /* Any other end tag */
-        } elseif ($token['type'] === HTML5::ENDTAG) {
-            /* Parse error. Ignore the token. */
-        }
-    }
-
-    private function inHead($token)
-    {
-        /* Handle the token as follows: */
-
-        /* A character token that is one of one of U+0009 CHARACTER TABULATION,
-        U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
-        or U+0020 SPACE.
-
-        THIS DIFFERS FROM THE SPEC: If the current node is either a title, style
-        or script element, append the character to the current node regardless
-        of its content. */
-        if (($token['type'] === HTML5::CHARACTR &&
-                preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) || (
-                $token['type'] === HTML5::CHARACTR && in_array(
-                    end($this->stack)->nodeName,
-                    array('title', 'style', 'script')
-                ))
-        ) {
-            /* Append the character to the current node. */
-            $this->insertText($token['data']);
-
-            /* A comment token */
-        } elseif ($token['type'] === HTML5::COMMENT) {
-            /* Append a Comment node to the current node with the data attribute
-            set to the data given in the comment token. */
-            $this->insertComment($token['data']);
-
-        } elseif ($token['type'] === HTML5::ENDTAG &&
-            in_array($token['name'], array('title', 'style', 'script'))
-        ) {
-            array_pop($this->stack);
-            return HTML5::PCDATA;
-
-            /* A start tag with the tag name "title" */
-        } elseif ($token['type'] === HTML5::STARTTAG && $token['name'] === 'title') {
-            /* Create an element for the token and append the new element to the
-            node pointed to by the head element pointer, or, if that is null
-            (innerHTML case), to the current node. */
-            if ($this->head_pointer !== null) {
-                $element = $this->insertElement($token, false);
-                $this->head_pointer->appendChild($element);
-
-            } else {
-                $element = $this->insertElement($token);
-            }
-
-            /* Switch the tokeniser's content model flag  to the RCDATA state. */
-            return HTML5::RCDATA;
-
-            /* A start tag with the tag name "style" */
-        } elseif ($token['type'] === HTML5::STARTTAG && $token['name'] === 'style') {
-            /* Create an element for the token and append the new element to the
-            node pointed to by the head element pointer, or, if that is null
-            (innerHTML case), to the current node. */
-            if ($this->head_pointer !== null) {
-                $element = $this->insertElement($token, false);
-                $this->head_pointer->appendChild($element);
-
-            } else {
-                $this->insertElement($token);
-            }
-
-            /* Switch the tokeniser's content model flag  to the CDATA state. */
-            return HTML5::CDATA;
-
-            /* A start tag with the tag name "script" */
-        } elseif ($token['type'] === HTML5::STARTTAG && $token['name'] === 'script') {
-            /* Create an element for the token. */
-            $element = $this->insertElement($token, false);
-            $this->head_pointer->appendChild($element);
-
-            /* Switch the tokeniser's content model flag  to the CDATA state. */
-            return HTML5::CDATA;
-
-            /* A start tag with the tag name "base", "link", or "meta" */
-        } elseif ($token['type'] === HTML5::STARTTAG && in_array(
-                $token['name'],
-                array('base', 'link', 'meta')
-            )
-        ) {
-            /* Create an element for the token and append the new element to the
-            node pointed to by the head element pointer, or, if that is null
-            (innerHTML case), to the current node. */
-            if ($this->head_pointer !== null) {
-                $element = $this->insertElement($token, false);
-                $this->head_pointer->appendChild($element);
-                array_pop($this->stack);
-
-            } else {
-                $this->insertElement($token);
-            }
-
-            /* An end tag with the tag name "head" */
-        } elseif ($token['type'] === HTML5::ENDTAG && $token['name'] === 'head') {
-            /* If the current node is a head element, pop the current node off
-            the stack of open elements. */
-            if ($this->head_pointer->isSameNode(end($this->stack))) {
-                array_pop($this->stack);
-
-                /* Otherwise, this is a parse error. */
-            } else {
-                // k
-            }
-
-            /* Change the insertion mode to "after head". */
-            $this->mode = self::AFTER_HEAD;
-
-            /* A start tag with the tag name "head" or an end tag except "html". */
-        } elseif (($token['type'] === HTML5::STARTTAG && $token['name'] === 'head') ||
-            ($token['type'] === HTML5::ENDTAG && $token['name'] !== 'html')
-        ) {
-            // Parse error. Ignore the token.
-
-            /* Anything else */
-        } else {
-            /* If the current node is a head element, act as if an end tag
-            token with the tag name "head" had been seen. */
-            if ($this->head_pointer->isSameNode(end($this->stack))) {
-                $this->inHead(
-                    array(
-                        'name' => 'head',
-                        'type' => HTML5::ENDTAG
-                    )
-                );
-
-                /* Otherwise, change the insertion mode to "after head". */
-            } else {
-                $this->mode = self::AFTER_HEAD;
-            }
-
-            /* Then, reprocess the current token. */
-            return $this->afterHead($token);
-        }
-    }
-
-    private function afterHead($token)
-    {
-        /* Handle the token as follows: */
-
-        /* A character token that is one of one of U+0009 CHARACTER TABULATION,
-        U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
-        or U+0020 SPACE */
-        if ($token['type'] === HTML5::CHARACTR &&
-            preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])
-        ) {
-            /* Append the character to the current node. */
-            $this->insertText($token['data']);
-
-            /* A comment token */
-        } elseif ($token['type'] === HTML5::COMMENT) {
-            /* Append a Comment node to the current node with the data attribute
-            set to the data given in the comment token. */
-            $this->insertComment($token['data']);
-
-            /* A start tag token with the tag name "body" */
-        } elseif ($token['type'] === HTML5::STARTTAG && $token['name'] === 'body') {
-            /* Insert a body element for the token. */
-            $this->insertElement($token);
-
-            /* Change the insertion mode to "in body". */
-            $this->mode = self::IN_BODY;
-
-            /* A start tag token with the tag name "frameset" */
-        } elseif ($token['type'] === HTML5::STARTTAG && $token['name'] === 'frameset') {
-            /* Insert a frameset element for the token. */
-            $this->insertElement($token);
-
-            /* Change the insertion mode to "in frameset". */
-            $this->mode = self::IN_FRAME;
-
-            /* A start tag token whose tag name is one of: "base", "link", "meta",
-            "script", "style", "title" */
-        } elseif ($token['type'] === HTML5::STARTTAG && in_array(
-                $token['name'],
-                array('base', 'link', 'meta', 'script', 'style', 'title')
-            )
-        ) {
-            /* Parse error. Switch the insertion mode back to "in head" and
-            reprocess the token. */
-            $this->mode = self::IN_HEAD;
-            return $this->inHead($token);
-
-            /* Anything else */
-        } else {
-            /* Act as if a start tag token with the tag name "body" and no
-            attributes had been seen, and then reprocess the current token. */
-            $this->afterHead(
-                array(
-                    'name' => 'body',
-                    'type' => HTML5::STARTTAG,
-                    'attr' => array()
-                )
-            );
-
-            return $this->inBody($token);
-        }
-    }
-
-    private function inBody($token)
-    {
-        /* Handle the token as follows: */
-
-        switch ($token['type']) {
-            /* A character token */
-            case HTML5::CHARACTR:
-                /* Reconstruct the active formatting elements, if any. */
-                $this->reconstructActiveFormattingElements();
-
-                /* Append the token's character to the current node. */
-                $this->insertText($token['data']);
-                break;
-
-            /* A comment token */
-            case HTML5::COMMENT:
-                /* Append a Comment node to the current node with the data
-                attribute set to the data given in the comment token. */
-                $this->insertComment($token['data']);
-                break;
-
-            case HTML5::STARTTAG:
-                switch ($token['name']) {
-                    /* A start tag token whose tag name is one of: "script",
-                    "style" */
-                    case 'script':
-                    case 'style':
-                        /* Process the token as if the insertion mode had been "in
-                        head". */
-                        return $this->inHead($token);
-                        break;
-
-                    /* A start tag token whose tag name is one of: "base", "link",
-                    "meta", "title" */
-                    case 'base':
-                    case 'link':
-                    case 'meta':
-                    case 'title':
-                        /* Parse error. Process the token as if the insertion mode
-                        had    been "in head". */
-                        return $this->inHead($token);
-                        break;
-
-                    /* A start tag token with the tag name "body" */
-                    case 'body':
-                        /* Parse error. If the second element on the stack of open
-                        elements is not a body element, or, if the stack of open
-                        elements has only one node on it, then ignore the token.
-                        (innerHTML case) */
-                        if (count($this->stack) === 1 || $this->stack[1]->nodeName !== 'body') {
-                            // Ignore
-
-                            /* Otherwise, for each attribute on the token, check to see
-                            if the attribute is already present on the body element (the
-                            second element)    on the stack of open elements. If it is not,
-                            add the attribute and its corresponding value to that
-                            element. */
-                        } else {
-                            foreach ($token['attr'] as $attr) {
-                                if (!$this->stack[1]->hasAttribute($attr['name'])) {
-                                    $this->stack[1]->setAttribute($attr['name'], $attr['value']);
-                                }
-                            }
-                        }
-                        break;
-
-                    /* A start tag whose tag name is one of: "address",
-                    "blockquote", "center", "dir", "div", "dl", "fieldset",
-                    "listing", "menu", "ol", "p", "ul" */
-                    case 'address':
-                    case 'blockquote':
-                    case 'center':
-                    case 'dir':
-                    case 'div':
-                    case 'dl':
-                    case 'fieldset':
-                    case 'listing':
-                    case 'menu':
-                    case 'ol':
-                    case 'p':
-                    case 'ul':
-                        /* If the stack of open elements has a p element in scope,
-                        then act as if an end tag with the tag name p had been
-                        seen. */
-                        if ($this->elementInScope('p')) {
-                            $this->emitToken(
-                                array(
-                                    'name' => 'p',
-                                    'type' => HTML5::ENDTAG
-                                )
-                            );
-                        }
-
-                        /* Insert an HTML element for the token. */
-                        $this->insertElement($token);
-                        break;
-
-                    /* A start tag whose tag name is "form" */
-                    case 'form':
-                        /* If the form element pointer is not null, ignore the
-                        token with a parse error. */
-                        if ($this->form_pointer !== null) {
-                            // Ignore.
-
-                            /* Otherwise: */
-                        } else {
-                            /* If the stack of open elements has a p element in
-                            scope, then act as if an end tag with the tag name p
-                            had been seen. */
-                            if ($this->elementInScope('p')) {
-                                $this->emitToken(
-                                    array(
-                                        'name' => 'p',
-                                        'type' => HTML5::ENDTAG
-                                    )
-                                );
-                            }
-
-                            /* Insert an HTML element for the token, and set the
-                            form element pointer to point to the element created. */
-                            $element = $this->insertElement($token);
-                            $this->form_pointer = $element;
-                        }
-                        break;
-
-                    /* A start tag whose tag name is "li", "dd" or "dt" */
-                    case 'li':
-                    case 'dd':
-                    case 'dt':
-                        /* If the stack of open elements has a p  element in scope,
-                        then act as if an end tag with the tag name p had been
-                        seen. */
-                        if ($this->elementInScope('p')) {
-                            $this->emitToken(
-                                array(
-                                    'name' => 'p',
-                                    'type' => HTML5::ENDTAG
-                                )
-                            );
-                        }
-
-                        $stack_length = count($this->stack) - 1;
-
-                        for ($n = $stack_length; 0 <= $n; $n--) {
-                            /* 1. Initialise node to be the current node (the
-                            bottommost node of the stack). */
-                            $stop = false;
-                            $node = $this->stack[$n];
-                            $cat = $this->getElementCategory($node->tagName);
-
-                            /* 2. If node is an li, dd or dt element, then pop all
-                            the    nodes from the current node up to node, including
-                            node, then stop this algorithm. */
-                            if ($token['name'] === $node->tagName || ($token['name'] !== 'li'
-                                    && ($node->tagName === 'dd' || $node->tagName === 'dt'))
-                            ) {
-                                for ($x = $stack_length; $x >= $n; $x--) {
-                                    array_pop($this->stack);
-                                }
-
-                                break;
-                            }
-
-                            /* 3. If node is not in the formatting category, and is
-                            not    in the phrasing category, and is not an address or
-                            div element, then stop this algorithm. */
-                            if ($cat !== self::FORMATTING && $cat !== self::PHRASING &&
-                                $node->tagName !== 'address' && $node->tagName !== 'div'
-                            ) {
-                                break;
-                            }
-                        }
-
-                        /* Finally, insert an HTML element with the same tag
-                        name as the    token's. */
-                        $this->insertElement($token);
-                        break;
-
-                    /* A start tag token whose tag name is "plaintext" */
-                    case 'plaintext':
-                        /* If the stack of open elements has a p  element in scope,
-                        then act as if an end tag with the tag name p had been
-                        seen. */
-                        if ($this->elementInScope('p')) {
-                            $this->emitToken(
-                                array(
-                                    'name' => 'p',
-                                    'type' => HTML5::ENDTAG
-                                )
-                            );
-                        }
-
-                        /* Insert an HTML element for the token. */
-                        $this->insertElement($token);
-
-                        return HTML5::PLAINTEXT;
-                        break;
-
-                    /* A start tag whose tag name is one of: "h1", "h2", "h3", "h4",
-                    "h5", "h6" */
-                    case 'h1':
-                    case 'h2':
-                    case 'h3':
-                    case 'h4':
-                    case 'h5':
-                    case 'h6':
-                        /* If the stack of open elements has a p  element in scope,
-                        then act as if an end tag with the tag name p had been seen. */
-                        if ($this->elementInScope('p')) {
-                            $this->emitToken(
-                                array(
-                                    'name' => 'p',
-                                    'type' => HTML5::ENDTAG
-                                )
-                            );
-                        }
-
-                        /* If the stack of open elements has in scope an element whose
-                        tag name is one of "h1", "h2", "h3", "h4", "h5", or "h6", then
-                        this is a parse error; pop elements from the stack until an
-                        element with one of those tag names has been popped from the
-                        stack. */
-                        while ($this->elementInScope(array('h1', 'h2', 'h3', 'h4', 'h5', 'h6'))) {
-                            array_pop($this->stack);
-                        }
-
-                        /* Insert an HTML element for the token. */
-                        $this->insertElement($token);
-                        break;
-
-                    /* A start tag whose tag name is "a" */
-                    case 'a':
-                        /* If the list of active formatting elements contains
-                        an element whose tag name is "a" between the end of the
-                        list and the last marker on the list (or the start of
-                        the list if there is no marker on the list), then this
-                        is a parse error; act as if an end tag with the tag name
-                        "a" had been seen, then remove that element from the list
-                        of active formatting elements and the stack of open
-                        elements if the end tag didn't already remove it (it
-                        might not have if the element is not in table scope). */
-                        $leng = count($this->a_formatting);
-
-                        for ($n = $leng - 1; $n >= 0; $n--) {
-                            if ($this->a_formatting[$n] === self::MARKER) {
-                                break;
-
-                            } elseif ($this->a_formatting[$n]->nodeName === 'a') {
-                                $this->emitToken(
-                                    array(
-                                        'name' => 'a',
-                                        'type' => HTML5::ENDTAG
-                                    )
-                                );
-                                break;
-                            }
-                        }
-
-                        /* Reconstruct the active formatting elements, if any. */
-                        $this->reconstructActiveFormattingElements();
-
-                        /* Insert an HTML element for the token. */
-                        $el = $this->insertElement($token);
-
-                        /* Add that element to the list of active formatting
-                        elements. */
-                        $this->a_formatting[] = $el;
-                        break;
-
-                    /* A start tag whose tag name is one of: "b", "big", "em", "font",
-                    "i", "nobr", "s", "small", "strike", "strong", "tt", "u" */
-                    case 'b':
-                    case 'big':
-                    case 'em':
-                    case 'font':
-                    case 'i':
-                    case 'nobr':
-                    case 's':
-                    case 'small':
-                    case 'strike':
-                    case 'strong':
-                    case 'tt':
-                    case 'u':
-                        /* Reconstruct the active formatting elements, if any. */
-                        $this->reconstructActiveFormattingElements();
-
-                        /* Insert an HTML element for the token. */
-                        $el = $this->insertElement($token);
-
-                        /* Add that element to the list of active formatting
-                        elements. */
-                        $this->a_formatting[] = $el;
-                        break;
-
-                    /* A start tag token whose tag name is "button" */
-                    case 'button':
-                        /* If the stack of open elements has a button element in scope,
-                        then this is a parse error; act as if an end tag with the tag
-                        name "button" had been seen, then reprocess the token. (We don't
-                        do that. Unnecessary.) */
-                        if ($this->elementInScope('button')) {
-                            $this->inBody(
-                                array(
-                                    'name' => 'button',
-                                    'type' => HTML5::ENDTAG
-                                )
-                            );
-                        }
-
-                        /* Reconstruct the active formatting elements, if any. */
-                        $this->reconstructActiveFormattingElements();
-
-                        /* Insert an HTML element for the token. */
-                        $this->insertElement($token);
-
-                        /* Insert a marker at the end of the list of active
-                        formatting elements. */
-                        $this->a_formatting[] = self::MARKER;
-                        break;
-
-                    /* A start tag token whose tag name is one of: "marquee", "object" */
-                    case 'marquee':
-                    case 'object':
-                        /* Reconstruct the active formatting elements, if any. */
-                        $this->reconstructActiveFormattingElements();
-
-                        /* Insert an HTML element for the token. */
-                        $this->insertElement($token);
-
-                        /* Insert a marker at the end of the list of active
-                        formatting elements. */
-                        $this->a_formatting[] = self::MARKER;
-                        break;
-
-                    /* A start tag token whose tag name is "xmp" */
-                    case 'xmp':
-                        /* Reconstruct the active formatting elements, if any. */
-                        $this->reconstructActiveFormattingElements();
-
-                        /* Insert an HTML element for the token. */
-                        $this->insertElement($token);
-
-                        /* Switch the content model flag to the CDATA state. */
-                        return HTML5::CDATA;
-                        break;
-
-                    /* A start tag whose tag name is "table" */
-                    case 'table':
-                        /* If the stack of open elements has a p element in scope,
-                        then act as if an end tag with the tag name p had been seen. */
-                        if ($this->elementInScope('p')) {
-                            $this->emitToken(
-                                array(
-                                    'name' => 'p',
-                                    'type' => HTML5::ENDTAG
-                                )
-                            );
-                        }
-
-                        /* Insert an HTML element for the token. */
-                        $this->insertElement($token);
-
-                        /* Change the insertion mode to "in table". */
-                        $this->mode = self::IN_TABLE;
-                        break;
-
-                    /* A start tag whose tag name is one of: "area", "basefont",
-                    "bgsound", "br", "embed", "img", "param", "spacer", "wbr" */
-                    case 'area':
-                    case 'basefont':
-                    case 'bgsound':
-                    case 'br':
-                    case 'embed':
-                    case 'img':
-                    case 'param':
-                    case 'spacer':
-                    case 'wbr':
-                        /* Reconstruct the active formatting elements, if any. */
-                        $this->reconstructActiveFormattingElements();
-
-                        /* Insert an HTML element for the token. */
-                        $this->insertElement($token);
-
-                        /* Immediately pop the current node off the stack of open elements. */
-                        array_pop($this->stack);
-                        break;
-
-                    /* A start tag whose tag name is "hr" */
-                    case 'hr':
-                        /* If the stack of open elements has a p element in scope,
-                        then act as if an end tag with the tag name p had been seen. */
-                        if ($this->elementInScope('p')) {
-                            $this->emitToken(
-                                array(
-                                    'name' => 'p',
-                                    'type' => HTML5::ENDTAG
-                                )
-                            );
-                        }
-
-                        /* Insert an HTML element for the token. */
-                        $this->insertElement($token);
-
-                        /* Immediately pop the current node off the stack of open elements. */
-                        array_pop($this->stack);
-                        break;
-
-                    /* A start tag whose tag name is "image" */
-                    case 'image':
-                        /* Parse error. Change the token's tag name to "img" and
-                        reprocess it. (Don't ask.) */
-                        $token['name'] = 'img';
-                        return $this->inBody($token);
-                        break;
-
-                    /* A start tag whose tag name is "input" */
-                    case 'input':
-                        /* Reconstruct the active formatting elements, if any. */
-                        $this->reconstructActiveFormattingElements();
-
-                        /* Insert an input element for the token. */
-                        $element = $this->insertElement($token, false);
-
-                        /* If the form element pointer is not null, then associate the
-                        input element with the form element pointed to by the form
-                        element pointer. */
-                        $this->form_pointer !== null
-                            ? $this->form_pointer->appendChild($element)
-                            : end($this->stack)->appendChild($element);
-
-                        /* Pop that input element off the stack of open elements. */
-                        array_pop($this->stack);
-                        break;
-
-                    /* A start tag whose tag name is "isindex" */
-                    case 'isindex':
-                        /* Parse error. */
-                        // w/e
-
-                        /* If the form element pointer is not null,
-                        then ignore the token. */
-                        if ($this->form_pointer === null) {
-                            /* Act as if a start tag token with the tag name "form" had
-                            been seen. */
-                            $this->inBody(
-                                array(
-                                    'name' => 'body',
-                                    'type' => HTML5::STARTTAG,
-                                    'attr' => array()
-                                )
-                            );
-
-                            /* Act as if a start tag token with the tag name "hr" had
-                            been seen. */
-                            $this->inBody(
-                                array(
-                                    'name' => 'hr',
-                                    'type' => HTML5::STARTTAG,
-                                    'attr' => array()
-                                )
-                            );
-
-                            /* Act as if a start tag token with the tag name "p" had
-                            been seen. */
-                            $this->inBody(
-                                array(
-                                    'name' => 'p',
-                                    'type' => HTML5::STARTTAG,
-                                    'attr' => array()
-                                )
-                            );
-
-                            /* Act as if a start tag token with the tag name "label"
-                            had been seen. */
-                            $this->inBody(
-                                array(
-                                    'name' => 'label',
-                                    'type' => HTML5::STARTTAG,
-                                    'attr' => array()
-                                )
-                            );
-
-                            /* Act as if a stream of character tokens had been seen. */
-                            $this->insertText(
-                                'This is a searchable index. ' .
-                                'Insert your search keywords here: '
-                            );
-
-                            /* Act as if a start tag token with the tag name "input"
-                            had been seen, with all the attributes from the "isindex"
-                            token, except with the "name" attribute set to the value
-                            "isindex" (ignoring any explicit "name" attribute). */
-                            $attr = $token['attr'];
-                            $attr[] = array('name' => 'name', 'value' => 'isindex');
-
-                            $this->inBody(
-                                array(
-                                    'name' => 'input',
-                                    'type' => HTML5::STARTTAG,
-                                    'attr' => $attr
-                                )
-                            );
-
-                            /* Act as if a stream of character tokens had been seen
-                            (see below for what they should say). */
-                            $this->insertText(
-                                'This is a searchable index. ' .
-                                'Insert your search keywords here: '
-                            );
-
-                            /* Act as if an end tag token with the tag name "label"
-                            had been seen. */
-                            $this->inBody(
-                                array(
-                                    'name' => 'label',
-                                    'type' => HTML5::ENDTAG
-                                )
-                            );
-
-                            /* Act as if an end tag token with the tag name "p" had
-                            been seen. */
-                            $this->inBody(
-                                array(
-                                    'name' => 'p',
-                                    'type' => HTML5::ENDTAG
-                                )
-                            );
-
-                            /* Act as if a start tag token with the tag name "hr" had
-                            been seen. */
-                            $this->inBody(
-                                array(
-                                    'name' => 'hr',
-                                    'type' => HTML5::ENDTAG
-                                )
-                            );
-
-                            /* Act as if an end tag token with the tag name "form" had
-                            been seen. */
-                            $this->inBody(
-                                array(
-                                    'name' => 'form',
-                                    'type' => HTML5::ENDTAG
-                                )
-                            );
-                        }
-                        break;
-
-                    /* A start tag whose tag name is "textarea" */
-                    case 'textarea':
-                        $this->insertElement($token);
-
-                        /* Switch the tokeniser's content model flag to the
-                        RCDATA state. */
-                        return HTML5::RCDATA;
-                        break;
-
-                    /* A start tag whose tag name is one of: "iframe", "noembed",
-                    "noframes" */
-                    case 'iframe':
-                    case 'noembed':
-                    case 'noframes':
-                        $this->insertElement($token);
-
-                        /* Switch the tokeniser's content model flag to the CDATA state. */
-                        return HTML5::CDATA;
-                        break;
-
-                    /* A start tag whose tag name is "select" */
-                    case 'select':
-                        /* Reconstruct the active formatting elements, if any. */
-                        $this->reconstructActiveFormattingElements();
-
-                        /* Insert an HTML element for the token. */
-                        $this->insertElement($token);
-
-                        /* Change the insertion mode to "in select". */
-                        $this->mode = self::IN_SELECT;
-                        break;
-
-                    /* A start or end tag whose tag name is one of: "caption", "col",
-                    "colgroup", "frame", "frameset", "head", "option", "optgroup",
-                    "tbody", "td", "tfoot", "th", "thead", "tr". */
-                    case 'caption':
-                    case 'col':
-                    case 'colgroup':
-                    case 'frame':
-                    case 'frameset':
-                    case 'head':
-                    case 'option':
-                    case 'optgroup':
-                    case 'tbody':
-                    case 'td':
-                    case 'tfoot':
-                    case 'th':
-                    case 'thead':
-                    case 'tr':
-                        // Parse error. Ignore the token.
-                        break;
-
-                    /* A start or end tag whose tag name is one of: "event-source",
-                    "section", "nav", "article", "aside", "header", "footer",
-                    "datagrid", "command" */
-                    case 'event-source':
-                    case 'section':
-                    case 'nav':
-                    case 'article':
-                    case 'aside':
-                    case 'header':
-                    case 'footer':
-                    case 'datagrid':
-                    case 'command':
-                        // Work in progress!
-                        break;
-
-                    /* A start tag token not covered by the previous entries */
-                    default:
-                        /* Reconstruct the active formatting elements, if any. */
-                        $this->reconstructActiveFormattingElements();
-
-                        $this->insertElement($token, true, true);
-                        break;
-                }
-                break;
-
-            case HTML5::ENDTAG:
-                switch ($token['name']) {
-                    /* An end tag with the tag name "body" */
-                    case 'body':
-                        /* If the second element in the stack of open elements is
-                        not a body element, this is a parse error. Ignore the token.
-                        (innerHTML case) */
-                        if (count($this->stack) < 2 || $this->stack[1]->nodeName !== 'body') {
-                            // Ignore.
-
-                            /* If the current node is not the body element, then this
-                            is a parse error. */
-                        } elseif (end($this->stack)->nodeName !== 'body') {
-                            // Parse error.
-                        }
-
-                        /* Change the insertion mode to "after body". */
-                        $this->mode = self::AFTER_BODY;
-                        break;
-
-                    /* An end tag with the tag name "html" */
-                    case 'html':
-                        /* Act as if an end tag with tag name "body" had been seen,
-                        then, if that token wasn't ignored, reprocess the current
-                        token. */
-                        $this->inBody(
-                            array(
-                                'name' => 'body',
-                                'type' => HTML5::ENDTAG
-                            )
-                        );
-
-                        return $this->afterBody($token);
-                        break;
-
-                    /* An end tag whose tag name is one of: "address", "blockquote",
-                    "center", "dir", "div", "dl", "fieldset", "listing", "menu",
-                    "ol", "pre", "ul" */
-                    case 'address':
-                    case 'blockquote':
-                    case 'center':
-                    case 'dir':
-                    case 'div':
-                    case 'dl':
-                    case 'fieldset':
-                    case 'listing':
-                    case 'menu':
-                    case 'ol':
-                    case 'pre':
-                    case 'ul':
-                        /* If the stack of open elements has an element in scope
-                        with the same tag name as that of the token, then generate
-                        implied end tags. */
-                        if ($this->elementInScope($token['name'])) {
-                            $this->generateImpliedEndTags();
-
-                            /* Now, if the current node is not an element with
-                            the same tag name as that of the token, then this
-                            is a parse error. */
-                            // w/e
-
-                            /* If the stack of open elements has an element in
-                            scope with the same tag name as that of the token,
-                            then pop elements from this stack until an element
-                            with that tag name has been popped from the stack. */
-                            for ($n = count($this->stack) - 1; $n >= 0; $n--) {
-                                if ($this->stack[$n]->nodeName === $token['name']) {
-                                    $n = -1;
-                                }
-
-                                array_pop($this->stack);
-                            }
-                        }
-                        break;
-
-                    /* An end tag whose tag name is "form" */
-                    case 'form':
-                        /* If the stack of open elements has an element in scope
-                        with the same tag name as that of the token, then generate
-                        implied    end tags. */
-                        if ($this->elementInScope($token['name'])) {
-                            $this->generateImpliedEndTags();
-
-                        }
-
-                        if (end($this->stack)->nodeName !== $token['name']) {
-                            /* Now, if the current node is not an element with the
-                            same tag name as that of the token, then this is a parse
-                            error. */
-                            // w/e
-
-                        } else {
-                            /* Otherwise, if the current node is an element with
-                            the same tag name as that of the token pop that element
-                            from the stack. */
-                            array_pop($this->stack);
-                        }
-
-                        /* In any case, set the form element pointer to null. */
-                        $this->form_pointer = null;
-                        break;
-
-                    /* An end tag whose tag name is "p" */
-                    case 'p':
-                        /* If the stack of open elements has a p element in scope,
-                        then generate implied end tags, except for p elements. */
-                        if ($this->elementInScope('p')) {
-                            $this->generateImpliedEndTags(array('p'));
-
-                            /* If the current node is not a p element, then this is
-                            a parse error. */
-                            // k
-
-                            /* If the stack of open elements has a p element in
-                            scope, then pop elements from this stack until the stack
-                            no longer has a p element in scope. */
-                            for ($n = count($this->stack) - 1; $n >= 0; $n--) {
-                                if ($this->elementInScope('p')) {
-                                    array_pop($this->stack);
-
-                                } else {
-                                    break;
-                                }
-                            }
-                        }
-                        break;
-
-                    /* An end tag whose tag name is "dd", "dt", or "li" */
-                    case 'dd':
-                    case 'dt':
-                    case 'li':
-                        /* If the stack of open elements has an element in scope
-                        whose tag name matches the tag name of the token, then
-                        generate implied end tags, except for elements with the
-                        same tag name as the token. */
-                        if ($this->elementInScope($token['name'])) {
-                            $this->generateImpliedEndTags(array($token['name']));
-
-                            /* If the current node is not an element with the same
-                            tag name as the token, then this is a parse error. */
-                            // w/e
-
-                            /* If the stack of open elements has an element in scope
-                            whose tag name matches the tag name of the token, then
-                            pop elements from this stack until an element with that
-                            tag name has been popped from the stack. */
-                            for ($n = count($this->stack) - 1; $n >= 0; $n--) {
-                                if ($this->stack[$n]->nodeName === $token['name']) {
-                                    $n = -1;
-                                }
-
-                                array_pop($this->stack);
-                            }
-                        }
-                        break;
-
-                    /* An end tag whose tag name is one of: "h1", "h2", "h3", "h4",
-                    "h5", "h6" */
-                    case 'h1':
-                    case 'h2':
-                    case 'h3':
-                    case 'h4':
-                    case 'h5':
-                    case 'h6':
-                        $elements = array('h1', 'h2', 'h3', 'h4', 'h5', 'h6');
-
-                        /* If the stack of open elements has in scope an element whose
-                        tag name is one of "h1", "h2", "h3", "h4", "h5", or "h6", then
-                        generate implied end tags. */
-                        if ($this->elementInScope($elements)) {
-                            $this->generateImpliedEndTags();
-
-                            /* Now, if the current node is not an element with the same
-                            tag name as that of the token, then this is a parse error. */
-                            // w/e
-
-                            /* If the stack of open elements has in scope an element
-                            whose tag name is one of "h1", "h2", "h3", "h4", "h5", or
-                            "h6", then pop elements from the stack until an element
-                            with one of those tag names has been popped from the stack. */
-                            while ($this->elementInScope($elements)) {
-                                array_pop($this->stack);
-                            }
-                        }
-                        break;
-
-                    /* An end tag whose tag name is one of: "a", "b", "big", "em",
-                    "font", "i", "nobr", "s", "small", "strike", "strong", "tt", "u" */
-                    case 'a':
-                    case 'b':
-                    case 'big':
-                    case 'em':
-                    case 'font':
-                    case 'i':
-                    case 'nobr':
-                    case 's':
-                    case 'small':
-                    case 'strike':
-                    case 'strong':
-                    case 'tt':
-                    case 'u':
-                        /* 1. Let the formatting element be the last element in
-                        the list of active formatting elements that:
-                            * is between the end of the list and the last scope
-                            marker in the list, if any, or the start of the list
-                            otherwise, and
-                            * has the same tag name as the token.
-                        */
-                        while (true) {
-                            for ($a = count($this->a_formatting) - 1; $a >= 0; $a--) {
-                                if ($this->a_formatting[$a] === self::MARKER) {
-                                    break;
-
-                                } elseif ($this->a_formatting[$a]->tagName === $token['name']) {
-                                    $formatting_element = $this->a_formatting[$a];
-                                    $in_stack = in_array($formatting_element, $this->stack, true);
-                                    $fe_af_pos = $a;
-                                    break;
-                                }
-                            }
-
-                            /* If there is no such node, or, if that node is
-                            also in the stack of open elements but the element
-                            is not in scope, then this is a parse error. Abort
-                            these steps. The token is ignored. */
-                            if (!isset($formatting_element) || ($in_stack &&
-                                    !$this->elementInScope($token['name']))
-                            ) {
-                                break;
-
-                                /* Otherwise, if there is such a node, but that node
-                                is not in the stack of open elements, then this is a
-                                parse error; remove the element from the list, and
-                                abort these steps. */
-                            } elseif (isset($formatting_element) && !$in_stack) {
-                                unset($this->a_formatting[$fe_af_pos]);
-                                $this->a_formatting = array_merge($this->a_formatting);
-                                break;
-                            }
-
-                            /* 2. Let the furthest block be the topmost node in the
-                            stack of open elements that is lower in the stack
-                            than the formatting element, and is not an element in
-                            the phrasing or formatting categories. There might
-                            not be one. */
-                            $fe_s_pos = array_search($formatting_element, $this->stack, true);
-                            $length = count($this->stack);
-
-                            for ($s = $fe_s_pos + 1; $s < $length; $s++) {
-                                $category = $this->getElementCategory($this->stack[$s]->nodeName);
-
-                                if ($category !== self::PHRASING && $category !== self::FORMATTING) {
-                                    $furthest_block = $this->stack[$s];
-                                }
-                            }
-
-                            /* 3. If there is no furthest block, then the UA must
-                            skip the subsequent steps and instead just pop all
-                            the nodes from the bottom of the stack of open
-                            elements, from the current node up to the formatting
-                            element, and remove the formatting element from the
-                            list of active formatting elements. */
-                            if (!isset($furthest_block)) {
-                                for ($n = $length - 1; $n >= $fe_s_pos; $n--) {
-                                    array_pop($this->stack);
-                                }
-
-                                unset($this->a_formatting[$fe_af_pos]);
-                                $this->a_formatting = array_merge($this->a_formatting);
-                                break;
-                            }
-
-                            /* 4. Let the common ancestor be the element
-                            immediately above the formatting element in the stack
-                            of open elements. */
-                            $common_ancestor = $this->stack[$fe_s_pos - 1];
-
-                            /* 5. If the furthest block has a parent node, then
-                            remove the furthest block from its parent node. */
-                            if ($furthest_block->parentNode !== null) {
-                                $furthest_block->parentNode->removeChild($furthest_block);
-                            }
-
-                            /* 6. Let a bookmark note the position of the
-                            formatting element in the list of active formatting
-                            elements relative to the elements on either side
-                            of it in the list. */
-                            $bookmark = $fe_af_pos;
-
-                            /* 7. Let node and last node  be the furthest block.
-                            Follow these steps: */
-                            $node = $furthest_block;
-                            $last_node = $furthest_block;
-
-                            while (true) {
-                                for ($n = array_search($node, $this->stack, true) - 1; $n >= 0; $n--) {
-                                    /* 7.1 Let node be the element immediately
-                                    prior to node in the stack of open elements. */
-                                    $node = $this->stack[$n];
-
-                                    /* 7.2 If node is not in the list of active
-                                    formatting elements, then remove node from
-                                    the stack of open elements and then go back
-                                    to step 1. */
-                                    if (!in_array($node, $this->a_formatting, true)) {
-                                        unset($this->stack[$n]);
-                                        $this->stack = array_merge($this->stack);
-
-                                    } else {
-                                        break;
-                                    }
-                                }
-
-                                /* 7.3 Otherwise, if node is the formatting
-                                element, then go to the next step in the overall
-                                algorithm. */
-                                if ($node === $formatting_element) {
-                                    break;
-
-                                    /* 7.4 Otherwise, if last node is the furthest
-                                    block, then move the aforementioned bookmark to
-                                    be immediately after the node in the list of
-                                    active formatting elements. */
-                                } elseif ($last_node === $furthest_block) {
-                                    $bookmark = array_search($node, $this->a_formatting, true) + 1;
-                                }
-
-                                /* 7.5 If node has any children, perform a
-                                shallow clone of node, replace the entry for
-                                node in the list of active formatting elements
-                                with an entry for the clone, replace the entry
-                                for node in the stack of open elements with an
-                                entry for the clone, and let node be the clone. */
-                                if ($node->hasChildNodes()) {
-                                    $clone = $node->cloneNode();
-                                    $s_pos = array_search($node, $this->stack, true);
-                                    $a_pos = array_search($node, $this->a_formatting, true);
-
-                                    $this->stack[$s_pos] = $clone;
-                                    $this->a_formatting[$a_pos] = $clone;
-                                    $node = $clone;
-                                }
-
-                                /* 7.6 Insert last node into node, first removing
-                                it from its previous parent node if any. */
-                                if ($last_node->parentNode !== null) {
-                                    $last_node->parentNode->removeChild($last_node);
-                                }
-
-                                $node->appendChild($last_node);
-
-                                /* 7.7 Let last node be node. */
-                                $last_node = $node;
-                            }
-
-                            /* 8. Insert whatever last node ended up being in
-                            the previous step into the common ancestor node,
-                            first removing it from its previous parent node if
-                            any. */
-                            if ($last_node->parentNode !== null) {
-                                $last_node->parentNode->removeChild($last_node);
-                            }
-
-                            $common_ancestor->appendChild($last_node);
-
-                            /* 9. Perform a shallow clone of the formatting
-                            element. */
-                            $clone = $formatting_element->cloneNode();
-
-                            /* 10. Take all of the child nodes of the furthest
-                            block and append them to the clone created in the
-                            last step. */
-                            while ($furthest_block->hasChildNodes()) {
-                                $child = $furthest_block->firstChild;
-                                $furthest_block->removeChild($child);
-                                $clone->appendChild($child);
-                            }
-
-                            /* 11. Append that clone to the furthest block. */
-                            $furthest_block->appendChild($clone);
-
-                            /* 12. Remove the formatting element from the list
-                            of active formatting elements, and insert the clone
-                            into the list of active formatting elements at the
-                            position of the aforementioned bookmark. */
-                            $fe_af_pos = array_search($formatting_element, $this->a_formatting, true);
-                            unset($this->a_formatting[$fe_af_pos]);
-                            $this->a_formatting = array_merge($this->a_formatting);
-
-                            $af_part1 = array_slice($this->a_formatting, 0, $bookmark - 1);
-                            $af_part2 = array_slice($this->a_formatting, $bookmark, count($this->a_formatting));
-                            $this->a_formatting = array_merge($af_part1, array($clone), $af_part2);
-
-                            /* 13. Remove the formatting element from the stack
-                            of open elements, and insert the clone into the stack
-                            of open elements immediately after (i.e. in a more
-                            deeply nested position than) the position of the
-                            furthest block in that stack. */
-                            $fe_s_pos = array_search($formatting_element, $this->stack, true);
-                            $fb_s_pos = array_search($furthest_block, $this->stack, true);
-                            unset($this->stack[$fe_s_pos]);
-
-                            $s_part1 = array_slice($this->stack, 0, $fb_s_pos);
-                            $s_part2 = array_slice($this->stack, $fb_s_pos + 1, count($this->stack));
-                            $this->stack = array_merge($s_part1, array($clone), $s_part2);
-
-                            /* 14. Jump back to step 1 in this series of steps. */
-                            unset($formatting_element, $fe_af_pos, $fe_s_pos, $furthest_block);
-                        }
-                        break;
-
-                    /* An end tag token whose tag name is one of: "button",
-                    "marquee", "object" */
-                    case 'button':
-                    case 'marquee':
-                    case 'object':
-                        /* If the stack of open elements has an element in scope whose
-                        tag name matches the tag name of the token, then generate implied
-                        tags. */
-                        if ($this->elementInScope($token['name'])) {
-                            $this->generateImpliedEndTags();
-
-                            /* Now, if the current node is not an element with the same
-                            tag name as the token, then this is a parse error. */
-                            // k
-
-                            /* Now, if the stack of open elements has an element in scope
-                            whose tag name matches the tag name of the token, then pop
-                            elements from the stack until that element has been popped from
-                            the stack, and clear the list of active formatting elements up
-                            to the last marker. */
-                            for ($n = count($this->stack) - 1; $n >= 0; $n--) {
-                                if ($this->stack[$n]->nodeName === $token['name']) {
-                                    $n = -1;
-                                }
-
-                                array_pop($this->stack);
-                            }
-
-                            $marker = end(array_keys($this->a_formatting, self::MARKER, true));
-
-                            for ($n = count($this->a_formatting) - 1; $n > $marker; $n--) {
-                                array_pop($this->a_formatting);
-                            }
-                        }
-                        break;
-
-                    /* Or an end tag whose tag name is one of: "area", "basefont",
-                    "bgsound", "br", "embed", "hr", "iframe", "image", "img",
-                    "input", "isindex", "noembed", "noframes", "param", "select",
-                    "spacer", "table", "textarea", "wbr" */
-                    case 'area':
-                    case 'basefont':
-                    case 'bgsound':
-                    case 'br':
-                    case 'embed':
-                    case 'hr':
-                    case 'iframe':
-                    case 'image':
-                    case 'img':
-                    case 'input':
-                    case 'isindex':
-                    case 'noembed':
-                    case 'noframes':
-                    case 'param':
-                    case 'select':
-                    case 'spacer':
-                    case 'table':
-                    case 'textarea':
-                    case 'wbr':
-                        // Parse error. Ignore the token.
-                        break;
-
-                    /* An end tag token not covered by the previous entries */
-                    default:
-                        for ($n = count($this->stack) - 1; $n >= 0; $n--) {
-                            /* Initialise node to be the current node (the bottommost
-                            node of the stack). */
-                            $node = end($this->stack);
-
-                            /* If node has the same tag name as the end tag token,
-                            then: */
-                            if ($token['name'] === $node->nodeName) {
-                                /* Generate implied end tags. */
-                                $this->generateImpliedEndTags();
-
-                                /* If the tag name of the end tag token does not
-                                match the tag name of the current node, this is a
-                                parse error. */
-                                // k
-
-                                /* Pop all the nodes from the current node up to
-                                node, including node, then stop this algorithm. */
-                                for ($x = count($this->stack) - $n; $x >= $n; $x--) {
-                                    array_pop($this->stack);
-                                }
-
-                            } else {
-                                $category = $this->getElementCategory($node);
-
-                                if ($category !== self::SPECIAL && $category !== self::SCOPING) {
-                                    /* Otherwise, if node is in neither the formatting
-                                    category nor the phrasing category, then this is a
-                                    parse error. Stop this algorithm. The end tag token
-                                    is ignored. */
-                                    return false;
-                                }
-                            }
-                        }
-                        break;
-                }
-                break;
-        }
-    }
-
-    private function inTable($token)
-    {
-        $clear = array('html', 'table');
-
-        /* A character token that is one of one of U+0009 CHARACTER TABULATION,
-        U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
-        or U+0020 SPACE */
-        if ($token['type'] === HTML5::CHARACTR &&
-            preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])
-        ) {
-            /* Append the character to the current node. */
-            $text = $this->dom->createTextNode($token['data']);
-            end($this->stack)->appendChild($text);
-
-            /* A comment token */
-        } elseif ($token['type'] === HTML5::COMMENT) {
-            /* Append a Comment node to the current node with the data
-            attribute set to the data given in the comment token. */
-            $comment = $this->dom->createComment($token['data']);
-            end($this->stack)->appendChild($comment);
-
-            /* A start tag whose tag name is "caption" */
-        } elseif ($token['type'] === HTML5::STARTTAG &&
-            $token['name'] === 'caption'
-        ) {
-            /* Clear the stack back to a table context. */
-            $this->clearStackToTableContext($clear);
-
-            /* Insert a marker at the end of the list of active
-            formatting elements. */
-            $this->a_formatting[] = self::MARKER;
-
-            /* Insert an HTML element for the token, then switch the
-            insertion mode to "in caption". */
-            $this->insertElement($token);
-            $this->mode = self::IN_CAPTION;
-
-            /* A start tag whose tag name is "colgroup" */
-        } elseif ($token['type'] === HTML5::STARTTAG &&
-            $token['name'] === 'colgroup'
-        ) {
-            /* Clear the stack back to a table context. */
-            $this->clearStackToTableContext($clear);
-
-            /* Insert an HTML element for the token, then switch the
-            insertion mode to "in column group". */
-            $this->insertElement($token);
-            $this->mode = self::IN_CGROUP;
-
-            /* A start tag whose tag name is "col" */
-        } elseif ($token['type'] === HTML5::STARTTAG &&
-            $token['name'] === 'col'
-        ) {
-            $this->inTable(
-                array(
-                    'name' => 'colgroup',
-                    'type' => HTML5::STARTTAG,
-                    'attr' => array()
-                )
-            );
-
-            $this->inColumnGroup($token);
-
-            /* A start tag whose tag name is one of: "tbody", "tfoot", "thead" */
-        } elseif ($token['type'] === HTML5::STARTTAG && in_array(
-                $token['name'],
-                array('tbody', 'tfoot', 'thead')
-            )
-        ) {
-            /* Clear the stack back to a table context. */
-            $this->clearStackToTableContext($clear);
-
-            /* Insert an HTML element for the token, then switch the insertion
-            mode to "in table body". */
-            $this->insertElement($token);
-            $this->mode = self::IN_TBODY;
-
-            /* A start tag whose tag name is one of: "td", "th", "tr" */
-        } elseif ($token['type'] === HTML5::STARTTAG &&
-            in_array($token['name'], array('td', 'th', 'tr'))
-        ) {
-            /* Act as if a start tag token with the tag name "tbody" had been
-            seen, then reprocess the current token. */
-            $this->inTable(
-                array(
-                    'name' => 'tbody',
-                    'type' => HTML5::STARTTAG,
-                    'attr' => array()
-                )
-            );
-
-            return $this->inTableBody($token);
-
-            /* A start tag whose tag name is "table" */
-        } elseif ($token['type'] === HTML5::STARTTAG &&
-            $token['name'] === 'table'
-        ) {
-            /* Parse error. Act as if an end tag token with the tag name "table"
-            had been seen, then, if that token wasn't ignored, reprocess the
-            current token. */
-            $this->inTable(
-                array(
-                    'name' => 'table',
-                    'type' => HTML5::ENDTAG
-                )
-            );
-
-            return $this->mainPhase($token);
-
-            /* An end tag whose tag name is "table" */
-        } elseif ($token['type'] === HTML5::ENDTAG &&
-            $token['name'] === 'table'
-        ) {
-            /* If the stack of open elements does not have an element in table
-            scope with the same tag name as the token, this is a parse error.
-            Ignore the token. (innerHTML case) */
-            if (!$this->elementInScope($token['name'], true)) {
-                return false;
-
-                /* Otherwise: */
-            } else {
-                /* Generate implied end tags. */
-                $this->generateImpliedEndTags();
-
-                /* Now, if the current node is not a table element, then this
-                is a parse error. */
-                // w/e
-
-                /* Pop elements from this stack until a table element has been
-                popped from the stack. */
-                while (true) {
-                    $current = end($this->stack)->nodeName;
-                    array_pop($this->stack);
-
-                    if ($current === 'table') {
-                        break;
-                    }
-                }
-
-                /* Reset the insertion mode appropriately. */
-                $this->resetInsertionMode();
-            }
-
-            /* An end tag whose tag name is one of: "body", "caption", "col",
-            "colgroup", "html", "tbody", "td", "tfoot", "th", "thead", "tr" */
-        } elseif ($token['type'] === HTML5::ENDTAG && in_array(
-                $token['name'],
-                array(
-                    'body',
-                    'caption',
-                    'col',
-                    'colgroup',
-                    'html',
-                    'tbody',
-                    'td',
-                    'tfoot',
-                    'th',
-                    'thead',
-                    'tr'
-                )
-            )
-        ) {
-            // Parse error. Ignore the token.
-
-            /* Anything else */
-        } else {
-            /* Parse error. Process the token as if the insertion mode was "in
-            body", with the following exception: */
-
-            /* If the current node is a table, tbody, tfoot, thead, or tr
-            element, then, whenever a node would be inserted into the current
-            node, it must instead be inserted into the foster parent element. */
-            if (in_array(
-                end($this->stack)->nodeName,
-                array('table', 'tbody', 'tfoot', 'thead', 'tr')
-            )
-            ) {
-                /* The foster parent element is the parent element of the last
-                table element in the stack of open elements, if there is a
-                table element and it has such a parent element. If there is no
-                table element in the stack of open elements (innerHTML case),
-                then the foster parent element is the first element in the
-                stack of open elements (the html  element). Otherwise, if there
-                is a table element in the stack of open elements, but the last
-                table element in the stack of open elements has no parent, or
-                its parent node is not an element, then the foster parent
-                element is the element before the last table element in the
-                stack of open elements. */
-                for ($n = count($this->stack) - 1; $n >= 0; $n--) {
-                    if ($this->stack[$n]->nodeName === 'table') {
-                        $table = $this->stack[$n];
-                        break;
-                    }
-                }
-
-                if (isset($table) && $table->parentNode !== null) {
-                    $this->foster_parent = $table->parentNode;
-
-                } elseif (!isset($table)) {
-                    $this->foster_parent = $this->stack[0];
-
-                } elseif (isset($table) && ($table->parentNode === null ||
-                        $table->parentNode->nodeType !== XML_ELEMENT_NODE)
-                ) {
-                    $this->foster_parent = $this->stack[$n - 1];
-                }
-            }
-
-            $this->inBody($token);
-        }
-    }
-
-    private function inCaption($token)
-    {
-        /* An end tag whose tag name is "caption" */
-        if ($token['type'] === HTML5::ENDTAG && $token['name'] === 'caption') {
-            /* If the stack of open elements does not have an element in table
-            scope with the same tag name as the token, this is a parse error.
-            Ignore the token. (innerHTML case) */
-            if (!$this->elementInScope($token['name'], true)) {
-                // Ignore
-
-                /* Otherwise: */
-            } else {
-                /* Generate implied end tags. */
-                $this->generateImpliedEndTags();
-
-                /* Now, if the current node is not a caption element, then this
-                is a parse error. */
-                // w/e
-
-                /* Pop elements from this stack until a caption element has
-                been popped from the stack. */
-                while (true) {
-                    $node = end($this->stack)->nodeName;
-                    array_pop($this->stack);
-
-                    if ($node === 'caption') {
-                        break;
-                    }
-                }
-
-                /* Clear the list of active formatting elements up to the last
-                marker. */
-                $this->clearTheActiveFormattingElementsUpToTheLastMarker();
-
-                /* Switch the insertion mode to "in table". */
-                $this->mode = self::IN_TABLE;
-            }
-
-            /* A start tag whose tag name is one of: "caption", "col", "colgroup",
-            "tbody", "td", "tfoot", "th", "thead", "tr", or an end tag whose tag
-            name is "table" */
-        } elseif (($token['type'] === HTML5::STARTTAG && in_array(
-                    $token['name'],
-                    array(
-                        'caption',
-                        'col',
-                        'colgroup',
-                        'tbody',
-                        'td',
-                        'tfoot',
-                        'th',
-                        'thead',
-                        'tr'
-                    )
-                )) || ($token['type'] === HTML5::ENDTAG &&
-                $token['name'] === 'table')
-        ) {
-            /* Parse error. Act as if an end tag with the tag name "caption"
-            had been seen, then, if that token wasn't ignored, reprocess the
-            current token. */
-            $this->inCaption(
-                array(
-                    'name' => 'caption',
-                    'type' => HTML5::ENDTAG
-                )
-            );
-
-            return $this->inTable($token);
-
-            /* An end tag whose tag name is one of: "body", "col", "colgroup",
-            "html", "tbody", "td", "tfoot", "th", "thead", "tr" */
-        } elseif ($token['type'] === HTML5::ENDTAG && in_array(
-                $token['name'],
-                array(
-                    'body',
-                    'col',
-                    'colgroup',
-                    'html',
-                    'tbody',
-                    'tfoot',
-                    'th',
-                    'thead',
-                    'tr'
-                )
-            )
-        ) {
-            // Parse error. Ignore the token.
-
-            /* Anything else */
-        } else {
-            /* Process the token as if the insertion mode was "in body". */
-            $this->inBody($token);
-        }
-    }
-
-    private function inColumnGroup($token)
-    {
-        /* A character token that is one of one of U+0009 CHARACTER TABULATION,
-        U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
-        or U+0020 SPACE */
-        if ($token['type'] === HTML5::CHARACTR &&
-            preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])
-        ) {
-            /* Append the character to the current node. */
-            $text = $this->dom->createTextNode($token['data']);
-            end($this->stack)->appendChild($text);
-
-            /* A comment token */
-        } elseif ($token['type'] === HTML5::COMMENT) {
-            /* Append a Comment node to the current node with the data
-            attribute set to the data given in the comment token. */
-            $comment = $this->dom->createComment($token['data']);
-            end($this->stack)->appendChild($comment);
-
-            /* A start tag whose tag name is "col" */
-        } elseif ($token['type'] === HTML5::STARTTAG && $token['name'] === 'col') {
-            /* Insert a col element for the token. Immediately pop the current
-            node off the stack of open elements. */
-            $this->insertElement($token);
-            array_pop($this->stack);
-
-            /* An end tag whose tag name is "colgroup" */
-        } elseif ($token['type'] === HTML5::ENDTAG &&
-            $token['name'] === 'colgroup'
-        ) {
-            /* If the current node is the root html element, then this is a
-            parse error, ignore the token. (innerHTML case) */
-            if (end($this->stack)->nodeName === 'html') {
-                // Ignore
-
-                /* Otherwise, pop the current node (which will be a colgroup
-                element) from the stack of open elements. Switch the insertion
-                mode to "in table". */
-            } else {
-                array_pop($this->stack);
-                $this->mode = self::IN_TABLE;
-            }
-
-            /* An end tag whose tag name is "col" */
-        } elseif ($token['type'] === HTML5::ENDTAG && $token['name'] === 'col') {
-            /* Parse error. Ignore the token. */
-
-            /* Anything else */
-        } else {
-            /* Act as if an end tag with the tag name "colgroup" had been seen,
-            and then, if that token wasn't ignored, reprocess the current token. */
-            $this->inColumnGroup(
-                array(
-                    'name' => 'colgroup',
-                    'type' => HTML5::ENDTAG
-                )
-            );
-
-            return $this->inTable($token);
-        }
-    }
-
-    private function inTableBody($token)
-    {
-        $clear = array('tbody', 'tfoot', 'thead', 'html');
-
-        /* A start tag whose tag name is "tr" */
-        if ($token['type'] === HTML5::STARTTAG && $token['name'] === 'tr') {
-            /* Clear the stack back to a table body context. */
-            $this->clearStackToTableContext($clear);
-
-            /* Insert a tr element for the token, then switch the insertion
-            mode to "in row". */
-            $this->insertElement($token);
-            $this->mode = self::IN_ROW;
-
-            /* A start tag whose tag name is one of: "th", "td" */
-        } elseif ($token['type'] === HTML5::STARTTAG &&
-            ($token['name'] === 'th' || $token['name'] === 'td')
-        ) {
-            /* Parse error. Act as if a start tag with the tag name "tr" had
-            been seen, then reprocess the current token. */
-            $this->inTableBody(
-                array(
-                    'name' => 'tr',
-                    'type' => HTML5::STARTTAG,
-                    'attr' => array()
-                )
-            );
-
-            return $this->inRow($token);
-
-            /* An end tag whose tag name is one of: "tbody", "tfoot", "thead" */
-        } elseif ($token['type'] === HTML5::ENDTAG &&
-            in_array($token['name'], array('tbody', 'tfoot', 'thead'))
-        ) {
-            /* If the stack of open elements does not have an element in table
-            scope with the same tag name as the token, this is a parse error.
-            Ignore the token. */
-            if (!$this->elementInScope($token['name'], true)) {
-                // Ignore
-
-                /* Otherwise: */
-            } else {
-                /* Clear the stack back to a table body context. */
-                $this->clearStackToTableContext($clear);
-
-                /* Pop the current node from the stack of open elements. Switch
-                the insertion mode to "in table". */
-                array_pop($this->stack);
-                $this->mode = self::IN_TABLE;
-            }
-
-            /* A start tag whose tag name is one of: "caption", "col", "colgroup",
-            "tbody", "tfoot", "thead", or an end tag whose tag name is "table" */
-        } elseif (($token['type'] === HTML5::STARTTAG && in_array(
-                    $token['name'],
-                    array('caption', 'col', 'colgroup', 'tbody', 'tfoor', 'thead')
-                )) ||
-            ($token['type'] === HTML5::STARTTAG && $token['name'] === 'table')
-        ) {
-            /* If the stack of open elements does not have a tbody, thead, or
-            tfoot element in table scope, this is a parse error. Ignore the
-            token. (innerHTML case) */
-            if (!$this->elementInScope(array('tbody', 'thead', 'tfoot'), true)) {
-                // Ignore.
-
-                /* Otherwise: */
-            } else {
-                /* Clear the stack back to a table body context. */
-                $this->clearStackToTableContext($clear);
-
-                /* Act as if an end tag with the same tag name as the current
-                node ("tbody", "tfoot", or "thead") had been seen, then
-                reprocess the current token. */
-                $this->inTableBody(
-                    array(
-                        'name' => end($this->stack)->nodeName,
-                        'type' => HTML5::ENDTAG
-                    )
-                );
-
-                return $this->mainPhase($token);
-            }
-
-            /* An end tag whose tag name is one of: "body", "caption", "col",
-            "colgroup", "html", "td", "th", "tr" */
-        } elseif ($token['type'] === HTML5::ENDTAG && in_array(
-                $token['name'],
-                array('body', 'caption', 'col', 'colgroup', 'html', 'td', 'th', 'tr')
-            )
-        ) {
-            /* Parse error. Ignore the token. */
-
-            /* Anything else */
-        } else {
-            /* Process the token as if the insertion mode was "in table". */
-            $this->inTable($token);
-        }
-    }
-
-    private function inRow($token)
-    {
-        $clear = array('tr', 'html');
-
-        /* A start tag whose tag name is one of: "th", "td" */
-        if ($token['type'] === HTML5::STARTTAG &&
-            ($token['name'] === 'th' || $token['name'] === 'td')
-        ) {
-            /* Clear the stack back to a table row context. */
-            $this->clearStackToTableContext($clear);
-
-            /* Insert an HTML element for the token, then switch the insertion
-            mode to "in cell". */
-            $this->insertElement($token);
-            $this->mode = self::IN_CELL;
-
-            /* Insert a marker at the end of the list of active formatting
-            elements. */
-            $this->a_formatting[] = self::MARKER;
-
-            /* An end tag whose tag name is "tr" */
-        } elseif ($token['type'] === HTML5::ENDTAG && $token['name'] === 'tr') {
-            /* If the stack of open elements does not have an element in table
-            scope with the same tag name as the token, this is a parse error.
-            Ignore the token. (innerHTML case) */
-            if (!$this->elementInScope($token['name'], true)) {
-                // Ignore.
-
-                /* Otherwise: */
-            } else {
-                /* Clear the stack back to a table row context. */
-                $this->clearStackToTableContext($clear);
-
-                /* Pop the current node (which will be a tr element) from the
-                stack of open elements. Switch the insertion mode to "in table
-                body". */
-                array_pop($this->stack);
-                $this->mode = self::IN_TBODY;
-            }
-
-            /* A start tag whose tag name is one of: "caption", "col", "colgroup",
-            "tbody", "tfoot", "thead", "tr" or an end tag whose tag name is "table" */
-        } elseif ($token['type'] === HTML5::STARTTAG && in_array(
-                $token['name'],
-                array('caption', 'col', 'colgroup', 'tbody', 'tfoot', 'thead', 'tr')
-            )
-        ) {
-            /* Act as if an end tag with the tag name "tr" had been seen, then,
-            if that token wasn't ignored, reprocess the current token. */
-            $this->inRow(
-                array(
-                    'name' => 'tr',
-                    'type' => HTML5::ENDTAG
-                )
-            );
-
-            return $this->inCell($token);
-
-            /* An end tag whose tag name is one of: "tbody", "tfoot", "thead" */
-        } elseif ($token['type'] === HTML5::ENDTAG &&
-            in_array($token['name'], array('tbody', 'tfoot', 'thead'))
-        ) {
-            /* If the stack of open elements does not have an element in table
-            scope with the same tag name as the token, this is a parse error.
-            Ignore the token. */
-            if (!$this->elementInScope($token['name'], true)) {
-                // Ignore.
-
-                /* Otherwise: */
-            } else {
-                /* Otherwise, act as if an end tag with the tag name "tr" had
-                been seen, then reprocess the current token. */
-                $this->inRow(
-                    array(
-                        'name' => 'tr',
-                        'type' => HTML5::ENDTAG
-                    )
-                );
-
-                return $this->inCell($token);
-            }
-
-            /* An end tag whose tag name is one of: "body", "caption", "col",
-            "colgroup", "html", "td", "th" */
-        } elseif ($token['type'] === HTML5::ENDTAG && in_array(
-                $token['name'],
-                array('body', 'caption', 'col', 'colgroup', 'html', 'td', 'th', 'tr')
-            )
-        ) {
-            /* Parse error. Ignore the token. */
-
-            /* Anything else */
-        } else {
-            /* Process the token as if the insertion mode was "in table". */
-            $this->inTable($token);
-        }
-    }
-
-    private function inCell($token)
-    {
-        /* An end tag whose tag name is one of: "td", "th" */
-        if ($token['type'] === HTML5::ENDTAG &&
-            ($token['name'] === 'td' || $token['name'] === 'th')
-        ) {
-            /* If the stack of open elements does not have an element in table
-            scope with the same tag name as that of the token, then this is a
-            parse error and the token must be ignored. */
-            if (!$this->elementInScope($token['name'], true)) {
-                // Ignore.
-
-                /* Otherwise: */
-            } else {
-                /* Generate implied end tags, except for elements with the same
-                tag name as the token. */
-                $this->generateImpliedEndTags(array($token['name']));
-
-                /* Now, if the current node is not an element with the same tag
-                name as the token, then this is a parse error. */
-                // k
-
-                /* Pop elements from this stack until an element with the same
-                tag name as the token has been popped from the stack. */
-                while (true) {
-                    $node = end($this->stack)->nodeName;
-                    array_pop($this->stack);
-
-                    if ($node === $token['name']) {
-                        break;
-                    }
-                }
-
-                /* Clear the list of active formatting elements up to the last
-                marker. */
-                $this->clearTheActiveFormattingElementsUpToTheLastMarker();
-
-                /* Switch the insertion mode to "in row". (The current node
-                will be a tr element at this point.) */
-                $this->mode = self::IN_ROW;
-            }
-
-            /* A start tag whose tag name is one of: "caption", "col", "colgroup",
-            "tbody", "td", "tfoot", "th", "thead", "tr" */
-        } elseif ($token['type'] === HTML5::STARTTAG && in_array(
-                $token['name'],
-                array(
-                    'caption',
-                    'col',
-                    'colgroup',
-                    'tbody',
-                    'td',
-                    'tfoot',
-                    'th',
-                    'thead',
-                    'tr'
-                )
-            )
-        ) {
-            /* If the stack of open elements does not have a td or th element
-            in table scope, then this is a parse error; ignore the token.
-            (innerHTML case) */
-            if (!$this->elementInScope(array('td', 'th'), true)) {
-                // Ignore.
-
-                /* Otherwise, close the cell (see below) and reprocess the current
-                token. */
-            } else {
-                $this->closeCell();
-                return $this->inRow($token);
-            }
-
-            /* A start tag whose tag name is one of: "caption", "col", "colgroup",
-            "tbody", "td", "tfoot", "th", "thead", "tr" */
-        } elseif ($token['type'] === HTML5::STARTTAG && in_array(
-                $token['name'],
-                array(
-                    'caption',
-                    'col',
-                    'colgroup',
-                    'tbody',
-                    'td',
-                    'tfoot',
-                    'th',
-                    'thead',
-                    'tr'
-                )
-            )
-        ) {
-            /* If the stack of open elements does not have a td or th element
-            in table scope, then this is a parse error; ignore the token.
-            (innerHTML case) */
-            if (!$this->elementInScope(array('td', 'th'), true)) {
-                // Ignore.
-
-                /* Otherwise, close the cell (see below) and reprocess the current
-                token. */
-            } else {
-                $this->closeCell();
-                return $this->inRow($token);
-            }
-
-            /* An end tag whose tag name is one of: "body", "caption", "col",
-            "colgroup", "html" */
-        } elseif ($token['type'] === HTML5::ENDTAG && in_array(
-                $token['name'],
-                array('body', 'caption', 'col', 'colgroup', 'html')
-            )
-        ) {
-            /* Parse error. Ignore the token. */
-
-            /* An end tag whose tag name is one of: "table", "tbody", "tfoot",
-            "thead", "tr" */
-        } elseif ($token['type'] === HTML5::ENDTAG && in_array(
-                $token['name'],
-                array('table', 'tbody', 'tfoot', 'thead', 'tr')
-            )
-        ) {
-            /* If the stack of open elements does not have an element in table
-            scope with the same tag name as that of the token (which can only
-            happen for "tbody", "tfoot" and "thead", or, in the innerHTML case),
-            then this is a parse error and the token must be ignored. */
-            if (!$this->elementInScope($token['name'], true)) {
-                // Ignore.
-
-                /* Otherwise, close the cell (see below) and reprocess the current
-                token. */
-            } else {
-                $this->closeCell();
-                return $this->inRow($token);
-            }
-
-            /* Anything else */
-        } else {
-            /* Process the token as if the insertion mode was "in body". */
-            $this->inBody($token);
-        }
-    }
-
-    private function inSelect($token)
-    {
-        /* Handle the token as follows: */
-
-        /* A character token */
-        if ($token['type'] === HTML5::CHARACTR) {
-            /* Append the token's character to the current node. */
-            $this->insertText($token['data']);
-
-            /* A comment token */
-        } elseif ($token['type'] === HTML5::COMMENT) {
-            /* Append a Comment node to the current node with the data
-            attribute set to the data given in the comment token. */
-            $this->insertComment($token['data']);
-
-            /* A start tag token whose tag name is "option" */
-        } elseif ($token['type'] === HTML5::STARTTAG &&
-            $token['name'] === 'option'
-        ) {
-            /* If the current node is an option element, act as if an end tag
-            with the tag name "option" had been seen. */
-            if (end($this->stack)->nodeName === 'option') {
-                $this->inSelect(
-                    array(
-                        'name' => 'option',
-                        'type' => HTML5::ENDTAG
-                    )
-                );
-            }
-
-            /* Insert an HTML element for the token. */
-            $this->insertElement($token);
-
-            /* A start tag token whose tag name is "optgroup" */
-        } elseif ($token['type'] === HTML5::STARTTAG &&
-            $token['name'] === 'optgroup'
-        ) {
-            /* If the current node is an option element, act as if an end tag
-            with the tag name "option" had been seen. */
-            if (end($this->stack)->nodeName === 'option') {
-                $this->inSelect(
-                    array(
-                        'name' => 'option',
-                        'type' => HTML5::ENDTAG
-                    )
-                );
-            }
-
-            /* If the current node is an optgroup element, act as if an end tag
-            with the tag name "optgroup" had been seen. */
-            if (end($this->stack)->nodeName === 'optgroup') {
-                $this->inSelect(
-                    array(
-                        'name' => 'optgroup',
-                        'type' => HTML5::ENDTAG
-                    )
-                );
-            }
-
-            /* Insert an HTML element for the token. */
-            $this->insertElement($token);
-
-            /* An end tag token whose tag name is "optgroup" */
-        } elseif ($token['type'] === HTML5::ENDTAG &&
-            $token['name'] === 'optgroup'
-        ) {
-            /* First, if the current node is an option element, and the node
-            immediately before it in the stack of open elements is an optgroup
-            element, then act as if an end tag with the tag name "option" had
-            been seen. */
-            $elements_in_stack = count($this->stack);
-
-            if ($this->stack[$elements_in_stack - 1]->nodeName === 'option' &&
-                $this->stack[$elements_in_stack - 2]->nodeName === 'optgroup'
-            ) {
-                $this->inSelect(
-                    array(
-                        'name' => 'option',
-                        'type' => HTML5::ENDTAG
-                    )
-                );
-            }
-
-            /* If the current node is an optgroup element, then pop that node
-            from the stack of open elements. Otherwise, this is a parse error,
-            ignore the token. */
-            if ($this->stack[$elements_in_stack - 1] === 'optgroup') {
-                array_pop($this->stack);
-            }
-
-            /* An end tag token whose tag name is "option" */
-        } elseif ($token['type'] === HTML5::ENDTAG &&
-            $token['name'] === 'option'
-        ) {
-            /* If the current node is an option element, then pop that node
-            from the stack of open elements. Otherwise, this is a parse error,
-            ignore the token. */
-            if (end($this->stack)->nodeName === 'option') {
-                array_pop($this->stack);
-            }
-
-            /* An end tag whose tag name is "select" */
-        } elseif ($token['type'] === HTML5::ENDTAG &&
-            $token['name'] === 'select'
-        ) {
-            /* If the stack of open elements does not have an element in table
-            scope with the same tag name as the token, this is a parse error.
-            Ignore the token. (innerHTML case) */
-            if (!$this->elementInScope($token['name'], true)) {
-                // w/e
-
-                /* Otherwise: */
-            } else {
-                /* Pop elements from the stack of open elements until a select
-                element has been popped from the stack. */
-                while (true) {
-                    $current = end($this->stack)->nodeName;
-                    array_pop($this->stack);
-
-                    if ($current === 'select') {
-                        break;
-                    }
-                }
-
-                /* Reset the insertion mode appropriately. */
-                $this->resetInsertionMode();
-            }
-
-            /* A start tag whose tag name is "select" */
-        } elseif ($token['name'] === 'select' &&
-            $token['type'] === HTML5::STARTTAG
-        ) {
-            /* Parse error. Act as if the token had been an end tag with the
-            tag name "select" instead. */
-            $this->inSelect(
-                array(
-                    'name' => 'select',
-                    'type' => HTML5::ENDTAG
-                )
-            );
-
-            /* An end tag whose tag name is one of: "caption", "table", "tbody",
-            "tfoot", "thead", "tr", "td", "th" */
-        } elseif (in_array(
-                $token['name'],
-                array(
-                    'caption',
-                    'table',
-                    'tbody',
-                    'tfoot',
-                    'thead',
-                    'tr',
-                    'td',
-                    'th'
-                )
-            ) && $token['type'] === HTML5::ENDTAG
-        ) {
-            /* Parse error. */
-            // w/e
-
-            /* If the stack of open elements has an element in table scope with
-            the same tag name as that of the token, then act as if an end tag
-            with the tag name "select" had been seen, and reprocess the token.
-            Otherwise, ignore the token. */
-            if ($this->elementInScope($token['name'], true)) {
-                $this->inSelect(
-                    array(
-                        'name' => 'select',
-                        'type' => HTML5::ENDTAG
-                    )
-                );
-
-                $this->mainPhase($token);
-            }
-
-            /* Anything else */
-        } else {
-            /* Parse error. Ignore the token. */
-        }
-    }
-
-    private function afterBody($token)
-    {
-        /* Handle the token as follows: */
-
-        /* A character token that is one of one of U+0009 CHARACTER TABULATION,
-        U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
-        or U+0020 SPACE */
-        if ($token['type'] === HTML5::CHARACTR &&
-            preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])
-        ) {
-            /* Process the token as it would be processed if the insertion mode
-            was "in body". */
-            $this->inBody($token);
-
-            /* A comment token */
-        } elseif ($token['type'] === HTML5::COMMENT) {
-            /* Append a Comment node to the first element in the stack of open
-            elements (the html element), with the data attribute set to the
-            data given in the comment token. */
-            $comment = $this->dom->createComment($token['data']);
-            $this->stack[0]->appendChild($comment);
-
-            /* An end tag with the tag name "html" */
-        } elseif ($token['type'] === HTML5::ENDTAG && $token['name'] === 'html') {
-            /* If the parser was originally created in order to handle the
-            setting of an element's innerHTML attribute, this is a parse error;
-            ignore the token. (The element will be an html element in this
-            case.) (innerHTML case) */
-
-            /* Otherwise, switch to the trailing end phase. */
-            $this->phase = self::END_PHASE;
-
-            /* Anything else */
-        } else {
-            /* Parse error. Set the insertion mode to "in body" and reprocess
-            the token. */
-            $this->mode = self::IN_BODY;
-            return $this->inBody($token);
-        }
-    }
-
-    private function inFrameset($token)
-    {
-        /* Handle the token as follows: */
-
-        /* A character token that is one of one of U+0009 CHARACTER TABULATION,
-        U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
-        U+000D CARRIAGE RETURN (CR), or U+0020 SPACE */
-        if ($token['type'] === HTML5::CHARACTR &&
-            preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])
-        ) {
-            /* Append the character to the current node. */
-            $this->insertText($token['data']);
-
-            /* A comment token */
-        } elseif ($token['type'] === HTML5::COMMENT) {
-            /* Append a Comment node to the current node with the data
-            attribute set to the data given in the comment token. */
-            $this->insertComment($token['data']);
-
-            /* A start tag with the tag name "frameset" */
-        } elseif ($token['name'] === 'frameset' &&
-            $token['type'] === HTML5::STARTTAG
-        ) {
-            $this->insertElement($token);
-
-            /* An end tag with the tag name "frameset" */
-        } elseif ($token['name'] === 'frameset' &&
-            $token['type'] === HTML5::ENDTAG
-        ) {
-            /* If the current node is the root html element, then this is a
-            parse error; ignore the token. (innerHTML case) */
-            if (end($this->stack)->nodeName === 'html') {
-                // Ignore
-
-            } else {
-                /* Otherwise, pop the current node from the stack of open
-                elements. */
-                array_pop($this->stack);
-
-                /* If the parser was not originally created in order to handle
-                the setting of an element's innerHTML attribute (innerHTML case),
-                and the current node is no longer a frameset element, then change
-                the insertion mode to "after frameset". */
-                $this->mode = self::AFTR_FRAME;
-            }
-
-            /* A start tag with the tag name "frame" */
-        } elseif ($token['name'] === 'frame' &&
-            $token['type'] === HTML5::STARTTAG
-        ) {
-            /* Insert an HTML element for the token. */
-            $this->insertElement($token);
-
-            /* Immediately pop the current node off the stack of open elements. */
-            array_pop($this->stack);
-
-            /* A start tag with the tag name "noframes" */
-        } elseif ($token['name'] === 'noframes' &&
-            $token['type'] === HTML5::STARTTAG
-        ) {
-            /* Process the token as if the insertion mode had been "in body". */
-            $this->inBody($token);
-
-            /* Anything else */
-        } else {
-            /* Parse error. Ignore the token. */
-        }
-    }
-
-    private function afterFrameset($token)
-    {
-        /* Handle the token as follows: */
-
-        /* A character token that is one of one of U+0009 CHARACTER TABULATION,
-        U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
-        U+000D CARRIAGE RETURN (CR), or U+0020 SPACE */
-        if ($token['type'] === HTML5::CHARACTR &&
-            preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])
-        ) {
-            /* Append the character to the current node. */
-            $this->insertText($token['data']);
-
-            /* A comment token */
-        } elseif ($token['type'] === HTML5::COMMENT) {
-            /* Append a Comment node to the current node with the data
-            attribute set to the data given in the comment token. */
-            $this->insertComment($token['data']);
-
-            /* An end tag with the tag name "html" */
-        } elseif ($token['name'] === 'html' &&
-            $token['type'] === HTML5::ENDTAG
-        ) {
-            /* Switch to the trailing end phase. */
-            $this->phase = self::END_PHASE;
-
-            /* A start tag with the tag name "noframes" */
-        } elseif ($token['name'] === 'noframes' &&
-            $token['type'] === HTML5::STARTTAG
-        ) {
-            /* Process the token as if the insertion mode had been "in body". */
-            $this->inBody($token);
-
-            /* Anything else */
-        } else {
-            /* Parse error. Ignore the token. */
-        }
-    }
-
-    private function trailingEndPhase($token)
-    {
-        /* After the main phase, as each token is emitted from the tokenisation
-        stage, it must be processed as described in this section. */
-
-        /* A DOCTYPE token */
-        if ($token['type'] === HTML5::DOCTYPE) {
-            // Parse error. Ignore the token.
-
-            /* A comment token */
-        } elseif ($token['type'] === HTML5::COMMENT) {
-            /* Append a Comment node to the Document object with the data
-            attribute set to the data given in the comment token. */
-            $comment = $this->dom->createComment($token['data']);
-            $this->dom->appendChild($comment);
-
-            /* A character token that is one of one of U+0009 CHARACTER TABULATION,
-            U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
-            or U+0020 SPACE */
-        } elseif ($token['type'] === HTML5::CHARACTR &&
-            preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])
-        ) {
-            /* Process the token as it would be processed in the main phase. */
-            $this->mainPhase($token);
-
-            /* A character token that is not one of U+0009 CHARACTER TABULATION,
-            U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
-            or U+0020 SPACE. Or a start tag token. Or an end tag token. */
-        } elseif (($token['type'] === HTML5::CHARACTR &&
-                preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) ||
-            $token['type'] === HTML5::STARTTAG || $token['type'] === HTML5::ENDTAG
-        ) {
-            /* Parse error. Switch back to the main phase and reprocess the
-            token. */
-            $this->phase = self::MAIN_PHASE;
-            return $this->mainPhase($token);
-
-            /* An end-of-file token */
-        } elseif ($token['type'] === HTML5::EOF) {
-            /* OMG DONE!! */
-        }
-    }
-
-    private function insertElement($token, $append = true, $check = false)
-    {
-        // Proprietary workaround for libxml2's limitations with tag names
-        if ($check) {
-            // Slightly modified HTML5 tag-name modification,
-            // removing anything that's not an ASCII letter, digit, or hyphen
-            $token['name'] = preg_replace('/[^a-z0-9-]/i', '', $token['name']);
-            // Remove leading hyphens and numbers
-            $token['name'] = ltrim($token['name'], '-0..9');
-            // In theory, this should ever be needed, but just in case
-            if ($token['name'] === '') {
-                $token['name'] = 'span';
-            } // arbitrary generic choice
-        }
-
-        $el = $this->dom->createElement($token['name']);
-
-        foreach ($token['attr'] as $attr) {
-            if (!$el->hasAttribute($attr['name'])) {
-                $el->setAttribute($attr['name'], $attr['value']);
-            }
-        }
-
-        $this->appendToRealParent($el);
-        $this->stack[] = $el;
-
-        return $el;
-    }
-
-    private function insertText($data)
-    {
-        $text = $this->dom->createTextNode($data);
-        $this->appendToRealParent($text);
-    }
-
-    private function insertComment($data)
-    {
-        $comment = $this->dom->createComment($data);
-        $this->appendToRealParent($comment);
-    }
-
-    private function appendToRealParent($node)
-    {
-        if ($this->foster_parent === null) {
-            end($this->stack)->appendChild($node);
-
-        } elseif ($this->foster_parent !== null) {
-            /* If the foster parent element is the parent element of the
-            last table element in the stack of open elements, then the new
-            node must be inserted immediately before the last table element
-            in the stack of open elements in the foster parent element;
-            otherwise, the new node must be appended to the foster parent
-            element. */
-            for ($n = count($this->stack) - 1; $n >= 0; $n--) {
-                if ($this->stack[$n]->nodeName === 'table' &&
-                    $this->stack[$n]->parentNode !== null
-                ) {
-                    $table = $this->stack[$n];
-                    break;
-                }
-            }
-
-            if (isset($table) && $this->foster_parent->isSameNode($table->parentNode)) {
-                $this->foster_parent->insertBefore($node, $table);
-            } else {
-                $this->foster_parent->appendChild($node);
-            }
-
-            $this->foster_parent = null;
-        }
-    }
-
-    private function elementInScope($el, $table = false)
-    {
-        if (is_array($el)) {
-            foreach ($el as $element) {
-                if ($this->elementInScope($element, $table)) {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        $leng = count($this->stack);
-
-        for ($n = 0; $n < $leng; $n++) {
-            /* 1. Initialise node to be the current node (the bottommost node of
-            the stack). */
-            $node = $this->stack[$leng - 1 - $n];
-
-            if ($node->tagName === $el) {
-                /* 2. If node is the target node, terminate in a match state. */
-                return true;
-
-            } elseif ($node->tagName === 'table') {
-                /* 3. Otherwise, if node is a table element, terminate in a failure
-                state. */
-                return false;
-
-            } elseif ($table === true && in_array(
-                    $node->tagName,
-                    array(
-                        'caption',
-                        'td',
-                        'th',
-                        'button',
-                        'marquee',
-                        'object'
-                    )
-                )
-            ) {
-                /* 4. Otherwise, if the algorithm is the "has an element in scope"
-                variant (rather than the "has an element in table scope" variant),
-                and node is one of the following, terminate in a failure state. */
-                return false;
-
-            } elseif ($node === $node->ownerDocument->documentElement) {
-                /* 5. Otherwise, if node is an html element (root element), terminate
-                in a failure state. (This can only happen if the node is the topmost
-                node of the    stack of open elements, and prevents the next step from
-                being invoked if there are no more elements in the stack.) */
-                return false;
-            }
-
-            /* Otherwise, set node to the previous entry in the stack of open
-            elements and return to step 2. (This will never fail, since the loop
-            will always terminate in the previous step if the top of the stack
-            is reached.) */
-        }
-    }
-
-    private function reconstructActiveFormattingElements()
-    {
-        /* 1. If there are no entries in the list of active formatting elements,
-        then there is nothing to reconstruct; stop this algorithm. */
-        $formatting_elements = count($this->a_formatting);
-
-        if ($formatting_elements === 0) {
-            return false;
-        }
-
-        /* 3. Let entry be the last (most recently added) element in the list
-        of active formatting elements. */
-        $entry = end($this->a_formatting);
-
-        /* 2. If the last (most recently added) entry in the list of active
-        formatting elements is a marker, or if it is an element that is in the
-        stack of open elements, then there is nothing to reconstruct; stop this
-        algorithm. */
-        if ($entry === self::MARKER || in_array($entry, $this->stack, true)) {
-            return false;
-        }
-
-        for ($a = $formatting_elements - 1; $a >= 0; true) {
-            /* 4. If there are no entries before entry in the list of active
-            formatting elements, then jump to step 8. */
-            if ($a === 0) {
-                $step_seven = false;
-                break;
-            }
-
-            /* 5. Let entry be the entry one earlier than entry in the list of
-            active formatting elements. */
-            $a--;
-            $entry = $this->a_formatting[$a];
-
-            /* 6. If entry is neither a marker nor an element that is also in
-            thetack of open elements, go to step 4. */
-            if ($entry === self::MARKER || in_array($entry, $this->stack, true)) {
-                break;
-            }
-        }
-
-        while (true) {
-            /* 7. Let entry be the element one later than entry in the list of
-            active formatting elements. */
-            if (isset($step_seven) && $step_seven === true) {
-                $a++;
-                $entry = $this->a_formatting[$a];
-            }
-
-            /* 8. Perform a shallow clone of the element entry to obtain clone. */
-            $clone = $entry->cloneNode();
-
-            /* 9. Append clone to the current node and push it onto the stack
-            of open elements  so that it is the new current node. */
-            end($this->stack)->appendChild($clone);
-            $this->stack[] = $clone;
-
-            /* 10. Replace the entry for entry in the list with an entry for
-            clone. */
-            $this->a_formatting[$a] = $clone;
-
-            /* 11. If the entry for clone in the list of active formatting
-            elements is not the last entry in the list, return to step 7. */
-            if (end($this->a_formatting) !== $clone) {
-                $step_seven = true;
-            } else {
-                break;
-            }
-        }
-    }
-
-    private function clearTheActiveFormattingElementsUpToTheLastMarker()
-    {
-        /* When the steps below require the UA to clear the list of active
-        formatting elements up to the last marker, the UA must perform the
-        following steps: */
-
-        while (true) {
-            /* 1. Let entry be the last (most recently added) entry in the list
-            of active formatting elements. */
-            $entry = end($this->a_formatting);
-
-            /* 2. Remove entry from the list of active formatting elements. */
-            array_pop($this->a_formatting);
-
-            /* 3. If entry was a marker, then stop the algorithm at this point.
-            The list has been cleared up to the last marker. */
-            if ($entry === self::MARKER) {
-                break;
-            }
-        }
-    }
-
-    private function generateImpliedEndTags($exclude = array())
-    {
-        /* When the steps below require the UA to generate implied end tags,
-        then, if the current node is a dd element, a dt element, an li element,
-        a p element, a td element, a th  element, or a tr element, the UA must
-        act as if an end tag with the respective tag name had been seen and
-        then generate implied end tags again. */
-        $node = end($this->stack);
-        $elements = array_diff(array('dd', 'dt', 'li', 'p', 'td', 'th', 'tr'), $exclude);
-
-        while (in_array(end($this->stack)->nodeName, $elements)) {
-            array_pop($this->stack);
-        }
-    }
-
-    private function getElementCategory($node)
-    {
-        $name = $node->tagName;
-        if (in_array($name, $this->special)) {
-            return self::SPECIAL;
-        } elseif (in_array($name, $this->scoping)) {
-            return self::SCOPING;
-        } elseif (in_array($name, $this->formatting)) {
-            return self::FORMATTING;
-        } else {
-            return self::PHRASING;
-        }
-    }
-
-    private function clearStackToTableContext($elements)
-    {
-        /* When the steps above require the UA to clear the stack back to a
-        table context, it means that the UA must, while the current node is not
-        a table element or an html element, pop elements from the stack of open
-        elements. If this causes any elements to be popped from the stack, then
-        this is a parse error. */
-        while (true) {
-            $node = end($this->stack)->nodeName;
-
-            if (in_array($node, $elements)) {
-                break;
-            } else {
-                array_pop($this->stack);
-            }
-        }
-    }
-
-    private function resetInsertionMode()
-    {
-        /* 1. Let last be false. */
-        $last = false;
-        $leng = count($this->stack);
-
-        for ($n = $leng - 1; $n >= 0; $n--) {
-            /* 2. Let node be the last node in the stack of open elements. */
-            $node = $this->stack[$n];
-
-            /* 3. If node is the first node in the stack of open elements, then
-            set last to true. If the element whose innerHTML  attribute is being
-            set is neither a td  element nor a th element, then set node to the
-            element whose innerHTML  attribute is being set. (innerHTML  case) */
-            if ($this->stack[0]->isSameNode($node)) {
-                $last = true;
-            }
-
-            /* 4. If node is a select element, then switch the insertion mode to
-            "in select" and abort these steps. (innerHTML case) */
-            if ($node->nodeName === 'select') {
-                $this->mode = self::IN_SELECT;
-                break;
-
-                /* 5. If node is a td or th element, then switch the insertion mode
-                to "in cell" and abort these steps. */
-            } elseif ($node->nodeName === 'td' || $node->nodeName === 'th') {
-                $this->mode = self::IN_CELL;
-                break;
-
-                /* 6. If node is a tr element, then switch the insertion mode to
-                "in    row" and abort these steps. */
-            } elseif ($node->nodeName === 'tr') {
-                $this->mode = self::IN_ROW;
-                break;
-
-                /* 7. If node is a tbody, thead, or tfoot element, then switch the
-                insertion mode to "in table body" and abort these steps. */
-            } elseif (in_array($node->nodeName, array('tbody', 'thead', 'tfoot'))) {
-                $this->mode = self::IN_TBODY;
-                break;
-
-                /* 8. If node is a caption element, then switch the insertion mode
-                to "in caption" and abort these steps. */
-            } elseif ($node->nodeName === 'caption') {
-                $this->mode = self::IN_CAPTION;
-                break;
-
-                /* 9. If node is a colgroup element, then switch the insertion mode
-                to "in column group" and abort these steps. (innerHTML case) */
-            } elseif ($node->nodeName === 'colgroup') {
-                $this->mode = self::IN_CGROUP;
-                break;
-
-                /* 10. If node is a table element, then switch the insertion mode
-                to "in table" and abort these steps. */
-            } elseif ($node->nodeName === 'table') {
-                $this->mode = self::IN_TABLE;
-                break;
-
-                /* 11. If node is a head element, then switch the insertion mode
-                to "in body" ("in body"! not "in head"!) and abort these steps.
-                (innerHTML case) */
-            } elseif ($node->nodeName === 'head') {
-                $this->mode = self::IN_BODY;
-                break;
-
-                /* 12. If node is a body element, then switch the insertion mode to
-                "in body" and abort these steps. */
-            } elseif ($node->nodeName === 'body') {
-                $this->mode = self::IN_BODY;
-                break;
-
-                /* 13. If node is a frameset element, then switch the insertion
-                mode to "in frameset" and abort these steps. (innerHTML case) */
-            } elseif ($node->nodeName === 'frameset') {
-                $this->mode = self::IN_FRAME;
-                break;
-
-                /* 14. If node is an html element, then: if the head element
-                pointer is null, switch the insertion mode to "before head",
-                otherwise, switch the insertion mode to "after head". In either
-                case, abort these steps. (innerHTML case) */
-            } elseif ($node->nodeName === 'html') {
-                $this->mode = ($this->head_pointer === null)
-                    ? self::BEFOR_HEAD
-                    : self::AFTER_HEAD;
-
-                break;
-
-                /* 15. If last is true, then set the insertion mode to "in body"
-                and    abort these steps. (innerHTML case) */
-            } elseif ($last) {
-                $this->mode = self::IN_BODY;
-                break;
-            }
-        }
-    }
-
-    private function closeCell()
-    {
-        /* If the stack of open elements has a td or th element in table scope,
-        then act as if an end tag token with that tag name had been seen. */
-        foreach (array('td', 'th') as $cell) {
-            if ($this->elementInScope($cell, true)) {
-                $this->inCell(
-                    array(
-                        'name' => $cell,
-                        'type' => HTML5::ENDTAG
-                    )
-                );
-
-                break;
-            }
-        }
-    }
-
-    public function save()
-    {
-        return $this->dom;
-    }
-}
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Node.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Node.php
deleted file mode 100644
index 3995fec9fe..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Node.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/**
- * Abstract base node class that all others inherit from.
- *
- * Why do we not use the DOM extension?  (1) It is not always available,
- * (2) it has funny constraints on the data it can represent,
- * whereas we want a maximally flexible representation, and (3) its
- * interface is a bit cumbersome.
- */
-abstract class HTMLPurifier_Node
-{
-    /**
-     * Line number of the start token in the source document
-     * @type int
-     */
-    public $line;
-
-    /**
-     * Column number of the start token in the source document. Null if unknown.
-     * @type int
-     */
-    public $col;
-
-    /**
-     * Lookup array of processing that this token is exempt from.
-     * Currently, valid values are "ValidateAttributes".
-     * @type array
-     */
-    public $armor = array();
-
-    /**
-     * When true, this node should be ignored as non-existent.
-     *
-     * Who is responsible for ignoring dead nodes?  FixNesting is
-     * responsible for removing them before passing on to child
-     * validators.
-     */
-    public $dead = false;
-
-    /**
-     * Returns a pair of start and end tokens, where the end token
-     * is null if it is not necessary. Does not include children.
-     * @type array
-     */
-    abstract public function toTokenPair();
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Node/Comment.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Node/Comment.php
deleted file mode 100644
index 38ba193942..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Node/Comment.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * Concrete comment node class.
- */
-class HTMLPurifier_Node_Comment extends HTMLPurifier_Node
-{
-    /**
-     * Character data within comment.
-     * @type string
-     */
-    public $data;
-
-    /**
-     * @type bool
-     */
-    public $is_whitespace = true;
-
-    /**
-     * Transparent constructor.
-     *
-     * @param string $data String comment data.
-     * @param int $line
-     * @param int $col
-     */
-    public function __construct($data, $line = null, $col = null)
-    {
-        $this->data = $data;
-        $this->line = $line;
-        $this->col = $col;
-    }
-
-    public function toTokenPair() {
-        return array(new HTMLPurifier_Token_Comment($this->data, $this->line, $this->col), null);
-    }
-}
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Node/Element.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Node/Element.php
deleted file mode 100644
index 6cbf56dada..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Node/Element.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-/**
- * Concrete element node class.
- */
-class HTMLPurifier_Node_Element extends HTMLPurifier_Node
-{
-    /**
-     * The lower-case name of the tag, like 'a', 'b' or 'blockquote'.
-     *
-     * @note Strictly speaking, XML tags are case sensitive, so we shouldn't
-     * be lower-casing them, but these tokens cater to HTML tags, which are
-     * insensitive.
-     * @type string
-     */
-    public $name;
-
-    /**
-     * Associative array of the node's attributes.
-     * @type array
-     */
-    public $attr = array();
-
-    /**
-     * List of child elements.
-     * @type array
-     */
-    public $children = array();
-
-    /**
-     * Does this use the <a></a> form or the </a> form, i.e.
-     * is it a pair of start/end tokens or an empty token.
-     * @bool
-     */
-    public $empty = false;
-
-    public $endCol = null, $endLine = null, $endArmor = array();
-
-    public function __construct($name, $attr = array(), $line = null, $col = null, $armor = array()) {
-        $this->name = $name;
-        $this->attr = $attr;
-        $this->line = $line;
-        $this->col = $col;
-        $this->armor = $armor;
-    }
-
-    public function toTokenPair() {
-        // XXX inefficiency here, normalization is not necessary
-        if ($this->empty) {
-            return array(new HTMLPurifier_Token_Empty($this->name, $this->attr, $this->line, $this->col, $this->armor), null);
-        } else {
-            $start = new HTMLPurifier_Token_Start($this->name, $this->attr, $this->line, $this->col, $this->armor);
-            $end = new HTMLPurifier_Token_End($this->name, array(), $this->endLine, $this->endCol, $this->endArmor);
-            //$end->start = $start;
-            return array($start, $end);
-        }
-    }
-}
-
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Node/Text.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Node/Text.php
deleted file mode 100644
index aec9166473..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Node/Text.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/**
- * Concrete text token class.
- *
- * Text tokens comprise of regular parsed character data (PCDATA) and raw
- * character data (from the CDATA sections). Internally, their
- * data is parsed with all entities expanded. Surprisingly, the text token
- * does have a "tag name" called #PCDATA, which is how the DTD represents it
- * in permissible child nodes.
- */
-class HTMLPurifier_Node_Text extends HTMLPurifier_Node
-{
-
-    /**
-     * PCDATA tag name compatible with DTD, see
-     * HTMLPurifier_ChildDef_Custom for details.
-     * @type string
-     */
-    public $name = '#PCDATA';
-
-    /**
-     * @type string
-     */
-    public $data;
-    /**< Parsed character data of text. */
-
-    /**
-     * @type bool
-     */
-    public $is_whitespace;
-
-    /**< Bool indicating if node is whitespace. */
-
-    /**
-     * Constructor, accepts data and determines if it is whitespace.
-     * @param string $data String parsed character data.
-     * @param int $line
-     * @param int $col
-     */
-    public function __construct($data, $is_whitespace, $line = null, $col = null)
-    {
-        $this->data = $data;
-        $this->is_whitespace = $is_whitespace;
-        $this->line = $line;
-        $this->col = $col;
-    }
-
-    public function toTokenPair() {
-        return array(new HTMLPurifier_Token_Text($this->data, $this->line, $this->col), null);
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/PercentEncoder.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/PercentEncoder.php
deleted file mode 100644
index 18c8bbb00a..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/PercentEncoder.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-/**
- * Class that handles operations involving percent-encoding in URIs.
- *
- * @warning
- *      Be careful when reusing instances of PercentEncoder. The object
- *      you use for normalize() SHOULD NOT be used for encode(), or
- *      vice-versa.
- */
-class HTMLPurifier_PercentEncoder
-{
-
-    /**
-     * Reserved characters to preserve when using encode().
-     * @type array
-     */
-    protected $preserve = array();
-
-    /**
-     * String of characters that should be preserved while using encode().
-     * @param bool $preserve
-     */
-    public function __construct($preserve = false)
-    {
-        // unreserved letters, ought to const-ify
-        for ($i = 48; $i <= 57; $i++) { // digits
-            $this->preserve[$i] = true;
-        }
-        for ($i = 65; $i <= 90; $i++) { // upper-case
-            $this->preserve[$i] = true;
-        }
-        for ($i = 97; $i <= 122; $i++) { // lower-case
-            $this->preserve[$i] = true;
-        }
-        $this->preserve[45] = true; // Dash         -
-        $this->preserve[46] = true; // Period       .
-        $this->preserve[95] = true; // Underscore   _
-        $this->preserve[126]= true; // Tilde        ~
-
-        // extra letters not to escape
-        if ($preserve !== false) {
-            for ($i = 0, $c = strlen($preserve); $i < $c; $i++) {
-                $this->preserve[ord($preserve[$i])] = true;
-            }
-        }
-    }
-
-    /**
-     * Our replacement for urlencode, it encodes all non-reserved characters,
-     * as well as any extra characters that were instructed to be preserved.
-     * @note
-     *      Assumes that the string has already been normalized, making any
-     *      and all percent escape sequences valid. Percents will not be
-     *      re-escaped, regardless of their status in $preserve
-     * @param string $string String to be encoded
-     * @return string Encoded string.
-     */
-    public function encode($string)
-    {
-        $ret = '';
-        for ($i = 0, $c = strlen($string); $i < $c; $i++) {
-            if ($string[$i] !== '%' && !isset($this->preserve[$int = ord($string[$i])])) {
-                $ret .= '%' . sprintf('%02X', $int);
-            } else {
-                $ret .= $string[$i];
-            }
-        }
-        return $ret;
-    }
-
-    /**
-     * Fix up percent-encoding by decoding unreserved characters and normalizing.
-     * @warning This function is affected by $preserve, even though the
-     *          usual desired behavior is for this not to preserve those
-     *          characters. Be careful when reusing instances of PercentEncoder!
-     * @param string $string String to normalize
-     * @return string
-     */
-    public function normalize($string)
-    {
-        if ($string == '') {
-            return '';
-        }
-        $parts = explode('%', $string);
-        $ret = array_shift($parts);
-        foreach ($parts as $part) {
-            $length = strlen($part);
-            if ($length < 2) {
-                $ret .= '%25' . $part;
-                continue;
-            }
-            $encoding = substr($part, 0, 2);
-            $text     = substr($part, 2);
-            if (!ctype_xdigit($encoding)) {
-                $ret .= '%25' . $part;
-                continue;
-            }
-            $int = hexdec($encoding);
-            if (isset($this->preserve[$int])) {
-                $ret .= chr($int) . $text;
-                continue;
-            }
-            $encoding = strtoupper($encoding);
-            $ret .= '%' . $encoding . $text;
-        }
-        return $ret;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer.php
deleted file mode 100644
index 549e4cea1e..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer.php
+++ /dev/null
@@ -1,218 +0,0 @@
-<?php
-
-// OUT OF DATE, NEEDS UPDATING!
-// USE XMLWRITER!
-
-class HTMLPurifier_Printer
-{
-
-    /**
-     * For HTML generation convenience funcs.
-     * @type HTMLPurifier_Generator
-     */
-    protected $generator;
-
-    /**
-     * For easy access.
-     * @type HTMLPurifier_Config
-     */
-    protected $config;
-
-    /**
-     * Initialize $generator.
-     */
-    public function __construct()
-    {
-    }
-
-    /**
-     * Give generator necessary configuration if possible
-     * @param HTMLPurifier_Config $config
-     */
-    public function prepareGenerator($config)
-    {
-        $all = $config->getAll();
-        $context = new HTMLPurifier_Context();
-        $this->generator = new HTMLPurifier_Generator($config, $context);
-    }
-
-    /**
-     * Main function that renders object or aspect of that object
-     * @note Parameters vary depending on printer
-     */
-    // function render() {}
-
-    /**
-     * Returns a start tag
-     * @param string $tag Tag name
-     * @param array $attr Attribute array
-     * @return string
-     */
-    protected function start($tag, $attr = array())
-    {
-        return $this->generator->generateFromToken(
-            new HTMLPurifier_Token_Start($tag, $attr ? $attr : array())
-        );
-    }
-
-    /**
-     * Returns an end tag
-     * @param string $tag Tag name
-     * @return string
-     */
-    protected function end($tag)
-    {
-        return $this->generator->generateFromToken(
-            new HTMLPurifier_Token_End($tag)
-        );
-    }
-
-    /**
-     * Prints a complete element with content inside
-     * @param string $tag Tag name
-     * @param string $contents Element contents
-     * @param array $attr Tag attributes
-     * @param bool $escape whether or not to escape contents
-     * @return string
-     */
-    protected function element($tag, $contents, $attr = array(), $escape = true)
-    {
-        return $this->start($tag, $attr) .
-            ($escape ? $this->escape($contents) : $contents) .
-            $this->end($tag);
-    }
-
-    /**
-     * @param string $tag
-     * @param array $attr
-     * @return string
-     */
-    protected function elementEmpty($tag, $attr = array())
-    {
-        return $this->generator->generateFromToken(
-            new HTMLPurifier_Token_Empty($tag, $attr)
-        );
-    }
-
-    /**
-     * @param string $text
-     * @return string
-     */
-    protected function text($text)
-    {
-        return $this->generator->generateFromToken(
-            new HTMLPurifier_Token_Text($text)
-        );
-    }
-
-    /**
-     * Prints a simple key/value row in a table.
-     * @param string $name Key
-     * @param mixed $value Value
-     * @return string
-     */
-    protected function row($name, $value)
-    {
-        if (is_bool($value)) {
-            $value = $value ? 'On' : 'Off';
-        }
-        return
-            $this->start('tr') . "\n" .
-            $this->element('th', $name) . "\n" .
-            $this->element('td', $value) . "\n" .
-            $this->end('tr');
-    }
-
-    /**
-     * Escapes a string for HTML output.
-     * @param string $string String to escape
-     * @return string
-     */
-    protected function escape($string)
-    {
-        $string = HTMLPurifier_Encoder::cleanUTF8($string);
-        $string = htmlspecialchars($string, ENT_COMPAT, 'UTF-8');
-        return $string;
-    }
-
-    /**
-     * Takes a list of strings and turns them into a single list
-     * @param string[] $array List of strings
-     * @param bool $polite Bool whether or not to add an end before the last
-     * @return string
-     */
-    protected function listify($array, $polite = false)
-    {
-        if (empty($array)) {
-            return 'None';
-        }
-        $ret = '';
-        $i = count($array);
-        foreach ($array as $value) {
-            $i--;
-            $ret .= $value;
-            if ($i > 0 && !($polite && $i == 1)) {
-                $ret .= ', ';
-            }
-            if ($polite && $i == 1) {
-                $ret .= 'and ';
-            }
-        }
-        return $ret;
-    }
-
-    /**
-     * Retrieves the class of an object without prefixes, as well as metadata
-     * @param object $obj Object to determine class of
-     * @param string $sec_prefix Further prefix to remove
-     * @return string
-     */
-    protected function getClass($obj, $sec_prefix = '')
-    {
-        static $five = null;
-        if ($five === null) {
-            $five = version_compare(PHP_VERSION, '5', '>=');
-        }
-        $prefix = 'HTMLPurifier_' . $sec_prefix;
-        if (!$five) {
-            $prefix = strtolower($prefix);
-        }
-        $class = str_replace($prefix, '', get_class($obj));
-        $lclass = strtolower($class);
-        $class .= '(';
-        switch ($lclass) {
-            case 'enum':
-                $values = array();
-                foreach ($obj->valid_values as $value => $bool) {
-                    $values[] = $value;
-                }
-                $class .= implode(', ', $values);
-                break;
-            case 'css_composite':
-                $values = array();
-                foreach ($obj->defs as $def) {
-                    $values[] = $this->getClass($def, $sec_prefix);
-                }
-                $class .= implode(', ', $values);
-                break;
-            case 'css_multiple':
-                $class .= $this->getClass($obj->single, $sec_prefix) . ', ';
-                $class .= $obj->max;
-                break;
-            case 'css_denyelementdecorator':
-                $class .= $this->getClass($obj->def, $sec_prefix) . ', ';
-                $class .= $obj->element;
-                break;
-            case 'css_importantdecorator':
-                $class .= $this->getClass($obj->def, $sec_prefix);
-                if ($obj->allow) {
-                    $class .= ', !important';
-                }
-                break;
-        }
-        $class .= ')';
-        return $class;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer/CSSDefinition.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer/CSSDefinition.php
deleted file mode 100644
index 29505fe12d..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer/CSSDefinition.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-class HTMLPurifier_Printer_CSSDefinition extends HTMLPurifier_Printer
-{
-    /**
-     * @type HTMLPurifier_CSSDefinition
-     */
-    protected $def;
-
-    /**
-     * @param HTMLPurifier_Config $config
-     * @return string
-     */
-    public function render($config)
-    {
-        $this->def = $config->getCSSDefinition();
-        $ret = '';
-
-        $ret .= $this->start('div', array('class' => 'HTMLPurifier_Printer'));
-        $ret .= $this->start('table');
-
-        $ret .= $this->element('caption', 'Properties ($info)');
-
-        $ret .= $this->start('thead');
-        $ret .= $this->start('tr');
-        $ret .= $this->element('th', 'Property', array('class' => 'heavy'));
-        $ret .= $this->element('th', 'Definition', array('class' => 'heavy', 'style' => 'width:auto;'));
-        $ret .= $this->end('tr');
-        $ret .= $this->end('thead');
-
-        ksort($this->def->info);
-        foreach ($this->def->info as $property => $obj) {
-            $name = $this->getClass($obj, 'AttrDef_');
-            $ret .= $this->row($property, $name);
-        }
-
-        $ret .= $this->end('table');
-        $ret .= $this->end('div');
-
-        return $ret;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.css b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.css
deleted file mode 100644
index 3ff1a88aa4..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.css
+++ /dev/null
@@ -1,10 +0,0 @@
-
-.hp-config {}
-
-.hp-config tbody th {text-align:right; padding-right:0.5em;}
-.hp-config thead, .hp-config .namespace {background:#3C578C; color:#FFF;}
-.hp-config .namespace th {text-align:center;}
-.hp-config .verbose {display:none;}
-.hp-config .controls {text-align:center;}
-
-/* vim: et sw=4 sts=4 */
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.js b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.js
deleted file mode 100644
index cba00c9b80..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.js
+++ /dev/null
@@ -1,5 +0,0 @@
-function toggleWriteability(id_of_patient, checked) {
-    document.getElementById(id_of_patient).disabled = checked;
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.php
deleted file mode 100644
index 33ae11397e..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.php
+++ /dev/null
@@ -1,451 +0,0 @@
-<?php
-
-/**
- * @todo Rewrite to use Interchange objects
- */
-class HTMLPurifier_Printer_ConfigForm extends HTMLPurifier_Printer
-{
-
-    /**
-     * Printers for specific fields.
-     * @type HTMLPurifier_Printer[]
-     */
-    protected $fields = array();
-
-    /**
-     * Documentation URL, can have fragment tagged on end.
-     * @type string
-     */
-    protected $docURL;
-
-    /**
-     * Name of form element to stuff config in.
-     * @type string
-     */
-    protected $name;
-
-    /**
-     * Whether or not to compress directive names, clipping them off
-     * after a certain amount of letters. False to disable or integer letters
-     * before clipping.
-     * @type bool
-     */
-    protected $compress = false;
-
-    /**
-     * @param string $name Form element name for directives to be stuffed into
-     * @param string $doc_url String documentation URL, will have fragment tagged on
-     * @param bool $compress Integer max length before compressing a directive name, set to false to turn off
-     */
-    public function __construct(
-        $name,
-        $doc_url = null,
-        $compress = false
-    ) {
-        parent::__construct();
-        $this->docURL = $doc_url;
-        $this->name = $name;
-        $this->compress = $compress;
-        // initialize sub-printers
-        $this->fields[0] = new HTMLPurifier_Printer_ConfigForm_default();
-        $this->fields[HTMLPurifier_VarParser::C_BOOL] = new HTMLPurifier_Printer_ConfigForm_bool();
-    }
-
-    /**
-     * Sets default column and row size for textareas in sub-printers
-     * @param $cols Integer columns of textarea, null to use default
-     * @param $rows Integer rows of textarea, null to use default
-     */
-    public function setTextareaDimensions($cols = null, $rows = null)
-    {
-        if ($cols) {
-            $this->fields['default']->cols = $cols;
-        }
-        if ($rows) {
-            $this->fields['default']->rows = $rows;
-        }
-    }
-
-    /**
-     * Retrieves styling, in case it is not accessible by webserver
-     */
-    public static function getCSS()
-    {
-        return file_get_contents(HTMLPURIFIER_PREFIX . '/HTMLPurifier/Printer/ConfigForm.css');
-    }
-
-    /**
-     * Retrieves JavaScript, in case it is not accessible by webserver
-     */
-    public static function getJavaScript()
-    {
-        return file_get_contents(HTMLPURIFIER_PREFIX . '/HTMLPurifier/Printer/ConfigForm.js');
-    }
-
-    /**
-     * Returns HTML output for a configuration form
-     * @param HTMLPurifier_Config|array $config Configuration object of current form state, or an array
-     *        where [0] has an HTML namespace and [1] is being rendered.
-     * @param array|bool $allowed Optional namespace(s) and directives to restrict form to.
-     * @param bool $render_controls
-     * @return string
-     */
-    public function render($config, $allowed = true, $render_controls = true)
-    {
-        if (is_array($config) && isset($config[0])) {
-            $gen_config = $config[0];
-            $config = $config[1];
-        } else {
-            $gen_config = $config;
-        }
-
-        $this->config = $config;
-        $this->genConfig = $gen_config;
-        $this->prepareGenerator($gen_config);
-
-        $allowed = HTMLPurifier_Config::getAllowedDirectivesForForm($allowed, $config->def);
-        $all = array();
-        foreach ($allowed as $key) {
-            list($ns, $directive) = $key;
-            $all[$ns][$directive] = $config->get($ns . '.' . $directive);
-        }
-
-        $ret = '';
-        $ret .= $this->start('table', array('class' => 'hp-config'));
-        $ret .= $this->start('thead');
-        $ret .= $this->start('tr');
-        $ret .= $this->element('th', 'Directive', array('class' => 'hp-directive'));
-        $ret .= $this->element('th', 'Value', array('class' => 'hp-value'));
-        $ret .= $this->end('tr');
-        $ret .= $this->end('thead');
-        foreach ($all as $ns => $directives) {
-            $ret .= $this->renderNamespace($ns, $directives);
-        }
-        if ($render_controls) {
-            $ret .= $this->start('tbody');
-            $ret .= $this->start('tr');
-            $ret .= $this->start('td', array('colspan' => 2, 'class' => 'controls'));
-            $ret .= $this->elementEmpty('input', array('type' => 'submit', 'value' => 'Submit'));
-            $ret .= '[<a href="?">Reset</a>]';
-            $ret .= $this->end('td');
-            $ret .= $this->end('tr');
-            $ret .= $this->end('tbody');
-        }
-        $ret .= $this->end('table');
-        return $ret;
-    }
-
-    /**
-     * Renders a single namespace
-     * @param $ns String namespace name
-     * @param array $directives array of directives to values
-     * @return string
-     */
-    protected function renderNamespace($ns, $directives)
-    {
-        $ret = '';
-        $ret .= $this->start('tbody', array('class' => 'namespace'));
-        $ret .= $this->start('tr');
-        $ret .= $this->element('th', $ns, array('colspan' => 2));
-        $ret .= $this->end('tr');
-        $ret .= $this->end('tbody');
-        $ret .= $this->start('tbody');
-        foreach ($directives as $directive => $value) {
-            $ret .= $this->start('tr');
-            $ret .= $this->start('th');
-            if ($this->docURL) {
-                $url = str_replace('%s', urlencode("$ns.$directive"), $this->docURL);
-                $ret .= $this->start('a', array('href' => $url));
-            }
-            $attr = array('for' => "{$this->name}:$ns.$directive");
-
-            // crop directive name if it's too long
-            if (!$this->compress || (strlen($directive) < $this->compress)) {
-                $directive_disp = $directive;
-            } else {
-                $directive_disp = substr($directive, 0, $this->compress - 2) . '...';
-                $attr['title'] = $directive;
-            }
-
-            $ret .= $this->element(
-                'label',
-                $directive_disp,
-                // component printers must create an element with this id
-                $attr
-            );
-            if ($this->docURL) {
-                $ret .= $this->end('a');
-            }
-            $ret .= $this->end('th');
-
-            $ret .= $this->start('td');
-            $def = $this->config->def->info["$ns.$directive"];
-            if (is_int($def)) {
-                $allow_null = $def < 0;
-                $type = abs($def);
-            } else {
-                $type = $def->type;
-                $allow_null = isset($def->allow_null);
-            }
-            if (!isset($this->fields[$type])) {
-                $type = 0;
-            } // default
-            $type_obj = $this->fields[$type];
-            if ($allow_null) {
-                $type_obj = new HTMLPurifier_Printer_ConfigForm_NullDecorator($type_obj);
-            }
-            $ret .= $type_obj->render($ns, $directive, $value, $this->name, array($this->genConfig, $this->config));
-            $ret .= $this->end('td');
-            $ret .= $this->end('tr');
-        }
-        $ret .= $this->end('tbody');
-        return $ret;
-    }
-
-}
-
-/**
- * Printer decorator for directives that accept null
- */
-class HTMLPurifier_Printer_ConfigForm_NullDecorator extends HTMLPurifier_Printer
-{
-    /**
-     * Printer being decorated
-     * @type HTMLPurifier_Printer
-     */
-    protected $obj;
-
-    /**
-     * @param HTMLPurifier_Printer $obj Printer to decorate
-     */
-    public function __construct($obj)
-    {
-        parent::__construct();
-        $this->obj = $obj;
-    }
-
-    /**
-     * @param string $ns
-     * @param string $directive
-     * @param string $value
-     * @param string $name
-     * @param HTMLPurifier_Config|array $config
-     * @return string
-     */
-    public function render($ns, $directive, $value, $name, $config)
-    {
-        if (is_array($config) && isset($config[0])) {
-            $gen_config = $config[0];
-            $config = $config[1];
-        } else {
-            $gen_config = $config;
-        }
-        $this->prepareGenerator($gen_config);
-
-        $ret = '';
-        $ret .= $this->start('label', array('for' => "$name:Null_$ns.$directive"));
-        $ret .= $this->element('span', "$ns.$directive:", array('class' => 'verbose'));
-        $ret .= $this->text(' Null/Disabled');
-        $ret .= $this->end('label');
-        $attr = array(
-            'type' => 'checkbox',
-            'value' => '1',
-            'class' => 'null-toggle',
-            'name' => "$name" . "[Null_$ns.$directive]",
-            'id' => "$name:Null_$ns.$directive",
-            'onclick' => "toggleWriteability('$name:$ns.$directive',checked)" // INLINE JAVASCRIPT!!!!
-        );
-        if ($this->obj instanceof HTMLPurifier_Printer_ConfigForm_bool) {
-            // modify inline javascript slightly
-            $attr['onclick'] =
-                "toggleWriteability('$name:Yes_$ns.$directive',checked);" .
-                "toggleWriteability('$name:No_$ns.$directive',checked)";
-        }
-        if ($value === null) {
-            $attr['checked'] = 'checked';
-        }
-        $ret .= $this->elementEmpty('input', $attr);
-        $ret .= $this->text(' or ');
-        $ret .= $this->elementEmpty('br');
-        $ret .= $this->obj->render($ns, $directive, $value, $name, array($gen_config, $config));
-        return $ret;
-    }
-}
-
-/**
- * Swiss-army knife configuration form field printer
- */
-class HTMLPurifier_Printer_ConfigForm_default extends HTMLPurifier_Printer
-{
-    /**
-     * @type int
-     */
-    public $cols = 18;
-
-    /**
-     * @type int
-     */
-    public $rows = 5;
-
-    /**
-     * @param string $ns
-     * @param string $directive
-     * @param string $value
-     * @param string $name
-     * @param HTMLPurifier_Config|array $config
-     * @return string
-     */
-    public function render($ns, $directive, $value, $name, $config)
-    {
-        if (is_array($config) && isset($config[0])) {
-            $gen_config = $config[0];
-            $config = $config[1];
-        } else {
-            $gen_config = $config;
-        }
-        $this->prepareGenerator($gen_config);
-        // this should probably be split up a little
-        $ret = '';
-        $def = $config->def->info["$ns.$directive"];
-        if (is_int($def)) {
-            $type = abs($def);
-        } else {
-            $type = $def->type;
-        }
-        if (is_array($value)) {
-            switch ($type) {
-                case HTMLPurifier_VarParser::LOOKUP:
-                    $array = $value;
-                    $value = array();
-                    foreach ($array as $val => $b) {
-                        $value[] = $val;
-                    }
-                    //TODO does this need a break?
-                case HTMLPurifier_VarParser::ALIST:
-                    $value = implode(PHP_EOL, $value);
-                    break;
-                case HTMLPurifier_VarParser::HASH:
-                    $nvalue = '';
-                    foreach ($value as $i => $v) {
-                        if (is_array($v)) {
-                            // HACK
-                            $v = implode(";", $v);
-                        }
-                        $nvalue .= "$i:$v" . PHP_EOL;
-                    }
-                    $value = $nvalue;
-                    break;
-                default:
-                    $value = '';
-            }
-        }
-        if ($type === HTMLPurifier_VarParser::C_MIXED) {
-            return 'Not supported';
-            $value = serialize($value);
-        }
-        $attr = array(
-            'name' => "$name" . "[$ns.$directive]",
-            'id' => "$name:$ns.$directive"
-        );
-        if ($value === null) {
-            $attr['disabled'] = 'disabled';
-        }
-        if (isset($def->allowed)) {
-            $ret .= $this->start('select', $attr);
-            foreach ($def->allowed as $val => $b) {
-                $attr = array();
-                if ($value == $val) {
-                    $attr['selected'] = 'selected';
-                }
-                $ret .= $this->element('option', $val, $attr);
-            }
-            $ret .= $this->end('select');
-        } elseif ($type === HTMLPurifier_VarParser::TEXT ||
-                $type === HTMLPurifier_VarParser::ITEXT ||
-                $type === HTMLPurifier_VarParser::ALIST ||
-                $type === HTMLPurifier_VarParser::HASH ||
-                $type === HTMLPurifier_VarParser::LOOKUP) {
-            $attr['cols'] = $this->cols;
-            $attr['rows'] = $this->rows;
-            $ret .= $this->start('textarea', $attr);
-            $ret .= $this->text($value);
-            $ret .= $this->end('textarea');
-        } else {
-            $attr['value'] = $value;
-            $attr['type'] = 'text';
-            $ret .= $this->elementEmpty('input', $attr);
-        }
-        return $ret;
-    }
-}
-
-/**
- * Bool form field printer
- */
-class HTMLPurifier_Printer_ConfigForm_bool extends HTMLPurifier_Printer
-{
-    /**
-     * @param string $ns
-     * @param string $directive
-     * @param string $value
-     * @param string $name
-     * @param HTMLPurifier_Config|array $config
-     * @return string
-     */
-    public function render($ns, $directive, $value, $name, $config)
-    {
-        if (is_array($config) && isset($config[0])) {
-            $gen_config = $config[0];
-            $config = $config[1];
-        } else {
-            $gen_config = $config;
-        }
-        $this->prepareGenerator($gen_config);
-        $ret = '';
-        $ret .= $this->start('div', array('id' => "$name:$ns.$directive"));
-
-        $ret .= $this->start('label', array('for' => "$name:Yes_$ns.$directive"));
-        $ret .= $this->element('span', "$ns.$directive:", array('class' => 'verbose'));
-        $ret .= $this->text(' Yes');
-        $ret .= $this->end('label');
-
-        $attr = array(
-            'type' => 'radio',
-            'name' => "$name" . "[$ns.$directive]",
-            'id' => "$name:Yes_$ns.$directive",
-            'value' => '1'
-        );
-        if ($value === true) {
-            $attr['checked'] = 'checked';
-        }
-        if ($value === null) {
-            $attr['disabled'] = 'disabled';
-        }
-        $ret .= $this->elementEmpty('input', $attr);
-
-        $ret .= $this->start('label', array('for' => "$name:No_$ns.$directive"));
-        $ret .= $this->element('span', "$ns.$directive:", array('class' => 'verbose'));
-        $ret .= $this->text(' No');
-        $ret .= $this->end('label');
-
-        $attr = array(
-            'type' => 'radio',
-            'name' => "$name" . "[$ns.$directive]",
-            'id' => "$name:No_$ns.$directive",
-            'value' => '0'
-        );
-        if ($value === false) {
-            $attr['checked'] = 'checked';
-        }
-        if ($value === null) {
-            $attr['disabled'] = 'disabled';
-        }
-        $ret .= $this->elementEmpty('input', $attr);
-
-        $ret .= $this->end('div');
-
-        return $ret;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer/HTMLDefinition.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer/HTMLDefinition.php
deleted file mode 100644
index ae8639176e..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer/HTMLDefinition.php
+++ /dev/null
@@ -1,324 +0,0 @@
-<?php
-
-class HTMLPurifier_Printer_HTMLDefinition extends HTMLPurifier_Printer
-{
-
-    /**
-     * @type HTMLPurifier_HTMLDefinition, for easy access
-     */
-    protected $def;
-
-    /**
-     * @param HTMLPurifier_Config $config
-     * @return string
-     */
-    public function render($config)
-    {
-        $ret = '';
-        $this->config =& $config;
-
-        $this->def = $config->getHTMLDefinition();
-
-        $ret .= $this->start('div', array('class' => 'HTMLPurifier_Printer'));
-
-        $ret .= $this->renderDoctype();
-        $ret .= $this->renderEnvironment();
-        $ret .= $this->renderContentSets();
-        $ret .= $this->renderInfo();
-
-        $ret .= $this->end('div');
-
-        return $ret;
-    }
-
-    /**
-     * Renders the Doctype table
-     * @return string
-     */
-    protected function renderDoctype()
-    {
-        $doctype = $this->def->doctype;
-        $ret = '';
-        $ret .= $this->start('table');
-        $ret .= $this->element('caption', 'Doctype');
-        $ret .= $this->row('Name', $doctype->name);
-        $ret .= $this->row('XML', $doctype->xml ? 'Yes' : 'No');
-        $ret .= $this->row('Default Modules', implode(', ', $doctype->modules));
-        $ret .= $this->row('Default Tidy Modules', implode(', ', $doctype->tidyModules));
-        $ret .= $this->end('table');
-        return $ret;
-    }
-
-
-    /**
-     * Renders environment table, which is miscellaneous info
-     * @return string
-     */
-    protected function renderEnvironment()
-    {
-        $def = $this->def;
-
-        $ret = '';
-
-        $ret .= $this->start('table');
-        $ret .= $this->element('caption', 'Environment');
-
-        $ret .= $this->row('Parent of fragment', $def->info_parent);
-        $ret .= $this->renderChildren($def->info_parent_def->child);
-        $ret .= $this->row('Block wrap name', $def->info_block_wrapper);
-
-        $ret .= $this->start('tr');
-        $ret .= $this->element('th', 'Global attributes');
-        $ret .= $this->element('td', $this->listifyAttr($def->info_global_attr), null, 0);
-        $ret .= $this->end('tr');
-
-        $ret .= $this->start('tr');
-        $ret .= $this->element('th', 'Tag transforms');
-        $list = array();
-        foreach ($def->info_tag_transform as $old => $new) {
-            $new = $this->getClass($new, 'TagTransform_');
-            $list[] = "<$old> with $new";
-        }
-        $ret .= $this->element('td', $this->listify($list));
-        $ret .= $this->end('tr');
-
-        $ret .= $this->start('tr');
-        $ret .= $this->element('th', 'Pre-AttrTransform');
-        $ret .= $this->element('td', $this->listifyObjectList($def->info_attr_transform_pre));
-        $ret .= $this->end('tr');
-
-        $ret .= $this->start('tr');
-        $ret .= $this->element('th', 'Post-AttrTransform');
-        $ret .= $this->element('td', $this->listifyObjectList($def->info_attr_transform_post));
-        $ret .= $this->end('tr');
-
-        $ret .= $this->end('table');
-        return $ret;
-    }
-
-    /**
-     * Renders the Content Sets table
-     * @return string
-     */
-    protected function renderContentSets()
-    {
-        $ret = '';
-        $ret .= $this->start('table');
-        $ret .= $this->element('caption', 'Content Sets');
-        foreach ($this->def->info_content_sets as $name => $lookup) {
-            $ret .= $this->heavyHeader($name);
-            $ret .= $this->start('tr');
-            $ret .= $this->element('td', $this->listifyTagLookup($lookup));
-            $ret .= $this->end('tr');
-        }
-        $ret .= $this->end('table');
-        return $ret;
-    }
-
-    /**
-     * Renders the Elements ($info) table
-     * @return string
-     */
-    protected function renderInfo()
-    {
-        $ret = '';
-        $ret .= $this->start('table');
-        $ret .= $this->element('caption', 'Elements ($info)');
-        ksort($this->def->info);
-        $ret .= $this->heavyHeader('Allowed tags', 2);
-        $ret .= $this->start('tr');
-        $ret .= $this->element('td', $this->listifyTagLookup($this->def->info), array('colspan' => 2));
-        $ret .= $this->end('tr');
-        foreach ($this->def->info as $name => $def) {
-            $ret .= $this->start('tr');
-            $ret .= $this->element('th', "<$name>", array('class' => 'heavy', 'colspan' => 2));
-            $ret .= $this->end('tr');
-            $ret .= $this->start('tr');
-            $ret .= $this->element('th', 'Inline content');
-            $ret .= $this->element('td', $def->descendants_are_inline ? 'Yes' : 'No');
-            $ret .= $this->end('tr');
-            if (!empty($def->excludes)) {
-                $ret .= $this->start('tr');
-                $ret .= $this->element('th', 'Excludes');
-                $ret .= $this->element('td', $this->listifyTagLookup($def->excludes));
-                $ret .= $this->end('tr');
-            }
-            if (!empty($def->attr_transform_pre)) {
-                $ret .= $this->start('tr');
-                $ret .= $this->element('th', 'Pre-AttrTransform');
-                $ret .= $this->element('td', $this->listifyObjectList($def->attr_transform_pre));
-                $ret .= $this->end('tr');
-            }
-            if (!empty($def->attr_transform_post)) {
-                $ret .= $this->start('tr');
-                $ret .= $this->element('th', 'Post-AttrTransform');
-                $ret .= $this->element('td', $this->listifyObjectList($def->attr_transform_post));
-                $ret .= $this->end('tr');
-            }
-            if (!empty($def->auto_close)) {
-                $ret .= $this->start('tr');
-                $ret .= $this->element('th', 'Auto closed by');
-                $ret .= $this->element('td', $this->listifyTagLookup($def->auto_close));
-                $ret .= $this->end('tr');
-            }
-            $ret .= $this->start('tr');
-            $ret .= $this->element('th', 'Allowed attributes');
-            $ret .= $this->element('td', $this->listifyAttr($def->attr), array(), 0);
-            $ret .= $this->end('tr');
-
-            if (!empty($def->required_attr)) {
-                $ret .= $this->row('Required attributes', $this->listify($def->required_attr));
-            }
-
-            $ret .= $this->renderChildren($def->child);
-        }
-        $ret .= $this->end('table');
-        return $ret;
-    }
-
-    /**
-     * Renders a row describing the allowed children of an element
-     * @param HTMLPurifier_ChildDef $def HTMLPurifier_ChildDef of pertinent element
-     * @return string
-     */
-    protected function renderChildren($def)
-    {
-        $context = new HTMLPurifier_Context();
-        $ret = '';
-        $ret .= $this->start('tr');
-        $elements = array();
-        $attr = array();
-        if (isset($def->elements)) {
-            if ($def->type == 'strictblockquote') {
-                $def->validateChildren(array(), $this->config, $context);
-            }
-            $elements = $def->elements;
-        }
-        if ($def->type == 'chameleon') {
-            $attr['rowspan'] = 2;
-        } elseif ($def->type == 'empty') {
-            $elements = array();
-        } elseif ($def->type == 'table') {
-            $elements = array_flip(
-                array(
-                    'col',
-                    'caption',
-                    'colgroup',
-                    'thead',
-                    'tfoot',
-                    'tbody',
-                    'tr'
-                )
-            );
-        }
-        $ret .= $this->element('th', 'Allowed children', $attr);
-
-        if ($def->type == 'chameleon') {
-
-            $ret .= $this->element(
-                'td',
-                '<em>Block</em>: ' .
-                $this->escape($this->listifyTagLookup($def->block->elements)),
-                null,
-                0
-            );
-            $ret .= $this->end('tr');
-            $ret .= $this->start('tr');
-            $ret .= $this->element(
-                'td',
-                '<em>Inline</em>: ' .
-                $this->escape($this->listifyTagLookup($def->inline->elements)),
-                null,
-                0
-            );
-
-        } elseif ($def->type == 'custom') {
-
-            $ret .= $this->element(
-                'td',
-                '<em>' . ucfirst($def->type) . '</em>: ' .
-                $def->dtd_regex
-            );
-
-        } else {
-            $ret .= $this->element(
-                'td',
-                '<em>' . ucfirst($def->type) . '</em>: ' .
-                $this->escape($this->listifyTagLookup($elements)),
-                null,
-                0
-            );
-        }
-        $ret .= $this->end('tr');
-        return $ret;
-    }
-
-    /**
-     * Listifies a tag lookup table.
-     * @param array $array Tag lookup array in form of array('tagname' => true)
-     * @return string
-     */
-    protected function listifyTagLookup($array)
-    {
-        ksort($array);
-        $list = array();
-        foreach ($array as $name => $discard) {
-            if ($name !== '#PCDATA' && !isset($this->def->info[$name])) {
-                continue;
-            }
-            $list[] = $name;
-        }
-        return $this->listify($list);
-    }
-
-    /**
-     * Listifies a list of objects by retrieving class names and internal state
-     * @param array $array List of objects
-     * @return string
-     * @todo Also add information about internal state
-     */
-    protected function listifyObjectList($array)
-    {
-        ksort($array);
-        $list = array();
-        foreach ($array as $obj) {
-            $list[] = $this->getClass($obj, 'AttrTransform_');
-        }
-        return $this->listify($list);
-    }
-
-    /**
-     * Listifies a hash of attributes to AttrDef classes
-     * @param array $array Array hash in form of array('attrname' => HTMLPurifier_AttrDef)
-     * @return string
-     */
-    protected function listifyAttr($array)
-    {
-        ksort($array);
-        $list = array();
-        foreach ($array as $name => $obj) {
-            if ($obj === false) {
-                continue;
-            }
-            $list[] = "$name&nbsp;=&nbsp;<i>" . $this->getClass($obj, 'AttrDef_') . '</i>';
-        }
-        return $this->listify($list);
-    }
-
-    /**
-     * Creates a heavy header row
-     * @param string $text
-     * @param int $num
-     * @return string
-     */
-    protected function heavyHeader($text, $num = 1)
-    {
-        $ret = '';
-        $ret .= $this->start('tr');
-        $ret .= $this->element('th', $text, array('colspan' => $num, 'class' => 'heavy'));
-        $ret .= $this->end('tr');
-        return $ret;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/PropertyList.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/PropertyList.php
deleted file mode 100644
index 189348fd9e..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/PropertyList.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-
-/**
- * Generic property list implementation
- */
-class HTMLPurifier_PropertyList
-{
-    /**
-     * Internal data-structure for properties.
-     * @type array
-     */
-    protected $data = array();
-
-    /**
-     * Parent plist.
-     * @type HTMLPurifier_PropertyList
-     */
-    protected $parent;
-
-    /**
-     * Cache.
-     * @type array
-     */
-    protected $cache;
-
-    /**
-     * @param HTMLPurifier_PropertyList $parent Parent plist
-     */
-    public function __construct($parent = null)
-    {
-        $this->parent = $parent;
-    }
-
-    /**
-     * Recursively retrieves the value for a key
-     * @param string $name
-     * @throws HTMLPurifier_Exception
-     */
-    public function get($name)
-    {
-        if ($this->has($name)) {
-            return $this->data[$name];
-        }
-        // possible performance bottleneck, convert to iterative if necessary
-        if ($this->parent) {
-            return $this->parent->get($name);
-        }
-        throw new HTMLPurifier_Exception("Key '$name' not found");
-    }
-
-    /**
-     * Sets the value of a key, for this plist
-     * @param string $name
-     * @param mixed $value
-     */
-    public function set($name, $value)
-    {
-        $this->data[$name] = $value;
-    }
-
-    /**
-     * Returns true if a given key exists
-     * @param string $name
-     * @return bool
-     */
-    public function has($name)
-    {
-        return array_key_exists($name, $this->data);
-    }
-
-    /**
-     * Resets a value to the value of it's parent, usually the default. If
-     * no value is specified, the entire plist is reset.
-     * @param string $name
-     */
-    public function reset($name = null)
-    {
-        if ($name == null) {
-            $this->data = array();
-        } else {
-            unset($this->data[$name]);
-        }
-    }
-
-    /**
-     * Squashes this property list and all of its property lists into a single
-     * array, and returns the array. This value is cached by default.
-     * @param bool $force If true, ignores the cache and regenerates the array.
-     * @return array
-     */
-    public function squash($force = false)
-    {
-        if ($this->cache !== null && !$force) {
-            return $this->cache;
-        }
-        if ($this->parent) {
-            return $this->cache = array_merge($this->parent->squash($force), $this->data);
-        } else {
-            return $this->cache = $this->data;
-        }
-    }
-
-    /**
-     * Returns the parent plist.
-     * @return HTMLPurifier_PropertyList
-     */
-    public function getParent()
-    {
-        return $this->parent;
-    }
-
-    /**
-     * Sets the parent plist.
-     * @param HTMLPurifier_PropertyList $plist Parent plist
-     */
-    public function setParent($plist)
-    {
-        $this->parent = $plist;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/PropertyListIterator.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/PropertyListIterator.php
deleted file mode 100644
index 15b330ea30..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/PropertyListIterator.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * Property list iterator. Do not instantiate this class directly.
- */
-class HTMLPurifier_PropertyListIterator extends FilterIterator
-{
-
-    /**
-     * @type int
-     */
-    protected $l;
-    /**
-     * @type string
-     */
-    protected $filter;
-
-    /**
-     * @param Iterator $iterator Array of data to iterate over
-     * @param string $filter Optional prefix to only allow values of
-     */
-    public function __construct(Iterator $iterator, $filter = null)
-    {
-        parent::__construct($iterator);
-        $this->l = strlen($filter);
-        $this->filter = $filter;
-    }
-
-    /**
-     * @return bool
-     */
-    public function accept()
-    {
-        $key = $this->getInnerIterator()->key();
-        if (strncmp($key, $this->filter, $this->l) !== 0) {
-            return false;
-        }
-        return true;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Queue.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Queue.php
deleted file mode 100644
index f58db9042a..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Queue.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/**
- * A simple array-backed queue, based off of the classic Okasaki
- * persistent amortized queue.  The basic idea is to maintain two
- * stacks: an input stack and an output stack.  When the output
- * stack runs out, reverse the input stack and use it as the output
- * stack.
- *
- * We don't use the SPL implementation because it's only supported
- * on PHP 5.3 and later.
- *
- * Exercise: Prove that push/pop on this queue take amortized O(1) time.
- *
- * Exercise: Extend this queue to be a deque, while preserving amortized
- * O(1) time.  Some care must be taken on rebalancing to avoid quadratic
- * behaviour caused by repeatedly shuffling data from the input stack
- * to the output stack and back.
- */
-class HTMLPurifier_Queue {
-    private $input;
-    private $output;
-
-    public function __construct($input = array()) {
-        $this->input = $input;
-        $this->output = array();
-    }
-
-    /**
-     * Shifts an element off the front of the queue.
-     */
-    public function shift() {
-        if (empty($this->output)) {
-            $this->output = array_reverse($this->input);
-            $this->input = array();
-        }
-        if (empty($this->output)) {
-            return NULL;
-        }
-        return array_pop($this->output);
-    }
-
-    /**
-     * Pushes an element onto the front of the queue.
-     */
-    public function push($x) {
-        array_push($this->input, $x);
-    }
-
-    /**
-     * Checks if it's empty.
-     */
-    public function isEmpty() {
-        return empty($this->input) && empty($this->output);
-    }
-}
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy.php
deleted file mode 100644
index e1ff3b72df..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * Supertype for classes that define a strategy for modifying/purifying tokens.
- *
- * While HTMLPurifier's core purpose is fixing HTML into something proper,
- * strategies provide plug points for extra configuration or even extra
- * features, such as custom tags, custom parsing of text, etc.
- */
-
-
-abstract class HTMLPurifier_Strategy
-{
-
-    /**
-     * Executes the strategy on the tokens.
-     *
-     * @param HTMLPurifier_Token[] $tokens Array of HTMLPurifier_Token objects to be operated on.
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return HTMLPurifier_Token[] Processed array of token objects.
-     */
-    abstract public function execute($tokens, $config, $context);
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/Composite.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/Composite.php
deleted file mode 100644
index d7d35ce7d1..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/Composite.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/**
- * Composite strategy that runs multiple strategies on tokens.
- */
-abstract class HTMLPurifier_Strategy_Composite extends HTMLPurifier_Strategy
-{
-
-    /**
-     * List of strategies to run tokens through.
-     * @type HTMLPurifier_Strategy[]
-     */
-    protected $strategies = array();
-
-    /**
-     * @param HTMLPurifier_Token[] $tokens
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return HTMLPurifier_Token[]
-     */
-    public function execute($tokens, $config, $context)
-    {
-        foreach ($this->strategies as $strategy) {
-            $tokens = $strategy->execute($tokens, $config, $context);
-        }
-        return $tokens;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/Core.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/Core.php
deleted file mode 100644
index 4414c17d6e..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/Core.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/**
- * Core strategy composed of the big four strategies.
- */
-class HTMLPurifier_Strategy_Core extends HTMLPurifier_Strategy_Composite
-{
-    public function __construct()
-    {
-        $this->strategies[] = new HTMLPurifier_Strategy_RemoveForeignElements();
-        $this->strategies[] = new HTMLPurifier_Strategy_MakeWellFormed();
-        $this->strategies[] = new HTMLPurifier_Strategy_FixNesting();
-        $this->strategies[] = new HTMLPurifier_Strategy_ValidateAttributes();
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/FixNesting.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/FixNesting.php
deleted file mode 100644
index 6fa673db9a..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/FixNesting.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-
-/**
- * Takes a well formed list of tokens and fixes their nesting.
- *
- * HTML elements dictate which elements are allowed to be their children,
- * for example, you can't have a p tag in a span tag.  Other elements have
- * much more rigorous definitions: tables, for instance, require a specific
- * order for their elements.  There are also constraints not expressible by
- * document type definitions, such as the chameleon nature of ins/del
- * tags and global child exclusions.
- *
- * The first major objective of this strategy is to iterate through all
- * the nodes and determine whether or not their children conform to the
- * element's definition.  If they do not, the child definition may
- * optionally supply an amended list of elements that is valid or
- * require that the entire node be deleted (and the previous node
- * rescanned).
- *
- * The second objective is to ensure that explicitly excluded elements of
- * an element do not appear in its children.  Code that accomplishes this
- * task is pervasive through the strategy, though the two are distinct tasks
- * and could, theoretically, be seperated (although it's not recommended).
- *
- * @note Whether or not unrecognized children are silently dropped or
- *       translated into text depends on the child definitions.
- *
- * @todo Enable nodes to be bubbled out of the structure.  This is
- *       easier with our new algorithm.
- */
-
-class HTMLPurifier_Strategy_FixNesting extends HTMLPurifier_Strategy
-{
-
-    /**
-     * @param HTMLPurifier_Token[] $tokens
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array|HTMLPurifier_Token[]
-     */
-    public function execute($tokens, $config, $context)
-    {
-
-        //####################################################################//
-        // Pre-processing
-
-        // O(n) pass to convert to a tree, so that we can efficiently
-        // refer to substrings
-        $top_node = HTMLPurifier_Arborize::arborize($tokens, $config, $context);
-
-        // get a copy of the HTML definition
-        $definition = $config->getHTMLDefinition();
-
-        $excludes_enabled = !$config->get('Core.DisableExcludes');
-
-        // setup the context variable 'IsInline', for chameleon processing
-        // is 'false' when we are not inline, 'true' when it must always
-        // be inline, and an integer when it is inline for a certain
-        // branch of the document tree
-        $is_inline = $definition->info_parent_def->descendants_are_inline;
-        $context->register('IsInline', $is_inline);
-
-        // setup error collector
-        $e =& $context->get('ErrorCollector', true);
-
-        //####################################################################//
-        // Loop initialization
-
-        // stack that contains all elements that are excluded
-        // it is organized by parent elements, similar to $stack,
-        // but it is only populated when an element with exclusions is
-        // processed, i.e. there won't be empty exclusions.
-        $exclude_stack = array($definition->info_parent_def->excludes);
-
-        // variable that contains the start token while we are processing
-        // nodes. This enables error reporting to do its job
-        $node = $top_node;
-        // dummy token
-        list($token, $d) = $node->toTokenPair();
-        $context->register('CurrentNode', $node);
-        $context->register('CurrentToken', $token);
-
-        //####################################################################//
-        // Loop
-
-        // We need to implement a post-order traversal iteratively, to
-        // avoid running into stack space limits.  This is pretty tricky
-        // to reason about, so we just manually stack-ify the recursive
-        // variant:
-        //
-        //  function f($node) {
-        //      foreach ($node->children as $child) {
-        //          f($child);
-        //      }
-        //      validate($node);
-        //  }
-        //
-        // Thus, we will represent a stack frame as array($node,
-        // $is_inline, stack of children)
-        // e.g. array_reverse($node->children) - already processed
-        // children.
-
-        $parent_def = $definition->info_parent_def;
-        $stack = array(
-            array($top_node,
-                  $parent_def->descendants_are_inline,
-                  $parent_def->excludes, // exclusions
-                  0)
-            );
-
-        while (!empty($stack)) {
-            list($node, $is_inline, $excludes, $ix) = array_pop($stack);
-            // recursive call
-            $go = false;
-            $def = empty($stack) ? $definition->info_parent_def : $definition->info[$node->name];
-            while (isset($node->children[$ix])) {
-                $child = $node->children[$ix++];
-                if ($child instanceof HTMLPurifier_Node_Element) {
-                    $go = true;
-                    $stack[] = array($node, $is_inline, $excludes, $ix);
-                    $stack[] = array($child,
-                        // ToDo: I don't think it matters if it's def or
-                        // child_def, but double check this...
-                        $is_inline || $def->descendants_are_inline,
-                        empty($def->excludes) ? $excludes
-                                              : array_merge($excludes, $def->excludes),
-                        0);
-                    break;
-                }
-            };
-            if ($go) continue;
-            list($token, $d) = $node->toTokenPair();
-            // base case
-            if ($excludes_enabled && isset($excludes[$node->name])) {
-                $node->dead = true;
-                if ($e) $e->send(E_ERROR, 'Strategy_FixNesting: Node excluded');
-            } else {
-                // XXX I suppose it would be slightly more efficient to
-                // avoid the allocation here and have children
-                // strategies handle it
-                $children = array();
-                foreach ($node->children as $child) {
-                    if (!$child->dead) $children[] = $child;
-                }
-                $result = $def->child->validateChildren($children, $config, $context);
-                if ($result === true) {
-                    // nop
-                    $node->children = $children;
-                } elseif ($result === false) {
-                    $node->dead = true;
-                    if ($e) $e->send(E_ERROR, 'Strategy_FixNesting: Node removed');
-                } else {
-                    $node->children = $result;
-                    if ($e) {
-                        // XXX This will miss mutations of internal nodes. Perhaps defer to the child validators
-                        if (empty($result) && !empty($children)) {
-                            $e->send(E_ERROR, 'Strategy_FixNesting: Node contents removed');
-                        } else if ($result != $children) {
-                            $e->send(E_WARNING, 'Strategy_FixNesting: Node reorganized');
-                        }
-                    }
-                }
-            }
-        }
-
-        //####################################################################//
-        // Post-processing
-
-        // remove context variables
-        $context->destroy('IsInline');
-        $context->destroy('CurrentNode');
-        $context->destroy('CurrentToken');
-
-        //####################################################################//
-        // Return
-
-        return HTMLPurifier_Arborize::flatten($node, $config, $context);
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/MakeWellFormed.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/MakeWellFormed.php
deleted file mode 100644
index a6eb09e453..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/MakeWellFormed.php
+++ /dev/null
@@ -1,659 +0,0 @@
-<?php
-
-/**
- * Takes tokens makes them well-formed (balance end tags, etc.)
- *
- * Specification of the armor attributes this strategy uses:
- *
- *      - MakeWellFormed_TagClosedError: This armor field is used to
- *        suppress tag closed errors for certain tokens [TagClosedSuppress],
- *        in particular, if a tag was generated automatically by HTML
- *        Purifier, we may rely on our infrastructure to close it for us
- *        and shouldn't report an error to the user [TagClosedAuto].
- */
-class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy
-{
-
-    /**
-     * Array stream of tokens being processed.
-     * @type HTMLPurifier_Token[]
-     */
-    protected $tokens;
-
-    /**
-     * Current token.
-     * @type HTMLPurifier_Token
-     */
-    protected $token;
-
-    /**
-     * Zipper managing the true state.
-     * @type HTMLPurifier_Zipper
-     */
-    protected $zipper;
-
-    /**
-     * Current nesting of elements.
-     * @type array
-     */
-    protected $stack;
-
-    /**
-     * Injectors active in this stream processing.
-     * @type HTMLPurifier_Injector[]
-     */
-    protected $injectors;
-
-    /**
-     * Current instance of HTMLPurifier_Config.
-     * @type HTMLPurifier_Config
-     */
-    protected $config;
-
-    /**
-     * Current instance of HTMLPurifier_Context.
-     * @type HTMLPurifier_Context
-     */
-    protected $context;
-
-    /**
-     * @param HTMLPurifier_Token[] $tokens
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return HTMLPurifier_Token[]
-     * @throws HTMLPurifier_Exception
-     */
-    public function execute($tokens, $config, $context)
-    {
-        $definition = $config->getHTMLDefinition();
-
-        // local variables
-        $generator = new HTMLPurifier_Generator($config, $context);
-        $escape_invalid_tags = $config->get('Core.EscapeInvalidTags');
-        // used for autoclose early abortion
-        $global_parent_allowed_elements = $definition->info_parent_def->child->getAllowedElements($config);
-        $e = $context->get('ErrorCollector', true);
-        $i = false; // injector index
-        list($zipper, $token) = HTMLPurifier_Zipper::fromArray($tokens);
-        if ($token === NULL) {
-            return array();
-        }
-        $reprocess = false; // whether or not to reprocess the same token
-        $stack = array();
-
-        // member variables
-        $this->stack =& $stack;
-        $this->tokens =& $tokens;
-        $this->token =& $token;
-        $this->zipper =& $zipper;
-        $this->config = $config;
-        $this->context = $context;
-
-        // context variables
-        $context->register('CurrentNesting', $stack);
-        $context->register('InputZipper', $zipper);
-        $context->register('CurrentToken', $token);
-
-        // -- begin INJECTOR --
-
-        $this->injectors = array();
-
-        $injectors = $config->getBatch('AutoFormat');
-        $def_injectors = $definition->info_injector;
-        $custom_injectors = $injectors['Custom'];
-        unset($injectors['Custom']); // special case
-        foreach ($injectors as $injector => $b) {
-            // XXX: Fix with a legitimate lookup table of enabled filters
-            if (strpos($injector, '.') !== false) {
-                continue;
-            }
-            $injector = "HTMLPurifier_Injector_$injector";
-            if (!$b) {
-                continue;
-            }
-            $this->injectors[] = new $injector;
-        }
-        foreach ($def_injectors as $injector) {
-            // assumed to be objects
-            $this->injectors[] = $injector;
-        }
-        foreach ($custom_injectors as $injector) {
-            if (!$injector) {
-                continue;
-            }
-            if (is_string($injector)) {
-                $injector = "HTMLPurifier_Injector_$injector";
-                $injector = new $injector;
-            }
-            $this->injectors[] = $injector;
-        }
-
-        // give the injectors references to the definition and context
-        // variables for performance reasons
-        foreach ($this->injectors as $ix => $injector) {
-            $error = $injector->prepare($config, $context);
-            if (!$error) {
-                continue;
-            }
-            array_splice($this->injectors, $ix, 1); // rm the injector
-            trigger_error("Cannot enable {$injector->name} injector because $error is not allowed", E_USER_WARNING);
-        }
-
-        // -- end INJECTOR --
-
-        // a note on reprocessing:
-        //      In order to reduce code duplication, whenever some code needs
-        //      to make HTML changes in order to make things "correct", the
-        //      new HTML gets sent through the purifier, regardless of its
-        //      status. This means that if we add a start token, because it
-        //      was totally necessary, we don't have to update nesting; we just
-        //      punt ($reprocess = true; continue;) and it does that for us.
-
-        // isset is in loop because $tokens size changes during loop exec
-        for (;;
-             // only increment if we don't need to reprocess
-             $reprocess ? $reprocess = false : $token = $zipper->next($token)) {
-
-            // check for a rewind
-            if (is_int($i)) {
-                // possibility: disable rewinding if the current token has a
-                // rewind set on it already. This would offer protection from
-                // infinite loop, but might hinder some advanced rewinding.
-                $rewind_offset = $this->injectors[$i]->getRewindOffset();
-                if (is_int($rewind_offset)) {
-                    for ($j = 0; $j < $rewind_offset; $j++) {
-                        if (empty($zipper->front)) break;
-                        $token = $zipper->prev($token);
-                        // indicate that other injectors should not process this token,
-                        // but we need to reprocess it.  See Note [Injector skips]
-                        unset($token->skip[$i]);
-                        $token->rewind = $i;
-                        if ($token instanceof HTMLPurifier_Token_Start) {
-                            array_pop($this->stack);
-                        } elseif ($token instanceof HTMLPurifier_Token_End) {
-                            $this->stack[] = $token->start;
-                        }
-                    }
-                }
-                $i = false;
-            }
-
-            // handle case of document end
-            if ($token === NULL) {
-                // kill processing if stack is empty
-                if (empty($this->stack)) {
-                    break;
-                }
-
-                // peek
-                $top_nesting = array_pop($this->stack);
-                $this->stack[] = $top_nesting;
-
-                // send error [TagClosedSuppress]
-                if ($e && !isset($top_nesting->armor['MakeWellFormed_TagClosedError'])) {
-                    $e->send(E_NOTICE, 'Strategy_MakeWellFormed: Tag closed by document end', $top_nesting);
-                }
-
-                // append, don't splice, since this is the end
-                $token = new HTMLPurifier_Token_End($top_nesting->name);
-
-                // punt!
-                $reprocess = true;
-                continue;
-            }
-
-            //echo '<br>'; printZipper($zipper, $token);//printTokens($this->stack);
-            //flush();
-
-            // quick-check: if it's not a tag, no need to process
-            if (empty($token->is_tag)) {
-                if ($token instanceof HTMLPurifier_Token_Text) {
-                    foreach ($this->injectors as $i => $injector) {
-                        if (isset($token->skip[$i])) {
-                            // See Note [Injector skips]
-                            continue;
-                        }
-                        if ($token->rewind !== null && $token->rewind !== $i) {
-                            continue;
-                        }
-                        // XXX fuckup
-                        $r = $token;
-                        $injector->handleText($r);
-                        $token = $this->processToken($r, $i);
-                        $reprocess = true;
-                        break;
-                    }
-                }
-                // another possibility is a comment
-                continue;
-            }
-
-            if (isset($definition->info[$token->name])) {
-                $type = $definition->info[$token->name]->child->type;
-            } else {
-                $type = false; // Type is unknown, treat accordingly
-            }
-
-            // quick tag checks: anything that's *not* an end tag
-            $ok = false;
-            if ($type === 'empty' && $token instanceof HTMLPurifier_Token_Start) {
-                // claims to be a start tag but is empty
-                $token = new HTMLPurifier_Token_Empty(
-                    $token->name,
-                    $token->attr,
-                    $token->line,
-                    $token->col,
-                    $token->armor
-                );
-                $ok = true;
-            } elseif ($type && $type !== 'empty' && $token instanceof HTMLPurifier_Token_Empty) {
-                // claims to be empty but really is a start tag
-                // NB: this assignment is required
-                $old_token = $token;
-                $token = new HTMLPurifier_Token_End($token->name);
-                $token = $this->insertBefore(
-                    new HTMLPurifier_Token_Start($old_token->name, $old_token->attr, $old_token->line, $old_token->col, $old_token->armor)
-                );
-                // punt (since we had to modify the input stream in a non-trivial way)
-                $reprocess = true;
-                continue;
-            } elseif ($token instanceof HTMLPurifier_Token_Empty) {
-                // real empty token
-                $ok = true;
-            } elseif ($token instanceof HTMLPurifier_Token_Start) {
-                // start tag
-
-                // ...unless they also have to close their parent
-                if (!empty($this->stack)) {
-
-                    // Performance note: you might think that it's rather
-                    // inefficient, recalculating the autoclose information
-                    // for every tag that a token closes (since when we
-                    // do an autoclose, we push a new token into the
-                    // stream and then /process/ that, before
-                    // re-processing this token.)  But this is
-                    // necessary, because an injector can make an
-                    // arbitrary transformations to the autoclosing
-                    // tokens we introduce, so things may have changed
-                    // in the meantime.  Also, doing the inefficient thing is
-                    // "easy" to reason about (for certain perverse definitions
-                    // of "easy")
-
-                    $parent = array_pop($this->stack);
-                    $this->stack[] = $parent;
-
-                    $parent_def = null;
-                    $parent_elements = null;
-                    $autoclose = false;
-                    if (isset($definition->info[$parent->name])) {
-                        $parent_def = $definition->info[$parent->name];
-                        $parent_elements = $parent_def->child->getAllowedElements($config);
-                        $autoclose = !isset($parent_elements[$token->name]);
-                    }
-
-                    if ($autoclose && $definition->info[$token->name]->wrap) {
-                        // Check if an element can be wrapped by another
-                        // element to make it valid in a context (for
-                        // example, <ul><ul> needs a <li> in between)
-                        $wrapname = $definition->info[$token->name]->wrap;
-                        $wrapdef = $definition->info[$wrapname];
-                        $elements = $wrapdef->child->getAllowedElements($config);
-                        if (isset($elements[$token->name]) && isset($parent_elements[$wrapname])) {
-                            $newtoken = new HTMLPurifier_Token_Start($wrapname);
-                            $token = $this->insertBefore($newtoken);
-                            $reprocess = true;
-                            continue;
-                        }
-                    }
-
-                    $carryover = false;
-                    if ($autoclose && $parent_def->formatting) {
-                        $carryover = true;
-                    }
-
-                    if ($autoclose) {
-                        // check if this autoclose is doomed to fail
-                        // (this rechecks $parent, which his harmless)
-                        $autoclose_ok = isset($global_parent_allowed_elements[$token->name]);
-                        if (!$autoclose_ok) {
-                            foreach ($this->stack as $ancestor) {
-                                $elements = $definition->info[$ancestor->name]->child->getAllowedElements($config);
-                                if (isset($elements[$token->name])) {
-                                    $autoclose_ok = true;
-                                    break;
-                                }
-                                if ($definition->info[$token->name]->wrap) {
-                                    $wrapname = $definition->info[$token->name]->wrap;
-                                    $wrapdef = $definition->info[$wrapname];
-                                    $wrap_elements = $wrapdef->child->getAllowedElements($config);
-                                    if (isset($wrap_elements[$token->name]) && isset($elements[$wrapname])) {
-                                        $autoclose_ok = true;
-                                        break;
-                                    }
-                                }
-                            }
-                        }
-                        if ($autoclose_ok) {
-                            // errors need to be updated
-                            $new_token = new HTMLPurifier_Token_End($parent->name);
-                            $new_token->start = $parent;
-                            // [TagClosedSuppress]
-                            if ($e && !isset($parent->armor['MakeWellFormed_TagClosedError'])) {
-                                if (!$carryover) {
-                                    $e->send(E_NOTICE, 'Strategy_MakeWellFormed: Tag auto closed', $parent);
-                                } else {
-                                    $e->send(E_NOTICE, 'Strategy_MakeWellFormed: Tag carryover', $parent);
-                                }
-                            }
-                            if ($carryover) {
-                                $element = clone $parent;
-                                // [TagClosedAuto]
-                                $element->armor['MakeWellFormed_TagClosedError'] = true;
-                                $element->carryover = true;
-                                $token = $this->processToken(array($new_token, $token, $element));
-                            } else {
-                                $token = $this->insertBefore($new_token);
-                            }
-                        } else {
-                            $token = $this->remove();
-                        }
-                        $reprocess = true;
-                        continue;
-                    }
-
-                }
-                $ok = true;
-            }
-
-            if ($ok) {
-                foreach ($this->injectors as $i => $injector) {
-                    if (isset($token->skip[$i])) {
-                        // See Note [Injector skips]
-                        continue;
-                    }
-                    if ($token->rewind !== null && $token->rewind !== $i) {
-                        continue;
-                    }
-                    $r = $token;
-                    $injector->handleElement($r);
-                    $token = $this->processToken($r, $i);
-                    $reprocess = true;
-                    break;
-                }
-                if (!$reprocess) {
-                    // ah, nothing interesting happened; do normal processing
-                    if ($token instanceof HTMLPurifier_Token_Start) {
-                        $this->stack[] = $token;
-                    } elseif ($token instanceof HTMLPurifier_Token_End) {
-                        throw new HTMLPurifier_Exception(
-                            'Improper handling of end tag in start code; possible error in MakeWellFormed'
-                        );
-                    }
-                }
-                continue;
-            }
-
-            // sanity check: we should be dealing with a closing tag
-            if (!$token instanceof HTMLPurifier_Token_End) {
-                throw new HTMLPurifier_Exception('Unaccounted for tag token in input stream, bug in HTML Purifier');
-            }
-
-            // make sure that we have something open
-            if (empty($this->stack)) {
-                if ($escape_invalid_tags) {
-                    if ($e) {
-                        $e->send(E_WARNING, 'Strategy_MakeWellFormed: Unnecessary end tag to text');
-                    }
-                    $token = new HTMLPurifier_Token_Text($generator->generateFromToken($token));
-                } else {
-                    if ($e) {
-                        $e->send(E_WARNING, 'Strategy_MakeWellFormed: Unnecessary end tag removed');
-                    }
-                    $token = $this->remove();
-                }
-                $reprocess = true;
-                continue;
-            }
-
-            // first, check for the simplest case: everything closes neatly.
-            // Eventually, everything passes through here; if there are problems
-            // we modify the input stream accordingly and then punt, so that
-            // the tokens get processed again.
-            $current_parent = array_pop($this->stack);
-            if ($current_parent->name == $token->name) {
-                $token->start = $current_parent;
-                foreach ($this->injectors as $i => $injector) {
-                    if (isset($token->skip[$i])) {
-                        // See Note [Injector skips]
-                        continue;
-                    }
-                    if ($token->rewind !== null && $token->rewind !== $i) {
-                        continue;
-                    }
-                    $r = $token;
-                    $injector->handleEnd($r);
-                    $token = $this->processToken($r, $i);
-                    $this->stack[] = $current_parent;
-                    $reprocess = true;
-                    break;
-                }
-                continue;
-            }
-
-            // okay, so we're trying to close the wrong tag
-
-            // undo the pop previous pop
-            $this->stack[] = $current_parent;
-
-            // scroll back the entire nest, trying to find our tag.
-            // (feature could be to specify how far you'd like to go)
-            $size = count($this->stack);
-            // -2 because -1 is the last element, but we already checked that
-            $skipped_tags = false;
-            for ($j = $size - 2; $j >= 0; $j--) {
-                if ($this->stack[$j]->name == $token->name) {
-                    $skipped_tags = array_slice($this->stack, $j);
-                    break;
-                }
-            }
-
-            // we didn't find the tag, so remove
-            if ($skipped_tags === false) {
-                if ($escape_invalid_tags) {
-                    if ($e) {
-                        $e->send(E_WARNING, 'Strategy_MakeWellFormed: Stray end tag to text');
-                    }
-                    $token = new HTMLPurifier_Token_Text($generator->generateFromToken($token));
-                } else {
-                    if ($e) {
-                        $e->send(E_WARNING, 'Strategy_MakeWellFormed: Stray end tag removed');
-                    }
-                    $token = $this->remove();
-                }
-                $reprocess = true;
-                continue;
-            }
-
-            // do errors, in REVERSE $j order: a,b,c with </a></b></c>
-            $c = count($skipped_tags);
-            if ($e) {
-                for ($j = $c - 1; $j > 0; $j--) {
-                    // notice we exclude $j == 0, i.e. the current ending tag, from
-                    // the errors... [TagClosedSuppress]
-                    if (!isset($skipped_tags[$j]->armor['MakeWellFormed_TagClosedError'])) {
-                        $e->send(E_NOTICE, 'Strategy_MakeWellFormed: Tag closed by element end', $skipped_tags[$j]);
-                    }
-                }
-            }
-
-            // insert tags, in FORWARD $j order: c,b,a with </a></b></c>
-            $replace = array($token);
-            for ($j = 1; $j < $c; $j++) {
-                // ...as well as from the insertions
-                $new_token = new HTMLPurifier_Token_End($skipped_tags[$j]->name);
-                $new_token->start = $skipped_tags[$j];
-                array_unshift($replace, $new_token);
-                if (isset($definition->info[$new_token->name]) && $definition->info[$new_token->name]->formatting) {
-                    // [TagClosedAuto]
-                    $element = clone $skipped_tags[$j];
-                    $element->carryover = true;
-                    $element->armor['MakeWellFormed_TagClosedError'] = true;
-                    $replace[] = $element;
-                }
-            }
-            $token = $this->processToken($replace);
-            $reprocess = true;
-            continue;
-        }
-
-        $context->destroy('CurrentToken');
-        $context->destroy('CurrentNesting');
-        $context->destroy('InputZipper');
-
-        unset($this->injectors, $this->stack, $this->tokens);
-        return $zipper->toArray($token);
-    }
-
-    /**
-     * Processes arbitrary token values for complicated substitution patterns.
-     * In general:
-     *
-     * If $token is an array, it is a list of tokens to substitute for the
-     * current token. These tokens then get individually processed. If there
-     * is a leading integer in the list, that integer determines how many
-     * tokens from the stream should be removed.
-     *
-     * If $token is a regular token, it is swapped with the current token.
-     *
-     * If $token is false, the current token is deleted.
-     *
-     * If $token is an integer, that number of tokens (with the first token
-     * being the current one) will be deleted.
-     *
-     * @param HTMLPurifier_Token|array|int|bool $token Token substitution value
-     * @param HTMLPurifier_Injector|int $injector Injector that performed the substitution; default is if
-     *        this is not an injector related operation.
-     * @throws HTMLPurifier_Exception
-     */
-    protected function processToken($token, $injector = -1)
-    {
-        // Zend OpCache miscompiles $token = array($token), so
-        // avoid this pattern.  See: https://github.com/ezyang/htmlpurifier/issues/108
-
-        // normalize forms of token
-        if (is_object($token)) {
-            $tmp = $token;
-            $token = array(1, $tmp);
-        }
-        if (is_int($token)) {
-            $tmp = $token;
-            $token = array($tmp);
-        }
-        if ($token === false) {
-            $token = array(1);
-        }
-        if (!is_array($token)) {
-            throw new HTMLPurifier_Exception('Invalid token type from injector');
-        }
-        if (!is_int($token[0])) {
-            array_unshift($token, 1);
-        }
-        if ($token[0] === 0) {
-            throw new HTMLPurifier_Exception('Deleting zero tokens is not valid');
-        }
-
-        // $token is now an array with the following form:
-        // array(number nodes to delete, new node 1, new node 2, ...)
-
-        $delete = array_shift($token);
-        list($old, $r) = $this->zipper->splice($this->token, $delete, $token);
-
-        if ($injector > -1) {
-            // See Note [Injector skips]
-            // Determine appropriate skips.  Here's what the code does:
-            //  *If* we deleted one or more tokens, copy the skips
-            //  of those tokens into the skips of the new tokens (in $token).
-            //  Also, mark the newly inserted tokens as having come from
-            //  $injector.
-            $oldskip = isset($old[0]) ? $old[0]->skip : array();
-            foreach ($token as $object) {
-                $object->skip = $oldskip;
-                $object->skip[$injector] = true;
-            }
-        }
-
-        return $r;
-
-    }
-
-    /**
-     * Inserts a token before the current token. Cursor now points to
-     * this token.  You must reprocess after this.
-     * @param HTMLPurifier_Token $token
-     */
-    private function insertBefore($token)
-    {
-        // NB not $this->zipper->insertBefore(), due to positioning
-        // differences
-        $splice = $this->zipper->splice($this->token, 0, array($token));
-
-        return $splice[1];
-    }
-
-    /**
-     * Removes current token. Cursor now points to new token occupying previously
-     * occupied space.  You must reprocess after this.
-     */
-    private function remove()
-    {
-        return $this->zipper->delete();
-    }
-}
-
-// Note [Injector skips]
-// ~~~~~~~~~~~~~~~~~~~~~
-// When I originally designed this class, the idea behind the 'skip'
-// property of HTMLPurifier_Token was to help avoid infinite loops
-// in injector processing.  For example, suppose you wrote an injector
-// that bolded swear words.  Naively, you might write it so that
-// whenever you saw ****, you replaced it with <strong>****</strong>.
-//
-// When this happens, we will reprocess all of the tokens with the
-// other injectors.  Now there is an opportunity for infinite loop:
-// if we rerun the swear-word injector on these tokens, we might
-// see **** and then reprocess again to get
-// <strong><strong>****</strong></strong> ad infinitum.
-//
-// Thus, the idea of a skip is that once we process a token with
-// an injector, we mark all of those tokens as having "come from"
-// the injector, and we never run the injector again on these
-// tokens.
-//
-// There were two more complications, however:
-//
-//  - With HTMLPurifier_Injector_RemoveEmpty, we noticed that if
-//    you had <b><i></i></b>, after you removed the <i></i>, you
-//    really would like this injector to go back and reprocess
-//    the <b> tag, discovering that it is now empty and can be
-//    removed.  So we reintroduced the possibility of infinite looping
-//    by adding a "rewind" function, which let you go back to an
-//    earlier point in the token stream and reprocess it with injectors.
-//    Needless to say, we need to UN-skip the token so it gets
-//    reprocessed.
-//
-//  - Suppose that you successfuly process a token, replace it with
-//    one with your skip mark, but now another injector wants to
-//    process the skipped token with another token.  Should you continue
-//    to skip that new token, or reprocess it?  If you reprocess,
-//    you can end up with an infinite loop where one injector converts
-//    <a> to <b>, and then another injector converts it back.  So
-//    we inherit the skips, but for some reason, I thought that we
-//    should inherit the skip from the first token of the token
-//    that we deleted.  Why?  Well, it seems to work OK.
-//
-// If I were to redesign this functionality, I would absolutely not
-// go about doing it this way: the semantics are just not very well
-// defined, and in any case you probably wanted to operate on trees,
-// not token streams.
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/RemoveForeignElements.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/RemoveForeignElements.php
deleted file mode 100644
index 1a8149eccb..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/RemoveForeignElements.php
+++ /dev/null
@@ -1,207 +0,0 @@
-<?php
-
-/**
- * Removes all unrecognized tags from the list of tokens.
- *
- * This strategy iterates through all the tokens and removes unrecognized
- * tokens. If a token is not recognized but a TagTransform is defined for
- * that element, the element will be transformed accordingly.
- */
-
-class HTMLPurifier_Strategy_RemoveForeignElements extends HTMLPurifier_Strategy
-{
-
-    /**
-     * @param HTMLPurifier_Token[] $tokens
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return array|HTMLPurifier_Token[]
-     */
-    public function execute($tokens, $config, $context)
-    {
-        $definition = $config->getHTMLDefinition();
-        $generator = new HTMLPurifier_Generator($config, $context);
-        $result = array();
-
-        $escape_invalid_tags = $config->get('Core.EscapeInvalidTags');
-        $remove_invalid_img = $config->get('Core.RemoveInvalidImg');
-
-        // currently only used to determine if comments should be kept
-        $trusted = $config->get('HTML.Trusted');
-        $comment_lookup = $config->get('HTML.AllowedComments');
-        $comment_regexp = $config->get('HTML.AllowedCommentsRegexp');
-        $check_comments = $comment_lookup !== array() || $comment_regexp !== null;
-
-        $remove_script_contents = $config->get('Core.RemoveScriptContents');
-        $hidden_elements = $config->get('Core.HiddenElements');
-
-        // remove script contents compatibility
-        if ($remove_script_contents === true) {
-            $hidden_elements['script'] = true;
-        } elseif ($remove_script_contents === false && isset($hidden_elements['script'])) {
-            unset($hidden_elements['script']);
-        }
-
-        $attr_validator = new HTMLPurifier_AttrValidator();
-
-        // removes tokens until it reaches a closing tag with its value
-        $remove_until = false;
-
-        // converts comments into text tokens when this is equal to a tag name
-        $textify_comments = false;
-
-        $token = false;
-        $context->register('CurrentToken', $token);
-
-        $e = false;
-        if ($config->get('Core.CollectErrors')) {
-            $e =& $context->get('ErrorCollector');
-        }
-
-        foreach ($tokens as $token) {
-            if ($remove_until) {
-                if (empty($token->is_tag) || $token->name !== $remove_until) {
-                    continue;
-                }
-            }
-            if (!empty($token->is_tag)) {
-                // DEFINITION CALL
-
-                // before any processing, try to transform the element
-                if (isset($definition->info_tag_transform[$token->name])) {
-                    $original_name = $token->name;
-                    // there is a transformation for this tag
-                    // DEFINITION CALL
-                    $token = $definition->
-                        info_tag_transform[$token->name]->transform($token, $config, $context);
-                    if ($e) {
-                        $e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Tag transform', $original_name);
-                    }
-                }
-
-                if (isset($definition->info[$token->name])) {
-                    // mostly everything's good, but
-                    // we need to make sure required attributes are in order
-                    if (($token instanceof HTMLPurifier_Token_Start || $token instanceof HTMLPurifier_Token_Empty) &&
-                        $definition->info[$token->name]->required_attr &&
-                        ($token->name != 'img' || $remove_invalid_img) // ensure config option still works
-                    ) {
-                        $attr_validator->validateToken($token, $config, $context);
-                        $ok = true;
-                        foreach ($definition->info[$token->name]->required_attr as $name) {
-                            if (!isset($token->attr[$name])) {
-                                $ok = false;
-                                break;
-                            }
-                        }
-                        if (!$ok) {
-                            if ($e) {
-                                $e->send(
-                                    E_ERROR,
-                                    'Strategy_RemoveForeignElements: Missing required attribute',
-                                    $name
-                                );
-                            }
-                            continue;
-                        }
-                        $token->armor['ValidateAttributes'] = true;
-                    }
-
-                    if (isset($hidden_elements[$token->name]) && $token instanceof HTMLPurifier_Token_Start) {
-                        $textify_comments = $token->name;
-                    } elseif ($token->name === $textify_comments && $token instanceof HTMLPurifier_Token_End) {
-                        $textify_comments = false;
-                    }
-
-                } elseif ($escape_invalid_tags) {
-                    // invalid tag, generate HTML representation and insert in
-                    if ($e) {
-                        $e->send(E_WARNING, 'Strategy_RemoveForeignElements: Foreign element to text');
-                    }
-                    $token = new HTMLPurifier_Token_Text(
-                        $generator->generateFromToken($token)
-                    );
-                } else {
-                    // check if we need to destroy all of the tag's children
-                    // CAN BE GENERICIZED
-                    if (isset($hidden_elements[$token->name])) {
-                        if ($token instanceof HTMLPurifier_Token_Start) {
-                            $remove_until = $token->name;
-                        } elseif ($token instanceof HTMLPurifier_Token_Empty) {
-                            // do nothing: we're still looking
-                        } else {
-                            $remove_until = false;
-                        }
-                        if ($e) {
-                            $e->send(E_ERROR, 'Strategy_RemoveForeignElements: Foreign meta element removed');
-                        }
-                    } else {
-                        if ($e) {
-                            $e->send(E_ERROR, 'Strategy_RemoveForeignElements: Foreign element removed');
-                        }
-                    }
-                    continue;
-                }
-            } elseif ($token instanceof HTMLPurifier_Token_Comment) {
-                // textify comments in script tags when they are allowed
-                if ($textify_comments !== false) {
-                    $data = $token->data;
-                    $token = new HTMLPurifier_Token_Text($data);
-                } elseif ($trusted || $check_comments) {
-                    // always cleanup comments
-                    $trailing_hyphen = false;
-                    if ($e) {
-                        // perform check whether or not there's a trailing hyphen
-                        if (substr($token->data, -1) == '-') {
-                            $trailing_hyphen = true;
-                        }
-                    }
-                    $token->data = rtrim($token->data, '-');
-                    $found_double_hyphen = false;
-                    while (strpos($token->data, '--') !== false) {
-                        $found_double_hyphen = true;
-                        $token->data = str_replace('--', '-', $token->data);
-                    }
-                    if ($trusted || !empty($comment_lookup[trim($token->data)]) ||
-                        ($comment_regexp !== null && preg_match($comment_regexp, trim($token->data)))) {
-                        // OK good
-                        if ($e) {
-                            if ($trailing_hyphen) {
-                                $e->send(
-                                    E_NOTICE,
-                                    'Strategy_RemoveForeignElements: Trailing hyphen in comment removed'
-                                );
-                            }
-                            if ($found_double_hyphen) {
-                                $e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Hyphens in comment collapsed');
-                            }
-                        }
-                    } else {
-                        if ($e) {
-                            $e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Comment removed');
-                        }
-                        continue;
-                    }
-                } else {
-                    // strip comments
-                    if ($e) {
-                        $e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Comment removed');
-                    }
-                    continue;
-                }
-            } elseif ($token instanceof HTMLPurifier_Token_Text) {
-            } else {
-                continue;
-            }
-            $result[] = $token;
-        }
-        if ($remove_until && $e) {
-            // we removed tokens until the end, throw error
-            $e->send(E_ERROR, 'Strategy_RemoveForeignElements: Token removed to end', $remove_until);
-        }
-        $context->destroy('CurrentToken');
-        return $result;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/ValidateAttributes.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/ValidateAttributes.php
deleted file mode 100644
index fbb3d27c81..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/ValidateAttributes.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
- * Validate all attributes in the tokens.
- */
-
-class HTMLPurifier_Strategy_ValidateAttributes extends HTMLPurifier_Strategy
-{
-
-    /**
-     * @param HTMLPurifier_Token[] $tokens
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return HTMLPurifier_Token[]
-     */
-    public function execute($tokens, $config, $context)
-    {
-        // setup validator
-        $validator = new HTMLPurifier_AttrValidator();
-
-        $token = false;
-        $context->register('CurrentToken', $token);
-
-        foreach ($tokens as $key => $token) {
-
-            // only process tokens that have attributes,
-            //   namely start and empty tags
-            if (!$token instanceof HTMLPurifier_Token_Start && !$token instanceof HTMLPurifier_Token_Empty) {
-                continue;
-            }
-
-            // skip tokens that are armored
-            if (!empty($token->armor['ValidateAttributes'])) {
-                continue;
-            }
-
-            // note that we have no facilities here for removing tokens
-            $validator->validateToken($token, $config, $context);
-        }
-        $context->destroy('CurrentToken');
-        return $tokens;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/StringHash.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/StringHash.php
deleted file mode 100644
index c07370197a..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/StringHash.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/**
- * This is in almost every respect equivalent to an array except
- * that it keeps track of which keys were accessed.
- *
- * @warning For the sake of backwards compatibility with early versions
- *     of PHP 5, you must not use the $hash[$key] syntax; if you do
- *     our version of offsetGet is never called.
- */
-class HTMLPurifier_StringHash extends ArrayObject
-{
-    /**
-     * @type array
-     */
-    protected $accessed = array();
-
-    /**
-     * Retrieves a value, and logs the access.
-     * @param mixed $index
-     * @return mixed
-     */
-    public function offsetGet($index)
-    {
-        $this->accessed[$index] = true;
-        return parent::offsetGet($index);
-    }
-
-    /**
-     * Returns a lookup array of all array indexes that have been accessed.
-     * @return array in form array($index => true).
-     */
-    public function getAccessed()
-    {
-        return $this->accessed;
-    }
-
-    /**
-     * Resets the access array.
-     */
-    public function resetAccessed()
-    {
-        $this->accessed = array();
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/StringHashParser.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/StringHashParser.php
deleted file mode 100644
index 7c73f80835..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/StringHashParser.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-
-/**
- * Parses string hash files. File format is as such:
- *
- *      DefaultKeyValue
- *      KEY: Value
- *      KEY2: Value2
- *      --MULTILINE-KEY--
- *      Multiline
- *      value.
- *
- * Which would output something similar to:
- *
- *      array(
- *          'ID' => 'DefaultKeyValue',
- *          'KEY' => 'Value',
- *          'KEY2' => 'Value2',
- *          'MULTILINE-KEY' => "Multiline\nvalue.\n",
- *      )
- *
- * We use this as an easy to use file-format for configuration schema
- * files, but the class itself is usage agnostic.
- *
- * You can use ---- to forcibly terminate parsing of a single string-hash;
- * this marker is used in multi string-hashes to delimit boundaries.
- */
-class HTMLPurifier_StringHashParser
-{
-
-    /**
-     * @type string
-     */
-    public $default = 'ID';
-
-    /**
-     * Parses a file that contains a single string-hash.
-     * @param string $file
-     * @return array
-     */
-    public function parseFile($file)
-    {
-        if (!file_exists($file)) {
-            return false;
-        }
-        $fh = fopen($file, 'r');
-        if (!$fh) {
-            return false;
-        }
-        $ret = $this->parseHandle($fh);
-        fclose($fh);
-        return $ret;
-    }
-
-    /**
-     * Parses a file that contains multiple string-hashes delimited by '----'
-     * @param string $file
-     * @return array
-     */
-    public function parseMultiFile($file)
-    {
-        if (!file_exists($file)) {
-            return false;
-        }
-        $ret = array();
-        $fh = fopen($file, 'r');
-        if (!$fh) {
-            return false;
-        }
-        while (!feof($fh)) {
-            $ret[] = $this->parseHandle($fh);
-        }
-        fclose($fh);
-        return $ret;
-    }
-
-    /**
-     * Internal parser that acepts a file handle.
-     * @note While it's possible to simulate in-memory parsing by using
-     *       custom stream wrappers, if such a use-case arises we should
-     *       factor out the file handle into its own class.
-     * @param resource $fh File handle with pointer at start of valid string-hash
-     *            block.
-     * @return array
-     */
-    protected function parseHandle($fh)
-    {
-        $state   = false;
-        $single  = false;
-        $ret     = array();
-        do {
-            $line = fgets($fh);
-            if ($line === false) {
-                break;
-            }
-            $line = rtrim($line, "\n\r");
-            if (!$state && $line === '') {
-                continue;
-            }
-            if ($line === '----') {
-                break;
-            }
-            if (strncmp('--#', $line, 3) === 0) {
-                // Comment
-                continue;
-            } elseif (strncmp('--', $line, 2) === 0) {
-                // Multiline declaration
-                $state = trim($line, '- ');
-                if (!isset($ret[$state])) {
-                    $ret[$state] = '';
-                }
-                continue;
-            } elseif (!$state) {
-                $single = true;
-                if (strpos($line, ':') !== false) {
-                    // Single-line declaration
-                    list($state, $line) = explode(':', $line, 2);
-                    $line = trim($line);
-                } else {
-                    // Use default declaration
-                    $state  = $this->default;
-                }
-            }
-            if ($single) {
-                $ret[$state] = $line;
-                $single = false;
-                $state  = false;
-            } else {
-                $ret[$state] .= "$line\n";
-            }
-        } while (!feof($fh));
-        return $ret;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/TagTransform.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/TagTransform.php
deleted file mode 100644
index 7b8d833433..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/TagTransform.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- * Defines a mutation of an obsolete tag into a valid tag.
- */
-abstract class HTMLPurifier_TagTransform
-{
-
-    /**
-     * Tag name to transform the tag to.
-     * @type string
-     */
-    public $transform_to;
-
-    /**
-     * Transforms the obsolete tag into the valid tag.
-     * @param HTMLPurifier_Token_Tag $tag Tag to be transformed.
-     * @param HTMLPurifier_Config $config Mandatory HTMLPurifier_Config object
-     * @param HTMLPurifier_Context $context Mandatory HTMLPurifier_Context object
-     */
-    abstract public function transform($tag, $config, $context);
-
-    /**
-     * Prepends CSS properties to the style attribute, creating the
-     * attribute if it doesn't exist.
-     * @warning Copied over from AttrTransform, be sure to keep in sync
-     * @param array $attr Attribute array to process (passed by reference)
-     * @param string $css CSS to prepend
-     */
-    protected function prependCSS(&$attr, $css)
-    {
-        $attr['style'] = isset($attr['style']) ? $attr['style'] : '';
-        $attr['style'] = $css . $attr['style'];
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/TagTransform/Font.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/TagTransform/Font.php
deleted file mode 100644
index 768c9b153c..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/TagTransform/Font.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-
-/**
- * Transforms FONT tags to the proper form (SPAN with CSS styling)
- *
- * This transformation takes the three proprietary attributes of FONT and
- * transforms them into their corresponding CSS attributes.  These are color,
- * face, and size.
- *
- * @note Size is an interesting case because it doesn't map cleanly to CSS.
- *       Thanks to
- *       http://style.cleverchimp.com/font_size_intervals/altintervals.html
- *       for reasonable mappings.
- * @warning This doesn't work completely correctly; specifically, this
- *          TagTransform operates before well-formedness is enforced, so
- *          the "active formatting elements" algorithm doesn't get applied.
- */
-class HTMLPurifier_TagTransform_Font extends HTMLPurifier_TagTransform
-{
-    /**
-     * @type string
-     */
-    public $transform_to = 'span';
-
-    /**
-     * @type array
-     */
-    protected $_size_lookup = array(
-        '0' => 'xx-small',
-        '1' => 'xx-small',
-        '2' => 'small',
-        '3' => 'medium',
-        '4' => 'large',
-        '5' => 'x-large',
-        '6' => 'xx-large',
-        '7' => '300%',
-        '-1' => 'smaller',
-        '-2' => '60%',
-        '+1' => 'larger',
-        '+2' => '150%',
-        '+3' => '200%',
-        '+4' => '300%'
-    );
-
-    /**
-     * @param HTMLPurifier_Token_Tag $tag
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return HTMLPurifier_Token_End|string
-     */
-    public function transform($tag, $config, $context)
-    {
-        if ($tag instanceof HTMLPurifier_Token_End) {
-            $new_tag = clone $tag;
-            $new_tag->name = $this->transform_to;
-            return $new_tag;
-        }
-
-        $attr = $tag->attr;
-        $prepend_style = '';
-
-        // handle color transform
-        if (isset($attr['color'])) {
-            $prepend_style .= 'color:' . $attr['color'] . ';';
-            unset($attr['color']);
-        }
-
-        // handle face transform
-        if (isset($attr['face'])) {
-            $prepend_style .= 'font-family:' . $attr['face'] . ';';
-            unset($attr['face']);
-        }
-
-        // handle size transform
-        if (isset($attr['size'])) {
-            // normalize large numbers
-            if ($attr['size'] !== '') {
-                if ($attr['size'][0] == '+' || $attr['size'][0] == '-') {
-                    $size = (int)$attr['size'];
-                    if ($size < -2) {
-                        $attr['size'] = '-2';
-                    }
-                    if ($size > 4) {
-                        $attr['size'] = '+4';
-                    }
-                } else {
-                    $size = (int)$attr['size'];
-                    if ($size > 7) {
-                        $attr['size'] = '7';
-                    }
-                }
-            }
-            if (isset($this->_size_lookup[$attr['size']])) {
-                $prepend_style .= 'font-size:' .
-                    $this->_size_lookup[$attr['size']] . ';';
-            }
-            unset($attr['size']);
-        }
-
-        if ($prepend_style) {
-            $attr['style'] = isset($attr['style']) ?
-                $prepend_style . $attr['style'] :
-                $prepend_style;
-        }
-
-        $new_tag = clone $tag;
-        $new_tag->name = $this->transform_to;
-        $new_tag->attr = $attr;
-
-        return $new_tag;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/TagTransform/Simple.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/TagTransform/Simple.php
deleted file mode 100644
index 71bf10b91f..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/TagTransform/Simple.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * Simple transformation, just change tag name to something else,
- * and possibly add some styling. This will cover most of the deprecated
- * tag cases.
- */
-class HTMLPurifier_TagTransform_Simple extends HTMLPurifier_TagTransform
-{
-    /**
-     * @type string
-     */
-    protected $style;
-
-    /**
-     * @param string $transform_to Tag name to transform to.
-     * @param string $style CSS style to add to the tag
-     */
-    public function __construct($transform_to, $style = null)
-    {
-        $this->transform_to = $transform_to;
-        $this->style = $style;
-    }
-
-    /**
-     * @param HTMLPurifier_Token_Tag $tag
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return string
-     */
-    public function transform($tag, $config, $context)
-    {
-        $new_tag = clone $tag;
-        $new_tag->name = $this->transform_to;
-        if (!is_null($this->style) &&
-            ($new_tag instanceof HTMLPurifier_Token_Start || $new_tag instanceof HTMLPurifier_Token_Empty)
-        ) {
-            $this->prependCSS($new_tag->attr, $this->style);
-        }
-        return $new_tag;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token.php
deleted file mode 100644
index 84d3619a36..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-/**
- * Abstract base token class that all others inherit from.
- */
-abstract class HTMLPurifier_Token
-{
-    /**
-     * Line number node was on in source document. Null if unknown.
-     * @type int
-     */
-    public $line;
-
-    /**
-     * Column of line node was on in source document. Null if unknown.
-     * @type int
-     */
-    public $col;
-
-    /**
-     * Lookup array of processing that this token is exempt from.
-     * Currently, valid values are "ValidateAttributes" and
-     * "MakeWellFormed_TagClosedError"
-     * @type array
-     */
-    public $armor = array();
-
-    /**
-     * Used during MakeWellFormed.  See Note [Injector skips]
-     * @type
-     */
-    public $skip;
-
-    /**
-     * @type
-     */
-    public $rewind;
-
-    /**
-     * @type
-     */
-    public $carryover;
-
-    /**
-     * @param string $n
-     * @return null|string
-     */
-    public function __get($n)
-    {
-        if ($n === 'type') {
-            trigger_error('Deprecated type property called; use instanceof', E_USER_NOTICE);
-            switch (get_class($this)) {
-                case 'HTMLPurifier_Token_Start':
-                    return 'start';
-                case 'HTMLPurifier_Token_Empty':
-                    return 'empty';
-                case 'HTMLPurifier_Token_End':
-                    return 'end';
-                case 'HTMLPurifier_Token_Text':
-                    return 'text';
-                case 'HTMLPurifier_Token_Comment':
-                    return 'comment';
-                default:
-                    return null;
-            }
-        }
-    }
-
-    /**
-     * Sets the position of the token in the source document.
-     * @param int $l
-     * @param int $c
-     */
-    public function position($l = null, $c = null)
-    {
-        $this->line = $l;
-        $this->col = $c;
-    }
-
-    /**
-     * Convenience function for DirectLex settings line/col position.
-     * @param int $l
-     * @param int $c
-     */
-    public function rawPosition($l, $c)
-    {
-        if ($c === -1) {
-            $l++;
-        }
-        $this->line = $l;
-        $this->col = $c;
-    }
-
-    /**
-     * Converts a token into its corresponding node.
-     */
-    abstract public function toNode();
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/Comment.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/Comment.php
deleted file mode 100644
index 23453c7052..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/Comment.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/**
- * Concrete comment token class. Generally will be ignored.
- */
-class HTMLPurifier_Token_Comment extends HTMLPurifier_Token
-{
-    /**
-     * Character data within comment.
-     * @type string
-     */
-    public $data;
-
-    /**
-     * @type bool
-     */
-    public $is_whitespace = true;
-
-    /**
-     * Transparent constructor.
-     *
-     * @param string $data String comment data.
-     * @param int $line
-     * @param int $col
-     */
-    public function __construct($data, $line = null, $col = null)
-    {
-        $this->data = $data;
-        $this->line = $line;
-        $this->col = $col;
-    }
-
-    public function toNode() {
-        return new HTMLPurifier_Node_Comment($this->data, $this->line, $this->col);
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/Empty.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/Empty.php
deleted file mode 100644
index 78a95f5555..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/Empty.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-/**
- * Concrete empty token class.
- */
-class HTMLPurifier_Token_Empty extends HTMLPurifier_Token_Tag
-{
-    public function toNode() {
-        $n = parent::toNode();
-        $n->empty = true;
-        return $n;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/End.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/End.php
deleted file mode 100644
index 59b38fdc57..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/End.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * Concrete end token class.
- *
- * @warning This class accepts attributes even though end tags cannot. This
- * is for optimization reasons, as under normal circumstances, the Lexers
- * do not pass attributes.
- */
-class HTMLPurifier_Token_End extends HTMLPurifier_Token_Tag
-{
-    /**
-     * Token that started this node.
-     * Added by MakeWellFormed. Please do not edit this!
-     * @type HTMLPurifier_Token
-     */
-    public $start;
-
-    public function toNode() {
-        throw new Exception("HTMLPurifier_Token_End->toNode not supported!");
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/Start.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/Start.php
deleted file mode 100644
index 019f317ada..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/Start.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-/**
- * Concrete start token class.
- */
-class HTMLPurifier_Token_Start extends HTMLPurifier_Token_Tag
-{
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/Tag.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/Tag.php
deleted file mode 100644
index d643fa64e2..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/Tag.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-/**
- * Abstract class of a tag token (start, end or empty), and its behavior.
- */
-abstract class HTMLPurifier_Token_Tag extends HTMLPurifier_Token
-{
-    /**
-     * Static bool marker that indicates the class is a tag.
-     *
-     * This allows us to check objects with <tt>!empty($obj->is_tag)</tt>
-     * without having to use a function call <tt>is_a()</tt>.
-     * @type bool
-     */
-    public $is_tag = true;
-
-    /**
-     * The lower-case name of the tag, like 'a', 'b' or 'blockquote'.
-     *
-     * @note Strictly speaking, XML tags are case sensitive, so we shouldn't
-     * be lower-casing them, but these tokens cater to HTML tags, which are
-     * insensitive.
-     * @type string
-     */
-    public $name;
-
-    /**
-     * Associative array of the tag's attributes.
-     * @type array
-     */
-    public $attr = array();
-
-    /**
-     * Non-overloaded constructor, which lower-cases passed tag name.
-     *
-     * @param string $name String name.
-     * @param array $attr Associative array of attributes.
-     * @param int $line
-     * @param int $col
-     * @param array $armor
-     */
-    public function __construct($name, $attr = array(), $line = null, $col = null, $armor = array())
-    {
-        $this->name = ctype_lower($name) ? $name : strtolower($name);
-        foreach ($attr as $key => $value) {
-            // normalization only necessary when key is not lowercase
-            if (!ctype_lower($key)) {
-                $new_key = strtolower($key);
-                if (!isset($attr[$new_key])) {
-                    $attr[$new_key] = $attr[$key];
-                }
-                if ($new_key !== $key) {
-                    unset($attr[$key]);
-                }
-            }
-        }
-        $this->attr = $attr;
-        $this->line = $line;
-        $this->col = $col;
-        $this->armor = $armor;
-    }
-
-    public function toNode() {
-        return new HTMLPurifier_Node_Element($this->name, $this->attr, $this->line, $this->col, $this->armor);
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/Text.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/Text.php
deleted file mode 100644
index f26a1c211b..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Token/Text.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/**
- * Concrete text token class.
- *
- * Text tokens comprise of regular parsed character data (PCDATA) and raw
- * character data (from the CDATA sections). Internally, their
- * data is parsed with all entities expanded. Surprisingly, the text token
- * does have a "tag name" called #PCDATA, which is how the DTD represents it
- * in permissible child nodes.
- */
-class HTMLPurifier_Token_Text extends HTMLPurifier_Token
-{
-
-    /**
-     * @type string
-     */
-    public $name = '#PCDATA';
-    /**< PCDATA tag name compatible with DTD. */
-
-    /**
-     * @type string
-     */
-    public $data;
-    /**< Parsed character data of text. */
-
-    /**
-     * @type bool
-     */
-    public $is_whitespace;
-
-    /**< Bool indicating if node is whitespace. */
-
-    /**
-     * Constructor, accepts data and determines if it is whitespace.
-     * @param string $data String parsed character data.
-     * @param int $line
-     * @param int $col
-     */
-    public function __construct($data, $line = null, $col = null)
-    {
-        $this->data = $data;
-        $this->is_whitespace = ctype_space($data);
-        $this->line = $line;
-        $this->col = $col;
-    }
-
-    public function toNode() {
-        return new HTMLPurifier_Node_Text($this->data, $this->is_whitespace, $this->line, $this->col);
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/TokenFactory.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/TokenFactory.php
deleted file mode 100644
index dea2446b93..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/TokenFactory.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-
-/**
- * Factory for token generation.
- *
- * @note Doing some benchmarking indicates that the new operator is much
- *       slower than the clone operator (even discounting the cost of the
- *       constructor).  This class is for that optimization.
- *       Other then that, there's not much point as we don't
- *       maintain parallel HTMLPurifier_Token hierarchies (the main reason why
- *       you'd want to use an abstract factory).
- * @todo Port DirectLex to use this
- */
-class HTMLPurifier_TokenFactory
-{
-    // p stands for prototype
-
-    /**
-     * @type HTMLPurifier_Token_Start
-     */
-    private $p_start;
-
-    /**
-     * @type HTMLPurifier_Token_End
-     */
-    private $p_end;
-
-    /**
-     * @type HTMLPurifier_Token_Empty
-     */
-    private $p_empty;
-
-    /**
-     * @type HTMLPurifier_Token_Text
-     */
-    private $p_text;
-
-    /**
-     * @type HTMLPurifier_Token_Comment
-     */
-    private $p_comment;
-
-    /**
-     * Generates blank prototypes for cloning.
-     */
-    public function __construct()
-    {
-        $this->p_start = new HTMLPurifier_Token_Start('', array());
-        $this->p_end = new HTMLPurifier_Token_End('');
-        $this->p_empty = new HTMLPurifier_Token_Empty('', array());
-        $this->p_text = new HTMLPurifier_Token_Text('');
-        $this->p_comment = new HTMLPurifier_Token_Comment('');
-    }
-
-    /**
-     * Creates a HTMLPurifier_Token_Start.
-     * @param string $name Tag name
-     * @param array $attr Associative array of attributes
-     * @return HTMLPurifier_Token_Start Generated HTMLPurifier_Token_Start
-     */
-    public function createStart($name, $attr = array())
-    {
-        $p = clone $this->p_start;
-        $p->__construct($name, $attr);
-        return $p;
-    }
-
-    /**
-     * Creates a HTMLPurifier_Token_End.
-     * @param string $name Tag name
-     * @return HTMLPurifier_Token_End Generated HTMLPurifier_Token_End
-     */
-    public function createEnd($name)
-    {
-        $p = clone $this->p_end;
-        $p->__construct($name);
-        return $p;
-    }
-
-    /**
-     * Creates a HTMLPurifier_Token_Empty.
-     * @param string $name Tag name
-     * @param array $attr Associative array of attributes
-     * @return HTMLPurifier_Token_Empty Generated HTMLPurifier_Token_Empty
-     */
-    public function createEmpty($name, $attr = array())
-    {
-        $p = clone $this->p_empty;
-        $p->__construct($name, $attr);
-        return $p;
-    }
-
-    /**
-     * Creates a HTMLPurifier_Token_Text.
-     * @param string $data Data of text token
-     * @return HTMLPurifier_Token_Text Generated HTMLPurifier_Token_Text
-     */
-    public function createText($data)
-    {
-        $p = clone $this->p_text;
-        $p->__construct($data);
-        return $p;
-    }
-
-    /**
-     * Creates a HTMLPurifier_Token_Comment.
-     * @param string $data Data of comment token
-     * @return HTMLPurifier_Token_Comment Generated HTMLPurifier_Token_Comment
-     */
-    public function createComment($data)
-    {
-        $p = clone $this->p_comment;
-        $p->__construct($data);
-        return $p;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URI.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URI.php
deleted file mode 100644
index 9c5be39d18..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URI.php
+++ /dev/null
@@ -1,316 +0,0 @@
-<?php
-
-/**
- * HTML Purifier's internal representation of a URI.
- * @note
- *      Internal data-structures are completely escaped. If the data needs
- *      to be used in a non-URI context (which is very unlikely), be sure
- *      to decode it first. The URI may not necessarily be well-formed until
- *      validate() is called.
- */
-class HTMLPurifier_URI
-{
-    /**
-     * @type string
-     */
-    public $scheme;
-
-    /**
-     * @type string
-     */
-    public $userinfo;
-
-    /**
-     * @type string
-     */
-    public $host;
-
-    /**
-     * @type int
-     */
-    public $port;
-
-    /**
-     * @type string
-     */
-    public $path;
-
-    /**
-     * @type string
-     */
-    public $query;
-
-    /**
-     * @type string
-     */
-    public $fragment;
-
-    /**
-     * @param string $scheme
-     * @param string $userinfo
-     * @param string $host
-     * @param int $port
-     * @param string $path
-     * @param string $query
-     * @param string $fragment
-     * @note Automatically normalizes scheme and port
-     */
-    public function __construct($scheme, $userinfo, $host, $port, $path, $query, $fragment)
-    {
-        $this->scheme = is_null($scheme) || ctype_lower($scheme) ? $scheme : strtolower($scheme);
-        $this->userinfo = $userinfo;
-        $this->host = $host;
-        $this->port = is_null($port) ? $port : (int)$port;
-        $this->path = $path;
-        $this->query = $query;
-        $this->fragment = $fragment;
-    }
-
-    /**
-     * Retrieves a scheme object corresponding to the URI's scheme/default
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return HTMLPurifier_URIScheme Scheme object appropriate for validating this URI
-     */
-    public function getSchemeObj($config, $context)
-    {
-        $registry = HTMLPurifier_URISchemeRegistry::instance();
-        if ($this->scheme !== null) {
-            $scheme_obj = $registry->getScheme($this->scheme, $config, $context);
-            if (!$scheme_obj) {
-                return false;
-            } // invalid scheme, clean it out
-        } else {
-            // no scheme: retrieve the default one
-            $def = $config->getDefinition('URI');
-            $scheme_obj = $def->getDefaultScheme($config, $context);
-            if (!$scheme_obj) {
-                if ($def->defaultScheme !== null) {
-                    // something funky happened to the default scheme object
-                    trigger_error(
-                        'Default scheme object "' . $def->defaultScheme . '" was not readable',
-                        E_USER_WARNING
-                    );
-                } // suppress error if it's null
-                return false;
-            }
-        }
-        return $scheme_obj;
-    }
-
-    /**
-     * Generic validation method applicable for all schemes. May modify
-     * this URI in order to get it into a compliant form.
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool True if validation/filtering succeeds, false if failure
-     */
-    public function validate($config, $context)
-    {
-        // ABNF definitions from RFC 3986
-        $chars_sub_delims = '!$&\'()*+,;=';
-        $chars_gen_delims = ':/?#[]@';
-        $chars_pchar = $chars_sub_delims . ':@';
-
-        // validate host
-        if (!is_null($this->host)) {
-            $host_def = new HTMLPurifier_AttrDef_URI_Host();
-            $this->host = $host_def->validate($this->host, $config, $context);
-            if ($this->host === false) {
-                $this->host = null;
-            }
-        }
-
-        // validate scheme
-        // NOTE: It's not appropriate to check whether or not this
-        // scheme is in our registry, since a URIFilter may convert a
-        // URI that we don't allow into one we do.  So instead, we just
-        // check if the scheme can be dropped because there is no host
-        // and it is our default scheme.
-        if (!is_null($this->scheme) && is_null($this->host) || $this->host === '') {
-            // support for relative paths is pretty abysmal when the
-            // scheme is present, so axe it when possible
-            $def = $config->getDefinition('URI');
-            if ($def->defaultScheme === $this->scheme) {
-                $this->scheme = null;
-            }
-        }
-
-        // validate username
-        if (!is_null($this->userinfo)) {
-            $encoder = new HTMLPurifier_PercentEncoder($chars_sub_delims . ':');
-            $this->userinfo = $encoder->encode($this->userinfo);
-        }
-
-        // validate port
-        if (!is_null($this->port)) {
-            if ($this->port < 1 || $this->port > 65535) {
-                $this->port = null;
-            }
-        }
-
-        // validate path
-        $segments_encoder = new HTMLPurifier_PercentEncoder($chars_pchar . '/');
-        if (!is_null($this->host)) { // this catches $this->host === ''
-            // path-abempty (hier and relative)
-            // http://www.example.com/my/path
-            // //www.example.com/my/path (looks odd, but works, and
-            //                            recognized by most browsers)
-            // (this set is valid or invalid on a scheme by scheme
-            // basis, so we'll deal with it later)
-            // file:///my/path
-            // ///my/path
-            $this->path = $segments_encoder->encode($this->path);
-        } elseif ($this->path !== '') {
-            if ($this->path[0] === '/') {
-                // path-absolute (hier and relative)
-                // http:/my/path
-                // /my/path
-                if (strlen($this->path) >= 2 && $this->path[1] === '/') {
-                    // This could happen if both the host gets stripped
-                    // out
-                    // http://my/path
-                    // //my/path
-                    $this->path = '';
-                } else {
-                    $this->path = $segments_encoder->encode($this->path);
-                }
-            } elseif (!is_null($this->scheme)) {
-                // path-rootless (hier)
-                // http:my/path
-                // Short circuit evaluation means we don't need to check nz
-                $this->path = $segments_encoder->encode($this->path);
-            } else {
-                // path-noscheme (relative)
-                // my/path
-                // (once again, not checking nz)
-                $segment_nc_encoder = new HTMLPurifier_PercentEncoder($chars_sub_delims . '@');
-                $c = strpos($this->path, '/');
-                if ($c !== false) {
-                    $this->path =
-                        $segment_nc_encoder->encode(substr($this->path, 0, $c)) .
-                        $segments_encoder->encode(substr($this->path, $c));
-                } else {
-                    $this->path = $segment_nc_encoder->encode($this->path);
-                }
-            }
-        } else {
-            // path-empty (hier and relative)
-            $this->path = ''; // just to be safe
-        }
-
-        // qf = query and fragment
-        $qf_encoder = new HTMLPurifier_PercentEncoder($chars_pchar . '/?');
-
-        if (!is_null($this->query)) {
-            $this->query = $qf_encoder->encode($this->query);
-        }
-
-        if (!is_null($this->fragment)) {
-            $this->fragment = $qf_encoder->encode($this->fragment);
-        }
-        return true;
-    }
-
-    /**
-     * Convert URI back to string
-     * @return string URI appropriate for output
-     */
-    public function toString()
-    {
-        // reconstruct authority
-        $authority = null;
-        // there is a rendering difference between a null authority
-        // (http:foo-bar) and an empty string authority
-        // (http:///foo-bar).
-        if (!is_null($this->host)) {
-            $authority = '';
-            if (!is_null($this->userinfo)) {
-                $authority .= $this->userinfo . '@';
-            }
-            $authority .= $this->host;
-            if (!is_null($this->port)) {
-                $authority .= ':' . $this->port;
-            }
-        }
-
-        // Reconstruct the result
-        // One might wonder about parsing quirks from browsers after
-        // this reconstruction.  Unfortunately, parsing behavior depends
-        // on what *scheme* was employed (file:///foo is handled *very*
-        // differently than http:///foo), so unfortunately we have to
-        // defer to the schemes to do the right thing.
-        $result = '';
-        if (!is_null($this->scheme)) {
-            $result .= $this->scheme . ':';
-        }
-        if (!is_null($authority)) {
-            $result .= '//' . $authority;
-        }
-        $result .= $this->path;
-        if (!is_null($this->query)) {
-            $result .= '?' . $this->query;
-        }
-        if (!is_null($this->fragment)) {
-            $result .= '#' . $this->fragment;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns true if this URL might be considered a 'local' URL given
-     * the current context.  This is true when the host is null, or
-     * when it matches the host supplied to the configuration.
-     *
-     * Note that this does not do any scheme checking, so it is mostly
-     * only appropriate for metadata that doesn't care about protocol
-     * security.  isBenign is probably what you actually want.
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool
-     */
-    public function isLocal($config, $context)
-    {
-        if ($this->host === null) {
-            return true;
-        }
-        $uri_def = $config->getDefinition('URI');
-        if ($uri_def->host === $this->host) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Returns true if this URL should be considered a 'benign' URL,
-     * that is:
-     *
-     *      - It is a local URL (isLocal), and
-     *      - It has a equal or better level of security
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool
-     */
-    public function isBenign($config, $context)
-    {
-        if (!$this->isLocal($config, $context)) {
-            return false;
-        }
-
-        $scheme_obj = $this->getSchemeObj($config, $context);
-        if (!$scheme_obj) {
-            return false;
-        } // conservative approach
-
-        $current_scheme_obj = $config->getDefinition('URI')->getDefaultScheme($config, $context);
-        if ($current_scheme_obj->secure) {
-            if (!$scheme_obj->secure) {
-                return false;
-            }
-        }
-        return true;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIDefinition.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIDefinition.php
deleted file mode 100644
index e0bd8bcca8..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIDefinition.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-
-class HTMLPurifier_URIDefinition extends HTMLPurifier_Definition
-{
-
-    public $type = 'URI';
-    protected $filters = array();
-    protected $postFilters = array();
-    protected $registeredFilters = array();
-
-    /**
-     * HTMLPurifier_URI object of the base specified at %URI.Base
-     */
-    public $base;
-
-    /**
-     * String host to consider "home" base, derived off of $base
-     */
-    public $host;
-
-    /**
-     * Name of default scheme based on %URI.DefaultScheme and %URI.Base
-     */
-    public $defaultScheme;
-
-    public function __construct()
-    {
-        $this->registerFilter(new HTMLPurifier_URIFilter_DisableExternal());
-        $this->registerFilter(new HTMLPurifier_URIFilter_DisableExternalResources());
-        $this->registerFilter(new HTMLPurifier_URIFilter_DisableResources());
-        $this->registerFilter(new HTMLPurifier_URIFilter_HostBlacklist());
-        $this->registerFilter(new HTMLPurifier_URIFilter_SafeIframe());
-        $this->registerFilter(new HTMLPurifier_URIFilter_MakeAbsolute());
-        $this->registerFilter(new HTMLPurifier_URIFilter_Munge());
-    }
-
-    public function registerFilter($filter)
-    {
-        $this->registeredFilters[$filter->name] = $filter;
-    }
-
-    public function addFilter($filter, $config)
-    {
-        $r = $filter->prepare($config);
-        if ($r === false) return; // null is ok, for backwards compat
-        if ($filter->post) {
-            $this->postFilters[$filter->name] = $filter;
-        } else {
-            $this->filters[$filter->name] = $filter;
-        }
-    }
-
-    protected function doSetup($config)
-    {
-        $this->setupMemberVariables($config);
-        $this->setupFilters($config);
-    }
-
-    protected function setupFilters($config)
-    {
-        foreach ($this->registeredFilters as $name => $filter) {
-            if ($filter->always_load) {
-                $this->addFilter($filter, $config);
-            } else {
-                $conf = $config->get('URI.' . $name);
-                if ($conf !== false && $conf !== null) {
-                    $this->addFilter($filter, $config);
-                }
-            }
-        }
-        unset($this->registeredFilters);
-    }
-
-    protected function setupMemberVariables($config)
-    {
-        $this->host = $config->get('URI.Host');
-        $base_uri = $config->get('URI.Base');
-        if (!is_null($base_uri)) {
-            $parser = new HTMLPurifier_URIParser();
-            $this->base = $parser->parse($base_uri);
-            $this->defaultScheme = $this->base->scheme;
-            if (is_null($this->host)) $this->host = $this->base->host;
-        }
-        if (is_null($this->defaultScheme)) $this->defaultScheme = $config->get('URI.DefaultScheme');
-    }
-
-    public function getDefaultScheme($config, $context)
-    {
-        return HTMLPurifier_URISchemeRegistry::instance()->getScheme($this->defaultScheme, $config, $context);
-    }
-
-    public function filter(&$uri, $config, $context)
-    {
-        foreach ($this->filters as $name => $f) {
-            $result = $f->filter($uri, $config, $context);
-            if (!$result) return false;
-        }
-        return true;
-    }
-
-    public function postFilter(&$uri, $config, $context)
-    {
-        foreach ($this->postFilters as $name => $f) {
-            $result = $f->filter($uri, $config, $context);
-            if (!$result) return false;
-        }
-        return true;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter.php
deleted file mode 100644
index 09724e9f41..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-/**
- * Chainable filters for custom URI processing.
- *
- * These filters can perform custom actions on a URI filter object,
- * including transformation or blacklisting.  A filter named Foo
- * must have a corresponding configuration directive %URI.Foo,
- * unless always_load is specified to be true.
- *
- * The following contexts may be available while URIFilters are being
- * processed:
- *
- *      - EmbeddedURI: true if URI is an embedded resource that will
- *        be loaded automatically on page load
- *      - CurrentToken: a reference to the token that is currently
- *        being processed
- *      - CurrentAttr: the name of the attribute that is currently being
- *        processed
- *      - CurrentCSSProperty: the name of the CSS property that is
- *        currently being processed (if applicable)
- *
- * @warning This filter is called before scheme object validation occurs.
- *          Make sure, if you require a specific scheme object, you
- *          you check that it exists. This allows filters to convert
- *          proprietary URI schemes into regular ones.
- */
-abstract class HTMLPurifier_URIFilter
-{
-
-    /**
-     * Unique identifier of filter.
-     * @type string
-     */
-    public $name;
-
-    /**
-     * True if this filter should be run after scheme validation.
-     * @type bool
-     */
-    public $post = false;
-
-    /**
-     * True if this filter should always be loaded.
-     * This permits a filter to be named Foo without the corresponding
-     * %URI.Foo directive existing.
-     * @type bool
-     */
-    public $always_load = false;
-
-    /**
-     * Performs initialization for the filter.  If the filter returns
-     * false, this means that it shouldn't be considered active.
-     * @param HTMLPurifier_Config $config
-     * @return bool
-     */
-    public function prepare($config)
-    {
-        return true;
-    }
-
-    /**
-     * Filter a URI object
-     * @param HTMLPurifier_URI $uri Reference to URI object variable
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool Whether or not to continue processing: false indicates
-     *         URL is no good, true indicates continue processing. Note that
-     *         all changes are committed directly on the URI object
-     */
-    abstract public function filter(&$uri, $config, $context);
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/DisableExternal.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/DisableExternal.php
deleted file mode 100644
index ced1b13763..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/DisableExternal.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-class HTMLPurifier_URIFilter_DisableExternal extends HTMLPurifier_URIFilter
-{
-    /**
-     * @type string
-     */
-    public $name = 'DisableExternal';
-
-    /**
-     * @type array
-     */
-    protected $ourHostParts = false;
-
-    /**
-     * @param HTMLPurifier_Config $config
-     * @return void
-     */
-    public function prepare($config)
-    {
-        $our_host = $config->getDefinition('URI')->host;
-        if ($our_host !== null) {
-            $this->ourHostParts = array_reverse(explode('.', $our_host));
-        }
-    }
-
-    /**
-     * @param HTMLPurifier_URI $uri Reference
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool
-     */
-    public function filter(&$uri, $config, $context)
-    {
-        if (is_null($uri->host)) {
-            return true;
-        }
-        if ($this->ourHostParts === false) {
-            return false;
-        }
-        $host_parts = array_reverse(explode('.', $uri->host));
-        foreach ($this->ourHostParts as $i => $x) {
-            if (!isset($host_parts[$i])) {
-                return false;
-            }
-            if ($host_parts[$i] != $this->ourHostParts[$i]) {
-                return false;
-            }
-        }
-        return true;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/DisableExternalResources.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/DisableExternalResources.php
deleted file mode 100644
index c6562169e0..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/DisableExternalResources.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-class HTMLPurifier_URIFilter_DisableExternalResources extends HTMLPurifier_URIFilter_DisableExternal
-{
-    /**
-     * @type string
-     */
-    public $name = 'DisableExternalResources';
-
-    /**
-     * @param HTMLPurifier_URI $uri
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool
-     */
-    public function filter(&$uri, $config, $context)
-    {
-        if (!$context->get('EmbeddedURI', true)) {
-            return true;
-        }
-        return parent::filter($uri, $config, $context);
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/DisableResources.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/DisableResources.php
deleted file mode 100644
index d5c412c444..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/DisableResources.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-class HTMLPurifier_URIFilter_DisableResources extends HTMLPurifier_URIFilter
-{
-    /**
-     * @type string
-     */
-    public $name = 'DisableResources';
-
-    /**
-     * @param HTMLPurifier_URI $uri
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool
-     */
-    public function filter(&$uri, $config, $context)
-    {
-        return !$context->get('EmbeddedURI', true);
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/HostBlacklist.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/HostBlacklist.php
deleted file mode 100644
index a6645c17ee..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/HostBlacklist.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-// It's not clear to me whether or not Punycode means that hostnames
-// do not have canonical forms anymore. As far as I can tell, it's
-// not a problem (punycoding should be identity when no Unicode
-// points are involved), but I'm not 100% sure
-class HTMLPurifier_URIFilter_HostBlacklist extends HTMLPurifier_URIFilter
-{
-    /**
-     * @type string
-     */
-    public $name = 'HostBlacklist';
-
-    /**
-     * @type array
-     */
-    protected $blacklist = array();
-
-    /**
-     * @param HTMLPurifier_Config $config
-     * @return bool
-     */
-    public function prepare($config)
-    {
-        $this->blacklist = $config->get('URI.HostBlacklist');
-        return true;
-    }
-
-    /**
-     * @param HTMLPurifier_URI $uri
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool
-     */
-    public function filter(&$uri, $config, $context)
-    {
-        foreach ($this->blacklist as $blacklisted_host_fragment) {
-            if (strpos($uri->host, $blacklisted_host_fragment) !== false) {
-                return false;
-            }
-        }
-        return true;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/MakeAbsolute.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/MakeAbsolute.php
deleted file mode 100644
index c507bbff8e..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/MakeAbsolute.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-
-// does not support network paths
-
-class HTMLPurifier_URIFilter_MakeAbsolute extends HTMLPurifier_URIFilter
-{
-    /**
-     * @type string
-     */
-    public $name = 'MakeAbsolute';
-
-    /**
-     * @type
-     */
-    protected $base;
-
-    /**
-     * @type array
-     */
-    protected $basePathStack = array();
-
-    /**
-     * @param HTMLPurifier_Config $config
-     * @return bool
-     */
-    public function prepare($config)
-    {
-        $def = $config->getDefinition('URI');
-        $this->base = $def->base;
-        if (is_null($this->base)) {
-            trigger_error(
-                'URI.MakeAbsolute is being ignored due to lack of ' .
-                'value for URI.Base configuration',
-                E_USER_WARNING
-            );
-            return false;
-        }
-        $this->base->fragment = null; // fragment is invalid for base URI
-        $stack = explode('/', $this->base->path);
-        array_pop($stack); // discard last segment
-        $stack = $this->_collapseStack($stack); // do pre-parsing
-        $this->basePathStack = $stack;
-        return true;
-    }
-
-    /**
-     * @param HTMLPurifier_URI $uri
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool
-     */
-    public function filter(&$uri, $config, $context)
-    {
-        if (is_null($this->base)) {
-            return true;
-        } // abort early
-        if ($uri->path === '' && is_null($uri->scheme) &&
-            is_null($uri->host) && is_null($uri->query) && is_null($uri->fragment)) {
-            // reference to current document
-            $uri = clone $this->base;
-            return true;
-        }
-        if (!is_null($uri->scheme)) {
-            // absolute URI already: don't change
-            if (!is_null($uri->host)) {
-                return true;
-            }
-            $scheme_obj = $uri->getSchemeObj($config, $context);
-            if (!$scheme_obj) {
-                // scheme not recognized
-                return false;
-            }
-            if (!$scheme_obj->hierarchical) {
-                // non-hierarchal URI with explicit scheme, don't change
-                return true;
-            }
-            // special case: had a scheme but always is hierarchical and had no authority
-        }
-        if (!is_null($uri->host)) {
-            // network path, don't bother
-            return true;
-        }
-        if ($uri->path === '') {
-            $uri->path = $this->base->path;
-        } elseif ($uri->path[0] !== '/') {
-            // relative path, needs more complicated processing
-            $stack = explode('/', $uri->path);
-            $new_stack = array_merge($this->basePathStack, $stack);
-            if ($new_stack[0] !== '' && !is_null($this->base->host)) {
-                array_unshift($new_stack, '');
-            }
-            $new_stack = $this->_collapseStack($new_stack);
-            $uri->path = implode('/', $new_stack);
-        } else {
-            // absolute path, but still we should collapse
-            $uri->path = implode('/', $this->_collapseStack(explode('/', $uri->path)));
-        }
-        // re-combine
-        $uri->scheme = $this->base->scheme;
-        if (is_null($uri->userinfo)) {
-            $uri->userinfo = $this->base->userinfo;
-        }
-        if (is_null($uri->host)) {
-            $uri->host = $this->base->host;
-        }
-        if (is_null($uri->port)) {
-            $uri->port = $this->base->port;
-        }
-        return true;
-    }
-
-    /**
-     * Resolve dots and double-dots in a path stack
-     * @param array $stack
-     * @return array
-     */
-    private function _collapseStack($stack)
-    {
-        $result = array();
-        $is_folder = false;
-        for ($i = 0; isset($stack[$i]); $i++) {
-            $is_folder = false;
-            // absorb an internally duplicated slash
-            if ($stack[$i] == '' && $i && isset($stack[$i + 1])) {
-                continue;
-            }
-            if ($stack[$i] == '..') {
-                if (!empty($result)) {
-                    $segment = array_pop($result);
-                    if ($segment === '' && empty($result)) {
-                        // error case: attempted to back out too far:
-                        // restore the leading slash
-                        $result[] = '';
-                    } elseif ($segment === '..') {
-                        $result[] = '..'; // cannot remove .. with ..
-                    }
-                } else {
-                    // relative path, preserve the double-dots
-                    $result[] = '..';
-                }
-                $is_folder = true;
-                continue;
-            }
-            if ($stack[$i] == '.') {
-                // silently absorb
-                $is_folder = true;
-                continue;
-            }
-            $result[] = $stack[$i];
-        }
-        if ($is_folder) {
-            $result[] = '';
-        }
-        return $result;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/Munge.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/Munge.php
deleted file mode 100644
index 6e03315a17..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/Munge.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-
-class HTMLPurifier_URIFilter_Munge extends HTMLPurifier_URIFilter
-{
-    /**
-     * @type string
-     */
-    public $name = 'Munge';
-
-    /**
-     * @type bool
-     */
-    public $post = true;
-
-    /**
-     * @type string
-     */
-    private $target;
-
-    /**
-     * @type HTMLPurifier_URIParser
-     */
-    private $parser;
-
-    /**
-     * @type bool
-     */
-    private $doEmbed;
-
-    /**
-     * @type string
-     */
-    private $secretKey;
-
-    /**
-     * @type array
-     */
-    protected $replace = array();
-
-    /**
-     * @param HTMLPurifier_Config $config
-     * @return bool
-     */
-    public function prepare($config)
-    {
-        $this->target = $config->get('URI.' . $this->name);
-        $this->parser = new HTMLPurifier_URIParser();
-        $this->doEmbed = $config->get('URI.MungeResources');
-        $this->secretKey = $config->get('URI.MungeSecretKey');
-        if ($this->secretKey && !function_exists('hash_hmac')) {
-            throw new Exception("Cannot use %URI.MungeSecretKey without hash_hmac support.");
-        }
-        return true;
-    }
-
-    /**
-     * @param HTMLPurifier_URI $uri
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool
-     */
-    public function filter(&$uri, $config, $context)
-    {
-        if ($context->get('EmbeddedURI', true) && !$this->doEmbed) {
-            return true;
-        }
-
-        $scheme_obj = $uri->getSchemeObj($config, $context);
-        if (!$scheme_obj) {
-            return true;
-        } // ignore unknown schemes, maybe another postfilter did it
-        if (!$scheme_obj->browsable) {
-            return true;
-        } // ignore non-browseable schemes, since we can't munge those in a reasonable way
-        if ($uri->isBenign($config, $context)) {
-            return true;
-        } // don't redirect if a benign URL
-
-        $this->makeReplace($uri, $config, $context);
-        $this->replace = array_map('rawurlencode', $this->replace);
-
-        $new_uri = strtr($this->target, $this->replace);
-        $new_uri = $this->parser->parse($new_uri);
-        // don't redirect if the target host is the same as the
-        // starting host
-        if ($uri->host === $new_uri->host) {
-            return true;
-        }
-        $uri = $new_uri; // overwrite
-        return true;
-    }
-
-    /**
-     * @param HTMLPurifier_URI $uri
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     */
-    protected function makeReplace($uri, $config, $context)
-    {
-        $string = $uri->toString();
-        // always available
-        $this->replace['%s'] = $string;
-        $this->replace['%r'] = $context->get('EmbeddedURI', true);
-        $token = $context->get('CurrentToken', true);
-        $this->replace['%n'] = $token ? $token->name : null;
-        $this->replace['%m'] = $context->get('CurrentAttr', true);
-        $this->replace['%p'] = $context->get('CurrentCSSProperty', true);
-        // not always available
-        if ($this->secretKey) {
-            $this->replace['%t'] = hash_hmac("sha256", $string, $this->secretKey);
-        }
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/SafeIframe.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/SafeIframe.php
deleted file mode 100644
index f609c47a34..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/SafeIframe.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-/**
- * Implements safety checks for safe iframes.
- *
- * @warning This filter is *critical* for ensuring that %HTML.SafeIframe
- * works safely.
- */
-class HTMLPurifier_URIFilter_SafeIframe extends HTMLPurifier_URIFilter
-{
-    /**
-     * @type string
-     */
-    public $name = 'SafeIframe';
-
-    /**
-     * @type bool
-     */
-    public $always_load = true;
-
-    /**
-     * @type string
-     */
-    protected $regexp = null;
-
-    // XXX: The not so good bit about how this is all set up now is we
-    // can't check HTML.SafeIframe in the 'prepare' step: we have to
-    // defer till the actual filtering.
-    /**
-     * @param HTMLPurifier_Config $config
-     * @return bool
-     */
-    public function prepare($config)
-    {
-        $this->regexp = $config->get('URI.SafeIframeRegexp');
-        return true;
-    }
-
-    /**
-     * @param HTMLPurifier_URI $uri
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool
-     */
-    public function filter(&$uri, $config, $context)
-    {
-        // check if filter not applicable
-        if (!$config->get('HTML.SafeIframe')) {
-            return true;
-        }
-        // check if the filter should actually trigger
-        if (!$context->get('EmbeddedURI', true)) {
-            return true;
-        }
-        $token = $context->get('CurrentToken', true);
-        if (!($token && $token->name == 'iframe')) {
-            return true;
-        }
-        // check if we actually have some whitelists enabled
-        if ($this->regexp === null) {
-            return false;
-        }
-        // actually check the whitelists
-        return preg_match($this->regexp, $uri->toString());
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIParser.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIParser.php
deleted file mode 100644
index 0e7381a07b..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIParser.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-/**
- * Parses a URI into the components and fragment identifier as specified
- * by RFC 3986.
- */
-class HTMLPurifier_URIParser
-{
-
-    /**
-     * Instance of HTMLPurifier_PercentEncoder to do normalization with.
-     */
-    protected $percentEncoder;
-
-    public function __construct()
-    {
-        $this->percentEncoder = new HTMLPurifier_PercentEncoder();
-    }
-
-    /**
-     * Parses a URI.
-     * @param $uri string URI to parse
-     * @return HTMLPurifier_URI representation of URI. This representation has
-     *         not been validated yet and may not conform to RFC.
-     */
-    public function parse($uri)
-    {
-        $uri = $this->percentEncoder->normalize($uri);
-
-        // Regexp is as per Appendix B.
-        // Note that ["<>] are an addition to the RFC's recommended
-        // characters, because they represent external delimeters.
-        $r_URI = '!'.
-            '(([a-zA-Z0-9\.\+\-]+):)?'. // 2. Scheme
-            '(//([^/?#"<>]*))?'. // 4. Authority
-            '([^?#"<>]*)'.       // 5. Path
-            '(\?([^#"<>]*))?'.   // 7. Query
-            '(#([^"<>]*))?'.     // 8. Fragment
-            '!';
-
-        $matches = array();
-        $result = preg_match($r_URI, $uri, $matches);
-
-        if (!$result) return false; // *really* invalid URI
-
-        // seperate out parts
-        $scheme     = !empty($matches[1]) ? $matches[2] : null;
-        $authority  = !empty($matches[3]) ? $matches[4] : null;
-        $path       = $matches[5]; // always present, can be empty
-        $query      = !empty($matches[6]) ? $matches[7] : null;
-        $fragment   = !empty($matches[8]) ? $matches[9] : null;
-
-        // further parse authority
-        if ($authority !== null) {
-            $r_authority = "/^((.+?)@)?(\[[^\]]+\]|[^:]*)(:(\d*))?/";
-            $matches = array();
-            preg_match($r_authority, $authority, $matches);
-            $userinfo   = !empty($matches[1]) ? $matches[2] : null;
-            $host       = !empty($matches[3]) ? $matches[3] : '';
-            $port       = !empty($matches[4]) ? (int) $matches[5] : null;
-        } else {
-            $port = $host = $userinfo = null;
-        }
-
-        return new HTMLPurifier_URI(
-            $scheme, $userinfo, $host, $port, $path, $query, $fragment);
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme.php
deleted file mode 100644
index fe9e82cf26..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-/**
- * Validator for the components of a URI for a specific scheme
- */
-abstract class HTMLPurifier_URIScheme
-{
-
-    /**
-     * Scheme's default port (integer). If an explicit port number is
-     * specified that coincides with the default port, it will be
-     * elided.
-     * @type int
-     */
-    public $default_port = null;
-
-    /**
-     * Whether or not URIs of this scheme are locatable by a browser
-     * http and ftp are accessible, while mailto and news are not.
-     * @type bool
-     */
-    public $browsable = false;
-
-    /**
-     * Whether or not data transmitted over this scheme is encrypted.
-     * https is secure, http is not.
-     * @type bool
-     */
-    public $secure = false;
-
-    /**
-     * Whether or not the URI always uses <hier_part>, resolves edge cases
-     * with making relative URIs absolute
-     * @type bool
-     */
-    public $hierarchical = false;
-
-    /**
-     * Whether or not the URI may omit a hostname when the scheme is
-     * explicitly specified, ala file:///path/to/file. As of writing,
-     * 'file' is the only scheme that browsers support his properly.
-     * @type bool
-     */
-    public $may_omit_host = false;
-
-    /**
-     * Validates the components of a URI for a specific scheme.
-     * @param HTMLPurifier_URI $uri Reference to a HTMLPurifier_URI object
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool success or failure
-     */
-    abstract public function doValidate(&$uri, $config, $context);
-
-    /**
-     * Public interface for validating components of a URI.  Performs a
-     * bunch of default actions. Don't overload this method.
-     * @param HTMLPurifier_URI $uri Reference to a HTMLPurifier_URI object
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool success or failure
-     */
-    public function validate(&$uri, $config, $context)
-    {
-        if ($this->default_port == $uri->port) {
-            $uri->port = null;
-        }
-        // kludge: browsers do funny things when the scheme but not the
-        // authority is set
-        if (!$this->may_omit_host &&
-            // if the scheme is present, a missing host is always in error
-            (!is_null($uri->scheme) && ($uri->host === '' || is_null($uri->host))) ||
-            // if the scheme is not present, a *blank* host is in error,
-            // since this translates into '///path' which most browsers
-            // interpret as being 'http://path'.
-            (is_null($uri->scheme) && $uri->host === '')
-        ) {
-            do {
-                if (is_null($uri->scheme)) {
-                    if (substr($uri->path, 0, 2) != '//') {
-                        $uri->host = null;
-                        break;
-                    }
-                    // URI is '////path', so we cannot nullify the
-                    // host to preserve semantics.  Try expanding the
-                    // hostname instead (fall through)
-                }
-                // first see if we can manually insert a hostname
-                $host = $config->get('URI.Host');
-                if (!is_null($host)) {
-                    $uri->host = $host;
-                } else {
-                    // we can't do anything sensible, reject the URL.
-                    return false;
-                }
-            } while (false);
-        }
-        return $this->doValidate($uri, $config, $context);
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/data.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/data.php
deleted file mode 100644
index 41c49d5533..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/data.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-
-/**
- * Implements data: URI for base64 encoded images supported by GD.
- */
-class HTMLPurifier_URIScheme_data extends HTMLPurifier_URIScheme
-{
-    /**
-     * @type bool
-     */
-    public $browsable = true;
-
-    /**
-     * @type array
-     */
-    public $allowed_types = array(
-        // you better write validation code for other types if you
-        // decide to allow them
-        'image/jpeg' => true,
-        'image/gif' => true,
-        'image/png' => true,
-    );
-    // this is actually irrelevant since we only write out the path
-    // component
-    /**
-     * @type bool
-     */
-    public $may_omit_host = true;
-
-    /**
-     * @param HTMLPurifier_URI $uri
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool
-     */
-    public function doValidate(&$uri, $config, $context)
-    {
-        $result = explode(',', $uri->path, 2);
-        $is_base64 = false;
-        $charset = null;
-        $content_type = null;
-        if (count($result) == 2) {
-            list($metadata, $data) = $result;
-            // do some legwork on the metadata
-            $metas = explode(';', $metadata);
-            while (!empty($metas)) {
-                $cur = array_shift($metas);
-                if ($cur == 'base64') {
-                    $is_base64 = true;
-                    break;
-                }
-                if (substr($cur, 0, 8) == 'charset=') {
-                    // doesn't match if there are arbitrary spaces, but
-                    // whatever dude
-                    if ($charset !== null) {
-                        continue;
-                    } // garbage
-                    $charset = substr($cur, 8); // not used
-                } else {
-                    if ($content_type !== null) {
-                        continue;
-                    } // garbage
-                    $content_type = $cur;
-                }
-            }
-        } else {
-            $data = $result[0];
-        }
-        if ($content_type !== null && empty($this->allowed_types[$content_type])) {
-            return false;
-        }
-        if ($charset !== null) {
-            // error; we don't allow plaintext stuff
-            $charset = null;
-        }
-        $data = rawurldecode($data);
-        if ($is_base64) {
-            $raw_data = base64_decode($data);
-        } else {
-            $raw_data = $data;
-        }
-        if ( strlen($raw_data) < 12 ) {
-            // error; exif_imagetype throws exception with small files,
-            // and this likely indicates a corrupt URI/failed parse anyway
-            return false;
-        }
-        // XXX probably want to refactor this into a general mechanism
-        // for filtering arbitrary content types
-        if (function_exists('sys_get_temp_dir')) {
-            $file = tempnam(sys_get_temp_dir(), "");
-        } else {
-            $file = tempnam("/tmp", "");
-        }
-        file_put_contents($file, $raw_data);
-        if (function_exists('exif_imagetype')) {
-            $image_code = exif_imagetype($file);
-            unlink($file);
-        } elseif (function_exists('getimagesize')) {
-            set_error_handler(array($this, 'muteErrorHandler'));
-            $info = getimagesize($file);
-            restore_error_handler();
-            unlink($file);
-            if ($info == false) {
-                return false;
-            }
-            $image_code = $info[2];
-        } else {
-            trigger_error("could not find exif_imagetype or getimagesize functions", E_USER_ERROR);
-        }
-        $real_content_type = image_type_to_mime_type($image_code);
-        if ($real_content_type != $content_type) {
-            // we're nice guys; if the content type is something else we
-            // support, change it over
-            if (empty($this->allowed_types[$real_content_type])) {
-                return false;
-            }
-            $content_type = $real_content_type;
-        }
-        // ok, it's kosher, rewrite what we need
-        $uri->userinfo = null;
-        $uri->host = null;
-        $uri->port = null;
-        $uri->fragment = null;
-        $uri->query = null;
-        $uri->path = "$content_type;base64," . base64_encode($raw_data);
-        return true;
-    }
-
-    /**
-     * @param int $errno
-     * @param string $errstr
-     */
-    public function muteErrorHandler($errno, $errstr)
-    {
-    }
-}
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/file.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/file.php
deleted file mode 100644
index 215be4ba80..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/file.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * Validates file as defined by RFC 1630 and RFC 1738.
- */
-class HTMLPurifier_URIScheme_file extends HTMLPurifier_URIScheme
-{
-    /**
-     * Generally file:// URLs are not accessible from most
-     * machines, so placing them as an img src is incorrect.
-     * @type bool
-     */
-    public $browsable = false;
-
-    /**
-     * Basically the *only* URI scheme for which this is true, since
-     * accessing files on the local machine is very common.  In fact,
-     * browsers on some operating systems don't understand the
-     * authority, though I hear it is used on Windows to refer to
-     * network shares.
-     * @type bool
-     */
-    public $may_omit_host = true;
-
-    /**
-     * @param HTMLPurifier_URI $uri
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool
-     */
-    public function doValidate(&$uri, $config, $context)
-    {
-        // Authentication method is not supported
-        $uri->userinfo = null;
-        // file:// makes no provisions for accessing the resource
-        $uri->port = null;
-        // While it seems to work on Firefox, the querystring has
-        // no possible effect and is thus stripped.
-        $uri->query = null;
-        return true;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/ftp.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/ftp.php
deleted file mode 100644
index 1eb43ee5c4..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/ftp.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * Validates ftp (File Transfer Protocol) URIs as defined by generic RFC 1738.
- */
-class HTMLPurifier_URIScheme_ftp extends HTMLPurifier_URIScheme
-{
-    /**
-     * @type int
-     */
-    public $default_port = 21;
-
-    /**
-     * @type bool
-     */
-    public $browsable = true; // usually
-
-    /**
-     * @type bool
-     */
-    public $hierarchical = true;
-
-    /**
-     * @param HTMLPurifier_URI $uri
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool
-     */
-    public function doValidate(&$uri, $config, $context)
-    {
-        $uri->query = null;
-
-        // typecode check
-        $semicolon_pos = strrpos($uri->path, ';'); // reverse
-        if ($semicolon_pos !== false) {
-            $type = substr($uri->path, $semicolon_pos + 1); // no semicolon
-            $uri->path = substr($uri->path, 0, $semicolon_pos);
-            $type_ret = '';
-            if (strpos($type, '=') !== false) {
-                // figure out whether or not the declaration is correct
-                list($key, $typecode) = explode('=', $type, 2);
-                if ($key !== 'type') {
-                    // invalid key, tack it back on encoded
-                    $uri->path .= '%3B' . $type;
-                } elseif ($typecode === 'a' || $typecode === 'i' || $typecode === 'd') {
-                    $type_ret = ";type=$typecode";
-                }
-            } else {
-                $uri->path .= '%3B' . $type;
-            }
-            $uri->path = str_replace(';', '%3B', $uri->path);
-            $uri->path .= $type_ret;
-        }
-        return true;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/http.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/http.php
deleted file mode 100644
index ce69ec438a..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/http.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * Validates http (HyperText Transfer Protocol) as defined by RFC 2616
- */
-class HTMLPurifier_URIScheme_http extends HTMLPurifier_URIScheme
-{
-    /**
-     * @type int
-     */
-    public $default_port = 80;
-
-    /**
-     * @type bool
-     */
-    public $browsable = true;
-
-    /**
-     * @type bool
-     */
-    public $hierarchical = true;
-
-    /**
-     * @param HTMLPurifier_URI $uri
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool
-     */
-    public function doValidate(&$uri, $config, $context)
-    {
-        $uri->userinfo = null;
-        return true;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/https.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/https.php
deleted file mode 100644
index 0e96882db9..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/https.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * Validates https (Secure HTTP) according to http scheme.
- */
-class HTMLPurifier_URIScheme_https extends HTMLPurifier_URIScheme_http
-{
-    /**
-     * @type int
-     */
-    public $default_port = 443;
-    /**
-     * @type bool
-     */
-    public $secure = true;
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/mailto.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/mailto.php
deleted file mode 100644
index c3a6b602a7..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/mailto.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-// VERY RELAXED! Shouldn't cause problems, not even Firefox checks if the
-// email is valid, but be careful!
-
-/**
- * Validates mailto (for E-mail) according to RFC 2368
- * @todo Validate the email address
- * @todo Filter allowed query parameters
- */
-
-class HTMLPurifier_URIScheme_mailto extends HTMLPurifier_URIScheme
-{
-    /**
-     * @type bool
-     */
-    public $browsable = false;
-
-    /**
-     * @type bool
-     */
-    public $may_omit_host = true;
-
-    /**
-     * @param HTMLPurifier_URI $uri
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool
-     */
-    public function doValidate(&$uri, $config, $context)
-    {
-        $uri->userinfo = null;
-        $uri->host     = null;
-        $uri->port     = null;
-        // we need to validate path against RFC 2368's addr-spec
-        return true;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/news.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/news.php
deleted file mode 100644
index 7490927d63..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/news.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * Validates news (Usenet) as defined by generic RFC 1738
- */
-class HTMLPurifier_URIScheme_news extends HTMLPurifier_URIScheme
-{
-    /**
-     * @type bool
-     */
-    public $browsable = false;
-
-    /**
-     * @type bool
-     */
-    public $may_omit_host = true;
-
-    /**
-     * @param HTMLPurifier_URI $uri
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool
-     */
-    public function doValidate(&$uri, $config, $context)
-    {
-        $uri->userinfo = null;
-        $uri->host = null;
-        $uri->port = null;
-        $uri->query = null;
-        // typecode check needed on path
-        return true;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/nntp.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/nntp.php
deleted file mode 100644
index f211d715e9..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/nntp.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * Validates nntp (Network News Transfer Protocol) as defined by generic RFC 1738
- */
-class HTMLPurifier_URIScheme_nntp extends HTMLPurifier_URIScheme
-{
-    /**
-     * @type int
-     */
-    public $default_port = 119;
-
-    /**
-     * @type bool
-     */
-    public $browsable = false;
-
-    /**
-     * @param HTMLPurifier_URI $uri
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool
-     */
-    public function doValidate(&$uri, $config, $context)
-    {
-        $uri->userinfo = null;
-        $uri->query = null;
-        return true;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/tel.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/tel.php
deleted file mode 100644
index 8cd1933527..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIScheme/tel.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- * Validates tel (for phone numbers).
- *
- * The relevant specifications for this protocol are RFC 3966 and RFC 5341,
- * but this class takes a much simpler approach: we normalize phone
- * numbers so that they only include (possibly) a leading plus,
- * and then any number of digits and x'es.
- */
-
-class HTMLPurifier_URIScheme_tel extends HTMLPurifier_URIScheme
-{
-    /**
-     * @type bool
-     */
-    public $browsable = false;
-
-    /**
-     * @type bool
-     */
-    public $may_omit_host = true;
-
-    /**
-     * @param HTMLPurifier_URI $uri
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return bool
-     */
-    public function doValidate(&$uri, $config, $context)
-    {
-        $uri->userinfo = null;
-        $uri->host     = null;
-        $uri->port     = null;
-
-        // Delete all non-numeric characters, non-x characters
-        // from phone number, EXCEPT for a leading plus sign.
-        $uri->path = preg_replace('/(?!^\+)[^\dx]/', '',
-                     // Normalize e(x)tension to lower-case
-                     str_replace('X', 'x', $uri->path));
-
-        return true;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URISchemeRegistry.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URISchemeRegistry.php
deleted file mode 100644
index 4ac8a0b76e..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URISchemeRegistry.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/**
- * Registry for retrieving specific URI scheme validator objects.
- */
-class HTMLPurifier_URISchemeRegistry
-{
-
-    /**
-     * Retrieve sole instance of the registry.
-     * @param HTMLPurifier_URISchemeRegistry $prototype Optional prototype to overload sole instance with,
-     *                   or bool true to reset to default registry.
-     * @return HTMLPurifier_URISchemeRegistry
-     * @note Pass a registry object $prototype with a compatible interface and
-     *       the function will copy it and return it all further times.
-     */
-    public static function instance($prototype = null)
-    {
-        static $instance = null;
-        if ($prototype !== null) {
-            $instance = $prototype;
-        } elseif ($instance === null || $prototype == true) {
-            $instance = new HTMLPurifier_URISchemeRegistry();
-        }
-        return $instance;
-    }
-
-    /**
-     * Cache of retrieved schemes.
-     * @type HTMLPurifier_URIScheme[]
-     */
-    protected $schemes = array();
-
-    /**
-     * Retrieves a scheme validator object
-     * @param string $scheme String scheme name like http or mailto
-     * @param HTMLPurifier_Config $config
-     * @param HTMLPurifier_Context $context
-     * @return HTMLPurifier_URIScheme
-     */
-    public function getScheme($scheme, $config, $context)
-    {
-        if (!$config) {
-            $config = HTMLPurifier_Config::createDefault();
-        }
-
-        // important, otherwise attacker could include arbitrary file
-        $allowed_schemes = $config->get('URI.AllowedSchemes');
-        if (!$config->get('URI.OverrideAllowedSchemes') &&
-            !isset($allowed_schemes[$scheme])
-        ) {
-            return;
-        }
-
-        if (isset($this->schemes[$scheme])) {
-            return $this->schemes[$scheme];
-        }
-        if (!isset($allowed_schemes[$scheme])) {
-            return;
-        }
-
-        $class = 'HTMLPurifier_URIScheme_' . $scheme;
-        if (!class_exists($class)) {
-            return;
-        }
-        $this->schemes[$scheme] = new $class();
-        return $this->schemes[$scheme];
-    }
-
-    /**
-     * Registers a custom scheme to the cache, bypassing reflection.
-     * @param string $scheme Scheme name
-     * @param HTMLPurifier_URIScheme $scheme_obj
-     */
-    public function register($scheme, $scheme_obj)
-    {
-        $this->schemes[$scheme] = $scheme_obj;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/UnitConverter.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/UnitConverter.php
deleted file mode 100644
index 166f3bf306..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/UnitConverter.php
+++ /dev/null
@@ -1,307 +0,0 @@
-<?php
-
-/**
- * Class for converting between different unit-lengths as specified by
- * CSS.
- */
-class HTMLPurifier_UnitConverter
-{
-
-    const ENGLISH = 1;
-    const METRIC = 2;
-    const DIGITAL = 3;
-
-    /**
-     * Units information array. Units are grouped into measuring systems
-     * (English, Metric), and are assigned an integer representing
-     * the conversion factor between that unit and the smallest unit in
-     * the system. Numeric indexes are actually magical constants that
-     * encode conversion data from one system to the next, with a O(n^2)
-     * constraint on memory (this is generally not a problem, since
-     * the number of measuring systems is small.)
-     */
-    protected static $units = array(
-        self::ENGLISH => array(
-            'px' => 3, // This is as per CSS 2.1 and Firefox. Your mileage may vary
-            'pt' => 4,
-            'pc' => 48,
-            'in' => 288,
-            self::METRIC => array('pt', '0.352777778', 'mm'),
-        ),
-        self::METRIC => array(
-            'mm' => 1,
-            'cm' => 10,
-            self::ENGLISH => array('mm', '2.83464567', 'pt'),
-        ),
-    );
-
-    /**
-     * Minimum bcmath precision for output.
-     * @type int
-     */
-    protected $outputPrecision;
-
-    /**
-     * Bcmath precision for internal calculations.
-     * @type int
-     */
-    protected $internalPrecision;
-
-    /**
-     * Whether or not BCMath is available.
-     * @type bool
-     */
-    private $bcmath;
-
-    public function __construct($output_precision = 4, $internal_precision = 10, $force_no_bcmath = false)
-    {
-        $this->outputPrecision = $output_precision;
-        $this->internalPrecision = $internal_precision;
-        $this->bcmath = !$force_no_bcmath && function_exists('bcmul');
-    }
-
-    /**
-     * Converts a length object of one unit into another unit.
-     * @param HTMLPurifier_Length $length
-     *      Instance of HTMLPurifier_Length to convert. You must validate()
-     *      it before passing it here!
-     * @param string $to_unit
-     *      Unit to convert to.
-     * @return HTMLPurifier_Length|bool
-     * @note
-     *      About precision: This conversion function pays very special
-     *      attention to the incoming precision of values and attempts
-     *      to maintain a number of significant figure. Results are
-     *      fairly accurate up to nine digits. Some caveats:
-     *          - If a number is zero-padded as a result of this significant
-     *            figure tracking, the zeroes will be eliminated.
-     *          - If a number contains less than four sigfigs ($outputPrecision)
-     *            and this causes some decimals to be excluded, those
-     *            decimals will be added on.
-     */
-    public function convert($length, $to_unit)
-    {
-        if (!$length->isValid()) {
-            return false;
-        }
-
-        $n = $length->getN();
-        $unit = $length->getUnit();
-
-        if ($n === '0' || $unit === false) {
-            return new HTMLPurifier_Length('0', false);
-        }
-
-        $state = $dest_state = false;
-        foreach (self::$units as $k => $x) {
-            if (isset($x[$unit])) {
-                $state = $k;
-            }
-            if (isset($x[$to_unit])) {
-                $dest_state = $k;
-            }
-        }
-        if (!$state || !$dest_state) {
-            return false;
-        }
-
-        // Some calculations about the initial precision of the number;
-        // this will be useful when we need to do final rounding.
-        $sigfigs = $this->getSigFigs($n);
-        if ($sigfigs < $this->outputPrecision) {
-            $sigfigs = $this->outputPrecision;
-        }
-
-        // BCMath's internal precision deals only with decimals. Use
-        // our default if the initial number has no decimals, or increase
-        // it by how ever many decimals, thus, the number of guard digits
-        // will always be greater than or equal to internalPrecision.
-        $log = (int)floor(log(abs($n), 10));
-        $cp = ($log < 0) ? $this->internalPrecision - $log : $this->internalPrecision; // internal precision
-
-        for ($i = 0; $i < 2; $i++) {
-
-            // Determine what unit IN THIS SYSTEM we need to convert to
-            if ($dest_state === $state) {
-                // Simple conversion
-                $dest_unit = $to_unit;
-            } else {
-                // Convert to the smallest unit, pending a system shift
-                $dest_unit = self::$units[$state][$dest_state][0];
-            }
-
-            // Do the conversion if necessary
-            if ($dest_unit !== $unit) {
-                $factor = $this->div(self::$units[$state][$unit], self::$units[$state][$dest_unit], $cp);
-                $n = $this->mul($n, $factor, $cp);
-                $unit = $dest_unit;
-            }
-
-            // Output was zero, so bail out early. Shouldn't ever happen.
-            if ($n === '') {
-                $n = '0';
-                $unit = $to_unit;
-                break;
-            }
-
-            // It was a simple conversion, so bail out
-            if ($dest_state === $state) {
-                break;
-            }
-
-            if ($i !== 0) {
-                // Conversion failed! Apparently, the system we forwarded
-                // to didn't have this unit. This should never happen!
-                return false;
-            }
-
-            // Pre-condition: $i == 0
-
-            // Perform conversion to next system of units
-            $n = $this->mul($n, self::$units[$state][$dest_state][1], $cp);
-            $unit = self::$units[$state][$dest_state][2];
-            $state = $dest_state;
-
-            // One more loop around to convert the unit in the new system.
-
-        }
-
-        // Post-condition: $unit == $to_unit
-        if ($unit !== $to_unit) {
-            return false;
-        }
-
-        // Useful for debugging:
-        //echo "<pre>n";
-        //echo "$n\nsigfigs = $sigfigs\nnew_log = $new_log\nlog = $log\nrp = $rp\n</pre>\n";
-
-        $n = $this->round($n, $sigfigs);
-        if (strpos($n, '.') !== false) {
-            $n = rtrim($n, '0');
-        }
-        $n = rtrim($n, '.');
-
-        return new HTMLPurifier_Length($n, $unit);
-    }
-
-    /**
-     * Returns the number of significant figures in a string number.
-     * @param string $n Decimal number
-     * @return int number of sigfigs
-     */
-    public function getSigFigs($n)
-    {
-        $n = ltrim($n, '0+-');
-        $dp = strpos($n, '.'); // decimal position
-        if ($dp === false) {
-            $sigfigs = strlen(rtrim($n, '0'));
-        } else {
-            $sigfigs = strlen(ltrim($n, '0.')); // eliminate extra decimal character
-            if ($dp !== 0) {
-                $sigfigs--;
-            }
-        }
-        return $sigfigs;
-    }
-
-    /**
-     * Adds two numbers, using arbitrary precision when available.
-     * @param string $s1
-     * @param string $s2
-     * @param int $scale
-     * @return string
-     */
-    private function add($s1, $s2, $scale)
-    {
-        if ($this->bcmath) {
-            return bcadd($s1, $s2, $scale);
-        } else {
-            return $this->scale((float)$s1 + (float)$s2, $scale);
-        }
-    }
-
-    /**
-     * Multiples two numbers, using arbitrary precision when available.
-     * @param string $s1
-     * @param string $s2
-     * @param int $scale
-     * @return string
-     */
-    private function mul($s1, $s2, $scale)
-    {
-        if ($this->bcmath) {
-            return bcmul($s1, $s2, $scale);
-        } else {
-            return $this->scale((float)$s1 * (float)$s2, $scale);
-        }
-    }
-
-    /**
-     * Divides two numbers, using arbitrary precision when available.
-     * @param string $s1
-     * @param string $s2
-     * @param int $scale
-     * @return string
-     */
-    private function div($s1, $s2, $scale)
-    {
-        if ($this->bcmath) {
-            return bcdiv($s1, $s2, $scale);
-        } else {
-            return $this->scale((float)$s1 / (float)$s2, $scale);
-        }
-    }
-
-    /**
-     * Rounds a number according to the number of sigfigs it should have,
-     * using arbitrary precision when available.
-     * @param float $n
-     * @param int $sigfigs
-     * @return string
-     */
-    private function round($n, $sigfigs)
-    {
-        $new_log = (int)floor(log(abs($n), 10)); // Number of digits left of decimal - 1
-        $rp = $sigfigs - $new_log - 1; // Number of decimal places needed
-        $neg = $n < 0 ? '-' : ''; // Negative sign
-        if ($this->bcmath) {
-            if ($rp >= 0) {
-                $n = bcadd($n, $neg . '0.' . str_repeat('0', $rp) . '5', $rp + 1);
-                $n = bcdiv($n, '1', $rp);
-            } else {
-                // This algorithm partially depends on the standardized
-                // form of numbers that comes out of bcmath.
-                $n = bcadd($n, $neg . '5' . str_repeat('0', $new_log - $sigfigs), 0);
-                $n = substr($n, 0, $sigfigs + strlen($neg)) . str_repeat('0', $new_log - $sigfigs + 1);
-            }
-            return $n;
-        } else {
-            return $this->scale(round($n, $sigfigs - $new_log - 1), $rp + 1);
-        }
-    }
-
-    /**
-     * Scales a float to $scale digits right of decimal point, like BCMath.
-     * @param float $r
-     * @param int $scale
-     * @return string
-     */
-    private function scale($r, $scale)
-    {
-        if ($scale < 0) {
-            // The f sprintf type doesn't support negative numbers, so we
-            // need to cludge things manually. First get the string.
-            $r = sprintf('%.0f', (float)$r);
-            // Due to floating point precision loss, $r will more than likely
-            // look something like 4652999999999.9234. We grab one more digit
-            // than we need to precise from $r and then use that to round
-            // appropriately.
-            $precise = (string)round(substr($r, 0, strlen($r) + $scale), -1);
-            // Now we return it, truncating the zero that was rounded off.
-            return substr($precise, 0, -1) . str_repeat('0', -$scale + 1);
-        }
-        return sprintf('%.' . $scale . 'f', (float)$r);
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/VarParser.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/VarParser.php
deleted file mode 100644
index 0c97c8289d..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/VarParser.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-
-/**
- * Parses string representations into their corresponding native PHP
- * variable type. The base implementation does a simple type-check.
- */
-class HTMLPurifier_VarParser
-{
-
-    const C_STRING = 1;
-    const ISTRING = 2;
-    const TEXT = 3;
-    const ITEXT = 4;
-    const C_INT = 5;
-    const C_FLOAT = 6;
-    const C_BOOL = 7;
-    const LOOKUP = 8;
-    const ALIST = 9;
-    const HASH = 10;
-    const C_MIXED = 11;
-
-    /**
-     * Lookup table of allowed types. Mainly for backwards compatibility, but
-     * also convenient for transforming string type names to the integer constants.
-     */
-    public static $types = array(
-        'string' => self::C_STRING,
-        'istring' => self::ISTRING,
-        'text' => self::TEXT,
-        'itext' => self::ITEXT,
-        'int' => self::C_INT,
-        'float' => self::C_FLOAT,
-        'bool' => self::C_BOOL,
-        'lookup' => self::LOOKUP,
-        'list' => self::ALIST,
-        'hash' => self::HASH,
-        'mixed' => self::C_MIXED
-    );
-
-    /**
-     * Lookup table of types that are string, and can have aliases or
-     * allowed value lists.
-     */
-    public static $stringTypes = array(
-        self::C_STRING => true,
-        self::ISTRING => true,
-        self::TEXT => true,
-        self::ITEXT => true,
-    );
-
-    /**
-     * Validate a variable according to type.
-     * It may return NULL as a valid type if $allow_null is true.
-     *
-     * @param mixed $var Variable to validate
-     * @param int $type Type of variable, see HTMLPurifier_VarParser->types
-     * @param bool $allow_null Whether or not to permit null as a value
-     * @return string Validated and type-coerced variable
-     * @throws HTMLPurifier_VarParserException
-     */
-    final public function parse($var, $type, $allow_null = false)
-    {
-        if (is_string($type)) {
-            if (!isset(HTMLPurifier_VarParser::$types[$type])) {
-                throw new HTMLPurifier_VarParserException("Invalid type '$type'");
-            } else {
-                $type = HTMLPurifier_VarParser::$types[$type];
-            }
-        }
-        $var = $this->parseImplementation($var, $type, $allow_null);
-        if ($allow_null && $var === null) {
-            return null;
-        }
-        // These are basic checks, to make sure nothing horribly wrong
-        // happened in our implementations.
-        switch ($type) {
-            case (self::C_STRING):
-            case (self::ISTRING):
-            case (self::TEXT):
-            case (self::ITEXT):
-                if (!is_string($var)) {
-                    break;
-                }
-                if ($type == self::ISTRING || $type == self::ITEXT) {
-                    $var = strtolower($var);
-                }
-                return $var;
-            case (self::C_INT):
-                if (!is_int($var)) {
-                    break;
-                }
-                return $var;
-            case (self::C_FLOAT):
-                if (!is_float($var)) {
-                    break;
-                }
-                return $var;
-            case (self::C_BOOL):
-                if (!is_bool($var)) {
-                    break;
-                }
-                return $var;
-            case (self::LOOKUP):
-            case (self::ALIST):
-            case (self::HASH):
-                if (!is_array($var)) {
-                    break;
-                }
-                if ($type === self::LOOKUP) {
-                    foreach ($var as $k) {
-                        if ($k !== true) {
-                            $this->error('Lookup table contains value other than true');
-                        }
-                    }
-                } elseif ($type === self::ALIST) {
-                    $keys = array_keys($var);
-                    if (array_keys($keys) !== $keys) {
-                        $this->error('Indices for list are not uniform');
-                    }
-                }
-                return $var;
-            case (self::C_MIXED):
-                return $var;
-            default:
-                $this->errorInconsistent(get_class($this), $type);
-        }
-        $this->errorGeneric($var, $type);
-    }
-
-    /**
-     * Actually implements the parsing. Base implementation does not
-     * do anything to $var. Subclasses should overload this!
-     * @param mixed $var
-     * @param int $type
-     * @param bool $allow_null
-     * @return string
-     */
-    protected function parseImplementation($var, $type, $allow_null)
-    {
-        return $var;
-    }
-
-    /**
-     * Throws an exception.
-     * @throws HTMLPurifier_VarParserException
-     */
-    protected function error($msg)
-    {
-        throw new HTMLPurifier_VarParserException($msg);
-    }
-
-    /**
-     * Throws an inconsistency exception.
-     * @note This should not ever be called. It would be called if we
-     *       extend the allowed values of HTMLPurifier_VarParser without
-     *       updating subclasses.
-     * @param string $class
-     * @param int $type
-     * @throws HTMLPurifier_Exception
-     */
-    protected function errorInconsistent($class, $type)
-    {
-        throw new HTMLPurifier_Exception(
-            "Inconsistency in $class: " . HTMLPurifier_VarParser::getTypeName($type) .
-            " not implemented"
-        );
-    }
-
-    /**
-     * Generic error for if a type didn't work.
-     * @param mixed $var
-     * @param int $type
-     */
-    protected function errorGeneric($var, $type)
-    {
-        $vtype = gettype($var);
-        $this->error("Expected type " . HTMLPurifier_VarParser::getTypeName($type) . ", got $vtype");
-    }
-
-    /**
-     * @param int $type
-     * @return string
-     */
-    public static function getTypeName($type)
-    {
-        static $lookup;
-        if (!$lookup) {
-            // Lazy load the alternative lookup table
-            $lookup = array_flip(HTMLPurifier_VarParser::$types);
-        }
-        if (!isset($lookup[$type])) {
-            return 'unknown';
-        }
-        return $lookup[$type];
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Flexible.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Flexible.php
deleted file mode 100644
index 3bfbe83868..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Flexible.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-
-/**
- * Performs safe variable parsing based on types which can be used by
- * users. This may not be able to represent all possible data inputs,
- * however.
- */
-class HTMLPurifier_VarParser_Flexible extends HTMLPurifier_VarParser
-{
-    /**
-     * @param mixed $var
-     * @param int $type
-     * @param bool $allow_null
-     * @return array|bool|float|int|mixed|null|string
-     * @throws HTMLPurifier_VarParserException
-     */
-    protected function parseImplementation($var, $type, $allow_null)
-    {
-        if ($allow_null && $var === null) {
-            return null;
-        }
-        switch ($type) {
-            // Note: if code "breaks" from the switch, it triggers a generic
-            // exception to be thrown. Specific errors can be specifically
-            // done here.
-            case self::C_MIXED:
-            case self::ISTRING:
-            case self::C_STRING:
-            case self::TEXT:
-            case self::ITEXT:
-                return $var;
-            case self::C_INT:
-                if (is_string($var) && ctype_digit($var)) {
-                    $var = (int)$var;
-                }
-                return $var;
-            case self::C_FLOAT:
-                if ((is_string($var) && is_numeric($var)) || is_int($var)) {
-                    $var = (float)$var;
-                }
-                return $var;
-            case self::C_BOOL:
-                if (is_int($var) && ($var === 0 || $var === 1)) {
-                    $var = (bool)$var;
-                } elseif (is_string($var)) {
-                    if ($var == 'on' || $var == 'true' || $var == '1') {
-                        $var = true;
-                    } elseif ($var == 'off' || $var == 'false' || $var == '0') {
-                        $var = false;
-                    } else {
-                        throw new HTMLPurifier_VarParserException("Unrecognized value '$var' for $type");
-                    }
-                }
-                return $var;
-            case self::ALIST:
-            case self::HASH:
-            case self::LOOKUP:
-                if (is_string($var)) {
-                    // special case: technically, this is an array with
-                    // a single empty string item, but having an empty
-                    // array is more intuitive
-                    if ($var == '') {
-                        return array();
-                    }
-                    if (strpos($var, "\n") === false && strpos($var, "\r") === false) {
-                        // simplistic string to array method that only works
-                        // for simple lists of tag names or alphanumeric characters
-                        $var = explode(',', $var);
-                    } else {
-                        $var = preg_split('/(,|[\n\r]+)/', $var);
-                    }
-                    // remove spaces
-                    foreach ($var as $i => $j) {
-                        $var[$i] = trim($j);
-                    }
-                    if ($type === self::HASH) {
-                        // key:value,key2:value2
-                        $nvar = array();
-                        foreach ($var as $keypair) {
-                            $c = explode(':', $keypair, 2);
-                            if (!isset($c[1])) {
-                                continue;
-                            }
-                            $nvar[trim($c[0])] = trim($c[1]);
-                        }
-                        $var = $nvar;
-                    }
-                }
-                if (!is_array($var)) {
-                    break;
-                }
-                $keys = array_keys($var);
-                if ($keys === array_keys($keys)) {
-                    if ($type == self::ALIST) {
-                        return $var;
-                    } elseif ($type == self::LOOKUP) {
-                        $new = array();
-                        foreach ($var as $key) {
-                            $new[$key] = true;
-                        }
-                        return $new;
-                    } else {
-                        break;
-                    }
-                }
-                if ($type === self::ALIST) {
-                    trigger_error("Array list did not have consecutive integer indexes", E_USER_WARNING);
-                    return array_values($var);
-                }
-                if ($type === self::LOOKUP) {
-                    foreach ($var as $key => $value) {
-                        if ($value !== true) {
-                            trigger_error(
-                                "Lookup array has non-true value at key '$key'; " .
-                                "maybe your input array was not indexed numerically",
-                                E_USER_WARNING
-                            );
-                        }
-                        $var[$key] = true;
-                    }
-                }
-                return $var;
-            default:
-                $this->errorInconsistent(__CLASS__, $type);
-        }
-        $this->errorGeneric($var, $type);
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Native.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Native.php
deleted file mode 100644
index f11c318efb..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Native.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/**
- * This variable parser uses PHP's internal code engine. Because it does
- * this, it can represent all inputs; however, it is dangerous and cannot
- * be used by users.
- */
-class HTMLPurifier_VarParser_Native extends HTMLPurifier_VarParser
-{
-
-    /**
-     * @param mixed $var
-     * @param int $type
-     * @param bool $allow_null
-     * @return null|string
-     */
-    protected function parseImplementation($var, $type, $allow_null)
-    {
-        return $this->evalExpression($var);
-    }
-
-    /**
-     * @param string $expr
-     * @return mixed
-     * @throws HTMLPurifier_VarParserException
-     */
-    protected function evalExpression($expr)
-    {
-        $var = null;
-        $result = eval("\$var = $expr;");
-        if ($result === false) {
-            throw new HTMLPurifier_VarParserException("Fatal error in evaluated code");
-        }
-        return $var;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/VarParserException.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/VarParserException.php
deleted file mode 100644
index 5df3414959..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/VarParserException.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-/**
- * Exception type for HTMLPurifier_VarParser
- */
-class HTMLPurifier_VarParserException extends HTMLPurifier_Exception
-{
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Zipper.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Zipper.php
deleted file mode 100644
index 6e21ea0703..0000000000
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Zipper.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-
-/**
- * A zipper is a purely-functional data structure which contains
- * a focus that can be efficiently manipulated.  It is known as
- * a "one-hole context".  This mutable variant implements a zipper
- * for a list as a pair of two arrays, laid out as follows:
- *
- *      Base list: 1 2 3 4 [ ] 6 7 8 9
- *      Front list: 1 2 3 4
- *      Back list: 9 8 7 6
- *
- * User is expected to keep track of the "current element" and properly
- * fill it back in as necessary.  (ToDo: Maybe it's more user friendly
- * to implicitly track the current element?)
- *
- * Nota bene: the current class gets confused if you try to store NULLs
- * in the list.
- */
-
-class HTMLPurifier_Zipper
-{
-    public $front, $back;
-
-    public function __construct($front, $back) {
-        $this->front = $front;
-        $this->back = $back;
-    }
-
-    /**
-     * Creates a zipper from an array, with a hole in the
-     * 0-index position.
-     * @param Array to zipper-ify.
-     * @return Tuple of zipper and element of first position.
-     */
-    static public function fromArray($array) {
-        $z = new self(array(), array_reverse($array));
-        $t = $z->delete(); // delete the "dummy hole"
-        return array($z, $t);
-    }
-
-    /**
-     * Convert zipper back into a normal array, optionally filling in
-     * the hole with a value. (Usually you should supply a $t, unless you
-     * are at the end of the array.)
-     */
-    public function toArray($t = NULL) {
-        $a = $this->front;
-        if ($t !== NULL) $a[] = $t;
-        for ($i = count($this->back)-1; $i >= 0; $i--) {
-            $a[] = $this->back[$i];
-        }
-        return $a;
-    }
-
-    /**
-     * Move hole to the next element.
-     * @param $t Element to fill hole with
-     * @return Original contents of new hole.
-     */
-    public function next($t) {
-        if ($t !== NULL) array_push($this->front, $t);
-        return empty($this->back) ? NULL : array_pop($this->back);
-    }
-
-    /**
-     * Iterated hole advancement.
-     * @param $t Element to fill hole with
-     * @param $i How many forward to advance hole
-     * @return Original contents of new hole, i away
-     */
-    public function advance($t, $n) {
-        for ($i = 0; $i < $n; $i++) {
-            $t = $this->next($t);
-        }
-        return $t;
-    }
-
-    /**
-     * Move hole to the previous element
-     * @param $t Element to fill hole with
-     * @return Original contents of new hole.
-     */
-    public function prev($t) {
-        if ($t !== NULL) array_push($this->back, $t);
-        return empty($this->front) ? NULL : array_pop($this->front);
-    }
-
-    /**
-     * Delete contents of current hole, shifting hole to
-     * next element.
-     * @return Original contents of new hole.
-     */
-    public function delete() {
-        return empty($this->back) ? NULL : array_pop($this->back);
-    }
-
-    /**
-     * Returns true if we are at the end of the list.
-     * @return bool
-     */
-    public function done() {
-        return empty($this->back);
-    }
-
-    /**
-     * Insert element before hole.
-     * @param Element to insert
-     */
-    public function insertBefore($t) {
-        if ($t !== NULL) array_push($this->front, $t);
-    }
-
-    /**
-     * Insert element after hole.
-     * @param Element to insert
-     */
-    public function insertAfter($t) {
-        if ($t !== NULL) array_push($this->back, $t);
-    }
-
-    /**
-     * Splice in multiple elements at hole.  Functional specification
-     * in terms of array_splice:
-     *
-     *      $arr1 = $arr;
-     *      $old1 = array_splice($arr1, $i, $delete, $replacement);
-     *
-     *      list($z, $t) = HTMLPurifier_Zipper::fromArray($arr);
-     *      $t = $z->advance($t, $i);
-     *      list($old2, $t) = $z->splice($t, $delete, $replacement);
-     *      $arr2 = $z->toArray($t);
-     *
-     *      assert($old1 === $old2);
-     *      assert($arr1 === $arr2);
-     *
-     * NB: the absolute index location after this operation is
-     * *unchanged!*
-     *
-     * @param Current contents of hole.
-     */
-    public function splice($t, $delete, $replacement) {
-        // delete
-        $old = array();
-        $r = $t;
-        for ($i = $delete; $i > 0; $i--) {
-            $old[] = $r;
-            $r = $this->delete();
-        }
-        // insert
-        for ($i = count($replacement)-1; $i >= 0; $i--) {
-            $this->insertAfter($r);
-            $r = $replacement[$i];
-        }
-        return array($old, $r);
-    }
-}
diff --git a/vendor/jumbojett/openid-connect-php/.github/dependabot.yml b/vendor/jumbojett/openid-connect-php/.github/dependabot.yml
new file mode 100644
index 0000000000..a54473b417
--- /dev/null
+++ b/vendor/jumbojett/openid-connect-php/.github/dependabot.yml
@@ -0,0 +1,19 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+
+updates:
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+
+  # Maintain dependencies for composer
+  - package-ecosystem: "composer"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/vendor/jumbojett/openid-connect-php/.github/workflows/build.yml b/vendor/jumbojett/openid-connect-php/.github/workflows/build.yml
index 2033968d43..38080af1b2 100644
--- a/vendor/jumbojett/openid-connect-php/.github/workflows/build.yml
+++ b/vendor/jumbojett/openid-connect-php/.github/workflows/build.yml
@@ -1,7 +1,13 @@
 ---
 name: build
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
 
 env:
     DEFAULT_COMPOSER_FLAGS: "--prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi"
@@ -14,20 +20,20 @@ jobs:
             fail-fast: false
             matrix:
                 os: [ubuntu-latest]
-                php: ['5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1']
+                php: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v2
+              uses: actions/checkout@v4
             - name: Install PHP
               uses: shivammathur/setup-php@v2
               with:
                   php-version: ${{ matrix.php }}
             - name: Get composer cache directory
               id: composer-cache
-              run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+              run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
             - name: Cache composer dependencies
-              uses: actions/cache@v1
+              uses: actions/cache@v4
               with:
                   path: ${{ steps.composer-cache.outputs.dir }}
                   key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -35,4 +41,4 @@ jobs:
             - name: Install dependencies
               run: composer update $DEFAULT_COMPOSER_FLAGS
             - name: Run unit tests
-              run: vendor/bin/phpunit --verbose --colors=always tests
+              run: vendor/bin/phpunit --colors=always tests
diff --git a/vendor/jumbojett/openid-connect-php/CHANGELOG.md b/vendor/jumbojett/openid-connect-php/CHANGELOG.md
index eacd7d3c2b..0e1c710571 100644
--- a/vendor/jumbojett/openid-connect-php/CHANGELOG.md
+++ b/vendor/jumbojett/openid-connect-php/CHANGELOG.md
@@ -1,185 +1,194 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-The format is based on [Keep a Changelog](http://keepachangelog.com/)
-and this project adheres to [Semantic Versioning](http://semver.org/).
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.9.10]
+## [1.0.1] - 2024-09-13
 
-## Fixed
+### Fixed
+- Cast `$_SERVER['SERVER_PORT']` to integer to prevent adding 80 or 443 port to redirect URL. #437
 
-* `private_key_jwt` and `client_secret_jwt` need to explicitly be enabled #331
+## [1.0.1] - 2024-09-05
 
+### Fixed
+- Fix JWT decode of non JWT tokens #428
+- Fix method signatures #427
+- Cast `$_SERVER['SERVER_PORT']` to integer to prevent adding 80 or 443 port to redirect URL. #403
+- Check subject when verifying JWT #406
+- Removed duplicate check on jwks_uri and only check if jwks_uri exists when needed #373
 
-## [0.9.9]
+## [1.0.0] - 2023-12-13
 
 ### Added
+- PHP 7.0 is required. #327
+- Support for signed and encrypted UserInfo response and ID Token. #305
+- Allow to set User-Agent header. #370
 
-* Added support for back-channel logout. #302
-* Added support for `private_key_jwt` Client Authentication method #322
-* Added support for `client_secret_jwt` Client Authentication method #324
-* Added PS512 encryption support #342
+### Fixed
+- User-Agent is set for any HTTP method in fetchURL() (not just POST). #382
+- Update visibility of getWellKnownConfigValue to protected. #363
+- Fixed issue on authentication for php8. #354
+- Update construct typehint in docblock. #364
+- Fixed LogoutToken verification for single value aud claims. #334
+- Update well known config value function response types. #376
 
-## Fixed
+## [0.9.10] - 2022-09-30
 
-* Harden self-signed JWK header usage. #323
+### Fixed
+- `private_key_jwt` and `client_secret_jwt` need to explicitly be enabled #331
 
-## [0.9.8]
+## [0.9.9] - 2022-09-28
 
-## Fixed
+### Added
+- Added support for back-channel logout. #302
+- Added support for `private_key_jwt` Client Authentication method #322
+- Added support for `client_secret_jwt` Client Authentication method #324
+- Added PS512 encryption support #342
 
-* Do not use PKCE if IdP does not support it. #317
+### Fixed
+- Harden self-signed JWK header usage. #323
 
-## [0.9.7]
+## [0.9.8] - 2022-08-05
 
-### Added
+### Fixed
+- Do not use PKCE if IdP does not support it. #317
 
-* Support for Self-Contained JWTs. #308
-* Support for RFC8693 Token Exchange Request. #275
+## [0.9.7] - 2022-07-13
 
-### Fixed
+### Added
+- Support for Self-Contained JWTs. #308
+- Support for RFC8693 Token Exchange Request. #275
 
-* PHP 5.4 compatibility. #304
-* Use session_status(). #306
+### Fixed
+- PHP 5.4 compatibility. #304
+- Use session_status(). #306
 
-## [0.9.6]
+## [0.9.6] - 2022-05-08
 
 ### Added
-
-* Support for [phpseclib/phpseclib](https://phpseclib.com/) version **3**. #260
-* Support client_secret on token endpoint with PKCE. #293
-* Added new parameter to `requestTokens()` to pass custom HTTP headers #297
+- Support for [phpseclib/phpseclib](https://phpseclib.com/) version **3**. #260
+- Support client_secret on token endpoint with PKCE. #293
+- Added new parameter to `requestTokens()` to pass custom HTTP headers #297
 
 ### Changed
+- Allow serializing `OpenIDConnectClient` using `serialize()` #295
 
-* Allow serializing `OpenIDConnectClient` using `serialize()` #295
-
-## [0.9.5]
+## [0.9.5] - 2021-11-24
 
 ### Changed
+- signOut() Method parameter $accessToken -> $idToken to prevent confusion about access and id tokens usage. #127
+- Fixed issue where missing nonce within the claims was causing an exception. #280
 
-* signOut() Method parameter $accessToken -> $idToken to prevent confusion about access and id tokens usage. #127
-* Fixed issue where missing nonce within the claims was causing an exception. #280
-
-## [0.9.4]
+## [0.9.4] - 2021-11-21
 
 ### Added
+- Enabled `client_secret_basic` authentication on `refreshToken()` #215
+- Basic auth support for requestResourceOwnerToken #271
 
-* Enabled `client_secret_basic` authentication on `refreshToken()` #215
-* Basic auth support for requestResourceOwnerToken #271
-
-## [0.9.3]
+## [0.9.3] - 2021-11-20
 
 ### Added
+- getRedirectURL() will not log a warning for PHP 7.1+ #179
+- it is now possible to disable upgrading from HTTP to HTTPS for development purposes by calling `setHttpUpgradeInsecureRequests(false)` #241
+- bugfix in getSessionKey when _SESSION key does not exist #251
+- Added scope parameter to refresh token request #225
+- bugfix in `verifyJWTclaims` when $accessToken is empty and $claims->at_hash is not #276
+- bugfix with the `empty` function in PHP 5.4 #267
 
-* getRedirectURL() will not log a warning for PHP 7.1+ #179
-* it is now possible to disable upgrading from HTTP to HTTPS for development purposes by calling `setHttpUpgradeInsecureRequests(false)` #241
-* bugfix in getSessionKey when _SESSION key does not exist #251
-* Added scope parameter to refresh token request #225
-* bugfix in `verifyJWTclaims` when $accessToken is empty and $claims->at_hash is not #276
-* bugfix with the `empty` function in PHP 5.4 #267
-
-## [0.9.2]
+## [0.9.2] - 2020-11-16
 
 ### Added
-* Support for [PKCE](https://tools.ietf.org/html/rfc7636). Currently, the supported methods are 'plain' and 'S256'.
+- Support for [PKCE](https://tools.ietf.org/html/rfc7636). Currently, the supported methods are 'plain' and 'S256'.
 
-## [0.9.1]
+## [0.9.1] - 2020-08-27
 
 ### Added
-* Add support for MS Azure Active Directory B2C user flows
+- Add support for MS Azure Active Directory B2C user flows
 
 ### Changed
-* Fix at_hash verification #200
-* Getters for public parameters #204
-* Removed client ID query parameter when making a token request using Basic Auth
-* Use of `random_bytes()` for token generation instead of `uniqid()`; polyfill for PHP < 7.0 provided.
+- Fix at_hash verification #200
+- Getters for public parameters #204
+- Removed client ID query parameter when making a token request using Basic Auth
+- Use of `random_bytes()` for token generation instead of `uniqid()`; polyfill for PHP < 7.0 provided.
 
 ### Removed
-* Removed explicit content-length header - caused issues with proxy servers
-
+- Removed explicit content-length header - caused issues with proxy servers
 
-## [0.9.0]
+## [0.9.0] - 2020-03-09
 
 ### Added
-* php 7.4 deprecates array_key_exists on objects, use property_exists in getVerifiedClaims and requestUserInfo
-* Adding a header to indicate JSON as the return type for userinfo endpoint #151
-* ~Updated OpenIDConnectClient to conditionally verify nonce #146~
-* Add possibility to change enc_type parameter for http_build_query #155
-* Adding OAuth 2.0 Token Introspection #156
-* Add optional parameters clientId/clientSecret for introspection #157 & #158
-* Adding OAuth 2.0 Token Revocation #160
-* Adding issuer validator #145
-* Adding signing algorithm PS256 #180
-* Check http status of request user info #186
-* URL encode clientId and clientSecret when using basic authentication, according to https://tools.ietf.org/html/rfc6749#section-2.3.1 #192
-* Adjust PHPDoc to state that null is also allowed #193
+- php 7.4 deprecates array_key_exists on objects, use property_exists in getVerifiedClaims and requestUserInfo
+- Adding a header to indicate JSON as the return type for userinfo endpoint #151
+- ~Updated OpenIDConnectClient to conditionally verify nonce #146~
+- Add possibility to change enc_type parameter for http_build_query #155
+- Adding OAuth 2.0 Token Introspection #156
+- Add optional parameters clientId/clientSecret for introspection #157 & #158
+- Adding OAuth 2.0 Token Revocation #160
+- Adding issuer validator #145
+- Adding signing algorithm PS256 #180
+- Check http status of request user info #186
+- URL encode clientId and clientSecret when using basic authentication, according to https://tools.ietf.org/html/rfc6749#section-2.3.1 #192
+- Adjust PHPDoc to state that null is also allowed #193
 
 ### Changed
-* Bugfix/code cleanup #152
-  * Cleanup PHPDoc #46e5b59
-  * Replace unnecessary double quotes with single quotes #2a76b57
-  * Use original function names instead of aliases #1f37892
-  * Remove unnecessary default values #5ab801e
-  * Explicit declare field $redirectURL #9187c0b
-  * Remove unused code #1e65384
-  * Fix indent #e9cdf56
-  * Cleanup conditional code flow for better readability #107f3fb
- * Added strict type comparisons #167
-* Bugfix: required `openid` scope was omitted when additional scopes were registered using `addScope` method. This resulted in failing OpenID process.
-
-## [0.8.0]
+- Bugfix/code cleanup #152
+- Cleanup PHPDoc #46e5b59
+- Replace unnecessary double quotes with single quotes #2a76b57
+- Use original function names instead of aliases #1f37892
+- Remove unnecessary default values #5ab801e
+- Explicit declare field $redirectURL #9187c0b
+- Remove unused code #1e65384
+- Fix indent #e9cdf56
+- Cleanup conditional code flow for better readability #107f3fb
+- Added strict type comparisons #167
+- Bugfix: required `openid` scope was omitted when additional scopes were registered using `addScope` method. This resulted in failing OpenID process.
+
+## [0.8.0] - 2019-01-02
 
 ### Added
-* Fix `verifyJWTsignature()`: verify JWT to prevent php errors and warnings on invalid token
+- Fix `verifyJWTsignature()`: verify JWT to prevent php errors and warnings on invalid token
 
 ### Changed
-* Decouple session manipulation, it's allow use of other session libraries #134
-* Broaden version requirements of the phpseclib/phpseclib package. #144
+- Decouple session manipulation, it's allow use of other session libraries #134
+- Broaden version requirements of the phpseclib/phpseclib package. #144
 
-## [0.7.0]
+## [0.7.0] - 2018-10-15
 
 ### Added
-* Add "license" field to composer.json #138
-* Ensure key_alg is set when getting key #139
-* Add option to send additional registration parameters like post_logout_redirect_uris. #140
+- Add "license" field to composer.json #138
+- Ensure key_alg is set when getting key #139
+- Add option to send additional registration parameters like post_logout_redirect_uris. #140
 
 ### Changed
-* disabled autoload for Crypt_RSA + make refreshToken() method tolerant for errors #137
+- disabled autoload for Crypt_RSA + make refreshToken() method tolerant for errors #137
 
-### Removed
-*
-
-## [0.6.0]
+## [0.6.0] - 2018-07-17
 
 ### Added
-* Added five minutes leeway due to clock skew between openidconnect server and client.
-* Fix save access_token from request in implicit flow authentication #129
-* `verifyJWTsignature()` method private -> public #126
-* Support for providers where provider/login URL is not the same as the issuer URL. #125
-* Support for providers that has a different login URL from the issuer URL, for instance Azure Active Directory. Here, the provider URL is on the format: https://login.windows.net/(tenant-id), while the issuer claim actually is on the format: https://sts.windows.net/(tenant-id).
+- Added five minutes leeway due to clock skew between openidconnect server and client.
+- Fix save access_token from request in implicit flow authentication #129
+- `verifyJWTsignature()` method private -> public #126
+- Support for providers where provider/login URL is not the same as the issuer URL. #125
+- Support for providers that has a different login URL from the issuer URL, for instance Azure Active Directory. Here, the provider URL is on the format: https://login.windows.net/(tenant-id), while the issuer claim actually is on the format: https://sts.windows.net/(tenant-id).
 
 ### Changed
-* refreshToken method update #124
+- refreshToken method update #124
 
-### Removed
-*
+## [0.5.0] - 2018-04-09
 
-## [0.5.0]
-## Added
-* Implement Azure AD B2C Implicit Workflow
-
-## [0.4.1]
-## Changed
-* Documentation updates for include path.
-
-## [0.4]
 ### Added
-* Timeout is configurable via setTimeout method. This addresses issue #94.
-* Add the ability to authenticate using the Resource Owner flow (with or without the Client ID and ClientSecret). This addresses issue #98
-* Add support for HS256, HS512 and HS384 signatures
-* Removed unused calls to $this->getProviderConfigValue("token_endpoint_…
+- Implement Azure AD B2C Implicit Workflow
+
+## [0.4.1] - 2018-02-16
 
 ### Changed
+- Documentation updates for include path.
 
-### Removed
+## [0.4.0] - 2018-02-15
+
+### Added
+- Timeout is configurable via setTimeout method. This addresses issue #94.
+- Add the ability to authenticate using the Resource Owner flow (with or without the Client ID and ClientSecret). This addresses issue #98
+- Add support for HS256, HS512 and HS384 signatures
+- Removed unused calls to $this->getProviderConfigValue("token_endpoint_…
diff --git a/vendor/jumbojett/openid-connect-php/README.md b/vendor/jumbojett/openid-connect-php/README.md
index a44b8cb095..904b83eced 100644
--- a/vendor/jumbojett/openid-connect-php/README.md
+++ b/vendor/jumbojett/openid-connect-php/README.md
@@ -7,7 +7,7 @@ the OpenID Connect protocol to set up authentication.
 A special thanks goes to Justin Richer and Amanda Anganes for their help and support of the protocol.
 
 # Requirements #
- 1. PHP 5.4 or greater
+ 1. PHP 7.0 or greater
  2. CURL extension
  3. JSON extension
 
@@ -69,8 +69,8 @@ use Jumbojett\OpenIDConnectClient;
 $oidc = new OpenIDConnectClient('https://id.provider.com',
                                 'ClientIDHere',
                                 'ClientSecretHere');
-$oidc->providerConfigParam(array('token_endpoint'=>'https://id.provider.com/connect/token'));
-$oidc->addScope('my_scope');
+$oidc->providerConfigParam(['token_endpoint'=>'https://id.provider.com/connect/token']);
+$oidc->addScope(['my_scope']);
 
 // this assumes success (to validate check if the access_token property is there and a valid JWT) :
 $clientCredentialsToken = $oidc->requestClientCredentialsToken()->access_token;
@@ -85,12 +85,12 @@ use Jumbojett\OpenIDConnectClient;
 $oidc = new OpenIDConnectClient('https://id.provider.com',
                                 'ClientIDHere',
                                 'ClientSecretHere');
-$oidc->providerConfigParam(array('token_endpoint'=>'https://id.provider.com/connect/token'));
-$oidc->addScope('my_scope');
+$oidc->providerConfigParam(['token_endpoint'=>'https://id.provider.com/connect/token']);
+$oidc->addScope(['my_scope']);
 
 //Add username and password
-$oidc->addAuthParam(array('username'=>'<Username>'));
-$oidc->addAuthParam(array('password'=>'<Password>'));
+$oidc->addAuthParam(['username'=>'<Username>']);
+$oidc->addAuthParam(['password'=>'<Password>']);
 
 //Perform the auth and return the token (to validate check if the access_token property is there and a valid JWT) :
 $token = $oidc->requestResourceOwnerToken(TRUE)->access_token;
@@ -105,10 +105,9 @@ use Jumbojett\OpenIDConnectClient;
 $oidc = new OpenIDConnectClient('https://id.provider.com',
                                 'ClientIDHere',
                                 'ClientSecretHere');
-$oidc->setResponseTypes(array('id_token'));
-$oidc->addScope(array('openid'));
+$oidc->setResponseTypes(['id_token']);
 $oidc->setAllowImplicitFlow(true);
-$oidc->addAuthParam(array('response_mode' => 'form_post'));
+$oidc->addAuthParam(['response_mode' => 'form_post']);
 $oidc->setCertPath('/path/to/my.cert');
 $oidc->authenticate();
 $sub = $oidc->getVerifiedClaims('sub');
@@ -152,7 +151,7 @@ ensure your RP performs 'single sign out' for the user even if they didn't have
 device, but still had an active session there.
 
 Either the sid or the sub may be accessible from the logout token sent from the OP. You can use either
-`getSidFromBackChannel()` or `getSubFromBackChannel()` to retrieve them if it is helpful to match them to a session
+`getSidFromBackChannel()` or `getSubjectFromBackChannel()` to retrieve them if it is helpful to match them to a session
 in order to destroy it.
 
 The below ensures the use of this library to ensure validation of the back-channel logout token, but is afterward
@@ -184,7 +183,7 @@ function handleLogout() {
                 session_commit();
                 session_id($session_id_to_destroy); // switches to that session
                 session_start();
-                $_SESSION = array(); // effectively ends the session
+                $_SESSION = []; // effectively ends the session
             }
         }
     }
diff --git a/vendor/jumbojett/openid-connect-php/composer.json b/vendor/jumbojett/openid-connect-php/composer.json
index 6d218ccf65..6482588433 100644
--- a/vendor/jumbojett/openid-connect-php/composer.json
+++ b/vendor/jumbojett/openid-connect-php/composer.json
@@ -3,15 +3,15 @@
     "description": "Bare-bones OpenID Connect client",
     "license": "Apache-2.0",
     "require": {
-        "php": ">=5.4",
-        "phpseclib/phpseclib" : "~2.0 || ^3.0",
+        "php": ">=7.0",
         "ext-json": "*",
         "ext-curl": "*",
-        "paragonie/random_compat": ">=2"
+        "phpseclib/phpseclib": "^3.0.7"
     },
     "require-dev": {
-        "roave/security-advisories": "dev-master",
-        "yoast/phpunit-polyfills": "^1.0"
+        "phpunit/phpunit": "<10",
+        "roave/security-advisories": "dev-latest",
+        "yoast/phpunit-polyfills": "^2.0"
     },
     "archive" : {
         "exclude" : [
diff --git a/vendor/jumbojett/openid-connect-php/src/OpenIDConnectClient.php b/vendor/jumbojett/openid-connect-php/src/OpenIDConnectClient.php
index bac366cfd0..e3f9d3f26d 100644
--- a/vendor/jumbojett/openid-connect-php/src/OpenIDConnectClient.php
+++ b/vendor/jumbojett/openid-connect-php/src/OpenIDConnectClient.php
@@ -3,7 +3,7 @@
  *
  * Copyright MITRE 2020
  *
- * OpenIDConnectClient for PHP5
+ * OpenIDConnectClient for PHP7+
  * Author: Michael Jett <mjett@mitre.org>
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -22,18 +22,15 @@
 
 namespace Jumbojett;
 
-/**
- *
- * JWT signature verification support by Jonathan Reed <jdreed@mit.edu>
- * Licensed under the same license as the rest of this file.
- *
- * phpseclib is required to validate the signatures of some tokens.
- * It can be downloaded from: http://phpseclib.sourceforge.net/
- */
 
-if (!class_exists('\phpseclib3\Crypt\RSA') && !class_exists('\phpseclib\Crypt\RSA') && !class_exists('Crypt_RSA')) {
-    user_error('Unable to find phpseclib Crypt/RSA.php.  Ensure phpseclib is installed and in include_path before you include this file');
-}
+use Error;
+use Exception;
+use phpseclib3\Crypt\RSA;
+use phpseclib3\Math\BigInteger;
+use stdClass;
+use function bin2hex;
+use function is_object;
+use function random_bytes;
 
 /**
  * A wrapper around base64_decode which decodes Base64URL-encoded data,
@@ -41,7 +38,7 @@
  * @param string $base64url
  * @return bool|string
  */
-function base64url_decode($base64url) {
+function base64url_decode(string $base64url) {
     return base64_decode(b64url2b64($base64url));
 }
 
@@ -53,7 +50,8 @@ function base64url_decode($base64url) {
  * @param string $base64url
  * @return string
  */
-function b64url2b64($base64url) {
+function b64url2b64(string $base64url): string
+{
     // "Shouldn't" be necessary, but why not
     $padding = strlen($base64url) % 4;
     if ($padding > 0) {
@@ -66,19 +64,8 @@ function b64url2b64($base64url) {
 /**
  * OpenIDConnect Exception Class
  */
-class OpenIDConnectClientException extends \Exception
+class OpenIDConnectClientException extends Exception
 {
-
-}
-
-/**
- * Require the CURL and JSON PHP extensions to be installed
- */
-if (!function_exists('curl_init')) {
-    throw new OpenIDConnectClientException('OpenIDConnect needs the CURL PHP extension.');
-}
-if (!function_exists('json_decode')) {
-    throw new OpenIDConnectClientException('OpenIDConnect needs the JSON PHP extension.');
 }
 
 /**
@@ -145,7 +132,7 @@ class OpenIDConnectClient
     protected $idToken;
 
     /**
-     * @var string stores the token response
+     * @var object stores the token response
      */
     private $tokenResponse;
 
@@ -157,17 +144,17 @@ class OpenIDConnectClient
     /**
      * @var int|null Response code from the server
      */
-    private $responseCode;
+    protected $responseCode;
 
     /**
-     * @var array holds response types
+     * @var string|null Content type from the server
      */
-    private $responseTypes = [];
+    private $responseContentType;
 
     /**
-     * @var array holds a cache of info returned from the user info endpoint
+     * @var array holds response types
      */
-    private $userInfo = [];
+    private $responseTypes = [];
 
     /**
      * @var array holds authentication parameters
@@ -185,7 +172,7 @@ class OpenIDConnectClient
     private $wellKnown = false;
 
     /**
-     * @var mixed holds well-known opendid configuration parameters, like policy for MS Azure AD B2C User Flow  
+     * @var mixed holds well-known openid configuration parameters, like policy for MS Azure AD B2C User Flow
      * @see https://docs.microsoft.com/en-us/azure/active-directory-b2c/user-flow-overview 
      */
     private $wellKnownConfigParameters = [];
@@ -206,7 +193,7 @@ class OpenIDConnectClient
     private $additionalJwks = [];
 
     /**
-     * @var array holds verified jwt claims
+     * @var object holds verified jwt claims
      */
     protected $verifiedClaims = [];
 
@@ -267,13 +254,12 @@ class OpenIDConnectClient
     private $token_endpoint_auth_methods_supported = ['client_secret_basic'];
 
     /**
-     * @param $provider_url string optional
-     *
-     * @param $client_id string optional
-     * @param $client_secret string optional
-     * @param null $issuer
+     * @param string|null $provider_url optional
+     * @param string|null $client_id optional
+     * @param string|null $client_secret optional
+     * @param string|null $issuer
      */
-    public function __construct($provider_url = null, $client_id = null, $client_secret = null, $issuer = null) {
+    public function __construct(string $provider_url = null, string $client_id = null, string $client_secret = null, string $issuer = null) {
         $this->setProviderURL($provider_url);
         if ($issuer === null) {
             $this->setIssuer($provider_url);
@@ -310,8 +296,8 @@ public function setResponseTypes($response_types) {
      * @return bool
      * @throws OpenIDConnectClientException
      */
-    public function authenticate() {
-
+    public function authenticate(): bool
+    {
         // Do a preemptive check to see if the provider has thrown an error from a previous redirect
         if (isset($_REQUEST['error'])) {
             $desc = isset($_REQUEST['error_description']) ? ' Description: ' . $_REQUEST['error_description'] : '';
@@ -333,7 +319,7 @@ public function authenticate() {
             }
 
             // Do an OpenID Connect session check
-            if ($_REQUEST['state'] !== $this->getState()) {
+	    if (!isset($_REQUEST['state']) || ($_REQUEST['state'] !== $this->getState())) {
                 throw new OpenIDConnectClientException('Unable to determine state');
             }
 
@@ -344,28 +330,26 @@ public function authenticate() {
                 throw new OpenIDConnectClientException('User did not authorize openid scope.');
             }
 
-            $claims = $this->decodeJWT($token_json->id_token, 1);
+            $id_token = $token_json->id_token;
+            $idTokenHeaders = $this->decodeJWT($id_token);
+            if (isset($idTokenHeaders->enc)) {
+                // Handle JWE
+                $id_token = $this->handleJweResponse($id_token);
+            }
+
+            $claims = $this->decodeJWT($id_token, 1);
 
             // Verify the signature
-            if ($this->canVerifySignatures()) {
-                if (!$this->getProviderConfigValue('jwks_uri')) {
-                    throw new OpenIDConnectClientException ('Unable to verify signature due to no jwks_uri being defined');
-                }
-                if (!$this->verifyJWTsignature($token_json->id_token)) {
-                    throw new OpenIDConnectClientException ('Unable to verify signature');
-                }
-            } else {
-                user_error('Warning: JWT signature verification unavailable.');
-            }
+            $this->verifySignatures($id_token);
 
             // Save the id token
-            $this->idToken = $token_json->id_token;
+            $this->idToken = $id_token;
 
             // Save the access token
             $this->accessToken = $token_json->access_token;
 
             // If this is a valid claim
-            if ($this->verifyJWTclaims($claims, $token_json->access_token)) {
+            if ($this->verifyJWTClaims($claims, $token_json->access_token)) {
 
                 // Clean up the session a little
                 $this->unsetNonce();
@@ -392,13 +376,10 @@ public function authenticate() {
             // if we have no code but an id_token use that
             $id_token = $_REQUEST['id_token'];
 
-            $accessToken = null;
-            if (isset($_REQUEST['access_token'])) {
-                $accessToken = $_REQUEST['access_token'];
-            }
+            $accessToken = $_REQUEST['access_token'] ?? null;
 
             // Do an OpenID Connect session check
-            if ($_REQUEST['state'] !== $this->getState()) {
+    	    if (!isset($_REQUEST['state']) || ($_REQUEST['state'] !== $this->getState())) {
                 throw new OpenIDConnectClientException('Unable to determine state');
             }
 
@@ -408,22 +389,13 @@ public function authenticate() {
             $claims = $this->decodeJWT($id_token, 1);
 
             // Verify the signature
-            if ($this->canVerifySignatures()) {
-                if (!$this->getProviderConfigValue('jwks_uri')) {
-                    throw new OpenIDConnectClientException ('Unable to verify signature due to no jwks_uri being defined');
-                }
-                if (!$this->verifyJWTsignature($id_token)) {
-                    throw new OpenIDConnectClientException ('Unable to verify signature');
-                }
-            } else {
-                user_error('Warning: JWT signature verification unavailable.');
-            }
+            $this->verifySignatures($id_token);
 
             // Save the id token
             $this->idToken = $id_token;
 
             // If this is a valid claim
-            if ($this->verifyJWTclaims($claims, $accessToken)) {
+            if ($this->verifyJWTClaims($claims, $accessToken)) {
 
                 // Clean up the session a little
                 $this->unsetNonce();
@@ -460,10 +432,9 @@ public function authenticate() {
      *
      * @throws OpenIDConnectClientException
      */
-    public function signOut($idToken, $redirect) {
-        $signout_endpoint = $this->getProviderConfigValue('end_session_endpoint');
+    public function signOut(string $idToken, $redirect) {
+        $sign_out_endpoint = $this->getProviderConfigValue('end_session_endpoint');
 
-        $signout_params = null;
         if($redirect === null){
             $signout_params = ['id_token_hint' => $idToken];
         }
@@ -473,8 +444,8 @@ public function signOut($idToken, $redirect) {
                 'post_logout_redirect_uri' => $redirect];
         }
 
-        $signout_endpoint  .= (strpos($signout_endpoint, '?') === false ? '?' : '&') . http_build_query( $signout_params, '', '&', $this->encType);
-        $this->redirect($signout_endpoint);
+        $sign_out_endpoint  .= (strpos($sign_out_endpoint, '?') === false ? '?' : '&') . http_build_query( $signout_params, '', '&', $this->encType);
+        $this->redirect($sign_out_endpoint);
     }
 
 
@@ -489,7 +460,7 @@ public function signOut($idToken, $redirect) {
      * @return bool
      * @throws OpenIDConnectClientException
      */
-    public function verifyLogoutToken()
+    public function verifyLogoutToken(): bool
     {
         if (isset($_REQUEST['logout_token'])) {
             $logout_token = $_REQUEST['logout_token'];
@@ -497,17 +468,7 @@ public function verifyLogoutToken()
             $claims = $this->decodeJWT($logout_token, 1);
 
             // Verify the signature
-            if ($this->canVerifySignatures()) {
-                if (!$this->getProviderConfigValue('jwks_uri')) {
-                    throw new OpenIDConnectClientException('Back-channel logout: Unable to verify signature due to no jwks_uri being defined');
-                }
-                if (!$this->verifyJWTsignature($logout_token)) {
-                    throw new OpenIDConnectClientException('Back-channel logout: Unable to verify JWT signature');
-                }
-            }
-            else {
-                user_error('Warning: JWT signature verification unavailable');
-            }
+            $this->verifySignatures($logout_token);
 
             // Verify Logout Token Claims
             if ($this->verifyLogoutTokenClaims($claims)) {
@@ -529,7 +490,7 @@ public function verifyLogoutToken()
      * @return bool
      * @throws OpenIDConnectClientException
      */
-    public function verifyLogoutTokenClaims($claims)
+    public function verifyLogoutTokenClaims($claims): bool
     {
         // Verify that the Logout Token doesn't contain a nonce Claim.
         if (isset($claims->nonce)) {
@@ -570,7 +531,9 @@ public function verifyLogoutTokenClaims($claims)
             return false;
         }
         // Validate the aud
-        if ((!$claims->aud === $this->clientID) || (!in_array($this->clientID, $claims->aud, true))) {
+        $auds = $claims->aud;
+        $auds = is_array( $auds ) ? $auds : [ $auds ];
+        if (!in_array($this->clientID, $auds, true)) {
             return false;
         }
         // Validate the iat. At this point we can return true if it is ok
@@ -584,28 +547,25 @@ public function verifyLogoutTokenClaims($claims)
     /**
      * @param array $scope - example: openid, given_name, etc...
      */
-    public function addScope($scope) {
-        $this->scopes = array_merge($this->scopes, (array)$scope);
+    public function addScope(array $scope) {
+        $this->scopes = array_merge($this->scopes, $scope);
     }
 
     /**
      * @param array $param - example: prompt=login
      */
-    public function addAuthParam($param) {
-        $this->authParams = array_merge($this->authParams, (array)$param);
+    public function addAuthParam(array $param) {
+        $this->authParams = array_merge($this->authParams, $param);
     }
 
     /**
      * @param array $param - example: post_logout_redirect_uris=[http://example.com/successful-logout]
      */
-    public function addRegistrationParam($param) {
-        $this->registrationParams = array_merge($this->registrationParams, (array)$param);
+    public function addRegistrationParam(array $param) {
+        $this->registrationParams = array_merge($this->registrationParams, $param);
     }
 
-    /**
-     * @param array $token_endpoint_auth_methods_supported
-     */
-    public function setTokenEndpointAuthMethodsSupported($token_endpoint_auth_methods_supported)
+    public function setTokenEndpointAuthMethodsSupported(array $token_endpoint_auth_methods_supported)
     {
         $this->token_endpoint_auth_methods_supported = $token_endpoint_auth_methods_supported;
     }
@@ -618,16 +578,16 @@ protected function addAdditionalJwk($jwk) {
     }
 
     /**
-     * Get's anything that we need configuration wise including endpoints, and other values
+     * Gets anything that we need configuration wise including endpoints, and other values
      *
      * @param string $param
-     * @param string $default optional
-     * @throws OpenIDConnectClientException
-     * @return string|array
+     * @param string|string[]|bool|null $default optional
+     * @return string|string[]|bool
      *
+     * @throws OpenIDConnectClientException
      */
-    protected function getProviderConfigValue($param, $default = null) {
-
+    protected function getProviderConfigValue(string $param, $default = null)
+    {
         // If the configuration value is not available, attempt to fetch it from a well known config endpoint
         // This is also known as auto "discovery"
         if (!isset($this->providerConfig[$param])) {
@@ -638,15 +598,16 @@ protected function getProviderConfigValue($param, $default = null) {
     }
 
     /**
-     * Get's anything that we need configuration wise including endpoints, and other values
+     * Gets anything that we need configuration wise including endpoints, and other values
      *
      * @param string $param
-     * @param string $default optional
-     * @throws OpenIDConnectClientException
-     * @return string
+     * @param string|string[]|bool|null $default optional
+     * @return string|string[]|bool
      *
+     * @throws OpenIDConnectClientException
      */
-    private function getWellKnownConfigValue($param, $default = null) {
+    protected function getWellKnownConfigValue(string $param, $default = null)
+    {
 
         // If the configuration value is not available, attempt to fetch it from a well known config endpoint
         // This is also known as auto "discovery"
@@ -655,13 +616,10 @@ private function getWellKnownConfigValue($param, $default = null) {
             if (count($this->wellKnownConfigParameters) > 0){
                 $well_known_config_url .= '?' .  http_build_query($this->wellKnownConfigParameters) ;
             }
-            $this->wellKnown = json_decode($this->fetchURL($well_known_config_url));
+            $this->wellKnown = json_decode($this->fetchURL($well_known_config_url), false);
         }
 
-        $value = false;
-        if(isset($this->wellKnown->{$param})){
-            $value = $this->wellKnown->{$param};
-        }
+        $value = $this->wellKnown->{$param} ?? false;
 
         if ($value) {
             return $value;
@@ -672,14 +630,11 @@ private function getWellKnownConfigValue($param, $default = null) {
             return $default;
         }
 
-        throw new OpenIDConnectClientException("The provider {$param} could not be fetched. Make sure your provider has a well known configuration available.");
+        throw new OpenIDConnectClientException("The provider $param could not be fetched. Make sure your provider has a well known configuration available.");
     }
 
     /**
-     * Set optionnal parameters for .well-known/openid-configuration 
-     *
-     * @param string $param
-     *
+     * Set optional parameters for .well-known/openid-configuration
      */
     public function setWellKnownConfigParameters(array $params = []){
         $this->wellKnownConfigParameters=$params;
@@ -689,7 +644,7 @@ public function setWellKnownConfigParameters(array $params = []){
     /**
      * @param string $url Sets redirect URL for auth flow
      */
-    public function setRedirectURL($url) {
+    public function setRedirectURL(string $url) {
         if (parse_url($url,PHP_URL_HOST) !== false) {
             $this->redirectURL = $url;
         }
@@ -700,8 +655,8 @@ public function setRedirectURL($url) {
      *
      * @return string
      */
-    public function getRedirectURL() {
-
+    public function getRedirectURL(): string
+    {
         // If the redirect URL has been set then return it.
         if (property_exists($this, 'redirectURL') && $this->redirectURL) {
             return $this->redirectURL;
@@ -733,9 +688,10 @@ public function getRedirectURL() {
         }
 	    
         if (isset($_SERVER['HTTP_X_FORWARDED_PORT'])) {
-            $port = intval($_SERVER['HTTP_X_FORWARDED_PORT']);
+            $port = (int)$_SERVER['HTTP_X_FORWARDED_PORT'];
         } elseif (isset($_SERVER['SERVER_PORT'])) {
-            $port = intval($_SERVER['SERVER_PORT']);
+            # keep this case - even if some tool claim it is unnecessary
+            $port = (int)$_SERVER['SERVER_PORT'];
         } elseif ($protocol === 'https') {
             $port = 443;
         } else {
@@ -764,11 +720,10 @@ public function getRedirectURL() {
      * @return string
      * @throws OpenIDConnectClientException
      */
-    protected function generateRandString() {
-        // Error and Exception need to be catched in this order, see https://github.com/paragonie/random_compat/blob/master/README.md
-        // random_compat polyfill library should be removed if support for PHP versions < 7 is dropped
+    protected function generateRandString(): string
+    {
         try {
-            return \bin2hex(\random_bytes(16));
+            return bin2hex(random_bytes(16));
         } catch (Error $e) {
             throw new OpenIDConnectClientException('Random token generation failed.');
         } catch (Exception $e) {
@@ -780,7 +735,7 @@ protected function generateRandString() {
      * Start Here
      * @return void
      * @throws OpenIDConnectClientException
-     * @throws \Exception
+     * @throws Exception
      */
     private function requestAuthorization() {
 
@@ -857,7 +812,7 @@ public function requestClientCredentialsToken() {
         // Convert token params to string format
         $post_params = http_build_query($post_data, '', '&', $this->encType);
 
-        return json_decode($this->fetchURL($token_endpoint, $post_params, $headers));
+        return json_decode($this->fetchURL($token_endpoint, $post_params, $headers), false);
     }
 
     /**
@@ -868,7 +823,7 @@ public function requestClientCredentialsToken() {
      * @return mixed
      * @throws OpenIDConnectClientException
      */
-    public function requestResourceOwnerToken($bClientAuth = FALSE) {
+    public function requestResourceOwnerToken(bool $bClientAuth = false) {
         $token_endpoint = $this->getProviderConfigValue('token_endpoint');
 
         $headers = [];
@@ -896,7 +851,7 @@ public function requestResourceOwnerToken($bClientAuth = FALSE) {
         // Convert token params to string format
         $post_params = http_build_query($post_data, '', '&', $this->encType);
 
-        return json_decode($this->fetchURL($token_endpoint, $post_params, $headers));
+        return json_decode($this->fetchURL($token_endpoint, $post_params, $headers), false);
     }
 
 
@@ -908,7 +863,7 @@ public function requestResourceOwnerToken($bClientAuth = FALSE) {
      * @return mixed
      * @throws OpenIDConnectClientException
      */
-    protected function requestTokens($code, $headers = array()) {
+    protected function requestTokens(string $code, array $headers = []) {
         $token_endpoint = $this->getProviderConfigValue('token_endpoint');
         $token_endpoint_auth_methods_supported = $this->getProviderConfigValue('token_endpoint_auth_methods_supported', ['client_secret_basic']);
 
@@ -926,11 +881,10 @@ protected function requestTokens($code, $headers = array()) {
         # Consider Basic authentication if provider config is set this way
         if ($this->supportsAuthMethod('client_secret_basic', $token_endpoint_auth_methods_supported)) {
             $authorizationHeader = 'Authorization: Basic ' . base64_encode(urlencode($this->clientID) . ':' . urlencode($this->clientSecret));
-            unset($token_params['client_secret']);
-	        unset($token_params['client_id']);
+            unset($token_params['client_secret'], $token_params['client_id']);
         }
 
-        // When there is a private key jwt generator and it is supported then use it as client authentication
+        // When there is a private key jwt generator, and it is supported then use it as client authentication
         if ($this->privateKeyJwtGenerator !== null && $this->supportsAuthMethod('private_key_jwt', $token_endpoint_auth_methods_supported)) {
             $token_params['client_assertion_type'] = 'urn:ietf:params:oauth:client-assertion-type:jwt-bearer';
             $token_params['client_assertion'] = $this->privateKeyJwtGenerator->__invoke($token_endpoint);
@@ -945,7 +899,7 @@ protected function requestTokens($code, $headers = array()) {
             else{
                 $client_assertion = $this->getJWTClientAssertion($this->getProviderConfigValue('token_endpoint'));
             }
-            
+
             $token_params['client_assertion_type'] = $client_assertion_type;
             $token_params['client_assertion'] = $client_assertion;
             unset($token_params['client_secret']);
@@ -972,7 +926,7 @@ protected function requestTokens($code, $headers = array()) {
             $headers[] = $authorizationHeader;
         }
 
-        $this->tokenResponse = json_decode($this->fetchURL($token_endpoint, $token_params, $headers));
+        $this->tokenResponse = json_decode($this->fetchURL($token_endpoint, $token_params, $headers), false);
 
         return $this->tokenResponse;
     }
@@ -987,7 +941,7 @@ protected function requestTokens($code, $headers = array()) {
      * @return mixed
      * @throws OpenIDConnectClientException
      */
-    public function requestTokenExchange($subjectToken, $subjectTokenType, $audience = '') {
+    public function requestTokenExchange(string $subjectToken, string $subjectTokenType, string $audience = '') {
         $token_endpoint = $this->getProviderConfigValue('token_endpoint');
         $token_endpoint_auth_methods_supported = $this->getProviderConfigValue('token_endpoint_auth_methods_supported', ['client_secret_basic']);
         $headers = [];
@@ -1009,14 +963,13 @@ public function requestTokenExchange($subjectToken, $subjectTokenType, $audience
         # Consider Basic authentication if provider config is set this way
         if ($this->supportsAuthMethod('client_secret_basic', $token_endpoint_auth_methods_supported)) {
             $headers = ['Authorization: Basic ' . base64_encode(urlencode($this->clientID) . ':' . urlencode($this->clientSecret))];
-            unset($post_data['client_secret']);
-            unset($post_data['client_id']);
+            unset($post_data['client_secret'], $post_data['client_id']);
         }
 
         // Convert token params to string format
         $post_params = http_build_query($post_data, null, '&', $this->encType);
 
-        return json_decode($this->fetchURL($token_endpoint, $post_params, $headers));
+        return json_decode($this->fetchURL($token_endpoint, $post_params, $headers), false);
     }
 
 
@@ -1027,7 +980,7 @@ public function requestTokenExchange($subjectToken, $subjectTokenType, $audience
      * @return mixed
      * @throws OpenIDConnectClientException
      */
-    public function refreshToken($refresh_token) {
+    public function refreshToken(string $refresh_token) {
         $token_endpoint = $this->getProviderConfigValue('token_endpoint');
         $token_endpoint_auth_methods_supported = $this->getProviderConfigValue('token_endpoint_auth_methods_supported', ['client_secret_basic']);
 
@@ -1046,14 +999,13 @@ public function refreshToken($refresh_token) {
         # Consider Basic authentication if provider config is set this way
         if ($this->supportsAuthMethod('client_secret_basic', $token_endpoint_auth_methods_supported)) {
             $headers = ['Authorization: Basic ' . base64_encode(urlencode($this->clientID) . ':' . urlencode($this->clientSecret))];
-            unset($token_params['client_secret']);
-            unset($token_params['client_id']);
+            unset($token_params['client_secret'], $token_params['client_id']);
         }
 
         if ($this->supportsAuthMethod('client_secret_jwt', $token_endpoint_auth_methods_supported)) {
             $client_assertion_type = $this->getProviderConfigValue('client_assertion_type');
             $client_assertion = $this->getJWTClientAssertion($this->getProviderConfigValue('token_endpoint'));
-            
+
             $token_params["grant_type"] = "urn:ietf:params:oauth:grant-type:token-exchange";
             $token_params["subject_token"] = $refresh_token;
             $token_params["audience"] = $this->clientID;
@@ -1061,14 +1013,13 @@ public function refreshToken($refresh_token) {
 			$token_params["requested_token_type"] = "urn:ietf:params:oauth:token-type:access_token";
             $token_params['client_assertion_type']=$client_assertion_type;
             $token_params['client_assertion'] = $client_assertion;
-            
-            unset($token_params['client_secret']);
-            unset($token_params['client_id']);
+
+            unset($token_params['client_secret'], $token_params['client_id']);
         }
         // Convert token params to string format
         $token_params = http_build_query($token_params, '', '&', $this->encType);
 
-        $json = json_decode($this->fetchURL($token_endpoint, $token_params, $headers));
+        $json = json_decode($this->fetchURL($token_endpoint, $token_params, $headers), false);
 
         if (isset($json->access_token)) {
             $this->accessToken = $json->access_token;
@@ -1082,21 +1033,16 @@ public function refreshToken($refresh_token) {
     }
 
     /**
-     * @param array $keys
-     * @param array $header
      * @throws OpenIDConnectClientException
-     * @return object
      */
-    private function getKeyForHeader($keys, $header) {
+    private function getKeyForHeader(array $keys, stdClass $header) {
         foreach ($keys as $key) {
             if ($key->kty === 'RSA') {
                 if (!isset($header->kid) || $key->kid === $header->kid) {
                     return $key;
                 }
-            } else {
-                if (isset($key->alg) && $key->alg === $header->alg && $key->kid === $header->kid) {
-                    return $key;
-                }
+            } else if (isset($key->alg) && $key->alg === $header->alg && $key->kid === $header->kid) {
+                return $key;
             }
         }
         if ($this->additionalJwks) {
@@ -1105,10 +1051,8 @@ private function getKeyForHeader($keys, $header) {
                     if (!isset($header->kid) || $key->kid === $header->kid) {
                         return $key;
                     }
-                } else {
-                    if (isset($key->alg) && $key->alg === $header->alg && $key->kid === $header->kid) {
-                        return $key;
-                    }
+                } else if (isset($key->alg) && $key->alg === $header->alg && $key->kid === $header->kid) {
+                    return $key;
                 }
             }
         }
@@ -1119,94 +1063,43 @@ private function getKeyForHeader($keys, $header) {
         throw new OpenIDConnectClientException('Unable to find a key for RSA');
     }
 
-
     /**
-     * @param string $hashtype
-     * @param object $key
-     * @param $payload
-     * @param $signature
-     * @param $signatureType
-     * @return bool
      * @throws OpenIDConnectClientException
      */
-    private function verifyRSAJWTsignature($hashtype, $key, $payload, $signature, $signatureType) {
-        if (!class_exists('\phpseclib3\Crypt\RSA') && !class_exists('\phpseclib\Crypt\RSA') && !class_exists('Crypt_RSA')) {
-            throw new OpenIDConnectClientException('Crypt_RSA support unavailable.');
-        }
+    private function verifyRSAJWTSignature(string $hashType, stdClass $key, $payload, $signature, $signatureType): bool
+    {
         if (!(property_exists($key, 'n') && property_exists($key, 'e'))) {
             throw new OpenIDConnectClientException('Malformed key object');
         }
 
-        /* We already have base64url-encoded data, so re-encode it as
-           regular base64 and use the XML key format for simplicity.
-        */
-        $public_key_xml = "<RSAKeyValue>\r\n".
-            '  <Modulus>' . b64url2b64($key->n) . "</Modulus>\r\n" .
-            '  <Exponent>' . b64url2b64($key->e) . "</Exponent>\r\n" .
-            '</RSAKeyValue>';
-        if (class_exists('\phpseclib3\Crypt\RSA', false)) {
-            $key = \phpseclib3\Crypt\PublicKeyLoader::load($public_key_xml)
-                ->withHash($hashtype);
-            if ($signatureType === 'PSS') {
-                $key = $key->withMGFHash($hashtype)
-                    ->withPadding(\phpseclib3\Crypt\RSA::SIGNATURE_PSS);
-            } else {
-                $key = $key->withPadding(\phpseclib3\Crypt\RSA::SIGNATURE_PKCS1);
-            }
-            return $key->verify($payload, $signature);
-        } elseif (class_exists('Crypt_RSA', false)) {
-            $rsa = new Crypt_RSA();
-            $rsa->setHash($hashtype);
-            if ($signatureType === 'PSS') {
-                $rsa->setMGFHash($hashtype);
-            }
-            $rsa->loadKey($public_key_xml, Crypt_RSA::PUBLIC_FORMAT_XML);
-            $rsa->setSignatureMode($signatureType === 'PSS' ? Crypt_RSA::SIGNATURE_PSS : Crypt_RSA::SIGNATURE_PKCS1);
-            return $rsa->verify($payload, $signature);
+        $key = RSA::load([
+            'publicExponent' => new BigInteger(base64_decode(b64url2b64($key->e)), 256),
+            'modulus' => new BigInteger(base64_decode(b64url2b64($key->n)), 256),
+            'isPublicKey' => true,
+        ])
+            ->withHash($hashType);
+        if ($signatureType === 'PSS') {
+            $key = $key->withMGFHash($hashType)
+                ->withPadding(RSA::SIGNATURE_PSS);
         } else {
-            $rsa = new \phpseclib\Crypt\RSA();
-            $rsa->setHash($hashtype);
-            if ($signatureType === 'PSS') {
-                $rsa->setMGFHash($hashtype);
-            }
-            $rsa->loadKey($public_key_xml, \phpseclib\Crypt\RSA::PUBLIC_FORMAT_XML);
-            $rsa->setSignatureMode($signatureType === 'PSS' ? \phpseclib\Crypt\RSA::SIGNATURE_PSS : \phpseclib\Crypt\RSA::SIGNATURE_PKCS1);
-            return $rsa->verify($payload, $signature);
+            $key = $key->withPadding(RSA::SIGNATURE_PKCS1);
         }
+        return $key->verify($payload, $signature);
     }
 
-    /**
-     * @param string $hashtype
-     * @param object $key
-     * @param $payload
-     * @param $signature
-     * @return bool
-     * @throws OpenIDConnectClientException
-     */
-    private function verifyHMACJWTsignature($hashtype, $key, $payload, $signature)
+    private function verifyHMACJWTSignature(string $hashType, string $key, string $payload, string $signature): bool
     {
-        if (!function_exists('hash_hmac')) {
-            throw new OpenIDConnectClientException('hash_hmac support unavailable.');
-        }
-
-        $expected=hash_hmac($hashtype, $payload, $key, true);
-
-        if (function_exists('hash_equals')) {
-            return hash_equals($signature, $expected);
-        }
-
-        return self::hashEquals($signature, $expected);
+        $expected = hash_hmac($hashType, $payload, $key, true);
+        return hash_equals($signature, $expected);
     }
 
     /**
      * @param string $jwt encoded JWT
-     * @throws OpenIDConnectClientException
      * @return bool
+     * @throws OpenIDConnectClientException
      */
-    public function verifyJWTsignature($jwt) {
-        if (!\is_string($jwt)) {
-            throw new OpenIDConnectClientException('Error token is not a string');
-        }
+    public function verifyJWTSignature(string $jwt): bool
+    {
         $parts = explode('.', $jwt);
         if (!isset($parts[0])) {
             throw new OpenIDConnectClientException('Error missing part 0 in token');
@@ -1215,8 +1108,8 @@ public function verifyJWTsignature($jwt) {
         if (false === $signature || '' === $signature) {
             throw new OpenIDConnectClientException('Error decoding signature from token');
         }
-        $header = json_decode(base64url_decode($parts[0]));
-        if (null === $header || !\is_object($header)) {
+        $header = json_decode(base64url_decode($parts[0]), false);
+        if (!is_object($header)) {
             throw new OpenIDConnectClientException('Error decoding JSON from token header');
         }
         if (!isset($header->alg)) {
@@ -1230,28 +1123,33 @@ public function verifyJWTsignature($jwt) {
             case 'PS512':
             case 'RS384':
             case 'RS512':
-                $hashtype = 'sha' . substr($header->alg, 2);
+                $hashType = 'sha' . substr($header->alg, 2);
                 $signatureType = $header->alg === 'PS256' || $header->alg === 'PS512' ? 'PSS' : '';
                 if (isset($header->jwk)) {
                     $jwk = $header->jwk;
                     $this->verifyJWKHeader($jwk);
                 } else {
-                    $jwks = json_decode($this->fetchURL($this->getProviderConfigValue('jwks_uri')));
+                    $jwksUri = $this->getProviderConfigValue('jwks_uri');
+                    if (!$jwksUri) {
+                        throw new OpenIDConnectClientException ('Unable to verify signature due to no jwks_uri being defined');
+                    }
+
+                    $jwks = json_decode($this->fetchURL($jwksUri), false);
                     if ($jwks === NULL) {
                         throw new OpenIDConnectClientException('Error decoding JSON from jwks_uri');
                     }
                     $jwk = $this->getKeyForHeader($jwks->keys, $header);
                 }
 
-                $verified = $this->verifyRSAJWTsignature($hashtype,
+                $verified = $this->verifyRSAJWTSignature($hashType,
                     $jwk,
                     $payload, $signature, $signatureType);
                 break;
             case 'HS256':
             case 'HS512':
             case 'HS384':
-                $hashtype = 'SHA' . substr($header->alg, 2);
-                $verified = $this->verifyHMACJWTsignature($hashtype, $this->getClientSecret(), $payload, $signature);
+                $hashType = 'SHA' . substr($header->alg, 2);
+                $verified = $this->verifyHMACJWTSignature($hashType, $this->getClientSecret(), $payload, $signature);
                 break;
             default:
                 throw new OpenIDConnectClientException('No support for signature type: ' . $header->alg);
@@ -1259,12 +1157,25 @@ public function verifyJWTsignature($jwt) {
         return $verified;
     }
 
+    /**
+     * @param string $jwt encoded JWT
+     * @return void
+     * @throws OpenIDConnectClientException
+     */
+    public function verifySignatures(string $jwt)
+    {
+        if (!$this->verifyJWTSignature($jwt)) {
+            throw new OpenIDConnectClientException ('Unable to verify signature');
+        }
+    }
+
     /**
      * @param string $iss
      * @return bool
      * @throws OpenIDConnectClientException
      */
-    protected function validateIssuer($iss) {
+    protected function validateIssuer(string $iss): bool
+    {
         if ($this->issuerValidator !== null) {
             return $this->issuerValidator->__invoke($iss);
         }
@@ -1276,9 +1187,11 @@ protected function validateIssuer($iss) {
      * @param object $claims
      * @param string|null $accessToken
      * @return bool
+     * @throws OpenIDConnectClientException
      */
-    protected function verifyJWTclaims($claims, $accessToken = null) {
-        if(isset($claims->at_hash) && isset($accessToken)) {
+    protected function verifyJWTClaims($claims, string $accessToken = null): bool
+    {
+        if(isset($claims->at_hash, $accessToken)) {
             if(isset($this->getIdTokenHeader()->alg) && $this->getIdTokenHeader()->alg !== 'none') {
                 $bit = substr($this->getIdTokenHeader()->alg, 2, 3);
             } else {
@@ -1290,33 +1203,29 @@ protected function verifyJWTclaims($claims, $accessToken = null) {
         }
         return (($this->validateIssuer($claims->iss))
             && (($claims->aud === $this->clientID) || in_array($this->clientID, $claims->aud, true))
+            && ($claims->sub === $this->getIdTokenPayload()->sub)
             && (!isset($claims->nonce) || $claims->nonce === $this->getNonce())
-            && ( !isset($claims->exp) || ((gettype($claims->exp) === 'integer') && ($claims->exp >= time() - $this->leeway)))
-            && ( !isset($claims->nbf) || ((gettype($claims->nbf) === 'integer') && ($claims->nbf <= time() + $this->leeway)))
+            && ( !isset($claims->exp) || ((is_int($claims->exp)) && ($claims->exp >= time() - $this->leeway)))
+            && ( !isset($claims->nbf) || ((is_int($claims->nbf)) && ($claims->nbf <= time() + $this->leeway)))
             && ( !isset($claims->at_hash) || !isset($accessToken) || $claims->at_hash === $expected_at_hash )
         );
     }
 
-    /**
-     * @param string $str
-     * @return string
-     */
-    protected function urlEncode($str) {
+    protected function urlEncode(string $str): string
+    {
         $enc = base64_encode($str);
         $enc = rtrim($enc, '=');
-        $enc = strtr($enc, '+/', '-_');
-        return $enc;
+        return strtr($enc, '+/', '-_');
     }
 
     /**
      * @param string $jwt encoded JWT
      * @param int $section the section we would like to decode
-     * @return object
+     * @return object|string|null
      */
-    protected function decodeJWT($jwt, $section = 0) {
-
+    protected function decodeJWT(string $jwt, int $section = 0) {
         $parts = explode('.', $jwt);
-        return json_decode(base64url_decode($parts[$section]));
+        return json_decode(base64url_decode($parts[$section] ?? ''), false);
     }
 
     /**
@@ -1341,13 +1250,13 @@ protected function decodeJWT($jwt, $section = 0) {
      * locale           string      The End-User's locale, represented as a BCP47 [RFC5646] language tag. This is typically an ISO 639-1 Alpha-2 [ISO639‑1] language code in lowercase and an ISO 3166-1 Alpha-2 [ISO3166‑1] country code in uppercase, separated by a dash. For example, en-US or fr-CA. As a compatibility note, some implementations have used an underscore as the separator rather than a dash, for example, en_US; Implementations MAY choose to accept this locale syntax as well.
      * phone_number     string      The End-User's preferred telephone number. E.164 [E.164] is RECOMMENDED as the format of this Claim. For example, +1 (425) 555-1212 or +56 (2) 687 2400.
      * address          JSON object The End-User's preferred address. The value of the address member is a JSON [RFC4627] structure containing some or all of the members defined in Section 2.4.2.1.
-     * updated_time     string      Time the End-User's information was last updated, represented as a RFC 3339 [RFC3339] datetime. For example, 2011-01-03T23:58:42+0000.
+     * updated_time     string      Time the End-User's information was last updated, represented as an RFC 3339 [RFC3339] datetime. For example, 2011-01-03T23:58:42+0000.
      *
      * @return mixed
      *
      * @throws OpenIDConnectClientException
      */
-    public function requestUserInfo($attribute = null) {
+    public function requestUserInfo(string $attribute = null) {
 
         $user_info_endpoint = $this->getProviderConfigValue('userinfo_endpoint');
         $schema = 'openid';
@@ -1356,21 +1265,50 @@ public function requestUserInfo($attribute = null) {
 
         //The accessToken has to be sent in the Authorization header.
         // Accept json to indicate response type
-        $headers = ["Authorization: Bearer {$this->accessToken}",
+        $headers = ["Authorization: Bearer $this->accessToken",
             'Accept: application/json'];
 
-        $user_json = json_decode($this->fetchURL($user_info_endpoint,null,$headers));
-        if ($this->getResponseCode() <> 200) {
+        $response = $this->fetchURL($user_info_endpoint,null,$headers);
+        if ($this->getResponseCode() !== 200) {
             throw new OpenIDConnectClientException('The communication to retrieve user data has failed with status code '.$this->getResponseCode());
         }
-        $this->userInfo = $user_json;
+
+        // When we receive application/jwt, the UserInfo Response is signed and/or encrypted.
+        if ($this->getResponseContentType() === 'application/jwt' ) {
+            // Check if the response is encrypted
+            $jwtHeaders = $this->decodeJWT($response);
+            if (isset($jwtHeaders->enc)) {
+                // Handle JWE
+                $jwt = $this->handleJweResponse($response);
+            } else {
+                // If the response is not encrypted then it must be signed
+                $jwt = $response;
+            }
+
+            // Verify the signature
+            $this->verifySignatures($jwt);
+
+            // Get claims from JWT
+            $claims = $this->decodeJWT($jwt, 1);
+
+            // Verify the JWT claims
+            if (!$this->verifyJWTClaims($claims)) {
+                throw new OpenIDConnectClientException('Invalid JWT signature');
+            }
+
+            $user_json = $claims;
+        } else {
+            $user_json = json_decode($response, false);
+        }
+
+        $userInfo = $user_json;
 
         if($attribute === null) {
-            return $this->userInfo;
+            return $userInfo;
         }
 
-        if (property_exists($this->userInfo, $attribute)) {
-            return $this->userInfo->$attribute;
+        if (property_exists($userInfo, $attribute)) {
+            return $userInfo->$attribute;
         }
 
         return null;
@@ -1389,13 +1327,13 @@ public function requestUserInfo($attribute = null) {
      * aud              string  Audience
      * nonce            string  nonce
      * iat              int     Issued At
-     * auth_time        int     Authenatication time
+     * auth_time        int     Authentication time
      * oid              string  Object id
      *
      * @return mixed
      *
      */
-    public function getVerifiedClaims($attribute = null) {
+    public function getVerifiedClaims(string $attribute = null) {
 
         if($attribute === null) {
             return $this->verifiedClaims;
@@ -1411,11 +1349,11 @@ public function getVerifiedClaims($attribute = null) {
     /**
      * @param string $url
      * @param string | null $post_body string If this is set the post type will be POST
-     * @param array $headers Extra headers to be send with the request. Format as 'NameHeader: ValueHeader'
+     * @param array $headers Extra headers to be sent with the request. Format as 'NameHeader: ValueHeader'
+     * @return bool|string
      * @throws OpenIDConnectClientException
-     * @return mixed
      */
-    protected function fetchURL($url, $post_body = null, $headers = []) {
+    protected function fetchURL(string $url, string $post_body = null, array $headers = []) {
 
         // OK cool - then let's create a new cURL resource handle
         $ch = curl_init();
@@ -1423,7 +1361,7 @@ protected function fetchURL($url, $post_body = null, $headers = []) {
         // Determine whether this is a GET or POST
         if ($post_body !== null) {
             // curl_setopt($ch, CURLOPT_POST, 1);
-            // Alows to keep the POST method even after redirect
+            // Allows to keep the POST method even after redirect
             curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'POST');
             curl_setopt($ch, CURLOPT_POSTFIELDS, $post_body);
 
@@ -1431,15 +1369,17 @@ protected function fetchURL($url, $post_body = null, $headers = []) {
             $content_type = 'application/x-www-form-urlencoded';
 
             // Determine if this is a JSON payload and add the appropriate content type
-            if (is_object(json_decode($post_body))) {
+            if (is_object(json_decode($post_body, false))) {
                 $content_type = 'application/json';
             }
 
             // Add POST-specific headers
-            $headers[] = "Content-Type: {$content_type}";
-
+            $headers[] = "Content-Type: $content_type";
         }
 
+        // Set the User-Agent
+        curl_setopt($ch, CURLOPT_USERAGENT, $this->getUserAgent());
+
         // If we set some headers include them
         if(count($headers) > 0) {
             curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
@@ -1490,6 +1430,7 @@ protected function fetchURL($url, $post_body = null, $headers = []) {
         // HTTP Response code from server may be required from subclass
         $info = curl_getinfo($ch);
         $this->responseCode = $info['http_code'];
+        $this->responseContentType = $info['content_type'];
 
         if ($output === false) {
             throw new OpenIDConnectClientException('Curl error: (' . curl_errno($ch) . ') ' . curl_error($ch));
@@ -1502,20 +1443,18 @@ protected function fetchURL($url, $post_body = null, $headers = []) {
     }
 
     /**
-     * @param bool $appendSlash
-     * @return string
      * @throws OpenIDConnectClientException
      */
-    public function getWellKnownIssuer($appendSlash = false) {
-
+    public function getWellKnownIssuer(bool $appendSlash = false): string
+    {
         return $this->getWellKnownConfigValue('issuer') . ($appendSlash ? '/' : '');
     }
 
     /**
-     * @return string
      * @throws OpenIDConnectClientException
      */
-    public function getIssuer() {
+    public function getIssuer(): string
+    {
 
         if (!isset($this->providerConfig['issuer'])) {
             throw new OpenIDConnectClientException('The issuer has not been set');
@@ -1536,25 +1475,16 @@ public function getProviderURL() {
         return $this->providerConfig['providerUrl'];
     }
 
-    /**
-     * @param string $url
-     */
-    public function redirect($url) {
+    public function redirect(string $url) {
         header('Location: ' . $url);
         exit;
     }
 
-    /**
-     * @param string $httpProxy
-     */
-    public function setHttpProxy($httpProxy) {
+    public function setHttpProxy(string $httpProxy) {
         $this->httpProxy = $httpProxy;
     }
 
-    /**
-     * @param string $certPath
-     */
-    public function setCertPath($certPath) {
+    public function setCertPath(string $certPath) {
         $this->certPath = $certPath;
     }
 
@@ -1565,48 +1495,33 @@ public function getCertPath() {
         return $this->certPath;
     }
 
-    /**
-     * @param bool $verifyPeer
-     */
-    public function setVerifyPeer($verifyPeer) {
+    public function setVerifyPeer(bool $verifyPeer) {
         $this->verifyPeer = $verifyPeer;
     }
 
-    /**
-     * @param bool $verifyHost
-     */
-    public function setVerifyHost($verifyHost) {
+    public function setVerifyHost(bool $verifyHost) {
         $this->verifyHost = $verifyHost;
     }
 
-
     /**
      * Controls whether http header HTTP_UPGRADE_INSECURE_REQUESTS should be considered
      * defaults to true
-     * @param bool $httpUpgradeInsecureRequests
      */
-    public function setHttpUpgradeInsecureRequests($httpUpgradeInsecureRequests) {
+    public function setHttpUpgradeInsecureRequests(bool $httpUpgradeInsecureRequests) {
         $this->httpUpgradeInsecureRequests = $httpUpgradeInsecureRequests;
     }
 
-    /**
-     * @return bool
-     */
-    public function getVerifyHost() {
+    public function getVerifyHost(): bool
+    {
         return $this->verifyHost;
     }
 
-    /**
-     * @return bool
-     */
-    public function getVerifyPeer() {
+    public function getVerifyPeer(): bool
+    {
         return $this->verifyPeer;
     }
 
-    /**
-     * @return bool 
-     */
-    public function getHttpUpgradeInsecureRequests()
+    public function getHttpUpgradeInsecureRequests(): bool
     {
         return $this->httpUpgradeInsecureRequests;
     }
@@ -1615,10 +1530,8 @@ public function getHttpUpgradeInsecureRequests()
      * Use this for custom issuer validation
      * The given function should accept the issuer string from the JWT claim as the only argument
      * and return true if the issuer is valid, otherwise return false
-     *
-     * @param callable $issuerValidator
      */
-    public function setIssuerValidator($issuerValidator) {
+    public function setIssuerValidator(callable $issuerValidator) {
         $this->issuerValidator = $issuerValidator;
     }
 
@@ -1627,24 +1540,20 @@ public function setIssuerValidator($issuerValidator) {
      * The given function should accept the token_endpoint string as the only argument
      * and return a jwt signed with your private key according to:
      * https://openid.net/specs/openid-connect-core-1_0.html#ClientAuthentication
-     *
-     * @param callable $privateKeyJwtGenerator
      */
-    public function setPrivateKeyJwtGenerator($privateKeyJwtGenerator) {
+    public function setPrivateKeyJwtGenerator(callable $privateKeyJwtGenerator) {
         $this->privateKeyJwtGenerator = $privateKeyJwtGenerator;
     }
 
-    /**
-     * @param bool $allowImplicitFlow
-     */
-    public function setAllowImplicitFlow($allowImplicitFlow) {
+    public function setAllowImplicitFlow(bool $allowImplicitFlow) {
         $this->allowImplicitFlow = $allowImplicitFlow;
     }
 
     /**
      * @return bool
      */
-    public function getAllowImplicitFlow() {
+    public function getAllowImplicitFlow(): bool
+    {
         return $this->allowImplicitFlow;
     }
 
@@ -1655,21 +1564,15 @@ public function getAllowImplicitFlow() {
      * @param array $array
      *        simple key => value
      */
-    public function providerConfigParam($array) {
+    public function providerConfigParam(array $array) {
         $this->providerConfig = array_merge($this->providerConfig, $array);
     }
 
-    /**
-     * @param string $clientSecret
-     */
-    public function setClientSecret($clientSecret) {
+    public function setClientSecret(string $clientSecret) {
         $this->clientSecret = $clientSecret;
     }
 
-    /**
-     * @param string $clientID
-     */
-    public function setClientID($clientID) {
+    public function setClientID(string $clientID) {
         $this->clientID = $clientID;
     }
 
@@ -1690,7 +1593,7 @@ public function register() {
 
         $response = $this->fetchURL($registration_endpoint, json_encode($send_object));
 
-        $json_response = json_decode($response);
+        $json_response = json_decode($response, false);
 
         // Throw some errors if we encounter them
         if ($json_response === false) {
@@ -1708,10 +1611,8 @@ public function register() {
         if (isset($json_response->{'client_secret'})) {
             $this->setClientSecret($json_response->{'client_secret'});
         } else {
-            throw new OpenIDConnectClientException('Error registering:
-                                                    Please contact the OpenID Connect provider and obtain a Client ID and Secret directly from them');
+            throw new OpenIDConnectClientException('Error registering: Please contact the OpenID Connect provider and obtain a Client ID and Secret directly from them');
         }
-
     }
 
     /**
@@ -1724,8 +1625,9 @@ public function register() {
      * @param string|null $clientSecret
      * @return mixed
      * @throws OpenIDConnectClientException
+     * @throws Exception
      */
-    public function introspectToken($token, $token_type_hint = '', $clientId = null, $clientSecret = null) {
+    public function introspectToken(string $token, string $token_type_hint = '', string $clientId = null, string $clientSecret = null) {
         $introspection_endpoint = $this->getProviderConfigValue('introspection_endpoint');
         $token_endpoint_auth_methods_supported = $this->getProviderConfigValue('token_endpoint_auth_methods_supported', ['client_secret_basic']);
 
@@ -1734,8 +1636,8 @@ public function introspectToken($token, $token_type_hint = '', $clientId = null,
         if ($token_type_hint) {
             $post_data['token_type_hint'] = $token_type_hint;
         }
-        $clientId = $clientId !== null ? $clientId : $this->clientID;
-        $clientSecret = $clientSecret !== null ? $clientSecret : $this->clientSecret;
+        $clientId = $clientId ?? $this->clientID;
+        $clientSecret = $clientSecret ?? $this->clientSecret;
 
         // Convert token params to string format
         $headers = ['Authorization: Basic ' . base64_encode(urlencode($clientId) . ':' . urlencode($clientSecret)),
@@ -1744,7 +1646,7 @@ public function introspectToken($token, $token_type_hint = '', $clientId = null,
         if ($this->supportsAuthMethod('client_secret_jwt', $token_endpoint_auth_methods_supported)) {
             $client_assertion_type = $this->getProviderConfigValue('client_assertion_type');
             $client_assertion = $this->getJWTClientAssertion($this->getProviderConfigValue('introspection_endpoint'));
-            
+
             $post_data['client_assertion_type']=$client_assertion_type;
             $post_data['client_assertion'] = $client_assertion;
             $headers = ['Accept: application/json'];
@@ -1752,7 +1654,7 @@ public function introspectToken($token, $token_type_hint = '', $clientId = null,
 
         $post_params = http_build_query($post_data, '', '&');
 
-        return json_decode($this->fetchURL($introspection_endpoint, $post_params, $headers));
+        return json_decode($this->fetchURL($introspection_endpoint, $post_params, $headers), false);
     }
 
     /**
@@ -1766,7 +1668,7 @@ public function introspectToken($token, $token_type_hint = '', $clientId = null,
      * @return mixed
      * @throws OpenIDConnectClientException
      */
-    public function revokeToken($token, $token_type_hint = '', $clientId = null, $clientSecret = null) {
+    public function revokeToken(string $token, string $token_type_hint = '', string $clientId = null, string $clientSecret = null) {
         $revocation_endpoint = $this->getProviderConfigValue('revocation_endpoint');
 
         $post_data = ['token' => $token];
@@ -1774,82 +1676,77 @@ public function revokeToken($token, $token_type_hint = '', $clientId = null, $cl
         if ($token_type_hint) {
             $post_data['token_type_hint'] = $token_type_hint;
         }
-        $clientId = $clientId !== null ? $clientId : $this->clientID;
-        $clientSecret = $clientSecret !== null ? $clientSecret : $this->clientSecret;
+        $clientId = $clientId ?? $this->clientID;
+        $clientSecret = $clientSecret ?? $this->clientSecret;
 
         // Convert token params to string format
         $post_params = http_build_query($post_data, '', '&');
         $headers = ['Authorization: Basic ' . base64_encode(urlencode($clientId) . ':' . urlencode($clientSecret)),
             'Accept: application/json'];
 
-        return json_decode($this->fetchURL($revocation_endpoint, $post_params, $headers));
+        return json_decode($this->fetchURL($revocation_endpoint, $post_params, $headers), false);
     }
 
     /**
-     * @return string
+     * @return string|null
      */
-    public function getClientName() {
+    public function getClientName()
+    {
         return $this->clientName;
     }
 
-    /**
-     * @param string $clientName
-     */
-    public function setClientName($clientName) {
+    public function setClientName(string $clientName) {
         $this->clientName = $clientName;
     }
 
     /**
-     * @return string
+     * @return string|null
      */
     public function getClientID() {
         return $this->clientID;
     }
 
     /**
-     * @return string
+     * @return string|null
      */
     public function getClientSecret() {
         return $this->clientSecret;
     }
 
-    /**
-     * @return bool
-     */
-    public function canVerifySignatures() {
-        return class_exists('\phpseclib3\Crypt\RSA') || class_exists('\phpseclib\Crypt\RSA') || class_exists('Crypt_RSA');
-    }
-
     /**
      * Set the access token.
      *
      * May be required for subclasses of this Client.
-     *
-     * @param string $accessToken
-     * @return void
      */
-    public function setAccessToken($accessToken) {
+    public function setAccessToken(string $accessToken) {
         $this->accessToken = $accessToken;
     }
 
     /**
-     * @return string
+     * @return string|null
      */
-    public function getAccessToken() {
+    public function getAccessToken()
+    {
         return $this->accessToken;
     }
 
     /**
-     * @return string
+     * @return string|null
      */
-    public function getRefreshToken() {
+    public function getRefreshToken()
+    {
         return $this->refreshToken;
     }
 
+    public function setIdToken(string $idToken) {
+        $this->idToken = $idToken;
+    }
+
     /**
-     * @return string
+     * @return string|null
      */
-    public function getIdToken() {
+    public function getIdToken()
+    {
         return $this->idToken;
     }
 
@@ -1861,28 +1758,28 @@ public function getAccessTokenHeader() {
     }
 
     /**
-     * @return object
+     * @return object|string|null
      */
     public function getAccessTokenPayload() {
         return $this->decodeJWT($this->accessToken, 1);
     }
 
     /**
-     * @return object
+     * @return object|string|null
      */
     public function getIdTokenHeader() {
         return $this->decodeJWT($this->idToken);
     }
 
     /**
-     * @return object
+     * @return object|string|null
      */
     public function getIdTokenPayload() {
         return $this->decodeJWT($this->idToken, 1);
     }
 
     /**
-     * @return string
+     * @return object
      */
     public function getTokenResponse() {
         return $this->tokenResponse;
@@ -1890,11 +1787,9 @@ public function getTokenResponse() {
 
     /**
      * Stores nonce
-     *
-     * @param string $nonce
-     * @return string
      */
-    protected function setNonce($nonce) {
+    protected function setNonce(string $nonce): string
+    {
         $this->setSessionKey('openid_connect_nonce', $nonce);
         return $nonce;
     }
@@ -1919,11 +1814,9 @@ protected function unsetNonce() {
 
     /**
      * Stores $state
-     *
-     * @param string $state
-     * @return string
      */
-    protected function setState($state) {
+    protected function setState(string $state): string
+    {
         $this->setSessionKey('openid_connect_state', $state);
         return $state;
     }
@@ -1948,11 +1841,9 @@ protected function unsetState() {
 
     /**
      * Stores $codeVerifier
-     *
-     * @param string $codeVerifier
-     * @return string
      */
-    protected function setCodeVerifier($codeVerifier) {
+    protected function setCodeVerifier(string $codeVerifier): string
+    {
         $this->setSessionKey('openid_connect_code_verifier', $codeVerifier);
         return $codeVerifier;
     }
@@ -1980,57 +1871,33 @@ protected function unsetCodeVerifier() {
      *
      * @return int
      */
-    public function getResponseCode() {
+    public function getResponseCode(): int
+    {
         return $this->responseCode;
     }
 
     /**
-     * Set timeout (seconds)
+     * Get the content type from last action/curl request.
      *
-     * @param int $timeout
-     */
-    public function setTimeout($timeout) {
-        $this->timeOut = $timeout;
-    }
-
-    /**
-     * @return int
+     * @return string|null
      */
-    public function getTimeout() {
-        return $this->timeOut;
+    public function getResponseContentType()
+    {
+        return $this->responseContentType;
     }
 
     /**
-     * Safely calculate length of binary string
-     * @param string $str
-     * @return int
+     * Set timeout (seconds)
+     *
+     * @param int $timeout
      */
-    private static function safeLength($str) {
-        if (function_exists('mb_strlen')) {
-            return mb_strlen($str, '8bit');
-        }
-        return strlen($str);
+    public function setTimeout(int $timeout) {
+        $this->timeOut = $timeout;
     }
 
-    /**
-     * Where hash_equals is not available, this provides a timing-attack safe string comparison
-     * @param string $str1
-     * @param string $str2
-     * @return bool
-     */
-    private static function hashEquals($str1, $str2) {
-        $len1=static::safeLength($str1);
-        $len2=static::safeLength($str2);
-
-        //compare strings without any early abort...
-        $len = min($len1, $len2);
-        $status = 0;
-        for ($i = 0; $i < $len; $i++) {
-            $status |= (ord($str1[$i]) ^ ord($str2[$i]));
-        }
-        //if strings were different lengths, we fail
-        $status |= ($len1 ^ $len2);
-        return ($status === 0);
+    public function getTimeout(): int
+    {
+        return $this->timeOut;
     }
 
     /**
@@ -2048,7 +1915,7 @@ protected function commitSession() {
         session_write_close();
     }
 
-    protected function getSessionKey($key) {
+    protected function getSessionKey(string $key) {
         $this->startSession();
 
         if (array_key_exists($key, $_SESSION)) {
@@ -2057,19 +1924,23 @@ protected function getSessionKey($key) {
         return false;
     }
 
-    protected function setSessionKey($key, $value) {
+    protected function setSessionKey(string $key, $value) {
         $this->startSession();
 
         $_SESSION[$key] = $value;
     }
 
-    protected function unsetSessionKey($key) {
+    protected function unsetSessionKey(string $key) {
         $this->startSession();
 
         unset($_SESSION[$key]);
     }
 
-    protected function getJWTClientAssertion($aud) {
+    /**
+     * @throws Exception
+     */
+    protected function getJWTClientAssertion($aud): string
+    {
         $jti = hash('sha256',bin2hex(random_bytes(64)));
 
         $now = time();
@@ -2085,7 +1956,7 @@ protected function getJWTClientAssertion($aud) {
 		]);
 		// Encode Header to Base64Url String
 		$base64UrlHeader = $this->urlEncode($header);
-		
+
 
 		// Encode Payload to Base64Url String
 		$base64UrlPayload = $this->urlEncode($payload);
@@ -2100,12 +1971,10 @@ protected function getJWTClientAssertion($aud) {
 
 		// Encode Signature to Base64Url String
 		$base64UrlSignature = $this->urlEncode($signature);
-		
-		$jwt = $base64UrlHeader . "." . $base64UrlPayload . "." . $base64UrlSignature;
 
-		return $jwt;
+        return $base64UrlHeader . "." . $base64UrlPayload . "." . $base64UrlSignature;
     }
-    
+
     public function setUrlEncoding($curEncoding) {
         switch ($curEncoding)
         {
@@ -2120,27 +1989,20 @@ public function setUrlEncoding($curEncoding) {
         	default:
                 break;
         }
-
     }
 
-    /**
-     * @return array
-     */
-    public function getScopes() {
+    public function getScopes(): array
+    {
         return $this->scopes;
     }
 
-    /**
-     * @return array
-     */
-    public function getResponseTypes() {
+    public function getResponseTypes(): array
+    {
         return $this->responseTypes;
     }
 
-    /**
-     * @return array
-     */
-    public function getAuthParams() {
+    public function getAuthParams(): array
+    {
         return $this->authParams;
     }
 
@@ -2159,10 +2021,8 @@ public function getPrivateKeyJwtGenerator() {
         return $this->privateKeyJwtGenerator;
     }
 
-    /**
-     * @return int
-     */
-    public function getLeeway() {
+    public function getLeeway(): int
+    {
         return $this->leeway;
     }
 
@@ -2173,10 +2033,7 @@ public function getCodeChallengeMethod() {
         return $this->codeChallengeMethod;
     }
 
-    /**
-     * @param string $codeChallengeMethod
-     */
-    public function setCodeChallengeMethod($codeChallengeMethod) {
+    public function setCodeChallengeMethod(string $codeChallengeMethod) {
         $this->codeChallengeMethod = $codeChallengeMethod;
     }
 
@@ -2188,26 +2045,27 @@ protected function verifyJWKHeader($jwk)
         throw new OpenIDConnectClientException('Self signed JWK header is not valid');
     }
 
-    /*
-     * @return string
+    /**
+     * @param string $jwe The JWE to decrypt
+     * @return string the JWT payload
+     * @throws OpenIDConnectClientException
      */
-    public function getSidFromBackChannel() {
+    protected function handleJweResponse(string $jwe): string
+    {
+        throw new OpenIDConnectClientException('JWE response is not supported, please extend the class and implement this method');
+    }
+
+    public function getSidFromBackChannel(): string
+    {
         return $this->backChannelSid;
     }
 
-    /**
-     * @return string
-     */
-    public function getSubjectFromBackChannel() {
+    public function getSubjectFromBackChannel(): string
+    {
         return $this->backChannelSubject;
     }
 
-    /**
-     * @param string $auth_method
-     * @param array $token_endpoint_auth_methods_supported
-     * @return bool
-     */
-    public function supportsAuthMethod($auth_method, $token_endpoint_auth_methods_supported)
+    public function supportsAuthMethod(string $auth_method, array $token_endpoint_auth_methods_supported): bool
     {
         # client_secret_jwt has to explicitly be enabled
         if (!in_array($auth_method, $this->token_endpoint_auth_methods_supported, true)) {
@@ -2216,4 +2074,9 @@ public function supportsAuthMethod($auth_method, $token_endpoint_auth_methods_su
 
         return in_array($auth_method, $token_endpoint_auth_methods_supported, true);
     }
+
+    protected function getUserAgent(): string
+    {
+        return "jumbojett/OpenID-Connect-PHP";
+    }
 }
diff --git a/vendor/jumbojett/openid-connect-php/tests/OpenIDConnectClientTest.php b/vendor/jumbojett/openid-connect-php/tests/OpenIDConnectClientTest.php
index dd3321bb41..45adc7b3f2 100644
--- a/vendor/jumbojett/openid-connect-php/tests/OpenIDConnectClientTest.php
+++ b/vendor/jumbojett/openid-connect-php/tests/OpenIDConnectClientTest.php
@@ -7,9 +7,49 @@
 
 class OpenIDConnectClientTest extends TestCase
 {
-    /**
-     * @return void
-     */
+    public function testJWTDecode()
+    {
+        $client = new OpenIDConnectClient();
+        # access token
+        $client->setAccessToken('');
+        $header = $client->getAccessTokenHeader();
+        self::assertEquals('', $header);
+        $payload = $client->getAccessTokenPayload();
+        self::assertEquals('', $payload);
+
+        # id token
+        $client->setIdToken('');
+        $header = $client->getIdTokenHeader();
+        self::assertEquals('', $header);
+        $payload = $client->getIdTokenPayload();
+        self::assertEquals('', $payload);
+
+    }
+
+    public function testGetNull()
+    {
+        $client = new OpenIDConnectClient();
+        self::assertNull($client->getAccessToken());
+        self::assertNull($client->getRefreshToken());
+        self::assertNull($client->getIdToken());
+        self::assertNull($client->getClientName());
+        self::assertNull($client->getClientID());
+        self::assertNull($client->getClientSecret());
+        self::assertNull($client->getCertPath());
+    }
+
+    public function testResponseTypes()
+    {
+        $client = new OpenIDConnectClient();
+        self::assertEquals([], $client->getResponseTypes());
+
+        $client->setResponseTypes('foo');
+        self::assertEquals(['foo'], $client->getResponseTypes());
+
+        $client->setResponseTypes(['bar', 'ipsum']);
+        self::assertEquals(['foo', 'bar', 'ipsum'], $client->getResponseTypes());
+    }
+
     public function testGetRedirectURL()
     {
         $client = new OpenIDConnectClient();
@@ -18,14 +58,19 @@ public function testGetRedirectURL()
 
         $_SERVER['SERVER_NAME'] = 'domain.test';
         $_SERVER['REQUEST_URI'] = '/path/index.php?foo=bar&baz#fragment';
+        $_SERVER['SERVER_PORT'] = '443';
         self::assertSame('http://domain.test/path/index.php', $client->getRedirectURL());
+
+        $_SERVER['SERVER_PORT'] = '8888';
+        self::assertSame('http://domain.test:8888/path/index.php', $client->getRedirectURL());
     }
 
     public function testAuthenticateDoesNotThrowExceptionIfClaimsIsMissingNonce()
     {
-        $fakeClaims = new \StdClass();
+        $fakeClaims = new StdClass();
         $fakeClaims->iss = 'fake-issuer';
         $fakeClaims->aud = 'fake-client-id';
+        $fakeClaims->sub = 'fake-sub';
         $fakeClaims->nonce = null;
 
         $_REQUEST['id_token'] = 'abc.123.xyz';
@@ -33,10 +78,10 @@ public function testAuthenticateDoesNotThrowExceptionIfClaimsIsMissingNonce()
         $_SESSION['openid_connect_state'] = false;
 
         /** @var OpenIDConnectClient | MockObject $client */
-        $client = $this->getMockBuilder(OpenIDConnectClient::class)->setMethods(['decodeJWT', 'getProviderConfigValue', 'verifyJWTsignature'])->getMock();
+        $client = $this->getMockBuilder(OpenIDConnectClient::class)->setMethods(['decodeJWT', 'getProviderConfigValue', 'verifyJWTSignature'])->getMock();
         $client->method('decodeJWT')->willReturn($fakeClaims);
         $client->method('getProviderConfigValue')->with('jwks_uri')->willReturn(true);
-        $client->method('verifyJWTsignature')->willReturn(true);
+        $client->method('verifyJWTSignature')->willReturn(true);
 
         $client->setClientID('fake-client-id');
         $client->setIssuer('fake-issuer');
@@ -60,7 +105,7 @@ public function testSerialize()
     {
         $client = new OpenIDConnectClient('https://example.com', 'foo', 'bar', 'baz');
         $serialized = serialize($client);
-        $this->assertInstanceOf('Jumbojett\OpenIDConnectClient', unserialize($serialized));
+        $this->assertInstanceOf(OpenIDConnectClient::class, unserialize($serialized));
     }
 
     /**
@@ -75,7 +120,7 @@ public function testAuthMethodSupport($expected, $authMethod, $clientAuthMethods
         $this->assertEquals($expected, $client->supportsAuthMethod($authMethod, $idpAuthMethods));
     }
 
-    public function provider()
+    public function provider(): array
     {
         return [
             'client_secret_basic - default config' => [true, 'client_secret_basic', null, ['client_secret_basic']],
@@ -88,4 +133,153 @@ public function provider()
 
         ];
     }
+
+    /**
+     * @covers       Jumbojett\\OpenIDConnectClient::verifyLogoutTokenClaims
+     * @dataProvider provideTestVerifyLogoutTokenClaimsData
+     * @throws OpenIDConnectClientException
+     */
+    public function testVerifyLogoutTokenClaims( $claims, $expectedResult )
+    {
+        /** @var OpenIDConnectClient | MockObject $client */
+        $client = $this->getMockBuilder(OpenIDConnectClient::class)->setMethods(['decodeJWT'])->getMock();
+
+        $client->setClientID('fake-client-id');
+        $client->setIssuer('fake-issuer');
+        $client->setIssuerValidator(function() {
+            return true;
+        });
+        $client->setProviderURL('https://jwt.io/');
+
+        $actualResult = $client->verifyLogoutTokenClaims( $claims );
+
+        $this->assertEquals( $expectedResult, $actualResult );
+    }
+
+    /**
+     * @return array
+     */
+    public function provideTestVerifyLogoutTokenClaimsData(): array
+    {
+        return [
+            'valid-single-aud' => [
+                (object)[
+                    'iss' => 'fake-issuer',
+                    'aud' => 'fake-client-id',
+                    'sid' => 'fake-client-sid',
+                    'sub' => 'fake-client-sub',
+                    'iat' => time(),
+                    'events' => (object) [
+                        'http://schemas.openid.net/event/backchannel-logout' => (object)[]
+                    ],
+                ],
+                true
+            ],
+            'valid-multiple-auds' => [
+                (object)[
+                    'iss' => 'fake-issuer',
+                    'aud' => [ 'fake-client-id', 'some-other-aud' ],
+                    'sid' => 'fake-client-sid',
+                    'sub' => 'fake-client-sub',
+                    'iat' => time(),
+                    'events' => (object) [
+                        'http://schemas.openid.net/event/backchannel-logout' => (object)[]
+                    ],
+                ],
+                true
+            ],
+            'invalid-no-sid-and-no-sub' => [
+                (object)[
+                    'iss' => 'fake-issuer',
+                    'aud' => [ 'fake-client-id', 'some-other-aud' ],
+                    'iat' => time(),
+                    'events' => (object) [
+                        'http://schemas.openid.net/event/backchannel-logout' => (object)[]
+                    ],
+                ],
+                false
+            ],
+            'valid-no-sid' => [
+                (object)[
+                    'iss' => 'fake-issuer',
+                    'aud' => [ 'fake-client-id', 'some-other-aud' ],
+                    'sub' => 'fake-client-sub',
+                    'iat' => time(),
+                    'events' => (object) [
+                        'http://schemas.openid.net/event/backchannel-logout' => (object)[]
+                    ],
+                ],
+                true
+            ],
+            'valid-no-sub' => [
+                (object)[
+                    'iss' => 'fake-issuer',
+                    'aud' => [ 'fake-client-id', 'some-other-aud' ],
+                    'sid' => 'fake-client-sid',
+                    'iat' => time(),
+                    'events' => (object) [
+                        'http://schemas.openid.net/event/backchannel-logout' => (object)[]
+                    ],
+                ],
+                true
+            ],
+            'invalid-with-nonce' => [
+                (object)[
+                    'iss' => 'fake-issuer',
+                    'aud' => [ 'fake-client-id', 'some-other-aud' ],
+                    'sid' => 'fake-client-sid',
+                    'iat' => time(),
+                    'events' => (object) [
+                        'http://schemas.openid.net/event/backchannel-logout' => (object)[]
+                    ],
+                    'nonce' => 'must-not-be-set'
+                ],
+                false
+            ],
+            'invalid-no-events' => [
+                (object)[
+                    'iss' => 'fake-issuer',
+                    'aud' => [ 'fake-client-id', 'some-other-aud' ],
+                    'sid' => 'fake-client-sid',
+                    'iat' => time(),
+                    'nonce' => 'must-not-be-set'
+                ],
+                false
+            ],
+            'invalid-no-backchannel-event' => [
+                (object)[
+                    'iss' => 'fake-issuer',
+                    'aud' => [ 'fake-client-id', 'some-other-aud' ],
+                    'sid' => 'fake-client-sid',
+                    'iat' => time(),
+                    'events' => (object) [],
+                    'nonce' => 'must-not-be-set'
+                ],
+                false
+            ],
+            'invalid-no-iat' => [
+                (object)[
+                    'iss' => 'fake-issuer',
+                    'aud' => [ 'fake-client-id', 'some-other-aud' ],
+                    'sid' => 'fake-client-sid',
+                    'events' => (object) [
+                        'http://schemas.openid.net/event/backchannel-logout' => (object)[]
+                    ]
+                ],
+                false
+            ],
+            'invalid-bad-iat' => [
+                (object)[
+                    'iss' => 'fake-issuer',
+                    'aud' => [ 'fake-client-id', 'some-other-aud' ],
+                    'sid' => 'fake-client-sid',
+                    'iat' => time() + 301,
+                    'events' => (object) [
+                        'http://schemas.openid.net/event/backchannel-logout' => (object)[]
+                    ]
+                ],
+                false
+            ],
+        ];
+    }
 }
diff --git a/vendor/jumbojett/openid-connect-php/tests/TokenVerificationTest.php b/vendor/jumbojett/openid-connect-php/tests/TokenVerificationTest.php
index 58449924c5..0715911eb5 100644
--- a/vendor/jumbojett/openid-connect-php/tests/TokenVerificationTest.php
+++ b/vendor/jumbojett/openid-connect-php/tests/TokenVerificationTest.php
@@ -2,6 +2,7 @@
 
 
 use Jumbojett\OpenIDConnectClient;
+use Jumbojett\OpenIDConnectClientException;
 use PHPUnit\Framework\MockObject\MockObject;
 use Yoast\PHPUnitPolyfills\TestCases\TestCase;
 
@@ -10,7 +11,7 @@ class TokenVerificationTest extends TestCase
     /**
      * @param $alg
      * @param $jwt
-     * @throws \Jumbojett\OpenIDConnectClientException
+     * @throws OpenIDConnectClientException
      * @dataProvider providesTokens
      */
     public function testTokenVerification($alg, $jwt)
@@ -20,12 +21,12 @@ public function testTokenVerification($alg, $jwt)
         $client->method('fetchUrl')->willReturn(file_get_contents(__DIR__ . "/data/jwks-$alg.json"));
         $client->setProviderURL('https://jwt.io/');
         $client->providerConfigParam(['jwks_uri' => 'https://jwt.io/.well-known/jwks.json']);
-        $verified = $client->verifyJWTsignature($jwt);
+        $verified = $client->verifyJWTSignature($jwt);
         self::assertTrue($verified);
         $client->setAccessToken($jwt);
     }
 
-    public function providesTokens()
+    public function providesTokens(): array
     {
         return [
             'PS256' => ['ps256', 'eyJhbGciOiJQUzI1NiIsImtpZCI6Imtvbm5lY3RkLXRva2Vucy1zaWduaW5nLWtleSIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJrcG9wLWh0dHBzOi8va29wYW5vLmRlbW8vbWVldC8iLCJleHAiOjE1NjgzNzE0NjEsImp0aSI6IkpkR0tDbEdOTXl2VXJpcmlRRUlWUXZCVmttT2FfQkRjIiwiaWF0IjoxNTY4MzcxMjIxLCJpc3MiOiJodHRwczovL2tvcGFuby5kZW1vIiwic3ViIjoiUHpUVWp3NHBlXzctWE5rWlBILXJxVHE0MTQ1Z3lDdlRvQmk4V1E5bFBrcW5rbEc1aktvRU5LM21Qb0I1WGY1ZTM5dFRMR2RKWXBMNEJubXFnelpaX0FAa29ubmVjdCIsImtjLmlzQWNjZXNzVG9rZW4iOnRydWUsImtjLmF1dGhvcml6ZWRTY29wZXMiOlsicHJvZmlsZSIsImVtYWlsIiwia29wYW5vL2t3bSIsImtvcGFuby9nYyIsImtvcGFuby9rdnMiLCJvcGVuaWQiXSwia2MuYXV0aG9yaXplZENsYWltcyI6eyJpZF90b2tlbiI6eyJuYW1lIjpudWxsfX0sImtjLmlkZW50aXR5Ijp7ImtjLmkuZG4iOiJKb25hcyBCcmVra2UiLCJrYy5pLmlkIjoiQUFBQUFLd2hxVkJBMCs1SXN4bjdwMU13UkNVQkFBQUFCZ0FBQUJzQUFBQk5VVDA5QUFBQUFBPT0iLCJrYy5pLnVuIjoidXNlcjEiLCJrYy5pLnVzIjoiTVEifSwia2MucHJvdmlkZXIiOiJpZGVudGlmaWVyLWtjIn0.hGRuXvul2kOiALHexwYp5MBEJVwz1YV3ehyM3AOuwCoK2w5sJxdciqqY_TfXCKyO6nAEbYLK3J0CBOjfup_IG0aCZcwzjto8khYlc4ezXkGnFsbJBNQdDGkpHtWnioWx-OJ3cXvY9F8aOvjaq0gw11ZDAcqQl0g7LTbJ9-J_yx0pmy3NGai2JB30Fh1OgSDzYfxWnE0RRgZG-x68e65RXfSBaEGW85OUh4wihxO2zdTGAHJ3Iq_-QAG4yRbXZtLx3ZspG7LNmqG-YE3huy3Rd8u3xrJNhmUOfEnz3x07q7VW0cj9NedX98BAbj3iNvksQsE0oG0J_f_Tu8Ai8VbWB72sJuXZWxANDKdz0BBYLzXhsjXkNByRq9x3zqDVsX-cVHei_XudxEOVRBjhkvW2MmIjcAHNKCKsdar865-gFG9McP4PCcBlY28tC0Cvnzyi83LBfpGRXdl6MJunnUsKQ1C79iCoVI1doK1erFN959Q-TGJfJA3Tr5LNpuGawB5rpe1nDGWvmYhg3uYfNl8uTTyvNgvvejcflEb2DURuXdqABuSiP7RkDWYtzx6mq49G0tRxelBbvyjQ2id2QjmRRdQ6dHEZ2NCJ51b8OFoDJBtxN1CD62TTxa3FUqCdZAPAUR3hHn_69vYq82MR514s-Gb67A6j2PbMPFATQP2UdK8']
diff --git a/vendor/laminas/laminas-escaper/.laminas-ci.json b/vendor/laminas/laminas-escaper/.laminas-ci.json
deleted file mode 100644
index bce3fa21bb..0000000000
--- a/vendor/laminas/laminas-escaper/.laminas-ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "ignore_php_platform_requirements": {
-        "8.1": true
-    }
-}
diff --git a/vendor/laminas/laminas-escaper/COPYRIGHT.md b/vendor/laminas/laminas-escaper/COPYRIGHT.md
deleted file mode 100644
index 0a8cccc06b..0000000000
--- a/vendor/laminas/laminas-escaper/COPYRIGHT.md
+++ /dev/null
@@ -1 +0,0 @@
-Copyright (c) 2020 Laminas Project a Series of LF Projects, LLC. (https://getlaminas.org/)
diff --git a/vendor/laminas/laminas-escaper/LICENSE.md b/vendor/laminas/laminas-escaper/LICENSE.md
deleted file mode 100644
index 10b40f1423..0000000000
--- a/vendor/laminas/laminas-escaper/LICENSE.md
+++ /dev/null
@@ -1,26 +0,0 @@
-Copyright (c) 2020 Laminas Project a Series of LF Projects, LLC.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-- Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-- Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-- Neither the name of Laminas Foundation nor the names of its contributors may
-  be used to endorse or promote products derived from this software without
-  specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/laminas/laminas-escaper/README.md b/vendor/laminas/laminas-escaper/README.md
deleted file mode 100644
index 4f6c184c82..0000000000
--- a/vendor/laminas/laminas-escaper/README.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# laminas-escaper
-
-[![Build Status](https://github.com/laminas/laminas-escaper/actions/workflows/continuous-integration.yml/badge.svg)](https://github.com/laminas/laminas-escaper/actions/workflows/continuous-integration.yml)
-[![Coverage Status](https://coveralls.io/repos/github/laminas/laminas-escaper/badge.svg?branch=master)](https://coveralls.io/github/laminas/laminas-escaper?branch=master)
-
-The OWASP Top 10 web security risks study lists Cross-Site Scripting (XSS) in
-second place. PHP’s sole functionality against XSS is limited to two functions
-of which one is commonly misapplied. Thus, the laminas-escaper component was written.
-It offers developers a way to escape output and defend from XSS and related
-vulnerabilities by introducing contextual escaping based on peer-reviewed rules.
-
-## Installation
-
-Run the following to install this library:
-
-```bash
-$ composer require laminas/laminas-escaper
-```
-
-## Documentation
-
-Browse the documentation online at https://docs.laminas.dev/laminas-escaper/
-
-## Support
-
-* [Issues](https://github.com/laminas/laminas-escaper/issues/)
-* [Chat](https://laminas.dev/chat/)
-* [Forum](https://discourse.laminas.dev/)
diff --git a/vendor/laminas/laminas-escaper/composer.json b/vendor/laminas/laminas-escaper/composer.json
deleted file mode 100644
index f6ea6e13ee..0000000000
--- a/vendor/laminas/laminas-escaper/composer.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-    "name": "laminas/laminas-escaper",
-    "description": "Securely and safely escape HTML, HTML attributes, JavaScript, CSS, and URLs",
-    "license": "BSD-3-Clause",
-    "keywords": [
-        "laminas",
-        "escaper"
-    ],
-    "homepage": "https://laminas.dev",
-    "support": {
-        "docs": "https://docs.laminas.dev/laminas-escaper/",
-        "issues": "https://github.com/laminas/laminas-escaper/issues",
-        "source": "https://github.com/laminas/laminas-escaper",
-        "rss": "https://github.com/laminas/laminas-escaper/releases.atom",
-        "chat": "https://laminas.dev/chat",
-        "forum": "https://discourse.laminas.dev"
-    },
-    "config": {
-        "sort-packages": true
-    },
-    "extra": {
-    },
-    "require": {
-        "php": "^7.3 || ~8.0.0",
-        "laminas/laminas-zendframework-bridge": "^1.0"
-    },
-    "suggest": {
-        "ext-iconv": "*",
-        "ext-mbstring": "*"
-    },
-    "require-dev": {
-        "laminas/laminas-coding-standard": "~2.3.0",
-        "phpunit/phpunit": "^9.3",
-        "psalm/plugin-phpunit": "^0.12.2",
-        "vimeo/psalm": "^3.16"
-    },
-    "autoload": {
-        "psr-4": {
-            "Laminas\\Escaper\\": "src/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "LaminasTest\\Escaper\\": "test/"
-        }
-    },
-    "scripts": {
-        "check": [
-            "@cs-check",
-            "@test"
-        ],
-        "cs-check": "phpcs",
-        "cs-fix": "phpcbf",
-        "static-analysis": "psalm --shepherd --stats",
-        "test": "phpunit --colors=always",
-        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
-    },
-    "replace": {
-        "zendframework/zend-escaper": "^2.6.1"
-    }
-}
diff --git a/vendor/laminas/laminas-escaper/composer.lock b/vendor/laminas/laminas-escaper/composer.lock
deleted file mode 100644
index 8aeb43191e..0000000000
--- a/vendor/laminas/laminas-escaper/composer.lock
+++ /dev/null
@@ -1,4233 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
-        "This file is @generated automatically"
-    ],
-    "content-hash": "3ae8b5c14cc68f892022c288cce516a3",
-    "packages": [
-        {
-            "name": "laminas/laminas-zendframework-bridge",
-            "version": "1.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-zendframework-bridge.git",
-                "reference": "13af2502d9bb6f7d33be2de4b51fb68c6cdb476e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/13af2502d9bb6f7d33be2de4b51fb68c6cdb476e",
-                "reference": "13af2502d9bb6f7d33be2de4b51fb68c6cdb476e",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.3 || ^8.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.1 || ^9.3",
-                "psalm/plugin-phpunit": "^0.15.1",
-                "squizlabs/php_codesniffer": "^3.5",
-                "vimeo/psalm": "^4.6"
-            },
-            "type": "library",
-            "extra": {
-                "laminas": {
-                    "module": "Laminas\\ZendFrameworkBridge"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "src/autoload.php"
-                ],
-                "psr-4": {
-                    "Laminas\\ZendFrameworkBridge\\": "src//"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "Alias legacy ZF class names to Laminas Project equivalents.",
-            "keywords": [
-                "ZendFramework",
-                "autoloading",
-                "laminas",
-                "zf"
-            ],
-            "support": {
-                "forum": "https://discourse.laminas.dev/",
-                "issues": "https://github.com/laminas/laminas-zendframework-bridge/issues",
-                "rss": "https://github.com/laminas/laminas-zendframework-bridge/releases.atom",
-                "source": "https://github.com/laminas/laminas-zendframework-bridge"
-            },
-            "funding": [
-                {
-                    "url": "https://funding.communitybridge.org/projects/laminas-project",
-                    "type": "community_bridge"
-                }
-            ],
-            "time": "2021-06-24T12:49:22+00:00"
-        }
-    ],
-    "packages-dev": [
-        {
-            "name": "amphp/amp",
-            "version": "v2.5.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/amphp/amp.git",
-                "reference": "efca2b32a7580087adb8aabbff6be1dc1bb924a9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/amphp/amp/zipball/efca2b32a7580087adb8aabbff6be1dc1bb924a9",
-                "reference": "efca2b32a7580087adb8aabbff6be1dc1bb924a9",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7"
-            },
-            "require-dev": {
-                "amphp/php-cs-fixer-config": "dev-master",
-                "amphp/phpunit-util": "^1",
-                "ext-json": "*",
-                "jetbrains/phpstorm-stubs": "^2019.3",
-                "phpunit/phpunit": "^6.0.9 | ^7",
-                "psalm/phar": "^3.11@dev",
-                "react/promise": "^2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Amp\\": "lib"
-                },
-                "files": [
-                    "lib/functions.php",
-                    "lib/Internal/functions.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Daniel Lowrey",
-                    "email": "rdlowrey@php.net"
-                },
-                {
-                    "name": "Aaron Piotrowski",
-                    "email": "aaron@trowski.com"
-                },
-                {
-                    "name": "Bob Weinand",
-                    "email": "bobwei9@hotmail.com"
-                },
-                {
-                    "name": "Niklas Keller",
-                    "email": "me@kelunik.com"
-                }
-            ],
-            "description": "A non-blocking concurrency framework for PHP applications.",
-            "homepage": "http://amphp.org/amp",
-            "keywords": [
-                "async",
-                "asynchronous",
-                "awaitable",
-                "concurrency",
-                "event",
-                "event-loop",
-                "future",
-                "non-blocking",
-                "promise"
-            ],
-            "support": {
-                "irc": "irc://irc.freenode.org/amphp",
-                "issues": "https://github.com/amphp/amp/issues",
-                "source": "https://github.com/amphp/amp/tree/v2.5.2"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/amphp",
-                    "type": "github"
-                }
-            ],
-            "time": "2021-01-10T17:06:37+00:00"
-        },
-        {
-            "name": "amphp/byte-stream",
-            "version": "v1.8.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/amphp/byte-stream.git",
-                "reference": "acbd8002b3536485c997c4e019206b3f10ca15bd"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/amphp/byte-stream/zipball/acbd8002b3536485c997c4e019206b3f10ca15bd",
-                "reference": "acbd8002b3536485c997c4e019206b3f10ca15bd",
-                "shasum": ""
-            },
-            "require": {
-                "amphp/amp": "^2",
-                "php": ">=7.1"
-            },
-            "require-dev": {
-                "amphp/php-cs-fixer-config": "dev-master",
-                "amphp/phpunit-util": "^1.4",
-                "friendsofphp/php-cs-fixer": "^2.3",
-                "jetbrains/phpstorm-stubs": "^2019.3",
-                "phpunit/phpunit": "^6 || ^7 || ^8",
-                "psalm/phar": "^3.11.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Amp\\ByteStream\\": "lib"
-                },
-                "files": [
-                    "lib/functions.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Aaron Piotrowski",
-                    "email": "aaron@trowski.com"
-                },
-                {
-                    "name": "Niklas Keller",
-                    "email": "me@kelunik.com"
-                }
-            ],
-            "description": "A stream abstraction to make working with non-blocking I/O simple.",
-            "homepage": "http://amphp.org/byte-stream",
-            "keywords": [
-                "amp",
-                "amphp",
-                "async",
-                "io",
-                "non-blocking",
-                "stream"
-            ],
-            "support": {
-                "irc": "irc://irc.freenode.org/amphp",
-                "issues": "https://github.com/amphp/byte-stream/issues",
-                "source": "https://github.com/amphp/byte-stream/tree/v1.8.1"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/amphp",
-                    "type": "github"
-                }
-            ],
-            "time": "2021-03-30T17:13:30+00:00"
-        },
-        {
-            "name": "composer/package-versions-deprecated",
-            "version": "1.11.99.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/composer/package-versions-deprecated.git",
-                "reference": "c6522afe5540d5fc46675043d3ed5a45a740b27c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/c6522afe5540d5fc46675043d3ed5a45a740b27c",
-                "reference": "c6522afe5540d5fc46675043d3ed5a45a740b27c",
-                "shasum": ""
-            },
-            "require": {
-                "composer-plugin-api": "^1.1.0 || ^2.0",
-                "php": "^7 || ^8"
-            },
-            "replace": {
-                "ocramius/package-versions": "1.11.99"
-            },
-            "require-dev": {
-                "composer/composer": "^1.9.3 || ^2.0@dev",
-                "ext-zip": "^1.13",
-                "phpunit/phpunit": "^6.5 || ^7"
-            },
-            "type": "composer-plugin",
-            "extra": {
-                "class": "PackageVersions\\Installer",
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "PackageVersions\\": "src/PackageVersions"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com"
-                },
-                {
-                    "name": "Jordi Boggiano",
-                    "email": "j.boggiano@seld.be"
-                }
-            ],
-            "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)",
-            "support": {
-                "issues": "https://github.com/composer/package-versions-deprecated/issues",
-                "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.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": "2021-05-24T07:46:03+00:00"
-        },
-        {
-            "name": "composer/semver",
-            "version": "3.2.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/composer/semver.git",
-                "reference": "31f3ea725711245195f62e54ffa402d8ef2fdba9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/composer/semver/zipball/31f3ea725711245195f62e54ffa402d8ef2fdba9",
-                "reference": "31f3ea725711245195f62e54ffa402d8ef2fdba9",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.2 || ^7.0 || ^8.0"
-            },
-            "require-dev": {
-                "phpstan/phpstan": "^0.12.54",
-                "symfony/phpunit-bridge": "^4.2 || ^5"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "3.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Composer\\Semver\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nils Adermann",
-                    "email": "naderman@naderman.de",
-                    "homepage": "http://www.naderman.de"
-                },
-                {
-                    "name": "Jordi Boggiano",
-                    "email": "j.boggiano@seld.be",
-                    "homepage": "http://seld.be"
-                },
-                {
-                    "name": "Rob Bast",
-                    "email": "rob.bast@gmail.com",
-                    "homepage": "http://robbast.nl"
-                }
-            ],
-            "description": "Semver library that offers utilities, version constraint parsing and validation.",
-            "keywords": [
-                "semantic",
-                "semver",
-                "validation",
-                "versioning"
-            ],
-            "support": {
-                "irc": "irc://irc.freenode.org/composer",
-                "issues": "https://github.com/composer/semver/issues",
-                "source": "https://github.com/composer/semver/tree/3.2.5"
-            },
-            "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": "2021-05-24T12:41:47+00:00"
-        },
-        {
-            "name": "composer/xdebug-handler",
-            "version": "1.4.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "f27e06cd9675801df441b3656569b328e04aa37c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/f27e06cd9675801df441b3656569b328e04aa37c",
-                "reference": "f27e06cd9675801df441b3656569b328e04aa37c",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.2 || ^7.0 || ^8.0",
-                "psr/log": "^1.0"
-            },
-            "require-dev": {
-                "phpstan/phpstan": "^0.12.55",
-                "symfony/phpunit-bridge": "^4.2 || ^5"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Composer\\XdebugHandler\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "John Stevenson",
-                    "email": "john-stevenson@blueyonder.co.uk"
-                }
-            ],
-            "description": "Restarts a process without Xdebug.",
-            "keywords": [
-                "Xdebug",
-                "performance"
-            ],
-            "support": {
-                "irc": "irc://irc.freenode.org/composer",
-                "issues": "https://github.com/composer/xdebug-handler/issues",
-                "source": "https://github.com/composer/xdebug-handler/tree/1.4.6"
-            },
-            "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": "2021-03-25T17:01:18+00:00"
-        },
-        {
-            "name": "dealerdirect/phpcodesniffer-composer-installer",
-            "version": "v0.7.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Dealerdirect/phpcodesniffer-composer-installer.git",
-                "reference": "fe390591e0241955f22eb9ba327d137e501c771c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Dealerdirect/phpcodesniffer-composer-installer/zipball/fe390591e0241955f22eb9ba327d137e501c771c",
-                "reference": "fe390591e0241955f22eb9ba327d137e501c771c",
-                "shasum": ""
-            },
-            "require": {
-                "composer-plugin-api": "^1.0 || ^2.0",
-                "php": ">=5.3",
-                "squizlabs/php_codesniffer": "^2.0 || ^3.0 || ^4.0"
-            },
-            "require-dev": {
-                "composer/composer": "*",
-                "phpcompatibility/php-compatibility": "^9.0",
-                "sensiolabs/security-checker": "^4.1.0"
-            },
-            "type": "composer-plugin",
-            "extra": {
-                "class": "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin"
-            },
-            "autoload": {
-                "psr-4": {
-                    "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Franck Nijhof",
-                    "email": "franck.nijhof@dealerdirect.com",
-                    "homepage": "http://www.frenck.nl",
-                    "role": "Developer / IT Manager"
-                }
-            ],
-            "description": "PHP_CodeSniffer Standards Composer Installer Plugin",
-            "homepage": "http://www.dealerdirect.com",
-            "keywords": [
-                "PHPCodeSniffer",
-                "PHP_CodeSniffer",
-                "code quality",
-                "codesniffer",
-                "composer",
-                "installer",
-                "phpcs",
-                "plugin",
-                "qa",
-                "quality",
-                "standard",
-                "standards",
-                "style guide",
-                "stylecheck",
-                "tests"
-            ],
-            "support": {
-                "issues": "https://github.com/dealerdirect/phpcodesniffer-composer-installer/issues",
-                "source": "https://github.com/dealerdirect/phpcodesniffer-composer-installer"
-            },
-            "time": "2020-12-07T18:04:37+00:00"
-        },
-        {
-            "name": "dnoegel/php-xdg-base-dir",
-            "version": "v0.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/dnoegel/php-xdg-base-dir.git",
-                "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/dnoegel/php-xdg-base-dir/zipball/8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd",
-                "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~7.0|~6.0|~5.0|~4.8.35"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "XdgBaseDir\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "implementation of xdg base directory specification for php",
-            "support": {
-                "issues": "https://github.com/dnoegel/php-xdg-base-dir/issues",
-                "source": "https://github.com/dnoegel/php-xdg-base-dir/tree/v0.1.1"
-            },
-            "time": "2019-12-04T15:06:13+00:00"
-        },
-        {
-            "name": "doctrine/instantiator",
-            "version": "1.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/d56bf6102915de5702778fe20f2de3b2fe570b5b",
-                "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1 || ^8.0"
-            },
-            "require-dev": {
-                "doctrine/coding-standard": "^8.0",
-                "ext-pdo": "*",
-                "ext-phar": "*",
-                "phpbench/phpbench": "^0.13 || 1.0.0-alpha2",
-                "phpstan/phpstan": "^0.12",
-                "phpstan/phpstan-phpunit": "^0.12",
-                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com",
-                    "homepage": "https://ocramius.github.io/"
-                }
-            ],
-            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://www.doctrine-project.org/projects/instantiator.html",
-            "keywords": [
-                "constructor",
-                "instantiate"
-            ],
-            "support": {
-                "issues": "https://github.com/doctrine/instantiator/issues",
-                "source": "https://github.com/doctrine/instantiator/tree/1.4.0"
-            },
-            "funding": [
-                {
-                    "url": "https://www.doctrine-project.org/sponsorship.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://www.patreon.com/phpdoctrine",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-11-10T18:47:58+00:00"
-        },
-        {
-            "name": "felixfbecker/advanced-json-rpc",
-            "version": "v3.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/felixfbecker/php-advanced-json-rpc.git",
-                "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/felixfbecker/php-advanced-json-rpc/zipball/b5f37dbff9a8ad360ca341f3240dc1c168b45447",
-                "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447",
-                "shasum": ""
-            },
-            "require": {
-                "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0",
-                "php": "^7.1 || ^8.0",
-                "phpdocumentor/reflection-docblock": "^4.3.4 || ^5.0.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^7.0 || ^8.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "AdvancedJsonRpc\\": "lib/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "ISC"
-            ],
-            "authors": [
-                {
-                    "name": "Felix Becker",
-                    "email": "felix.b@outlook.com"
-                }
-            ],
-            "description": "A more advanced JSONRPC implementation",
-            "support": {
-                "issues": "https://github.com/felixfbecker/php-advanced-json-rpc/issues",
-                "source": "https://github.com/felixfbecker/php-advanced-json-rpc/tree/v3.2.1"
-            },
-            "time": "2021-06-11T22:34:44+00:00"
-        },
-        {
-            "name": "felixfbecker/language-server-protocol",
-            "version": "1.5.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/felixfbecker/php-language-server-protocol.git",
-                "reference": "9d846d1f5cf101deee7a61c8ba7caa0a975cd730"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/9d846d1f5cf101deee7a61c8ba7caa0a975cd730",
-                "reference": "9d846d1f5cf101deee7a61c8ba7caa0a975cd730",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "require-dev": {
-                "phpstan/phpstan": "*",
-                "squizlabs/php_codesniffer": "^3.1",
-                "vimeo/psalm": "^4.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "LanguageServerProtocol\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "ISC"
-            ],
-            "authors": [
-                {
-                    "name": "Felix Becker",
-                    "email": "felix.b@outlook.com"
-                }
-            ],
-            "description": "PHP classes for the Language Server Protocol",
-            "keywords": [
-                "language",
-                "microsoft",
-                "php",
-                "server"
-            ],
-            "support": {
-                "issues": "https://github.com/felixfbecker/php-language-server-protocol/issues",
-                "source": "https://github.com/felixfbecker/php-language-server-protocol/tree/1.5.1"
-            },
-            "time": "2021-02-22T14:02:09+00:00"
-        },
-        {
-            "name": "laminas/laminas-coding-standard",
-            "version": "2.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-coding-standard.git",
-                "reference": "bcf6e07fe4690240be7beb6d884d0b0fafa6a251"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-coding-standard/zipball/bcf6e07fe4690240be7beb6d884d0b0fafa6a251",
-                "reference": "bcf6e07fe4690240be7beb6d884d0b0fafa6a251",
-                "shasum": ""
-            },
-            "require": {
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.7",
-                "php": "^7.3 || ^8.0",
-                "slevomat/coding-standard": "^7.0",
-                "squizlabs/php_codesniffer": "^3.6",
-                "webimpress/coding-standard": "^1.2"
-            },
-            "type": "phpcodesniffer-standard",
-            "autoload": {
-                "psr-4": {
-                    "LaminasCodingStandard\\": "src/LaminasCodingStandard/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "Laminas Coding Standard",
-            "homepage": "https://laminas.dev",
-            "keywords": [
-                "Coding Standard",
-                "laminas"
-            ],
-            "support": {
-                "chat": "https://laminas.dev/chat",
-                "docs": "https://docs.laminas.dev/laminas-coding-standard/",
-                "forum": "https://discourse.laminas.dev",
-                "issues": "https://github.com/laminas/laminas-coding-standard/issues",
-                "rss": "https://github.com/laminas/laminas-coding-standard/releases.atom",
-                "source": "https://github.com/laminas/laminas-coding-standard"
-            },
-            "funding": [
-                {
-                    "url": "https://funding.communitybridge.org/projects/laminas-project",
-                    "type": "community_bridge"
-                }
-            ],
-            "time": "2021-05-29T15:53:59+00:00"
-        },
-        {
-            "name": "myclabs/deep-copy",
-            "version": "1.10.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/776f831124e9c62e1a2c601ecc52e776d8bb7220",
-                "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1 || ^8.0"
-            },
-            "replace": {
-                "myclabs/deep-copy": "self.version"
-            },
-            "require-dev": {
-                "doctrine/collections": "^1.0",
-                "doctrine/common": "^2.6",
-                "phpunit/phpunit": "^7.1"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "DeepCopy\\": "src/DeepCopy/"
-                },
-                "files": [
-                    "src/DeepCopy/deep_copy.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "Create deep copies (clones) of your objects",
-            "keywords": [
-                "clone",
-                "copy",
-                "duplicate",
-                "object",
-                "object graph"
-            ],
-            "support": {
-                "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.10.2"
-            },
-            "funding": [
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-11-13T09:40:50+00:00"
-        },
-        {
-            "name": "netresearch/jsonmapper",
-            "version": "v3.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/cweiske/jsonmapper.git",
-                "reference": "ba09f0e456d4f00cef84e012da5715625594407c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/ba09f0e456d4f00cef84e012da5715625594407c",
-                "reference": "ba09f0e456d4f00cef84e012da5715625594407c",
-                "shasum": ""
-            },
-            "require": {
-                "ext-json": "*",
-                "ext-pcre": "*",
-                "ext-reflection": "*",
-                "ext-spl": "*",
-                "php": ">=5.6"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.8.35 || ~5.7 || ~6.4 || ~7.0",
-                "squizlabs/php_codesniffer": "~3.5"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "JsonMapper": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "OSL-3.0"
-            ],
-            "authors": [
-                {
-                    "name": "Christian Weiske",
-                    "email": "cweiske@cweiske.de",
-                    "homepage": "http://github.com/cweiske/jsonmapper/",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Map nested JSON structures onto PHP classes",
-            "support": {
-                "email": "cweiske@cweiske.de",
-                "issues": "https://github.com/cweiske/jsonmapper/issues",
-                "source": "https://github.com/cweiske/jsonmapper/tree/v3.1.1"
-            },
-            "time": "2020-11-02T19:19:54+00:00"
-        },
-        {
-            "name": "nikic/php-parser",
-            "version": "v4.10.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "4432ba399e47c66624bc73c8c0f811e5c109576f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4432ba399e47c66624bc73c8c0f811e5c109576f",
-                "reference": "4432ba399e47c66624bc73c8c0f811e5c109576f",
-                "shasum": ""
-            },
-            "require": {
-                "ext-tokenizer": "*",
-                "php": ">=7.0"
-            },
-            "require-dev": {
-                "ircmaxell/php-yacc": "^0.0.7",
-                "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
-            },
-            "bin": [
-                "bin/php-parse"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.9-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "PhpParser\\": "lib/PhpParser"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Nikita Popov"
-                }
-            ],
-            "description": "A PHP parser written in PHP",
-            "keywords": [
-                "parser",
-                "php"
-            ],
-            "support": {
-                "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.10.5"
-            },
-            "time": "2021-05-03T19:11:20+00:00"
-        },
-        {
-            "name": "openlss/lib-array2xml",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/nullivex/lib-array2xml.git",
-                "reference": "a91f18a8dfc69ffabe5f9b068bc39bb202c81d90"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/nullivex/lib-array2xml/zipball/a91f18a8dfc69ffabe5f9b068bc39bb202c81d90",
-                "reference": "a91f18a8dfc69ffabe5f9b068bc39bb202c81d90",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.2"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "LSS": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "Apache-2.0"
-            ],
-            "authors": [
-                {
-                    "name": "Bryan Tong",
-                    "email": "bryan@nullivex.com",
-                    "homepage": "https://www.nullivex.com"
-                },
-                {
-                    "name": "Tony Butler",
-                    "email": "spudz76@gmail.com",
-                    "homepage": "https://www.nullivex.com"
-                }
-            ],
-            "description": "Array2XML conversion library credit to lalit.org",
-            "homepage": "https://www.nullivex.com",
-            "keywords": [
-                "array",
-                "array conversion",
-                "xml",
-                "xml conversion"
-            ],
-            "support": {
-                "issues": "https://github.com/nullivex/lib-array2xml/issues",
-                "source": "https://github.com/nullivex/lib-array2xml/tree/master"
-            },
-            "time": "2019-03-29T20:06:56+00:00"
-        },
-        {
-            "name": "phar-io/manifest",
-            "version": "2.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phar-io/manifest.git",
-                "reference": "85265efd3af7ba3ca4b2a2c34dbfc5788dd29133"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/manifest/zipball/85265efd3af7ba3ca4b2a2c34dbfc5788dd29133",
-                "reference": "85265efd3af7ba3ca4b2a2c34dbfc5788dd29133",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-phar": "*",
-                "ext-xmlwriter": "*",
-                "phar-io/version": "^3.0.1",
-                "php": "^7.2 || ^8.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Arne Blankerts",
-                    "email": "arne@blankerts.de",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Sebastian Heuer",
-                    "email": "sebastian@phpeople.de",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
-            "support": {
-                "issues": "https://github.com/phar-io/manifest/issues",
-                "source": "https://github.com/phar-io/manifest/tree/master"
-            },
-            "time": "2020-06-27T14:33:11+00:00"
-        },
-        {
-            "name": "phar-io/version",
-            "version": "3.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phar-io/version.git",
-                "reference": "bae7c545bef187884426f042434e561ab1ddb182"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/version/zipball/bae7c545bef187884426f042434e561ab1ddb182",
-                "reference": "bae7c545bef187884426f042434e561ab1ddb182",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2 || ^8.0"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Arne Blankerts",
-                    "email": "arne@blankerts.de",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Sebastian Heuer",
-                    "email": "sebastian@phpeople.de",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Library for handling version information and constraints",
-            "support": {
-                "issues": "https://github.com/phar-io/version/issues",
-                "source": "https://github.com/phar-io/version/tree/3.1.0"
-            },
-            "time": "2021-02-23T14:00:09+00:00"
-        },
-        {
-            "name": "phpdocumentor/reflection-common",
-            "version": "2.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b",
-                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2 || ^8.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-2.x": "2.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jaap van Otterdijk",
-                    "email": "opensource@ijaap.nl"
-                }
-            ],
-            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
-            "homepage": "http://www.phpdoc.org",
-            "keywords": [
-                "FQSEN",
-                "phpDocumentor",
-                "phpdoc",
-                "reflection",
-                "static analysis"
-            ],
-            "support": {
-                "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x"
-            },
-            "time": "2020-06-27T09:03:43+00:00"
-        },
-        {
-            "name": "phpdocumentor/reflection-docblock",
-            "version": "5.2.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/069a785b2141f5bcf49f3e353548dc1cce6df556",
-                "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556",
-                "shasum": ""
-            },
-            "require": {
-                "ext-filter": "*",
-                "php": "^7.2 || ^8.0",
-                "phpdocumentor/reflection-common": "^2.2",
-                "phpdocumentor/type-resolver": "^1.3",
-                "webmozart/assert": "^1.9.1"
-            },
-            "require-dev": {
-                "mockery/mockery": "~1.3.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                },
-                {
-                    "name": "Jaap van Otterdijk",
-                    "email": "account@ijaap.nl"
-                }
-            ],
-            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "support": {
-                "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/master"
-            },
-            "time": "2020-09-03T19:13:55+00:00"
-        },
-        {
-            "name": "phpdocumentor/type-resolver",
-            "version": "1.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0",
-                "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2 || ^8.0",
-                "phpdocumentor/reflection-common": "^2.0"
-            },
-            "require-dev": {
-                "ext-tokenizer": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-1.x": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                }
-            ],
-            "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
-            "support": {
-                "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
-                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.4.0"
-            },
-            "time": "2020-09-17T18:55:26+00:00"
-        },
-        {
-            "name": "phpspec/prophecy",
-            "version": "1.13.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "be1996ed8adc35c3fd795488a653f4b518be70ea"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/be1996ed8adc35c3fd795488a653f4b518be70ea",
-                "reference": "be1996ed8adc35c3fd795488a653f4b518be70ea",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.2",
-                "php": "^7.2 || ~8.0, <8.1",
-                "phpdocumentor/reflection-docblock": "^5.2",
-                "sebastian/comparator": "^3.0 || ^4.0",
-                "sebastian/recursion-context": "^3.0 || ^4.0"
-            },
-            "require-dev": {
-                "phpspec/phpspec": "^6.0",
-                "phpunit/phpunit": "^8.0 || ^9.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.11.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Prophecy\\": "src/Prophecy"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                },
-                {
-                    "name": "Marcello Duarte",
-                    "email": "marcello.duarte@gmail.com"
-                }
-            ],
-            "description": "Highly opinionated mocking framework for PHP 5.3+",
-            "homepage": "https://github.com/phpspec/prophecy",
-            "keywords": [
-                "Double",
-                "Dummy",
-                "fake",
-                "mock",
-                "spy",
-                "stub"
-            ],
-            "support": {
-                "issues": "https://github.com/phpspec/prophecy/issues",
-                "source": "https://github.com/phpspec/prophecy/tree/1.13.0"
-            },
-            "time": "2021-03-17T13:42:18+00:00"
-        },
-        {
-            "name": "phpstan/phpdoc-parser",
-            "version": "0.5.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpstan/phpdoc-parser.git",
-                "reference": "e352d065af1ae9b41c12d1dfd309e90f7b1f55c9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/e352d065af1ae9b41c12d1dfd309e90f7b1f55c9",
-                "reference": "e352d065af1ae9b41c12d1dfd309e90f7b1f55c9",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1 || ^8.0"
-            },
-            "require-dev": {
-                "phing/phing": "^2.16.3",
-                "php-parallel-lint/php-parallel-lint": "^1.2",
-                "phpstan/extension-installer": "^1.0",
-                "phpstan/phpstan": "^0.12.60",
-                "phpstan/phpstan-strict-rules": "^0.12.5",
-                "phpunit/phpunit": "^7.5.20",
-                "symfony/process": "^5.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "0.5-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "PHPStan\\PhpDocParser\\": [
-                        "src/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "PHPDoc parser with support for nullable, intersection and generic types",
-            "support": {
-                "issues": "https://github.com/phpstan/phpdoc-parser/issues",
-                "source": "https://github.com/phpstan/phpdoc-parser/tree/0.5.4"
-            },
-            "time": "2021-04-03T14:46:19+00:00"
-        },
-        {
-            "name": "phpunit/php-code-coverage",
-            "version": "9.2.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "f6293e1b30a2354e8428e004689671b83871edde"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f6293e1b30a2354e8428e004689671b83871edde",
-                "reference": "f6293e1b30a2354e8428e004689671b83871edde",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-libxml": "*",
-                "ext-xmlwriter": "*",
-                "nikic/php-parser": "^4.10.2",
-                "php": ">=7.3",
-                "phpunit/php-file-iterator": "^3.0.3",
-                "phpunit/php-text-template": "^2.0.2",
-                "sebastian/code-unit-reverse-lookup": "^2.0.2",
-                "sebastian/complexity": "^2.0",
-                "sebastian/environment": "^5.1.2",
-                "sebastian/lines-of-code": "^1.0.3",
-                "sebastian/version": "^3.0.1",
-                "theseer/tokenizer": "^1.2.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.3"
-            },
-            "suggest": {
-                "ext-pcov": "*",
-                "ext-xdebug": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "9.2-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
-            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
-            "keywords": [
-                "coverage",
-                "testing",
-                "xunit"
-            ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.6"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2021-03-28T07:26:59+00:00"
-        },
-        {
-            "name": "phpunit/php-file-iterator",
-            "version": "3.0.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "aa4be8575f26070b100fccb67faabb28f21f66f8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/aa4be8575f26070b100fccb67faabb28f21f66f8",
-                "reference": "aa4be8575f26070b100fccb67faabb28f21f66f8",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
-            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
-            "keywords": [
-                "filesystem",
-                "iterator"
-            ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
-                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.5"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-09-28T05:57:25+00:00"
-        },
-        {
-            "name": "phpunit/php-invoker",
-            "version": "3.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-invoker.git",
-                "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/5a10147d0aaf65b58940a0b72f71c9ac0423cc67",
-                "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.3"
-            },
-            "require-dev": {
-                "ext-pcntl": "*",
-                "phpunit/phpunit": "^9.3"
-            },
-            "suggest": {
-                "ext-pcntl": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.1-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Invoke callables with a timeout",
-            "homepage": "https://github.com/sebastianbergmann/php-invoker/",
-            "keywords": [
-                "process"
-            ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/php-invoker/issues",
-                "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.1"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-09-28T05:58:55+00:00"
-        },
-        {
-            "name": "phpunit/php-text-template",
-            "version": "2.0.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28",
-                "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Simple template engine.",
-            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
-            "keywords": [
-                "template"
-            ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
-                "source": "https://github.com/sebastianbergmann/php-text-template/tree/2.0.4"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-10-26T05:33:50+00:00"
-        },
-        {
-            "name": "phpunit/php-timer",
-            "version": "5.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2",
-                "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Utility class for timing",
-            "homepage": "https://github.com/sebastianbergmann/php-timer/",
-            "keywords": [
-                "timer"
-            ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/php-timer/issues",
-                "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-10-26T13:16:10+00:00"
-        },
-        {
-            "name": "phpunit/phpunit",
-            "version": "9.5.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "fb9b8333f14e3dce976a60ef6a7e05c7c7ed8bfb"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fb9b8333f14e3dce976a60ef6a7e05c7c7ed8bfb",
-                "reference": "fb9b8333f14e3dce976a60ef6a7e05c7c7ed8bfb",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.3.1",
-                "ext-dom": "*",
-                "ext-json": "*",
-                "ext-libxml": "*",
-                "ext-mbstring": "*",
-                "ext-xml": "*",
-                "ext-xmlwriter": "*",
-                "myclabs/deep-copy": "^1.10.1",
-                "phar-io/manifest": "^2.0.1",
-                "phar-io/version": "^3.0.2",
-                "php": ">=7.3",
-                "phpspec/prophecy": "^1.12.1",
-                "phpunit/php-code-coverage": "^9.2.3",
-                "phpunit/php-file-iterator": "^3.0.5",
-                "phpunit/php-invoker": "^3.1.1",
-                "phpunit/php-text-template": "^2.0.3",
-                "phpunit/php-timer": "^5.0.2",
-                "sebastian/cli-parser": "^1.0.1",
-                "sebastian/code-unit": "^1.0.6",
-                "sebastian/comparator": "^4.0.5",
-                "sebastian/diff": "^4.0.3",
-                "sebastian/environment": "^5.1.3",
-                "sebastian/exporter": "^4.0.3",
-                "sebastian/global-state": "^5.0.1",
-                "sebastian/object-enumerator": "^4.0.3",
-                "sebastian/resource-operations": "^3.0.3",
-                "sebastian/type": "^2.3.4",
-                "sebastian/version": "^3.0.2"
-            },
-            "require-dev": {
-                "ext-pdo": "*",
-                "phpspec/prophecy-phpunit": "^2.0.1"
-            },
-            "suggest": {
-                "ext-soap": "*",
-                "ext-xdebug": "*"
-            },
-            "bin": [
-                "phpunit"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "9.5-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ],
-                "files": [
-                    "src/Framework/Assert/Functions.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "The PHP Unit Testing framework.",
-            "homepage": "https://phpunit.de/",
-            "keywords": [
-                "phpunit",
-                "testing",
-                "xunit"
-            ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.6"
-            },
-            "funding": [
-                {
-                    "url": "https://phpunit.de/donate.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2021-06-23T05:14:38+00:00"
-        },
-        {
-            "name": "psalm/plugin-phpunit",
-            "version": "0.12.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/psalm/psalm-plugin-phpunit.git",
-                "reference": "85ee5a080a5281e63085d933b30a06b1b1680758"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/psalm/psalm-plugin-phpunit/zipball/85ee5a080a5281e63085d933b30a06b1b1680758",
-                "reference": "85ee5a080a5281e63085d933b30a06b1b1680758",
-                "shasum": ""
-            },
-            "require": {
-                "composer/package-versions-deprecated": "^1.10",
-                "composer/semver": "^1.4 || ^2.0 || ^3.0",
-                "ext-simplexml": "*",
-                "php": "^7.1.3 || ^8.0",
-                "phpunit/phpunit": "^7.5 || ^8.0 || ^9.0",
-                "vimeo/psalm": "^3.6.2 || dev-master || dev-4.x"
-            },
-            "require-dev": {
-                "codeception/codeception": "^4.0.3",
-                "squizlabs/php_codesniffer": "^3.3.1",
-                "weirdan/codeception-psalm-module": "^0.7.1",
-                "weirdan/prophecy-shim": "^1.0 || ^2.0"
-            },
-            "type": "psalm-plugin",
-            "extra": {
-                "psalm": {
-                    "pluginClass": "Psalm\\PhpUnitPlugin\\Plugin"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psalm\\PhpUnitPlugin\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Matt Brown",
-                    "email": "github@muglug.com"
-                }
-            ],
-            "description": "Psalm plugin for PHPUnit",
-            "support": {
-                "issues": "https://github.com/psalm/psalm-plugin-phpunit/issues",
-                "source": "https://github.com/psalm/psalm-plugin-phpunit/tree/0.12.2"
-            },
-            "time": "2020-09-28T17:25:39+00:00"
-        },
-        {
-            "name": "psr/container",
-            "version": "1.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/container.git",
-                "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf",
-                "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Container\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "https://www.php-fig.org/"
-                }
-            ],
-            "description": "Common Container Interface (PHP FIG PSR-11)",
-            "homepage": "https://github.com/php-fig/container",
-            "keywords": [
-                "PSR-11",
-                "container",
-                "container-interface",
-                "container-interop",
-                "psr"
-            ],
-            "support": {
-                "issues": "https://github.com/php-fig/container/issues",
-                "source": "https://github.com/php-fig/container/tree/1.1.1"
-            },
-            "time": "2021-03-05T17:36:06+00:00"
-        },
-        {
-            "name": "psr/log",
-            "version": "1.1.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/log.git",
-                "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
-                "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Log\\": "Psr/Log/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "https://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for logging libraries",
-            "homepage": "https://github.com/php-fig/log",
-            "keywords": [
-                "log",
-                "psr",
-                "psr-3"
-            ],
-            "support": {
-                "source": "https://github.com/php-fig/log/tree/1.1.4"
-            },
-            "time": "2021-05-03T11:20:27+00:00"
-        },
-        {
-            "name": "sebastian/cli-parser",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/cli-parser.git",
-                "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2",
-                "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library for parsing CLI options",
-            "homepage": "https://github.com/sebastianbergmann/cli-parser",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/cli-parser/issues",
-                "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-09-28T06:08:49+00:00"
-        },
-        {
-            "name": "sebastian/code-unit",
-            "version": "1.0.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/code-unit.git",
-                "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/1fc9f64c0927627ef78ba436c9b17d967e68e120",
-                "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Collection of value objects that represent the PHP code units",
-            "homepage": "https://github.com/sebastianbergmann/code-unit",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/code-unit/issues",
-                "source": "https://github.com/sebastianbergmann/code-unit/tree/1.0.8"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-10-26T13:08:54+00:00"
-        },
-        {
-            "name": "sebastian/code-unit-reverse-lookup",
-            "version": "2.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-                "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5",
-                "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Looks up which function or method a line of code belongs to",
-            "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
-                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/2.0.3"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-09-28T05:30:19+00:00"
-        },
-        {
-            "name": "sebastian/comparator",
-            "version": "4.0.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "55f4261989e546dc112258c7a75935a81a7ce382"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/55f4261989e546dc112258c7a75935a81a7ce382",
-                "reference": "55f4261989e546dc112258c7a75935a81a7ce382",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.3",
-                "sebastian/diff": "^4.0",
-                "sebastian/exporter": "^4.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                }
-            ],
-            "description": "Provides the functionality to compare PHP values for equality",
-            "homepage": "https://github.com/sebastianbergmann/comparator",
-            "keywords": [
-                "comparator",
-                "compare",
-                "equality"
-            ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/comparator/issues",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.6"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-10-26T15:49:45+00:00"
-        },
-        {
-            "name": "sebastian/complexity",
-            "version": "2.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/complexity.git",
-                "reference": "739b35e53379900cc9ac327b2147867b8b6efd88"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/739b35e53379900cc9ac327b2147867b8b6efd88",
-                "reference": "739b35e53379900cc9ac327b2147867b8b6efd88",
-                "shasum": ""
-            },
-            "require": {
-                "nikic/php-parser": "^4.7",
-                "php": ">=7.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library for calculating the complexity of PHP code units",
-            "homepage": "https://github.com/sebastianbergmann/complexity",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/complexity/issues",
-                "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.2"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-10-26T15:52:27+00:00"
-        },
-        {
-            "name": "sebastian/diff",
-            "version": "4.0.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d",
-                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.3",
-                "symfony/process": "^4.2 || ^5"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
-                }
-            ],
-            "description": "Diff implementation",
-            "homepage": "https://github.com/sebastianbergmann/diff",
-            "keywords": [
-                "diff",
-                "udiff",
-                "unidiff",
-                "unified diff"
-            ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/diff/issues",
-                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-10-26T13:10:38+00:00"
-        },
-        {
-            "name": "sebastian/environment",
-            "version": "5.1.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "388b6ced16caa751030f6a69e588299fa09200ac"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/388b6ced16caa751030f6a69e588299fa09200ac",
-                "reference": "388b6ced16caa751030f6a69e588299fa09200ac",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.3"
-            },
-            "suggest": {
-                "ext-posix": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.1-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides functionality to handle HHVM/PHP environments",
-            "homepage": "http://www.github.com/sebastianbergmann/environment",
-            "keywords": [
-                "Xdebug",
-                "environment",
-                "hhvm"
-            ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/environment/issues",
-                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.3"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-09-28T05:52:38+00:00"
-        },
-        {
-            "name": "sebastian/exporter",
-            "version": "4.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "d89cc98761b8cb5a1a235a6b703ae50d34080e65"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/d89cc98761b8cb5a1a235a6b703ae50d34080e65",
-                "reference": "d89cc98761b8cb5a1a235a6b703ae50d34080e65",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.3",
-                "sebastian/recursion-context": "^4.0"
-            },
-            "require-dev": {
-                "ext-mbstring": "*",
-                "phpunit/phpunit": "^9.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@gmail.com"
-                }
-            ],
-            "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "http://www.github.com/sebastianbergmann/exporter",
-            "keywords": [
-                "export",
-                "exporter"
-            ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/exporter/issues",
-                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.3"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-09-28T05:24:23+00:00"
-        },
-        {
-            "name": "sebastian/global-state",
-            "version": "5.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "23bd5951f7ff26f12d4e3242864df3e08dec4e49"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/23bd5951f7ff26f12d4e3242864df3e08dec4e49",
-                "reference": "23bd5951f7ff26f12d4e3242864df3e08dec4e49",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.3",
-                "sebastian/object-reflector": "^2.0",
-                "sebastian/recursion-context": "^4.0"
-            },
-            "require-dev": {
-                "ext-dom": "*",
-                "phpunit/phpunit": "^9.3"
-            },
-            "suggest": {
-                "ext-uopz": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Snapshotting of global state",
-            "homepage": "http://www.github.com/sebastianbergmann/global-state",
-            "keywords": [
-                "global state"
-            ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/global-state/issues",
-                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.3"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2021-06-11T13:31:12+00:00"
-        },
-        {
-            "name": "sebastian/lines-of-code",
-            "version": "1.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/lines-of-code.git",
-                "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/c1c2e997aa3146983ed888ad08b15470a2e22ecc",
-                "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc",
-                "shasum": ""
-            },
-            "require": {
-                "nikic/php-parser": "^4.6",
-                "php": ">=7.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library for counting the lines of code in PHP source code",
-            "homepage": "https://github.com/sebastianbergmann/lines-of-code",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
-                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.3"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-11-28T06:42:11+00:00"
-        },
-        {
-            "name": "sebastian/object-enumerator",
-            "version": "4.0.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
-                "reference": "5c9eeac41b290a3712d88851518825ad78f45c71"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/5c9eeac41b290a3712d88851518825ad78f45c71",
-                "reference": "5c9eeac41b290a3712d88851518825ad78f45c71",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.3",
-                "sebastian/object-reflector": "^2.0",
-                "sebastian/recursion-context": "^4.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
-            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
-                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/4.0.4"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-10-26T13:12:34+00:00"
-        },
-        {
-            "name": "sebastian/object-reflector",
-            "version": "2.0.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/object-reflector.git",
-                "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/b4f479ebdbf63ac605d183ece17d8d7fe49c15c7",
-                "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Allows reflection of object attributes, including inherited and non-public ones",
-            "homepage": "https://github.com/sebastianbergmann/object-reflector/",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/object-reflector/issues",
-                "source": "https://github.com/sebastianbergmann/object-reflector/tree/2.0.4"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-10-26T13:14:26+00:00"
-        },
-        {
-            "name": "sebastian/recursion-context",
-            "version": "4.0.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172",
-                "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                }
-            ],
-            "description": "Provides functionality to recursively process PHP variables",
-            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
-                "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-10-26T13:17:30+00:00"
-        },
-        {
-            "name": "sebastian/resource-operations",
-            "version": "3.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
-                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides a list of PHP built-in functions that operate on resources",
-            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/resource-operations/issues",
-                "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-09-28T06:45:17+00:00"
-        },
-        {
-            "name": "sebastian/type",
-            "version": "2.3.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b8cd8a1c753c90bc1a0f5372170e3e489136f914",
-                "reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.3-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Collection of value objects that represent the types of the PHP type system",
-            "homepage": "https://github.com/sebastianbergmann/type",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/type/issues",
-                "source": "https://github.com/sebastianbergmann/type/tree/2.3.4"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2021-06-15T12:49:02+00:00"
-        },
-        {
-            "name": "sebastian/version",
-            "version": "3.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "c6c1022351a901512170118436c764e473f6de8c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c6c1022351a901512170118436c764e473f6de8c",
-                "reference": "c6c1022351a901512170118436c764e473f6de8c",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
-            "homepage": "https://github.com/sebastianbergmann/version",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/version/issues",
-                "source": "https://github.com/sebastianbergmann/version/tree/3.0.2"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-09-28T06:39:44+00:00"
-        },
-        {
-            "name": "slevomat/coding-standard",
-            "version": "7.0.9",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/slevomat/coding-standard.git",
-                "reference": "d59652e000bcde019459dcba677de030867d0232"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/d59652e000bcde019459dcba677de030867d0232",
-                "reference": "d59652e000bcde019459dcba677de030867d0232",
-                "shasum": ""
-            },
-            "require": {
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7",
-                "php": "^7.1 || ^8.0",
-                "phpstan/phpdoc-parser": "0.5.1 - 0.5.4",
-                "squizlabs/php_codesniffer": "^3.6.0"
-            },
-            "require-dev": {
-                "phing/phing": "2.16.4",
-                "php-parallel-lint/php-parallel-lint": "1.3.0",
-                "phpstan/phpstan": "0.12.88",
-                "phpstan/phpstan-deprecation-rules": "0.12.6",
-                "phpstan/phpstan-phpunit": "0.12.19",
-                "phpstan/phpstan-strict-rules": "0.12.9",
-                "phpunit/phpunit": "7.5.20|8.5.5|9.5.5"
-            },
-            "type": "phpcodesniffer-standard",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "7.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "SlevomatCodingStandard\\": "SlevomatCodingStandard"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "Slevomat Coding Standard for PHP_CodeSniffer complements Consistence Coding Standard by providing sniffs with additional checks.",
-            "support": {
-                "issues": "https://github.com/slevomat/coding-standard/issues",
-                "source": "https://github.com/slevomat/coding-standard/tree/7.0.9"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/kukulich",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/slevomat/coding-standard",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2021-06-07T10:08:42+00:00"
-        },
-        {
-            "name": "squizlabs/php_codesniffer",
-            "version": "3.6.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "ffced0d2c8fa8e6cdc4d695a743271fab6c38625"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ffced0d2c8fa8e6cdc4d695a743271fab6c38625",
-                "reference": "ffced0d2c8fa8e6cdc4d695a743271fab6c38625",
-                "shasum": ""
-            },
-            "require": {
-                "ext-simplexml": "*",
-                "ext-tokenizer": "*",
-                "ext-xmlwriter": "*",
-                "php": ">=5.4.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
-            },
-            "bin": [
-                "bin/phpcs",
-                "bin/phpcbf"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.x-dev"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Greg Sherwood",
-                    "role": "lead"
-                }
-            ],
-            "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
-            "homepage": "https://github.com/squizlabs/PHP_CodeSniffer",
-            "keywords": [
-                "phpcs",
-                "standards"
-            ],
-            "support": {
-                "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues",
-                "source": "https://github.com/squizlabs/PHP_CodeSniffer",
-                "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
-            },
-            "time": "2021-04-09T00:54:41+00:00"
-        },
-        {
-            "name": "symfony/console",
-            "version": "v5.3.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/console.git",
-                "reference": "649730483885ff2ca99ca0560ef0e5f6b03f2ac1"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/649730483885ff2ca99ca0560ef0e5f6b03f2ac1",
-                "reference": "649730483885ff2ca99ca0560ef0e5f6b03f2ac1",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2.5",
-                "symfony/deprecation-contracts": "^2.1",
-                "symfony/polyfill-mbstring": "~1.0",
-                "symfony/polyfill-php73": "^1.8",
-                "symfony/polyfill-php80": "^1.15",
-                "symfony/service-contracts": "^1.1|^2",
-                "symfony/string": "^5.1"
-            },
-            "conflict": {
-                "symfony/dependency-injection": "<4.4",
-                "symfony/dotenv": "<5.1",
-                "symfony/event-dispatcher": "<4.4",
-                "symfony/lock": "<4.4",
-                "symfony/process": "<4.4"
-            },
-            "provide": {
-                "psr/log-implementation": "1.0"
-            },
-            "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/config": "^4.4|^5.0",
-                "symfony/dependency-injection": "^4.4|^5.0",
-                "symfony/event-dispatcher": "^4.4|^5.0",
-                "symfony/lock": "^4.4|^5.0",
-                "symfony/process": "^4.4|^5.0",
-                "symfony/var-dumper": "^4.4|^5.0"
-            },
-            "suggest": {
-                "psr/log": "For using the console logger",
-                "symfony/event-dispatcher": "",
-                "symfony/lock": "",
-                "symfony/process": ""
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Console\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Eases the creation of beautiful and testable command line interfaces",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "cli",
-                "command line",
-                "console",
-                "terminal"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/console/tree/v5.3.2"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2021-06-12T09:42:48+00:00"
-        },
-        {
-            "name": "symfony/deprecation-contracts",
-            "version": "v2.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5f38c8804a9e97d23e0c8d63341088cd8a22d627",
-                "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "2.4-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "function.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "A generic function and convention to trigger deprecation notices",
-            "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v2.4.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2021-03-23T23:28:01+00:00"
-        },
-        {
-            "name": "symfony/polyfill-ctype",
-            "version": "v1.23.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce",
-                "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "suggest": {
-                "ext-ctype": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Ctype\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Gert de Pagter",
-                    "email": "BackEndTea@gmail.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for ctype functions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "ctype",
-                "polyfill",
-                "portable"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.23.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2021-02-19T12:13:01+00:00"
-        },
-        {
-            "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.23.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "24b72c6baa32c746a4d0840147c9715e42bb68ab"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/24b72c6baa32c746a4d0840147c9715e42bb68ab",
-                "reference": "24b72c6baa32c746a4d0840147c9715e42bb68ab",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "suggest": {
-                "ext-intl": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Intl\\Grapheme\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for intl's grapheme_* functions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "grapheme",
-                "intl",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.23.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2021-05-27T09:17:38+00:00"
-        },
-        {
-            "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.23.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8",
-                "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "suggest": {
-                "ext-intl": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ],
-                "classmap": [
-                    "Resources/stubs"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for intl's Normalizer class and related functions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "intl",
-                "normalizer",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.23.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2021-02-19T12:13:01+00:00"
-        },
-        {
-            "name": "symfony/polyfill-mbstring",
-            "version": "v1.23.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2df51500adbaebdc4c38dea4c89a2e131c45c8a1",
-                "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "suggest": {
-                "ext-mbstring": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for the Mbstring extension",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "mbstring",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2021-05-27T09:27:20+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php73",
-            "version": "v1.23.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php73.git",
-                "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fba8933c384d6476ab14fb7b8526e5287ca7e010",
-                "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php73\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ],
-                "classmap": [
-                    "Resources/stubs"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-php73/tree/v1.23.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2021-02-19T12:13:01+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php80",
-            "version": "v1.23.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "eca0bf41ed421bed1b57c4958bab16aa86b757d0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/eca0bf41ed421bed1b57c4958bab16aa86b757d0",
-                "reference": "eca0bf41ed421bed1b57c4958bab16aa86b757d0",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php80\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ],
-                "classmap": [
-                    "Resources/stubs"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Ion Bazan",
-                    "email": "ion.bazan@gmail.com"
-                },
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2021-02-19T12:13:01+00:00"
-        },
-        {
-            "name": "symfony/service-contracts",
-            "version": "v2.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb",
-                "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2.5",
-                "psr/container": "^1.1"
-            },
-            "suggest": {
-                "symfony/service-implementation": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "2.4-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Contracts\\Service\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Generic abstractions related to writing services",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "abstractions",
-                "contracts",
-                "decoupling",
-                "interfaces",
-                "interoperability",
-                "standards"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v2.4.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2021-04-01T10:43:52+00:00"
-        },
-        {
-            "name": "symfony/string",
-            "version": "v5.3.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/string.git",
-                "reference": "0732e97e41c0a590f77e231afc16a327375d50b0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/0732e97e41c0a590f77e231afc16a327375d50b0",
-                "reference": "0732e97e41c0a590f77e231afc16a327375d50b0",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2.5",
-                "symfony/polyfill-ctype": "~1.8",
-                "symfony/polyfill-intl-grapheme": "~1.0",
-                "symfony/polyfill-intl-normalizer": "~1.0",
-                "symfony/polyfill-mbstring": "~1.0",
-                "symfony/polyfill-php80": "~1.15"
-            },
-            "require-dev": {
-                "symfony/error-handler": "^4.4|^5.0",
-                "symfony/http-client": "^4.4|^5.0",
-                "symfony/translation-contracts": "^1.1|^2",
-                "symfony/var-exporter": "^4.4|^5.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\String\\": ""
-                },
-                "files": [
-                    "Resources/functions.php"
-                ],
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "grapheme",
-                "i18n",
-                "string",
-                "unicode",
-                "utf-8",
-                "utf8"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/string/tree/v5.3.2"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2021-06-06T09:51:56+00:00"
-        },
-        {
-            "name": "theseer/tokenizer",
-            "version": "1.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "75a63c33a8577608444246075ea0af0d052e452a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/75a63c33a8577608444246075ea0af0d052e452a",
-                "reference": "75a63c33a8577608444246075ea0af0d052e452a",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-tokenizer": "*",
-                "ext-xmlwriter": "*",
-                "php": "^7.2 || ^8.0"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Arne Blankerts",
-                    "email": "arne@blankerts.de",
-                    "role": "Developer"
-                }
-            ],
-            "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
-            "support": {
-                "issues": "https://github.com/theseer/tokenizer/issues",
-                "source": "https://github.com/theseer/tokenizer/tree/master"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/theseer",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-07-12T23:59:07+00:00"
-        },
-        {
-            "name": "vimeo/psalm",
-            "version": "3.18.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/vimeo/psalm.git",
-                "reference": "19aa905f7c3c7350569999a93c40ae91ae4e1626"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/vimeo/psalm/zipball/19aa905f7c3c7350569999a93c40ae91ae4e1626",
-                "reference": "19aa905f7c3c7350569999a93c40ae91ae4e1626",
-                "shasum": ""
-            },
-            "require": {
-                "amphp/amp": "^2.1",
-                "amphp/byte-stream": "^1.5",
-                "composer/package-versions-deprecated": "^1.8.0",
-                "composer/semver": "^1.4 || ^2.0 || ^3.0",
-                "composer/xdebug-handler": "^1.1",
-                "dnoegel/php-xdg-base-dir": "^0.1.1",
-                "ext-dom": "*",
-                "ext-json": "*",
-                "ext-libxml": "*",
-                "ext-mbstring": "*",
-                "ext-simplexml": "*",
-                "ext-tokenizer": "*",
-                "felixfbecker/advanced-json-rpc": "^3.0.3",
-                "felixfbecker/language-server-protocol": "^1.4",
-                "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0",
-                "nikic/php-parser": "4.3.* || 4.4.* || 4.5.* || 4.6.* || ^4.8",
-                "openlss/lib-array2xml": "^1.0",
-                "php": "^7.1.3|^8",
-                "sebastian/diff": "^3.0 || ^4.0",
-                "symfony/console": "^3.4.17 || ^4.1.6 || ^5.0",
-                "webmozart/glob": "^4.1",
-                "webmozart/path-util": "^2.3"
-            },
-            "provide": {
-                "psalm/psalm": "self.version"
-            },
-            "require-dev": {
-                "amphp/amp": "^2.4.2",
-                "bamarni/composer-bin-plugin": "^1.2",
-                "brianium/paratest": "^4.0.0",
-                "ext-curl": "*",
-                "phpdocumentor/reflection-docblock": "^4.3.4 || ^5",
-                "phpmyadmin/sql-parser": "5.1.0",
-                "phpspec/prophecy": ">=1.9.0",
-                "phpunit/phpunit": "^7.5.16 || ^8.5 || ^9.0",
-                "psalm/plugin-phpunit": "^0.11",
-                "slevomat/coding-standard": "^5.0",
-                "squizlabs/php_codesniffer": "^3.5",
-                "symfony/process": "^4.3",
-                "weirdan/prophecy-shim": "^1.0 || ^2.0"
-            },
-            "suggest": {
-                "ext-igbinary": "^2.0.5"
-            },
-            "bin": [
-                "psalm",
-                "psalm-language-server",
-                "psalm-plugin",
-                "psalm-refactor",
-                "psalter"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.x-dev",
-                    "dev-2.x": "2.x-dev",
-                    "dev-1.x": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psalm\\": "src/Psalm/"
-                },
-                "files": [
-                    "src/functions.php",
-                    "src/spl_object_id.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Matthew Brown"
-                }
-            ],
-            "description": "A static analysis tool for finding errors in PHP applications",
-            "keywords": [
-                "code",
-                "inspection",
-                "php"
-            ],
-            "support": {
-                "issues": "https://github.com/vimeo/psalm/issues",
-                "source": "https://github.com/vimeo/psalm/tree/3.18.2"
-            },
-            "time": "2020-10-20T13:48:22+00:00"
-        },
-        {
-            "name": "webimpress/coding-standard",
-            "version": "1.2.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/webimpress/coding-standard.git",
-                "reference": "8f4a220de33f471a8101836f7ec72b852c3f9f03"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/webimpress/coding-standard/zipball/8f4a220de33f471a8101836f7ec72b852c3f9f03",
-                "reference": "8f4a220de33f471a8101836f7ec72b852c3f9f03",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.3 || ^8.0",
-                "squizlabs/php_codesniffer": "^3.6"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.5.4"
-            },
-            "type": "phpcodesniffer-standard",
-            "extra": {
-                "dev-master": "1.2.x-dev",
-                "dev-develop": "1.3.x-dev"
-            },
-            "autoload": {
-                "psr-4": {
-                    "WebimpressCodingStandard\\": "src/WebimpressCodingStandard/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-2-Clause"
-            ],
-            "description": "Webimpress Coding Standard",
-            "keywords": [
-                "Coding Standard",
-                "PSR-2",
-                "phpcs",
-                "psr-12",
-                "webimpress"
-            ],
-            "support": {
-                "issues": "https://github.com/webimpress/coding-standard/issues",
-                "source": "https://github.com/webimpress/coding-standard/tree/1.2.2"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/michalbundyra",
-                    "type": "github"
-                }
-            ],
-            "time": "2021-04-12T12:51:27+00:00"
-        },
-        {
-            "name": "webmozart/assert",
-            "version": "1.9.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/webmozarts/assert.git",
-                "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/webmozarts/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389",
-                "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.3 || ^7.0 || ^8.0",
-                "symfony/polyfill-ctype": "^1.8"
-            },
-            "conflict": {
-                "phpstan/phpstan": "<0.12.20",
-                "vimeo/psalm": "<3.9.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.8.36 || ^7.5.13"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Webmozart\\Assert\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@gmail.com"
-                }
-            ],
-            "description": "Assertions to validate method input/output with nice error messages.",
-            "keywords": [
-                "assert",
-                "check",
-                "validate"
-            ],
-            "support": {
-                "issues": "https://github.com/webmozarts/assert/issues",
-                "source": "https://github.com/webmozarts/assert/tree/1.9.1"
-            },
-            "time": "2020-07-08T17:02:28+00:00"
-        },
-        {
-            "name": "webmozart/glob",
-            "version": "4.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/webmozarts/glob.git",
-                "reference": "06358fafde0f32edb4513f4fd88fe113a40c90ee"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/webmozarts/glob/zipball/06358fafde0f32edb4513f4fd88fe113a40c90ee",
-                "reference": "06358fafde0f32edb4513f4fd88fe113a40c90ee",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.3 || ^8.0.0",
-                "webmozart/path-util": "^2.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^8.0",
-                "symfony/filesystem": "^5.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.1-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Webmozart\\Glob\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@gmail.com"
-                }
-            ],
-            "description": "A PHP implementation of Ant's glob.",
-            "support": {
-                "issues": "https://github.com/webmozarts/glob/issues",
-                "source": "https://github.com/webmozarts/glob/tree/4.3.0"
-            },
-            "time": "2021-01-21T06:17:15+00:00"
-        },
-        {
-            "name": "webmozart/path-util",
-            "version": "2.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/webmozart/path-util.git",
-                "reference": "d939f7edc24c9a1bb9c0dee5cb05d8e859490725"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/path-util/zipball/d939f7edc24c9a1bb9c0dee5cb05d8e859490725",
-                "reference": "d939f7edc24c9a1bb9c0dee5cb05d8e859490725",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "webmozart/assert": "~1.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.6",
-                "sebastian/version": "^1.0.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.3-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Webmozart\\PathUtil\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@gmail.com"
-                }
-            ],
-            "description": "A robust cross-platform utility for normalizing, comparing and modifying file paths.",
-            "support": {
-                "issues": "https://github.com/webmozart/path-util/issues",
-                "source": "https://github.com/webmozart/path-util/tree/2.3.0"
-            },
-            "time": "2015-12-17T08:42:14+00:00"
-        }
-    ],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": [],
-    "prefer-stable": false,
-    "prefer-lowest": false,
-    "platform": {
-        "php": "^7.3 || ~8.0.0"
-    },
-    "platform-dev": [],
-    "plugin-api-version": "2.0.0"
-}
diff --git a/vendor/laminas/laminas-escaper/phpcs.xml.dist b/vendor/laminas/laminas-escaper/phpcs.xml.dist
deleted file mode 100644
index 7f391d80a4..0000000000
--- a/vendor/laminas/laminas-escaper/phpcs.xml.dist
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<ruleset
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="./vendor/squizlabs/php_codesniffer/phpcs.xsd">
-
-    <arg name="basepath" value="."/>
-    <arg name="cache" value=".phpcs-cache"/>
-    <arg name="colors"/>
-    <arg name="extensions" value="php"/>
-    <arg name="parallel" value="80"/>
-
-    <!-- Show progress -->
-    <arg value="p"/>
-
-    <!-- Paths to check -->
-    <file>src</file>
-    <file>test</file>
-
-    <!-- Include all rules from Laminas Coding Standard -->
-    <rule ref="LaminasCodingStandard"/>
-</ruleset>
diff --git a/vendor/laminas/laminas-escaper/psalm-baseline.xml b/vendor/laminas/laminas-escaper/psalm-baseline.xml
deleted file mode 100644
index ea04b426cc..0000000000
--- a/vendor/laminas/laminas-escaper/psalm-baseline.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="3.18.2@19aa905f7c3c7350569999a93c40ae91ae4e1626">
-  <file src="src/Escaper.php">
-    <MixedArgument occurrences="10">
-      <code>$chr</code>
-      <code>$chr</code>
-      <code>$chr</code>
-      <code>$chr</code>
-      <code>$chr</code>
-      <code>$chr</code>
-      <code>$chr</code>
-      <code>$chr</code>
-      <code>$chr</code>
-      <code>$chr</code>
-    </MixedArgument>
-    <MixedArgumentTypeCoercion occurrences="3">
-      <code>$this-&gt;cssMatcher</code>
-      <code>$this-&gt;htmlAttrMatcher</code>
-      <code>$this-&gt;jsMatcher</code>
-    </MixedArgumentTypeCoercion>
-    <MixedAssignment occurrences="3">
-      <code>$chr</code>
-      <code>$chr</code>
-      <code>$chr</code>
-    </MixedAssignment>
-    <MixedOperand occurrences="1">
-      <code>static::$htmlNamedEntityMap[$ord]</code>
-    </MixedOperand>
-    <PossiblyInvalidArgument occurrences="1">
-      <code>$from</code>
-    </PossiblyInvalidArgument>
-  </file>
-  <file src="test/EscaperTest.php">
-    <InvalidReturnStatement occurrences="5"/>
-    <InvalidReturnType occurrences="5">
-      <code>array&lt;string, array{0: string, 1: string}&gt;</code>
-      <code>array&lt;string, array{0: string, 1: string}&gt;</code>
-      <code>array&lt;string, array{0: string, 1: string}&gt;</code>
-      <code>array&lt;string, array{0: string, 1: string}&gt;</code>
-      <code>array&lt;string, array{0: string}&gt;</code>
-    </InvalidReturnType>
-    <MissingReturnType occurrences="9">
-      <code>testCssEscapingReturnsStringIfContainsOnlyDigits</code>
-      <code>testCssEscapingReturnsStringIfZeroLength</code>
-      <code>testHtmlAttributeEscapingEscapesOwaspRecommendedRanges</code>
-      <code>testJavascriptEscapingReturnsStringIfContainsOnlyDigits</code>
-      <code>testJavascriptEscapingReturnsStringIfZeroLength</code>
-      <code>testReturnsEncodingFromGetter</code>
-      <code>testSettingEncodingToEmptyStringShouldThrowException</code>
-      <code>testSettingEncodingToInvalidValueShouldThrowException</code>
-      <code>testUnicodeCodepointConversionToUtf8</code>
-    </MissingReturnType>
-  </file>
-</files>
diff --git a/vendor/laminas/laminas-escaper/psalm.xml b/vendor/laminas/laminas-escaper/psalm.xml
deleted file mode 100644
index b8b808e48a..0000000000
--- a/vendor/laminas/laminas-escaper/psalm.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<psalm
-    totallyTyped="true"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns="https://getpsalm.org/schema/config"
-    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
-    errorBaseline="psalm-baseline.xml"
->
-    <projectFiles>
-        <directory name="src"/>
-        <directory name="test"/>
-        <ignoreFiles>
-            <directory name="vendor"/>
-        </ignoreFiles>
-    </projectFiles>
-
-    <issueHandlers>
-        <InternalMethod>
-            <errorLevel type="suppress">
-                <referencedMethod name="PHPUnit\Framework\MockObject\Builder\InvocationMocker::method"/>
-            </errorLevel>
-            <errorLevel type="suppress">
-                <referencedMethod name="PHPUnit\Framework\MockObject\Builder\InvocationMocker::willReturn"/>
-            </errorLevel>
-            <errorLevel type="suppress">
-                <referencedMethod name="PHPUnit\Framework\MockObject\Builder\InvocationMocker::with"/>
-            </errorLevel>
-        </InternalMethod>
-    </issueHandlers>
-    <plugins>
-        <pluginClass class="Psalm\PhpUnitPlugin\Plugin"/>
-    </plugins>
-</psalm>
diff --git a/vendor/laminas/laminas-escaper/src/Escaper.php b/vendor/laminas/laminas-escaper/src/Escaper.php
deleted file mode 100644
index ca0f1a9dd2..0000000000
--- a/vendor/laminas/laminas-escaper/src/Escaper.php
+++ /dev/null
@@ -1,422 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Laminas\Escaper;
-
-use function bin2hex;
-use function ctype_digit;
-use function function_exists;
-use function hexdec;
-use function htmlspecialchars;
-use function iconv;
-use function in_array;
-use function mb_convert_encoding;
-use function ord;
-use function preg_match;
-use function preg_replace_callback;
-use function rawurlencode;
-use function sprintf;
-use function strlen;
-use function strtolower;
-use function strtoupper;
-use function substr;
-
-use const ENT_QUOTES;
-use const ENT_SUBSTITUTE;
-
-/**
- * Context specific methods for use in secure output escaping
- */
-class Escaper
-{
-    /**
-     * Entity Map mapping Unicode codepoints to any available named HTML entities.
-     *
-     * While HTML supports far more named entities, the lowest common denominator
-     * has become HTML5's XML Serialisation which is restricted to the those named
-     * entities that XML supports. Using HTML entities would result in this error:
-     *     XML Parsing Error: undefined entity
-     *
-     * @var array
-     */
-    protected static $htmlNamedEntityMap = [
-        34 => 'quot', // quotation mark
-        38 => 'amp', // ampersand
-        60 => 'lt', // less-than sign
-        62 => 'gt', // greater-than sign
-    ];
-
-    /**
-     * Current encoding for escaping. If not UTF-8, we convert strings from this encoding
-     * pre-escaping and back to this encoding post-escaping.
-     *
-     * @var string
-     */
-    protected $encoding = 'utf-8';
-
-    /**
-     * Holds the value of the special flags passed as second parameter to
-     * htmlspecialchars().
-     *
-     * @var int
-     */
-    protected $htmlSpecialCharsFlags;
-
-    /**
-     * Static Matcher which escapes characters for HTML Attribute contexts
-     *
-     * @var callable
-     */
-    protected $htmlAttrMatcher;
-
-    /**
-     * Static Matcher which escapes characters for Javascript contexts
-     *
-     * @var callable
-     */
-    protected $jsMatcher;
-
-    /**
-     * Static Matcher which escapes characters for CSS Attribute contexts
-     *
-     * @var callable
-     */
-    protected $cssMatcher;
-
-    /**
-     * List of all encoding supported by this class
-     *
-     * @var array
-     */
-    protected $supportedEncodings = [
-        'iso-8859-1',
-        'iso8859-1',
-        'iso-8859-5',
-        'iso8859-5',
-        'iso-8859-15',
-        'iso8859-15',
-        'utf-8',
-        'cp866',
-        'ibm866',
-        '866',
-        'cp1251',
-        'windows-1251',
-        'win-1251',
-        '1251',
-        'cp1252',
-        'windows-1252',
-        '1252',
-        'koi8-r',
-        'koi8-ru',
-        'koi8r',
-        'big5',
-        '950',
-        'gb2312',
-        '936',
-        'big5-hkscs',
-        'shift_jis',
-        'sjis',
-        'sjis-win',
-        'cp932',
-        '932',
-        'euc-jp',
-        'eucjp',
-        'eucjp-win',
-        'macroman',
-    ];
-
-    /**
-     * Constructor: Single parameter allows setting of global encoding for use by
-     * the current object.
-     *
-     * @throws Exception\InvalidArgumentException
-     */
-    public function __construct(?string $encoding = null)
-    {
-        if ($encoding !== null) {
-            if ($encoding === '') {
-                throw new Exception\InvalidArgumentException(
-                    static::class . ' constructor parameter does not allow a blank value'
-                );
-            }
-
-            $encoding = strtolower($encoding);
-            if (! in_array($encoding, $this->supportedEncodings)) {
-                throw new Exception\InvalidArgumentException(
-                    'Value of \'' . $encoding . '\' passed to ' . static::class
-                    . ' constructor parameter is invalid. Provide an encoding supported by htmlspecialchars()'
-                );
-            }
-
-            $this->encoding = $encoding;
-        }
-
-        // We take advantage of ENT_SUBSTITUTE flag to correctly deal with invalid UTF-8 sequences.
-        $this->htmlSpecialCharsFlags = ENT_QUOTES | ENT_SUBSTITUTE;
-
-        // set matcher callbacks
-        $this->htmlAttrMatcher = [$this, 'htmlAttrMatcher'];
-        $this->jsMatcher       = [$this, 'jsMatcher'];
-        $this->cssMatcher      = [$this, 'cssMatcher'];
-    }
-
-    /**
-     * Return the encoding that all output/input is expected to be encoded in.
-     *
-     * @return string
-     */
-    public function getEncoding()
-    {
-        return $this->encoding;
-    }
-
-    /**
-     * Escape a string for the HTML Body context where there are very few characters
-     * of special meaning. Internally this will use htmlspecialchars().
-     *
-     * @return string
-     */
-    public function escapeHtml(string $string)
-    {
-        return htmlspecialchars($string, $this->htmlSpecialCharsFlags, $this->encoding);
-    }
-
-    /**
-     * Escape a string for the HTML Attribute context. We use an extended set of characters
-     * to escape that are not covered by htmlspecialchars() to cover cases where an attribute
-     * might be unquoted or quoted illegally (e.g. backticks are valid quotes for IE).
-     *
-     * @return string
-     */
-    public function escapeHtmlAttr(string $string)
-    {
-        $string = $this->toUtf8($string);
-        if ($string === '' || ctype_digit($string)) {
-            return $string;
-        }
-
-        $result = preg_replace_callback('/[^a-z0-9,\.\-_]/iSu', $this->htmlAttrMatcher, $string);
-        return $this->fromUtf8($result);
-    }
-
-    /**
-     * Escape a string for the Javascript context. This does not use json_encode(). An extended
-     * set of characters are escaped beyond ECMAScript's rules for Javascript literal string
-     * escaping in order to prevent misinterpretation of Javascript as HTML leading to the
-     * injection of special characters and entities. The escaping used should be tolerant
-     * of cases where HTML escaping was not applied on top of Javascript escaping correctly.
-     * Backslash escaping is not used as it still leaves the escaped character as-is and so
-     * is not useful in a HTML context.
-     *
-     * @return string
-     */
-    public function escapeJs(string $string)
-    {
-        $string = $this->toUtf8($string);
-        if ($string === '' || ctype_digit($string)) {
-            return $string;
-        }
-
-        $result = preg_replace_callback('/[^a-z0-9,\._]/iSu', $this->jsMatcher, $string);
-        return $this->fromUtf8($result);
-    }
-
-    /**
-     * Escape a string for the URI or Parameter contexts. This should not be used to escape
-     * an entire URI - only a subcomponent being inserted. The function is a simple proxy
-     * to rawurlencode() which now implements RFC 3986 since PHP 5.3 completely.
-     *
-     * @return string
-     */
-    public function escapeUrl(string $string)
-    {
-        return rawurlencode($string);
-    }
-
-    /**
-     * Escape a string for the CSS context. CSS escaping can be applied to any string being
-     * inserted into CSS and escapes everything except alphanumerics.
-     *
-     * @return string
-     */
-    public function escapeCss(string $string)
-    {
-        $string = $this->toUtf8($string);
-        if ($string === '' || ctype_digit($string)) {
-            return $string;
-        }
-
-        $result = preg_replace_callback('/[^a-z0-9]/iSu', $this->cssMatcher, $string);
-        return $this->fromUtf8($result);
-    }
-
-    /**
-     * Callback function for preg_replace_callback that applies HTML Attribute
-     * escaping to all matches.
-     *
-     * @param array $matches
-     * @return string
-     */
-    protected function htmlAttrMatcher($matches)
-    {
-        $chr = $matches[0];
-        $ord = ord($chr);
-
-        /**
-         * The following replaces characters undefined in HTML with the
-         * hex entity for the Unicode replacement character.
-         */
-        if (
-            ($ord <= 0x1f && $chr !== "\t" && $chr !== "\n" && $chr !== "\r")
-            || ($ord >= 0x7f && $ord <= 0x9f)
-        ) {
-            return '&#xFFFD;';
-        }
-
-        /**
-         * Check if the current character to escape has a name entity we should
-         * replace it with while grabbing the integer value of the character.
-         */
-        if (strlen($chr) > 1) {
-            $chr = $this->convertEncoding($chr, 'UTF-32BE', 'UTF-8');
-        }
-
-        $hex = bin2hex($chr);
-        $ord = hexdec($hex);
-        if (isset(static::$htmlNamedEntityMap[$ord])) {
-            return '&' . static::$htmlNamedEntityMap[$ord] . ';';
-        }
-
-        /**
-         * Per OWASP recommendations, we'll use upper hex entities
-         * for any other characters where a named entity does not exist.
-         */
-        if ($ord > 255) {
-            return sprintf('&#x%04X;', $ord);
-        }
-        return sprintf('&#x%02X;', $ord);
-    }
-
-    /**
-     * Callback function for preg_replace_callback that applies Javascript
-     * escaping to all matches.
-     *
-     * @param array $matches
-     * @return string
-     */
-    protected function jsMatcher($matches)
-    {
-        $chr = $matches[0];
-        if (strlen($chr) === 1) {
-            return sprintf('\\x%02X', ord($chr));
-        }
-        $chr = $this->convertEncoding($chr, 'UTF-16BE', 'UTF-8');
-        $hex = strtoupper(bin2hex($chr));
-        if (strlen($hex) <= 4) {
-            return sprintf('\\u%04s', $hex);
-        }
-        $highSurrogate = substr($hex, 0, 4);
-        $lowSurrogate  = substr($hex, 4, 4);
-        return sprintf('\\u%04s\\u%04s', $highSurrogate, $lowSurrogate);
-    }
-
-    /**
-     * Callback function for preg_replace_callback that applies CSS
-     * escaping to all matches.
-     *
-     * @param array $matches
-     * @return string
-     */
-    protected function cssMatcher($matches)
-    {
-        $chr = $matches[0];
-        if (strlen($chr) === 1) {
-            $ord = ord($chr);
-        } else {
-            $chr = $this->convertEncoding($chr, 'UTF-32BE', 'UTF-8');
-            $ord = hexdec(bin2hex($chr));
-        }
-        return sprintf('\\%X ', $ord);
-    }
-
-    /**
-     * Converts a string to UTF-8 from the base encoding. The base encoding is set via this
-     *
-     * @param string $string
-     * @throws Exception\RuntimeException
-     * @return string
-     */
-    protected function toUtf8($string)
-    {
-        if ($this->getEncoding() === 'utf-8') {
-            $result = $string;
-        } else {
-            $result = $this->convertEncoding($string, 'UTF-8', $this->getEncoding());
-        }
-
-        if (! $this->isUtf8($result)) {
-            throw new Exception\RuntimeException(
-                sprintf('String to be escaped was not valid UTF-8 or could not be converted: %s', $result)
-            );
-        }
-
-        return $result;
-    }
-
-    /**
-     * Converts a string from UTF-8 to the base encoding. The base encoding is set via this
-     *
-     * @param string $string
-     * @return string
-     */
-    protected function fromUtf8($string)
-    {
-        if ($this->getEncoding() === 'utf-8') {
-            return $string;
-        }
-
-        return $this->convertEncoding($string, $this->getEncoding(), 'UTF-8');
-    }
-
-    /**
-     * Checks if a given string appears to be valid UTF-8 or not.
-     *
-     * @param string $string
-     * @return bool
-     */
-    protected function isUtf8($string)
-    {
-        return $string === '' || preg_match('/^./su', $string);
-    }
-
-    /**
-     * Encoding conversion helper which wraps iconv and mbstring where they exist or throws
-     * and exception where neither is available.
-     *
-     * @param string $string
-     * @param string $to
-     * @param array|string $from
-     * @throws Exception\RuntimeException
-     * @return string
-     */
-    protected function convertEncoding($string, $to, $from)
-    {
-        if (function_exists('iconv')) {
-            $result = iconv($from, $to, $string);
-        } elseif (function_exists('mb_convert_encoding')) {
-            $result = mb_convert_encoding($string, $to, $from);
-        } else {
-            throw new Exception\RuntimeException(
-                static::class
-                . ' requires either the iconv or mbstring extension to be installed'
-                . ' when escaping for non UTF-8 strings.'
-            );
-        }
-
-        if ($result === false) {
-            return ''; // return non-fatal blank string on encoding errors from users
-        }
-        return $result;
-    }
-}
diff --git a/vendor/laminas/laminas-escaper/src/Exception/ExceptionInterface.php b/vendor/laminas/laminas-escaper/src/Exception/ExceptionInterface.php
deleted file mode 100644
index 87edfd2aa5..0000000000
--- a/vendor/laminas/laminas-escaper/src/Exception/ExceptionInterface.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Laminas\Escaper\Exception;
-
-interface ExceptionInterface
-{
-}
diff --git a/vendor/laminas/laminas-escaper/src/Exception/InvalidArgumentException.php b/vendor/laminas/laminas-escaper/src/Exception/InvalidArgumentException.php
deleted file mode 100644
index 48e646dcef..0000000000
--- a/vendor/laminas/laminas-escaper/src/Exception/InvalidArgumentException.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Laminas\Escaper\Exception;
-
-/**
- * Invalid argument exception
- */
-class InvalidArgumentException extends \InvalidArgumentException implements
-    ExceptionInterface
-{
-}
diff --git a/vendor/laminas/laminas-escaper/src/Exception/RuntimeException.php b/vendor/laminas/laminas-escaper/src/Exception/RuntimeException.php
deleted file mode 100644
index 5004c4c475..0000000000
--- a/vendor/laminas/laminas-escaper/src/Exception/RuntimeException.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Laminas\Escaper\Exception;
-
-/**
- * Invalid argument exception
- */
-class RuntimeException extends \RuntimeException implements
-    ExceptionInterface
-{
-}
diff --git a/vendor/laminas/laminas-zendframework-bridge/.github/FUNDING.yml b/vendor/laminas/laminas-zendframework-bridge/.github/FUNDING.yml
deleted file mode 100644
index 6674aab603..0000000000
--- a/vendor/laminas/laminas-zendframework-bridge/.github/FUNDING.yml
+++ /dev/null
@@ -1 +0,0 @@
-community_bridge: laminas-project
diff --git a/vendor/laminas/laminas-zendframework-bridge/.github/workflows/continuous-integration.yml b/vendor/laminas/laminas-zendframework-bridge/.github/workflows/continuous-integration.yml
deleted file mode 100644
index ab6f8eee95..0000000000
--- a/vendor/laminas/laminas-zendframework-bridge/.github/workflows/continuous-integration.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-name: "Continuous Integration"
-
-on:
-  pull_request:
-  push:
-    branches:
-      - '[0-9]+.[0-9]+.x'
-      - 'refs/pull/*'
-
-jobs:
-  matrix:
-    name: Generate job matrix
-    runs-on: ubuntu-latest
-    outputs:
-      matrix: ${{ steps.matrix.outputs.matrix }}
-    steps:
-      - name: Gather CI configuration
-        id: matrix
-        uses: laminas/laminas-ci-matrix-action@v1
-
-  qa:
-    name: QA Checks
-    needs: [matrix]
-    runs-on: ${{ matrix.operatingSystem }}
-    strategy:
-      fail-fast: false
-      matrix: ${{ fromJSON(needs.matrix.outputs.matrix) }}
-    steps:
-      - name: ${{ matrix.name }}
-        uses: laminas/laminas-continuous-integration-action@v1
-        with:
-          job: ${{ matrix.job }}
diff --git a/vendor/laminas/laminas-zendframework-bridge/.github/workflows/release-on-milestone-closed.yml b/vendor/laminas/laminas-zendframework-bridge/.github/workflows/release-on-milestone-closed.yml
deleted file mode 100644
index 6066f8b20a..0000000000
--- a/vendor/laminas/laminas-zendframework-bridge/.github/workflows/release-on-milestone-closed.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-# Alternate workflow example.
-# This one is identical to the one in release-on-milestone.yml, with one change:
-# the Release step uses the ORGANIZATION_ADMIN_TOKEN instead, to allow it to
-# trigger a release workflow event. This is useful if you have other actions
-# that intercept that event.
-
-name: "Automatic Releases"
-
-on:
-  milestone:
-    types:
-      - "closed"
-
-jobs:
-  release:
-    name: "GIT tag, release & create merge-up PR"
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: "Checkout"
-        uses: "actions/checkout@v2"
-
-      - name: "Release"
-        uses: "laminas/automatic-releases@v1"
-        with:
-          command-name: "laminas:automatic-releases:release"
-        env:
-          "GITHUB_TOKEN": ${{ secrets.ORGANIZATION_ADMIN_TOKEN }}
-          "SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
-          "GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
-          "GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
-
-      - name: "Create Merge-Up Pull Request"
-        uses: "laminas/automatic-releases@v1"
-        with:
-          command-name: "laminas:automatic-releases:create-merge-up-pull-request"
-        env:
-          "GITHUB_TOKEN": ${{ secrets.GITHUB_TOKEN }}
-          "SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
-          "GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
-          "GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
-
-      - name: "Create and/or Switch to new Release Branch"
-        uses: "laminas/automatic-releases@v1"
-        with:
-          command-name: "laminas:automatic-releases:switch-default-branch-to-next-minor"
-        env:
-          "GITHUB_TOKEN": ${{ secrets.ORGANIZATION_ADMIN_TOKEN }}
-          "SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
-          "GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
-          "GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
-
-      - name: "Bump Changelog Version On Originating Release Branch"
-        uses: "laminas/automatic-releases@v1"
-        with:
-          command-name: "laminas:automatic-releases:bump-changelog"
-        env:
-          "GITHUB_TOKEN": ${{ secrets.GITHUB_TOKEN }}
-          "SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
-          "GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
-          "GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
-
-      - name: "Create new milestones"
-        uses: "laminas/automatic-releases@v1"
-        with:
-          command-name: "laminas:automatic-releases:create-milestones"
-        env:
-          "GITHUB_TOKEN": ${{ secrets.GITHUB_TOKEN }}
-          "SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
-          "GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
-          "GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
diff --git a/vendor/laminas/laminas-zendframework-bridge/CHANGELOG.md b/vendor/laminas/laminas-zendframework-bridge/CHANGELOG.md
deleted file mode 100644
index 646828a655..0000000000
--- a/vendor/laminas/laminas-zendframework-bridge/CHANGELOG.md
+++ /dev/null
@@ -1,734 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file, in reverse chronological order by release.
-
-## 1.2.1 - TBD
-
-### Added
-
-- Nothing.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
-## 1.2.0 - 2021-02-25
-
-
------
-
-### Release Notes for [1.2.0](https://github.com/laminas/laminas-zendframework-bridge/milestone/7)
-
-Feature release (minor)
-
-## Added
-
-- Added Psalm support
-
-## Removed
-
-- Dropped support for PHP prior 7.3
-
-### 1.2.0
-
-- Total issues resolved: **1**
-- Total pull requests resolved: **2**
-- Total contributors: **3**
-
-#### Enhancement
-
- - [78: GitHub Actions &amp; Psalm](https://github.com/laminas/laminas-zendframework-bridge/pull/78) thanks to @gsteel and @boesing
-
-#### Bug
-
- - [72: Merge release 1.1.1 into 1.2.x](https://github.com/laminas/laminas-zendframework-bridge/pull/72) thanks to @github-actions[bot]
-
-## 1.1.1 - 2020-09-14
-
-### Fixed
-
-- [#71](https://github.com/laminas/laminas-zendframework-bridge/pull/71) fixes detection of the vendor directory when the `COMPOSER_VENDOR_DIR` env variable is missing or empty. Previously, this could lead to scenarios where a non-existent path was used for finding the bridge autoloader.
-
------
-
-### Release Notes for [1.1.1](https://github.com/laminas/laminas-zendframework-bridge/milestone/5)
-
-- Total issues resolved: **0**
-- Total pull requests resolved: **1**
-- Total contributors: **1**
-
-#### Bug
-
- - [71: Verify `COMPOSER&#95;VENDOR&#95;DIR` in conditional](https://github.com/laminas/laminas-zendframework-bridge/pull/71) thanks to @aaronbushnell
-
-## 1.1.0 - 2020-08-18
-
-### Added
-
-- [#68](https://github.com/laminas/laminas-zendframework-bridge/pull/68) adds support for the upcoming PHP 8.0 release.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- [#67](https://github.com/laminas/laminas-zendframework-bridge/pull/67) fixes how the Composer autoload file is found, looking first in the `COMPOSER_VENDOR_DIR` before trying to resolve relative to where the package is installed.
-
-## 1.0.4 - 2020-05-20
-
-### Added
-
-- Nothing.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- [#66](https://github.com/laminas/laminas-zendframework-bridge/pull/66) ensures that references to BjyAuthorize templates are not rewritten, so that they can be resolved during runtime.
-
-## 1.0.3 - 2020-04-03
-
-### Added
-
-- Nothing.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- [#63](https://github.com/laminas/laminas-zendframework-bridge/pull/63) fixes handling of dependency configuration to ensure each of delegators, initializers, and abstract factories are properly handled during configuration post processing. The new approach should allow delegators to work post-migration to Laminas or Mezzio.
-
-- [#61](https://github.com/laminas/laminas-zendframework-bridge/pull/61) ensures configuration for delegator factories gets rewritten; the functionality broke in version 1.0.1.
-
-## 1.0.2 - 2020-03-26
-
-### Added
-
-- Nothing.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- [#55](https://github.com/laminas/laminas-zendframework-bridge/pull/55) adds provisions to ensure that references to legacy classes/interfaces in dependency configuration always create aliases from the legacy to the new classes. Previously, we did straight replacements in the configuration, which could lead to the legacy service no longer being available. Now it will remain available.
-
-- [#59](https://github.com/laminas/laminas-zendframework-bridge/pull/59) fixes the replacement rules such as to avoid replacing references to API Skeletons packages, classes, or configuration keys.
-
-- [#57](https://github.com/laminas/laminas-zendframework-bridge/pull/57) fixes how references to the "zf-apigility" key are replaced. Previously, they were rewritten to "laminas-api-tools", but the correct replacement is "api-tools".
-
-- [#56](https://github.com/laminas/laminas-zendframework-bridge/pull/56) provides a mechanism to add additional maps with multiple levels of namespace separator escaping, in order to ensure that all various known permutations are matched. The escaping is applied to both the original and target, to ensure that rewrites conform to the original escaping.
-
-- [#56](https://github.com/laminas/laminas-zendframework-bridge/pull/56) makes changes to the replacement rules to ensure we do not replace references to "Zend" or "ZF" if they occur as subnamespaces OR as class names (formerly, we only enforced subnamespaces). Additional rules were provided for cases where one or both occur within our own packages.
-
-- [#52](https://github.com/laminas/laminas-zendframework-bridge/pull/52) fixes a scenario whereby factory _values_ were not being rewritten during configuration post processing.
-
-- [#52](https://github.com/laminas/laminas-zendframework-bridge/pull/52) fixes an issue that occurs with the configuration post processor. Previously, when a service name used as a factory or invokable was encountered that referenced a legacy class, it would get rewritten. This would cause issues if the service was not exposed in the original legacy package, however, as there would now be no alias of the legacy service to the new one. This patch modifies the configuration post processor such that it now tests to see if a service name it will rename exists as an alias; if not, it also creates the alias.
-
-## 1.0.1 - 2020-01-07
-
-### Added
-
-- Nothing.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- [#47](https://github.com/laminas/laminas-zendframework-bridge/pull/47) adds entries for rewriting the various `::*Zend()` methods exposed in the psr7bridge to `::*Laminas()` during migrations.
-
-- [#46](https://github.com/laminas/laminas-zendframework-bridge/pull/46) adds a rule to rewrite the config key `use_zend_loader` to `use_laminas_loader`.
-
-- [#45](https://github.com/laminas/laminas-zendframework-bridge/pull/45) adds a rule to exclude rewriting of view paths provided by the various Doctrine modules targeting the developer tools.
-
-## 1.0.0 - 2019-12-31
-
-### Added
-
-- First stable release.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
-## 0.4.5 - 2019-12-23
-
-### Added
-
-- Nothing.
-
-### Changed
-
-- [#42](https://github.com/laminas/laminas-zendframework-bridge/pull/42) modifies the replacement rules to no longer rewrite zf-deploy; the package will not be coming to the new organizations.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
-## 0.4.4 - 2019-12-18
-
-### Added
-
-- Nothing.
-
-### Changed
-
-- [#40](https://github.com/laminas/laminas-zendframework-bridge/pull/40) adds exclusion rules for subnamespaces that reference Zend, ZF, ZendService, or ZendOAuth to ensure they are not rewritten.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- [#40](https://github.com/laminas/laminas-zendframework-bridge/pull/40) adds exclusions for classes referencing Zend Server product features to ensure they are not rewritten (e.g., `ZendServerDisk`, `ZendServerShm`, `ZendMonitor`).
-
-## 0.4.3 - 2019-12-17
-
-### Added
-
-- Nothing.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- [#39](https://github.com/laminas/laminas-zendframework-bridge/pull/39) fixes an issue when using the Auryn DI container. The class `Northwoods\Container\Zend\Config` was incorrectly being renamed to `Northwoods\Container\Laminas\Config` (which should not happen, as it is not a class under our control).
-
-## 0.4.2 - 2019-12-16
-
-### Added
-
-- Nothing.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- [#36](https://github.com/laminas/laminas-zendframework-bridge/pull/36) adds some cases for classes that contain the verbiage "Expressive" and "Apigility" ot ensure they are rewritten correctly.
-
-## 0.4.1 - 2019-12-10
-
-### Added
-
-- Nothing.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- [#35](https://github.com/laminas/laminas-zendframework-bridge/pull/35) removes zend-debug from the replacement list, as it is not being brought over to Laminas.
-
-## 0.4.0 - 2019-11-27
-
-### Added
-
-- Nothing.
-
-### Changed
-
-- [#32](https://github.com/laminas/laminas-zendframework-bridge/pull/32) changes all references to Expressive to instead reference Mezzio.
-
-- [#32](https://github.com/laminas/laminas-zendframework-bridge/pull/32) changes all references to Apigility to instead reference Laminas API Tools. The vendor becomes laminas-api-tools, the URL becomes api-tools.getlaminas.org, packages and repos are prefixed with api-tools, and namespaces become `Laminas\ApiTools`.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
-## 0.3.8 - 2019-11-14
-
-### Added
-
-- [#29](https://github.com/laminas/laminas-zendframework-bridge/pull/29) adds entries to translate `ZendDeveloperTools` to `Laminas\DeveloperTools`, and vice-versa.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
-## 0.3.7 - 2019-11-12
-
-### Added
-
-- Nothing.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- [#28](https://github.com/laminas/laminas-zendframework-bridge/pull/28) updates the `zenddevelopertools` string to rewrite to `laminas-developer-tools` instead of `laminasdevelopertools`.
-
-## 0.3.6 - 2019-11-07
-
-### Added
-
-- Nothing.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- [#27](https://github.com/laminas/laminas-zendframework-bridge/pull/27) adds a rewrite rule for zend-framework.flf => laminas-project.flf.
-
-## 0.3.5 - 2019-11-06
-
-### Added
-
-- Nothing.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- [#25](https://github.com/laminas/laminas-zendframework-bridge/pull/25) adds entries for ZendHttp and ZendModule, which are file name segments in files from the zend-feed and zend-config-aggregator-module packages, respectively.
-
-## 0.3.4 - 2019-11-06
-
-### Added
-
-- Nothing.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- [#24](https://github.com/laminas/laminas-zendframework-bridge/pull/24) adds a rule to never rewrite the string `Doctrine\Zend`.
-
-- [#23](https://github.com/laminas/laminas-zendframework-bridge/pull/23) adds a missing map for each of ZendAcl and ZendRbac, which occur in the zend-expressive-authorization-acl and zend-expressive-authorization-rbac packages, respectively.
-
-## 0.3.3 - 2019-11-06
-
-### Added
-
-- [#22](https://github.com/laminas/laminas-zendframework-bridge/pull/22) adds configuration post-processing features, exposed both as a laminas-config-aggregator post processor (for use with Expressive applications) and as a laminas-modulemanager `EVENT_MERGE_CONFIG` listener (for use with MVC applications). When registered, it will post-process the configuration, replacing known Zend Framework-specific strings with their Laminas replacements. A ruleset is provided that ensures dependency configuration is rewritten in a safe manner, routing configuration is skipped, and certain top-level configuration keys are matched exactly (instead of potentially as substrings or word stems). A later release of laminas-migration will auto-register these tools in applications when possible.
-
-### Changed
-
-- [#22](https://github.com/laminas/laminas-zendframework-bridge/pull/22) removes support for PHP versions prior to PHP 5.6. We have decided to only support supported PHP versions, whether that support is via php.net or commercial. The lowest supported PHP version we have found is 5.6. Users wishing to migrate to Laminas must at least update to PHP 5.6 before doing so.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
-## 0.3.2 - 2019-10-30
-
-### Added
-
-- Nothing.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- [#21](https://github.com/laminas/laminas-zendframework-bridge/pull/21) removes rewriting of the Amazon library, as it is not moving to Laminas.
-
-- [#21](https://github.com/laminas/laminas-zendframework-bridge/pull/21) removes rewriting of the GCM and APNS libraries, as they are not moving to Laminas.
-
-### Fixed
-
-- [#21](https://github.com/laminas/laminas-zendframework-bridge/pull/21) fixes how the recaptcha and twitter library package and namespaces are rewritten.
-
-## 0.3.1 - 2019-04-25
-
-### Added
-
-- [#20](https://github.com/laminas/laminas-zendframework-bridge/pull/20) provides an additional autoloader that is _prepended_ to the autoloader
-  stack. This new autoloader will create class aliases for interfaces, classes,
-  and traits referenced in type hints and class declarations, ensuring PHP is
-  able to resolve them correctly during class_alias operations.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
-## 0.3.0 - 2019-04-12
-
-### Added
-
-- Nothing.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- [#16](https://github.com/laminas/laminas-zendframework-bridge/pull/16) removes the `RewriteRules::classRewrite()` method, as it is no longer
-  needed due to internal refactoring.
-
-### Fixed
-
-- [#16](https://github.com/laminas/laminas-zendframework-bridge/pull/16) fixes how the rewrite rules detect the word `Zend` in subnamespaces and
-  class names to be both more robust and simpler.
-
-## 0.2.5 - 2019-04-11
-
-### Added
-
-- [#12](https://github.com/laminas/laminas-zendframework-bridge/pull/12) adds functionality for ensuring we alias namespaces and classes that
-  include the word `Zend` in them; e.g., `Zend\Expressive\ZendView\ZendViewRendererFactory`
-  will now alias to `Expressive\LaminasView\LaminasViewRendererFactory`.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
-## 0.2.4 - 2019-04-11
-
-### Added
-
-- [#11](https://github.com/laminas/laminas-zendframework-bridge/pull/11) adds maps for the Expressive router adapter packages.
-
-- [#10](https://github.com/laminas/laminas-zendframework-bridge/pull/10) adds a map for the Psr7Bridge package, as it used `Zend` within a subnamespace.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
-## 0.2.3 - 2019-04-10
-
-### Added
-
-- Nothing.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- [#9](https://github.com/laminas/laminas-zendframework-bridge/pull/9) fixes the mapping for the Problem Details package.
-
-## 0.2.2 - 2019-04-10
-
-### Added
-
-- Nothing.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Added a check that the discovered alias exists as a class, interface, or trait
-  before attempting to call `class_alias()`.
-
-## 0.2.1 - 2019-04-10
-
-### Added
-
-- Nothing.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- [#8](https://github.com/laminas/laminas-zendframework-bridge/pull/8) fixes mappings for each of zend-expressive-authentication-zendauthentication,
-  zend-expressive-zendrouter, and zend-expressive-zendviewrenderer.
-
-## 0.2.0 - 2019-04-01
-
-### Added
-
-- Nothing.
-
-### Changed
-
-- [#4](https://github.com/laminas/laminas-zendframework-bridge/pull/4) rewrites the autoloader to be class-based, via the class
-  `Laminas\ZendFrameworkBridge\Autoloader`. Additionally, the new approach
-  provides a performance boost by using a balanced tree algorithm, ensuring
-  matches occur faster.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- [#4](https://github.com/laminas/laminas-zendframework-bridge/pull/4) removes function aliasing. Function aliasing will move to the packages that
-  provide functions.
-
-### Fixed
-
-- Nothing.
-
-## 0.1.0 - 2019-03-27
-
-### Added
-
-- Adds an autoloader file that registers with `spl_autoload_register` a routine
-  for aliasing legacy ZF class/interface/trait names to Laminas Project
-  equivalents.
-
-- Adds autoloader files for aliasing legacy ZF package functions to Laminas
-  Project equivalents.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
\ No newline at end of file
diff --git a/vendor/laminas/laminas-zendframework-bridge/COPYRIGHT.md b/vendor/laminas/laminas-zendframework-bridge/COPYRIGHT.md
deleted file mode 100644
index 0a8cccc06b..0000000000
--- a/vendor/laminas/laminas-zendframework-bridge/COPYRIGHT.md
+++ /dev/null
@@ -1 +0,0 @@
-Copyright (c) 2020 Laminas Project a Series of LF Projects, LLC. (https://getlaminas.org/)
diff --git a/vendor/laminas/laminas-zendframework-bridge/LICENSE.md b/vendor/laminas/laminas-zendframework-bridge/LICENSE.md
deleted file mode 100644
index 10b40f1423..0000000000
--- a/vendor/laminas/laminas-zendframework-bridge/LICENSE.md
+++ /dev/null
@@ -1,26 +0,0 @@
-Copyright (c) 2020 Laminas Project a Series of LF Projects, LLC.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-- Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-- Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-- Neither the name of Laminas Foundation nor the names of its contributors may
-  be used to endorse or promote products derived from this software without
-  specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/laminas/laminas-zendframework-bridge/README.md b/vendor/laminas/laminas-zendframework-bridge/README.md
deleted file mode 100644
index a8d8526fa3..0000000000
--- a/vendor/laminas/laminas-zendframework-bridge/README.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# laminas-zendframework-bridge
-
-[![Build Status](https://github.com/laminas/laminas-zendframework-bridge/workflows/Continuous%20Integration/badge.svg)](https://github.com/laminas/laminas-zendframework-bridge/actions?query=workflow%3A"Continuous+Integration")
-
-
-This library provides a custom autoloader that aliases legacy Zend Framework,
-Apigility, and Expressive classes to their replacements under the Laminas
-Project.
-
-This package should be installed only if you are also using the composer plugin
-that installs Laminas packages to replace ZF/Apigility/Expressive packages.
-
-This tool supports:
-
-* Zend Framework MVC projects, all v2 and v3 releases
-* Apigility projects, all stable versions
-* Expressive versions, all stable versions
-
-## Installation
-
-Run the following to install this library:
-
-```bash
-$ composer require laminas/laminas-zendframework-bridge
-```
-
-## Support
-
-* [Issues](https://github.com/laminas/laminas-zendframework-bridge/issues/)
-* [Forum](https://discourse.laminas.dev/)
diff --git a/vendor/laminas/laminas-zendframework-bridge/composer.json b/vendor/laminas/laminas-zendframework-bridge/composer.json
deleted file mode 100644
index d025ba0e1b..0000000000
--- a/vendor/laminas/laminas-zendframework-bridge/composer.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-    "name": "laminas/laminas-zendframework-bridge",
-    "description": "Alias legacy ZF class names to Laminas Project equivalents.",
-    "license": "BSD-3-Clause",
-    "keywords": [
-        "autoloading",
-        "laminas",
-        "zf",
-        "zendframework"
-    ],
-    "support": {
-        "issues": "https://github.com/laminas/laminas-zendframework-bridge/issues",
-        "source": "https://github.com/laminas/laminas-zendframework-bridge",
-        "rss": "https://github.com/laminas/laminas-zendframework-bridge/releases.atom",
-        "forum": "https://discourse.laminas.dev/"
-    },
-    "require": {
-        "php": "^7.3 || ^8.0"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.1 || ^9.3",
-        "psalm/plugin-phpunit": "^0.15.1",
-        "squizlabs/php_codesniffer": "^3.5",
-        "vimeo/psalm": "^4.6"
-    },
-    "autoload": {
-        "files": [
-            "src/autoload.php"
-        ],
-        "psr-4": {
-            "Laminas\\ZendFrameworkBridge\\": "src//"
-        }
-    },
-    "autoload-dev": {
-        "files": [
-            "test/classes.php"
-        ],
-        "psr-4": {
-            "LaminasTest\\ZendFrameworkBridge\\": "test/",
-            "LaminasTest\\ZendFrameworkBridge\\TestAsset\\": "test/TestAsset/classes/",
-            "Laminas\\ApiTools\\": "test/TestAsset/LaminasApiTools/",
-            "Mezzio\\": "test/TestAsset/Mezzio/",
-            "Laminas\\": "test/TestAsset/Laminas/"
-        }
-    },
-    "extra": {
-        "laminas": {
-            "module": "Laminas\\ZendFrameworkBridge"
-        }
-    },
-    "config": {
-        "sort-packages": true
-    },
-    "scripts": {
-        "cs-check": "phpcs",
-        "cs-fix": "phpcbf",
-        "static-analysis": "psalm --shepherd --stats",
-        "test": "phpunit --colors=always",
-        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
-    }
-}
diff --git a/vendor/laminas/laminas-zendframework-bridge/config/replacements.php b/vendor/laminas/laminas-zendframework-bridge/config/replacements.php
deleted file mode 100644
index f5344355f1..0000000000
--- a/vendor/laminas/laminas-zendframework-bridge/config/replacements.php
+++ /dev/null
@@ -1,372 +0,0 @@
-<?php
-
-return [
-    // NEVER REWRITE
-    'zendframework/zendframework' => 'zendframework/zendframework',
-    'zend-developer-tools/toolbar/bjy' => 'zend-developer-tools/toolbar/bjy',
-    'zend-developer-tools/toolbar/doctrine' => 'zend-developer-tools/toolbar/doctrine',
-
-    // NAMESPACES
-    // Zend Framework components
-    'Zend\\AuraDi\\Config' => 'Laminas\\AuraDi\\Config',
-    'Zend\\Authentication' => 'Laminas\\Authentication',
-    'Zend\\Barcode' => 'Laminas\\Barcode',
-    'Zend\\Cache' => 'Laminas\\Cache',
-    'Zend\\Captcha' => 'Laminas\\Captcha',
-    'Zend\\Code' => 'Laminas\\Code',
-    'ZendCodingStandard\\Sniffs' => 'LaminasCodingStandard\\Sniffs',
-    'ZendCodingStandard\\Utils' => 'LaminasCodingStandard\\Utils',
-    'Zend\\ComponentInstaller' => 'Laminas\\ComponentInstaller',
-    'Zend\\Config' => 'Laminas\\Config',
-    'Zend\\ConfigAggregator' => 'Laminas\\ConfigAggregator',
-    'Zend\\ConfigAggregatorModuleManager' => 'Laminas\\ConfigAggregatorModuleManager',
-    'Zend\\ConfigAggregatorParameters' => 'Laminas\\ConfigAggregatorParameters',
-    'Zend\\Console' => 'Laminas\\Console',
-    'Zend\\ContainerConfigTest' => 'Laminas\\ContainerConfigTest',
-    'Zend\\Crypt' => 'Laminas\\Crypt',
-    'Zend\\Db' => 'Laminas\\Db',
-    'ZendDeveloperTools' => 'Laminas\\DeveloperTools',
-    'Zend\\Di' => 'Laminas\\Di',
-    'Zend\\Diactoros' => 'Laminas\\Diactoros',
-    'ZendDiagnostics\\Check' => 'Laminas\\Diagnostics\\Check',
-    'ZendDiagnostics\\Result' => 'Laminas\\Diagnostics\\Result',
-    'ZendDiagnostics\\Runner' => 'Laminas\\Diagnostics\\Runner',
-    'Zend\\Dom' => 'Laminas\\Dom',
-    'Zend\\Escaper' => 'Laminas\\Escaper',
-    'Zend\\EventManager' => 'Laminas\\EventManager',
-    'Zend\\Feed' => 'Laminas\\Feed',
-    'Zend\\File' => 'Laminas\\File',
-    'Zend\\Filter' => 'Laminas\\Filter',
-    'Zend\\Form' => 'Laminas\\Form',
-    'Zend\\Http' => 'Laminas\\Http',
-    'Zend\\HttpHandlerRunner' => 'Laminas\\HttpHandlerRunner',
-    'Zend\\Hydrator' => 'Laminas\\Hydrator',
-    'Zend\\I18n' => 'Laminas\\I18n',
-    'Zend\\InputFilter' => 'Laminas\\InputFilter',
-    'Zend\\Json' => 'Laminas\\Json',
-    'Zend\\Ldap' => 'Laminas\\Ldap',
-    'Zend\\Loader' => 'Laminas\\Loader',
-    'Zend\\Log' => 'Laminas\\Log',
-    'Zend\\Mail' => 'Laminas\\Mail',
-    'Zend\\Math' => 'Laminas\\Math',
-    'Zend\\Memory' => 'Laminas\\Memory',
-    'Zend\\Mime' => 'Laminas\\Mime',
-    'Zend\\ModuleManager' => 'Laminas\\ModuleManager',
-    'Zend\\Mvc' => 'Laminas\\Mvc',
-    'Zend\\Navigation' => 'Laminas\\Navigation',
-    'Zend\\Paginator' => 'Laminas\\Paginator',
-    'Zend\\Permissions' => 'Laminas\\Permissions',
-    'Zend\\Pimple\\Config' => 'Laminas\\Pimple\\Config',
-    'Zend\\ProblemDetails' => 'Mezzio\\ProblemDetails',
-    'Zend\\ProgressBar' => 'Laminas\\ProgressBar',
-    'Zend\\Psr7Bridge' => 'Laminas\\Psr7Bridge',
-    'Zend\\Router' => 'Laminas\\Router',
-    'Zend\\Serializer' => 'Laminas\\Serializer',
-    'Zend\\Server' => 'Laminas\\Server',
-    'Zend\\ServiceManager' => 'Laminas\\ServiceManager',
-    'ZendService\\ReCaptcha' => 'Laminas\\ReCaptcha',
-    'ZendService\\Twitter' => 'Laminas\\Twitter',
-    'Zend\\Session' => 'Laminas\\Session',
-    'Zend\\SkeletonInstaller' => 'Laminas\\SkeletonInstaller',
-    'Zend\\Soap' => 'Laminas\\Soap',
-    'Zend\\Stdlib' => 'Laminas\\Stdlib',
-    'Zend\\Stratigility' => 'Laminas\\Stratigility',
-    'Zend\\Tag' => 'Laminas\\Tag',
-    'Zend\\Test' => 'Laminas\\Test',
-    'Zend\\Text' => 'Laminas\\Text',
-    'Zend\\Uri' => 'Laminas\\Uri',
-    'Zend\\Validator' => 'Laminas\\Validator',
-    'Zend\\View' => 'Laminas\\View',
-    'ZendXml' => 'Laminas\\Xml',
-    'Zend\\Xml2Json' => 'Laminas\\Xml2Json',
-    'Zend\\XmlRpc' => 'Laminas\\XmlRpc',
-    'ZendOAuth' => 'Laminas\\OAuth',
-
-    // class ZendAcl in zend-expressive-authorization-acl
-    'ZendAcl' => 'LaminasAcl',
-    'Zend\\Expressive\\Authorization\\Acl\\ZendAcl' => 'Mezzio\\Authorization\\Acl\\LaminasAcl',
-    // class ZendHttpClientDecorator in zend-feed
-    'ZendHttp' => 'LaminasHttp',
-    // class ZendModuleProvider in zend-config-aggregator-modulemanager
-    'ZendModule' => 'LaminasModule',
-    // class ZendRbac in zend-expressive-authorization-rbac
-    'ZendRbac' => 'LaminasRbac',
-    'Zend\\Expressive\\Authorization\\Rbac\\ZendRbac' => 'Mezzio\\Authorization\\Rbac\\LaminasRbac',
-    // class ZendRouter in zend-expressive-router-zendrouter
-    'ZendRouter' => 'LaminasRouter',
-    'Zend\\Expressive\\Router\\ZendRouter' => 'Mezzio\\Router\\LaminasRouter',
-    // class ZendViewRenderer in zend-expressive-zendviewrenderer
-    'ZendViewRenderer' => 'LaminasViewRenderer',
-    'Zend\\Expressive\\ZendView\\ZendViewRenderer' => 'Mezzio\\LaminasView\\LaminasViewRenderer',
-    'a\\Zend' => 'a\\Zend',
-    'b\\Zend' => 'b\\Zend',
-    'c\\Zend' => 'c\\Zend',
-    'd\\Zend' => 'd\\Zend',
-    'e\\Zend' => 'e\\Zend',
-    'f\\Zend' => 'f\\Zend',
-    'g\\Zend' => 'g\\Zend',
-    'h\\Zend' => 'h\\Zend',
-    'i\\Zend' => 'i\\Zend',
-    'j\\Zend' => 'j\\Zend',
-    'k\\Zend' => 'k\\Zend',
-    'l\\Zend' => 'l\\Zend',
-    'm\\Zend' => 'm\\Zend',
-    'n\\Zend' => 'n\\Zend',
-    'o\\Zend' => 'o\\Zend',
-    'p\\Zend' => 'p\\Zend',
-    'q\\Zend' => 'q\\Zend',
-    'r\\Zend' => 'r\\Zend',
-    's\\Zend' => 's\\Zend',
-    't\\Zend' => 't\\Zend',
-    'u\\Zend' => 'u\\Zend',
-    'v\\Zend' => 'v\\Zend',
-    'w\\Zend' => 'w\\Zend',
-    'x\\Zend' => 'x\\Zend',
-    'y\\Zend' => 'y\\Zend',
-    'z\\Zend' => 'z\\Zend',
-
-    // Expressive
-    'Zend\\Expressive' => 'Mezzio',
-    'ZendAuthentication' => 'LaminasAuthentication',
-    'ZendAcl' => 'LaminasAcl',
-    'ZendRbac' => 'LaminasRbac',
-    'ZendRouter' => 'LaminasRouter',
-    'ExpressiveUrlGenerator' => 'MezzioUrlGenerator',
-    'ExpressiveInstaller' => 'MezzioInstaller',
-
-    // Apigility
-    'ZF\\Apigility' => 'Laminas\\ApiTools',
-    'ZF\\ApiProblem' => 'Laminas\\ApiTools\\ApiProblem',
-    'ZF\\AssetManager' => 'Laminas\\ApiTools\\AssetManager',
-    'ZF\\ComposerAutoloading' => 'Laminas\\ComposerAutoloading',
-    'ZF\\Configuration' => 'Laminas\\ApiTools\\Configuration',
-    'ZF\\ContentNegotiation' => 'Laminas\\ApiTools\\ContentNegotiation',
-    'ZF\\ContentValidation' => 'Laminas\\ApiTools\\ContentValidation',
-    'ZF\\DevelopmentMode' => 'Laminas\\DevelopmentMode',
-    'ZF\\Doctrine\\QueryBuilder' => 'Laminas\\ApiTools\\Doctrine\\QueryBuilder',
-    'ZF\\Hal' => 'Laminas\\ApiTools\\Hal',
-    'ZF\\HttpCache' => 'Laminas\\ApiTools\\HttpCache',
-    'ZF\\MvcAuth' => 'Laminas\\ApiTools\\MvcAuth',
-    'ZF\\OAuth2' => 'Laminas\\ApiTools\\OAuth2',
-    'ZF\\Rest' => 'Laminas\\ApiTools\\Rest',
-    'ZF\\Rpc' => 'Laminas\\ApiTools\\Rpc',
-    'ZF\\Versioning' => 'Laminas\\ApiTools\\Versioning',
-    'a\\ZF' => 'a\\ZF',
-    'b\\ZF' => 'b\\ZF',
-    'c\\ZF' => 'c\\ZF',
-    'd\\ZF' => 'd\\ZF',
-    'e\\ZF' => 'e\\ZF',
-    'f\\ZF' => 'f\\ZF',
-    'g\\ZF' => 'g\\ZF',
-    'h\\ZF' => 'h\\ZF',
-    'i\\ZF' => 'i\\ZF',
-    'j\\ZF' => 'j\\ZF',
-    'k\\ZF' => 'k\\ZF',
-    'l\\ZF' => 'l\\ZF',
-    'm\\ZF' => 'm\\ZF',
-    'n\\ZF' => 'n\\ZF',
-    'o\\ZF' => 'o\\ZF',
-    'p\\ZF' => 'p\\ZF',
-    'q\\ZF' => 'q\\ZF',
-    'r\\ZF' => 'r\\ZF',
-    's\\ZF' => 's\\ZF',
-    't\\ZF' => 't\\ZF',
-    'u\\ZF' => 'u\\ZF',
-    'v\\ZF' => 'v\\ZF',
-    'w\\ZF' => 'w\\ZF',
-    'x\\ZF' => 'x\\ZF',
-    'y\\ZF' => 'y\\ZF',
-    'z\\ZF' => 'z\\ZF',
-
-    'ApigilityModuleInterface' => 'ApiToolsModuleInterface',
-    'ApigilityProviderInterface' => 'ApiToolsProviderInterface',
-    'ApigilityVersionController' => 'ApiToolsVersionController',
-
-    // PACKAGES
-    // ZF components, MVC
-    'zendframework/skeleton-application' => 'laminas/skeleton-application',
-    'zendframework/zend-auradi-config' => 'laminas/laminas-auradi-config',
-    'zendframework/zend-authentication' => 'laminas/laminas-authentication',
-    'zendframework/zend-barcode' => 'laminas/laminas-barcode',
-    'zendframework/zend-cache' => 'laminas/laminas-cache',
-    'zendframework/zend-captcha' => 'laminas/laminas-captcha',
-    'zendframework/zend-code' => 'laminas/laminas-code',
-    'zendframework/zend-coding-standard' => 'laminas/laminas-coding-standard',
-    'zendframework/zend-component-installer' => 'laminas/laminas-component-installer',
-    'zendframework/zend-composer-autoloading' => 'laminas/laminas-composer-autoloading',
-    'zendframework/zend-config-aggregator' => 'laminas/laminas-config-aggregator',
-    'zendframework/zend-config' => 'laminas/laminas-config',
-    'zendframework/zend-console' => 'laminas/laminas-console',
-    'zendframework/zend-container-config-test' => 'laminas/laminas-container-config-test',
-    'zendframework/zend-crypt' => 'laminas/laminas-crypt',
-    'zendframework/zend-db' => 'laminas/laminas-db',
-    'zendframework/zend-developer-tools' => 'laminas/laminas-developer-tools',
-    'zendframework/zend-diactoros' => 'laminas/laminas-diactoros',
-    'zendframework/zenddiagnostics' => 'laminas/laminas-diagnostics',
-    'zendframework/zend-di' => 'laminas/laminas-di',
-    'zendframework/zend-dom' => 'laminas/laminas-dom',
-    'zendframework/zend-escaper' => 'laminas/laminas-escaper',
-    'zendframework/zend-eventmanager' => 'laminas/laminas-eventmanager',
-    'zendframework/zend-feed' => 'laminas/laminas-feed',
-    'zendframework/zend-file' => 'laminas/laminas-file',
-    'zendframework/zend-filter' => 'laminas/laminas-filter',
-    'zendframework/zend-form' => 'laminas/laminas-form',
-    'zendframework/zend-httphandlerrunner' => 'laminas/laminas-httphandlerrunner',
-    'zendframework/zend-http' => 'laminas/laminas-http',
-    'zendframework/zend-hydrator' => 'laminas/laminas-hydrator',
-    'zendframework/zend-i18n' => 'laminas/laminas-i18n',
-    'zendframework/zend-i18n-resources' => 'laminas/laminas-i18n-resources',
-    'zendframework/zend-inputfilter' => 'laminas/laminas-inputfilter',
-    'zendframework/zend-json' => 'laminas/laminas-json',
-    'zendframework/zend-json-server' => 'laminas/laminas-json-server',
-    'zendframework/zend-ldap' => 'laminas/laminas-ldap',
-    'zendframework/zend-loader' => 'laminas/laminas-loader',
-    'zendframework/zend-log' => 'laminas/laminas-log',
-    'zendframework/zend-mail' => 'laminas/laminas-mail',
-    'zendframework/zend-math' => 'laminas/laminas-math',
-    'zendframework/zend-memory' => 'laminas/laminas-memory',
-    'zendframework/zend-mime' => 'laminas/laminas-mime',
-    'zendframework/zend-modulemanager' => 'laminas/laminas-modulemanager',
-    'zendframework/zend-mvc' => 'laminas/laminas-mvc',
-    'zendframework/zend-navigation' => 'laminas/laminas-navigation',
-    'zendframework/zend-oauth' => 'laminas/laminas-oauth',
-    'zendframework/zend-paginator' => 'laminas/laminas-paginator',
-    'zendframework/zend-permissions-acl' => 'laminas/laminas-permissions-acl',
-    'zendframework/zend-permissions-rbac' => 'laminas/laminas-permissions-rbac',
-    'zendframework/zend-pimple-config' => 'laminas/laminas-pimple-config',
-    'zendframework/zend-progressbar' => 'laminas/laminas-progressbar',
-    'zendframework/zend-psr7bridge' => 'laminas/laminas-psr7bridge',
-    'zendframework/zend-recaptcha' => 'laminas/laminas-recaptcha',
-    'zendframework/zend-router' => 'laminas/laminas-router',
-    'zendframework/zend-serializer' => 'laminas/laminas-serializer',
-    'zendframework/zend-server' => 'laminas/laminas-server',
-    'zendframework/zend-servicemanager' => 'laminas/laminas-servicemanager',
-    'zendframework/zendservice-recaptcha' => 'laminas/laminas-recaptcha',
-    'zendframework/zendservice-twitter' => 'laminas/laminas-twitter',
-    'zendframework/zend-session' => 'laminas/laminas-session',
-    'zendframework/zend-skeleton-installer' => 'laminas/laminas-skeleton-installer',
-    'zendframework/zend-soap' => 'laminas/laminas-soap',
-    'zendframework/zend-stdlib' => 'laminas/laminas-stdlib',
-    'zendframework/zend-stratigility' => 'laminas/laminas-stratigility',
-    'zendframework/zend-tag' => 'laminas/laminas-tag',
-    'zendframework/zend-test' => 'laminas/laminas-test',
-    'zendframework/zend-text' => 'laminas/laminas-text',
-    'zendframework/zend-uri' => 'laminas/laminas-uri',
-    'zendframework/zend-validator' => 'laminas/laminas-validator',
-    'zendframework/zend-view' => 'laminas/laminas-view',
-    'zendframework/zend-xml2json' => 'laminas/laminas-xml2json',
-    'zendframework/zend-xml' => 'laminas/laminas-xml',
-    'zendframework/zend-xmlrpc' => 'laminas/laminas-xmlrpc',
-
-    // Expressive packages
-    'zendframework/zend-expressive' => 'mezzio/mezzio',
-    'zendframework/zend-expressive-zendrouter' => 'mezzio/mezzio-laminasrouter',
-    'zendframework/zend-problem-details' => 'mezzio/mezzio-problem-details',
-    'zendframework/zend-expressive-zendviewrenderer' => 'mezzio/mezzio-laminasviewrenderer',
-
-    // Apigility packages
-    'zfcampus/apigility-documentation' => 'laminas-api-tools/documentation',
-    'zfcampus/statuslib-example' => 'laminas-api-tools/statuslib-example',
-    'zfcampus/zf-apigility' => 'laminas-api-tools/api-tools',
-    'zfcampus/zf-api-problem' => 'laminas-api-tools/api-tools-api-problem',
-    'zfcampus/zf-asset-manager' => 'laminas-api-tools/api-tools-asset-manager',
-    'zfcampus/zf-configuration' => 'laminas-api-tools/api-tools-configuration',
-    'zfcampus/zf-content-negotiation' => 'laminas-api-tools/api-tools-content-negotiation',
-    'zfcampus/zf-content-validation' => 'laminas-api-tools/api-tools-content-validation',
-    'zfcampus/zf-development-mode' => 'laminas/laminas-development-mode',
-    'zfcampus/zf-doctrine-querybuilder' => 'laminas-api-tools/api-tools-doctrine-querybuilder',
-    'zfcampus/zf-hal' => 'laminas-api-tools/api-tools-hal',
-    'zfcampus/zf-http-cache' => 'laminas-api-tools/api-tools-http-cache',
-    'zfcampus/zf-mvc-auth' => 'laminas-api-tools/api-tools-mvc-auth',
-    'zfcampus/zf-oauth2' => 'laminas-api-tools/api-tools-oauth2',
-    'zfcampus/zf-rest' => 'laminas-api-tools/api-tools-rest',
-    'zfcampus/zf-rpc' => 'laminas-api-tools/api-tools-rpc',
-    'zfcampus/zf-versioning' => 'laminas-api-tools/api-tools-versioning',
-
-    // CONFIG KEYS, SCRIPT NAMES, ETC
-    // ZF components
-    '::fromZend' => '::fromLaminas', // psr7bridge
-    '::toZend' => '::toLaminas', // psr7bridge
-    'use_zend_loader' => 'use_laminas_loader', // zend-modulemanager
-    'zend-config' => 'laminas-config',
-    'zend-developer-tools/' => 'laminas-developer-tools/',
-    'zend-tag-cloud' => 'laminas-tag-cloud',
-    'zenddevelopertools' => 'laminas-developer-tools',
-    'zendbarcode' => 'laminasbarcode',
-    'ZendBarcode' => 'LaminasBarcode',
-    'zendcache' => 'laminascache',
-    'ZendCache' => 'LaminasCache',
-    'zendconfig' => 'laminasconfig',
-    'ZendConfig' => 'LaminasConfig',
-    'zendfeed' => 'laminasfeed',
-    'ZendFeed' => 'LaminasFeed',
-    'zendfilter' => 'laminasfilter',
-    'ZendFilter' => 'LaminasFilter',
-    'zendform' => 'laminasform',
-    'ZendForm' => 'LaminasForm',
-    'zendi18n' => 'laminasi18n',
-    'ZendI18n' => 'LaminasI18n',
-    'zendinputfilter' => 'laminasinputfilter',
-    'ZendInputFilter' => 'LaminasInputFilter',
-    'zendlog' => 'laminaslog',
-    'ZendLog' => 'LaminasLog',
-    'zendmail' => 'laminasmail',
-    'ZendMail' => 'LaminasMail',
-    'zendmvc' => 'laminasmvc',
-    'ZendMvc' => 'LaminasMvc',
-    'zendpaginator' => 'laminaspaginator',
-    'ZendPaginator' => 'LaminasPaginator',
-    'zendserializer' => 'laminasserializer',
-    'ZendSerializer' => 'LaminasSerializer',
-    'zendtag' => 'laminastag',
-    'ZendTag' => 'LaminasTag',
-    'zendtext' => 'laminastext',
-    'ZendText' => 'LaminasText',
-    'zendvalidator' => 'laminasvalidator',
-    'ZendValidator' => 'LaminasValidator',
-    'zendview' => 'laminasview',
-    'ZendView' => 'LaminasView',
-    'zend-framework.flf' => 'laminas-project.flf',
-
-    // Expressive-related
-    "'zend-expressive'" => "'mezzio'",
-    '"zend-expressive"' => '"mezzio"',
-    'zend-expressive.' => 'mezzio.',
-    'zend-expressive-authorization' => 'mezzio-authorization',
-    'zend-expressive-hal' => 'mezzio-hal',
-    'zend-expressive-session' => 'mezzio-session',
-    'zend-expressive-swoole' => 'mezzio-swoole',
-    'zend-expressive-tooling' => 'mezzio-tooling',
-
-    // Apigility-related
-    "'zf-apigility'" => "'api-tools'",
-    '"zf-apigility"' => '"api-tools"',
-    'zf-apigility/' => 'api-tools/',
-    'zf-apigility-admin' => 'api-tools-admin',
-    'zf-content-negotiation' => 'api-tools-content-negotiation',
-    'zf-hal' => 'api-tools-hal',
-    'zf-rest' => 'api-tools-rest',
-    'zf-rpc' => 'api-tools-rpc',
-    'zf-content-validation' => 'api-tools-content-validation',
-    'zf-apigility-ui' => 'api-tools-ui',
-    'zf-apigility-documentation-blueprint' => 'api-tools-documentation-blueprint',
-    'zf-apigility-documentation-swagger' => 'api-tools-documentation-swagger',
-    'zf-apigility-welcome' => 'api-tools-welcome',
-    'zf-api-problem' => 'api-tools-api-problem',
-    'zf-configuration' => 'api-tools-configuration',
-    'zf-http-cache' => 'api-tools-http-cache',
-    'zf-mvc-auth' => 'api-tools-mvc-auth',
-    'zf-oauth2' => 'api-tools-oauth2',
-    'zf-versioning' => 'api-tools-versioning',
-    'ZfApigilityDoctrineQueryProviderManager' => 'LaminasApiToolsDoctrineQueryProviderManager',
-    'ZfApigilityDoctrineQueryCreateFilterManager' => 'LaminasApiToolsDoctrineQueryCreateFilterManager',
-    'zf-apigility-doctrine' => 'api-tools-doctrine',
-    'zf-development-mode' => 'laminas-development-mode',
-    'zf-doctrine-querybuilder' => 'api-tools-doctrine-querybuilder',
-
-    // 3rd party Apigility packages
-    'api-skeletons/zf-' => 'api-skeletons/zf-', // api-skeletons packages
-    'zf-oauth2-' => 'zf-oauth2-', // api-skeletons OAuth2-related packages
-    'ZF\\OAuth2\\Client' => 'ZF\\OAuth2\\Client', // api-skeletons/zf-oauth2-client
-    'ZF\\OAuth2\\Doctrine' => 'ZF\\OAuth2\\Doctrine', // api-skeletons/zf-oauth2-doctrine
-];
diff --git a/vendor/laminas/laminas-zendframework-bridge/psalm-baseline.xml b/vendor/laminas/laminas-zendframework-bridge/psalm-baseline.xml
deleted file mode 100644
index eabf89c513..0000000000
--- a/vendor/laminas/laminas-zendframework-bridge/psalm-baseline.xml
+++ /dev/null
@@ -1,382 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.6.1@e93e532e4eaad6d68c4d7b606853800eaceccc72">
-  <file src="config/replacements.php">
-    <DuplicateArrayKey occurrences="3">
-      <code>'ZendAcl' =&gt; 'LaminasAcl'</code>
-      <code>'ZendRbac' =&gt; 'LaminasRbac'</code>
-      <code>'ZendRouter' =&gt; 'LaminasRouter'</code>
-    </DuplicateArrayKey>
-  </file>
-  <file src="src/Autoloader.php">
-    <MissingClosureParamType occurrences="2">
-      <code>$class</code>
-      <code>$class</code>
-    </MissingClosureParamType>
-    <MissingFile occurrences="1">
-      <code>include __DIR__ . '/../../../autoload.php'</code>
-    </MissingFile>
-    <MissingReturnType occurrences="1">
-      <code>load</code>
-    </MissingReturnType>
-    <MixedArgument occurrences="7">
-      <code>$class</code>
-      <code>$class</code>
-      <code>$class</code>
-      <code>$class</code>
-      <code>$class</code>
-      <code>$class</code>
-      <code>$class</code>
-    </MixedArgument>
-    <MixedArgumentTypeCoercion occurrences="2"/>
-    <MixedArrayOffset occurrences="1">
-      <code>$loaded[$class]</code>
-    </MixedArrayOffset>
-    <MixedInferredReturnType occurrences="1">
-      <code>ClassLoader</code>
-    </MixedInferredReturnType>
-    <MixedOperand occurrences="2">
-      <code>$namespaces[$check]</code>
-      <code>$namespaces[$check]</code>
-    </MixedOperand>
-    <MixedReturnStatement occurrences="3">
-      <code>include __DIR__ . '/../../../autoload.php'</code>
-      <code>include __DIR__ . '/../vendor/autoload.php'</code>
-      <code>include getenv('COMPOSER_VENDOR_DIR') . '/autoload.php'</code>
-    </MixedReturnStatement>
-    <PossiblyFalseOperand occurrences="2">
-      <code>getenv('COMPOSER_VENDOR_DIR')</code>
-      <code>getenv('COMPOSER_VENDOR_DIR')</code>
-    </PossiblyFalseOperand>
-    <UnresolvableInclude occurrences="1">
-      <code>include getenv('COMPOSER_VENDOR_DIR') . '/autoload.php'</code>
-    </UnresolvableInclude>
-  </file>
-  <file src="src/ConfigPostProcessor.php">
-    <InvalidArgument occurrences="1">
-      <code>$keys</code>
-    </InvalidArgument>
-    <MissingClosureParamType occurrences="4">
-      <code>$value</code>
-      <code>$value</code>
-      <code>$value</code>
-      <code>$value</code>
-    </MissingClosureParamType>
-    <MissingClosureReturnType occurrences="4">
-      <code>function ($value) {</code>
-      <code>function ($value) {</code>
-      <code>function ($value, array $keys) {</code>
-      <code>function ($value, array $keys) {</code>
-    </MissingClosureReturnType>
-    <MissingReturnType occurrences="3">
-      <code>replaceDependencyConfiguration</code>
-      <code>replaceDependencyFactories</code>
-      <code>replaceDependencyServices</code>
-    </MissingReturnType>
-    <MixedArgument occurrences="5">
-      <code>$config</code>
-      <code>$newKey</code>
-      <code>$newKey</code>
-      <code>$newKey</code>
-      <code>$target</code>
-    </MixedArgument>
-    <MixedArgumentTypeCoercion occurrences="1">
-      <code>[$key]</code>
-    </MixedArgumentTypeCoercion>
-    <MixedArrayAssignment occurrences="4">
-      <code>$config[$key]</code>
-      <code>$config['aliases'][$alias]</code>
-      <code>$config['aliases'][$service]</code>
-      <code>$config['aliases'][$service]</code>
-    </MixedArrayAssignment>
-    <MixedArrayOffset occurrences="7">
-      <code>$aliases[$name]</code>
-      <code>$config[$key]</code>
-      <code>$keys[$key]</code>
-      <code>$rewritten[$newKey]</code>
-      <code>$rewritten[$newKey]</code>
-      <code>$rewritten[$newKey]</code>
-      <code>$this-&gt;exactReplacements[$value]</code>
-    </MixedArrayOffset>
-    <MixedArrayTypeCoercion occurrences="1">
-      <code>$aliases[$name]</code>
-    </MixedArrayTypeCoercion>
-    <MixedAssignment occurrences="26">
-      <code>$a[$key]</code>
-      <code>$a[$key]</code>
-      <code>$a[]</code>
-      <code>$config</code>
-      <code>$config</code>
-      <code>$config[$key]</code>
-      <code>$config['factories'][$replacedService]</code>
-      <code>$config['services'][$replacedService]</code>
-      <code>$data</code>
-      <code>$factory</code>
-      <code>$factory</code>
-      <code>$key</code>
-      <code>$key</code>
-      <code>$name</code>
-      <code>$newKey</code>
-      <code>$newValue</code>
-      <code>$notIn[]</code>
-      <code>$result</code>
-      <code>$rewritten[$key]</code>
-      <code>$rewritten[$newKey]</code>
-      <code>$rewritten[$newKey][]</code>
-      <code>$serviceInstance</code>
-      <code>$serviceInstance</code>
-      <code>$target</code>
-      <code>$value</code>
-      <code>$value</code>
-    </MixedAssignment>
-  </file>
-  <file src="src/Module.php">
-    <MissingReturnType occurrences="2">
-      <code>init</code>
-      <code>onMergeConfig</code>
-    </MissingReturnType>
-    <UndefinedDocblockClass occurrences="2">
-      <code>ModuleEvent</code>
-      <code>ModuleManager</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Replacements.php">
-    <MixedArgument occurrences="2">
-      <code>$replacement</code>
-      <code>$replacement</code>
-    </MixedArgument>
-    <MixedArgumentTypeCoercion occurrences="3">
-      <code>$original</code>
-      <code>$original</code>
-      <code>$original</code>
-    </MixedArgumentTypeCoercion>
-    <MixedAssignment occurrences="1">
-      <code>$replacement</code>
-    </MixedAssignment>
-    <MixedPropertyTypeCoercion occurrences="3">
-      <code>$this-&gt;replacements</code>
-      <code>$this-&gt;replacements</code>
-    </MixedPropertyTypeCoercion>
-  </file>
-  <file src="test/AutoloaderTest.php">
-    <InvalidStringClass occurrences="1">
-      <code>new $legacy()</code>
-    </InvalidStringClass>
-    <MissingReturnType occurrences="3">
-      <code>testLegacyClassIsAliasToLaminas</code>
-      <code>testReverseAliasCreated</code>
-      <code>testTypeHint</code>
-    </MissingReturnType>
-    <PossiblyInvalidArgument occurrences="1">
-      <code>testLegacyClassIsAliasToLaminas</code>
-    </PossiblyInvalidArgument>
-    <ReservedWord occurrences="5">
-      <code>self::assertSame($actual, get_class(new $legacy()))</code>
-      <code>self::assertTrue($isInterface ? interface_exists($legacy) : class_exists($legacy))</code>
-      <code>self::assertTrue(class_exists($actual))</code>
-      <code>self::assertTrue(class_exists($legacy))</code>
-      <code>self::assertTrue(class_exists('Laminas\LegacyTypeHint'))</code>
-    </ReservedWord>
-  </file>
-  <file src="test/ConfigPostProcessorTest.php">
-    <MissingReturnType occurrences="4">
-      <code>invalidServiceManagerConfiguration</code>
-      <code>testRewritesNestedKeys</code>
-      <code>testServiceManagerServiceInstancesCanBeHandled</code>
-      <code>testWillSkipInvalidConfigurations</code>
-    </MissingReturnType>
-    <MixedArgument occurrences="1">
-      <code>$config</code>
-    </MixedArgument>
-    <MixedAssignment occurrences="2">
-      <code>$config</code>
-      <code>$expected</code>
-    </MixedAssignment>
-    <MixedInferredReturnType occurrences="1">
-      <code>iterable</code>
-    </MixedInferredReturnType>
-    <ReservedWord occurrences="3">
-      <code>$this-&gt;assertSame($expected, $processor($config))</code>
-      <code>self::assertSame($config, $processor($config))</code>
-      <code>self::assertSame($expected, $processor($config))</code>
-    </ReservedWord>
-    <UnresolvableInclude occurrences="2">
-      <code>require $configLocation</code>
-      <code>require $expectedResultLocation</code>
-    </UnresolvableInclude>
-  </file>
-  <file src="test/ModuleTest.php">
-    <InvalidArgument occurrences="2">
-      <code>$event</code>
-      <code>$moduleManager</code>
-    </InvalidArgument>
-    <MissingReturnType occurrences="2">
-      <code>testInitRegistersListenerWithEventManager</code>
-      <code>testOnMergeConfigProcessesAndReplacesConfigurationPulledFromListener</code>
-    </MissingReturnType>
-    <MixedArgument occurrences="1">
-      <code>$config</code>
-    </MixedArgument>
-    <MixedAssignment occurrences="2">
-      <code>$config</code>
-      <code>$expected</code>
-    </MixedAssignment>
-    <MixedInferredReturnType occurrences="1">
-      <code>iterable</code>
-    </MixedInferredReturnType>
-    <ReservedWord occurrences="3">
-      <code>$this-&gt;assertNull($module-&gt;onMergeConfig($event))</code>
-      <code>$this-&gt;assertSame($expected, $listener-&gt;getMergedConfig())</code>
-    </ReservedWord>
-    <UnresolvableInclude occurrences="2">
-      <code>require $configFile</code>
-      <code>require $expectationsFile</code>
-    </UnresolvableInclude>
-  </file>
-  <file src="test/ReplacementsTest.php">
-    <MissingReturnType occurrences="1">
-      <code>testEdgeCases</code>
-    </MissingReturnType>
-    <MixedInferredReturnType occurrences="1">
-      <code>iterable</code>
-    </MixedInferredReturnType>
-    <ReservedWord occurrences="1">
-      <code>$this-&gt;assertSame($expected, $replacements-&gt;replace($string))</code>
-    </ReservedWord>
-  </file>
-  <file src="test/TestAsset/ConfigPostProcessor/AbstractFactories.php">
-    <UndefinedClass occurrences="4">
-      <code>ConfigAbstractFactory</code>
-      <code>ConfigAbstractFactory</code>
-      <code>InvokableFactory</code>
-      <code>InvokableFactory</code>
-    </UndefinedClass>
-  </file>
-  <file src="test/TestAsset/ConfigPostProcessor/CyclicalAliasing.php">
-    <DuplicateArrayKey occurrences="1">
-      <code>'Zend\Db\Adapter\Adapter' =&gt; 'ZF\Apigility\DbConnectedAdapter'</code>
-    </DuplicateArrayKey>
-  </file>
-  <file src="test/TestAsset/ConfigPostProcessor/ExpressiveSlimRouterConfig.php">
-    <UndefinedClass occurrences="2">
-      <code>Factory\SlimRouterFactory</code>
-      <code>RouterInterface</code>
-    </UndefinedClass>
-  </file>
-  <file src="test/TestAsset/ConfigPostProcessor/LazyServices.php">
-    <UndefinedClass occurrences="1">
-      <code>LazyServiceFactory</code>
-    </UndefinedClass>
-  </file>
-  <file src="test/TestAsset/ConfigPostProcessor/MwopNetAppConfig.php">
-    <UndefinedClass occurrences="42">
-      <code>CacheItemPoolInterface</code>
-      <code>ConfigFactory</code>
-      <code>ConfigFactory</code>
-      <code>ConfigFactory</code>
-      <code>ConfigFactory</code>
-      <code>ConfigFactory</code>
-      <code>ConfigFactory</code>
-      <code>Csp</code>
-      <code>DisplayPostHandler</code>
-      <code>Engine</code>
-      <code>EventDispatcherInterface</code>
-      <code>Factory\CachePoolFactory</code>
-      <code>Factory\EventDispatcherFactory</code>
-      <code>Factory\MailTransport</code>
-      <code>Factory\PlatesFunctionsDelegator</code>
-      <code>FeedReaderHttpClientInterface</code>
-      <code>Feed\HttpPlugClientFactory</code>
-      <code>Handler\ComicsPageHandler</code>
-      <code>Handler\ComicsPageHandlerFactory</code>
-      <code>Handler\HomePageHandler</code>
-      <code>Handler\HomePageHandlerFactory</code>
-      <code>Handler\PageHandlerFactory</code>
-      <code>Handler\PageHandlerFactory</code>
-      <code>Handler\ResumePageHandler</code>
-      <code>Handler\ResumePageHandler</code>
-      <code>Middleware\ContentSecurityPolicyMiddlewareFactory</code>
-      <code>Middleware\DisplayBlogPostHandlerDelegator</code>
-      <code>Middleware\RedirectAmpPagesMiddleware</code>
-      <code>Middleware\RedirectAmpPagesMiddlewareFactory</code>
-      <code>Middleware\RedirectsMiddleware</code>
-      <code>Middleware\RedirectsMiddleware</code>
-      <code>Middleware\XClacksOverheadMiddleware</code>
-      <code>Middleware\XClacksOverheadMiddleware</code>
-      <code>Middleware\XPoweredByMiddleware</code>
-      <code>Middleware\XPoweredByMiddleware</code>
-      <code>RequestFactory</code>
-      <code>RequestFactoryInterface</code>
-      <code>ResponseFactory</code>
-      <code>ResponseFactoryInterface</code>
-      <code>SessionCachePool</code>
-      <code>SessionCachePool</code>
-      <code>SessionCachePoolFactory</code>
-    </UndefinedClass>
-  </file>
-  <file src="test/TestAsset/Replacements/TestClass.php">
-    <UndefinedClass occurrences="1">
-      <code>\Zend\Expressive\Router</code>
-    </UndefinedClass>
-  </file>
-  <file src="test/TestAsset/Replacements/ZFOAuth2Client.php">
-    <UndefinedClass occurrences="1">
-      <code>OAuth2Client</code>
-    </UndefinedClass>
-  </file>
-  <file src="test/TestAsset/classes/ConfigListener.php">
-    <MissingReturnType occurrences="1">
-      <code>setMergedConfig</code>
-    </MissingReturnType>
-  </file>
-  <file src="test/TestAsset/classes/EventManager.php">
-    <InvalidArgument occurrences="1">
-      <code>$listener</code>
-    </InvalidArgument>
-    <MissingPropertyType occurrences="1">
-      <code>$listeners</code>
-    </MissingPropertyType>
-    <MissingReturnType occurrences="1">
-      <code>attach</code>
-    </MissingReturnType>
-    <MixedArgument occurrences="1">
-      <code>$this-&gt;listeners[$eventName]</code>
-    </MixedArgument>
-    <MixedArrayAccess occurrences="1">
-      <code>$this-&gt;listeners[$eventName]</code>
-    </MixedArrayAccess>
-    <MixedArrayAssignment occurrences="1">
-      <code>$this-&gt;listeners[$eventName]</code>
-    </MixedArrayAssignment>
-    <MixedInferredReturnType occurrences="1">
-      <code>array</code>
-    </MixedInferredReturnType>
-    <MixedReturnStatement occurrences="1">
-      <code>$this-&gt;listeners</code>
-    </MixedReturnStatement>
-  </file>
-  <file src="test/TestAsset/classes/ModuleEvent.php">
-    <MissingPropertyType occurrences="1">
-      <code>$listener</code>
-    </MissingPropertyType>
-    <MixedInferredReturnType occurrences="1">
-      <code>ConfigListener</code>
-    </MixedInferredReturnType>
-    <MixedReturnStatement occurrences="1">
-      <code>$this-&gt;listener</code>
-    </MixedReturnStatement>
-  </file>
-  <file src="test/TestAsset/classes/ModuleManager.php">
-    <MixedInferredReturnType occurrences="1">
-      <code>EventManager</code>
-    </MixedInferredReturnType>
-    <MixedReturnStatement occurrences="1">
-      <code>$this-&gt;eventManager</code>
-    </MixedReturnStatement>
-    <UndefinedThisPropertyAssignment occurrences="1">
-      <code>$this-&gt;eventManager</code>
-    </UndefinedThisPropertyAssignment>
-    <UndefinedThisPropertyFetch occurrences="1">
-      <code>$this-&gt;eventManager</code>
-    </UndefinedThisPropertyFetch>
-  </file>
-</files>
diff --git a/vendor/laminas/laminas-zendframework-bridge/psalm.xml.dist b/vendor/laminas/laminas-zendframework-bridge/psalm.xml.dist
deleted file mode 100644
index 788bbc00d4..0000000000
--- a/vendor/laminas/laminas-zendframework-bridge/psalm.xml.dist
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<psalm
-        totallyTyped="true"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xmlns="https://getpsalm.org/schema/config"
-        xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
-    errorBaseline="psalm-baseline.xml"
->
-    <projectFiles>
-        <directory name="src"/>
-        <directory name="test"/>
-        <ignoreFiles>
-            <directory name="vendor"/>
-        </ignoreFiles>
-    </projectFiles>
-
-    <issueHandlers>
-        <InternalMethod>
-            <errorLevel type="suppress">
-                <referencedMethod name="PHPUnit\Framework\MockObject\Builder\InvocationMocker::method"/>
-            </errorLevel>
-            <errorLevel type="suppress">
-                <referencedMethod name="PHPUnit\Framework\MockObject\Builder\InvocationMocker::willReturn"/>
-            </errorLevel>
-            <errorLevel type="suppress">
-                <referencedMethod name="PHPUnit\Framework\MockObject\Builder\InvocationMocker::with"/>
-            </errorLevel>
-        </InternalMethod>
-    </issueHandlers>
-    <plugins>
-        <pluginClass class="Psalm\PhpUnitPlugin\Plugin"/>
-    </plugins>
-</psalm>
diff --git a/vendor/laminas/laminas-zendframework-bridge/src/Autoloader.php b/vendor/laminas/laminas-zendframework-bridge/src/Autoloader.php
deleted file mode 100644
index 261bb888fd..0000000000
--- a/vendor/laminas/laminas-zendframework-bridge/src/Autoloader.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<?php
-
-namespace Laminas\ZendFrameworkBridge;
-
-use ArrayObject;
-use Composer\Autoload\ClassLoader;
-use RuntimeException;
-
-use function array_values;
-use function class_alias;
-use function class_exists;
-use function explode;
-use function file_exists;
-use function interface_exists;
-use function spl_autoload_register;
-use function strlen;
-use function strtr;
-use function substr;
-use function trait_exists;
-
-/**
- * Alias legacy Zend Framework project classes/interfaces/traits to Laminas equivalents.
- */
-class Autoloader
-{
-    /**
-     * Attach autoloaders for managing legacy ZF artifacts.
-     *
-     * We attach two autoloaders:
-     *
-     * - The first is _prepended_ to handle new classes and add aliases for
-     *   legacy classes. PHP expects any interfaces implemented, classes
-     *   extended, or traits used when declaring class_alias() to exist and/or
-     *   be autoloadable already at the time of declaration. If not, it will
-     *   raise a fatal error. This autoloader helps mitigate errors in such
-     *   situations.
-     *
-     * - The second is _appended_ in order to create aliases for legacy
-     *   classes.
-     */
-    public static function load()
-    {
-        $loaded = new ArrayObject([]);
-
-        spl_autoload_register(self::createPrependAutoloader(
-            RewriteRules::namespaceReverse(),
-            self::getClassLoader(),
-            $loaded
-        ), true, true);
-
-        spl_autoload_register(self::createAppendAutoloader(
-            RewriteRules::namespaceRewrite(),
-            $loaded
-        ));
-    }
-
-    /**
-     * @return ClassLoader
-     * @throws RuntimeException
-     */
-    private static function getClassLoader()
-    {
-        if (getenv('COMPOSER_VENDOR_DIR') && file_exists(getenv('COMPOSER_VENDOR_DIR') . '/autoload.php')) {
-            return include getenv('COMPOSER_VENDOR_DIR') . '/autoload.php';
-        }
-
-        if (file_exists(__DIR__ . '/../../../autoload.php')) {
-            return include __DIR__ . '/../../../autoload.php';
-        }
-
-        if (file_exists(__DIR__ . '/../vendor/autoload.php')) {
-            return include __DIR__ . '/../vendor/autoload.php';
-        }
-
-        throw new RuntimeException('Cannot detect composer autoload. Please run composer install');
-    }
-
-    /**
-     * @return callable
-     */
-    private static function createPrependAutoloader(array $namespaces, ClassLoader $classLoader, ArrayObject $loaded)
-    {
-        /**
-         * @param  string $class Class name to autoload
-         * @return void
-         */
-        return static function ($class) use ($namespaces, $classLoader, $loaded) {
-            if (isset($loaded[$class])) {
-                return;
-            }
-
-            $segments = explode('\\', $class);
-
-            $i = 0;
-            $check = '';
-
-            while (isset($segments[$i + 1], $namespaces[$check . $segments[$i] . '\\'])) {
-                $check .= $segments[$i] . '\\';
-                ++$i;
-            }
-
-            if ($check === '') {
-                return;
-            }
-
-            if ($classLoader->loadClass($class)) {
-                $legacy = $namespaces[$check]
-                    . strtr(substr($class, strlen($check)), [
-                        'ApiTools' => 'Apigility',
-                        'Mezzio' => 'Expressive',
-                        'Laminas' => 'Zend',
-                    ]);
-                class_alias($class, $legacy);
-            }
-        };
-    }
-
-    /**
-     * @return callable
-     */
-    private static function createAppendAutoloader(array $namespaces, ArrayObject $loaded)
-    {
-        /**
-         * @param  string $class Class name to autoload
-         * @return void
-         */
-        return static function ($class) use ($namespaces, $loaded) {
-            $segments = explode('\\', $class);
-
-            if ($segments[0] === 'ZendService' && isset($segments[1])) {
-                $segments[0] .= '\\' . $segments[1];
-                unset($segments[1]);
-                $segments = array_values($segments);
-            }
-
-            $i = 0;
-            $check = '';
-
-            // We are checking segments of the namespace to match quicker
-            while (isset($segments[$i + 1], $namespaces[$check . $segments[$i] . '\\'])) {
-                $check .= $segments[$i] . '\\';
-                ++$i;
-            }
-
-            if ($check === '') {
-                return;
-            }
-
-            $alias = $namespaces[$check]
-                . strtr(substr($class, strlen($check)), [
-                    'Apigility' => 'ApiTools',
-                    'Expressive' => 'Mezzio',
-                    'Zend' => 'Laminas',
-                    'AbstractZendServer' => 'AbstractZendServer',
-                    'ZendServerDisk' => 'ZendServerDisk',
-                    'ZendServerShm' => 'ZendServerShm',
-                    'ZendMonitor' => 'ZendMonitor',
-                ]);
-
-            $loaded[$alias] = true;
-            if (class_exists($alias) || interface_exists($alias) || trait_exists($alias)) {
-                class_alias($alias, $class);
-            }
-        };
-    }
-}
diff --git a/vendor/laminas/laminas-zendframework-bridge/src/ConfigPostProcessor.php b/vendor/laminas/laminas-zendframework-bridge/src/ConfigPostProcessor.php
deleted file mode 100644
index c3b601a681..0000000000
--- a/vendor/laminas/laminas-zendframework-bridge/src/ConfigPostProcessor.php
+++ /dev/null
@@ -1,426 +0,0 @@
-<?php
-
-namespace Laminas\ZendFrameworkBridge;
-
-use function array_intersect_key;
-use function array_key_exists;
-use function array_pop;
-use function in_array;
-use function is_array;
-use function is_callable;
-use function is_int;
-use function is_string;
-
-class ConfigPostProcessor
-{
-    /** @internal */
-    const SERVICE_MANAGER_KEYS_OF_INTEREST = [
-        'aliases'    => true,
-        'factories'  => true,
-        'invokables' => true,
-        'services'   => true,
-    ];
-
-    /** @var array String keys => string values */
-    private $exactReplacements = [
-        'zend-expressive' => 'mezzio',
-        'zf-apigility'    => 'api-tools',
-    ];
-
-    /** @var Replacements */
-    private $replacements;
-
-    /** @var callable[] */
-    private $rulesets;
-
-    public function __construct()
-    {
-        $this->replacements = new Replacements();
-
-        /* Define the rulesets for replacements.
-         *
-         * Each ruleset has the following signature:
-         *
-         * @param mixed $value
-         * @param string[] $keys Full nested key hierarchy leading to the value
-         * @return null|callable
-         *
-         * If no match is made, a null is returned, allowing it to fallback to
-         * the next ruleset in the list. If a match is made, a callback is returned,
-         * and that will be used to perform the replacement on the value.
-         *
-         * The callback should have the following signature:
-         *
-         * @param mixed $value
-         * @param string[] $keys
-         * @return mixed The transformed value
-         */
-        $this->rulesets = [
-            // Exact values
-            function ($value) {
-                return is_string($value) && isset($this->exactReplacements[$value])
-                    ? [$this, 'replaceExactValue']
-                    : null;
-            },
-
-            // Router (MVC applications)
-            // We do not want to rewrite these.
-            function ($value, array $keys) {
-                $key = array_pop($keys);
-                // Only worried about a top-level "router" key.
-                return $key === 'router' && $keys === [] && is_array($value)
-                    ? [$this, 'noopReplacement']
-                    : null;
-            },
-
-            // service- and pluginmanager handling
-            function ($value) {
-                return is_array($value) && array_intersect_key(self::SERVICE_MANAGER_KEYS_OF_INTEREST, $value) !== []
-                    ? [$this, 'replaceDependencyConfiguration']
-                    : null;
-            },
-
-            // Array values
-            function ($value, array $keys) {
-                return $keys !== [] && is_array($value)
-                    ? [$this, '__invoke']
-                    : null;
-            },
-        ];
-    }
-
-    /**
-     * @param string[] $keys Hierarchy of keys, for determining location in
-     *     nested configuration.
-     * @return array
-     */
-    public function __invoke(array $config, array $keys = [])
-    {
-        $rewritten = [];
-
-        foreach ($config as $key => $value) {
-            // Determine new key from replacements
-            $newKey = is_string($key) ? $this->replace($key, $keys) : $key;
-
-            // Keep original values with original key, if the key has changed, but only at the top-level.
-            if (empty($keys) && $newKey !== $key) {
-                $rewritten[$key] = $value;
-            }
-
-            // Perform value replacements, if any
-            $newValue = $this->replace($value, $keys, $newKey);
-
-            // Key does not already exist and/or is not an array value
-            if (! array_key_exists($newKey, $rewritten) || ! is_array($rewritten[$newKey])) {
-                // Do not overwrite existing values with null values
-                $rewritten[$newKey] = array_key_exists($newKey, $rewritten) && null === $newValue
-                    ? $rewritten[$newKey]
-                    : $newValue;
-                continue;
-            }
-
-            // New value is null; nothing to do.
-            if (null === $newValue) {
-                continue;
-            }
-
-            // Key already exists as an array value, but $value is not an array
-            if (! is_array($newValue)) {
-                $rewritten[$newKey][] = $newValue;
-                continue;
-            }
-
-            // Key already exists as an array value, and $value is also an array
-            $rewritten[$newKey] = static::merge($rewritten[$newKey], $newValue);
-        }
-
-        return $rewritten;
-    }
-
-    /**
-     * Perform substitutions as needed on an individual value.
-     *
-     * The $key is provided to allow fine-grained selection of rewrite rules.
-     *
-     * @param mixed $value
-     * @param string[] $keys Key hierarchy
-     * @param null|int|string $key
-     * @return mixed
-     */
-    private function replace($value, array $keys, $key = null)
-    {
-        // Add new key to the list of keys.
-        // We do not need to remove it later, as we are working on a copy of the array.
-        $keys[] = $key;
-
-        // Identify rewrite strategy and perform replacements
-        $rewriteRule = $this->replacementRuleMatch($value, $keys);
-        return $rewriteRule($value, $keys);
-    }
-
-    /**
-     * Merge two arrays together.
-     *
-     * If an integer key exists in both arrays, the value from the second array
-     * will be appended to the first array. If both values are arrays, they are
-     * merged together, else the value of the second array overwrites the one
-     * of the first array.
-     *
-     * Based on zend-stdlib Zend\Stdlib\ArrayUtils::merge
-     * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
-     *
-     * @return array
-     */
-    public static function merge(array $a, array $b)
-    {
-        foreach ($b as $key => $value) {
-            if (! isset($a[$key]) && ! array_key_exists($key, $a)) {
-                $a[$key] = $value;
-                continue;
-            }
-
-            if (null === $value && array_key_exists($key, $a)) {
-                // Leave as-is if value from $b is null
-                continue;
-            }
-
-            if (is_int($key)) {
-                $a[] = $value;
-                continue;
-            }
-
-            if (is_array($value) && is_array($a[$key])) {
-                $a[$key] = static::merge($a[$key], $value);
-                continue;
-            }
-
-            $a[$key] = $value;
-        }
-
-        return $a;
-    }
-
-    /**
-     * @param mixed $value
-     * @param null|int|string $key
-     * @return callable Callable to invoke with value
-     */
-    private function replacementRuleMatch($value, $key = null)
-    {
-        foreach ($this->rulesets as $ruleset) {
-            $result = $ruleset($value, $key);
-            if (is_callable($result)) {
-                return $result;
-            }
-        }
-        return [$this, 'fallbackReplacement'];
-    }
-
-    /**
-     * Replace a value using the translation table, if the value is a string.
-     *
-     * @param mixed $value
-     * @return mixed
-     */
-    private function fallbackReplacement($value)
-    {
-        return is_string($value)
-            ? $this->replacements->replace($value)
-            : $value;
-    }
-
-    /**
-     * Replace a value matched exactly.
-     *
-     * @param mixed $value
-     * @return mixed
-     */
-    private function replaceExactValue($value)
-    {
-        return $this->exactReplacements[$value];
-    }
-
-    private function replaceDependencyConfiguration(array $config)
-    {
-        $aliases = isset($config['aliases']) && is_array($config['aliases'])
-            ? $this->replaceDependencyAliases($config['aliases'])
-            : [];
-
-        if ($aliases) {
-            $config['aliases'] = $aliases;
-        }
-
-        $config = $this->replaceDependencyInvokables($config);
-        $config = $this->replaceDependencyFactories($config);
-        $config = $this->replaceDependencyServices($config);
-
-        $keys = self::SERVICE_MANAGER_KEYS_OF_INTEREST;
-        foreach ($config as $key => $data) {
-            if (isset($keys[$key])) {
-                continue;
-            }
-
-            $config[$key] = is_array($data) ? $this->__invoke($data, [$key]) :  $data;
-        }
-
-        return $config;
-    }
-
-    /**
-     * Rewrite dependency aliases array
-     *
-     * In this case, we want to keep the alias as-is, but rewrite the target.
-     *
-     * We need also provide an additional alias if the alias key is a legacy class.
-     *
-     * @return array
-     */
-    private function replaceDependencyAliases(array $aliases)
-    {
-        foreach ($aliases as $alias => $target) {
-            if (! is_string($alias) || ! is_string($target)) {
-                continue;
-            }
-
-            $newTarget = $this->replacements->replace($target);
-            $newAlias  = $this->replacements->replace($alias);
-
-            $notIn = [$newTarget];
-            $name  = $newTarget;
-            while (isset($aliases[$name])) {
-                $notIn[] = $aliases[$name];
-                $name    = $aliases[$name];
-            }
-
-            if ($newAlias === $alias && ! in_array($alias, $notIn, true)) {
-                $aliases[$alias] = $newTarget;
-                continue;
-            }
-
-            if (isset($aliases[$newAlias])) {
-                continue;
-            }
-
-            if (! in_array($newAlias, $notIn, true)) {
-                $aliases[$alias]    = $newAlias;
-                $aliases[$newAlias] = $newTarget;
-            }
-        }
-
-        return $aliases;
-    }
-
-    /**
-     * Rewrite dependency invokables array
-     *
-     * In this case, we want to keep the alias as-is, but rewrite the target.
-     *
-     * We need also provide an additional alias if invokable is defined with
-     * an alias which is a legacy class.
-     *
-     * @return array
-     */
-    private function replaceDependencyInvokables(array $config)
-    {
-        if (empty($config['invokables']) || ! is_array($config['invokables'])) {
-            return $config;
-        }
-
-        foreach ($config['invokables'] as $alias => $target) {
-            if (! is_string($alias)) {
-                continue;
-            }
-
-            $newTarget = $this->replacements->replace($target);
-            $newAlias  = $this->replacements->replace($alias);
-
-            if ($alias === $target || isset($config['aliases'][$newAlias])) {
-                $config['invokables'][$alias] = $newTarget;
-                continue;
-            }
-
-            $config['invokables'][$newAlias] = $newTarget;
-
-            if ($newAlias === $alias) {
-                continue;
-            }
-
-            $config['aliases'][$alias] = $newAlias;
-
-            unset($config['invokables'][$alias]);
-        }
-
-        return $config;
-    }
-
-    /**
-     * @param mixed $value
-     * @return mixed Returns $value verbatim.
-     */
-    private function noopReplacement($value)
-    {
-        return $value;
-    }
-
-    private function replaceDependencyFactories(array $config)
-    {
-        if (empty($config['factories']) || ! is_array($config['factories'])) {
-            return $config;
-        }
-
-        foreach ($config['factories'] as $service => $factory) {
-            if (! is_string($service)) {
-                continue;
-            }
-
-            $replacedService = $this->replacements->replace($service);
-            $factory         = is_string($factory) ? $this->replacements->replace($factory) : $factory;
-            $config['factories'][$replacedService] = $factory;
-
-            if ($replacedService === $service) {
-                continue;
-            }
-
-            unset($config['factories'][$service]);
-            if (isset($config['aliases'][$service])) {
-                continue;
-            }
-
-            $config['aliases'][$service] = $replacedService;
-        }
-
-        return $config;
-    }
-
-    private function replaceDependencyServices(array $config)
-    {
-        if (empty($config['services']) || ! is_array($config['services'])) {
-            return $config;
-        }
-
-        foreach ($config['services'] as $service => $serviceInstance) {
-            if (! is_string($service)) {
-                continue;
-            }
-
-            $replacedService = $this->replacements->replace($service);
-            $serviceInstance = is_array($serviceInstance) ? $this->__invoke($serviceInstance) : $serviceInstance;
-
-            $config['services'][$replacedService] = $serviceInstance;
-
-            if ($service === $replacedService) {
-                continue;
-            }
-
-            unset($config['services'][$service]);
-
-            if (isset($config['aliases'][$service])) {
-                continue;
-            }
-
-            $config['aliases'][$service] = $replacedService;
-        }
-
-        return $config;
-    }
-}
diff --git a/vendor/laminas/laminas-zendframework-bridge/src/Module.php b/vendor/laminas/laminas-zendframework-bridge/src/Module.php
deleted file mode 100644
index 9bb1298010..0000000000
--- a/vendor/laminas/laminas-zendframework-bridge/src/Module.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-namespace Laminas\ZendFrameworkBridge;
-
-use Laminas\ModuleManager\Listener\ConfigMergerInterface;
-use Laminas\ModuleManager\ModuleEvent;
-use Laminas\ModuleManager\ModuleManager;
-
-class Module
-{
-    /**
-     * Initialize the module.
-     *
-     * Type-hinting deliberately omitted to allow unit testing
-     * without dependencies on packages that do not exist yet.
-     *
-     * @param ModuleManager $moduleManager
-     */
-    public function init($moduleManager)
-    {
-        $moduleManager
-            ->getEventManager()
-            ->attach('mergeConfig', [$this, 'onMergeConfig']);
-    }
-
-    /**
-     * Perform substitutions in the merged configuration.
-     *
-     * Rewrites keys and values matching known ZF classes, namespaces, and
-     * configuration keys to their Laminas equivalents.
-     *
-     * Type-hinting deliberately omitted to allow unit testing
-     * without dependencies on packages that do not exist yet.
-     *
-     * @param ModuleEvent $event
-     */
-    public function onMergeConfig($event)
-    {
-        /** @var ConfigMergerInterface */
-        $configMerger = $event->getConfigListener();
-        $processor    = new ConfigPostProcessor();
-        $configMerger->setMergedConfig(
-            $processor(
-                $configMerger->getMergedConfig($returnAsObject = false)
-            )
-        );
-    }
-}
diff --git a/vendor/laminas/laminas-zendframework-bridge/src/Replacements.php b/vendor/laminas/laminas-zendframework-bridge/src/Replacements.php
deleted file mode 100644
index 5a09ef1216..0000000000
--- a/vendor/laminas/laminas-zendframework-bridge/src/Replacements.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace Laminas\ZendFrameworkBridge;
-
-use function array_merge;
-use function str_replace;
-use function strpos;
-use function strtr;
-
-class Replacements
-{
-    /** @var string[] */
-    private $replacements;
-
-    public function __construct(array $additionalReplacements = [])
-    {
-        $this->replacements = array_merge(
-            require __DIR__ . '/../config/replacements.php',
-            $additionalReplacements
-        );
-
-        // Provide multiple variants of strings containing namespace separators
-        foreach ($this->replacements as $original => $replacement) {
-            if (false === strpos($original, '\\')) {
-                continue;
-            }
-            $this->replacements[str_replace('\\', '\\\\', $original)] = str_replace('\\', '\\\\', $replacement);
-            $this->replacements[str_replace('\\', '\\\\\\\\', $original)] = str_replace('\\', '\\\\\\\\', $replacement);
-        }
-    }
-
-    /**
-     * @param string $value
-     * @return string
-     */
-    public function replace($value)
-    {
-        return strtr($value, $this->replacements);
-    }
-}
diff --git a/vendor/laminas/laminas-zendframework-bridge/src/RewriteRules.php b/vendor/laminas/laminas-zendframework-bridge/src/RewriteRules.php
deleted file mode 100644
index 61aa56dd4e..0000000000
--- a/vendor/laminas/laminas-zendframework-bridge/src/RewriteRules.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-namespace Laminas\ZendFrameworkBridge;
-
-class RewriteRules
-{
-    /**
-     * @return array
-     */
-    public static function namespaceRewrite()
-    {
-        return [
-            // Expressive
-            'Zend\\ProblemDetails\\' => 'Mezzio\\ProblemDetails\\',
-            'Zend\\Expressive\\'     => 'Mezzio\\',
-
-            // Laminas
-            'Zend\\'                    => 'Laminas\\',
-            'ZF\\ComposerAutoloading\\' => 'Laminas\\ComposerAutoloading\\',
-            'ZF\\DevelopmentMode\\'     => 'Laminas\\DevelopmentMode\\',
-
-            // Apigility
-            'ZF\\Apigility\\' => 'Laminas\\ApiTools\\',
-            'ZF\\'            => 'Laminas\\ApiTools\\',
-
-            // ZendXml, API wrappers, zend-http OAuth support, zend-diagnostics, ZendDeveloperTools
-            'ZendXml\\'                => 'Laminas\\Xml\\',
-            'ZendOAuth\\'              => 'Laminas\\OAuth\\',
-            'ZendDiagnostics\\'        => 'Laminas\\Diagnostics\\',
-            'ZendService\\ReCaptcha\\' => 'Laminas\\ReCaptcha\\',
-            'ZendService\\Twitter\\'   => 'Laminas\\Twitter\\',
-            'ZendDeveloperTools\\'     => 'Laminas\\DeveloperTools\\',
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    public static function namespaceReverse()
-    {
-        return [
-            // ZendXml, ZendOAuth, ZendDiagnostics, ZendDeveloperTools
-            'Laminas\\Xml\\'            => 'ZendXml\\',
-            'Laminas\\OAuth\\'          => 'ZendOAuth\\',
-            'Laminas\\Diagnostics\\'    => 'ZendDiagnostics\\',
-            'Laminas\\DeveloperTools\\' => 'ZendDeveloperTools\\',
-
-            // Zend Service
-            'Laminas\\ReCaptcha\\' => 'ZendService\\ReCaptcha\\',
-            'Laminas\\Twitter\\'   => 'ZendService\\Twitter\\',
-
-            // Zend
-            'Laminas\\' => 'Zend\\',
-
-            // Expressive
-            'Mezzio\\ProblemDetails\\' => 'Zend\\ProblemDetails\\',
-            'Mezzio\\'                 => 'Zend\\Expressive\\',
-
-            // Laminas to ZfCampus
-            'Laminas\\ComposerAutoloading\\' => 'ZF\\ComposerAutoloading\\',
-            'Laminas\\DevelopmentMode\\'     => 'ZF\\DevelopmentMode\\',
-
-            // Apigility
-            'Laminas\\ApiTools\\Admin\\'         => 'ZF\\Apigility\\Admin\\',
-            'Laminas\\ApiTools\\Doctrine\\'      => 'ZF\\Apigility\\Doctrine\\',
-            'Laminas\\ApiTools\\Documentation\\' => 'ZF\\Apigility\\Documentation\\',
-            'Laminas\\ApiTools\\Example\\'       => 'ZF\\Apigility\\Example\\',
-            'Laminas\\ApiTools\\Provider\\'      => 'ZF\\Apigility\\Provider\\',
-            'Laminas\\ApiTools\\Welcome\\'       => 'ZF\\Apiglity\\Welcome\\',
-            'Laminas\\ApiTools\\'                => 'ZF\\',
-        ];
-    }
-}
diff --git a/vendor/laminas/laminas-zendframework-bridge/src/autoload.php b/vendor/laminas/laminas-zendframework-bridge/src/autoload.php
deleted file mode 100644
index e92ff589e1..0000000000
--- a/vendor/laminas/laminas-zendframework-bridge/src/autoload.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-Laminas\ZendFrameworkBridge\Autoloader::load();
diff --git a/vendor/maennchen/zipstream-php/.editorconfig b/vendor/maennchen/zipstream-php/.editorconfig
new file mode 100644
index 0000000000..f7cd914279
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/.editorconfig
@@ -0,0 +1,22 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+
+[*.{yml,md,xml}]
+indent_style = space
+indent_size = 2
+
+[*.{rst,php}]
+indent_style = space
+indent_size = 4
+
+[composer.json]
+indent_style = space
+indent_size = 2
+
+[composer.lock]
+indent_style = space
+indent_size = 4
diff --git a/vendor/maennchen/zipstream-php/.gitattributes b/vendor/maennchen/zipstream-php/.gitattributes
new file mode 100644
index 0000000000..e058ebd0ab
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/.gitattributes
@@ -0,0 +1,6 @@
+.gitignore     text eol=lf
+.gitattributes text eol=lf
+*.md       text eol=lf
+*.php      text eol=lf
+*.yml      text eol=lf
+*.xml      text eol=lf
diff --git a/vendor/maennchen/zipstream-php/.github/CODE_OF_CONDUCT.md b/vendor/maennchen/zipstream-php/.github/CODE_OF_CONDUCT.md
new file mode 100644
index 0000000000..9d75b87639
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/.github/CODE_OF_CONDUCT.md
@@ -0,0 +1,132 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, caste, color, religion, or sexual
+identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+- Demonstrating empathy and kindness toward other people
+- Being respectful of differing opinions, viewpoints, and experiences
+- Giving and gracefully accepting constructive feedback
+- Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+- Focusing on what is best not just for us as individuals, but for the overall
+  community
+
+Examples of unacceptable behavior include:
+
+- The use of sexualized language or imagery, and sexual attention or advances of
+  any kind
+- Trolling, insulting or derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or email address,
+  without their explicit permission
+- Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+jonatan@maennchen.ch.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series of
+actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or permanent
+ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior, harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within the
+community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.1, available at
+[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
+
+Community Impact Guidelines were inspired by
+[Mozilla's code of conduct enforcement ladder][mozilla coc].
+
+For answers to common questions about this code of conduct, see the FAQ at
+[https://www.contributor-covenant.org/faq][faq]. Translations are available at
+[https://www.contributor-covenant.org/translations][translations].
+
+[homepage]: https://www.contributor-covenant.org
+[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
+[mozilla coc]: https://github.com/mozilla/diversity
+[faq]: https://www.contributor-covenant.org/faq
+[translations]: https://www.contributor-covenant.org/translations
diff --git a/vendor/maennchen/zipstream-php/.github/CONTRIBUTING.md b/vendor/maennchen/zipstream-php/.github/CONTRIBUTING.md
new file mode 100644
index 0000000000..d8caee081b
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/.github/CONTRIBUTING.md
@@ -0,0 +1,139 @@
+# Contributing to ZipStream-PHP
+
+## Welcome!
+
+We look forward to your contributions! Here are some examples how you can
+contribute:
+
+- [Report a bug](https://github.com/maennchen/ZipStream-PHP/issues/new?labels=bug&template=BUG.md)
+- [Propose a new feature](https://github.com/maennchen/ZipStream-PHP/issues/new?labels=enhancement&template=FEATURE.md)
+- [Send a pull request](https://github.com/maennchen/ZipStream-PHP/pulls)
+
+## We have a Code of Conduct
+
+Please note that this project is released with a
+[Contributor Code of Conduct](CODE_OF_CONDUCT.md). By participating in this
+project you agree to abide by its terms.
+
+## Any contributions you make will be under the MIT License
+
+When you submit code changes, your submissions are understood to be under the
+same [MIT License](https://github.com/maennchen/ZipStream-PHP/blob/main/LICENSE)
+that covers the project. By contributing to this project, you agree that your
+contributions will be licensed under its MIT License.
+
+## Write bug reports with detail, background, and sample code
+
+In your bug report, please provide the following:
+
+- A quick summary and/or background
+- Steps to reproduce
+  - Be specific!
+  - Give sample code if you can.
+- What you expected would happen
+- What actually happens
+- Notes (possibly including why you think this might be happening, or stuff you
+- tried that didn't work)
+
+Please do not report a bug for a version of ZIPStream-PHP that is no longer
+supported (`< 3.0.0`). Please do not report a bug if you are using a version of
+PHP that is not supported by the version of ZipStream-PHP you are using.
+
+Please post code and output as text
+([using proper markup](https://guides.github.com/features/mastering-markdown/)).
+Do not post screenshots of code or output.
+
+Please include the output of `composer info | sort`.
+
+## Workflow for Pull Requests
+
+1. Fork the repository.
+2. Create your branch from `main` if you plan to implement new functionality or
+   change existing code significantly; create your branch from the oldest branch
+   that is affected by the bug if you plan to fix a bug.
+3. Implement your change and add tests for it.
+4. Ensure the test suite passes.
+5. Ensure the code complies with our coding guidelines (see below).
+6. Send that pull request!
+
+Please make sure you have
+[set up your user name and email address](https://git-scm.com/book/en/v2/Getting-Started-First-Time-Git-Setup)
+for use with Git. Strings such as `silly nick name <root@localhost>` look really
+stupid in the commit history of a project.
+
+We encourage you to
+[sign your Git commits with your GPG key](https://docs.github.com/en/github/authenticating-to-github/signing-commits).
+
+Pull requests for new features must be based on the `main` branch.
+
+We are trying to keep backwards compatibility breaks in ZipStream-PHP to a
+minimum. Please take this into account when proposing changes.
+
+Due to time constraints, we are not always able to respond as quickly as we
+would like. Please do not take delays personal and feel free to remind us if you
+feel that we forgot to respond.
+
+## Coding Guidelines
+
+This project comes with a configuration file (located at `/psalm.yml` in the
+repository) that you can use to perform static analysis (with a focus on type
+checking):
+
+```bash
+$ .composer run test:lint
+```
+
+This project comes with a configuration file (located at
+`/.php-cs-fixer.dist.php` in the repository) that you can use to (re)format your
+source code for compliance with this project's coding guidelines:
+
+```bash
+$ composer run format
+```
+
+Please understand that we will not accept a pull request when its changes
+violate this project's coding guidelines.
+
+## Using ZipStream-PHP from a Git checkout
+
+The following commands can be used to perform the initial checkout of
+ZipStream-PHP:
+
+```bash
+$ git clone git@github.com:maennchen/ZipStream-PHP.git
+
+$ cd ZipStream-PHP
+```
+
+Install ZipStream-PHP's dependencies using [Composer](https://getcomposer.org/):
+
+```bash
+$ composer install
+$ composer run install:tools # Install phpDocumentor using phive
+```
+
+## Running ZipStream-PHP's test suite
+
+After following the steps shown above, ZipStream-PHP's test suite is run like
+this:
+
+```bash
+$ composer run test:unit
+```
+
+There's some slow tests in the test suite that test the handling of big files in
+the archives. To skip them use the following command instead:
+
+```bash
+$ composer run test:unit:fast
+```
+
+## Generating ZipStream-PHP Documentation
+
+To generate the documentation for the library, run:
+
+```bash
+$ composer run docs:generate
+```
+
+The guide documentation pages can be found in the `/guides/` directory.
diff --git a/vendor/maennchen/zipstream-php/.github/FUNDING.yml b/vendor/maennchen/zipstream-php/.github/FUNDING.yml
index d807a3f33f..5a4612769f 100644
--- a/vendor/maennchen/zipstream-php/.github/FUNDING.yml
+++ b/vendor/maennchen/zipstream-php/.github/FUNDING.yml
@@ -1 +1 @@
-open_collective: zipstream
+github: maennchen
diff --git a/vendor/maennchen/zipstream-php/.github/ISSUE_TEMPLATE.md b/vendor/maennchen/zipstream-php/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 3c2e66d6f5..0000000000
--- a/vendor/maennchen/zipstream-php/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Description of the problem
-
-Please be very descriptive and include as much details as possible.
-
-# Example code
-
-# Informations
-
-* ZipStream-PHP version:
-* PHP version:
-
-Please include any supplemental information you deem relevant to this issue.
diff --git a/vendor/maennchen/zipstream-php/.github/ISSUE_TEMPLATE/BUG.yml b/vendor/maennchen/zipstream-php/.github/ISSUE_TEMPLATE/BUG.yml
new file mode 100644
index 0000000000..0eb8cc772e
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/.github/ISSUE_TEMPLATE/BUG.yml
@@ -0,0 +1,71 @@
+name: 🐞 Bug Report
+description: Something is broken?
+labels: ["bug"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        - Create a discussion instead if you are looking for support:
+          https://github.com/maennchen/ZipStream-PHP/discussions
+  - type: input
+    id: version
+    attributes:
+      label: ZipStream-PHP version
+      placeholder: x.y.z
+    validations:
+      required: true
+  - type: input
+    id: php-version
+    attributes:
+      label: PHP version
+      placeholder: x.y.z
+    validations:
+      required: true
+  - type: checkboxes
+    id: constraints
+    attributes:
+      label: Constraints for Bug Report
+      options:
+        - label: |
+            I'm using a version of ZipStream that is currently supported:
+            https://github.com/maennchen/ZipStream-PHP#version-support
+          required: true
+        - label: |
+            I'm using a version of PHP that has active support:
+            https://www.php.net/supported-versions.php
+          required: true
+        - label: |
+            I'm using a version of PHP that is compatible with your used
+            ZipStream version.
+          required: true
+        - label: |
+            I'm using the latest release of the used ZipStream major version.
+          required: true
+  - type: textarea
+    id: summary
+    attributes:
+      label: Summary
+      description: Provide a summary describing the problem you are experiencing.
+    validations:
+      required: true
+  - type: textarea
+    id: current-behaviour
+    attributes:
+      label: Current behavior
+      description: What is the current (buggy) behavior?
+    validations:
+      required: true
+  - type: textarea
+    id: reproduction
+    attributes:
+      label: How to reproduce
+      description: Provide steps to reproduce the bug.
+    validations:
+      required: true
+  - type: textarea
+    id: expected-behaviour
+    attributes:
+      label: Expected behavior
+      description: What was the expected (correct) behavior?
+    validations:
+      required: true
diff --git a/vendor/maennchen/zipstream-php/.github/ISSUE_TEMPLATE/FEATURE.yml b/vendor/maennchen/zipstream-php/.github/ISSUE_TEMPLATE/FEATURE.yml
new file mode 100644
index 0000000000..e5dec63716
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/.github/ISSUE_TEMPLATE/FEATURE.yml
@@ -0,0 +1,11 @@
+name: 🎉 Feature Request
+description: You have a neat idea that should be implemented?
+labels: ["enhancement"]
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: Provide a summary of the feature you would like to see implemented.
+    validations:
+      required: true
diff --git a/vendor/maennchen/zipstream-php/.github/PULL_REQUEST_TEMPLATE.md b/vendor/maennchen/zipstream-php/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000000..6892c571bf
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,6 @@
+Please go the the `Preview` tab and select the appropriate sub-template:
+
+* [🐞 Failing Test](?expand=1&template=FAILING_TEST.md)
+* [🐞 Bug Fix](?expand=1&template=FIX.md)
+* [⚙ Improvement](?expand=1&template=IMPROVEMENT.md)
+* [🎉 New Feature](?expand=1&template=NEW_FEATURE.md)
diff --git a/vendor/maennchen/zipstream-php/.github/PULL_REQUEST_TEMPLATE/FAILING_TEST.md b/vendor/maennchen/zipstream-php/.github/PULL_REQUEST_TEMPLATE/FAILING_TEST.md
new file mode 100644
index 0000000000..24603cb636
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/.github/PULL_REQUEST_TEMPLATE/FAILING_TEST.md
@@ -0,0 +1,13 @@
+<!---
+name: 🐞 Failing Test
+about: You found a bug and have a failing test?
+labels: bug, tests
+--->
+
+<!--
+- Please do not send a pull request for an issue in a version of ZipStream-PHP
+  that is no longer supported.
+  See: https://github.com/maennchen/ZipStream-PHP#version-support
+- Please target the oldest branch of ZipStream-PHP that is still supported and
+  where the test fails.
+-->
diff --git a/vendor/maennchen/zipstream-php/.github/PULL_REQUEST_TEMPLATE/FIX.md b/vendor/maennchen/zipstream-php/.github/PULL_REQUEST_TEMPLATE/FIX.md
new file mode 100644
index 0000000000..77f65a0803
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/.github/PULL_REQUEST_TEMPLATE/FIX.md
@@ -0,0 +1,13 @@
+<!---
+name: 🐞 Bug Fix
+about: You have a fix for a bug?
+labels: bug
+--->
+
+<!--
+- Please do not send a pull request for an issue in a version of ZipStream-PHP
+  that is no longer supported.
+  See: https://github.com/maennchen/ZipStream-PHP#version-support
+- Please target the oldest branch of ZipStream-PHP that is still supported and
+  affected by this bug.
+-->
diff --git a/vendor/maennchen/zipstream-php/.github/PULL_REQUEST_TEMPLATE/IMPROVEMENT.md b/vendor/maennchen/zipstream-php/.github/PULL_REQUEST_TEMPLATE/IMPROVEMENT.md
new file mode 100644
index 0000000000..3ac8e31009
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/.github/PULL_REQUEST_TEMPLATE/IMPROVEMENT.md
@@ -0,0 +1,9 @@
+<!---
+name: ⚙ Improvement
+about: You have some improvement to make ZipStream-PHP better?
+labels: enhancement
+--->
+
+<!--
+- Please target the `main` branch of ZipStream-PHP.
+-->
diff --git a/vendor/maennchen/zipstream-php/.github/PULL_REQUEST_TEMPLATE/NEW_FEATURE.md b/vendor/maennchen/zipstream-php/.github/PULL_REQUEST_TEMPLATE/NEW_FEATURE.md
new file mode 100644
index 0000000000..ca53939c89
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/.github/PULL_REQUEST_TEMPLATE/NEW_FEATURE.md
@@ -0,0 +1,9 @@
+<!---
+name: 🎉 New Feature
+about: You have implemented some neat idea that you want to make part of ZipStream-PHP?
+labels: type/enhancement
+--->
+
+<!--
+- Please target the `main` branch of ZipStream-PHP.
+-->
diff --git a/vendor/maennchen/zipstream-php/.github/SECURITY.md b/vendor/maennchen/zipstream-php/.github/SECURITY.md
new file mode 100644
index 0000000000..3046c3107c
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/.github/SECURITY.md
@@ -0,0 +1,22 @@
+# Security Policy
+
+[![OpenSSF Vulnerability Disclosure](https://img.shields.io/badge/OpenSSF-Vulnerability_Disclosure-green)](https://github.com/ossf/oss-vulnerability-guide/blob/main/finder-guide.md)
+[![GitHub Report](https://img.shields.io/badge/GitHub-Security_Advisories-blue)](https://github.com/maennchen/ZipStream-PHP/security/advisories/new)
+[![Email Report](https://img.shields.io/badge/Email-jonatan%40maennchen.ch-blue)](mailto:jonatan@maennchen.ch)
+
+This repository follows the
+[OpenSSF Vulnerability Disclosure guide](https://github.com/ossf/oss-vulnerability-guide/tree/main).
+You can learn more about it in the
+[Finders Guide](https://github.com/ossf/oss-vulnerability-guide/blob/main/finder-guide.md).
+
+Please report vulnerabilities via the
+[GitHub Security Vulnerability Reporting](https://github.com/maennchen/ZipStream-PHP/security/advisories/new)
+or via email to [`jonatan@maennchen.ch`](mailto:jonatan@maennchen.ch) if this does
+not work for you.
+
+Our vulnerability management team will respond within 3 working days of your
+report. If the issue is confirmed as a vulnerability, we will open a Security
+Advisory. This project follows a 90 day disclosure timeline.
+
+If you have questions about reporting security issues, email the vulnerability
+management team: [`jonatan@maennchen.ch`](mailto:jonatan@maennchen.ch)
diff --git a/vendor/maennchen/zipstream-php/.github/dependabot.yml b/vendor/maennchen/zipstream-php/.github/dependabot.yml
new file mode 100644
index 0000000000..6056437b94
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/.github/dependabot.yml
@@ -0,0 +1,13 @@
+version: 2
+updates:
+  - package-ecosystem: "composer"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    groups:
+      github-actions:
+        applies-to: version-updates
\ No newline at end of file
diff --git a/vendor/maennchen/zipstream-php/.github/scorecard.yml b/vendor/maennchen/zipstream-php/.github/scorecard.yml
new file mode 100644
index 0000000000..219fc0bfdd
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/.github/scorecard.yml
@@ -0,0 +1,14 @@
+annotations:
+  - checks:
+      - fuzzing
+    reasons:
+      - reason: not-applicable # PHP is memory safe
+  - checks:
+      - packaging
+    reasons:
+      - reason: not-supported # Using Composer
+  - checks:
+      - signed-releases
+    reasons:
+      - reason: not-applicable # Releases are distributed via Composer
+
diff --git a/vendor/maennchen/zipstream-php/.github/workflows/branch_main.yml b/vendor/maennchen/zipstream-php/.github/workflows/branch_main.yml
new file mode 100644
index 0000000000..15ff2782cc
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/.github/workflows/branch_main.yml
@@ -0,0 +1,24 @@
+on:
+  push:
+    branches:
+      - "main"
+
+name: "Main Branch"
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    name: "Test"
+
+    permissions:
+      contents: read
+      security-events: write
+
+    uses: ./.github/workflows/part_test.yml
+
+  docs:
+    name: "Docs"
+
+    uses: ./.github/workflows/part_docs.yml
diff --git a/vendor/maennchen/zipstream-php/.github/workflows/part_dependabot.yml b/vendor/maennchen/zipstream-php/.github/workflows/part_dependabot.yml
new file mode 100644
index 0000000000..77e466b814
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/.github/workflows/part_dependabot.yml
@@ -0,0 +1,30 @@
+on:
+  workflow_call: {}
+
+name: "Dependabot"
+
+permissions:
+  contents: read
+
+jobs:
+  automerge_dependabot:
+    name: "Automerge PRs"
+
+    runs-on: ubuntu-latest
+
+    permissions:
+      pull-requests: write
+      contents: write
+
+    steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        with:
+          egress-policy: audit
+
+      - uses: fastify/github-action-merge-dependabot@3892334d1c649bb8119af3d22a3f3766bd5e593f # v3.10.2
+        with:
+          github-token: ${{ github.token }}
+          use-github-auto-merge: true
+          # Major Updates need to be merged manually
+          target: minor
diff --git a/vendor/maennchen/zipstream-php/.github/workflows/part_docs.yml b/vendor/maennchen/zipstream-php/.github/workflows/part_docs.yml
new file mode 100644
index 0000000000..7af16f3be1
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/.github/workflows/part_docs.yml
@@ -0,0 +1,51 @@
+on:
+  workflow_call: {}
+
+name: "Documentation"
+
+permissions:
+  contents: read
+
+jobs:
+  generate:
+    name: "Generate"
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        with:
+          egress-policy: audit
+
+      - name: Checkout Code
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - name: SetUp PHP
+        id: setup-php
+        uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2
+        with:
+          php-version: "8.3"
+          tools: phive
+      - name: Cache Tools
+        uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
+        id: cache
+        with:
+          path: ~/.phive
+          key: tools-${{ runner.os }}-${{ steps.setup-php.outputs.php-version }}-${{ hashFiles('**/phars.xml') }}
+          restore-keys: |
+            tools-${{ runner.os }}-${{ steps.setup-php.outputs.php-version }}-
+            tools-${{ steps.setup-php.outputs.php-version }}-
+            tools-
+      - name: Install Tools
+        run: composer run install:tools
+      - name: Generate Docs
+        run: composer run docs:generate
+      - uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 # v4.4.1
+        with:
+          name: docs
+          path: docs
+      - name: Package for GitHub Pages
+        uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa # v3.0.1
+        with:
+          path: docs
+
diff --git a/vendor/maennchen/zipstream-php/.github/workflows/part_release.yml b/vendor/maennchen/zipstream-php/.github/workflows/part_release.yml
new file mode 100644
index 0000000000..c0f3867df8
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/.github/workflows/part_release.yml
@@ -0,0 +1,94 @@
+on:
+  workflow_call:
+    inputs:
+      releaseName:
+        required: true
+        type: string
+      stable:
+        required: false
+        type: boolean
+        default: false
+
+name: "Release"
+
+permissions:
+  contents: read
+
+jobs:
+  create:
+    name: Create Release
+
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write
+
+    steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        with:
+          egress-policy: audit
+
+      - name: Create prerelease
+        if: ${{ !inputs.stable }}
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        run: |
+          gh release create \
+            --repo ${{ github.repository }} \
+            --title ${{ inputs.releaseName }} \
+            --prerelease \
+            --generate-notes \
+            ${{ inputs.releaseName }}
+
+      - name: Create release
+        if: ${{ inputs.stable }}
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        run: |
+          gh release create \
+            --repo ${{ github.repository }} \
+            --title ${{ inputs.releaseName }} \
+            --generate-notes \
+            ${{ inputs.releaseName }}
+
+  upload_release:
+    name: "Upload"
+
+    needs: ["create"]
+
+    runs-on: ubuntu-latest
+
+    permissions:
+      id-token: write
+      contents: write
+      attestations: write
+
+    steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        with:
+          egress-policy: audit
+
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+        with:
+          name: docs
+          path: docs
+      - run: |
+          tar -czvf docs.tar.gz docs
+      - name: "Attest Documentation"
+        id: attestation
+        uses: actions/attest-build-provenance@1c608d11d69870c2092266b3f9a6f3abbf17002c # v1.4.3
+        with:
+          subject-path: "docs.tar.gz"
+      - name: Copy Attestation
+        run: cp "$ATTESTATION" docs.tar.gz.sigstore
+        env:
+          ATTESTATION: "${{ steps.attestation.outputs.bundle-path }}"
+      - name: Upload
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        run: |
+          gh release upload --clobber "${{ github.ref_name }}" \
+            docs.tar.gz docs.tar.gz.sigstore
diff --git a/vendor/maennchen/zipstream-php/.github/workflows/part_test.yml b/vendor/maennchen/zipstream-php/.github/workflows/part_test.yml
new file mode 100644
index 0000000000..ccf4d660e5
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/.github/workflows/part_test.yml
@@ -0,0 +1,183 @@
+on:
+  workflow_call:
+
+name: "Test"
+
+permissions:
+  contents: read
+
+jobs:
+  phpunit:
+    name: PHPUnit (PHP ${{ matrix.php }} on ${{ matrix.os }})
+
+    runs-on: ${{ matrix.os }}
+
+    continue-on-error: ${{ matrix.experimental }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        php: ["8.1", "8.2", "8.3"]
+        os: [ubuntu-latest]
+        experimental: [false]
+        include:
+          - php: nightly
+            os: ubuntu-latest
+            experimental: true
+          - php: "8.3"
+            os: windows-latest
+            experimental: false
+          - php: "8.3"
+            os: macos-latest
+            experimental: false
+
+    steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        with:
+          egress-policy: audit
+
+      - name: Checkout Code
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - name: SetUp PHP
+        id: setup-php
+        uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2
+        with:
+          php-version: "${{ matrix.php }}"
+          tools: phpunit
+          coverage: xdebug
+          extensions: xdebug,zip
+      - name: Get composer cache directory
+        id: composer-cache-common
+        if: "${{ runner.os != 'Windows' }}"
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+      - name: Get composer cache directory
+        id: composer-cache-windows
+        if: "${{ runner.os == 'Windows' }}"
+        run: echo "dir=$(composer config cache-files-dir)" >> $env:GITHUB_OUTPUT
+      - name: Cache Deps
+        uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
+        id: cache
+        with:
+          path: ${{ steps.composer-cache-common.outputs.dir }}${{ steps.composer-cache-windows.outputs.dir }}
+          key: deps-${{ runner.os }}-${{ steps.setup-php.outputs.php-version }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            deps-${{ runner.os }}-${{ steps.setup-php.outputs.php-version }}-composer-
+            deps-${{ runner.os }}-${{ steps.setup-php.outputs.php-version }}-
+            deps-${{ steps.setup-php.outputs.php-version }}-
+            deps-
+      - name: Install Deps
+        if: matrix.php != 'nightly'
+        run: composer install --prefer-dist
+      - name: Install Deps (ignore PHP requirement)
+        if: matrix.php == 'nightly'
+        run: composer install --prefer-dist --ignore-platform-req=php+
+      - name: Run PHPUnit
+        run: composer run test:unit
+        env:
+          XDEBUG_MODE: coverage
+      - name: Upload coverage results to Coveralls
+        env:
+          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          COVERALLS_PARALLEL: true
+          COVERALLS_FLAG_NAME: ${{ runner.os }}-${{ steps.setup-php.outputs.php-version }}
+        run: composer run coverage:report
+        continue-on-error: ${{ matrix.experimental }}
+
+  mark_coverage_done:
+    needs: ["phpunit"]
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        with:
+          egress-policy: audit
+
+      - name: Coveralls Finished
+        uses: coverallsapp/github-action@643bc377ffa44ace6394b2b5d0d3950076de9f63 # v2.3.0
+        with:
+          github-token: ${{ secrets.github_token }}
+          parallel-finished: true
+
+  psalm:
+    name: Run Psalm
+
+    runs-on: "ubuntu-latest"
+
+    permissions:
+      security-events: write
+
+    steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        with:
+          egress-policy: audit
+
+      - name: Checkout Code
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - name: SetUp PHP
+        id: setup-php
+        uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2
+        with:
+          php-version: "8.3"
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+      - name: Cache Deps
+        uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
+        id: cache
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: deps-${{ runner.os }}-${{ steps.setup-php.outputs.php-version }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            deps-${{ runner.os }}-${{ steps.setup-php.outputs.php-version }}-composer-
+            deps-${{ runner.os }}-${{ steps.setup-php.outputs.php-version }}-
+            deps-${{ steps.setup-php.outputs.php-version }}-
+            deps-
+      - name: Install Deps
+        run: composer install --prefer-dist
+      - name: Run Psalm
+        run: composer run test:lint -- --report=results.sarif
+      - name: "Upload SARIF"
+        uses: github/codeql-action/upload-sarif@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3
+        with:
+          sarif_file: results.sarif
+
+  php-cs:
+    name: Run PHP-CS
+
+    runs-on: "ubuntu-latest"
+
+    steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        with:
+          egress-policy: audit
+
+      - name: Checkout Code
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - name: SetUp PHP
+        id: setup-php
+        uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2
+        with:
+          php-version: "8.3"
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+      - name: Cache Deps
+        uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
+        id: cache
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: deps-${{ runner.os }}-${{ steps.setup-php.outputs.php-version }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            deps-${{ runner.os }}-${{ steps.setup-php.outputs.php-version }}-composer-
+            deps-${{ runner.os }}-${{ steps.setup-php.outputs.php-version }}-
+            deps-${{ steps.setup-php.outputs.php-version }}-
+            deps-
+      - name: Install Deps
+        run: composer install --prefer-dist
+      - name: Run PHP-CS
+        run: composer run test:formatted
diff --git a/vendor/maennchen/zipstream-php/.github/workflows/pr.yml b/vendor/maennchen/zipstream-php/.github/workflows/pr.yml
new file mode 100644
index 0000000000..05259d4f75
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/.github/workflows/pr.yml
@@ -0,0 +1,50 @@
+on:
+  pull_request:
+    branches:
+      - "*"
+  workflow_dispatch: {}
+
+name: "Pull Request"
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    name: "Test"
+
+    permissions:
+      contents: read
+      security-events: write
+
+    uses: ./.github/workflows/part_test.yml
+
+  docs:
+    name: "Docs"
+
+    uses: ./.github/workflows/part_docs.yml
+
+  dependabot:
+    name: "Dependabot"
+
+    if: ${{ github.actor == 'dependabot[bot]'}}
+
+    permissions:
+      pull-requests: write
+      contents: write
+
+    uses: ./.github/workflows/part_dependabot.yml
+
+  dependency-review:
+    name: Dependency Review
+    runs-on: ubuntu-latest
+    steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        with:
+          egress-policy: audit
+
+      - name: 'Checkout Repository'
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - name: 'Dependency Review'
+        uses: actions/dependency-review-action@5a2ce3f5b92ee19cbb1541a4984c76d921601d7c # v4.3.4
diff --git a/vendor/maennchen/zipstream-php/.github/workflows/scorecard.yml b/vendor/maennchen/zipstream-php/.github/workflows/scorecard.yml
new file mode 100644
index 0000000000..7bb8dbb6c4
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/.github/workflows/scorecard.yml
@@ -0,0 +1,78 @@
+# This workflow uses actions that are not certified by GitHub. They are provided
+# by a third-party and are governed by separate terms of service, privacy
+# policy, and support documentation.
+
+name: Scorecard supply-chain security
+on:
+  # For Branch-Protection check. Only the default branch is supported. See
+  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
+  branch_protection_rule:
+  # To guarantee Maintained check is occasionally updated. See
+  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
+  schedule:
+    - cron: '28 11 * * 3'
+  push:
+    branches: [ "main" ]
+
+# Declare default permissions as read only.
+permissions: read-all
+
+jobs:
+  analysis:
+    name: Scorecard analysis
+    runs-on: ubuntu-latest
+    permissions:
+      # Needed to upload the results to code-scanning dashboard.
+      security-events: write
+      # Needed to publish results and get a badge (see publish_results below).
+      id-token: write
+      # Uncomment the permissions below if installing in a private repository.
+      # contents: read
+      # actions: read
+
+    steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        with:
+          egress-policy: audit
+
+      - name: "Checkout code"
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        with:
+          persist-credentials: false
+
+      - name: "Run analysis"
+        uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
+        with:
+          results_file: results.sarif
+          results_format: sarif
+          # (Optional) "write" PAT token. Uncomment the `repo_token` line below if:
+          # - you want to enable the Branch-Protection check on a *public* repository, or
+          # - you are installing Scorecard on a *private* repository
+          # To create the PAT, follow the steps in https://github.com/ossf/scorecard-action?tab=readme-ov-file#authentication-with-fine-grained-pat-optional.
+          # repo_token: ${{ secrets.SCORECARD_TOKEN }}
+
+          # Public repositories:
+          #   - Publish results to OpenSSF REST API for easy access by consumers
+          #   - Allows the repository to include the Scorecard badge.
+          #   - See https://github.com/ossf/scorecard-action#publishing-results.
+          # For private repositories:
+          #   - `publish_results` will always be set to `false`, regardless
+          #     of the value entered here.
+          publish_results: true
+
+      # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
+      # format to the repository Actions tab.
+      - name: "Upload artifact"
+        uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 # v4.4.1
+        with:
+          name: SARIF file
+          path: results.sarif
+          retention-days: 5
+
+      # Upload the results to GitHub's code scanning dashboard (optional).
+      # Commenting out will disable upload of results to your repo's Code Scanning dashboard
+      - name: "Upload to code-scanning"
+        uses: github/codeql-action/upload-sarif@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
+        with:
+          sarif_file: results.sarif
diff --git a/vendor/maennchen/zipstream-php/.github/workflows/tag-beta.yml b/vendor/maennchen/zipstream-php/.github/workflows/tag-beta.yml
new file mode 100644
index 0000000000..b3399454a6
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/.github/workflows/tag-beta.yml
@@ -0,0 +1,29 @@
+on:
+  push:
+    tags:
+      - "[0-9]+.[0-9]+.[0-9]+-beta.[0-9]+"
+
+name: "Beta Tag"
+
+permissions:
+  contents: read
+
+jobs:
+  docs:
+    name: "Docs"
+
+    uses: ./.github/workflows/part_docs.yml
+
+  release:
+    name: "Release"
+
+    needs: ["docs"]
+
+    permissions:
+      id-token: write
+      contents: write
+      attestations: write
+
+    uses: ./.github/workflows/part_release.yml
+    with:
+      releaseName: "${{ github.ref_name }}"
diff --git a/vendor/maennchen/zipstream-php/.github/workflows/tag-stable.yml b/vendor/maennchen/zipstream-php/.github/workflows/tag-stable.yml
new file mode 100644
index 0000000000..0e91cf0d0f
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/.github/workflows/tag-stable.yml
@@ -0,0 +1,55 @@
+on:
+  push:
+    tags:
+      - "[0-9]+.[0-9]+.[0-9]+"
+
+name: "Stable Tag"
+
+permissions:
+  contents: read
+
+jobs:
+  docs:
+    name: "Docs"
+
+    uses: ./.github/workflows/part_docs.yml
+
+  release:
+    name: "Release"
+
+    needs: ["docs"]
+
+    permissions:
+      id-token: write
+      contents: write
+      attestations: write
+
+    uses: ./.github/workflows/part_release.yml
+    with:
+      releaseName: "${{ github.ref_name }}"
+      stable: true
+
+  deploy_pages:
+    name: "Deploy to GitHub Pages"
+
+    needs: ["release", "docs"]
+
+    runs-on: ubuntu-latest
+
+    permissions:
+      pages: write
+      id-token: write
+
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+
+    steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        with:
+          egress-policy: audit
+
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@d6db90164ac5ed86f2b6aed7e0febac5b3c0c03e # v4.0.5
diff --git a/vendor/maennchen/zipstream-php/.gitignore b/vendor/maennchen/zipstream-php/.gitignore
index 5210738a9c..e52a498776 100644
--- a/vendor/maennchen/zipstream-php/.gitignore
+++ b/vendor/maennchen/zipstream-php/.gitignore
@@ -1,6 +1,12 @@
-clover.xml
-composer.lock
-coverage.clover
+/composer.lock
+/cov
+/coverage.clover.xml
+/docs
 .idea
-phpunit.xml
-vendor
+/.php-cs-fixer.cache
+/.phpdoc/cache
+/.phpunit.result.cache
+/phpunit.xml
+/.phpunit.cache
+/tools
+/vendor
diff --git a/vendor/maennchen/zipstream-php/.phive/phars.xml b/vendor/maennchen/zipstream-php/.phive/phars.xml
new file mode 100644
index 0000000000..183927b125
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/.phive/phars.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phive xmlns="https://phar.io/phive">
+  <phar name="phpdocumentor" version="^3.3.1" installed="3.4.3" location="./tools/phpdocumentor" copy="false"/>
+</phive>
diff --git a/vendor/maennchen/zipstream-php/.php-cs-fixer.dist.php b/vendor/maennchen/zipstream-php/.php-cs-fixer.dist.php
new file mode 100644
index 0000000000..38d6a76584
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/.php-cs-fixer.dist.php
@@ -0,0 +1,70 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * PHP-CS-Fixer config for ZipStream-PHP
+ * @author Nicolas CARPi <nico-git@deltablot.email>
+ * @copyright 2022 Nicolas CARPi
+ * @see https://github.com/maennchen/ZipStream-PHP
+ * @license MIT
+ * @package maennchen/ZipStream-PHP
+ */
+
+use PhpCsFixer\Config;
+use PhpCsFixer\Finder;
+
+$finder = Finder::create()
+    ->exclude('.github')
+    ->exclude('.phpdoc')
+    ->exclude('docs')
+    ->exclude('tools')
+    ->exclude('vendor')
+    ->in(__DIR__);
+
+$config = new Config();
+return $config->setRules([
+        '@PER' => true,
+        '@PER:risky' => true,
+        '@PHP82Migration' => true,
+        '@PHPUnit84Migration:risky' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'class_attributes_separation' => true,
+        'declare_strict_types' => true,
+        'dir_constant' => true,
+        'is_null' => true,
+        'no_homoglyph_names' => true,
+        'no_null_property_initialization' => true,
+        'no_php4_constructor' => true,
+        'no_unused_imports' => true,
+        'no_useless_else' => true,
+        'non_printable_character' => true,
+        'ordered_imports' => true,
+        'ordered_class_elements' => true,
+        'php_unit_construct' => true,
+        'pow_to_exponentiation' => true,
+        'psr_autoloading' => true,
+        'random_api_migration' => true,
+        'return_assignment' => true,
+        'self_accessor' => true,
+        'semicolon_after_instruction' => true,
+        'short_scalar_cast' => true,
+        'simplified_null_return' => true,
+        'single_class_element_per_statement' => true,
+        'single_line_comment_style' => true,
+        'single_quote' => true,
+        'space_after_semicolon' => true,
+        'standardize_not_equals' => true,
+        'strict_param' => true,
+        'ternary_operator_spaces' => true,
+        'trailing_comma_in_multiline' => true,
+        'trim_array_spaces' => true,
+        'unary_operator_spaces' => true,
+        'global_namespace_import' => [
+            'import_classes' => true,
+            'import_functions' => true,
+            'import_constants' => true,
+        ],
+    ])
+    ->setFinder($finder)
+    ->setRiskyAllowed(true);
diff --git a/vendor/maennchen/zipstream-php/.phpdoc/template/base.html.twig b/vendor/maennchen/zipstream-php/.phpdoc/template/base.html.twig
new file mode 100644
index 0000000000..b7507fb9cb
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/.phpdoc/template/base.html.twig
@@ -0,0 +1,15 @@
+{% extends 'layout.html.twig' %}
+
+{% set topMenu = {
+    "menu": [
+        { "name": "Guides", "url": "https://maennchen.dev/ZipStream-PHP/guide/index.html"},
+        { "name": "API", "url": "https://maennchen.dev/ZipStream-PHP/classes/ZipStream-ZipStream.html"},
+        { "name": "Issues", "url": "https://github.com/maennchen/ZipStream-PHP/issues"},
+    ],
+    "social": [
+        { "iconClass": "fab fa-github", "url": "https://github.com/maennchen/ZipStream-PHP"},
+        { "iconClass": "fas fa-envelope-open-text", "url": "https://github.com/maennchen/ZipStream-PHP/discussions"},
+        { "iconClass": "fas fa-money-bill", "url": "https://opencollective.com/zipstream"},
+    ]
+}
+%}
\ No newline at end of file
diff --git a/vendor/maennchen/zipstream-php/.tool-versions b/vendor/maennchen/zipstream-php/.tool-versions
new file mode 100644
index 0000000000..4a3dc9dfde
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/.tool-versions
@@ -0,0 +1 @@
+php 8.3.1
diff --git a/vendor/maennchen/zipstream-php/.travis.yml b/vendor/maennchen/zipstream-php/.travis.yml
deleted file mode 100644
index 12c8a640e1..0000000000
--- a/vendor/maennchen/zipstream-php/.travis.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-language: php
-dist: trusty
-sudo: false
-php:
-  - 7.1
-  - 7.2
-  - 7.3
-install: composer install
-script: ./vendor/bin/phpunit --coverage-clover=coverage.clover
-after_script:
-  - wget https://scrutinizer-ci.com/ocular.phar
-  - php ocular.phar code-coverage:upload --format=php-clover coverage.clover
diff --git a/vendor/maennchen/zipstream-php/CHANGELOG.md b/vendor/maennchen/zipstream-php/CHANGELOG.md
deleted file mode 100644
index b1979abcc8..0000000000
--- a/vendor/maennchen/zipstream-php/CHANGELOG.md
+++ /dev/null
@@ -1,51 +0,0 @@
-# CHANGELOG for ZipStream-PHP
-
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
-and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
-
-## [2.1.0] - 2020-06-01
-### Changed
-- Don't execute ob_flush() when output buffering is not enabled (#152)
-- Fix inconsistent return type on 32-bit systems (#149) Fix #144
-- Use mbstring polyfill (#151)
-- Promote 7zip usage over unzip to avoid UTF-8 issues (#147)
-
-## [2.0.0] - 2020-02-22
-### Breaking change
-- Only the self opened streams will be closed (#139)
-If you were relying on ZipStream to close streams that the library didn't open,
-you'll need to close them yourself now.
-
-### Changed
-- Minor change to data descriptor (#136)
-
-## [1.2.0] - 2019-07-11
-
-### Added
-- Option to flush output buffer after every write (#122)
-
-## [1.1.0] - 2019-04-30
-
-### Fixed
-- Honor last-modified timestamps set via `ZipStream\Option\File::setTime()` (#106)
-- Documentation regarding output of HTTP headers
-- Test warnings with PHPUnit (#109)
-
-### Added
-- Test for FileNotReadableException (#114)
-- Size attribute to File options (#113)
-- Tests on PHP 7.3 (#108)
-
-## [1.0.0] - 2019-04-17
-
-### Breaking changes
-- Mininum PHP version is now 7.1
-- Options are now passed to the ZipStream object via the Option\Archive object. See the wiki for available options and code examples
-
-### Added
-- Add large file support with Zip64 headers
-
-### Changed
-- Major refactoring and code cleanup
diff --git a/vendor/maennchen/zipstream-php/CONTRIBUTING.md b/vendor/maennchen/zipstream-php/CONTRIBUTING.md
deleted file mode 100644
index f8ef5a5731..0000000000
--- a/vendor/maennchen/zipstream-php/CONTRIBUTING.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# ZipStream Readme for Contributors
-## Code styling
-### Indention
-For spaces are used to indent code. The convention is [K&R](http://en.wikipedia.org/wiki/Indent_style#K&R)
-
-### Comments
-Double Slashes are used for an one line comment.
-
-Classes, Variables, Methods etc:
-
-```php
-/**
- * My comment
- *
- * @myanotation like @param etc.
- */
-```
-
-## Pull requests
-Feel free to submit pull requests.
-
-## Testing
-For every new feature please write a new PHPUnit test.
-
-Before every commit execute `./vendor/bin/phpunit` to check if your changes wrecked something:
diff --git a/vendor/maennchen/zipstream-php/README.md b/vendor/maennchen/zipstream-php/README.md
index c2e832b6fb..858add09f2 100644
--- a/vendor/maennchen/zipstream-php/README.md
+++ b/vendor/maennchen/zipstream-php/README.md
@@ -1,123 +1,154 @@
 # ZipStream-PHP
 
-[![Build Status](https://travis-ci.org/maennchen/ZipStream-PHP.svg?branch=master)](https://travis-ci.org/maennchen/ZipStream-PHP)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/maennchen/ZipStream-PHP/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/maennchen/ZipStream-PHP/)
-[![Code Coverage](https://scrutinizer-ci.com/g/maennchen/ZipStream-PHP/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/maennchen/ZipStream-PHP/)
+[![Main Branch](https://github.com/maennchen/ZipStream-PHP/actions/workflows/branch_main.yml/badge.svg)](https://github.com/maennchen/ZipStream-PHP/actions/workflows/branch_main.yml)
+[![Coverage Status](https://coveralls.io/repos/github/maennchen/ZipStream-PHP/badge.svg?branch=main)](https://coveralls.io/github/maennchen/ZipStream-PHP?branch=main)
 [![Latest Stable Version](https://poser.pugx.org/maennchen/zipstream-php/v/stable)](https://packagist.org/packages/maennchen/zipstream-php)
 [![Total Downloads](https://poser.pugx.org/maennchen/zipstream-php/downloads)](https://packagist.org/packages/maennchen/zipstream-php)
 [![Financial Contributors on Open Collective](https://opencollective.com/zipstream/all/badge.svg?label=financial+contributors)](https://opencollective.com/zipstream) [![License](https://img.shields.io/github/license/maennchen/zipstream-php.svg)](LICENSE)
+[![OpenSSF Best Practices](https://www.bestpractices.dev/projects/9524/badge)](https://www.bestpractices.dev/projects/9524)
+[![OpenSSF Scorecard](https://api.scorecard.dev/projects/github.com/maennchen/ZipStream-PHP/badge)](https://scorecard.dev/viewer/?uri=github.com/maennchen/ZipStream-PHP)
+
+## Unstable Branch
+
+The `main` branch is not stable. Please see the
+[releases](https://github.com/maennchen/ZipStream-PHP/releases) for a stable
+version.
 
 ## Overview
 
-A fast and simple streaming zip file downloader for PHP. Using this library will save you from having to write the Zip to disk. You can directly send it to the user, which is much faster. It can work with S3 buckets or any PSR7 Stream.
+A fast and simple streaming zip file downloader for PHP. Using this library will
+save you from having to write the Zip to disk. You can directly send it to the
+user, which is much faster. It can work with S3 buckets or any PSR7 Stream.
 
 Please see the [LICENSE](LICENSE) file for licensing and warranty information.
 
 ## Installation
 
-Simply add a dependency on maennchen/zipstream-php to your project's composer.json file if you use Composer to manage the dependencies of your project. Use following command to add the package to your project's dependencies:
+Simply add a dependency on maennchen/zipstream-php to your project's
+`composer.json` file if you use Composer to manage the dependencies of your
+project. Use following command to add the package to your project's dependencies:
 
 ```bash
 composer require maennchen/zipstream-php
 ```
 
-## Usage and options
+## Usage
 
-Here's a simple example:
+For detailed instructions, please check the
+[Documentation](https://maennchen.github.io/ZipStream-PHP/).
 
 ```php
 // Autoload the dependencies
 require 'vendor/autoload.php';
 
-// enable output of HTTP headers
-$options = new ZipStream\Option\Archive();
-$options->setSendHttpHeaders(true);
-
 // create a new zipstream object
-$zip = new ZipStream\ZipStream('example.zip', $options);
+$zip = new ZipStream\ZipStream(
+    outputName: 'example.zip',
+
+    // enable output of HTTP headers
+    sendHttpHeaders: true,
+);
 
 // create a file named 'hello.txt'
-$zip->addFile('hello.txt', 'This is the contents of hello.txt');
+$zip->addFile(
+    fileName: 'hello.txt',
+    data: 'This is the contents of hello.txt',
+);
 
 // add a file named 'some_image.jpg' from a local file 'path/to/image.jpg'
-$zip->addFileFromPath('some_image.jpg', 'path/to/image.jpg');
-
-// add a file named 'goodbye.txt' from an open stream resource
-$fp = tmpfile();
-fwrite($fp, 'The quick brown fox jumped over the lazy dog.');
-rewind($fp);
-$zip->addFileFromStream('goodbye.txt', $fp);
-fclose($fp);
+$zip->addFileFromPath(
+    fileName: 'some_image.jpg',
+    path: 'path/to/image.jpg',
+);
 
 // finish the zip stream
 $zip->finish();
 ```
 
-You can also add comments, modify file timestamps, and customize (or
-disable) the HTTP headers. It is also possible to specify the storage method when adding files,
-the current default storage method is 'deflate' i.e files are stored with Compression mode 0x08.
-
-See the [Wiki](https://github.com/maennchen/ZipStream-PHP/wiki) for details.
-
-## Known issue
-
-The native Mac OS archive extraction tool might not open archives in some conditions. A workaround is to disable the Zip64 feature with the option `$opt->setEnableZip64(false)`. This limits the archive to 4 Gb and 64k files but will allow Mac OS users to open them without issue. See #116.
-
-The linux `unzip` utility might not handle properly unicode characters. It is recommended to extract with another tool like [7-zip](https://www.7-zip.org/). See #146.
+## Upgrade to version 3.0.0
+
+### General
+
+- Minimum PHP Version: `8.1`
+- Only 64bit Architecture is supported.
+- The class `ZipStream\Option\Method` has been replaced with the enum
+  `ZipStream\CompressionMethod`.
+- Most clases have been flagged as `@internal` and should not be used from the
+  outside.
+  If you're using internal resources to extend this library, please open an
+  issue so that a clean interface can be added & published.
+  The externally available classes & enums are:
+  - `ZipStream\CompressionMethod`
+  - `ZipStream\Exception*`
+  - `ZipStream\ZipStream`
+
+### Archive Options
+
+- The class `ZipStream\Option\Archive` has been replaced in favor of named
+  arguments in the `ZipStream\ZipStream` constuctor.
+- The archive options `largeFileSize` & `largeFileMethod` has been removed. If
+  you want different `compressionMethods` based on the file size, you'll have to
+  implement this yourself.
+- The archive option `httpHeaderCallback` changed the type from `callable` to
+  `Closure`.
+- The archive option `zeroHeader` has been replaced with the option
+  `defaultEnableZeroHeader` and can be overridden for every file. Its default
+  value changed from `false` to `true`.
+- The archive option `statFiles` was removed since the library no longer checks
+  filesizes this way.
+- The archive option `deflateLevel` has been replaced with the option
+  `defaultDeflateLevel` and can be overridden for every file.
+- The first argument (`name`) of the `ZipStream\ZipStream` constuctor has been
+  replaced with the named argument `outputName`.
+- Headers are now also sent if the `outputName` is empty. If you do not want to
+  automatically send http headers, set `sendHttpHeaders` to `false`.
+
+### File Options
+
+- The class `ZipStream\Option\File` has been replaced in favor of named
+  arguments in the `ZipStream\ZipStream->addFile*` functions.
+- The file option `method` has been renamed to `compressionMethod`.
+- The file option `time` has been renamed to `lastModificationDateTime`.
+- The file option `size` has been renamed to `maxSize`.
 
 ## Upgrade to version 2.0.0
 
-* Only the self opened streams will be closed (#139)
-If you were relying on ZipStream to close streams that the library didn't open,
-you'll need to close them yourself now.
+https://github.com/maennchen/ZipStream-PHP/tree/2.0.0#upgrade-to-version-200
 
 ## Upgrade to version 1.0.0
 
-* All options parameters to all function have been moved from an `array` to structured option objects. See [the wiki](https://github.com/maennchen/ZipStream-PHP/wiki/Available-options) for examples.
-* The whole library has been refactored. The minimal PHP requirement has been raised to PHP 7.1.
-
-## Usage with Symfony and S3
-
-You can find example code on [the wiki](https://github.com/maennchen/ZipStream-PHP/wiki/Symfony-example).
+https://github.com/maennchen/ZipStream-PHP/tree/2.0.0#upgrade-to-version-100
 
 ## Contributing
 
-ZipStream-PHP is a collaborative project. Please take a look at the [CONTRIBUTING.md](CONTRIBUTING.md) file.
-
-## About the Authors
-
-* Paul Duncan <pabs@pablotron.org> - https://pablotron.org/
-* Jonatan Männchen <jonatan@maennchen.ch> - https://maennchen.dev
-* Jesse G. Donat <donatj@gmail.com> - https://donatstudios.com
-* Nicolas CARPi <nico-git@deltablot.email> - https://www.deltablot.com
-* Nik Barham <nik@brokencube.co.uk> - https://www.brokencube.co.uk
+ZipStream-PHP is a collaborative project. Please take a look at the
+[.github/CONTRIBUTING.md](.github/CONTRIBUTING.md) file.
 
-## Contributors
+## Version Support
 
-### Code Contributors
+Versions are supported according to the table below.
 
-This project exists thanks to all the people who contribute. [[Contribute](CONTRIBUTING.md)].
-<a href="https://github.com/maennchen/ZipStream-PHP/graphs/contributors"><img src="https://opencollective.com/zipstream/contributors.svg?width=890&button=false" /></a>
+Please do not open any pull requests contradicting the current version support
+status.
 
-### Financial Contributors
+Careful: Always check the `README` on `main` for up-to-date information.
 
-Become a financial contributor and help us sustain our community. [[Contribute](https://opencollective.com/zipstream/contribute)]
+| Version | New Features | Bugfixes | Security |
+|---------|--------------|----------|----------|
+| *3*     | ✓            | ✓        | ✓        |
+| *2*     | ✗            | ✗        | ✓        |
+| *1*     | ✗            | ✗        | ✗        |
+| *0*     | ✗            | ✗        | ✗        |
 
-#### Individuals
+This library aligns itself with the PHP core support. New features and bugfixes
+will only target PHP versions according to their current status.
 
-<a href="https://opencollective.com/zipstream"><img src="https://opencollective.com/zipstream/individuals.svg?width=890"></a>
+See: https://www.php.net/supported-versions.php
 
-#### Organizations
-
-Support this project with your organization. Your logo will show up here with a link to your website. [[Contribute](https://opencollective.com/zipstream/contribute)]
+## About the Authors
 
-<a href="https://opencollective.com/zipstream/organization/0/website"><img src="https://opencollective.com/zipstream/organization/0/avatar.svg"></a>
-<a href="https://opencollective.com/zipstream/organization/1/website"><img src="https://opencollective.com/zipstream/organization/1/avatar.svg"></a>
-<a href="https://opencollective.com/zipstream/organization/2/website"><img src="https://opencollective.com/zipstream/organization/2/avatar.svg"></a>
-<a href="https://opencollective.com/zipstream/organization/3/website"><img src="https://opencollective.com/zipstream/organization/3/avatar.svg"></a>
-<a href="https://opencollective.com/zipstream/organization/4/website"><img src="https://opencollective.com/zipstream/organization/4/avatar.svg"></a>
-<a href="https://opencollective.com/zipstream/organization/5/website"><img src="https://opencollective.com/zipstream/organization/5/avatar.svg"></a>
-<a href="https://opencollective.com/zipstream/organization/6/website"><img src="https://opencollective.com/zipstream/organization/6/avatar.svg"></a>
-<a href="https://opencollective.com/zipstream/organization/7/website"><img src="https://opencollective.com/zipstream/organization/7/avatar.svg"></a>
-<a href="https://opencollective.com/zipstream/organization/8/website"><img src="https://opencollective.com/zipstream/organization/8/avatar.svg"></a>
-<a href="https://opencollective.com/zipstream/organization/9/website"><img src="https://opencollective.com/zipstream/organization/9/avatar.svg"></a>
+- Paul Duncan <pabs@pablotron.org> - https://pablotron.org/
+- Jonatan Männchen <jonatan@maennchen.ch> - https://maennchen.dev
+- Jesse G. Donat <donatj@gmail.com> - https://donatstudios.com
+- Nicolas CARPi <nico-git@deltablot.email> - https://www.deltablot.com
+- Nik Barham <nik@brokencube.co.uk> - https://www.brokencube.co.uk
diff --git a/vendor/maennchen/zipstream-php/composer.json b/vendor/maennchen/zipstream-php/composer.json
index 103c78c705..de5e624131 100644
--- a/vendor/maennchen/zipstream-php/composer.json
+++ b/vendor/maennchen/zipstream-php/composer.json
@@ -22,20 +22,67 @@
     }
   ],
   "require": {
-    "php": ">= 7.1",
-    "symfony/polyfill-mbstring": "^1.0",
-    "psr/http-message": "^1.0",
-    "myclabs/php-enum": "^1.5"
+    "php-64bit": "^8.1",
+    "ext-mbstring": "*",
+    "ext-zlib": "*"
   },
   "require-dev": {
-    "phpunit/phpunit": ">= 7.5",
-    "guzzlehttp/guzzle": ">= 6.3",
+    "phpunit/phpunit": "^10.0",
+    "guzzlehttp/guzzle": "^7.5",
     "ext-zip": "*",
-    "mikey179/vfsstream": "^1.6"
+    "mikey179/vfsstream": "^1.6",
+    "php-coveralls/php-coveralls": "^2.5",
+    "friendsofphp/php-cs-fixer": "^3.16",
+    "vimeo/psalm": "^5.0"
+  },
+  "suggest": {
+    "psr/http-message": "^2.0",
+    "guzzlehttp/psr7": "^2.4"
+  },
+  "scripts": {
+    "format": "php-cs-fixer fix",
+    "test": [
+      "@test:unit",
+      "@test:formatted",
+      "@test:lint"
+    ],
+    "test:unit": "phpunit --coverage-clover=coverage.clover.xml --coverage-html cov",
+    "test:unit:slow": "@test:unit --group slow",
+    "test:unit:fast": "@test:unit --exclude-group slow",
+    "test:formatted": "@format --dry-run --stop-on-violation --using-cache=no",
+    "test:lint": "psalm --stats --show-info=true --find-unused-psalm-suppress",
+    "coverage:report": "php-coveralls --coverage_clover=coverage.clover.xml --json_path=coveralls-upload.json --insecure",
+    "install:tools": "phive install --trust-gpg-keys 0x67F861C3D889C656 --trust-gpg-keys 0x8AC0BAA79732DD42",
+    "docs:generate": "tools/phpdocumentor --sourcecode"
   },
   "autoload": {
     "psr-4": {
       "ZipStream\\": "src/"
     }
+  },
+  "autoload-dev": {
+    "psr-4": { "ZipStream\\Test\\": "test/" }
+  },
+  "archive": {
+    "exclude": [
+      "/composer.lock",
+      "/docs",
+      "/.gitattributes",
+      "/.github",
+      "/.gitignore",
+      "/guides",
+      "/.phive",
+      "/.php-cs-fixer.cache",
+      "/.php-cs-fixer.dist.php",
+      "/.phpdoc",
+      "/phpdoc.dist.xml",
+      "/.phpunit.result.cache",
+      "/phpunit.xml.dist",
+      "/psalm.xml",
+      "/test",
+      "/tools",
+      "/.tool-versions",
+      "/vendor"
+    ]
   }
 }
diff --git a/vendor/maennchen/zipstream-php/guides/ContentLength.rst b/vendor/maennchen/zipstream-php/guides/ContentLength.rst
new file mode 100644
index 0000000000..21fea34d7d
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/guides/ContentLength.rst
@@ -0,0 +1,47 @@
+Adding Content-Length header
+=============
+
+Adding a ``Content-Length`` header for ``ZipStream`` can be achieved by
+using the options ``SIMULATION_STRICT`` or ``SIMULATION_LAX`` in the
+``operationMode`` parameter.
+
+In the ``SIMULATION_STRICT`` mode, ``ZipStream`` will not allow to calculate the
+size based on reading the whole file. ``SIMULATION_LAX`` will read the whole
+file if neccessary.
+
+``SIMULATION_STRICT`` is therefore useful to make sure that the size can be
+calculated efficiently.
+
+.. code-block:: php
+    use ZipStream\OperationMode;
+    use ZipStream\ZipStream;
+
+    $zip = new ZipStream(
+        operationMode: OperationMode::SIMULATE_STRICT, // or SIMULATE_LAX
+        defaultEnableZeroHeader: false,
+        sendHttpHeaders: true,
+        outputStream: $stream,
+    );
+
+    // Normally add files
+    $zip->addFile('sample.txt', 'Sample String Data');
+
+    // Use addFileFromCallback and exactSize if you want to defer opening of
+    // the file resource
+    $zip->addFileFromCallback(
+        'sample.txt',
+        exactSize: 18,
+        callback: function () {
+            return fopen('...');
+        }
+    );
+
+    // Read resulting file size
+    $size = $zip->finish();
+    
+    // Tell it to the browser
+    header('Content-Length: '. $size);
+    
+    // Execute the Simulation and stream the actual zip to the client
+    $zip->executeSimulation();
+
diff --git a/vendor/maennchen/zipstream-php/guides/FlySystem.rst b/vendor/maennchen/zipstream-php/guides/FlySystem.rst
new file mode 100644
index 0000000000..4e6c6fb82d
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/guides/FlySystem.rst
@@ -0,0 +1,34 @@
+Usage with FlySystem
+===============
+
+For saving or uploading the generated zip, you can use the
+`Flysystem <https://flysystem.thephpleague.com>`_ package, and its many
+adapters.
+
+For that you will need to provide another stream than the ``php://output``
+default one, and pass it to Flysystem ``putStream`` method.
+
+.. code-block:: php
+
+    // Open Stream only once for read and write since it's a memory stream and
+    // the content is lost when closing the stream / opening another one
+    $tempStream = fopen('php://memory', 'w+');
+
+    // Create Zip Archive
+    $zipStream = new ZipStream(
+        outputStream: $tempStream,
+        outputName: 'test.zip',
+    );
+    $zipStream->addFile('test.txt', 'text');
+    $zipStream->finish();
+
+    // Store File
+    // (see Flysystem documentation, and all its framework integration)
+    // Can be any adapter (AWS, Google, Ftp, etc.)
+    $adapter = new Local(__DIR__.'/path/to/folder');
+    $filesystem = new Filesystem($adapter);
+
+    $filesystem->writeStream('test.zip', $tempStream)
+
+    // Close Stream
+    fclose($tempStream);
diff --git a/vendor/maennchen/zipstream-php/guides/Nginx.rst b/vendor/maennchen/zipstream-php/guides/Nginx.rst
new file mode 100644
index 0000000000..c53d3000e4
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/guides/Nginx.rst
@@ -0,0 +1,16 @@
+Usage with nginx
+=============
+
+If you are using nginx as a webserver, it will try to buffer the response.
+So you'll want to disable this with a custom header:
+
+.. code-block:: php
+    header('X-Accel-Buffering: no');
+    # or with the Response class from Symfony
+    $response->headers->set('X-Accel-Buffering', 'no');
+
+Alternatively, you can tweak the
+`fastcgi cache parameters <https://nginx.org/en/docs/http/ngx_http_fastcgi_module.html#fastcgi_buffers>`_
+within nginx config.
+
+See `original issue <https://github.com/maennchen/ZipStream-PHP/issues/77>`_.
\ No newline at end of file
diff --git a/vendor/maennchen/zipstream-php/guides/Options.rst b/vendor/maennchen/zipstream-php/guides/Options.rst
new file mode 100644
index 0000000000..5e92e94d66
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/guides/Options.rst
@@ -0,0 +1,66 @@
+Available options
+===============
+
+Here is the full list of options available to you. You can also have a look at
+``src/ZipStream.php`` file.
+
+.. code-block:: php
+
+    use ZipStream\ZipStream;
+
+    require_once 'vendor/autoload.php';
+
+    $zip = new ZipStream(
+        // Define output stream
+        // (argument is eiter a resource or implementing
+        // `Psr\Http\Message\StreamInterface`)
+        //
+        // Setup with `psr/http-message` & `guzzlehttp/psr7` dependencies
+        // required when using `Psr\Http\Message\StreamInterface`.
+        outputStream: $filePointer,
+
+        // Set the deflate level (default is 6; use -1 to disable it)
+        defaultDeflateLevel: 6,
+
+        // Add a comment to the zip file
+        comment: 'This is a comment.',
+
+        // Send http headers (default is true)
+        sendHttpHeaders: false,
+
+        // HTTP Content-Disposition.
+        // Defaults to 'attachment', where FILENAME is the specified filename.
+        // Note that this does nothing if you are not sending HTTP headers.
+        contentDisposition: 'attachment',
+
+        // Output Name for HTTP Content-Disposition
+        // Defaults to no name
+        outputName: "example.zip",
+
+        // HTTP Content-Type.
+        // Defaults to 'application/x-zip'.
+        // Note that this does nothing if you are not sending HTTP headers.
+        contentType: 'application/x-zip',
+
+        // Set the function called for setting headers.
+        // Default is the `header()` of PHP
+        httpHeaderCallback: header(...),
+
+        // Enable streaming files with single read where general purpose bit 3
+        // indicates local file header contain zero values in crc and size
+        // fields, these appear only after file contents in data descriptor
+        // block.
+        // Set to true if your input stream is remote
+        // (used with addFileFromStream()).
+        // Default is false.
+        defaultEnableZeroHeader: false,
+
+        // Enable zip64 extension, allowing very large archives
+        // (> 4Gb or file count > 64k)
+        // Default is true
+        enableZip64: true,
+
+        // Flush output buffer after every write
+        // Default is false
+        flushOutput: true,
+    );
diff --git a/vendor/maennchen/zipstream-php/guides/PSR7Streams.rst b/vendor/maennchen/zipstream-php/guides/PSR7Streams.rst
new file mode 100644
index 0000000000..22af71d4ac
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/guides/PSR7Streams.rst
@@ -0,0 +1,21 @@
+Usage with PSR 7 Streams
+===============
+
+PSR-7 streams are `standardized streams <https://www.php-fig.org/psr/psr-7/>`_.
+
+ZipStream-PHP supports working with these streams with the function
+``addFileFromPsr7Stream``. 
+
+For all parameters of the function see the API documentation.
+
+Example
+---------------
+
+.. code-block:: php
+
+    $stream = $response->getBody();
+    // add a file named 'streamfile.txt' from the content of the stream
+    $zip->addFileFromPsr7Stream(
+        fileName: 'streamfile.txt',
+        stream: $stream,
+    );
diff --git a/vendor/maennchen/zipstream-php/guides/StreamOutput.rst b/vendor/maennchen/zipstream-php/guides/StreamOutput.rst
new file mode 100644
index 0000000000..9f3165b755
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/guides/StreamOutput.rst
@@ -0,0 +1,39 @@
+Stream Output
+===============
+
+Stream to S3 Bucket
+---------------
+
+.. code-block:: php
+
+    use Aws\S3\S3Client;
+    use Aws\Credentials\CredentialProvider;
+    use ZipStream\ZipStream;
+
+    $bucket = 'your bucket name';
+    $client = new S3Client([
+        'region' => 'your region',
+        'version' => 'latest',
+        'bucketName' => $bucket,
+        'credentials' => CredentialProvider::defaultProvider(),
+    ]);
+    $client->registerStreamWrapper();
+
+    $zipFile = fopen("s3://$bucket/example.zip", 'w');
+
+    $zip = new ZipStream(
+        enableZip64: false,
+        outputStream: $zipFile,
+    );
+
+    $zip->addFile(
+        fileName: 'file1.txt',
+        data: 'File1 data',
+    );
+    $zip->addFile(
+        fileName: 'file2.txt',
+        data: 'File2 data',
+    );
+    $zip->finish();
+
+    fclose($zipFile);
diff --git a/vendor/maennchen/zipstream-php/guides/Symfony.rst b/vendor/maennchen/zipstream-php/guides/Symfony.rst
new file mode 100644
index 0000000000..902552c920
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/guides/Symfony.rst
@@ -0,0 +1,130 @@
+Usage with Symfony
+===============
+
+Overview for using ZipStream in Symfony
+--------
+
+Using ZipStream in Symfony requires use of Symfony's ``StreamedResponse`` when
+used in controller actions.
+
+Wrap your call to the relevant ``ZipStream`` stream method (i.e. ``addFile``,
+``addFileFromPath``, ``addFileFromStream``) in Symfony's ``StreamedResponse``
+function passing in any required arguments for your use case.
+
+Using Symfony's ``StreamedResponse`` will allow Symfony to stream output from
+ZipStream correctly to users' browsers and avoid a corrupted final zip landing
+on the users' end.
+
+Example for using ``ZipStream`` in a controller action to zip stream files
+stored in an AWS S3 bucket by key:
+
+.. code-block:: php
+
+    use Symfony\Component\HttpFoundation\StreamedResponse;
+    use Aws\S3\S3Client;
+    use ZipStream;
+
+    //...
+
+    /**
+    * @Route("/zipstream", name="zipstream")
+    */
+    public function zipStreamAction()
+    {
+        // sample test file on s3
+        $s3keys = array(
+        "ziptestfolder/file1.txt"
+        );
+
+        $s3Client = $this->get('app.amazon.s3'); //s3client service
+        $s3Client->registerStreamWrapper(); //required
+
+        // using StreamedResponse to wrap ZipStream functionality
+        // for files on AWS s3.
+        $response = new StreamedResponse(function() use($s3keys, $s3Client)
+        {
+            // Define suitable options for ZipStream Archive.
+            // this is needed to prevent issues with truncated zip files
+            //initialise zipstream with output zip filename and options.
+            $zip = new ZipStream\ZipStream(
+                outputName: 'test.zip',
+                defaultEnableZeroHeader: true,
+                contentType: 'application/octet-stream',
+            );
+
+            //loop keys - useful for multiple files
+            foreach ($s3keys as $key) {
+                // Get the file name in S3 key so we can save it to the zip
+                //file using the same name.
+                $fileName = basename($key);
+
+                // concatenate s3path.
+                // replace with your bucket name or get from parameters file.
+                $bucket = 'bucketname';
+                $s3path = "s3://" . $bucket . "/" . $key;
+
+                //addFileFromStream
+                if ($streamRead = fopen($s3path, 'r')) {
+                    $zip->addFileFromStream(
+                        fileName: $fileName,
+                        stream: $streamRead,
+                    );
+                } else {
+                    die('Could not open stream for reading');
+                }
+            }
+
+            $zip->finish();
+
+        });
+
+        return $response;
+    }
+
+In the above example, files on AWS S3 are being streamed from S3 to the Symfon
+application via ``fopen`` call when the s3Client has ``registerStreamWrapper``
+applied. This stream is then passed to ``ZipStream`` via the
+``addFileFromStream`` function, which ZipStream then streams as a zip to the
+client browser via Symfony's ``StreamedResponse``. No Zip is created server
+side, which makes this approach a more efficient solution for streaming zips to
+the client browser especially for larger files.
+
+For the above use case you will need to have installed
+`aws/aws-sdk-php-symfony <https://github.com/aws/aws-sdk-php-symfony>`_ to
+support accessing S3 objects in your Symfony web application. This is not
+required for locally stored files on you server you intend to stream via
+``ZipStream``.
+
+See official Symfony documentation for details on
+`Symfony's StreamedResponse <https://symfony.com/doc/current/components/http_foundation.html#streaming-a-response>`_ 
+``Symfony\Component\HttpFoundation\StreamedResponse``.
+
+Note from `S3 documentation <https://docs.aws.amazon.com/sdk-for-php/v3/developer-guide/s3-stream-wrapper.html>`_:
+
+    Streams opened in "r" mode only allow data to be read from the stream, and
+    are not seekable by default. This is so that data can be downloaded from
+    Amazon S3 in a truly streaming manner, where previously read bytes do not
+    need to be buffered into memory. If you need a stream to be seekable, you
+    can pass seekable into the stream context options of a function.
+
+Make sure to configure your S3 context correctly!
+
+Uploading a file
+--------
+
+You need to add correct permissions
+(see `#120 <https://github.com/maennchen/ZipStream-PHP/issues/120>`_)
+
+**example code**
+
+
+.. code-block:: php
+
+    $path = "s3://{$adapter->getBucket()}/{$this->getArchivePath()}";
+
+    // the important bit
+    $outputContext = stream_context_create([
+        's3' => ['ACL' => 'public-read'],
+    ]);
+
+    fopen($path, 'w', null, $outputContext);
diff --git a/vendor/maennchen/zipstream-php/guides/Varnish.rst b/vendor/maennchen/zipstream-php/guides/Varnish.rst
new file mode 100644
index 0000000000..952d28749b
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/guides/Varnish.rst
@@ -0,0 +1,22 @@
+Usage with Varnish
+=============
+
+Serving a big zip with varnish in between can cause random stream close.
+This can be solved by adding attached code to the vcl file.
+
+To avoid the problem, add the following to your varnish config file:
+
+.. code-block::
+    sub vcl_recv {
+        # Varnish can’t intercept the discussion anymore
+        # helps for streaming big zips
+        if (req.url ~ "\.(tar|gz|zip|7z|exe)$") {
+            return (pipe);
+        }
+    }
+    # Varnish can’t intercept the discussion anymore
+    # helps for streaming big zips
+    sub vcl_pipe {
+        set bereq.http.connection = "close";
+        return (pipe);
+    }
diff --git a/vendor/maennchen/zipstream-php/guides/index.rst b/vendor/maennchen/zipstream-php/guides/index.rst
new file mode 100644
index 0000000000..48f465aea2
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/guides/index.rst
@@ -0,0 +1,126 @@
+ZipStream PHP
+=============
+
+A fast and simple streaming zip file downloader for PHP. Using this library will
+save you from having to write the Zip to disk. You can directly send it to the
+user, which is much faster. It can work with S3 buckets or any PSR7 Stream.
+
+.. toctree::
+
+   index
+   Symfony
+   Options
+   StreamOutput
+   FlySystem
+   PSR7Streams
+   Nginx
+   Varnish
+   ContentLength
+
+Installation
+---------------
+
+Simply add a dependency on ``maennchen/zipstream-php`` to your project's
+``composer.json`` file if you use Composer to manage the dependencies of your
+project. Use following command to add the package to your project's
+dependencies:
+
+.. code-block:: sh
+   composer require maennchen/zipstream-php
+
+If you want to use``addFileFromPsr7Stream```
+(``Psr\Http\Message\StreamInterface``) or use a stream instead of a
+``resource`` as ``outputStream``, the following dependencies must be installed
+as well:
+
+.. code-block:: sh
+   composer require psr/http-message guzzlehttp/psr7
+
+If ``composer install`` yields the following error, your installation is missing
+the `mbstring extension <https://www.php.net/manual/en/book.mbstring.php>`_,
+either `install it <https://www.php.net/manual/en/mbstring.installation.php>`_
+or run the follwoing command:
+
+.. code-block::
+    Your requirements could not be resolved to an installable set of packages.
+
+    Problem 1
+        - Root composer.json requires PHP extension ext-mbstring * but it is
+          missing from your system. Install or enable PHP's mbstrings extension.
+
+.. code-block:: sh
+   composer require symfony/polyfill-mbstring
+
+Usage Intro
+---------------
+
+Here's a simple example:
+
+.. code-block:: php
+
+   // Autoload the dependencies
+   require 'vendor/autoload.php';
+
+   // create a new zipstream object
+   $zip = new ZipStream\ZipStream(
+      outputName: 'example.zip',
+
+      // enable output of HTTP headers
+      sendHttpHeaders: true,
+   );
+
+   // create a file named 'hello.txt'
+   $zip->addFile(
+      fileName: 'hello.txt',
+      data: 'This is the contents of hello.txt',
+   );
+
+   // add a file named 'some_image.jpg' from a local file 'path/to/image.jpg'
+   $zip->addFileFromPath(
+      fileName: 'some_image.jpg',
+      path: 'path/to/image.jpg',
+   );
+
+   // add a file named 'goodbye.txt' from an open stream resource
+   $filePointer = tmpfile();
+   fwrite($filePointer, 'The quick brown fox jumped over the lazy dog.');
+   rewind($filePointer);
+   $zip->addFileFromStream(
+      fileName: 'goodbye.txt',
+      stream: $filePointer,
+   );
+   fclose($filePointer);
+
+   // add a file named 'streamfile.txt' from the body of a `guzzle` response
+   // Setup with `psr/http-message` & `guzzlehttp/psr7` dependencies required.
+   $zip->addFileFromPsr7Stream(
+      fileName: 'streamfile.txt',
+      stream: $response->getBody(),
+   );
+
+   // finish the zip stream
+   $zip->finish();
+
+You can also add comments, modify file timestamps, and customize (or
+disable) the HTTP headers. It is also possible to specify the storage method
+when adding files, the current default storage method is ``DEFLATE``
+i.e files are stored with Compression mode 0x08.
+
+Known Issues
+---------------
+
+The native Mac OS archive extraction tool prior to macOS 10.15 might not open
+archives in some conditions. A workaround is to disable the Zip64 feature with
+the option ``enableZip64: false``. This limits the archive to 4 Gb and 64k files
+but will allow users on macOS 10.14 and below to open them without issue.
+See `#116 <https://github.com/maennchen/ZipStream-PHP/issues/116>`_.
+
+The linux ``unzip`` utility might not handle properly unicode characters.
+It is recommended to extract with another tool like
+`7-zip <https://www.7-zip.org/>`_.
+See `#146 <https://github.com/maennchen/ZipStream-PHP/issues/146>`_.
+
+It is the responsability of the client code to make sure that files are not
+saved with the same path, as it is not possible for the library to figure it out
+while streaming a zip.
+See `#154 <https://github.com/maennchen/ZipStream-PHP/issues/154>`_.
diff --git a/vendor/maennchen/zipstream-php/phpdoc.dist.xml b/vendor/maennchen/zipstream-php/phpdoc.dist.xml
new file mode 100644
index 0000000000..b98fe1cd2f
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/phpdoc.dist.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<phpdocumentor
+        configVersion="3"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns="https://www.phpdoc.org"
+        xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/phpDocumentor/phpDocumentor/master/data/xsd/phpdoc.xsd"
+>
+    <title>💾 ZipStream-PHP</title>
+    <paths>
+        <output>docs</output>
+    </paths>
+    <version number="3.0.0">
+        <folder>latest</folder>
+        <api>
+            <source dsn=".">
+                <path>src</path>
+            </source>
+            <output>api</output>
+            <ignore hidden="true" symlinks="true">
+                <path>tests/**/*</path>
+                <path>vendor/**/*</path>
+            </ignore>
+            <extensions>
+                <extension>php</extension>
+            </extensions>
+            <visibility>public</visibility>
+            <default-package-name>ZipStream</default-package-name>
+            <include-source>true</include-source>
+        </api>
+        <guide>
+            <source dsn=".">
+                <path>guides</path>
+            </source>
+            <output>guide</output>
+        </guide>
+    </version>
+    <setting name="guides.enabled" value="true"/>
+    <template name="default" />
+</phpdocumentor>
\ No newline at end of file
diff --git a/vendor/maennchen/zipstream-php/phpunit.xml.dist b/vendor/maennchen/zipstream-php/phpunit.xml.dist
index f6e722796e..1b02a3af87 100644
--- a/vendor/maennchen/zipstream-php/phpunit.xml.dist
+++ b/vendor/maennchen/zipstream-php/phpunit.xml.dist
@@ -1,17 +1,15 @@
-<phpunit bootstrap="test/bootstrap.php">
-    <testsuites>
-        <testsuite name="Application">
-            <directory>test</directory>
-        </testsuite>
-    </testsuites>
-
-    <logging>
-        <log type="coverage-clover" target="clover.xml"/>
-    </logging>
-
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">src</directory>
-        </whitelist>
-    </filter>
+<?xml version="1.0"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="test/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd" cacheDirectory=".phpunit.cache">
+  <coverage/>
+  <testsuites>
+    <testsuite name="Application">
+      <directory>test</directory>
+    </testsuite>
+  </testsuites>
+  <logging/>
+  <source>
+    <include>
+      <directory suffix=".php">src</directory>
+    </include>
+  </source>
 </phpunit>
diff --git a/vendor/maennchen/zipstream-php/psalm.xml b/vendor/maennchen/zipstream-php/psalm.xml
index 42f355b2ce..4da8618369 100644
--- a/vendor/maennchen/zipstream-php/psalm.xml
+++ b/vendor/maennchen/zipstream-php/psalm.xml
@@ -1,55 +1,25 @@
 <?xml version="1.0"?>
 <psalm
-    totallyTyped="false"
+    errorLevel="1"
     resolveFromConfigFile="true"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="true"
+    phpVersion="8.1.0"
 >
+    <!-- TODO: Update phpVersion when raising the minimum supported version -->
     <projectFiles>
         <directory name="src" />
         <ignoreFiles>
             <directory name="vendor" />
         </ignoreFiles>
     </projectFiles>
-
     <issueHandlers>
-        <LessSpecificReturnType errorLevel="info" />
-
-        <!-- level 3 issues - slightly lazy code writing, but provably low false-negatives -->
-
-        <DeprecatedMethod errorLevel="info" />
-        <DeprecatedProperty errorLevel="info" />
-        <DeprecatedClass errorLevel="info" />
-        <DeprecatedConstant errorLevel="info" />
-        <DeprecatedFunction errorLevel="info" />
-        <DeprecatedInterface errorLevel="info" />
-        <DeprecatedTrait errorLevel="info" />
-
-        <InternalMethod errorLevel="info" />
-        <InternalProperty errorLevel="info" />
-        <InternalClass errorLevel="info" />
-
-        <MissingClosureReturnType errorLevel="info" />
-        <MissingReturnType errorLevel="info" />
-        <MissingPropertyType errorLevel="info" />
-        <InvalidDocblock errorLevel="info" />
-        <MisplacedRequiredParam errorLevel="info" />
-
-        <PropertyNotSetInConstructor errorLevel="info" />
-        <MissingConstructor errorLevel="info" />
-        <MissingClosureParamType errorLevel="info" />
-        <MissingParamType errorLevel="info" />
-
-        <RedundantCondition errorLevel="info" />
-
-        <DocblockTypeContradiction errorLevel="info" />
-        <RedundantConditionGivenDocblockType errorLevel="info" />
-
-        <UnresolvableInclude errorLevel="info" />
-
-        <RawObjectIteration errorLevel="info" />
-
-        <InvalidStringClass errorLevel="info" />
+        <!-- Turn off dead code warnings for externally called functions -->
+        <PossiblyUnusedProperty errorLevel="suppress" />
+        <PossiblyUnusedMethod errorLevel="suppress" />
+        <PossiblyUnusedReturnValue errorLevel="suppress" />
     </issueHandlers>
 </psalm>
diff --git a/vendor/maennchen/zipstream-php/results.sarif b/vendor/maennchen/zipstream-php/results.sarif
new file mode 100644
index 0000000000..c99a3f47f2
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/results.sarif
@@ -0,0 +1 @@
+{"version":"2.1.0","$schema":"https:\/\/json.schemastore.org\/sarif-2.1.0.json","runs":[{"tool":{"driver":{"name":"Psalm","informationUri":"https:\/\/psalm.dev","version":"5.26.1@d747f6500b38ac4f7dfc5edbcae6e4b637d7add0"}},"results":[]}]}
diff --git a/vendor/maennchen/zipstream-php/src/Bigint.php b/vendor/maennchen/zipstream-php/src/Bigint.php
deleted file mode 100644
index 52ccfd2ea4..0000000000
--- a/vendor/maennchen/zipstream-php/src/Bigint.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace ZipStream;
-
-use OverflowException;
-
-class Bigint
-{
-    /**
-     * @var int[]
-     */
-    private $bytes = [0, 0, 0, 0, 0, 0, 0, 0];
-
-    /**
-     * Initialize the bytes array
-     *
-     * @param int $value
-     */
-    public function __construct(int $value = 0)
-    {
-        $this->fillBytes($value, 0, 8);
-    }
-
-    /**
-     * Fill the bytes field with int
-     *
-     * @param int $value
-     * @param int $start
-     * @param int $count
-     * @return void
-     */
-    protected function fillBytes(int $value, int $start, int $count): void
-    {
-        for ($i = 0; $i < $count; $i++) {
-            $this->bytes[$start + $i] = $i >= PHP_INT_SIZE ? 0 : $value & 0xFF;
-            $value >>= 8;
-        }
-    }
-
-    /**
-     * Get an instance
-     *
-     * @param int $value
-     * @return Bigint
-     */
-    public static function init(int $value = 0): self
-    {
-        return new self($value);
-    }
-
-    /**
-     * Fill bytes from low to high
-     *
-     * @param int $low
-     * @param int $high
-     * @return Bigint
-     */
-    public static function fromLowHigh(int $low, int $high): self
-    {
-        $bigint = new Bigint();
-        $bigint->fillBytes($low, 0, 4);
-        $bigint->fillBytes($high, 4, 4);
-        return $bigint;
-    }
-
-    /**
-     * Get high 32
-     *
-     * @return int
-     */
-    public function getHigh32(): int
-    {
-        return $this->getValue(4, 4);
-    }
-
-    /**
-     * Get value from bytes array
-     *
-     * @param int $end
-     * @param int $length
-     * @return int
-     */
-    public function getValue(int $end = 0, int $length = 8): int
-    {
-        $result = 0;
-        for ($i = $end + $length - 1; $i >= $end; $i--) {
-            $result <<= 8;
-            $result |= $this->bytes[$i];
-        }
-        return $result;
-    }
-
-    /**
-     * Get low FF
-     *
-     * @param bool $force
-     * @return float
-     */
-    public function getLowFF(bool $force = false): float
-    {
-        if ($force || $this->isOver32()) {
-            return (float)0xFFFFFFFF;
-        }
-        return (float)$this->getLow32();
-    }
-
-    /**
-     * Check if is over 32
-     *
-     * @param bool $force
-     * @return bool
-     */
-    public function isOver32(bool $force = false): bool
-    {
-        // value 0xFFFFFFFF already needs a Zip64 header
-        return $force ||
-            max(array_slice($this->bytes, 4, 4)) > 0 ||
-            min(array_slice($this->bytes, 0, 4)) === 0xFF;
-    }
-
-    /**
-     * Get low 32
-     *
-     * @return int
-     */
-    public function getLow32(): int
-    {
-        return $this->getValue(0, 4);
-    }
-
-    /**
-     * Get hexadecimal
-     *
-     * @return string
-     */
-    public function getHex64(): string
-    {
-        $result = '0x';
-        for ($i = 7; $i >= 0; $i--) {
-            $result .= sprintf('%02X', $this->bytes[$i]);
-        }
-        return $result;
-    }
-
-    /**
-     * Add
-     *
-     * @param Bigint $other
-     * @return Bigint
-     */
-    public function add(Bigint $other): Bigint
-    {
-        $result = clone $this;
-        $overflow = false;
-        for ($i = 0; $i < 8; $i++) {
-            $result->bytes[$i] += $other->bytes[$i];
-            if ($overflow) {
-                $result->bytes[$i]++;
-                $overflow = false;
-            }
-            if ($result->bytes[$i] & 0x100) {
-                $overflow = true;
-                $result->bytes[$i] &= 0xFF;
-            }
-        }
-        if ($overflow) {
-            throw new OverflowException;
-        }
-        return $result;
-    }
-}
diff --git a/vendor/maennchen/zipstream-php/src/CentralDirectoryFileHeader.php b/vendor/maennchen/zipstream-php/src/CentralDirectoryFileHeader.php
new file mode 100644
index 0000000000..ffcfc6e970
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/src/CentralDirectoryFileHeader.php
@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream;
+
+use DateTimeInterface;
+
+/**
+ * @internal
+ */
+abstract class CentralDirectoryFileHeader
+{
+    private const SIGNATURE = 0x02014b50;
+
+    public static function generate(
+        int $versionMadeBy,
+        int $versionNeededToExtract,
+        int $generalPurposeBitFlag,
+        CompressionMethod $compressionMethod,
+        DateTimeInterface $lastModificationDateTime,
+        int $crc32,
+        int $compressedSize,
+        int $uncompressedSize,
+        string $fileName,
+        string $extraField,
+        string $fileComment,
+        int $diskNumberStart,
+        int $internalFileAttributes,
+        int $externalFileAttributes,
+        int $relativeOffsetOfLocalHeader,
+    ): string {
+        return PackField::pack(
+            new PackField(format: 'V', value: self::SIGNATURE),
+            new PackField(format: 'v', value: $versionMadeBy),
+            new PackField(format: 'v', value: $versionNeededToExtract),
+            new PackField(format: 'v', value: $generalPurposeBitFlag),
+            new PackField(format: 'v', value: $compressionMethod->value),
+            new PackField(format: 'V', value: Time::dateTimeToDosTime($lastModificationDateTime)),
+            new PackField(format: 'V', value: $crc32),
+            new PackField(format: 'V', value: $compressedSize),
+            new PackField(format: 'V', value: $uncompressedSize),
+            new PackField(format: 'v', value: strlen($fileName)),
+            new PackField(format: 'v', value: strlen($extraField)),
+            new PackField(format: 'v', value: strlen($fileComment)),
+            new PackField(format: 'v', value: $diskNumberStart),
+            new PackField(format: 'v', value: $internalFileAttributes),
+            new PackField(format: 'V', value: $externalFileAttributes),
+            new PackField(format: 'V', value: $relativeOffsetOfLocalHeader),
+        ) . $fileName . $extraField . $fileComment;
+    }
+}
diff --git a/vendor/maennchen/zipstream-php/src/CompressionMethod.php b/vendor/maennchen/zipstream-php/src/CompressionMethod.php
new file mode 100644
index 0000000000..51e4363702
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/src/CompressionMethod.php
@@ -0,0 +1,106 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream;
+
+enum CompressionMethod: int
+{
+    /**
+     * The file is stored (no compression)
+     */
+    case STORE = 0x00;
+
+    // 0x01: legacy algorithm - The file is Shrunk
+    // 0x02: legacy algorithm - The file is Reduced with compression factor 1
+    // 0x03: legacy algorithm - The file is Reduced with compression factor 2
+    // 0x04: legacy algorithm - The file is Reduced with compression factor 3
+    // 0x05: legacy algorithm - The file is Reduced with compression factor 4
+    // 0x06: legacy algorithm - The file is Imploded
+    // 0x07: Reserved for Tokenizing compression algorithm
+
+    /**
+     * The file is Deflated
+     */
+    case DEFLATE = 0x08;
+
+    // /**
+    //  * Enhanced Deflating using Deflate64(tm)
+    //  */
+    // case DEFLATE_64 = 0x09;
+
+    // /**
+    //  * PKWARE Data Compression Library Imploding (old IBM TERSE)
+    //  */
+    // case PKWARE = 0x0a;
+
+    // // 0x0b: Reserved by PKWARE
+
+    // /**
+    //  * File is compressed using BZIP2 algorithm
+    //  */
+    // case BZIP2 = 0x0c;
+
+    // // 0x0d: Reserved by PKWARE
+
+    // /**
+    //  * LZMA
+    //  */
+    // case LZMA = 0x0e;
+
+    // // 0x0f: Reserved by PKWARE
+
+    // /**
+    //  * IBM z/OS CMPSC Compression
+    //  */
+    // case IBM_ZOS_CMPSC = 0x10;
+
+    // // 0x11: Reserved by PKWARE
+
+    // /**
+    //  * File is compressed using IBM TERSE
+    //  */
+    // case IBM_TERSE = 0x12;
+
+    // /**
+    //  * IBM LZ77 z Architecture
+    //  */
+    // case IBM_LZ77 = 0x13;
+
+    // // 0x14: deprecated (use method 93 for zstd)
+
+    // /**
+    //  * Zstandard (zstd) Compression
+    //  */
+    // case ZSTD = 0x5d;
+
+    // /**
+    //  * MP3 Compression
+    //  */
+    // case MP3 = 0x5e;
+
+    // /**
+    //  * XZ Compression
+    //  */
+    // case XZ = 0x5f;
+
+    // /**
+    //  * JPEG variant
+    //  */
+    // case JPEG = 0x60;
+
+    // /**
+    //  * WavPack compressed data
+    //  */
+    // case WAV_PACK = 0x61;
+
+    // /**
+    //  * PPMd version I, Rev 1
+    //  */
+    // case PPMD_1_1 = 0x62;
+
+    // /**
+    //  * AE-x encryption marker
+    //  */
+    // case AE_X_ENCRYPTION = 0x63;
+}
diff --git a/vendor/maennchen/zipstream-php/src/DataDescriptor.php b/vendor/maennchen/zipstream-php/src/DataDescriptor.php
new file mode 100644
index 0000000000..04146190d1
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/src/DataDescriptor.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream;
+
+/**
+ * @internal
+ */
+abstract class DataDescriptor
+{
+    private const SIGNATURE = 0x08074b50;
+
+    public static function generate(
+        int $crc32UncompressedData,
+        int $compressedSize,
+        int $uncompressedSize,
+    ): string {
+        return PackField::pack(
+            new PackField(format: 'V', value: self::SIGNATURE),
+            new PackField(format: 'V', value: $crc32UncompressedData),
+            new PackField(format: 'V', value: $compressedSize),
+            new PackField(format: 'V', value: $uncompressedSize),
+        );
+    }
+}
diff --git a/vendor/maennchen/zipstream-php/src/DeflateStream.php b/vendor/maennchen/zipstream-php/src/DeflateStream.php
deleted file mode 100644
index d6c272885b..0000000000
--- a/vendor/maennchen/zipstream-php/src/DeflateStream.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace ZipStream;
-
-class DeflateStream extends Stream
-{
-    protected $filter;
-
-    /**
-     * @var Option\File
-     */
-    protected $options;
-
-    /**
-     * Rewind stream
-     *
-     * @return void
-     */
-    public function rewind(): void
-    {
-        // deflate filter needs to be removed before rewind
-        if ($this->filter) {
-            $this->removeDeflateFilter();
-            $this->seek(0);
-            $this->addDeflateFilter($this->options);
-        } else {
-            rewind($this->stream);
-        }
-    }
-
-    /**
-     * Remove the deflate filter
-     *
-     * @return void
-     */
-    public function removeDeflateFilter(): void
-    {
-        if (!$this->filter) {
-            return;
-        }
-        stream_filter_remove($this->filter);
-        $this->filter = null;
-    }
-
-    /**
-     * Add a deflate filter
-     *
-     * @param Option\File $options
-     * @return void
-     */
-    public function addDeflateFilter(Option\File $options): void
-    {
-        $this->options = $options;
-        // parameter 4 for stream_filter_append expects array
-        // so we convert the option object in an array
-        $optionsArr = [
-            'comment' => $options->getComment(),
-            'method' => $options->getMethod(),
-            'deflateLevel' => $options->getDeflateLevel(),
-            'time' => $options->getTime()
-        ];
-        $this->filter = stream_filter_append(
-            $this->stream,
-            'zlib.deflate',
-            STREAM_FILTER_READ,
-            $optionsArr
-        );
-    }
-}
diff --git a/vendor/maennchen/zipstream-php/src/EndOfCentralDirectory.php b/vendor/maennchen/zipstream-php/src/EndOfCentralDirectory.php
new file mode 100644
index 0000000000..4320addc32
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/src/EndOfCentralDirectory.php
@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream;
+
+/**
+ * @internal
+ */
+abstract class EndOfCentralDirectory
+{
+    private const SIGNATURE = 0x06054b50;
+
+    public static function generate(
+        int $numberOfThisDisk,
+        int $numberOfTheDiskWithCentralDirectoryStart,
+        int $numberOfCentralDirectoryEntriesOnThisDisk,
+        int $numberOfCentralDirectoryEntries,
+        int $sizeOfCentralDirectory,
+        int $centralDirectoryStartOffsetOnDisk,
+        string $zipFileComment,
+    ): string {
+        /** @psalm-suppress MixedArgument */
+        return PackField::pack(
+            new PackField(format: 'V', value: static::SIGNATURE),
+            new PackField(format: 'v', value: $numberOfThisDisk),
+            new PackField(format: 'v', value: $numberOfTheDiskWithCentralDirectoryStart),
+            new PackField(format: 'v', value: $numberOfCentralDirectoryEntriesOnThisDisk),
+            new PackField(format: 'v', value: $numberOfCentralDirectoryEntries),
+            new PackField(format: 'V', value: $sizeOfCentralDirectory),
+            new PackField(format: 'V', value: $centralDirectoryStartOffsetOnDisk),
+            new PackField(format: 'v', value: strlen($zipFileComment)),
+        ) . $zipFileComment;
+    }
+}
diff --git a/vendor/maennchen/zipstream-php/src/Exception.php b/vendor/maennchen/zipstream-php/src/Exception.php
index 18ccfbbdc1..2e81e307bb 100644
--- a/vendor/maennchen/zipstream-php/src/Exception.php
+++ b/vendor/maennchen/zipstream-php/src/Exception.php
@@ -1,11 +1,7 @@
 <?php
+
 declare(strict_types=1);
 
 namespace ZipStream;
 
-/**
- * This class is only for inheriting
- */
-abstract class Exception extends \Exception
-{
-}
+abstract class Exception extends \Exception {}
diff --git a/vendor/maennchen/zipstream-php/src/Exception/DosTimeOverflowException.php b/vendor/maennchen/zipstream-php/src/Exception/DosTimeOverflowException.php
new file mode 100644
index 0000000000..b8d0508085
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/src/Exception/DosTimeOverflowException.php
@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Exception;
+
+use DateTimeInterface;
+use ZipStream\Exception;
+
+/**
+ * This Exception gets invoked if a file wasn't found
+ */
+class DosTimeOverflowException extends Exception
+{
+    /**
+     * @internal
+     */
+    public function __construct(
+        public readonly DateTimeInterface $dateTime
+    ) {
+        parent::__construct('The date ' . $dateTime->format(DateTimeInterface::ATOM) . " can't be represented as DOS time / date.");
+    }
+}
diff --git a/vendor/maennchen/zipstream-php/src/Exception/EncodingException.php b/vendor/maennchen/zipstream-php/src/Exception/EncodingException.php
deleted file mode 100644
index 5134ea8831..0000000000
--- a/vendor/maennchen/zipstream-php/src/Exception/EncodingException.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace ZipStream\Exception;
-
-use ZipStream\Exception;
-
-/**
- * This Exception gets invoked if file or comment encoding is incorrect
- */
-class EncodingException extends Exception
-{
-}
diff --git a/vendor/maennchen/zipstream-php/src/Exception/FileNotFoundException.php b/vendor/maennchen/zipstream-php/src/Exception/FileNotFoundException.php
index ac1a4d5f9c..350a7bfe56 100644
--- a/vendor/maennchen/zipstream-php/src/Exception/FileNotFoundException.php
+++ b/vendor/maennchen/zipstream-php/src/Exception/FileNotFoundException.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace ZipStream\Exception;
@@ -11,12 +12,11 @@
 class FileNotFoundException extends Exception
 {
     /**
-     * Constructor of the Exception
-     *
-     * @param String $path - The path which wasn't found
+     * @internal
      */
-    public function __construct(string $path)
-    {
+    public function __construct(
+        public readonly string $path
+    ) {
         parent::__construct("The file with the path $path wasn't found.");
     }
 }
diff --git a/vendor/maennchen/zipstream-php/src/Exception/FileNotReadableException.php b/vendor/maennchen/zipstream-php/src/Exception/FileNotReadableException.php
index e8b4e5ed11..93d0c6c64e 100644
--- a/vendor/maennchen/zipstream-php/src/Exception/FileNotReadableException.php
+++ b/vendor/maennchen/zipstream-php/src/Exception/FileNotReadableException.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace ZipStream\Exception;
@@ -11,12 +12,11 @@
 class FileNotReadableException extends Exception
 {
     /**
-     * Constructor of the Exception
-     *
-     * @param String $path - The path which wasn't found
+     * @internal
      */
-    public function __construct(string $path)
-    {
+    public function __construct(
+        public readonly string $path
+    ) {
         parent::__construct("The file with the path $path isn't readable.");
     }
 }
diff --git a/vendor/maennchen/zipstream-php/src/Exception/FileSizeIncorrectException.php b/vendor/maennchen/zipstream-php/src/Exception/FileSizeIncorrectException.php
new file mode 100644
index 0000000000..11f0b67b34
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/src/Exception/FileSizeIncorrectException.php
@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Exception;
+
+use ZipStream\Exception;
+
+/**
+ * This Exception gets invoked if a file is not as large as it was specified.
+ */
+class FileSizeIncorrectException extends Exception
+{
+    /**
+     * @internal
+     */
+    public function __construct(
+        public readonly int $expectedSize,
+        public readonly int $actualSize
+    ) {
+        parent::__construct("File is {$actualSize} instead of {$expectedSize} bytes large. Adjust `exactSize` parameter.");
+    }
+}
diff --git a/vendor/maennchen/zipstream-php/src/Exception/IncompatibleOptionsException.php b/vendor/maennchen/zipstream-php/src/Exception/IncompatibleOptionsException.php
deleted file mode 100644
index ebed364607..0000000000
--- a/vendor/maennchen/zipstream-php/src/Exception/IncompatibleOptionsException.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace ZipStream\Exception;
-
-use ZipStream\Exception;
-
-/**
- * This Exception gets invoked if options are incompatible
- */
-class IncompatibleOptionsException extends Exception
-{
-}
diff --git a/vendor/maennchen/zipstream-php/src/Exception/OverflowException.php b/vendor/maennchen/zipstream-php/src/Exception/OverflowException.php
index c46cbeff31..09bdafb289 100644
--- a/vendor/maennchen/zipstream-php/src/Exception/OverflowException.php
+++ b/vendor/maennchen/zipstream-php/src/Exception/OverflowException.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace ZipStream\Exception;
@@ -10,6 +11,9 @@
  */
 class OverflowException extends Exception
 {
+    /**
+     * @internal
+     */
     public function __construct()
     {
         parent::__construct('File size exceeds limit of 32 bit integer. Please enable "zip64" option.');
diff --git a/vendor/maennchen/zipstream-php/src/Exception/ResourceActionException.php b/vendor/maennchen/zipstream-php/src/Exception/ResourceActionException.php
new file mode 100644
index 0000000000..cbd9b0bb95
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/src/Exception/ResourceActionException.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Exception;
+
+use ZipStream\Exception;
+
+/**
+ * This Exception gets invoked if a resource like `fread` returns false
+ */
+class ResourceActionException extends Exception
+{
+    /**
+     * @var ?resource
+     */
+    public $resource;
+
+    /**
+     * @param resource $resource
+     */
+    public function __construct(
+        public readonly string $function,
+        $resource = null,
+    ) {
+        $this->resource = $resource;
+        parent::__construct('Function ' . $function . 'failed on resource.');
+    }
+}
diff --git a/vendor/maennchen/zipstream-php/src/Exception/SimulationFileUnknownException.php b/vendor/maennchen/zipstream-php/src/Exception/SimulationFileUnknownException.php
new file mode 100644
index 0000000000..717c1aafef
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/src/Exception/SimulationFileUnknownException.php
@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Exception;
+
+use ZipStream\Exception;
+
+/**
+ * This Exception gets invoked if a strict simulation is executed and the file
+ * information can't be determined without reading the entire file.
+ */
+class SimulationFileUnknownException extends Exception
+{
+    public function __construct()
+    {
+        parent::__construct('The details of the strict simulation file could not be determined without reading the entire file.');
+    }
+}
diff --git a/vendor/maennchen/zipstream-php/src/Exception/StreamNotReadableException.php b/vendor/maennchen/zipstream-php/src/Exception/StreamNotReadableException.php
index c4ed251d39..c1446735a6 100644
--- a/vendor/maennchen/zipstream-php/src/Exception/StreamNotReadableException.php
+++ b/vendor/maennchen/zipstream-php/src/Exception/StreamNotReadableException.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace ZipStream\Exception;
@@ -6,17 +7,15 @@
 use ZipStream\Exception;
 
 /**
- * This Exception gets invoked if `fread` fails on a stream.
+ * This Exception gets invoked if a stream can't be read.
  */
 class StreamNotReadableException extends Exception
 {
     /**
-     * Constructor of the Exception
-     *
-     * @param string $fileName - The name of the file which the stream belongs to.
+     * @internal
      */
-    public function __construct(string $fileName)
+    public function __construct()
     {
-        parent::__construct("The stream for $fileName could not be read.");
+        parent::__construct('The stream could not be read.');
     }
 }
diff --git a/vendor/maennchen/zipstream-php/src/Exception/StreamNotSeekableException.php b/vendor/maennchen/zipstream-php/src/Exception/StreamNotSeekableException.php
new file mode 100644
index 0000000000..606f11f144
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/src/Exception/StreamNotSeekableException.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Exception;
+
+use ZipStream\Exception;
+
+/**
+ * This Exception gets invoked if a non seekable stream is
+ * provided and zero headers are disabled.
+ */
+class StreamNotSeekableException extends Exception
+{
+    /**
+     * @internal
+     */
+    public function __construct()
+    {
+        parent::__construct('enableZeroHeader must be enable to add non seekable streams');
+    }
+}
diff --git a/vendor/maennchen/zipstream-php/src/File.php b/vendor/maennchen/zipstream-php/src/File.php
index 2200a366be..0462196e25 100644
--- a/vendor/maennchen/zipstream-php/src/File.php
+++ b/vendor/maennchen/zipstream-php/src/File.php
@@ -1,477 +1,420 @@
 <?php
+
 declare(strict_types=1);
 
 namespace ZipStream;
 
-use Psr\Http\Message\StreamInterface;
-use ZipStream\Exception\EncodingException;
-use ZipStream\Exception\FileNotFoundException;
-use ZipStream\Exception\FileNotReadableException;
+use Closure;
+use DateTimeInterface;
+use DeflateContext;
+use RuntimeException;
+use ZipStream\Exception\FileSizeIncorrectException;
 use ZipStream\Exception\OverflowException;
-use ZipStream\Option\File as FileOptions;
-use ZipStream\Option\Method;
-use ZipStream\Option\Version;
-
+use ZipStream\Exception\ResourceActionException;
+use ZipStream\Exception\SimulationFileUnknownException;
+use ZipStream\Exception\StreamNotReadableException;
+use ZipStream\Exception\StreamNotSeekableException;
+
+/**
+ * @internal
+ */
 class File
 {
-    const HASH_ALGORITHM = 'crc32b';
+    private const CHUNKED_READ_BLOCK_SIZE = 0x1000000;
 
-    const BIT_ZERO_HEADER = 0x0008;
-    const BIT_EFS_UTF8 = 0x0800;
+    private Version $version;
 
-    const COMPUTE = 1;
-    const SEND = 2;
+    private int $compressedSize = 0;
 
-    private const CHUNKED_READ_BLOCK_SIZE = 1048576;
+    private int $uncompressedSize = 0;
 
-    /**
-     * @var string
-     */
-    public $name;
+    private int $crc = 0;
 
-    /**
-     * @var FileOptions
-     */
-    public $opt;
+    private int $generalPurposeBitFlag = 0;
 
-    /**
-     * @var Bigint
-     */
-    public $len;
-    /**
-     * @var Bigint
-     */
-    public $zlen;
-
-    /** @var  int */
-    public $crc;
+    private readonly string $fileName;
 
     /**
-     * @var Bigint
+     * @var resource|null
      */
-    public $hlen;
+    private $stream;
 
     /**
-     * @var Bigint
+     * @param Closure $dataCallback
+     * @psalm-param Closure(): resource $dataCallback
      */
-    public $ofs;
+    public function __construct(
+        string $fileName,
+        private readonly Closure $dataCallback,
+        private readonly OperationMode $operationMode,
+        private readonly int $startOffset,
+        private readonly CompressionMethod $compressionMethod,
+        private readonly string $comment,
+        private readonly DateTimeInterface $lastModificationDateTime,
+        private readonly int $deflateLevel,
+        private readonly ?int $maxSize,
+        private readonly ?int $exactSize,
+        private readonly bool $enableZip64,
+        private readonly bool $enableZeroHeader,
+        private readonly Closure $send,
+        private readonly Closure $recordSentBytes,
+    ) {
+        $this->fileName = self::filterFilename($fileName);
+        $this->checkEncoding();
+
+        if ($this->enableZeroHeader) {
+            $this->generalPurposeBitFlag |= GeneralPurposeBitFlag::ZERO_HEADER;
+        }
 
-    /**
-     * @var int
-     */
-    public $bits;
+        $this->version = $this->compressionMethod === CompressionMethod::DEFLATE ? Version::DEFLATE : Version::STORE;
+    }
 
-    /**
-     * @var Version
-     */
-    public $version;
+    public function cloneSimulationExecution(): self
+    {
+        return new self(
+            $this->fileName,
+            $this->dataCallback,
+            OperationMode::NORMAL,
+            $this->startOffset,
+            $this->compressionMethod,
+            $this->comment,
+            $this->lastModificationDateTime,
+            $this->deflateLevel,
+            $this->maxSize,
+            $this->exactSize,
+            $this->enableZip64,
+            $this->enableZeroHeader,
+            $this->send,
+            $this->recordSentBytes,
+        );
+    }
 
-    /**
-     * @var ZipStream
-     */
-    public $zip;
+    public function process(): string
+    {
+        $forecastSize = $this->forecastSize();
 
-    /**
-     * @var resource
-     */
-    private $deflate;
-    /**
-     * @var resource
-     */
-    private $hash;
+        if ($this->enableZeroHeader) {
+            // No calculation required
+        } elseif ($this->isSimulation() && $forecastSize !== null) {
+            $this->uncompressedSize = $forecastSize;
+            $this->compressedSize = $forecastSize;
+        } else {
+            $this->readStream(send: false);
+            if (rewind($this->unpackStream()) === false) {
+                throw new ResourceActionException('rewind', $this->unpackStream());
+            }
+        }
 
-    /**
-     * @var Method
-     */
-    private $method;
+        $this->addFileHeader();
 
-    /**
-     * @var Bigint
-     */
-    private $totalLength;
+        $detectedSize = $forecastSize ?? ($this->compressedSize > 0 ? $this->compressedSize : null);
 
-    public function __construct(ZipStream $zip, string $name, ?FileOptions $opt = null)
-    {
-        $this->zip = $zip;
+        if (
+            $this->isSimulation() &&
+            $detectedSize !== null
+        ) {
+            ($this->recordSentBytes)($detectedSize);
+        } else {
+            $this->readStream(send: true);
+        }
 
-        $this->name = $name;
-        $this->opt = $opt ?: new FileOptions();
-        $this->method = $this->opt->getMethod();
-        $this->version = Version::STORE();
-        $this->ofs = new Bigint();
+        $this->addFileFooter();
+        return $this->getCdrFile();
     }
 
-    public function processPath(string $path): void
+    /**
+     * @return resource
+     */
+    private function unpackStream()
     {
-        if (!is_readable($path)) {
-            if (!file_exists($path)) {
-                throw new FileNotFoundException($path);
-            }
-            throw new FileNotReadableException($path);
+        if ($this->stream) {
+            return $this->stream;
         }
-        if ($this->zip->isLargeFile($path) === false) {
-            $data = file_get_contents($path);
-            $this->processData($data);
-        } else {
-            $this->method = $this->zip->opt->getLargeFileMethod();
 
-            $stream = new DeflateStream(fopen($path, 'rb'));
-            $this->processStream($stream);
-            $stream->close();
+        if ($this->operationMode === OperationMode::SIMULATE_STRICT) {
+            throw new SimulationFileUnknownException();
+        }
+
+        $this->stream = ($this->dataCallback)();
+
+        if (!$this->enableZeroHeader && !stream_get_meta_data($this->stream)['seekable']) {
+            throw new StreamNotSeekableException();
         }
+        if (!(
+            str_contains(stream_get_meta_data($this->stream)['mode'], 'r')
+            || str_contains(stream_get_meta_data($this->stream)['mode'], 'w+')
+            || str_contains(stream_get_meta_data($this->stream)['mode'], 'a+')
+            || str_contains(stream_get_meta_data($this->stream)['mode'], 'x+')
+            || str_contains(stream_get_meta_data($this->stream)['mode'], 'c+')
+        )) {
+            throw new StreamNotReadableException();
+        }
+
+        return $this->stream;
     }
 
-    public function processData(string $data): void
+    private function forecastSize(): ?int
     {
-        $this->len = new Bigint(strlen($data));
-        $this->crc = crc32($data);
+        if ($this->compressionMethod !== CompressionMethod::STORE) {
+            return null;
+        }
+        if ($this->exactSize !== null) {
+            return $this->exactSize;
+        }
+        $fstat = fstat($this->unpackStream());
+        if (!$fstat || !array_key_exists('size', $fstat) || $fstat['size'] < 1) {
+            return null;
+        }
 
-        // compress data if needed
-        if ($this->method->equals(Method::DEFLATE())) {
-            $data = gzdeflate($data);
+        if ($this->maxSize !== null && $this->maxSize < $fstat['size']) {
+            return $this->maxSize;
         }
 
-        $this->zlen = new Bigint(strlen($data));
-        $this->addFileHeader();
-        $this->zip->send($data);
-        $this->addFileFooter();
+        return $fstat['size'];
     }
 
     /**
      * Create and send zip header for this file.
-     *
-     * @return void
-     * @throws \ZipStream\Exception\EncodingException
      */
-    public function addFileHeader(): void
+    private function addFileHeader(): void
     {
-        $name = static::filterFilename($this->name);
-
-        // calculate name length
-        $nameLength = strlen($name);
-
-        // create dos timestamp
-        $time = static::dosTime($this->opt->getTime()->getTimestamp());
-
-        $comment = $this->opt->getComment();
-
-        if (!mb_check_encoding($name, 'ASCII') ||
-            !mb_check_encoding($comment, 'ASCII')) {
-            // Sets Bit 11: Language encoding flag (EFS).  If this bit is set,
-            // the filename and comment fields for this file
-            // MUST be encoded using UTF-8. (see APPENDIX D)
-            if (!mb_check_encoding($name, 'UTF-8') ||
-                !mb_check_encoding($comment, 'UTF-8')) {
-                throw new EncodingException(
-                    'File name and comment should use UTF-8 ' .
-                    'if one of them does not fit into ASCII range.'
-                );
-            }
-            $this->bits |= self::BIT_EFS_UTF8;
-        }
+        $forceEnableZip64 = $this->enableZeroHeader && $this->enableZip64;
 
-        if ($this->method->equals(Method::DEFLATE())) {
-            $this->version = Version::DEFLATE();
-        }
+        $footer = $this->buildZip64ExtraBlock($forceEnableZip64);
 
-        $force = (boolean)($this->bits & self::BIT_ZERO_HEADER) &&
-            $this->zip->opt->isEnableZip64();
+        $zip64Enabled = $footer !== '';
 
-        $footer = $this->buildZip64ExtraBlock($force);
+        if ($zip64Enabled) {
+            $this->version = Version::ZIP64;
+        }
 
-        // If this file will start over 4GB limit in ZIP file,
-        // CDR record will have to use Zip64 extension to describe offset
-        // to keep consistency we use the same value here
-        if ($this->zip->ofs->isOver32()) {
-            $this->version = Version::ZIP64();
+        if ($this->generalPurposeBitFlag & GeneralPurposeBitFlag::EFS) {
+            // Put the tricky entry to
+            // force Linux unzip to lookup EFS flag.
+            $footer .= Zs\ExtendedInformationExtraField::generate();
         }
 
-        $fields = [
-            ['V', ZipStream::FILE_HEADER_SIGNATURE],
-            ['v', $this->version->getValue()],      // Version needed to Extract
-            ['v', $this->bits],                     // General purpose bit flags - data descriptor flag set
-            ['v', $this->method->getValue()],       // Compression method
-            ['V', $time],                           // Timestamp (DOS Format)
-            ['V', $this->crc],                      // CRC32 of data (0 -> moved to data descriptor footer)
-            ['V', $this->zlen->getLowFF($force)],   // Length of compressed data (forced to 0xFFFFFFFF for zero header)
-            ['V', $this->len->getLowFF($force)],    // Length of original data (forced to 0xFFFFFFFF for zero header)
-            ['v', $nameLength],                     // Length of filename
-            ['v', strlen($footer)],                 // Extra data (see above)
-        ];
-
-        // pack fields and calculate "total" length
-        $header = ZipStream::packFields($fields);
-
-        // print header and filename
-        $data = $header . $name . $footer;
-        $this->zip->send($data);
-
-        // save header length
-        $this->hlen = Bigint::init(strlen($data));
+        $data = LocalFileHeader::generate(
+            versionNeededToExtract: $this->version->value,
+            generalPurposeBitFlag: $this->generalPurposeBitFlag,
+            compressionMethod: $this->compressionMethod,
+            lastModificationDateTime: $this->lastModificationDateTime,
+            crc32UncompressedData: $this->crc,
+            compressedSize: $zip64Enabled
+                ? 0xFFFFFFFF
+                : $this->compressedSize,
+            uncompressedSize: $zip64Enabled
+                ? 0xFFFFFFFF
+                : $this->uncompressedSize,
+            fileName: $this->fileName,
+            extraField: $footer,
+        );
+
+
+        ($this->send)($data);
     }
 
     /**
      * Strip characters that are not legal in Windows filenames
      * to prevent compatibility issues
-     *
-     * @param string $filename Unprocessed filename
-     * @return string
      */
-    public static function filterFilename(string $filename): string
-    {
+    private static function filterFilename(
+        /**
+         * Unprocessed filename
+         */
+        string $fileName
+    ): string {
         // strip leading slashes from file name
         // (fixes bug in windows archive viewer)
-        $filename = preg_replace('/^\\/+/', '', $filename);
+        $fileName = ltrim($fileName, '/');
 
-        return str_replace(['\\', ':', '*', '?', '"', '<', '>', '|'], '_', $filename);
+        return str_replace(['\\', ':', '*', '?', '"', '<', '>', '|'], '_', $fileName);
     }
 
-    /**
-     * Convert a UNIX timestamp to a DOS timestamp.
-     *
-     * @param int $when
-     * @return int DOS Timestamp
-     */
-    final protected static function dosTime(int $when): int
+    private function checkEncoding(): void
     {
-        // get date array for timestamp
-        $d = getdate($when);
-
-        // set lower-bound on dates
-        if ($d['year'] < 1980) {
-            $d = array(
-                'year' => 1980,
-                'mon' => 1,
-                'mday' => 1,
-                'hours' => 0,
-                'minutes' => 0,
-                'seconds' => 0
-            );
+        // Sets Bit 11: Language encoding flag (EFS).  If this bit is set,
+        // the filename and comment fields for this file
+        // MUST be encoded using UTF-8. (see APPENDIX D)
+        if (mb_check_encoding($this->fileName, 'UTF-8') &&
+                mb_check_encoding($this->comment, 'UTF-8')) {
+            $this->generalPurposeBitFlag |= GeneralPurposeBitFlag::EFS;
         }
-
-        // remove extra years from 1980
-        $d['year'] -= 1980;
-
-        // return date string
-        return
-            ($d['year'] << 25) |
-            ($d['mon'] << 21) |
-            ($d['mday'] << 16) |
-            ($d['hours'] << 11) |
-            ($d['minutes'] << 5) |
-            ($d['seconds'] >> 1);
     }
 
-    protected function buildZip64ExtraBlock(bool $force = false): string
+    private function buildZip64ExtraBlock(bool $force = false): string
     {
+        $outputZip64ExtraBlock = false;
 
-        $fields = [];
-        if ($this->len->isOver32($force)) {
-            $fields[] = ['P', $this->len];          // Length of original data
+        $originalSize = null;
+        if ($force || $this->uncompressedSize > 0xFFFFFFFF) {
+            $outputZip64ExtraBlock = true;
+            $originalSize = $this->uncompressedSize;
         }
 
-        if ($this->len->isOver32($force)) {
-            $fields[] = ['P', $this->zlen];         // Length of compressed data
+        $compressedSize = null;
+        if ($force || $this->compressedSize > 0xFFFFFFFF) {
+            $outputZip64ExtraBlock = true;
+            $compressedSize = $this->compressedSize;
         }
 
-        if ($this->ofs->isOver32()) {
-            $fields[] = ['P', $this->ofs];          // Offset of local header record
+        // If this file will start over 4GB limit in ZIP file,
+        // CDR record will have to use Zip64 extension to describe offset
+        // to keep consistency we use the same value here
+        $relativeHeaderOffset = null;
+        if ($this->startOffset > 0xFFFFFFFF) {
+            $outputZip64ExtraBlock = true;
+            $relativeHeaderOffset = $this->startOffset;
         }
 
-        if (!empty($fields)) {
-            if (!$this->zip->opt->isEnableZip64()) {
-                throw new OverflowException();
-            }
+        if (!$outputZip64ExtraBlock) {
+            return '';
+        }
 
-            array_unshift(
-                $fields,
-                ['v', 0x0001],                      // 64 bit extension
-                ['v', count($fields) * 8]             // Length of data block
-            );
-            $this->version = Version::ZIP64();
+        if (!$this->enableZip64) {
+            throw new OverflowException();
         }
 
-        return ZipStream::packFields($fields);
+        return Zip64\ExtendedInformationExtraField::generate(
+            originalSize: $originalSize,
+            compressedSize: $compressedSize,
+            relativeHeaderOffset: $relativeHeaderOffset,
+            diskStartNumber: null,
+        );
     }
 
-    /**
-     * Create and send data descriptor footer for this file.
-     *
-     * @return void
-     */
-
-    public function addFileFooter(): void
+    private function addFileFooter(): void
     {
-
-        if ($this->bits & self::BIT_ZERO_HEADER) {
-            // compressed and uncompressed size
-            $sizeFormat = 'V';
-            if ($this->zip->opt->isEnableZip64()) {
-                $sizeFormat = 'P';
-            }
-            $fields = [
-                ['V', ZipStream::DATA_DESCRIPTOR_SIGNATURE],
-                ['V', $this->crc],              // CRC32
-                [$sizeFormat, $this->zlen],     // Length of compressed data
-                [$sizeFormat, $this->len],      // Length of original data
-            ];
-
-            $footer = ZipStream::packFields($fields);
-            $this->zip->send($footer);
-        } else {
-            $footer = '';
+        if (($this->compressedSize > 0xFFFFFFFF || $this->uncompressedSize > 0xFFFFFFFF) && $this->version !== Version::ZIP64) {
+            throw new OverflowException();
         }
-        $this->totalLength = $this->hlen->add($this->zlen)->add(Bigint::init(strlen($footer)));
-        $this->zip->addToCdr($this);
-    }
 
-    public function processStream(StreamInterface $stream): void
-    {
-        $this->zlen = new Bigint();
-        $this->len = new Bigint();
+        if (!$this->enableZeroHeader) {
+            return;
+        }
 
-        if ($this->zip->opt->isZeroHeader()) {
-            $this->processStreamWithZeroHeader($stream);
+        if ($this->version === Version::ZIP64) {
+            $footer = Zip64\DataDescriptor::generate(
+                crc32UncompressedData: $this->crc,
+                compressedSize: $this->compressedSize,
+                uncompressedSize: $this->uncompressedSize,
+            );
         } else {
-            $this->processStreamWithComputedHeader($stream);
+            $footer = DataDescriptor::generate(
+                crc32UncompressedData: $this->crc,
+                compressedSize: $this->compressedSize,
+                uncompressedSize: $this->uncompressedSize,
+            );
         }
-    }
 
-    protected function processStreamWithZeroHeader(StreamInterface $stream): void
-    {
-        $this->bits |= self::BIT_ZERO_HEADER;
-        $this->addFileHeader();
-        $this->readStream($stream, self::COMPUTE | self::SEND);
-        $this->addFileFooter();
+        ($this->send)($footer);
     }
 
-    protected function readStream(StreamInterface $stream, ?int $options = null): void
+    private function readStream(bool $send): void
     {
-        $this->deflateInit();
-        $total = 0;
-        $size = $this->opt->getSize();
-        while (!$stream->eof() && ($size === 0 || $total < $size)) {
-            $data = $stream->read(self::CHUNKED_READ_BLOCK_SIZE);
-            $total += strlen($data);
-            if ($size > 0 && $total > $size) {
-                $data = substr($data, 0 , strlen($data)-($total - $size));
+        $this->compressedSize = 0;
+        $this->uncompressedSize = 0;
+        $hash = hash_init('crc32b');
+
+        $deflate = $this->compressionInit();
+
+        while (
+            !feof($this->unpackStream()) &&
+            ($this->maxSize === null || $this->uncompressedSize < $this->maxSize) &&
+            ($this->exactSize === null || $this->uncompressedSize < $this->exactSize)
+        ) {
+            $readLength = min(
+                ($this->maxSize ?? PHP_INT_MAX) - $this->uncompressedSize,
+                ($this->exactSize ?? PHP_INT_MAX) - $this->uncompressedSize,
+                self::CHUNKED_READ_BLOCK_SIZE
+            );
+
+            $data = fread($this->unpackStream(), $readLength);
+
+            hash_update($hash, $data);
+
+            $this->uncompressedSize += strlen($data);
+
+            if ($deflate) {
+                $data =  deflate_add(
+                    $deflate,
+                    $data,
+                    feof($this->unpackStream()) ? ZLIB_FINISH : ZLIB_NO_FLUSH
+                );
             }
-            $this->deflateData($stream, $data, $options);
-            if ($options & self::SEND) {
-                $this->zip->send($data);
+
+            $this->compressedSize += strlen($data);
+
+            if ($send) {
+                ($this->send)($data);
             }
         }
-        $this->deflateFinish($options);
-    }
 
-    protected function deflateInit(): void
-    {
-        $this->hash = hash_init(self::HASH_ALGORITHM);
-        if ($this->method->equals(Method::DEFLATE())) {
-            $this->deflate = deflate_init(
-                ZLIB_ENCODING_RAW,
-                ['level' => $this->opt->getDeflateLevel()]
-            );
+        if ($this->exactSize !== null && $this->uncompressedSize !== $this->exactSize) {
+            throw new FileSizeIncorrectException(expectedSize: $this->exactSize, actualSize: $this->uncompressedSize);
         }
-    }
 
-    protected function deflateData(StreamInterface $stream, string &$data, ?int $options = null): void
-    {
-        if ($options & self::COMPUTE) {
-            $this->len = $this->len->add(Bigint::init(strlen($data)));
-            hash_update($this->hash, $data);
-        }
-        if ($this->deflate) {
-            $data = deflate_add(
-                $this->deflate,
-                $data,
-                $stream->eof()
-                    ? ZLIB_FINISH
-                    : ZLIB_NO_FLUSH
-            );
-        }
-        if ($options & self::COMPUTE) {
-            $this->zlen = $this->zlen->add(Bigint::init(strlen($data)));
-        }
+        $this->crc = hexdec(hash_final($hash));
     }
 
-    protected function deflateFinish(?int $options = null): void
+    private function compressionInit(): ?DeflateContext
     {
-        if ($options & self::COMPUTE) {
-            $this->crc = hexdec(hash_final($this->hash));
-        }
-    }
+        switch ($this->compressionMethod) {
+            case CompressionMethod::STORE:
+                // Noting to do
+                return null;
+            case CompressionMethod::DEFLATE:
+                $deflateContext = deflate_init(
+                    ZLIB_ENCODING_RAW,
+                    ['level' => $this->deflateLevel]
+                );
 
-    protected function processStreamWithComputedHeader(StreamInterface $stream): void
-    {
-        $this->readStream($stream, self::COMPUTE);
-        $stream->rewind();
-
-        // incremental compression with deflate_add
-        // makes this second read unnecessary
-        // but it is only available from PHP 7.0
-        if (!$this->deflate && $stream instanceof DeflateStream && $this->method->equals(Method::DEFLATE())) {
-            $stream->addDeflateFilter($this->opt);
-            $this->zlen = new Bigint();
-            while (!$stream->eof()) {
-                $data = $stream->read(self::CHUNKED_READ_BLOCK_SIZE);
-                $this->zlen = $this->zlen->add(Bigint::init(strlen($data)));
-            }
-            $stream->rewind();
+                if (!$deflateContext) {
+                    // @codeCoverageIgnoreStart
+                    throw new RuntimeException("Can't initialize deflate context.");
+                    // @codeCoverageIgnoreEnd
+                }
+
+                // False positive, resource is no longer returned from this function
+                return $deflateContext;
+            default:
+                // @codeCoverageIgnoreStart
+                throw new RuntimeException('Unsupported Compression Method ' . print_r($this->compressionMethod, true));
+                // @codeCoverageIgnoreEnd
         }
-
-        $this->addFileHeader();
-        $this->readStream($stream, self::SEND);
-        $this->addFileFooter();
     }
 
-    /**
-     * Send CDR record for specified file.
-     *
-     * @return string
-     */
-    public function getCdrFile(): string
+    private function getCdrFile(): string
     {
-        $name = static::filterFilename($this->name);
-
-        // get attributes
-        $comment = $this->opt->getComment();
-
-        // get dos timestamp
-        $time = static::dosTime($this->opt->getTime()->getTimestamp());
-
         $footer = $this->buildZip64ExtraBlock();
 
-        $fields = [
-            ['V', ZipStream::CDR_FILE_SIGNATURE],   // Central file header signature
-            ['v', ZipStream::ZIP_VERSION_MADE_BY],  // Made by version
-            ['v', $this->version->getValue()],      // Extract by version
-            ['v', $this->bits],                     // General purpose bit flags - data descriptor flag set
-            ['v', $this->method->getValue()],       // Compression method
-            ['V', $time],                           // Timestamp (DOS Format)
-            ['V', $this->crc],                      // CRC32
-            ['V', $this->zlen->getLowFF()],         // Compressed Data Length
-            ['V', $this->len->getLowFF()],          // Original Data Length
-            ['v', strlen($name)],                   // Length of filename
-            ['v', strlen($footer)],                 // Extra data len (see above)
-            ['v', strlen($comment)],                // Length of comment
-            ['v', 0],                               // Disk number
-            ['v', 0],                               // Internal File Attributes
-            ['V', 32],                              // External File Attributes
-            ['V', $this->ofs->getLowFF()]           // Relative offset of local header
-        ];
-
-        // pack fields, then append name and comment
-        $header = ZipStream::packFields($fields);
-
-        return $header . $name . $footer . $comment;
+        return CentralDirectoryFileHeader::generate(
+            versionMadeBy: ZipStream::ZIP_VERSION_MADE_BY,
+            versionNeededToExtract: $this->version->value,
+            generalPurposeBitFlag: $this->generalPurposeBitFlag,
+            compressionMethod: $this->compressionMethod,
+            lastModificationDateTime: $this->lastModificationDateTime,
+            crc32: $this->crc,
+            compressedSize: $this->compressedSize > 0xFFFFFFFF
+                ? 0xFFFFFFFF
+                : $this->compressedSize,
+            uncompressedSize: $this->uncompressedSize > 0xFFFFFFFF
+                ? 0xFFFFFFFF
+                : $this->uncompressedSize,
+            fileName: $this->fileName,
+            extraField: $footer,
+            fileComment: $this->comment,
+            diskNumberStart: 0,
+            internalFileAttributes: 0,
+            externalFileAttributes: 32,
+            relativeOffsetOfLocalHeader: $this->startOffset > 0xFFFFFFFF
+                ? 0xFFFFFFFF
+                : $this->startOffset,
+        );
     }
 
-    /**
-     * @return Bigint
-     */
-    public function getTotalLength(): Bigint
+    private function isSimulation(): bool
     {
-        return $this->totalLength;
+        return $this->operationMode === OperationMode::SIMULATE_LAX || $this->operationMode === OperationMode::SIMULATE_STRICT;
     }
 }
diff --git a/vendor/maennchen/zipstream-php/src/GeneralPurposeBitFlag.php b/vendor/maennchen/zipstream-php/src/GeneralPurposeBitFlag.php
new file mode 100644
index 0000000000..23a66d8899
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/src/GeneralPurposeBitFlag.php
@@ -0,0 +1,89 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream;
+
+/**
+ * @internal
+ */
+abstract class GeneralPurposeBitFlag
+{
+    /**
+     * If set, indicates that the file is encrypted.
+     */
+    public const ENCRYPTED = 1 << 0;
+
+    /**
+     * (For Methods 8 and 9 - Deflating)
+     * Normal (-en) compression option was used.
+     */
+    public const DEFLATE_COMPRESSION_NORMAL = 0 << 1;
+
+    /**
+     * (For Methods 8 and 9 - Deflating)
+     * Maximum (-exx/-ex) compression option was used.
+     */
+    public const DEFLATE_COMPRESSION_MAXIMUM = 1 << 1;
+
+    /**
+     * (For Methods 8 and 9 - Deflating)
+     * Fast (-ef) compression option was used.
+     */
+    public const DEFLATE_COMPRESSION_FAST = 10 << 1;
+
+    /**
+     * (For Methods 8 and 9 - Deflating)
+     * Super Fast (-es) compression option was used.
+     */
+    public const DEFLATE_COMPRESSION_SUPERFAST = 11 << 1;
+
+    /**
+     * If the compression method used was type 14,
+     * LZMA, then this bit, if set, indicates
+     * an end-of-stream (EOS) marker is used to
+     * mark the end of the compressed data stream.
+     * If clear, then an EOS marker is not present
+     * and the compressed data size must be known
+     * to extract.
+     */
+    public const LZMA_EOS = 1 << 1;
+
+    /**
+     * If this bit is set, the fields crc-32, compressed
+     * size and uncompressed size are set to zero in the
+     * local header.  The correct values are put in the
+     * data descriptor immediately following the compressed
+     * data.
+     */
+    public const ZERO_HEADER = 1 << 3;
+
+    /**
+     * If this bit is set, this indicates that the file is
+     * compressed patched data.
+     */
+    public const COMPRESSED_PATCHED_DATA = 1 << 5;
+
+    /**
+     * Strong encryption. If this bit is set, you MUST
+     * set the version needed to extract value to at least
+     * 50 and you MUST also set bit 0.  If AES encryption
+     * is used, the version needed to extract value MUST
+     * be at least 51.
+     */
+    public const STRONG_ENCRYPTION = 1 << 6;
+
+    /**
+     * Language encoding flag (EFS).  If this bit is set,
+     * the filename and comment fields for this file
+     * MUST be encoded using UTF-8.
+     */
+    public const EFS = 1 << 11;
+
+    /**
+     * Set when encrypting the Central Directory to indicate
+     * selected data values in the Local Header are masked to
+     * hide their actual values.
+     */
+    public const ENCRYPT_CENTRAL_DIRECTORY = 1 << 13;
+}
diff --git a/vendor/maennchen/zipstream-php/src/LocalFileHeader.php b/vendor/maennchen/zipstream-php/src/LocalFileHeader.php
new file mode 100644
index 0000000000..e08b656107
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/src/LocalFileHeader.php
@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream;
+
+use DateTimeInterface;
+
+/**
+ * @internal
+ */
+abstract class LocalFileHeader
+{
+    private const SIGNATURE = 0x04034b50;
+
+    public static function generate(
+        int $versionNeededToExtract,
+        int $generalPurposeBitFlag,
+        CompressionMethod $compressionMethod,
+        DateTimeInterface $lastModificationDateTime,
+        int $crc32UncompressedData,
+        int $compressedSize,
+        int $uncompressedSize,
+        string $fileName,
+        string $extraField,
+    ): string {
+        return PackField::pack(
+            new PackField(format: 'V', value: self::SIGNATURE),
+            new PackField(format: 'v', value: $versionNeededToExtract),
+            new PackField(format: 'v', value: $generalPurposeBitFlag),
+            new PackField(format: 'v', value: $compressionMethod->value),
+            new PackField(format: 'V', value: Time::dateTimeToDosTime($lastModificationDateTime)),
+            new PackField(format: 'V', value: $crc32UncompressedData),
+            new PackField(format: 'V', value: $compressedSize),
+            new PackField(format: 'V', value: $uncompressedSize),
+            new PackField(format: 'v', value: strlen($fileName)),
+            new PackField(format: 'v', value: strlen($extraField)),
+        ) . $fileName . $extraField;
+    }
+}
diff --git a/vendor/maennchen/zipstream-php/src/OperationMode.php b/vendor/maennchen/zipstream-php/src/OperationMode.php
new file mode 100644
index 0000000000..dd650f0702
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/src/OperationMode.php
@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream;
+
+/**
+ * ZipStream execution operation modes
+ */
+enum OperationMode
+{
+    /**
+     * Stream file into output stream
+     */
+    case NORMAL;
+
+    /**
+     * Simulate the zip to figure out the resulting file size
+     *
+     * This only supports entries where the file size is known beforehand and
+     * deflation is disabled.
+     */
+    case SIMULATE_STRICT;
+
+    /**
+     * Simulate the zip to figure out the resulting file size
+     *
+     * If the file size is not known beforehand or deflation is enabled, the
+     * entry streams will be read and rewound.
+     *
+     * If the entry does not support rewinding either, you will not be able to
+     * use the same stream in a later operation mode like `NORMAL`.
+     */
+    case SIMULATE_LAX;
+}
diff --git a/vendor/maennchen/zipstream-php/src/Option/Archive.php b/vendor/maennchen/zipstream-php/src/Option/Archive.php
deleted file mode 100644
index b6b95cce54..0000000000
--- a/vendor/maennchen/zipstream-php/src/Option/Archive.php
+++ /dev/null
@@ -1,261 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace ZipStream\Option;
-
-final class Archive
-{
-    const DEFAULT_DEFLATE_LEVEL = 6;
-    /**
-     * @var string
-     */
-    private $comment = '';
-    /**
-     * Size, in bytes, of the largest file to try
-     * and load into memory (used by
-     * addFileFromPath()).  Large files may also
-     * be compressed differently; see the
-     * 'largeFileMethod' option. Default is ~20 Mb.
-     *
-     * @var int
-     */
-    private $largeFileSize = 20 * 1024 * 1024;
-    /**
-     * How to handle large files.  Legal values are
-     * Method::STORE() (the default), or
-     * Method::DEFLATE(). STORE sends the file
-     * raw and is significantly
-     * faster, while DEFLATE compresses the file
-     * and is much, much slower. Note that DEFLATE
-     * must compress the file twice and is extremely slow.
-     *
-     * @var Method
-     */
-    private $largeFileMethod;
-    /**
-     * Boolean indicating whether or not to send
-     * the HTTP headers for this file.
-     *
-     * @var bool
-     */
-    private $sendHttpHeaders = false;
-    /**
-     * The method called to send headers
-     *
-     * @var Callable
-     */
-    private $httpHeaderCallback = 'header';
-    /**
-     * Enable Zip64 extension, supporting very large
-     * archives (any size > 4 GB or file count > 64k)
-     *
-     * @var bool
-     */
-    private $enableZip64 = true;
-    /**
-     * Enable streaming files with single read where
-     * general purpose bit 3 indicates local file header
-     * contain zero values in crc and size fields,
-     * these appear only after file contents
-     * in data descriptor block.
-     *
-     * @var bool
-     */
-    private $zeroHeader = false;
-    /**
-     * Enable reading file stat for determining file size.
-     * When a 32-bit system reads file size that is
-     * over 2 GB, invalid value appears in file size
-     * due to integer overflow. Should be disabled on
-     * 32-bit systems with method addFileFromPath
-     * if any file may exceed 2 GB. In this case file
-     * will be read in blocks and correct size will be
-     * determined from content.
-     *
-     * @var bool
-     */
-    private $statFiles = true;
-    /**
-     * Enable flush after every write to output stream.
-     * @var bool
-     */
-    private $flushOutput = false;
-    /**
-     * HTTP Content-Disposition.  Defaults to
-     * 'attachment', where
-     * FILENAME is the specified filename.
-     *
-     * Note that this does nothing if you are
-     * not sending HTTP headers.
-     *
-     * @var string
-     */
-    private $contentDisposition = 'attachment';
-    /**
-     * Note that this does nothing if you are
-     * not sending HTTP headers.
-     *
-     * @var string
-     */
-    private $contentType = 'application/x-zip';
-    /**
-     * @var int
-     */
-    private $deflateLevel = 6;
-
-    /**
-     * @var resource
-     */
-    private $outputStream;
-
-    /**
-     * Options constructor.
-     */
-    public function __construct()
-    {
-        $this->largeFileMethod = Method::STORE();
-        $this->outputStream = fopen('php://output', 'wb');
-    }
-
-    public function getComment(): string
-    {
-        return $this->comment;
-    }
-
-    public function setComment(string $comment): void
-    {
-        $this->comment = $comment;
-    }
-
-    public function getLargeFileSize(): int
-    {
-        return $this->largeFileSize;
-    }
-
-    public function setLargeFileSize(int $largeFileSize): void
-    {
-        $this->largeFileSize = $largeFileSize;
-    }
-
-    public function getLargeFileMethod(): Method
-    {
-        return $this->largeFileMethod;
-    }
-
-    public function setLargeFileMethod(Method $largeFileMethod): void
-    {
-        $this->largeFileMethod = $largeFileMethod;
-    }
-
-    public function isSendHttpHeaders(): bool
-    {
-        return $this->sendHttpHeaders;
-    }
-
-    public function setSendHttpHeaders(bool $sendHttpHeaders): void
-    {
-        $this->sendHttpHeaders = $sendHttpHeaders;
-    }
-
-    public function getHttpHeaderCallback(): Callable
-    {
-        return $this->httpHeaderCallback;
-    }
-
-    public function setHttpHeaderCallback(Callable $httpHeaderCallback): void
-    {
-        $this->httpHeaderCallback = $httpHeaderCallback;
-    }
-
-    public function isEnableZip64(): bool
-    {
-        return $this->enableZip64;
-    }
-
-    public function setEnableZip64(bool $enableZip64): void
-    {
-        $this->enableZip64 = $enableZip64;
-    }
-
-    public function isZeroHeader(): bool
-    {
-        return $this->zeroHeader;
-    }
-
-    public function setZeroHeader(bool $zeroHeader): void
-    {
-        $this->zeroHeader = $zeroHeader;
-    }
-
-    public function isFlushOutput(): bool
-    {
-        return $this->flushOutput;
-    }
-
-    public function setFlushOutput(bool $flushOutput): void
-    {
-        $this->flushOutput = $flushOutput;
-    }
-
-    public function isStatFiles(): bool
-    {
-        return $this->statFiles;
-    }
-
-    public function setStatFiles(bool $statFiles): void
-    {
-        $this->statFiles = $statFiles;
-    }
-
-    public function getContentDisposition(): string
-    {
-        return $this->contentDisposition;
-    }
-
-    public function setContentDisposition(string $contentDisposition): void
-    {
-        $this->contentDisposition = $contentDisposition;
-    }
-
-    public function getContentType(): string
-    {
-        return $this->contentType;
-    }
-
-    public function setContentType(string $contentType): void
-    {
-        $this->contentType = $contentType;
-    }
-
-    /**
-     * @return resource
-     */
-    public function getOutputStream()
-    {
-        return $this->outputStream;
-    }
-
-    /**
-     * @param resource $outputStream
-     */
-    public function setOutputStream($outputStream): void
-    {
-        $this->outputStream = $outputStream;
-    }
-
-    /**
-     * @return int
-     */
-    public function getDeflateLevel(): int
-    {
-        return $this->deflateLevel;
-    }
-
-    /**
-     * @param int $deflateLevel
-     */
-    public function setDeflateLevel(int $deflateLevel): void
-    {
-        $this->deflateLevel = $deflateLevel;
-    }
-}
diff --git a/vendor/maennchen/zipstream-php/src/Option/File.php b/vendor/maennchen/zipstream-php/src/Option/File.php
deleted file mode 100644
index 7fd29ea55c..0000000000
--- a/vendor/maennchen/zipstream-php/src/Option/File.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace ZipStream\Option;
-
-use DateTime;
-
-final class File
-{
-    /**
-     * @var string
-     */
-    private $comment = '';
-    /**
-     * @var Method
-     */
-    private $method;
-    /**
-     * @var int
-     */
-    private $deflateLevel;
-    /**
-     * @var DateTime
-     */
-    private $time;
-    /**
-     * @var int
-     */
-    private $size = 0;
-
-    public function defaultTo(Archive $archiveOptions): void
-    {
-        $this->deflateLevel = $this->deflateLevel ?: $archiveOptions->getDeflateLevel();
-        $this->time = $this->time ?: new DateTime();
-    }
-
-    /**
-     * @return string
-     */
-    public function getComment(): string
-    {
-        return $this->comment;
-    }
-
-    /**
-     * @param string $comment
-     */
-    public function setComment(string $comment): void
-    {
-        $this->comment = $comment;
-    }
-
-    /**
-     * @return Method
-     */
-    public function getMethod(): Method
-    {
-        return $this->method ?: Method::DEFLATE();
-    }
-
-    /**
-     * @param Method $method
-     */
-    public function setMethod(Method $method): void
-    {
-        $this->method = $method;
-    }
-
-    /**
-     * @return int
-     */
-    public function getDeflateLevel(): int
-    {
-        return $this->deflateLevel ?: Archive::DEFAULT_DEFLATE_LEVEL;
-    }
-
-    /**
-     * @param int $deflateLevel
-     */
-    public function setDeflateLevel(int $deflateLevel): void
-    {
-        $this->deflateLevel = $deflateLevel;
-    }
-
-    /**
-     * @return DateTime
-     */
-    public function getTime(): DateTime
-    {
-        return $this->time;
-    }
-
-    /**
-     * @param DateTime $time
-     */
-    public function setTime(DateTime $time): void
-    {
-        $this->time = $time;
-    }
-
-    /**
-     * @return int
-     */
-    public function getSize(): int
-    {
-        return $this->size;
-    }
-
-    /**
-     * @param int $size
-     */
-    public function setSize(int $size): void
-    {
-        $this->size = $size;
-    }
-}
diff --git a/vendor/maennchen/zipstream-php/src/Option/Method.php b/vendor/maennchen/zipstream-php/src/Option/Method.php
deleted file mode 100644
index bbec84c00d..0000000000
--- a/vendor/maennchen/zipstream-php/src/Option/Method.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace ZipStream\Option;
-
-use MyCLabs\Enum\Enum;
-
-/**
- * Methods enum
- *
- * @method static STORE(): Method
- * @method static DEFLATE(): Method
- * @psalm-immutable
- */
-class Method extends Enum
-{
-    const STORE = 0x00;
-    const DEFLATE = 0x08;
-}
diff --git a/vendor/maennchen/zipstream-php/src/Option/Version.php b/vendor/maennchen/zipstream-php/src/Option/Version.php
deleted file mode 100644
index ba2144246e..0000000000
--- a/vendor/maennchen/zipstream-php/src/Option/Version.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace ZipStream\Option;
-
-use MyCLabs\Enum\Enum;
-
-/**
- * Class Version
- * @package ZipStream\Option
- *
- * @method static STORE(): Version
- * @method static DEFLATE(): Version
- * @method static ZIP64(): Version
- * @psalm-immutable
- */
-class Version extends Enum
-{
-    const STORE = 0x000A; // 1.00
-    const DEFLATE = 0x0014; // 2.00
-    const ZIP64 = 0x002D; // 4.50
-}
diff --git a/vendor/maennchen/zipstream-php/src/PackField.php b/vendor/maennchen/zipstream-php/src/PackField.php
new file mode 100644
index 0000000000..892b4009a6
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/src/PackField.php
@@ -0,0 +1,56 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream;
+
+use RuntimeException;
+
+/**
+ * @internal
+ * TODO: Make class readonly when requiring PHP 8.2 exclusively
+ */
+class PackField
+{
+    public const MAX_V = 0xFFFFFFFF;
+
+    public const MAX_v = 0xFFFF;
+
+    public function __construct(
+        public readonly string $format,
+        public readonly int|string $value
+    ) {}
+
+    /**
+     * Create a format string and argument list for pack(), then call
+     * pack() and return the result.
+     */
+    public static function pack(self ...$fields): string
+    {
+        $fmt = array_reduce($fields, function (string $acc, self $field) {
+            return $acc . $field->format;
+        }, '');
+
+        $args = array_map(function (self $field) {
+            switch ($field->format) {
+                case 'V':
+                    if ($field->value > self::MAX_V) {
+                        throw new RuntimeException(print_r($field->value, true) . ' is larger than 32 bits');
+                    }
+                    break;
+                case 'v':
+                    if ($field->value > self::MAX_v) {
+                        throw new RuntimeException(print_r($field->value, true) . ' is larger than 16 bits');
+                    }
+                    break;
+                case 'P': break;
+                default:
+                    break;
+            }
+
+            return $field->value;
+        }, $fields);
+
+        return pack($fmt, ...$args);
+    }
+}
diff --git a/vendor/maennchen/zipstream-php/src/Stream.php b/vendor/maennchen/zipstream-php/src/Stream.php
deleted file mode 100644
index bf410a3425..0000000000
--- a/vendor/maennchen/zipstream-php/src/Stream.php
+++ /dev/null
@@ -1,253 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace ZipStream;
-
-use Psr\Http\Message\StreamInterface;
-use RuntimeException;
-
-/**
- * Describes a data stream.
- *
- * Typically, an instance will wrap a PHP stream; this interface provides
- * a wrapper around the most common operations, including serialization of
- * the entire stream to a string.
- */
-class Stream implements StreamInterface
-{
-    protected $stream;
-
-    public function __construct($stream)
-    {
-        $this->stream = $stream;
-    }
-
-    /**
-     * Closes the stream and any underlying resources.
-     *
-     * @return void
-     */
-    public function close(): void
-    {
-        if (is_resource($this->stream)) {
-            fclose($this->stream);
-        }
-        $this->detach();
-    }
-
-    /**
-     * Separates any underlying resources from the stream.
-     *
-     * After the stream has been detached, the stream is in an unusable state.
-     *
-     * @return resource|null Underlying PHP stream, if any
-     */
-    public function detach()
-    {
-        $result = $this->stream;
-        $this->stream = null;
-        return $result;
-    }
-
-    /**
-     * Reads all data from the stream into a string, from the beginning to end.
-     *
-     * This method MUST attempt to seek to the beginning of the stream before
-     * reading data and read the stream until the end is reached.
-     *
-     * Warning: This could attempt to load a large amount of data into memory.
-     *
-     * This method MUST NOT raise an exception in order to conform with PHP's
-     * string casting operations.
-     *
-     * @see http://php.net/manual/en/language.oop5.magic.php#object.tostring
-     * @return string
-     */
-    public function __toString(): string
-    {
-        try {
-            $this->seek(0);
-        } catch (\RuntimeException $e) {}
-        return (string) stream_get_contents($this->stream);
-    }
-
-    /**
-     * Seek to a position in the stream.
-     *
-     * @link http://www.php.net/manual/en/function.fseek.php
-     * @param int $offset Stream offset
-     * @param int $whence Specifies how the cursor position will be calculated
-     *     based on the seek offset. Valid values are identical to the built-in
-     *     PHP $whence values for `fseek()`.  SEEK_SET: Set position equal to
-     *     offset bytes SEEK_CUR: Set position to current location plus offset
-     *     SEEK_END: Set position to end-of-stream plus offset.
-     * @throws \RuntimeException on failure.
-     */
-    public function seek($offset, $whence = SEEK_SET): void
-    {
-        if (!$this->isSeekable()) {
-            throw new RuntimeException;
-        }
-        if (fseek($this->stream, $offset, $whence) !== 0) {
-            throw new RuntimeException;
-        }
-    }
-
-    /**
-     * Returns whether or not the stream is seekable.
-     *
-     * @return bool
-     */
-    public function isSeekable(): bool
-    {
-        return (bool)$this->getMetadata('seekable');
-    }
-
-    /**
-     * Get stream metadata as an associative array or retrieve a specific key.
-     *
-     * The keys returned are identical to the keys returned from PHP's
-     * stream_get_meta_data() function.
-     *
-     * @link http://php.net/manual/en/function.stream-get-meta-data.php
-     * @param string $key Specific metadata to retrieve.
-     * @return array|mixed|null Returns an associative array if no key is
-     *     provided. Returns a specific key value if a key is provided and the
-     *     value is found, or null if the key is not found.
-     */
-    public function getMetadata($key = null)
-    {
-        $metadata = stream_get_meta_data($this->stream);
-        return $key !== null ? @$metadata[$key] : $metadata;
-    }
-
-    /**
-     * Get the size of the stream if known.
-     *
-     * @return int|null Returns the size in bytes if known, or null if unknown.
-     */
-    public function getSize(): ?int
-    {
-        $stats = fstat($this->stream);
-        return $stats['size'];
-    }
-
-    /**
-     * Returns the current position of the file read/write pointer
-     *
-     * @return int Position of the file pointer
-     * @throws \RuntimeException on error.
-     */
-    public function tell(): int
-    {
-        $position = ftell($this->stream);
-        if ($position === false) {
-            throw new RuntimeException;
-        }
-        return $position;
-    }
-
-    /**
-     * Returns true if the stream is at the end of the stream.
-     *
-     * @return bool
-     */
-    public function eof(): bool
-    {
-        return feof($this->stream);
-    }
-
-    /**
-     * Seek to the beginning of the stream.
-     *
-     * If the stream is not seekable, this method will raise an exception;
-     * otherwise, it will perform a seek(0).
-     *
-     * @see seek()
-     * @link http://www.php.net/manual/en/function.fseek.php
-     * @throws \RuntimeException on failure.
-     */
-    public function rewind(): void
-    {
-        $this->seek(0);
-    }
-
-    /**
-     * Write data to the stream.
-     *
-     * @param string $string The string that is to be written.
-     * @return int Returns the number of bytes written to the stream.
-     * @throws \RuntimeException on failure.
-     */
-    public function write($string): int
-    {
-        if (!$this->isWritable()) {
-            throw new RuntimeException;
-        }
-        if (fwrite($this->stream, $string) === false) {
-            throw new RuntimeException;
-        }
-        return \mb_strlen($string);
-    }
-
-    /**
-     * Returns whether or not the stream is writable.
-     *
-     * @return bool
-     */
-    public function isWritable(): bool
-    {
-        return preg_match('/[waxc+]/', $this->getMetadata('mode')) === 1;
-    }
-
-    /**
-     * Read data from the stream.
-     *
-     * @param int $length Read up to $length bytes from the object and return
-     *     them. Fewer than $length bytes may be returned if underlying stream
-     *     call returns fewer bytes.
-     * @return string Returns the data read from the stream, or an empty string
-     *     if no bytes are available.
-     * @throws \RuntimeException if an error occurs.
-     */
-    public function read($length): string
-    {
-        if (!$this->isReadable()) {
-            throw new RuntimeException;
-        }
-        $result = fread($this->stream, $length);
-        if ($result === false) {
-            throw new RuntimeException;
-        }
-        return $result;
-    }
-
-    /**
-     * Returns whether or not the stream is readable.
-     *
-     * @return bool
-     */
-    public function isReadable(): bool
-    {
-        return preg_match('/[r+]/', $this->getMetadata('mode')) === 1;
-    }
-
-    /**
-     * Returns the remaining contents in a string
-     *
-     * @return string
-     * @throws \RuntimeException if unable to read or an error occurs while
-     *     reading.
-     */
-    public function getContents(): string
-    {
-        if (!$this->isReadable()) {
-            throw new RuntimeException;
-        }
-        $result = stream_get_contents($this->stream);
-        if ($result === false) {
-            throw new RuntimeException;
-        }
-        return $result;
-    }
-}
diff --git a/vendor/maennchen/zipstream-php/src/Time.php b/vendor/maennchen/zipstream-php/src/Time.php
new file mode 100644
index 0000000000..1b4121ca9f
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/src/Time.php
@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream;
+
+use DateInterval;
+use DateTimeImmutable;
+use DateTimeInterface;
+use ZipStream\Exception\DosTimeOverflowException;
+
+/**
+ * @internal
+ */
+abstract class Time
+{
+    private const DOS_MINIMUM_DATE = '1980-01-01 00:00:00Z';
+
+    public static function dateTimeToDosTime(DateTimeInterface $dateTime): int
+    {
+        $dosMinimumDate = new DateTimeImmutable(self::DOS_MINIMUM_DATE);
+
+        if ($dateTime->getTimestamp() < $dosMinimumDate->getTimestamp()) {
+            throw new DosTimeOverflowException(dateTime: $dateTime);
+        }
+
+        $dateTime = DateTimeImmutable::createFromInterface($dateTime)->sub(new DateInterval('P1980Y'));
+
+        [$year, $month, $day, $hour, $minute, $second] = explode(' ', $dateTime->format('Y n j G i s'));
+
+        return
+            ((int) $year << 25) |
+            ((int) $month << 21) |
+            ((int) $day << 16) |
+            ((int) $hour << 11) |
+            ((int) $minute << 5) |
+            ((int) $second >> 1);
+    }
+}
diff --git a/vendor/maennchen/zipstream-php/src/Version.php b/vendor/maennchen/zipstream-php/src/Version.php
new file mode 100644
index 0000000000..c014f8a104
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/src/Version.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream;
+
+enum Version: int
+{
+    case STORE = 0x000A; // 1.00
+    case DEFLATE = 0x0014; // 2.00
+    case ZIP64 = 0x002D; // 4.50
+}
diff --git a/vendor/maennchen/zipstream-php/src/Zip64/DataDescriptor.php b/vendor/maennchen/zipstream-php/src/Zip64/DataDescriptor.php
new file mode 100644
index 0000000000..041c5579d7
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/src/Zip64/DataDescriptor.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Zip64;
+
+use ZipStream\PackField;
+
+/**
+ * @internal
+ */
+abstract class DataDescriptor
+{
+    private const SIGNATURE = 0x08074b50;
+
+    public static function generate(
+        int $crc32UncompressedData,
+        int $compressedSize,
+        int $uncompressedSize,
+    ): string {
+        return PackField::pack(
+            new PackField(format: 'V', value: self::SIGNATURE),
+            new PackField(format: 'V', value: $crc32UncompressedData),
+            new PackField(format: 'P', value: $compressedSize),
+            new PackField(format: 'P', value: $uncompressedSize),
+        );
+    }
+}
diff --git a/vendor/maennchen/zipstream-php/src/Zip64/EndOfCentralDirectory.php b/vendor/maennchen/zipstream-php/src/Zip64/EndOfCentralDirectory.php
new file mode 100644
index 0000000000..08588e49cd
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/src/Zip64/EndOfCentralDirectory.php
@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Zip64;
+
+use ZipStream\PackField;
+
+/**
+ * @internal
+ */
+abstract class EndOfCentralDirectory
+{
+    private const SIGNATURE = 0x06064b50;
+
+    public static function generate(
+        int $versionMadeBy,
+        int $versionNeededToExtract,
+        int $numberOfThisDisk,
+        int $numberOfTheDiskWithCentralDirectoryStart,
+        int $numberOfCentralDirectoryEntriesOnThisDisk,
+        int $numberOfCentralDirectoryEntries,
+        int $sizeOfCentralDirectory,
+        int $centralDirectoryStartOffsetOnDisk,
+        string $extensibleDataSector,
+    ): string {
+        $recordSize = 44 + strlen($extensibleDataSector); // (length of block - 12) = 44;
+
+        /** @psalm-suppress MixedArgument */
+        return PackField::pack(
+            new PackField(format: 'V', value: static::SIGNATURE),
+            new PackField(format: 'P', value: $recordSize),
+            new PackField(format: 'v', value: $versionMadeBy),
+            new PackField(format: 'v', value: $versionNeededToExtract),
+            new PackField(format: 'V', value: $numberOfThisDisk),
+            new PackField(format: 'V', value: $numberOfTheDiskWithCentralDirectoryStart),
+            new PackField(format: 'P', value: $numberOfCentralDirectoryEntriesOnThisDisk),
+            new PackField(format: 'P', value: $numberOfCentralDirectoryEntries),
+            new PackField(format: 'P', value: $sizeOfCentralDirectory),
+            new PackField(format: 'P', value: $centralDirectoryStartOffsetOnDisk),
+        ) . $extensibleDataSector;
+    }
+}
diff --git a/vendor/maennchen/zipstream-php/src/Zip64/EndOfCentralDirectoryLocator.php b/vendor/maennchen/zipstream-php/src/Zip64/EndOfCentralDirectoryLocator.php
new file mode 100644
index 0000000000..ef431c347f
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/src/Zip64/EndOfCentralDirectoryLocator.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Zip64;
+
+use ZipStream\PackField;
+
+/**
+ * @internal
+ */
+abstract class EndOfCentralDirectoryLocator
+{
+    private const SIGNATURE = 0x07064b50;
+
+    public static function generate(
+        int $numberOfTheDiskWithZip64CentralDirectoryStart,
+        int $zip64centralDirectoryStartOffsetOnDisk,
+        int $totalNumberOfDisks,
+    ): string {
+        /** @psalm-suppress MixedArgument */
+        return PackField::pack(
+            new PackField(format: 'V', value: static::SIGNATURE),
+            new PackField(format: 'V', value: $numberOfTheDiskWithZip64CentralDirectoryStart),
+            new PackField(format: 'P', value: $zip64centralDirectoryStartOffsetOnDisk),
+            new PackField(format: 'V', value: $totalNumberOfDisks),
+        );
+    }
+}
diff --git a/vendor/maennchen/zipstream-php/src/Zip64/ExtendedInformationExtraField.php b/vendor/maennchen/zipstream-php/src/Zip64/ExtendedInformationExtraField.php
new file mode 100644
index 0000000000..aaac51c83c
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/src/Zip64/ExtendedInformationExtraField.php
@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Zip64;
+
+use ZipStream\PackField;
+
+/**
+ * @internal
+ */
+abstract class ExtendedInformationExtraField
+{
+    private const TAG = 0x0001;
+
+    public static function generate(
+        ?int $originalSize = null,
+        ?int $compressedSize = null,
+        ?int $relativeHeaderOffset = null,
+        ?int $diskStartNumber = null,
+    ): string {
+        return PackField::pack(
+            new PackField(format: 'v', value: self::TAG),
+            new PackField(
+                format: 'v',
+                value: ($originalSize === null ? 0 : 8) +
+                    ($compressedSize === null ? 0 : 8) +
+                    ($relativeHeaderOffset === null ? 0 : 8) +
+                    ($diskStartNumber === null ? 0 : 4)
+            ),
+            ...($originalSize === null ? [] : [
+                new PackField(format: 'P', value: $originalSize),
+            ]),
+            ...($compressedSize === null ? [] : [
+                new PackField(format: 'P', value: $compressedSize),
+            ]),
+            ...($relativeHeaderOffset === null ? [] : [
+                new PackField(format: 'P', value: $relativeHeaderOffset),
+            ]),
+            ...($diskStartNumber === null ? [] : [
+                new PackField(format: 'V', value: $diskStartNumber),
+            ]),
+        );
+    }
+}
diff --git a/vendor/maennchen/zipstream-php/src/ZipStream.php b/vendor/maennchen/zipstream-php/src/ZipStream.php
index e83038cf01..3f4f481a80 100644
--- a/vendor/maennchen/zipstream-php/src/ZipStream.php
+++ b/vendor/maennchen/zipstream-php/src/ZipStream.php
@@ -1,59 +1,69 @@
 <?php
+
 declare(strict_types=1);
 
 namespace ZipStream;
 
+use Closure;
+use DateTimeImmutable;
+use DateTimeInterface;
+use GuzzleHttp\Psr7\StreamWrapper;
 use Psr\Http\Message\StreamInterface;
+use RuntimeException;
+use ZipStream\Exception\FileNotFoundException;
+use ZipStream\Exception\FileNotReadableException;
 use ZipStream\Exception\OverflowException;
-use ZipStream\Option\Archive as ArchiveOptions;
-use ZipStream\Option\File as FileOptions;
-use ZipStream\Option\Version;
+use ZipStream\Exception\ResourceActionException;
 
 /**
- * ZipStream
- *
  * Streamed, dynamically generated zip archives.
  *
- * Usage:
+ * ## Usage
  *
  * Streaming zip archives is a simple, three-step process:
  *
  * 1.  Create the zip stream:
  *
- *     $zip = new ZipStream('example.zip');
+ * ```php
+ * $zip = new ZipStream(outputName: 'example.zip');
+ * ```
  *
  * 2.  Add one or more files to the archive:
  *
- *      * add first file
- *     $data = file_get_contents('some_file.gif');
- *     $zip->addFile('some_file.gif', $data);
+ * ```php
+ * // add first file
+ * $zip->addFile(fileName: 'world.txt', data: 'Hello World');
  *
- *      * add second file
- *     $data = file_get_contents('some_file.gif');
- *     $zip->addFile('another_file.png', $data);
+ * // add second file
+ * $zip->addFile(fileName: 'moon.txt', data: 'Hello Moon');
+ * ```
  *
  * 3.  Finish the zip stream:
  *
- *     $zip->finish();
+ * ```php
+ * $zip->finish();
+ * ```
  *
  * You can also add an archive comment, add comments to individual files,
  * and adjust the timestamp of files. See the API documentation for each
  * method below for additional information.
  *
- * Example:
+ * ## Example
  *
- *   // create a new zip stream object
- *   $zip = new ZipStream('some_files.zip');
+ * ```php
+ * // create a new zip stream object
+ * $zip = new ZipStream(outputName: 'some_files.zip');
  *
- *   // list of local files
- *   $files = array('foo.txt', 'bar.jpg');
+ * // list of local files
+ * $files = array('foo.txt', 'bar.jpg');
  *
- *   // read and add each file to the archive
- *   foreach ($files as $path)
- *     $zip->addFile($path, file_get_contents($path));
+ * // read and add each file to the archive
+ * foreach ($files as $path)
+ *   $zip->addFileFromPath(fileName: $path, $path);
  *
- *   // write archive footer to stream
- *   $zip->finish();
+ * // write archive footer to stream
+ * $zip->finish();
+ * ```
  */
 class ZipStream
 {
@@ -79,521 +89,777 @@ class ZipStream
      * Here we are using 6 for the OS, indicating OS/2 H.P.F.S.
      * to prevent file permissions issues upon extract (see #84)
      * 0x603 is 00000110 00000011 in binary, so 6 and 3
-     */
-    const ZIP_VERSION_MADE_BY = 0x603;
-
-    /**
-     * The following signatures end with 0x4b50, which in ASCII is PK,
-     * the initials of the inventor Phil Katz.
-     * See https://en.wikipedia.org/wiki/Zip_(file_format)#File_headers
-     */
-    const FILE_HEADER_SIGNATURE = 0x04034b50;
-    const CDR_FILE_SIGNATURE = 0x02014b50;
-    const CDR_EOF_SIGNATURE = 0x06054b50;
-    const DATA_DESCRIPTOR_SIGNATURE = 0x08074b50;
-    const ZIP64_CDR_EOF_SIGNATURE = 0x06064b50;
-    const ZIP64_CDR_LOCATOR_SIGNATURE = 0x07064b50;
-
-    /**
-     * Global Options
      *
-     * @var ArchiveOptions
+     * @internal
      */
-    public $opt;
+    public const ZIP_VERSION_MADE_BY = 0x603;
 
-    /**
-     * @var array
-     */
-    public $files = [];
+    private bool $ready = true;
 
-    /**
-     * @var Bigint
-     */
-    public $cdr_ofs;
+    private int $offset = 0;
 
     /**
-     * @var Bigint
+     * @var string[]
      */
-    public $ofs;
+    private array $centralDirectoryRecords = [];
 
     /**
-     * @var bool
+     * @var resource
      */
-    protected $need_headers;
+    private $outputStream;
+
+    private readonly Closure $httpHeaderCallback;
 
     /**
-     * @var null|String
+     * @var File[]
      */
-    protected $output_name;
+    private array $recordedSimulation = [];
 
     /**
      * Create a new ZipStream object.
      *
-     * Parameters:
+     * ##### Examples
+     *
+     * ```php
+     * // create a new zip file named 'foo.zip'
+     * $zip = new ZipStream(outputName: 'foo.zip');
+     *
+     * // create a new zip file named 'bar.zip' with a comment
+     * $zip = new ZipStream(
+     *   outputName: 'bar.zip',
+     *   comment: 'this is a comment for the zip file.',
+     * );
+     * ```
+     *
+     * @param OperationMode $operationMode
+     * The mode can be used to switch between `NORMAL` and `SIMULATION_*` modes.
+     * For details see the `OperationMode` documentation.
+     *
+     * Default to `NORMAL`.
+     *
+     * @param string $comment
+     * Archive Level Comment
+     *
+     * @param StreamInterface|resource|null $outputStream
+     * Override the output of the archive to a different target.
+     *
+     * By default the archive is sent to `STDOUT`.
+     *
+     * @param CompressionMethod $defaultCompressionMethod
+     * How to handle file compression. Legal values are
+     * `CompressionMethod::DEFLATE` (the default), or
+     * `CompressionMethod::STORE`. `STORE` sends the file raw and is
+     * significantly faster, while `DEFLATE` compresses the file and
+     * is much, much slower.
+     *
+     * @param int $defaultDeflateLevel
+     * Default deflation level. Only relevant if `compressionMethod`
+     * is `DEFLATE`.
+     *
+     * See details of [`deflate_init`](https://www.php.net/manual/en/function.deflate-init.php#refsect1-function.deflate-init-parameters)
      *
-     * @param String $name - Name of output file (optional).
-     * @param ArchiveOptions $opt - Archive Options
+     * @param bool $enableZip64
+     * Enable Zip64 extension, supporting very large
+     * archives (any size > 4 GB or file count > 64k)
      *
-     * Large File Support:
+     * @param bool $defaultEnableZeroHeader
+     * Enable streaming files with single read.
      *
-     * By default, the method addFileFromPath() will send send files
-     * larger than 20 megabytes along raw rather than attempting to
-     * compress them.  You can change both the maximum size and the
-     * compression behavior using the largeFile* options above, with the
-     * following caveats:
+     * When the zero header is set, the file is streamed into the output
+     * and the size & checksum are added at the end of the file. This is the
+     * fastest method and uses the least memory. Unfortunately not all
+     * ZIP clients fully support this and can lead to clients reporting
+     * the generated ZIP files as corrupted in combination with other
+     * circumstances. (Zip64 enabled, using UTF8 in comments / names etc.)
      *
-     * * For "small" files (e.g. files smaller than largeFileSize), the
-     *   memory use can be up to twice that of the actual file.  In other
-     *   words, adding a 10 megabyte file to the archive could potentially
-     *   occupy 20 megabytes of memory.
+     * When the zero header is not set, the length & checksum need to be
+     * defined before the file is actually added. To prevent loading all
+     * the data into memory, the data has to be read twice. If the data
+     * which is added is not seekable, this call will fail.
      *
-     * * Enabling compression on large files (e.g. files larger than
-     *   large_file_size) is extremely slow, because ZipStream has to pass
-     *   over the large file once to calculate header information, and then
-     *   again to compress and send the actual data.
+     * @param bool $sendHttpHeaders
+     * Boolean indicating whether or not to send
+     * the HTTP headers for this file.
      *
-     * Examples:
+     * @param ?Closure $httpHeaderCallback
+     * The method called to send HTTP headers
      *
-     *   // create a new zip file named 'foo.zip'
-     *   $zip = new ZipStream('foo.zip');
+     * @param string|null $outputName
+     * The name of the created archive.
      *
-     *   // create a new zip file named 'bar.zip' with a comment
-     *   $opt->setComment = 'this is a comment for the zip file.';
-     *   $zip = new ZipStream('bar.zip', $opt);
+     * Only relevant if `$sendHttpHeaders = true`.
      *
-     * Notes:
+     * @param string $contentDisposition
+     * HTTP Content-Disposition
      *
-     * In order to let this library send HTTP headers, a filename must be given
-     * _and_ the option `sendHttpHeaders` must be `true`. This behavior is to
-     * allow software to send its own headers (including the filename), and
-     * still use this library.
+     * Only relevant if `sendHttpHeaders = true`.
+     *
+     * @param string $contentType
+     * HTTP Content Type
+     *
+     * Only relevant if `sendHttpHeaders = true`.
+     *
+     * @param bool $flushOutput
+     * Enable flush after every write to output stream.
+     *
+     * @return self
      */
-    public function __construct(?string $name = null, ?ArchiveOptions $opt = null)
-    {
-        $this->opt = $opt ?: new ArchiveOptions();
-
-        $this->output_name = $name;
-        $this->need_headers = $name && $this->opt->isSendHttpHeaders();
-
-        $this->cdr_ofs = new Bigint();
-        $this->ofs = new Bigint();
+    public function __construct(
+        private OperationMode $operationMode = OperationMode::NORMAL,
+        private readonly string $comment = '',
+        $outputStream = null,
+        private readonly CompressionMethod $defaultCompressionMethod = CompressionMethod::DEFLATE,
+        private readonly int $defaultDeflateLevel = 6,
+        private readonly bool $enableZip64 = true,
+        private readonly bool $defaultEnableZeroHeader = true,
+        private bool $sendHttpHeaders = true,
+        ?Closure $httpHeaderCallback = null,
+        private readonly ?string $outputName = null,
+        private readonly string $contentDisposition = 'attachment',
+        private readonly string $contentType = 'application/x-zip',
+        private bool $flushOutput = false,
+    ) {
+        $this->outputStream = self::normalizeStream($outputStream);
+        $this->httpHeaderCallback = $httpHeaderCallback ?? header(...);
     }
 
     /**
-     * addFile
-     *
      * Add a file to the archive.
      *
-     * @param String $name - path of file in archive (including directory).
-     * @param String $data - contents of file
-     * @param FileOptions $options
+     * ##### File Options
+     *
+     * See {@see addFileFromPsr7Stream()}
      *
-     * File Options:
-     *  time     - Last-modified timestamp (seconds since the epoch) of
-     *             this file.  Defaults to the current time.
-     *  comment  - Comment related to this file.
-     *  method   - Storage method for file ("store" or "deflate")
+     * ##### Examples
      *
-     * Examples:
+     * ```php
+     * // add a file named 'world.txt'
+     * $zip->addFile(fileName: 'world.txt', data: 'Hello World!');
      *
-     *   // add a file named 'foo.txt'
-     *   $data = file_get_contents('foo.txt');
-     *   $zip->addFile('foo.txt', $data);
+     * // add a file named 'bar.jpg' with a comment and a last-modified
+     * // time of two hours ago
+     * $zip->addFile(
+     *   fileName: 'bar.jpg',
+     *   data: $data,
+     *   comment: 'this is a comment about bar.jpg',
+     *   lastModificationDateTime: new DateTime('2 hours ago'),
+     * );
+     * ```
      *
-     *   // add a file named 'bar.jpg' with a comment and a last-modified
-     *   // time of two hours ago
-     *   $data = file_get_contents('bar.jpg');
-     *   $opt->setTime = time() - 2 * 3600;
-     *   $opt->setComment = 'this is a comment about bar.jpg';
-     *   $zip->addFile('bar.jpg', $data, $opt);
+     * @param string $data
+     *
+     * contents of file
      */
-    public function addFile(string $name, string $data, ?FileOptions $options = null): void
-    {
-        $options = $options ?: new FileOptions();
-        $options->defaultTo($this->opt);
-
-        $file = new File($this, $name, $options);
-        $file->processData($data);
+    public function addFile(
+        string $fileName,
+        string $data,
+        string $comment = '',
+        ?CompressionMethod $compressionMethod = null,
+        ?int $deflateLevel = null,
+        ?DateTimeInterface $lastModificationDateTime = null,
+        ?int $maxSize = null,
+        ?int $exactSize = null,
+        ?bool $enableZeroHeader = null,
+    ): void {
+        $this->addFileFromCallback(
+            fileName: $fileName,
+            callback: fn() => $data,
+            comment: $comment,
+            compressionMethod: $compressionMethod,
+            deflateLevel: $deflateLevel,
+            lastModificationDateTime: $lastModificationDateTime,
+            maxSize: $maxSize,
+            exactSize: $exactSize,
+            enableZeroHeader: $enableZeroHeader,
+        );
     }
 
     /**
-     * addFileFromPath
-     *
      * Add a file at path to the archive.
      *
-     * Note that large files may be compressed differently than smaller
-     * files; see the "Large File Support" section above for more
-     * information.
+     * ##### File Options
      *
-     * @param String $name - name of file in archive (including directory path).
-     * @param String $path - path to file on disk (note: paths should be encoded using
-     *          UNIX-style forward slashes -- e.g '/path/to/some/file').
-     * @param FileOptions $options
+     * See {@see addFileFromPsr7Stream()}
      *
-     * File Options:
-     *  time     - Last-modified timestamp (seconds since the epoch) of
-     *             this file.  Defaults to the current time.
-     *  comment  - Comment related to this file.
-     *  method   - Storage method for file ("store" or "deflate")
+     * ###### Examples
      *
-     * Examples:
+     * ```php
+     * // add a file named 'foo.txt' from the local file '/tmp/foo.txt'
+     * $zip->addFileFromPath(
+     *   fileName: 'foo.txt',
+     *   path: '/tmp/foo.txt',
+     * );
      *
-     *   // add a file named 'foo.txt' from the local file '/tmp/foo.txt'
-     *   $zip->addFileFromPath('foo.txt', '/tmp/foo.txt');
+     * // add a file named 'bigfile.rar' from the local file
+     * // '/usr/share/bigfile.rar' with a comment and a last-modified
+     * // time of two hours ago
+     * $zip->addFileFromPath(
+     *   fileName: 'bigfile.rar',
+     *   path: '/usr/share/bigfile.rar',
+     *   comment: 'this is a comment about bigfile.rar',
+     *   lastModificationDateTime: new DateTime('2 hours ago'),
+     * );
+     * ```
      *
-     *   // add a file named 'bigfile.rar' from the local file
-     *   // '/usr/share/bigfile.rar' with a comment and a last-modified
-     *   // time of two hours ago
-     *   $path = '/usr/share/bigfile.rar';
-     *   $opt->setTime = time() - 2 * 3600;
-     *   $opt->setComment = 'this is a comment about bar.jpg';
-     *   $zip->addFileFromPath('bigfile.rar', $path, $opt);
-     *
-     * @return void
      * @throws \ZipStream\Exception\FileNotFoundException
      * @throws \ZipStream\Exception\FileNotReadableException
      */
-    public function addFileFromPath(string $name, string $path, ?FileOptions $options = null): void
-    {
-        $options = $options ?: new FileOptions();
-        $options->defaultTo($this->opt);
+    public function addFileFromPath(
+        /**
+         * name of file in archive (including directory path).
+         */
+        string $fileName,
+
+        /**
+         * path to file on disk (note: paths should be encoded using
+         * UNIX-style forward slashes -- e.g '/path/to/some/file').
+         */
+        string $path,
+        string $comment = '',
+        ?CompressionMethod $compressionMethod = null,
+        ?int $deflateLevel = null,
+        ?DateTimeInterface $lastModificationDateTime = null,
+        ?int $maxSize = null,
+        ?int $exactSize = null,
+        ?bool $enableZeroHeader = null,
+    ): void {
+        if (!is_readable($path)) {
+            if (!file_exists($path)) {
+                throw new FileNotFoundException($path);
+            }
+            throw new FileNotReadableException($path);
+        }
+
+        $fileTime = filemtime($path);
+        if ($fileTime !== false) {
+            $lastModificationDateTime ??= (new DateTimeImmutable())->setTimestamp($fileTime);
+        }
+
+        $this->addFileFromCallback(
+            fileName: $fileName,
+            callback: function () use ($path) {
 
-        $file = new File($this, $name, $options);
-        $file->processPath($path);
+                $stream =  fopen($path, 'rb');
+
+                if (!$stream) {
+                    // @codeCoverageIgnoreStart
+                    throw new ResourceActionException('fopen');
+                    // @codeCoverageIgnoreEnd
+                }
+
+                return $stream;
+            },
+            comment: $comment,
+            compressionMethod: $compressionMethod,
+            deflateLevel: $deflateLevel,
+            lastModificationDateTime: $lastModificationDateTime,
+            maxSize: $maxSize,
+            exactSize: $exactSize,
+            enableZeroHeader: $enableZeroHeader,
+        );
     }
 
     /**
-     * addFileFromStream
-     *
-     * Add an open stream to the archive.
+     * Add an open stream (resource) to the archive.
      *
-     * @param String $name - path of file in archive (including directory).
-     * @param resource $stream - contents of file as a stream resource
-     * @param FileOptions $options
+     * ##### File Options
      *
-     * File Options:
-     *  time     - Last-modified timestamp (seconds since the epoch) of
-     *             this file.  Defaults to the current time.
-     *  comment  - Comment related to this file.
+     * See {@see addFileFromPsr7Stream()}
      *
-     * Examples:
+     * ##### Examples
      *
-     *   // create a temporary file stream and write text to it
-     *   $fp = tmpfile();
-     *   fwrite($fp, 'The quick brown fox jumped over the lazy dog.');
+     * ```php
+     * // create a temporary file stream and write text to it
+     * $filePointer = tmpfile();
+     * fwrite($filePointer, 'The quick brown fox jumped over the lazy dog.');
      *
-     *   // add a file named 'streamfile.txt' from the content of the stream
-     *   $x->addFileFromStream('streamfile.txt', $fp);
+     * // add a file named 'streamfile.txt' from the content of the stream
+     * $archive->addFileFromStream(
+     *   fileName: 'streamfile.txt',
+     *   stream: $filePointer,
+     * );
+     * ```
      *
-     * @return void
+     * @param resource $stream contents of file as a stream resource
      */
-    public function addFileFromStream(string $name, $stream, ?FileOptions $options = null): void
-    {
-        $options = $options ?: new FileOptions();
-        $options->defaultTo($this->opt);
-
-        $file = new File($this, $name, $options);
-        $file->processStream(new DeflateStream($stream));
+    public function addFileFromStream(
+        string $fileName,
+        $stream,
+        string $comment = '',
+        ?CompressionMethod $compressionMethod = null,
+        ?int $deflateLevel = null,
+        ?DateTimeInterface $lastModificationDateTime = null,
+        ?int $maxSize = null,
+        ?int $exactSize = null,
+        ?bool $enableZeroHeader = null,
+    ): void {
+        $this->addFileFromCallback(
+            fileName: $fileName,
+            callback: fn() => $stream,
+            comment: $comment,
+            compressionMethod: $compressionMethod,
+            deflateLevel: $deflateLevel,
+            lastModificationDateTime: $lastModificationDateTime,
+            maxSize: $maxSize,
+            exactSize: $exactSize,
+            enableZeroHeader: $enableZeroHeader,
+        );
     }
 
     /**
-     * addFileFromPsr7Stream
-     *
      * Add an open stream to the archive.
      *
-     * @param String $name - path of file in archive (including directory).
-     * @param StreamInterface $stream - contents of file as a stream resource
-     * @param FileOptions $options
+     * ##### Examples
+     *
+     * ```php
+     * $stream = $response->getBody();
+     * // add a file named 'streamfile.txt' from the content of the stream
+     * $archive->addFileFromPsr7Stream(
+     *   fileName: 'streamfile.txt',
+     *   stream: $stream,
+     * );
+     * ```
      *
-     * File Options:
-     *  time     - Last-modified timestamp (seconds since the epoch) of
-     *             this file.  Defaults to the current time.
-     *  comment  - Comment related to this file.
+     * @param string $fileName
+     * path of file in archive (including directory)
      *
-     * Examples:
+     * @param StreamInterface $stream
+     * contents of file as a stream resource
      *
-     *   // create a temporary file stream and write text to it
-     *   $fp = tmpfile();
-     *   fwrite($fp, 'The quick brown fox jumped over the lazy dog.');
+     * @param string $comment
+     * ZIP comment for this file
      *
-     *   // add a file named 'streamfile.txt' from the content of the stream
-     *   $x->addFileFromPsr7Stream('streamfile.txt', $fp);
+     * @param ?CompressionMethod $compressionMethod
+     * Override `defaultCompressionMethod`
      *
-     * @return void
+     * See {@see __construct()}
+     *
+     * @param ?int $deflateLevel
+     * Override `defaultDeflateLevel`
+     *
+     * See {@see __construct()}
+     *
+     * @param ?DateTimeInterface $lastModificationDateTime
+     * Set last modification time of file.
+     *
+     * Default: `now`
+     *
+     * @param ?int $maxSize
+     * Only read `maxSize` bytes from file.
+     *
+     * The file is considered done when either reaching `EOF`
+     * or the `maxSize`.
+     *
+     * @param ?int $exactSize
+     * Read exactly `exactSize` bytes from file.
+     * If `EOF` is reached before reading `exactSize` bytes, an error will be
+     * thrown. The parameter allows for faster size calculations if the `stream`
+     * does not support `fstat` size or is slow and otherwise known beforehand.
+     *
+     * @param ?bool $enableZeroHeader
+     * Override `defaultEnableZeroHeader`
+     *
+     * See {@see __construct()}
      */
     public function addFileFromPsr7Stream(
-        string $name,
+        string $fileName,
         StreamInterface $stream,
-        ?FileOptions $options = null
+        string $comment = '',
+        ?CompressionMethod $compressionMethod = null,
+        ?int $deflateLevel = null,
+        ?DateTimeInterface $lastModificationDateTime = null,
+        ?int $maxSize = null,
+        ?int $exactSize = null,
+        ?bool $enableZeroHeader = null,
+    ): void {
+        $this->addFileFromCallback(
+            fileName: $fileName,
+            callback: fn() => $stream,
+            comment: $comment,
+            compressionMethod: $compressionMethod,
+            deflateLevel: $deflateLevel,
+            lastModificationDateTime: $lastModificationDateTime,
+            maxSize: $maxSize,
+            exactSize: $exactSize,
+            enableZeroHeader: $enableZeroHeader,
+        );
+    }
+
+    /**
+     * Add a file based on a callback.
+     *
+     * This is useful when you want to simulate a lot of files without keeping
+     * all of the file handles open at the same time.
+     *
+     * ##### Examples
+     *
+     * ```php
+     * foreach($files as $name => $size) {
+     *   $archive->addFileFromCallback(
+     *     fileName: 'streamfile.txt',
+     *     exactSize: $size,
+     *     callback: function() use($name): Psr\Http\Message\StreamInterface {
+     *       $response = download($name);
+     *       return $response->getBody();
+     *     }
+     *   );
+     * }
+     * ```
+     *
+     * @param string $fileName
+     * path of file in archive (including directory)
+     *
+     * @param Closure $callback
+     * @psalm-param Closure(): (resource|StreamInterface|string) $callback
+     * A callback to get the file contents in the shape of a PHP stream,
+     * a Psr StreamInterface implementation, or a string.
+     *
+     * @param string $comment
+     * ZIP comment for this file
+     *
+     * @param ?CompressionMethod $compressionMethod
+     * Override `defaultCompressionMethod`
+     *
+     * See {@see __construct()}
+     *
+     * @param ?int $deflateLevel
+     * Override `defaultDeflateLevel`
+     *
+     * See {@see __construct()}
+     *
+     * @param ?DateTimeInterface $lastModificationDateTime
+     * Set last modification time of file.
+     *
+     * Default: `now`
+     *
+     * @param ?int $maxSize
+     * Only read `maxSize` bytes from file.
+     *
+     * The file is considered done when either reaching `EOF`
+     * or the `maxSize`.
+     *
+     * @param ?int $exactSize
+     * Read exactly `exactSize` bytes from file.
+     * If `EOF` is reached before reading `exactSize` bytes, an error will be
+     * thrown. The parameter allows for faster size calculations if the `stream`
+     * does not support `fstat` size or is slow and otherwise known beforehand.
+     *
+     * @param ?bool $enableZeroHeader
+     * Override `defaultEnableZeroHeader`
+     *
+     * See {@see __construct()}
+     */
+    public function addFileFromCallback(
+        string $fileName,
+        Closure $callback,
+        string $comment = '',
+        ?CompressionMethod $compressionMethod = null,
+        ?int $deflateLevel = null,
+        ?DateTimeInterface $lastModificationDateTime = null,
+        ?int $maxSize = null,
+        ?int $exactSize = null,
+        ?bool $enableZeroHeader = null,
+    ): void {
+        $file = new File(
+            dataCallback: function () use ($callback, $maxSize) {
+                $data = $callback();
+
+                if (is_resource($data)) {
+                    return $data;
+                }
+
+                if ($data instanceof StreamInterface) {
+                    return StreamWrapper::getResource($data);
+                }
+
+
+                $stream = fopen('php://memory', 'rw+');
+                if ($stream === false) {
+                    // @codeCoverageIgnoreStart
+                    throw new ResourceActionException('fopen');
+                    // @codeCoverageIgnoreEnd
+                }
+                if ($maxSize !== null && fwrite($stream, $data, $maxSize) === false) {
+                    // @codeCoverageIgnoreStart
+                    throw new ResourceActionException('fwrite', $stream);
+                    // @codeCoverageIgnoreEnd
+                } elseif (fwrite($stream, $data) === false) {
+                    // @codeCoverageIgnoreStart
+                    throw new ResourceActionException('fwrite', $stream);
+                    // @codeCoverageIgnoreEnd
+                }
+                if (rewind($stream) === false) {
+                    // @codeCoverageIgnoreStart
+                    throw new ResourceActionException('rewind', $stream);
+                    // @codeCoverageIgnoreEnd
+                }
+
+                return $stream;
+
+            },
+            send: $this->send(...),
+            recordSentBytes: $this->recordSentBytes(...),
+            operationMode: $this->operationMode,
+            fileName: $fileName,
+            startOffset: $this->offset,
+            compressionMethod: $compressionMethod ?? $this->defaultCompressionMethod,
+            comment: $comment,
+            deflateLevel: $deflateLevel ?? $this->defaultDeflateLevel,
+            lastModificationDateTime: $lastModificationDateTime ?? new DateTimeImmutable(),
+            maxSize: $maxSize,
+            exactSize: $exactSize,
+            enableZip64: $this->enableZip64,
+            enableZeroHeader: $enableZeroHeader ?? $this->defaultEnableZeroHeader,
+        );
+
+        if ($this->operationMode !== OperationMode::NORMAL) {
+            $this->recordedSimulation[] = $file;
+        }
+
+        $this->centralDirectoryRecords[] = $file->process();
+    }
+
+    /**
+     * Add a directory to the archive.
+     *
+     * ##### File Options
+     *
+     * See {@see addFileFromPsr7Stream()}
+     *
+     * ##### Examples
+     *
+     * ```php
+     * // add a directory named 'world/'
+     * $zip->addDirectory(fileName: 'world/');
+     * ```
+     */
+    public function addDirectory(
+        string $fileName,
+        string $comment = '',
+        ?DateTimeInterface $lastModificationDateTime = null,
     ): void {
-        $options = $options ?: new FileOptions();
-        $options->defaultTo($this->opt);
+        if (!str_ends_with($fileName, '/')) {
+            $fileName .= '/';
+        }
 
-        $file = new File($this, $name, $options);
-        $file->processStream($stream);
+        $this->addFile(
+            fileName: $fileName,
+            data: '',
+            comment: $comment,
+            compressionMethod: CompressionMethod::STORE,
+            deflateLevel: null,
+            lastModificationDateTime: $lastModificationDateTime,
+            maxSize: 0,
+            exactSize: 0,
+            enableZeroHeader: false,
+        );
     }
 
     /**
-     * finish
+     * Executes a previously calculated simulation.
      *
-     * Write zip footer to stream.
+     * ##### Example
+     *
+     * ```php
+     * $zip = new ZipStream(
+     *   outputName: 'foo.zip',
+     *   operationMode: OperationMode::SIMULATE_STRICT,
+     * );
      *
-     *  Example:
+     * $zip->addFile('test.txt', 'Hello World');
      *
-     *   // add a list of files to the archive
-     *   $files = array('foo.txt', 'bar.jpg');
-     *   foreach ($files as $path)
-     *     $zip->addFile($path, file_get_contents($path));
+     * $size = $zip->finish();
      *
-     *   // write footer to stream
-     *   $zip->finish();
-     * @return void
+     * header('Content-Length: '. $size);
      *
-     * @throws OverflowException
+     * $zip->executeSimulation();
+     * ```
      */
-    public function finish(): void
+    public function executeSimulation(): void
     {
+        if ($this->operationMode !== OperationMode::NORMAL) {
+            throw new RuntimeException('Zip simulation is not finished.');
+        }
+
+        foreach ($this->recordedSimulation as $file) {
+            $this->centralDirectoryRecords[] = $file->cloneSimulationExecution()->process();
+        }
+
+        $this->finish();
+    }
+
+    /**
+     * Write zip footer to stream.
+     *
+     * The clase is left in an unusable state after `finish`.
+     *
+     * ##### Example
+     *
+     * ```php
+     * // write footer to stream
+     * $zip->finish();
+     * ```
+     */
+    public function finish(): int
+    {
+        $centralDirectoryStartOffsetOnDisk = $this->offset;
+        $sizeOfCentralDirectory = 0;
+
         // add trailing cdr file records
-        foreach ($this->files as $cdrFile) {
-            $this->send($cdrFile);
-            $this->cdr_ofs = $this->cdr_ofs->add(Bigint::init(strlen($cdrFile)));
+        foreach ($this->centralDirectoryRecords as $centralDirectoryRecord) {
+            $this->send($centralDirectoryRecord);
+            $sizeOfCentralDirectory += strlen($centralDirectoryRecord);
         }
 
         // Add 64bit headers (if applicable)
-        if (count($this->files) >= 0xFFFF ||
-            $this->cdr_ofs->isOver32() ||
-            $this->ofs->isOver32()) {
-            if (!$this->opt->isEnableZip64()) {
+        if (count($this->centralDirectoryRecords) >= 0xFFFF ||
+            $centralDirectoryStartOffsetOnDisk > 0xFFFFFFFF ||
+            $sizeOfCentralDirectory > 0xFFFFFFFF) {
+            if (!$this->enableZip64) {
                 throw new OverflowException();
             }
 
-            $this->addCdr64Eof();
-            $this->addCdr64Locator();
+            $this->send(Zip64\EndOfCentralDirectory::generate(
+                versionMadeBy: self::ZIP_VERSION_MADE_BY,
+                versionNeededToExtract: Version::ZIP64->value,
+                numberOfThisDisk: 0,
+                numberOfTheDiskWithCentralDirectoryStart: 0,
+                numberOfCentralDirectoryEntriesOnThisDisk: count($this->centralDirectoryRecords),
+                numberOfCentralDirectoryEntries: count($this->centralDirectoryRecords),
+                sizeOfCentralDirectory: $sizeOfCentralDirectory,
+                centralDirectoryStartOffsetOnDisk: $centralDirectoryStartOffsetOnDisk,
+                extensibleDataSector: '',
+            ));
+
+            $this->send(Zip64\EndOfCentralDirectoryLocator::generate(
+                numberOfTheDiskWithZip64CentralDirectoryStart: 0x00,
+                zip64centralDirectoryStartOffsetOnDisk: $centralDirectoryStartOffsetOnDisk + $sizeOfCentralDirectory,
+                totalNumberOfDisks: 1,
+            ));
         }
 
         // add trailing cdr eof record
-        $this->addCdrEof();
+        $numberOfCentralDirectoryEntries = min(count($this->centralDirectoryRecords), 0xFFFF);
+        $this->send(EndOfCentralDirectory::generate(
+            numberOfThisDisk: 0x00,
+            numberOfTheDiskWithCentralDirectoryStart: 0x00,
+            numberOfCentralDirectoryEntriesOnThisDisk: $numberOfCentralDirectoryEntries,
+            numberOfCentralDirectoryEntries: $numberOfCentralDirectoryEntries,
+            sizeOfCentralDirectory: min($sizeOfCentralDirectory, 0xFFFFFFFF),
+            centralDirectoryStartOffsetOnDisk: min($centralDirectoryStartOffsetOnDisk, 0xFFFFFFFF),
+            zipFileComment: $this->comment,
+        ));
+
+        $size = $this->offset;
 
         // The End
         $this->clear();
+
+        return $size;
     }
 
     /**
-     * Send ZIP64 CDR EOF (Central Directory Record End-of-File) record.
-     *
-     * @return void
+     * @param StreamInterface|resource|null $outputStream
+     * @return resource
      */
-    protected function addCdr64Eof(): void
+    private static function normalizeStream($outputStream)
     {
-        $num_files = count($this->files);
-        $cdr_length = $this->cdr_ofs;
-        $cdr_offset = $this->ofs;
-
-        $fields = [
-            ['V', static::ZIP64_CDR_EOF_SIGNATURE],     // ZIP64 end of central file header signature
-            ['P', 44],                                  // Length of data below this header (length of block - 12) = 44
-            ['v', static::ZIP_VERSION_MADE_BY],         // Made by version
-            ['v', Version::ZIP64],                      // Extract by version
-            ['V', 0x00],                                // disk number
-            ['V', 0x00],                                // no of disks
-            ['P', $num_files],                          // no of entries on disk
-            ['P', $num_files],                          // no of entries in cdr
-            ['P', $cdr_length],                         // CDR size
-            ['P', $cdr_offset],                         // CDR offset
-        ];
-
-        $ret = static::packFields($fields);
-        $this->send($ret);
+        if ($outputStream instanceof StreamInterface) {
+            return StreamWrapper::getResource($outputStream);
+        }
+        if (is_resource($outputStream)) {
+            return $outputStream;
+        }
+        return fopen('php://output', 'wb');
     }
 
     /**
-     * Create a format string and argument list for pack(), then call
-     * pack() and return the result.
-     *
-     * @param array $fields
-     * @return string
+     * Record sent bytes
      */
-    public static function packFields(array $fields): string
+    private function recordSentBytes(int $sentBytes): void
     {
-        $fmt = '';
-        $args = [];
-
-        // populate format string and argument list
-        foreach ($fields as [$format, $value]) {
-            if ($format === 'P') {
-                $fmt .= 'VV';
-                if ($value instanceof Bigint) {
-                    $args[] = $value->getLow32();
-                    $args[] = $value->getHigh32();
-                } else {
-                    $args[] = $value;
-                    $args[] = 0;
-                }
-            } else {
-                if ($value instanceof Bigint) {
-                    $value = $value->getLow32();
-                }
-                $fmt .= $format;
-                $args[] = $value;
-            }
-        }
-
-        // prepend format string to argument list
-        array_unshift($args, $fmt);
-
-        // build output string from header and compressed data
-        return pack(...$args);
+        $this->offset += $sentBytes;
     }
 
     /**
      * Send string, sending HTTP headers if necessary.
      * Flush output after write if configure option is set.
-     *
-     * @param String $str
-     * @return void
      */
-    public function send(string $str): void
+    private function send(string $data): void
     {
-        if ($this->need_headers) {
+        if (!$this->ready) {
+            throw new RuntimeException('Archive is already finished');
+        }
+
+        if ($this->operationMode === OperationMode::NORMAL && $this->sendHttpHeaders) {
             $this->sendHttpHeaders();
+            $this->sendHttpHeaders = false;
         }
-        $this->need_headers = false;
 
-        fwrite($this->opt->getOutputStream(), $str);
+        $this->recordSentBytes(strlen($data));
 
-        if ($this->opt->isFlushOutput()) {
-            // flush output buffer if it is on and flushable
-            $status = ob_get_status();
-            if (isset($status['flags']) && ($status['flags'] & PHP_OUTPUT_HANDLER_FLUSHABLE)) {
-                ob_flush();
+        if ($this->operationMode === OperationMode::NORMAL) {
+            if (fwrite($this->outputStream, $data) === false) {
+                throw new ResourceActionException('fwrite', $this->outputStream);
             }
 
-            // Flush system buffers after flushing userspace output buffer
-            flush();
+            if ($this->flushOutput) {
+                // flush output buffer if it is on and flushable
+                $status = ob_get_status();
+                if (isset($status['flags']) && is_int($status['flags']) && ($status['flags'] & PHP_OUTPUT_HANDLER_FLUSHABLE)) {
+                    ob_flush();
+                }
+
+                // Flush system buffers after flushing userspace output buffer
+                flush();
+            }
         }
     }
 
     /**
-     * Send HTTP headers for this stream.
-     *
-     * @return void
-     */
-    protected function sendHttpHeaders(): void
+    * Send HTTP headers for this stream.
+    */
+    private function sendHttpHeaders(): void
     {
         // grab content disposition
-        $disposition = $this->opt->getContentDisposition();
+        $disposition = $this->contentDisposition;
 
-        if ($this->output_name) {
+        if ($this->outputName !== null) {
             // Various different browsers dislike various characters here. Strip them all for safety.
-            $safe_output = trim(str_replace(['"', "'", '\\', ';', "\n", "\r"], '', $this->output_name));
+            $safeOutput = trim(str_replace(['"', "'", '\\', ';', "\n", "\r"], '', $this->outputName));
 
             // Check if we need to UTF-8 encode the filename
-            $urlencoded = rawurlencode($safe_output);
+            $urlencoded = rawurlencode($safeOutput);
             $disposition .= "; filename*=UTF-8''{$urlencoded}";
         }
 
-        $headers = array(
-            'Content-Type' => $this->opt->getContentType(),
+        $headers = [
+            'Content-Type' => $this->contentType,
             'Content-Disposition' => $disposition,
             'Pragma' => 'public',
             'Cache-Control' => 'public, must-revalidate',
-            'Content-Transfer-Encoding' => 'binary'
-        );
+            'Content-Transfer-Encoding' => 'binary',
+        ];
 
-        $call = $this->opt->getHttpHeaderCallback();
         foreach ($headers as $key => $val) {
-            $call("$key: $val");
+            ($this->httpHeaderCallback)("$key: $val");
         }
     }
 
-    /**
-     * Send ZIP64 CDR Locator (Central Directory Record Locator) record.
-     *
-     * @return void
-     */
-    protected function addCdr64Locator(): void
-    {
-        $cdr_offset = $this->ofs->add($this->cdr_ofs);
-
-        $fields = [
-            ['V', static::ZIP64_CDR_LOCATOR_SIGNATURE], // ZIP64 end of central file header signature
-            ['V', 0x00],                                // Disc number containing CDR64EOF
-            ['P', $cdr_offset],                         // CDR offset
-            ['V', 1],                                   // Total number of disks
-        ];
-
-        $ret = static::packFields($fields);
-        $this->send($ret);
-    }
-
-    /**
-     * Send CDR EOF (Central Directory Record End-of-File) record.
-     *
-     * @return void
-     */
-    protected function addCdrEof(): void
-    {
-        $num_files = count($this->files);
-        $cdr_length = $this->cdr_ofs;
-        $cdr_offset = $this->ofs;
-
-        // grab comment (if specified)
-        $comment = $this->opt->getComment();
-
-        $fields = [
-            ['V', static::CDR_EOF_SIGNATURE],   // end of central file header signature
-            ['v', 0x00],                        // disk number
-            ['v', 0x00],                        // no of disks
-            ['v', min($num_files, 0xFFFF)],     // no of entries on disk
-            ['v', min($num_files, 0xFFFF)],     // no of entries in cdr
-            ['V', $cdr_length->getLowFF()],     // CDR size
-            ['V', $cdr_offset->getLowFF()],     // CDR offset
-            ['v', strlen($comment)],            // Zip Comment size
-        ];
-
-        $ret = static::packFields($fields) . $comment;
-        $this->send($ret);
-    }
-
     /**
      * Clear all internal variables. Note that the stream object is not
      * usable after this.
-     *
-     * @return void
      */
-    protected function clear(): void
+    private function clear(): void
     {
-        $this->files = [];
-        $this->ofs = new Bigint();
-        $this->cdr_ofs = new Bigint();
-        $this->opt = new ArchiveOptions();
-    }
-
-    /**
-     * Is this file larger than large_file_size?
-     *
-     * @param string $path
-     * @return bool
-     */
-    public function isLargeFile(string $path): bool
-    {
-        if (!$this->opt->isStatFiles()) {
-            return false;
+        $this->centralDirectoryRecords = [];
+        $this->offset = 0;
+
+        if ($this->operationMode === OperationMode::NORMAL) {
+            $this->ready = false;
+            $this->recordedSimulation = [];
+        } else {
+            $this->operationMode = OperationMode::NORMAL;
         }
-        $stat = stat($path);
-        return $stat['size'] > $this->opt->getLargeFileSize();
-    }
-
-    /**
-     * Save file attributes for trailing CDR record.
-     *
-     * @param File $file
-     * @return void
-     */
-    public function addToCdr(File $file): void
-    {
-        $file->ofs = $this->ofs;
-        $this->ofs = $this->ofs->add($file->getTotalLength());
-        $this->files[] = $file->getCdrFile();
     }
 }
diff --git a/vendor/maennchen/zipstream-php/src/Zs/ExtendedInformationExtraField.php b/vendor/maennchen/zipstream-php/src/Zs/ExtendedInformationExtraField.php
new file mode 100644
index 0000000000..bf621bc09e
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/src/Zs/ExtendedInformationExtraField.php
@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Zs;
+
+use ZipStream\PackField;
+
+/**
+ * @internal
+ */
+abstract class ExtendedInformationExtraField
+{
+    private const TAG = 0x5653;
+
+    public static function generate(): string
+    {
+        return PackField::pack(
+            new PackField(format: 'v', value: self::TAG),
+            new PackField(format: 'v', value: 0x0000),
+        );
+    }
+}
diff --git a/vendor/maennchen/zipstream-php/test/Assertions.php b/vendor/maennchen/zipstream-php/test/Assertions.php
new file mode 100644
index 0000000000..8d7670effd
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/test/Assertions.php
@@ -0,0 +1,49 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Test;
+
+trait Assertions
+{
+    protected function assertFileContains(string $filePath, string $needle): void
+    {
+        $last = '';
+
+        $handle = fopen($filePath, 'r');
+        while (!feof($handle)) {
+            $line = fgets($handle, 1024);
+
+            if (str_contains($last . $line, $needle)) {
+                fclose($handle);
+                return;
+            }
+
+            $last = $line;
+        }
+
+        fclose($handle);
+
+        $this->fail("File {$filePath} must contain {$needle}");
+    }
+
+    protected function assertFileDoesNotContain(string $filePath, string $needle): void
+    {
+        $last = '';
+
+        $handle = fopen($filePath, 'r');
+        while (!feof($handle)) {
+            $line = fgets($handle, 1024);
+
+            if (str_contains($last . $line, $needle)) {
+                fclose($handle);
+
+                $this->fail("File {$filePath} must not contain {$needle}");
+            }
+
+            $last = $line;
+        }
+
+        fclose($handle);
+    }
+}
diff --git a/vendor/maennchen/zipstream-php/test/BigintTest.php b/vendor/maennchen/zipstream-php/test/BigintTest.php
deleted file mode 100644
index ac9c7c28ba..0000000000
--- a/vendor/maennchen/zipstream-php/test/BigintTest.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace BigintTest;
-
-use OverflowException;
-use PHPUnit\Framework\TestCase;
-use ZipStream\Bigint;
-
-class BigintTest extends TestCase
-{
-    public function testConstruct(): void
-    {
-        $bigint = new Bigint(0x12345678);
-        $this->assertSame('0x0000000012345678', $bigint->getHex64());
-        $this->assertSame(0x12345678, $bigint->getLow32());
-        $this->assertSame(0, $bigint->getHigh32());
-    }
-
-    public function testConstructLarge(): void
-    {
-        $bigint = new Bigint(0x87654321);
-        $this->assertSame('0x0000000087654321', $bigint->getHex64());
-        $this->assertSame('87654321', bin2hex(pack('N', $bigint->getLow32())));
-        $this->assertSame(0, $bigint->getHigh32());
-    }
-
-    public function testAddSmallValue(): void
-    {
-        $bigint = new Bigint(1);
-        $bigint = $bigint->add(Bigint::init(2));
-        $this->assertSame(3, $bigint->getLow32());
-        $this->assertFalse($bigint->isOver32());
-        $this->assertTrue($bigint->isOver32(true));
-        $this->assertSame($bigint->getLowFF(), (float)$bigint->getLow32());
-        $this->assertSame($bigint->getLowFF(true), (float)0xFFFFFFFF);
-    }
-
-    public function testAddWithOverflowAtLowestByte(): void
-    {
-        $bigint = new Bigint(0xFF);
-        $bigint = $bigint->add(Bigint::init(0x01));
-        $this->assertSame(0x100, $bigint->getLow32());
-    }
-
-    public function testAddWithOverflowAtInteger32(): void
-    {
-        $bigint = new Bigint(0xFFFFFFFE);
-        $this->assertFalse($bigint->isOver32());
-        $bigint = $bigint->add(Bigint::init(0x01));
-        $this->assertTrue($bigint->isOver32());
-        $bigint = $bigint->add(Bigint::init(0x01));
-        $this->assertSame('0x0000000100000000', $bigint->getHex64());
-        $this->assertTrue($bigint->isOver32());
-        $this->assertSame((float)0xFFFFFFFF, $bigint->getLowFF());
-    }
-
-    public function testAddWithOverflowAtInteger64(): void
-    {
-        $bigint = Bigint::fromLowHigh(0xFFFFFFFF, 0xFFFFFFFF);
-        $this->assertSame('0xFFFFFFFFFFFFFFFF', $bigint->getHex64());
-        $this->expectException(OverflowException::class);
-        $bigint->add(Bigint::init(1));
-    }
-}
diff --git a/vendor/maennchen/zipstream-php/test/CentralDirectoryFileHeaderTest.php b/vendor/maennchen/zipstream-php/test/CentralDirectoryFileHeaderTest.php
new file mode 100644
index 0000000000..5457b4f442
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/test/CentralDirectoryFileHeaderTest.php
@@ -0,0 +1,60 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Test;
+
+use DateTimeImmutable;
+use PHPUnit\Framework\TestCase;
+use ZipStream\CentralDirectoryFileHeader;
+use ZipStream\CompressionMethod;
+
+class CentralDirectoryFileHeaderTest extends TestCase
+{
+    public function testSerializesCorrectly(): void
+    {
+        $dateTime = new DateTimeImmutable('2022-01-01 01:01:01Z');
+
+        $header = CentralDirectoryFileHeader::generate(
+            versionMadeBy: 0x603,
+            versionNeededToExtract: 0x002D,
+            generalPurposeBitFlag: 0x2222,
+            compressionMethod: CompressionMethod::DEFLATE,
+            lastModificationDateTime: $dateTime,
+            crc32: 0x11111111,
+            compressedSize: 0x77777777,
+            uncompressedSize: 0x99999999,
+            fileName: 'test.png',
+            extraField: 'some content',
+            fileComment: 'some comment',
+            diskNumberStart: 0,
+            internalFileAttributes: 0,
+            externalFileAttributes: 32,
+            relativeOffsetOfLocalHeader: 0x1234,
+        );
+
+        $this->assertSame(
+            bin2hex($header),
+            '504b0102' . // 4 bytes; central file header signature
+            '0306' . // 2 bytes; version made by
+            '2d00' . // 2 bytes; version needed to extract
+            '2222' . // 2 bytes; general purpose bit flag
+            '0800' . // 2 bytes; compression method
+            '2008' . // 2 bytes; last mod file time
+            '2154' . // 2 bytes; last mod file date
+            '11111111' . // 4 bytes; crc-32
+            '77777777' . // 4 bytes; compressed size
+            '99999999' . // 4 bytes; uncompressed size
+            '0800' . // 2 bytes; file name length (n)
+            '0c00' . // 2 bytes; extra field length (m)
+            '0c00' . // 2 bytes; file comment length (o)
+            '0000' . // 2 bytes; disk number start
+            '0000' . // 2 bytes; internal file attributes
+            '20000000' . // 4 bytes; external file attributes
+            '34120000' . // 4 bytes; relative offset of local header
+            '746573742e706e67' . // n bytes; file name
+            '736f6d6520636f6e74656e74' . // m bytes; extra field
+            '736f6d6520636f6d6d656e74' // o bytes; file comment
+        );
+    }
+}
diff --git a/vendor/maennchen/zipstream-php/test/DataDescriptorTest.php b/vendor/maennchen/zipstream-php/test/DataDescriptorTest.php
new file mode 100644
index 0000000000..cc886c74b9
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/test/DataDescriptorTest.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Test;
+
+use PHPUnit\Framework\TestCase;
+use ZipStream\DataDescriptor;
+
+class DataDescriptorTest extends TestCase
+{
+    public function testSerializesCorrectly(): void
+    {
+        $this->assertSame(
+            bin2hex(DataDescriptor::generate(
+                crc32UncompressedData: 0x11111111,
+                compressedSize: 0x77777777,
+                uncompressedSize: 0x99999999,
+            )),
+            '504b0708' . // 4 bytes; Optional data descriptor signature = 0x08074b50
+            '11111111' . // 4 bytes; CRC-32 of uncompressed data
+            '77777777' . // 4 bytes; Compressed size
+            '99999999' // 4 bytes; Uncompressed size
+        );
+    }
+}
diff --git a/vendor/maennchen/zipstream-php/test/EndOfCentralDirectoryTest.php b/vendor/maennchen/zipstream-php/test/EndOfCentralDirectoryTest.php
new file mode 100644
index 0000000000..be0a90743d
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/test/EndOfCentralDirectoryTest.php
@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Test;
+
+use PHPUnit\Framework\TestCase;
+use ZipStream\EndOfCentralDirectory;
+
+class EndOfCentralDirectoryTest extends TestCase
+{
+    public function testSerializesCorrectly(): void
+    {
+        $this->assertSame(
+            bin2hex(EndOfCentralDirectory::generate(
+                numberOfThisDisk: 0x00,
+                numberOfTheDiskWithCentralDirectoryStart: 0x00,
+                numberOfCentralDirectoryEntriesOnThisDisk: 0x10,
+                numberOfCentralDirectoryEntries: 0x10,
+                sizeOfCentralDirectory: 0x22,
+                centralDirectoryStartOffsetOnDisk: 0x33,
+                zipFileComment: 'foo',
+            )),
+            '504b0506' . // 4 bytes; end of central dir signature 0x06054b50
+            '0000' . // 2 bytes; number of this disk
+            '0000' . // 2 bytes; number of the disk with the start of the central directory
+            '1000' . // 2 bytes; total number of entries in the central directory on this disk
+            '1000' . // 2 bytes; total number of entries in the central directory
+            '22000000' . // 4 bytes; size of the central directory
+            '33000000' . // 4 bytes; offset of start of central directory with respect to the starting disk number
+            '0300' . // 2 bytes; .ZIP file comment length
+            bin2hex('foo')
+        );
+    }
+}
diff --git a/vendor/maennchen/zipstream-php/test/EndlessCycleStream.php b/vendor/maennchen/zipstream-php/test/EndlessCycleStream.php
new file mode 100644
index 0000000000..d9e7df1fbc
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/test/EndlessCycleStream.php
@@ -0,0 +1,104 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Test;
+
+use Psr\Http\Message\StreamInterface;
+use RuntimeException;
+
+class EndlessCycleStream implements StreamInterface
+{
+    private int $offset = 0;
+
+    public function __construct(private readonly string $toRepeat = '0') {}
+
+    public function __toString(): string
+    {
+        throw new RuntimeException('Infinite Stream!');
+    }
+
+    public function close(): void
+    {
+        $this->detach();
+    }
+
+    /**
+     * @return null
+     */
+    public function detach()
+    {
+        return;
+    }
+
+    public function getSize(): ?int
+    {
+        return null;
+    }
+
+    public function tell(): int
+    {
+        return $this->offset;
+    }
+
+    public function eof(): bool
+    {
+        return false;
+    }
+
+    public function isSeekable(): bool
+    {
+        return true;
+    }
+
+    public function seek(int $offset, int $whence = SEEK_SET): void
+    {
+        switch ($whence) {
+            case SEEK_SET:
+                $this->offset = $offset;
+                break;
+            case SEEK_CUR:
+                $this->offset += $offset;
+                break;
+            case SEEK_END:
+                throw new RuntimeException('Infinite Stream!');
+                break;
+        }
+    }
+
+    public function rewind(): void
+    {
+        $this->seek(0);
+    }
+
+    public function isWritable(): bool
+    {
+        return false;
+    }
+
+    public function write(string $string): int
+    {
+        throw new RuntimeException('Not writeable');
+    }
+
+    public function isReadable(): bool
+    {
+        return true;
+    }
+
+    public function read(int $length): string
+    {
+        $this->offset += $length;
+        return substr(str_repeat($this->toRepeat, (int) ceil($length / strlen($this->toRepeat))), 0, $length);
+    }
+
+    public function getContents(): string
+    {
+        throw new RuntimeException('Infinite Stream!');
+    }
+
+    public function getMetadata(?string $key = null): array|null
+    {
+        return $key !== null ? null : [];
+    }
+}
diff --git a/vendor/maennchen/zipstream-php/test/FaultInjectionResource.php b/vendor/maennchen/zipstream-php/test/FaultInjectionResource.php
new file mode 100644
index 0000000000..3d4440e8a4
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/test/FaultInjectionResource.php
@@ -0,0 +1,141 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Test;
+
+class FaultInjectionResource
+{
+    public const NAME = 'zipstream-php-test-broken-resource';
+
+    /** @var resource */
+    public $context;
+
+    private array $injectFaults;
+
+    private string $mode;
+
+    /**
+     * @return resource
+     */
+    public static function getResource(array $injectFaults)
+    {
+        self::register();
+
+        return fopen(self::NAME . '://foobar', 'rw+', false, self::createStreamContext($injectFaults));
+    }
+
+    public function stream_open(string $path, string $mode, int $options, string &$opened_path = null): bool
+    {
+        $options = stream_context_get_options($this->context);
+
+        if (!isset($options[self::NAME]['injectFaults'])) {
+            return false;
+        }
+
+        $this->mode = $mode;
+        $this->injectFaults = $options[self::NAME]['injectFaults'];
+
+        if ($this->shouldFail(__FUNCTION__)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public function stream_write(string $data)
+    {
+        if ($this->shouldFail(__FUNCTION__)) {
+            return false;
+        }
+        return true;
+    }
+
+    public function stream_eof()
+    {
+        return true;
+    }
+
+    public function stream_seek(int $offset, int $whence): bool
+    {
+        if ($this->shouldFail(__FUNCTION__)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public function stream_tell(): int
+    {
+        if ($this->shouldFail(__FUNCTION__)) {
+            return false;
+        }
+
+        return 0;
+    }
+
+    public static function register(): void
+    {
+        if (!in_array(self::NAME, stream_get_wrappers(), true)) {
+            stream_wrapper_register(self::NAME, __CLASS__);
+        }
+    }
+
+    public function stream_stat(): array
+    {
+        static $modeMap = [
+            'r'  => 33060,
+            'rb' => 33060,
+            'r+' => 33206,
+            'w'  => 33188,
+            'wb' => 33188,
+        ];
+
+        return [
+            'dev'     => 0,
+            'ino'     => 0,
+            'mode'    => $modeMap[$this->mode],
+            'nlink'   => 0,
+            'uid'     => 0,
+            'gid'     => 0,
+            'rdev'    => 0,
+            'size'    => 0,
+            'atime'   => 0,
+            'mtime'   => 0,
+            'ctime'   => 0,
+            'blksize' => 0,
+            'blocks'  => 0,
+        ];
+    }
+
+    public function url_stat(string $path, int $flags): array
+    {
+        return [
+            'dev'     => 0,
+            'ino'     => 0,
+            'mode'    => 0,
+            'nlink'   => 0,
+            'uid'     => 0,
+            'gid'     => 0,
+            'rdev'    => 0,
+            'size'    => 0,
+            'atime'   => 0,
+            'mtime'   => 0,
+            'ctime'   => 0,
+            'blksize' => 0,
+            'blocks'  => 0,
+        ];
+    }
+
+    private static function createStreamContext(array $injectFaults)
+    {
+        return stream_context_create([
+            self::NAME => ['injectFaults' => $injectFaults],
+        ]);
+    }
+
+    private function shouldFail(string $function): bool
+    {
+        return in_array($function, $this->injectFaults, true);
+    }
+}
diff --git a/vendor/maennchen/zipstream-php/test/LocalFileHeaderTest.php b/vendor/maennchen/zipstream-php/test/LocalFileHeaderTest.php
new file mode 100644
index 0000000000..196dd0fe32
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/test/LocalFileHeaderTest.php
@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Test;
+
+use DateTimeImmutable;
+use PHPUnit\Framework\TestCase;
+use ZipStream\CompressionMethod;
+use ZipStream\LocalFileHeader;
+
+class LocalFileHeaderTest extends TestCase
+{
+    public function testSerializesCorrectly(): void
+    {
+        $dateTime = new DateTimeImmutable('2022-01-01 01:01:01Z');
+
+        $header = LocalFileHeader::generate(
+            versionNeededToExtract: 0x002D,
+            generalPurposeBitFlag: 0x2222,
+            compressionMethod: CompressionMethod::DEFLATE,
+            lastModificationDateTime: $dateTime,
+            crc32UncompressedData: 0x11111111,
+            compressedSize: 0x77777777,
+            uncompressedSize: 0x99999999,
+            fileName: 'test.png',
+            extraField: 'some content'
+        );
+
+        $this->assertSame(
+            bin2hex((string) $header),
+            '504b0304' . // 4 bytes; Local file header signature
+            '2d00' . // 2 bytes; Version needed to extract (minimum)
+            '2222' . // 2 bytes; General purpose bit flag
+            '0800' . // 2 bytes; Compression method; e.g. none = 0, DEFLATE = 8
+            '2008' . // 2 bytes; File last modification time
+            '2154' . // 2 bytes; File last modification date
+            '11111111' . // 4 bytes; CRC-32 of uncompressed data
+            '77777777' . // 4 bytes; Compressed size (or 0xffffffff for ZIP64)
+            '99999999' . // 4 bytes; Uncompressed size (or 0xffffffff for ZIP64)
+            '0800' . // 2 bytes; File name length (n)
+            '0c00' . // 2 bytes; Extra field length (m)
+            '746573742e706e67' . // n bytes; File name
+            '736f6d6520636f6e74656e74' // m bytes; Extra field
+        );
+    }
+}
diff --git a/vendor/maennchen/zipstream-php/test/PackFieldTest.php b/vendor/maennchen/zipstream-php/test/PackFieldTest.php
new file mode 100644
index 0000000000..ecd66bac7e
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/test/PackFieldTest.php
@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Test;
+
+use PHPUnit\Framework\TestCase;
+use RuntimeException;
+use ZipStream\PackField;
+
+class PackFieldTest extends TestCase
+{
+    public function testPacksFields(): void
+    {
+        $this->assertSame(
+            bin2hex(PackField::pack(new PackField(format: 'v', value: 0x1122))),
+            '2211',
+        );
+    }
+
+    public function testOverflow2(): void
+    {
+        $this->expectException(RuntimeException::class);
+
+        PackField::pack(new PackField(format: 'v', value: 0xFFFFF));
+    }
+
+    public function testOverflow4(): void
+    {
+        $this->expectException(RuntimeException::class);
+
+        PackField::pack(new PackField(format: 'V', value: 0xFFFFFFFFF));
+    }
+
+    public function testUnknownOperator(): void
+    {
+        $this->assertSame(
+            bin2hex(PackField::pack(new PackField(format: 'a', value: 0x1122))),
+            '34',
+        );
+    }
+}
diff --git a/vendor/maennchen/zipstream-php/test/ResourceStream.php b/vendor/maennchen/zipstream-php/test/ResourceStream.php
new file mode 100644
index 0000000000..752a1a3574
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/test/ResourceStream.php
@@ -0,0 +1,159 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Test;
+
+use Psr\Http\Message\StreamInterface;
+use RuntimeException;
+
+/**
+ * @internal
+ */
+class ResourceStream implements StreamInterface
+{
+    public function __construct(
+        /**
+         * @var resource
+         */
+        private $stream
+    ) {}
+
+    public function __toString(): string
+    {
+        if ($this->isSeekable()) {
+            $this->seek(0);
+        }
+        return (string) stream_get_contents($this->stream);
+    }
+
+    public function close(): void
+    {
+        $stream = $this->detach();
+        if ($stream) {
+            fclose($stream);
+        }
+    }
+
+    public function detach()
+    {
+        $result = $this->stream;
+        // According to the interface, the stream is left in an unusable state;
+        /** @psalm-suppress PossiblyNullPropertyAssignmentValue */
+        $this->stream = null;
+        return $result;
+    }
+
+    public function seek(int $offset, int $whence = SEEK_SET): void
+    {
+        if (!$this->isSeekable()) {
+            throw new RuntimeException();
+        }
+        if (fseek($this->stream, $offset, $whence) !== 0) {
+            // @codeCoverageIgnoreStart
+            throw new RuntimeException();
+            // @codeCoverageIgnoreEnd
+        }
+    }
+
+    public function isSeekable(): bool
+    {
+        return (bool) $this->getMetadata('seekable');
+    }
+
+    public function getMetadata(?string $key = null)
+    {
+        $metadata = stream_get_meta_data($this->stream);
+        return $key !== null ? @$metadata[$key] : $metadata;
+    }
+
+    public function getSize(): ?int
+    {
+        $stats = fstat($this->stream);
+        return $stats['size'];
+    }
+
+    public function tell(): int
+    {
+        $position = ftell($this->stream);
+        if ($position === false) {
+            // @codeCoverageIgnoreStart
+            throw new RuntimeException();
+            // @codeCoverageIgnoreEnd
+        }
+        return $position;
+    }
+
+    public function eof(): bool
+    {
+        return feof($this->stream);
+    }
+
+    public function rewind(): void
+    {
+        $this->seek(0);
+    }
+
+    public function write(string $string): int
+    {
+        if (!$this->isWritable()) {
+            throw new RuntimeException();
+        }
+        if (fwrite($this->stream, $string) === false) {
+            // @codeCoverageIgnoreStart
+            throw new RuntimeException();
+            // @codeCoverageIgnoreEnd
+        }
+        return strlen($string);
+    }
+
+    public function isWritable(): bool
+    {
+        $mode = $this->getMetadata('mode');
+        if (!is_string($mode)) {
+            // @codeCoverageIgnoreStart
+            throw new RuntimeException('Could not get stream mode from metadata!');
+            // @codeCoverageIgnoreEnd
+        }
+        return preg_match('/[waxc+]/', $mode) === 1;
+    }
+
+    public function read(int $length): string
+    {
+        if (!$this->isReadable()) {
+            throw new RuntimeException();
+        }
+        $result = fread($this->stream, $length);
+        if ($result === false) {
+            // @codeCoverageIgnoreStart
+            throw new RuntimeException();
+            // @codeCoverageIgnoreEnd
+        }
+        return $result;
+    }
+
+    public function isReadable(): bool
+    {
+        $mode = $this->getMetadata('mode');
+        if (!is_string($mode)) {
+            // @codeCoverageIgnoreStart
+            throw new RuntimeException('Could not get stream mode from metadata!');
+            // @codeCoverageIgnoreEnd
+        }
+        return preg_match('/[r+]/', $mode) === 1;
+    }
+
+    public function getContents(): string
+    {
+        if (!$this->isReadable()) {
+            throw new RuntimeException();
+        }
+        $result = stream_get_contents($this->stream);
+        if ($result === false) {
+            // @codeCoverageIgnoreStart
+            throw new RuntimeException();
+            // @codeCoverageIgnoreEnd
+        }
+        return $result;
+    }
+}
diff --git a/vendor/maennchen/zipstream-php/test/Tempfile.php b/vendor/maennchen/zipstream-php/test/Tempfile.php
new file mode 100644
index 0000000000..7ef9c61f9f
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/test/Tempfile.php
@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Test;
+
+trait Tempfile
+{
+    protected string|null $tempfile;
+
+    /**
+     * @var resource
+     */
+    protected $tempfileStream;
+
+    protected function setUp(): void
+    {
+        [$tempfile, $tempfileStream] = $this->getTmpFileStream();
+
+        $this->tempfile = $tempfile;
+        $this->tempfileStream = $tempfileStream;
+    }
+
+    protected function tearDown(): void
+    {
+        unlink($this->tempfile);
+        if (is_resource($this->tempfileStream)) {
+            fclose($this->tempfileStream);
+        }
+
+        $this->tempfile = null;
+        $this->tempfileStream = null;
+    }
+
+    protected function getTmpFileStream(): array
+    {
+        $tmp = tempnam(sys_get_temp_dir(), 'zipstreamtest');
+        $stream = fopen($tmp, 'wb+');
+
+        return [$tmp, $stream];
+    }
+}
diff --git a/vendor/maennchen/zipstream-php/test/TimeTest.php b/vendor/maennchen/zipstream-php/test/TimeTest.php
new file mode 100644
index 0000000000..61cfe03887
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/test/TimeTest.php
@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Test;
+
+use DateTimeImmutable;
+use PHPUnit\Framework\TestCase;
+use ZipStream\Exception\DosTimeOverflowException;
+use ZipStream\Time;
+
+class TimeTest extends TestCase
+{
+    public function testNormalDateToDosTime(): void
+    {
+        $this->assertSame(
+            Time::dateTimeToDosTime(new DateTimeImmutable('2014-11-17T17:46:08Z')),
+            1165069764
+        );
+
+        // January 1 1980 - DOS Epoch.
+        $this->assertSame(
+            Time::dateTimeToDosTime(new DateTimeImmutable('1980-01-01T00:00:00+00:00')),
+            2162688
+        );
+
+        // Local timezone different than UTC.
+        $prevLocalTimezone = date_default_timezone_get();
+        date_default_timezone_set('Europe/Berlin');
+        $this->assertSame(
+            Time::dateTimeToDosTime(new DateTimeImmutable('1980-01-01T00:00:00+00:00')),
+            2162688
+        );
+        date_default_timezone_set($prevLocalTimezone);
+    }
+
+    public function testTooEarlyDateToDosTime(): void
+    {
+        $this->expectException(DosTimeOverflowException::class);
+
+        // January 1 1980 is the minimum DOS Epoch.
+        Time::dateTimeToDosTime(new DateTimeImmutable('1970-01-01T00:00:00+00:00'));
+    }
+}
diff --git a/vendor/maennchen/zipstream-php/test/Util.php b/vendor/maennchen/zipstream-php/test/Util.php
new file mode 100644
index 0000000000..86592b4292
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/test/Util.php
@@ -0,0 +1,127 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Test;
+
+use function fgets;
+use function pclose;
+use function popen;
+use function preg_match;
+
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
+
+use function strtolower;
+
+use ZipArchive;
+
+trait Util
+{
+    protected function cmdExists(string $command): bool
+    {
+        if (strtolower(\substr(PHP_OS, 0, 3)) === 'win') {
+            $fp = popen("where $command", 'r');
+            $result = fgets($fp, 255);
+            $exists = !preg_match('#Could not find files#', $result);
+            pclose($fp);
+        } else { // non-Windows
+            $fp = popen("which $command", 'r');
+            $result = fgets($fp, 255);
+            $exists = !empty($result);
+            pclose($fp);
+        }
+
+        return $exists;
+    }
+
+    protected function dumpZipContents(string $path): string
+    {
+        if (!$this->cmdExists('hexdump')) {
+            return '';
+        }
+
+        $output = [];
+
+        if (!exec("hexdump -C \"$path\" | head -n 50", $output)) {
+            return '';
+        }
+
+        return "\nHexdump:\n" . implode("\n", $output);
+    }
+
+    protected function validateAndExtractZip(string $zipPath): string
+    {
+        $tmpDir = $this->getTmpDir();
+
+        $zipArchive = new ZipArchive();
+        $result = $zipArchive->open($zipPath);
+
+        if ($result !== true) {
+            $codeName = $this->zipArchiveOpenErrorCodeName($result);
+            $debugInformation = $this->dumpZipContents($zipPath);
+
+            $this->fail("Failed to open {$zipPath}. Code: $result ($codeName)$debugInformation");
+
+            return $tmpDir;
+        }
+
+        $this->assertSame(0, $zipArchive->status);
+        $this->assertSame(0, $zipArchive->statusSys);
+
+        $zipArchive->extractTo($tmpDir);
+        $zipArchive->close();
+
+        return $tmpDir;
+    }
+
+    protected function zipArchiveOpenErrorCodeName(int $code): string
+    {
+        switch ($code) {
+            case ZipArchive::ER_EXISTS: return 'ER_EXISTS';
+            case ZipArchive::ER_INCONS: return 'ER_INCONS';
+            case ZipArchive::ER_INVAL: return 'ER_INVAL';
+            case ZipArchive::ER_MEMORY: return 'ER_MEMORY';
+            case ZipArchive::ER_NOENT: return 'ER_NOENT';
+            case ZipArchive::ER_NOZIP: return 'ER_NOZIP';
+            case ZipArchive::ER_OPEN: return 'ER_OPEN';
+            case ZipArchive::ER_READ: return 'ER_READ';
+            case ZipArchive::ER_SEEK: return 'ER_SEEK';
+            default: return 'unknown';
+        }
+    }
+
+    protected function getTmpDir(): string
+    {
+        $tmp = tempnam(sys_get_temp_dir(), 'zipstreamtest');
+        unlink($tmp);
+        mkdir($tmp) or $this->fail('Failed to make directory');
+
+        return $tmp;
+    }
+
+    /**
+     * @return string[]
+     */
+    protected function getRecursiveFileList(string $path, bool $includeDirectories = false): array
+    {
+        $data = [];
+        $path = (string) realpath($path);
+        $files = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path));
+
+        $pathLen = strlen($path);
+        foreach ($files as $file) {
+            $filePath = $file->getRealPath();
+
+            if (is_dir($filePath) && !$includeDirectories) {
+                continue;
+            }
+
+            $data[] = substr($filePath, $pathLen + 1);
+        }
+
+        sort($data);
+
+        return $data;
+    }
+}
diff --git a/vendor/maennchen/zipstream-php/test/Zip64/DataDescriptorTest.php b/vendor/maennchen/zipstream-php/test/Zip64/DataDescriptorTest.php
new file mode 100644
index 0000000000..49fb2ccb27
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/test/Zip64/DataDescriptorTest.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Test\Zip64;
+
+use PHPUnit\Framework\TestCase;
+use ZipStream\Zip64\DataDescriptor;
+
+class DataDescriptorTest extends TestCase
+{
+    public function testSerializesCorrectly(): void
+    {
+        $descriptor = DataDescriptor::generate(
+            crc32UncompressedData: 0x11111111,
+            compressedSize: (0x77777777 << 32) +  0x66666666,
+            uncompressedSize: (0x99999999 << 32) + 0x88888888,
+        );
+
+        $this->assertSame(
+            bin2hex($descriptor),
+            '504b0708' . // 4 bytes; Optional data descriptor signature = 0x08074b50
+            '11111111' . // 4 bytes; CRC-32 of uncompressed data
+            '6666666677777777' . // 8 bytes; Compressed size
+            '8888888899999999' // 8 bytes; Uncompressed size
+        );
+    }
+}
diff --git a/vendor/maennchen/zipstream-php/test/Zip64/EndOfCentralDirectoryLocatorTest.php b/vendor/maennchen/zipstream-php/test/Zip64/EndOfCentralDirectoryLocatorTest.php
new file mode 100644
index 0000000000..271a298628
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/test/Zip64/EndOfCentralDirectoryLocatorTest.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Test\Zip64;
+
+use PHPUnit\Framework\TestCase;
+use ZipStream\Zip64\EndOfCentralDirectoryLocator;
+
+class EndOfCentralDirectoryLocatorTest extends TestCase
+{
+    public function testSerializesCorrectly(): void
+    {
+        $descriptor = EndOfCentralDirectoryLocator::generate(
+            numberOfTheDiskWithZip64CentralDirectoryStart: 0x11111111,
+            zip64centralDirectoryStartOffsetOnDisk: (0x22222222 << 32) + 0x33333333,
+            totalNumberOfDisks: 0x44444444,
+        );
+
+        $this->assertSame(
+            bin2hex($descriptor),
+            '504b0607' . // 4 bytes; zip64 end of central dir locator signature - 0x07064b50
+            '11111111' . // 4 bytes; number of the disk with the start of the zip64 end of central directory
+            '3333333322222222' . // 28 bytes; relative offset of the zip64 end of central directory record
+            '44444444' // 4 bytes;total number of disks
+        );
+    }
+}
diff --git a/vendor/maennchen/zipstream-php/test/Zip64/EndOfCentralDirectoryTest.php b/vendor/maennchen/zipstream-php/test/Zip64/EndOfCentralDirectoryTest.php
new file mode 100644
index 0000000000..b86fb1781f
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/test/Zip64/EndOfCentralDirectoryTest.php
@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Test\Zip64;
+
+use PHPUnit\Framework\TestCase;
+use ZipStream\Zip64\EndOfCentralDirectory;
+
+class EndOfCentralDirectoryTest extends TestCase
+{
+    public function testSerializesCorrectly(): void
+    {
+        $descriptor = EndOfCentralDirectory::generate(
+            versionMadeBy: 0x3333,
+            versionNeededToExtract: 0x4444,
+            numberOfThisDisk: 0x55555555,
+            numberOfTheDiskWithCentralDirectoryStart: 0x66666666,
+            numberOfCentralDirectoryEntriesOnThisDisk: (0x77777777 << 32) + 0x88888888,
+            numberOfCentralDirectoryEntries: (0x99999999 << 32) + 0xAAAAAAAA,
+            sizeOfCentralDirectory: (0xBBBBBBBB << 32) + 0xCCCCCCCC,
+            centralDirectoryStartOffsetOnDisk: (0xDDDDDDDD << 32) + 0xEEEEEEEE,
+            extensibleDataSector: 'foo',
+        );
+
+        $this->assertSame(
+            bin2hex($descriptor),
+            '504b0606' . // 4 bytes;zip64 end of central dir signature - 0x06064b50
+            '2f00000000000000' . // 8 bytes; size of zip64 end of central directory record
+            '3333' . // 2 bytes; version made by
+            '4444' . // 2 bytes; version needed to extract
+            '55555555' . // 4 bytes; number of this disk
+            '66666666' . // 4 bytes; number of the disk with the start of the central directory
+            '8888888877777777' . // 8 bytes; total number of entries in the central directory on this disk
+            'aaaaaaaa99999999' . // 8 bytes; total number of entries in the central directory
+            'ccccccccbbbbbbbb' . // 8 bytes; size of the central directory
+            'eeeeeeeedddddddd' . // 8 bytes; offset of start of central directory with respect to the starting disk number
+            bin2hex('foo')
+        );
+    }
+}
diff --git a/vendor/maennchen/zipstream-php/test/Zip64/ExtendedInformationExtraFieldTest.php b/vendor/maennchen/zipstream-php/test/Zip64/ExtendedInformationExtraFieldTest.php
new file mode 100644
index 0000000000..904783d860
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/test/Zip64/ExtendedInformationExtraFieldTest.php
@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Test\Zip64;
+
+use PHPUnit\Framework\TestCase;
+use ZipStream\Zip64\ExtendedInformationExtraField;
+
+class ExtendedInformationExtraFieldTest extends TestCase
+{
+    public function testSerializesCorrectly(): void
+    {
+        $extraField = ExtendedInformationExtraField::generate(
+            originalSize: (0x77777777 << 32) + 0x66666666,
+            compressedSize: (0x99999999 << 32) + 0x88888888,
+            relativeHeaderOffset: (0x22222222 << 32) + 0x11111111,
+            diskStartNumber: 0x33333333,
+        );
+
+        $this->assertSame(
+            bin2hex($extraField),
+            '0100' . // 2 bytes; Tag for this "extra" block type
+            '1c00' . // 2 bytes; Size of this "extra" block
+            '6666666677777777' . // 8 bytes; Original uncompressed file size
+            '8888888899999999' . // 8 bytes; Size of compressed data
+            '1111111122222222' . // 8 bytes; Offset of local header record
+            '33333333' // 4 bytes; Number of the disk on which this file starts
+        );
+    }
+
+    public function testSerializesEmptyCorrectly(): void
+    {
+        $extraField = ExtendedInformationExtraField::generate();
+
+        $this->assertSame(
+            bin2hex($extraField),
+            '0100' . // 2 bytes; Tag for this "extra" block type
+            '0000' // 2 bytes; Size of this "extra" block
+        );
+    }
+}
diff --git a/vendor/maennchen/zipstream-php/test/ZipStreamTest.php b/vendor/maennchen/zipstream-php/test/ZipStreamTest.php
index 6549b0b469..9b10ba65df 100644
--- a/vendor/maennchen/zipstream-php/test/ZipStreamTest.php
+++ b/vendor/maennchen/zipstream-php/test/ZipStreamTest.php
@@ -1,586 +1,1195 @@
 <?php
+
 declare(strict_types=1);
 
-namespace ZipStreamTest;
+namespace ZipStream\Test;
 
-use org\bovigo\vfs\vfsStream;
+use DateTimeImmutable;
 use GuzzleHttp\Psr7\Response;
+use GuzzleHttp\Psr7\StreamWrapper;
+use org\bovigo\vfs\vfsStream;
 use PHPUnit\Framework\TestCase;
-use ZipStream\File;
-use ZipStream\Option\Archive as ArchiveOptions;
-use ZipStream\Option\File as FileOptions;
-use ZipStream\Option\Method;
+use Psr\Http\Message\StreamInterface;
+use RuntimeException;
+use ZipArchive;
+use ZipStream\CompressionMethod;
+use ZipStream\Exception\FileNotFoundException;
+use ZipStream\Exception\FileNotReadableException;
+use ZipStream\Exception\FileSizeIncorrectException;
+use ZipStream\Exception\OverflowException;
+use ZipStream\Exception\ResourceActionException;
+use ZipStream\Exception\SimulationFileUnknownException;
+use ZipStream\Exception\StreamNotReadableException;
+use ZipStream\Exception\StreamNotSeekableException;
+use ZipStream\OperationMode;
+use ZipStream\PackField;
 use ZipStream\ZipStream;
 
-/**
- * Test Class for the Main ZipStream CLass
- */
 class ZipStreamTest extends TestCase
 {
-    const OSX_ARCHIVE_UTILITY =
-        '/System/Library/CoreServices/Applications/Archive Utility.app/Contents/MacOS/Archive Utility';
+    use Util;
+    use Assertions;
+    use Tempfile;
+
+    public function testAddFile(): void
+    {
+        $zip = new ZipStream(
+            outputStream: $this->tempfileStream,
+            sendHttpHeaders: false,
+        );
+
+        $zip->addFile('sample.txt', 'Sample String Data');
+        $zip->addFile('test/sample.txt', 'More Simple Sample Data');
+
+        $zip->finish();
+
+        $tmpDir = $this->validateAndExtractZip($this->tempfile);
+
+        $files = $this->getRecursiveFileList($tmpDir);
+        $this->assertSame(['sample.txt', 'test' . DIRECTORY_SEPARATOR . 'sample.txt'], $files);
+
+        $this->assertStringEqualsFile($tmpDir . '/sample.txt', 'Sample String Data');
+        $this->assertStringEqualsFile($tmpDir . '/test/sample.txt', 'More Simple Sample Data');
+    }
+
+    public function testAddFileUtf8NameComment(): void
+    {
+        $zip = new ZipStream(
+            outputStream: $this->tempfileStream,
+            sendHttpHeaders: false,
+        );
+
+        $name = 'árvíztűrő tükörfúrógép.txt';
+        $content = 'Sample String Data';
+        $comment =
+            'Filename has every special characters ' .
+            'from Hungarian language in lowercase. ' .
+            'In uppercase: ÁÍŰŐÜÖÚÓÉ';
+
+        $zip->addFile(fileName: $name, data: $content, comment: $comment);
+        $zip->finish();
+
+        $tmpDir = $this->validateAndExtractZip($this->tempfile);
+
+        $files = $this->getRecursiveFileList($tmpDir);
+        $this->assertSame([$name], $files);
+        $this->assertStringEqualsFile($tmpDir . '/' . $name, $content);
+
+        $zipArchive = new ZipArchive();
+        $zipArchive->open($this->tempfile);
+        $this->assertSame($comment, $zipArchive->getCommentName($name));
+    }
+
+    public function testAddFileUtf8NameNonUtfComment(): void
+    {
+        $zip = new ZipStream(
+            outputStream: $this->tempfileStream,
+            sendHttpHeaders: false,
+        );
+
+        $name = 'á.txt';
+        $content = 'any';
+        $comment = mb_convert_encoding('á', 'ISO-8859-2', 'UTF-8');
+
+        // @see https://libzip.org/documentation/zip_file_get_comment.html
+        //
+        // mb_convert_encoding hasn't CP437.
+        // nearly CP850 (DOS-Latin-1)
+        $guessComment = mb_convert_encoding($comment, 'UTF-8', 'CP850');
+
+        $zip->addFile(fileName: $name, data: $content, comment: $comment);
+
+        $zip->finish();
+
+        $zipArch = new ZipArchive();
+        $zipArch->open($this->tempfile);
+        $this->assertSame($guessComment, $zipArch->getCommentName($name));
+        $this->assertSame($comment, $zipArch->getCommentName($name, ZipArchive::FL_ENC_RAW));
+    }
+
+    public function testAddFileWithStorageMethod(): void
+    {
+        $zip = new ZipStream(
+            outputStream: $this->tempfileStream,
+            sendHttpHeaders: false,
+        );
+
+        $zip->addFile(fileName: 'sample.txt', data: 'Sample String Data', compressionMethod: CompressionMethod::STORE);
+        $zip->addFile(fileName: 'test/sample.txt', data: 'More Simple Sample Data');
+        $zip->finish();
+
+        $zipArchive = new ZipArchive();
+        $zipArchive->open($this->tempfile);
+
+        $sample1 = $zipArchive->statName('sample.txt');
+        $sample12 = $zipArchive->statName('test/sample.txt');
+        $this->assertSame($sample1['comp_method'], CompressionMethod::STORE->value);
+        $this->assertSame($sample12['comp_method'], CompressionMethod::DEFLATE->value);
+
+        $zipArchive->close();
+    }
 
-    public function testFileNotFoundException(): void
+    public function testAddFileFromPath(): void
     {
-        $this->expectException(\ZipStream\Exception\FileNotFoundException::class);
+        $zip = new ZipStream(
+            outputStream: $this->tempfileStream,
+            sendHttpHeaders: false,
+        );
+
+        [$tmpExample, $streamExample] = $this->getTmpFileStream();
+        fwrite($streamExample, 'Sample String Data');
+        fclose($streamExample);
+        $zip->addFileFromPath(fileName: 'sample.txt', path: $tmpExample);
+
+        [$tmpExample, $streamExample] = $this->getTmpFileStream();
+        fwrite($streamExample, 'More Simple Sample Data');
+        fclose($streamExample);
+        $zip->addFileFromPath(fileName: 'test/sample.txt', path: $tmpExample);
+
+        $zip->finish();
+
+        $tmpDir = $this->validateAndExtractZip($this->tempfile);
+
+        $files = $this->getRecursiveFileList($tmpDir);
+        $this->assertSame(['sample.txt', 'test' . DIRECTORY_SEPARATOR . 'sample.txt'], $files);
+
+        $this->assertStringEqualsFile($tmpDir . '/sample.txt', 'Sample String Data');
+        $this->assertStringEqualsFile($tmpDir . '/test/sample.txt', 'More Simple Sample Data');
+
+        unlink($tmpExample);
+    }
+
+    public function testAddFileFromPathFileNotFoundException(): void
+    {
+        $this->expectException(FileNotFoundException::class);
+
         // Get ZipStream Object
-        $zip = new ZipStream();
+        $zip = new ZipStream(
+            outputStream: $this->tempfileStream,
+            sendHttpHeaders: false,
+        );
 
         // Trigger error by adding a file which doesn't exist
-        $zip->addFileFromPath('foobar.php', '/foo/bar/foobar.php');
+        $zip->addFileFromPath(fileName: 'foobar.php', path: '/foo/bar/foobar.php');
     }
 
-    public function testFileNotReadableException(): void
+    public function testAddFileFromPathFileNotReadableException(): void
     {
+        $this->expectException(FileNotReadableException::class);
+
         // create new virtual filesystem
         $root = vfsStream::setup('vfs');
         // create a virtual file with no permissions
-        $file = vfsStream::newFile('foo.txt', 0000)->at($root)->setContent('bar');
-        $zip = new ZipStream();
-        $this->expectException(\ZipStream\Exception\FileNotReadableException::class);
+        $file = vfsStream::newFile('foo.txt', 0)->at($root)->setContent('bar');
+
+        // Get ZipStream Object
+        $zip = new ZipStream(
+            outputStream: $this->tempfileStream,
+            sendHttpHeaders: false,
+        );
+
         $zip->addFileFromPath('foo.txt', $file->url());
     }
 
-    public function testDostime(): void
+    public function testAddFileFromPathWithStorageMethod(): void
     {
-        // Allows testing of protected method
-        $class = new \ReflectionClass(File::class);
-        $method = $class->getMethod('dostime');
-        $method->setAccessible(true);
+        $zip = new ZipStream(
+            outputStream: $this->tempfileStream,
+            sendHttpHeaders: false,
+        );
 
-        $this->assertSame($method->invoke(null, 1416246368), 1165069764);
+        [$tmpExample, $streamExample] = $this->getTmpFileStream();
+        fwrite($streamExample, 'Sample String Data');
+        fclose($streamExample);
+        $zip->addFileFromPath(fileName: 'sample.txt', path: $tmpExample, compressionMethod: CompressionMethod::STORE);
+
+        [$tmpExample, $streamExample] = $this->getTmpFileStream();
+        fwrite($streamExample, 'More Simple Sample Data');
+        fclose($streamExample);
+        $zip->addFileFromPath('test/sample.txt', $tmpExample);
 
-        // January 1 1980 - DOS Epoch.
-        $this->assertSame($method->invoke(null, 315532800), 2162688);
+        $zip->finish();
+
+        $zipArchive = new ZipArchive();
+        $zipArchive->open($this->tempfile);
+
+        $sample1 = $zipArchive->statName('sample.txt');
+        $this->assertSame(CompressionMethod::STORE->value, $sample1['comp_method']);
+
+        $sample2 = $zipArchive->statName('test/sample.txt');
+        $this->assertSame(CompressionMethod::DEFLATE->value, $sample2['comp_method']);
 
-        // January 1 1970 -> January 1 1980 due to minimum DOS Epoch.  @todo Throw Exception?
-        $this->assertSame($method->invoke(null, 0), 2162688);
+        $zipArchive->close();
     }
 
-    public function testAddFile(): void
+    public function testAddLargeFileFromPath(): void
     {
-        [$tmp, $stream] = $this->getTmpFileStream();
+        foreach ([CompressionMethod::DEFLATE, CompressionMethod::STORE] as $compressionMethod) {
+            foreach ([false, true] as $zeroHeader) {
+                foreach ([false, true] as $zip64) {
+                    if ($zeroHeader && $compressionMethod === CompressionMethod::DEFLATE) {
+                        continue;
+                    }
+                    $this->addLargeFileFileFromPath(
+                        compressionMethod: $compressionMethod,
+                        zeroHeader: $zeroHeader,
+                        zip64: $zip64
+                    );
+                }
+            }
+        }
+    }
 
-        $options = new ArchiveOptions();
-        $options->setOutputStream($stream);
+    public function testAddFileFromStream(): void
+    {
+        $zip = new ZipStream(
+            outputStream: $this->tempfileStream,
+            sendHttpHeaders: false,
+        );
 
-        $zip = new ZipStream(null, $options);
+        // In this test we can't use temporary stream to feed data
+        // because zlib.deflate filter gives empty string before PHP 7
+        // it works fine with file stream
+        $streamExample = fopen(__FILE__, 'rb');
+        $zip->addFileFromStream('sample.txt', $streamExample);
+        fclose($streamExample);
 
-        $zip->addFile('sample.txt', 'Sample String Data');
-        $zip->addFile('test/sample.txt', 'More Simple Sample Data');
+        $streamExample2 = fopen('php://temp', 'wb+');
+        fwrite($streamExample2, 'More Simple Sample Data');
+        rewind($streamExample2); // move the pointer back to the beginning of file.
+        $zip->addFileFromStream('test/sample.txt', $streamExample2); //, $fileOptions);
+        fclose($streamExample2);
 
         $zip->finish();
-        fclose($stream);
 
-        $tmpDir = $this->validateAndExtractZip($tmp);
+        $tmpDir = $this->validateAndExtractZip($this->tempfile);
 
         $files = $this->getRecursiveFileList($tmpDir);
-        $this->assertEquals(['sample.txt', 'test/sample.txt'], $files);
+        $this->assertSame(['sample.txt', 'test' . DIRECTORY_SEPARATOR . 'sample.txt'], $files);
 
-        $this->assertStringEqualsFile($tmpDir . '/sample.txt', 'Sample String Data');
+        $this->assertStringEqualsFile(__FILE__, file_get_contents($tmpDir . '/sample.txt'));
         $this->assertStringEqualsFile($tmpDir . '/test/sample.txt', 'More Simple Sample Data');
     }
 
-    /**
-     * @return array
-     */
-    protected function getTmpFileStream(): array
+    public function testAddFileFromStreamUnreadableInput(): void
     {
-        $tmp = tempnam(sys_get_temp_dir(), 'zipstreamtest');
-        $stream = fopen($tmp, 'wb+');
+        $this->expectException(StreamNotReadableException::class);
+
+        [$tmpInput] = $this->getTmpFileStream();
 
-        return array($tmp, $stream);
+        $zip = new ZipStream(
+            outputStream: $this->tempfileStream,
+            sendHttpHeaders: false,
+        );
+
+        $streamUnreadable = fopen($tmpInput, 'w');
+
+        $zip->addFileFromStream('sample.json', $streamUnreadable);
     }
 
-    /**
-     * @param string $tmp
-     * @return string
-     */
-    protected function validateAndExtractZip($tmp): string
+    public function testAddFileFromStreamBrokenOutputWrite(): void
     {
-        $tmpDir = $this->getTmpDir();
+        $this->expectException(ResourceActionException::class);
 
-        $zipArch = new \ZipArchive;
-        $res = $zipArch->open($tmp);
+        $outputStream = FaultInjectionResource::getResource(['stream_write']);
 
-        if ($res !== true) {
-            $this->fail("Failed to open {$tmp}. Code: $res");
+        $zip = new ZipStream(
+            outputStream: $outputStream,
+            sendHttpHeaders: false,
+        );
 
-            return $tmpDir;
-        }
+        $zip->addFile('sample.txt', 'foobar');
+    }
 
-        $this->assertEquals(0, $zipArch->status);
-        $this->assertEquals(0, $zipArch->statusSys);
+    public function testAddFileFromStreamBrokenInputRewind(): void
+    {
+        $this->expectException(ResourceActionException::class);
 
-        $zipArch->extractTo($tmpDir);
-        $zipArch->close();
+        $zip = new ZipStream(
+            outputStream: $this->tempfileStream,
+            sendHttpHeaders: false,
+            defaultEnableZeroHeader: false,
+        );
 
-        return $tmpDir;
+        $fileStream = FaultInjectionResource::getResource(['stream_seek']);
+
+        $zip->addFileFromStream('sample.txt', $fileStream, maxSize: 0);
     }
 
-    protected function getTmpDir(): string
+    public function testAddFileFromStreamUnseekableInputWithoutZeroHeader(): void
     {
-        $tmp = tempnam(sys_get_temp_dir(), 'zipstreamtest');
-        unlink($tmp);
-        mkdir($tmp) or $this->fail('Failed to make directory');
+        $this->expectException(StreamNotSeekableException::class);
+
+        $zip = new ZipStream(
+            outputStream: $this->tempfileStream,
+            sendHttpHeaders: false,
+            defaultEnableZeroHeader: false,
+        );
+
+        if (file_exists('/dev/null')) {
+            $streamUnseekable = fopen('/dev/null', 'w+');
+        } elseif (file_exists('NUL')) {
+            $streamUnseekable = fopen('NUL', 'w+');
+        } else {
+            $this->markTestSkipped('Needs file /dev/null');
+        }
 
-        return $tmp;
+        $zip->addFileFromStream('sample.txt', $streamUnseekable, maxSize: 2);
     }
 
-    /**
-     * @param string $path
-     * @return string[]
-     */
-    protected function getRecursiveFileList(string $path): array
+    public function testAddFileFromStreamUnseekableInputWithZeroHeader(): void
     {
-        $data = array();
-        $path = (string)realpath($path);
-        $files = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($path));
+        $zip = new ZipStream(
+            outputStream: $this->tempfileStream,
+            sendHttpHeaders: false,
+            defaultEnableZeroHeader: true,
+            defaultCompressionMethod: CompressionMethod::STORE,
+        );
+
+        $streamUnseekable = StreamWrapper::getResource(new class ('test') extends EndlessCycleStream {
+            public function isSeekable(): bool
+            {
+                return false;
+            }
 
-        $pathLen = strlen($path);
-        foreach ($files as $file) {
-            $filePath = $file->getRealPath();
-            if (!is_dir($filePath)) {
-                $data[] = substr($filePath, $pathLen + 1);
+            public function seek(int $offset, int $whence = SEEK_SET): void
+            {
+                throw new RuntimeException('Not seekable');
             }
-        }
+        });
+
+        $zip->addFileFromStream('sample.txt', $streamUnseekable, maxSize: 7);
+
+        $zip->finish();
 
-        sort($data);
+        $tmpDir = $this->validateAndExtractZip($this->tempfile);
 
-        return $data;
+        $files = $this->getRecursiveFileList($tmpDir);
+        $this->assertSame(['sample.txt'], $files);
+
+        $this->assertSame(filesize($tmpDir . '/sample.txt'), 7);
     }
 
-    public function testAddFileUtf8NameComment(): void
+    public function testAddFileFromStreamWithStorageMethod(): void
     {
-        [$tmp, $stream] = $this->getTmpFileStream();
+        $zip = new ZipStream(
+            outputStream: $this->tempfileStream,
+            sendHttpHeaders: false,
+        );
 
-        $options = new ArchiveOptions();
-        $options->setOutputStream($stream);
+        $streamExample = fopen('php://temp', 'wb+');
+        fwrite($streamExample, 'Sample String Data');
+        rewind($streamExample); // move the pointer back to the beginning of file.
+        $zip->addFileFromStream('sample.txt', $streamExample, compressionMethod: CompressionMethod::STORE);
+        fclose($streamExample);
 
-        $zip = new ZipStream(null, $options);
+        $streamExample2 = fopen('php://temp', 'bw+');
+        fwrite($streamExample2, 'More Simple Sample Data');
+        rewind($streamExample2); // move the pointer back to the beginning of file.
+        $zip->addFileFromStream('test/sample.txt', $streamExample2, compressionMethod: CompressionMethod::DEFLATE);
+        fclose($streamExample2);
 
-        $name = 'árvíztűrő tükörfúrógép.txt';
-        $content = 'Sample String Data';
-        $comment =
-            'Filename has every special characters ' .
-            'from Hungarian language in lowercase. ' .
-            'In uppercase: ÁÍŰŐÜÖÚÓÉ';
+        $zip->finish();
+
+        $zipArchive = new ZipArchive();
+        $zipArchive->open($this->tempfile);
+
+        $sample1 = $zipArchive->statName('sample.txt');
+        $this->assertSame(CompressionMethod::STORE->value, $sample1['comp_method']);
 
-        $fileOptions = new FileOptions();
-        $fileOptions->setComment($comment);
+        $sample2 = $zipArchive->statName('test/sample.txt');
+        $this->assertSame(CompressionMethod::DEFLATE->value, $sample2['comp_method']);
 
-        $zip->addFile($name, $content, $fileOptions);
+        $zipArchive->close();
+    }
+
+    public function testAddFileFromPsr7Stream(): void
+    {
+        $zip = new ZipStream(
+            outputStream: $this->tempfileStream,
+            sendHttpHeaders: false,
+        );
+
+        $body = 'Sample String Data';
+        $response = new Response(200, [], $body);
+
+        $zip->addFileFromPsr7Stream('sample.json', $response->getBody());
         $zip->finish();
-        fclose($stream);
 
-        $tmpDir = $this->validateAndExtractZip($tmp);
+        $tmpDir = $this->validateAndExtractZip($this->tempfile);
 
         $files = $this->getRecursiveFileList($tmpDir);
-        $this->assertEquals(array($name), $files);
-        $this->assertStringEqualsFile($tmpDir . '/' . $name, $content);
+        $this->assertSame(['sample.json'], $files);
+        $this->assertStringEqualsFile($tmpDir . '/sample.json', $body);
+    }
+
+    /**
+     * @group slow
+     */
+    public function testAddLargeFileFromPsr7Stream(): void
+    {
+        $zip = new ZipStream(
+            outputStream: $this->tempfileStream,
+            sendHttpHeaders: false,
+            enableZip64: true,
+        );
+
+        $zip->addFileFromPsr7Stream(
+            fileName: 'sample.json',
+            stream: new EndlessCycleStream('0'),
+            maxSize: 0x100000000,
+            compressionMethod: CompressionMethod::STORE,
+            lastModificationDateTime: new DateTimeImmutable('2022-01-01 01:01:01Z'),
+        );
+        $zip->finish();
 
-        $zipArch = new \ZipArchive();
-        $zipArch->open($tmp);
-        $this->assertEquals($comment, $zipArch->getCommentName($name));
+        $tmpDir = $this->validateAndExtractZip($this->tempfile);
+
+        $files = $this->getRecursiveFileList($tmpDir);
+        $this->assertSame(['sample.json'], $files);
+        $this->assertFileIsReadable($tmpDir . '/sample.json');
+        $this->assertStringStartsWith('000000', file_get_contents(filename: $tmpDir . '/sample.json', length: 20));
     }
 
-    public function testAddFileUtf8NameNonUtfComment(): void
+    public function testContinueFinishedZip(): void
     {
-        $this->expectException(\ZipStream\Exception\EncodingException::class);
+        $this->expectException(RuntimeException::class);
 
-        $stream = $this->getTmpFileStream()[1];
+        $zip = new ZipStream(
+            outputStream: $this->tempfileStream,
+            sendHttpHeaders: false,
+        );
+        $zip->finish();
 
-        $options = new ArchiveOptions();
-        $options->setOutputStream($stream);
+        $zip->addFile('sample.txt', '1234');
+    }
 
-        $zip = new ZipStream(null, $options);
+    /**
+     * @group slow
+     */
+    public function testManyFilesWithoutZip64(): void
+    {
+        $this->expectException(OverflowException::class);
 
-        $name = 'á.txt';
-        $content = 'any';
-        $comment = 'á';
+        $zip = new ZipStream(
+            outputStream: $this->tempfileStream,
+            sendHttpHeaders: false,
+            enableZip64: false,
+        );
 
-        $fileOptions = new FileOptions();
-        $fileOptions->setComment(mb_convert_encoding($comment, 'ISO-8859-2', 'UTF-8'));
+        for ($i = 0; $i <= 0xFFFF; $i++) {
+            $zip->addFile('sample' . $i, '');
+        }
 
-        $zip->addFile($name, $content, $fileOptions);
+        $zip->finish();
     }
 
-    public function testAddFileNonUtf8NameUtfComment(): void
+    /**
+     * @group slow
+     */
+    public function testManyFilesWithZip64(): void
     {
-        $this->expectException(\ZipStream\Exception\EncodingException::class);
+        $zip = new ZipStream(
+            outputStream: $this->tempfileStream,
+            sendHttpHeaders: false,
+            enableZip64: true,
+        );
+
+        for ($i = 0; $i <= 0xFFFF; $i++) {
+            $zip->addFile('sample' . $i, '');
+        }
+
+        $zip->finish();
 
-        $stream = $this->getTmpFileStream()[1];
+        $tmpDir = $this->validateAndExtractZip($this->tempfile);
 
-        $options = new ArchiveOptions();
-        $options->setOutputStream($stream);
+        $files = $this->getRecursiveFileList($tmpDir);
 
-        $zip = new ZipStream(null, $options);
+        $this->assertSame(count($files), 0x10000);
+    }
 
-        $name = 'á.txt';
-        $content = 'any';
-        $comment = 'á';
+    /**
+     * @group slow
+     */
+    public function testLongZipWithout64(): void
+    {
+        $this->expectException(OverflowException::class);
+
+        $zip = new ZipStream(
+            outputStream: $this->tempfileStream,
+            sendHttpHeaders: false,
+            enableZip64: false,
+            defaultCompressionMethod: CompressionMethod::STORE,
+        );
+
+        for ($i = 0; $i < 4; $i++) {
+            $zip->addFileFromPsr7Stream(
+                fileName: 'sample' . $i,
+                stream: new EndlessCycleStream('0'),
+                maxSize: 0xFFFFFFFF,
+                compressionMethod: CompressionMethod::STORE,
+                lastModificationDateTime: new DateTimeImmutable('2022-01-01 01:01:01Z'),
+            );
+        }
+    }
+
+    /**
+     * @group slow
+     */
+    public function testLongZipWith64(): void
+    {
+        $zip = new ZipStream(
+            outputStream: $this->tempfileStream,
+            sendHttpHeaders: false,
+            enableZip64: true,
+            defaultCompressionMethod: CompressionMethod::STORE,
+        );
+
+        for ($i = 0; $i < 4; $i++) {
+            $zip->addFileFromPsr7Stream(
+                fileName: 'sample' . $i,
+                stream: new EndlessCycleStream('0'),
+                maxSize: 0x5FFFFFFF,
+                compressionMethod: CompressionMethod::STORE,
+                lastModificationDateTime: new DateTimeImmutable('2022-01-01 01:01:01Z'),
+            );
+        }
 
-        $fileOptions = new FileOptions();
-        $fileOptions->setComment($comment);
+        $zip->finish();
+
+        $tmpDir = $this->validateAndExtractZip($this->tempfile);
 
-        $zip->addFile(mb_convert_encoding($name, 'ISO-8859-2', 'UTF-8'), $content, $fileOptions);
+        $files = $this->getRecursiveFileList($tmpDir);
+        $this->assertSame(['sample0', 'sample1', 'sample2', 'sample3'], $files);
     }
 
-    public function testAddFileWithStorageMethod(): void
+    /**
+     * @group slow
+     */
+    public function testAddLargeFileWithoutZip64WithZeroHeader(): void
     {
-        [$tmp, $stream] = $this->getTmpFileStream();
+        $this->expectException(OverflowException::class);
+
+        $zip = new ZipStream(
+            outputStream: $this->tempfileStream,
+            sendHttpHeaders: false,
+            enableZip64: false,
+            defaultEnableZeroHeader: true,
+        );
+
+        $zip->addFileFromPsr7Stream(
+            fileName: 'sample.json',
+            stream: new EndlessCycleStream('0'),
+            maxSize: 0x100000000,
+            compressionMethod: CompressionMethod::STORE,
+            lastModificationDateTime: new DateTimeImmutable('2022-01-01 01:01:01Z'),
+        );
+    }
 
-        $options = new ArchiveOptions();
-        $options->setOutputStream($stream);
+    /**
+     * @group slow
+     */
+    public function testAddsZip64HeaderWhenNeeded(): void
+    {
+        $zip = new ZipStream(
+            outputStream: $this->tempfileStream,
+            sendHttpHeaders: false,
+            enableZip64: true,
+            defaultEnableZeroHeader: false,
+        );
+
+        $zip->addFileFromPsr7Stream(
+            fileName: 'sample.json',
+            stream: new EndlessCycleStream('0'),
+            maxSize: 0x100000000,
+            compressionMethod: CompressionMethod::STORE,
+            lastModificationDateTime: new DateTimeImmutable('2022-01-01 01:01:01Z'),
+        );
 
-        $zip = new ZipStream(null, $options);
+        $zip->finish();
 
-        $fileOptions = new FileOptions();
-        $fileOptions->setMethod(Method::STORE());
+        $tmpDir = $this->validateAndExtractZip($this->tempfile);
+        $files = $this->getRecursiveFileList($tmpDir);
+
+        $this->assertSame(['sample.json'], $files);
+        $this->assertFileContains($this->tempfile, PackField::pack(
+            new PackField(format: 'V', value: 0x06064b50)
+        ));
+    }
+
+    /**
+     * @group slow
+     */
+    public function testDoesNotAddZip64HeaderWhenNotNeeded(): void
+    {
+        $zip = new ZipStream(
+            outputStream: $this->tempfileStream,
+            sendHttpHeaders: false,
+            enableZip64: true,
+            defaultEnableZeroHeader: false,
+        );
+
+        $zip->addFileFromPsr7Stream(
+            fileName: 'sample.json',
+            stream: new EndlessCycleStream('0'),
+            maxSize: 0x10,
+            compressionMethod: CompressionMethod::STORE,
+            lastModificationDateTime: new DateTimeImmutable('2022-01-01 01:01:01Z'),
+        );
 
-        $zip->addFile('sample.txt', 'Sample String Data', $fileOptions);
-        $zip->addFile('test/sample.txt', 'More Simple Sample Data');
         $zip->finish();
-        fclose($stream);
 
-        $zipArch = new \ZipArchive();
-        $zipArch->open($tmp);
+        $tmpDir = $this->validateAndExtractZip($this->tempfile);
+        $files = $this->getRecursiveFileList($tmpDir);
 
-        $sample1 = $zipArch->statName('sample.txt');
-        $sample12 = $zipArch->statName('test/sample.txt');
-        $this->assertEquals($sample1['comp_method'], Method::STORE);
-        $this->assertEquals($sample12['comp_method'], Method::DEFLATE);
+        $this->assertSame(['sample.json'], $files);
+        $this->assertFileDoesNotContain($this->tempfile, PackField::pack(
+            new PackField(format: 'V', value: 0x06064b50)
+        ));
+    }
 
-        $zipArch->close();
+    /**
+     * @group slow
+     */
+    public function testAddLargeFileWithoutZip64WithoutZeroHeader(): void
+    {
+        $this->expectException(OverflowException::class);
+
+        $zip = new ZipStream(
+            outputStream: $this->tempfileStream,
+            sendHttpHeaders: false,
+            enableZip64: false,
+            defaultEnableZeroHeader: false,
+        );
+
+        $zip->addFileFromPsr7Stream(
+            fileName: 'sample.json',
+            stream: new EndlessCycleStream('0'),
+            maxSize: 0x100000000,
+            compressionMethod: CompressionMethod::STORE,
+            lastModificationDateTime: new DateTimeImmutable('2022-01-01 01:01:01Z'),
+        );
     }
 
-    public function testDecompressFileWithMacUnarchiver(): void
+    public function testAddFileFromPsr7StreamWithOutputToPsr7Stream(): void
     {
-        if (!file_exists(self::OSX_ARCHIVE_UTILITY)) {
-            $this->markTestSkipped('The Mac OSX Archive Utility is not available.');
-        }
+        $psr7OutputStream = new ResourceStream($this->tempfileStream);
 
-        [$tmp, $stream] = $this->getTmpFileStream();
+        $zip = new ZipStream(
+            outputStream: $psr7OutputStream,
+            sendHttpHeaders: false,
+        );
 
-        $options = new ArchiveOptions();
-        $options->setOutputStream($stream);
+        $body = 'Sample String Data';
+        $response = new Response(200, [], $body);
 
-        $zip = new ZipStream(null, $options);
+        $zip->addFileFromPsr7Stream(
+            fileName: 'sample.json',
+            stream: $response->getBody(),
+            compressionMethod: CompressionMethod::STORE,
+        );
+        $zip->finish();
+        $psr7OutputStream->close();
 
-        $folder = uniqid('', true);
+        $tmpDir = $this->validateAndExtractZip($this->tempfile);
+        $files = $this->getRecursiveFileList($tmpDir);
 
-        $zip->addFile($folder . '/sample.txt', 'Sample Data');
-        $zip->finish();
-        fclose($stream);
+        $this->assertSame(['sample.json'], $files);
+        $this->assertStringEqualsFile($tmpDir . '/sample.json', $body);
+    }
 
-        exec(escapeshellarg(self::OSX_ARCHIVE_UTILITY) . ' ' . escapeshellarg($tmp), $output, $returnStatus);
+    public function testAddFileFromPsr7StreamWithFileSizeSet(): void
+    {
+        $zip = new ZipStream(
+            outputStream: $this->tempfileStream,
+            sendHttpHeaders: false,
+        );
 
-        $this->assertEquals(0, $returnStatus);
-        $this->assertCount(0, $output);
+        $body = 'Sample String Data';
+        $fileSize = strlen($body);
+        // Add fake padding
+        $fakePadding = "\0\0\0\0\0\0";
+        $response = new Response(200, [], $body . $fakePadding);
 
-        $this->assertFileExists(dirname($tmp) . '/' . $folder . '/sample.txt');
-        $this->assertStringEqualsFile(dirname($tmp) . '/' . $folder . '/sample.txt', 'Sample Data');
+        $zip->addFileFromPsr7Stream(
+            fileName: 'sample.json',
+            stream: $response->getBody(),
+            compressionMethod: CompressionMethod::STORE,
+            maxSize: $fileSize
+        );
+        $zip->finish();
+
+        $tmpDir = $this->validateAndExtractZip($this->tempfile);
+
+        $files = $this->getRecursiveFileList($tmpDir);
+        $this->assertSame(['sample.json'], $files);
+        $this->assertStringEqualsFile($tmpDir . '/sample.json', $body);
     }
 
-    public function testAddFileFromPath(): void
+    public function testCreateArchiveHeaders(): void
     {
-        [$tmp, $stream] = $this->getTmpFileStream();
-
-        $options = new ArchiveOptions();
-        $options->setOutputStream($stream);
+        $headers = [];
+
+        $httpHeaderCallback = function (string $header) use (&$headers) {
+            $headers[] = $header;
+        };
+
+        $zip = new ZipStream(
+            outputStream: $this->tempfileStream,
+            sendHttpHeaders: true,
+            outputName: 'example.zip',
+            httpHeaderCallback: $httpHeaderCallback,
+        );
+
+        $zip->addFile(
+            fileName: 'sample.json',
+            data: 'foo',
+        );
+        $zip->finish();
 
-        $zip = new ZipStream(null, $options);
+        $this->assertContains('Content-Type: application/x-zip', $headers);
+        $this->assertContains("Content-Disposition: attachment; filename*=UTF-8''example.zip", $headers);
+        $this->assertContains('Pragma: public', $headers);
+        $this->assertContains('Cache-Control: public, must-revalidate', $headers);
+        $this->assertContains('Content-Transfer-Encoding: binary', $headers);
+    }
 
-        [$tmpExample, $streamExample] = $this->getTmpFileStream();
-        fwrite($streamExample, 'Sample String Data');
-        fclose($streamExample);
-        $zip->addFileFromPath('sample.txt', $tmpExample);
+    public function testCreateArchiveWithFlushOptionSet(): void
+    {
+        $zip = new ZipStream(
+            outputStream: $this->tempfileStream,
+            flushOutput: true,
+            sendHttpHeaders: false,
+        );
 
-        [$tmpExample, $streamExample] = $this->getTmpFileStream();
-        fwrite($streamExample, 'More Simple Sample Data');
-        fclose($streamExample);
-        $zip->addFileFromPath('test/sample.txt', $tmpExample);
+        $zip->addFile('sample.txt', 'Sample String Data');
+        $zip->addFile('test/sample.txt', 'More Simple Sample Data');
 
         $zip->finish();
-        fclose($stream);
 
-        $tmpDir = $this->validateAndExtractZip($tmp);
+        $tmpDir = $this->validateAndExtractZip($this->tempfile);
 
         $files = $this->getRecursiveFileList($tmpDir);
-        $this->assertEquals(array('sample.txt', 'test/sample.txt'), $files);
+        $this->assertSame(['sample.txt', 'test' . DIRECTORY_SEPARATOR . 'sample.txt'], $files);
 
         $this->assertStringEqualsFile($tmpDir . '/sample.txt', 'Sample String Data');
         $this->assertStringEqualsFile($tmpDir . '/test/sample.txt', 'More Simple Sample Data');
     }
 
-    public function testAddFileFromPathWithStorageMethod(): void
+    public function testCreateArchiveWithOutputBufferingOffAndFlushOptionSet(): void
     {
-        [$tmp, $stream] = $this->getTmpFileStream();
+        // WORKAROUND (1/2): remove phpunit's output buffer in order to run test without any buffering
+        ob_end_flush();
+        $this->assertSame(0, ob_get_level());
 
-        $options = new ArchiveOptions();
-        $options->setOutputStream($stream);
+        $zip = new ZipStream(
+            outputStream: $this->tempfileStream,
+            flushOutput: true,
+            sendHttpHeaders: false,
+        );
 
-        $zip = new ZipStream(null, $options);
+        $zip->addFile('sample.txt', 'Sample String Data');
 
-        $fileOptions = new FileOptions();
-        $fileOptions->setMethod(Method::STORE());
+        $zip->finish();
 
-        [$tmpExample, $streamExample] = $this->getTmpFileStream();
-        fwrite($streamExample, 'Sample String Data');
-        fclose($streamExample);
-        $zip->addFileFromPath('sample.txt', $tmpExample, $fileOptions);
+        $tmpDir = $this->validateAndExtractZip($this->tempfile);
+        $this->assertStringEqualsFile($tmpDir . '/sample.txt', 'Sample String Data');
 
-        [$tmpExample, $streamExample] = $this->getTmpFileStream();
-        fwrite($streamExample, 'More Simple Sample Data');
-        fclose($streamExample);
-        $zip->addFileFromPath('test/sample.txt', $tmpExample);
+        // WORKAROUND (2/2): add back output buffering so that PHPUnit doesn't complain that it is missing
+        ob_start();
+    }
+
+    public function testAddEmptyDirectory(): void
+    {
+        $zip = new ZipStream(
+            outputStream: $this->tempfileStream,
+            sendHttpHeaders: false,
+        );
+
+        $zip->addDirectory('foo');
 
         $zip->finish();
-        fclose($stream);
 
-        $zipArch = new \ZipArchive();
-        $zipArch->open($tmp);
+        $tmpDir = $this->validateAndExtractZip($this->tempfile);
 
-        $sample1 = $zipArch->statName('sample.txt');
-        $this->assertEquals(Method::STORE, $sample1['comp_method']);
+        $files = $this->getRecursiveFileList($tmpDir, includeDirectories: true);
 
-        $sample2 = $zipArch->statName('test/sample.txt');
-        $this->assertEquals(Method::DEFLATE, $sample2['comp_method']);
+        $this->assertContains('foo', $files);
 
-        $zipArch->close();
+        $this->assertFileExists($tmpDir . DIRECTORY_SEPARATOR . 'foo');
+        $this->assertDirectoryExists($tmpDir . DIRECTORY_SEPARATOR . 'foo');
     }
 
-    public function testAddLargeFileFromPath(): void
+    public function testAddFileSimulate(): void
     {
-        $methods = [Method::DEFLATE(), Method::STORE()];
-        $falseTrue = [false, true];
-        foreach ($methods as $method) {
-            foreach ($falseTrue as $zeroHeader) {
-                foreach ($falseTrue as $zip64) {
-                    if ($zeroHeader && $method->equals(Method::DEFLATE())) {
-                        continue;
-                    }
-                    $this->addLargeFileFileFromPath($method, $zeroHeader, $zip64);
-                }
-            }
-        }
+        $create = function (OperationMode $operationMode): int {
+            $zip = new ZipStream(
+                sendHttpHeaders: false,
+                operationMode: $operationMode,
+                defaultEnableZeroHeader: true,
+                outputStream: $this->tempfileStream,
+            );
+
+            $zip->addFile('sample.txt', 'Sample String Data');
+            $zip->addFile('test/sample.txt', 'More Simple Sample Data');
+
+            return $zip->finish();
+        };
+
+
+        $sizeExpected = $create(OperationMode::NORMAL);
+        $sizeActual = $create(OperationMode::SIMULATE_LAX);
+
+        $this->assertEquals($sizeExpected, $sizeActual);
     }
 
-    protected function addLargeFileFileFromPath($method, $zeroHeader, $zip64): void
+    public function testAddFileSimulateWithMaxSize(): void
     {
-        [$tmp, $stream] = $this->getTmpFileStream();
+        $create = function (OperationMode $operationMode): int {
+            $zip = new ZipStream(
+                sendHttpHeaders: false,
+                operationMode: $operationMode,
+                defaultCompressionMethod: CompressionMethod::STORE,
+                defaultEnableZeroHeader: true,
+                outputStream: $this->tempfileStream,
+            );
 
-        $options = new ArchiveOptions();
-        $options->setOutputStream($stream);
-        $options->setLargeFileMethod($method);
-        $options->setLargeFileSize(5);
-        $options->setZeroHeader($zeroHeader);
-        $options->setEnableZip64($zip64);
+            $zip->addFile('sample.txt', 'Sample String Data', maxSize: 0);
 
-        $zip = new ZipStream(null, $options);
+            return $zip->finish();
+        };
 
-        [$tmpExample, $streamExample] = $this->getTmpFileStream();
-        for ($i = 0; $i <= 10000; $i++) {
-            fwrite($streamExample, sha1((string)$i));
-            if ($i % 100 === 0) {
-                fwrite($streamExample, "\n");
-            }
-        }
-        fclose($streamExample);
-        $shaExample = sha1_file($tmpExample);
-        $zip->addFileFromPath('sample.txt', $tmpExample);
-        unlink($tmpExample);
 
-        $zip->finish();
-        fclose($stream);
+        $sizeExpected = $create(OperationMode::NORMAL);
+        $sizeActual = $create(OperationMode::SIMULATE_LAX);
 
-        $tmpDir = $this->validateAndExtractZip($tmp);
+        $this->assertEquals($sizeExpected, $sizeActual);
+    }
 
-        $files = $this->getRecursiveFileList($tmpDir);
-        $this->assertEquals(array('sample.txt'), $files);
+    public function testAddFileSimulateWithFstat(): void
+    {
+        $create = function (OperationMode $operationMode): int {
+            $zip = new ZipStream(
+                sendHttpHeaders: false,
+                operationMode: $operationMode,
+                defaultCompressionMethod: CompressionMethod::STORE,
+                defaultEnableZeroHeader: true,
+                outputStream: $this->tempfileStream,
+            );
+
+            $zip->addFile('sample.txt', 'Sample String Data');
+            $zip->addFile('test/sample.txt', 'More Simple Sample Data');
+
+            return $zip->finish();
+        };
+
+
+        $sizeExpected = $create(OperationMode::NORMAL);
+        $sizeActual = $create(OperationMode::SIMULATE_LAX);
 
-        $this->assertEquals(sha1_file($tmpDir . '/sample.txt'), $shaExample, "SHA-1 Mismatch Method: {$method}");
+        $this->assertEquals($sizeExpected, $sizeActual);
     }
 
-    public function testAddFileFromStream(): void
+    public function testAddFileSimulateWithExactSizeZero(): void
     {
-        [$tmp, $stream] = $this->getTmpFileStream();
+        $create = function (OperationMode $operationMode): int {
+            $zip = new ZipStream(
+                sendHttpHeaders: false,
+                operationMode: $operationMode,
+                defaultCompressionMethod: CompressionMethod::STORE,
+                defaultEnableZeroHeader: true,
+                outputStream: $this->tempfileStream,
+            );
 
-        $options = new ArchiveOptions();
-        $options->setOutputStream($stream);
+            $zip->addFile('sample.txt', 'Sample String Data', exactSize: 18);
 
-        $zip = new ZipStream(null, $options);
+            return $zip->finish();
+        };
 
-        // In this test we can't use temporary stream to feed data
-        // because zlib.deflate filter gives empty string before PHP 7
-        // it works fine with file stream
-        $streamExample = fopen(__FILE__, 'rb');
-        $zip->addFileFromStream('sample.txt', $streamExample);
-//        fclose($streamExample);
 
-        $fileOptions = new FileOptions();
-        $fileOptions->setMethod(Method::STORE());
+        $sizeExpected = $create(OperationMode::NORMAL);
+        $sizeActual = $create(OperationMode::SIMULATE_LAX);
 
-        $streamExample2 = fopen('php://temp', 'wb+');
-        fwrite($streamExample2, 'More Simple Sample Data');
-        rewind($streamExample2); // move the pointer back to the beginning of file.
-        $zip->addFileFromStream('test/sample.txt', $streamExample2, $fileOptions);
-//        fclose($streamExample2);
+        $this->assertEquals($sizeExpected, $sizeActual);
+    }
 
-        $zip->finish();
-        fclose($stream);
+    public function testAddFileSimulateWithExactSizeInitial(): void
+    {
+        $create = function (OperationMode $operationMode): int {
+            $zip = new ZipStream(
+                sendHttpHeaders: false,
+                operationMode: $operationMode,
+                defaultCompressionMethod: CompressionMethod::STORE,
+                defaultEnableZeroHeader: false,
+                outputStream: $this->tempfileStream,
+            );
 
-        $tmpDir = $this->validateAndExtractZip($tmp);
+            $zip->addFile('sample.txt', 'Sample String Data', exactSize: 18);
 
-        $files = $this->getRecursiveFileList($tmpDir);
-        $this->assertEquals(array('sample.txt', 'test/sample.txt'), $files);
+            return $zip->finish();
+        };
 
-        $this->assertStringEqualsFile(__FILE__, file_get_contents($tmpDir . '/sample.txt'));
-        $this->assertStringEqualsFile($tmpDir . '/test/sample.txt', 'More Simple Sample Data');
+        $sizeExpected = $create(OperationMode::NORMAL);
+        $sizeActual = $create(OperationMode::SIMULATE_LAX);
+
+        $this->assertEquals($sizeExpected, $sizeActual);
     }
 
-    public function testAddFileFromStreamWithStorageMethod(): void
+    public function testAddFileSimulateWithZeroSizeInFstat(): void
     {
-        [$tmp, $stream] = $this->getTmpFileStream();
+        $create = function (OperationMode $operationMode): int {
+            $zip = new ZipStream(
+                sendHttpHeaders: false,
+                operationMode: $operationMode,
+                defaultCompressionMethod: CompressionMethod::STORE,
+                defaultEnableZeroHeader: false,
+                outputStream: $this->tempfileStream,
+            );
+
+            $zip->addFileFromPsr7Stream('sample.txt', new class implements StreamInterface {
+                public $pos = 0;
+
+                public function __toString(): string
+                {
+                    return 'test';
+                }
 
-        $options = new ArchiveOptions();
-        $options->setOutputStream($stream);
+                public function close(): void {}
 
-        $zip = new ZipStream(null, $options);
+                public function detach() {}
 
-        $fileOptions = new FileOptions();
-        $fileOptions->setMethod(Method::STORE());
+                public function getSize(): ?int
+                {
+                    return null;
+                }
 
-        $streamExample = fopen('php://temp', 'wb+');
-        fwrite($streamExample, 'Sample String Data');
-        rewind($streamExample); // move the pointer back to the beginning of file.
-        $zip->addFileFromStream('sample.txt', $streamExample, $fileOptions);
-//        fclose($streamExample);
+                public function tell(): int
+                {
+                    return $this->pos;
+                }
 
-        $streamExample2 = fopen('php://temp', 'bw+');
-        fwrite($streamExample2, 'More Simple Sample Data');
-        rewind($streamExample2); // move the pointer back to the beginning of file.
-        $zip->addFileFromStream('test/sample.txt', $streamExample2);
-//        fclose($streamExample2);
+                public function eof(): bool
+                {
+                    return $this->pos >= 4;
+                }
 
-        $zip->finish();
-        fclose($stream);
+                public function isSeekable(): bool
+                {
+                    return true;
+                }
 
-        $zipArch = new \ZipArchive();
-        $zipArch->open($tmp);
+                public function seek(int $offset, int $whence = SEEK_SET): void
+                {
+                    $this->pos = $offset;
+                }
 
-        $sample1 = $zipArch->statName('sample.txt');
-        $this->assertEquals(Method::STORE, $sample1['comp_method']);
+                public function rewind(): void
+                {
+                    $this->pos = 0;
+                }
+
+                public function isWritable(): bool
+                {
+                    return false;
+                }
+
+                public function write(string $string): int
+                {
+                    return 0;
+                }
+
+                public function isReadable(): bool
+                {
+                    return true;
+                }
+
+                public function read(int $length): string
+                {
+                    $data = substr('test', $this->pos, $length);
+                    $this->pos += strlen($data);
+                    return $data;
+                }
+
+                public function getContents(): string
+                {
+                    return $this->read(4);
+                }
+
+                public function getMetadata(?string $key = null)
+                {
+                    return $key !== null ? null : [];
+                }
+            });
+
+            return $zip->finish();
+        };
+
+        $sizeExpected = $create(OperationMode::NORMAL);
+        $sizeActual = $create(OperationMode::SIMULATE_LAX);
 
-        $sample2 = $zipArch->statName('test/sample.txt');
-        $this->assertEquals(Method::DEFLATE, $sample2['comp_method']);
 
-        $zipArch->close();
+        $this->assertEquals($sizeExpected, $sizeActual);
     }
 
-    public function testAddFileFromPsr7Stream(): void
+    public function testAddFileSimulateWithWrongExactSize(): void
     {
-        [$tmp, $stream] = $this->getTmpFileStream();
+        $this->expectException(FileSizeIncorrectException::class);
 
-        $options = new ArchiveOptions();
-        $options->setOutputStream($stream);
+        $zip = new ZipStream(
+            sendHttpHeaders: false,
+            operationMode: OperationMode::SIMULATE_LAX,
+        );
 
-        $zip = new ZipStream(null, $options);
+        $zip->addFile('sample.txt', 'Sample String Data', exactSize: 1000);
+    }
 
-        $body = 'Sample String Data';
-        $response = new Response(200, [], $body);
+    public function testAddFileSimulateStrictZero(): void
+    {
+        $this->expectException(SimulationFileUnknownException::class);
 
-        $fileOptions = new FileOptions();
-        $fileOptions->setMethod(Method::STORE());
+        $zip = new ZipStream(
+            sendHttpHeaders: false,
+            operationMode: OperationMode::SIMULATE_STRICT,
+            defaultEnableZeroHeader: true
+        );
 
-        $zip->addFileFromPsr7Stream('sample.json', $response->getBody(), $fileOptions);
-        $zip->finish();
-        fclose($stream);
+        $zip->addFile('sample.txt', 'Sample String Data');
+    }
 
-        $tmpDir = $this->validateAndExtractZip($tmp);
+    public function testAddFileSimulateStrictInitial(): void
+    {
+        $this->expectException(SimulationFileUnknownException::class);
 
-        $files = $this->getRecursiveFileList($tmpDir);
-        $this->assertEquals(array('sample.json'), $files);
-        $this->assertStringEqualsFile($tmpDir . '/sample.json', $body);
+        $zip = new ZipStream(
+            sendHttpHeaders: false,
+            operationMode: OperationMode::SIMULATE_STRICT,
+            defaultEnableZeroHeader: false
+        );
+
+        $zip->addFile('sample.txt', 'Sample String Data');
     }
 
-    public function testAddFileFromPsr7StreamWithFileSizeSet(): void
+    public function testAddFileCallbackStrict(): void
     {
-        [$tmp, $stream] = $this->getTmpFileStream();
+        $this->expectException(SimulationFileUnknownException::class);
 
-        $options = new ArchiveOptions();
-        $options->setOutputStream($stream);
+        $zip = new ZipStream(
+            sendHttpHeaders: false,
+            operationMode: OperationMode::SIMULATE_STRICT,
+            defaultEnableZeroHeader: false
+        );
 
-        $zip = new ZipStream(null, $options);
+        $zip->addFileFromCallback('sample.txt', callback: function () {
+            return '';
+        });
+    }
 
-        $body = 'Sample String Data';
-        $fileSize = strlen($body);
-        // Add fake padding
-        $fakePadding = "\0\0\0\0\0\0";
-        $response = new Response(200, [], $body . $fakePadding);
+    public function testAddFileCallbackLax(): void
+    {
+        $zip = new ZipStream(
+            operationMode: OperationMode::SIMULATE_LAX,
+            defaultEnableZeroHeader: false,
+            sendHttpHeaders: false,
+        );
 
-        $fileOptions = new FileOptions();
-        $fileOptions->setMethod(Method::STORE());
-        $fileOptions->setSize($fileSize);
-        $zip->addFileFromPsr7Stream('sample.json', $response->getBody(), $fileOptions);
-        $zip->finish();
-        fclose($stream);
+        $zip->addFileFromCallback('sample.txt', callback: function () {
+            return 'Sample String Data';
+        });
 
-        $tmpDir = $this->validateAndExtractZip($tmp);
+        $size = $zip->finish();
 
-        $files = $this->getRecursiveFileList($tmpDir);
-        $this->assertEquals(array('sample.json'), $files);
-        $this->assertStringEqualsFile($tmpDir . '/sample.json', $body);
+        $this->assertEquals($size, 142);
     }
 
-    public function testCreateArchiveWithFlushOptionSet(): void
+    public function testExecuteSimulation(): void
     {
-        [$tmp, $stream] = $this->getTmpFileStream();
+        $zip = new ZipStream(
+            operationMode: OperationMode::SIMULATE_STRICT,
+            defaultCompressionMethod: CompressionMethod::STORE,
+            defaultEnableZeroHeader: false,
+            sendHttpHeaders: false,
+            outputStream: $this->tempfileStream,
+        );
+
+        $zip->addFileFromCallback(
+            'sample.txt',
+            exactSize: 18,
+            callback: function () {
+                return 'Sample String Data';
+            }
+        );
 
-        $options = new ArchiveOptions();
-        $options->setOutputStream($stream);
-        $options->setFlushOutput(true);
+        $zip->addFileFromCallback(
+            '.gitkeep',
+            exactSize: 0,
+            callback: function () {
+                return '';
+            }
+        );
 
-        $zip = new ZipStream(null, $options);
+        $size = $zip->finish();
 
-        $zip->addFile('sample.txt', 'Sample String Data');
-        $zip->addFile('test/sample.txt', 'More Simple Sample Data');
+        $this->assertEquals(filesize($this->tempfile), 0);
 
-        $zip->finish();
-        fclose($stream);
+        $zip->executeSimulation();
 
-        $tmpDir = $this->validateAndExtractZip($tmp);
+        clearstatcache();
 
-        $files = $this->getRecursiveFileList($tmpDir);
-        $this->assertEquals(['sample.txt', 'test/sample.txt'], $files);
+        $this->assertEquals(filesize($this->tempfile), $size);
 
-        $this->assertStringEqualsFile($tmpDir . '/sample.txt', 'Sample String Data');
-        $this->assertStringEqualsFile($tmpDir . '/test/sample.txt', 'More Simple Sample Data');
+        $tmpDir = $this->validateAndExtractZip($this->tempfile);
+
+        $files = $this->getRecursiveFileList($tmpDir);
+        $this->assertSame(['.gitkeep', 'sample.txt'], $files);
     }
 
-    public function testCreateArchiveWithOutputBufferingOffAndFlushOptionSet(): void
+    public function testExecuteSimulationBeforeFinish(): void
     {
-        // WORKAROUND (1/2): remove phpunit's output buffer in order to run test without any buffering
-        ob_end_flush();
-        $this->assertEquals(0, ob_get_level());
+        $this->expectException(RuntimeException::class);
 
-        [$tmp, $stream] = $this->getTmpFileStream();
+        $zip = new ZipStream(
+            operationMode: OperationMode::SIMULATE_LAX,
+            defaultEnableZeroHeader: false,
+            sendHttpHeaders: false,
+            outputStream: $this->tempfileStream,
+        );
+
+        $zip->executeSimulation();
+    }
 
-        $options = new ArchiveOptions();
-        $options->setOutputStream($stream);
-        $options->setFlushOutput(true);
+    private function addLargeFileFileFromPath(CompressionMethod $compressionMethod, $zeroHeader, $zip64): void
+    {
+        [$tmp, $stream] = $this->getTmpFileStream();
 
-        $zip = new ZipStream(null, $options);
+        $zip = new ZipStream(
+            outputStream: $stream,
+            sendHttpHeaders: false,
+            defaultEnableZeroHeader: $zeroHeader,
+            enableZip64: $zip64,
+        );
 
-        $zip->addFile('sample.txt', 'Sample String Data');
+        [$tmpExample, $streamExample] = $this->getTmpFileStream();
+        for ($i = 0; $i <= 10000; $i++) {
+            fwrite($streamExample, sha1((string) $i));
+            if ($i % 100 === 0) {
+                fwrite($streamExample, "\n");
+            }
+        }
+        fclose($streamExample);
+        $shaExample = sha1_file($tmpExample);
+        $zip->addFileFromPath('sample.txt', $tmpExample);
+        unlink($tmpExample);
 
         $zip->finish();
         fclose($stream);
 
         $tmpDir = $this->validateAndExtractZip($tmp);
-        $this->assertStringEqualsFile($tmpDir . '/sample.txt', 'Sample String Data');
 
-        // WORKAROUND (2/2): add back output buffering so that PHPUnit doesn't complain that it is missing
-        ob_start();
+        $files = $this->getRecursiveFileList($tmpDir);
+        $this->assertSame(['sample.txt'], $files);
+
+        $this->assertSame(sha1_file($tmpDir . '/sample.txt'), $shaExample, "SHA-1 Mismatch Method: {$compressionMethod->value}");
+
+        unlink($tmp);
     }
 }
diff --git a/vendor/maennchen/zipstream-php/test/Zs/ExtendedInformationExtraFieldTest.php b/vendor/maennchen/zipstream-php/test/Zs/ExtendedInformationExtraFieldTest.php
new file mode 100644
index 0000000000..2b8dbed4aa
--- /dev/null
+++ b/vendor/maennchen/zipstream-php/test/Zs/ExtendedInformationExtraFieldTest.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZipStream\Test\Zs;
+
+use PHPUnit\Framework\TestCase;
+use ZipStream\Zs\ExtendedInformationExtraField;
+
+class ExtendedInformationExtraFieldTest extends TestCase
+{
+    public function testSerializesCorrectly(): void
+    {
+        $extraField = ExtendedInformationExtraField::generate();
+
+        $this->assertSame(
+            bin2hex((string) $extraField),
+            '5356' . // 2 bytes; Tag for this "extra" block type
+            '0000' // 2 bytes; TODO: Document
+        );
+    }
+}
diff --git a/vendor/maennchen/zipstream-php/test/bootstrap.php b/vendor/maennchen/zipstream-php/test/bootstrap.php
index b43c9bd6cb..13c7a0e6c6 100644
--- a/vendor/maennchen/zipstream-php/test/bootstrap.php
+++ b/vendor/maennchen/zipstream-php/test/bootstrap.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 date_default_timezone_set('UTC');
diff --git a/vendor/maennchen/zipstream-php/test/bug/BugHonorFileTimeTest.php b/vendor/maennchen/zipstream-php/test/bug/BugHonorFileTimeTest.php
deleted file mode 100644
index b42862d3b1..0000000000
--- a/vendor/maennchen/zipstream-php/test/bug/BugHonorFileTimeTest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace BugHonorFileTimeTest;
-
-use DateTime;
-use PHPUnit\Framework\TestCase;
-use ZipStream\Option\{
-    Archive,
-    File
-};
-use ZipStream\ZipStream;
-
-use function fopen;
-
-/**
- * Asserts that specified last-modified timestamps are not overwritten when a
- * file is added
- */
-class BugHonorFileTimeTest extends TestCase
-{
-    public function testHonorsFileTime(): void
-    {
-        $archiveOpt = new Archive();
-        $fileOpt = new File();
-        $expectedTime = new DateTime('2019-04-21T19:25:00-0800');
-
-        $archiveOpt->setOutputStream(fopen('php://memory', 'wb'));
-        $fileOpt->setTime(clone $expectedTime);
-
-        $zip = new ZipStream(null, $archiveOpt);
-
-        $zip->addFile('sample.txt', 'Sample', $fileOpt);
-
-        $zip->finish();
-
-        $this->assertEquals($expectedTime, $fileOpt->getTime());
-    }
-}
diff --git a/vendor/markbaker/complex/.github/workflows/main.yml b/vendor/markbaker/complex/.github/workflows/main.yml
index 43d5bf040d..8911533084 100644
--- a/vendor/markbaker/complex/.github/workflows/main.yml
+++ b/vendor/markbaker/complex/.github/workflows/main.yml
@@ -12,16 +12,18 @@ jobs:
           - '7.3'
           - '7.4'
           - '8.0'
+          - '8.1'
+          - '8.2'
 
         include:
-          - php-version: '8.1'
+          - php-version: 'nightly'
             experimental: true
 
     name: PHP ${{ matrix.php-version }}
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@v2
@@ -34,7 +36,7 @@ jobs:
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: Cache composer dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -42,8 +44,9 @@ jobs:
 
       - name: Delete composer lock file
         id: composer-lock
-        if: ${{ matrix.php-version == '8.1' }}
+        if: ${{ matrix.php-version == '8.0' || matrix.php-version == '8.1' || matrix.php-version == '8.2' || matrix.php-version == 'nightly' }}
         run: |
+          rm composer.lock
           echo "::set-output name=flags::--ignore-platform-reqs"
 
       - name: Install dependencies
@@ -64,7 +67,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@v2
@@ -78,7 +81,7 @@ jobs:
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: Cache composer dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -94,7 +97,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@v2
@@ -108,7 +111,7 @@ jobs:
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: Cache composer dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -124,7 +127,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@v2
@@ -137,7 +140,7 @@ jobs:
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: Cache composer dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
diff --git a/vendor/markbaker/complex/README.md b/vendor/markbaker/complex/README.md
index c306394eeb..76347af16d 100644
--- a/vendor/markbaker/complex/README.md
+++ b/vendor/markbaker/complex/README.md
@@ -3,11 +3,13 @@ PHPComplex
 
 ---
 
-PHP Class for handling Complex numbers
+PHP Class Library for working with Complex numbers
 
-Master: [![Build Status](https://travis-ci.org/MarkBaker/PHPComplex.png?branch=master)](http://travis-ci.org/MarkBaker/PHPComplex)
+[![Build Status](https://github.com/MarkBaker/PHPComplex/workflows/main/badge.svg)](https://github.com/MarkBaker/PHPComplex/actions)
+[![Total Downloads](https://img.shields.io/packagist/dt/markbaker/complex)](https://packagist.org/packages/markbaker/complex)
+[![Latest Stable Version](https://img.shields.io/github/v/release/MarkBaker/PHPComplex)](https://packagist.org/packages/markbaker/complex)
+[![License](https://img.shields.io/github/license/MarkBaker/PHPComplex)](https://packagist.org/packages/markbaker/complex)
 
-Develop: [![Build Status](https://travis-ci.org/MarkBaker/PHPComplex.png?branch=develop)](http://travis-ci.org/MarkBaker/PHPComplex)
 
 [![Complex Numbers](https://imgs.xkcd.com/comics/complex_numbers_2x.png)](https://xkcd.com/2028/)
 
@@ -63,19 +65,37 @@ together with functions for
  
 ---
 
+# Installation
+
+```shell
+composer require markbaker/complex:^1.0
+```
+
+# Important BC Note
+
+If you've previously been using procedural calls to functions and operations using this library, then from version 3.0 you should use [MarkBaker/PHPComplexFunctions](https://github.com/MarkBaker/PHPComplexFunctions) instead (available on packagist as [markbaker/complex-functions](https://packagist.org/packages/markbaker/complex-functions)).
+
+You'll need to replace `markbaker/complex`in your `composer.json` file with the new library, but otherwise there should be no difference in the namespacing, or in the way that you have called the Complex functions in the past, so no actual code changes are required.
+
+```shell
+composer require markbaker/complex-functions:^3.0
+```
+
+You should not reference this library (`markbaker/complex`) in your `composer.json`, composer wil take care of that for you.
+
 # Usage
 
 To create a new complex object, you can provide either the real, imaginary and suffix parts as individual values, or as an array of values passed passed to the constructor; or a string representing the value. e.g
 
-```
+```php
 $real = 1.23;
 $imaginary = -4.56;
 $suffix = 'i';
 
 $complexObject = new Complex\Complex($real, $imaginary, $suffix);
 ```
-or
-```
+or as an array
+```php
 $real = 1.23;
 $imaginary = -4.56;
 $suffix = 'i';
@@ -84,8 +104,8 @@ $arguments = [$real, $imaginary, $suffix];
 
 $complexObject = new Complex\Complex($arguments);
 ```
-or
-```
+or as a string
+```php
 $complexString = '1.23-4.56i';
 
 $complexObject = new Complex\Complex($complexString);
@@ -98,57 +118,54 @@ This also allows you to chain multiple methods as you would for a fluent interfa
 
 To perform mathematical operations with Complex values, you can call the appropriate method against a complex value, passing other values as arguments
 
-```
+```php
 $complexString1 = '1.23-4.56i';
 $complexString2 = '2.34+5.67i';
 
 $complexObject = new Complex\Complex($complexString1);
 echo $complexObject->add($complexString2);
 ```
-or pass all values to the appropriate function
-```
+
+or use the static Operation methods
+```php
 $complexString1 = '1.23-4.56i';
 $complexString2 = '2.34+5.67i';
 
-echo Complex\add($complexString1, $complexString2);
+echo Complex\Operations::add($complexString1, $complexString2);
 ```
 If you want to perform the same operation against multiple values (e.g. to add three or more complex numbers), then you can pass multiple arguments to any of the operations.
 
-You can pass these arguments as Complex objects, or as an array or string that will parse to a complex object.
+You can pass these arguments as Complex objects, or as an array, or string that will parse to a complex object.
 
 ## Using functions
 
 When calling any of the available functions for a complex value, you can either call the relevant method for the Complex object
-```
+```php
 $complexString = '1.23-4.56i';
 
 $complexObject = new Complex\Complex($complexString);
 echo $complexObject->sinh();
 ```
-or you can call the function as you would in procedural code, passing the Complex object as an argument 
-```
-$complexString = '1.23-4.56i';
 
-$complexObject = new Complex\Complex($complexString);
-echo Complex\sinh($complexObject);
-```
-When called procedurally using the function, you can pass in the argument as a Complex object, or as an array or string that will parse to a complex object.
-```
+or use the static Functions methods
+```php
 $complexString = '1.23-4.56i';
 
-echo Complex\sinh($complexString);
+echo Complex\Functions::sinh($complexString);
 ```
+As with operations, you can pass these arguments as Complex objects, or as an array or string that will parse to a complex object.
 
-In the case of the `pow()` function (the only implemented function that requires an additional argument) you need to pass both arguments when calling the function procedurally
 
-```
+In the case of the `pow()` function (the only implemented function that requires an additional argument) you need to pass both arguments when calling the function
+
+```php
 $complexString = '1.23-4.56i';
 
 $complexObject = new Complex\Complex($complexString);
-echo Complex\pow($complexObject, 2);
+echo Complex\Functions::pow($complexObject, 2);
 ```
 or pass the additional argument when calling the method
-```
+```php
 $complexString = '1.23-4.56i';
 
 $complexObject = new Complex\Complex($complexString);
diff --git a/vendor/markbaker/complex/classes/Autoloader.php b/vendor/markbaker/complex/classes/Autoloader.php
deleted file mode 100644
index 792ecef0d9..0000000000
--- a/vendor/markbaker/complex/classes/Autoloader.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-namespace Complex;
-
-/**
- *
- * Autoloader for Complex classes
- *
- * @package Complex
- * @copyright  Copyright (c) 2014 Mark Baker (https://github.com/MarkBaker/PHPComplex)
- * @license    https://opensource.org/licenses/MIT          MIT
- */
-class Autoloader
-{
-    /**
-     * Register the Autoloader with SPL
-     *
-     */
-    public static function Register()
-    {
-        if (function_exists('__autoload')) {
-            //    Register any existing autoloader function with SPL, so we don't get any clashes
-            spl_autoload_register('__autoload');
-        }
-        //    Register ourselves with SPL
-        return spl_autoload_register(['Complex\\Autoloader', 'Load']);
-    }
-
-
-    /**
-     * Autoload a class identified by name
-     *
-     * @param    string    $pClassName    Name of the object to load
-     */
-    public static function Load($pClassName)
-    {
-        if ((class_exists($pClassName, false)) || (strpos($pClassName, 'Complex\\') !== 0)) {
-            // Either already loaded, or not a Complex class request
-            return false;
-        }
-
-        $pClassFilePath = __DIR__ . DIRECTORY_SEPARATOR .
-                          'src' . DIRECTORY_SEPARATOR .
-                          str_replace(['Complex\\', '\\'], ['', '/'], $pClassName) .
-                          '.php';
-
-        if ((file_exists($pClassFilePath) === false) || (is_readable($pClassFilePath) === false)) {
-            // Can't load
-            return false;
-        }
-        require($pClassFilePath);
-    }
-}
diff --git a/vendor/markbaker/complex/classes/Bootstrap.php b/vendor/markbaker/complex/classes/Bootstrap.php
deleted file mode 100644
index f1103df86f..0000000000
--- a/vendor/markbaker/complex/classes/Bootstrap.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-include_once __DIR__ . '/Autoloader.php';
-
-\Complex\Autoloader::Register();
-
-
-abstract class FilesystemRegexFilter extends RecursiveRegexIterator
-{
-    protected $regex;
-    public function __construct(RecursiveIterator $it, $regex)
-    {
-        $this->regex = $regex;
-        parent::__construct($it, $regex);
-    }
-}
-
-class FilenameFilter extends FilesystemRegexFilter
-{
-    // Filter files against the regex
-    public function accept()
-    {
-        return (!$this->isFile() || preg_match($this->regex, $this->getFilename()));
-    }
-}
-
-
-$srcFolder = __DIR__ . DIRECTORY_SEPARATOR . 'src';
-$srcDirectory = new RecursiveDirectoryIterator($srcFolder);
-
-$filteredFileList = new FilenameFilter($srcDirectory, '/(?:php)$/i');
-$filteredFileList = new FilenameFilter($filteredFileList, '/^(?!.*(Complex|Exception)\.php).*$/i');
-
-foreach (new RecursiveIteratorIterator($filteredFileList) as $file) {
-    if ($file->isFile()) {
-        include_once $file;
-    }
-}
diff --git a/vendor/markbaker/complex/classes/src/Complex.php b/vendor/markbaker/complex/classes/src/Complex.php
index 6be84d23f5..25414ee612 100644
--- a/vendor/markbaker/complex/classes/src/Complex.php
+++ b/vendor/markbaker/complex/classes/src/Complex.php
@@ -377,13 +377,11 @@ public function __call($functionName, $arguments)
 
         // Test for function calls
         if (in_array($functionName, self::$functions, true)) {
-            $functionName = "\\" . __NAMESPACE__ . "\\{$functionName}";
-            return $functionName($this, ...$arguments);
+            return Functions::$functionName($this, ...$arguments);
         }
         // Test for operation calls
         if (in_array($functionName, self::$operations, true)) {
-            $functionName = "\\" . __NAMESPACE__ . "\\{$functionName}";
-            return $functionName($this, ...$arguments);
+            return Operations::$functionName($this, ...$arguments);
         }
         throw new Exception('Complex Function or Operation does not exist');
     }
diff --git a/vendor/markbaker/complex/classes/src/Functions.php b/vendor/markbaker/complex/classes/src/Functions.php
new file mode 100644
index 0000000000..ff38c237d4
--- /dev/null
+++ b/vendor/markbaker/complex/classes/src/Functions.php
@@ -0,0 +1,823 @@
+<?php
+
+namespace Complex;
+
+use InvalidArgumentException;
+
+class Functions
+{
+    /**
+     * Returns the absolute value (modulus) of a complex number.
+     * Also known as the rho of the complex number, i.e. the distance/radius
+     *   from the centrepoint to the representation of the number in polar coordinates.
+     *
+     * This function is a synonym for rho()
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    float            The absolute (or rho) value of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     *
+     * @see    rho
+     *
+     */
+    public static function abs($complex): float
+    {
+        return self::rho($complex);
+    }
+
+    /**
+     * Returns the inverse cosine of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The inverse cosine of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     */
+    public static function acos($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        $invsqrt = self::sqrt(Operations::subtract(1, Operations::multiply($complex, $complex)));
+        $adjust = new Complex(
+            $complex->getReal() - $invsqrt->getImaginary(),
+            $complex->getImaginary() + $invsqrt->getReal()
+        );
+        $log = self::ln($adjust);
+
+        return new Complex(
+            $log->getImaginary(),
+            -1 * $log->getReal()
+        );
+    }
+
+    /**
+     * Returns the inverse hyperbolic cosine of a complex number.
+     *
+     * Formula from Wolfram Alpha:
+     *   cosh^(-1)z = ln(z + sqrt(z + 1) sqrt(z - 1)).
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The inverse hyperbolic cosine of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     */
+    public static function acosh($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        if ($complex->isReal() && ($complex->getReal() > 1)) {
+            return new Complex(\acosh($complex->getReal()));
+        }
+
+        $acosh = self::ln(
+            Operations::add(
+                $complex,
+                Operations::multiply(
+                    self::sqrt(Operations::add($complex, 1)),
+                    self::sqrt(Operations::subtract($complex, 1))
+                )
+            )
+        );
+
+        return $acosh;
+    }
+
+    /**
+     * Returns the inverse cotangent of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The inverse cotangent of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     * @throws    \InvalidArgumentException    If function would result in a division by zero
+     */
+    public static function acot($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        return self::atan(self::inverse($complex));
+    }
+
+    /**
+     * Returns the inverse hyperbolic cotangent of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The inverse hyperbolic cotangent of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     * @throws    \InvalidArgumentException    If function would result in a division by zero
+     */
+    public static function acoth($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        return self::atanh(self::inverse($complex));
+    }
+
+    /**
+     * Returns the inverse cosecant of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The inverse cosecant of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     * @throws    \InvalidArgumentException    If function would result in a division by zero
+     */
+    public static function acsc($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
+            return new Complex(INF);
+        }
+
+        return self::asin(self::inverse($complex));
+    }
+
+    /**
+     * Returns the inverse hyperbolic cosecant of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The inverse hyperbolic cosecant of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     * @throws    \InvalidArgumentException    If function would result in a division by zero
+     */
+    public static function acsch($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
+            return new Complex(INF);
+        }
+
+        return self::asinh(self::inverse($complex));
+    }
+
+    /**
+     * Returns the argument of a complex number.
+     * Also known as the theta of the complex number, i.e. the angle in radians
+     *   from the real axis to the representation of the number in polar coordinates.
+     *
+     * This function is a synonym for theta()
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    float            The argument (or theta) value of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     *
+     * @see    theta
+     */
+    public static function argument($complex): float
+    {
+        return self::theta($complex);
+    }
+
+    /**
+     * Returns the inverse secant of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The inverse secant of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     * @throws    \InvalidArgumentException    If function would result in a division by zero
+     */
+    public static function asec($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
+            return new Complex(INF);
+        }
+
+        return self::acos(self::inverse($complex));
+    }
+
+    /**
+     * Returns the inverse hyperbolic secant of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The inverse hyperbolic secant of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     * @throws    \InvalidArgumentException    If function would result in a division by zero
+     */
+    public static function asech($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
+            return new Complex(INF);
+        }
+
+        return self::acosh(self::inverse($complex));
+    }
+
+    /**
+     * Returns the inverse sine of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The inverse sine of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     */
+    public static function asin($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        $invsqrt = self::sqrt(Operations::subtract(1, Operations::multiply($complex, $complex)));
+        $adjust = new Complex(
+            $invsqrt->getReal() - $complex->getImaginary(),
+            $invsqrt->getImaginary() + $complex->getReal()
+        );
+        $log = self::ln($adjust);
+
+        return new Complex(
+            $log->getImaginary(),
+            -1 * $log->getReal()
+        );
+    }
+
+    /**
+     * Returns the inverse hyperbolic sine of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The inverse hyperbolic sine of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     */
+    public static function asinh($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        if ($complex->isReal() && ($complex->getReal() > 1)) {
+            return new Complex(\asinh($complex->getReal()));
+        }
+
+        $asinh = clone $complex;
+        $asinh = $asinh->reverse()
+            ->invertReal();
+        $asinh = self::asin($asinh);
+
+        return $asinh->reverse()
+            ->invertImaginary();
+    }
+
+    /**
+     * Returns the inverse tangent of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The inverse tangent of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     * @throws    \InvalidArgumentException    If function would result in a division by zero
+     */
+    public static function atan($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        if ($complex->isReal()) {
+            return new Complex(\atan($complex->getReal()));
+        }
+
+        $t1Value = new Complex(-1 * $complex->getImaginary(), $complex->getReal());
+        $uValue = new Complex(1, 0);
+
+        $d1Value = clone $uValue;
+        $d1Value = Operations::subtract($d1Value, $t1Value);
+        $d2Value = Operations::add($t1Value, $uValue);
+        $uResult = $d1Value->divideBy($d2Value);
+        $uResult = self::ln($uResult);
+
+        $realMultiplier = -0.5;
+        $imaginaryMultiplier = 0.5;
+
+        if (abs($uResult->getImaginary()) === M_PI) {
+            // If we have an imaginary value at the max or min (PI or -PI), then we need to ensure
+            //    that the primary is assigned for the correct quadrant.
+            $realMultiplier = (
+                ($uResult->getImaginary() === M_PI && $uResult->getReal() > 0.0) ||
+                ($uResult->getImaginary() === -M_PI && $uResult->getReal() < 0.0)
+            ) ? 0.5 : -0.5;
+        }
+
+        return new Complex(
+            $uResult->getImaginary() * $realMultiplier,
+            $uResult->getReal() * $imaginaryMultiplier,
+            $complex->getSuffix()
+        );
+    }
+
+    /**
+     * Returns the inverse hyperbolic tangent of a complex number.
+     *
+     * Formula from Wolfram Alpha:
+     *  tanh^(-1)z = 1/2 [ln(1 + z) - ln(1 - z)].
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The inverse hyperbolic tangent of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     */
+    public static function atanh($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        if ($complex->isReal()) {
+            $real = $complex->getReal();
+            if ($real >= -1.0 && $real <= 1.0) {
+                return new Complex(\atanh($real));
+            } else {
+                return new Complex(\atanh(1 / $real), (($real < 0.0) ? M_PI_2 : -1 * M_PI_2));
+            }
+        }
+
+        $atanh = Operations::multiply(
+            Operations::subtract(
+                self::ln(Operations::add(1.0, $complex)),
+                self::ln(Operations::subtract(1.0, $complex))
+            ),
+            0.5
+        );
+
+        return $atanh;
+    }
+
+    /**
+     * Returns the complex conjugate of a complex number
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The conjugate of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     */
+    public static function conjugate($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        return new Complex(
+            $complex->getReal(),
+            -1 * $complex->getImaginary(),
+            $complex->getSuffix()
+        );
+    }
+
+    /**
+     * Returns the cosine of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The cosine of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     */
+    public static function cos($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        if ($complex->isReal()) {
+            return new Complex(\cos($complex->getReal()));
+        }
+
+        return self::conjugate(
+            new Complex(
+                \cos($complex->getReal()) * \cosh($complex->getImaginary()),
+                \sin($complex->getReal()) * \sinh($complex->getImaginary()),
+                $complex->getSuffix()
+            )
+        );
+    }
+
+    /**
+     * Returns the hyperbolic cosine of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The hyperbolic cosine of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     */
+    public static function cosh($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        if ($complex->isReal()) {
+            return new Complex(\cosh($complex->getReal()));
+        }
+
+        return new Complex(
+            \cosh($complex->getReal()) * \cos($complex->getImaginary()),
+            \sinh($complex->getReal()) * \sin($complex->getImaginary()),
+            $complex->getSuffix()
+        );
+    }
+
+    /**
+     * Returns the cotangent of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The cotangent of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     * @throws    \InvalidArgumentException    If function would result in a division by zero
+     */
+    public static function cot($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
+            return new Complex(INF);
+        }
+
+        return self::inverse(self::tan($complex));
+    }
+
+    /**
+     * Returns the hyperbolic cotangent of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The hyperbolic cotangent of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     * @throws    \InvalidArgumentException    If function would result in a division by zero
+     */
+    public static function coth($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        return self::inverse(self::tanh($complex));
+    }
+
+    /**
+     * Returns the cosecant of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The cosecant of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     * @throws    \InvalidArgumentException    If function would result in a division by zero
+     */
+    public static function csc($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
+            return new Complex(INF);
+        }
+
+        return self::inverse(self::sin($complex));
+    }
+
+    /**
+     * Returns the hyperbolic cosecant of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The hyperbolic cosecant of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     * @throws    \InvalidArgumentException    If function would result in a division by zero
+     */
+    public static function csch($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
+            return new Complex(INF);
+        }
+
+        return self::inverse(self::sinh($complex));
+    }
+
+    /**
+     * Returns the exponential of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The exponential of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     */
+    public static function exp($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        if (($complex->getReal() == 0.0) && (\abs($complex->getImaginary()) == M_PI)) {
+            return new Complex(-1.0, 0.0);
+        }
+
+        $rho = \exp($complex->getReal());
+
+        return new Complex(
+            $rho * \cos($complex->getImaginary()),
+            $rho * \sin($complex->getImaginary()),
+            $complex->getSuffix()
+        );
+    }
+
+    /**
+     * Returns the inverse of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The inverse of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     * @throws    InvalidArgumentException    If function would result in a division by zero
+     */
+    public static function inverse($complex): Complex
+    {
+        $complex = clone Complex::validateComplexArgument($complex);
+
+        if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
+            throw new InvalidArgumentException('Division by zero');
+        }
+
+        return $complex->divideInto(1.0);
+    }
+
+    /**
+     * Returns the natural logarithm of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The natural logarithm of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     * @throws    InvalidArgumentException  If the real and the imaginary parts are both zero
+     */
+    public static function ln($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        if (($complex->getReal() == 0.0) && ($complex->getImaginary() == 0.0)) {
+            throw new InvalidArgumentException();
+        }
+
+        return new Complex(
+            \log(self::rho($complex)),
+            self::theta($complex),
+            $complex->getSuffix()
+        );
+    }
+
+    /**
+     * Returns the base-2 logarithm of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The base-2 logarithm of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     * @throws    InvalidArgumentException  If the real and the imaginary parts are both zero
+     */
+    public static function log2($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        if (($complex->getReal() == 0.0) && ($complex->getImaginary() == 0.0)) {
+            throw new InvalidArgumentException();
+        } elseif (($complex->getReal() > 0.0) && ($complex->getImaginary() == 0.0)) {
+            return new Complex(\log($complex->getReal(), 2), 0.0, $complex->getSuffix());
+        }
+
+        return self::ln($complex)
+            ->multiply(\log(Complex::EULER, 2));
+    }
+
+    /**
+     * Returns the common logarithm (base 10) of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The common logarithm (base 10) of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     * @throws    InvalidArgumentException  If the real and the imaginary parts are both zero
+     */
+    public static function log10($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        if (($complex->getReal() == 0.0) && ($complex->getImaginary() == 0.0)) {
+            throw new InvalidArgumentException();
+        } elseif (($complex->getReal() > 0.0) && ($complex->getImaginary() == 0.0)) {
+            return new Complex(\log10($complex->getReal()), 0.0, $complex->getSuffix());
+        }
+
+        return self::ln($complex)
+            ->multiply(\log10(Complex::EULER));
+    }
+
+    /**
+     * Returns the negative of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The negative value of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     *
+     * @see    rho
+     *
+     */
+    public static function negative($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        return new Complex(
+            -1 * $complex->getReal(),
+            -1 * $complex->getImaginary(),
+            $complex->getSuffix()
+        );
+    }
+
+    /**
+     * Returns a complex number raised to a power.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @param     float|integer    $power      The power to raise this value to
+     * @return    Complex          The complex argument raised to the real power.
+     * @throws    Exception        If the power argument isn't a valid real
+     */
+    public static function pow($complex, $power): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        if (!is_numeric($power)) {
+            throw new Exception('Power argument must be a real number');
+        }
+
+        if ($complex->getImaginary() == 0.0 && $complex->getReal() >= 0.0) {
+            return new Complex(\pow($complex->getReal(), $power));
+        }
+
+        $rValue = \sqrt(($complex->getReal() * $complex->getReal()) + ($complex->getImaginary() * $complex->getImaginary()));
+        $rPower = \pow($rValue, $power);
+        $theta = $complex->argument() * $power;
+        if ($theta == 0) {
+            return new Complex(1);
+        }
+
+        return new Complex($rPower * \cos($theta), $rPower * \sin($theta), $complex->getSuffix());
+    }
+
+    /**
+     * Returns the rho of a complex number.
+     * This is the distance/radius from the centrepoint to the representation of the number in polar coordinates.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    float            The rho value of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     */
+    public static function rho($complex): float
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        return \sqrt(
+            ($complex->getReal() * $complex->getReal()) +
+            ($complex->getImaginary() * $complex->getImaginary())
+        );
+    }
+
+    /**
+     * Returns the secant of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The secant of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     * @throws    \InvalidArgumentException    If function would result in a division by zero
+     */
+    public static function sec($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        return self::inverse(self::cos($complex));
+    }
+
+    /**
+     * Returns the hyperbolic secant of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The hyperbolic secant of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     * @throws    \InvalidArgumentException    If function would result in a division by zero
+     */
+    public static function sech($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        return self::inverse(self::cosh($complex));
+    }
+
+    /**
+     * Returns the sine of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The sine of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     */
+    public static function sin($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        if ($complex->isReal()) {
+            return new Complex(\sin($complex->getReal()));
+        }
+
+        return new Complex(
+            \sin($complex->getReal()) * \cosh($complex->getImaginary()),
+            \cos($complex->getReal()) * \sinh($complex->getImaginary()),
+            $complex->getSuffix()
+        );
+    }
+
+    /**
+     * Returns the hyperbolic sine of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The hyperbolic sine of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     */
+    public static function sinh($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        if ($complex->isReal()) {
+            return new Complex(\sinh($complex->getReal()));
+        }
+
+        return new Complex(
+            \sinh($complex->getReal()) * \cos($complex->getImaginary()),
+            \cosh($complex->getReal()) * \sin($complex->getImaginary()),
+            $complex->getSuffix()
+        );
+    }
+
+    /**
+     * Returns the square root of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The Square root of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     */
+    public static function sqrt($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        $theta = self::theta($complex);
+        $delta1 = \cos($theta / 2);
+        $delta2 = \sin($theta / 2);
+        $rho = \sqrt(self::rho($complex));
+
+        return new Complex($delta1 * $rho, $delta2 * $rho, $complex->getSuffix());
+    }
+
+    /**
+     * Returns the tangent of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The tangent of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     * @throws    InvalidArgumentException    If function would result in a division by zero
+     */
+    public static function tan($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        if ($complex->isReal()) {
+            return new Complex(\tan($complex->getReal()));
+        }
+
+        $real = $complex->getReal();
+        $imaginary = $complex->getImaginary();
+        $divisor = 1 + \pow(\tan($real), 2) * \pow(\tanh($imaginary), 2);
+        if ($divisor == 0.0) {
+            throw new InvalidArgumentException('Division by zero');
+        }
+
+        return new Complex(
+            \pow(self::sech($imaginary)->getReal(), 2) * \tan($real) / $divisor,
+            \pow(self::sec($real)->getReal(), 2) * \tanh($imaginary) / $divisor,
+            $complex->getSuffix()
+        );
+    }
+
+    /**
+     * Returns the hyperbolic tangent of a complex number.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    Complex          The hyperbolic tangent of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     * @throws    \InvalidArgumentException    If function would result in a division by zero
+     */
+    public static function tanh($complex): Complex
+    {
+        $complex = Complex::validateComplexArgument($complex);
+        $real = $complex->getReal();
+        $imaginary = $complex->getImaginary();
+        $divisor = \cos($imaginary) * \cos($imaginary) + \sinh($real) * \sinh($real);
+        if ($divisor == 0.0) {
+            throw new InvalidArgumentException('Division by zero');
+        }
+
+        return new Complex(
+            \sinh($real) * \cosh($real) / $divisor,
+            0.5 * \sin(2 * $imaginary) / $divisor,
+            $complex->getSuffix()
+        );
+    }
+
+    /**
+     * Returns the theta of a complex number.
+     *   This is the angle in radians from the real axis to the representation of the number in polar coordinates.
+     *
+     * @param     Complex|mixed    $complex    Complex number or a numeric value.
+     * @return    float            The theta value of the complex argument.
+     * @throws    Exception        If argument isn't a valid real or complex number.
+     */
+    public static function theta($complex): float
+    {
+        $complex = Complex::validateComplexArgument($complex);
+
+        if ($complex->getReal() == 0.0) {
+            if ($complex->isReal()) {
+                return 0.0;
+            } elseif ($complex->getImaginary() < 0.0) {
+                return M_PI / -2;
+            }
+            return M_PI / 2;
+        } elseif ($complex->getReal() > 0.0) {
+            return \atan($complex->getImaginary() / $complex->getReal());
+        } elseif ($complex->getImaginary() < 0.0) {
+            return -(M_PI - \atan(\abs($complex->getImaginary()) / \abs($complex->getReal())));
+        }
+
+        return M_PI - \atan($complex->getImaginary() / \abs($complex->getReal()));
+    }
+}
diff --git a/vendor/markbaker/complex/classes/src/Operations.php b/vendor/markbaker/complex/classes/src/Operations.php
new file mode 100644
index 0000000000..b13a8734dc
--- /dev/null
+++ b/vendor/markbaker/complex/classes/src/Operations.php
@@ -0,0 +1,210 @@
+<?php
+
+namespace Complex;
+
+use InvalidArgumentException;
+
+class Operations
+{
+    /**
+     * Adds two or more complex numbers
+     *
+     * @param     array of string|integer|float|Complex    $complexValues   The numbers to add
+     * @return    Complex
+     */
+    public static function add(...$complexValues): Complex
+    {
+        if (count($complexValues) < 2) {
+            throw new \Exception('This function requires at least 2 arguments');
+        }
+
+        $base = array_shift($complexValues);
+        $result = clone Complex::validateComplexArgument($base);
+
+        foreach ($complexValues as $complex) {
+            $complex = Complex::validateComplexArgument($complex);
+
+            if ($result->isComplex() && $complex->isComplex() &&
+                $result->getSuffix() !== $complex->getSuffix()) {
+                throw new Exception('Suffix Mismatch');
+            }
+
+            $real = $result->getReal() + $complex->getReal();
+            $imaginary = $result->getImaginary() + $complex->getImaginary();
+
+            $result = new Complex(
+                $real,
+                $imaginary,
+                ($imaginary == 0.0) ? null : max($result->getSuffix(), $complex->getSuffix())
+            );
+        }
+
+        return $result;
+    }
+
+    /**
+     * Divides two or more complex numbers
+     *
+     * @param     array of string|integer|float|Complex    $complexValues   The numbers to divide
+     * @return    Complex
+     */
+    public static function divideby(...$complexValues): Complex
+    {
+        if (count($complexValues) < 2) {
+            throw new \Exception('This function requires at least 2 arguments');
+        }
+
+        $base = array_shift($complexValues);
+        $result = clone Complex::validateComplexArgument($base);
+
+        foreach ($complexValues as $complex) {
+            $complex = Complex::validateComplexArgument($complex);
+
+            if ($result->isComplex() && $complex->isComplex() &&
+                $result->getSuffix() !== $complex->getSuffix()) {
+                throw new Exception('Suffix Mismatch');
+            }
+            if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
+                throw new InvalidArgumentException('Division by zero');
+            }
+
+            $delta1 = ($result->getReal() * $complex->getReal()) +
+                ($result->getImaginary() * $complex->getImaginary());
+            $delta2 = ($result->getImaginary() * $complex->getReal()) -
+                ($result->getReal() * $complex->getImaginary());
+            $delta3 = ($complex->getReal() * $complex->getReal()) +
+                ($complex->getImaginary() * $complex->getImaginary());
+
+            $real = $delta1 / $delta3;
+            $imaginary = $delta2 / $delta3;
+
+            $result = new Complex(
+                $real,
+                $imaginary,
+                ($imaginary == 0.0) ? null : max($result->getSuffix(), $complex->getSuffix())
+            );
+        }
+
+        return $result;
+    }
+
+    /**
+     * Divides two or more complex numbers
+     *
+     * @param     array of string|integer|float|Complex    $complexValues   The numbers to divide
+     * @return    Complex
+     */
+    public static function divideinto(...$complexValues): Complex
+    {
+        if (count($complexValues) < 2) {
+            throw new \Exception('This function requires at least 2 arguments');
+        }
+
+        $base = array_shift($complexValues);
+        $result = clone Complex::validateComplexArgument($base);
+
+        foreach ($complexValues as $complex) {
+            $complex = Complex::validateComplexArgument($complex);
+
+            if ($result->isComplex() && $complex->isComplex() &&
+                $result->getSuffix() !== $complex->getSuffix()) {
+                throw new Exception('Suffix Mismatch');
+            }
+            if ($result->getReal() == 0.0 && $result->getImaginary() == 0.0) {
+                throw new InvalidArgumentException('Division by zero');
+            }
+
+            $delta1 = ($complex->getReal() * $result->getReal()) +
+                ($complex->getImaginary() * $result->getImaginary());
+            $delta2 = ($complex->getImaginary() * $result->getReal()) -
+                ($complex->getReal() * $result->getImaginary());
+            $delta3 = ($result->getReal() * $result->getReal()) +
+                ($result->getImaginary() * $result->getImaginary());
+
+            $real = $delta1 / $delta3;
+            $imaginary = $delta2 / $delta3;
+
+            $result = new Complex(
+                $real,
+                $imaginary,
+                ($imaginary == 0.0) ? null : max($result->getSuffix(), $complex->getSuffix())
+            );
+        }
+
+        return $result;
+    }
+
+    /**
+     * Multiplies two or more complex numbers
+     *
+     * @param     array of string|integer|float|Complex    $complexValues   The numbers to multiply
+     * @return    Complex
+     */
+    public static function multiply(...$complexValues): Complex
+    {
+        if (count($complexValues) < 2) {
+            throw new \Exception('This function requires at least 2 arguments');
+        }
+
+        $base = array_shift($complexValues);
+        $result = clone Complex::validateComplexArgument($base);
+
+        foreach ($complexValues as $complex) {
+            $complex = Complex::validateComplexArgument($complex);
+
+            if ($result->isComplex() && $complex->isComplex() &&
+                $result->getSuffix() !== $complex->getSuffix()) {
+                throw new Exception('Suffix Mismatch');
+            }
+
+            $real = ($result->getReal() * $complex->getReal()) -
+                ($result->getImaginary() * $complex->getImaginary());
+            $imaginary = ($result->getReal() * $complex->getImaginary()) +
+                ($result->getImaginary() * $complex->getReal());
+
+            $result = new Complex(
+                $real,
+                $imaginary,
+                ($imaginary == 0.0) ? null : max($result->getSuffix(), $complex->getSuffix())
+            );
+        }
+
+        return $result;
+    }
+
+    /**
+     * Subtracts two or more complex numbers
+     *
+     * @param     array of string|integer|float|Complex    $complexValues   The numbers to subtract
+     * @return    Complex
+     */
+    public static function subtract(...$complexValues): Complex
+    {
+        if (count($complexValues) < 2) {
+            throw new \Exception('This function requires at least 2 arguments');
+        }
+
+        $base = array_shift($complexValues);
+        $result = clone Complex::validateComplexArgument($base);
+
+        foreach ($complexValues as $complex) {
+            $complex = Complex::validateComplexArgument($complex);
+
+            if ($result->isComplex() && $complex->isComplex() &&
+                $result->getSuffix() !== $complex->getSuffix()) {
+                throw new Exception('Suffix Mismatch');
+            }
+
+            $real = $result->getReal() - $complex->getReal();
+            $imaginary = $result->getImaginary() - $complex->getImaginary();
+
+            $result = new Complex(
+                $real,
+                $imaginary,
+                ($imaginary == 0.0) ? null : max($result->getSuffix(), $complex->getSuffix())
+            );
+        }
+
+        return $result;
+    }
+}
diff --git a/vendor/markbaker/complex/classes/src/functions/abs.php b/vendor/markbaker/complex/classes/src/functions/abs.php
deleted file mode 100644
index 98a90a7560..0000000000
--- a/vendor/markbaker/complex/classes/src/functions/abs.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the complex abs() function
- *
- * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-namespace Complex;
-
-/**
- * Returns the absolute value (modulus) of a complex number.
- * Also known as the rho of the complex number, i.e. the distance/radius
- *   from the centrepoint to the representation of the number in polar coordinates.
- *
- * This function is a synonym for rho()
- *
- * @param     Complex|mixed    $complex    Complex number or a numeric value.
- * @return    float            The absolute (or rho) value of the complex argument.
- * @throws    Exception        If argument isn't a valid real or complex number.
- *
- * @see    rho
- *
- */
-if (!function_exists(__NAMESPACE__ . '\\abs')) {
-    function abs($complex): float
-    {
-        return rho($complex);
-    }
-}
diff --git a/vendor/markbaker/complex/classes/src/functions/acos.php b/vendor/markbaker/complex/classes/src/functions/acos.php
deleted file mode 100644
index 1bf4587c90..0000000000
--- a/vendor/markbaker/complex/classes/src/functions/acos.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the complex acos() function
- *
- * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-namespace Complex;
-
-/**
- * Returns the inverse cosine of a complex number.
- *
- * @param     Complex|mixed    $complex    Complex number or a numeric value.
- * @return    Complex          The inverse cosine of the complex argument.
- * @throws    Exception        If argument isn't a valid real or complex number.
- */
-if (!function_exists(__NAMESPACE__ . '\\acos')) {
-    function acos($complex): Complex
-    {
-        $complex = Complex::validateComplexArgument($complex);
-
-        $square = clone $complex;
-        $square = multiply($square, $complex);
-        $invsqrt = new Complex(1.0);
-        $invsqrt = subtract($invsqrt, $square);
-        $invsqrt = sqrt($invsqrt);
-        $adjust = new Complex(
-            $complex->getReal() - $invsqrt->getImaginary(),
-            $complex->getImaginary() + $invsqrt->getReal()
-        );
-        $log = ln($adjust);
-
-        return new Complex(
-            $log->getImaginary(),
-            -1 * $log->getReal()
-        );
-    }
-}
diff --git a/vendor/markbaker/complex/classes/src/functions/acosh.php b/vendor/markbaker/complex/classes/src/functions/acosh.php
deleted file mode 100644
index 21ed664918..0000000000
--- a/vendor/markbaker/complex/classes/src/functions/acosh.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the complex acosh() function
- *
- * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-namespace Complex;
-
-/**
- * Returns the inverse hyperbolic cosine of a complex number.
- *
- * @param     Complex|mixed    $complex    Complex number or a numeric value.
- * @return    Complex          The inverse hyperbolic cosine of the complex argument.
- * @throws    Exception        If argument isn't a valid real or complex number.
- */
-if (!function_exists(__NAMESPACE__ . '\\acosh')) {
-    function acosh($complex)
-    {
-        $complex = Complex::validateComplexArgument($complex);
-
-        if ($complex->isReal() && ($complex->getReal() > 1)) {
-            return new Complex(\acosh($complex->getReal()));
-        }
-
-        $acosh = acos($complex)
-            ->reverse();
-        if ($acosh->getReal() < 0.0) {
-            $acosh = $acosh->invertReal();
-        }
-
-        return $acosh;
-    }
-}
diff --git a/vendor/markbaker/complex/classes/src/functions/acot.php b/vendor/markbaker/complex/classes/src/functions/acot.php
deleted file mode 100644
index 61ea3a3053..0000000000
--- a/vendor/markbaker/complex/classes/src/functions/acot.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the complex acot() function
- *
- * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-namespace Complex;
-
-/**
- * Returns the inverse cotangent of a complex number.
- *
- * @param     Complex|mixed    $complex    Complex number or a numeric value.
- * @return    Complex          The inverse cotangent of the complex argument.
- * @throws    Exception        If argument isn't a valid real or complex number.
- * @throws    \InvalidArgumentException    If function would result in a division by zero
- */
-if (!function_exists(__NAMESPACE__ . '\\acot')) {
-    function acot($complex): Complex
-    {
-        $complex = Complex::validateComplexArgument($complex);
-
-        return atan(inverse($complex));
-    }
-}
diff --git a/vendor/markbaker/complex/classes/src/functions/acoth.php b/vendor/markbaker/complex/classes/src/functions/acoth.php
deleted file mode 100644
index 1b48d82ae0..0000000000
--- a/vendor/markbaker/complex/classes/src/functions/acoth.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the complex acoth() function
- *
- * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-namespace Complex;
-
-/**
- * Returns the inverse hyperbolic cotangent of a complex number.
- *
- * @param     Complex|mixed    $complex    Complex number or a numeric value.
- * @return    Complex          The inverse hyperbolic cotangent of the complex argument.
- * @throws    Exception        If argument isn't a valid real or complex number.
- * @throws    \InvalidArgumentException    If function would result in a division by zero
- */
-if (!function_exists(__NAMESPACE__ . '\\acoth')) {
-    function acoth($complex): Complex
-    {
-        $complex = Complex::validateComplexArgument($complex);
-
-        return atanh(inverse($complex));
-    }
-}
diff --git a/vendor/markbaker/complex/classes/src/functions/acsc.php b/vendor/markbaker/complex/classes/src/functions/acsc.php
deleted file mode 100644
index 6d4fda77df..0000000000
--- a/vendor/markbaker/complex/classes/src/functions/acsc.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the complex acsc() function
- *
- * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-namespace Complex;
-
-/**
- * Returns the inverse cosecant of a complex number.
- *
- * @param     Complex|mixed    $complex    Complex number or a numeric value.
- * @return    Complex          The inverse cosecant of the complex argument.
- * @throws    Exception        If argument isn't a valid real or complex number.
- * @throws    \InvalidArgumentException    If function would result in a division by zero
- */
-if (!function_exists(__NAMESPACE__ . '\\acsc')) {
-    function acsc($complex): Complex
-    {
-        $complex = Complex::validateComplexArgument($complex);
-
-        if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
-            return new Complex(INF);
-        }
-
-        return asin(inverse($complex));
-    }
-}
diff --git a/vendor/markbaker/complex/classes/src/functions/acsch.php b/vendor/markbaker/complex/classes/src/functions/acsch.php
deleted file mode 100644
index 9f03bb7ea8..0000000000
--- a/vendor/markbaker/complex/classes/src/functions/acsch.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the complex acsch() function
- *
- * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-namespace Complex;
-
-/**
- * Returns the inverse hyperbolic cosecant of a complex number.
- *
- * @param     Complex|mixed    $complex    Complex number or a numeric value.
- * @return    Complex          The inverse hyperbolic cosecant of the complex argument.
- * @throws    Exception        If argument isn't a valid real or complex number.
- * @throws    \InvalidArgumentException    If function would result in a division by zero
- */
-if (!function_exists(__NAMESPACE__ . '\\acsch')) {
-    function acsch($complex): Complex
-    {
-        $complex = Complex::validateComplexArgument($complex);
-
-        if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
-            return new Complex(INF);
-        }
-
-        return asinh(inverse($complex));
-    }
-}
diff --git a/vendor/markbaker/complex/classes/src/functions/argument.php b/vendor/markbaker/complex/classes/src/functions/argument.php
deleted file mode 100644
index e0a00910de..0000000000
--- a/vendor/markbaker/complex/classes/src/functions/argument.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the complex argument() function
- *
- * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-namespace Complex;
-
-/**
- * Returns the argument of a complex number.
- * Also known as the theta of the complex number, i.e. the angle in radians
- *   from the real axis to the representation of the number in polar coordinates.
- *
- * This function is a synonym for theta()
- *
- * @param     Complex|mixed    $complex    Complex number or a numeric value.
- * @return    float            The argument (or theta) value of the complex argument.
- * @throws    Exception        If argument isn't a valid real or complex number.
- *
- * @see    theta
- */
-if (!function_exists(__NAMESPACE__ . '\\argument')) {
-    function argument($complex): float
-    {
-        return theta($complex);
-    }
-}
diff --git a/vendor/markbaker/complex/classes/src/functions/asec.php b/vendor/markbaker/complex/classes/src/functions/asec.php
deleted file mode 100644
index 2789718388..0000000000
--- a/vendor/markbaker/complex/classes/src/functions/asec.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the complex asec() function
- *
- * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-namespace Complex;
-
-/**
- * Returns the inverse secant of a complex number.
- *
- * @param     Complex|mixed    $complex    Complex number or a numeric value.
- * @return    Complex          The inverse secant of the complex argument.
- * @throws    Exception        If argument isn't a valid real or complex number.
- * @throws    \InvalidArgumentException    If function would result in a division by zero
- */
-if (!function_exists(__NAMESPACE__ . '\\asec')) {
-    function asec($complex): Complex
-    {
-        $complex = Complex::validateComplexArgument($complex);
-
-        if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
-            return new Complex(INF);
-        }
-
-        return acos(inverse($complex));
-    }
-}
diff --git a/vendor/markbaker/complex/classes/src/functions/asech.php b/vendor/markbaker/complex/classes/src/functions/asech.php
deleted file mode 100644
index 4ca50486f5..0000000000
--- a/vendor/markbaker/complex/classes/src/functions/asech.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the complex asech() function
- *
- * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-namespace Complex;
-
-/**
- * Returns the inverse hyperbolic secant of a complex number.
- *
- * @param     Complex|mixed    $complex    Complex number or a numeric value.
- * @return    Complex          The inverse hyperbolic secant of the complex argument.
- * @throws    Exception        If argument isn't a valid real or complex number.
- * @throws    \InvalidArgumentException    If function would result in a division by zero
- */
-if (!function_exists(__NAMESPACE__ . '\\asech')) {
-    function asech($complex): Complex
-    {
-        $complex = Complex::validateComplexArgument($complex);
-
-        if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
-            return new Complex(INF);
-        }
-
-        return acosh(inverse($complex));
-    }
-}
diff --git a/vendor/markbaker/complex/classes/src/functions/asin.php b/vendor/markbaker/complex/classes/src/functions/asin.php
deleted file mode 100644
index 283474729f..0000000000
--- a/vendor/markbaker/complex/classes/src/functions/asin.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the complex asin() function
- *
- * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-namespace Complex;
-
-/**
- * Returns the inverse sine of a complex number.
- *
- * @param     Complex|mixed    $complex    Complex number or a numeric value.
- * @return    Complex          The inverse sine of the complex argument.
- * @throws    Exception        If argument isn't a valid real or complex number.
- */
-if (!function_exists(__NAMESPACE__ . '\\asin')) {
-    function asin($complex): Complex
-    {
-        $complex = Complex::validateComplexArgument($complex);
-
-        $square = multiply($complex, $complex);
-        $invsqrt = new Complex(1.0);
-        $invsqrt = subtract($invsqrt, $square);
-        $invsqrt = sqrt($invsqrt);
-        $adjust = new Complex(
-            $invsqrt->getReal() - $complex->getImaginary(),
-            $invsqrt->getImaginary() + $complex->getReal()
-        );
-        $log = ln($adjust);
-
-        return new Complex(
-            $log->getImaginary(),
-            -1 * $log->getReal()
-        );
-    }
-}
diff --git a/vendor/markbaker/complex/classes/src/functions/asinh.php b/vendor/markbaker/complex/classes/src/functions/asinh.php
deleted file mode 100644
index 78868b73e6..0000000000
--- a/vendor/markbaker/complex/classes/src/functions/asinh.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the complex asinh() function
- *
- * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-namespace Complex;
-
-/**
- * Returns the inverse hyperbolic sine of a complex number.
- *
- * @param     Complex|mixed    $complex    Complex number or a numeric value.
- * @return    Complex          The inverse hyperbolic sine of the complex argument.
- * @throws    Exception        If argument isn't a valid real or complex number.
- */
-if (!function_exists(__NAMESPACE__ . '\\asinh')) {
-    function asinh($complex): Complex
-    {
-        $complex = Complex::validateComplexArgument($complex);
-
-        if ($complex->isReal() && ($complex->getReal() > 1)) {
-            return new Complex(\asinh($complex->getReal()));
-        }
-
-        $asinh = clone $complex;
-        $asinh = $asinh->reverse()
-            ->invertReal();
-        $asinh = asin($asinh);
-        return $asinh->reverse()
-            ->invertImaginary();
-    }
-}
diff --git a/vendor/markbaker/complex/classes/src/functions/atan.php b/vendor/markbaker/complex/classes/src/functions/atan.php
deleted file mode 100644
index 3f4d3d7774..0000000000
--- a/vendor/markbaker/complex/classes/src/functions/atan.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the complex atan() function
- *
- * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-namespace Complex;
-
-//include_once 'Math/Complex.php';
-//include_once 'Math/ComplexOp.php';
-
-/**
- * Returns the inverse tangent of a complex number.
- *
- * @param     Complex|mixed    $complex    Complex number or a numeric value.
- * @return    Complex          The inverse tangent of the complex argument.
- * @throws    Exception        If argument isn't a valid real or complex number.
- * @throws    \InvalidArgumentException    If function would result in a division by zero
- */
-if (!function_exists(__NAMESPACE__ . '\\atan')) {
-    function atan($complex): Complex
-    {
-        $complex = Complex::validateComplexArgument($complex);
-
-        if ($complex->isReal()) {
-            return new Complex(\atan($complex->getReal()));
-        }
-
-        $t1Value = new Complex(-1 * $complex->getImaginary(), $complex->getReal());
-        $uValue = new Complex(1, 0);
-
-        $d1Value = clone $uValue;
-        $d1Value = subtract($d1Value, $t1Value);
-        $d2Value = add($t1Value, $uValue);
-        $uResult = $d1Value->divideBy($d2Value);
-        $uResult = ln($uResult);
-
-        return new Complex(
-            (($uResult->getImaginary() == M_PI) ? -M_PI : $uResult->getImaginary()) * -0.5,
-            $uResult->getReal() * 0.5,
-            $complex->getSuffix()
-        );
-    }
-}
diff --git a/vendor/markbaker/complex/classes/src/functions/atanh.php b/vendor/markbaker/complex/classes/src/functions/atanh.php
deleted file mode 100644
index 65311ec26d..0000000000
--- a/vendor/markbaker/complex/classes/src/functions/atanh.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the complex atanh() function
- *
- * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-namespace Complex;
-
-/**
- * Returns the inverse hyperbolic tangent of a complex number.
- *
- * @param     Complex|mixed    $complex    Complex number or a numeric value.
- * @return    Complex          The inverse hyperbolic tangent of the complex argument.
- * @throws    Exception        If argument isn't a valid real or complex number.
- */
-if (!function_exists(__NAMESPACE__ . '\\atanh')) {
-    function atanh($complex): Complex
-    {
-        $complex = Complex::validateComplexArgument($complex);
-
-        if ($complex->isReal()) {
-            $real = $complex->getReal();
-            if ($real >= -1.0 && $real <= 1.0) {
-                return new Complex(\atanh($real));
-            } else {
-                return new Complex(\atanh(1 / $real), (($real < 0.0) ? M_PI_2 : -1 * M_PI_2));
-            }
-        }
-
-        $iComplex = clone $complex;
-        $iComplex = $iComplex->invertImaginary()
-            ->reverse();
-        return atan($iComplex)
-            ->invertReal()
-            ->reverse();
-    }
-}
diff --git a/vendor/markbaker/complex/classes/src/functions/conjugate.php b/vendor/markbaker/complex/classes/src/functions/conjugate.php
deleted file mode 100644
index b8ec040720..0000000000
--- a/vendor/markbaker/complex/classes/src/functions/conjugate.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the complex conjugate() function
- *
- * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-namespace Complex;
-
-/**
- * Returns the complex conjugate of a complex number
- *
- * @param     Complex|mixed    $complex    Complex number or a numeric value.
- * @return    Complex          The conjugate of the complex argument.
- * @throws    Exception        If argument isn't a valid real or complex number.
- */
-if (!function_exists(__NAMESPACE__ . '\\conjugate')) {
-    function conjugate($complex): Complex
-    {
-        $complex = Complex::validateComplexArgument($complex);
-
-        return new Complex(
-            $complex->getReal(),
-            -1 * $complex->getImaginary(),
-            $complex->getSuffix()
-        );
-    }
-}
diff --git a/vendor/markbaker/complex/classes/src/functions/cos.php b/vendor/markbaker/complex/classes/src/functions/cos.php
deleted file mode 100644
index 720299d443..0000000000
--- a/vendor/markbaker/complex/classes/src/functions/cos.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the complex cos() function
- *
- * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-namespace Complex;
-
-/**
- * Returns the cosine of a complex number.
- *
- * @param     Complex|mixed    $complex    Complex number or a numeric value.
- * @return    Complex          The cosine of the complex argument.
- * @throws    Exception        If argument isn't a valid real or complex number.
- */
-if (!function_exists(__NAMESPACE__ . '\\cos')) {
-    function cos($complex): Complex
-    {
-        $complex = Complex::validateComplexArgument($complex);
-
-        if ($complex->isReal()) {
-            return new Complex(\cos($complex->getReal()));
-        }
-
-        return conjugate(
-            new Complex(
-                \cos($complex->getReal()) * \cosh($complex->getImaginary()),
-                \sin($complex->getReal()) * \sinh($complex->getImaginary()),
-                $complex->getSuffix()
-            )
-        );
-    }
-}
diff --git a/vendor/markbaker/complex/classes/src/functions/cosh.php b/vendor/markbaker/complex/classes/src/functions/cosh.php
deleted file mode 100644
index 73aadde461..0000000000
--- a/vendor/markbaker/complex/classes/src/functions/cosh.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the complex cosh() function
- *
- * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-namespace Complex;
-
-/**
- * Returns the hyperbolic cosine of a complex number.
- *
- * @param     Complex|mixed    $complex    Complex number or a numeric value.
- * @return    Complex          The hyperbolic cosine of the complex argument.
- * @throws    Exception        If argument isn't a valid real or complex number.
- */
-if (!function_exists(__NAMESPACE__ . '\\cosh')) {
-    function cosh($complex): Complex
-    {
-        $complex = Complex::validateComplexArgument($complex);
-
-        if ($complex->isReal()) {
-            return new Complex(\cosh($complex->getReal()));
-        }
-
-        return new Complex(
-            \cosh($complex->getReal()) * \cos($complex->getImaginary()),
-            \sinh($complex->getReal()) * \sin($complex->getImaginary()),
-            $complex->getSuffix()
-        );
-    }
-}
diff --git a/vendor/markbaker/complex/classes/src/functions/cot.php b/vendor/markbaker/complex/classes/src/functions/cot.php
deleted file mode 100644
index a52810b586..0000000000
--- a/vendor/markbaker/complex/classes/src/functions/cot.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the complex cot() function
- *
- * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-namespace Complex;
-
-/**
- * Returns the cotangent of a complex number.
- *
- * @param     Complex|mixed    $complex    Complex number or a numeric value.
- * @return    Complex          The cotangent of the complex argument.
- * @throws    Exception        If argument isn't a valid real or complex number.
- * @throws    \InvalidArgumentException    If function would result in a division by zero
- */
-if (!function_exists(__NAMESPACE__ . '\\cot')) {
-    function cot($complex): Complex
-    {
-        $complex = Complex::validateComplexArgument($complex);
-
-        if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
-            return new Complex(INF);
-        }
-
-        return inverse(tan($complex));
-    }
-}
diff --git a/vendor/markbaker/complex/classes/src/functions/coth.php b/vendor/markbaker/complex/classes/src/functions/coth.php
deleted file mode 100644
index ffc32974f3..0000000000
--- a/vendor/markbaker/complex/classes/src/functions/coth.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the complex coth() function
- *
- * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-namespace Complex;
-
-/**
- * Returns the hyperbolic cotangent of a complex number.
- *
- * @param     Complex|mixed    $complex    Complex number or a numeric value.
- * @return    Complex          The hyperbolic cotangent of the complex argument.
- * @throws    Exception        If argument isn't a valid real or complex number.
- * @throws    \InvalidArgumentException    If function would result in a division by zero
- */
-if (!function_exists(__NAMESPACE__ . '\\coth')) {
-    function coth($complex): Complex
-    {
-        $complex = Complex::validateComplexArgument($complex);
-        return inverse(tanh($complex));
-    }
-}
diff --git a/vendor/markbaker/complex/classes/src/functions/csc.php b/vendor/markbaker/complex/classes/src/functions/csc.php
deleted file mode 100644
index b9b2768aa8..0000000000
--- a/vendor/markbaker/complex/classes/src/functions/csc.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the complex csc() function
- *
- * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-namespace Complex;
-
-/**
- * Returns the cosecant of a complex number.
- *
- * @param     Complex|mixed    $complex    Complex number or a numeric value.
- * @return    Complex          The cosecant of the complex argument.
- * @throws    Exception        If argument isn't a valid real or complex number.
- * @throws    \InvalidArgumentException    If function would result in a division by zero
- */
-if (!function_exists(__NAMESPACE__ . '\\csc')) {
-    function csc($complex): Complex
-    {
-        $complex = Complex::validateComplexArgument($complex);
-
-        if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
-            return new Complex(INF);
-        }
-
-        return inverse(sin($complex));
-    }
-}
diff --git a/vendor/markbaker/complex/classes/src/functions/csch.php b/vendor/markbaker/complex/classes/src/functions/csch.php
deleted file mode 100644
index b94a22a985..0000000000
--- a/vendor/markbaker/complex/classes/src/functions/csch.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the complex csch() function
- *
- * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-namespace Complex;
-
-/**
- * Returns the hyperbolic cosecant of a complex number.
- *
- * @param     Complex|mixed    $complex    Complex number or a numeric value.
- * @return    Complex          The hyperbolic cosecant of the complex argument.
- * @throws    Exception        If argument isn't a valid real or complex number.
- * @throws    \InvalidArgumentException    If function would result in a division by zero
- */
-if (!function_exists(__NAMESPACE__ . '\\csch')) {
-    function csch($complex): Complex
-    {
-        $complex = Complex::validateComplexArgument($complex);
-
-        if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
-            return new Complex(INF);
-        }
-
-        return inverse(sinh($complex));
-    }
-}
diff --git a/vendor/markbaker/complex/classes/src/functions/exp.php b/vendor/markbaker/complex/classes/src/functions/exp.php
deleted file mode 100644
index 6bfd52980c..0000000000
--- a/vendor/markbaker/complex/classes/src/functions/exp.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the complex exp() function
- *
- * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-namespace Complex;
-
-/**
- * Returns the exponential of a complex number.
- *
- * @param     Complex|mixed    $complex    Complex number or a numeric value.
- * @return    Complex          The exponential of the complex argument.
- * @throws    Exception        If argument isn't a valid real or complex number.
- */
-if (!function_exists(__NAMESPACE__ . '\\exp')) {
-    function exp($complex): Complex
-    {
-        $complex = Complex::validateComplexArgument($complex);
-
-        if (($complex->getReal() == 0.0) && (\abs($complex->getImaginary()) == M_PI)) {
-            return new Complex(-1.0, 0.0);
-        }
-
-        $rho = \exp($complex->getReal());
-
-        return new Complex(
-            $rho * \cos($complex->getImaginary()),
-            $rho * \sin($complex->getImaginary()),
-            $complex->getSuffix()
-        );
-    }
-}
diff --git a/vendor/markbaker/complex/classes/src/functions/inverse.php b/vendor/markbaker/complex/classes/src/functions/inverse.php
deleted file mode 100644
index 07c342a450..0000000000
--- a/vendor/markbaker/complex/classes/src/functions/inverse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the complex inverse() function
- *
- * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-namespace Complex;
-
-/**
- * Returns the inverse of a complex number.
- *
- * @param     Complex|mixed    $complex    Complex number or a numeric value.
- * @return    Complex          The inverse of the complex argument.
- * @throws    Exception        If argument isn't a valid real or complex number.
- * @throws    \InvalidArgumentException    If function would result in a division by zero
- */
-if (!function_exists(__NAMESPACE__ . '\\inverse')) {
-    function inverse($complex): Complex
-    {
-        $complex = clone Complex::validateComplexArgument($complex);
-
-        if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
-            throw new \InvalidArgumentException('Division by zero');
-        }
-
-        return $complex->divideInto(1.0);
-    }
-}
diff --git a/vendor/markbaker/complex/classes/src/functions/ln.php b/vendor/markbaker/complex/classes/src/functions/ln.php
deleted file mode 100644
index 6b070cf494..0000000000
--- a/vendor/markbaker/complex/classes/src/functions/ln.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the complex ln() function
- *
- * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-namespace Complex;
-
-/**
- * Returns the natural logarithm of a complex number.
- *
- * @param     Complex|mixed    $complex    Complex number or a numeric value.
- * @return    Complex          The natural logarithm of the complex argument.
- * @throws    Exception        If argument isn't a valid real or complex number.
- * @throws    \InvalidArgumentException  If the real and the imaginary parts are both zero
- */
-if (!function_exists(__NAMESPACE__ . '\\ln')) {
-    function ln($complex): Complex
-    {
-        $complex = Complex::validateComplexArgument($complex);
-
-        if (($complex->getReal() == 0.0) && ($complex->getImaginary() == 0.0)) {
-            throw new \InvalidArgumentException();
-        }
-
-        return new Complex(
-            \log(rho($complex)),
-            theta($complex),
-            $complex->getSuffix()
-        );
-    }
-}
diff --git a/vendor/markbaker/complex/classes/src/functions/log10.php b/vendor/markbaker/complex/classes/src/functions/log10.php
deleted file mode 100644
index e18c9840ee..0000000000
--- a/vendor/markbaker/complex/classes/src/functions/log10.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the complex log10() function
- *
- * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-namespace Complex;
-
-/**
- * Returns the common logarithm (base 10) of a complex number.
- *
- * @param     Complex|mixed    $complex    Complex number or a numeric value.
- * @return    Complex          The common logarithm (base 10) of the complex argument.
- * @throws    Exception        If argument isn't a valid real or complex number.
- * @throws    \InvalidArgumentException  If the real and the imaginary parts are both zero
- */
-if (!function_exists(__NAMESPACE__ . '\\log10')) {
-    function log10($complex): Complex
-    {
-        $complex = Complex::validateComplexArgument($complex);
-
-        if (($complex->getReal() == 0.0) && ($complex->getImaginary() == 0.0)) {
-            throw new \InvalidArgumentException();
-        } elseif (($complex->getReal() > 0.0) && ($complex->getImaginary() == 0.0)) {
-            return new Complex(\log10($complex->getReal()), 0.0, $complex->getSuffix());
-        }
-
-        return ln($complex)
-            ->multiply(\log10(Complex::EULER));
-    }
-}
diff --git a/vendor/markbaker/complex/classes/src/functions/log2.php b/vendor/markbaker/complex/classes/src/functions/log2.php
deleted file mode 100644
index e3198130c1..0000000000
--- a/vendor/markbaker/complex/classes/src/functions/log2.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the complex log2() function
- *
- * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-namespace Complex;
-
-/**
- * Returns the base-2 logarithm of a complex number.
- *
- * @param     Complex|mixed    $complex    Complex number or a numeric value.
- * @return    Complex          The base-2 logarithm of the complex argument.
- * @throws    Exception        If argument isn't a valid real or complex number.
- * @throws    \InvalidArgumentException  If the real and the imaginary parts are both zero
- */
-if (!function_exists(__NAMESPACE__ . '\\log2')) {
-    function log2($complex): Complex
-    {
-        $complex = Complex::validateComplexArgument($complex);
-
-        if (($complex->getReal() == 0.0) && ($complex->getImaginary() == 0.0)) {
-            throw new \InvalidArgumentException();
-        } elseif (($complex->getReal() > 0.0) && ($complex->getImaginary() == 0.0)) {
-            return new Complex(\log($complex->getReal(), 2), 0.0, $complex->getSuffix());
-        }
-
-        return ln($complex)
-            ->multiply(\log(Complex::EULER, 2));
-    }
-}
diff --git a/vendor/markbaker/complex/classes/src/functions/negative.php b/vendor/markbaker/complex/classes/src/functions/negative.php
deleted file mode 100644
index 35bec44e76..0000000000
--- a/vendor/markbaker/complex/classes/src/functions/negative.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the complex negative() function
- *
- * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-namespace Complex;
-
-/**
- * Returns the negative of a complex number.
- *
- * @param     Complex|mixed    $complex    Complex number or a numeric value.
- * @return    Complex          The negative value of the complex argument.
- * @throws    Exception        If argument isn't a valid real or complex number.
- *
- * @see    rho
- *
- */
-if (!function_exists(__NAMESPACE__ . '\\negative')) {
-    function negative($complex): Complex
-    {
-        $complex = Complex::validateComplexArgument($complex);
-
-        return new Complex(
-            -1 * $complex->getReal(),
-            -1 * $complex->getImaginary(),
-            $complex->getSuffix()
-        );
-    }
-}
diff --git a/vendor/markbaker/complex/classes/src/functions/pow.php b/vendor/markbaker/complex/classes/src/functions/pow.php
deleted file mode 100644
index dc0ae8bbc9..0000000000
--- a/vendor/markbaker/complex/classes/src/functions/pow.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the complex pow() function
- *
- * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-namespace Complex;
-
-/**
- * Returns a complex number raised to a power.
- *
- * @param     Complex|mixed    $complex    Complex number or a numeric value.
- * @param     float|integer    $power      The power to raise this value to
- * @return    Complex          The complex argument raised to the real power.
- * @throws    Exception        If the power argument isn't a valid real
- */
-if (!function_exists(__NAMESPACE__ . '\\pow')) {
-    function pow($complex, $power): Complex
-    {
-        $complex = Complex::validateComplexArgument($complex);
-
-        if (!is_numeric($power)) {
-            throw new Exception('Power argument must be a real number');
-        }
-
-        if ($complex->getImaginary() == 0.0 && $complex->getReal() >= 0.0) {
-            return new Complex(\pow($complex->getReal(), $power));
-        }
-
-        $rValue = \sqrt(($complex->getReal() * $complex->getReal()) + ($complex->getImaginary() * $complex->getImaginary()));
-        $rPower = \pow($rValue, $power);
-        $theta = $complex->argument() * $power;
-        if ($theta == 0) {
-            return new Complex(1);
-        }
-
-        return new Complex($rPower * \cos($theta), $rPower * \sin($theta), $complex->getSuffix());
-    }
-}
diff --git a/vendor/markbaker/complex/classes/src/functions/rho.php b/vendor/markbaker/complex/classes/src/functions/rho.php
deleted file mode 100644
index b799f6f264..0000000000
--- a/vendor/markbaker/complex/classes/src/functions/rho.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the complex rho() function
- *
- * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-namespace Complex;
-
-/**
- * Returns the rho of a complex number.
- * This is the distance/radius from the centrepoint to the representation of the number in polar coordinates.
- *
- * @param     Complex|mixed    $complex    Complex number or a numeric value.
- * @return    float            The rho value of the complex argument.
- * @throws    Exception        If argument isn't a valid real or complex number.
- */
-if (!function_exists(__NAMESPACE__ . '\\rho')) {
-    function rho($complex): float
-    {
-        $complex = Complex::validateComplexArgument($complex);
-
-        return \sqrt(
-            ($complex->getReal() * $complex->getReal()) +
-            ($complex->getImaginary() * $complex->getImaginary())
-        );
-    }
-}
diff --git a/vendor/markbaker/complex/classes/src/functions/sec.php b/vendor/markbaker/complex/classes/src/functions/sec.php
deleted file mode 100644
index 48f8d53f7f..0000000000
--- a/vendor/markbaker/complex/classes/src/functions/sec.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the complex sec() function
- *
- * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-namespace Complex;
-
-/**
- * Returns the secant of a complex number.
- *
- * @param     Complex|mixed    $complex    Complex number or a numeric value.
- * @return    Complex          The secant of the complex argument.
- * @throws    Exception        If argument isn't a valid real or complex number.
- * @throws    \InvalidArgumentException    If function would result in a division by zero
- */
-if (!function_exists(__NAMESPACE__ . '\\sec')) {
-    function sec($complex): Complex
-    {
-        $complex = Complex::validateComplexArgument($complex);
-
-        return inverse(cos($complex));
-    }
-}
diff --git a/vendor/markbaker/complex/classes/src/functions/sech.php b/vendor/markbaker/complex/classes/src/functions/sech.php
deleted file mode 100644
index 8d32af837c..0000000000
--- a/vendor/markbaker/complex/classes/src/functions/sech.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the complex sech() function
- *
- * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-namespace Complex;
-
-/**
- * Returns the hyperbolic secant of a complex number.
- *
- * @param     Complex|mixed    $complex    Complex number or a numeric value.
- * @return    Complex          The hyperbolic secant of the complex argument.
- * @throws    Exception        If argument isn't a valid real or complex number.
- * @throws    \InvalidArgumentException    If function would result in a division by zero
- */
-if (!function_exists(__NAMESPACE__ . '\\sech')) {
-    function sech($complex): Complex
-    {
-        $complex = Complex::validateComplexArgument($complex);
-
-        return inverse(cosh($complex));
-    }
-}
diff --git a/vendor/markbaker/complex/classes/src/functions/sin.php b/vendor/markbaker/complex/classes/src/functions/sin.php
deleted file mode 100644
index 6d9fd1d75c..0000000000
--- a/vendor/markbaker/complex/classes/src/functions/sin.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the complex sin() function
- *
- * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-namespace Complex;
-
-/**
- * Returns the sine of a complex number.
- *
- * @param     Complex|mixed    $complex    Complex number or a numeric value.
- * @return    Complex          The sine of the complex argument.
- * @throws    Exception        If argument isn't a valid real or complex number.
- */
-if (!function_exists(__NAMESPACE__ . '\\sin')) {
-    function sin($complex): Complex
-    {
-        $complex = Complex::validateComplexArgument($complex);
-
-        if ($complex->isReal()) {
-            return new Complex(\sin($complex->getReal()));
-        }
-
-        return new Complex(
-            \sin($complex->getReal()) * \cosh($complex->getImaginary()),
-            \cos($complex->getReal()) * \sinh($complex->getImaginary()),
-            $complex->getSuffix()
-        );
-    }
-}
diff --git a/vendor/markbaker/complex/classes/src/functions/sinh.php b/vendor/markbaker/complex/classes/src/functions/sinh.php
deleted file mode 100644
index b178befadd..0000000000
--- a/vendor/markbaker/complex/classes/src/functions/sinh.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the complex sinh() function
- *
- * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-namespace Complex;
-
-/**
- * Returns the hyperbolic sine of a complex number.
- *
- * @param     Complex|mixed    $complex    Complex number or a numeric value.
- * @return    Complex          The hyperbolic sine of the complex argument.
- * @throws    Exception        If argument isn't a valid real or complex number.
- */
-if (!function_exists(__NAMESPACE__ . '\\sinh')) {
-    function sinh($complex): Complex
-    {
-        $complex = Complex::validateComplexArgument($complex);
-
-        if ($complex->isReal()) {
-            return new Complex(\sinh($complex->getReal()));
-        }
-
-        return new Complex(
-            \sinh($complex->getReal()) * \cos($complex->getImaginary()),
-            \cosh($complex->getReal()) * \sin($complex->getImaginary()),
-            $complex->getSuffix()
-        );
-    }
-}
diff --git a/vendor/markbaker/complex/classes/src/functions/sqrt.php b/vendor/markbaker/complex/classes/src/functions/sqrt.php
deleted file mode 100644
index ebf6773091..0000000000
--- a/vendor/markbaker/complex/classes/src/functions/sqrt.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the complex sqrt() function
- *
- * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-namespace Complex;
-
-/**
- * Returns the square root of a complex number.
- *
- * @param     Complex|mixed    $complex    Complex number or a numeric value.
- * @return    Complex          The Square root of the complex argument.
- * @throws    Exception        If argument isn't a valid real or complex number.
- */
-if (!function_exists(__NAMESPACE__ . '\\sqrt')) {
-    function sqrt($complex): Complex
-    {
-        $complex = Complex::validateComplexArgument($complex);
-
-        $theta = theta($complex);
-        $delta1 = \cos($theta / 2);
-        $delta2 = \sin($theta / 2);
-        $rho = \sqrt(rho($complex));
-
-        return new Complex($delta1 * $rho, $delta2 * $rho, $complex->getSuffix());
-    }
-}
diff --git a/vendor/markbaker/complex/classes/src/functions/tan.php b/vendor/markbaker/complex/classes/src/functions/tan.php
deleted file mode 100644
index 0e6d624681..0000000000
--- a/vendor/markbaker/complex/classes/src/functions/tan.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the complex tan() function
- *
- * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-namespace Complex;
-
-/**
- * Returns the tangent of a complex number.
- *
- * @param     Complex|mixed    $complex    Complex number or a numeric value.
- * @return    Complex          The tangent of the complex argument.
- * @throws    Exception        If argument isn't a valid real or complex number.
- * @throws    \InvalidArgumentException    If function would result in a division by zero
- */
-if (!function_exists(__NAMESPACE__ . '\\tan')) {
-    function tan($complex): Complex
-    {
-        $complex = Complex::validateComplexArgument($complex);
-
-        if ($complex->isReal()) {
-            return new Complex(\tan($complex->getReal()));
-        }
-
-        $real = $complex->getReal();
-        $imaginary = $complex->getImaginary();
-        $divisor = 1 + \pow(\tan($real), 2) * \pow(\tanh($imaginary), 2);
-        if ($divisor == 0.0) {
-            throw new \InvalidArgumentException('Division by zero');
-        }
-
-        return new Complex(
-            \pow(sech($imaginary)->getReal(), 2) * \tan($real) / $divisor,
-            \pow(sec($real)->getReal(), 2) * \tanh($imaginary) / $divisor,
-            $complex->getSuffix()
-        );
-    }
-}
diff --git a/vendor/markbaker/complex/classes/src/functions/tanh.php b/vendor/markbaker/complex/classes/src/functions/tanh.php
deleted file mode 100644
index 84547d8f4f..0000000000
--- a/vendor/markbaker/complex/classes/src/functions/tanh.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the complex tanh() function
- *
- * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-namespace Complex;
-
-/**
- * Returns the hyperbolic tangent of a complex number.
- *
- * @param     Complex|mixed    $complex    Complex number or a numeric value.
- * @return    Complex          The hyperbolic tangent of the complex argument.
- * @throws    Exception        If argument isn't a valid real or complex number.
- * @throws    \InvalidArgumentException    If function would result in a division by zero
- */
-if (!function_exists(__NAMESPACE__ . '\\tanh')) {
-    function tanh($complex): Complex
-    {
-        $complex = Complex::validateComplexArgument($complex);
-        $real = $complex->getReal();
-        $imaginary = $complex->getImaginary();
-        $divisor = \cos($imaginary) * \cos($imaginary) + \sinh($real) * \sinh($real);
-        if ($divisor == 0.0) {
-            throw new \InvalidArgumentException('Division by zero');
-        }
-
-        return new Complex(
-            \sinh($real) * \cosh($real) / $divisor,
-            0.5 * \sin(2 * $imaginary) / $divisor,
-            $complex->getSuffix()
-        );
-    }
-}
diff --git a/vendor/markbaker/complex/classes/src/functions/theta.php b/vendor/markbaker/complex/classes/src/functions/theta.php
deleted file mode 100644
index ef925c12fb..0000000000
--- a/vendor/markbaker/complex/classes/src/functions/theta.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the complex theta() function
- *
- * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-namespace Complex;
-
-/**
- * Returns the theta of a complex number.
- *   This is the angle in radians from the real axis to the representation of the number in polar coordinates.
- *
- * @param     Complex|mixed    $complex    Complex number or a numeric value.
- * @return    float            The theta value of the complex argument.
- * @throws    Exception        If argument isn't a valid real or complex number.
- */
-if (!function_exists(__NAMESPACE__ . '\\theta')) {
-    function theta($complex): float
-    {
-        $complex = Complex::validateComplexArgument($complex);
-
-        if ($complex->getReal() == 0.0) {
-            if ($complex->isReal()) {
-                return 0.0;
-            } elseif ($complex->getImaginary() < 0.0) {
-                return M_PI / -2;
-            }
-            return M_PI / 2;
-        } elseif ($complex->getReal() > 0.0) {
-            return \atan($complex->getImaginary() / $complex->getReal());
-        } elseif ($complex->getImaginary() < 0.0) {
-            return -(M_PI - \atan(\abs($complex->getImaginary()) / \abs($complex->getReal())));
-        }
-
-        return M_PI - \atan($complex->getImaginary() / \abs($complex->getReal()));
-    }
-}
diff --git a/vendor/markbaker/complex/classes/src/operations/add.php b/vendor/markbaker/complex/classes/src/operations/add.php
deleted file mode 100644
index 9bbc5a5551..0000000000
--- a/vendor/markbaker/complex/classes/src/operations/add.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the complex addition operation
- *
- * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-namespace Complex;
-
-/**
- * Adds two or more complex numbers
- *
- * @param     array of string|integer|float|Complex    $complexValues   The numbers to add
- * @return    Complex
- */
-if (!function_exists(__NAMESPACE__ . '\\add')) {
-    function add(...$complexValues): Complex
-    {
-        if (count($complexValues) < 2) {
-            throw new \Exception('This function requires at least 2 arguments');
-        }
-
-        $base = array_shift($complexValues);
-        $result = clone Complex::validateComplexArgument($base);
-
-        foreach ($complexValues as $complex) {
-            $complex = Complex::validateComplexArgument($complex);
-
-            if ($result->isComplex() && $complex->isComplex() &&
-                $result->getSuffix() !== $complex->getSuffix()) {
-                throw new Exception('Suffix Mismatch');
-            }
-
-            $real = $result->getReal() + $complex->getReal();
-            $imaginary = $result->getImaginary() + $complex->getImaginary();
-
-            $result = new Complex(
-                $real,
-                $imaginary,
-                ($imaginary == 0.0) ? null : max($result->getSuffix(), $complex->getSuffix())
-            );
-        }
-
-        return $result;
-    }
-}
diff --git a/vendor/markbaker/complex/classes/src/operations/divideby.php b/vendor/markbaker/complex/classes/src/operations/divideby.php
deleted file mode 100644
index 32b91b2b87..0000000000
--- a/vendor/markbaker/complex/classes/src/operations/divideby.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the complex division operation
- *
- * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-namespace Complex;
-
-/**
- * Divides two or more complex numbers
- *
- * @param     array of string|integer|float|Complex    $complexValues   The numbers to divide
- * @return    Complex
- */
-if (!function_exists(__NAMESPACE__ . '\\divideby')) {
-    function divideby(...$complexValues): Complex
-    {
-        if (count($complexValues) < 2) {
-            throw new \Exception('This function requires at least 2 arguments');
-        }
-
-        $base = array_shift($complexValues);
-        $result = clone Complex::validateComplexArgument($base);
-
-        foreach ($complexValues as $complex) {
-            $complex = Complex::validateComplexArgument($complex);
-
-            if ($result->isComplex() && $complex->isComplex() &&
-                $result->getSuffix() !== $complex->getSuffix()) {
-                throw new Exception('Suffix Mismatch');
-            }
-            if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
-                throw new \InvalidArgumentException('Division by zero');
-            }
-
-            $delta1 = ($result->getReal() * $complex->getReal()) +
-                ($result->getImaginary() * $complex->getImaginary());
-            $delta2 = ($result->getImaginary() * $complex->getReal()) -
-                ($result->getReal() * $complex->getImaginary());
-            $delta3 = ($complex->getReal() * $complex->getReal()) +
-                ($complex->getImaginary() * $complex->getImaginary());
-
-            $real = $delta1 / $delta3;
-            $imaginary = $delta2 / $delta3;
-
-            $result = new Complex(
-                $real,
-                $imaginary,
-                ($imaginary == 0.0) ? null : max($result->getSuffix(), $complex->getSuffix())
-            );
-        }
-
-        return $result;
-    }
-}
diff --git a/vendor/markbaker/complex/classes/src/operations/divideinto.php b/vendor/markbaker/complex/classes/src/operations/divideinto.php
deleted file mode 100644
index 5e67ade2f9..0000000000
--- a/vendor/markbaker/complex/classes/src/operations/divideinto.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the complex division operation
- *
- * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-namespace Complex;
-
-/**
- * Divides two or more complex numbers
- *
- * @param     array of string|integer|float|Complex    $complexValues   The numbers to divide
- * @return    Complex
- */
-if (!function_exists(__NAMESPACE__ . '\\divideinto')) {
-    function divideinto(...$complexValues): Complex
-    {
-        if (count($complexValues) < 2) {
-            throw new \Exception('This function requires at least 2 arguments');
-        }
-
-        $base = array_shift($complexValues);
-        $result = clone Complex::validateComplexArgument($base);
-
-        foreach ($complexValues as $complex) {
-            $complex = Complex::validateComplexArgument($complex);
-
-            if ($result->isComplex() && $complex->isComplex() &&
-                $result->getSuffix() !== $complex->getSuffix()) {
-                throw new Exception('Suffix Mismatch');
-            }
-            if ($result->getReal() == 0.0 && $result->getImaginary() == 0.0) {
-                throw new \InvalidArgumentException('Division by zero');
-            }
-
-            $delta1 = ($complex->getReal() * $result->getReal()) +
-                ($complex->getImaginary() * $result->getImaginary());
-            $delta2 = ($complex->getImaginary() * $result->getReal()) -
-                ($complex->getReal() * $result->getImaginary());
-            $delta3 = ($result->getReal() * $result->getReal()) +
-                ($result->getImaginary() * $result->getImaginary());
-
-            $real = $delta1 / $delta3;
-            $imaginary = $delta2 / $delta3;
-
-            $result = new Complex(
-                $real,
-                $imaginary,
-                ($imaginary == 0.0) ? null : max($result->getSuffix(), $complex->getSuffix())
-            );
-        }
-
-        return $result;
-    }
-}
diff --git a/vendor/markbaker/complex/classes/src/operations/multiply.php b/vendor/markbaker/complex/classes/src/operations/multiply.php
deleted file mode 100644
index 259ad0020a..0000000000
--- a/vendor/markbaker/complex/classes/src/operations/multiply.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the complex multiplication operation
- *
- * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-namespace Complex;
-
-/**
- * Multiplies two or more complex numbers
- *
- * @param     array of string|integer|float|Complex    $complexValues   The numbers to multiply
- * @return    Complex
- */
-if (!function_exists(__NAMESPACE__ . '\\multiply')) {
-    function multiply(...$complexValues): Complex
-    {
-        if (count($complexValues) < 2) {
-            throw new \Exception('This function requires at least 2 arguments');
-        }
-
-        $base = array_shift($complexValues);
-        $result = clone Complex::validateComplexArgument($base);
-
-        foreach ($complexValues as $complex) {
-            $complex = Complex::validateComplexArgument($complex);
-
-            if ($result->isComplex() && $complex->isComplex() &&
-                $result->getSuffix() !== $complex->getSuffix()) {
-                throw new Exception('Suffix Mismatch');
-            }
-
-            $real = ($result->getReal() * $complex->getReal()) -
-                ($result->getImaginary() * $complex->getImaginary());
-            $imaginary = ($result->getReal() * $complex->getImaginary()) +
-                ($result->getImaginary() * $complex->getReal());
-
-            $result = new Complex(
-                $real,
-                $imaginary,
-                ($imaginary == 0.0) ? null : max($result->getSuffix(), $complex->getSuffix())
-            );
-        }
-
-        return $result;
-    }
-}
diff --git a/vendor/markbaker/complex/classes/src/operations/subtract.php b/vendor/markbaker/complex/classes/src/operations/subtract.php
deleted file mode 100644
index 3ca34f2839..0000000000
--- a/vendor/markbaker/complex/classes/src/operations/subtract.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the complex subtraction operation
- *
- * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-namespace Complex;
-
-/**
- * Subtracts two or more complex numbers
- *
- * @param     array of string|integer|float|Complex    $complexValues   The numbers to subtract
- * @return    Complex
- */
-if (!function_exists(__NAMESPACE__ . '\\subtract')) {
-    function subtract(...$complexValues): Complex
-    {
-        if (count($complexValues) < 2) {
-            throw new \Exception('This function requires at least 2 arguments');
-        }
-
-        $base = array_shift($complexValues);
-        $result = clone Complex::validateComplexArgument($base);
-
-        foreach ($complexValues as $complex) {
-            $complex = Complex::validateComplexArgument($complex);
-
-            if ($result->isComplex() && $complex->isComplex() &&
-                $result->getSuffix() !== $complex->getSuffix()) {
-                throw new Exception('Suffix Mismatch');
-            }
-
-            $real = $result->getReal() - $complex->getReal();
-            $imaginary = $result->getImaginary() - $complex->getImaginary();
-
-            $result = new Complex(
-                $real,
-                $imaginary,
-                ($imaginary == 0.0) ? null : max($result->getSuffix(), $complex->getSuffix())
-            );
-        }
-
-        return $result;
-    }
-}
diff --git a/vendor/markbaker/complex/composer.json b/vendor/markbaker/complex/composer.json
index 4037f1c640..246683ca4b 100644
--- a/vendor/markbaker/complex/composer.json
+++ b/vendor/markbaker/complex/composer.json
@@ -11,63 +11,26 @@
             "email": "mark@lange.demon.co.uk"
         }
     ],
+    "config": {
+        "sort-packages": true,
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true,
+            "markbaker/ukraine": true
+        }
+    },
     "require": {
         "php": "^7.2 || ^8.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.0 || ^8.0 || ^9.3",
-        "squizlabs/php_codesniffer": "^3.4",
-        "phpcompatibility/php-compatibility": "^9.0",
-        "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0"
+        "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
+        "squizlabs/php_codesniffer": "^3.7",
+        "phpcompatibility/php-compatibility": "^9.3",
+        "dealerdirect/phpcodesniffer-composer-installer": "dev-master"
     },
     "autoload": {
         "psr-4": {
             "Complex\\": "classes/src/"
-        },
-        "files": [
-            "classes/src/functions/abs.php",
-            "classes/src/functions/acos.php",
-            "classes/src/functions/acosh.php",
-            "classes/src/functions/acot.php",
-            "classes/src/functions/acoth.php",
-            "classes/src/functions/acsc.php",
-            "classes/src/functions/acsch.php",
-            "classes/src/functions/argument.php",
-            "classes/src/functions/asec.php",
-            "classes/src/functions/asech.php",
-            "classes/src/functions/asin.php",
-            "classes/src/functions/asinh.php",
-            "classes/src/functions/atan.php",
-            "classes/src/functions/atanh.php",
-            "classes/src/functions/conjugate.php",
-            "classes/src/functions/cos.php",
-            "classes/src/functions/cosh.php",
-            "classes/src/functions/cot.php",
-            "classes/src/functions/coth.php",
-            "classes/src/functions/csc.php",
-            "classes/src/functions/csch.php",
-            "classes/src/functions/exp.php",
-            "classes/src/functions/inverse.php",
-            "classes/src/functions/ln.php",
-            "classes/src/functions/log2.php",
-            "classes/src/functions/log10.php",
-            "classes/src/functions/negative.php",
-            "classes/src/functions/pow.php",
-            "classes/src/functions/rho.php",
-            "classes/src/functions/sec.php",
-            "classes/src/functions/sech.php",
-            "classes/src/functions/sin.php",
-            "classes/src/functions/sinh.php",
-            "classes/src/functions/sqrt.php",
-            "classes/src/functions/tan.php",
-            "classes/src/functions/tanh.php",
-            "classes/src/functions/theta.php",
-            "classes/src/operations/add.php",
-            "classes/src/operations/subtract.php",
-            "classes/src/operations/multiply.php",
-            "classes/src/operations/divideby.php",
-            "classes/src/operations/divideinto.php"
-        ]
+        }
     },
     "scripts": {
         "style": "phpcs --report-width=200 --standard=PSR2 --report=summary,full classes/src/ unitTests/classes/src -n",
diff --git a/vendor/markbaker/complex/examples/complexTest.php b/vendor/markbaker/complex/examples/complexTest.php
index 7dafd8a639..9a5e1238d1 100644
--- a/vendor/markbaker/complex/examples/complexTest.php
+++ b/vendor/markbaker/complex/examples/complexTest.php
@@ -2,7 +2,7 @@
 
 use Complex\Complex as Complex;
 
-include('../classes/Bootstrap.php');
+include(__DIR__ . '/../vendor/autoload.php');
 
 echo 'Create', PHP_EOL;
 
diff --git a/vendor/markbaker/complex/examples/testFunctions.php b/vendor/markbaker/complex/examples/testFunctions.php
index 4d5ed7358b..bad1c03ded 100644
--- a/vendor/markbaker/complex/examples/testFunctions.php
+++ b/vendor/markbaker/complex/examples/testFunctions.php
@@ -2,7 +2,7 @@
 
 namespace Complex;
 
-include('../classes/Bootstrap.php');
+include(__DIR__ . '/../vendor/autoload.php');
 
 echo 'Function Examples', PHP_EOL;
 
@@ -39,7 +39,7 @@
 for ($real = -3.5; $real <= 3.5; $real += 0.5) {
     for ($imaginary = -3.5; $imaginary <= 3.5; $imaginary += 0.5) {
         foreach ($functions as $function) {
-            $complexFunction = __NAMESPACE__ . '\\' . $function;
+            $complexFunction = __NAMESPACE__ . '\\Functions::' . $function;
             $complex = new Complex($real, $imaginary);
             try {
                 echo $function, '(', $complex, ') = ', $complexFunction($complex), PHP_EOL;
diff --git a/vendor/markbaker/complex/examples/testOperations.php b/vendor/markbaker/complex/examples/testOperations.php
index f791263efd..2b7e0ba4b6 100644
--- a/vendor/markbaker/complex/examples/testOperations.php
+++ b/vendor/markbaker/complex/examples/testOperations.php
@@ -1,8 +1,9 @@
 <?php
 
 use Complex\Complex as Complex;
+use Complex\Operations;
 
-include('../classes/Bootstrap.php');
+include(__DIR__ . '/../vendor/autoload.php');
 
 $values = [
     new Complex(123),
@@ -16,19 +17,19 @@
 
 echo 'Addition', PHP_EOL;
 
-$result = \Complex\add(...$values);
+$result = Operations::add(...$values);
 echo '=> ', $result, PHP_EOL;
 
 echo PHP_EOL;
 
 echo 'Subtraction', PHP_EOL;
 
-$result = \Complex\subtract(...$values);
+$result = Operations::subtract(...$values);
 echo '=> ', $result, PHP_EOL;
 
 echo PHP_EOL;
 
 echo 'Multiplication', PHP_EOL;
 
-$result = \Complex\multiply(...$values);
+$result = Operations::multiply(...$values);
 echo '=> ', $result, PHP_EOL;
diff --git a/vendor/markbaker/matrix/.github/workflows/main.yaml b/vendor/markbaker/matrix/.github/workflows/main.yaml
index 158fcdfc65..5fa1bdb2d6 100644
--- a/vendor/markbaker/matrix/.github/workflows/main.yaml
+++ b/vendor/markbaker/matrix/.github/workflows/main.yaml
@@ -12,12 +12,17 @@ jobs:
           - '7.4'
           - '8.0'
           - '8.1'
+          - '8.2'
+
+        include:
+          - php-version: 'nightly'
+            experimental: true
 
     name: PHP ${{ matrix.php-version }}
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@v2
@@ -31,20 +36,21 @@ jobs:
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: Cache composer dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
 
-      - name: Set composer flags
+      - name: Delete composer lock file
         id: composer-lock
-        if: ${{ matrix.php-version == '8.0' || matrix.php-version == '8.1' }}
+        if: ${{ matrix.php-version == '8.0' || matrix.php-version == '8.1' || matrix.php-version == '8.2' || matrix.php-version == 'nightly' }}
         run: |
+          rm composer.lock
           echo "::set-output name=flags::--ignore-platform-reqs"
 
       - name: Install dependencies
-        run: composer install --no-progress --prefer-dist --optimize-autoloader ${{ steps.composer-lock.outputs.flags }}
+        run: composer update --no-progress --prefer-dist --optimize-autoloader ${{ steps.composer-lock.outputs.flags }}
 
       - name: Setup problem matchers for PHP
         run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
@@ -59,7 +65,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@v2
@@ -74,7 +80,7 @@ jobs:
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: Cache composer dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -90,7 +96,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@v2
@@ -104,7 +110,7 @@ jobs:
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: Cache composer dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
diff --git a/vendor/markbaker/matrix/README.md b/vendor/markbaker/matrix/README.md
index f9e300288a..d0dc91452c 100644
--- a/vendor/markbaker/matrix/README.md
+++ b/vendor/markbaker/matrix/README.md
@@ -5,7 +5,11 @@ PHPMatrix
 
 PHP Class for handling Matrices
 
-[![Build Status](https://travis-ci.org/MarkBaker/PHPMatrix.png?branch=2.0)](http://travis-ci.org/MarkBaker/PHPMatrix)
+[![Build Status](https://github.com/MarkBaker/PHPMatrix/workflows/main/badge.svg)](https://github.com/MarkBaker/PHPMatrix/actions)
+[![Total Downloads](https://img.shields.io/packagist/dt/markbaker/matrix)](https://packagist.org/packages/markbaker/matrix)
+[![Latest Stable Version](https://img.shields.io/github/v/release/MarkBaker/PHPMatrix)](https://packagist.org/packages/markbaker/matrix)
+[![License](https://img.shields.io/github/license/MarkBaker/PHPMatrix)](https://packagist.org/packages/markbaker/matrix)
+
 
 [![Matrix Transform](https://imgs.xkcd.com/comics/matrix_transform.png)](https://xkcd.com/184/)
 
@@ -60,6 +64,24 @@ and classes for
 
 ---
 
+# Installation
+
+```shell
+composer require markbaker/matrix:^3.0
+```
+
+# Important BC Note
+
+If you've previously been using procedural calls to functions and operations using this library, then from version 3.0 you should use [MarkBaker/PHPMatrixFunctions](https://github.com/MarkBaker/PHPMatrixFunctions) instead (available on packagist as [markbaker/matrix-functions](https://packagist.org/packages/markbaker/matrix-functions)).
+
+You'll need to replace `markbaker/matrix`in your `composer.json` file with the new library, but otherwise there should be no difference in the namespacing, or in the way that you have called the Matrix functions in the past, so no actual code changes are required.
+
+```shell
+composer require markbaker/matrix-functions:^1.0
+```
+
+You should not reference this library (`markbaker/matrix`) in your `composer.json`, composer wil take care of that for you.
+
 # Usage
 
 To create a new Matrix object, provide an array as the constructor argument
@@ -105,7 +127,7 @@ $matrix2 = new Matrix\Matrix([
 
 var_dump($matrix1->multiply($matrix2)->toArray());
 ```
-or pass all values to the appropriate function
+or pass all values to the appropriate static method
 ```php
 $matrix1 = new Matrix\Matrix([
     [2, 7, 6],
@@ -118,7 +140,7 @@ $matrix2 = new Matrix\Matrix([
     [7, 8, 9],
 ]);
 
-var_dump(Matrix\multiply($matrix1, $matrix2)->toArray());
+var_dump(Matrix\Operations::multiply($matrix1, $matrix2)->toArray());
 ```
 You can pass in the arguments as Matrix objects, or as arrays.
 
@@ -139,7 +161,7 @@ $matrix = new Matrix\Matrix($grid);
 
 echo $matrix->trace();
 ```
-or you can call the function as you would in procedural code, passing the Matrix object as an argument 
+or you can call the static method, passing the Matrix object or array as an argument 
 ```php
 $grid = [
     [16,  3,  2, 13],
@@ -149,20 +171,8 @@ $grid = [
 ];
 
 $matrix = new Matrix\Matrix($grid);
-echo Matrix\trace($matrix);
-```
-When called procedurally using the function, you can pass in the argument as a Matrix object, or as an array.
-```php
-$grid = [
-    [16,  3,  2, 13],
-    [ 5, 10, 11,  8],
-    [ 9,  6,  7, 12],
-    [ 4, 15, 14,  1],
-];
-
-echo Matrix\trace($grid);
+echo Matrix\Functions::trace($matrix);
 ```
-As an alternative, it is also possible to call the method directly from the `Functions` class.
 ```php
 $grid = [
     [16,  3,  2, 13],
@@ -171,10 +181,8 @@ $grid = [
     [ 4, 15, 14,  1],
 ];
 
-$matrix = new Matrix\Matrix($grid);
-echo Matrix\Functions::trace($matrix);
+echo Matrix\Functions::trace($grid);
 ```
-Used this way, methods must be called statically, and the argument must be the Matrix object, and cannot be an array.
 
 ## Decomposition
 
diff --git a/vendor/markbaker/matrix/classes/src/Functions.php b/vendor/markbaker/matrix/classes/src/Functions.php
index 5dba574ef8..cdb49c6af6 100644
--- a/vendor/markbaker/matrix/classes/src/Functions.php
+++ b/vendor/markbaker/matrix/classes/src/Functions.php
@@ -4,6 +4,25 @@
 
 class Functions
 {
+    /**
+     * Validates an array of matrix, converting an array to a matrix if required.
+     *
+     * @param Matrix|array $matrix Matrix or an array to treat as a matrix.
+     * @return Matrix The new matrix
+     * @throws Exception If argument isn't a valid matrix or array.
+     */
+    private static function validateMatrix($matrix)
+    {
+        if (is_array($matrix)) {
+            $matrix = new Matrix($matrix);
+        }
+        if (!$matrix instanceof Matrix) {
+            throw new Exception('Must be Matrix or array');
+        }
+
+        return $matrix;
+    }
+
     /**
      * Calculate the adjoint of the matrix
      *
@@ -25,12 +44,14 @@ private static function getAdjoint(Matrix $matrix)
      * The adjugate has sometimes been called the "adjoint", but today the "adjoint" of a matrix normally refers
      *     to its corresponding adjoint operator, which is its conjugate transpose.
      *
-     * @param Matrix $matrix The matrix whose adjoint we wish to calculate
+     * @param Matrix|array $matrix The matrix whose adjoint we wish to calculate
      * @return Matrix
      * @throws Exception
      **/
-    public static function adjoint(Matrix $matrix)
+    public static function adjoint($matrix)
     {
+        $matrix = self::validateMatrix($matrix);
+
         if (!$matrix->isSquare()) {
             throw new Exception('Adjoint can only be calculated for a square matrix');
         }
@@ -67,13 +88,15 @@ private static function getCofactors(Matrix $matrix)
     /**
      * Return the cofactors of this matrix
      *
-     * @param Matrix $matrix The matrix whose cofactors we wish to calculate
+     * @param Matrix|array $matrix The matrix whose cofactors we wish to calculate
      * @return Matrix
      *
      * @throws Exception
      */
-    public static function cofactors(Matrix $matrix)
+    public static function cofactors($matrix)
     {
+        $matrix = self::validateMatrix($matrix);
+
         if (!$matrix->isSquare()) {
             throw new Exception('Cofactors can only be calculated for a square matrix');
         }
@@ -141,12 +164,14 @@ private static function getDeterminant(Matrix $matrix)
     /**
      * Return the determinant of this matrix
      *
-     * @param Matrix $matrix The matrix whose determinant we wish to calculate
+     * @param Matrix|array $matrix The matrix whose determinant we wish to calculate
      * @return float
      * @throws Exception
      **/
-    public static function determinant(Matrix $matrix)
+    public static function determinant($matrix)
     {
+        $matrix = self::validateMatrix($matrix);
+
         if (!$matrix->isSquare()) {
             throw new Exception('Determinant can only be calculated for a square matrix');
         }
@@ -157,12 +182,14 @@ public static function determinant(Matrix $matrix)
     /**
      * Return the diagonal of this matrix
      *
-     * @param Matrix $matrix The matrix whose diagonal we wish to calculate
+     * @param Matrix|array $matrix The matrix whose diagonal we wish to calculate
      * @return Matrix
      * @throws Exception
      **/
-    public static function diagonal(Matrix $matrix)
+    public static function diagonal($matrix)
     {
+        $matrix = self::validateMatrix($matrix);
+
         if (!$matrix->isSquare()) {
             throw new Exception('Diagonal can only be extracted from a square matrix');
         }
@@ -181,12 +208,14 @@ public static function diagonal(Matrix $matrix)
     /**
      * Return the antidiagonal of this matrix
      *
-     * @param Matrix $matrix The matrix whose antidiagonal we wish to calculate
+     * @param Matrix|array $matrix The matrix whose antidiagonal we wish to calculate
      * @return Matrix
      * @throws Exception
      **/
-    public static function antidiagonal(Matrix $matrix)
+    public static function antidiagonal($matrix)
     {
+        $matrix = self::validateMatrix($matrix);
+
         if (!$matrix->isSquare()) {
             throw new Exception('Anti-Diagonal can only be extracted from a square matrix');
         }
@@ -207,12 +236,14 @@ public static function antidiagonal(Matrix $matrix)
      * The identity matrix, or sometimes ambiguously called a unit matrix, of size n is the n × n square matrix
      *   with ones on the main diagonal and zeros elsewhere
      *
-     * @param Matrix $matrix The matrix whose identity we wish to calculate
+     * @param Matrix|array $matrix The matrix whose identity we wish to calculate
      * @return Matrix
      * @throws Exception
      **/
-    public static function identity(Matrix $matrix)
+    public static function identity($matrix)
     {
+        $matrix = self::validateMatrix($matrix);
+
         if (!$matrix->isSquare()) {
             throw new Exception('Identity can only be created for a square matrix');
         }
@@ -225,12 +256,14 @@ public static function identity(Matrix $matrix)
     /**
      * Return the inverse of this matrix
      *
-     * @param Matrix $matrix The matrix whose inverse we wish to calculate
+     * @param Matrix|array $matrix The matrix whose inverse we wish to calculate
      * @return Matrix
      * @throws Exception
      **/
-    public static function inverse(Matrix $matrix, string $type = 'inverse')
+    public static function inverse($matrix, string $type = 'inverse')
     {
+        $matrix = self::validateMatrix($matrix);
+
         if (!$matrix->isSquare()) {
             throw new Exception(ucfirst($type) . ' can only be calculated for a square matrix');
         }
@@ -281,12 +314,14 @@ protected static function getMinors(Matrix $matrix)
      *     calculating matrix cofactors, which in turn are useful for computing both the determinant and inverse of
      *     square matrices.
      *
-     * @param Matrix $matrix The matrix whose minors we wish to calculate
+     * @param Matrix|array $matrix The matrix whose minors we wish to calculate
      * @return Matrix
      * @throws Exception
      **/
-    public static function minors(Matrix $matrix)
+    public static function minors($matrix)
     {
+        $matrix = self::validateMatrix($matrix);
+
         if (!$matrix->isSquare()) {
             throw new Exception('Minors can only be calculated for a square matrix');
         }
@@ -299,12 +334,14 @@ public static function minors(Matrix $matrix)
      * The trace is defined as the sum of the elements on the main diagonal (the diagonal from the upper left to the lower right)
      *     of the matrix
      *
-     * @param Matrix $matrix The matrix whose trace we wish to calculate
+     * @param Matrix|array $matrix The matrix whose trace we wish to calculate
      * @return float
      * @throws Exception
      **/
-    public static function trace(Matrix $matrix)
+    public static function trace($matrix)
     {
+        $matrix = self::validateMatrix($matrix);
+
         if (!$matrix->isSquare()) {
             throw new Exception('Trace can only be extracted from a square matrix');
         }
@@ -321,11 +358,13 @@ public static function trace(Matrix $matrix)
     /**
      * Return the transpose of this matrix
      *
-     * @param Matrix $matrix The matrix whose transpose we wish to calculate
+     * @param Matrix|\a $matrix The matrix whose transpose we wish to calculate
      * @return Matrix
      **/
-    public static function transpose(Matrix $matrix)
+    public static function transpose($matrix)
     {
+        $matrix = self::validateMatrix($matrix);
+
         $array = array_values(array_merge([null], $matrix->toArray()));
         $grid = call_user_func_array(
             'array_map',
diff --git a/vendor/markbaker/matrix/classes/src/Functions/adjoint.php b/vendor/markbaker/matrix/classes/src/Functions/adjoint.php
deleted file mode 100644
index eef0bb7003..0000000000
--- a/vendor/markbaker/matrix/classes/src/Functions/adjoint.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the matrix adjoint() function
- *
- * @copyright  Copyright (c) 2018 Mark Baker (https://github.com/MarkBaker/PHPMatrix)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-
-namespace Matrix;
-
-/**
- * Returns the adjoint of a matrix or an array.
- *
- * @param Matrix|array $matrix Matrix or an array to treat as a matrix.
- * @return Matrix The new matrix
- * @throws Exception If argument isn't a valid matrix or array.
- */
-if (!function_exists(__NAMESPACE__ . '\\adjoint')) {
-    function adjoint($matrix): Matrix
-    {
-        if (is_array($matrix)) {
-            $matrix = new Matrix($matrix);
-        }
-        if (!$matrix instanceof Matrix) {
-            throw new Exception('Must be Matrix or array');
-        }
-
-        return Functions::adjoint($matrix);
-    }
-}
diff --git a/vendor/markbaker/matrix/classes/src/Functions/antidiagonal.php b/vendor/markbaker/matrix/classes/src/Functions/antidiagonal.php
deleted file mode 100644
index ac308ed35b..0000000000
--- a/vendor/markbaker/matrix/classes/src/Functions/antidiagonal.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the matrix antidiagonal() function
- *
- * @copyright  Copyright (c) 2018 Mark Baker (https://github.com/MarkBaker/PHPMatrix)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-namespace Matrix;
-
-/**
- * Returns the antidiagonal of a matrix or an array.
- *
- * @param     Matrix|array     $matrix    Matrix or an array to treat as a matrix.
- * @return    Matrix           The new matrix
- * @throws    Exception        If argument isn't a valid matrix or array.
- */
-if (!function_exists(__NAMESPACE__ . '\\antidiagonal')) {
-    function antidiagonal($matrix): Matrix
-    {
-        if (is_array($matrix)) {
-            $matrix = new Matrix($matrix);
-        }
-        if (!$matrix instanceof Matrix) {
-            throw new Exception('Must be Matrix or array');
-        }
-
-        return Functions::antidiagonal($matrix);
-    }
-}
diff --git a/vendor/markbaker/matrix/classes/src/Functions/cofactors.php b/vendor/markbaker/matrix/classes/src/Functions/cofactors.php
deleted file mode 100644
index 7eed4a3427..0000000000
--- a/vendor/markbaker/matrix/classes/src/Functions/cofactors.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the matrix cofactors() function
- *
- * @copyright  Copyright (c) 2018 Mark Baker (https://github.com/MarkBaker/PHPMatrix)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-
-namespace Matrix;
-
-/**
- * Returns the cofactors of a matrix or an array.
- *
- * @param Matrix|array $matrix Matrix or an array to treat as a matrix.
- * @return Matrix The new matrix
- * @throws Exception If argument isn't a valid matrix or array.
- */
-if (!function_exists(__NAMESPACE__ . '\\cofactors')) {
-    function cofactors($matrix): Matrix
-    {
-        if (is_array($matrix)) {
-            $matrix = new Matrix($matrix);
-        }
-        if (!$matrix instanceof Matrix) {
-            throw new Exception('Must be Matrix or array');
-        }
-
-        return Functions::cofactors($matrix);
-    }
-}
diff --git a/vendor/markbaker/matrix/classes/src/Functions/determinant.php b/vendor/markbaker/matrix/classes/src/Functions/determinant.php
deleted file mode 100644
index a3896ad6a0..0000000000
--- a/vendor/markbaker/matrix/classes/src/Functions/determinant.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the matrix determinant() function
- *
- * @copyright  Copyright (c) 2018 Mark Baker (https://github.com/MarkBaker/PHPMatrix)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-
-namespace Matrix;
-
-/**
- * Returns the determinant of a matrix or an array.
- *
- * @param Matrix|array $matrix Matrix or an array to treat as a matrix.
- * @return float Matrix determinant
- * @throws Exception If argument isn't a valid matrix or array.
- */
-if (!function_exists(__NAMESPACE__ . '\\determinant')) {
-    function determinant($matrix): float
-    {
-        if (is_array($matrix)) {
-            $matrix = new Matrix($matrix);
-        }
-        if (!$matrix instanceof Matrix) {
-            throw new Exception('Must be Matrix or array');
-        }
-
-        return Functions::determinant($matrix);
-    }
-}
diff --git a/vendor/markbaker/matrix/classes/src/Functions/diagonal.php b/vendor/markbaker/matrix/classes/src/Functions/diagonal.php
deleted file mode 100644
index 48f6059fef..0000000000
--- a/vendor/markbaker/matrix/classes/src/Functions/diagonal.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the matrix diagonal() function
- *
- * @copyright  Copyright (c) 2018 Mark Baker (https://github.com/MarkBaker/PHPMatrix)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-
-namespace Matrix;
-
-/**
- * Returns the diagonal of a matrix or an array.
- *
- * @param Matrix|array $matrix Matrix or an array to treat as a matrix.
- * @return Matrix The new matrix
- * @throws Exception If argument isn't a valid matrix or array.
- */
-if (!function_exists(__NAMESPACE__ . '\\diagonal')) {
-    function diagonal($matrix): Matrix
-    {
-        if (is_array($matrix)) {
-            $matrix = new Matrix($matrix);
-        }
-        if (!$matrix instanceof Matrix) {
-            throw new Exception('Must be Matrix or array');
-        }
-
-        return Functions::diagonal($matrix);
-    }
-}
diff --git a/vendor/markbaker/matrix/classes/src/Functions/identity.php b/vendor/markbaker/matrix/classes/src/Functions/identity.php
deleted file mode 100644
index 3589f3f9bc..0000000000
--- a/vendor/markbaker/matrix/classes/src/Functions/identity.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the matrix identity() function
- *
- * @copyright  Copyright (c) 2018 Mark Baker (https://github.com/MarkBaker/PHPMatrix)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-
-namespace Matrix;
-
-/**
- * Returns the identity of a matrix or an array.
- *
- * @param Matrix|array $matrix Matrix or an array to treat as a matrix.
- * @return Matrix The identity matrix
- * @throws Exception If argument isn't a valid matrix or array.
- */
-if (!function_exists(__NAMESPACE__ . '\\identity')) {
-    function identity($matrix): Matrix
-    {
-        if (is_array($matrix)) {
-            $matrix = new Matrix($matrix);
-        }
-        if (!$matrix instanceof Matrix) {
-            throw new Exception('Must be Matrix or array');
-        }
-
-        return Functions::identity($matrix);
-    }
-}
diff --git a/vendor/markbaker/matrix/classes/src/Functions/inverse.php b/vendor/markbaker/matrix/classes/src/Functions/inverse.php
deleted file mode 100644
index ada1bbf279..0000000000
--- a/vendor/markbaker/matrix/classes/src/Functions/inverse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the matrix inverse() function
- *
- * @copyright  Copyright (c) 2018 Mark Baker (https://github.com/MarkBaker/PHPMatrix)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-
-namespace Matrix;
-
-/**
- * Returns the inverse of a matrix or an array.
- *
- * @param Matrix|array $matrix Matrix or an array to treat as a matrix.
- * @return Matrix The new matrix
- * @throws Exception If argument isn't a valid matrix or array.
- */
-if (!function_exists(__NAMESPACE__ . '\\inverse')) {
-    function inverse($matrix): Matrix
-    {
-        if (is_array($matrix)) {
-            $matrix = new Matrix($matrix);
-        }
-        if (!$matrix instanceof Matrix) {
-            throw new Exception('Must be Matrix or array');
-        }
-
-        return Functions::inverse($matrix);
-    }
-}
diff --git a/vendor/markbaker/matrix/classes/src/Functions/minors.php b/vendor/markbaker/matrix/classes/src/Functions/minors.php
deleted file mode 100644
index 21a53e7df5..0000000000
--- a/vendor/markbaker/matrix/classes/src/Functions/minors.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the matrix minors() function
- *
- * @copyright  Copyright (c) 2018 Mark Baker (https://github.com/MarkBaker/PHPMatrix)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-
-namespace Matrix;
-
-/**
- * Returns the minors of a matrix or an array.
- *
- * @param Matrix|array $matrix Matrix or an array to treat as a matrix.
- * @return Matrix The new matrix
- * @throws Exception If argument isn't a valid matrix or array.
- */
-if (!function_exists(__NAMESPACE__ . '\\minors')) {
-    function minors($matrix): Matrix
-    {
-        if (is_array($matrix)) {
-            $matrix = new Matrix($matrix);
-        }
-        if (!$matrix instanceof Matrix) {
-            throw new Exception('Must be Matrix or array');
-        }
-
-        return Functions::minors($matrix);
-    }
-}
diff --git a/vendor/markbaker/matrix/classes/src/Functions/trace.php b/vendor/markbaker/matrix/classes/src/Functions/trace.php
deleted file mode 100644
index 6720174072..0000000000
--- a/vendor/markbaker/matrix/classes/src/Functions/trace.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the matrix trace() function
- *
- * @copyright  Copyright (c) 2018 Mark Baker (https://github.com/MarkBaker/PHPMatrix)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-
-namespace Matrix;
-
-/**
- * Returns the trace of a matrix or an array.
- *
- * @param Matrix|array $matrix Matrix or an array to treat as a matrix.
- * @return float The trace of the matrix
- * @throws Exception If argument isn't a valid matrix or array.
- */
-if (!function_exists(__NAMESPACE__ . '\\trace')) {
-    function trace($matrix): float
-    {
-        if (is_array($matrix)) {
-            $matrix = new Matrix($matrix);
-        }
-        if (!$matrix instanceof Matrix) {
-            throw new Exception('Must be Matrix or array');
-        }
-
-        return Functions::trace($matrix);
-    }
-}
diff --git a/vendor/markbaker/matrix/classes/src/Functions/transpose.php b/vendor/markbaker/matrix/classes/src/Functions/transpose.php
deleted file mode 100644
index e020a5bf80..0000000000
--- a/vendor/markbaker/matrix/classes/src/Functions/transpose.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the matrix transpose() function
- *
- * @copyright  Copyright (c) 2018 Mark Baker (https://github.com/MarkBaker/PHPMatrix)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-
-namespace Matrix;
-
-/**
- * Returns the transpose of a matrix or an array.
- *
- * @param Matrix|array $matrix Matrix or an array to treat as a matrix.
- * @return Matrix The transposed matrix
- * @throws Exception If argument isn't a valid matrix or array.
- */
-if (!function_exists(__NAMESPACE__ . '\\transpose')) {
-    function transpose($matrix): Matrix
-    {
-        if (is_array($matrix)) {
-            $matrix = new Matrix($matrix);
-        }
-        if (!$matrix instanceof Matrix) {
-            throw new Exception('Must be Matrix or array');
-        }
-
-        return Functions::transpose($matrix);
-    }
-}
diff --git a/vendor/markbaker/matrix/classes/src/Matrix.php b/vendor/markbaker/matrix/classes/src/Matrix.php
index 2435e761c6..95f55e75a3 100644
--- a/vendor/markbaker/matrix/classes/src/Matrix.php
+++ b/vendor/markbaker/matrix/classes/src/Matrix.php
@@ -28,7 +28,6 @@
  * @method Matrix diagonal()
  * @method Matrix identity()
  * @method Matrix inverse()
- * @method Matrix pseudoInverse()
  * @method Matrix minors()
  * @method float trace()
  * @method Matrix transpose()
@@ -411,12 +410,13 @@ public function __call(string $functionName, $arguments)
     {
         $functionName = strtolower(str_replace('_', '', $functionName));
 
-        if (in_array($functionName, self::$functions, true) || in_array($functionName, self::$operations, true)) {
-            $functionName = "\\" . __NAMESPACE__ . "\\{$functionName}";
-            if (is_callable($functionName)) {
-                $arguments = array_values(array_merge([$this], $arguments));
-                return call_user_func_array($functionName, $arguments);
-            }
+        // Test for function calls
+        if (in_array($functionName, self::$functions, true)) {
+            return Functions::$functionName($this, ...$arguments);
+        }
+        // Test for operation calls
+        if (in_array($functionName, self::$operations, true)) {
+            return Operations::$functionName($this, ...$arguments);
         }
         throw new Exception('Function or Operation does not exist');
     }
diff --git a/vendor/markbaker/matrix/classes/src/Operations.php b/vendor/markbaker/matrix/classes/src/Operations.php
new file mode 100644
index 0000000000..e3d88d6418
--- /dev/null
+++ b/vendor/markbaker/matrix/classes/src/Operations.php
@@ -0,0 +1,157 @@
+<?php
+
+namespace Matrix;
+
+use Matrix\Operators\Addition;
+use Matrix\Operators\DirectSum;
+use Matrix\Operators\Division;
+use Matrix\Operators\Multiplication;
+use Matrix\Operators\Subtraction;
+
+class Operations
+{
+    public static function add(...$matrixValues): Matrix
+    {
+        if (count($matrixValues) < 2) {
+            throw new Exception('Addition operation requires at least 2 arguments');
+        }
+
+        $matrix = array_shift($matrixValues);
+
+        if (is_array($matrix)) {
+            $matrix = new Matrix($matrix);
+        }
+        if (!$matrix instanceof Matrix) {
+            throw new Exception('Addition arguments must be Matrix or array');
+        }
+
+        $result = new Addition($matrix);
+
+        foreach ($matrixValues as $matrix) {
+            $result->execute($matrix);
+        }
+
+        return $result->result();
+    }
+
+    public static function directsum(...$matrixValues): Matrix
+    {
+        if (count($matrixValues) < 2) {
+            throw new Exception('DirectSum operation requires at least 2 arguments');
+        }
+
+        $matrix = array_shift($matrixValues);
+
+        if (is_array($matrix)) {
+            $matrix = new Matrix($matrix);
+        }
+        if (!$matrix instanceof Matrix) {
+            throw new Exception('DirectSum arguments must be Matrix or array');
+        }
+
+        $result = new DirectSum($matrix);
+
+        foreach ($matrixValues as $matrix) {
+            $result->execute($matrix);
+        }
+
+        return $result->result();
+    }
+
+    public static function divideby(...$matrixValues): Matrix
+    {
+        if (count($matrixValues) < 2) {
+            throw new Exception('Division operation requires at least 2 arguments');
+        }
+
+        $matrix = array_shift($matrixValues);
+
+        if (is_array($matrix)) {
+            $matrix = new Matrix($matrix);
+        }
+        if (!$matrix instanceof Matrix) {
+            throw new Exception('Division arguments must be Matrix or array');
+        }
+
+        $result = new Division($matrix);
+
+        foreach ($matrixValues as $matrix) {
+            $result->execute($matrix);
+        }
+
+        return $result->result();
+    }
+
+    public static function divideinto(...$matrixValues): Matrix
+    {
+        if (count($matrixValues) < 2) {
+            throw new Exception('Division operation requires at least 2 arguments');
+        }
+
+        $matrix = array_pop($matrixValues);
+        $matrixValues = array_reverse($matrixValues);
+
+        if (is_array($matrix)) {
+            $matrix = new Matrix($matrix);
+        }
+        if (!$matrix instanceof Matrix) {
+            throw new Exception('Division arguments must be Matrix or array');
+        }
+
+        $result = new Division($matrix);
+
+        foreach ($matrixValues as $matrix) {
+            $result->execute($matrix);
+        }
+
+        return $result->result();
+    }
+
+    public static function multiply(...$matrixValues): Matrix
+    {
+        if (count($matrixValues) < 2) {
+            throw new Exception('Multiplication operation requires at least 2 arguments');
+        }
+
+        $matrix = array_shift($matrixValues);
+
+        if (is_array($matrix)) {
+            $matrix = new Matrix($matrix);
+        }
+        if (!$matrix instanceof Matrix) {
+            throw new Exception('Multiplication arguments must be Matrix or array');
+        }
+
+        $result = new Multiplication($matrix);
+
+        foreach ($matrixValues as $matrix) {
+            $result->execute($matrix);
+        }
+
+        return $result->result();
+    }
+
+    public static function subtract(...$matrixValues): Matrix
+    {
+        if (count($matrixValues) < 2) {
+            throw new Exception('Subtraction operation requires at least 2 arguments');
+        }
+
+        $matrix = array_shift($matrixValues);
+
+        if (is_array($matrix)) {
+            $matrix = new Matrix($matrix);
+        }
+        if (!$matrix instanceof Matrix) {
+            throw new Exception('Subtraction arguments must be Matrix or array');
+        }
+
+        $result = new Subtraction($matrix);
+
+        foreach ($matrixValues as $matrix) {
+            $result->execute($matrix);
+        }
+
+        return $result->result();
+    }
+}
diff --git a/vendor/markbaker/matrix/classes/src/Operations/add.php b/vendor/markbaker/matrix/classes/src/Operations/add.php
deleted file mode 100644
index 28bcac1896..0000000000
--- a/vendor/markbaker/matrix/classes/src/Operations/add.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the matrix addition operation
- *
- * @copyright  Copyright (c) 2018 Mark Baker (https://github.com/MarkBaker/PHPMatrix)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-
-namespace Matrix;
-
-use Matrix\Operators\Addition;
-
-/**
- * Adds two or more matrices
- *
- * @param array<int, mixed> $matrixValues The matrices to add
- * @return Matrix
- * @throws Exception
- */
-if (!function_exists(__NAMESPACE__ . '\\add')) {
-    function add(...$matrixValues): Matrix
-    {
-        if (count($matrixValues) < 2) {
-            throw new Exception('Addition operation requires at least 2 arguments');
-        }
-
-        $matrix = array_shift($matrixValues);
-
-        if (is_array($matrix)) {
-            $matrix = new Matrix($matrix);
-        }
-        if (!$matrix instanceof Matrix) {
-            throw new Exception('Addition arguments must be Matrix or array');
-        }
-
-        $result = new Addition($matrix);
-
-        foreach ($matrixValues as $matrix) {
-            $result->execute($matrix);
-        }
-
-        return $result->result();
-    }
-}
diff --git a/vendor/markbaker/matrix/classes/src/Operations/directsum.php b/vendor/markbaker/matrix/classes/src/Operations/directsum.php
deleted file mode 100644
index dc2d3da6ca..0000000000
--- a/vendor/markbaker/matrix/classes/src/Operations/directsum.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the matrix direct sum operation
- *
- * @copyright  Copyright (c) 2018 Mark Baker (https://github.com/MarkBaker/PHPMatrix)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-
-namespace Matrix;
-
-use Matrix\Operators\DirectSum;
-
-/**
- * Adds two or more matrices
- *
- * @param array<int, mixed> $matrixValues The matrices to add
- * @return Matrix
- * @throws Exception
- */
-if (!function_exists(__NAMESPACE__ . '\\directsum')) {
-    function directsum(...$matrixValues): Matrix
-    {
-        if (count($matrixValues) < 2) {
-            throw new Exception('DirectSum operation requires at least 2 arguments');
-        }
-
-        $matrix = array_shift($matrixValues);
-
-        if (is_array($matrix)) {
-            $matrix = new Matrix($matrix);
-        }
-        if (!$matrix instanceof Matrix) {
-            throw new Exception('DirectSum arguments must be Matrix or array');
-        }
-
-        $result = new DirectSum($matrix);
-
-        foreach ($matrixValues as $matrix) {
-            $result->execute($matrix);
-        }
-
-        return $result->result();
-    }
-}
diff --git a/vendor/markbaker/matrix/classes/src/Operations/divideby.php b/vendor/markbaker/matrix/classes/src/Operations/divideby.php
deleted file mode 100644
index f74b14ebf2..0000000000
--- a/vendor/markbaker/matrix/classes/src/Operations/divideby.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the matrix division operation
- *
- * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPComplex)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-
-namespace Matrix;
-
-use Matrix\Operators\Division;
-
-/**
- * Divides two or more matrix numbers
- *
- * @param array<int, mixed> $matrixValues The matrices to divide
- * @return Matrix
- * @throws Exception
- */
-if (!function_exists(__NAMESPACE__ . '\\divideby')) {
-    function divideby(...$matrixValues): Matrix
-    {
-        if (count($matrixValues) < 2) {
-            throw new Exception('Division operation requires at least 2 arguments');
-        }
-
-        $matrix = array_shift($matrixValues);
-
-        if (is_array($matrix)) {
-            $matrix = new Matrix($matrix);
-        }
-        if (!$matrix instanceof Matrix) {
-            throw new Exception('Division arguments must be Matrix or array');
-        }
-
-        $result = new Division($matrix);
-
-        foreach ($matrixValues as $matrix) {
-            $result->execute($matrix);
-        }
-
-        return $result->result();
-    }
-}
diff --git a/vendor/markbaker/matrix/classes/src/Operations/divideinto.php b/vendor/markbaker/matrix/classes/src/Operations/divideinto.php
deleted file mode 100644
index 8ffef561a0..0000000000
--- a/vendor/markbaker/matrix/classes/src/Operations/divideinto.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the matrix division operation
- *
- * @copyright  Copyright (c) 2013-2018 Mark Baker (https://github.com/MarkBaker/PHPMatrix)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-
-namespace Matrix;
-
-use Matrix\Operators\Division;
-
-/**
- * Divides two or more matrix numbers
- *
- * @param array<int, mixed> $matrixValues The numbers to divide
- * @return Matrix
- * @throws Exception
- */
-if (!function_exists(__NAMESPACE__ . '\\divideinto')) {
-    function divideinto(...$matrixValues): Matrix
-    {
-        if (count($matrixValues) < 2) {
-            throw new Exception('Division operation requires at least 2 arguments');
-        }
-
-        $matrix = array_pop($matrixValues);
-        $matrixValues = array_reverse($matrixValues);
-
-        if (is_array($matrix)) {
-            $matrix = new Matrix($matrix);
-        }
-        if (!$matrix instanceof Matrix) {
-            throw new Exception('Division arguments must be Matrix or array');
-        }
-
-        $result = new Division($matrix);
-
-        foreach ($matrixValues as $matrix) {
-            $result->execute($matrix);
-        }
-
-        return $result->result();
-    }
-}
diff --git a/vendor/markbaker/matrix/classes/src/Operations/multiply.php b/vendor/markbaker/matrix/classes/src/Operations/multiply.php
deleted file mode 100644
index 7afc5a076c..0000000000
--- a/vendor/markbaker/matrix/classes/src/Operations/multiply.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the matrix multiplication operation
- *
- * @copyright  Copyright (c) 2018 Mark Baker (https://github.com/MarkBaker/PHPMatrix)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-
-namespace Matrix;
-
-use Matrix\Operators\Multiplication;
-
-/**
- * Multiplies two or more matrices
- *
- * @param array<int, mixed> $matrixValues The matrices to multiply
- * @return Matrix
- * @throws Exception
- */
-if (!function_exists(__NAMESPACE__ . '\\multiply')) {
-    function multiply(...$matrixValues): Matrix
-    {
-        if (count($matrixValues) < 2) {
-            throw new Exception('Multiplication operation requires at least 2 arguments');
-        }
-
-        $matrix = array_shift($matrixValues);
-
-        if (is_array($matrix)) {
-            $matrix = new Matrix($matrix);
-        }
-        if (!$matrix instanceof Matrix) {
-            throw new Exception('Multiplication arguments must be Matrix or array');
-        }
-
-        $result = new Multiplication($matrix);
-
-        foreach ($matrixValues as $matrix) {
-            $result->execute($matrix);
-        }
-
-        return $result->result();
-    }
-}
diff --git a/vendor/markbaker/matrix/classes/src/Operations/subtract.php b/vendor/markbaker/matrix/classes/src/Operations/subtract.php
deleted file mode 100644
index 95c4e828ed..0000000000
--- a/vendor/markbaker/matrix/classes/src/Operations/subtract.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- *
- * Function code for the matrix subtraction operation
- *
- * @copyright  Copyright (c) 2018 Mark Baker (https://github.com/MarkBaker/PHPMatrix)
- * @license    https://opensource.org/licenses/MIT    MIT
- */
-
-namespace Matrix;
-
-use Matrix\Operators\Subtraction;
-
-/**
- * Subtracts two or more matrices
- *
- * @param array<int, mixed> $matrixValues The matrices to subtract
- * @return Matrix
- * @throws Exception
- */
-if (!function_exists(__NAMESPACE__ . '\\subtract')) {
-    function subtract(...$matrixValues): Matrix
-    {
-        if (count($matrixValues) < 2) {
-            throw new Exception('Subtraction operation requires at least 2 arguments');
-        }
-
-        $matrix = array_shift($matrixValues);
-
-        if (is_array($matrix)) {
-            $matrix = new Matrix($matrix);
-        }
-        if (!$matrix instanceof Matrix) {
-            throw new Exception('Subtraction arguments must be Matrix or array');
-        }
-
-        $result = new Subtraction($matrix);
-
-        foreach ($matrixValues as $matrix) {
-            $result->execute($matrix);
-        }
-
-        return $result->result();
-    }
-}
diff --git a/vendor/markbaker/matrix/composer.json b/vendor/markbaker/matrix/composer.json
index b3711afd1a..e86a1e0556 100644
--- a/vendor/markbaker/matrix/composer.json
+++ b/vendor/markbaker/matrix/composer.json
@@ -15,60 +15,24 @@
         "php": "^7.1 || ^8.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.0 || ^8.0 || ^9.3",
+        "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
         "phpdocumentor/phpdocumentor": "2.*",
         "phpmd/phpmd": "2.*",
         "sebastian/phpcpd": "^4.0",
         "phploc/phploc": "^4.0",
-        "squizlabs/php_codesniffer": "^3.4",
-        "phpcompatibility/php-compatibility": "^9.0",
-        "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0"
+        "squizlabs/php_codesniffer": "^3.7",
+        "phpcompatibility/php-compatibility": "^9.3",
+        "dealerdirect/phpcodesniffer-composer-installer": "dev-master"
     },
     "autoload": {
         "psr-4": {
             "Matrix\\": "classes/src/"
-        },
-        "files": [
-            "classes/src/Functions/adjoint.php",
-            "classes/src/Functions/antidiagonal.php",
-            "classes/src/Functions/cofactors.php",
-            "classes/src/Functions/determinant.php",
-            "classes/src/Functions/diagonal.php",
-            "classes/src/Functions/identity.php",
-            "classes/src/Functions/inverse.php",
-            "classes/src/Functions/minors.php",
-            "classes/src/Functions/trace.php",
-            "classes/src/Functions/transpose.php",
-            "classes/src/Operations/add.php",
-            "classes/src/Operations/directsum.php",
-            "classes/src/Operations/subtract.php",
-            "classes/src/Operations/multiply.php",
-            "classes/src/Operations/divideby.php",
-            "classes/src/Operations/divideinto.php"
-        ]
+        }
     },
     "autoload-dev": {
         "psr-4": {
             "MatrixTest\\": "unitTests/classes/src/"
-        },
-        "files": [
-            "classes/src/Functions/adjoint.php",
-            "classes/src/Functions/antidiagonal.php",
-            "classes/src/Functions/cofactors.php",
-            "classes/src/Functions/determinant.php",
-            "classes/src/Functions/diagonal.php",
-            "classes/src/Functions/identity.php",
-            "classes/src/Functions/inverse.php",
-            "classes/src/Functions/minors.php",
-            "classes/src/Functions/trace.php",
-            "classes/src/Functions/transpose.php",
-            "classes/src/Operations/add.php",
-            "classes/src/Operations/directsum.php",
-            "classes/src/Operations/subtract.php",
-            "classes/src/Operations/multiply.php",
-            "classes/src/Operations/divideby.php",
-            "classes/src/Operations/divideinto.php"
-        ]
+        }
     },
     "scripts": {
         "style": "phpcs --report-width=200 --standard=PSR2 --report=summary,full classes/src/ unitTests/classes/src -n",
@@ -79,5 +43,10 @@
         "versions": "phpcs --report-width=200 --standard=PHPCompatibility --report=summary,full classes/src/ --runtime-set testVersion 7.2- -n",
         "coverage": "phpunit -c phpunit.xml.dist --coverage-text --coverage-html ./build/coverage"
     },
-    "minimum-stability": "dev"
-}
\ No newline at end of file
+    "minimum-stability": "dev",
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
+    }
+}
diff --git a/vendor/markbaker/matrix/examples/test.php b/vendor/markbaker/matrix/examples/test.php
index 2edc737d36..071dae910c 100644
--- a/vendor/markbaker/matrix/examples/test.php
+++ b/vendor/markbaker/matrix/examples/test.php
@@ -6,13 +6,13 @@
 include __DIR__ . '/../vendor/autoload.php';
 
 $grid = [
-    [1, 2],
-    [3, 4],
+    [0, 1],
+    [-1, 0],
 ];
 
 $targetGrid = [
     [-1],
-    [-2],
+    [2],
 ];
 
 $matrix = new Matrix($grid);
diff --git a/vendor/myclabs/php-enum/LICENSE b/vendor/myclabs/php-enum/LICENSE
deleted file mode 100644
index 2a8cf22ec6..0000000000
--- a/vendor/myclabs/php-enum/LICENSE
+++ /dev/null
@@ -1,18 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 My C-Labs
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
-associated documentation files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial
-portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
-NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/vendor/myclabs/php-enum/README.md b/vendor/myclabs/php-enum/README.md
deleted file mode 100644
index 1e4d1ff422..0000000000
--- a/vendor/myclabs/php-enum/README.md
+++ /dev/null
@@ -1,138 +0,0 @@
-# PHP Enum implementation inspired from SplEnum
-
-[![Build Status](https://travis-ci.org/myclabs/php-enum.png?branch=master)](https://travis-ci.org/myclabs/php-enum)
-[![Latest Stable Version](https://poser.pugx.org/myclabs/php-enum/version.png)](https://packagist.org/packages/myclabs/php-enum)
-[![Total Downloads](https://poser.pugx.org/myclabs/php-enum/downloads.png)](https://packagist.org/packages/myclabs/php-enum)
-[![psalm](https://shepherd.dev/github/myclabs/php-enum/coverage.svg)](https://shepherd.dev/github/myclabs/php-enum)
-
-Maintenance for this project is [supported via Tidelift](https://tidelift.com/subscription/pkg/packagist-myclabs-php-enum?utm_source=packagist-myclabs-php-enum&utm_medium=referral&utm_campaign=readme).
-
-## Why?
-
-First, and mainly, `SplEnum` is not integrated to PHP, you have to install the extension separately.
-
-Using an enum instead of class constants provides the following advantages:
-
-- You can use an enum as a parameter type: `function setAction(Action $action) {`
-- You can use an enum as a return type: `function getAction() : Action {`
-- You can enrich the enum with methods (e.g. `format`, `parse`, …)
-- You can extend the enum to add new values (make your enum `final` to prevent it)
-- You can get a list of all the possible values (see below)
-
-This Enum class is not intended to replace class constants, but only to be used when it makes sense.
-
-## Installation
-
-```
-composer require myclabs/php-enum
-```
-
-## Declaration
-
-```php
-use MyCLabs\Enum\Enum;
-
-/**
- * Action enum
- */
-final class Action extends Enum
-{
-    private const VIEW = 'view';
-    private const EDIT = 'edit';
-}
-```
-
-## Usage
-
-```php
-$action = Action::VIEW();
-
-// or with a dynamic key:
-$action = Action::$key();
-// or with a dynamic value:
-$action = Action::from($value);
-// or
-$action = new Action($value);
-```
-
-As you can see, static methods are automatically implemented to provide quick access to an enum value.
-
-One advantage over using class constants is to be able to use an enum as a parameter type:
-
-```php
-function setAction(Action $action) {
-    // ...
-}
-```
-
-## Documentation
-
-- `__construct()` The constructor checks that the value exist in the enum
-- `__toString()` You can `echo $myValue`, it will display the enum value (value of the constant)
-- `getValue()` Returns the current value of the enum
-- `getKey()` Returns the key of the current value on Enum
-- `equals()` Tests whether enum instances are equal (returns `true` if enum values are equal, `false` otherwise)
-
-Static methods:
-
-- `from()` Creates an Enum instance, checking that the value exist in the enum
-- `toArray()` method Returns all possible values as an array (constant name in key, constant value in value)
-- `keys()` Returns the names (keys) of all constants in the Enum class
-- `values()` Returns instances of the Enum class of all Enum constants (constant name in key, Enum instance in value)
-- `isValid()` Check if tested value is valid on enum set
-- `isValidKey()` Check if tested key is valid on enum set
-- `assertValidValue()` Assert the value is valid on enum set, throwing exception otherwise
-- `search()` Return key for searched value
-
-### Static methods
-
-```php
-final class Action extends Enum
-{
-    private const VIEW = 'view';
-    private const EDIT = 'edit';
-}
-
-// Static method:
-$action = Action::VIEW();
-$action = Action::EDIT();
-```
-
-Static method helpers are implemented using [`__callStatic()`](http://www.php.net/manual/en/language.oop5.overloading.php#object.callstatic).
-
-If you care about IDE autocompletion, you can either implement the static methods yourself:
-
-```php
-final class Action extends Enum
-{
-    private const VIEW = 'view';
-
-    /**
-     * @return Action
-     */
-    public static function VIEW() {
-        return new Action(self::VIEW);
-    }
-}
-```
-
-or you can use phpdoc (this is supported in PhpStorm for example):
-
-```php
-/**
- * @method static Action VIEW()
- * @method static Action EDIT()
- */
-final class Action extends Enum
-{
-    private const VIEW = 'view';
-    private const EDIT = 'edit';
-}
-```
-
-## Related projects
-
-- [Doctrine enum mapping](https://github.com/acelaya/doctrine-enum-type)
-- [Symfony ParamConverter integration](https://github.com/Ex3v/MyCLabsEnumParamConverter)
-- [PHPStan integration](https://github.com/timeweb/phpstan-enum)
-- [Yii2 enum mapping](https://github.com/KartaviK/yii2-enum)
diff --git a/vendor/myclabs/php-enum/SECURITY.md b/vendor/myclabs/php-enum/SECURITY.md
deleted file mode 100644
index 84fd4e3202..0000000000
--- a/vendor/myclabs/php-enum/SECURITY.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-Only the latest stable release is supported.
-
-## Reporting a Vulnerability
-
-To report a security vulnerability, please use the [Tidelift security contact](https://tidelift.com/security).
-
-Tidelift will coordinate the fix and disclosure.
diff --git a/vendor/myclabs/php-enum/composer.json b/vendor/myclabs/php-enum/composer.json
deleted file mode 100644
index 924f924bba..0000000000
--- a/vendor/myclabs/php-enum/composer.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "name": "myclabs/php-enum",
-    "type": "library",
-    "description": "PHP Enum implementation",
-    "keywords": ["enum"],
-    "homepage": "http://github.com/myclabs/php-enum",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "PHP Enum contributors",
-            "homepage": "https://github.com/myclabs/php-enum/graphs/contributors"
-        }
-    ],
-    "autoload": {
-        "psr-4": {
-            "MyCLabs\\Enum\\": "src/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "MyCLabs\\Tests\\Enum\\": "tests/"
-        }
-    },
-    "require": {
-        "php": "^7.3 || ^8.0",
-        "ext-json": "*"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "^9.5",
-        "squizlabs/php_codesniffer": "1.*",
-        "vimeo/psalm": "^4.6.2"
-    }
-}
diff --git a/vendor/myclabs/php-enum/psalm.xml b/vendor/myclabs/php-enum/psalm.xml
deleted file mode 100644
index ff06b66ed8..0000000000
--- a/vendor/myclabs/php-enum/psalm.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<psalm
-    totallyTyped="true"
-    resolveFromConfigFile="true"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns="https://getpsalm.org/schema/config"
-    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
->
-    <projectFiles>
-        <directory name="src" />
-        <directory name="static-analysis" />
-        <ignoreFiles>
-            <directory name="vendor" />
-            <directory name="src/PHPUnit" />
-        </ignoreFiles>
-    </projectFiles>
-
-    <issueHandlers>
-        <MixedAssignment errorLevel="info" />
-
-        <ImpureStaticProperty>
-            <!-- self::$... usages in Enum are used to populate an internal cache, and cause no side-effects -->
-            <errorLevel type="suppress">
-                <file name="src/Enum.php"/>
-            </errorLevel>
-        </ImpureStaticProperty>
-
-        <ImpureVariable>
-            <!-- $this usages in Enum point themselves to an immutable instance -->
-            <errorLevel type="suppress">
-                <file name="src/Enum.php"/>
-            </errorLevel>
-        </ImpureVariable>
-    </issueHandlers>
-</psalm>
diff --git a/vendor/myclabs/php-enum/src/Enum.php b/vendor/myclabs/php-enum/src/Enum.php
deleted file mode 100644
index 89064eba74..0000000000
--- a/vendor/myclabs/php-enum/src/Enum.php
+++ /dev/null
@@ -1,318 +0,0 @@
-<?php
-/**
- * @link    http://github.com/myclabs/php-enum
- * @license http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE file)
- */
-
-namespace MyCLabs\Enum;
-
-/**
- * Base Enum class
- *
- * Create an enum by implementing this class and adding class constants.
- *
- * @author Matthieu Napoli <matthieu@mnapoli.fr>
- * @author Daniel Costa <danielcosta@gmail.com>
- * @author Mirosław Filip <mirfilip@gmail.com>
- *
- * @psalm-template T
- * @psalm-immutable
- * @psalm-consistent-constructor
- */
-abstract class Enum implements \JsonSerializable
-{
-    /**
-     * Enum value
-     *
-     * @var mixed
-     * @psalm-var T
-     */
-    protected $value;
-
-    /**
-     * Enum key, the constant name
-     *
-     * @var string
-     */
-    private $key;
-
-    /**
-     * Store existing constants in a static cache per object.
-     *
-     *
-     * @var array
-     * @psalm-var array<class-string, array<string, mixed>>
-     */
-    protected static $cache = [];
-
-    /**
-     * Cache of instances of the Enum class
-     *
-     * @var array
-     * @psalm-var array<class-string, array<string, static>>
-     */
-    protected static $instances = [];
-
-    /**
-     * Creates a new value of some type
-     *
-     * @psalm-pure
-     * @param mixed $value
-     *
-     * @psalm-param T $value
-     * @throws \UnexpectedValueException if incompatible type is given.
-     */
-    public function __construct($value)
-    {
-        if ($value instanceof static) {
-           /** @psalm-var T */
-            $value = $value->getValue();
-        }
-
-        /** @psalm-suppress ImplicitToStringCast assertValidValueReturningKey returns always a string but psalm has currently an issue here */
-        $this->key = static::assertValidValueReturningKey($value);
-
-        /** @psalm-var T */
-        $this->value = $value;
-    }
-
-    /**
-     * This method exists only for the compatibility reason when deserializing a previously serialized version
-     * that didn't had the key property
-     */
-    public function __wakeup()
-    {
-        /** @psalm-suppress DocblockTypeContradiction key can be null when deserializing an enum without the key */
-        if ($this->key === null) {
-            /**
-             * @psalm-suppress InaccessibleProperty key is not readonly as marked by psalm
-             * @psalm-suppress PossiblyFalsePropertyAssignmentValue deserializing a case that was removed
-             */
-            $this->key = static::search($this->value);
-        }
-    }
-
-    /**
-     * @param mixed $value
-     * @return static
-     */
-    public static function from($value): self
-    {
-        $key = static::assertValidValueReturningKey($value);
-
-        return self::__callStatic($key, []);
-    }
-
-    /**
-     * @psalm-pure
-     * @return mixed
-     * @psalm-return T
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * Returns the enum key (i.e. the constant name).
-     *
-     * @psalm-pure
-     * @return string
-     */
-    public function getKey()
-    {
-        return $this->key;
-    }
-
-    /**
-     * @psalm-pure
-     * @psalm-suppress InvalidCast
-     * @return string
-     */
-    public function __toString()
-    {
-        return (string)$this->value;
-    }
-
-    /**
-     * Determines if Enum should be considered equal with the variable passed as a parameter.
-     * Returns false if an argument is an object of different class or not an object.
-     *
-     * This method is final, for more information read https://github.com/myclabs/php-enum/issues/4
-     *
-     * @psalm-pure
-     * @psalm-param mixed $variable
-     * @return bool
-     */
-    final public function equals($variable = null): bool
-    {
-        return $variable instanceof self
-            && $this->getValue() === $variable->getValue()
-            && static::class === \get_class($variable);
-    }
-
-    /**
-     * Returns the names (keys) of all constants in the Enum class
-     *
-     * @psalm-pure
-     * @psalm-return list<string>
-     * @return array
-     */
-    public static function keys()
-    {
-        return \array_keys(static::toArray());
-    }
-
-    /**
-     * Returns instances of the Enum class of all Enum constants
-     *
-     * @psalm-pure
-     * @psalm-return array<string, static>
-     * @return static[] Constant name in key, Enum instance in value
-     */
-    public static function values()
-    {
-        $values = array();
-
-        /** @psalm-var T $value */
-        foreach (static::toArray() as $key => $value) {
-            $values[$key] = new static($value);
-        }
-
-        return $values;
-    }
-
-    /**
-     * Returns all possible values as an array
-     *
-     * @psalm-pure
-     * @psalm-suppress ImpureStaticProperty
-     *
-     * @psalm-return array<string, mixed>
-     * @return array Constant name in key, constant value in value
-     */
-    public static function toArray()
-    {
-        $class = static::class;
-
-        if (!isset(static::$cache[$class])) {
-            /** @psalm-suppress ImpureMethodCall this reflection API usage has no side-effects here */
-            $reflection            = new \ReflectionClass($class);
-            /** @psalm-suppress ImpureMethodCall this reflection API usage has no side-effects here */
-            static::$cache[$class] = $reflection->getConstants();
-        }
-
-        return static::$cache[$class];
-    }
-
-    /**
-     * Check if is valid enum value
-     *
-     * @param $value
-     * @psalm-param mixed $value
-     * @psalm-pure
-     * @psalm-assert-if-true T $value
-     * @return bool
-     */
-    public static function isValid($value)
-    {
-        return \in_array($value, static::toArray(), true);
-    }
-
-    /**
-     * Asserts valid enum value
-     *
-     * @psalm-pure
-     * @psalm-assert T $value
-     * @param mixed $value
-     */
-    public static function assertValidValue($value): void
-    {
-        self::assertValidValueReturningKey($value);
-    }
-
-    /**
-     * Asserts valid enum value
-     *
-     * @psalm-pure
-     * @psalm-assert T $value
-     * @param mixed $value
-     * @return string
-     */
-    private static function assertValidValueReturningKey($value): string
-    {
-        if (false === ($key = static::search($value))) {
-            throw new \UnexpectedValueException("Value '$value' is not part of the enum " . static::class);
-        }
-
-        return $key;
-    }
-
-    /**
-     * Check if is valid enum key
-     *
-     * @param $key
-     * @psalm-param string $key
-     * @psalm-pure
-     * @return bool
-     */
-    public static function isValidKey($key)
-    {
-        $array = static::toArray();
-
-        return isset($array[$key]) || \array_key_exists($key, $array);
-    }
-
-    /**
-     * Return key for value
-     *
-     * @param mixed $value
-     *
-     * @psalm-param mixed $value
-     * @psalm-pure
-     * @return string|false
-     */
-    public static function search($value)
-    {
-        return \array_search($value, static::toArray(), true);
-    }
-
-    /**
-     * Returns a value when called statically like so: MyEnum::SOME_VALUE() given SOME_VALUE is a class constant
-     *
-     * @param string $name
-     * @param array  $arguments
-     *
-     * @return static
-     * @throws \BadMethodCallException
-     *
-     * @psalm-pure
-     */
-    public static function __callStatic($name, $arguments)
-    {
-        $class = static::class;
-        if (!isset(self::$instances[$class][$name])) {
-            $array = static::toArray();
-            if (!isset($array[$name]) && !\array_key_exists($name, $array)) {
-                $message = "No static method or enum constant '$name' in class " . static::class;
-                throw new \BadMethodCallException($message);
-            }
-            return self::$instances[$class][$name] = new static($array[$name]);
-        }
-        return clone self::$instances[$class][$name];
-    }
-
-    /**
-     * Specify data which should be serialized to JSON. This method returns data that can be serialized by json_encode()
-     * natively.
-     *
-     * @return mixed
-     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
-     * @psalm-pure
-     */
-    #[\ReturnTypeWillChange]
-    public function jsonSerialize()
-    {
-        return $this->getValue();
-    }
-}
diff --git a/vendor/myclabs/php-enum/src/PHPUnit/Comparator.php b/vendor/myclabs/php-enum/src/PHPUnit/Comparator.php
deleted file mode 100644
index 302bf80ebf..0000000000
--- a/vendor/myclabs/php-enum/src/PHPUnit/Comparator.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-namespace MyCLabs\Enum\PHPUnit;
-
-use MyCLabs\Enum\Enum;
-use SebastianBergmann\Comparator\ComparisonFailure;
-
-/**
- * Use this Comparator to get nice output when using PHPUnit assertEquals() with Enums.
- *
- * Add this to your PHPUnit bootstrap PHP file:
- *
- * \SebastianBergmann\Comparator\Factory::getInstance()->register(new \MyCLabs\Enum\PHPUnit\Comparator());
- */
-final class Comparator extends \SebastianBergmann\Comparator\Comparator
-{
-    public function accepts($expected, $actual)
-    {
-        return $expected instanceof Enum && (
-                $actual instanceof Enum || $actual === null
-            );
-    }
-
-    /**
-     * @param Enum $expected
-     * @param Enum|null $actual
-     *
-     * @return void
-     */
-    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
-    {
-        if ($expected->equals($actual)) {
-            return;
-        }
-
-        throw new ComparisonFailure(
-            $expected,
-            $actual,
-            $this->formatEnum($expected),
-            $this->formatEnum($actual),
-            false,
-            'Failed asserting that two Enums are equal.'
-        );
-    }
-
-    private function formatEnum(Enum $enum = null)
-    {
-        if ($enum === null) {
-            return "null";
-        }
-
-        return get_class($enum)."::{$enum->getKey()}()";
-    }
-}
diff --git a/vendor/paragonie/constant_time_encoding/README.md b/vendor/paragonie/constant_time_encoding/README.md
index cedddd8633..211f0dc9f9 100644
--- a/vendor/paragonie/constant_time_encoding/README.md
+++ b/vendor/paragonie/constant_time_encoding/README.md
@@ -1,6 +1,7 @@
 # Constant-Time Encoding
 
 [![Build Status](https://github.com/paragonie/constant_time_encoding/actions/workflows/ci.yml/badge.svg)](https://github.com/paragonie/constant_time_encoding/actions)
+[![Static Analysis](https://github.com/paragonie/constant_time_encoding/actions/workflows/psalm.yml/badge.svg)](https://github.com/paragonie/constant_time_encoding/actions)
 [![Latest Stable Version](https://poser.pugx.org/paragonie/constant_time_encoding/v/stable)](https://packagist.org/packages/paragonie/constant_time_encoding)
 [![Latest Unstable Version](https://poser.pugx.org/paragonie/constant_time_encoding/v/unstable)](https://packagist.org/packages/paragonie/constant_time_encoding)
 [![License](https://poser.pugx.org/paragonie/constant_time_encoding/license)](https://packagist.org/packages/paragonie/constant_time_encoding)
@@ -11,7 +12,7 @@ this library aims to offer character encoding functions that do not leak
 information about what you are encoding/decoding via processor cache 
 misses. Further reading on [cache-timing attacks](http://blog.ircmaxell.com/2014/11/its-all-about-time.html).
 
-Our fork offers the following enchancements:
+Our fork offers the following enhancements:
 
 * `mbstring.func_overload` resistance
 * Unit tests
@@ -22,10 +23,13 @@ Our fork offers the following enchancements:
 
 ## PHP Version Requirements
 
-Version 2 of this library should work on **PHP 7** or newer. For PHP 5
-support, see [the v1.x branch](https://github.com/paragonie/constant_time_encoding/tree/v1.x).
+Version 3 of this library should work on **PHP 8** or newer.
 
-If you are adding this as a dependency to a project intended to work on both PHP 5 and PHP 7, please set the required version to `^1|^2` instead of just `^1` or `^2`.
+Version 2 of this library should work on **PHP 7** or newer. See [the v2.x branch](https://github.com/paragonie/constant_time_encoding/tree/v2.x).
+
+For PHP 5 support, see [the v1.x branch](https://github.com/paragonie/constant_time_encoding/tree/v1.x).
+
+If you are adding this as a dependency to a project intended to work on PHP 5 through 8.4, please set the required version to `^1|^2|^3`.
 
 ## How to Install
 
diff --git a/vendor/paragonie/constant_time_encoding/composer.json b/vendor/paragonie/constant_time_encoding/composer.json
index 2fe9717adb..5023095b40 100644
--- a/vendor/paragonie/constant_time_encoding/composer.json
+++ b/vendor/paragonie/constant_time_encoding/composer.json
@@ -37,11 +37,11 @@
     "source":   "https://github.com/paragonie/constant_time_encoding"
   },
   "require": {
-    "php": "^7|^8"
+    "php": "^8"
   },
   "require-dev": {
-    "phpunit/phpunit": "^6|^7|^8|^9",
-    "vimeo/psalm": "^1|^2|^3|^4"
+    "phpunit/phpunit": "^9",
+    "vimeo/psalm": "^4|^5"
   },
   "autoload": {
     "psr-4": {
diff --git a/vendor/paragonie/constant_time_encoding/src/Base32.php b/vendor/paragonie/constant_time_encoding/src/Base32.php
index 7508b3df6f..48d00b9911 100644
--- a/vendor/paragonie/constant_time_encoding/src/Base32.php
+++ b/vendor/paragonie/constant_time_encoding/src/Base32.php
@@ -44,8 +44,11 @@ abstract class Base32 implements EncoderInterface
      * @param bool $strictPadding
      * @return string
      */
-    public static function decode(string $encodedString, bool $strictPadding = false): string
-    {
+    public static function decode(
+        #[\SensitiveParameter]
+        string $encodedString,
+        bool $strictPadding = false
+    ): string {
         return static::doDecode($encodedString, false, $strictPadding);
     }
 
@@ -56,8 +59,11 @@ public static function decode(string $encodedString, bool $strictPadding = false
      * @param bool $strictPadding
      * @return string
      */
-    public static function decodeUpper(string $src, bool $strictPadding = false): string
-    {
+    public static function decodeUpper(
+        #[\SensitiveParameter]
+        string $src,
+        bool $strictPadding = false
+    ): string {
         return static::doDecode($src, true, $strictPadding);
     }
 
@@ -68,10 +74,13 @@ public static function decodeUpper(string $src, bool $strictPadding = false): st
      * @return string
      * @throws TypeError
      */
-    public static function encode(string $binString): string
-    {
+    public static function encode(
+        #[\SensitiveParameter]
+        string $binString
+    ): string {
         return static::doEncode($binString, false, true);
     }
+
     /**
      * Encode into Base32 (RFC 4648)
      *
@@ -79,8 +88,10 @@ public static function encode(string $binString): string
      * @return string
      * @throws TypeError
      */
-    public static function encodeUnpadded(string $src): string
-    {
+    public static function encodeUnpadded(
+        #[\SensitiveParameter]
+        string $src
+    ): string {
         return static::doEncode($src, false, false);
     }
 
@@ -91,8 +102,10 @@ public static function encodeUnpadded(string $src): string
      * @return string
      * @throws TypeError
      */
-    public static function encodeUpper(string $src): string
-    {
+    public static function encodeUpper(
+        #[\SensitiveParameter]
+        string $src
+    ): string {
         return static::doEncode($src, true, true);
     }
 
@@ -103,8 +116,10 @@ public static function encodeUpper(string $src): string
      * @return string
      * @throws TypeError
      */
-    public static function encodeUpperUnpadded(string $src): string
-    {
+    public static function encodeUpperUnpadded(
+        #[\SensitiveParameter]
+        string $src
+    ): string {
         return static::doEncode($src, true, false);
     }
 
@@ -191,8 +206,11 @@ protected static function encode5BitsUpper(int $src): string
      * @param bool $upper
      * @return string
      */
-    public static function decodeNoPadding(string $encodedString, bool $upper = false): string
-    {
+    public static function decodeNoPadding(
+        #[\SensitiveParameter]
+        string $encodedString,
+        bool $upper = false
+    ): string {
         $srcLen = Binary::safeStrlen($encodedString);
         if ($srcLen === 0) {
             return '';
@@ -222,9 +240,9 @@ public static function decodeNoPadding(string $encodedString, bool $upper = fals
      * @return string
      *
      * @throws TypeError
-     * @psalm-suppress RedundantCondition
      */
     protected static function doDecode(
+        #[\SensitiveParameter]
         string $src,
         bool $upper = false,
         bool $strictPadding = false
@@ -434,8 +452,12 @@ protected static function doDecode(
      * @return string
      * @throws TypeError
      */
-    protected static function doEncode(string $src, bool $upper = false, $pad = true): string
-    {
+    protected static function doEncode(
+        #[\SensitiveParameter]
+        string $src,
+        bool $upper = false,
+        $pad = true
+    ): string {
         // We do this to reduce code duplication:
         $method = $upper
             ? 'encode5BitsUpper'
diff --git a/vendor/paragonie/constant_time_encoding/src/Base64.php b/vendor/paragonie/constant_time_encoding/src/Base64.php
index f5716179f1..2e3ecc8595 100644
--- a/vendor/paragonie/constant_time_encoding/src/Base64.php
+++ b/vendor/paragonie/constant_time_encoding/src/Base64.php
@@ -47,8 +47,10 @@ abstract class Base64 implements EncoderInterface
      *
      * @throws TypeError
      */
-    public static function encode(string $binString): string
-    {
+    public static function encode(
+        #[\SensitiveParameter]
+        string $binString
+    ): string {
         return static::doEncode($binString, true);
     }
 
@@ -62,8 +64,10 @@ public static function encode(string $binString): string
      *
      * @throws TypeError
      */
-    public static function encodeUnpadded(string $src): string
-    {
+    public static function encodeUnpadded(
+        #[\SensitiveParameter]
+        string $src
+    ): string {
         return static::doEncode($src, false);
     }
 
@@ -74,8 +78,11 @@ public static function encodeUnpadded(string $src): string
      *
      * @throws TypeError
      */
-    protected static function doEncode(string $src, bool $pad = true): string
-    {
+    protected static function doEncode(
+        #[\SensitiveParameter]
+        string $src,
+        bool $pad = true
+    ): string {
         $dest = '';
         $srcLen = Binary::safeStrlen($src);
         // Main loop (no padding):
@@ -129,10 +136,12 @@ protected static function doEncode(string $src, bool $pad = true): string
      *
      * @throws RangeException
      * @throws TypeError
-     * @psalm-suppress RedundantCondition
      */
-    public static function decode(string $encodedString, bool $strictPadding = false): string
-    {
+    public static function decode(
+        #[\SensitiveParameter]
+        string $encodedString,
+        bool $strictPadding = false
+    ): string {
         // Remove padding
         $srcLen = Binary::safeStrlen($encodedString);
         if ($srcLen === 0) {
@@ -227,25 +236,21 @@ public static function decode(string $encodedString, bool $strictPadding = false
      * @param string $encodedString
      * @return string
      */
-    public static function decodeNoPadding(string $encodedString): string
-    {
+    public static function decodeNoPadding(
+        #[\SensitiveParameter]
+        string $encodedString
+    ): string {
         $srcLen = Binary::safeStrlen($encodedString);
         if ($srcLen === 0) {
             return '';
         }
         if (($srcLen & 3) === 0) {
-            if ($encodedString[$srcLen - 1] === '=') {
+            // If $strLen is not zero, and it is divisible by 4, then it's at least 4.
+            if ($encodedString[$srcLen - 1] === '=' || $encodedString[$srcLen - 2] === '=') {
                 throw new InvalidArgumentException(
                     "decodeNoPadding() doesn't tolerate padding"
                 );
             }
-            if (($srcLen & 3) > 1) {
-                if ($encodedString[$srcLen - 2] === '=') {
-                    throw new InvalidArgumentException(
-                        "decodeNoPadding() doesn't tolerate padding"
-                    );
-                }
-            }
         }
         return static::decode(
             $encodedString,
diff --git a/vendor/paragonie/constant_time_encoding/src/Binary.php b/vendor/paragonie/constant_time_encoding/src/Binary.php
index 828f3e0f64..a958f2f7c8 100644
--- a/vendor/paragonie/constant_time_encoding/src/Binary.php
+++ b/vendor/paragonie/constant_time_encoding/src/Binary.php
@@ -45,8 +45,10 @@ abstract class Binary
      * @param string $str
      * @return int
      */
-    public static function safeStrlen(string $str): int
-    {
+    public static function safeStrlen(
+        #[\SensitiveParameter]
+        string $str
+    ): int {
         if (\function_exists('mb_strlen')) {
             // mb_strlen in PHP 7.x can return false.
             /** @psalm-suppress RedundantCast */
@@ -70,9 +72,10 @@ public static function safeStrlen(string $str): int
      * @throws TypeError
      */
     public static function safeSubstr(
+        #[\SensitiveParameter]
         string $str,
         int $start = 0,
-        $length = null
+        ?int $length = null
     ): string {
         if ($length === 0) {
             return '';
diff --git a/vendor/paragonie/constant_time_encoding/src/Encoding.php b/vendor/paragonie/constant_time_encoding/src/Encoding.php
index 8649f31fc1..8b7e3878e1 100644
--- a/vendor/paragonie/constant_time_encoding/src/Encoding.php
+++ b/vendor/paragonie/constant_time_encoding/src/Encoding.php
@@ -40,8 +40,10 @@ abstract class Encoding
      * @return string
      * @throws TypeError
      */
-    public static function base32Encode(string $str): string
-    {
+    public static function base32Encode(
+        #[\SensitiveParameter]
+        string $str
+    ): string {
         return Base32::encode($str);
     }
 
@@ -52,8 +54,10 @@ public static function base32Encode(string $str): string
      * @return string
      * @throws TypeError
      */
-    public static function base32EncodeUpper(string $str): string
-    {
+    public static function base32EncodeUpper(
+        #[\SensitiveParameter]
+        string $str
+    ): string {
         return Base32::encodeUpper($str);
     }
 
@@ -64,8 +68,10 @@ public static function base32EncodeUpper(string $str): string
      * @return string
      * @throws TypeError
      */
-    public static function base32Decode(string $str): string
-    {
+    public static function base32Decode(
+        #[\SensitiveParameter]
+        string $str
+    ): string {
         return Base32::decode($str);
     }
 
@@ -76,8 +82,10 @@ public static function base32Decode(string $str): string
      * @return string
      * @throws TypeError
      */
-    public static function base32DecodeUpper(string $str): string
-    {
+    public static function base32DecodeUpper(
+        #[\SensitiveParameter]
+        string $str
+    ): string {
         return Base32::decodeUpper($str);
     }
 
@@ -88,8 +96,10 @@ public static function base32DecodeUpper(string $str): string
      * @return string
      * @throws TypeError
      */
-    public static function base32HexEncode(string $str): string
-    {
+    public static function base32HexEncode(
+        #[\SensitiveParameter]
+        string $str
+    ): string {
         return Base32Hex::encode($str);
     }
 
@@ -100,8 +110,10 @@ public static function base32HexEncode(string $str): string
      * @return string
      * @throws TypeError
      */
-    public static function base32HexEncodeUpper(string $str): string
-    {
+    public static function base32HexEncodeUpper(
+        #[\SensitiveParameter]
+        string $str
+    ): string {
         return Base32Hex::encodeUpper($str);
     }
 
@@ -112,8 +124,10 @@ public static function base32HexEncodeUpper(string $str): string
      * @return string
      * @throws TypeError
      */
-    public static function base32HexDecode(string $str): string
-    {
+    public static function base32HexDecode(
+        #[\SensitiveParameter]
+        string $str
+    ): string {
         return Base32Hex::decode($str);
     }
 
@@ -124,8 +138,10 @@ public static function base32HexDecode(string $str): string
      * @return string
      * @throws TypeError
      */
-    public static function base32HexDecodeUpper(string $str): string
-    {
+    public static function base32HexDecodeUpper(
+        #[\SensitiveParameter]
+        string $str
+    ): string {
         return Base32Hex::decodeUpper($str);
     }
 
@@ -136,8 +152,10 @@ public static function base32HexDecodeUpper(string $str): string
      * @return string
      * @throws TypeError
      */
-    public static function base64Encode(string $str): string
-    {
+    public static function base64Encode(
+        #[\SensitiveParameter]
+        string $str
+    ): string {
         return Base64::encode($str);
     }
 
@@ -148,8 +166,10 @@ public static function base64Encode(string $str): string
      * @return string
      * @throws TypeError
      */
-    public static function base64Decode(string $str): string
-    {
+    public static function base64Decode(
+        #[\SensitiveParameter]
+        string $str
+    ): string {
         return Base64::decode($str);
     }
 
@@ -161,8 +181,10 @@ public static function base64Decode(string $str): string
      * @return string
      * @throws TypeError
      */
-    public static function base64EncodeDotSlash(string $str): string
-    {
+    public static function base64EncodeDotSlash(
+        #[\SensitiveParameter]
+        string $str
+    ): string {
         return Base64DotSlash::encode($str);
     }
 
@@ -176,8 +198,10 @@ public static function base64EncodeDotSlash(string $str): string
      * @throws \RangeException
      * @throws TypeError
      */
-    public static function base64DecodeDotSlash(string $str): string
-    {
+    public static function base64DecodeDotSlash(
+        #[\SensitiveParameter]
+        string $str
+    ): string {
         return Base64DotSlash::decode($str);
     }
 
@@ -189,8 +213,10 @@ public static function base64DecodeDotSlash(string $str): string
      * @return string
      * @throws TypeError
      */
-    public static function base64EncodeDotSlashOrdered(string $str): string
-    {
+    public static function base64EncodeDotSlashOrdered(
+        #[\SensitiveParameter]
+        string $str
+    ): string {
         return Base64DotSlashOrdered::encode($str);
     }
 
@@ -204,8 +230,10 @@ public static function base64EncodeDotSlashOrdered(string $str): string
      * @throws \RangeException
      * @throws TypeError
      */
-    public static function base64DecodeDotSlashOrdered(string $str): string
-    {
+    public static function base64DecodeDotSlashOrdered(
+        #[\SensitiveParameter]
+        string $str
+    ): string {
         return Base64DotSlashOrdered::decode($str);
     }
 
@@ -217,8 +245,10 @@ public static function base64DecodeDotSlashOrdered(string $str): string
      * @return string
      * @throws TypeError
      */
-    public static function hexEncode(string $bin_string): string
-    {
+    public static function hexEncode(
+        #[\SensitiveParameter]
+        string $bin_string
+    ): string {
         return Hex::encode($bin_string);
     }
 
@@ -230,8 +260,10 @@ public static function hexEncode(string $bin_string): string
      * @return string (raw binary)
      * @throws \RangeException
      */
-    public static function hexDecode(string $hex_string): string
-    {
+    public static function hexDecode(
+        #[\SensitiveParameter]
+        string $hex_string
+    ): string {
         return Hex::decode($hex_string);
     }
 
@@ -243,8 +275,10 @@ public static function hexDecode(string $hex_string): string
      * @return string
      * @throws TypeError
      */
-    public static function hexEncodeUpper(string $bin_string): string
-    {
+    public static function hexEncodeUpper(
+        #[\SensitiveParameter]
+        string $bin_string
+    ): string {
         return Hex::encodeUpper($bin_string);
     }
 
@@ -255,8 +289,10 @@ public static function hexEncodeUpper(string $bin_string): string
      * @param string $bin_string (raw binary)
      * @return string
      */
-    public static function hexDecodeUpper(string $bin_string): string
-    {
+    public static function hexDecodeUpper(
+        #[\SensitiveParameter]
+        string $bin_string
+    ): string {
         return Hex::decode($bin_string);
     }
 }
diff --git a/vendor/paragonie/constant_time_encoding/src/Hex.php b/vendor/paragonie/constant_time_encoding/src/Hex.php
index a9e058cd36..97c2046f09 100644
--- a/vendor/paragonie/constant_time_encoding/src/Hex.php
+++ b/vendor/paragonie/constant_time_encoding/src/Hex.php
@@ -42,8 +42,10 @@ abstract class Hex implements EncoderInterface
      * @return string
      * @throws TypeError
      */
-    public static function encode(string $binString): string
-    {
+    public static function encode(
+        #[\SensitiveParameter]
+        string $binString
+    ): string {
         $hex = '';
         $len = Binary::safeStrlen($binString);
         for ($i = 0; $i < $len; ++$i) {
@@ -69,8 +71,10 @@ public static function encode(string $binString): string
      * @return string
      * @throws TypeError
      */
-    public static function encodeUpper(string $binString): string
-    {
+    public static function encodeUpper(
+        #[\SensitiveParameter]
+        string $binString
+    ): string {
         $hex = '';
         $len = Binary::safeStrlen($binString);
 
@@ -99,6 +103,7 @@ public static function encodeUpper(string $binString): string
      * @throws RangeException
      */
     public static function decode(
+        #[\SensitiveParameter]
         string $encodedString,
         bool $strictPadding = false
     ): string {
diff --git a/vendor/paragonie/constant_time_encoding/src/RFC4648.php b/vendor/paragonie/constant_time_encoding/src/RFC4648.php
index f124d65bfd..7cd2e9909d 100644
--- a/vendor/paragonie/constant_time_encoding/src/RFC4648.php
+++ b/vendor/paragonie/constant_time_encoding/src/RFC4648.php
@@ -46,8 +46,10 @@ abstract class RFC4648
      *
      * @throws TypeError
      */
-    public static function base64Encode(string $str): string
-    {
+    public static function base64Encode(
+        #[\SensitiveParameter]
+        string $str
+    ): string {
         return Base64::encode($str);
     }
 
@@ -61,8 +63,10 @@ public static function base64Encode(string $str): string
      *
      * @throws TypeError
      */
-    public static function base64Decode(string $str): string
-    {
+    public static function base64Decode(
+        #[\SensitiveParameter]
+        string $str
+    ): string {
         return Base64::decode($str, true);
     }
 
@@ -76,8 +80,10 @@ public static function base64Decode(string $str): string
      *
      * @throws TypeError
      */
-    public static function base64UrlSafeEncode(string $str): string
-    {
+    public static function base64UrlSafeEncode(
+        #[\SensitiveParameter]
+        string $str
+    ): string {
         return Base64UrlSafe::encode($str);
     }
 
@@ -91,8 +97,10 @@ public static function base64UrlSafeEncode(string $str): string
      *
      * @throws TypeError
      */
-    public static function base64UrlSafeDecode(string $str): string
-    {
+    public static function base64UrlSafeDecode(
+        #[\SensitiveParameter]
+        string $str
+    ): string {
         return Base64UrlSafe::decode($str, true);
     }
 
@@ -106,8 +114,10 @@ public static function base64UrlSafeDecode(string $str): string
      *
      * @throws TypeError
      */
-    public static function base32Encode(string $str): string
-    {
+    public static function base32Encode(
+        #[\SensitiveParameter]
+        string $str
+    ): string {
         return Base32::encodeUpper($str);
     }
 
@@ -121,8 +131,10 @@ public static function base32Encode(string $str): string
      *
      * @throws TypeError
      */
-    public static function base32Decode(string $str): string
-    {
+    public static function base32Decode(
+        #[\SensitiveParameter]
+        string $str
+    ): string {
         return Base32::decodeUpper($str, true);
     }
 
@@ -136,8 +148,10 @@ public static function base32Decode(string $str): string
      *
      * @throws TypeError
      */
-    public static function base32HexEncode(string $str): string
-    {
+    public static function base32HexEncode(
+        #[\SensitiveParameter]
+        string $str
+    ): string {
         return Base32::encodeUpper($str);
     }
 
@@ -151,8 +165,10 @@ public static function base32HexEncode(string $str): string
      *
      * @throws TypeError
      */
-    public static function base32HexDecode(string $str): string
-    {
+    public static function base32HexDecode(
+        #[\SensitiveParameter]
+        string $str
+    ): string {
         return Base32::decodeUpper($str, true);
     }
 
@@ -166,8 +182,10 @@ public static function base32HexDecode(string $str): string
      *
      * @throws TypeError
      */
-    public static function base16Encode(string $str): string
-    {
+    public static function base16Encode(
+        #[\SensitiveParameter]
+        string $str
+    ): string {
         return Hex::encodeUpper($str);
     }
 
@@ -179,8 +197,10 @@ public static function base16Encode(string $str): string
      * @param string $str
      * @return string
      */
-    public static function base16Decode(string $str): string
-    {
+    public static function base16Decode(
+        #[\SensitiveParameter]
+        string $str
+    ): string {
         return Hex::decode($str, true);
     }
-}
\ No newline at end of file
+}
diff --git a/vendor/phpoffice/math/.github/dependabot.yml b/vendor/phpoffice/math/.github/dependabot.yml
new file mode 100644
index 0000000000..67ca95f873
--- /dev/null
+++ b/vendor/phpoffice/math/.github/dependabot.yml
@@ -0,0 +1,11 @@
+version: 2
+updates:
+    - package-ecosystem: "composer"
+      directory: "/"
+      schedule:
+          interval: "daily"
+
+    - package-ecosystem: "github-actions"
+      directory: "/"
+      schedule:
+          interval: "daily"
\ No newline at end of file
diff --git a/vendor/phpoffice/math/.github/workflows/deploy.yml b/vendor/phpoffice/math/.github/workflows/deploy.yml
new file mode 100644
index 0000000000..ac43191f6a
--- /dev/null
+++ b/vendor/phpoffice/math/.github/workflows/deploy.yml
@@ -0,0 +1,51 @@
+name: Deploy
+
+on:
+  push:
+    branches: 
+      - master
+  pull_request:
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      ### MkDocs
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.x
+      - name: Install Python Dependencies
+        run: pip install mkdocs-material autolink-references-mkdocs-plugin
+      - name: Build documentation
+        run: mkdocs build --site-dir public
+      ### PHPUnit
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.1
+          extensions: dom, xml
+          coverage: xdebug
+      - name: Create directory public/coverage
+        run: mkdir ./public/coverage
+      - name: Install PHP Dependencies
+        run: composer install --ansi --prefer-dist --no-interaction --no-progress
+      - name: Build Coverage Report
+        run: XDEBUG_MODE=coverage ./vendor/bin/phpunit -c ./ --coverage-text --coverage-html ./public/coverage
+        ### PHPDoc
+      - name: Create directory public/docs
+        run: mkdir ./public/docs
+      - name: Install PhpDocumentor
+        run: wget https://phpdoc.org/phpDocumentor.phar && chmod +x phpDocumentor.phar
+      - name: Build Documentation
+        run: ./phpDocumentor.phar run -d ./src -t ./public/docs
+
+      ### Deploy
+      - name: Deploy
+        uses: peaceiris/actions-gh-pages@v4
+        if: github.ref == 'refs/heads/master'
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./public
\ No newline at end of file
diff --git a/vendor/phpoffice/math/.github/workflows/php.yml b/vendor/phpoffice/math/.github/workflows/php.yml
new file mode 100644
index 0000000000..df807baadc
--- /dev/null
+++ b/vendor/phpoffice/math/.github/workflows/php.yml
@@ -0,0 +1,116 @@
+name: PHP
+on: 
+    push:
+        branches:
+            - master
+    pull_request:
+
+jobs:
+  php-cs-fixer:
+    name: PHP CS Fixer
+    runs-on: ubuntu-latest
+    steps:
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '7.4'
+          extensions: xml
+
+      - uses: actions/checkout@v4
+
+      -   name: Validate composer config
+          run: composer validate --strict
+
+      -   name: Composer Install
+          run: composer global require friendsofphp/php-cs-fixer
+
+      -   name: Add environment path
+          run: export PATH="$PATH:$HOME/.composer/vendor/bin"
+
+      -   name: Run PHPCSFixer
+          run: php-cs-fixer fix --dry-run --diff
+
+  phpstan:
+    name: PHP Static Analysis
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        php: 
+            - '7.1'
+            - '7.2'
+            - '7.3'
+            - '7.4'
+            - '8.0'
+            - '8.1'
+            - '8.2'
+            - '8.3'
+    steps:
+        -   name: Setup PHP
+            uses: shivammathur/setup-php@v2
+            with:
+                php-version: ${{ matrix.php }}
+                extensions: xml
+
+        -   uses: actions/checkout@v4
+
+        -   name: Composer Install
+            run: composer install --ansi --prefer-dist --no-interaction --no-progress
+
+        -   name: Run phpstan
+            run: ./vendor/bin/phpstan analyse -c phpstan.neon.dist
+
+  phpunit:
+    name: PHPUnit
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        php: 
+            - '7.1'
+            - '7.2'
+            - '7.3'
+            - '7.4'
+            - '8.0'
+            - '8.1'
+            - '8.2'
+            - '8.3'
+    steps:
+      -   name: Setup PHP
+          uses: shivammathur/setup-php@v2
+          with:
+              php-version: ${{ matrix.php }}
+              extensions: xml
+              coverage: ${{ (matrix.php == '8.1') && 'xdebug' || 'none' }}
+
+      -   uses: actions/checkout@v4
+
+      -   name: Install dependencies
+          run: composer install --ansi --prefer-dist --no-interaction --no-progress
+
+      -   name: Run PHPUnit
+          if: matrix.php != '8.1'
+          run: ./vendor/bin/phpunit -c phpunit.xml.dist
+
+      -   name: Run PHPUnit (w CodeCoverage)
+          if: matrix.php == '8.1'
+          run: XDEBUG_MODE=coverage ./vendor/bin/phpunit -c phpunit.xml.dist --coverage-clover build/clover.xml
+
+      -   name: Upload coverage results to Coveralls
+          if: matrix.php == '8.1'
+          env:
+            COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          run: |
+            wget https://github.com/php-coveralls/php-coveralls/releases/download/v2.4.3/php-coveralls.phar
+            chmod +x php-coveralls.phar
+            php php-coveralls.phar --coverage_clover=build/clover.xml --json_path=build/coveralls-upload.json -vvv
+
+  roave-backwards-compatibility-check:
+    name: Roave Backwards Compatibility Check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: "Check for BC breaks"
+        run: docker run -u $(id -u) -v $(pwd):/app nyholm/roave-bc-check-ga
diff --git a/vendor/phpoffice/math/.gitignore b/vendor/phpoffice/math/.gitignore
new file mode 100644
index 0000000000..bda65ede3a
--- /dev/null
+++ b/vendor/phpoffice/math/.gitignore
@@ -0,0 +1,9 @@
+.php_cs.cache
+.php-cs-fixer.cache
+.phpunit.cache
+.phpunit.result.cache
+composer.lock
+phpDocumentor.phar
+
+public/
+vendor/
diff --git a/vendor/phpoffice/math/.php-cs-fixer.dist.php b/vendor/phpoffice/math/.php-cs-fixer.dist.php
new file mode 100644
index 0000000000..aaa50168c3
--- /dev/null
+++ b/vendor/phpoffice/math/.php-cs-fixer.dist.php
@@ -0,0 +1,45 @@
+<?php
+
+$config = new PhpCsFixer\Config();
+
+$config
+    ->setUsingCache(true)
+    ->setRiskyAllowed(true)
+    ->setRules([
+        '@Symfony' => true,
+        'array_indentation' => true,
+        'cast_spaces' => [
+            'space' => 'single',
+        ],
+        'combine_consecutive_issets' => true,
+        'concat_space' => [
+            'spacing' => 'one',
+        ],
+        'error_suppression' => [
+            'mute_deprecation_error' => false,
+            'noise_remaining_usages' => false,
+            'noise_remaining_usages_exclude' => [],
+        ],
+        'function_to_constant' => false,
+        'global_namespace_import' => true,
+        'method_chaining_indentation' => true,
+        'no_alias_functions' => false,
+        'no_superfluous_phpdoc_tags' => false,
+        'non_printable_character' => [
+            'use_escape_sequences_in_strings' => true,
+        ],
+        'phpdoc_align' => [
+            'align' => 'left',
+        ],
+        'phpdoc_summary' => false,
+        'protected_to_private' => false,
+        'self_accessor' => false,
+        'yoda_style' => false,
+        'single_line_throw' => false,
+        'no_alias_language_construct_call' => false,
+    ])
+    ->getFinder()
+    ->in(__DIR__)
+    ->exclude('vendor');
+
+return $config;
\ No newline at end of file
diff --git a/vendor/symfony/polyfill-mbstring/LICENSE b/vendor/phpoffice/math/LICENSE
similarity index 86%
rename from vendor/symfony/polyfill-mbstring/LICENSE
rename to vendor/phpoffice/math/LICENSE
index 4cd8bdd300..a3380df69d 100644
--- a/vendor/symfony/polyfill-mbstring/LICENSE
+++ b/vendor/phpoffice/math/LICENSE
@@ -1,11 +1,13 @@
-Copyright (c) 2015-2019 Fabien Potencier
+MIT License
+
+Copyright (c) 2019 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
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
@@ -15,5 +17,5 @@ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
\ No newline at end of file
diff --git a/vendor/phpoffice/math/README.md b/vendor/phpoffice/math/README.md
new file mode 100644
index 0000000000..93b4938fcd
--- /dev/null
+++ b/vendor/phpoffice/math/README.md
@@ -0,0 +1,75 @@
+# Math
+
+[![Latest Stable Version](https://poser.pugx.org/phpoffice/math/v/stable.png)](https://packagist.org/packages/phpoffice/math)
+[![Coverage Status](https://coveralls.io/repos/github/PHPOffice/Math/badge.svg?branch=master)](https://coveralls.io/github/PHPOffice/Math?branch=master)
+[![Total Downloads](https://poser.pugx.org/phpoffice/math/downloads.png)](https://packagist.org/packages/phpoffice/math)
+[![License](https://poser.pugx.org/phpoffice/math/license.png)](https://packagist.org/packages/phpoffice/math)
+[![CI](https://github.com/PHPOffice/Math/actions/workflows/php.yml/badge.svg)](https://github.com/PHPOffice/Math/actions/workflows/php.yml)
+
+Math is a library written in pure PHP that provides a set of classes to manipulate different formula file formats, i.e. [MathML](https://en.wikipedia.org/wiki/MathML) and [Office MathML (OOML)](https://en.wikipedia.org/wiki/Office_Open_XML_file_formats#Office_MathML_(OMML)).
+
+Math is an open source project licensed under the terms of [MIT](https://github.com/PHPOffice/Math/blob/master/LICENCE). Math is aimed to be a high quality software product by incorporating [continuous integration and unit testing](https://github.com/PHPOffice/Math/actions/workflows/php.yml). You can learn more about Math by reading this Developers'Documentation and the [API Documentation](http://phpoffice.github.io/Math/docs/)
+
+If you have any questions, please ask on [StackOverFlow](https://stackoverflow.com/questions/tagged/phpoffice-math)
+
+Read more about Math:
+
+- [Features](#features)
+- [Requirements](#requirements)
+- [Installation](#installation)
+- [Contributing](#contributing)
+- [Developers' Documentation](https://phpoffice.github.io/Math/)
+
+## Features
+
+- Insert elements:
+
+    * Basic :
+
+        * Identifier : <math display="inline"><mi>a</mi></math>
+        * Operator : <math display="inline"><mo>+</mo></math>
+        * Numeric : <math display="inline"><mn>2</mn></math>
+
+    * Simple :
+    
+        * Fraction : <math display="inline"><mfrac><mi>a</mi><mn>3</mn></mfrac></math>
+        * Superscript : <math display="inline"><msup><mi>a</mi><mn>3</mn></msup></math>
+
+    * Architectural :
+
+        * Row
+        * Semantics
+
+- Support
+
+    * MathML
+    * OfficeMathML
+## Requirements
+
+Math requires the following:
+
+- PHP 7.1+
+- [XML Parser extension](http://www.php.net/manual/en/xml.installation.php)
+- [XMLWriter extension](http://php.net/manual/en/book.xmlwriter.php)
+
+## Installation
+
+Math is installed via [Composer](https://getcomposer.org/).
+To [add a dependency](https://getcomposer.org/doc/04-schema.md#package-links) to Math in your project, either
+
+Run the following to use the latest stable version
+```sh
+composer require phpoffice/math
+```
+or if you want the latest unreleased version
+```sh
+composer require phpoffice/math:dev-master
+```
+
+## Contributing
+
+We welcome everyone to contribute to PHPWord. Below are some of the things that you can do to contribute.
+
+- [Fork us](https://github.com/PHPOffice/Math/fork) and [request a pull](https://github.com/PHPOffice/Math/pulls) to the [master](https://github.com/PHPOffice/Math/tree/master) branch.
+- Submit [bug reports or feature requests](https://github.com/PHPOffice/Math/issues) to GitHub.
+- Follow [@PHPOffice](https://twitter.com/PHPOffice) on Twitter.
diff --git a/vendor/phpoffice/math/composer.json b/vendor/phpoffice/math/composer.json
new file mode 100644
index 0000000000..615e11c3ed
--- /dev/null
+++ b/vendor/phpoffice/math/composer.json
@@ -0,0 +1,33 @@
+{
+    "name": "phpoffice/math",
+    "description": "Math - Manipulate Math Formula",
+    "keywords": ["PHP","mathml", "officemathml"],
+    "homepage": "https://phpoffice.github.io/Math/",
+    "type": "library",
+    "license": "MIT",
+    "autoload": {
+        "psr-4": {
+            "PhpOffice\\Math\\": "src/Math/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Tests\\PhpOffice\\Math\\": "tests/Math/"
+        }
+    },
+    "authors": [
+        {
+            "name": "Progi1984",
+            "homepage": "https://lefevre.dev"
+        }
+    ],
+    "require": {
+        "php": "^7.1|^8.0",
+        "ext-dom": "*",
+        "ext-xml": "*"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^7.0 || ^9.0",
+        "phpstan/phpstan": "^0.12.88 || ^1.0.0"
+    }
+}
diff --git a/vendor/phpoffice/math/docs/assets/mathjax.js b/vendor/phpoffice/math/docs/assets/mathjax.js
new file mode 100644
index 0000000000..73e997218e
--- /dev/null
+++ b/vendor/phpoffice/math/docs/assets/mathjax.js
@@ -0,0 +1,17 @@
+window.MathJax = {
+    tex: {
+      inlineMath: [["\\(", "\\)"]],
+      displayMath: [["\\[", "\\]"]],
+      processEscapes: true,
+      processEnvironments: true
+    },
+    options: {
+      ignoreHtmlClass: ".*|",
+      processHtmlClass: "arithmatex"
+    }
+  };
+  
+  document$.subscribe(() => {
+    MathJax.typesetPromise()
+  })
+  
\ No newline at end of file
diff --git a/vendor/phpoffice/math/docs/changes/0.1.0.md b/vendor/phpoffice/math/docs/changes/0.1.0.md
new file mode 100644
index 0000000000..81ceb3d5c4
--- /dev/null
+++ b/vendor/phpoffice/math/docs/changes/0.1.0.md
@@ -0,0 +1,19 @@
+# 0.1.0
+
+## Enhancements
+
+- Initial version by [@Progi1984](https://github/Progi1984)
+- MathML Reader : Support for Semantics by [@Progi1984](https://github/Progi1984) in [#4](https://github.com/PHPOffice/Math/pull/4)
+- PHPUnit : Improved Unit Tests by [@Progi1984](https://github/Progi1984) in [#8](https://github.com/PHPOffice/Math/pull/8)
+
+## Bug fixes
+
+- N/A
+
+## Miscellaneous
+- Github Actions : PHPCSFixer by [@Progi1984](https://github/Progi1984) in [#1](https://github.com/PHPOffice/Math/pull/1)
+- Github Actions : PHPStan by [@Progi1984](https://github/Progi1984) in [#2](https://github.com/PHPOffice/Math/pull/2)
+- Removed dependency friendsofphp/php-cs-fixer by [@Progi1984](https://github/Progi1984) in [#3](https://github.com/PHPOffice/Math/pull/3)
+- Github Actions : Dependabot by [@Progi1984](https://github/Progi1984) in [#5](https://github.com/PHPOffice/Math/pull/5)
+- Bump actions/checkout from 2 to 4 by [@dependabot](https://github/dependabot) in [#6](https://github.com/PHPOffice/Math/pull/6)
+- Added documentation (MkDocs / Coverage / PHPDoc) by [@Progi1984](https://github/Progi1984) in [#7](https://github.com/PHPOffice/Math/pull/7)
\ No newline at end of file
diff --git a/vendor/phpoffice/math/docs/changes/0.2.0.md b/vendor/phpoffice/math/docs/changes/0.2.0.md
new file mode 100644
index 0000000000..f7b72fca60
--- /dev/null
+++ b/vendor/phpoffice/math/docs/changes/0.2.0.md
@@ -0,0 +1,17 @@
+# 0.2.0
+
+## Enhancements
+
+- N/A
+
+## Bug fixes
+
+- MathML Reader : Support for mrow in mfrac by [@Progi1984](https://github/Progi1984) in [#16](https://github.com/PHPOffice/Math/pull/16)
+
+## Miscellaneous
+
+- Github Action : Roave BC Check by [@Progi1984](https://github/Progi1984) in [#9](https://github.com/PHPOffice/Math/pull/9)
+- Bump actions/checkout from 2 to 4 by [@dependabot](https://github/dependabot) in [#10](https://github.com/PHPOffice/Math/pull/10)
+- Bump actions/setup-python from 2 to 4 by [@dependabot](https://github/dependabot) in [#11](https://github.com/PHPOffice/Math/pull/11)
+- Bump actions/setup-python from 4 to 5 by [@dependabot](https://github/dependabot) in [#12](https://github.com/PHPOffice/Math/pull/12)
+- Bump peaceiris/actions-gh-pages from 3 to 4 by [@dependabot](https://github/dependabot) in [#13](https://github.com/PHPOffice/Math/pull/13)
\ No newline at end of file
diff --git a/vendor/phpoffice/math/docs/credits.md b/vendor/phpoffice/math/docs/credits.md
new file mode 100644
index 0000000000..34795bab69
--- /dev/null
+++ b/vendor/phpoffice/math/docs/credits.md
@@ -0,0 +1,8 @@
+## References
+
+### MathML
+
+- [MDN Web Docs](https://developer.mozilla.org/en-US/docs/Web/MathML)
+
+### OfficeMathML
+
diff --git a/vendor/phpoffice/math/docs/index.md b/vendor/phpoffice/math/docs/index.md
new file mode 100644
index 0000000000..340b0dccac
--- /dev/null
+++ b/vendor/phpoffice/math/docs/index.md
@@ -0,0 +1,59 @@
+#
+
+Math is a library written in pure PHP that provides a set of classes to manipulate different formula file formats, i.e. [MathML](https://en.wikipedia.org/wiki/MathML) and [Office MathML (OOML)](https://en.wikipedia.org/wiki/Office_Open_XML_file_formats#Office_MathML_(OMML)).
+
+Math is an open source project licensed under the terms of [MIT](https://github.com/PHPOffice/Math/blob/master/LICENCE). Math is aimed to be a high quality software product by incorporating [continuous integration and unit testing](https://github.com/PHPOffice/Math/actions/workflows/php.yml). You can learn more about Math by reading this Developers'Documentation and the [API Documentation](http://phpoffice.github.io/Math/docs/develop/)
+
+## Features
+
+- Insert elements:
+
+    * Basic :
+
+        * Identifier : <math display="inline"><mi>a</mi></math>
+        * Operator : <math display="inline"><mo>+</mo></math>
+        * Numeric : <math display="inline"><mn>2</mn></math>
+
+    * Simple :
+    
+        * Fraction : <math display="inline"><mfrac><mi>a</mi><mn>3</mn></mfrac></math>
+        * Superscript : <math display="inline"><msup><mi>a</mi><mn>3</mn></msup></math>
+
+    * Architectural :
+
+        * Row
+        * Semantics
+
+## Support
+
+### Readers
+
+| Features                  |                      | MathML           | Office MathML    |
+|---------------------------|----------------------|:----------------:|:----------------:|
+| **Basic**                 | Identifier           | :material-check: | :material-check: |
+|                           | Operator             | :material-check: | :material-check: |
+|                           | Numeric              | :material-check: | :material-check: |
+| **Simple**                | Fraction             | :material-check: | :material-check: |
+|                           | Superscript          | :material-check: |                  |
+| **Architectural**         | Row                  | :material-check: |                  |
+|                           | Semantics            | :material-check: |                  |
+
+### Writers
+
+| Features                  |                      | MathML           | Office MathML    |
+|---------------------------|----------------------|:----------------:|:----------------:|
+| **Basic**                 | Identifier           | :material-check: | :material-check: |
+|                           | Operator             | :material-check: | :material-check: |
+|                           | Numeric              | :material-check: | :material-check: |
+| **Simple**                | Fraction             | :material-check: | :material-check: |
+|                           | Superscript          | :material-check: |                  |
+| **Architectural**         | Row                  | :material-check: | :material-check: |
+|                           | Semantics            |                  |                  |
+
+## Contributing
+
+We welcome everyone to contribute to Math. Below are some of the things that you can do to contribute:
+
+-  [Fork us](https://github.com/PHPOffice/Math/fork) and [request a pull](https://github.com/PHPOffice/Math/pulls) to the [master](https://github.com/PHPOffice/Math/tree/master) branch
+-  Submit [bug reports or feature requests](https://github.com/PHPOffice/Math/issues) to GitHub
+-  Follow [@PHPOffice](https://twitter.com/PHPOffice) on Twitter
diff --git a/vendor/phpoffice/math/docs/install.md b/vendor/phpoffice/math/docs/install.md
new file mode 100644
index 0000000000..6aca509e36
--- /dev/null
+++ b/vendor/phpoffice/math/docs/install.md
@@ -0,0 +1,25 @@
+# Installation
+
+## Requirements
+
+Mandatory:
+
+-  PHP 7.1+
+-  PHP [DOM extension](http://php.net/manual/en/book.dom.php)
+-  PHP [XML Parser extension](http://www.php.net/manual/en/xml.installation.php)
+-  PHP [XMLWriter extension](http://php.net/manual/en/book.xmlwriter.php)
+
+
+## Installation
+
+### Using Composer
+
+To install via [Composer](http://getcomposer.org), add the following lines to your `composer.json`:
+
+``` json
+{
+    "require": {
+        "phpoffice/math": "dev-master"
+    }
+}
+```
\ No newline at end of file
diff --git a/vendor/phpoffice/math/docs/usage/elements/fraction.md b/vendor/phpoffice/math/docs/usage/elements/fraction.md
new file mode 100644
index 0000000000..b73db19e8c
--- /dev/null
+++ b/vendor/phpoffice/math/docs/usage/elements/fraction.md
@@ -0,0 +1,61 @@
+## Usage
+
+To create a fraction, use the `PhpOffice\Math\Element\Fraction` class.
+
+### Methods
+#### getDenominator
+
+The method has no parameter.
+
+#### getNumerator
+
+The method has no parameter.
+
+#### setDenominator
+
+The method has one parameter : 
+
+* `PhpOffice\Math\Element\AbstractElement` **$element**
+
+#### setNumerator
+
+The method has one parameter : 
+
+* `PhpOffice\Math\Element\AbstractElement` **$element**
+
+## Example
+
+### Math
+<math display="block">
+  <mfrac>
+      <mi>a</mi>
+      <mn>3</mn>
+  </mfrac>
+</math>
+
+### XML
+``` xml
+<math display="block">
+  <mfrac>
+      <mi>a</mi>
+      <mn>3</mn>
+  </mfrac>
+</math>
+```
+
+### PHP
+
+``` php
+<?php
+
+use PhpOffice\Math\Element;
+use PhpOffice\Math\Math;
+
+$math = new Math();
+
+$fraction = new Element\Fraction();
+$fraction->setDenominator(new Element\Identifier('a'));
+$fraction->setNumerator(new Element\Numeric(3));
+
+$math->add($fraction);
+```
\ No newline at end of file
diff --git a/vendor/phpoffice/math/docs/usage/elements/identifier.md b/vendor/phpoffice/math/docs/usage/elements/identifier.md
new file mode 100644
index 0000000000..070a075e9e
--- /dev/null
+++ b/vendor/phpoffice/math/docs/usage/elements/identifier.md
@@ -0,0 +1,43 @@
+## Usage
+
+To create an identifier, use the `PhpOffice\Math\Element\Identifier` class.
+
+### Methods
+#### getValue
+
+The method has no parameter.
+
+#### setValue
+
+The method has one parameter : 
+
+* `string` **$value**
+
+## Example
+
+### Math
+<math display="block">
+  <mi>a</mi>
+</math>
+
+### XML
+``` xml
+<math display="block">
+  <mi>a</mi>
+</math>
+```
+
+### PHP
+
+``` php
+<?php
+
+use PhpOffice\Math\Element;
+use PhpOffice\Math\Math;
+
+$math = new Math();
+
+$identifier = new Element\Identifier('a');
+
+$math->add($identifier);
+```
\ No newline at end of file
diff --git a/vendor/phpoffice/math/docs/usage/elements/numeric.md b/vendor/phpoffice/math/docs/usage/elements/numeric.md
new file mode 100644
index 0000000000..200ec18e72
--- /dev/null
+++ b/vendor/phpoffice/math/docs/usage/elements/numeric.md
@@ -0,0 +1,43 @@
+## Usage
+
+To create a numeric, use the `PhpOffice\Math\Element\Numeric` class.
+
+### Methods
+#### getValue
+
+The method has no parameter.
+
+#### setValue
+
+The method has one parameter : 
+
+* `float` **$value**
+
+## Example
+
+### Math
+<math display="block">
+  <mn>3</mn>
+</math>
+
+### XML
+``` xml
+<math display="block">
+  <mn>3</mn>
+</math>
+```
+
+### PHP
+
+``` php
+<?php
+
+use PhpOffice\Math\Element;
+use PhpOffice\Math\Math;
+
+$math = new Math();
+
+$identifier = new Element\Numeric(3);
+
+$math->add($identifier);
+```
\ No newline at end of file
diff --git a/vendor/phpoffice/math/docs/usage/elements/operator.md b/vendor/phpoffice/math/docs/usage/elements/operator.md
new file mode 100644
index 0000000000..9816eb7503
--- /dev/null
+++ b/vendor/phpoffice/math/docs/usage/elements/operator.md
@@ -0,0 +1,43 @@
+## Usage
+
+To create an operator, use the `PhpOffice\Math\Element\Operator` class.
+
+### Methods
+#### getValue
+
+The method has no parameter.
+
+#### setValue
+
+The method has one parameter : 
+
+* `string` **$value**
+
+## Example
+
+### Math
+<math display="block">
+  <mo>+</mo>
+</math>
+
+### XML
+``` xml
+<math display="block">
+  <mo>+</mo>
+</math>
+```
+
+### PHP
+
+``` php
+<?php
+
+use PhpOffice\Math\Element;
+use PhpOffice\Math\Math;
+
+$math = new Math();
+
+$identifier = new Element\Operator('+');
+
+$math->add($identifier);
+```
\ No newline at end of file
diff --git a/vendor/phpoffice/math/docs/usage/elements/row.md b/vendor/phpoffice/math/docs/usage/elements/row.md
new file mode 100644
index 0000000000..32a9fd7b55
--- /dev/null
+++ b/vendor/phpoffice/math/docs/usage/elements/row.md
@@ -0,0 +1,62 @@
+## Usage
+
+To create a row, use the `PhpOffice\Math\Element\Row` class.
+
+### Methods
+#### add
+
+The method add an element to the row.
+The method has one parameter : 
+
+* `PhpOffice\Math\Element\AbstractElement` **$element**
+
+#### getElements
+
+The method return all elements of the row.
+
+#### remove
+
+The method remove an element to the row.
+The method has one parameter : 
+
+* `PhpOffice\Math\Element\AbstractElement` **$element**
+
+## Example
+
+### Math
+<math display="block">
+  <mrow>
+    <mn>1</mn>
+    <mo>+</mo>
+    <mi>K</mi>
+  </mrow>
+</math>
+
+### XML
+``` xml
+<math display="block">
+  <mrow>
+    <mn>1</mn>
+    <mo>+</mo>
+    <mi>K</mi>
+  </mrow>
+</math>
+```
+
+### PHP
+
+``` php
+<?php
+
+use PhpOffice\Math\Element;
+use PhpOffice\Math\Math;
+
+$math = new Math();
+
+$row = new Element\Row();
+$row->add(new Element\Numeric(1));
+$row->add(new Element\Operator('+'));
+$row->add(new Element\Identifier('K'));
+
+$math->add($row);
+```
\ No newline at end of file
diff --git a/vendor/phpoffice/math/docs/usage/elements/semantics.md b/vendor/phpoffice/math/docs/usage/elements/semantics.md
new file mode 100644
index 0000000000..4015be00d4
--- /dev/null
+++ b/vendor/phpoffice/math/docs/usage/elements/semantics.md
@@ -0,0 +1,81 @@
+## Usage
+
+To create a semantics, use the `PhpOffice\Math\Element\Semantics` class.
+
+### Methods
+#### add
+
+The method add an element to the `semantics` element.
+The method has one parameter : 
+
+* `PhpOffice\Math\Element\AbstractElement` **$element**
+
+#### addAnnotation
+
+The method add an annotation to the `semantics` element.
+The method has two parameters : 
+
+* `string` **$encoding**
+* `string` **$annotation**
+
+#### getAnnotation
+
+The method return an annotation based on its encoding.
+The method has one parameter : 
+
+* `string` **$encoding**
+
+#### getAnnotations
+
+The method return alls annotation of the `semantics` element.
+The method has no parameter.
+
+#### getElements
+
+The method return all elements of the `semantics` element.
+
+#### remove
+
+The method remove an element to the `semantics` element.
+The method has one parameter : 
+
+* `PhpOffice\Math\Element\AbstractElement` **$element**
+
+## Example
+
+### Math
+<math display="block">
+  <semantics>
+    <mi>y</mi>
+    
+    <annotation encoding="application/x-tex"> y </annotation>
+  </semantics>
+</math>
+
+### XML
+``` xml
+<math display="block">
+  <semantics>
+    <mi>y</mi>
+    
+    <annotation encoding="application/x-tex"> y </annotation>
+  </semantics>
+</math>
+```
+
+### PHP
+
+``` php
+<?php
+
+use PhpOffice\Math\Element;
+use PhpOffice\Math\Math;
+
+$math = new Math();
+
+$semantics = new Element\Semantics();
+$semantics->add(new Element\Identifier('y'));
+$semantics->addAnnotation('application/x-tex', ' y ');
+
+$math->add($semantics);
+```
\ No newline at end of file
diff --git a/vendor/phpoffice/math/docs/usage/elements/superscript.md b/vendor/phpoffice/math/docs/usage/elements/superscript.md
new file mode 100644
index 0000000000..fc91c2018f
--- /dev/null
+++ b/vendor/phpoffice/math/docs/usage/elements/superscript.md
@@ -0,0 +1,61 @@
+## Usage
+
+To attach a superscript to an expression, use the `PhpOffice\Math\Element\Superscript` class.
+
+### Methods
+#### getBase
+
+The method has no parameter.
+
+#### getSuperscript
+
+The method has no parameter.
+
+#### setBase
+
+The method has one parameter : 
+
+* `PhpOffice\Math\Element\AbstractElement` **$element**
+
+#### setSuperscript
+
+The method has one parameter : 
+
+* `PhpOffice\Math\Element\AbstractElement` **$element**
+
+## Example
+
+### Math
+<math display="block">
+  <msup>
+    <mi>X</mi>
+    <mn>2</mn>
+  </msup>
+</math>
+
+### XML
+``` xml
+<math display="block">
+  <msup>
+    <mi>X</mi>
+    <mn>2</mn>
+  </msup>
+</math>
+```
+
+### PHP
+
+``` php
+<?php
+
+use PhpOffice\Math\Element;
+use PhpOffice\Math\Math;
+
+$math = new Math();
+
+$superscript = new Element\Superscript();
+$superscript->setBase(new Element\Identifier('X'));
+$superscript->setSuperscript(new Element\Numeric(2));
+
+$math->add($superscript);
+```
\ No newline at end of file
diff --git a/vendor/phpoffice/math/docs/usage/readers.md b/vendor/phpoffice/math/docs/usage/readers.md
new file mode 100644
index 0000000000..495685767e
--- /dev/null
+++ b/vendor/phpoffice/math/docs/usage/readers.md
@@ -0,0 +1,50 @@
+
+## Readers
+### MathML
+The name of the reader is `MathML`.
+
+``` php
+<?php
+
+use PhpOffice\Math\Reader\MathML;
+
+$reader = new MathML();
+$math = $reader->read(
+   '<?xml version="1.0" encoding="UTF-8"?>
+    <!DOCTYPE math PUBLIC "-//W3C//DTD MathML 2.0//EN" "http://www.w3.org/Math/DTD/mathml2/mathml2.dtd">
+    <math xmlns="http://www.w3.org/1998/Math/MathML">
+        <mi> a </mi>
+    </math>'
+);
+```
+
+### OfficeMathML
+The name of the reader is `OfficeMathML`.
+
+``` php
+<?php
+
+use PhpOffice\Math\Reader\OfficeMathML;
+
+$reader = new OfficeMathML();
+$math = $reader->read(
+   '<m:oMathPara xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math">
+      <m:oMath>
+        <m:f>
+          <m:num><m:r><m:t>π</m:t></m:r></m:num>
+          <m:den><m:r><m:t>2</m:t></m:r></m:den>
+        </m:f>
+      </m:oMath>
+    </m:oMathPara>'
+);
+```
+
+## Methods
+
+### read
+
+The method has one parameter :
+
+* `string` **$content**
+
+The method returns a `PhpOffice\Math\Math` object.
\ No newline at end of file
diff --git a/vendor/phpoffice/math/docs/usage/writers.md b/vendor/phpoffice/math/docs/usage/writers.md
new file mode 100644
index 0000000000..58dbb6af66
--- /dev/null
+++ b/vendor/phpoffice/math/docs/usage/writers.md
@@ -0,0 +1,46 @@
+
+## Writers
+### MathML
+The name of the writer is `MathML`.
+
+``` php
+<?php
+
+use PhpOffice\Math\Element;
+use PhpOffice\Math\Math;
+use PhpOffice\Math\Writer\MathML;
+
+$math = new Math();
+$math->add(new Element\Operator('+'));
+
+$writer = new MathML();
+$output = $writer->write($math);
+```
+
+### OfficeMathML
+
+The name of the writer is `OfficeMathML`.
+
+``` php
+<?php
+
+use PhpOffice\Math\Element;
+use PhpOffice\Math\Math;
+use PhpOffice\Math\Writer\OfficeMathML;
+
+$math = new Math();
+$math->add(new Element\Operator('+'));
+
+$writer = new OfficeMathML();
+$output = $writer->write($math);
+```
+
+## Methods
+
+### writer
+
+The method has one parameter :
+
+* `PhpOffice\Math\Math` **$math**
+
+The method returns a `string`.
\ No newline at end of file
diff --git a/vendor/phpoffice/math/mkdocs.yml b/vendor/phpoffice/math/mkdocs.yml
new file mode 100644
index 0000000000..972d2741b3
--- /dev/null
+++ b/vendor/phpoffice/math/mkdocs.yml
@@ -0,0 +1,64 @@
+site_name: Math
+site_url: https://phpoffice.github.io/Math
+repo_url: https://github.com/PHPOffice/Math
+repo_name: PHPOffice/Math
+edit_uri: edit/master/docs/
+
+## Theme
+theme:
+  name: material
+  palette:
+    primary: grey
+  features:
+    - search.highlight
+    - search.suggest
+
+## Plugins
+plugins:
+  - search
+
+## Config
+extra:
+  generator: false
+extra_javascript:
+  - assets/mathjax.js
+  - https://cdnjs.cloudflare.com/polyfill/v3/polyfill.min.js?version=3.111.0&features=es6
+  - https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js
+markdown_extensions:
+  ## Syntax highlighting
+  - pymdownx.highlight
+  - pymdownx.superfences
+  ## Support for Math
+  - pymdownx.arithmatex:
+      generic: true
+  ## Support for emojis
+  - pymdownx.emoji:
+      emoji_index: !!python/name:materialx.emoji.twemoji
+      emoji_generator: !!python/name:materialx.emoji.to_svg
+  ## Support for call-outs
+  - admonition
+  - pymdownx.details
+use_directory_urls: false
+
+## Navigation
+nav:
+  - Introduction: 'index.md'
+  - Install: 'install.md'
+  - Usage:
+    - Elements: 
+      - Fraction: 'usage/elements/fraction.md'
+      - Identifier: 'usage/elements/identifier.md'
+      - Numeric: 'usage/elements/numeric.md'
+      - Operator: 'usage/elements/operator.md'
+      - Row: 'usage/elements/row.md'
+      - Semantics: 'usage/elements/semantics.md'
+      - Superscript: 'usage/elements/superscript.md'
+    - Readers: 'usage/readers.md'
+    - Writers: 'usage/writers.md'
+  - Credits: 'credits.md'
+  - Releases:
+      - '0.1.0 (WIP)': 'changes/0.1.0.md'
+  - Developers:
+    - 'Coveralls': 'https://coveralls.io/github/PHPOffice/Math'
+    - 'Code Coverage': 'coverage/index.html'
+    - 'PHPDoc': 'docs/index.html'
diff --git a/vendor/phpoffice/math/phpstan.neon.dist b/vendor/phpoffice/math/phpstan.neon.dist
new file mode 100644
index 0000000000..9521cfad1f
--- /dev/null
+++ b/vendor/phpoffice/math/phpstan.neon.dist
@@ -0,0 +1,12 @@
+parameters:
+  level: 7
+  bootstrapFiles:
+    - vendor/autoload.php
+  paths:
+    - src
+    - tests
+  reportUnmatchedIgnoredErrors: false
+  ignoreErrors:
+
+  ## Remove after remove ArrayObject
+  treatPhpDocTypesAsCertain: false
\ No newline at end of file
diff --git a/vendor/phpoffice/math/phpunit.xml.dist b/vendor/phpoffice/math/phpunit.xml.dist
new file mode 100644
index 0000000000..5017e4da3f
--- /dev/null
+++ b/vendor/phpoffice/math/phpunit.xml.dist
@@ -0,0 +1,29 @@
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         bootstrap="./vendor/autoload.php"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false">
+    <testsuites>
+        <testsuite name="PhpOffice\Math Test Suite">
+            <directory>./tests/Math</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist>
+            <directory suffix=".php">./src</directory>
+        </whitelist>
+    </filter>
+    <logging>
+        <log type="coverage-html" target="./build/coverage" />
+        <log type="coverage-clover" target="./build/clover.xml" />
+    </logging>
+    <coverage>
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+    </coverage>
+</phpunit>
\ No newline at end of file
diff --git a/vendor/phpoffice/math/roave-bc-check.yaml b/vendor/phpoffice/math/roave-bc-check.yaml
new file mode 100644
index 0000000000..dd0494d973
--- /dev/null
+++ b/vendor/phpoffice/math/roave-bc-check.yaml
@@ -0,0 +1,4 @@
+parameters:
+    ignoreErrors:
+      # 0.1 has not autoload-dev
+        - '#\[BC\] REMOVED: Class Tests\\PhpOffice\\Math\\.+ has been deleted#'
diff --git a/vendor/phpoffice/math/src/Math/Element/AbstractElement.php b/vendor/phpoffice/math/src/Math/Element/AbstractElement.php
new file mode 100644
index 0000000000..3b1981ced8
--- /dev/null
+++ b/vendor/phpoffice/math/src/Math/Element/AbstractElement.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace PhpOffice\Math\Element;
+
+abstract class AbstractElement
+{
+}
diff --git a/vendor/phpoffice/math/src/Math/Element/AbstractGroupElement.php b/vendor/phpoffice/math/src/Math/Element/AbstractGroupElement.php
new file mode 100644
index 0000000000..4bc925c248
--- /dev/null
+++ b/vendor/phpoffice/math/src/Math/Element/AbstractGroupElement.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace PhpOffice\Math\Element;
+
+abstract class AbstractGroupElement extends AbstractElement
+{
+    /**
+     * @var AbstractElement[]
+     */
+    protected $elements = [];
+
+    public function add(AbstractElement $element): self
+    {
+        $this->elements[] = $element;
+
+        return $this;
+    }
+
+    public function remove(AbstractElement $element): self
+    {
+        $this->elements = array_filter($this->elements, function ($child) use ($element) {
+            return $child != $element;
+        });
+
+        return $this;
+    }
+
+    /**
+     * @return AbstractElement[]
+     */
+    public function getElements(): array
+    {
+        return $this->elements;
+    }
+}
diff --git a/vendor/phpoffice/math/src/Math/Element/Fraction.php b/vendor/phpoffice/math/src/Math/Element/Fraction.php
new file mode 100644
index 0000000000..8812998f24
--- /dev/null
+++ b/vendor/phpoffice/math/src/Math/Element/Fraction.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace PhpOffice\Math\Element;
+
+class Fraction extends AbstractElement
+{
+    /**
+     * @var AbstractElement
+     */
+    protected $denominator;
+
+    /**
+     * @var AbstractElement
+     */
+    protected $numerator;
+
+    public function __construct(AbstractElement $numerator, AbstractElement $denominator)
+    {
+        $this->setNumerator($numerator);
+        $this->setDenominator($denominator);
+    }
+
+    public function getDenominator(): AbstractElement
+    {
+        return $this->denominator;
+    }
+
+    public function getNumerator(): AbstractElement
+    {
+        return $this->numerator;
+    }
+
+    public function setDenominator(AbstractElement $element): self
+    {
+        $this->denominator = $element;
+
+        return $this;
+    }
+
+    public function setNumerator(AbstractElement $element): self
+    {
+        $this->numerator = $element;
+
+        return $this;
+    }
+}
diff --git a/vendor/phpoffice/math/src/Math/Element/Identifier.php b/vendor/phpoffice/math/src/Math/Element/Identifier.php
new file mode 100644
index 0000000000..d2439faad1
--- /dev/null
+++ b/vendor/phpoffice/math/src/Math/Element/Identifier.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace PhpOffice\Math\Element;
+
+class Identifier extends AbstractElement
+{
+    /**
+     * @var string
+     */
+    protected $value;
+
+    public function __construct(string $value)
+    {
+        $this->value = $value;
+    }
+
+    public function getValue(): string
+    {
+        return $this->value;
+    }
+}
diff --git a/vendor/phpoffice/math/src/Math/Element/Numeric.php b/vendor/phpoffice/math/src/Math/Element/Numeric.php
new file mode 100644
index 0000000000..e809e61665
--- /dev/null
+++ b/vendor/phpoffice/math/src/Math/Element/Numeric.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace PhpOffice\Math\Element;
+
+class Numeric extends AbstractElement
+{
+    /**
+     * @var float
+     */
+    protected $value;
+
+    public function __construct(float $value)
+    {
+        $this->value = $value;
+    }
+
+    public function getValue(): float
+    {
+        return $this->value;
+    }
+}
diff --git a/vendor/phpoffice/math/src/Math/Element/Operator.php b/vendor/phpoffice/math/src/Math/Element/Operator.php
new file mode 100644
index 0000000000..e91cc557f0
--- /dev/null
+++ b/vendor/phpoffice/math/src/Math/Element/Operator.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace PhpOffice\Math\Element;
+
+class Operator extends AbstractElement
+{
+    /**
+     * @var string
+     */
+    protected $value;
+
+    public function __construct(string $value)
+    {
+        $this->value = $value;
+    }
+
+    public function getValue(): string
+    {
+        return $this->value;
+    }
+}
diff --git a/vendor/phpoffice/math/src/Math/Element/Row.php b/vendor/phpoffice/math/src/Math/Element/Row.php
new file mode 100644
index 0000000000..cc4722b287
--- /dev/null
+++ b/vendor/phpoffice/math/src/Math/Element/Row.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace PhpOffice\Math\Element;
+
+class Row extends AbstractGroupElement
+{
+}
diff --git a/vendor/phpoffice/math/src/Math/Element/Semantics.php b/vendor/phpoffice/math/src/Math/Element/Semantics.php
new file mode 100644
index 0000000000..be3ec56fb0
--- /dev/null
+++ b/vendor/phpoffice/math/src/Math/Element/Semantics.php
@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpOffice\Math\Element;
+
+class Semantics extends AbstractGroupElement
+{
+    /**
+     * @var array<string, string>
+     */
+    protected $annotations = [];
+
+    public function addAnnotation(string $encoding, string $annotation): self
+    {
+        $this->annotations[$encoding] = $annotation;
+
+        return $this;
+    }
+
+    public function getAnnotation(string $encoding): ?string
+    {
+        return $this->annotations[$encoding] ?? null;
+    }
+
+    /**
+     * @return array<string, string>
+     */
+    public function getAnnotations(): array
+    {
+        return $this->annotations;
+    }
+}
diff --git a/vendor/phpoffice/math/src/Math/Element/Superscript.php b/vendor/phpoffice/math/src/Math/Element/Superscript.php
new file mode 100644
index 0000000000..e3a68cc6cc
--- /dev/null
+++ b/vendor/phpoffice/math/src/Math/Element/Superscript.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace PhpOffice\Math\Element;
+
+class Superscript extends AbstractElement
+{
+    /**
+     * @var AbstractElement
+     */
+    protected $base;
+
+    /**
+     * @var AbstractElement
+     */
+    protected $superscript;
+
+    public function __construct(AbstractElement $base, AbstractElement $superscript)
+    {
+        $this->setBase($base);
+        $this->setSuperscript($superscript);
+    }
+
+    public function getBase(): AbstractElement
+    {
+        return $this->base;
+    }
+
+    public function getSuperscript(): AbstractElement
+    {
+        return $this->superscript;
+    }
+
+    public function setBase(AbstractElement $element): self
+    {
+        $this->base = $element;
+
+        return $this;
+    }
+
+    public function setSuperscript(AbstractElement $element): self
+    {
+        $this->superscript = $element;
+
+        return $this;
+    }
+}
diff --git a/vendor/phpoffice/math/src/Math/Exception/InvalidInputException.php b/vendor/phpoffice/math/src/Math/Exception/InvalidInputException.php
new file mode 100644
index 0000000000..d0bd5fc480
--- /dev/null
+++ b/vendor/phpoffice/math/src/Math/Exception/InvalidInputException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace PhpOffice\Math\Exception;
+
+class InvalidInputException extends MathException
+{
+}
diff --git a/vendor/phpoffice/math/src/Math/Exception/MathException.php b/vendor/phpoffice/math/src/Math/Exception/MathException.php
new file mode 100644
index 0000000000..e065f6f4fd
--- /dev/null
+++ b/vendor/phpoffice/math/src/Math/Exception/MathException.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace PhpOffice\Math\Exception;
+
+use Exception;
+
+class MathException extends Exception
+{
+}
diff --git a/vendor/phpoffice/math/src/Math/Exception/NotImplementedException.php b/vendor/phpoffice/math/src/Math/Exception/NotImplementedException.php
new file mode 100644
index 0000000000..bb6bcd433d
--- /dev/null
+++ b/vendor/phpoffice/math/src/Math/Exception/NotImplementedException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace PhpOffice\Math\Exception;
+
+class NotImplementedException extends MathException
+{
+}
diff --git a/vendor/phpoffice/math/src/Math/Math.php b/vendor/phpoffice/math/src/Math/Math.php
new file mode 100644
index 0000000000..13a0e4c884
--- /dev/null
+++ b/vendor/phpoffice/math/src/Math/Math.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace PhpOffice\Math;
+
+use PhpOffice\Math\Element\AbstractGroupElement;
+
+class Math extends AbstractGroupElement
+{
+}
diff --git a/vendor/phpoffice/math/src/Math/Reader/MathML.php b/vendor/phpoffice/math/src/Math/Reader/MathML.php
new file mode 100644
index 0000000000..58d9393541
--- /dev/null
+++ b/vendor/phpoffice/math/src/Math/Reader/MathML.php
@@ -0,0 +1,139 @@
+<?php
+
+namespace PhpOffice\Math\Reader;
+
+use DOMDocument;
+use DOMElement;
+use DOMNode;
+use DOMXPath;
+use PhpOffice\Math\Element;
+use PhpOffice\Math\Exception\InvalidInputException;
+use PhpOffice\Math\Exception\NotImplementedException;
+use PhpOffice\Math\Math;
+
+class MathML implements ReaderInterface
+{
+    /** @var Math */
+    private $math;
+
+    /** @var DOMDocument */
+    private $dom;
+
+    /** @var DOMXPath */
+    private $xpath;
+
+    public function read(string $content): ?Math
+    {
+        $content = str_replace(
+            [
+                '&InvisibleTimes;',
+            ],
+            [
+                '<mchar name="InvisibleTimes"/>',
+            ],
+            $content
+        );
+
+        $this->dom = new DOMDocument();
+        $this->dom->loadXML($content, LIBXML_DTDLOAD);
+
+        $this->math = new Math();
+        $this->parseNode(null, $this->math);
+
+        return $this->math;
+    }
+
+    /**
+     * @param Math|Element\AbstractGroupElement $parent
+     */
+    protected function parseNode(?DOMNode $nodeRowElement, $parent): void
+    {
+        $this->xpath = new DOMXPath($this->dom);
+        foreach ($this->xpath->query('*', $nodeRowElement) ?: [] as $nodeElement) {
+            if ($parent instanceof Element\Semantics
+                && $nodeElement instanceof DOMElement
+                && $nodeElement->nodeName == 'annotation') {
+                $parent->addAnnotation(
+                    $nodeElement->getAttribute('encoding'),
+                    trim($nodeElement->nodeValue)
+                );
+
+                continue;
+            }
+
+            $parent->add($this->getElement($nodeElement));
+        }
+    }
+
+    protected function getElement(DOMNode $nodeElement): Element\AbstractElement
+    {
+        $nodeValue = trim($nodeElement->nodeValue);
+        switch ($nodeElement->nodeName) {
+            case 'mfrac':
+                $nodeList = $this->xpath->query('*', $nodeElement);
+                if ($nodeList && $nodeList->length == 2) {
+                    return new Element\Fraction(
+                        $this->getElement($nodeList->item(0)),
+                        $this->getElement($nodeList->item(1))
+                    );
+                }
+
+                throw new InvalidInputException(sprintf(
+                    '%s : The tag `%s` has not two subelements',
+                    __METHOD__,
+                    $nodeElement->nodeName
+                ));
+            case 'mi':
+                return new Element\Identifier($nodeValue);
+            case 'mn':
+                return new Element\Numeric(floatval($nodeValue));
+            case 'mo':
+                if (empty($nodeValue)) {
+                    $nodeList = $this->xpath->query('*', $nodeElement);
+                    if (
+                        $nodeList
+                        && $nodeList->length == 1
+                        && $nodeList->item(0)->nodeName == 'mchar'
+                        && $nodeList->item(0) instanceof DOMElement
+                        && $nodeList->item(0)->hasAttribute('name')
+                    ) {
+                        $nodeValue = $nodeList->item(0)->getAttribute('name');
+                    }
+                }
+
+                return new Element\Operator($nodeValue);
+            case 'mrow':
+                $mrow = new Element\Row();
+
+                $this->parseNode($nodeElement, $mrow);
+
+                return $mrow;
+            case 'msup':
+                $nodeList = $this->xpath->query('*', $nodeElement);
+                if ($nodeList && $nodeList->length == 2) {
+                    return new Element\Superscript(
+                        $this->getElement($nodeList->item(0)),
+                        $this->getElement($nodeList->item(1))
+                    );
+                }
+
+                throw new InvalidInputException(sprintf(
+                    '%s : The tag `%s` has not two subelements',
+                    __METHOD__,
+                    $nodeElement->nodeName
+                ));
+            case 'semantics':
+                $semantics = new Element\Semantics();
+
+                $this->parseNode($nodeElement, $semantics);
+
+                return $semantics;
+            default:
+                throw new NotImplementedException(sprintf(
+                    '%s : The tag `%s` is not implemented',
+                    __METHOD__,
+                    $nodeElement->nodeName
+                ));
+        }
+    }
+}
diff --git a/vendor/phpoffice/math/src/Math/Reader/OfficeMathML.php b/vendor/phpoffice/math/src/Math/Reader/OfficeMathML.php
new file mode 100644
index 0000000000..9cc3f73317
--- /dev/null
+++ b/vendor/phpoffice/math/src/Math/Reader/OfficeMathML.php
@@ -0,0 +1,133 @@
+<?php
+
+namespace PhpOffice\Math\Reader;
+
+use DOMDocument;
+use DOMNode;
+use DOMXPath;
+use PhpOffice\Math\Element;
+use PhpOffice\Math\Exception\InvalidInputException;
+use PhpOffice\Math\Exception\NotImplementedException;
+use PhpOffice\Math\Math;
+
+class OfficeMathML implements ReaderInterface
+{
+    /** @var DOMDocument */
+    protected $dom;
+
+    /** @var Math */
+    protected $math;
+
+    /** @var DOMXPath */
+    protected $xpath;
+
+    /** @var string[] */
+    protected $operators = ['+', '-', '/', '∗'];
+
+    public function read(string $content): ?Math
+    {
+        $nsMath = 'xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math"';
+        $nsWord = 'xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"';
+
+        $content = str_replace(
+            $nsMath,
+            $nsMath . ' ' . $nsWord,
+            $content
+        );
+
+        $this->dom = new DOMDocument();
+        $this->dom->loadXML($content);
+
+        $this->math = new Math();
+        $this->parseNode(null, $this->math);
+
+        return $this->math;
+    }
+
+    /**
+     * @see https://devblogs.microsoft.com/math-in-office/officemath/
+     * @see https://learn.microsoft.com/fr-fr/archive/blogs/murrays/mathml-and-ecma-math-omml
+     *
+     * @param Math|Element\AbstractGroupElement $parent
+     */
+    protected function parseNode(?DOMNode $nodeRowElement, $parent): void
+    {
+        $this->xpath = new DOMXPath($this->dom);
+        foreach ($this->xpath->query('*', $nodeRowElement) ?: [] as $nodeElement) {
+            $element = $this->getElement($nodeElement);
+            $parent->add($element);
+
+            if ($element instanceof Element\AbstractGroupElement) {
+                $this->parseNode($nodeElement, $element);
+            }
+        }
+    }
+
+    protected function getElement(DOMNode $nodeElement): Element\AbstractElement
+    {
+        switch ($nodeElement->nodeName) {
+            case 'm:f':
+                // Numerator
+                $nodeNumerator = $this->xpath->query('m:num/m:r/m:t', $nodeElement);
+                if ($nodeNumerator && $nodeNumerator->length == 1) {
+                    $value = $nodeNumerator->item(0)->nodeValue;
+                    if (is_numeric($value)) {
+                        $numerator = new Element\Numeric(floatval($value));
+                    } else {
+                        $numerator = new Element\Identifier($value);
+                    }
+                } else {
+                    throw new InvalidInputException(sprintf(
+                        '%s : The tag `%s` has no numerator defined',
+                        __METHOD__,
+                        $nodeElement->nodeName
+                    ));
+                }
+                // Denominator
+                $nodeDenominator = $this->xpath->query('m:den/m:r/m:t', $nodeElement);
+                if ($nodeDenominator && $nodeDenominator->length == 1) {
+                    $value = $nodeDenominator->item(0)->nodeValue;
+                    if (is_numeric($value)) {
+                        $denominator = new Element\Numeric(floatval($value));
+                    } else {
+                        $denominator = new Element\Identifier($value);
+                    }
+                } else {
+                    throw new InvalidInputException(sprintf(
+                        '%s : The tag `%s` has no denominator defined',
+                        __METHOD__,
+                        $nodeElement->nodeName
+                    ));
+                }
+
+                return new Element\Fraction($numerator, $denominator);
+            case 'm:r':
+                $nodeText = $this->xpath->query('m:t', $nodeElement);
+                if ($nodeText && $nodeText->length == 1) {
+                    $value = trim($nodeText->item(0)->nodeValue);
+                    if (in_array($value, $this->operators)) {
+                        return new Element\Operator($value);
+                    }
+                    if (is_numeric($value)) {
+                        return new Element\Numeric(floatval($value));
+                    }
+
+                    return new Element\Identifier($value);
+                }
+
+                throw new InvalidInputException(sprintf(
+                    '%s : The tag `%s` has no tag `m:t` defined',
+                    __METHOD__,
+                    $nodeElement->nodeName
+                ));
+            case 'm:oMath':
+                return new Element\Row();
+            default:
+                throw new NotImplementedException(sprintf(
+                    '%s : The tag `%s` is not implemented',
+                    __METHOD__,
+                    $nodeElement->nodeName
+                ));
+        }
+    }
+}
diff --git a/vendor/phpoffice/math/src/Math/Reader/ReaderInterface.php b/vendor/phpoffice/math/src/Math/Reader/ReaderInterface.php
new file mode 100644
index 0000000000..6816c63590
--- /dev/null
+++ b/vendor/phpoffice/math/src/Math/Reader/ReaderInterface.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace PhpOffice\Math\Reader;
+
+use PhpOffice\Math\Math;
+
+interface ReaderInterface
+{
+    public function read(string $content): ?Math;
+}
diff --git a/vendor/phpoffice/math/src/Math/Writer/MathML.php b/vendor/phpoffice/math/src/Math/Writer/MathML.php
new file mode 100644
index 0000000000..d8905f00a3
--- /dev/null
+++ b/vendor/phpoffice/math/src/Math/Writer/MathML.php
@@ -0,0 +1,131 @@
+<?php
+
+namespace PhpOffice\Math\Writer;
+
+use PhpOffice\Math\Element;
+use PhpOffice\Math\Exception\NotImplementedException;
+use PhpOffice\Math\Math;
+use XMLWriter;
+
+class MathML implements WriterInterface
+{
+    /** @var XMLWriter */
+    private $output;
+
+    /**
+     * @param Math $math
+     *
+     * @return string
+     */
+    public function write(Math $math): string
+    {
+        $this->output = new XMLWriter();
+        $this->output->openMemory();
+        $this->output->startDocument('1.0', 'UTF-8');
+        $this->output->writeDtd('math', '-//W3C//DTD MathML 2.0//EN', 'http://www.w3.org/Math/DTD/mathml2/mathml2.dtd');
+        $this->output->startElement('math');
+        $this->output->writeAttribute('xmlns', 'http://www.w3.org/1998/Math/MathML');
+
+        foreach ($math->getElements() as $element) {
+            $this->writeElementItem($element);
+        }
+
+        $this->output->endElement();
+        $this->output->endDocument();
+
+        return $this->output->outputMemory();
+    }
+
+    protected function writeElementItem(Element\AbstractElement $element): void
+    {
+        $tagName = $this->getElementTagName($element);
+
+        // Element\AbstractGroupElement
+        if ($element instanceof Element\AbstractGroupElement) {
+            $this->output->startElement($tagName);
+            foreach ($element->getElements() as $childElement) {
+                $this->writeElementItem($childElement);
+            }
+            $this->output->endElement();
+
+            return;
+        }
+
+        // Element\Superscript
+        if ($element instanceof Element\Superscript) {
+            $this->output->startElement($tagName);
+            $this->writeElementItem($element->getBase());
+            $this->writeElementItem($element->getSuperscript());
+            $this->output->endElement();
+
+            return;
+        }
+
+        // Element\Fraction
+        if ($element instanceof Element\Fraction) {
+            $this->output->startElement($tagName);
+            $this->writeElementItem($element->getNumerator());
+            $this->writeElementItem($element->getDenominator());
+            $this->output->endElement();
+
+            return;
+        }
+
+        if ($element instanceof Element\Identifier
+          || $element instanceof Element\Numeric
+          || $element instanceof Element\Operator) {
+            $this->output->startElement($tagName);
+            $this->output->text((string) $element->getValue());
+            $this->output->endElement();
+
+            return;
+        }
+
+        /*
+        throw new NotImplementedException(sprintf(
+            '%s : The class `%s` is not implemented',
+            __METHOD__,
+            get_class($element)
+        ));
+        */
+    }
+
+    protected function getElementTagName(Element\AbstractElement $element): string
+    {
+        // Group
+        if ($element instanceof Element\Row) {
+            return 'mrow';
+        }
+        if ($element instanceof Element\AbstractGroupElement) {
+            /*
+            throw new NotImplementedException(sprintf(
+                '%s : The element of the class `%s` has no tag name',
+                __METHOD__,
+                get_class($element)
+            ));
+            */
+        }
+
+        if ($element instanceof Element\Superscript) {
+            return 'msup';
+        }
+        if ($element instanceof Element\Fraction) {
+            return 'mfrac';
+        }
+        if ($element instanceof Element\Identifier) {
+            return 'mi';
+        }
+        if ($element instanceof Element\Numeric) {
+            return 'mn';
+        }
+        if ($element instanceof Element\Operator) {
+            return 'mo';
+        }
+
+        throw new NotImplementedException(sprintf(
+            '%s : The element of the class `%s` has no tag name',
+            __METHOD__,
+            get_class($element)
+        ));
+    }
+}
diff --git a/vendor/phpoffice/math/src/Math/Writer/OfficeMathML.php b/vendor/phpoffice/math/src/Math/Writer/OfficeMathML.php
new file mode 100644
index 0000000000..e06b8f4cc0
--- /dev/null
+++ b/vendor/phpoffice/math/src/Math/Writer/OfficeMathML.php
@@ -0,0 +1,102 @@
+<?php
+
+namespace PhpOffice\Math\Writer;
+
+use PhpOffice\Math\Element;
+use PhpOffice\Math\Exception\NotImplementedException;
+use PhpOffice\Math\Math;
+use XMLWriter;
+
+class OfficeMathML implements WriterInterface
+{
+    /** @var XMLWriter */
+    private $output;
+
+    /**
+     * @param Math $math
+     *
+     * @return string
+     */
+    public function write(Math $math): string
+    {
+        $this->output = new XMLWriter();
+        $this->output->openMemory();
+        $this->output->startElement('m:oMathPara');
+        $this->output->writeAttribute('xmlns:m', 'http://schemas.openxmlformats.org/officeDocument/2006/math');
+        $this->output->startElement('m:oMath');
+
+        foreach ($math->getElements() as $element) {
+            $this->writeElementItem($element);
+        }
+
+        $this->output->endElement();
+        $this->output->endElement();
+
+        return $this->output->outputMemory();
+    }
+
+    protected function writeElementItem(Element\AbstractElement $element): void
+    {
+        // Element\Row
+        if ($element instanceof Element\Row) {
+            foreach ($element->getElements() as $childElement) {
+                $this->writeElementItem($childElement);
+            }
+
+            return;
+        }
+
+        // Element\Fraction
+        if ($element instanceof Element\Fraction) {
+            $this->output->startElement($this->getElementTagName($element));
+            $this->output->startElement('m:num');
+            $this->writeElementItem($element->getNumerator());
+            $this->output->endElement();
+            $this->output->startElement('m:den');
+            $this->writeElementItem($element->getDenominator());
+            $this->output->endElement();
+            $this->output->endElement();
+
+            return;
+        }
+
+        if ($element instanceof Element\Identifier
+          || $element instanceof Element\Numeric
+          || $element instanceof Element\Operator) {
+            $this->output->startElement('m:r');
+            $this->output->startElement('m:t');
+            $this->output->text((string) $element->getValue());
+            $this->output->endElement();
+            $this->output->endElement();
+
+            return;
+        }
+
+        // Check if managed
+        $this->getElementTagName($element);
+    }
+
+    protected function getElementTagName(Element\AbstractElement $element): string
+    {
+        // Group
+        if ($element instanceof Element\AbstractGroupElement) {
+            /*
+            throw new NotImplementedException(sprintf(
+                '%s : The element of the class `%s` has no tag name',
+                __METHOD__,
+                get_class($element)
+            ));
+            */
+        }
+
+        if ($element instanceof Element\Fraction) {
+            return 'm:f';
+        }
+
+        throw new NotImplementedException(sprintf(
+            '%s : The element of the class `%s` has no tag name',
+            __METHOD__,
+            get_class($element)
+        ));
+    }
+}
diff --git a/vendor/phpoffice/math/src/Math/Writer/WriterInterface.php b/vendor/phpoffice/math/src/Math/Writer/WriterInterface.php
new file mode 100644
index 0000000000..5ef5f29e38
--- /dev/null
+++ b/vendor/phpoffice/math/src/Math/Writer/WriterInterface.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace PhpOffice\Math\Writer;
+
+use PhpOffice\Math\Math;
+
+interface WriterInterface
+{
+    public function write(Math $math): string;
+}
diff --git a/vendor/phpoffice/math/tests/Math/Element/AbstractGroupElementTest.php b/vendor/phpoffice/math/tests/Math/Element/AbstractGroupElementTest.php
new file mode 100644
index 0000000000..c192e2fa38
--- /dev/null
+++ b/vendor/phpoffice/math/tests/Math/Element/AbstractGroupElementTest.php
@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\PhpOffice\Math\Element;
+
+use PhpOffice\Math\Element;
+use PHPUnit\Framework\TestCase;
+
+class AbstractGroupElementTest extends TestCase
+{
+    public function testConstruct(): void
+    {
+        $row = new Element\Row();
+
+        $this->assertIsArray($row->getElements());
+        $this->assertCount(0, $row->getElements());
+    }
+
+    public function testAdd(): void
+    {
+        $identifierA = new Element\Identifier('a');
+        $row = new Element\Row();
+
+        $this->assertCount(0, $row->getElements());
+
+        $this->assertInstanceOf(Element\AbstractGroupElement::class, $row->add($identifierA));
+
+        $this->assertCount(1, $row->getElements());
+        $this->assertEquals([$identifierA], $row->getElements());
+    }
+
+    public function testRemove(): void
+    {
+        $identifierA = new Element\Identifier('a');
+
+        $row = new Element\Row();
+        $row->add($identifierA);
+
+        $this->assertCount(1, $row->getElements());
+
+        $this->assertInstanceOf(Element\AbstractGroupElement::class, $row->remove($identifierA));
+
+        $this->assertCount(0, $row->getElements());
+    }
+}
diff --git a/vendor/phpoffice/math/tests/Math/Element/FractionTest.php b/vendor/phpoffice/math/tests/Math/Element/FractionTest.php
new file mode 100644
index 0000000000..61b5224066
--- /dev/null
+++ b/vendor/phpoffice/math/tests/Math/Element/FractionTest.php
@@ -0,0 +1,49 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\PhpOffice\Math\Element;
+
+use PhpOffice\Math\Element;
+use PhpOffice\Math\Element\Fraction;
+use PHPUnit\Framework\TestCase;
+
+class FractionTest extends TestCase
+{
+    public function testConstruct(): void
+    {
+        $identifierA = new Element\Identifier('a');
+        $identifierB = new Element\Identifier('b');
+
+        $fraction = new Fraction($identifierA, $identifierB);
+
+        $this->assertEquals($identifierA, $fraction->getNumerator());
+        $this->assertEquals($identifierB, $fraction->getDenominator());
+    }
+
+    public function testBase(): void
+    {
+        $identifierA = new Element\Identifier('a');
+        $identifierB = new Element\Identifier('b');
+        $identifierC = new Element\Identifier('c');
+
+        $fraction = new Fraction($identifierA, $identifierB);
+
+        $this->assertEquals($identifierA, $fraction->getNumerator());
+        $this->assertInstanceOf(Fraction::class, $fraction->setNumerator($identifierC));
+        $this->assertEquals($identifierC, $fraction->getNumerator());
+    }
+
+    public function testFraction(): void
+    {
+        $identifierA = new Element\Identifier('a');
+        $identifierB = new Element\Identifier('b');
+        $identifierC = new Element\Identifier('c');
+
+        $fraction = new Fraction($identifierA, $identifierB);
+
+        $this->assertEquals($identifierB, $fraction->getDenominator());
+        $this->assertInstanceOf(Fraction::class, $fraction->setDenominator($identifierC));
+        $this->assertEquals($identifierC, $fraction->getDenominator());
+    }
+}
diff --git a/vendor/phpoffice/math/tests/Math/Element/IdentifierTest.php b/vendor/phpoffice/math/tests/Math/Element/IdentifierTest.php
new file mode 100644
index 0000000000..ed5c9faf88
--- /dev/null
+++ b/vendor/phpoffice/math/tests/Math/Element/IdentifierTest.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\PhpOffice\Math\Element;
+
+use PhpOffice\Math\Element\Identifier;
+use PHPUnit\Framework\TestCase;
+
+class IdentifierTest extends TestCase
+{
+    public function testConstruct(): void
+    {
+        $operator = new Identifier('x');
+
+        $this->assertEquals('x', $operator->getValue());
+    }
+}
diff --git a/vendor/phpoffice/math/tests/Math/Element/NumericTest.php b/vendor/phpoffice/math/tests/Math/Element/NumericTest.php
new file mode 100644
index 0000000000..ac64927496
--- /dev/null
+++ b/vendor/phpoffice/math/tests/Math/Element/NumericTest.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\PhpOffice\Math\Element;
+
+use PhpOffice\Math\Element\Numeric;
+use PHPUnit\Framework\TestCase;
+
+class NumericTest extends TestCase
+{
+    public function testConstruct(): void
+    {
+        $numeric = new Numeric(2);
+
+        $this->assertEquals(2, $numeric->getValue());
+    }
+}
diff --git a/vendor/phpoffice/math/tests/Math/Element/OperatorTest.php b/vendor/phpoffice/math/tests/Math/Element/OperatorTest.php
new file mode 100644
index 0000000000..8ce6f08b67
--- /dev/null
+++ b/vendor/phpoffice/math/tests/Math/Element/OperatorTest.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\PhpOffice\Math\Element;
+
+use PhpOffice\Math\Element\Operator;
+use PHPUnit\Framework\TestCase;
+
+class OperatorTest extends TestCase
+{
+    public function testConstruct(): void
+    {
+        $operator = new Operator('+');
+
+        $this->assertEquals('+', $operator->getValue());
+    }
+}
diff --git a/vendor/phpoffice/math/tests/Math/Element/SemanticsTest.php b/vendor/phpoffice/math/tests/Math/Element/SemanticsTest.php
new file mode 100644
index 0000000000..0ab4cc9c13
--- /dev/null
+++ b/vendor/phpoffice/math/tests/Math/Element/SemanticsTest.php
@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\PhpOffice\Math\Element;
+
+use PhpOffice\Math\Element\Semantics;
+use PHPUnit\Framework\TestCase;
+
+class SemanticsTest extends TestCase
+{
+    public function testConstruct(): void
+    {
+        $semantics = new Semantics();
+
+        $this->assertIsArray($semantics->getAnnotations());
+        $this->assertCount(0, $semantics->getAnnotations());
+    }
+
+    public function testAnnotation(): void
+    {
+        $semantics = new Semantics();
+
+        $this->assertIsArray($semantics->getAnnotations());
+        $this->assertCount(0, $semantics->getAnnotations());
+
+        $this->assertInstanceOf(Semantics::class, $semantics->addAnnotation('encoding', 'content'));
+        $this->assertEquals(['encoding' => 'content'], $semantics->getAnnotations());
+        $this->assertCount(1, $semantics->getAnnotations());
+
+        $this->assertEquals('content', $semantics->getAnnotation('encoding'));
+        $this->assertNull($semantics->getAnnotation('notexisting'));
+    }
+}
diff --git a/vendor/phpoffice/math/tests/Math/Element/SuperscriptTest.php b/vendor/phpoffice/math/tests/Math/Element/SuperscriptTest.php
new file mode 100644
index 0000000000..2080b774d2
--- /dev/null
+++ b/vendor/phpoffice/math/tests/Math/Element/SuperscriptTest.php
@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\PhpOffice\Math\Element;
+
+use PhpOffice\Math\Element;
+use PhpOffice\Math\Element\Superscript;
+use PHPUnit\Framework\TestCase;
+
+class SuperscriptTest extends TestCase
+{
+    public function testConstruct(): void
+    {
+        $superscript = new Superscript(new Element\Identifier('a'), new Element\Identifier('a'));
+
+        $this->assertInstanceOf(Element\Identifier::class, $superscript->getBase());
+        $this->assertInstanceOf(Element\Identifier::class, $superscript->getSuperscript());
+    }
+
+    public function testBase(): void
+    {
+        $identifierA = new Element\Identifier('a');
+        $identifierB = new Element\Identifier('b');
+        $identifierC = new Element\Identifier('c');
+
+        $superscript = new Superscript($identifierA, $identifierB);
+
+        $this->assertEquals($identifierA, $superscript->getBase());
+        $this->assertInstanceOf(Superscript::class, $superscript->setBase($identifierC));
+        $this->assertEquals($identifierC, $superscript->getBase());
+    }
+
+    public function testSuperscript(): void
+    {
+        $identifierA = new Element\Identifier('a');
+        $identifierB = new Element\Identifier('b');
+        $identifierC = new Element\Identifier('c');
+
+        $superscript = new Superscript($identifierA, $identifierB);
+
+        $this->assertEquals($identifierB, $superscript->getSuperscript());
+        $this->assertInstanceOf(Superscript::class, $superscript->setSuperscript($identifierC));
+        $this->assertEquals($identifierC, $superscript->getSuperscript());
+    }
+}
diff --git a/vendor/phpoffice/math/tests/Math/Reader/MathMLTest.php b/vendor/phpoffice/math/tests/Math/Reader/MathMLTest.php
new file mode 100644
index 0000000000..db9b174a47
--- /dev/null
+++ b/vendor/phpoffice/math/tests/Math/Reader/MathMLTest.php
@@ -0,0 +1,297 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\PhpOffice\Math\Reader;
+
+use PhpOffice\Math\Element;
+use PhpOffice\Math\Exception\InvalidInputException;
+use PhpOffice\Math\Exception\NotImplementedException;
+use PhpOffice\Math\Math;
+use PhpOffice\Math\Reader\MathML;
+use PHPUnit\Framework\TestCase;
+
+class MathMLTest extends TestCase
+{
+    public function testReadBasic(): void
+    {
+        $content = '<?xml version="1.0" encoding="UTF-8"?>
+        <!DOCTYPE math PUBLIC "-//W3C//DTD MathML 2.0//EN" "http://www.w3.org/Math/DTD/mathml2/mathml2.dtd">
+        <math xmlns="http://www.w3.org/1998/Math/MathML">
+            <mrow>
+                <mi>a</mi> <mo>&InvisibleTimes;</mo> <msup><mi>x</mi><mn>2</mn></msup>
+                <mo>+</mo><mi>b</mi><mo>&InvisibleTimes;</mo><mi>x</mi>
+                <mo>+</mo><mi>c</mi>
+            </mrow>
+        </math>';
+
+        $reader = new MathML();
+        $math = $reader->read($content);
+        $this->assertInstanceOf(Math::class, $math);
+
+        $elements = $math->getElements();
+        $this->assertCount(1, $elements);
+        $this->assertInstanceOf(Element\Row::class, $elements[0]);
+
+        /** @var Element\Row $element */
+        $element = $elements[0];
+        $subElements = $element->getElements();
+        $this->assertCount(9, $subElements);
+
+        /** @var Element\Identifier $subElement */
+        $subElement = $subElements[0];
+        $this->assertInstanceOf(Element\Identifier::class, $subElement);
+        $this->assertEquals('a', $subElement->getValue());
+
+        /** @var Element\Identifier $subElement */
+        $subElement = $subElements[1];
+        $this->assertInstanceOf(Element\Operator::class, $subElement);
+        $this->assertEquals('InvisibleTimes', $subElement->getValue());
+
+        /** @var Element\Superscript $subElement */
+        $subElement = $subElements[2];
+        $this->assertInstanceOf(Element\Superscript::class, $subElements[2]);
+
+        /** @var Element\Identifier $base */
+        $base = $subElement->getBase();
+        $this->assertInstanceOf(Element\Identifier::class, $base);
+        $this->assertEquals('x', $base->getValue());
+
+        /** @var Element\Numeric $superscript */
+        $superscript = $subElement->getSuperscript();
+        $this->assertInstanceOf(Element\Numeric::class, $superscript);
+        $this->assertEquals(2, $superscript->getValue());
+
+        /** @var Element\Operator $subElement */
+        $subElement = $subElements[3];
+        $this->assertInstanceOf(Element\Operator::class, $subElement);
+        $this->assertEquals('+', $subElement->getValue());
+
+        /** @var Element\Identifier $subElement */
+        $subElement = $subElements[4];
+        $this->assertInstanceOf(Element\Identifier::class, $subElement);
+        $this->assertEquals('b', $subElement->getValue());
+
+        /** @var Element\Operator $subElement */
+        $subElement = $subElements[5];
+        $this->assertInstanceOf(Element\Operator::class, $subElement);
+        $this->assertEquals('InvisibleTimes', $subElement->getValue());
+
+        /** @var Element\Identifier $subElement */
+        $subElement = $subElements[6];
+        $this->assertInstanceOf(Element\Identifier::class, $subElement);
+        $this->assertEquals('x', $subElement->getValue());
+
+        /** @var Element\Operator $subElement */
+        $subElement = $subElements[7];
+        $this->assertInstanceOf(Element\Operator::class, $subElement);
+        $this->assertEquals('+', $subElement->getValue());
+
+        /** @var Element\Identifier $subElement */
+        $subElement = $subElements[8];
+        $this->assertInstanceOf(Element\Identifier::class, $subElement);
+        $this->assertEquals('c', $subElement->getValue());
+    }
+
+    public function testReadFraction(): void
+    {
+        $content = '<?xml version="1.0" encoding="UTF-8"?>
+        <!DOCTYPE math PUBLIC "-//W3C//DTD MathML 2.0//EN" "http://www.w3.org/Math/DTD/mathml2/mathml2.dtd">
+        <math xmlns="http://www.w3.org/1998/Math/MathML">
+            <mfrac bevelled="true">
+                <mfrac>
+                    <mi> a </mi>
+                    <mi> b </mi>
+                </mfrac>
+                <mfrac>
+                    <mi> c </mi>
+                    <mi> d </mi>
+                </mfrac>
+            </mfrac>
+        </math>';
+
+        $reader = new MathML();
+        $math = $reader->read($content);
+        $this->assertInstanceOf(Math::class, $math);
+
+        $elements = $math->getElements();
+        $this->assertCount(1, $elements);
+        $this->assertInstanceOf(Element\Fraction::class, $elements[0]);
+
+        /** @var Element\Fraction $element */
+        $element = $elements[0];
+
+        $this->assertInstanceOf(Element\Fraction::class, $element->getNumerator());
+        /** @var Element\Fraction $subElement */
+        $subElement = $element->getNumerator();
+
+        /** @var Element\Identifier $numerator */
+        $numerator = $subElement->getNumerator();
+        $this->assertInstanceOf(Element\Identifier::class, $numerator);
+        $this->assertEquals('a', $numerator->getValue());
+        /** @var Element\Identifier $denominator */
+        $denominator = $subElement->getDenominator();
+        $this->assertInstanceOf(Element\Identifier::class, $denominator);
+        $this->assertEquals('b', $denominator->getValue());
+
+        $this->assertInstanceOf(Element\Fraction::class, $element->getDenominator());
+        /** @var Element\Fraction $subElement */
+        $subElement = $element->getDenominator();
+
+        /** @var Element\Identifier $numerator */
+        $numerator = $subElement->getNumerator();
+        $this->assertInstanceOf(Element\Identifier::class, $numerator);
+        $this->assertEquals('c', $numerator->getValue());
+        /** @var Element\Identifier $denominator */
+        $denominator = $subElement->getDenominator();
+        $this->assertInstanceOf(Element\Identifier::class, $denominator);
+        $this->assertEquals('d', $denominator->getValue());
+    }
+
+    public function testReadFractionInvalid(): void
+    {
+        $this->expectException(InvalidInputException::class);
+        $this->expectExceptionMessage('PhpOffice\Math\Reader\MathML::getElement : The tag `mfrac` has not two subelements');
+
+        $content = '<?xml version="1.0" encoding="UTF-8"?>
+        <!DOCTYPE math PUBLIC "-//W3C//DTD MathML 2.0//EN" "http://www.w3.org/Math/DTD/mathml2/mathml2.dtd">
+        <math xmlns="http://www.w3.org/1998/Math/MathML">
+            <mfrac>
+                <mi> a </mi>
+            </mfrac>
+        </math>';
+
+        $reader = new MathML();
+        $math = $reader->read($content);
+    }
+
+    public function testReadFractionWithRow(): void
+    {
+        $content = '<?xml version="1.0" encoding="UTF-8"?>
+        <!DOCTYPE math PUBLIC "-//W3C//DTD MathML 2.0//EN" "http://www.w3.org/Math/DTD/mathml2/mathml2.dtd">
+        <math xmlns="http://www.w3.org/1998/Math/MathML">
+            <mfrac>
+                <mrow>
+                    <mn>3</mn>
+                    <mo>-</mo>
+                    <mi>x</mi>
+                </mrow>
+                <mn>2</mn>
+            </mfrac>
+        </math>';
+
+        $reader = new MathML();
+        $math = $reader->read($content);
+        $this->assertInstanceOf(Math::class, $math);
+
+        $elements = $math->getElements();
+        $this->assertCount(1, $elements);
+        $this->assertInstanceOf(Element\Fraction::class, $elements[0]);
+
+        /** @var Element\Fraction $element */
+        $element = $elements[0];
+
+        $this->assertInstanceOf(Element\Row::class, $element->getNumerator());
+        /** @var Element\Row $subElement */
+        $subElement = $element->getNumerator();
+
+        $subsubElements = $subElement->getElements();
+        $this->assertCount(3, $subsubElements);
+
+        /** @var Element\Numeric $subsubElement */
+        $subsubElement = $subsubElements[0];
+        $this->assertInstanceOf(Element\Numeric::class, $subsubElement);
+        $this->assertEquals('3', $subsubElement->getValue());
+
+        /** @var Element\Operator $subsubElement */
+        $subsubElement = $subsubElements[1];
+        $this->assertInstanceOf(Element\Operator::class, $subsubElement);
+        $this->assertEquals('-', $subsubElement->getValue());
+
+        /** @var Element\Identifier $subsubElement */
+        $subsubElement = $subsubElements[2];
+        $this->assertInstanceOf(Element\Identifier::class, $subsubElement);
+        $this->assertEquals('x', $subsubElement->getValue());
+
+        $this->assertInstanceOf(Element\Numeric::class, $element->getDenominator());
+        /** @var Element\Numeric $subElement */
+        $subElement = $element->getDenominator();
+        $this->assertEquals('2', $subElement->getValue());
+    }
+
+    public function testReadSuperscriptInvalid(): void
+    {
+        $this->expectException(InvalidInputException::class);
+        $this->expectExceptionMessage('PhpOffice\Math\Reader\MathML::getElement : The tag `msup` has not two subelements');
+
+        $content = '<?xml version="1.0" encoding="UTF-8"?>
+        <!DOCTYPE math PUBLIC "-//W3C//DTD MathML 2.0//EN" "http://www.w3.org/Math/DTD/mathml2/mathml2.dtd">
+        <math xmlns="http://www.w3.org/1998/Math/MathML">
+            <msup>
+                <mi> a </mi>
+            </msup>
+        </math>';
+
+        $reader = new MathML();
+        $math = $reader->read($content);
+    }
+
+    public function testReadSemantics(): void
+    {
+        $content = '<?xml version="1.0" encoding="UTF-8"?>
+        <math xmlns="http://www.w3.org/1998/Math/MathML" display="block">
+            <semantics>
+                <mrow>
+                    <mfrac>
+                        <mi>π</mi>
+                        <mn>2</mn>
+                    </mfrac>
+                    <mo stretchy="false">+</mo>
+                    <mrow>
+                        <mi>a</mi>
+                        <mo stretchy="false">∗</mo>
+                        <mn>2</mn>
+                    </mrow>
+                </mrow>
+                <annotation encoding="StarMath 5.0">{π} over {2}  + { a } * 2 </annotation>
+            </semantics>
+        </math>';
+
+        $reader = new MathML();
+        $math = $reader->read($content);
+        $this->assertInstanceOf(Math::class, $math);
+
+        $elements = $math->getElements();
+        $this->assertCount(1, $elements);
+        $this->assertInstanceOf(Element\Semantics::class, $elements[0]);
+
+        /** @var Element\Semantics $element */
+        $element = $elements[0];
+
+        // Check MathML
+        $subElements = $element->getElements();
+        $this->assertCount(1, $subElements);
+        $this->assertInstanceOf(Element\Row::class, $subElements[0]);
+
+        // Check Annotation
+        $this->assertCount(1, $element->getAnnotations());
+        $this->assertEquals('{π} over {2}  + { a } * 2', $element->getAnnotation('StarMath 5.0'));
+    }
+
+    public function testReadNotImplemented(): void
+    {
+        $this->expectException(NotImplementedException::class);
+        $this->expectExceptionMessage('PhpOffice\Math\Reader\MathML::getElement : The tag `mnotexisting` is not implemented');
+
+        $content = '<?xml version="1.0" encoding="UTF-8"?>
+        <!DOCTYPE math PUBLIC "-//W3C//DTD MathML 2.0//EN" "http://www.w3.org/Math/DTD/mathml2/mathml2.dtd">
+        <math xmlns="http://www.w3.org/1998/Math/MathML">
+            <mnotexisting>
+                <mi> a </mi>
+            </mnotexisting>
+        </math>';
+
+        $reader = new MathML();
+        $math = $reader->read($content);
+    }
+}
diff --git a/vendor/phpoffice/math/tests/Math/Reader/OfficeMathMLTest.php b/vendor/phpoffice/math/tests/Math/Reader/OfficeMathMLTest.php
new file mode 100644
index 0000000000..2bc8d8843a
--- /dev/null
+++ b/vendor/phpoffice/math/tests/Math/Reader/OfficeMathMLTest.php
@@ -0,0 +1,197 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\PhpOffice\Math\Reader;
+
+use PhpOffice\Math\Element;
+use PhpOffice\Math\Exception\InvalidInputException;
+use PhpOffice\Math\Exception\NotImplementedException;
+use PhpOffice\Math\Math;
+use PhpOffice\Math\Reader\OfficeMathML;
+use PHPUnit\Framework\TestCase;
+
+class OfficeMathMLTest extends TestCase
+{
+    public function testRead(): void
+    {
+        $content = '<m:oMathPara xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math">
+        <m:oMath>
+          <m:f>
+            <m:num><m:r><m:t>2</m:t></m:r></m:num>
+            <m:den><m:r><m:t>π</m:t></m:r></m:den>
+          </m:f>
+        </m:oMath>
+      </m:oMathPara>';
+
+        $reader = new OfficeMathML();
+        $math = $reader->read($content);
+        $this->assertInstanceOf(Math::class, $math);
+
+        $elements = $math->getElements();
+        $this->assertCount(1, $elements);
+        $this->assertInstanceOf(Element\Row::class, $elements[0]);
+
+        /** @var Element\Row $element */
+        $element = $elements[0];
+        $subElements = $element->getElements();
+        $this->assertCount(1, $subElements);
+        $this->assertInstanceOf(Element\Fraction::class, $subElements[0]);
+
+        /** @var Element\Fraction $subElement */
+        $subElement = $subElements[0];
+
+        /** @var Element\Identifier $numerator */
+        $numerator = $subElement->getNumerator();
+        $this->assertInstanceOf(Element\Numeric::class, $numerator);
+        $this->assertEquals(2, $numerator->getValue());
+
+        /** @var Element\Numeric $denominator */
+        $denominator = $subElement->getDenominator();
+        $this->assertInstanceOf(Element\Identifier::class, $denominator);
+        $this->assertEquals('π', $denominator->getValue());
+    }
+
+    public function testReadWithWTag(): void
+    {
+        $content = '<m:oMath xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math">
+          <m:f>
+            <m:num>
+              <m:r>
+                <w:rPr><w:rFonts w:ascii="Cambria Math" w:hAnsi="Cambria Math"/></w:rPr>
+                <m:t xml:space="preserve">π</m:t>
+              </m:r>
+            </m:num>
+            <m:den>
+              <m:r>
+                <w:rPr><w:rFonts w:ascii="Cambria Math" w:hAnsi="Cambria Math"/></w:rPr>
+                <m:t xml:space="preserve">2</m:t>
+              </m:r>
+            </m:den>
+          </m:f>
+          <m:r>
+            <w:rPr><w:rFonts w:ascii="Cambria Math" w:hAnsi="Cambria Math"/></w:rPr>
+            <m:t xml:space="preserve">+</m:t>
+          </m:r>
+          <m:r>
+            <w:rPr><w:rFonts w:ascii="Cambria Math" w:hAnsi="Cambria Math"/></w:rPr>
+            <m:t xml:space="preserve">a</m:t>
+          </m:r>
+          <m:r>
+            <w:rPr><w:rFonts w:ascii="Cambria Math" w:hAnsi="Cambria Math"/></w:rPr>
+            <m:t xml:space="preserve">∗</m:t>
+          </m:r>
+          <m:r>
+            <w:rPr><w:rFonts w:ascii="Cambria Math" w:hAnsi="Cambria Math"/></w:rPr>
+            <m:t xml:space="preserve">2</m:t>
+          </m:r>
+        </m:oMath>';
+
+        $reader = new OfficeMathML();
+        $math = $reader->read($content);
+        $this->assertInstanceOf(Math::class, $math);
+
+        $elements = $math->getElements();
+        $this->assertCount(5, $elements);
+
+        /** @var Element\Fraction $element */
+        $element = $elements[0];
+        $this->assertInstanceOf(Element\Fraction::class, $element);
+        /** @var Element\Identifier $numerator */
+        $numerator = $element->getNumerator();
+        $this->assertInstanceOf(Element\Identifier::class, $numerator);
+        $this->assertEquals('π', $numerator->getValue());
+        /** @var Element\Numeric $denominator */
+        $denominator = $element->getDenominator();
+        $this->assertInstanceOf(Element\Numeric::class, $denominator);
+        $this->assertEquals(2, $denominator->getValue());
+
+        /** @var Element\Operator $element */
+        $element = $elements[1];
+        $this->assertInstanceOf(Element\Operator::class, $element);
+        $this->assertEquals('+', $element->getValue());
+
+        /** @var Element\Identifier $element */
+        $element = $elements[2];
+        $this->assertInstanceOf(Element\Identifier::class, $element);
+        $this->assertEquals('a', $element->getValue());
+
+        /** @var Element\Operator $element */
+        $element = $elements[3];
+        $this->assertInstanceOf(Element\Operator::class, $element);
+        $this->assertEquals('∗', $element->getValue());
+
+        /** @var Element\Numeric $element */
+        $element = $elements[4];
+        $this->assertInstanceOf(Element\Numeric::class, $element);
+        $this->assertEquals(2, $element->getValue());
+    }
+
+    public function testReadFractionNoNumerator(): void
+    {
+        $this->expectException(InvalidInputException::class);
+        $this->expectExceptionMessage('PhpOffice\Math\Reader\OfficeMathML::getElement : The tag `m:f` has no numerator defined');
+
+        $content = '<m:oMathPara xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math">
+          <m:oMath>
+            <m:f>
+              <m:den><m:r><m:t>2</m:t></m:r></m:den>
+            </m:f>
+          </m:oMath>
+        </m:oMathPara>';
+
+        $reader = new OfficeMathML();
+        $math = $reader->read($content);
+    }
+
+    public function testReadFractionNoDenominator(): void
+    {
+        $this->expectException(InvalidInputException::class);
+        $this->expectExceptionMessage('PhpOffice\Math\Reader\OfficeMathML::getElement : The tag `m:f` has no denominator defined');
+
+        $content = '<m:oMathPara xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math">
+          <m:oMath>
+            <m:f>
+              <m:num><m:r><m:t>π</m:t></m:r></m:num>
+            </m:f>
+          </m:oMath>
+        </m:oMathPara>';
+
+        $reader = new OfficeMathML();
+        $math = $reader->read($content);
+    }
+
+    public function testReadBasicNoText(): void
+    {
+        $this->expectException(InvalidInputException::class);
+        $this->expectExceptionMessage('PhpOffice\Math\Reader\OfficeMathML::getElement : The tag `m:r` has no tag `m:t` defined');
+
+        $content = '<m:oMathPara xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math">
+          <m:oMath>
+            <m:r>
+              a
+            </m:r>
+          </m:oMath>
+        </m:oMathPara>';
+
+        $reader = new OfficeMathML();
+        $math = $reader->read($content);
+    }
+
+    public function testReadNotImplemented(): void
+    {
+        $this->expectException(NotImplementedException::class);
+        $this->expectExceptionMessage('PhpOffice\Math\Reader\OfficeMathML::getElement : The tag `m:mnotexisting` is not implemented');
+
+        $content = '<m:oMathPara xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math">
+          <m:oMath>
+            <m:mnotexisting>
+              <m:num><m:r><m:t>π</m:t></m:r></m:num>
+            </m:mnotexisting>
+          </m:oMath>
+        </m:oMathPara>';
+
+        $reader = new OfficeMathML();
+        $math = $reader->read($content);
+    }
+}
diff --git a/vendor/phpoffice/math/tests/Math/Writer/MathMLTest.php b/vendor/phpoffice/math/tests/Math/Writer/MathMLTest.php
new file mode 100644
index 0000000000..06aac383ea
--- /dev/null
+++ b/vendor/phpoffice/math/tests/Math/Writer/MathMLTest.php
@@ -0,0 +1,104 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\PhpOffice\Math\Writer;
+
+use PhpOffice\Math\Element;
+use PhpOffice\Math\Exception\NotImplementedException;
+use PhpOffice\Math\Math;
+use PhpOffice\Math\Writer\MathML;
+
+class MathMLTest extends WriterTestCase
+{
+    public function testWrite(): void
+    {
+        $opTimes = new Element\Operator('&InvisibleTimes;');
+
+        $math = new Math();
+
+        $row = new Element\Row();
+        $math->add($row);
+
+        $row->add(new Element\Identifier('a'));
+        $row->add(clone $opTimes);
+
+        $superscript = new Element\Superscript(
+            new Element\Identifier('x'),
+            new Element\Numeric(2)
+        );
+        $row->add($superscript);
+
+        $row->add(new Element\Operator('+'));
+
+        $row->add(new Element\Identifier('b'));
+        $row->add(clone $opTimes);
+        $row->add(new Element\Identifier('x'));
+
+        $row->add(new Element\Operator('+'));
+
+        $row->add(new Element\Identifier('c'));
+
+        $writer = new MathML();
+        $output = $writer->write($math);
+
+        $expected = '<?xml version="1.0" encoding="UTF-8"?>'
+            . PHP_EOL
+            . '<!DOCTYPE math PUBLIC "-//W3C//DTD MathML 2.0//EN" "http://www.w3.org/Math/DTD/mathml2/mathml2.dtd">'
+            . '<math xmlns="http://www.w3.org/1998/Math/MathML">'
+            . '<mrow><mi>a</mi><mo>&amp;InvisibleTimes;</mo><msup><mi>x</mi><mn>2</mn></msup><mo>+</mo><mi>b</mi><mo>&amp;InvisibleTimes;</mo><mi>x</mi><mo>+</mo><mi>c</mi>'
+            . '</mrow>'
+            . '</math>'
+            . PHP_EOL;
+        $this->assertEquals($expected, $output);
+        $this->assertIsSchemaMathMLValid($output);
+    }
+
+    public function testWriteFraction(): void
+    {
+        $math = new Math();
+
+        $fraction = new Element\Fraction(
+            new Element\Identifier('π'),
+            new Element\Numeric(2)
+        );
+        $math->add($fraction);
+
+        $writer = new MathML();
+        $output = $writer->write($math);
+
+        $expected = '<?xml version="1.0" encoding="UTF-8"?>'
+            . PHP_EOL
+            . '<!DOCTYPE math PUBLIC "-//W3C//DTD MathML 2.0//EN" "http://www.w3.org/Math/DTD/mathml2/mathml2.dtd">'
+            . '<math xmlns="http://www.w3.org/1998/Math/MathML">'
+            . '<mfrac>'
+            . '<mi>π</mi><mn>2</mn>'
+            . '</mfrac>'
+            . '</math>'
+            . PHP_EOL;
+        $this->assertEquals($expected, $output);
+        $this->assertIsSchemaMathMLValid($output);
+    }
+
+    public function testWriteNotImplemented(): void
+    {
+        $this->expectException(NotImplementedException::class);
+        if (method_exists($this, 'expectExceptionMessageRegExp')) {
+            $this->expectExceptionMessageRegExp('/PhpOffice\\\Math\\\Writer\\\MathML::getElementTagName : The element of the class/');
+            $this->expectExceptionMessageRegExp('/has no tag name/');
+        } else {
+            // @phpstan-ignore-next-line
+            $this->expectExceptionMessageMatches('/PhpOffice\\\Math\\\Writer\\\MathML::getElementTagName : The element of the class/');
+            // @phpstan-ignore-next-line
+            $this->expectExceptionMessageMatches('/has no tag name/');
+        }
+
+        $math = new Math();
+
+        $object = new class extends Element\AbstractElement {};
+        $math->add($object);
+
+        $writer = new MathML();
+        $output = $writer->write($math);
+    }
+}
diff --git a/vendor/phpoffice/math/tests/Math/Writer/OfficeMathMLTest.php b/vendor/phpoffice/math/tests/Math/Writer/OfficeMathMLTest.php
new file mode 100644
index 0000000000..40060f03a4
--- /dev/null
+++ b/vendor/phpoffice/math/tests/Math/Writer/OfficeMathMLTest.php
@@ -0,0 +1,79 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\PhpOffice\Math\Writer;
+
+use PhpOffice\Math\Element;
+use PhpOffice\Math\Exception\NotImplementedException;
+use PhpOffice\Math\Math;
+use PhpOffice\Math\Writer\OfficeMathML;
+
+class OfficeMathMLTest extends WriterTestCase
+{
+    public function testWriteFraction(): void
+    {
+        $math = new Math();
+
+        $fraction = new Element\Fraction(
+            new Element\Identifier('π'),
+            new Element\Numeric(2)
+        );
+        $math->add($fraction);
+
+        $writer = new OfficeMathML();
+        $output = $writer->write($math);
+
+        $expected = '<m:oMathPara xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math">'
+            . '<m:oMath>'
+            . '<m:f>'
+            . '<m:num><m:r><m:t>π</m:t></m:r></m:num>'
+            . '<m:den><m:r><m:t>2</m:t></m:r></m:den>'
+            . '</m:f>'
+            . '</m:oMath>'
+            . '</m:oMathPara>';
+        $this->assertEquals($expected, $output);
+    }
+
+    public function testWriteRow(): void
+    {
+        $math = new Math();
+
+        $row = new Element\Row();
+        $math->add($row);
+
+        $row->add(new Element\Identifier('x'));
+
+        $writer = new OfficeMathML();
+        $output = $writer->write($math);
+
+        $expected = '<m:oMathPara xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math">'
+            . '<m:oMath>'
+            . '<m:r><m:t>x</m:t></m:r>'
+            . '</m:oMath>'
+            . '</m:oMathPara>';
+        $this->assertEquals($expected, $output);
+    }
+
+    public function testWriteNotImplemented(): void
+    {
+        $this->expectException(NotImplementedException::class);
+        if (method_exists($this, 'expectExceptionMessageRegExp')) {
+            $this->expectExceptionMessageRegExp('/PhpOffice\\\Math\\\Writer\\\OfficeMathML::getElementTagName : The element of the class/');
+            $this->expectExceptionMessageRegExp('/has no tag name/');
+        } else {
+            // @phpstan-ignore-next-line
+            $this->expectExceptionMessageMatches('/PhpOffice\\\Math\\\Writer\\\OfficeMathML::getElementTagName : The element of the class/');
+            // @phpstan-ignore-next-line
+            $this->expectExceptionMessageMatches('/has no tag name/');
+        }
+
+        $math = new Math();
+
+        $object = new class extends Element\AbstractElement {};
+        $math->add($object);
+
+        $writer = new OfficeMathML();
+        $output = $writer->write($math);
+    }
+}
diff --git a/vendor/phpoffice/math/tests/Math/Writer/WriterTestCase.php b/vendor/phpoffice/math/tests/Math/Writer/WriterTestCase.php
new file mode 100644
index 0000000000..482019f549
--- /dev/null
+++ b/vendor/phpoffice/math/tests/Math/Writer/WriterTestCase.php
@@ -0,0 +1,83 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\PhpOffice\Math\Writer;
+
+use DOMDocument;
+use LibXMLError;
+use PHPUnit\Framework\TestCase;
+
+class WriterTestCase extends TestCase
+{
+    public function assertIsSchemaMathMLValid(string $content): void
+    {
+        $dom = new DOMDocument();
+        $dom->loadXML($content);
+        $xmlSource = $dom->saveXML();
+
+        if (is_string($xmlSource)) {
+            $dom->loadXML($xmlSource);
+            $dom->schemaValidate(dirname(__DIR__, 2) . '/resources/schema/mathml3/mathml3.xsd');
+
+            $error = libxml_get_last_error();
+            if ($error instanceof LibXMLError) {
+                $this->failXmlError($error, $xmlSource);
+            } else {
+                $this->assertTrue(true);
+            }
+
+            return;
+        }
+
+        $this->fail(sprintf('The XML is not valid : %s', $content));
+    }
+
+    /**
+     * @param array<string, string> $params
+     */
+    protected function failXmlError(LibXMLError $error, string $source, array $params = []): void
+    {
+        switch ($error->level) {
+            case LIBXML_ERR_WARNING:
+                $errorType = 'warning';
+                break;
+            case LIBXML_ERR_ERROR:
+                $errorType = 'error';
+                break;
+            case LIBXML_ERR_FATAL:
+                $errorType = 'fatal';
+                break;
+            default:
+                $errorType = 'Error';
+                break;
+        }
+        $errorLine = (int) $error->line;
+        $contents = explode("\n", $source);
+        $lines = [];
+        if (isset($contents[$errorLine - 2])) {
+            $lines[] = '>> ' . $contents[$errorLine - 2];
+        }
+        if (isset($contents[$errorLine - 1])) {
+            $lines[] = '>>> ' . $contents[$errorLine - 1];
+        }
+        if (isset($contents[$errorLine])) {
+            $lines[] = '>> ' . $contents[$errorLine];
+        }
+        $paramStr = '';
+        if (!empty($params)) {
+            $paramStr .= "\n" . ' - Parameters :' . "\n";
+            foreach ($params as $key => $val) {
+                $paramStr .= '   - ' . $key . ' : ' . $val . "\n";
+            }
+        }
+        $this->fail(sprintf(
+            "Validation %s :\n - - Line : %s\n - Message : %s - Lines :\n%s%s",
+            $errorType,
+            $error->line,
+            $error->message,
+            implode(PHP_EOL, $lines),
+            $paramStr
+        ));
+    }
+}
diff --git a/vendor/phpoffice/math/tests/resources/schema/mathml3/mathml3-common.xsd b/vendor/phpoffice/math/tests/resources/schema/mathml3/mathml3-common.xsd
new file mode 100644
index 0000000000..646934e789
--- /dev/null
+++ b/vendor/phpoffice/math/tests/resources/schema/mathml3/mathml3-common.xsd
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:m="http://www.w3.org/1998/Math/MathML" elementFormDefault="qualified" targetNamespace="http://www.w3.org/1998/Math/MathML">
+   <xs:element name="math">
+      <xs:complexType>
+         <xs:group minOccurs="0" maxOccurs="unbounded" ref="m:MathExpression"/>
+         <xs:attributeGroup ref="m:math.attributes"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:attributeGroup name="CommonDeprecatedAtt">
+      <xs:attribute name="other"/>
+   </xs:attributeGroup>
+   <xs:attributeGroup name="CommonAtt">
+      <xs:attribute name="id" type="xs:ID"/>
+      <xs:attribute name="xref"/>
+      <xs:attribute name="class" type="xs:NMTOKENS"/>
+      <xs:attribute name="style" type="xs:string"/>
+      <xs:attribute name="href" type="xs:anyURI"/>
+      <xs:attributeGroup ref="m:CommonDeprecatedAtt"/>
+      <xs:anyAttribute namespace="##other" processContents="skip"/>
+   </xs:attributeGroup>
+   <xs:attributeGroup name="math.deprecatedattributes">
+      <xs:attribute name="mode" type="xs:string"/>
+      <xs:attribute name="macros" type="xs:string"/>
+   </xs:attributeGroup>
+   <xs:attributeGroup name="name">
+      <xs:attribute name="name" use="required" type="xs:NCName"/>
+   </xs:attributeGroup>
+   <xs:attributeGroup name="cd">
+      <xs:attribute name="cd" use="required" type="xs:NCName"/>
+   </xs:attributeGroup>
+   <xs:attributeGroup name="src">
+      <xs:attribute name="src" type="xs:anyURI"/>
+   </xs:attributeGroup>
+   <xs:element name="annotation">
+      <xs:complexType mixed="true">
+         <xs:attributeGroup ref="m:annotation.attributes"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:complexType name="annotation-xml.model"><!--content model altered for libxml (annotation-xml)--><xs:sequence>
+         <xs:any processContents="lax"/>
+      </xs:sequence>
+   </xs:complexType>
+   <xs:group name="anyElement">
+      <xs:choice>
+         <xs:any namespace="##other" processContents="skip"/>
+         <xs:any namespace="##local" processContents="skip"/>
+      </xs:choice>
+   </xs:group>
+   <xs:element name="annotation-xml">
+      <xs:complexType>
+         <xs:complexContent>
+            <xs:extension base="m:annotation-xml.model">
+               <xs:attributeGroup ref="m:annotation.attributes"/>
+            </xs:extension>
+         </xs:complexContent>
+      </xs:complexType>
+   </xs:element>
+   <xs:attributeGroup name="annotation.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attribute name="cd" type="xs:NCName"/>
+      <xs:attribute name="name" type="xs:NCName"/>
+      <xs:attributeGroup ref="m:DefEncAtt"/>
+      <xs:attributeGroup ref="m:src"/>
+   </xs:attributeGroup>
+   <xs:attributeGroup name="DefEncAtt">
+      <xs:attribute name="encoding" type="xs:string"/>
+      <xs:attribute name="definitionURL" type="xs:anyURI"/>
+   </xs:attributeGroup>
+   <xs:group name="semantics">
+      <xs:sequence>
+         <xs:element name="semantics">
+            <xs:complexType>
+               <xs:sequence>
+                  <xs:group ref="m:MathExpression"/>
+                  <xs:choice minOccurs="0" maxOccurs="unbounded">
+                     <xs:element ref="m:annotation"/>
+                     <xs:element ref="m:annotation-xml"/>
+                  </xs:choice>
+               </xs:sequence>
+               <xs:attributeGroup ref="m:semantics.attributes"/>
+            </xs:complexType>
+         </xs:element>
+      </xs:sequence>
+   </xs:group>
+   <xs:attributeGroup name="semantics.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attributeGroup ref="m:DefEncAtt"/>
+      <xs:attribute name="cd" type="xs:NCName"/>
+      <xs:attribute name="name" type="xs:NCName"/>
+   </xs:attributeGroup>
+   <xs:simpleType name="length">
+      <xs:restriction base="xs:string">
+         <xs:pattern value="\s*((-?[0-9]*([0-9]\.?|\.[0-9])[0-9]*(e[mx]|in|cm|mm|p[xtc]|%)?)|(negative)?((very){0,2}thi(n|ck)|medium)mathspace)\s*"/>
+      </xs:restriction>
+   </xs:simpleType>
+</xs:schema>
\ No newline at end of file
diff --git a/vendor/phpoffice/math/tests/resources/schema/mathml3/mathml3-content.xsd b/vendor/phpoffice/math/tests/resources/schema/mathml3/mathml3-content.xsd
new file mode 100644
index 0000000000..00af6b21c8
--- /dev/null
+++ b/vendor/phpoffice/math/tests/resources/schema/mathml3/mathml3-content.xsd
@@ -0,0 +1,681 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:m="http://www.w3.org/1998/Math/MathML" elementFormDefault="qualified" targetNamespace="http://www.w3.org/1998/Math/MathML">
+   <xs:include schemaLocation="mathml3-strict-content.xsd"/>
+   <xs:complexType name="cn.content" mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+         <xs:element ref="m:mglyph"/>
+         <xs:element ref="m:sep"/>
+         <xs:element ref="m:PresentationExpression"/>
+      </xs:choice>
+   </xs:complexType>
+   <xs:attributeGroup name="cn.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attributeGroup ref="m:DefEncAtt"/>
+      <xs:attribute name="type"/>
+      <xs:attribute name="base"/>
+   </xs:attributeGroup>
+   <xs:attributeGroup name="ci.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attributeGroup ref="m:DefEncAtt"/>
+      <xs:attribute name="type"/>
+   </xs:attributeGroup>
+   <xs:attributeGroup name="ci.type">
+      <xs:attribute name="type" use="required"/>
+   </xs:attributeGroup>
+   <xs:complexType name="ci.content" mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+         <xs:element ref="m:mglyph"/>
+         <xs:element ref="m:PresentationExpression"/>
+      </xs:choice>
+   </xs:complexType>
+   <xs:attributeGroup name="csymbol.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attributeGroup ref="m:DefEncAtt"/>
+      <xs:attribute name="type"/>
+      <xs:attribute name="cd" type="xs:NCName"/>
+   </xs:attributeGroup>
+   <xs:complexType name="csymbol.content" mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+         <xs:element ref="m:mglyph"/>
+         <xs:element ref="m:PresentationExpression"/>
+      </xs:choice>
+   </xs:complexType>
+   <xs:element name="bvar">
+      <xs:complexType>
+         <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:choice>
+               <xs:element ref="m:ci"/>
+               <xs:group ref="m:semantics-ci"/>
+            </xs:choice>
+            <xs:element ref="m:degree"/>
+         </xs:choice>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:attributeGroup name="cbytes.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attributeGroup ref="m:DefEncAtt"/>
+   </xs:attributeGroup>
+   <xs:attributeGroup name="cs.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attributeGroup ref="m:DefEncAtt"/>
+   </xs:attributeGroup>
+   <!--Ambiguous content model altered (apply.content)-->
+<xs:complexType name="apply.content">
+      <xs:sequence>
+         <xs:group ref="m:ContExp"/>
+         <xs:group ref="m:BvarQ"/>
+         <xs:group minOccurs="0" maxOccurs="unbounded" ref="m:Qualifier"/>
+         <xs:group minOccurs="0" maxOccurs="unbounded" ref="m:ContExp"/>
+      </xs:sequence>
+   </xs:complexType>
+   <xs:complexType name="bind.content">
+      <xs:complexContent>
+         <xs:extension base="m:apply.content"/>
+      </xs:complexContent>
+   </xs:complexType>
+   <xs:attributeGroup name="base">
+      <xs:attribute name="base" use="required"/>
+   </xs:attributeGroup>
+   <xs:element name="sep">
+      <xs:complexType/>
+   </xs:element>
+   <xs:element name="PresentationExpression" abstract="true"/>
+   <xs:group name="DomainQ">
+      <xs:sequence>
+         <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="m:domainofapplication"/>
+            <xs:element ref="m:condition"/>
+            <!--Ambiguous content model altered (interval)--><xs:sequence>
+               <xs:element ref="m:lowlimit"/>
+               <xs:element minOccurs="0" ref="m:uplimit"/>
+            </xs:sequence>
+         </xs:choice>
+      </xs:sequence>
+   </xs:group>
+   <xs:element name="domainofapplication">
+      <xs:complexType>
+         <xs:group ref="m:ContExp"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="condition">
+      <xs:complexType>
+         <xs:group ref="m:ContExp"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="uplimit">
+      <xs:complexType>
+         <xs:group ref="m:ContExp"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="lowlimit">
+      <xs:complexType>
+         <xs:group ref="m:ContExp"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:group name="Qualifier">
+      <xs:choice>
+         <xs:group ref="m:DomainQ"/>
+         <xs:element ref="m:degree"/>
+         <xs:element ref="m:momentabout"/>
+         <xs:element ref="m:logbase"/>
+      </xs:choice>
+   </xs:group>
+   <xs:element name="degree">
+      <xs:complexType>
+         <xs:group ref="m:ContExp"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="momentabout">
+      <xs:complexType>
+         <xs:group ref="m:ContExp"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="logbase">
+      <xs:complexType>
+         <xs:group ref="m:ContExp"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:attributeGroup name="type">
+      <xs:attribute name="type" use="required"/>
+   </xs:attributeGroup>
+   <xs:attributeGroup name="order">
+      <xs:attribute name="order" use="required">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="numeric"/>
+               <xs:enumeration value="lexicographic"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+   </xs:attributeGroup>
+   <xs:attributeGroup name="closure">
+      <xs:attribute name="closure" use="required"/>
+   </xs:attributeGroup>
+   <xs:element name="piecewise">
+      <xs:complexType>
+         <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="m:piece"/>
+            <xs:element ref="m:otherwise"/>
+         </xs:choice>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="piece">
+      <xs:complexType>
+         <xs:sequence>
+            <xs:group ref="m:ContExp"/>
+            <xs:group ref="m:ContExp"/>
+         </xs:sequence>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="otherwise">
+      <xs:complexType>
+         <xs:group ref="m:ContExp"/>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="DeprecatedContExp" abstract="true"/>
+   <xs:element name="reln" substitutionGroup="m:DeprecatedContExp">
+      <xs:complexType>
+         <xs:group minOccurs="0" maxOccurs="unbounded" ref="m:ContExp"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="fn" substitutionGroup="m:DeprecatedContExp">
+      <xs:complexType>
+         <xs:group ref="m:ContExp"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="declare" substitutionGroup="m:DeprecatedContExp">
+      <xs:complexType>
+         <xs:group maxOccurs="unbounded" ref="m:ContExp"/>
+         <xs:attribute name="type" type="xs:string"/>
+         <xs:attribute name="scope" type="xs:string"/>
+         <xs:attribute name="nargs" type="xs:nonNegativeInteger"/>
+         <xs:attribute name="occurrence">
+            <xs:simpleType>
+               <xs:restriction base="xs:token">
+                  <xs:enumeration value="prefix"/>
+                  <xs:enumeration value="infix"/>
+                  <xs:enumeration value="function-model"/>
+               </xs:restriction>
+            </xs:simpleType>
+         </xs:attribute>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="interval.class" abstract="true">
+      <xs:complexType>
+         <xs:sequence>
+            <xs:group ref="m:ContExp"/>
+            <xs:group ref="m:ContExp"/>
+         </xs:sequence>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+         <xs:attribute name="closure"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="interval" substitutionGroup="m:interval.class"/>
+   <xs:element name="unary-functional.class" abstract="true">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="inverse" substitutionGroup="m:unary-functional.class"/>
+   <xs:element name="ident" substitutionGroup="m:unary-functional.class"/>
+   <xs:element name="domain" substitutionGroup="m:unary-functional.class"/>
+   <xs:element name="codomain" substitutionGroup="m:unary-functional.class"/>
+   <xs:element name="image" substitutionGroup="m:unary-functional.class"/>
+   <xs:element name="ln" substitutionGroup="m:unary-functional.class"/>
+   <xs:element name="log" substitutionGroup="m:unary-functional.class"/>
+   <xs:element name="moment" substitutionGroup="m:unary-functional.class"/>
+   <xs:element name="lambda.class" abstract="true">
+      <xs:complexType>
+         <xs:sequence>
+            <xs:group ref="m:BvarQ"/>
+            <xs:group ref="m:DomainQ"/>
+            <xs:group ref="m:ContExp"/>
+         </xs:sequence>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="lambda" substitutionGroup="m:lambda.class"/>
+   <xs:element name="nary-functional.class" abstract="true">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="compose" substitutionGroup="m:nary-functional.class"/>
+   <xs:group name="binary-arith.class">
+      <xs:choice>
+         <xs:element ref="m:quotient"/>
+         <xs:element ref="m:divide"/>
+         <xs:element ref="m:minus"/>
+         <xs:element ref="m:power"/>
+         <xs:element ref="m:rem"/>
+         <xs:element ref="m:root"/>
+      </xs:choice>
+   </xs:group>
+   <xs:element name="quotient">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="divide">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="minus">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="power">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="rem">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="root">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:group name="unary-arith.class">
+      <xs:choice>
+         <xs:element ref="m:factorial"/>
+         <!--Ambiguous content model altered (minus)--><!--Ambiguous content model altered (root)--><xs:element ref="m:abs"/>
+         <xs:element ref="m:conjugate"/>
+         <xs:element ref="m:arg"/>
+         <xs:element ref="m:real"/>
+         <xs:element ref="m:imaginary"/>
+         <xs:element ref="m:floor"/>
+         <xs:element ref="m:ceiling"/>
+         <xs:element ref="m:exp"/>
+      </xs:choice>
+   </xs:group>
+   <xs:element name="factorial">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="abs">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="conjugate">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="arg">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="real">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="imaginary">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="floor">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="ceiling">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="exp">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="nary-minmax.class" abstract="true">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="max" substitutionGroup="m:nary-minmax.class"/>
+   <xs:element name="min" substitutionGroup="m:nary-minmax.class"/>
+   <xs:element name="nary-arith.class" abstract="true">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="plus" substitutionGroup="m:nary-arith.class"/>
+   <xs:element name="times" substitutionGroup="m:nary-arith.class"/>
+   <xs:element name="gcd" substitutionGroup="m:nary-arith.class"/>
+   <xs:element name="lcm" substitutionGroup="m:nary-arith.class"/>
+   <xs:element name="nary-logical.class" abstract="true">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="and" substitutionGroup="m:nary-logical.class"/>
+   <xs:element name="or" substitutionGroup="m:nary-logical.class"/>
+   <xs:element name="xor" substitutionGroup="m:nary-logical.class"/>
+   <xs:element name="unary-logical.class" abstract="true">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="not" substitutionGroup="m:unary-logical.class"/>
+   <xs:element name="binary-logical.class" abstract="true">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="implies" substitutionGroup="m:binary-logical.class"/>
+   <xs:element name="equivalent" substitutionGroup="m:binary-logical.class"/>
+   <xs:element name="quantifier.class" abstract="true">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="forall" substitutionGroup="m:quantifier.class"/>
+   <xs:element name="exists" substitutionGroup="m:quantifier.class"/>
+   <xs:element name="nary-reln.class" abstract="true">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="eq" substitutionGroup="m:nary-reln.class"/>
+   <xs:element name="gt" substitutionGroup="m:nary-reln.class"/>
+   <xs:element name="lt" substitutionGroup="m:nary-reln.class"/>
+   <xs:element name="geq" substitutionGroup="m:nary-reln.class"/>
+   <xs:element name="leq" substitutionGroup="m:nary-reln.class"/>
+   <xs:element name="binary-reln.class" abstract="true"/>
+   <xs:element name="neq" substitutionGroup="m:binary-reln.class">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="approx" substitutionGroup="m:binary-reln.class">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="factorof" substitutionGroup="m:binary-reln.class">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="tendsto" substitutionGroup="m:binary-reln.class">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+         <xs:attribute name="type"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="int.class" abstract="true">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="int" substitutionGroup="m:int.class"/>
+   <xs:element name="Differential-Operator.class" abstract="true">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="diff" substitutionGroup="m:Differential-Operator.class"/>
+   <xs:element name="partialdiff.class" abstract="true">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="partialdiff" substitutionGroup="m:partialdiff.class"/>
+   <xs:element name="unary-veccalc.class" abstract="true">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="divergence" substitutionGroup="m:unary-veccalc.class"/>
+   <xs:element name="grad" substitutionGroup="m:unary-veccalc.class"/>
+   <xs:element name="curl" substitutionGroup="m:unary-veccalc.class"/>
+   <xs:element name="laplacian" substitutionGroup="m:unary-veccalc.class"/>
+   <xs:element name="nary-setlist-constructor.class" abstract="true"/>
+   <xs:element name="set" substitutionGroup="m:nary-setlist-constructor.class">
+      <xs:complexType>
+         <xs:sequence>
+            <xs:group minOccurs="0" maxOccurs="unbounded" ref="m:BvarQ"/>
+            <xs:group minOccurs="0" maxOccurs="unbounded" ref="m:DomainQ"/>
+            <xs:group minOccurs="0" maxOccurs="unbounded" ref="m:ContExp"/>
+         </xs:sequence>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+         <xs:attribute name="type"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="list" substitutionGroup="m:nary-setlist-constructor.class">
+      <xs:complexType>
+         <xs:sequence>
+            <xs:group minOccurs="0" maxOccurs="unbounded" ref="m:BvarQ"/>
+            <xs:group minOccurs="0" maxOccurs="unbounded" ref="m:DomainQ"/>
+            <xs:group minOccurs="0" maxOccurs="unbounded" ref="m:ContExp"/>
+         </xs:sequence>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+         <xs:attribute name="order">
+            <xs:simpleType>
+               <xs:restriction base="xs:token">
+                  <xs:enumeration value="numeric"/>
+                  <xs:enumeration value="lexicographic"/>
+               </xs:restriction>
+            </xs:simpleType>
+         </xs:attribute>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="nary-set.class" abstract="true">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="union" substitutionGroup="m:nary-set.class"/>
+   <xs:element name="intersect" substitutionGroup="m:nary-set.class"/>
+   <xs:element name="cartesianproduct" substitutionGroup="m:nary-set.class"/>
+   <xs:element name="binary-set.class" abstract="true">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="in" substitutionGroup="m:binary-set.class"/>
+   <xs:element name="notin" substitutionGroup="m:binary-set.class"/>
+   <xs:element name="notsubset" substitutionGroup="m:binary-set.class"/>
+   <xs:element name="notprsubset" substitutionGroup="m:binary-set.class"/>
+   <xs:element name="setdiff" substitutionGroup="m:binary-set.class"/>
+   <xs:element name="nary-set-reln.class" abstract="true">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="subset" substitutionGroup="m:nary-set-reln.class"/>
+   <xs:element name="prsubset" substitutionGroup="m:nary-set-reln.class"/>
+   <xs:element name="unary-set.class" abstract="true">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="card" substitutionGroup="m:unary-set.class"/>
+   <xs:element name="sum.class" abstract="true">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="sum" substitutionGroup="m:sum.class"/>
+   <xs:element name="product.class" abstract="true">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="product" substitutionGroup="m:product.class"/>
+   <xs:element name="limit.class" abstract="true">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="limit" substitutionGroup="m:limit.class"/>
+   <xs:element name="unary-elementary.class" abstract="true">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="sin" substitutionGroup="m:unary-elementary.class"/>
+   <xs:element name="cos" substitutionGroup="m:unary-elementary.class"/>
+   <xs:element name="tan" substitutionGroup="m:unary-elementary.class"/>
+   <xs:element name="sec" substitutionGroup="m:unary-elementary.class"/>
+   <xs:element name="csc" substitutionGroup="m:unary-elementary.class"/>
+   <xs:element name="cot" substitutionGroup="m:unary-elementary.class"/>
+   <xs:element name="sinh" substitutionGroup="m:unary-elementary.class"/>
+   <xs:element name="cosh" substitutionGroup="m:unary-elementary.class"/>
+   <xs:element name="tanh" substitutionGroup="m:unary-elementary.class"/>
+   <xs:element name="sech" substitutionGroup="m:unary-elementary.class"/>
+   <xs:element name="csch" substitutionGroup="m:unary-elementary.class"/>
+   <xs:element name="coth" substitutionGroup="m:unary-elementary.class"/>
+   <xs:element name="arcsin" substitutionGroup="m:unary-elementary.class"/>
+   <xs:element name="arccos" substitutionGroup="m:unary-elementary.class"/>
+   <xs:element name="arctan" substitutionGroup="m:unary-elementary.class"/>
+   <xs:element name="arccosh" substitutionGroup="m:unary-elementary.class"/>
+   <xs:element name="arccot" substitutionGroup="m:unary-elementary.class"/>
+   <xs:element name="arccoth" substitutionGroup="m:unary-elementary.class"/>
+   <xs:element name="arccsc" substitutionGroup="m:unary-elementary.class"/>
+   <xs:element name="arccsch" substitutionGroup="m:unary-elementary.class"/>
+   <xs:element name="arcsec" substitutionGroup="m:unary-elementary.class"/>
+   <xs:element name="arcsech" substitutionGroup="m:unary-elementary.class"/>
+   <xs:element name="arcsinh" substitutionGroup="m:unary-elementary.class"/>
+   <xs:element name="arctanh" substitutionGroup="m:unary-elementary.class"/>
+   <xs:element name="nary-stats.class" abstract="true">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="mean" substitutionGroup="m:nary-stats.class"/>
+   <xs:element name="sdev" substitutionGroup="m:nary-stats.class"/>
+   <xs:element name="variance" substitutionGroup="m:nary-stats.class"/>
+   <xs:element name="median" substitutionGroup="m:nary-stats.class"/>
+   <xs:element name="mode" substitutionGroup="m:nary-stats.class"/>
+   <xs:element name="nary-constructor.class" abstract="true">
+      <xs:complexType>
+         <xs:sequence>
+            <xs:group ref="m:BvarQ"/>
+            <xs:group ref="m:DomainQ"/>
+            <xs:group minOccurs="0" maxOccurs="unbounded" ref="m:ContExp"/>
+         </xs:sequence>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="vector" substitutionGroup="m:nary-constructor.class"/>
+   <xs:element name="matrix" substitutionGroup="m:nary-constructor.class"/>
+   <xs:element name="matrixrow" substitutionGroup="m:nary-constructor.class"/>
+   <xs:element name="unary-linalg.class" abstract="true">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="determinant" substitutionGroup="m:unary-linalg.class"/>
+   <xs:element name="transpose" substitutionGroup="m:unary-linalg.class"/>
+   <xs:element name="nary-linalg.class" abstract="true">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="selector" substitutionGroup="m:nary-linalg.class"/>
+   <xs:element name="binary-linalg.class" abstract="true">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="vectorproduct" substitutionGroup="m:binary-linalg.class"/>
+   <xs:element name="scalarproduct" substitutionGroup="m:binary-linalg.class"/>
+   <xs:element name="outerproduct" substitutionGroup="m:binary-linalg.class"/>
+   <xs:element name="constant-set.class" abstract="true">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="integers" substitutionGroup="m:constant-set.class"/>
+   <xs:element name="reals" substitutionGroup="m:constant-set.class"/>
+   <xs:element name="rationals" substitutionGroup="m:constant-set.class"/>
+   <xs:element name="naturalnumbers" substitutionGroup="m:constant-set.class"/>
+   <xs:element name="complexes" substitutionGroup="m:constant-set.class"/>
+   <xs:element name="primes" substitutionGroup="m:constant-set.class"/>
+   <xs:element name="emptyset" substitutionGroup="m:constant-set.class"/>
+   <xs:element name="constant-arith.class" abstract="true">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:DefEncAtt"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="exponentiale" substitutionGroup="m:constant-arith.class"/>
+   <xs:element name="imaginaryi" substitutionGroup="m:constant-arith.class"/>
+   <xs:element name="notanumber" substitutionGroup="m:constant-arith.class"/>
+   <xs:element name="true" substitutionGroup="m:constant-arith.class"/>
+   <xs:element name="false" substitutionGroup="m:constant-arith.class"/>
+   <xs:element name="pi" substitutionGroup="m:constant-arith.class"/>
+   <xs:element name="eulergamma" substitutionGroup="m:constant-arith.class"/>
+   <xs:element name="infinity" substitutionGroup="m:constant-arith.class"/>
+</xs:schema>
\ No newline at end of file
diff --git a/vendor/phpoffice/math/tests/resources/schema/mathml3/mathml3-presentation.xsd b/vendor/phpoffice/math/tests/resources/schema/mathml3/mathml3-presentation.xsd
new file mode 100644
index 0000000000..2d5e071d72
--- /dev/null
+++ b/vendor/phpoffice/math/tests/resources/schema/mathml3/mathml3-presentation.xsd
@@ -0,0 +1,2146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:m="http://www.w3.org/1998/Math/MathML" elementFormDefault="qualified" targetNamespace="http://www.w3.org/1998/Math/MathML">
+   <xs:complexType name="ImpliedMrow">
+      <xs:group minOccurs="0" maxOccurs="unbounded" ref="m:MathExpression"/>
+   </xs:complexType>
+   <xs:element name="TableRowExpression" abstract="true"/>
+   <xs:element name="TableCellExpression" abstract="true">
+      <xs:complexType>
+         <xs:complexContent>
+            <xs:extension base="m:ImpliedMrow">
+               <xs:attributeGroup ref="m:mtd.attributes"/>
+            </xs:extension>
+         </xs:complexContent>
+      </xs:complexType>
+   </xs:element>
+   <xs:group name="MstackExpression">
+      <xs:choice>
+         <xs:group ref="m:MathExpression"/>
+         <xs:element ref="m:mscarries"/>
+         <xs:element ref="m:msline"/>
+         <xs:element ref="m:msrow"/>
+         <xs:element ref="m:msgroup"/>
+      </xs:choice>
+   </xs:group>
+   <xs:group name="MsrowExpression">
+      <xs:choice>
+         <xs:group ref="m:MathExpression"/>
+         <xs:element ref="m:none"/>
+      </xs:choice>
+   </xs:group>
+   <xs:group name="MultiScriptExpression">
+      <xs:sequence>
+         <xs:choice>
+            <xs:group ref="m:MathExpression"/>
+            <xs:element ref="m:none"/>
+         </xs:choice>
+         <xs:choice>
+            <xs:group ref="m:MathExpression"/>
+            <xs:element ref="m:none"/>
+         </xs:choice>
+      </xs:sequence>
+   </xs:group>
+   <xs:simpleType name="mpadded-length">
+      <xs:restriction base="xs:string">
+         <xs:pattern value="\s*([\+\-]?[0-9]*([0-9]\.?|\.[0-9])[0-9]*\s*((%?\s*(height|depth|width)?)|e[mx]|in|cm|mm|p[xtc]|((negative)?((very){0,2}thi(n|ck)|medium)mathspace))?)\s*"/>
+      </xs:restriction>
+   </xs:simpleType>
+   <xs:simpleType name="linestyle">
+      <xs:restriction base="xs:token">
+         <xs:enumeration value="none"/>
+         <xs:enumeration value="solid"/>
+         <xs:enumeration value="dashed"/>
+      </xs:restriction>
+   </xs:simpleType>
+   <xs:simpleType name="verticalalign">
+      <xs:restriction base="xs:token">
+         <xs:enumeration value="top"/>
+         <xs:enumeration value="bottom"/>
+         <xs:enumeration value="center"/>
+         <xs:enumeration value="baseline"/>
+         <xs:enumeration value="axis"/>
+      </xs:restriction>
+   </xs:simpleType>
+   <xs:simpleType name="columnalignstyle">
+      <xs:restriction base="xs:token">
+         <xs:enumeration value="left"/>
+         <xs:enumeration value="center"/>
+         <xs:enumeration value="right"/>
+      </xs:restriction>
+   </xs:simpleType>
+   <xs:simpleType name="notationstyle">
+      <xs:restriction base="xs:token">
+         <xs:enumeration value="longdiv"/>
+         <xs:enumeration value="actuarial"/>
+         <xs:enumeration value="radical"/>
+         <xs:enumeration value="box"/>
+         <xs:enumeration value="roundedbox"/>
+         <xs:enumeration value="circle"/>
+         <xs:enumeration value="left"/>
+         <xs:enumeration value="right"/>
+         <xs:enumeration value="top"/>
+         <xs:enumeration value="bottom"/>
+         <xs:enumeration value="updiagonalstrike"/>
+         <xs:enumeration value="downdiagonalstrike"/>
+         <xs:enumeration value="verticalstrike"/>
+         <xs:enumeration value="horizontalstrike"/>
+         <xs:enumeration value="madruwb"/>
+      </xs:restriction>
+   </xs:simpleType>
+   <xs:simpleType name="unsigned-integer">
+      <xs:restriction base="xs:unsignedLong"/>
+   </xs:simpleType>
+   <xs:simpleType name="integer">
+      <xs:restriction base="xs:integer"/>
+   </xs:simpleType>
+   <xs:simpleType name="number">
+      <xs:restriction base="xs:decimal"/>
+   </xs:simpleType>
+   <xs:simpleType name="character">
+      <xs:restriction base="xs:string">
+         <xs:pattern value="\s*\S\s*"/>
+      </xs:restriction>
+   </xs:simpleType>
+   <xs:simpleType name="color">
+      <xs:restriction base="xs:string">
+         <xs:pattern value="\s*((#[0-9a-fA-F]{3}([0-9a-fA-F]{3})?)|[aA][qQ][uU][aA]|[bB][lL][aA][cC][kK]|[bB][lL][uU][eE]|[fF][uU][cC][hH][sS][iI][aA]|[gG][rR][aA][yY]|[gG][rR][eE][eE][nN]|[lL][iI][mM][eE]|[mM][aA][rR][oO][oO][nN]|[nN][aA][vV][yY]|[oO][lL][iI][vV][eE]|[pP][uU][rR][pP][lL][eE]|[rR][eE][dD]|[sS][iI][lL][vV][eE][rR]|[tT][eE][aA][lL]|[wW][hH][iI][tT][eE]|[yY][eE][lL][lL][oO][wW])\s*"/>
+      </xs:restriction>
+   </xs:simpleType>
+   <xs:simpleType name="group-alignment">
+      <xs:restriction base="xs:token">
+         <xs:enumeration value="left"/>
+         <xs:enumeration value="center"/>
+         <xs:enumeration value="right"/>
+         <xs:enumeration value="decimalpoint"/>
+      </xs:restriction>
+   </xs:simpleType>
+   <xs:simpleType name="group-alignment-list">
+      <xs:restriction>
+         <xs:simpleType>
+            <xs:list itemType="m:group-alignment"/>
+         </xs:simpleType>
+         <xs:minLength value="1"/>
+      </xs:restriction>
+   </xs:simpleType>
+   <xs:simpleType name="group-alignment-list-list">
+      <xs:restriction base="xs:string">
+         <xs:pattern value="(\s*\{\s*(left|center|right|decimalpoint)(\s+(left|center|right|decimalpoint))*\})*\s*"/>
+      </xs:restriction>
+   </xs:simpleType>
+   <xs:simpleType name="positive-integer">
+      <xs:restriction base="xs:positiveInteger"/>
+   </xs:simpleType>
+   <xs:element name="TokenExpression" abstract="true" substitutionGroup="m:PresentationExpression"/>
+   <xs:group name="token.content">
+      <xs:sequence>
+         <xs:choice minOccurs="0">
+            <xs:element ref="m:mglyph"/>
+            <xs:element ref="m:malignmark"/>
+         </xs:choice>
+      </xs:sequence>
+   </xs:group>
+   <xs:element name="mi" substitutionGroup="m:TokenExpression">
+      <xs:complexType mixed="true">
+         <xs:group minOccurs="0" maxOccurs="unbounded" ref="m:token.content"/>
+         <xs:attributeGroup ref="m:mi.attributes"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:attributeGroup name="mi.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attributeGroup ref="m:CommonPresAtt"/>
+      <xs:attributeGroup ref="m:TokenAtt"/>
+   </xs:attributeGroup>
+   <xs:element name="mn" substitutionGroup="m:TokenExpression">
+      <xs:complexType mixed="true">
+         <xs:group minOccurs="0" maxOccurs="unbounded" ref="m:token.content"/>
+         <xs:attributeGroup ref="m:mn.attributes"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:attributeGroup name="mn.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attributeGroup ref="m:CommonPresAtt"/>
+      <xs:attributeGroup ref="m:TokenAtt"/>
+   </xs:attributeGroup>
+   <xs:element name="mo" substitutionGroup="m:TokenExpression">
+      <xs:complexType mixed="true">
+         <xs:group minOccurs="0" maxOccurs="unbounded" ref="m:token.content"/>
+         <xs:attributeGroup ref="m:mo.attributes"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:attributeGroup name="mo.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attributeGroup ref="m:CommonPresAtt"/>
+      <xs:attributeGroup ref="m:TokenAtt"/>
+      <xs:attribute name="form">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="prefix"/>
+               <xs:enumeration value="infix"/>
+               <xs:enumeration value="postfix"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="fence">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="true"/>
+               <xs:enumeration value="false"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="separator">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="true"/>
+               <xs:enumeration value="false"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="lspace" type="m:length"/>
+      <xs:attribute name="rspace" type="m:length"/>
+      <xs:attribute name="stretchy">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="true"/>
+               <xs:enumeration value="false"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="symmetric">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="true"/>
+               <xs:enumeration value="false"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="maxsize">
+         <xs:simpleType>
+            <xs:union memberTypes="m:length">
+               <xs:simpleType>
+                  <xs:restriction base="xs:token">
+                     <xs:enumeration value="infinity"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:union>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="minsize" type="m:length"/>
+      <xs:attribute name="largeop">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="true"/>
+               <xs:enumeration value="false"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="movablelimits">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="true"/>
+               <xs:enumeration value="false"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="accent">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="true"/>
+               <xs:enumeration value="false"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="linebreak">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="auto"/>
+               <xs:enumeration value="newline"/>
+               <xs:enumeration value="nobreak"/>
+               <xs:enumeration value="goodbreak"/>
+               <xs:enumeration value="badbreak"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="lineleading" type="m:length"/>
+      <xs:attribute name="linebreakstyle">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="before"/>
+               <xs:enumeration value="after"/>
+               <xs:enumeration value="duplicate"/>
+               <xs:enumeration value="infixlinebreakstyle"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="linebreakmultchar"/>
+      <xs:attribute name="indentalign">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="left"/>
+               <xs:enumeration value="center"/>
+               <xs:enumeration value="right"/>
+               <xs:enumeration value="auto"/>
+               <xs:enumeration value="id"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="indentshift" type="m:length"/>
+      <xs:attribute name="indenttarget"/>
+      <xs:attribute name="indentalignfirst">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="left"/>
+               <xs:enumeration value="center"/>
+               <xs:enumeration value="right"/>
+               <xs:enumeration value="auto"/>
+               <xs:enumeration value="id"/>
+               <xs:enumeration value="indentalign"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="indentshiftfirst">
+         <xs:simpleType>
+            <xs:union memberTypes="m:length">
+               <xs:simpleType>
+                  <xs:restriction base="xs:token">
+                     <xs:enumeration value="indentshift"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:union>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="indentalignlast">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="left"/>
+               <xs:enumeration value="center"/>
+               <xs:enumeration value="right"/>
+               <xs:enumeration value="auto"/>
+               <xs:enumeration value="id"/>
+               <xs:enumeration value="indentalign"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="indentshiftlast">
+         <xs:simpleType>
+            <xs:union memberTypes="m:length">
+               <xs:simpleType>
+                  <xs:restriction base="xs:token">
+                     <xs:enumeration value="indentshift"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:union>
+         </xs:simpleType>
+      </xs:attribute>
+   </xs:attributeGroup>
+   <xs:element name="mtext" substitutionGroup="m:TokenExpression">
+      <xs:complexType mixed="true">
+         <xs:group minOccurs="0" maxOccurs="unbounded" ref="m:token.content"/>
+         <xs:attributeGroup ref="m:mtext.attributes"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:attributeGroup name="mtext.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attributeGroup ref="m:CommonPresAtt"/>
+      <xs:attributeGroup ref="m:TokenAtt"/>
+   </xs:attributeGroup>
+   <xs:element name="mspace" substitutionGroup="m:TokenExpression">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:mspace.attributes"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:attributeGroup name="mspace.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attributeGroup ref="m:CommonPresAtt"/>
+      <xs:attributeGroup ref="m:TokenAtt"/>
+      <xs:attribute name="width" type="m:length"/>
+      <xs:attribute name="height" type="m:length"/>
+      <xs:attribute name="depth" type="m:length"/>
+      <xs:attribute name="linebreak">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="auto"/>
+               <xs:enumeration value="newline"/>
+               <xs:enumeration value="nobreak"/>
+               <xs:enumeration value="goodbreak"/>
+               <xs:enumeration value="badbreak"/>
+               <xs:enumeration value="indentingnewline"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="indentalign">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="left"/>
+               <xs:enumeration value="center"/>
+               <xs:enumeration value="right"/>
+               <xs:enumeration value="auto"/>
+               <xs:enumeration value="id"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="indentshift" type="m:length"/>
+      <xs:attribute name="indenttarget"/>
+      <xs:attribute name="indentalignfirst">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="left"/>
+               <xs:enumeration value="center"/>
+               <xs:enumeration value="right"/>
+               <xs:enumeration value="auto"/>
+               <xs:enumeration value="id"/>
+               <xs:enumeration value="indentalign"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="indentshiftfirst">
+         <xs:simpleType>
+            <xs:union memberTypes="m:length">
+               <xs:simpleType>
+                  <xs:restriction base="xs:token">
+                     <xs:enumeration value="indentshift"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:union>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="indentalignlast">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="left"/>
+               <xs:enumeration value="center"/>
+               <xs:enumeration value="right"/>
+               <xs:enumeration value="auto"/>
+               <xs:enumeration value="id"/>
+               <xs:enumeration value="indentalign"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="indentshiftlast">
+         <xs:simpleType>
+            <xs:union memberTypes="m:length">
+               <xs:simpleType>
+                  <xs:restriction base="xs:token">
+                     <xs:enumeration value="indentshift"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:union>
+         </xs:simpleType>
+      </xs:attribute>
+   </xs:attributeGroup>
+   <xs:element name="ms" substitutionGroup="m:TokenExpression">
+      <xs:complexType mixed="true">
+         <xs:group minOccurs="0" maxOccurs="unbounded" ref="m:token.content"/>
+         <xs:attributeGroup ref="m:ms.attributes"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:attributeGroup name="ms.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attributeGroup ref="m:CommonPresAtt"/>
+      <xs:attributeGroup ref="m:TokenAtt"/>
+      <xs:attribute name="lquote"/>
+      <xs:attribute name="rquote"/>
+   </xs:attributeGroup>
+   <xs:element name="mglyph">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:mglyph.attributes"/>
+         <xs:attributeGroup ref="m:mglyph.deprecatedattributes"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:attributeGroup name="mglyph.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attributeGroup ref="m:CommonPresAtt"/>
+      <xs:attribute name="src" type="xs:anyURI"/>
+      <xs:attribute name="width" type="m:length"/>
+      <xs:attribute name="height" type="m:length"/>
+      <xs:attribute name="valign" type="m:length"/>
+      <xs:attribute name="alt"/>
+   </xs:attributeGroup>
+   <xs:attributeGroup name="mglyph.deprecatedattributes">
+      <xs:attribute name="index" type="m:integer"/>
+      <xs:attribute name="mathvariant">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="normal"/>
+               <xs:enumeration value="bold"/>
+               <xs:enumeration value="italic"/>
+               <xs:enumeration value="bold-italic"/>
+               <xs:enumeration value="double-struck"/>
+               <xs:enumeration value="bold-fraktur"/>
+               <xs:enumeration value="script"/>
+               <xs:enumeration value="bold-script"/>
+               <xs:enumeration value="fraktur"/>
+               <xs:enumeration value="sans-serif"/>
+               <xs:enumeration value="bold-sans-serif"/>
+               <xs:enumeration value="sans-serif-italic"/>
+               <xs:enumeration value="sans-serif-bold-italic"/>
+               <xs:enumeration value="monospace"/>
+               <xs:enumeration value="initial"/>
+               <xs:enumeration value="tailed"/>
+               <xs:enumeration value="looped"/>
+               <xs:enumeration value="stretched"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="mathsize">
+         <xs:simpleType>
+            <xs:union memberTypes="m:length">
+               <xs:simpleType>
+                  <xs:restriction base="xs:token">
+                     <xs:enumeration value="small"/>
+                  </xs:restriction>
+               </xs:simpleType>
+               <xs:simpleType>
+                  <xs:restriction base="xs:token">
+                     <xs:enumeration value="normal"/>
+                  </xs:restriction>
+               </xs:simpleType>
+               <xs:simpleType>
+                  <xs:restriction base="xs:token">
+                     <xs:enumeration value="big"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:union>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attributeGroup ref="m:DeprecatedTokenAtt"/>
+   </xs:attributeGroup>
+   <xs:element name="msline">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:msline.attributes"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:attributeGroup name="msline.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attributeGroup ref="m:CommonPresAtt"/>
+      <xs:attribute name="position" type="m:integer"/>
+      <xs:attribute name="length" type="m:unsigned-integer"/>
+      <xs:attribute name="leftoverhang" type="m:length"/>
+      <xs:attribute name="rightoverhang" type="m:length"/>
+      <xs:attribute name="mslinethickness">
+         <xs:simpleType>
+            <xs:union memberTypes="m:length">
+               <xs:simpleType>
+                  <xs:restriction base="xs:token">
+                     <xs:enumeration value="thin"/>
+                  </xs:restriction>
+               </xs:simpleType>
+               <xs:simpleType>
+                  <xs:restriction base="xs:token">
+                     <xs:enumeration value="medium"/>
+                  </xs:restriction>
+               </xs:simpleType>
+               <xs:simpleType>
+                  <xs:restriction base="xs:token">
+                     <xs:enumeration value="thick"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:union>
+         </xs:simpleType>
+      </xs:attribute>
+   </xs:attributeGroup>
+   <xs:element name="none">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:none.attributes"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:attributeGroup name="none.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attributeGroup ref="m:CommonPresAtt"/>
+   </xs:attributeGroup>
+   <xs:element name="mprescripts">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:mprescripts.attributes"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:attributeGroup name="mprescripts.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attributeGroup ref="m:CommonPresAtt"/>
+   </xs:attributeGroup>
+   <xs:attributeGroup name="CommonPresAtt">
+      <xs:attribute name="mathcolor" type="m:color"/>
+      <xs:attribute name="mathbackground">
+         <xs:simpleType>
+            <xs:union memberTypes="m:color">
+               <xs:simpleType>
+                  <xs:restriction base="xs:token">
+                     <xs:enumeration value="transparent"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:union>
+         </xs:simpleType>
+      </xs:attribute>
+   </xs:attributeGroup>
+   <xs:attributeGroup name="TokenAtt">
+      <xs:attribute name="mathvariant">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="normal"/>
+               <xs:enumeration value="bold"/>
+               <xs:enumeration value="italic"/>
+               <xs:enumeration value="bold-italic"/>
+               <xs:enumeration value="double-struck"/>
+               <xs:enumeration value="bold-fraktur"/>
+               <xs:enumeration value="script"/>
+               <xs:enumeration value="bold-script"/>
+               <xs:enumeration value="fraktur"/>
+               <xs:enumeration value="sans-serif"/>
+               <xs:enumeration value="bold-sans-serif"/>
+               <xs:enumeration value="sans-serif-italic"/>
+               <xs:enumeration value="sans-serif-bold-italic"/>
+               <xs:enumeration value="monospace"/>
+               <xs:enumeration value="initial"/>
+               <xs:enumeration value="tailed"/>
+               <xs:enumeration value="looped"/>
+               <xs:enumeration value="stretched"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="mathsize">
+         <xs:simpleType>
+            <xs:union memberTypes="m:length">
+               <xs:simpleType>
+                  <xs:restriction base="xs:token">
+                     <xs:enumeration value="small"/>
+                  </xs:restriction>
+               </xs:simpleType>
+               <xs:simpleType>
+                  <xs:restriction base="xs:token">
+                     <xs:enumeration value="normal"/>
+                  </xs:restriction>
+               </xs:simpleType>
+               <xs:simpleType>
+                  <xs:restriction base="xs:token">
+                     <xs:enumeration value="big"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:union>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="dir">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="ltr"/>
+               <xs:enumeration value="rtl"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attributeGroup ref="m:DeprecatedTokenAtt"/>
+   </xs:attributeGroup>
+   <xs:attributeGroup name="DeprecatedTokenAtt">
+      <xs:attribute name="fontfamily"/>
+      <xs:attribute name="fontweight">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="normal"/>
+               <xs:enumeration value="bold"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="fontstyle">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="normal"/>
+               <xs:enumeration value="italic"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="fontsize" type="m:length"/>
+      <xs:attribute name="color" type="m:color"/>
+      <xs:attribute name="background">
+         <xs:simpleType>
+            <xs:union memberTypes="m:color">
+               <xs:simpleType>
+                  <xs:restriction base="xs:token">
+                     <xs:enumeration value="transparent"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:union>
+         </xs:simpleType>
+      </xs:attribute>
+   </xs:attributeGroup>
+   <xs:element name="MalignExpression" abstract="true" substitutionGroup="m:PresentationExpression"/>
+   <xs:element name="malignmark" substitutionGroup="m:MalignExpression">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:malignmark.attributes"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:attributeGroup name="malignmark.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attributeGroup ref="m:CommonPresAtt"/>
+      <xs:attribute name="edge">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="left"/>
+               <xs:enumeration value="right"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+   </xs:attributeGroup>
+   <xs:element name="maligngroup" substitutionGroup="m:MalignExpression">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:maligngroup.attributes"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:attributeGroup name="maligngroup.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attributeGroup ref="m:CommonPresAtt"/>
+      <xs:attribute name="groupalign">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="left"/>
+               <xs:enumeration value="center"/>
+               <xs:enumeration value="right"/>
+               <xs:enumeration value="decimalpoint"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+   </xs:attributeGroup>
+   <xs:element name="mrow" substitutionGroup="m:PresentationExpression">
+      <xs:complexType>
+         <xs:group minOccurs="0" maxOccurs="unbounded" ref="m:MathExpression"/>
+         <xs:attributeGroup ref="m:mrow.attributes"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:attributeGroup name="mrow.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attributeGroup ref="m:CommonPresAtt"/>
+      <xs:attribute name="dir">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="ltr"/>
+               <xs:enumeration value="rtl"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+   </xs:attributeGroup>
+   <xs:element name="mfrac" substitutionGroup="m:PresentationExpression">
+      <xs:complexType>
+         <xs:sequence>
+            <xs:group ref="m:MathExpression"/>
+            <xs:group ref="m:MathExpression"/>
+         </xs:sequence>
+         <xs:attributeGroup ref="m:mfrac.attributes"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:attributeGroup name="mfrac.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attributeGroup ref="m:CommonPresAtt"/>
+      <xs:attribute name="linethickness">
+         <xs:simpleType>
+            <xs:union memberTypes="m:length">
+               <xs:simpleType>
+                  <xs:restriction base="xs:token">
+                     <xs:enumeration value="thin"/>
+                  </xs:restriction>
+               </xs:simpleType>
+               <xs:simpleType>
+                  <xs:restriction base="xs:token">
+                     <xs:enumeration value="medium"/>
+                  </xs:restriction>
+               </xs:simpleType>
+               <xs:simpleType>
+                  <xs:restriction base="xs:token">
+                     <xs:enumeration value="thick"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:union>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="numalign">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="left"/>
+               <xs:enumeration value="center"/>
+               <xs:enumeration value="right"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="denomalign">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="left"/>
+               <xs:enumeration value="center"/>
+               <xs:enumeration value="right"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="bevelled">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="true"/>
+               <xs:enumeration value="false"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+   </xs:attributeGroup>
+   <xs:element name="msqrt" substitutionGroup="m:PresentationExpression">
+      <xs:complexType>
+         <xs:complexContent>
+            <xs:extension base="m:ImpliedMrow">
+               <xs:attributeGroup ref="m:msqrt.attributes"/>
+            </xs:extension>
+         </xs:complexContent>
+      </xs:complexType>
+   </xs:element>
+   <xs:attributeGroup name="msqrt.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attributeGroup ref="m:CommonPresAtt"/>
+   </xs:attributeGroup>
+   <xs:element name="mroot" substitutionGroup="m:PresentationExpression">
+      <xs:complexType>
+         <xs:sequence>
+            <xs:group ref="m:MathExpression"/>
+            <xs:group ref="m:MathExpression"/>
+         </xs:sequence>
+         <xs:attributeGroup ref="m:mroot.attributes"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:attributeGroup name="mroot.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attributeGroup ref="m:CommonPresAtt"/>
+   </xs:attributeGroup>
+   <xs:element name="mstyle" substitutionGroup="m:PresentationExpression">
+      <xs:complexType>
+         <xs:complexContent>
+            <xs:extension base="m:ImpliedMrow">
+               <xs:attributeGroup ref="m:mstyle.attributes"/>
+            </xs:extension>
+         </xs:complexContent>
+      </xs:complexType>
+   </xs:element>
+   <xs:attributeGroup name="mstyle.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attributeGroup ref="m:CommonPresAtt"/>
+      <xs:attributeGroup ref="m:mstyle.specificattributes"/>
+      <xs:attributeGroup ref="m:mstyle.generalattributes"/>
+      <xs:attributeGroup ref="m:mstyle.deprecatedattributes"/>
+   </xs:attributeGroup>
+   <xs:attributeGroup name="mstyle.specificattributes">
+      <xs:attribute name="scriptlevel" type="m:integer"/>
+      <xs:attribute name="displaystyle">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="true"/>
+               <xs:enumeration value="false"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="scriptsizemultiplier" type="m:number"/>
+      <xs:attribute name="scriptminsize" type="m:length"/>
+      <xs:attribute name="infixlinebreakstyle">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="before"/>
+               <xs:enumeration value="after"/>
+               <xs:enumeration value="duplicate"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="decimalpoint" type="m:character"/>
+   </xs:attributeGroup>
+   <xs:attributeGroup name="mstyle.generalattributes">
+      <xs:attribute name="accent">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="true"/>
+               <xs:enumeration value="false"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="accentunder">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="true"/>
+               <xs:enumeration value="false"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="align">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="left"/>
+               <xs:enumeration value="right"/>
+               <xs:enumeration value="center"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="alignmentscope">
+         <xs:simpleType>
+            <xs:restriction>
+               <xs:simpleType>
+                  <xs:list>
+                     <xs:simpleType>
+                        <xs:restriction base="xs:token">
+                           <xs:enumeration value="true"/>
+                           <xs:enumeration value="false"/>
+                        </xs:restriction>
+                     </xs:simpleType>
+                  </xs:list>
+               </xs:simpleType>
+               <xs:minLength value="1"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="bevelled">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="true"/>
+               <xs:enumeration value="false"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="charalign">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="left"/>
+               <xs:enumeration value="center"/>
+               <xs:enumeration value="right"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="charspacing">
+         <xs:simpleType>
+            <xs:union memberTypes="m:length">
+               <xs:simpleType>
+                  <xs:restriction base="xs:token">
+                     <xs:enumeration value="loose"/>
+                  </xs:restriction>
+               </xs:simpleType>
+               <xs:simpleType>
+                  <xs:restriction base="xs:token">
+                     <xs:enumeration value="medium"/>
+                  </xs:restriction>
+               </xs:simpleType>
+               <xs:simpleType>
+                  <xs:restriction base="xs:token">
+                     <xs:enumeration value="tight"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:union>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="close"/>
+      <xs:attribute name="columnalign">
+         <xs:simpleType>
+            <xs:restriction>
+               <xs:simpleType>
+                  <xs:list itemType="m:columnalignstyle"/>
+               </xs:simpleType>
+               <xs:minLength value="1"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="columnlines">
+         <xs:simpleType>
+            <xs:restriction>
+               <xs:simpleType>
+                  <xs:list itemType="m:linestyle"/>
+               </xs:simpleType>
+               <xs:minLength value="1"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="columnspacing">
+         <xs:simpleType>
+            <xs:restriction>
+               <xs:simpleType>
+                  <xs:list itemType="m:length"/>
+               </xs:simpleType>
+               <xs:minLength value="1"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="columnspan" type="m:positive-integer"/>
+      <xs:attribute name="columnwidth">
+         <xs:simpleType>
+            <xs:restriction>
+               <xs:simpleType>
+                  <xs:list>
+                     <xs:simpleType>
+                        <xs:union memberTypes="m:length">
+                           <xs:simpleType>
+                              <xs:restriction base="xs:token">
+                                 <xs:enumeration value="auto"/>
+                              </xs:restriction>
+                           </xs:simpleType>
+                           <xs:simpleType>
+                              <xs:restriction base="xs:token">
+                                 <xs:enumeration value="fit"/>
+                              </xs:restriction>
+                           </xs:simpleType>
+                        </xs:union>
+                     </xs:simpleType>
+                  </xs:list>
+               </xs:simpleType>
+               <xs:minLength value="1"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="crossout">
+         <xs:simpleType>
+            <xs:list>
+               <xs:simpleType>
+                  <xs:restriction base="xs:token">
+                     <xs:enumeration value="none"/>
+                     <xs:enumeration value="updiagonalstrike"/>
+                     <xs:enumeration value="downdiagonalstrike"/>
+                     <xs:enumeration value="verticalstrike"/>
+                     <xs:enumeration value="horizontalstrike"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:list>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="denomalign">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="left"/>
+               <xs:enumeration value="center"/>
+               <xs:enumeration value="right"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="depth" type="m:length"/>
+      <xs:attribute name="dir">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="ltr"/>
+               <xs:enumeration value="rtl"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="edge">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="left"/>
+               <xs:enumeration value="right"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="equalcolumns">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="true"/>
+               <xs:enumeration value="false"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="equalrows">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="true"/>
+               <xs:enumeration value="false"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="fence">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="true"/>
+               <xs:enumeration value="false"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="form">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="prefix"/>
+               <xs:enumeration value="infix"/>
+               <xs:enumeration value="postfix"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="frame" type="m:linestyle"/>
+      <xs:attribute name="framespacing">
+         <xs:simpleType>
+            <xs:restriction>
+               <xs:simpleType>
+                  <xs:list>
+                     <xs:simpleType>
+                        <xs:union memberTypes="m:length m:length"/>
+                     </xs:simpleType>
+                  </xs:list>
+               </xs:simpleType>
+               <xs:length value="2"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="groupalign" type="m:group-alignment-list-list"/>
+      <xs:attribute name="height" type="m:length"/>
+      <xs:attribute name="indentalign">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="left"/>
+               <xs:enumeration value="center"/>
+               <xs:enumeration value="right"/>
+               <xs:enumeration value="auto"/>
+               <xs:enumeration value="id"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="indentalignfirst">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="left"/>
+               <xs:enumeration value="center"/>
+               <xs:enumeration value="right"/>
+               <xs:enumeration value="auto"/>
+               <xs:enumeration value="id"/>
+               <xs:enumeration value="indentalign"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="indentalignlast">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="left"/>
+               <xs:enumeration value="center"/>
+               <xs:enumeration value="right"/>
+               <xs:enumeration value="auto"/>
+               <xs:enumeration value="id"/>
+               <xs:enumeration value="indentalign"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="indentshift" type="m:length"/>
+      <xs:attribute name="indentshiftfirst">
+         <xs:simpleType>
+            <xs:union memberTypes="m:length">
+               <xs:simpleType>
+                  <xs:restriction base="xs:token">
+                     <xs:enumeration value="indentshift"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:union>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="indentshiftlast">
+         <xs:simpleType>
+            <xs:union memberTypes="m:length">
+               <xs:simpleType>
+                  <xs:restriction base="xs:token">
+                     <xs:enumeration value="indentshift"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:union>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="indenttarget"/>
+      <xs:attribute name="largeop">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="true"/>
+               <xs:enumeration value="false"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="leftoverhang" type="m:length"/>
+      <xs:attribute name="length" type="m:unsigned-integer"/>
+      <xs:attribute name="linebreak">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="auto"/>
+               <xs:enumeration value="newline"/>
+               <xs:enumeration value="nobreak"/>
+               <xs:enumeration value="goodbreak"/>
+               <xs:enumeration value="badbreak"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="linebreakmultchar"/>
+      <xs:attribute name="linebreakstyle">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="before"/>
+               <xs:enumeration value="after"/>
+               <xs:enumeration value="duplicate"/>
+               <xs:enumeration value="infixlinebreakstyle"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="lineleading" type="m:length"/>
+      <xs:attribute name="linethickness">
+         <xs:simpleType>
+            <xs:union memberTypes="m:length">
+               <xs:simpleType>
+                  <xs:restriction base="xs:token">
+                     <xs:enumeration value="thin"/>
+                  </xs:restriction>
+               </xs:simpleType>
+               <xs:simpleType>
+                  <xs:restriction base="xs:token">
+                     <xs:enumeration value="medium"/>
+                  </xs:restriction>
+               </xs:simpleType>
+               <xs:simpleType>
+                  <xs:restriction base="xs:token">
+                     <xs:enumeration value="thick"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:union>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="location">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="w"/>
+               <xs:enumeration value="nw"/>
+               <xs:enumeration value="n"/>
+               <xs:enumeration value="ne"/>
+               <xs:enumeration value="e"/>
+               <xs:enumeration value="se"/>
+               <xs:enumeration value="s"/>
+               <xs:enumeration value="sw"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="longdivstyle">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="lefttop"/>
+               <xs:enumeration value="stackedrightright"/>
+               <xs:enumeration value="mediumstackedrightright"/>
+               <xs:enumeration value="shortstackedrightright"/>
+               <xs:enumeration value="righttop"/>
+               <xs:enumeration value="left/\right"/>
+               <xs:enumeration value="left)(right"/>
+               <xs:enumeration value=":right=right"/>
+               <xs:enumeration value="stackedleftleft"/>
+               <xs:enumeration value="stackedleftlinetop"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="lquote"/>
+      <xs:attribute name="lspace" type="m:length"/>
+      <xs:attribute name="mathsize">
+         <xs:simpleType>
+            <xs:union memberTypes="m:length">
+               <xs:simpleType>
+                  <xs:restriction base="xs:token">
+                     <xs:enumeration value="small"/>
+                  </xs:restriction>
+               </xs:simpleType>
+               <xs:simpleType>
+                  <xs:restriction base="xs:token">
+                     <xs:enumeration value="normal"/>
+                  </xs:restriction>
+               </xs:simpleType>
+               <xs:simpleType>
+                  <xs:restriction base="xs:token">
+                     <xs:enumeration value="big"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:union>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="mathvariant">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="normal"/>
+               <xs:enumeration value="bold"/>
+               <xs:enumeration value="italic"/>
+               <xs:enumeration value="bold-italic"/>
+               <xs:enumeration value="double-struck"/>
+               <xs:enumeration value="bold-fraktur"/>
+               <xs:enumeration value="script"/>
+               <xs:enumeration value="bold-script"/>
+               <xs:enumeration value="fraktur"/>
+               <xs:enumeration value="sans-serif"/>
+               <xs:enumeration value="bold-sans-serif"/>
+               <xs:enumeration value="sans-serif-italic"/>
+               <xs:enumeration value="sans-serif-bold-italic"/>
+               <xs:enumeration value="monospace"/>
+               <xs:enumeration value="initial"/>
+               <xs:enumeration value="tailed"/>
+               <xs:enumeration value="looped"/>
+               <xs:enumeration value="stretched"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="maxsize">
+         <xs:simpleType>
+            <xs:union memberTypes="m:length">
+               <xs:simpleType>
+                  <xs:restriction base="xs:token">
+                     <xs:enumeration value="infinity"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:union>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="minlabelspacing" type="m:length"/>
+      <xs:attribute name="minsize" type="m:length"/>
+      <xs:attribute name="movablelimits">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="true"/>
+               <xs:enumeration value="false"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="mslinethickness">
+         <xs:simpleType>
+            <xs:union memberTypes="m:length">
+               <xs:simpleType>
+                  <xs:restriction base="xs:token">
+                     <xs:enumeration value="thin"/>
+                  </xs:restriction>
+               </xs:simpleType>
+               <xs:simpleType>
+                  <xs:restriction base="xs:token">
+                     <xs:enumeration value="medium"/>
+                  </xs:restriction>
+               </xs:simpleType>
+               <xs:simpleType>
+                  <xs:restriction base="xs:token">
+                     <xs:enumeration value="thick"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:union>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="notation"/>
+      <xs:attribute name="numalign">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="left"/>
+               <xs:enumeration value="center"/>
+               <xs:enumeration value="right"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="open"/>
+      <xs:attribute name="position" type="m:integer"/>
+      <xs:attribute name="rightoverhang" type="m:length"/>
+      <xs:attribute name="rowalign">
+         <xs:simpleType>
+            <xs:restriction>
+               <xs:simpleType>
+                  <xs:list itemType="m:verticalalign"/>
+               </xs:simpleType>
+               <xs:minLength value="1"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="rowlines">
+         <xs:simpleType>
+            <xs:restriction>
+               <xs:simpleType>
+                  <xs:list itemType="m:linestyle"/>
+               </xs:simpleType>
+               <xs:minLength value="1"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="rowspacing">
+         <xs:simpleType>
+            <xs:restriction>
+               <xs:simpleType>
+                  <xs:list itemType="m:length"/>
+               </xs:simpleType>
+               <xs:minLength value="1"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="rowspan" type="m:positive-integer"/>
+      <xs:attribute name="rquote"/>
+      <xs:attribute name="rspace" type="m:length"/>
+      <xs:attribute name="selection" type="m:positive-integer"/>
+      <xs:attribute name="separator">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="true"/>
+               <xs:enumeration value="false"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="separators"/>
+      <xs:attribute name="shift" type="m:integer"/>
+      <xs:attribute name="side">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="left"/>
+               <xs:enumeration value="right"/>
+               <xs:enumeration value="leftoverlap"/>
+               <xs:enumeration value="rightoverlap"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="stackalign">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="left"/>
+               <xs:enumeration value="center"/>
+               <xs:enumeration value="right"/>
+               <xs:enumeration value="decimalpoint"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="stretchy">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="true"/>
+               <xs:enumeration value="false"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="subscriptshift" type="m:length"/>
+      <xs:attribute name="superscriptshift" type="m:length"/>
+      <xs:attribute name="symmetric">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="true"/>
+               <xs:enumeration value="false"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="valign" type="m:length"/>
+      <xs:attribute name="width" type="m:length"/>
+   </xs:attributeGroup>
+   <xs:attributeGroup name="mstyle.deprecatedattributes">
+      <xs:attributeGroup ref="m:DeprecatedTokenAtt"/>
+      <xs:attribute name="veryverythinmathspace" type="m:length"/>
+      <xs:attribute name="verythinmathspace" type="m:length"/>
+      <xs:attribute name="thinmathspace" type="m:length"/>
+      <xs:attribute name="mediummathspace" type="m:length"/>
+      <xs:attribute name="thickmathspace" type="m:length"/>
+      <xs:attribute name="verythickmathspace" type="m:length"/>
+      <xs:attribute name="veryverythickmathspace" type="m:length"/>
+   </xs:attributeGroup>
+   <xs:attributeGroup name="math.attributes">
+      <xs:attributeGroup ref="m:CommonPresAtt"/>
+      <xs:attributeGroup ref="m:mstyle.specificattributes"/>
+      <xs:attributeGroup ref="m:mstyle.generalattributes"/>
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attribute name="display">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="block"/>
+               <xs:enumeration value="inline"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="maxwidth" type="m:length"/>
+      <xs:attribute name="overflow">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="linebreak"/>
+               <xs:enumeration value="scroll"/>
+               <xs:enumeration value="elide"/>
+               <xs:enumeration value="truncate"/>
+               <xs:enumeration value="scale"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="altimg" type="xs:anyURI"/>
+      <xs:attribute name="altimg-width" type="m:length"/>
+      <xs:attribute name="altimg-height" type="m:length"/>
+      <xs:attribute name="altimg-valign">
+         <xs:simpleType>
+            <xs:union memberTypes="m:length">
+               <xs:simpleType>
+                  <xs:restriction base="xs:token">
+                     <xs:enumeration value="top"/>
+                  </xs:restriction>
+               </xs:simpleType>
+               <xs:simpleType>
+                  <xs:restriction base="xs:token">
+                     <xs:enumeration value="middle"/>
+                  </xs:restriction>
+               </xs:simpleType>
+               <xs:simpleType>
+                  <xs:restriction base="xs:token">
+                     <xs:enumeration value="bottom"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:union>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="alttext"/>
+      <xs:attribute name="cdgroup" type="xs:anyURI"/>
+      <xs:attributeGroup ref="m:math.deprecatedattributes"/>
+   </xs:attributeGroup>
+   <xs:element name="merror" substitutionGroup="m:PresentationExpression">
+      <xs:complexType>
+         <xs:complexContent>
+            <xs:extension base="m:ImpliedMrow">
+               <xs:attributeGroup ref="m:merror.attributes"/>
+            </xs:extension>
+         </xs:complexContent>
+      </xs:complexType>
+   </xs:element>
+   <xs:attributeGroup name="merror.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attributeGroup ref="m:CommonPresAtt"/>
+   </xs:attributeGroup>
+   <xs:element name="mpadded" substitutionGroup="m:PresentationExpression">
+      <xs:complexType>
+         <xs:complexContent>
+            <xs:extension base="m:ImpliedMrow">
+               <xs:attributeGroup ref="m:mpadded.attributes"/>
+            </xs:extension>
+         </xs:complexContent>
+      </xs:complexType>
+   </xs:element>
+   <xs:attributeGroup name="mpadded.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attributeGroup ref="m:CommonPresAtt"/>
+      <xs:attribute name="height" type="m:mpadded-length"/>
+      <xs:attribute name="depth" type="m:mpadded-length"/>
+      <xs:attribute name="width" type="m:mpadded-length"/>
+      <xs:attribute name="lspace" type="m:mpadded-length"/>
+      <xs:attribute name="voffset" type="m:mpadded-length"/>
+   </xs:attributeGroup>
+   <xs:element name="mphantom" substitutionGroup="m:PresentationExpression">
+      <xs:complexType>
+         <xs:complexContent>
+            <xs:extension base="m:ImpliedMrow">
+               <xs:attributeGroup ref="m:mphantom.attributes"/>
+            </xs:extension>
+         </xs:complexContent>
+      </xs:complexType>
+   </xs:element>
+   <xs:attributeGroup name="mphantom.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attributeGroup ref="m:CommonPresAtt"/>
+   </xs:attributeGroup>
+   <xs:element name="mfenced" substitutionGroup="m:PresentationExpression">
+      <xs:complexType>
+         <xs:group minOccurs="0" maxOccurs="unbounded" ref="m:MathExpression"/>
+         <xs:attributeGroup ref="m:mfenced.attributes"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:attributeGroup name="mfenced.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attributeGroup ref="m:CommonPresAtt"/>
+      <xs:attribute name="open"/>
+      <xs:attribute name="close"/>
+      <xs:attribute name="separators"/>
+   </xs:attributeGroup>
+   <xs:element name="menclose" substitutionGroup="m:PresentationExpression">
+      <xs:complexType>
+         <xs:complexContent>
+            <xs:extension base="m:ImpliedMrow">
+               <xs:attributeGroup ref="m:menclose.attributes"/>
+            </xs:extension>
+         </xs:complexContent>
+      </xs:complexType>
+   </xs:element>
+   <xs:attributeGroup name="menclose.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attributeGroup ref="m:CommonPresAtt"/>
+      <xs:attribute name="notation"/>
+   </xs:attributeGroup>
+   <xs:element name="msub" substitutionGroup="m:PresentationExpression">
+      <xs:complexType>
+         <xs:sequence>
+            <xs:group ref="m:MathExpression"/>
+            <xs:group ref="m:MathExpression"/>
+         </xs:sequence>
+         <xs:attributeGroup ref="m:msub.attributes"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:attributeGroup name="msub.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attributeGroup ref="m:CommonPresAtt"/>
+      <xs:attribute name="subscriptshift" type="m:length"/>
+   </xs:attributeGroup>
+   <xs:element name="msup" substitutionGroup="m:PresentationExpression">
+      <xs:complexType>
+         <xs:sequence>
+            <xs:group ref="m:MathExpression"/>
+            <xs:group ref="m:MathExpression"/>
+         </xs:sequence>
+         <xs:attributeGroup ref="m:msup.attributes"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:attributeGroup name="msup.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attributeGroup ref="m:CommonPresAtt"/>
+      <xs:attribute name="superscriptshift" type="m:length"/>
+   </xs:attributeGroup>
+   <xs:element name="msubsup" substitutionGroup="m:PresentationExpression">
+      <xs:complexType>
+         <xs:sequence>
+            <xs:group ref="m:MathExpression"/>
+            <xs:group ref="m:MathExpression"/>
+            <xs:group ref="m:MathExpression"/>
+         </xs:sequence>
+         <xs:attributeGroup ref="m:msubsup.attributes"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:attributeGroup name="msubsup.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attributeGroup ref="m:CommonPresAtt"/>
+      <xs:attribute name="subscriptshift" type="m:length"/>
+      <xs:attribute name="superscriptshift" type="m:length"/>
+   </xs:attributeGroup>
+   <xs:element name="munder" substitutionGroup="m:PresentationExpression">
+      <xs:complexType>
+         <xs:sequence>
+            <xs:group ref="m:MathExpression"/>
+            <xs:group ref="m:MathExpression"/>
+         </xs:sequence>
+         <xs:attributeGroup ref="m:munder.attributes"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:attributeGroup name="munder.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attributeGroup ref="m:CommonPresAtt"/>
+      <xs:attribute name="accentunder">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="true"/>
+               <xs:enumeration value="false"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="align">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="left"/>
+               <xs:enumeration value="right"/>
+               <xs:enumeration value="center"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+   </xs:attributeGroup>
+   <xs:element name="mover" substitutionGroup="m:PresentationExpression">
+      <xs:complexType>
+         <xs:sequence>
+            <xs:group ref="m:MathExpression"/>
+            <xs:group ref="m:MathExpression"/>
+         </xs:sequence>
+         <xs:attributeGroup ref="m:mover.attributes"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:attributeGroup name="mover.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attributeGroup ref="m:CommonPresAtt"/>
+      <xs:attribute name="accent">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="true"/>
+               <xs:enumeration value="false"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="align">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="left"/>
+               <xs:enumeration value="right"/>
+               <xs:enumeration value="center"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+   </xs:attributeGroup>
+   <xs:element name="munderover" substitutionGroup="m:PresentationExpression">
+      <xs:complexType>
+         <xs:sequence>
+            <xs:group ref="m:MathExpression"/>
+            <xs:group ref="m:MathExpression"/>
+            <xs:group ref="m:MathExpression"/>
+         </xs:sequence>
+         <xs:attributeGroup ref="m:munderover.attributes"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:attributeGroup name="munderover.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attributeGroup ref="m:CommonPresAtt"/>
+      <xs:attribute name="accent">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="true"/>
+               <xs:enumeration value="false"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="accentunder">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="true"/>
+               <xs:enumeration value="false"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="align">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="left"/>
+               <xs:enumeration value="right"/>
+               <xs:enumeration value="center"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+   </xs:attributeGroup>
+   <xs:element name="mmultiscripts" substitutionGroup="m:PresentationExpression">
+      <xs:complexType>
+         <xs:sequence>
+            <xs:group ref="m:MathExpression"/>
+            <xs:group minOccurs="0" maxOccurs="unbounded" ref="m:MultiScriptExpression"/>
+            <xs:sequence minOccurs="0">
+               <xs:element ref="m:mprescripts"/>
+               <xs:group minOccurs="0" maxOccurs="unbounded" ref="m:MultiScriptExpression"/>
+            </xs:sequence>
+         </xs:sequence>
+         <xs:attributeGroup ref="m:mmultiscripts.attributes"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:attributeGroup name="mmultiscripts.attributes">
+      <xs:attributeGroup ref="m:msubsup.attributes"/>
+   </xs:attributeGroup>
+   <xs:element name="mtable" substitutionGroup="m:PresentationExpression">
+      <xs:complexType>
+         <xs:sequence>
+            <xs:element minOccurs="0" maxOccurs="unbounded" ref="m:TableRowExpression"/>
+         </xs:sequence>
+         <xs:attributeGroup ref="m:mtable.attributes"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:attributeGroup name="mtable.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attributeGroup ref="m:CommonPresAtt"/>
+      <xs:attribute name="align">
+         <xs:simpleType>
+            <xs:restriction base="xs:string">
+               <xs:pattern value="\s*(top|bottom|center|baseline|axis)(\s+-?[0-9]+)?\s*"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="rowalign">
+         <xs:simpleType>
+            <xs:restriction>
+               <xs:simpleType>
+                  <xs:list itemType="m:verticalalign"/>
+               </xs:simpleType>
+               <xs:minLength value="1"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="columnalign">
+         <xs:simpleType>
+            <xs:restriction>
+               <xs:simpleType>
+                  <xs:list itemType="m:columnalignstyle"/>
+               </xs:simpleType>
+               <xs:minLength value="1"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="groupalign" type="m:group-alignment-list-list"/>
+      <xs:attribute name="alignmentscope">
+         <xs:simpleType>
+            <xs:restriction>
+               <xs:simpleType>
+                  <xs:list>
+                     <xs:simpleType>
+                        <xs:restriction base="xs:token">
+                           <xs:enumeration value="true"/>
+                           <xs:enumeration value="false"/>
+                        </xs:restriction>
+                     </xs:simpleType>
+                  </xs:list>
+               </xs:simpleType>
+               <xs:minLength value="1"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="columnwidth">
+         <xs:simpleType>
+            <xs:restriction>
+               <xs:simpleType>
+                  <xs:list>
+                     <xs:simpleType>
+                        <xs:union memberTypes="m:length">
+                           <xs:simpleType>
+                              <xs:restriction base="xs:token">
+                                 <xs:enumeration value="auto"/>
+                              </xs:restriction>
+                           </xs:simpleType>
+                           <xs:simpleType>
+                              <xs:restriction base="xs:token">
+                                 <xs:enumeration value="fit"/>
+                              </xs:restriction>
+                           </xs:simpleType>
+                        </xs:union>
+                     </xs:simpleType>
+                  </xs:list>
+               </xs:simpleType>
+               <xs:minLength value="1"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="width">
+         <xs:simpleType>
+            <xs:union memberTypes="m:length">
+               <xs:simpleType>
+                  <xs:restriction base="xs:token">
+                     <xs:enumeration value="auto"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:union>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="rowspacing">
+         <xs:simpleType>
+            <xs:restriction>
+               <xs:simpleType>
+                  <xs:list itemType="m:length"/>
+               </xs:simpleType>
+               <xs:minLength value="1"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="columnspacing">
+         <xs:simpleType>
+            <xs:restriction>
+               <xs:simpleType>
+                  <xs:list itemType="m:length"/>
+               </xs:simpleType>
+               <xs:minLength value="1"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="rowlines">
+         <xs:simpleType>
+            <xs:restriction>
+               <xs:simpleType>
+                  <xs:list itemType="m:linestyle"/>
+               </xs:simpleType>
+               <xs:minLength value="1"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="columnlines">
+         <xs:simpleType>
+            <xs:restriction>
+               <xs:simpleType>
+                  <xs:list itemType="m:linestyle"/>
+               </xs:simpleType>
+               <xs:minLength value="1"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="frame" type="m:linestyle"/>
+      <xs:attribute name="framespacing">
+         <xs:simpleType>
+            <xs:restriction>
+               <xs:simpleType>
+                  <xs:list>
+                     <xs:simpleType>
+                        <xs:union memberTypes="m:length m:length"/>
+                     </xs:simpleType>
+                  </xs:list>
+               </xs:simpleType>
+               <xs:length value="2"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="equalrows">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="true"/>
+               <xs:enumeration value="false"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="equalcolumns">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="true"/>
+               <xs:enumeration value="false"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="displaystyle">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="true"/>
+               <xs:enumeration value="false"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="side">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="left"/>
+               <xs:enumeration value="right"/>
+               <xs:enumeration value="leftoverlap"/>
+               <xs:enumeration value="rightoverlap"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="minlabelspacing" type="m:length"/>
+   </xs:attributeGroup>
+   <xs:element name="mlabeledtr" substitutionGroup="m:TableRowExpression">
+      <xs:complexType>
+         <xs:sequence>
+            <xs:element maxOccurs="unbounded" ref="m:TableCellExpression"/>
+         </xs:sequence>
+         <xs:attributeGroup ref="m:mlabeledtr.attributes"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:attributeGroup name="mlabeledtr.attributes">
+      <xs:attributeGroup ref="m:mtr.attributes"/>
+   </xs:attributeGroup>
+   <xs:element name="mtr" substitutionGroup="m:TableRowExpression">
+      <xs:complexType>
+         <xs:sequence>
+            <xs:element minOccurs="0" maxOccurs="unbounded" ref="m:TableCellExpression"/>
+         </xs:sequence>
+         <xs:attributeGroup ref="m:mtr.attributes"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:attributeGroup name="mtr.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attributeGroup ref="m:CommonPresAtt"/>
+      <xs:attribute name="rowalign">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="top"/>
+               <xs:enumeration value="bottom"/>
+               <xs:enumeration value="center"/>
+               <xs:enumeration value="baseline"/>
+               <xs:enumeration value="axis"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="columnalign">
+         <xs:simpleType>
+            <xs:restriction>
+               <xs:simpleType>
+                  <xs:list itemType="m:columnalignstyle"/>
+               </xs:simpleType>
+               <xs:minLength value="1"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="groupalign" type="m:group-alignment-list-list"/>
+   </xs:attributeGroup>
+   <xs:element name="mtd" substitutionGroup="m:TableCellExpression"/>
+   <xs:attributeGroup name="mtd.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attributeGroup ref="m:CommonPresAtt"/>
+      <xs:attribute name="rowspan" type="m:positive-integer"/>
+      <xs:attribute name="columnspan" type="m:positive-integer"/>
+      <xs:attribute name="rowalign">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="top"/>
+               <xs:enumeration value="bottom"/>
+               <xs:enumeration value="center"/>
+               <xs:enumeration value="baseline"/>
+               <xs:enumeration value="axis"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="columnalign" type="m:columnalignstyle"/>
+      <xs:attribute name="groupalign" type="m:group-alignment-list"/>
+   </xs:attributeGroup>
+   <xs:element name="mstack" substitutionGroup="m:PresentationExpression">
+      <xs:complexType>
+         <xs:group minOccurs="0" maxOccurs="unbounded" ref="m:MstackExpression"/>
+         <xs:attributeGroup ref="m:mstack.attributes"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:attributeGroup name="mstack.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attributeGroup ref="m:CommonPresAtt"/>
+      <xs:attribute name="align">
+         <xs:simpleType>
+            <xs:restriction base="xs:string">
+               <xs:pattern value="\s*(top|bottom|center|baseline|axis)(\s+-?[0-9]+)?\s*"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="stackalign">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="left"/>
+               <xs:enumeration value="center"/>
+               <xs:enumeration value="right"/>
+               <xs:enumeration value="decimalpoint"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="charalign">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="left"/>
+               <xs:enumeration value="center"/>
+               <xs:enumeration value="right"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="charspacing">
+         <xs:simpleType>
+            <xs:union memberTypes="m:length">
+               <xs:simpleType>
+                  <xs:restriction base="xs:token">
+                     <xs:enumeration value="loose"/>
+                  </xs:restriction>
+               </xs:simpleType>
+               <xs:simpleType>
+                  <xs:restriction base="xs:token">
+                     <xs:enumeration value="medium"/>
+                  </xs:restriction>
+               </xs:simpleType>
+               <xs:simpleType>
+                  <xs:restriction base="xs:token">
+                     <xs:enumeration value="tight"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:union>
+         </xs:simpleType>
+      </xs:attribute>
+   </xs:attributeGroup>
+   <xs:element name="mlongdiv" substitutionGroup="m:PresentationExpression">
+      <xs:complexType>
+         <xs:sequence>
+            <xs:group ref="m:MstackExpression"/>
+            <xs:group ref="m:MstackExpression"/>
+            <xs:group maxOccurs="unbounded" ref="m:MstackExpression"/>
+         </xs:sequence>
+         <xs:attributeGroup ref="m:mlongdiv.attributes"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:attributeGroup name="mlongdiv.attributes">
+      <xs:attributeGroup ref="m:msgroup.attributes"/>
+      <xs:attribute name="longdivstyle">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="lefttop"/>
+               <xs:enumeration value="stackedrightright"/>
+               <xs:enumeration value="mediumstackedrightright"/>
+               <xs:enumeration value="shortstackedrightright"/>
+               <xs:enumeration value="righttop"/>
+               <xs:enumeration value="left/\right"/>
+               <xs:enumeration value="left)(right"/>
+               <xs:enumeration value=":right=right"/>
+               <xs:enumeration value="stackedleftleft"/>
+               <xs:enumeration value="stackedleftlinetop"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+   </xs:attributeGroup>
+   <xs:element name="msgroup">
+      <xs:complexType>
+         <xs:group minOccurs="0" maxOccurs="unbounded" ref="m:MstackExpression"/>
+         <xs:attributeGroup ref="m:msgroup.attributes"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:attributeGroup name="msgroup.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attributeGroup ref="m:CommonPresAtt"/>
+      <xs:attribute name="position" type="m:integer"/>
+      <xs:attribute name="shift" type="m:integer"/>
+   </xs:attributeGroup>
+   <xs:element name="msrow">
+      <xs:complexType>
+         <xs:group minOccurs="0" maxOccurs="unbounded" ref="m:MsrowExpression"/>
+         <xs:attributeGroup ref="m:msrow.attributes"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:attributeGroup name="msrow.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attributeGroup ref="m:CommonPresAtt"/>
+      <xs:attribute name="position" type="m:integer"/>
+   </xs:attributeGroup>
+   <xs:element name="mscarries">
+      <xs:complexType>
+         <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:group ref="m:MsrowExpression"/>
+            <xs:element ref="m:mscarry"/>
+         </xs:choice>
+         <xs:attributeGroup ref="m:mscarries.attributes"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:attributeGroup name="mscarries.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attributeGroup ref="m:CommonPresAtt"/>
+      <xs:attribute name="position" type="m:integer"/>
+      <xs:attribute name="location">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="w"/>
+               <xs:enumeration value="nw"/>
+               <xs:enumeration value="n"/>
+               <xs:enumeration value="ne"/>
+               <xs:enumeration value="e"/>
+               <xs:enumeration value="se"/>
+               <xs:enumeration value="s"/>
+               <xs:enumeration value="sw"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="crossout">
+         <xs:simpleType>
+            <xs:list>
+               <xs:simpleType>
+                  <xs:restriction base="xs:token">
+                     <xs:enumeration value="none"/>
+                     <xs:enumeration value="updiagonalstrike"/>
+                     <xs:enumeration value="downdiagonalstrike"/>
+                     <xs:enumeration value="verticalstrike"/>
+                     <xs:enumeration value="horizontalstrike"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:list>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="scriptsizemultiplier" type="m:number"/>
+   </xs:attributeGroup>
+   <xs:element name="mscarry">
+      <xs:complexType>
+         <xs:group minOccurs="0" maxOccurs="unbounded" ref="m:MsrowExpression"/>
+         <xs:attributeGroup ref="m:mscarry.attributes"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:attributeGroup name="mscarry.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attributeGroup ref="m:CommonPresAtt"/>
+      <xs:attribute name="location">
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="w"/>
+               <xs:enumeration value="nw"/>
+               <xs:enumeration value="n"/>
+               <xs:enumeration value="ne"/>
+               <xs:enumeration value="e"/>
+               <xs:enumeration value="se"/>
+               <xs:enumeration value="s"/>
+               <xs:enumeration value="sw"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="crossout">
+         <xs:simpleType>
+            <xs:list>
+               <xs:simpleType>
+                  <xs:restriction base="xs:token">
+                     <xs:enumeration value="none"/>
+                     <xs:enumeration value="updiagonalstrike"/>
+                     <xs:enumeration value="downdiagonalstrike"/>
+                     <xs:enumeration value="verticalstrike"/>
+                     <xs:enumeration value="horizontalstrike"/>
+                  </xs:restriction>
+               </xs:simpleType>
+            </xs:list>
+         </xs:simpleType>
+      </xs:attribute>
+   </xs:attributeGroup>
+   <xs:element name="maction" substitutionGroup="m:PresentationExpression">
+      <xs:complexType>
+         <xs:group maxOccurs="unbounded" ref="m:MathExpression"/>
+         <xs:attributeGroup ref="m:maction.attributes"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:attributeGroup name="maction.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+      <xs:attributeGroup ref="m:CommonPresAtt"/>
+      <xs:attribute name="actiontype" use="required"/>
+      <xs:attribute name="selection" type="m:positive-integer"/>
+   </xs:attributeGroup>
+</xs:schema>
\ No newline at end of file
diff --git a/vendor/phpoffice/math/tests/resources/schema/mathml3/mathml3-strict-content.xsd b/vendor/phpoffice/math/tests/resources/schema/mathml3/mathml3-strict-content.xsd
new file mode 100644
index 0000000000..d68232f57f
--- /dev/null
+++ b/vendor/phpoffice/math/tests/resources/schema/mathml3/mathml3-strict-content.xsd
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:m="http://www.w3.org/1998/Math/MathML" elementFormDefault="qualified" targetNamespace="http://www.w3.org/1998/Math/MathML">
+   <xs:group name="ContExp">
+      <xs:choice>
+<!--Ambiguous content model altered (ContExp)-->
+         <xs:element ref="m:apply"/>
+         <xs:element ref="m:bind"/>
+         <xs:element ref="m:ci"/>
+         <xs:element ref="m:cn"/>
+         <xs:element ref="m:csymbol"/>
+         <xs:element ref="m:cbytes"/>
+         <xs:element ref="m:cerror"/>
+         <xs:element ref="m:cs"/>
+         <xs:element ref="m:share"/>
+         <xs:element ref="m:piecewise"/>
+         <xs:element ref="m:DeprecatedContExp"/>
+         <xs:element ref="m:interval.class"/>
+         <xs:element ref="m:unary-functional.class"/>
+         <xs:element ref="m:lambda.class"/>
+         <xs:element ref="m:nary-functional.class"/>
+         <xs:group ref="m:binary-arith.class"/>
+         <xs:group ref="m:unary-arith.class"/>
+         <xs:element ref="m:nary-minmax.class"/>
+         <xs:element ref="m:nary-arith.class"/>
+         <xs:element ref="m:nary-logical.class"/>
+         <xs:element ref="m:unary-logical.class"/>
+         <xs:element ref="m:binary-logical.class"/>
+         <xs:element ref="m:quantifier.class"/>
+         <xs:element ref="m:nary-reln.class"/>
+         <xs:element ref="m:binary-reln.class"/>
+         <xs:element ref="m:int.class"/>
+         <xs:element ref="m:Differential-Operator.class"/>
+         <xs:element ref="m:partialdiff.class"/>
+         <xs:element ref="m:unary-veccalc.class"/>
+         <xs:element ref="m:nary-setlist-constructor.class"/>
+         <xs:element ref="m:nary-set.class"/>
+         <xs:element ref="m:binary-set.class"/>
+         <xs:element ref="m:nary-set-reln.class"/>
+         <xs:element ref="m:unary-set.class"/>
+         <xs:element ref="m:sum.class"/>
+         <xs:element ref="m:product.class"/>
+         <xs:element ref="m:limit.class"/>
+         <xs:element ref="m:unary-elementary.class"/>
+         <xs:element ref="m:nary-stats.class"/>
+         <xs:element ref="m:nary-constructor.class"/>
+         <xs:element ref="m:unary-linalg.class"/>
+         <xs:element ref="m:nary-linalg.class"/>
+         <xs:element ref="m:binary-linalg.class"/>
+         <xs:element ref="m:constant-set.class"/>
+         <xs:element ref="m:constant-arith.class"/>
+      </xs:choice>
+   </xs:group>
+   <xs:element name="cn">
+      <xs:complexType>
+         <xs:complexContent>
+            <xs:extension base="m:cn.content">
+               <xs:attributeGroup ref="m:cn.attributes"/>
+            </xs:extension>
+         </xs:complexContent>
+      </xs:complexType>
+   </xs:element>
+   <xs:group name="semantics-ci">
+      <xs:sequence>
+         <xs:element name="semantics">
+            <xs:complexType>
+               <xs:sequence>
+                  <xs:choice>
+                     <xs:element ref="m:ci"/>
+                     <xs:group ref="m:semantics-ci"/>
+                  </xs:choice>
+                  <xs:choice minOccurs="0" maxOccurs="unbounded">
+                     <xs:element ref="m:annotation"/>
+                     <xs:element ref="m:annotation-xml"/>
+                  </xs:choice>
+               </xs:sequence>
+               <xs:attributeGroup ref="m:semantics.attributes"/>
+            </xs:complexType>
+         </xs:element>
+      </xs:sequence>
+   </xs:group>
+   <xs:group name="semantics-contexp">
+      <xs:sequence>
+         <xs:element name="semantics">
+            <xs:complexType>
+               <xs:sequence>
+                  <xs:group ref="m:ContExp"/>
+                  <xs:choice minOccurs="0" maxOccurs="unbounded">
+                     <xs:element ref="m:annotation"/>
+                     <xs:element ref="m:annotation-xml"/>
+                  </xs:choice>
+               </xs:sequence>
+               <xs:attributeGroup ref="m:semantics.attributes"/>
+            </xs:complexType>
+         </xs:element>
+      </xs:sequence>
+   </xs:group>
+   <xs:element name="ci">
+      <xs:complexType>
+         <xs:complexContent>
+            <xs:extension base="m:ci.content">
+               <xs:attributeGroup ref="m:ci.attributes"/>
+            </xs:extension>
+         </xs:complexContent>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="csymbol">
+      <xs:complexType>
+         <xs:complexContent>
+            <xs:extension base="m:csymbol.content">
+               <xs:attributeGroup ref="m:csymbol.attributes"/>
+            </xs:extension>
+         </xs:complexContent>
+      </xs:complexType>
+   </xs:element>
+   <xs:simpleType name="SymbolName">
+      <xs:restriction base="xs:NCName"/>
+   </xs:simpleType>
+   <xs:group name="BvarQ">
+      <xs:sequence>
+         <xs:element minOccurs="0" maxOccurs="unbounded" ref="m:bvar"/>
+      </xs:sequence>
+   </xs:group>
+   <xs:element name="apply">
+      <xs:complexType>
+         <xs:complexContent>
+            <xs:extension base="m:apply.content">
+               <xs:attributeGroup ref="m:CommonAtt"/>
+            </xs:extension>
+         </xs:complexContent>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="bind">
+      <xs:complexType>
+         <xs:complexContent>
+            <xs:extension base="m:bind.content">
+               <xs:attributeGroup ref="m:CommonAtt"/>
+            </xs:extension>
+         </xs:complexContent>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="share">
+      <xs:complexType>
+         <xs:attributeGroup ref="m:CommonAtt"/>
+         <xs:attributeGroup ref="m:src"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:element name="cerror">
+      <xs:complexType>
+         <xs:sequence>
+            <xs:element ref="m:csymbol"/>
+            <xs:group minOccurs="0" maxOccurs="unbounded" ref="m:ContExp"/>
+         </xs:sequence>
+         <xs:attributeGroup ref="m:cerror.attributes"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:attributeGroup name="cerror.attributes">
+      <xs:attributeGroup ref="m:CommonAtt"/>
+   </xs:attributeGroup>
+   <xs:element name="cbytes">
+      <xs:complexType>
+         <xs:simpleContent>
+            <xs:extension base="m:base64">
+               <xs:attributeGroup ref="m:cbytes.attributes"/>
+            </xs:extension>
+         </xs:simpleContent>
+      </xs:complexType>
+   </xs:element>
+   <xs:simpleType name="base64">
+      <xs:restriction base="xs:base64Binary"/>
+   </xs:simpleType>
+   <xs:element name="cs">
+      <xs:complexType mixed="true">
+         <xs:attributeGroup ref="m:cs.attributes"/>
+      </xs:complexType>
+   </xs:element>
+   <xs:group name="MathExpression">
+      <xs:choice>
+         <xs:group ref="m:ContExp"/>
+         <xs:element ref="m:PresentationExpression"/>
+         <xs:group ref="m:semantics"/>
+      </xs:choice>
+   </xs:group>
+</xs:schema>
\ No newline at end of file
diff --git a/vendor/phpoffice/math/tests/resources/schema/mathml3/mathml3.xsd b/vendor/phpoffice/math/tests/resources/schema/mathml3/mathml3.xsd
new file mode 100644
index 0000000000..4a3956a676
--- /dev/null
+++ b/vendor/phpoffice/math/tests/resources/schema/mathml3/mathml3.xsd
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:m="http://www.w3.org/1998/Math/MathML" elementFormDefault="qualified" targetNamespace="http://www.w3.org/1998/Math/MathML">
+   <xs:include schemaLocation="mathml3-content.xsd"/>
+   <xs:include schemaLocation="mathml3-presentation.xsd"/>
+   <xs:include schemaLocation="mathml3-common.xsd"/>
+</xs:schema>
\ No newline at end of file
diff --git a/vendor/phpoffice/phpspreadsheet/.php-cs-fixer.dist.php b/vendor/phpoffice/phpspreadsheet/.php-cs-fixer.dist.php
new file mode 100644
index 0000000000..c4711f12a0
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/.php-cs-fixer.dist.php
@@ -0,0 +1,245 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->exclude('vendor')
+    ->notPath('src/PhpSpreadsheet/Writer/ZipStream3.php')
+    ->name('/(\.php|^generate-document|^generate-locales|^check-phpdoc-types)$/')
+    ->in(__DIR__);
+
+$config = new PhpCsFixer\Config();
+$config
+    ->setRiskyAllowed(true)
+    ->setFinder($finder)
+    ->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect(null, 600))
+    ->setCacheFile(sys_get_temp_dir() . '/php-cs-fixer' . preg_replace('~\W~', '-', __DIR__))
+    ->setRules([
+        'align_multiline_comment' => true,
+        'array_indentation' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'backtick_to_shell_exec' => true,
+        'binary_operator_spaces' => true,
+        'blank_line_after_namespace' => true,
+        'blank_lines_before_namespace' => ['max_line_breaks' => 2, 'min_line_breaks' => 2], // we want 1 blank line before namespace
+        'blank_line_after_opening_tag' => true,
+        'blank_line_before_statement' => true,
+        'cast_spaces' => true,
+        'class_attributes_separation' => ['elements' => ['method' => 'one', 'property' => 'one']], // const are often grouped with other related const
+        'class_definition' => false, // phpcs disagree
+        'combine_consecutive_issets' => true,
+        'combine_consecutive_unsets' => true,
+        'combine_nested_dirname' => true,
+        'comment_to_phpdoc' => false, // interferes with annotations
+        'compact_nullable_type_declaration' => true,
+        'concat_space' => ['spacing' => 'one'],
+        'constant_case' => true,
+        'date_time_immutable' => false, // Break our unit tests
+        'declare_equal_normalize' => true,
+        'declare_strict_types' => false, // Too early to adopt strict types
+        'dir_constant' => true,
+        'doctrine_annotation_array_assignment' => true,
+        'doctrine_annotation_braces' => true,
+        'doctrine_annotation_indentation' => true,
+        'doctrine_annotation_spaces' => true,
+        'elseif' => true,
+        'empty_loop_body' => true,
+        'empty_loop_condition' => true,
+        'encoding' => true,
+        'ereg_to_preg' => true,
+        'error_suppression' => false, // it breaks \PhpOffice\PhpSpreadsheet\Helper\Handler
+        'explicit_indirect_variable' => false, // I feel it makes the code actually harder to read
+        'explicit_string_variable' => false, // I feel it makes the code actually harder to read
+        'final_class' => false, // We need non-final classes
+        'final_internal_class' => true,
+        'final_public_method_for_abstract_class' => false, // We need non-final methods
+        'fopen_flag_order' => true,
+        'fopen_flags' => true,
+        'full_opening_tag' => true,
+        'fully_qualified_strict_types' => true,
+        'function_declaration' => true,
+        'function_to_constant' => true,
+        'general_phpdoc_annotation_remove' => ['annotations' => ['access', 'category', 'copyright']],
+        'general_phpdoc_tag_rename' => true,
+        'global_namespace_import' => true,
+        'group_import' => false, // I feel it makes the code actually harder to read
+        'header_comment' => false, // We don't use common header in all our files
+        'heredoc_indentation' => true,
+        'heredoc_to_nowdoc' => false, // Not sure about this one
+        'implode_call' => true,
+        'include' => true,
+        'increment_style' => true,
+        'indentation_type' => true,
+        'integer_literal_case' => true,
+        'is_null' => true,
+        'lambda_not_used_import' => true,
+        'line_ending' => true,
+        'linebreak_after_opening_tag' => true,
+        'list_syntax' => ['syntax' => 'short'],
+        'logical_operators' => true,
+        'lowercase_cast' => true,
+        'lowercase_keywords' => true,
+        'lowercase_static_reference' => true,
+        'magic_constant_casing' => true,
+        'magic_method_casing' => true,
+        'mb_str_functions' => false, // No, too dangerous to change that
+        'method_argument_space' => true,
+        'method_chaining_indentation' => true,
+        'modernize_strpos' => true,
+        'modernize_types_casting' => true,
+        'multiline_comment_opening_closing' => true,
+        'multiline_whitespace_before_semicolons' => true,
+        'native_constant_invocation' => false, // Micro optimization that look messy
+        'native_function_casing' => true,
+        'native_function_invocation' => false, // I suppose this would be best, but I am still unconvinced about the visual aspect of it
+        'new_with_parentheses' => ['anonymous_class' => true, 'named_class' => true],
+        'no_alias_functions' => true,
+        'no_alias_language_construct_call' => true,
+        'no_alternative_syntax' => true,
+        'no_binary_string' => true,
+        'no_blank_lines_after_class_opening' => true,
+        'no_blank_lines_after_phpdoc' => true,
+        'no_break_comment' => true,
+        'no_closing_tag' => true,
+        'no_empty_comment' => true,
+        'no_empty_phpdoc' => true,
+        'no_empty_statement' => true,
+        'no_extra_blank_lines' => true,
+        'no_homoglyph_names' => true,
+        'no_leading_import_slash' => true,
+        'no_leading_namespace_whitespace' => true,
+        'no_mixed_echo_print' => true,
+        'no_multiline_whitespace_around_double_arrow' => true,
+        'no_null_property_initialization' => true,
+        'no_php4_constructor' => true,
+        'no_short_bool_cast' => true,
+        'echo_tag_syntax' => ['format' => 'long'],
+        'no_singleline_whitespace_before_semicolons' => true,
+        'no_space_around_double_colon' => true,
+        'no_spaces_after_function_name' => true,
+        'no_spaces_around_offset' => true,
+        'no_superfluous_elseif' => false, // Might be risky on a huge code base
+        'no_superfluous_phpdoc_tags' => ['allow_mixed' => true],
+        'no_trailing_comma_in_singleline' => ['elements' => ['arguments', 'array_destructuring', 'array', 'group_import']],
+        'no_trailing_whitespace' => true,
+        'no_trailing_whitespace_in_comment' => true,
+        'no_trailing_whitespace_in_string' => false, // Too dangerous
+        'no_unneeded_control_parentheses' => true,
+        'no_unneeded_braces' => true,
+        'no_unneeded_final_method' => true,
+        'no_unreachable_default_argument_value' => true,
+        'no_unset_cast' => true,
+        'no_unset_on_property' => false,
+        'no_unused_imports' => true,
+        'no_useless_else' => true,
+        'no_useless_return' => true,
+        'no_useless_sprintf' => true,
+        'no_whitespace_before_comma_in_array' => true,
+        'no_whitespace_in_blank_line' => true,
+        'non_printable_character' => true,
+        'normalize_index_brace' => true,
+        'not_operator_with_space' => false, // No we prefer to keep '!' without spaces
+        'not_operator_with_successor_space' => false, // idem
+        'nullable_type_declaration_for_default_null_value' => true,
+        'object_operator_without_whitespace' => true,
+        'octal_notation' => true,
+        'operator_linebreak' => true,
+        'ordered_class_elements' => false, // We prefer to keep some freedom
+        'ordered_imports' => true,
+        'ordered_interfaces' => true,
+        'ordered_traits' => true,
+        'php_unit_construct' => true,
+        'php_unit_dedicate_assert' => true,
+        'php_unit_dedicate_assert_internal_type' => true,
+        'php_unit_expectation' => true,
+        'php_unit_fqcn_annotation' => true,
+        'php_unit_internal_class' => false, // Because tests are excluded from package
+        'php_unit_method_casing' => true,
+        'php_unit_mock' => true,
+        'php_unit_mock_short_will_return' => true,
+        'php_unit_namespaced' => true,
+        'php_unit_no_expectation_annotation' => true,
+        'phpdoc_order_by_value' => ['annotations' => ['covers']],
+        'php_unit_set_up_tear_down_visibility' => true,
+        'php_unit_size_class' => false, // That seems extra work to maintain for little benefits
+        'php_unit_strict' => false, // We sometime actually need assertEquals
+        'php_unit_test_annotation' => true,
+        'php_unit_test_case_static_method_calls' => ['call_type' => 'self'],
+        'php_unit_test_class_requires_covers' => false, // We don't care as much as we should about coverage
+        'phpdoc_add_missing_param_annotation' => false, // Don't add things that bring no value
+        'phpdoc_align' => false, // Waste of time
+        'phpdoc_annotation_without_dot' => true,
+        'phpdoc_indent' => true,
+        'phpdoc_line_span' => false, // Unfortunately our old comments turn even uglier with this
+        'phpdoc_no_access' => true,
+        'phpdoc_no_alias_tag' => true,
+        'phpdoc_no_empty_return' => true,
+        'phpdoc_no_package' => true,
+        'phpdoc_no_useless_inheritdoc' => true,
+        'phpdoc_order' => true,
+        'phpdoc_return_self_reference' => true,
+        'phpdoc_scalar' => true,
+        'phpdoc_separation' => true,
+        'phpdoc_single_line_var_spacing' => true,
+        'phpdoc_summary' => true,
+        'phpdoc_tag_casing' => true,
+        'phpdoc_tag_type' => true,
+        'phpdoc_to_comment' => false, // interferes with annotations
+        'phpdoc_to_param_type' => false, // Because experimental, but interesting for one shot use
+        'phpdoc_to_property_type' => false, // Because experimental, but interesting for one shot use
+        'phpdoc_to_return_type' => false, // Because experimental, but interesting for one shot use
+        'phpdoc_trim' => true,
+        'phpdoc_trim_consecutive_blank_line_separation' => true,
+        'phpdoc_types' => true,
+        'phpdoc_types_order' => true,
+        'phpdoc_var_annotation_correct_order' => true,
+        'phpdoc_var_without_name' => true,
+        'pow_to_exponentiation' => true,
+        'protected_to_private' => true,
+        'psr_autoloading' => true,
+        'random_api_migration' => true,
+        'return_assignment' => false, // Sometimes useful for clarity or debug
+        'return_type_declaration' => true,
+        'self_accessor' => true,
+        'self_static_accessor' => true,
+        'semicolon_after_instruction' => false, // Buggy in `samples/index.php`
+        'set_type_to_cast' => true,
+        'short_scalar_cast' => true,
+        'simple_to_complex_string_variable' => false, // Would differ from TypeScript without obvious advantages
+        'simplified_if_return' => false, // Even if technically correct we prefer to be explicit
+        'simplified_null_return' => false, // Even if technically correct we prefer to be explicit
+        'single_blank_line_at_eof' => true,
+        'single_class_element_per_statement' => true,
+        'single_import_per_statement' => true,
+        'single_line_after_imports' => true,
+        'single_line_comment_style' => true,
+        'single_line_throw' => false, // I don't see any reason for having a special case for Exception
+        'single_quote' => true,
+        'single_trait_insert_per_statement' => true,
+        'space_after_semicolon' => true,
+        'spaces_inside_parentheses' => ['space' => 'none'],
+        'standardize_increment' => true,
+        'standardize_not_equals' => true,
+        'static_lambda' => false, // Risky if we can't guarantee nobody use `bindTo()`
+        'strict_comparison' => false, // No, too dangerous to change that
+        'string_implicit_backslashes' => false, // was escape_implicit_backslashes, too confusing
+        'strict_param' => false, // No, too dangerous to change that
+        'string_length_to_empty' => true,
+        'string_line_ending' => true,
+        'switch_case_semicolon_to_colon' => true,
+        'switch_case_space' => true,
+        'switch_continue_to_break' => true,
+        'ternary_operator_spaces' => true,
+        'ternary_to_elvis_operator' => true,
+        'ternary_to_null_coalescing' => true,
+        'trailing_comma_in_multiline' => true,
+        'trim_array_spaces' => true,
+        'type_declaration_spaces' => ['elements' => ['function', 'property']], // was function_typehint_space
+        'types_spaces' => true,
+        'unary_operator_spaces' => true,
+        'use_arrow_functions' => true,
+        'visibility_required' => ['elements' => ['property', 'method']], // not const
+        'void_return' => true,
+        'whitespace_after_comma_in_array' => true,
+        'yoda_style' => false,
+    ]);
+
+return $config;
diff --git a/vendor/phpoffice/phpspreadsheet/.phpcs.xml.dist b/vendor/phpoffice/phpspreadsheet/.phpcs.xml.dist
index 3eafb6ca19..ccaa25f0a2 100644
--- a/vendor/phpoffice/phpspreadsheet/.phpcs.xml.dist
+++ b/vendor/phpoffice/phpspreadsheet/.phpcs.xml.dist
@@ -5,6 +5,10 @@
     <file>samples</file>
     <file>src</file>
     <file>tests</file>
+    <file>infra</file>
+    <file>bin/generate-document</file>
+    <file>bin/generate-locales</file>
+    <file>bin/check-phpdoc-types</file>
 
     <exclude-pattern>samples/Header.php</exclude-pattern>
     <exclude-pattern>*/tests/Core/*/*Test\.(inc|css|js)$</exclude-pattern>
diff --git a/vendor/phpoffice/phpspreadsheet/.readthedocs.yaml b/vendor/phpoffice/phpspreadsheet/.readthedocs.yaml
new file mode 100644
index 0000000000..c67101532d
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/.readthedocs.yaml
@@ -0,0 +1,12 @@
+# Read the Docs configuration file for MkDocs projects
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html
+
+version: 2
+
+build:
+    os: ubuntu-22.04
+    tools:
+        python: "3"
+
+mkdocs:
+    configuration: mkdocs.yml
diff --git a/vendor/phpoffice/phpspreadsheet/CHANGELOG.md b/vendor/phpoffice/phpspreadsheet/CHANGELOG.md
index 42a8802475..b99f7699a4 100644
--- a/vendor/phpoffice/phpspreadsheet/CHANGELOG.md
+++ b/vendor/phpoffice/phpspreadsheet/CHANGELOG.md
@@ -5,16 +5,950 @@ 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).
 
+## 2024-09-29 - 3.0.0
+
+### Dynamic Arrays
+
+- Support for Excel dynamic arrays is added. It is an opt-in feature, so our hope is that there will be no BC breaks, but it is a very large change. Full support is added for Xlsx. It is emulated as Ctrl-Shift-Enter arrays for Ods read and write and Excel2003 and Gnumeric read. Html/Pdf and Csv writers will populate cells on output if they are the result of array formulas. No support is added for Xls or Slk.
+
+### Added
+
+- Excel Dynamic Arrays. [Issue #3901](https://github.com/PHPOffice/PhpSpreadsheet/issues/3901) [Issue #3659](https://github.com/PHPOffice/PhpSpreadsheet/issues/3659) [Issue #1834](https://github.com/PHPOffice/PhpSpreadsheet/issues/1834) [PR #3962](https://github.com/PHPOffice/PhpSpreadsheet/pull/3962)
+- String Value Binder Allow Setting "Ignore Number Stored as Text". [PR #4141](https://github.com/PHPOffice/PhpSpreadsheet/pull/4141)
+
+### Changed
+
+- Xlsx Reader default datatype when none is specified in Xml is changed from string to numeric, which is how Excel treats it. There is expected to be little impact because DefaultValueBinder and AdvancedValueBinder correct mis-identification as string, and StringValueBinder usually expects string. [PR #4139](https://github.com/PHPOffice/PhpSpreadsheet/pull/4139)
+- Currency and Accounting Wizards are changed to act like Excel, and a new CurrencyBase Wizard is added for for non-Excel formats. [Issue #4125](https://github.com/PHPOffice/PhpSpreadsheet/issues/4125) [Issue #4124](https://github.com/PHPOffice/PhpSpreadsheet/issues/4124) [PR #4127](https://github.com/PHPOffice/PhpSpreadsheet/pull/4127)
+- Images will not be added to spreadsheet if they cannot be validated as images.
+
+### Deprecated
+
+- Nothing yet.
+
+### Removed
+
+- The following items were deprecated in release 2 and are now removed.
+- Writer\Xls\Style\ColorMap (no longer needed).
+- Reader\Xml::trySimpleXMLLoadString (should not have been public, no public replacement).
+- Calculation\Calculation::_translateFormulaToLocale (use method name translateFormulaToLocale without leading underscore).
+- Calculation\Calculation::_translateFormulaToEnglish (use method name translateFormulaToEnglish without leading underscore).
+
+### Moved
+
+- Nothing yet.
+
+### Fixed
+
+- Several security patches.
+- Xls Reader Some Ranges Not Handled Properly. [Issue #1570](https://github.com/PHPOffice/PhpSpreadsheet/issues/1570) [PR #4140](https://github.com/PHPOffice/PhpSpreadsheet/pull/4140)
+- Better Handling of legacyDrawing Xml. [Issue #4105](https://github.com/PHPOffice/PhpSpreadsheet/issues/4105) [PR #4122](https://github.com/PHPOffice/PhpSpreadsheet/pull/4122)
+- Improve Xlsx Reader Speed. [Issue #3917](https://github.com/PHPOffice/PhpSpreadsheet/issues/3917) [PR #4153](https://github.com/PHPOffice/PhpSpreadsheet/pull/4153)
+
+## 2024-08-07 - 2.2.2
+
+### Added
+
+- Nothing yet.
+
+### Changed
+
+- Nothing yet.
+
+### Deprecated
+
+- Nothing yet.
+
+### Moved
+
+- Nothing yet.
+
+### Fixed
+
+- Html Reader Preserve Unicode Whitespace. [Issue #1284](https://github.com/PHPOffice/PhpSpreadsheet/issues/1284) [PR #4106](https://github.com/PHPOffice/PhpSpreadsheet/pull/4106)
+- RATE Function Floating Point Number of Periods. [PR #4107](https://github.com/PHPOffice/PhpSpreadsheet/pull/4107)
+- Parameter Name Change Xlsx Writer Workbook. [Issue #4108](https://github.com/PHPOffice/PhpSpreadsheet/issues/4108) [PR #4111](https://github.com/PHPOffice/PhpSpreadsheet/pull/4111)
+- New Algorithm for TRUNC, ROUNDUP, ROUNDDOWN. [Issue #4113](https://github.com/PHPOffice/PhpSpreadsheet/issues/4113) [PR #4115](https://github.com/PHPOffice/PhpSpreadsheet/pull/4115)
+- Worksheet applyStylesFromArray Retain Active Cell (Excel 16 was having a problem with some files). [Issue #4128](https://github.com/PHPOffice/PhpSpreadsheet/issues/4128) [PR #4132](https://github.com/PHPOffice/PhpSpreadsheet/pull/4132)
+
+## 2024-07-29 - 2.2.1
+
+### Security Fix
+
+- Prevent XXE when loading files [PR #4119](https://github.com/PHPOffice/PhpSpreadsheet/pull/4119)
+
+### Fixed
+
+- Add Sheet may leave Active Sheet uninitialized. [Issue #4112](https://github.com/PHPOffice/PhpSpreadsheet/issues/4112) [PR #4114](https://github.com/PHPOffice/PhpSpreadsheet/pull/4114)
+- Reference to Defined Name Specifying Worksheet. [Issue #206](https://github.com/PHPOffice/PhpSpreadsheet/issues/296) [PR #4096](https://github.com/PHPOffice/PhpSpreadsheet/pull/4096)
+- Xls Reader Print/Show Gridlines. [Issue #912](https://github.com/PHPOffice/PhpSpreadsheet/issues/912) [PR #4098](https://github.com/PHPOffice/PhpSpreadsheet/pull/4098)
+- ODS Reader Allow Omission of Page Settings Tags. [Issue #4099](https://github.com/PHPOffice/PhpSpreadsheet/issues/4099) [PR #4101](https://github.com/PHPOffice/PhpSpreadsheet/pull/4101)
+
+## 2024-07-24 - 2.2.0
+
+### Added
+
+- Xlsx Reader Optionally Ignore Rows With No Cells. [Issue #3982](https://github.com/PHPOffice/PhpSpreadsheet/issues/3982) [PR #4035](https://github.com/PHPOffice/PhpSpreadsheet/pull/4035)
+- Means to change style without affecting current cell/sheet. [PR #4073](https://github.com/PHPOffice/PhpSpreadsheet/pull/4073)
+- Option for CSV output file to have varying numbers of columns for each row. [Issue #1415](https://github.com/PHPOffice/PhpSpreadsheet/issues/1415) [PR #4076](https://github.com/PHPOffice/PhpSpreadsheet/pull/4076)
+
+### Changed
+
+- On read, Xlsx Reader had been breaking up union ranges into separate individual ranges. It will now try to preserve range as it was read in. [PR #4042](https://github.com/PHPOffice/PhpSpreadsheet/pull/4042)
+- Xlsx/Xls spreadsheet calculation and formatting of dates will use base date of spreadsheet even when spreadsheets with different base dates are simultaneously open. [Issue #1036](https://github.com/PHPOffice/PhpSpreadsheet/issues/1036) [Issue #1635](https://github.com/PHPOffice/PhpSpreadsheet/issues/1635) [PR #4071](https://github.com/PHPOffice/PhpSpreadsheet/pull/4071) 
+
+### Deprecated
+
+- Writer\Xls\Style\ColorMap is no longer needed.
+
+### Moved
+
+- Nothing
+
+### Fixed
+
+- Incorrect Reader CSV with BOM. [Issue #4028](https://github.com/PHPOffice/PhpSpreadsheet/issues/4028) [PR #4029](https://github.com/PHPOffice/PhpSpreadsheet/pull/4029)
+- POWER Null/Bool Args. [PR #4031](https://github.com/PHPOffice/PhpSpreadsheet/pull/4031)
+- Do Not Output Alignment and Protection for Conditional Format. [Issue #4025](https://github.com/PHPOffice/PhpSpreadsheet/issues/4025) [PR #4027](https://github.com/PHPOffice/PhpSpreadsheet/pull/4027)
+- Conditional Color Scale Improvements. [Issue #4049](https://github.com/PHPOffice/PhpSpreadsheet/issues/4049) [PR #4050](https://github.com/PHPOffice/PhpSpreadsheet/pull/4050)
+- Mpdf and Tcpdf Borders on Merged Cells. [Issue #3557](https://github.com/PHPOffice/PhpSpreadsheet/issues/3557) [PR #4047](https://github.com/PHPOffice/PhpSpreadsheet/pull/4047)
+- Xls Conditional Format Improvements. [PR #4030](https://github.com/PHPOffice/PhpSpreadsheet/pull/4030) [PR #4033](https://github.com/PHPOffice/PhpSpreadsheet/pull/4033)
+- Conditional Range Unions and Intersections [Issue #4039](https://github.com/PHPOffice/PhpSpreadsheet/issues/4039) [PR #4042](https://github.com/PHPOffice/PhpSpreadsheet/pull/4042)
+- Ods comments with newlines. [Issue #4081](https://github.com/PHPOffice/PhpSpreadsheet/issues/4081) [PR #4086](https://github.com/PHPOffice/PhpSpreadsheet/pull/4086)
+- Propagate errors in Text functions. [Issue #2581](https://github.com/PHPOffice/PhpSpreadsheet/issues/2581) [PR #4080](https://github.com/PHPOffice/PhpSpreadsheet/pull/4080)
+- Csv Reader allow use of html mimetype. [Issue #4036](https://github.com/PHPOffice/PhpSpreadsheet/issues/4036) [PR #4040](https://github.com/PHPOffice/PhpSpreadsheet/pull/4040)
+- Problem rendering line chart with missing plot label. [PR #4074](https://github.com/PHPOffice/PhpSpreadsheet/pull/4074)
+- More RTL in Xlsx/Html Comments [Issue #4004](https://github.com/PHPOffice/PhpSpreadsheet/issues/4004) [PR #4065](https://github.com/PHPOffice/PhpSpreadsheet/pull/4065)
+- Empty String in sharedStrings. [Issue #4063](https://github.com/PHPOffice/PhpSpreadsheet/issues/4063) [PR #4064](https://github.com/PHPOffice/PhpSpreadsheet/pull/4064)
+- Xlsx Writer RichText and TYPE_STRING. [Issue #476](https://github.com/PHPOffice/PhpSpreadsheet/issues/476) [PR #4094](https://github.com/PHPOffice/PhpSpreadsheet/pull/4094)
+- Ods boolean data. [Issue #460](https://github.com/PHPOffice/PhpSpreadsheet/issues/460) [PR #4093](https://github.com/PHPOffice/PhpSpreadsheet/pull/4093)
+- Html Writer Minor Fixes. [PR #4089](https://github.com/PHPOffice/PhpSpreadsheet/pull/4089)
+- Changes to INDEX function. [Issue #64](https://github.com/PHPOffice/PhpSpreadsheet/issues/64) [PR #4088](https://github.com/PHPOffice/PhpSpreadsheet/pull/4088)
+- Ods Reader and Whitespace Text Nodes. [Issue #804](https://github.com/PHPOffice/PhpSpreadsheet/issues/804) [PR #4087](https://github.com/PHPOffice/PhpSpreadsheet/pull/4087)
+- Ods Xml Reader and Whitespace Text Nodes. [Issue #804](https://github.com/PHPOffice/PhpSpreadsheet/issues/804) [PR #4087](https://github.com/PHPOffice/PhpSpreadsheet/pull/4087)
+- Treat invalid formulas as strings. [Issue #1310](https://github.com/PHPOffice/PhpSpreadsheet/issues/1310) [PR #4073](https://github.com/PHPOffice/PhpSpreadsheet/pull/4073)
+
+## 2024-05-11 - 2.1.0
+
+### MINOR BREAKING CHANGE
+
+- Writing of cell comments to Html will now sanitize all Html tags within the comment, so the tags will be rendered as plaintext and have no other effects when rendered. Styling can be achieved by using the Font property of of the TextRuns which make up the comment, as is already the cases for Xlsx. [PR #3957](https://github.com/PHPOffice/PhpSpreadsheet/pull/3957)
+
+### Added
+
+- Default Style Alignment Property (workaround for bug in non-Excel spreadsheet apps) [Issue #3918](https://github.com/PHPOffice/PhpSpreadsheet/issues/3918) [PR #3924](https://github.com/PHPOffice/PhpSpreadsheet/pull/3924)
+- Additional Support for Date/Time Styles [PR #3939](https://github.com/PHPOffice/PhpSpreadsheet/pull/3939)
+
+### Changed
+
+- Nothing
+
+### Deprecated
+
+- Reader/Xml trySimpleXMLLoadString should not have had public visibility, and will be removed.
+
+### Removed
+
+- Nothing
+
+### Fixed
+
+- IF Empty Arguments. [Issue #3875](https://github.com/PHPOffice/PhpSpreadsheet/issues/3875) [Issue #2146](https://github.com/PHPOffice/PhpSpreadsheet/issues/2146) [PR #3879](https://github.com/PHPOffice/PhpSpreadsheet/pull/3879)
+- Changes to floating point in Php8.4. [Issue #3896](https://github.com/PHPOffice/PhpSpreadsheet/issues/3896) [PR #3897](https://github.com/PHPOffice/PhpSpreadsheet/pull/3897)
+- Handling User-supplied Decimal and Thousands Separators. [Issue #3900](https://github.com/PHPOffice/PhpSpreadsheet/issues/3900) [PR #3903](https://github.com/PHPOffice/PhpSpreadsheet/pull/3903)
+- Improve Performance of CSV Writer. [Issue #3904](https://github.com/PHPOffice/PhpSpreadsheet/issues/3904) [PR #3906](https://github.com/PHPOffice/PhpSpreadsheet/pull/3906)
+- Fix issue with prepending zero in percentage [Issue #3920](https://github.com/PHPOffice/PhpSpreadsheet/issues/3920) [PR #3921](https://github.com/PHPOffice/PhpSpreadsheet/pull/3921)
+- Incorrect SUMPRODUCT Calculation [Issue #3909](https://github.com/PHPOffice/PhpSpreadsheet/issues/3909) [PR #3916](https://github.com/PHPOffice/PhpSpreadsheet/pull/3916)
+- Formula Misidentifying Text as Cell After Insertion/Deletion [Issue #3907](https://github.com/PHPOffice/PhpSpreadsheet/issues/3907) [PR #3915](https://github.com/PHPOffice/PhpSpreadsheet/pull/3915)
+- Unexpected Absolute Address in Xlsx Rels [Issue #3730](https://github.com/PHPOffice/PhpSpreadsheet/issues/3730) [PR #3923](https://github.com/PHPOffice/PhpSpreadsheet/pull/3923)
+- Unallocated Cells Affected by Column/Row Insert/Delete [Issue #3933](https://github.com/PHPOffice/PhpSpreadsheet/issues/3933) [PR #3940](https://github.com/PHPOffice/PhpSpreadsheet/pull/3940)
+- Invalid Builtin Defined Name in Xls Reader [Issue #3935](https://github.com/PHPOffice/PhpSpreadsheet/issues/3935) [PR #3942](https://github.com/PHPOffice/PhpSpreadsheet/pull/3942)
+- Hidden Rows and Columns Tcpdf/Mpdf [PR #3945](https://github.com/PHPOffice/PhpSpreadsheet/pull/3945)
+- RTL Text Alignment in Xlsx Comments [Issue #4004](https://github.com/PHPOffice/PhpSpreadsheet/issues/4004) [PR #4006](https://github.com/PHPOffice/PhpSpreadsheet/pull/4006)
+- Protect Sheet But Allow Sort [Issue #3951](https://github.com/PHPOffice/PhpSpreadsheet/issues/3951) [PR #3956](https://github.com/PHPOffice/PhpSpreadsheet/pull/3956)
+- Default Value for Conditional::$text [PR #3946](https://github.com/PHPOffice/PhpSpreadsheet/pull/3946)
+- Table Filter Buttons [Issue #3988](https://github.com/PHPOffice/PhpSpreadsheet/issues/3988) [PR #3992](https://github.com/PHPOffice/PhpSpreadsheet/pull/3992)
+- Improvements to Xml Reader [Issue #3999](https://github.com/PHPOffice/PhpSpreadsheet/issues/3999) [Issue #4000](https://github.com/PHPOffice/PhpSpreadsheet/issues/4000) [Issue #4001](https://github.com/PHPOffice/PhpSpreadsheet/issues/4001) [Issue #4002](https://github.com/PHPOffice/PhpSpreadsheet/issues/4002) [PR #4003](https://github.com/PHPOffice/PhpSpreadsheet/pull/4003) [PR #4007](https://github.com/PHPOffice/PhpSpreadsheet/pull/4007)
+- Html Reader non-UTF8 [Issue #3995](https://github.com/PHPOffice/PhpSpreadsheet/issues/3995) [Issue #866](https://github.com/PHPOffice/PhpSpreadsheet/issues/866) [Issue #1681](https://github.com/PHPOffice/PhpSpreadsheet/issues/1681) [PR #4019](https://github.com/PHPOffice/PhpSpreadsheet/pull/4019)
+
+## 2.0.0 - 2024-01-04
+
+### BREAKING CHANGE
+
+- Typing was strengthened by leveraging native typing. This should not change any behavior. However, if you implement
+  any interfaces or inherit from any classes, you will need to adapt your typing accordingly. If you use static analysis 
+  tools such as PHPStan or Psalm, new errors might be found. If you find actual bugs because of the new typing, please
+  open a PR that fixes it with a **detailed** explanation of the reason. We'll try to merge and release typing-related
+  fixes quickly in the coming days. [PR #3718](https://github.com/PHPOffice/PhpSpreadsheet/pull/3718)
+- All deprecated things have been removed, for details, see [816b91d0b4](https://github.com/PHPOffice/PhpSpreadsheet/commit/816b91d0b4a0c7285a9e3fc88c58f7730d922044)
+
+### Added
+
+- Split screens (Xlsx and Xml only, not 100% complete). [Issue #3601](https://github.com/PHPOffice/PhpSpreadsheet/issues/3601) [PR #3622](https://github.com/PHPOffice/PhpSpreadsheet/pull/3622)
+- Permit Meta Viewport in Html. [Issue #3565](https://github.com/PHPOffice/PhpSpreadsheet/issues/3565) [PR #3623](https://github.com/PHPOffice/PhpSpreadsheet/pull/3623)
+- Hyperlink support for Ods. [Issue #3660](https://github.com/PHPOffice/PhpSpreadsheet/issues/3660) [PR #3669](https://github.com/PHPOffice/PhpSpreadsheet/pull/3669)
+- ListWorksheetInfo/Names for Html/Csv/Slk. [Issue #3706](https://github.com/PHPOffice/PhpSpreadsheet/issues/3706) [PR #3709](https://github.com/PHPOffice/PhpSpreadsheet/pull/3709)
+- Methods to determine if cell is actually locked, or hidden on formula bar. [PR #3722](https://github.com/PHPOffice/PhpSpreadsheet/pull/3722)
+- Add iterateOnlyExistingCells to Constructors. [Issue #3721](https://github.com/PHPOffice/PhpSpreadsheet/issues/3721) [PR #3727](https://github.com/PHPOffice/PhpSpreadsheet/pull/3727)
+- Support for Conditional Formatting Color Scale. [PR #3738](https://github.com/PHPOffice/PhpSpreadsheet/pull/3738)
+- Support Additional Tags in Helper/Html. [Issue #3751](https://github.com/PHPOffice/PhpSpreadsheet/issues/3751) [PR #3752](https://github.com/PHPOffice/PhpSpreadsheet/pull/3752)
+- Writer ODS : Write Border Style for cells [Issue #3690](https://github.com/PHPOffice/PhpSpreadsheet/issues/3690) [PR #3693](https://github.com/PHPOffice/PhpSpreadsheet/pull/3693)
+- Sheet Background Images [Issue #1649](https://github.com/PHPOffice/PhpSpreadsheet/issues/1649) [PR #3795](https://github.com/PHPOffice/PhpSpreadsheet/pull/3795)
+- Check if Coordinate is Inside Range [PR #3779](https://github.com/PHPOffice/PhpSpreadsheet/pull/3779)
+- Flipping Images [Issue #731](https://github.com/PHPOffice/PhpSpreadsheet/issues/731) [PR #3801](https://github.com/PHPOffice/PhpSpreadsheet/pull/3801)
+- Chart Dynamic Title and Font Properties [Issue #3797](https://github.com/PHPOffice/PhpSpreadsheet/issues/3797) [PR #3800](https://github.com/PHPOffice/PhpSpreadsheet/pull/3800)
+- Chart Axis Display Units and Logarithmic Scale. [Issue #3833](https://github.com/PHPOffice/PhpSpreadsheet/issues/3833) [PR #3836](https://github.com/PHPOffice/PhpSpreadsheet/pull/3836)
+- Partial Support of Fill Handles. [Discussion #3847](https://github.com/PHPOffice/PhpSpreadsheet/discussions/3847) [PR #3855](https://github.com/PHPOffice/PhpSpreadsheet/pull/3855)
+
+### Changed
+
+- **Drop support for PHP 7.4**, according to https://phpspreadsheet.readthedocs.io/en/latest/#php-version-support [PR #3713](https://github.com/PHPOffice/PhpSpreadsheet/pull/3713)
+- RLM Added to NumberFormatter Currency. This happens depending on release of ICU which Php is using (it does not yet happen with any official release). PhpSpreadsheet will continue to use the value returned by Php, but a method is added to keep the result unchanged from release to release. [Issue #3571](https://github.com/PHPOffice/PhpSpreadsheet/issues/3571) [PR #3640](https://github.com/PHPOffice/PhpSpreadsheet/pull/3640)
+- `toFormattedString` will now always return a string. This was introduced with 1.28.0, but was not properly documented at the time. This can affect the results of `toArray`, `namedRangeToArray`, and `rangeToArray`. [PR #3304](https://github.com/PHPOffice/PhpSpreadsheet/pull/3304)
+- Value of constants FORMAT_CURRENCY_EUR and FORMAT_CURRENCY_USD was changed in 1.28.0, but was not properly documented at the time. [Issue #3577](https://github.com/PHPOffice/PhpSpreadsheet/issues/3577)
+- Html Writer will attempt to use Chart coordinates to determine image size. [Issue #3783](https://github.com/PHPOffice/PhpSpreadsheet/issues/3783) [PR #3787](https://github.com/PHPOffice/PhpSpreadsheet/pull/3787)
+
+### Deprecated
+
+- Functions `_translateFormulaToLocale` and `_translateFormulaEnglish` are replaced by versions without leading underscore. [PR #3828](https://github.com/PHPOffice/PhpSpreadsheet/pull/3828)
+
+### Removed
+
+- Nothing
+
+### Fixed
+
+- Take advantage of mitoteam/jpgraph Extended mode to enable rendering of more graphs. [PR #3603](https://github.com/PHPOffice/PhpSpreadsheet/pull/3603)
+- Column widths, especially for ODS. [Issue #3609](https://github.com/PHPOffice/PhpSpreadsheet/issues/3609) [PR #3610](https://github.com/PHPOffice/PhpSpreadsheet/pull/3610)
+- Avoid NULL in String Function call (partial solution). [Issue #3613](https://github.com/PHPOffice/PhpSpreadsheet/issues/3613) [PR #3617](https://github.com/PHPOffice/PhpSpreadsheet/pull/3617)
+- Preserve transparency in Memory Drawing. [Issue #3624](https://github.com/PHPOffice/PhpSpreadsheet/issues/3624) [PR #3627](https://github.com/PHPOffice/PhpSpreadsheet/pull/3627)
+- Customizable padding for Exact Column Width. [Issue #3626](https://github.com/PHPOffice/PhpSpreadsheet/issues/3626) [PR #3628](https://github.com/PHPOffice/PhpSpreadsheet/pull/3628)
+- Ensure ROW function returns int (problem exposed in unreleased Php). [PR #3641](https://github.com/PHPOffice/PhpSpreadsheet/pull/3641)
+- Minor changes to Mpdf and Html Writers. [PR #3645](https://github.com/PHPOffice/PhpSpreadsheet/pull/3645)
+- Xlsx Reader Namespacing for Tables, Autofilters. [Issue #3665](https://github.com/PHPOffice/PhpSpreadsheet/issues/3665) [PR #3668](https://github.com/PHPOffice/PhpSpreadsheet/pull/3668)
+- Read Code Page for Xls ListWorksheetInfo/Names BIFF5. [Issue #3671](https://github.com/PHPOffice/PhpSpreadsheet/issues/3671) [PR #3672](https://github.com/PHPOffice/PhpSpreadsheet/pull/3672)
+- Read Data from Table on Different Sheet. [Issue #3635](https://github.com/PHPOffice/PhpSpreadsheet/issues/3635) [PR #3659](https://github.com/PHPOffice/PhpSpreadsheet/pull/3659)
+- Html Writer Styles Using Inline Css. [Issue #3678](https://github.com/PHPOffice/PhpSpreadsheet/issues/3678) [PR #3680](https://github.com/PHPOffice/PhpSpreadsheet/pull/3680)
+- Xlsx Read Ignoring Some Comments. [Issue #3654](https://github.com/PHPOffice/PhpSpreadsheet/issues/3654) [PR #3655](https://github.com/PHPOffice/PhpSpreadsheet/pull/3655)
+- Fractional Seconds in Date/Time Values. [PR #3677](https://github.com/PHPOffice/PhpSpreadsheet/pull/3677)
+- SetCalculatedValue Avoid Casting String to Numeric. [Issue #3658](https://github.com/PHPOffice/PhpSpreadsheet/issues/3658) [PR #3685](https://github.com/PHPOffice/PhpSpreadsheet/pull/3685)
+- Several Problems in a Very Complicated Spreadsheet. [Issue #3679](https://github.com/PHPOffice/PhpSpreadsheet/issues/3679) [PR #3681](https://github.com/PHPOffice/PhpSpreadsheet/pull/3681)
+- Inconsistent String Handling for Sum Functions. [Issue #3652](https://github.com/PHPOffice/PhpSpreadsheet/issues/3652) [PR #3653](https://github.com/PHPOffice/PhpSpreadsheet/pull/3653)
+- Recomputation of Relative Addresses in Defined Names. [Issue #3661](https://github.com/PHPOffice/PhpSpreadsheet/issues/3661) [PR #3673](https://github.com/PHPOffice/PhpSpreadsheet/pull/3673)
+- Writer Xls Characters Outside BMP (emojis). [Issue #642](https://github.com/PHPOffice/PhpSpreadsheet/issues/642) [PR #3696](https://github.com/PHPOffice/PhpSpreadsheet/pull/3696)
+- Xlsx Reader Improve Handling of Row and Column Styles. [Issue #3533](https://github.com/PHPOffice/PhpSpreadsheet/issues/3533) [Issue #3534](https://github.com/PHPOffice/PhpSpreadsheet/issues/3534) [PR #3688](https://github.com/PHPOffice/PhpSpreadsheet/pull/3688)
+- Avoid Allocating RowDimension Unneccesarily. [PR #3686](https://github.com/PHPOffice/PhpSpreadsheet/pull/3686)
+- Use Column Style when Row Dimension Exists Without Style. [Issue #3534](https://github.com/PHPOffice/PhpSpreadsheet/issues/3534) [PR #3688](https://github.com/PHPOffice/PhpSpreadsheet/pull/3688)
+- Inconsistency Between Cell Data and Explicitly Declared Type. [Issue #3711](https://github.com/PHPOffice/PhpSpreadsheet/issues/3711) [PR #3715](https://github.com/PHPOffice/PhpSpreadsheet/pull/3715)
+- Unexpected Namespacing in rels File. [Issue #3720](https://github.com/PHPOffice/PhpSpreadsheet/issues/3720) [PR #3722](https://github.com/PHPOffice/PhpSpreadsheet/pull/3722)
+- Break Some Circular References. [PR #3716](https://github.com/PHPOffice/PhpSpreadsheet/pull/3716) [PR #3707](https://github.com/PHPOffice/PhpSpreadsheet/pull/3707)
+- Missing Font Index in Some Xls. [PR #3734](https://github.com/PHPOffice/PhpSpreadsheet/pull/3734)
+- Load Tables even with READ_DATA_ONLY. [PR #3726](https://github.com/PHPOffice/PhpSpreadsheet/pull/3726)
+- Theme File Missing but Referenced in Spreadsheet. [Issue #3770](https://github.com/PHPOffice/PhpSpreadsheet/issues/3770) [PR #3772](https://github.com/PHPOffice/PhpSpreadsheet/pull/3772)
+- Slk Shared Formulas. [Issue #2267](https://github.com/PHPOffice/PhpSpreadsheet/issues/2267) [PR #3776](https://github.com/PHPOffice/PhpSpreadsheet/pull/3776)
+- Html omitting some charts. [Issue #3767](https://github.com/PHPOffice/PhpSpreadsheet/issues/3767) [PR #3771](https://github.com/PHPOffice/PhpSpreadsheet/pull/3771)
+- Case Insensitive Comparison for Sheet Names [PR #3791](https://github.com/PHPOffice/PhpSpreadsheet/pull/3791)
+- Performance improvement for Xlsx Reader. [Issue #3683](https://github.com/PHPOffice/PhpSpreadsheet/issues/3683) [PR #3810](https://github.com/PHPOffice/PhpSpreadsheet/pull/3810)
+- Prevent loop in Shared/File. [Issue #3807](https://github.com/PHPOffice/PhpSpreadsheet/issues/3807) [PR #3809](https://github.com/PHPOffice/PhpSpreadsheet/pull/3809)
+- Consistent handling of decimal/thousands separators between StringHelper and Php setlocale. [Issue #3811](https://github.com/PHPOffice/PhpSpreadsheet/issues/3811) [PR #3815](https://github.com/PHPOffice/PhpSpreadsheet/pull/3815)
+- Clone worksheet with tables or charts. [Issue #3820](https://github.com/PHPOffice/PhpSpreadsheet/issues/3820) [PR #3821](https://github.com/PHPOffice/PhpSpreadsheet/pull/3821)
+- COUNTIFS Does Not Require xlfn. [Issue #3819](https://github.com/PHPOffice/PhpSpreadsheet/issues/3819) [PR #3827](https://github.com/PHPOffice/PhpSpreadsheet/pull/3827)
+- Strip `xlfn.` and `xlws.` from Formula Translations. [Issue #3819](https://github.com/PHPOffice/PhpSpreadsheet/issues/3819) [PR #3828](https://github.com/PHPOffice/PhpSpreadsheet/pull/3828)
+- Recurse directories searching for font file. [Issue #2809](https://github.com/PHPOffice/PhpSpreadsheet/issues/2809) [PR #3830](https://github.com/PHPOffice/PhpSpreadsheet/pull/3830)
+- Reduce memory consumption of Worksheet::rangeToArray() when many empty rows are read. [Issue #3814](https://github.com/PHPOffice/PhpSpreadsheet/issues/3814) [PR #3834](https://github.com/PHPOffice/PhpSpreadsheet/pull/3834)
+- Reduce time used by Worksheet::rangeToArray() when many empty rows are read. [PR #3839](https://github.com/PHPOffice/PhpSpreadsheet/pull/3839)
+- Html Reader Tolerate Invalid Sheet Title. [PR #3845](https://github.com/PHPOffice/PhpSpreadsheet/pull/3845)
+- Do not include unparsed drawings when new drawing added. [Issue #3843](https://github.com/PHPOffice/PhpSpreadsheet/issues/3843) [PR #3846](https://github.com/PHPOffice/PhpSpreadsheet/pull/3846)
+- Do not include unparsed drawings when new drawing added. [Issue #3861](https://github.com/PHPOffice/PhpSpreadsheet/issues/3861) [PR #3862](https://github.com/PHPOffice/PhpSpreadsheet/pull/3862)
+- Excel omits `between` operator for data validation. [Issue #3863](https://github.com/PHPOffice/PhpSpreadsheet/issues/3863) [PR #3865](https://github.com/PHPOffice/PhpSpreadsheet/pull/3865)
+- Use less space when inserting rows and columns. [Issue #3687](https://github.com/PHPOffice/PhpSpreadsheet/issues/3687) [PR #3856](https://github.com/PHPOffice/PhpSpreadsheet/pull/3856)
+- Excel inconsistent handling of MIN/MAX/MINA/MAXA. [Issue #3866](https://github.com/PHPOffice/PhpSpreadsheet/issues/3866) [PR #3868](https://github.com/PHPOffice/PhpSpreadsheet/pull/3868)
+
+## 1.29.0 - 2023-06-15
+
+### Added
+
+- Wizards for defining Number Format masks for Dates and Times, including Durations/Intervals. [PR #3458](https://github.com/PHPOffice/PhpSpreadsheet/pull/3458)
+- Specify data type in html tags. [Issue #3444](https://github.com/PHPOffice/PhpSpreadsheet/issues/3444) [PR #3445](https://github.com/PHPOffice/PhpSpreadsheet/pull/3445)
+- Provide option to ignore hidden rows/columns in `toArray()` methods. [PR #3494](https://github.com/PHPOffice/PhpSpreadsheet/pull/3494)
+- Font/Effects/Theme support for Chart Data Labels and Axis. [PR #3476](https://github.com/PHPOffice/PhpSpreadsheet/pull/3476)
+- Font Themes support. [PR #3486](https://github.com/PHPOffice/PhpSpreadsheet/pull/3486)
+- Ability to Ignore Cell Errors in Excel. [Issue #1141](https://github.com/PHPOffice/PhpSpreadsheet/issues/1141) [PR #3508](https://github.com/PHPOffice/PhpSpreadsheet/pull/3508)
+- Unzipped Gnumeric file [PR #3591](https://github.com/PHPOffice/PhpSpreadsheet/pull/3591)
+
+### Changed
+
+- Xlsx Color schemes read in will be written out (previously Excel 2007-2010 Color scheme was always written); manipulation of those schemes before write, including restoring prior behavior, is provided [PR #3476](https://github.com/PHPOffice/PhpSpreadsheet/pull/3476)
+- Memory and speed optimisations for Read Filters with Xlsx Files and Shared Formulae. [PR #3474](https://github.com/PHPOffice/PhpSpreadsheet/pull/3474)
+- Allow `CellRange` and `CellAddress` objects for the `range` argument in the `rangeToArray()` method. [PR #3494](https://github.com/PHPOffice/PhpSpreadsheet/pull/3494)
+- Stock charts will now read and reproduce `upDownBars` and subsidiary tags; these were previously ignored on read and hard-coded on write. [PR #3515](https://github.com/PHPOffice/PhpSpreadsheet/pull/3515)
+
+### Deprecated
+
+- Nothing
+
+### Removed
+
+- Nothing
+
+### Fixed
+
+- Updates Cell formula absolute ranges/references, and Defined Name absolute ranges/references when inserting/deleting rows/columns. [Issue #3368](https://github.com/PHPOffice/PhpSpreadsheet/issues/3368) [PR #3402](https://github.com/PHPOffice/PhpSpreadsheet/pull/3402)
+- EOMONTH() and EDATE() Functions should round date value before evaluation. [Issue #3436](https://github.com/PHPOffice/PhpSpreadsheet/issues/3436) [PR #3437](https://github.com/PHPOffice/PhpSpreadsheet/pull/3437)
+- NETWORKDAYS function erroneously being converted to NETWORK_xlfn.DAYS in Xlsx Writer. [Issue #3461](https://github.com/PHPOffice/PhpSpreadsheet/issues/3461) [PR #3463](https://github.com/PHPOffice/PhpSpreadsheet/pull/3463)
+- Getting a style for a CellAddress instance fails if the worksheet is set in the CellAddress instance. [Issue #3439](https://github.com/PHPOffice/PhpSpreadsheet/issues/3439) [PR #3469](https://github.com/PHPOffice/PhpSpreadsheet/pull/3469)
+- Shared Formulae outside the filter range when reading with a filter are not always being identified. [Issue #3473](https://github.com/PHPOffice/PhpSpreadsheet/issues/3473) [PR #3474](https://github.com/PHPOffice/PhpSpreadsheet/pull/3474)
+- Xls Reader Conditional Styles. [PR #3400](https://github.com/PHPOffice/PhpSpreadsheet/pull/3400)
+- Allow use of # and 0 digit placeholders in fraction masks. [PR #3401](https://github.com/PHPOffice/PhpSpreadsheet/pull/3401)
+- Modify Date/Time check in the NumberFormatter for decimal/fractional times. [PR #3413](https://github.com/PHPOffice/PhpSpreadsheet/pull/3413)
+- Misplaced Xml Writing Chart Label FillColor. [Issue #3397](https://github.com/PHPOffice/PhpSpreadsheet/issues/3397) [PR #3404](https://github.com/PHPOffice/PhpSpreadsheet/pull/3404)
+- TEXT function ignores Time in DateTimeStamp. [Issue #3409](https://github.com/PHPOffice/PhpSpreadsheet/issues/3409) [PR #3411](https://github.com/PHPOffice/PhpSpreadsheet/pull/3411)
+- Xlsx Column Autosize Approximate for CJK. [Issue #3405](https://github.com/PHPOffice/PhpSpreadsheet/issues/3405) [PR #3416](https://github.com/PHPOffice/PhpSpreadsheet/pull/3416)
+- Correct Xlsx Parsing of quotePrefix="0". [Issue #3435](https://github.com/PHPOffice/PhpSpreadsheet/issues/3435) [PR #3438](https://github.com/PHPOffice/PhpSpreadsheet/pull/3438)
+- More Display Options for Chart Axis and Legend. [Issue #3414](https://github.com/PHPOffice/PhpSpreadsheet/issues/3414) [PR #3434](https://github.com/PHPOffice/PhpSpreadsheet/pull/3434)
+- Apply strict type checking to Complex suffix. [PR #3452](https://github.com/PHPOffice/PhpSpreadsheet/pull/3452)
+- Incorrect Font Color Read Xlsx Rich Text Indexed Color Custom Palette. [Issue #3464](https://github.com/PHPOffice/PhpSpreadsheet/issues/3464) [PR #3465](https://github.com/PHPOffice/PhpSpreadsheet/pull/3465)
+- Xlsx Writer Honor Alignment in Default Font. [Issue #3443](https://github.com/PHPOffice/PhpSpreadsheet/issues/3443) [PR #3459](https://github.com/PHPOffice/PhpSpreadsheet/pull/3459)
+- Support Border for Charts. [PR #3462](https://github.com/PHPOffice/PhpSpreadsheet/pull/3462)
+- Error in "this row" structured reference calculation (cached result from first row when using a range) [Issue #3504](https://github.com/PHPOffice/PhpSpreadsheet/issues/3504) [PR #3505](https://github.com/PHPOffice/PhpSpreadsheet/pull/3505)
+- Allow colour palette index references in Number Format masks [Issue #3511](https://github.com/PHPOffice/PhpSpreadsheet/issues/3511) [PR #3512](https://github.com/PHPOffice/PhpSpreadsheet/pull/3512)
+- Xlsx Reader formula with quotePrefix [Issue #3495](https://github.com/PHPOffice/PhpSpreadsheet/issues/3495) [PR #3497](https://github.com/PHPOffice/PhpSpreadsheet/pull/3497)
+- Handle REF error as part of range [Issue #3453](https://github.com/PHPOffice/PhpSpreadsheet/issues/3453) [PR #3467](https://github.com/PHPOffice/PhpSpreadsheet/pull/3467)
+- Handle Absolute Pathnames in Rels File [Issue #3553](https://github.com/PHPOffice/PhpSpreadsheet/issues/3553) [PR #3554](https://github.com/PHPOffice/PhpSpreadsheet/pull/3554)
+- Return Page Breaks in Order [Issue #3552](https://github.com/PHPOffice/PhpSpreadsheet/issues/3552) [PR #3555](https://github.com/PHPOffice/PhpSpreadsheet/pull/3555)
+- Add position attribute for MemoryDrawing in Html [Issue #3529](https://github.com/PHPOffice/PhpSpreadsheet/issues/3529 [PR #3535](https://github.com/PHPOffice/PhpSpreadsheet/pull/3535)
+- Allow Index_number as Array for VLOOKUP/HLOOKUP [Issue #3561](https://github.com/PHPOffice/PhpSpreadsheet/issues/3561 [PR #3570](https://github.com/PHPOffice/PhpSpreadsheet/pull/3570)
+- Add Unsupported Options in Xml Spreadsheet [Issue #3566](https://github.com/PHPOffice/PhpSpreadsheet/issues/3566 [Issue #3568](https://github.com/PHPOffice/PhpSpreadsheet/issues/3568 [Issue #3569](https://github.com/PHPOffice/PhpSpreadsheet/issues/3569 [PR #3567](https://github.com/PHPOffice/PhpSpreadsheet/pull/3567)
+- Changes to NUMBERVALUE, VALUE, DATEVALUE, TIMEVALUE [Issue #3574](https://github.com/PHPOffice/PhpSpreadsheet/issues/3574 [PR #3575](https://github.com/PHPOffice/PhpSpreadsheet/pull/3575)
+- Redo calculation of color tinting [Issue #3550](https://github.com/PHPOffice/PhpSpreadsheet/issues/3550) [PR #3580](https://github.com/PHPOffice/PhpSpreadsheet/pull/3580)
+- Accommodate Slash with preg_quote [PR #3582](https://github.com/PHPOffice/PhpSpreadsheet/pull/3582) [PR #3583](https://github.com/PHPOffice/PhpSpreadsheet/pull/3583) [PR #3584](https://github.com/PHPOffice/PhpSpreadsheet/pull/3584)
+- HyperlinkBase Property and Html Handling of Properties [Issue #3573](https://github.com/PHPOffice/PhpSpreadsheet/issues/3573) [PR #3589](https://github.com/PHPOffice/PhpSpreadsheet/pull/3589)
+- Improvements for Data Validation [Issue #3592](https://github.com/PHPOffice/PhpSpreadsheet/issues/3592) [Issue #3594](https://github.com/PHPOffice/PhpSpreadsheet/issues/3594) [PR #3605](https://github.com/PHPOffice/PhpSpreadsheet/pull/3605)
+
+## 1.28.0 - 2023-02-25
+
+### Added
+
+- Support for configuring a Chart Title's overlay [PR #3325](https://github.com/PHPOffice/PhpSpreadsheet/pull/3325)
+- Wizards for defining Number Format masks for Numbers, Percentages, Scientific, Currency and Accounting [PR #3334](https://github.com/PHPOffice/PhpSpreadsheet/pull/3334)
+- Support for fixed value divisor in fractional Number Format Masks [PR #3339](https://github.com/PHPOffice/PhpSpreadsheet/pull/3339)
+- Allow More Fonts/Fontnames for Exact Width Calculation [PR #3326](https://github.com/PHPOffice/PhpSpreadsheet/pull/3326) [Issue #3190](https://github.com/PHPOffice/PhpSpreadsheet/issues/3190)
+- Allow override of the Value Binder when setting a Cell value [PR #3361](https://github.com/PHPOffice/PhpSpreadsheet/pull/3361)
+
+### Changed
+
+- Improved handling for @ placeholder in Number Format Masks [PR #3344](https://github.com/PHPOffice/PhpSpreadsheet/pull/3344)
+- Improved handling for ? placeholder in Number Format Masks [PR #3394](https://github.com/PHPOffice/PhpSpreadsheet/pull/3394)
+- Improved support for locale settings and currency codes when matching formatted strings to numerics in the Calculation Engine [PR #3373](https://github.com/PHPOffice/PhpSpreadsheet/pull/3373) and [PR #3374](https://github.com/PHPOffice/PhpSpreadsheet/pull/3374) 
+- Improved support for locale settings and matching in the Advanced Value Binder [PR #3376](https://github.com/PHPOffice/PhpSpreadsheet/pull/3376)
+- `toFormattedString` will now always return a string. This can affect the results of `toArray`, `namedRangeToArray`, and `rangeToArray`. [PR #3304](https://github.com/PHPOffice/PhpSpreadsheet/pull/3304)
+- Value of constants FORMAT_CURRENCY_EUR and FORMAT_CURRENCY_USD is changed. [Issue #3577](https://github.com/PHPOffice/PhpSpreadsheet/issues/3577) [PR #3377](https://github.com/PHPOffice/PhpSpreadsheet/pull/3377)
+
+### Deprecated
+
+- Rationalisation of Pre-defined Currency Format Masks [PR #3377](https://github.com/PHPOffice/PhpSpreadsheet/pull/3377)
+
+### Removed
+
+- Nothing
+
+### Fixed
+
+- Calculation Engine doesn't evaluate Defined Name when default cell A1 is quote-prefixed [Issue #3335](https://github.com/PHPOffice/PhpSpreadsheet/issues/3335) [PR #3336](https://github.com/PHPOffice/PhpSpreadsheet/pull/3336)
+- XLSX Writer - Array Formulas do not include function prefix [Issue #3337](https://github.com/PHPOffice/PhpSpreadsheet/issues/3337) [PR #3338](https://github.com/PHPOffice/PhpSpreadsheet/pull/3338)
+- Permit Max Column for Row Breaks [Issue #3143](https://github.com/PHPOffice/PhpSpreadsheet/issues/3143) [PR #3345](https://github.com/PHPOffice/PhpSpreadsheet/pull/3345)
+- AutoSize Columns should allow for dropdown icon when AutoFilter is for a Table [Issue #3356](https://github.com/PHPOffice/PhpSpreadsheet/issues/3356) [PR #3358](https://github.com/PHPOffice/PhpSpreadsheet/pull/3358) and for Center Alignment of Headers [Issue #3395](https://github.com/PHPOffice/PhpSpreadsheet/issues/3395) [PR #3399](https://github.com/PHPOffice/PhpSpreadsheet/pull/3399)
+- Decimal Precision for Scientific Number Format Mask [Issue #3381](https://github.com/PHPOffice/PhpSpreadsheet/issues/3381) [PR #3382](https://github.com/PHPOffice/PhpSpreadsheet/pull/3382)
+- Xls Writer Parser Handle Boolean Literals as Function Arguments [Issue #3369](https://github.com/PHPOffice/PhpSpreadsheet/issues/3369) [PR #3391](https://github.com/PHPOffice/PhpSpreadsheet/pull/3391)
+- Conditional Formatting Improvements for Xlsx [Issue #3370](https://github.com/PHPOffice/PhpSpreadsheet/issues/3370) [Issue #3202](https://github.com/PHPOffice/PhpSpreadsheet/issues/3302) [PR #3372](https://github.com/PHPOffice/PhpSpreadsheet/pull/3372)
+- Coerce Bool to Int for Mathematical Operations on Arrays [Issue #3389](https://github.com/PHPOffice/PhpSpreadsheet/issues/3389) [Issue #3396](https://github.com/PHPOffice/PhpSpreadsheet/issues/3396) [PR #3392](https://github.com/PHPOffice/PhpSpreadsheet/pull/3392)
+
+## 1.27.1 - 2023-02-08
+
+### Added
+
+- Nothing
+
+### Changed
+
+- Nothing
+
+### Deprecated
+
+- Nothing
+
+### Removed
+
+- Nothing
+
+### Fixed
+
+- Fix Composer --dev dependency issue with dealerdirect/phpcodesniffer-composer-installer renaming their `master` branch to `main`
+
+
+## 1.27.0 - 2023-01-24
+
+### Added
+
+- Option to specify a range of columns/rows for the Row/Column `isEmpty()` methods [PR #3315](https://github.com/PHPOffice/PhpSpreadsheet/pull/3315)
+- Option for Cell Iterator to return a null value or create and return a new cell when accessing a cell that doesn't exist [PR #3314](https://github.com/PHPOffice/PhpSpreadsheet/pull/3314)
+- Support for Structured References in the Calculation Engine [PR #3261](https://github.com/PHPOffice/PhpSpreadsheet/pull/3261)
+- Limited Support for Form Controls [PR #3130](https://github.com/PHPOffice/PhpSpreadsheet/pull/3130) [Issue #2396](https://github.com/PHPOffice/PhpSpreadsheet/issues/2396) [Issue #1770](https://github.com/PHPOffice/PhpSpreadsheet/issues/1770) [Issue #2388](https://github.com/PHPOffice/PhpSpreadsheet/issues/2388) [Issue #2904](https://github.com/PHPOffice/PhpSpreadsheet/issues/2904) [Issue #2661](https://github.com/PHPOffice/PhpSpreadsheet/issues/2661)
+
+### Changed
+
+- Nothing
+
+### Deprecated
+
+- Nothing
+
+### Removed
+
+- Shared/JAMA is removed. [PR #3260](https://github.com/PHPOffice/PhpSpreadsheet/pull/3260)
+
+### Fixed
+
+- Namespace-Aware Code for SheetViewOptions, SheetProtection [PR #3230](https://github.com/PHPOffice/PhpSpreadsheet/pull/3230)
+- Additional Method for XIRR if Newton-Raphson Doesn't Converge [Issue #689](https://github.com/PHPOffice/PhpSpreadsheet/issues/689) [PR #3262](https://github.com/PHPOffice/PhpSpreadsheet/pull/3262)
+- Better Handling of Composite Charts [Issue #2333](https://github.com/PHPOffice/PhpSpreadsheet/issues/2333) [PR #3265](https://github.com/PHPOffice/PhpSpreadsheet/pull/3265)
+- Update Column Reference for Columns Beginning with Y and Z [Issue #3263](https://github.com/PHPOffice/PhpSpreadsheet/issues/3263) [PR #3264](https://github.com/PHPOffice/PhpSpreadsheet/pull/3264)
+- Honor Fit to 1-Page Height Html/Pdf [Issue #3266](https://github.com/PHPOffice/PhpSpreadsheet/issues/3266) [PR #3279](https://github.com/PHPOffice/PhpSpreadsheet/pull/3279)
+- AND/OR/XOR Handling of Literal Strings [PR #3287](https://github.com/PHPOffice/PhpSpreadsheet/pull/3287)
+- Xls Reader Vertical Break and Writer Page Order [Issue #3305](https://github.com/PHPOffice/PhpSpreadsheet/issues/3305) [PR #3306](https://github.com/PHPOffice/PhpSpreadsheet/pull/3306)
+
+
+## 1.26.0 - 2022-12-21
+
+### Added
+
+- Extended flag options for the Reader `load()` and Writer `save()` methods
+- Apply Row/Column limits (1048576 and XFD) in ReferenceHelper [PR #3213](https://github.com/PHPOffice/PhpSpreadsheet/pull/3213)
+- Allow the creation of In-Memory Drawings from a string of binary image data, or from a stream. [PR #3157](https://github.com/PHPOffice/PhpSpreadsheet/pull/3157)
+- Xlsx Reader support for Pivot Tables [PR #2829](https://github.com/PHPOffice/PhpSpreadsheet/pull/2829)
+- Permit Date/Time Entered on Spreadsheet to be calculated as Float [Issue #1416](https://github.com/PHPOffice/PhpSpreadsheet/issues/1416) [PR #3121](https://github.com/PHPOffice/PhpSpreadsheet/pull/3121)
+
+### Changed
+
+- Nothing
+
+### Deprecated
+
+- Direct update of Calculation::suppressFormulaErrors is replaced with setter.
+- Font public static variable defaultColumnWidths replaced with constant DEFAULT_COLUMN_WIDTHS.
+- ExcelError public static variable errorCodes replaced with constant ERROR_CODES.
+- NumberFormat constant FORMAT_DATE_YYYYMMDD2 replaced with existing identical FORMAT_DATE_YYYYMMDD.
+
+### Removed
+
+- Nothing
+
+### Fixed
+
+- Fixed handling for `_xlws` prefixed functions from Office365 [Issue #3245](https://github.com/PHPOffice/PhpSpreadsheet/issues/3245) [PR #3247](https://github.com/PHPOffice/PhpSpreadsheet/pull/3247)
+- Conditionals formatting rules applied to rows/columns are removed [Issue #3184](https://github.com/PHPOffice/PhpSpreadsheet/issues/3184) [PR #3213](https://github.com/PHPOffice/PhpSpreadsheet/pull/3213)
+- Treat strings containing currency or accounting values as floats in Calculation Engine operations [Issue #3165](https://github.com/PHPOffice/PhpSpreadsheet/issues/3165) [PR #3189](https://github.com/PHPOffice/PhpSpreadsheet/pull/3189)
+- Treat strings containing percentage values as floats in Calculation Engine operations [Issue #3155](https://github.com/PHPOffice/PhpSpreadsheet/issues/3155) [PR #3156](https://github.com/PHPOffice/PhpSpreadsheet/pull/3156) and [PR #3164](https://github.com/PHPOffice/PhpSpreadsheet/pull/3164)
+- Xlsx Reader Accept Palette of Fewer than 64 Colors [Issue #3093](https://github.com/PHPOffice/PhpSpreadsheet/issues/3093) [PR #3096](https://github.com/PHPOffice/PhpSpreadsheet/pull/3096)
+- Use Locale-Independent Float Conversion for Xlsx Writer Custom Property [Issue #3095](https://github.com/PHPOffice/PhpSpreadsheet/issues/3095) [PR #3099](https://github.com/PHPOffice/PhpSpreadsheet/pull/3099)
+- Allow setting AutoFilter range on a single cell or row [Issue #3102](https://github.com/PHPOffice/PhpSpreadsheet/issues/3102) [PR #3111](https://github.com/PHPOffice/PhpSpreadsheet/pull/3111)
+- Xlsx Reader External Data Validations Flag Missing [Issue #2677](https://github.com/PHPOffice/PhpSpreadsheet/issues/2677) [PR #3078](https://github.com/PHPOffice/PhpSpreadsheet/pull/3078)
+- Reduces extra memory usage on `__destruct()` calls [PR #3092](https://github.com/PHPOffice/PhpSpreadsheet/pull/3092)
+- Additional properties for Trendlines [Issue #3011](https://github.com/PHPOffice/PhpSpreadsheet/issues/3011) [PR #3028](https://github.com/PHPOffice/PhpSpreadsheet/pull/3028)
+- Calculation suppressFormulaErrors fix [Issue #1531](https://github.com/PHPOffice/PhpSpreadsheet/issues/1531) [PR #3092](https://github.com/PHPOffice/PhpSpreadsheet/pull/3092)
+- Permit Date/Time Entered on Spreadsheet to be Calculated as Float [Issue #1416](https://github.com/PHPOffice/PhpSpreadsheet/issues/1416) [PR #3121](https://github.com/PHPOffice/PhpSpreadsheet/pull/3121)
+- Incorrect Handling of Data Validation Formula Containing Ampersand [Issue #3145](https://github.com/PHPOffice/PhpSpreadsheet/issues/3145) [PR #3146](https://github.com/PHPOffice/PhpSpreadsheet/pull/3146)
+- Xlsx Namespace Handling of Drawings, RowAndColumnAttributes, MergeCells [Issue #3138](https://github.com/PHPOffice/PhpSpreadsheet/issues/3138) [PR #3136](https://github.com/PHPOffice/PhpSpreadsheet/pull/3137)
+- Generation3 Copy With Image in Footer [Issue #3126](https://github.com/PHPOffice/PhpSpreadsheet/issues/3126) [PR #3140](https://github.com/PHPOffice/PhpSpreadsheet/pull/3140)
+- MATCH Function Problems with Int/Float Compare and Wildcards [Issue #3141](https://github.com/PHPOffice/PhpSpreadsheet/issues/3141) [PR #3142](https://github.com/PHPOffice/PhpSpreadsheet/pull/3142)
+- Fix ODS Read Filter on number-columns-repeated cell [Issue #3148](https://github.com/PHPOffice/PhpSpreadsheet/issues/3148) [PR #3149](https://github.com/PHPOffice/PhpSpreadsheet/pull/3149)
+- Problems Formatting Very Small and Very Large Numbers [Issue #3128](https://github.com/PHPOffice/PhpSpreadsheet/issues/3128) [PR #3152](https://github.com/PHPOffice/PhpSpreadsheet/pull/3152)
+- XlsxWrite preserve line styles for y-axis, not just x-axis [PR #3163](https://github.com/PHPOffice/PhpSpreadsheet/pull/3163)
+- Xlsx Namespace Handling of Drawings, RowAndColumnAttributes, MergeCells [Issue #3138](https://github.com/PHPOffice/PhpSpreadsheet/issues/3138) [PR #3137](https://github.com/PHPOffice/PhpSpreadsheet/pull/3137)
+- More Detail for Cyclic Error Messages [Issue #3169](https://github.com/PHPOffice/PhpSpreadsheet/issues/3169) [PR #3170](https://github.com/PHPOffice/PhpSpreadsheet/pull/3170)
+- Improved Documentation for Deprecations - many PRs [Issue #3162](https://github.com/PHPOffice/PhpSpreadsheet/issues/3162)
+
+
+## 1.25.2 - 2022-09-25
+
+### Added
+
+- Nothing
+
+### Changed
+
+- Nothing
+
+### Deprecated
+
+- Nothing
+
+### Removed
+
+- Nothing
+
+### Fixed
+
+- Composer dependency clash with ezyang/htmlpurifier
+
+
+## 1.25.0 - 2022-09-25
+
+### Added
+
+- Implementation of the new `TEXTBEFORE()`, `TEXTAFTER()` and `TEXTSPLIT()` Excel Functions
+- Implementation of the `ARRAYTOTEXT()` and `VALUETOTEXT()` Excel Functions
+- Support for [mitoteam/jpgraph](https://packagist.org/packages/mitoteam/jpgraph) implementation of
+  JpGraph library to render charts added.
+- Charts: Add Gradients, Transparency, Hidden Axes, Rounded Corners, Trendlines, Date Axes.
+
+### Changed
+
+- Allow variant behaviour when merging cells [Issue #3065](https://github.com/PHPOffice/PhpSpreadsheet/issues/3065)
+  - Merge methods now allow an additional `$behaviour` argument. Permitted values are:
+    - Worksheet::MERGE_CELL_CONTENT_EMPTY - Empty the content of the hidden cells (the default behaviour)
+    - Worksheet::MERGE_CELL_CONTENT_HIDE - Keep the content of the hidden cells
+    - Worksheet::MERGE_CELL_CONTENT_MERGE - Move the content of the hidden cells into the first cell
+
+### Deprecated
+
+- Axis getLineProperty deprecated in favor of getLineColorProperty.
+- Moved majorGridlines and minorGridlines from Chart to Axis. Setting either in Chart constructor or through Chart methods, or getting either using Chart methods is deprecated.
+- Chart::EXCEL_COLOR_TYPE_* copied from Properties to ChartColor; use in Properties is deprecated.
+- ChartColor::EXCEL_COLOR_TYPE_ARGB deprecated in favor of EXCEL_COLOR_TYPE_RGB ("A" component was never allowed).
+- Misspelled Properties::LINE_STYLE_DASH_SQUERE_DOT deprecated in favor of LINE_STYLE_DASH_SQUARE_DOT.
+- Clone not permitted for Spreadsheet. Spreadsheet->copy() can be used instead.
+
+### Removed
+
+- Nothing
+
+### Fixed
+
+- Fix update to defined names when inserting/deleting rows/columns [Issue #3076](https://github.com/PHPOffice/PhpSpreadsheet/issues/3076) [PR #3077](https://github.com/PHPOffice/PhpSpreadsheet/pull/3077)
+- Fix DataValidation sqRef when inserting/deleting rows/columns [Issue #3056](https://github.com/PHPOffice/PhpSpreadsheet/issues/3056) [PR #3074](https://github.com/PHPOffice/PhpSpreadsheet/pull/3074)
+- Named ranges not usable as anchors in OFFSET function [Issue #3013](https://github.com/PHPOffice/PhpSpreadsheet/issues/3013)
+- Fully flatten an array [Issue #2955](https://github.com/PHPOffice/PhpSpreadsheet/issues/2955) [PR #2956](https://github.com/PHPOffice/PhpSpreadsheet/pull/2956)
+- cellExists() and getCell() methods should support UTF-8 named cells [Issue #2987](https://github.com/PHPOffice/PhpSpreadsheet/issues/2987) [PR #2988](https://github.com/PHPOffice/PhpSpreadsheet/pull/2988)
+- Spreadsheet copy fixed, clone disabled. [PR #2951](https://github.com/PHPOffice/PhpSpreadsheet/pull/2951)
+- Fix PDF problems with text rotation and paper size. [Issue #1747](https://github.com/PHPOffice/PhpSpreadsheet/issues/1747) [Issue #1713](https://github.com/PHPOffice/PhpSpreadsheet/issues/1713) [PR #2960](https://github.com/PHPOffice/PhpSpreadsheet/pull/2960)
+- Limited support for chart titles as formulas [Issue #2965](https://github.com/PHPOffice/PhpSpreadsheet/issues/2965) [Issue #749](https://github.com/PHPOffice/PhpSpreadsheet/issues/749) [PR #2971](https://github.com/PHPOffice/PhpSpreadsheet/pull/2971)
+- Add Gradients, Transparency, and Hidden Axes to Chart [Issue #2257](https://github.com/PHPOffice/PhpSpreadsheet/issues/2257) [Issue #2229](https://github.com/PHPOffice/PhpSpreadsheet/issues/2929) [Issue #2935](https://github.com/PHPOffice/PhpSpreadsheet/issues/2935) [PR #2950](https://github.com/PHPOffice/PhpSpreadsheet/pull/2950)
+- Chart Support for Rounded Corners and Trendlines [Issue #2968](https://github.com/PHPOffice/PhpSpreadsheet/issues/2968) [Issue #2815](https://github.com/PHPOffice/PhpSpreadsheet/issues/2815) [PR #2976](https://github.com/PHPOffice/PhpSpreadsheet/pull/2976)
+- Add setName Method for Chart [Issue #2991](https://github.com/PHPOffice/PhpSpreadsheet/issues/2991) [PR #3001](https://github.com/PHPOffice/PhpSpreadsheet/pull/3001)
+- Eliminate partial dependency on php-intl in StringHelper [Issue #2982](https://github.com/PHPOffice/PhpSpreadsheet/issues/2982) [PR #2994](https://github.com/PHPOffice/PhpSpreadsheet/pull/2994)
+- Minor changes for Pdf [Issue #2999](https://github.com/PHPOffice/PhpSpreadsheet/issues/2999) [PR #3002](https://github.com/PHPOffice/PhpSpreadsheet/pull/3002) [PR #3006](https://github.com/PHPOffice/PhpSpreadsheet/pull/3006)
+- Html/Pdf Do net set background color for cells using (default) nofill [PR #3016](https://github.com/PHPOffice/PhpSpreadsheet/pull/3016)
+- Add support for Date Axis to Chart [Issue #2967](https://github.com/PHPOffice/PhpSpreadsheet/issues/2967) [PR #3018](https://github.com/PHPOffice/PhpSpreadsheet/pull/3018)
+- Reconcile Differences Between Css and Excel for Cell Alignment [PR #3048](https://github.com/PHPOffice/PhpSpreadsheet/pull/3048)
+- R1C1 Format Internationalization and Better Support for Relative Offsets [Issue #1704](https://github.com/PHPOffice/PhpSpreadsheet/issues/1704) [PR #3052](https://github.com/PHPOffice/PhpSpreadsheet/pull/3052)
+- Minor Fix for Percentage Formatting [Issue #1929](https://github.com/PHPOffice/PhpSpreadsheet/issues/1929) [PR #3053](https://github.com/PHPOffice/PhpSpreadsheet/pull/3053)
+
+## 1.24.1 - 2022-07-18
+
+### Added
+
+- Support for SimpleCache Interface versions 1.0, 2.0 and 3.0
+- Add Chart Axis Option textRotation [Issue #2705](https://github.com/PHPOffice/PhpSpreadsheet/issues/2705) [PR #2940](https://github.com/PHPOffice/PhpSpreadsheet/pull/2940)
+
+### Changed
+
+- Nothing
+
+### Deprecated
+
+- Nothing
+
+### Removed
+
+- Nothing
+
+### Fixed
+
+- Fix Encoding issue with Html reader (PHP 8.2 deprecation for mb_convert_encoding) [Issue #2942](https://github.com/PHPOffice/PhpSpreadsheet/issues/2942) [PR #2943](https://github.com/PHPOffice/PhpSpreadsheet/pull/2943)
+- Additional Chart fixes
+  - Pie chart with part separated unwantedly [Issue #2506](https://github.com/PHPOffice/PhpSpreadsheet/issues/2506) [PR #2928](https://github.com/PHPOffice/PhpSpreadsheet/pull/2928)
+  - Chart styling is lost on simple load / save process [Issue #1797](https://github.com/PHPOffice/PhpSpreadsheet/issues/1797) [Issue #2077](https://github.com/PHPOffice/PhpSpreadsheet/issues/2077) [PR #2930](https://github.com/PHPOffice/PhpSpreadsheet/pull/2930)
+  - Can't create contour chart (surface 2d) [Issue #2931](https://github.com/PHPOffice/PhpSpreadsheet/issues/2931) [PR #2933](https://github.com/PHPOffice/PhpSpreadsheet/pull/2933)
+- VLOOKUP Breaks When Array Contains Null Cells [Issue #2934](https://github.com/PHPOffice/PhpSpreadsheet/issues/2934) [PR #2939](https://github.com/PHPOffice/PhpSpreadsheet/pull/2939)
+
+## 1.24.0 - 2022-07-09
+
+Note that this will be the last 1.x branch release before the 2.x release. We will maintain both branches in parallel for a time; but users are requested to update to version 2.0 once that is fully available.
+
+### Added
+
+- Added `removeComment()` method for Worksheet [PR #2875](https://github.com/PHPOffice/PhpSpreadsheet/pull/2875/files)
+- Add point size option for scatter charts [Issue #2298](https://github.com/PHPOffice/PhpSpreadsheet/issues/2298) [PR #2801](https://github.com/PHPOffice/PhpSpreadsheet/pull/2801)
+- Basic support for Xlsx reading/writing Chart Sheets [PR #2830](https://github.com/PHPOffice/PhpSpreadsheet/pull/2830)
+
+  Note that a ChartSheet is still only written as a normal Worksheet containing a single chart, not as an actual ChartSheet.
+
+- Added Worksheet visibility in Ods Reader [PR #2851](https://github.com/PHPOffice/PhpSpreadsheet/pull/2851) and Gnumeric Reader [PR #2853](https://github.com/PHPOffice/PhpSpreadsheet/pull/2853)
+- Added Worksheet visibility in Ods Writer [PR #2850](https://github.com/PHPOffice/PhpSpreadsheet/pull/2850)
+- Allow Csv Reader to treat string as contents of file [Issue #1285](https://github.com/PHPOffice/PhpSpreadsheet/issues/1285) [PR #2792](https://github.com/PHPOffice/PhpSpreadsheet/pull/2792)
+- Allow Csv Reader to store null string rather than leave cell empty [Issue #2840](https://github.com/PHPOffice/PhpSpreadsheet/issues/2840) [PR #2842](https://github.com/PHPOffice/PhpSpreadsheet/pull/2842)
+- Provide new Worksheet methods to identify if a row or column is "empty", making allowance for different definitions of "empty":
+  - Treat rows/columns containing no cell records as empty (default)
+  - Treat cells containing a null value as empty
+  - Treat cells containing an empty string as empty
+
+### Changed
+
+- Modify `rangeBoundaries()`, `rangeDimension()` and `getRangeBoundaries()` Coordinate methods to work with row/column ranges as well as with cell ranges and cells [PR #2926](https://github.com/PHPOffice/PhpSpreadsheet/pull/2926)
+- Better enforcement of value modification to match specified datatype when using `setValueExplicit()`
+- Relax validation of merge cells to allow merge for a single cell reference [Issue #2776](https://github.com/PHPOffice/PhpSpreadsheet/issues/2776)
+- Memory and speed improvements, particularly for the Cell Collection, and the Writers.
+
+  See [the Discussion section on github](https://github.com/PHPOffice/PhpSpreadsheet/discussions/2821) for details of performance across versions
+- Improved performance for removing rows/columns from a worksheet
+
+### Deprecated
+
+- Nothing
+
+### Removed
+
+- Nothing
+
+### Fixed
+
+- Xls Reader resolving absolute named ranges to relative ranges [Issue #2826](https://github.com/PHPOffice/PhpSpreadsheet/issues/2826) [PR #2827](https://github.com/PHPOffice/PhpSpreadsheet/pull/2827)
+- Null value handling in the Excel Math/Trig PRODUCT() function [Issue #2833](https://github.com/PHPOffice/PhpSpreadsheet/issues/2833) [PR #2834](https://github.com/PHPOffice/PhpSpreadsheet/pull/2834)
+- Invalid Print Area defined in Xlsx corrupts internal storage of print area [Issue #2848](https://github.com/PHPOffice/PhpSpreadsheet/issues/2848) [PR #2849](https://github.com/PHPOffice/PhpSpreadsheet/pull/2849)
+- Time interval formatting [Issue #2768](https://github.com/PHPOffice/PhpSpreadsheet/issues/2768) [PR #2772](https://github.com/PHPOffice/PhpSpreadsheet/pull/2772)
+- Copy from Xls(x) to Html/Pdf loses drawings [PR #2788](https://github.com/PHPOffice/PhpSpreadsheet/pull/2788)
+- Html Reader converting cell containing 0 to null string [Issue #2810](https://github.com/PHPOffice/PhpSpreadsheet/issues/2810) [PR #2813](https://github.com/PHPOffice/PhpSpreadsheet/pull/2813)
+- Many fixes for Charts, especially, but not limited to, Scatter, Bubble, and Surface charts. [Issue #2762](https://github.com/PHPOffice/PhpSpreadsheet/issues/2762) [Issue #2299](https://github.com/PHPOffice/PhpSpreadsheet/issues/2299) [Issue #2700](https://github.com/PHPOffice/PhpSpreadsheet/issues/2700) [Issue #2817](https://github.com/PHPOffice/PhpSpreadsheet/issues/2817) [Issue #2763](https://github.com/PHPOffice/PhpSpreadsheet/issues/2763) [Issue #2219](https://github.com/PHPOffice/PhpSpreadsheet/issues/2219) [Issue #2863](https://github.com/PHPOffice/PhpSpreadsheet/issues/2863) [PR #2828](https://github.com/PHPOffice/PhpSpreadsheet/pull/2828) [PR #2841](https://github.com/PHPOffice/PhpSpreadsheet/pull/2841) [PR #2846](https://github.com/PHPOffice/PhpSpreadsheet/pull/2846) [PR #2852](https://github.com/PHPOffice/PhpSpreadsheet/pull/2852) [PR #2856](https://github.com/PHPOffice/PhpSpreadsheet/pull/2856) [PR #2865](https://github.com/PHPOffice/PhpSpreadsheet/pull/2865) [PR #2872](https://github.com/PHPOffice/PhpSpreadsheet/pull/2872) [PR #2879](https://github.com/PHPOffice/PhpSpreadsheet/pull/2879) [PR #2898](https://github.com/PHPOffice/PhpSpreadsheet/pull/2898) [PR #2906](https://github.com/PHPOffice/PhpSpreadsheet/pull/2906) [PR #2922](https://github.com/PHPOffice/PhpSpreadsheet/pull/2922) [PR #2923](https://github.com/PHPOffice/PhpSpreadsheet/pull/2923)
+- Adjust both coordinates for two-cell anchors when rows/columns are added/deleted. [Issue #2908](https://github.com/PHPOffice/PhpSpreadsheet/issues/2908) [PR #2909](https://github.com/PHPOffice/PhpSpreadsheet/pull/2909)
+- Keep calculated string results below 32K. [PR #2921](https://github.com/PHPOffice/PhpSpreadsheet/pull/2921)
+- Filter out illegal Unicode char values FFFE/FFFF. [Issue #2897](https://github.com/PHPOffice/PhpSpreadsheet/issues/2897) [PR #2910](https://github.com/PHPOffice/PhpSpreadsheet/pull/2910)
+- Better handling of REF errors and propagation of all errors in Calculation engine. [PR #2902](https://github.com/PHPOffice/PhpSpreadsheet/pull/2902)
+- Calculating Engine regexp for Column/Row references when there are multiple quoted worksheet references in the formula [Issue #2874](https://github.com/PHPOffice/PhpSpreadsheet/issues/2874) [PR #2899](https://github.com/PHPOffice/PhpSpreadsheet/pull/2899)
+
+## 1.23.0 - 2022-04-24
+
+### Added
+
+- Ods Writer support for Freeze Pane [Issue #2013](https://github.com/PHPOffice/PhpSpreadsheet/issues/2013) [PR #2755](https://github.com/PHPOffice/PhpSpreadsheet/pull/2755)
+- Ods Writer support for setting column width/row height (including the use of AutoSize) [Issue #2346](https://github.com/PHPOffice/PhpSpreadsheet/issues/2346) [PR #2753](https://github.com/PHPOffice/PhpSpreadsheet/pull/2753)
+- Introduced CellAddress, CellRange, RowRange and ColumnRange value objects that can be used as an alternative to a string value (e.g. `'C5'`, `'B2:D4'`, `'2:2'` or `'B:C'`) in appropriate contexts.
+- Implementation of the FILTER(), SORT(), SORTBY() and UNIQUE() Lookup/Reference (array) functions.
+- Implementation of the ISREF() Information function.
+- Added support for reading "formatted" numeric values from Csv files; although default behaviour of reading these values as strings is preserved.
+
+  (i.e a value of "12,345.67" can be read as numeric `12345.67`, not simply as a string `"12,345.67"`, if the `castFormattedNumberToNumeric()` setting is enabled.
+
+  This functionality is locale-aware, using the server's locale settings to identify the thousands and decimal separators.
+
+- Support for two cell anchor drawing of images. [#2532](https://github.com/PHPOffice/PhpSpreadsheet/pull/2532) [#2674](https://github.com/PHPOffice/PhpSpreadsheet/pull/2674)
+- Limited support for Xls Reader to handle Conditional Formatting:
+
+  Ranges and Rules are read, but style is currently limited to font size, weight and color; and to fill style and color.
+
+- Add ability to suppress Mac line ending check for CSV [#2623](https://github.com/PHPOffice/PhpSpreadsheet/pull/2623)
+- Initial support for creating and writing Tables (Xlsx Writer only) [PR #2671](https://github.com/PHPOffice/PhpSpreadsheet/pull/2671)
+
+  See `/samples/Table` for examples of use.
+
+  Note that PreCalculateFormulas needs to be disabled when saving spreadsheets containing tables with formulae (totals or column formulae).
+
+### Changed
+
+- Gnumeric Reader now loads number formatting for cells.
+- Gnumeric Reader now correctly identifies selected worksheet and selected cells in a worksheet.
+- Some Refactoring of the Ods Reader, moving all formula and address translation from Ods to Excel into a separate class to eliminate code duplication and ensure consistency.
+- Make Boolean Conversion in Csv Reader locale-aware when using the String Value Binder.
+
+  This is determined by the Calculation Engine locale setting.
+
+  (i.e. `"Vrai"` wil be converted to a boolean `true` if the Locale is set to `fr`.)
+- Allow `psr/simple-cache` 2.x
+
+### Deprecated
+
+- All Excel Function implementations in `Calculation\Functions` (including the Error functions) have been moved to dedicated classes for groups of related functions. See the docblocks against all the deprecated methods for details of the new methods to call instead. At some point, these old classes will be deleted.
+- Worksheet methods that reference cells "byColumnandRow". All such methods have an equivalent that references the cell by its address (e.g. '`E3'` rather than `5, 3`).
+
+  These functions now accept either a cell address string (`'E3')` or an array with columnId and rowId (`[5, 3]`) or a new `CellAddress` object as their `cellAddress`/`coordinate` argument.
+  This includes the methods:
+  - `setCellValueByColumnAndRow()` use the equivalent `setCellValue()`
+  - `setCellValueExplicitByColumnAndRow()` use the equivalent `setCellValueExplicit()`
+  - `getCellByColumnAndRow()` use the equivalent `getCell()`
+  - `cellExistsByColumnAndRow()` use the equivalent `cellExists()`
+  - `getStyleByColumnAndRow()` use the equivalent `getStyle()`
+  - `setBreakByColumnAndRow()` use the equivalent `setBreak()`
+  - `mergeCellsByColumnAndRow()` use the equivalent `mergeCells()`
+  - `unmergeCellsByColumnAndRow()` use the equivalent `unmergeCells()`
+  - `protectCellsByColumnAndRow()` use the equivalent `protectCells()`
+  - `unprotectCellsByColumnAndRow()` use the equivalent `unprotectCells()`
+  - `setAutoFilterByColumnAndRow()` use the equivalent `setAutoFilter()`
+  - `freezePaneByColumnAndRow()` use the equivalent `freezePane()`
+  - `getCommentByColumnAndRow()` use the equivalent `getComment()`
+  - `setSelectedCellByColumnAndRow()` use the equivalent `setSelectedCells()`
+
+  This change provides more consistency in the methods (not every "by cell address" method has an equivalent "byColumnAndRow" method);
+  and the "by cell address" methods often provide more flexibility, such as allowing a range of cells, or referencing them by passing the defined name of a named range as the argument.
+
+### Removed
+
+- Nothing
+
+### Fixed
+
+- Make allowance for the AutoFilter dropdown icon in the first row of an Autofilter range when using Autosize columns. [Issue #2413](https://github.com/PHPOffice/PhpSpreadsheet/issues/2413) [PR #2754](https://github.com/PHPOffice/PhpSpreadsheet/pull/2754)
+- Support for "chained" ranges (e.g. `A5:C10:C20:F1`) in the Calculation Engine; and also support for using named ranges with the Range operator (e.g. `NamedRange1:NamedRange2`) [Issue #2730](https://github.com/PHPOffice/PhpSpreadsheet/issues/2730) [PR #2746](https://github.com/PHPOffice/PhpSpreadsheet/pull/2746)
+- Update Conditional Formatting ranges and rule conditions when inserting/deleting rows/columns [Issue #2678](https://github.com/PHPOffice/PhpSpreadsheet/issues/2678) [PR #2689](https://github.com/PHPOffice/PhpSpreadsheet/pull/2689)
+- Allow `INDIRECT()` to accept row/column ranges as well as cell ranges [PR #2687](https://github.com/PHPOffice/PhpSpreadsheet/pull/2687)
+- Fix bug when deleting cells with hyperlinks, where the hyperlink was then being "inherited" by whatever cell moved to that cell address.
+- Fix bug in Conditional Formatting in the Xls Writer that resulted in a broken file when there were multiple conditional ranges in a worksheet.
+- Fix Conditional Formatting in the Xls Writer to work with rules that contain string literals, cell references and formulae.
+- Fix for setting Active Sheet to the first loaded worksheet when bookViews element isn't defined [Issue #2666](https://github.com/PHPOffice/PhpSpreadsheet/issues/2666) [PR #2669](https://github.com/PHPOffice/PhpSpreadsheet/pull/2669)
+- Fixed behaviour of XLSX font style vertical align settings [PR #2619](https://github.com/PHPOffice/PhpSpreadsheet/pull/2619)
+- Resolved formula translations to handle separators (row and column) for array functions as well as for function argument separators; and cleanly handle nesting levels.
+
+  Note that this method is used when translating Excel functions between `en_us` and other locale languages, as well as when converting formulae between different spreadsheet formats (e.g. Ods to Excel).
+
+  Nor is this a perfect solution, as there may still be issues when function calls have array arguments that themselves contain function calls; but it's still better than the current logic.
+- Fix for escaping double quotes within a formula [Issue #1971](https://github.com/PHPOffice/PhpSpreadsheet/issues/1971) [PR #2651](https://github.com/PHPOffice/PhpSpreadsheet/pull/2651)
+- Change open mode for output from `wb+` to `wb` [Issue #2372](https://github.com/PHPOffice/PhpSpreadsheet/issues/2372) [PR #2657](https://github.com/PHPOffice/PhpSpreadsheet/pull/2657)
+- Use color palette if supplied [Issue #2499](https://github.com/PHPOffice/PhpSpreadsheet/issues/2499) [PR #2595](https://github.com/PHPOffice/PhpSpreadsheet/pull/2595)
+- Xls reader treat drawing offsets as int rather than float [PR #2648](https://github.com/PHPOffice/PhpSpreadsheet/pull/2648)
+- Handle booleans in conditional styles properly [PR #2654](https://github.com/PHPOffice/PhpSpreadsheet/pull/2654)
+- Fix for reading files in the root directory of a ZipFile, which should not be prefixed by relative paths ("./") as dirname($filename) does by default.
+- Fix invalid style of cells in empty columns with columnDimensions and rows with rowDimensions in added external sheet. [PR #2739](https://github.com/PHPOffice/PhpSpreadsheet/pull/2739)
+- Time Interval Formatting [Issue #2768](https://github.com/PHPOffice/PhpSpreadsheet/issues/2768) [PR #2772](https://github.com/PHPOffice/PhpSpreadsheet/pull/2772)
+
+## 1.22.0 - 2022-02-18
+
+### Added
+
+- Namespacing phase 2 - styles.
+[PR #2471](https://github.com/PHPOffice/PhpSpreadsheet/pull/2471)
+
+- Improved support for passing of array arguments to Excel function implementations to return array results (where appropriate). [Issue #2551](https://github.com/PHPOffice/PhpSpreadsheet/issues/2551)
+
+  This is the first stage in an ongoing process of adding array support to all appropriate function implementations,
+- Support for the Excel365 Math/Trig SEQUENCE() function [PR #2536](https://github.com/PHPOffice/PhpSpreadsheet/pull/2536)
+- Support for the Excel365 Math/Trig RANDARRAY() function [PR #2540](https://github.com/PHPOffice/PhpSpreadsheet/pull/2540)
+
+  Note that the Spill Operator is not yet supported in the Calculation Engine; but this can still be useful for defining array constants.
+- Improved support for Conditional Formatting Rules [PR #2491](https://github.com/PHPOffice/PhpSpreadsheet/pull/2491)
+  - Provide support for a wider range of Conditional Formatting Rules for Xlsx Reader/Writer:
+    - Cells Containing (cellIs)
+    - Specific Text (containing, notContaining, beginsWith, endsWith)
+    - Dates Occurring (all supported timePeriods)
+    - Blanks/NoBlanks
+    - Errors/NoErrors
+    - Duplicates/Unique
+    - Expression
+  - Provision of CF Wizards (for all the above listed rule types) to help create/modify CF Rules without having to manage all the combinations of types/operators, and the complexities of formula expressions, or the text/timePeriod attributes.
+
+    See [documentation](https://phpspreadsheet.readthedocs.io/en/latest/topics/conditional-formatting/) for details
+
+  - Full support of the above CF Rules for the Xlsx Reader and Writer; even when the file being loaded has CF rules listed in the `<extLst><ext><ConditionalFormattings>` element for the worksheet rather than the `<ConditionalFormatting>` element.
+  - Provision of a CellMatcher to identify if rules are matched for a cell, and which matching style will be applied.
+  - Improved documentation and examples, covering all supported CF rule types.
+  - Add support for one digit decimals (FORMAT_NUMBER_0, FORMAT_PERCENTAGE_0). [PR #2525](https://github.com/PHPOffice/PhpSpreadsheet/pull/2525)
+  - Initial work enabling Excel function implementations for handling arrays as arguments when used in "array formulae" [#2562](https://github.com/PHPOffice/PhpSpreadsheet/issues/2562)
+  - Enable most of the Date/Time functions to accept array arguments [#2573](https://github.com/PHPOffice/PhpSpreadsheet/issues/2573)
+  - Array ready functions - Text, Math/Trig, Statistical, Engineering and Logical [#2580](https://github.com/PHPOffice/PhpSpreadsheet/issues/2580)
+
+### Changed
+
+- Additional Russian translations for Excel Functions (courtesy of aleks-samurai).
+- Improved code coverage for NumberFormat. [PR #2556](https://github.com/PHPOffice/PhpSpreadsheet/pull/2556)
+- Extract some methods from the Calculation Engine into dedicated classes [#2537](https://github.com/PHPOffice/PhpSpreadsheet/issues/2537)
+- Eliminate calls to `flattenSingleValue()` that are no longer required when we're checking for array values as arguments [#2590](https://github.com/PHPOffice/PhpSpreadsheet/issues/2590)
+
+### Deprecated
+
+- Nothing
+
+### Removed
+
+- Nothing
+
+### Fixed
+
+- Fixed `ReferenceHelper@insertNewBefore` behavior when removing column before last column with null value [PR #2541](https://github.com/PHPOffice/PhpSpreadsheet/pull/2541)
+- Fix bug with `DOLLARDE()` and `DOLLARFR()` functions when the dollar value is negative [Issue #2578](https://github.com/PHPOffice/PhpSpreadsheet/issues/2578) [PR #2579](https://github.com/PHPOffice/PhpSpreadsheet/pull/2579)
+- Fix partial function name matching when translating formulae from Russian to English [Issue #2533](https://github.com/PHPOffice/PhpSpreadsheet/issues/2533) [PR #2534](https://github.com/PHPOffice/PhpSpreadsheet/pull/2534)
+- Various bugs related to Conditional Formatting Rules, and errors in the Xlsx Writer for Conditional Formatting [PR #2491](https://github.com/PHPOffice/PhpSpreadsheet/pull/2491)
+- Xlsx Reader merge range fixes. [Issue #2501](https://github.com/PHPOffice/PhpSpreadsheet/issues/2501) [PR #2504](https://github.com/PHPOffice/PhpSpreadsheet/pull/2504)
+- Handle explicit "date" type for Cell in Xlsx Reader. [Issue #2373](https://github.com/PHPOffice/PhpSpreadsheet/issues/2373) [PR #2485](https://github.com/PHPOffice/PhpSpreadsheet/pull/2485)
+- Recalibrate Row/Column Dimensions after removeRow/Column. [Issue #2442](https://github.com/PHPOffice/PhpSpreadsheet/issues/2442) [PR #2486](https://github.com/PHPOffice/PhpSpreadsheet/pull/2486)
+- Refinement for XIRR. [Issue #2469](https://github.com/PHPOffice/PhpSpreadsheet/issues/2469) [PR #2487](https://github.com/PHPOffice/PhpSpreadsheet/pull/2487)
+- Xlsx Reader handle cell with non-null explicit type but null value. [Issue #2488](https://github.com/PHPOffice/PhpSpreadsheet/issues/2488) [PR #2489](https://github.com/PHPOffice/PhpSpreadsheet/pull/2489)
+- Xlsx Reader fix height and width for oneCellAnchorDrawings. [PR #2492](https://github.com/PHPOffice/PhpSpreadsheet/pull/2492)
+- Fix rounding error in NumberFormat::NUMBER_PERCENTAGE, NumberFormat::NUMBER_PERCENTAGE_00. [PR #2555](https://github.com/PHPOffice/PhpSpreadsheet/pull/2555)
+- Don't treat thumbnail file as xml. [Issue #2516](https://github.com/PHPOffice/PhpSpreadsheet/issues/2516) [PR #2517](https://github.com/PHPOffice/PhpSpreadsheet/pull/2517)
+- Eliminating Xlsx Reader warning when no sz tag for RichText. [Issue #2542](https://github.com/PHPOffice/PhpSpreadsheet/issues/2542) [PR #2550](https://github.com/PHPOffice/PhpSpreadsheet/pull/2550)
+- Fix Xlsx/Xls Writer handling of inline strings. [Issue #353](https://github.com/PHPOffice/PhpSpreadsheet/issues/353) [PR #2569](https://github.com/PHPOffice/PhpSpreadsheet/pull/2569)
+- Richtext colors were not being read correctly after namespace change [#2458](https://github.com/PHPOffice/PhpSpreadsheet/issues/2458)
+- Fix discrepancy between the way markdown tables are rendered in ReadTheDocs and in PHPStorm [#2520](https://github.com/PHPOffice/PhpSpreadsheet/issues/2520)
+- Update Russian Functions Text File [#2557](https://github.com/PHPOffice/PhpSpreadsheet/issues/2557)
+- Fix documentation, instantiation example [#2564](https://github.com/PHPOffice/PhpSpreadsheet/issues/2564)
+
+
+## 1.21.0 - 2022-01-06
+
+### Added
+
+- Ability to add a picture to the background of the comment. Supports four image formats: png, jpeg, gif, bmp. New `Comment::setSizeAsBackgroundImage()` to change the size of a comment to the size of a background image. [Issue #1547](https://github.com/PHPOffice/PhpSpreadsheet/issues/1547) [PR #2422](https://github.com/PHPOffice/PhpSpreadsheet/pull/2422)
+- Ability to set default paper size and orientation [PR #2410](https://github.com/PHPOffice/PhpSpreadsheet/pull/2410)
+- Ability to extend AutoFilter to Maximum Row [PR #2414](https://github.com/PHPOffice/PhpSpreadsheet/pull/2414)
+
+### Changed
+
+- Xlsx Writer will evaluate AutoFilter only if it is as yet unevaluated, or has changed since it was last evaluated [PR #2414](https://github.com/PHPOffice/PhpSpreadsheet/pull/2414)
+
+### Deprecated
+
+- Nothing
+
+### Removed
+
+- Nothing
+
+### Fixed
+
+- Rounding in `NumberFormatter` [Issue #2385](https://github.com/PHPOffice/PhpSpreadsheet/issues/2385) [PR #2399](https://github.com/PHPOffice/PhpSpreadsheet/pull/2399)
+- Support for themes [Issue #2075](https://github.com/PHPOffice/PhpSpreadsheet/issues/2075) [Issue #2387](https://github.com/PHPOffice/PhpSpreadsheet/issues/2387) [PR #2403](https://github.com/PHPOffice/PhpSpreadsheet/pull/2403)
+- Read spreadsheet with `#` in name [Issue #2405](https://github.com/PHPOffice/PhpSpreadsheet/issues/2405) [PR #2409](https://github.com/PHPOffice/PhpSpreadsheet/pull/2409)
+- Improve PDF support for page size and orientation [Issue #1691](https://github.com/PHPOffice/PhpSpreadsheet/issues/1691) [PR #2410](https://github.com/PHPOffice/PhpSpreadsheet/pull/2410)
+- Wildcard handling issues in text match [Issue #2430](https://github.com/PHPOffice/PhpSpreadsheet/issues/2430) [PR #2431](https://github.com/PHPOffice/PhpSpreadsheet/pull/2431)
+- Respect DataType in `insertNewBefore` [PR #2433](https://github.com/PHPOffice/PhpSpreadsheet/pull/2433)
+- Handle rows explicitly hidden after AutoFilter [Issue #1641](https://github.com/PHPOffice/PhpSpreadsheet/issues/1641) [PR #2414](https://github.com/PHPOffice/PhpSpreadsheet/pull/2414)
+- Special characters in image file name [Issue #1470](https://github.com/PHPOffice/PhpSpreadsheet/issues/1470) [Issue #2415](https://github.com/PHPOffice/PhpSpreadsheet/issues/2415) [PR #2416](https://github.com/PHPOffice/PhpSpreadsheet/pull/2416)
+- Mpdf with very many styles [Issue #2432](https://github.com/PHPOffice/PhpSpreadsheet/issues/2432) [PR #2434](https://github.com/PHPOffice/PhpSpreadsheet/pull/2434)
+- Name clashes between parsed and unparsed drawings [Issue #1767](https://github.com/PHPOffice/PhpSpreadsheet/issues/1767) [Issue #2396](https://github.com/PHPOffice/PhpSpreadsheet/issues/2396) [PR #2423](https://github.com/PHPOffice/PhpSpreadsheet/pull/2423)
+- Fill pattern start and end colors [Issue #2441](https://github.com/PHPOffice/PhpSpreadsheet/issues/2441) [PR #2444](https://github.com/PHPOffice/PhpSpreadsheet/pull/2444)
+- General style specified in wrong case [Issue #2450](https://github.com/PHPOffice/PhpSpreadsheet/issues/2450) [PR #2451](https://github.com/PHPOffice/PhpSpreadsheet/pull/2451)
+- Null passed to `AutoFilter::setRange()` [Issue #2281](https://github.com/PHPOffice/PhpSpreadsheet/issues/2281) [PR #2454](https://github.com/PHPOffice/PhpSpreadsheet/pull/2454)
+- Another undefined index in Xls reader (#2470) [Issue #2463](https://github.com/PHPOffice/PhpSpreadsheet/issues/2463) [PR #2470](https://github.com/PHPOffice/PhpSpreadsheet/pull/2470)
+- Allow single-cell checks on conditional styles, even when the style is configured for a range of cells (#) [PR #2483](https://github.com/PHPOffice/PhpSpreadsheet/pull/2483)
+
+## 1.20.0 - 2021-11-23
+
+### Added
+
+- Xlsx Writer Support for WMF Files [#2339](https://github.com/PHPOffice/PhpSpreadsheet/issues/2339)
+- Use standard temporary file for internal use of HTMLPurifier [#2383](https://github.com/PHPOffice/PhpSpreadsheet/issues/2383)
+
+### Changed
+
+- Drop support for PHP 7.2, according to https://phpspreadsheet.readthedocs.io/en/latest/#php-version-support
+- Use native typing for objects that were already documented as such
+
+### Deprecated
+
+- Nothing
+
+### Removed
+
+- Nothing
+
+### Fixed
+
+- Fixed null conversation for strToUpper [#2292](https://github.com/PHPOffice/PhpSpreadsheet/issues/2292)
+- Fixed Trying to access array offset on value of type null (Xls Reader) [#2315](https://github.com/PHPOffice/PhpSpreadsheet/issues/2315)
+- Don't corrupt XLSX files containing data validation [#2377](https://github.com/PHPOffice/PhpSpreadsheet/issues/2377)
+- Non-fixed cells were not updated if shared formula has a fixed cell [#2354](https://github.com/PHPOffice/PhpSpreadsheet/issues/2354)
+- Declare key of generic ArrayObject
+- CSV reader better support for boolean values [#2374](https://github.com/PHPOffice/PhpSpreadsheet/pull/2374)
+- Some ZIP file could not be read [#2376](https://github.com/PHPOffice/PhpSpreadsheet/pull/2376)
+- Fix regression were hyperlinks could not be read [#2391](https://github.com/PHPOffice/PhpSpreadsheet/pull/2391)
+- AutoFilter Improvements [#2393](https://github.com/PHPOffice/PhpSpreadsheet/pull/2393)
+- Don't corrupt file when using chart with fill color [#589](https://github.com/PHPOffice/PhpSpreadsheet/pull/589)
+- Restore imperfect array formula values in xlsx writer [#2343](https://github.com/PHPOffice/PhpSpreadsheet/pull/2343)
+- Restore explicit list of changes to PHPExcel migration document [#1546](https://github.com/PHPOffice/PhpSpreadsheet/issues/1546)
+
+## 1.19.0 - 2021-10-31
+
+### Added
+
+- Ability to set style on named range, and validate input to setSelectedCells [Issue #2279](https://github.com/PHPOffice/PhpSpreadsheet/issues/2279) [PR #2280](https://github.com/PHPOffice/PhpSpreadsheet/pull/2280)
+- Process comments in Sylk file [Issue #2276](https://github.com/PHPOffice/PhpSpreadsheet/issues/2276) [PR #2277](https://github.com/PHPOffice/PhpSpreadsheet/pull/2277)
+- Addition of Custom Properties to Ods Writer, and 32-bit-safe timestamps for Document Properties [PR #2113](https://github.com/PHPOffice/PhpSpreadsheet/pull/2113)
+- Added callback to CSV reader to set user-specified defaults for various properties (especially for escape which has a poor PHP-inherited default of backslash which does not correspond with Excel) [PR #2103](https://github.com/PHPOffice/PhpSpreadsheet/pull/2103)
+- Phase 1 of better namespace handling for Xlsx, resolving many open issues [PR #2173](https://github.com/PHPOffice/PhpSpreadsheet/pull/2173) [PR #2204](https://github.com/PHPOffice/PhpSpreadsheet/pull/2204) [PR #2303](https://github.com/PHPOffice/PhpSpreadsheet/pull/2303)
+- Add ability to extract images if source is a URL [Issue #1997](https://github.com/PHPOffice/PhpSpreadsheet/issues/1997) [PR #2072](https://github.com/PHPOffice/PhpSpreadsheet/pull/2072)
+- Support for passing flags in the Reader `load()` and Writer `save()`methods, and through the IOFactory, to set behaviours [PR #2136](https://github.com/PHPOffice/PhpSpreadsheet/pull/2136)
+    - See [documentation](https://phpspreadsheet.readthedocs.io/en/latest/topics/reading-and-writing-to-file/#readerwriter-flags) for details
+- More flexibility in the StringValueBinder to determine what datatypes should be treated as strings [PR #2138](https://github.com/PHPOffice/PhpSpreadsheet/pull/2138)
+- Helper class for conversion between css size Units of measure (`px`, `pt`, `pc`, `in`, `cm`, `mm`) [PR #2152](https://github.com/PHPOffice/PhpSpreadsheet/issues/2145)
+- Allow Row height and Column Width to be set using different units of measure (`px`, `pt`, `pc`, `in`, `cm`, `mm`), rather than only in points or MS Excel column width units [PR #2152](https://github.com/PHPOffice/PhpSpreadsheet/issues/2145)
+- Ability to stream to an Amazon S3 bucket [Issue #2249](https://github.com/PHPOffice/PhpSpreadsheet/issues/2249)
+- Provided a Size Helper class to validate size values (pt, px, em) [PR #1694](https://github.com/PHPOffice/PhpSpreadsheet/pull/1694)
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- PHP 8.1 will deprecate auto_detect_line_endings. As a result of this change, Csv Reader using some release after PHP8.1 will no longer be able to handle a Csv with Mac line endings.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Unexpected format in Xlsx Timestamp [Issue #2331](https://github.com/PHPOffice/PhpSpreadsheet/issues/2331) [PR #2332](https://github.com/PHPOffice/PhpSpreadsheet/pull/2332)
+- Corrections for HLOOKUP [Issue #2123](https://github.com/PHPOffice/PhpSpreadsheet/issues/2123) [PR #2330](https://github.com/PHPOffice/PhpSpreadsheet/pull/2330)
+- Corrections for Xlsx Read Comments [Issue #2316](https://github.com/PHPOffice/PhpSpreadsheet/issues/2316) [PR #2329](https://github.com/PHPOffice/PhpSpreadsheet/pull/2329)
+- Lowercase Calibri font names [Issue #2273](https://github.com/PHPOffice/PhpSpreadsheet/issues/2273) [PR #2325](https://github.com/PHPOffice/PhpSpreadsheet/pull/2325)
+- isFormula Referencing Sheet with Space in Title [Issue #2304](https://github.com/PHPOffice/PhpSpreadsheet/issues/2304) [PR #2306](https://github.com/PHPOffice/PhpSpreadsheet/pull/2306)
+- Xls Reader Fatal Error due to Undefined Offset [Issue #1114](https://github.com/PHPOffice/PhpSpreadsheet/issues/1114) [PR #2308](https://github.com/PHPOffice/PhpSpreadsheet/pull/2308)
+- Permit Csv Reader delimiter to be set to null [Issue #2287](https://github.com/PHPOffice/PhpSpreadsheet/issues/2287) [PR #2288](https://github.com/PHPOffice/PhpSpreadsheet/pull/2288)
+- Csv Reader did not handle booleans correctly [PR #2232](https://github.com/PHPOffice/PhpSpreadsheet/pull/2232)
+- Problems when deleting sheet with local defined name [Issue #2266](https://github.com/PHPOffice/PhpSpreadsheet/issues/2266) [PR #2284](https://github.com/PHPOffice/PhpSpreadsheet/pull/2284)
+- Worksheet passwords were not always handled correctly [Issue #1897](https://github.com/PHPOffice/PhpSpreadsheet/issues/1897) [PR #2197](https://github.com/PHPOffice/PhpSpreadsheet/pull/2197)
+- Gnumeric Reader will now distinguish between Created and Modified timestamp [PR #2133](https://github.com/PHPOffice/PhpSpreadsheet/pull/2133)
+- Xls Reader will now handle MACCENTRALEUROPE with or without hyphen [Issue #549](https://github.com/PHPOffice/PhpSpreadsheet/issues/549) [PR #2213](https://github.com/PHPOffice/PhpSpreadsheet/pull/2213)
+- Tweaks to input file validation [Issue #1718](https://github.com/PHPOffice/PhpSpreadsheet/issues/1718) [PR #2217](https://github.com/PHPOffice/PhpSpreadsheet/pull/2217)
+- Html Reader did not handle comments correctly [Issue #2234](https://github.com/PHPOffice/PhpSpreadsheet/issues/2234) [PR #2235](https://github.com/PHPOffice/PhpSpreadsheet/pull/2235)
+- Apache OpenOffice Uses Unexpected Case for General format [Issue #2239](https://github.com/PHPOffice/PhpSpreadsheet/issues/2239) [PR #2242](https://github.com/PHPOffice/PhpSpreadsheet/pull/2242)
+- Problems with fraction formatting [Issue #2253](https://github.com/PHPOffice/PhpSpreadsheet/issues/2253) [PR #2254](https://github.com/PHPOffice/PhpSpreadsheet/pull/2254)
+- Xlsx Reader had problems reading file with no styles.xml or empty styles.xml [Issue #2246](https://github.com/PHPOffice/PhpSpreadsheet/issues/2246) [PR #2247](https://github.com/PHPOffice/PhpSpreadsheet/pull/2247)
+- Xlsx Reader did not read Data Validation flags correctly [Issue #2224](https://github.com/PHPOffice/PhpSpreadsheet/issues/2224) [PR #2225](https://github.com/PHPOffice/PhpSpreadsheet/pull/2225)
+- Better handling of empty arguments in Calculation engine [PR #2143](https://github.com/PHPOffice/PhpSpreadsheet/pull/2143)
+- Many fixes for Autofilter [Issue #2216](https://github.com/PHPOffice/PhpSpreadsheet/issues/2216) [PR #2141](https://github.com/PHPOffice/PhpSpreadsheet/pull/2141) [PR #2162](https://github.com/PHPOffice/PhpSpreadsheet/pull/2162) [PR #2218](https://github.com/PHPOffice/PhpSpreadsheet/pull/2218)
+- Locale generator will now use Unix line endings even on Windows [Issue #2172](https://github.com/PHPOffice/PhpSpreadsheet/issues/2172) [PR #2174](https://github.com/PHPOffice/PhpSpreadsheet/pull/2174)
+- Support differences in implementation of Text functions between Excel/Ods/Gnumeric [PR #2151](https://github.com/PHPOffice/PhpSpreadsheet/pull/2151)
+- Fixes to places where PHP8.1 enforces new or previously unenforced restrictions [PR #2137](https://github.com/PHPOffice/PhpSpreadsheet/pull/2137) [PR #2191](https://github.com/PHPOffice/PhpSpreadsheet/pull/2191) [PR #2231](https://github.com/PHPOffice/PhpSpreadsheet/pull/2231)
+- Clone for HashTable was incorrect [PR #2130](https://github.com/PHPOffice/PhpSpreadsheet/pull/2130)
+- Xlsx Reader was not evaluating Document Security Lock correctly [PR #2128](https://github.com/PHPOffice/PhpSpreadsheet/pull/2128)
+- Error in COUPNCD handling end of month [Issue #2116](https://github.com/PHPOffice/PhpSpreadsheet/issues/2116) [PR #2119](https://github.com/PHPOffice/PhpSpreadsheet/pull/2119)
+- Xls Writer Parser did not handle concatenation operator correctly [PR #2080](https://github.com/PHPOffice/PhpSpreadsheet/pull/2080)
+- Xlsx Writer did not handle boolean false correctly [Issue #2082](https://github.com/PHPOffice/PhpSpreadsheet/issues/2082) [PR #2087](https://github.com/PHPOffice/PhpSpreadsheet/pull/2087)
+- SUM needs to treat invalid strings differently depending on whether they come from a cell or are used as literals [Issue #2042](https://github.com/PHPOffice/PhpSpreadsheet/issues/2042) [PR #2045](https://github.com/PHPOffice/PhpSpreadsheet/pull/2045)
+- Html reader could have set illegal coordinates when dealing with embedded tables [Issue #2029](https://github.com/PHPOffice/PhpSpreadsheet/issues/2029) [PR #2032](https://github.com/PHPOffice/PhpSpreadsheet/pull/2032)
+- Documentation for printing gridlines was wrong [PR #2188](https://github.com/PHPOffice/PhpSpreadsheet/pull/2188)
+- Return Value Error - DatabaseAbstruct::buildQuery() return null but must be string [Issue #2158](https://github.com/PHPOffice/PhpSpreadsheet/issues/2158) [PR #2160](https://github.com/PHPOffice/PhpSpreadsheet/pull/2160)
+- Xlsx reader not recognize data validations that references another sheet [Issue #1432](https://github.com/PHPOffice/PhpSpreadsheet/issues/1432) [Issue #2149](https://github.com/PHPOffice/PhpSpreadsheet/issues/2149) [PR #2150](https://github.com/PHPOffice/PhpSpreadsheet/pull/2150) [PR #2265](https://github.com/PHPOffice/PhpSpreadsheet/pull/2265)
+- Don't calculate cell width for autosize columns if a cell contains a null or empty string value [Issue #2165](https://github.com/PHPOffice/PhpSpreadsheet/issues/2165) [PR #2167](https://github.com/PHPOffice/PhpSpreadsheet/pull/2167)
+- Allow negative interest rate values in a number of the Financial functions (`PPMT()`, `PMT()`, `FV()`, `PV()`, `NPER()`, etc) [Issue #2163](https://github.com/PHPOffice/PhpSpreadsheet/issues/2163) [PR #2164](https://github.com/PHPOffice/PhpSpreadsheet/pull/2164)
+- Xls Reader changing grey background to black in Excel template [Issue #2147](https://github.com/PHPOffice/PhpSpreadsheet/issues/2147) [PR #2156](https://github.com/PHPOffice/PhpSpreadsheet/pull/2156)
+- Column width and Row height styles in the Html Reader when the value includes a unit of measure [Issue #2145](https://github.com/PHPOffice/PhpSpreadsheet/issues/2145).
+- Data Validation flags not set correctly when reading XLSX files [Issue #2224](https://github.com/PHPOffice/PhpSpreadsheet/issues/2224) [PR #2225](https://github.com/PHPOffice/PhpSpreadsheet/pull/2225)
+- Reading XLSX files without styles.xml throws an exception [Issue #2246](https://github.com/PHPOffice/PhpSpreadsheet/issues/2246)
+- Improved performance of `Style::applyFromArray()` when applied to several cells [PR #1785](https://github.com/PHPOffice/PhpSpreadsheet/issues/1785).
+- Improve XLSX parsing speed if no readFilter is applied (again) - [#772](https://github.com/PHPOffice/PhpSpreadsheet/issues/772)
+
 ## 1.18.0 - 2021-05-31
 
 ### Added
-- Enhancements to CSV Reader, allowing options to be set when using `IOFactory::load()` with a callback to set delimiter, enclosure, charset etc. [PR #2103](https://github.com/PHPOffice/PhpSpreadsheet/pull/2103) - See [documentation](https://github.com/PHPOffice/PhpSpreadsheet/blob/master/docs/topics/reading-and-writing-to-file.md#csv-comma-separated-values) for details.
+
+- Enhancements to CSV Reader, allowing options to be set when using `IOFactory::load()` with a callback to set delimiter, enclosure, charset etc [PR #2103](https://github.com/PHPOffice/PhpSpreadsheet/pull/2103) - See [documentation](https://github.com/PHPOffice/PhpSpreadsheet/blob/master/docs/topics/reading-and-writing-to-file.md#csv-comma-separated-values) for details.
 - Implemented basic AutoFiltering for Ods Reader and Writer [PR #2053](https://github.com/PHPOffice/PhpSpreadsheet/pull/2053)
 - Implemented basic AutoFiltering for Gnumeric Reader [PR #2055](https://github.com/PHPOffice/PhpSpreadsheet/pull/2055)
 - Improved support for Row and Column ranges in formulae [Issue #1755](https://github.com/PHPOffice/PhpSpreadsheet/issues/1755) [PR #2028](https://github.com/PHPOffice/PhpSpreadsheet/pull/2028)
 - Implemented URLENCODE() Web Function
 - Implemented the CHITEST(), CHISQ.DIST() and CHISQ.INV() and equivalent Statistical functions, for both left- and right-tailed distributions.
-- Support for ActiveSheet and SelectedCells in the ODS Reader and Writer. [PR #1908](https://github.com/PHPOffice/PhpSpreadsheet/pull/1908)
+- Support for ActiveSheet and SelectedCells in the ODS Reader and Writer [PR #1908](https://github.com/PHPOffice/PhpSpreadsheet/pull/1908)
 - Support for notContainsText Conditional Style in xlsx [Issue #984](https://github.com/PHPOffice/PhpSpreadsheet/issues/984)
 
 ### Changed
@@ -30,20 +964,21 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - Use of `nb` rather than `no` as the locale language code for Norsk Bokmål.
 
 ### Fixed
+
 - Fixed error in COUPNCD() calculation for end of month [Issue #2116](https://github.com/PHPOffice/PhpSpreadsheet/issues/2116) - [PR #2119](https://github.com/PHPOffice/PhpSpreadsheet/pull/2119)
 - Resolve default values when a null argument is passed for HLOOKUP(), VLOOKUP() and ADDRESS() functions [Issue #2120](https://github.com/PHPOffice/PhpSpreadsheet/issues/2120) - [PR #2121](https://github.com/PHPOffice/PhpSpreadsheet/pull/2121)
 - Fixed incorrect R1C1 to A1 subtraction formula conversion (`R[-2]C-R[2]C`) [Issue #2076](https://github.com/PHPOffice/PhpSpreadsheet/pull/2076) [PR #2086](https://github.com/PHPOffice/PhpSpreadsheet/pull/2086)
 - Correctly handle absolute A1 references when converting to R1C1 format [PR #2060](https://github.com/PHPOffice/PhpSpreadsheet/pull/2060)
 - Correct default fill style for conditional without a pattern defined [Issue #2035](https://github.com/PHPOffice/PhpSpreadsheet/issues/2035) [PR #2050](https://github.com/PHPOffice/PhpSpreadsheet/pull/2050)
-- Fixed issue where array key check for existince before accessing arrays in Xlsx.php. [PR #1970](https://github.com/PHPOffice/PhpSpreadsheet/pull/1970)
+- Fixed issue where array key check for existince before accessing arrays in Xlsx.php [PR #1970](https://github.com/PHPOffice/PhpSpreadsheet/pull/1970)
 - Fixed issue with quoted strings in number format mask rendered with toFormattedString() [Issue 1972#](https://github.com/PHPOffice/PhpSpreadsheet/issues/1972) [PR #1978](https://github.com/PHPOffice/PhpSpreadsheet/pull/1978)
 - Fixed issue with percentage formats in number format mask rendered with toFormattedString() [Issue 1929#](https://github.com/PHPOffice/PhpSpreadsheet/issues/1929) [PR #1928](https://github.com/PHPOffice/PhpSpreadsheet/pull/1928)
 - Fixed issue with _ spacing character in number format mask corrupting output from toFormattedString() [Issue 1924#](https://github.com/PHPOffice/PhpSpreadsheet/issues/1924) [PR #1927](https://github.com/PHPOffice/PhpSpreadsheet/pull/1927)
 - Fix for [Issue #1887](https://github.com/PHPOffice/PhpSpreadsheet/issues/1887) - Lose Track of Selected Cells After Save
 - Fixed issue with Xlsx@listWorksheetInfo not returning any data
-- Fixed invalid arguments triggering mb_substr() error in LEFT(), MID() and RIGHT() text functions. [Issue #640](https://github.com/PHPOffice/PhpSpreadsheet/issues/640)
+- Fixed invalid arguments triggering mb_substr() error in LEFT(), MID() and RIGHT() text functions [Issue #640](https://github.com/PHPOffice/PhpSpreadsheet/issues/640)
 - Fix for [Issue #1916](https://github.com/PHPOffice/PhpSpreadsheet/issues/1916) - Invalid signature check for XML files
-- Fix change in `Font::setSize()` behavior for PHP8. [PR #2100](https://github.com/PHPOffice/PhpSpreadsheet/pull/2100)
+- Fix change in `Font::setSize()` behavior for PHP8 [PR #2100](https://github.com/PHPOffice/PhpSpreadsheet/pull/2100)
 
 ## 1.17.1 - 2021-03-01
 
@@ -64,7 +999,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
   `ABS()`, `ACOS()`, `ACOSH()`, `ASIN()`, `ASINH()`, `ATAN()`, `ATANH()`,
   `COS()`, `COSH()`, `DEGREES()` (rad2deg), `EXP()`, `LN()` (log), `LOG10()`,
   `RADIANS()` (deg2rad), `SIN()`, `SINH()`, `SQRT()`, `TAN()`, `TANH()`.
-  
+
   One TextData function is also affected: `REPT()` (str_repeat).
 - `formatAsDate` correctly matches language metadata, reverting c55272e
 - Formulae that previously crashed on sub function call returning excel error value now return said value.
@@ -90,12 +1025,12 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - Avoid Duplicate Titles When Reading Multiple HTML Files.[Issue #1823](https://github.com/PHPOffice/PhpSpreadsheet/issues/1823) [PR #1829](https://github.com/PHPOffice/PhpSpreadsheet/pull/1829)
 - Fixed issue with Worksheet's `getCell()` method when trying to get a cell by defined name. [#1858](https://github.com/PHPOffice/PhpSpreadsheet/issues/1858)
 - Fix possible endless loop in NumberFormat Masks [#1792](https://github.com/PHPOffice/PhpSpreadsheet/issues/1792)
-- Fix problem resulting from  literal dot inside quotes in number format masks. [PR #1830](https://github.com/PHPOffice/PhpSpreadsheet/pull/1830)
-- Resolve Google Sheets Xlsx charts issue. Google Sheets uses oneCellAnchor positioning and does not include *Cache values in the exported Xlsx. [PR #1761](https://github.com/PHPOffice/PhpSpreadsheet/pull/1761)
-- Fix for Xlsx Chart axis titles mapping to correct X or Y axis label when only one is present. [PR #1760](https://github.com/PHPOffice/PhpSpreadsheet/pull/1760)
+- Fix problem resulting from  literal dot inside quotes in number format masks [PR #1830](https://github.com/PHPOffice/PhpSpreadsheet/pull/1830)
+- Resolve Google Sheets Xlsx charts issue. Google Sheets uses oneCellAnchor positioning and does not include *Cache values in the exported Xlsx [PR #1761](https://github.com/PHPOffice/PhpSpreadsheet/pull/1761)
+- Fix for Xlsx Chart axis titles mapping to correct X or Y axis label when only one is present [PR #1760](https://github.com/PHPOffice/PhpSpreadsheet/pull/1760)
 - Fix For Null Exception on ODS Read of Page Settings. [#1772](https://github.com/PHPOffice/PhpSpreadsheet/issues/1772)
-- Fix Xlsx reader overriding manually set number format with builtin number format. [PR #1805](https://github.com/PHPOffice/PhpSpreadsheet/pull/1805)
-- Fix Xlsx reader cell alignment. [PR #1710](https://github.com/PHPOffice/PhpSpreadsheet/pull/1710)
+- Fix Xlsx reader overriding manually set number format with builtin number format [PR #1805](https://github.com/PHPOffice/PhpSpreadsheet/pull/1805)
+- Fix Xlsx reader cell alignment [PR #1710](https://github.com/PHPOffice/PhpSpreadsheet/pull/1710)
 - Fix for not yet implemented data-types in Open Document writer [Issue #1674](https://github.com/PHPOffice/PhpSpreadsheet/issues/1674)
 - Fix XLSX reader when having a corrupt numeric cell data type [PR #1664](https://github.com/phpoffice/phpspreadsheet/pull/1664)
 - Fix on `CUMPRINC()`, `CUMIPMT()`, `AMORLINC()`, `AMORDEGRC()` usage. When those functions called one of `YEARFRAC()`, `PPMT()`, `IPMT()` and they would get back an error value (represented as a string), trying to use numeral operands (`+`, `/`, `-`, `*`) on said return value and a number (`float or `int`) would fail.
@@ -120,7 +1055,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 ### Fixed
 
-- Fixed issue with absolute path in worksheets' Target. [PR #1769](https://github.com/PHPOffice/PhpSpreadsheet/pull/1769)
+- Fixed issue with absolute path in worksheets' Target [PR #1769](https://github.com/PHPOffice/PhpSpreadsheet/pull/1769)
 - Fix for Xls Reader when SST has a bad length [#1592](https://github.com/PHPOffice/PhpSpreadsheet/issues/1592)
 - Resolve Xlsx loader issue whe hyperlinks don't have a destination
 - Resolve issues when printer settings resources IDs clash with drawing IDs
@@ -694,7 +1629,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - Ignore inlineStr type if formula element exists - @ncrypthic [#570](https://github.com/PHPOffice/PHPExcel/issues/570)
 - Excel 2007 Reader freezes because of conditional formatting - @rentalhost [#575](https://github.com/PHPOffice/PHPExcel/issues/575)
 - Readers will now parse files containing worksheet titles over 31 characters [#176](https://github.com/PHPOffice/PhpSpreadsheet/pull/176)
-- Fixed PHP8 deprecation warning for libxml_disable_entity_loader() [#1625](https://github.com/phpoffice/phpspreadsheet/pull/1625) 
+- Fixed PHP8 deprecation warning for libxml_disable_entity_loader() [#1625](https://github.com/phpoffice/phpspreadsheet/pull/1625)
 
 ### General
 
@@ -717,3 +1652,6 @@ For a comprehensive list of all class changes, and a semi-automated migration pa
 ## Previous versions of PHPExcel
 
 The changelog for the project when it was called PHPExcel is [still available](./CHANGELOG.PHPExcel.md).
+
+### Changed
+- Replace ezyang/htmlpurifier (LGPL2.1) with voku/anti-xss (MIT)
diff --git a/vendor/phpoffice/phpspreadsheet/CONTRIBUTING.md b/vendor/phpoffice/phpspreadsheet/CONTRIBUTING.md
index f59535331c..e89e99ec5a 100644
--- a/vendor/phpoffice/phpspreadsheet/CONTRIBUTING.md
+++ b/vendor/phpoffice/phpspreadsheet/CONTRIBUTING.md
@@ -2,19 +2,44 @@
 
 If you would like to contribute, here are some notes and guidelines:
 
- - All new development happens on feature/fix branches, and are then merged to the `master` branch once stable; so the `master` branch is always the most up-to-date, working code
- - Tagged releases are made from the `master` branch
- - If you are going to be submitting a pull request, please fork from `master`, and submit your pull request back as a fix/feature branch referencing the GitHub issue number
- - Code style might be automatically fixed by `composer fix`
- - All code changes must be validated by `composer check`
+ - All new development should be on feature/fix branches, which are then merged to the `master` branch once stable and approved; so the `master` branch is always the most up-to-date, working code
+ - If you are going to submit a pull request, please fork from `master`, and submit your pull request back as a fix/feature branch referencing the GitHub issue number
+ - The code must work with all PHP versions that we support.
+   - You can call `composer versions` to test version compatibility. 
+ - Code style should be maintained.
+   - `composer style` will identify any issues with Coding Style`.
+   - `composer fix` will fix most issues with Coding Style.
+ - All code changes must be validated by `composer check`.
+ - Please include Unit Tests to verify that a bug exists, and that this PR fixes it.
+ - Please include Unit Tests to show that a new Feature works as expected.
+ - Please don't "bundle" several changes into a single PR; submit a PR for each discrete change/fix.
+ - Remember to update documentation if necessary.
+
  - [Helpful article about forking](https://help.github.com/articles/fork-a-repo/ "Forking a GitHub repository")
  - [Helpful article about pull requests](https://help.github.com/articles/using-pull-requests/ "Pull Requests")
 
+## Unit Tests
+
+When writing Unit Tests, please
+ - Always try to write Unit Tests for both the happy and unhappy paths.
+ - Put all assertions in the Test itself, not in an abstract class that the Test extends (even if this means code duplication between tests).
+ - Include any necessary `setup()` and `tearDown()` in the Test itself.
+ - If you change any global settings (such as system locale, or Compatibility Mode for Excel Function tests), make sure that you reset to the default in the `tearDown()`.
+ - Use the `ExcelError` functions in assertions for Excel Error values in Excel Function implementations.
+   <br />Not only does it reduce the risk of typos; but at some point in the future, ExcelError values will be an object rather than a string, and we won't then need to update all the tests.
+ - Don't over-complicate test code by testing happy and unhappy paths in the same test.
+
+This makes it easier to see exactly what is being tested when reviewing the PR. I want to be able to see it in the PR, not have to hunt in other unchanged classes to see what the test is doing.
+
 ## How to release
 
 1. Complete CHANGELOG.md and commit
 2. Create an annotated tag
     1. `git tag -a 1.2.3`
     2. Tag subject must be the version number, eg: `1.2.3`
-    3. Tag body must be a copy-paste of the changelog entries
-3. Push tag with `git push --tags`, GitHub Actions will create a GitHub release automatically
+    3. Tag body must be a copy-paste of the changelog entries.
+3. Push the tag with `git push --tags`, GitHub Actions will create a GitHub release automatically, and the release details will automatically be sent to packagist.
+4. Github seems to remove markdown headings in the Release Notes, so you should edit to restore these.
+
+> **Note:** Tagged releases are made from the `master` branch. Only in an emergency should a tagged release be made from the `release` branch. (i.e. cherry-picked hot-fixes.)
+
diff --git a/vendor/phpoffice/phpspreadsheet/README.md b/vendor/phpoffice/phpspreadsheet/README.md
index 2a94e0d3d5..84b4b7be15 100644
--- a/vendor/phpoffice/phpspreadsheet/README.md
+++ b/vendor/phpoffice/phpspreadsheet/README.md
@@ -11,12 +11,52 @@
 PhpSpreadsheet is a library written in pure PHP and offers a set of classes that
 allow you to read and write various spreadsheet file formats such as Excel and LibreOffice Calc.
 
+## Installation
+
+See the [install instructions](https://phpspreadsheet.readthedocs.io/en/latest/#installation).
+
 ## Documentation
 
 Read more about it, including install instructions, in the [official documentation](https://phpspreadsheet.readthedocs.io). Or check out the [API documentation](https://phpoffice.github.io/PhpSpreadsheet).
 
 Please ask your support questions on [StackOverflow](https://stackoverflow.com/questions/tagged/phpspreadsheet), or have a quick chat on [Gitter](https://gitter.im/PHPOffice/PhpSpreadsheet).
 
+## Patreon
+
+I am now running a [Patreon](https://www.patreon.com/MarkBaker) to support the work that I do on PhpSpreadsheet.
+
+Supporters will receive access to articles about working with PhpSpreadsheet, and how to use some of its more advanced features.
+
+Posts already available to Patreon supporters:
+ - The Dating Game
+   - A  look at how MS Excel (and PhpSpreadsheet) handle date and time values.
+- Looping the Loop
+    - Advice on Iterating through the rows and cells in a worksheet.
+
+And for Patrons at levels actively using PhpSpreadsheet:
+ - Behind the Mask
+   - A look at Number Format Masks.
+
+The Next Article (currently Work in Progress):
+ - Formula for Success
+   - How to debug formulae that don't produce the expected result.
+
+
+My aim is to post at least one article each month, taking a detailed look at some feature of MS Excel and how to use that feature in PhpSpreadsheet, or on how to perform different activities in PhpSpreadsheet.
+
+Planned posts for the future include topics like:
+ - Tables
+ - Structured References
+ - AutoFiltering
+ - Array Formulae
+ - Conditional Formatting
+ - Data Validation
+ - Value Binders
+ - Images
+ - Charts
+
+After a period of six months exclusive to Patreon supporters, articles will be incorporated into the public documentation for the library.
+
 ## PHPExcel vs PhpSpreadsheet ?
 
 PhpSpreadsheet is the next version of PHPExcel. It breaks compatibility to dramatically improve the code base quality (namespaces, PSR compliance, use of latest PHP language features, etc.).
diff --git a/vendor/phpoffice/phpspreadsheet/composer.json b/vendor/phpoffice/phpspreadsheet/composer.json
index 57ec895e8a..a823d2378d 100644
--- a/vendor/phpoffice/phpspreadsheet/composer.json
+++ b/vendor/phpoffice/phpspreadsheet/composer.json
@@ -12,7 +12,13 @@
         "spreadsheet"
     ],
     "config": {
-        "sort-packages": true
+        "platform": {
+            "php" : "8.1.99"
+        },
+        "sort-packages": true,
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     },
     "homepage": "https://github.com/PHPOffice/PhpSpreadsheet",
     "type": "library",
@@ -39,20 +45,27 @@
     ],
     "scripts": {
         "check": [
+            "./bin/check-phpdoc-types",
+            "phpcs samples/ src/ tests/ --report=checkstyle",
+            "phpcs samples/ src/ tests/ --standard=PHPCompatibility --runtime-set testVersion 8.0- -n",
             "php-cs-fixer fix --ansi --dry-run --diff",
-            "phpcs",
             "phpunit --color=always",
-            "phpstan analyse --ansi"
+            "phpstan analyse --ansi --memory-limit=2048M"
+        ],
+        "style": [
+            "phpcs samples/ src/ tests/ --report=checkstyle",
+            "php-cs-fixer fix --ansi --dry-run --diff"
         ],
         "fix": [
-            "php-cs-fixer fix --ansi"
+            "phpcbf samples/ src/ tests/ --report=checkstyle",
+            "php-cs-fixer fix"
         ],
         "versions": [
-            "phpcs --report-width=200 samples/ src/ tests/ --ignore=samples/Header.php --standard=PHPCompatibility --runtime-set testVersion 7.2- -n"
+            "phpcs samples/ src/ tests/ --standard=PHPCompatibility --runtime-set testVersion 8.0- -n"
         ]
     },
     "require": {
-        "php": "^7.2 || ^8.0",
+        "php": "^8.1",
         "ext-ctype": "*",
         "ext-dom": "*",
         "ext-fileinfo": "*",
@@ -66,32 +79,32 @@
         "ext-xmlwriter": "*",
         "ext-zip": "*",
         "ext-zlib": "*",
-        "ezyang/htmlpurifier": "^4.13",
-        "maennchen/zipstream-php": "^2.1",
-        "markbaker/complex": "^2.0",
-        "markbaker/matrix": "^2.0",
+        "maennchen/zipstream-php": "^2.1 || ^3.0",
+        "markbaker/complex": "^3.0",
+        "markbaker/matrix": "^3.0",
         "psr/http-client": "^1.0",
         "psr/http-factory": "^1.0",
-        "psr/simple-cache": "^1.0"
+        "psr/simple-cache": "^1.0 || ^2.0 || ^3.0"
     },
     "require-dev": {
-        "dealerdirect/phpcodesniffer-composer-installer": "dev-master",
-        "dompdf/dompdf": "^1.0",
-        "friendsofphp/php-cs-fixer": "^2.18",
-        "jpgraph/jpgraph": "^4.0",
-        "mpdf/mpdf": "^8.0",
+        "dealerdirect/phpcodesniffer-composer-installer": "dev-main",
+        "dompdf/dompdf": "^2.0 || ^3.0",
+        "friendsofphp/php-cs-fixer": "^3.2",
+        "mitoteam/jpgraph": "^10.3",
+        "mpdf/mpdf": "^8.1.1",
         "phpcompatibility/php-compatibility": "^9.3",
-        "phpstan/phpstan": "^0.12.82",
-        "phpstan/phpstan-phpunit": "^0.12.18",
-        "phpunit/phpunit": "^8.5",
-        "squizlabs/php_codesniffer": "^3.5",
-        "tecnickcom/tcpdf": "^6.3"
+        "phpstan/phpstan": "^1.1",
+        "phpstan/phpstan-phpunit": "^1.0",
+        "phpunit/phpunit": "^9.6 || ^10.5",
+        "squizlabs/php_codesniffer": "^3.7",
+        "tecnickcom/tcpdf": "^6.5"
     },
     "suggest": {
+        "ext-intl": "PHP Internationalization Functions",
         "mpdf/mpdf": "Option for rendering PDF with PDF Writer",
-        "dompdf/dompdf": "Option for rendering PDF with PDF Writer (doesn't yet support PHP8)",
-        "tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer (doesn't yet support PHP8)",
-        "jpgraph/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers"
+        "dompdf/dompdf": "Option for rendering PDF with PDF Writer",
+        "tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer",
+        "mitoteam/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers"
     },
     "autoload": {
         "psr-4": {
diff --git a/vendor/phpoffice/phpspreadsheet/phpstan-baseline.neon b/vendor/phpoffice/phpspreadsheet/phpstan-baseline.neon
index 4ee0a9efd3..364905f714 100644
--- a/vendor/phpoffice/phpspreadsheet/phpstan-baseline.neon
+++ b/vendor/phpoffice/phpspreadsheet/phpstan-baseline.neon
@@ -1,7602 +1,2 @@
 parameters:
 	ignoreErrors:
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Calculation\\:\\:\\$returnArrayAsType has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Calculation\\:\\:\\$branchPruningEnabled has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Calculation\\:\\:\\$cellStack has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Calculation\\:\\:\\$cyclicFormulaCell has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Calculation\\:\\:\\$localeFunctions has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Calculation\\:\\:\\$phpSpreadsheetFunctions has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Calculation\\:\\:\\$controlFunctions has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Binary operation \"\\-\" between 0 and string\\|false results in an error\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Calculation\\:\\:\\$spreadsheet \\(PhpOffice\\\\PhpSpreadsheet\\\\Spreadsheet\\) does not accept PhpOffice\\\\PhpSpreadsheet\\\\Spreadsheet\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Argument of an invalid type array\\<int, string\\>\\|false supplied for foreach, only iterables are supported\\.$#"
-			count: 3
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Parameter \\#3 \\$formula of static method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Calculation\\:\\:translateSeparator\\(\\) expects string, string\\|null given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Calculation\\:\\:\\$functionReplaceFromExcel has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Calculation\\:\\:\\$functionReplaceToLocale has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Calculation\\:\\:_translateFormulaToLocale\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Calculation\\:\\:_translateFormulaToLocale\\(\\) has parameter \\$formula with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Parameter \\#1 \\$str of function preg_quote expects string, int\\|string given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Calculation\\:\\:\\$functionReplaceFromLocale has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Calculation\\:\\:\\$functionReplaceToExcel has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Calculation\\:\\:_translateFormulaToEnglish\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Calculation\\:\\:_translateFormulaToEnglish\\(\\) has parameter \\$formula with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Parameter \\#1 \\$str of function trim expects string, int\\|string given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Calculation\\:\\:localeFunc\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Calculation\\:\\:localeFunc\\(\\) has parameter \\$function with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Cannot call method getCell\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\|null\\.$#"
-			count: 6
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Calculation\\:\\:\\$operatorAssociativity has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Calculation\\:\\:\\$comparisonOperators has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Calculation\\:\\:\\$operatorPrecedence has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between mixed and null will always evaluate to false\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Parameter \\#1 \\$haystack of function stripos expects string, float\\|int\\|string given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Parameter \\#1 \\$haystack of function strpos expects string, float\\|int\\|string given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Calculation\\:\\:dataTestReference\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Calculation\\:\\:dataTestReference\\(\\) has parameter \\$operandData with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Cannot call method getTitle\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Cannot call method getColumn\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Cell\\\\Cell\\|null\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Parameter \\#1 \\$str of function trim expects string, null given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Cannot call method getCoordinate\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Cell\\\\Cell\\|null\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Cannot call method getRow\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Cell\\\\Cell\\|null\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Cannot call method has\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Collection\\\\Cells\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Parameter \\#1 \\$parent of method PhpOffice\\\\PhpSpreadsheet\\\\Cell\\\\Cell\\:\\:attach\\(\\) expects PhpOffice\\\\PhpSpreadsheet\\\\Collection\\\\Cells, PhpOffice\\\\PhpSpreadsheet\\\\Collection\\\\Cells\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Cannot call method attach\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Cell\\\\Cell\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Calculation\\:\\:validateBinaryOperand\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Calculation\\:\\:validateBinaryOperand\\(\\) has parameter \\$operand with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Calculation\\:\\:validateBinaryOperand\\(\\) has parameter \\$stack with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Parameter \\#1 \\$pValue of static method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\StringHelper\\:\\:strCaseReverse\\(\\) expects string, string\\|null given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Calculation\\:\\:raiseFormulaError\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Calculation\\:\\:raiseFormulaError\\(\\) has parameter \\$errorMessage with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Cannot call method cellExists\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\|null\\.$#"
-			count: 4
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Parameter \\#2 \\$pSheet of static method PhpOffice\\\\PhpSpreadsheet\\\\DefinedName\\:\\:resolveName\\(\\) expects PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet, PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Cannot call method getHighestRow\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Cannot call method getHighestColumn\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Calculation\\:\\:getUnusedBranchStoreKey\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Calculation\\:\\:getTokensAsString\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Calculation\\:\\:getTokensAsString\\(\\) has parameter \\$tokens with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Calculation.php
-
-		-
-			message: "#^Parameter \\#2 \\$field of static method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Database\\\\DCountA\\:\\:evaluate\\(\\) expects int\\|string, int\\|string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Database.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Database\\:\\:DMAX\\(\\) should return float but returns float\\|string\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Database.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Database\\:\\:DMIN\\(\\) should return float but returns float\\|string\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Database.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Database\\:\\:DPRODUCT\\(\\) should return float\\|string but returns float\\|string\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Database.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Database\\:\\:DSTDEV\\(\\) should return float\\|string but returns float\\|string\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Database.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Database\\:\\:DSTDEVP\\(\\) should return float\\|string but returns float\\|string\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Database.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Database\\:\\:DSUM\\(\\) should return float\\|string but returns float\\|string\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Database.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Database\\:\\:DVAR\\(\\) should return float\\|string but returns float\\|string\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Database.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Database\\:\\:DVARP\\(\\) should return float\\|string but returns float\\|string\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Database.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Database\\\\DatabaseAbstract\\:\\:evaluate\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Database/DatabaseAbstract.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Database\\\\DatabaseAbstract\\:\\:evaluate\\(\\) has parameter \\$criteria with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Database/DatabaseAbstract.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Database\\\\DatabaseAbstract\\:\\:evaluate\\(\\) has parameter \\$database with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Database/DatabaseAbstract.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Database\\\\DatabaseAbstract\\:\\:evaluate\\(\\) has parameter \\$field with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Database/DatabaseAbstract.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Database\\\\DatabaseAbstract\\:\\:buildCondition\\(\\) has parameter \\$criterion with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Database/DatabaseAbstract.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Database\\\\DatabaseAbstract\\:\\:processCondition\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Database/DatabaseAbstract.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Engine\\\\Logger\\:\\:writeDebugLog\\(\\) has parameter \\$args with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Engine/Logger.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Engineering\\:\\:BITLSHIFT\\(\\) should return int\\|string but returns float\\|int\\|string\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Engineering.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Engineering\\:\\:BITRSHIFT\\(\\) should return int\\|string but returns float\\|int\\|string\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Engineering.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Engineering\\\\BesselJ\\:\\:besselj2a\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Engineering/BesselJ.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Engineering\\\\BesselJ\\:\\:besselj2b\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Engineering/BesselJ.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Engineering\\\\BesselK\\:\\:besselK2\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Engineering/BesselK.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Engineering\\\\BitWise\\:\\:validateBitwiseArgument\\(\\) never returns int so it can be removed from the return typehint\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Engineering/BitWise.php
-
-		-
-			message: "#^Parameter \\#1 \\$number of function floor expects float, float\\|int\\|string given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Engineering/BitWise.php
-
-		-
-			message: "#^Parameter \\#1 \\$number of function floor expects float, float\\|int\\<0, 281474976710655\\>\\|string given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Engineering/BitWise.php
-
-		-
-			message: "#^Parameter \\#1 \\$power of method Complex\\\\Complex\\:\\:pow\\(\\) expects float\\|int, float\\|int\\|string given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Engineering/ComplexFunctions.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Engineering\\\\ConvertBase\\:\\:validateValue\\(\\) has parameter \\$value with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Engineering/ConvertBase.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Engineering\\\\ConvertBase\\:\\:validatePlaces\\(\\) has parameter \\$places with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Engineering/ConvertBase.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Engineering\\\\ConvertUOM\\:\\:getUOMDetails\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Engineering/ConvertUOM.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Engineering\\\\ConvertUOM\\:\\:resolveTemperatureSynonyms\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Engineering/ConvertUOM.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Engineering\\\\Erf\\:\\:\\$twoSqrtPi has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Engineering/Erf.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Engineering\\\\Erf\\:\\:erfValue\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Engineering/Erf.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Engineering\\\\Erf\\:\\:erfValue\\(\\) has parameter \\$value with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Engineering/Erf.php
-
-		-
-			message: "#^Binary operation \"\\-\" between 1 and float\\|string results in an error\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Engineering/Erf.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Engineering\\\\ErfC\\:\\:\\$oneSqrtPi has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Engineering/ErfC.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Engineering\\\\ErfC\\:\\:erfcValue\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Engineering/ErfC.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Engineering\\\\ErfC\\:\\:erfcValue\\(\\) has parameter \\$value with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Engineering/ErfC.php
-
-		-
-			message: "#^Binary operation \"\\-\" between 2 and float\\|string results in an error\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Engineering/ErfC.php
-
-		-
-			message: "#^Parameter \\#1 \\$callback of function set_error_handler expects \\(callable\\(int, string, string, int, array\\)\\: bool\\)\\|null, array\\('PhpOffice\\\\\\\\PhpSpreadsheet\\\\\\\\Calculation\\\\\\\\Exception', 'errorHandlerCallback'\\) given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/ExceptionHandler.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Financial\\:\\:ISPMT\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Financial.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Financial\\:\\:ISPMT\\(\\) has parameter \\$args with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Financial.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Financial\\:\\:NPV\\(\\) has parameter \\$args with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Financial.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Financial\\\\CashFlow\\\\Constant\\\\Periodic\\\\Interest\\:\\:schedulePayment\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/Interest.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Financial\\\\CashFlow\\\\Constant\\\\Periodic\\\\Interest\\:\\:rateNextGuess\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/Interest.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Financial\\\\CashFlow\\\\Constant\\\\Periodic\\\\Interest\\:\\:rateNextGuess\\(\\) has parameter \\$futureValue with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/Interest.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Financial\\\\CashFlow\\\\Constant\\\\Periodic\\\\Interest\\:\\:rateNextGuess\\(\\) has parameter \\$numberOfPeriods with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/Interest.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Financial\\\\CashFlow\\\\Constant\\\\Periodic\\\\Interest\\:\\:rateNextGuess\\(\\) has parameter \\$payment with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/Interest.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Financial\\\\CashFlow\\\\Constant\\\\Periodic\\\\Interest\\:\\:rateNextGuess\\(\\) has parameter \\$presentValue with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/Interest.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Financial\\\\CashFlow\\\\Constant\\\\Periodic\\\\Interest\\:\\:rateNextGuess\\(\\) has parameter \\$rate with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/Interest.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Financial\\\\CashFlow\\\\Constant\\\\Periodic\\\\Interest\\:\\:rateNextGuess\\(\\) has parameter \\$type with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/Interest.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Financial\\\\CashFlow\\\\Constant\\\\Periodic\\\\InterestAndPrincipal\\:\\:\\$interest has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/InterestAndPrincipal.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Financial\\\\CashFlow\\\\Constant\\\\Periodic\\\\InterestAndPrincipal\\:\\:\\$principal has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/InterestAndPrincipal.php
-
-		-
-			message: "#^Binary operation \"\\-\" between float\\|string and 0\\|float results in an error\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/InterestAndPrincipal.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Financial\\\\CashFlow\\\\Variable\\\\NonPeriodic\\:\\:bothNegAndPos\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/NonPeriodic.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Financial\\\\CashFlow\\\\Variable\\\\NonPeriodic\\:\\:bothNegAndPos\\(\\) has parameter \\$neg with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/NonPeriodic.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Financial\\\\CashFlow\\\\Variable\\\\NonPeriodic\\:\\:bothNegAndPos\\(\\) has parameter \\$pos with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/NonPeriodic.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Financial\\\\CashFlow\\\\Variable\\\\NonPeriodic\\:\\:xirrPart1\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/NonPeriodic.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Financial\\\\CashFlow\\\\Variable\\\\NonPeriodic\\:\\:xirrPart1\\(\\) has parameter \\$dates with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/NonPeriodic.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Financial\\\\CashFlow\\\\Variable\\\\NonPeriodic\\:\\:xirrPart1\\(\\) has parameter \\$values with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/NonPeriodic.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Financial\\\\CashFlow\\\\Variable\\\\NonPeriodic\\:\\:xirrPart2\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/NonPeriodic.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Financial\\\\CashFlow\\\\Variable\\\\NonPeriodic\\:\\:xirrPart2\\(\\) has parameter \\$values with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/NonPeriodic.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Financial\\\\CashFlow\\\\Variable\\\\NonPeriodic\\:\\:xirrPart3\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/NonPeriodic.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Financial\\\\CashFlow\\\\Variable\\\\NonPeriodic\\:\\:xirrPart3\\(\\) has parameter \\$dates with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/NonPeriodic.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Financial\\\\CashFlow\\\\Variable\\\\NonPeriodic\\:\\:xirrPart3\\(\\) has parameter \\$values with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/NonPeriodic.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Financial\\\\CashFlow\\\\Variable\\\\NonPeriodic\\:\\:xirrPart3\\(\\) has parameter \\$x1 with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/NonPeriodic.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Financial\\\\CashFlow\\\\Variable\\\\NonPeriodic\\:\\:xirrPart3\\(\\) has parameter \\$x2 with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/NonPeriodic.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Financial\\\\CashFlow\\\\Variable\\\\NonPeriodic\\:\\:xnpvOrdered\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/NonPeriodic.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Financial\\\\CashFlow\\\\Variable\\\\NonPeriodic\\:\\:xnpvOrdered\\(\\) has parameter \\$dates with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/NonPeriodic.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Financial\\\\CashFlow\\\\Variable\\\\NonPeriodic\\:\\:xnpvOrdered\\(\\) has parameter \\$ordered with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/NonPeriodic.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Financial\\\\CashFlow\\\\Variable\\\\NonPeriodic\\:\\:xnpvOrdered\\(\\) has parameter \\$rate with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/NonPeriodic.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Financial\\\\CashFlow\\\\Variable\\\\NonPeriodic\\:\\:xnpvOrdered\\(\\) has parameter \\$values with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/NonPeriodic.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Financial\\\\CashFlow\\\\Variable\\\\NonPeriodic\\:\\:validateXnpv\\(\\) has parameter \\$dates with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/NonPeriodic.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Financial\\\\CashFlow\\\\Variable\\\\NonPeriodic\\:\\:validateXnpv\\(\\) has parameter \\$rate with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/NonPeriodic.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Financial\\\\CashFlow\\\\Variable\\\\NonPeriodic\\:\\:validateXnpv\\(\\) has parameter \\$values with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/NonPeriodic.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Financial\\\\CashFlow\\\\Variable\\\\Periodic\\:\\:presentValue\\(\\) has parameter \\$args with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/Periodic.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Financial\\\\Depreciation\\:\\:validateCost\\(\\) has parameter \\$cost with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Financial/Depreciation.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Financial\\\\Depreciation\\:\\:validateSalvage\\(\\) has parameter \\$salvage with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Financial/Depreciation.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Financial\\\\Depreciation\\:\\:validateLife\\(\\) has parameter \\$life with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Financial/Depreciation.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Financial\\\\Depreciation\\:\\:validatePeriod\\(\\) has parameter \\$period with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Financial/Depreciation.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Financial\\\\Depreciation\\:\\:validateMonth\\(\\) has parameter \\$month with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Financial/Depreciation.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Financial\\\\Depreciation\\:\\:validateFactor\\(\\) has parameter \\$factor with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Financial/Depreciation.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between string and null will always evaluate to false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/FormulaParser.php
-
-		-
-			message: "#^Cannot call method setValue\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\FormulaToken\\|null\\.$#"
-			count: 5
-			path: src/PhpSpreadsheet/Calculation/FormulaParser.php
-
-		-
-			message: "#^Cannot call method setTokenSubType\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\FormulaToken\\|null\\.$#"
-			count: 5
-			path: src/PhpSpreadsheet/Calculation/FormulaParser.php
-
-		-
-			message: "#^Cannot call method getTokenType\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\FormulaToken\\|null\\.$#"
-			count: 9
-			path: src/PhpSpreadsheet/Calculation/FormulaParser.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\FormulaToken and null will always evaluate to false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/FormulaParser.php
-
-		-
-			message: "#^Cannot call method getTokenSubType\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\FormulaToken\\|null\\.$#"
-			count: 4
-			path: src/PhpSpreadsheet/Calculation/FormulaParser.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Functions\\:\\:isMatrixValue\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Functions.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Functions\\:\\:isMatrixValue\\(\\) has parameter \\$idx with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Functions.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Functions\\:\\:isValue\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Functions.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Functions\\:\\:isValue\\(\\) has parameter \\$idx with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Functions.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Functions\\:\\:isCellValue\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Functions.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Functions\\:\\:isCellValue\\(\\) has parameter \\$idx with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Functions.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Functions\\:\\:ifCondition\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Functions.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Functions\\:\\:ifCondition\\(\\) has parameter \\$condition with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Functions.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Functions\\:\\:operandSpecialHandling\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Functions.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Functions\\:\\:operandSpecialHandling\\(\\) has parameter \\$operand with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Functions.php
-
-		-
-			message: "#^Cannot call method getCell\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Functions.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Internal\\\\MakeMatrix\\:\\:make\\(\\) has parameter \\$args with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Internal/MakeMatrix.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Internal\\\\WildcardMatch\\:\\:wildcard\\(\\) should return string but returns string\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Internal/WildcardMatch.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Internal\\\\WildcardMatch\\:\\:compare\\(\\) has parameter \\$value with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Internal/WildcardMatch.php
-
-		-
-			message: "#^Call to function is_string\\(\\) with null will always evaluate to false\\.$#"
-			count: 3
-			path: src/PhpSpreadsheet/Calculation/Logical/Operations.php
-
-		-
-			message: "#^Result of && is always false\\.$#"
-			count: 3
-			path: src/PhpSpreadsheet/Calculation/Logical/Operations.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\:\\:OFFSET\\(\\) should return array\\|string but returns array\\|int\\|string\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\:\\:CHOOSE\\(\\) has parameter \\$chooseArgs with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\Address\\:\\:sheetName\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/Address.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\ExcelMatch\\:\\:MATCH\\(\\) should return int\\|string but returns float\\|int\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/ExcelMatch.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\ExcelMatch\\:\\:matchFirstValue\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/ExcelMatch.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\ExcelMatch\\:\\:matchFirstValue\\(\\) has parameter \\$lookupArray with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/ExcelMatch.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\ExcelMatch\\:\\:matchFirstValue\\(\\) has parameter \\$lookupValue with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/ExcelMatch.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\ExcelMatch\\:\\:matchLargestValue\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/ExcelMatch.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\ExcelMatch\\:\\:matchLargestValue\\(\\) has parameter \\$keySet with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/ExcelMatch.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\ExcelMatch\\:\\:matchLargestValue\\(\\) has parameter \\$lookupArray with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/ExcelMatch.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\ExcelMatch\\:\\:matchLargestValue\\(\\) has parameter \\$lookupValue with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/ExcelMatch.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\ExcelMatch\\:\\:matchSmallestValue\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/ExcelMatch.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\ExcelMatch\\:\\:matchSmallestValue\\(\\) has parameter \\$lookupArray with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/ExcelMatch.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\ExcelMatch\\:\\:matchSmallestValue\\(\\) has parameter \\$lookupValue with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/ExcelMatch.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\ExcelMatch\\:\\:validateLookupValue\\(\\) has parameter \\$lookupValue with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/ExcelMatch.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\ExcelMatch\\:\\:validateMatchType\\(\\) has parameter \\$matchType with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/ExcelMatch.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\ExcelMatch\\:\\:validateLookupArray\\(\\) has parameter \\$lookupArray with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/ExcelMatch.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\ExcelMatch\\:\\:prepareLookupArray\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/ExcelMatch.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\ExcelMatch\\:\\:prepareLookupArray\\(\\) has parameter \\$lookupArray with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/ExcelMatch.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\ExcelMatch\\:\\:prepareLookupArray\\(\\) has parameter \\$matchType with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/ExcelMatch.php
-
-		-
-			message: "#^Binary operation \"\\-\" between int\\|string and 1 results in an error\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/HLookup.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\HLookup\\:\\:hLookupSearch\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/HLookup.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\HLookup\\:\\:hLookupSearch\\(\\) has parameter \\$column with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/HLookup.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\HLookup\\:\\:hLookupSearch\\(\\) has parameter \\$lookupArray with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/HLookup.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\HLookup\\:\\:hLookupSearch\\(\\) has parameter \\$lookupValue with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/HLookup.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\HLookup\\:\\:hLookupSearch\\(\\) has parameter \\$notExactMatch with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/HLookup.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\Lookup\\:\\:verifyResultVector\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/Lookup.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\Lookup\\:\\:verifyResultVector\\(\\) has parameter \\$resultVector with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/Lookup.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\LookupBase\\:\\:validateIndexLookup\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/LookupBase.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\LookupBase\\:\\:validateIndexLookup\\(\\) has parameter \\$index_number with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/LookupBase.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\LookupBase\\:\\:validateIndexLookup\\(\\) has parameter \\$lookup_array with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/LookupBase.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\LookupBase\\:\\:checkMatch\\(\\) has parameter \\$notExactMatch with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/LookupBase.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\Matrix\\:\\:extractRowValue\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/Matrix.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\Offset\\:\\:extractRequiredCells\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/Offset.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\Offset\\:\\:extractWorksheet\\(\\) has parameter \\$cellAddress with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/Offset.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\Offset\\:\\:adjustEndCellColumnForWidth\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/Offset.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\Offset\\:\\:adjustEndCellColumnForWidth\\(\\) has parameter \\$columns with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/Offset.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\Offset\\:\\:adjustEndCellColumnForWidth\\(\\) has parameter \\$width with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/Offset.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\Offset\\:\\:adustEndCellRowForHeight\\(\\) has parameter \\$endCellRow with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/Offset.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\Offset\\:\\:adustEndCellRowForHeight\\(\\) has parameter \\$height with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/Offset.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\Offset\\:\\:adustEndCellRowForHeight\\(\\) has parameter \\$rows with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/Offset.php
-
-		-
-			message: "#^Parameter \\#1 \\$pString of static method PhpOffice\\\\PhpSpreadsheet\\\\Cell\\\\Coordinate\\:\\:columnIndexFromString\\(\\) expects string, string\\|null given\\.$#"
-			count: 3
-			path: src/PhpSpreadsheet/Calculation/LookupRef/RowColumnInformation.php
-
-		-
-			message: "#^Parameter \\#1 \\$low of function range expects float\\|int\\|string, string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/RowColumnInformation.php
-
-		-
-			message: "#^Parameter \\#2 \\$high of function range expects float\\|int\\|string, string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/RowColumnInformation.php
-
-		-
-			message: "#^Parameter \\#2 \\$cmp_function of function uasort expects callable\\(mixed, mixed\\)\\: int, array\\('self', 'vlookupSort'\\) given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/VLookup.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\VLookup\\:\\:vlookupSort\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/VLookup.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\VLookup\\:\\:vlookupSort\\(\\) has parameter \\$a with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/VLookup.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\VLookup\\:\\:vlookupSort\\(\\) has parameter \\$b with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/VLookup.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\VLookup\\:\\:vLookupSearch\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/VLookup.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\VLookup\\:\\:vLookupSearch\\(\\) has parameter \\$column with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/VLookup.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\VLookup\\:\\:vLookupSearch\\(\\) has parameter \\$lookupArray with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/VLookup.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\VLookup\\:\\:vLookupSearch\\(\\) has parameter \\$lookupValue with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/VLookup.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\LookupRef\\\\VLookup\\:\\:vLookupSearch\\(\\) has parameter \\$notExactMatch with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/LookupRef/VLookup.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\:\\:MAXIFS\\(\\) should return float but returns float\\|string\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\:\\:MINIFS\\(\\) should return float but returns float\\|string\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\Averages\\:\\:filterArguments\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Averages.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\Averages\\:\\:filterArguments\\(\\) has parameter \\$args with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Averages.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\Averages\\:\\:modeCalc\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Averages.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\Averages\\:\\:modeCalc\\(\\) has parameter \\$data with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Averages.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\Percentiles\\:\\:percentileFilterValues\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Percentiles.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\Percentiles\\:\\:rankFilterValues\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Percentiles.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\Trends\\:\\:checkTrendArrays\\(\\) has parameter \\$array1 with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Trends.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\Trends\\:\\:checkTrendArrays\\(\\) has parameter \\$array2 with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Trends.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\Trends\\:\\:GROWTH\\(\\) should return array\\<float\\> but returns array\\<int, array\\<int, array\\<int, mixed\\>\\>\\>\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Trends.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\Trends\\:\\:TREND\\(\\) should return array\\<float\\> but returns array\\<int, array\\<int, array\\<int, mixed\\>\\>\\>\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Trends.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\Conditional\\:\\:SUMIF\\(\\) should return float\\|string but returns float\\|string\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Conditional.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\Conditional\\:\\:buildConditionSet\\(\\) has parameter \\$args with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Conditional.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\Conditional\\:\\:buildConditionSetForValueRange\\(\\) has parameter \\$args with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Conditional.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\Conditional\\:\\:buildConditions\\(\\) has parameter \\$args with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Conditional.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\Conditional\\:\\:buildDatabase\\(\\) has parameter \\$args with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Conditional.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\Conditional\\:\\:buildDatabaseWithValueRange\\(\\) has parameter \\$args with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Conditional.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\Conditional\\:\\:buildDataSet\\(\\) has parameter \\$args with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Conditional.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\Distributions\\\\Beta\\:\\:\\$logBetaCacheP has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Distributions/Beta.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\Distributions\\\\Beta\\:\\:\\$logBetaCacheQ has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Distributions/Beta.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\Distributions\\\\Beta\\:\\:\\$logBetaCacheResult has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Distributions/Beta.php
-
-		-
-			message: "#^Binary operation \"\\-\" between 1 and float\\|string results in an error\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Distributions/ChiSquared.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\Distributions\\\\ChiSquared\\:\\:pchisq\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Distributions/ChiSquared.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\Distributions\\\\ChiSquared\\:\\:pchisq\\(\\) has parameter \\$chi2 with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Distributions/ChiSquared.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\Distributions\\\\ChiSquared\\:\\:pchisq\\(\\) has parameter \\$degrees with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Distributions/ChiSquared.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\Distributions\\\\ChiSquared\\:\\:gammp\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Distributions/ChiSquared.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\Distributions\\\\ChiSquared\\:\\:gammp\\(\\) has parameter \\$n with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Distributions/ChiSquared.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\Distributions\\\\ChiSquared\\:\\:gammp\\(\\) has parameter \\$x with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Distributions/ChiSquared.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\Distributions\\\\ChiSquared\\:\\:gser\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Distributions/ChiSquared.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\Distributions\\\\ChiSquared\\:\\:gser\\(\\) has parameter \\$n with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Distributions/ChiSquared.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\Distributions\\\\ChiSquared\\:\\:gser\\(\\) has parameter \\$x with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Distributions/ChiSquared.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\Distributions\\\\ChiSquared\\:\\:gcf\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Distributions/ChiSquared.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\Distributions\\\\ChiSquared\\:\\:gcf\\(\\) has parameter \\$n with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Distributions/ChiSquared.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\Distributions\\\\ChiSquared\\:\\:gcf\\(\\) has parameter \\$x with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Distributions/ChiSquared.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\Distributions\\\\Normal\\:\\:inverseNcdf\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Distributions/Normal.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\Distributions\\\\Normal\\:\\:inverseNcdf\\(\\) has parameter \\$p with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Distributions/Normal.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\Distributions\\\\GammaBase\\:\\:calculateDistribution\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Distributions/GammaBase.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\Distributions\\\\GammaBase\\:\\:calculateInverse\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Distributions/GammaBase.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\Distributions\\\\GammaBase\\:\\:\\$logGammaCacheResult has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Distributions/GammaBase.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\Distributions\\\\GammaBase\\:\\:\\$logGammaCacheX has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Distributions/GammaBase.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\Distributions\\\\GammaBase\\:\\:logGamma1\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Distributions/GammaBase.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\Distributions\\\\GammaBase\\:\\:logGamma2\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Distributions/GammaBase.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\Distributions\\\\GammaBase\\:\\:logGamma3\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Distributions/GammaBase.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\Distributions\\\\GammaBase\\:\\:logGamma4\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Distributions/GammaBase.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\Distributions\\\\NewtonRaphson\\:\\:\\$callback has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Distributions/NewtonRaphson.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\Distributions\\\\NewtonRaphson\\:\\:execute\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Distributions/NewtonRaphson.php
-
-		-
-			message: "#^Binary operation \"\\-\" between 1 and float\\|string results in an error\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Distributions/StandardNormal.php
-
-		-
-			message: "#^Binary operation \"\\-\" between float\\|string and float\\|int\\|\\(string&numeric\\) results in an error\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/Distributions/StandardNormal.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\MaxMinBase\\:\\:datatypeAdjustmentAllowStrings\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/MaxMinBase.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\MaxMinBase\\:\\:datatypeAdjustmentAllowStrings\\(\\) has parameter \\$value with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/MaxMinBase.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\VarianceBase\\:\\:datatypeAdjustmentAllowStrings\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/VarianceBase.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\VarianceBase\\:\\:datatypeAdjustmentAllowStrings\\(\\) has parameter \\$value with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/VarianceBase.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\VarianceBase\\:\\:datatypeAdjustmentBooleans\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/VarianceBase.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Statistical\\\\VarianceBase\\:\\:datatypeAdjustmentBooleans\\(\\) has parameter \\$value with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Statistical/VarianceBase.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\TextData\\:\\:TRIMNONPRINTABLE\\(\\) should return string but returns string\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/TextData.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\TextData\\:\\:TRIMSPACES\\(\\) should return string but returns string\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/TextData.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\TextData\\:\\:CONCATENATE\\(\\) has parameter \\$args with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/TextData.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\TextData\\:\\:SEARCHSENSITIVE\\(\\) should return string but returns int\\|string\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/TextData.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\TextData\\:\\:SEARCHINSENSITIVE\\(\\) should return string but returns int\\|string\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/TextData.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\TextData\\\\CharacterConvert\\:\\:character\\(\\) should return string but returns string\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/TextData/CharacterConvert.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\TextData\\\\CharacterConvert\\:\\:unicodeToOrd\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/TextData/CharacterConvert.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\TextData\\\\CharacterConvert\\:\\:unicodeToOrd\\(\\) has parameter \\$character with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/TextData/CharacterConvert.php
-
-		-
-			message: "#^Cannot access offset 1 on array\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/TextData/CharacterConvert.php
-
-		-
-			message: "#^Parameter \\#2 \\$data of function unpack expects string, string\\|false given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/TextData/CharacterConvert.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\TextData\\\\CharacterConvert\\:\\:convertBooleanValue\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/TextData/CharacterConvert.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\TextData\\\\CharacterConvert\\:\\:convertBooleanValue\\(\\) has parameter \\$value with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/TextData/CharacterConvert.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\TextData\\\\Concatenate\\:\\:CONCATENATE\\(\\) has parameter \\$args with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/TextData/Concatenate.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\TextData\\\\Concatenate\\:\\:convertBooleanValue\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/TextData/Concatenate.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\TextData\\\\Concatenate\\:\\:convertBooleanValue\\(\\) has parameter \\$value with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/TextData/Concatenate.php
-
-		-
-			message: "#^Parameter \\#3 \\$length of function mb_substr expects int\\|null, float\\|int\\<0, max\\>\\|string given\\.$#"
-			count: 3
-			path: src/PhpSpreadsheet/Calculation/TextData/Extract.php
-
-		-
-			message: "#^Parameter \\#2 \\$start of function mb_substr expects int, float\\|int given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Calculation/TextData/Extract.php
-
-		-
-			message: "#^Cannot cast array\\|float\\|int\\|string to float\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/TextData/Format.php
-
-		-
-			message: "#^Parameter \\#3 \\$offset of function mb_strpos expects int, float\\|int given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/TextData/Search.php
-
-		-
-			message: "#^Parameter \\#3 \\$offset of function mb_stripos expects int, float\\|int given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/TextData/Search.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\TextData\\\\Trim\\:\\:\\$invalidChars has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/TextData/Trim.php
-
-		-
-			message: "#^Parameter \\#1 \\$str of function trim expects string, float\\|int\\|string given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Calculation/TextData/Trim.php
-
-		-
-			message: "#^Parameter \\#1 \\$str of function trim expects string, string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/TextData/Trim.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Token\\\\Stack\\:\\:getStackItem\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Token/Stack.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Token\\\\Stack\\:\\:getStackItem\\(\\) has parameter \\$onlyIf with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Token/Stack.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Token\\\\Stack\\:\\:getStackItem\\(\\) has parameter \\$onlyIfNot with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Token/Stack.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Token\\\\Stack\\:\\:getStackItem\\(\\) has parameter \\$reference with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Token/Stack.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Token\\\\Stack\\:\\:getStackItem\\(\\) has parameter \\$storeKey with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Token/Stack.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Token\\\\Stack\\:\\:getStackItem\\(\\) has parameter \\$type with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Token/Stack.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Token\\\\Stack\\:\\:getStackItem\\(\\) has parameter \\$value with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/Token/Stack.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Cell\\\\Cell\\:\\:\\$formulaAttributes has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Cell/Cell.php
-
-		-
-			message: "#^Elseif branch is unreachable because previous condition is always true\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Cell/Cell.php
-
-		-
-			message: "#^Parameter \\#2 \\$format of static method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\NumberFormat\\:\\:toFormattedString\\(\\) expects string, string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Cell/Cell.php
-
-		-
-			message: "#^Unreachable statement \\- code above always terminates\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Cell/Cell.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Cell\\\\Cell\\:\\:getFormulaAttributes\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Cell/Cell.php
-
-		-
-			message: "#^Parameter \\#2 \\$str of function explode expects string, array\\<int, string\\>\\|string given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Cell/Coordinate.php
-
-		-
-			message: "#^Parameter \\#4 \\$currentRow of static method PhpOffice\\\\PhpSpreadsheet\\\\Cell\\\\Coordinate\\:\\:validateRange\\(\\) expects int, string given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Cell/Coordinate.php
-
-		-
-			message: "#^Parameter \\#5 \\$endRow of static method PhpOffice\\\\PhpSpreadsheet\\\\Cell\\\\Coordinate\\:\\:validateRange\\(\\) expects int, string given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Cell/Coordinate.php
-
-		-
-			message: "#^Call to an undefined method object\\:\\:getHashCode\\(\\)\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Cell/Coordinate.php
-
-		-
-			message: "#^Parameter \\#1 \\$input of function array_chunk expects array, array\\<int, string\\>\\|false given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Cell/Coordinate.php
-
-		-
-			message: "#^Parameter \\#1 \\$pValue of static method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\StringHelper\\:\\:substring\\(\\) expects string, string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Cell/DataType.php
-
-		-
-			message: "#^Parameter \\#2 \\$alpha of method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Axis\\:\\:setShadowColor\\(\\) expects int, int\\|string given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Axis.php
-
-		-
-			message: "#^Parameter \\#1 \\$blur of method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Axis\\:\\:setShadowBlur\\(\\) expects float, float\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Axis.php
-
-		-
-			message: "#^Parameter \\#1 \\$angle of method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Axis\\:\\:setShadowAngle\\(\\) expects int, int\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Axis.php
-
-		-
-			message: "#^Parameter \\#1 \\$distance of method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Axis\\:\\:setShadowDistance\\(\\) expects float, float\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Axis.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart\\:\\:\\$title \\(PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Title\\) does not accept PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Title\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Chart.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart\\:\\:\\$legend \\(PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Legend\\) does not accept PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Legend\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Chart.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart\\:\\:\\$xAxisLabel \\(PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Title\\) does not accept PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Title\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Chart.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart\\:\\:\\$yAxisLabel \\(PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Title\\) does not accept PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Title\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Chart.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart\\:\\:\\$plotArea \\(PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\PlotArea\\) does not accept PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\PlotArea\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Chart.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart\\:\\:\\$xAxis \\(PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Axis\\) does not accept PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Axis\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Chart.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart\\:\\:\\$yAxis \\(PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Axis\\) does not accept PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Axis\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Chart.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart\\:\\:\\$majorGridlines \\(PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\GridLines\\) does not accept PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\GridLines\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Chart.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart\\:\\:\\$minorGridlines \\(PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\GridLines\\) does not accept PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\GridLines\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Chart.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart\\:\\:\\$worksheet \\(PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\) does not accept PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Chart.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart\\:\\:setTopLeftXOffset\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Chart.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart\\:\\:setTopLeftXOffset\\(\\) has parameter \\$xOffset with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Chart.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart\\:\\:getTopLeftXOffset\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Chart.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart\\:\\:setTopLeftYOffset\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Chart.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart\\:\\:setTopLeftYOffset\\(\\) has parameter \\$yOffset with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Chart.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart\\:\\:getTopLeftYOffset\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Chart.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart\\:\\:setBottomRightCell\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Chart.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart\\:\\:setBottomRightCell\\(\\) has parameter \\$cell with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Chart.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart\\:\\:setBottomRightXOffset\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Chart.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart\\:\\:setBottomRightXOffset\\(\\) has parameter \\$xOffset with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Chart.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart\\:\\:getBottomRightXOffset\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Chart.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart\\:\\:setBottomRightYOffset\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Chart.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart\\:\\:setBottomRightYOffset\\(\\) has parameter \\$yOffset with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Chart.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart\\:\\:getBottomRightYOffset\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Chart.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\DataSeriesValues and null will always evaluate to false\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Chart/DataSeries.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\DataSeriesValues\\:\\:\\$dataTypeValues has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/DataSeriesValues.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\DataSeriesValues\\:\\:\\$dataSource \\(string\\) does not accept string\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/DataSeriesValues.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\DataSeriesValues\\:\\:\\$fillColor \\(array\\<string\\>\\|string\\) does not accept array\\<string\\>\\|string\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/DataSeriesValues.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\DataSeriesValues\\:\\:refresh\\(\\) has parameter \\$flatten with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/DataSeriesValues.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\GridLines\\:\\:\\$objectState has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/GridLines.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\GridLines\\:\\:\\$lineProperties has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/GridLines.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\GridLines\\:\\:\\$shadowProperties has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/GridLines.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\GridLines\\:\\:\\$glowProperties has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/GridLines.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\GridLines\\:\\:\\$softEdges has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/GridLines.php
-
-		-
-			message: "#^Parameter \\#1 \\$color of method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\GridLines\\:\\:setGlowColor\\(\\) expects string, string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/GridLines.php
-
-		-
-			message: "#^Parameter \\#2 \\$alpha of method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\GridLines\\:\\:setGlowColor\\(\\) expects int, int\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/GridLines.php
-
-		-
-			message: "#^Parameter \\#3 \\$type of method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\GridLines\\:\\:setGlowColor\\(\\) expects string, string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/GridLines.php
-
-		-
-			message: "#^Parameter \\#1 \\$blur of method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\GridLines\\:\\:setShadowBlur\\(\\) expects float, string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/GridLines.php
-
-		-
-			message: "#^Parameter \\#1 \\$angle of method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\GridLines\\:\\:setShadowAngle\\(\\) expects int, int\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/GridLines.php
-
-		-
-			message: "#^Parameter \\#1 \\$distance of method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\GridLines\\:\\:setShadowDistance\\(\\) expects float, float\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/GridLines.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Legend\\:\\:\\$positionXLref has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Legend.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Legend\\:\\:\\$layout \\(PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Layout\\) does not accept PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Layout\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Legend.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\PlotArea\\:\\:\\$layout \\(PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Layout\\) does not accept PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Layout\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/PlotArea.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Properties\\:\\:getTrueAlpha\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Properties.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Properties\\:\\:getTrueAlpha\\(\\) has parameter \\$alpha with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Properties.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Properties\\:\\:setColorProperties\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Properties.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Properties\\:\\:setColorProperties\\(\\) has parameter \\$alpha with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Properties.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Properties\\:\\:setColorProperties\\(\\) has parameter \\$color with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Properties.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Properties\\:\\:setColorProperties\\(\\) has parameter \\$type with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Properties.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Properties\\:\\:getLineStyleArrowSize\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Properties.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Properties\\:\\:getLineStyleArrowSize\\(\\) has parameter \\$array_kay_selector with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Properties.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Properties\\:\\:getLineStyleArrowSize\\(\\) has parameter \\$array_selector with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Properties.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Properties\\:\\:getShadowPresetsMap\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Properties.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Properties\\:\\:getShadowPresetsMap\\(\\) has parameter \\$shadow_presets_option with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Properties.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Properties\\:\\:getArrayElementsValue\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Properties.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Properties\\:\\:getArrayElementsValue\\(\\) has parameter \\$elements with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Properties.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Properties\\:\\:getArrayElementsValue\\(\\) has parameter \\$properties with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Properties.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:\\$width has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:\\$height has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:\\$colourSet has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:\\$markSet has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:\\$chart has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:\\$graph has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:\\$plotColour has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:\\$plotMark has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:formatPointMarker\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:formatPointMarker\\(\\) has parameter \\$markerID with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:formatPointMarker\\(\\) has parameter \\$seriesPlot with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:formatDataSetLabels\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:formatDataSetLabels\\(\\) has parameter \\$datasetLabels with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:formatDataSetLabels\\(\\) has parameter \\$groupID with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:formatDataSetLabels\\(\\) has parameter \\$labelCount with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:formatDataSetLabels\\(\\) has parameter \\$rotation with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:percentageSumCalculation\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:percentageSumCalculation\\(\\) has parameter \\$groupID with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:percentageSumCalculation\\(\\) has parameter \\$seriesCount with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:percentageAdjustValues\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:percentageAdjustValues\\(\\) has parameter \\$dataValues with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:percentageAdjustValues\\(\\) has parameter \\$sumValues with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:getCaption\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:getCaption\\(\\) has parameter \\$captionElement with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:renderCartesianPlotArea\\(\\) has parameter \\$type with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:renderPlotLine\\(\\) has parameter \\$combination with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:renderPlotLine\\(\\) has parameter \\$dimensions with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:renderPlotLine\\(\\) has parameter \\$filled with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:renderPlotLine\\(\\) has parameter \\$groupID with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:renderPlotBar\\(\\) has parameter \\$dimensions with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:renderPlotBar\\(\\) has parameter \\$groupID with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:renderPlotScatter\\(\\) has parameter \\$bubble with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:renderPlotScatter\\(\\) has parameter \\$groupID with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:renderPlotRadar\\(\\) has parameter \\$groupID with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:renderPlotContour\\(\\) has parameter \\$groupID with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:renderPlotStock\\(\\) has parameter \\$groupID with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:renderAreaChart\\(\\) has parameter \\$dimensions with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:renderAreaChart\\(\\) has parameter \\$groupCount with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:renderLineChart\\(\\) has parameter \\$dimensions with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:renderLineChart\\(\\) has parameter \\$groupCount with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:renderBarChart\\(\\) has parameter \\$dimensions with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:renderBarChart\\(\\) has parameter \\$groupCount with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:renderScatterChart\\(\\) has parameter \\$groupCount with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:renderBubbleChart\\(\\) has parameter \\$groupCount with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:renderPieChart\\(\\) has parameter \\$dimensions with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:renderPieChart\\(\\) has parameter \\$doughnut with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:renderPieChart\\(\\) has parameter \\$groupCount with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:renderPieChart\\(\\) has parameter \\$multiplePlots with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:renderRadarChart\\(\\) has parameter \\$groupCount with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:renderStockChart\\(\\) has parameter \\$groupCount with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:renderContourChart\\(\\) has parameter \\$dimensions with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:renderContourChart\\(\\) has parameter \\$groupCount with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:renderCombinationChart\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:renderCombinationChart\\(\\) has parameter \\$dimensions with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:renderCombinationChart\\(\\) has parameter \\$groupCount with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Renderer\\\\JpGraph\\:\\:renderCombinationChart\\(\\) has parameter \\$outputDestination with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Title\\:\\:\\$layout \\(PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Layout\\) does not accept PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Layout\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Chart/Title.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Collection\\\\Cells\\:\\:getParent\\(\\) should return PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet but returns PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Collection/Cells.php
-
-		-
-			message: "#^Parameter \\#1 \\$string of function substr expects string, string\\|false given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Collection/Cells.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Collection\\\\Cells\\:\\:getCurrentCoordinate\\(\\) should return string but returns string\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Collection/Cells.php
-
-		-
-			message: "#^Parameter \\#1 \\$str of function sscanf expects string, string\\|null given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Collection/Cells.php
-
-		-
-			message: "#^Parameter \\#1 \\$columnIndex of static method PhpOffice\\\\PhpSpreadsheet\\\\Cell\\\\Coordinate\\:\\:stringFromColumnIndex\\(\\) expects int, int\\|false given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Collection/Cells.php
-
-		-
-			message: "#^Possibly invalid array key type \\(array\\|string\\)\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Collection/Cells.php
-
-		-
-			message: "#^Cannot call method detach\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Cell\\\\Cell\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Collection/Cells.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Collection\\\\Memory\\:\\:\\$cache has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Collection/Memory.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\DefinedName\\:\\:\\$worksheet \\(PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\) does not accept PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\|null\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/DefinedName.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\DefinedName\\:\\:\\$scope \\(PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\) does not accept PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\|null\\.$#"
-			count: 3
-			path: src/PhpSpreadsheet/DefinedName.php
-
-		-
-			message: "#^Parameter \\#1 \\$namedRange of method PhpOffice\\\\PhpSpreadsheet\\\\Spreadsheet\\:\\:addNamedRange\\(\\) expects PhpOffice\\\\PhpSpreadsheet\\\\NamedRange, \\$this\\(PhpOffice\\\\PhpSpreadsheet\\\\DefinedName\\) given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/DefinedName.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\HashTable\\:\\:getIndexForHashCode\\(\\) should return int but returns int\\|string\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/HashTable.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Helper\\\\Html\\:\\:\\$colourMap has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Helper/Html.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Helper\\\\Html\\:\\:\\$face has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Helper/Html.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Helper\\\\Html\\:\\:\\$size has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Helper/Html.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Helper\\\\Html\\:\\:\\$color has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Helper/Html.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Helper\\\\Html\\:\\:\\$bold has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Helper/Html.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Helper\\\\Html\\:\\:\\$italic has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Helper/Html.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Helper\\\\Html\\:\\:\\$underline has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Helper/Html.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Helper\\\\Html\\:\\:\\$superscript has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Helper/Html.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Helper\\\\Html\\:\\:\\$subscript has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Helper/Html.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Helper\\\\Html\\:\\:\\$strikethrough has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Helper/Html.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Helper\\\\Html\\:\\:\\$startTagCallbacks has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Helper/Html.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Helper\\\\Html\\:\\:\\$endTagCallbacks has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Helper/Html.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Helper\\\\Html\\:\\:\\$stack has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Helper/Html.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Helper\\\\Html\\:\\:\\$stringData has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Helper/Html.php
-
-		-
-			message: "#^Parameter \\#1 \\$text of method PhpOffice\\\\PhpSpreadsheet\\\\RichText\\\\ITextElement\\:\\:setText\\(\\) expects string, string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Helper/Html.php
-
-		-
-			message: "#^Cannot call method setName\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Helper/Html.php
-
-		-
-			message: "#^Cannot call method setSize\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Helper/Html.php
-
-		-
-			message: "#^Cannot call method setColor\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Helper/Html.php
-
-		-
-			message: "#^Cannot call method setBold\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Helper/Html.php
-
-		-
-			message: "#^Cannot call method setItalic\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Helper/Html.php
-
-		-
-			message: "#^Cannot call method setUnderline\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Helper/Html.php
-
-		-
-			message: "#^Cannot call method setSuperscript\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Helper/Html.php
-
-		-
-			message: "#^Cannot call method setSubscript\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Helper/Html.php
-
-		-
-			message: "#^Cannot call method setStrikethrough\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Helper/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Helper\\\\Html\\:\\:rgbToColour\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Helper/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Helper\\\\Html\\:\\:rgbToColour\\(\\) has parameter \\$rgb with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Helper/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Helper\\\\Html\\:\\:startFontTag\\(\\) has parameter \\$tag with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Helper/Html.php
-
-		-
-			message: "#^Parameter \\#1 \\$function of function call_user_func expects callable\\(\\)\\: mixed, array\\(\\$this\\(PhpOffice\\\\PhpSpreadsheet\\\\Helper\\\\Html\\), mixed\\) given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Helper/Html.php
-
-		-
-			message: "#^Parameter \\#1 \\$directory of class RecursiveDirectoryIterator constructor expects string, string\\|false given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Helper/Sample.php
-
-		-
-			message: "#^Parameter \\#3 \\$subject of function str_replace expects array\\|string, string\\|false given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Helper/Sample.php
-
-		-
-			message: "#^Parameter \\#1 \\$path of function pathinfo expects string, array\\|string given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Helper/Sample.php
-
-		-
-			message: "#^Parameter \\#3 \\$subject of function str_replace expects array\\|string, string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Helper/Sample.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Helper\\\\Sample\\:\\:getSamples\\(\\) should return array\\<array\\<string\\>\\> but returns array\\<string, array\\<string, array\\|string\\>\\>\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Helper/Sample.php
-
-		-
-			message: "#^Parameter \\#1 \\$filename of function unlink expects string, string\\|false given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Helper/Sample.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Helper\\\\Sample\\:\\:log\\(\\) has parameter \\$message with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Helper/Sample.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\IOFactory\\:\\:\\$readers has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/IOFactory.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\IOFactory\\:\\:\\$writers has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/IOFactory.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\BaseReader\\:\\:\\$fileHandle has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/BaseReader.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\BaseReader\\:\\:getSecurityScanner\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/BaseReader.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Html\\:\\:\\$rowspan has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Html\\:\\:readBeginning\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Html\\:\\:readEnding\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Html.php
-
-		-
-			message: "#^Parameter \\#2 \\$length of function fread expects int, int\\<min, \\-1\\>\\|int\\<1, 2048\\>\\|false given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Html\\:\\:startsWithTag\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Html\\:\\:startsWithTag\\(\\) has parameter \\$data with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Html\\:\\:endsWithTag\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Html\\:\\:endsWithTag\\(\\) has parameter \\$data with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Html\\:\\:containsTags\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Html\\:\\:containsTags\\(\\) has parameter \\$data with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Html.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Html\\:\\:\\$dataArray has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Html.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Html\\:\\:\\$tableLevel has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Html.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Html\\:\\:\\$nestedColumn has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Html\\:\\:setTableStartColumn\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Html\\:\\:setTableStartColumn\\(\\) has parameter \\$column with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Html\\:\\:getTableStartColumn\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Html\\:\\:releaseTableStartColumn\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Html\\:\\:flushCell\\(\\) has parameter \\$cellContent with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Html\\:\\:flushCell\\(\\) has parameter \\$column with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Html\\:\\:flushCell\\(\\) has parameter \\$row with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Html.php
-
-		-
-			message: "#^Argument of an invalid type DOMNamedNodeMap\\|null supplied for foreach, only iterables are supported\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Html.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Html\\:\\:\\$spanEtc has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Html.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Html\\:\\:\\$h1Etc has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Html.php
-
-		-
-			message: "#^Parameter \\#2 \\$styleValue of method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Html\\:\\:setBorderStyle\\(\\) expects string, string\\|null given\\.$#"
-			count: 5
-			path: src/PhpSpreadsheet/Reader/Html.php
-
-		-
-			message: "#^Parameter \\#3 \\$subject of function str_replace expects array\\|string, string\\|null given\\.$#"
-			count: 4
-			path: src/PhpSpreadsheet/Reader/Html.php
-
-		-
-			message: "#^Parameter \\#1 \\$pValue of method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Alignment\\:\\:setHorizontal\\(\\) expects string, string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Html.php
-
-		-
-			message: "#^Parameter \\#1 \\$pValue of method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Alignment\\:\\:setVertical\\(\\) expects string, string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Html\\:\\:getStyleColor\\(\\) has parameter \\$value with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Html.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Html\\:\\:\\$borderMappings has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Html.php
-
-		-
-			message: "#^Cannot call method getNamespaces\\(\\) on SimpleXMLElement\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Ods.php
-
-		-
-			message: "#^Cannot call method children\\(\\) on SimpleXMLElement\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Ods.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Ods\\:\\:listWorksheetNames\\(\\) should return array\\<string\\> but returns array\\<int, string\\|null\\>\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Ods.php
-
-		-
-			message: "#^Cannot call method getElementsByTagNameNS\\(\\) on DOMElement\\|null\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Reader/Ods.php
-
-		-
-			message: "#^Parameter \\#1 \\$element of method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Ods\\:\\:scanElementForText\\(\\) expects DOMNode, DOMElement\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Ods.php
-
-		-
-			message: "#^Cannot call method getAttributeNS\\(\\) on DOMElement\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Ods.php
-
-		-
-			message: "#^Parameter \\#1 \\$settings of method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Ods\\:\\:lookForActiveSheet\\(\\) expects DOMElement, DOMElement\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Ods.php
-
-		-
-			message: "#^Parameter \\#1 \\$settings of method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Ods\\:\\:lookForSelectedCells\\(\\) expects DOMElement, DOMElement\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Ods.php
-
-		-
-			message: "#^Cannot call method setSelectedCellByColumnAndRow\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Ods.php
-
-		-
-			message: "#^Cannot call method getNamedItem\\(\\) on DOMNamedNodeMap\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Ods.php
-
-		-
-			message: "#^If condition is always true\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Ods.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Ods\\\\PageSettings\\:\\:\\$officeNs has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Ods/PageSettings.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Ods\\\\PageSettings\\:\\:\\$stylesNs has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Ods/PageSettings.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Ods\\\\PageSettings\\:\\:\\$stylesFo has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Ods/PageSettings.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Ods\\\\PageSettings\\:\\:\\$pageLayoutStyles has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Ods/PageSettings.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Ods\\\\PageSettings\\:\\:\\$masterStylesCrossReference has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Ods/PageSettings.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Ods\\\\PageSettings\\:\\:\\$masterPrintStylesCrossReference has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Ods/PageSettings.php
-
-		-
-			message: "#^Cannot call method getElementsByTagNameNS\\(\\) on DOMElement\\|null\\.$#"
-			count: 3
-			path: src/PhpSpreadsheet/Reader/Ods/PageSettings.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Ods\\\\Properties\\:\\:\\$spreadsheet has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Ods/Properties.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Ods\\\\Properties\\:\\:load\\(\\) has parameter \\$namespacesMeta with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Ods/Properties.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Ods\\\\Properties\\:\\:setMetaProperties\\(\\) has parameter \\$namespacesMeta with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Ods/Properties.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Ods\\\\Properties\\:\\:setMetaProperties\\(\\) has parameter \\$propertyName with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Ods/Properties.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Ods\\\\Properties\\:\\:setUserDefinedProperty\\(\\) has parameter \\$propertyValue with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Ods/Properties.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Ods\\\\Properties\\:\\:setUserDefinedProperty\\(\\) has parameter \\$propertyValueAttributes with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Ods/Properties.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Security\\\\XmlScanner\\:\\:\\$callback has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Security/XmlScanner.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Security\\\\XmlScanner\\:\\:\\$libxmlDisableEntityLoaderValue has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Security/XmlScanner.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Security\\\\XmlScanner\\:\\:__construct\\(\\) has parameter \\$pattern with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Security/XmlScanner.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Security\\\\XmlScanner\\:\\:getInstance\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Security/XmlScanner.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Security\\\\XmlScanner\\:\\:threadSafeLibxmlDisableEntityLoaderAvailability\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Security/XmlScanner.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Security\\\\XmlScanner\\:\\:toUtf8\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Security/XmlScanner.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Security\\\\XmlScanner\\:\\:toUtf8\\(\\) has parameter \\$xml with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Security/XmlScanner.php
-
-		-
-			message: "#^Parameter \\#2 \\$subject of function preg_match expects string, array\\<int, string\\>\\|string\\|false given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Security/XmlScanner.php
-
-		-
-			message: "#^Parameter \\#1 \\$haystack of function substr_count expects string, string\\|false given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Slk.php
-
-		-
-			message: "#^Parameter \\#2 \\$str of function explode expects string, string\\|false given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Slk.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Slk\\:\\:\\$colorArray has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Slk.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Slk\\:\\:\\$fontStyleMappings has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Slk.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Slk\\:\\:\\$styleSettingsFont has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Slk.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Slk\\:\\:\\$styleSettingsBorder has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Slk.php
-
-		-
-			message: "#^Parameter \\#1 \\$columnIndex of static method PhpOffice\\\\PhpSpreadsheet\\\\Cell\\\\Coordinate\\:\\:stringFromColumnIndex\\(\\) expects int, string given\\.$#"
-			count: 3
-			path: src/PhpSpreadsheet/Reader/Slk.php
-
-		-
-			message: "#^Call to an undefined method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\\\SpgrContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\\\SpgrContainer\\\\SpContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\\\BstoreContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\\\BstoreContainer\\\\BSE\\:\\:getDgContainer\\(\\)\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls.php
-
-		-
-			message: "#^Call to an undefined method object\\:\\:getNestingLevel\\(\\)\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls.php
-
-		-
-			message: "#^Call to an undefined method object\\:\\:getStartCoordinates\\(\\)\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Reader/Xls.php
-
-		-
-			message: "#^Call to an undefined method object\\:\\:getEndCoordinates\\(\\)\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls.php
-
-		-
-			message: "#^Call to an undefined method object\\:\\:getStartOffsetX\\(\\)\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls.php
-
-		-
-			message: "#^Call to an undefined method object\\:\\:getStartOffsetY\\(\\)\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls.php
-
-		-
-			message: "#^Call to an undefined method object\\:\\:getEndOffsetX\\(\\)\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls.php
-
-		-
-			message: "#^Call to an undefined method object\\:\\:getEndOffsetY\\(\\)\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls.php
-
-		-
-			message: "#^Parameter \\#2 \\$startRow of static method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Xls\\:\\:getDistanceY\\(\\) expects int, string given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls.php
-
-		-
-			message: "#^Parameter \\#4 \\$endRow of static method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Xls\\:\\:getDistanceY\\(\\) expects int, string given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls.php
-
-		-
-			message: "#^Parameter \\#2 \\$row of static method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Xls\\:\\:sizeRow\\(\\) expects int, string given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls.php
-
-		-
-			message: "#^Call to an undefined method object\\:\\:getOPT\\(\\)\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls.php
-
-		-
-			message: "#^Call to an undefined method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\\\SpgrContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\\\SpgrContainer\\\\SpContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\\\BstoreContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\\\BstoreContainer\\\\BSE\\:\\:getDggContainer\\(\\)\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls.php
-
-		-
-			message: "#^If condition is always true\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls.php
-
-		-
-			message: "#^Parameter \\#1 \\$value of method PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\MemoryDrawing\\:\\:setImageResource\\(\\) expects GdImage\\|resource, resource\\|false given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls.php
-
-		-
-			message: "#^Parameter \\#1 \\$pValue of method PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\BaseDrawing\\:\\:setOffsetX\\(\\) expects int, float\\|int given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls.php
-
-		-
-			message: "#^Parameter \\#1 \\$pValue of method PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\BaseDrawing\\:\\:setOffsetY\\(\\) expects int, float\\|int given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls.php
-
-		-
-			message: "#^Parameter \\#2 \\$row of method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\IReadFilter\\:\\:readCell\\(\\) expects int, string given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls.php
-
-		-
-			message: "#^Negated boolean expression is always false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls.php
-
-		-
-			message: "#^Parameter \\#1 \\$block of method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xls\\:\\:makeKey\\(\\) expects int, float given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Reader/Xls.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xls\\:\\:\\$data \\(string\\) does not accept string\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xls\\:\\:\\$summaryInformation \\(string\\) does not accept string\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xls\\:\\:\\$documentSummaryInformation \\(string\\) does not accept string\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls.php
-
-		-
-			message: "#^Parameter \\#3 \\$subject of function str_replace expects array\\|string, int\\|string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls.php
-
-		-
-			message: "#^Parameter \\#2 \\$pos of static method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xls\\:\\:getUInt2d\\(\\) expects int, float\\|int given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls.php
-
-		-
-			message: "#^Parameter \\#2 \\$pos of static method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xls\\:\\:getInt4d\\(\\) expects int, float\\|int given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls.php
-
-		-
-			message: "#^Parameter \\#2 \\$start of function substr expects int, float\\|int given\\.$#"
-			count: 5
-			path: src/PhpSpreadsheet/Reader/Xls.php
-
-		-
-			message: "#^Parameter \\#1 \\$pValue of method PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\:\\:setShowSummaryBelow\\(\\) expects bool, int given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls.php
-
-		-
-			message: "#^Parameter \\#1 \\$pValue of method PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\:\\:setShowSummaryRight\\(\\) expects bool, int given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xls\\:\\:includeCellRangeFiltered\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xls\\:\\:includeCellRangeFiltered\\(\\) has parameter \\$cellRangeAddress with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls.php
-
-		-
-			message: "#^Parameter \\#1 \\$value of method PhpOffice\\\\PhpSpreadsheet\\\\Cell\\\\DataValidation\\:\\:setType\\(\\) expects string, int\\|string given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls.php
-
-		-
-			message: "#^Parameter \\#1 \\$value of method PhpOffice\\\\PhpSpreadsheet\\\\Cell\\\\DataValidation\\:\\:setErrorStyle\\(\\) expects string, int\\|string given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls.php
-
-		-
-			message: "#^Parameter \\#1 \\$value of method PhpOffice\\\\PhpSpreadsheet\\\\Cell\\\\DataValidation\\:\\:setOperator\\(\\) expects string, int\\|string given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls.php
-
-		-
-			message: "#^Unreachable statement \\- code above always terminates\\.$#"
-			count: 8
-			path: src/PhpSpreadsheet/Reader/Xls.php
-
-		-
-			message: "#^Cannot access offset 1 on array\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xls\\:\\:parseRichText\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xls\\:\\:parseRichText\\(\\) has parameter \\$is with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xls\\\\Color\\\\BIFF5\\:\\:\\$map has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls/Color/BIFF5.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xls\\\\Color\\\\BIFF8\\:\\:\\$map has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls/Color/BIFF8.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xls\\\\Color\\\\BuiltIn\\:\\:\\$map has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls/Color/BuiltIn.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xls\\\\ErrorCode\\:\\:\\$map has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls/ErrorCode.php
-
-		-
-			message: "#^Call to an undefined method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\\\SpgrContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\\\SpgrContainer\\\\SpContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\\\BstoreContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\\\BstoreContainer\\\\BSE\\:\\:setDggContainer\\(\\)\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls/Escher.php
-
-		-
-			message: "#^Call to an undefined method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\\\SpgrContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\\\SpgrContainer\\\\SpContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\\\BstoreContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\\\BstoreContainer\\\\BSE\\:\\:setBstoreContainer\\(\\)\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls/Escher.php
-
-		-
-			message: "#^Call to an undefined method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\\\SpgrContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\\\SpgrContainer\\\\SpContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\\\BstoreContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\\\BstoreContainer\\\\BSE\\:\\:addBSE\\(\\)\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls/Escher.php
-
-		-
-			message: "#^Call to an undefined method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\\\SpgrContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\\\SpgrContainer\\\\SpContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\\\BstoreContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\\\BstoreContainer\\\\BSE\\:\\:setBlip\\(\\)\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Reader/Xls/Escher.php
-
-		-
-			message: "#^Call to an undefined method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\\\SpgrContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\\\SpgrContainer\\\\SpContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\\\BstoreContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\\\BstoreContainer\\\\BSE\\:\\:setDgContainer\\(\\)\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls/Escher.php
-
-		-
-			message: "#^Call to an undefined method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\\\SpgrContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\\\SpgrContainer\\\\SpContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\\\BstoreContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\\\BstoreContainer\\\\BSE\\:\\:addChild\\(\\)\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls/Escher.php
-
-		-
-			message: "#^Call to an undefined method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\\\SpgrContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\\\SpgrContainer\\\\SpContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\\\BstoreContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\\\BstoreContainer\\\\BSE\\:\\:addChild\\(\\)\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls/Escher.php
-
-		-
-			message: "#^Call to an undefined method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\\\SpgrContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\\\SpgrContainer\\\\SpContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\\\BstoreContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\\\BstoreContainer\\\\BSE\\:\\:setStartCoordinates\\(\\)\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls/Escher.php
-
-		-
-			message: "#^Call to an undefined method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\\\SpgrContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\\\SpgrContainer\\\\SpContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\\\BstoreContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\\\BstoreContainer\\\\BSE\\:\\:setStartOffsetX\\(\\)\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls/Escher.php
-
-		-
-			message: "#^Call to an undefined method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\\\SpgrContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\\\SpgrContainer\\\\SpContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\\\BstoreContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\\\BstoreContainer\\\\BSE\\:\\:setStartOffsetY\\(\\)\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls/Escher.php
-
-		-
-			message: "#^Call to an undefined method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\\\SpgrContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\\\SpgrContainer\\\\SpContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\\\BstoreContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\\\BstoreContainer\\\\BSE\\:\\:setEndCoordinates\\(\\)\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls/Escher.php
-
-		-
-			message: "#^Call to an undefined method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\\\SpgrContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\\\SpgrContainer\\\\SpContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\\\BstoreContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\\\BstoreContainer\\\\BSE\\:\\:setEndOffsetX\\(\\)\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls/Escher.php
-
-		-
-			message: "#^Call to an undefined method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\\\SpgrContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\\\SpgrContainer\\\\SpContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\\\BstoreContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\\\BstoreContainer\\\\BSE\\:\\:setEndOffsetY\\(\\)\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls/Escher.php
-
-		-
-			message: "#^Call to an undefined method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\\\SpgrContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\\\SpgrContainer\\\\SpContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\\\BstoreContainer\\|PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\\\BstoreContainer\\\\BSE\\:\\:setOPT\\(\\)\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls/Escher.php
-
-		-
-			message: "#^Parameter \\#1 \\$input of function array_values expects array, array\\|false given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls/MD5.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xls\\\\MD5\\:\\:f\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls/MD5.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xls\\\\MD5\\:\\:g\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls/MD5.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xls\\\\MD5\\:\\:h\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls/MD5.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xls\\\\MD5\\:\\:i\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls/MD5.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xls\\\\MD5\\:\\:step\\(\\) has parameter \\$func with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls/MD5.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xls\\\\MD5\\:\\:rotate\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls/MD5.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xls\\\\RC4\\:\\:\\$s has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls/RC4.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xls\\\\RC4\\:\\:\\$i has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls/RC4.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xls\\\\RC4\\:\\:\\$j has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls/RC4.php
-
-		-
-			message: "#^Cannot access property \\$Relationship on SimpleXMLElement\\|false\\.$#"
-			count: 12
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Cannot access property \\$sheets on SimpleXMLElement\\|false\\.$#"
-			count: 6
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Cannot call method registerXPathNamespace\\(\\) on SimpleXMLElement\\|false\\.$#"
-			count: 4
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:castToBoolean\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:castToBoolean\\(\\) has parameter \\$c with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:castToError\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:castToError\\(\\) has parameter \\$c with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:castToString\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:castToString\\(\\) has parameter \\$c with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:castToFormula\\(\\) has parameter \\$c with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:castToFormula\\(\\) has parameter \\$calculatedValue with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:castToFormula\\(\\) has parameter \\$castBaseType with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:castToFormula\\(\\) has parameter \\$cellDataType with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:castToFormula\\(\\) has parameter \\$r with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:castToFormula\\(\\) has parameter \\$sharedFormulas with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:castToFormula\\(\\) has parameter \\$value with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:getFromZipArchive\\(\\) should return string but returns string\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Offset 'name' does not exist on SimpleXMLElement\\|null\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Cannot call method xpath\\(\\) on SimpleXMLElement\\|false\\.$#"
-			count: 4
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Parameter \\#1 \\$is of method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:parseRichText\\(\\) expects SimpleXMLElement\\|null, object given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Parameter \\#1 \\$styleXml of class PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Styles constructor expects SimpleXMLElement, SimpleXMLElement\\|false given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Cannot access property \\$workbookPr on SimpleXMLElement\\|false\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Parameter \\#2 \\$xmlWorkbook of method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:readProtection\\(\\) expects SimpleXMLElement, SimpleXMLElement\\|false given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Parameter \\#1 \\$relsWorksheet of method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Hyperlinks\\:\\:readHyperlinks\\(\\) expects SimpleXMLElement, SimpleXMLElement\\|false given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Cannot access property \\$authors on SimpleXMLElement\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Cannot access property \\$commentList on SimpleXMLElement\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Argument of an invalid type array\\<SimpleXMLElement\\>\\|false supplied for foreach, only iterables are supported\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Negated boolean expression is always true\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Cannot access property \\$drawing on SimpleXMLElement\\|false\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Cannot call method children\\(\\) on SimpleXMLElement\\|false\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Cannot call method count\\(\\) on SimpleXMLElement\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Cannot call method asXML\\(\\) on SimpleXMLElement\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Cannot access property \\$definedNames on SimpleXMLElement\\|false\\.$#"
-			count: 4
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Argument of an invalid type array\\<int, string\\>\\|false supplied for foreach, only iterables are supported\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Parameter \\#1 \\$pName of method PhpOffice\\\\PhpSpreadsheet\\\\Spreadsheet\\:\\:getSheetByName\\(\\) expects string, array\\|string given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Cannot access offset 0 on array\\<int, string\\>\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Cannot access property \\$bookViews on SimpleXMLElement\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Cannot access property \\$Default on SimpleXMLElement\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Cannot access property \\$Override on SimpleXMLElement\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Parameter \\#1 \\$chartElements of static method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Chart\\:\\:readChart\\(\\) expects SimpleXMLElement, SimpleXMLElement\\|false given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Cannot call method addChart\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Cannot access property \\$r on SimpleXMLElement\\|null\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Cannot call method setName\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Cannot call method setSize\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Cannot call method setColor\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Cannot call method setBold\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Cannot call method setItalic\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Cannot call method setSuperscript\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Cannot call method setSubscript\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Cannot call method setUnderline\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Cannot call method setStrikethrough\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:getArrayItem\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:getArrayItem\\(\\) has parameter \\$array with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:getArrayItem\\(\\) has parameter \\$key with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:dirAdd\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:dirAdd\\(\\) has parameter \\$add with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:dirAdd\\(\\) has parameter \\$base with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:toCSSArray\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:toCSSArray\\(\\) has parameter \\$style with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Parameter \\#1 \\$fontSizeInPoints of static method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Font\\:\\:fontSizeToPixels\\(\\) expects int, string given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Parameter \\#1 \\$haystack of function strpos expects string, int\\|string given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Parameter \\#3 \\$subject of function str_replace expects array\\|string, int\\|string given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Parameter \\#1 \\$sizeInInch of static method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Font\\:\\:inchSizeToPixels\\(\\) expects int, string given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Parameter \\#1 \\$sizeInCm of static method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Font\\:\\:centimeterSizeToPixels\\(\\) expects int, string given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:stripWhiteSpaceFromStyleString\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:stripWhiteSpaceFromStyleString\\(\\) has parameter \\$string with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:boolean\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:boolean\\(\\) has parameter \\$value with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Offset 'id' does not exist on SimpleXMLElement\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:readFormControlProperties\\(\\) has parameter \\$dir with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:readFormControlProperties\\(\\) has parameter \\$docSheet with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:readFormControlProperties\\(\\) has parameter \\$fileWorksheet with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:readPrinterSettings\\(\\) has parameter \\$dir with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:readPrinterSettings\\(\\) has parameter \\$docSheet with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:readPrinterSettings\\(\\) has parameter \\$fileWorksheet with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\AutoFilter\\:\\:\\$worksheet has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/AutoFilter.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\AutoFilter\\:\\:\\$worksheetXml has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/AutoFilter.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\AutoFilter\\:\\:readAutoFilter\\(\\) has parameter \\$autoFilterRange with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/AutoFilter.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\AutoFilter\\:\\:readAutoFilter\\(\\) has parameter \\$xmlSheet with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/AutoFilter.php
-
-		-
-			message: "#^Parameter \\#1 \\$pOperator of method PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\AutoFilter\\\\Column\\\\Rule\\:\\:setRule\\(\\) expects string, null given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Reader/Xlsx/AutoFilter.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\BaseParserClass\\:\\:boolean\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/BaseParserClass.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\BaseParserClass\\:\\:boolean\\(\\) has parameter \\$value with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/BaseParserClass.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Chart\\:\\:readColor\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Chart.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Chart\\:\\:readColor\\(\\) has parameter \\$background with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Chart.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Chart\\:\\:readColor\\(\\) has parameter \\$color with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Chart.php
-
-		-
-			message: "#^Parameter \\#1 \\$position of class PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Legend constructor expects string, bool\\|float\\|int\\|string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Chart.php
-
-		-
-			message: "#^Parameter \\#3 \\$overlay of class PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Legend constructor expects bool, bool\\|float\\|int\\|string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Chart.php
-
-		-
-			message: "#^Parameter \\#6 \\$displayBlanksAs of class PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart constructor expects string, bool\\|float\\|int\\|string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Chart.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Chart\\:\\:chartTitle\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Chart.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Chart\\:\\:chartLayoutDetails\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Chart.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Chart\\:\\:chartLayoutDetails\\(\\) has parameter \\$chartDetail with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Chart.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Chart\\:\\:chartLayoutDetails\\(\\) has parameter \\$namespacesChartMeta with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Chart.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Chart\\:\\:chartDataSeries\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Chart.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Chart\\:\\:chartDataSeries\\(\\) has parameter \\$chartDetail with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Chart.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Chart\\:\\:chartDataSeries\\(\\) has parameter \\$namespacesChartMeta with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Chart.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Chart\\:\\:chartDataSeries\\(\\) has parameter \\$plotType with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Chart.php
-
-		-
-			message: "#^Parameter \\#3 \\$plotOrder of class PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\DataSeries constructor expects array\\<int\\>, array\\<int\\|string, bool\\|float\\|int\\|string\\|null\\> given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Chart.php
-
-		-
-			message: "#^Parameter \\#7 \\$plotDirection of class PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\DataSeries constructor expects string\\|null, bool\\|float\\|int\\|string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Chart.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Chart\\:\\:chartDataSeriesValueSet\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Chart.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Chart\\:\\:chartDataSeriesValueSet\\(\\) has parameter \\$marker with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Chart.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Chart\\:\\:chartDataSeriesValueSet\\(\\) has parameter \\$namespacesChartMeta with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Chart.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Chart\\:\\:chartDataSeriesValueSet\\(\\) has parameter \\$seriesDetail with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Chart.php
-
-		-
-			message: "#^Parameter \\#4 \\$pointCount of class PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\DataSeriesValues constructor expects int, null given\\.$#"
-			count: 4
-			path: src/PhpSpreadsheet/Reader/Xlsx/Chart.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Chart\\:\\:chartDataSeriesValues\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Chart.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Chart\\:\\:chartDataSeriesValues\\(\\) has parameter \\$dataType with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Chart.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Chart\\:\\:chartDataSeriesValues\\(\\) has parameter \\$seriesValueSet with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Chart.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Chart\\:\\:chartDataSeriesValuesMultiLevel\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Chart.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Chart\\:\\:chartDataSeriesValuesMultiLevel\\(\\) has parameter \\$dataType with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Chart.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Chart\\:\\:chartDataSeriesValuesMultiLevel\\(\\) has parameter \\$seriesValueSet with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Chart.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Chart\\:\\:parseRichText\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Chart.php
-
-		-
-			message: "#^Cannot call method getFont\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\RichText\\\\Run\\|null\\.$#"
-			count: 12
-			path: src/PhpSpreadsheet/Reader/Xlsx/Chart.php
-
-		-
-			message: "#^Cannot call method setName\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Chart.php
-
-		-
-			message: "#^Cannot call method setSize\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Chart.php
-
-		-
-			message: "#^Cannot call method setColor\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Chart.php
-
-		-
-			message: "#^Cannot call method setBold\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Chart.php
-
-		-
-			message: "#^Cannot call method setItalic\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Chart.php
-
-		-
-			message: "#^Cannot call method setSuperscript\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Chart.php
-
-		-
-			message: "#^Cannot call method setSubscript\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Chart.php
-
-		-
-			message: "#^Cannot call method setUnderline\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 3
-			path: src/PhpSpreadsheet/Reader/Xlsx/Chart.php
-
-		-
-			message: "#^Cannot call method setStrikethrough\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Reader/Xlsx/Chart.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Chart\\:\\:readChartAttributes\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Chart.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Chart\\:\\:readChartAttributes\\(\\) has parameter \\$chartDetail with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Chart.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ColumnAndRowAttributes\\:\\:\\$worksheet has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ColumnAndRowAttributes\\:\\:\\$worksheetXml has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ColumnAndRowAttributes\\:\\:isFilteredColumn\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ColumnAndRowAttributes\\:\\:isFilteredColumn\\(\\) has parameter \\$columnCoordinate with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ColumnAndRowAttributes\\:\\:readColumnAttributes\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ColumnAndRowAttributes\\:\\:readColumnAttributes\\(\\) has parameter \\$readDataOnly with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ColumnAndRowAttributes\\:\\:readColumnRangeAttributes\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ColumnAndRowAttributes\\:\\:readColumnRangeAttributes\\(\\) has parameter \\$readDataOnly with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ColumnAndRowAttributes\\:\\:isFilteredRow\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ColumnAndRowAttributes\\:\\:isFilteredRow\\(\\) has parameter \\$rowCoordinate with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ColumnAndRowAttributes\\:\\:readRowAttributes\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ColumnAndRowAttributes\\:\\:readRowAttributes\\(\\) has parameter \\$readDataOnly with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ConditionalStyles\\:\\:\\$worksheet has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ConditionalStyles\\:\\:\\$worksheetXml has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ConditionalStyles\\:\\:\\$dxfs has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ConditionalStyles\\:\\:readConditionalStyles\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ConditionalStyles\\:\\:readConditionalStyles\\(\\) has parameter \\$xmlSheet with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ConditionalStyles\\:\\:setConditionalStyles\\(\\) has parameter \\$xmlExtLst with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ConditionalStyles\\:\\:readStyleRules\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ConditionalStyles\\:\\:readStyleRules\\(\\) has parameter \\$cfRules with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ConditionalStyles\\:\\:readStyleRules\\(\\) has parameter \\$extLst with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ConditionalStyles\\:\\:readDataBarOfConditionalRule\\(\\) has parameter \\$cfRule with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ConditionalStyles\\:\\:readDataBarOfConditionalRule\\(\\) has parameter \\$conditionalFormattingRuleExtensions with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ConditionalStyles\\:\\:readDataBarExtLstOfConditionalRule\\(\\) has parameter \\$cfRule with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ConditionalStyles\\:\\:readDataBarExtLstOfConditionalRule\\(\\) has parameter \\$conditionalFormattingRuleExtensions with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\DataValidations\\:\\:\\$worksheet has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/DataValidations.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\DataValidations\\:\\:\\$worksheetXml has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/DataValidations.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Hyperlinks\\:\\:\\$worksheet has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Hyperlinks.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Hyperlinks\\:\\:\\$hyperlinks has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Hyperlinks.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\PageSetup\\:\\:\\$worksheet has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/PageSetup.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\PageSetup\\:\\:\\$worksheetXml has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/PageSetup.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\PageSetup\\:\\:load\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/PageSetup.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\PageSetup\\:\\:pageSetup\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/PageSetup.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Properties\\:\\:\\$securityScanner has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Properties.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Properties\\:\\:\\$docProps has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Properties.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Properties\\:\\:extractPropertyData\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Properties.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Properties\\:\\:extractPropertyData\\(\\) has parameter \\$propertyData with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Properties.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Properties\\:\\:readCoreProperties\\(\\) has parameter \\$propertyData with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Properties.php
-
-		-
-			message: "#^Call to an undefined method object\\:\\:registerXPathNamespace\\(\\)\\.$#"
-			count: 3
-			path: src/PhpSpreadsheet/Reader/Xlsx/Properties.php
-
-		-
-			message: "#^Call to an undefined method object\\:\\:xpath\\(\\)\\.$#"
-			count: 9
-			path: src/PhpSpreadsheet/Reader/Xlsx/Properties.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Properties\\:\\:readExtendedProperties\\(\\) has parameter \\$propertyData with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Properties.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Properties\\:\\:readCustomProperties\\(\\) has parameter \\$propertyData with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Properties.php
-
-		-
-			message: "#^Argument of an invalid type object supplied for foreach, only iterables are supported\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Properties.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Properties\\:\\:getArrayItem\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Properties.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Properties\\:\\:getArrayItem\\(\\) has parameter \\$key with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Properties.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\SheetViewOptions\\:\\:\\$worksheet has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/SheetViewOptions.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\SheetViewOptions\\:\\:\\$worksheetXml has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/SheetViewOptions.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\SheetViews\\:\\:\\$sheetViewXml has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/SheetViews.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\SheetViews\\:\\:\\$worksheet has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/SheetViews.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Styles\\:\\:\\$styles has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Styles.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Styles\\:\\:\\$cellStyles has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Styles.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Styles\\:\\:\\$styleXml has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Styles.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Styles\\:\\:setStyleBaseData\\(\\) has parameter \\$cellStyles with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Styles.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Styles\\:\\:setStyleBaseData\\(\\) has parameter \\$styles with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Styles.php
-
-		-
-			message: "#^Static property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Styles\\:\\:\\$theme \\(PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Theme\\) does not accept PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Theme\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Styles.php
-
-		-
-			message: "#^Cannot call method count\\(\\) on SimpleXMLElement\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Styles.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Styles\\:\\:readStyle\\(\\) has parameter \\$style with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Styles.php
-
-		-
-			message: "#^Parameter \\#2 \\$alignmentXml of static method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Styles\\:\\:readAlignmentStyle\\(\\) expects SimpleXMLElement, object given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Styles.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Styles\\:\\:readProtectionLocked\\(\\) has parameter \\$style with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Styles.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Styles\\:\\:readProtectionHidden\\(\\) has parameter \\$style with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Styles.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Styles\\:\\:readColor\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Styles.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Styles\\:\\:readColor\\(\\) has parameter \\$background with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Styles.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Styles\\:\\:readColor\\(\\) has parameter \\$color with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Styles.php
-
-		-
-			message: "#^Parameter \\#1 \\$hex of static method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Color\\:\\:changeBrightness\\(\\) expects string, string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Styles.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Styles\\:\\:dxfs\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Styles.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Styles\\:\\:dxfs\\(\\) has parameter \\$readDataOnly with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Styles.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Styles\\:\\:styles\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Styles.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Styles\\:\\:getArrayItem\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Styles.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Styles\\:\\:getArrayItem\\(\\) has parameter \\$array with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Styles.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Styles\\:\\:getArrayItem\\(\\) has parameter \\$key with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Styles.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xml\\:\\:\\$fileContents has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xml.php
-
-		-
-			message: "#^Parameter \\#1 \\$haystack of function strpos expects string, string\\|false given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xml.php
-
-		-
-			message: "#^Parameter \\#2 \\$subject of function preg_match expects string, string\\|false given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xml.php
-
-		-
-			message: "#^Parameter \\#1 \\$value of static method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\StringHelper\\:\\:convertEncoding\\(\\) expects string, string\\|false given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xml.php
-
-		-
-			message: "#^Parameter \\#2 \\$cmp_function of function uksort expects callable\\(mixed, mixed\\)\\: int, array\\('self', 'cellReverseSort'\\) given\\.$#"
-			count: 4
-			path: src/PhpSpreadsheet/ReferenceHelper.php
-
-		-
-			message: "#^Parameter \\#2 \\$cmp_function of function uksort expects callable\\(mixed, mixed\\)\\: int, array\\('self', 'cellSort'\\) given\\.$#"
-			count: 4
-			path: src/PhpSpreadsheet/ReferenceHelper.php
-
-		-
-			message: "#^Parameter \\#1 \\$index of method PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\RowDimension\\:\\:setRowIndex\\(\\) expects int, string given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/ReferenceHelper.php
-
-		-
-			message: "#^Parameter \\#1 \\$columnIndex of static method PhpOffice\\\\PhpSpreadsheet\\\\Cell\\\\Coordinate\\:\\:stringFromColumnIndex\\(\\) expects int, float\\|int given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/ReferenceHelper.php
-
-		-
-			message: "#^Parameter \\#1 \\$pCellRange of method PhpOffice\\\\PhpSpreadsheet\\\\ReferenceHelper\\:\\:updateCellReference\\(\\) expects string, string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/ReferenceHelper.php
-
-		-
-			message: "#^Parameter \\#3 \\$subject of function str_replace expects array\\|string, string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/ReferenceHelper.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\RichText\\\\Run\\:\\:\\$font \\(PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\) does not accept PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/RichText/Run.php
-
-		-
-			message: "#^Result of && is always false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Settings.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between int and null will always evaluate to false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Settings.php
-
-		-
-			message: "#^Negated boolean expression is always false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Settings.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Settings\\:\\:getHttpClient\\(\\) should return Psr\\\\Http\\\\Client\\\\ClientInterface but returns Psr\\\\Http\\\\Client\\\\ClientInterface\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Settings.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Settings\\:\\:getRequestFactory\\(\\) should return Psr\\\\Http\\\\Message\\\\RequestFactoryInterface but returns Psr\\\\Http\\\\Message\\\\RequestFactoryInterface\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Settings.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\CodePage\\:\\:\\$pageArray has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/CodePage.php
-
-		-
-			message: "#^Parameter \\#1 \\$dateValue of static method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Date\\:\\:timestampToExcel\\(\\) expects int, float\\|int\\|string given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Date.php
-
-		-
-			message: "#^Parameter \\#1 \\$string of function substr expects string, int given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Shared/Date.php
-
-		-
-			message: "#^Parameter \\#1 \\$pFormatCode of static method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Date\\:\\:isDateTimeFormatCode\\(\\) expects string, string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Date.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Date\\:\\:\\$possibleDateFormatCharacters has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Date.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Drawing\\:\\:pixelsToCellDimension\\(\\) should return int but returns float\\|int\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Drawing.php
-
-		-
-			message: "#^Parameter \\#1 \\$fp of function fread expects resource, resource\\|false given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Shared/Drawing.php
-
-		-
-			message: "#^Parameter \\#1 \\$fp of function feof expects resource, resource\\|false given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Drawing.php
-
-		-
-			message: "#^Parameter \\#2 \\$data of function unpack expects string, string\\|false given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Drawing.php
-
-		-
-			message: "#^Cannot access offset 1 on array\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Drawing.php
-
-		-
-			message: "#^Parameter \\#1 \\$x_size of function imagecreatetruecolor expects int, float\\|int given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Drawing.php
-
-		-
-			message: "#^Parameter \\#2 \\$y_size of function imagecreatetruecolor expects int, float\\|int given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Drawing.php
-
-		-
-			message: "#^Parameter \\#1 \\$im of function imagecolorallocate expects resource, resource\\|false given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Drawing.php
-
-		-
-			message: "#^Parameter \\#2 \\$red of function imagecolorallocate expects int, float\\|int given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Drawing.php
-
-		-
-			message: "#^Parameter \\#3 \\$green of function imagecolorallocate expects int, float\\|int given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Drawing.php
-
-		-
-			message: "#^Parameter \\#4 \\$blue of function imagecolorallocate expects int, float\\|int given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Drawing.php
-
-		-
-			message: "#^Parameter \\#1 \\$im of function imagesetpixel expects resource, resource\\|false given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Drawing.php
-
-		-
-			message: "#^Parameter \\#3 \\$y of function imagesetpixel expects int, float\\|int given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Drawing.php
-
-		-
-			message: "#^Parameter \\#4 \\$col of function imagesetpixel expects int, int\\|false given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Drawing.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Drawing\\:\\:imagecreatefrombmp\\(\\) should return GdImage\\|resource but returns resource\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Drawing.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\:\\:\\$spgrContainer has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Escher/DgContainer.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\:\\:getDgId\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Escher/DgContainer.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\:\\:setDgId\\(\\) has parameter \\$value with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Escher/DgContainer.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\:\\:getLastSpId\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Escher/DgContainer.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\:\\:setLastSpId\\(\\) has parameter \\$value with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Escher/DgContainer.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\:\\:getSpgrContainer\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Escher/DgContainer.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\:\\:setSpgrContainer\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Escher/DgContainer.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\:\\:setSpgrContainer\\(\\) has parameter \\$spgrContainer with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Escher/DgContainer.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DgContainer\\\\SpgrContainer\\:\\:getChildren\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Escher/DgContainer/SpgrContainer.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between string\\|false and null will always evaluate to false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/File.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\File\\:\\:realpath\\(\\) should return string but returns string\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/File.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\File\\:\\:sysGetTempDir\\(\\) should return string but returns string\\|false\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Shared/File.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Font\\:\\:\\$autoSizeMethods has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Font.php
-
-		-
-			message: "#^Parameter \\#1 \\$pValue of static method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Drawing\\:\\:pixelsToCellDimension\\(\\) expects int, float\\|int given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Font.php
-
-		-
-			message: "#^Parameter \\#2 \\$pDefaultFont of static method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Drawing\\:\\:pixelsToCellDimension\\(\\) expects PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font, PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Font.php
-
-		-
-			message: "#^Parameter \\#1 \\$size of function imagettfbbox expects float, float\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Font.php
-
-		-
-			message: "#^Cannot access offset 0 on array\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Font.php
-
-		-
-			message: "#^Cannot access offset 2 on array\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Font.php
-
-		-
-			message: "#^Cannot access offset 4 on array\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Font.php
-
-		-
-			message: "#^Cannot access offset 6 on array\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Font.php
-
-		-
-			message: "#^Unreachable statement \\- code above always terminates\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Font.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\JAMA\\\\EigenvalueDecomposition\\:\\:\\$e has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/JAMA/EigenvalueDecomposition.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\JAMA\\\\EigenvalueDecomposition\\:\\:\\$cdivi has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/JAMA/EigenvalueDecomposition.php
-
-		-
-			message: "#^Else branch is unreachable because previous condition is always true\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/JAMA/LUDecomposition.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\JAMA\\\\LUDecomposition\\:\\:getDoublePivot\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/JAMA/LUDecomposition.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\JAMA\\\\Matrix\\:\\:__construct\\(\\) has parameter \\$args with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/JAMA/Matrix.php
-
-		-
-			message: "#^Unreachable statement \\- code above always terminates\\.$#"
-			count: 19
-			path: src/PhpSpreadsheet/Shared/JAMA/Matrix.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\JAMA\\\\Matrix\\:\\:getMatrix\\(\\) has parameter \\$args with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/JAMA/Matrix.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\JAMA\\\\Matrix\\:\\:plus\\(\\) has parameter \\$args with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/JAMA/Matrix.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\JAMA\\\\Matrix\\:\\:plusEquals\\(\\) has parameter \\$args with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/JAMA/Matrix.php
-
-		-
-			message: "#^Call to function is_string\\(\\) with float\\|int will always evaluate to false\\.$#"
-			count: 5
-			path: src/PhpSpreadsheet/Shared/JAMA/Matrix.php
-
-		-
-			message: "#^Result of && is always false\\.$#"
-			count: 10
-			path: src/PhpSpreadsheet/Shared/JAMA/Matrix.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\JAMA\\\\Matrix\\:\\:minus\\(\\) has parameter \\$args with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/JAMA/Matrix.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\JAMA\\\\Matrix\\:\\:minusEquals\\(\\) has parameter \\$args with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/JAMA/Matrix.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\JAMA\\\\Matrix\\:\\:arrayTimes\\(\\) has parameter \\$args with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/JAMA/Matrix.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\JAMA\\\\Matrix\\:\\:arrayTimesEquals\\(\\) has parameter \\$args with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/JAMA/Matrix.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\JAMA\\\\Matrix\\:\\:arrayRightDivide\\(\\) has parameter \\$args with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/JAMA/Matrix.php
-
-		-
-			message: "#^Parameter \\#3 \\$c of method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\JAMA\\\\Matrix\\:\\:set\\(\\) expects float\\|int\\|null, string given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Shared/JAMA/Matrix.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\JAMA\\\\Matrix\\:\\:arrayRightDivideEquals\\(\\) has parameter \\$args with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/JAMA/Matrix.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\JAMA\\\\Matrix\\:\\:arrayLeftDivide\\(\\) has parameter \\$args with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/JAMA/Matrix.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\JAMA\\\\Matrix\\:\\:arrayLeftDivideEquals\\(\\) has parameter \\$args with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/JAMA/Matrix.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\JAMA\\\\Matrix\\:\\:times\\(\\) has parameter \\$args with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/JAMA/Matrix.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\JAMA\\\\Matrix\\:\\:power\\(\\) has parameter \\$args with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/JAMA/Matrix.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\JAMA\\\\Matrix\\:\\:concat\\(\\) has parameter \\$args with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/JAMA/Matrix.php
-
-		-
-			message: "#^Parameter \\#1 \\$str of function trim expects string, float\\|int given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/JAMA/Matrix.php
-
-		-
-			message: "#^Left side of && is always true\\.$#"
-			count: 4
-			path: src/PhpSpreadsheet/Shared/JAMA/SingularValueDecomposition.php
-
-		-
-			message: "#^If condition is always true\\.$#"
-			count: 7
-			path: src/PhpSpreadsheet/Shared/JAMA/SingularValueDecomposition.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\OLE\\:\\:getStream\\(\\) should return resource but returns resource\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/OLE.php
-
-		-
-			message: "#^Parameter \\#2 \\$data of function unpack expects string, string\\|false given\\.$#"
-			count: 3
-			path: src/PhpSpreadsheet/Shared/OLE.php
-
-		-
-			message: "#^Parameter \\#1 \\$string of function substr expects string, string\\|false given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/OLE.php
-
-		-
-			message: "#^Parameter \\#1 \\$No of class PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\OLE\\\\PPS constructor expects int, null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/OLE.php
-
-		-
-			message: "#^Parameter \\#2 \\$name of class PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\OLE\\\\PPS constructor expects string, null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/OLE.php
-
-		-
-			message: "#^Parameter \\#3 \\$type of class PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\OLE\\\\PPS constructor expects int, null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/OLE.php
-
-		-
-			message: "#^Parameter \\#4 \\$prev of class PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\OLE\\\\PPS constructor expects int, null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/OLE.php
-
-		-
-			message: "#^Parameter \\#5 \\$next of class PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\OLE\\\\PPS constructor expects int, null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/OLE.php
-
-		-
-			message: "#^Parameter \\#6 \\$dir of class PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\OLE\\\\PPS constructor expects int, null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/OLE.php
-
-		-
-			message: "#^Parameter \\#9 \\$data of class PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\OLE\\\\PPS constructor expects string, null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/OLE.php
-
-		-
-			message: "#^Parameter \\#1 \\$oleTimestamp of static method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\OLE\\:\\:OLE2LocalDate\\(\\) expects string, string\\|false given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Shared/OLE.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\OLE\\:\\:getData\\(\\) should return string but returns string\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/OLE.php
-
-		-
-			message: "#^Cannot access offset 3 on array\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/OLE.php
-
-		-
-			message: "#^Cannot access offset 4 on array\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/OLE.php
-
-		-
-			message: "#^Cannot access offset 1 on array\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/OLE.php
-
-		-
-			message: "#^Cannot access offset 2 on array\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/OLE.php
-
-		-
-			message: "#^Parameter \\#1 \\$var of function count expects array\\|Countable, string given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/OLE/ChainedBlockStream.php
-
-		-
-			message: "#^Parameter \\#3 \\$length of function array_slice expects int\\|null, float given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/OLE/PPS.php
-
-		-
-			message: "#^Parameter \\#2 \\$offset of function array_slice expects int, float given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/OLE/PPS.php
-
-		-
-			message: "#^Parameter \\#1 \\$No of method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\OLE\\\\PPS\\:\\:__construct\\(\\) expects int, null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/OLE/PPS/File.php
-
-		-
-			message: "#^Parameter \\#4 \\$prev of method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\OLE\\\\PPS\\:\\:__construct\\(\\) expects int, null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/OLE/PPS/File.php
-
-		-
-			message: "#^Parameter \\#5 \\$next of method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\OLE\\\\PPS\\:\\:__construct\\(\\) expects int, null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/OLE/PPS/File.php
-
-		-
-			message: "#^Parameter \\#6 \\$dir of method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\OLE\\\\PPS\\:\\:__construct\\(\\) expects int, null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/OLE/PPS/File.php
-
-		-
-			message: "#^Parameter \\#1 \\$No of method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\OLE\\\\PPS\\:\\:__construct\\(\\) expects int, null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/OLE/PPS/Root.php
-
-		-
-			message: "#^Parameter \\#4 \\$prev of method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\OLE\\\\PPS\\:\\:__construct\\(\\) expects int, null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/OLE/PPS/Root.php
-
-		-
-			message: "#^Parameter \\#5 \\$next of method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\OLE\\\\PPS\\:\\:__construct\\(\\) expects int, null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/OLE/PPS/Root.php
-
-		-
-			message: "#^Parameter \\#6 \\$dir of method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\OLE\\\\PPS\\:\\:__construct\\(\\) expects int, null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/OLE/PPS/Root.php
-
-		-
-			message: "#^Parameter \\#9 \\$data of method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\OLE\\\\PPS\\:\\:__construct\\(\\) expects string, null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/OLE/PPS/Root.php
-
-		-
-			message: "#^Parameter \\#1 \\$iSBDcnt of method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\OLE\\\\PPS\\\\Root\\:\\:saveHeader\\(\\) expects int, float given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/OLE/PPS/Root.php
-
-		-
-			message: "#^Parameter \\#2 \\$iBBcnt of method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\OLE\\\\PPS\\\\Root\\:\\:saveHeader\\(\\) expects int, float given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/OLE/PPS/Root.php
-
-		-
-			message: "#^Parameter \\#3 \\$iPPScnt of method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\OLE\\\\PPS\\\\Root\\:\\:saveHeader\\(\\) expects int, float given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/OLE/PPS/Root.php
-
-		-
-			message: "#^Parameter \\#1 \\$iStBlk of method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\OLE\\\\PPS\\\\Root\\:\\:saveBigData\\(\\) expects int, float given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/OLE/PPS/Root.php
-
-		-
-			message: "#^Parameter \\#1 \\$iSbdSize of method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\OLE\\\\PPS\\\\Root\\:\\:saveBbd\\(\\) expects int, float given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/OLE/PPS/Root.php
-
-		-
-			message: "#^Parameter \\#2 \\$iBsize of method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\OLE\\\\PPS\\\\Root\\:\\:saveBbd\\(\\) expects int, float given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/OLE/PPS/Root.php
-
-		-
-			message: "#^Parameter \\#3 \\$iPpsCnt of method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\OLE\\\\PPS\\\\Root\\:\\:saveBbd\\(\\) expects int, float given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/OLE/PPS/Root.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\OLERead\\:\\:\\$data has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/OLERead.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\OLERead\\:\\:\\$wrkbook has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/OLERead.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\OLERead\\:\\:\\$summaryInformation has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/OLERead.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\OLERead\\:\\:\\$documentSummaryInformation has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/OLERead.php
-
-		-
-			message: "#^Parameter \\#1 \\$data of static method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\OLERead\\:\\:getInt4d\\(\\) expects string, string\\|false given\\.$#"
-			count: 8
-			path: src/PhpSpreadsheet/Shared/OLERead.php
-
-		-
-			message: "#^Parameter \\#1 \\$string of function substr expects string, string\\|false given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Shared/OLERead.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between int and null will always evaluate to false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/OLERead.php
-
-		-
-			message: "#^Argument of an invalid type array\\<int, string\\>\\|false supplied for foreach, only iterables are supported\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/PasswordHasher.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\StringHelper\\:\\:sanitizeUTF8\\(\\) should return string but returns string\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/StringHelper.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\StringHelper\\:\\:formatNumber\\(\\) should return string but returns array\\|string\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/StringHelper.php
-
-		-
-			message: "#^Parameter \\#3 \\$subject of function str_replace expects array\\|string, float given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/StringHelper.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\StringHelper\\:\\:countCharacters\\(\\) should return int but returns int\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/StringHelper.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\StringHelper\\:\\:mbIsUpper\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/StringHelper.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\StringHelper\\:\\:mbIsUpper\\(\\) has parameter \\$char with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/StringHelper.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\StringHelper\\:\\:mbStrSplit\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/StringHelper.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\StringHelper\\:\\:mbStrSplit\\(\\) has parameter \\$string with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/StringHelper.php
-
-		-
-			message: "#^Parameter \\#1 \\$string of function strlen expects string, float given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/StringHelper.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Trend\\\\BestFit\\:\\:\\$goodnessOfFit has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Trend/BestFit.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Trend\\\\BestFit\\:\\:\\$stdevOfResiduals has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Trend/BestFit.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Trend\\\\BestFit\\:\\:\\$covariance has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Trend/BestFit.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Trend\\\\BestFit\\:\\:\\$correlation has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Trend/BestFit.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Trend\\\\BestFit\\:\\:\\$SSRegression has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Trend/BestFit.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Trend\\\\BestFit\\:\\:\\$SSResiduals has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Trend/BestFit.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Trend\\\\BestFit\\:\\:\\$DFResiduals has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Trend/BestFit.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Trend\\\\BestFit\\:\\:\\$f has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Trend/BestFit.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Trend\\\\BestFit\\:\\:\\$slope has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Trend/BestFit.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Trend\\\\BestFit\\:\\:\\$slopeSE has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Trend/BestFit.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Trend\\\\BestFit\\:\\:\\$intersect has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Trend/BestFit.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Trend\\\\BestFit\\:\\:\\$intersectSE has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Trend/BestFit.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Trend\\\\BestFit\\:\\:\\$xOffset has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Trend/BestFit.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Trend\\\\BestFit\\:\\:\\$yOffset has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Trend/BestFit.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Trend\\\\BestFit\\:\\:getError\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Trend/BestFit.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Trend\\\\BestFit\\:\\:getBestFitType\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Trend/BestFit.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Trend\\\\BestFit\\:\\:calculateGoodnessOfFit\\(\\) has parameter \\$const with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Trend/BestFit.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Trend\\\\BestFit\\:\\:calculateGoodnessOfFit\\(\\) has parameter \\$meanX with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Trend/BestFit.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Trend\\\\BestFit\\:\\:calculateGoodnessOfFit\\(\\) has parameter \\$meanY with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Trend/BestFit.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Trend\\\\BestFit\\:\\:calculateGoodnessOfFit\\(\\) has parameter \\$sumX with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Trend/BestFit.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Trend\\\\BestFit\\:\\:calculateGoodnessOfFit\\(\\) has parameter \\$sumX2 with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Trend/BestFit.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Trend\\\\BestFit\\:\\:calculateGoodnessOfFit\\(\\) has parameter \\$sumXY with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Trend/BestFit.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Trend\\\\BestFit\\:\\:calculateGoodnessOfFit\\(\\) has parameter \\$sumY with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Trend/BestFit.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Trend\\\\BestFit\\:\\:calculateGoodnessOfFit\\(\\) has parameter \\$sumY2 with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Trend/BestFit.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Trend\\\\BestFit\\:\\:sumSquares\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Trend/BestFit.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Trend\\\\PolynomialBestFit\\:\\:getCoefficients\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Trend/PolynomialBestFit.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Trend\\\\PolynomialBestFit\\:\\:getCoefficients\\(\\) has parameter \\$dp with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Trend/PolynomialBestFit.php
-
-		-
-			message: "#^Parameter \\#2 \\.\\.\\.\\$args of function array_merge expects array, float given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Trend/PolynomialBestFit.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Trend\\\\Trend\\:\\:calculate\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Trend/Trend.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Trend\\\\Trend\\:\\:calculate\\(\\) has parameter \\$const with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Trend/Trend.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Trend\\\\Trend\\:\\:calculate\\(\\) has parameter \\$trendType with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Trend/Trend.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Trend\\\\Trend\\:\\:calculate\\(\\) has parameter \\$xValues with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Trend/Trend.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Trend\\\\Trend\\:\\:calculate\\(\\) has parameter \\$yValues with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Trend/Trend.php
-
-		-
-			message: "#^Parameter \\#1 \\$order of class PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Trend\\\\PolynomialBestFit constructor expects int, string given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Shared/Trend/Trend.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\XMLWriter\\:\\:\\$debugEnabled has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/XMLWriter.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\XMLWriter\\:\\:\\$tempFileName \\(string\\) does not accept string\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/XMLWriter.php
-
-		-
-			message: "#^Parameter \\#1 \\$uri of method XMLWriter\\:\\:openUri\\(\\) expects string, string\\|false given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/XMLWriter.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\XMLWriter\\:\\:getData\\(\\) should return string but returns string\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/XMLWriter.php
-
-		-
-			message: "#^Parameter \\#1 \\$pValue of static method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Drawing\\:\\:pointsToPixels\\(\\) expects int, float given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Xls.php
-
-		-
-			message: "#^Parameter \\#1 \\$fontSizeInPoints of static method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Font\\:\\:fontSizeToPixels\\(\\) expects int, float given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Xls.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Spreadsheet\\:\\:\\$workbookViewVisibilityValues has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Spreadsheet.php
-
-		-
-			message: "#^Call to function is_array\\(\\) with string will always evaluate to false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Spreadsheet.php
-
-		-
-			message: "#^Unreachable statement \\- code above always terminates\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Spreadsheet.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between PhpOffice\\\\PhpSpreadsheet\\\\Spreadsheet and null will always evaluate to false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Spreadsheet.php
-
-		-
-			message: "#^Parameter \\#1 \\$pSheet of method PhpOffice\\\\PhpSpreadsheet\\\\Spreadsheet\\:\\:getIndex\\(\\) expects PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet, PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Spreadsheet.php
-
-		-
-			message: "#^Cannot call method getTitle\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Spreadsheet.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between string and null will always evaluate to false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Spreadsheet.php
-
-		-
-			message: "#^Comparison operation \"\\<\\=\" between int\\<min, \\-1\\> and 1000 is always true\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Spreadsheet.php
-
-		-
-			message: "#^Result of \\|\\| is always true\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Spreadsheet.php
-
-		-
-			message: "#^Call to an undefined method PhpOffice\\\\PhpSpreadsheet\\\\Spreadsheet\\|PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Style\\:\\:getSharedComponent\\(\\)\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/Alignment.php
-
-		-
-			message: "#^Parameter \\#1 \\$parent of method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Supervisor\\:\\:bindParent\\(\\) expects PhpOffice\\\\PhpSpreadsheet\\\\Spreadsheet\\|PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Style, \\$this\\(PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Border\\) given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/Border.php
-
-		-
-			message: "#^Call to an undefined method PhpOffice\\\\PhpSpreadsheet\\\\Spreadsheet\\|PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Style\\:\\:getSharedComponent\\(\\)\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/Border.php
-
-		-
-			message: "#^Call to an undefined method PhpOffice\\\\PhpSpreadsheet\\\\Spreadsheet\\|PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Style\\:\\:getStyleArray\\(\\)\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/Border.php
-
-		-
-			message: "#^Right side of && is always true\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/Border.php
-
-		-
-			message: "#^Parameter \\#1 \\$parent of method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Supervisor\\:\\:bindParent\\(\\) expects PhpOffice\\\\PhpSpreadsheet\\\\Spreadsheet\\|PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Style, \\$this\\(PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Borders\\) given\\.$#"
-			count: 10
-			path: src/PhpSpreadsheet/Style/Borders.php
-
-		-
-			message: "#^Call to an undefined method PhpOffice\\\\PhpSpreadsheet\\\\Spreadsheet\\|PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Style\\:\\:getSharedComponent\\(\\)\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/Borders.php
-
-		-
-			message: "#^Call to an undefined method PhpOffice\\\\PhpSpreadsheet\\\\Spreadsheet\\|PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Style\\:\\:getSharedComponent\\(\\)\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/Color.php
-
-		-
-			message: "#^Call to an undefined method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Border\\|PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Fill\\:\\:getEndColor\\(\\)\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/Color.php
-
-		-
-			message: "#^Call to an undefined method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Border\\|PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Fill\\:\\:getStartColor\\(\\)\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/Color.php
-
-		-
-			message: "#^Call to an undefined method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Border\\|PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Fill\\:\\:getColor\\(\\)\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/Color.php
-
-		-
-			message: "#^Call to an undefined method PhpOffice\\\\PhpSpreadsheet\\\\Spreadsheet\\|PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Style\\:\\:getStyleArray\\(\\)\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/Color.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Color\\:\\:getColourComponent\\(\\) should return int\\|string but returns float\\|int\\|string\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/Color.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Conditional\\:\\:\\$condition \\(array\\<string\\>\\) does not accept array\\<bool\\|float\\|int\\|string\\>\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/Conditional.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Conditional\\:\\:\\$style \\(PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Style\\) does not accept PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Style\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/Conditional.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\ConditionalFormatting\\\\ConditionalDataBar\\:\\:setShowValue\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalDataBar.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\ConditionalFormatting\\\\ConditionalDataBar\\:\\:setMinimumConditionalFormatValueObject\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalDataBar.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\ConditionalFormatting\\\\ConditionalDataBar\\:\\:setMaximumConditionalFormatValueObject\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalDataBar.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\ConditionalFormatting\\\\ConditionalDataBar\\:\\:setConditionalFormattingRuleExt\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalDataBar.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\ConditionalFormatting\\\\ConditionalDataBarExtension\\:\\:getXmlAttributes\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalDataBarExtension.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\ConditionalFormatting\\\\ConditionalDataBarExtension\\:\\:getXmlElements\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalDataBarExtension.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\ConditionalFormatting\\\\ConditionalDataBarExtension\\:\\:setMaximumConditionalFormatValueObject\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalDataBarExtension.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\ConditionalFormatting\\\\ConditionalDataBarExtension\\:\\:setMinimumConditionalFormatValueObject\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalDataBarExtension.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\ConditionalFormatting\\\\ConditionalFormatValueObject\\:\\:\\$type has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormatValueObject.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\ConditionalFormatting\\\\ConditionalFormatValueObject\\:\\:\\$value has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormatValueObject.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\ConditionalFormatting\\\\ConditionalFormatValueObject\\:\\:\\$cellFormula has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormatValueObject.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\ConditionalFormatting\\\\ConditionalFormatValueObject\\:\\:__construct\\(\\) has parameter \\$type with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormatValueObject.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\ConditionalFormatting\\\\ConditionalFormatValueObject\\:\\:__construct\\(\\) has parameter \\$value with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormatValueObject.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\ConditionalFormatting\\\\ConditionalFormatValueObject\\:\\:setType\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormatValueObject.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\ConditionalFormatting\\\\ConditionalFormatValueObject\\:\\:setValue\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormatValueObject.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\ConditionalFormatting\\\\ConditionalFormatValueObject\\:\\:setCellFormula\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormatValueObject.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\ConditionalFormatting\\\\ConditionalFormattingRuleExtension\\:\\:\\$id has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormattingRuleExtension.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\ConditionalFormatting\\\\ConditionalFormattingRuleExtension\\:\\:__construct\\(\\) has parameter \\$id with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormattingRuleExtension.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\ConditionalFormatting\\\\ConditionalFormattingRuleExtension\\:\\:generateUuid\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormattingRuleExtension.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\ConditionalFormatting\\\\ConditionalFormattingRuleExtension\\:\\:parseExtLstXml\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormattingRuleExtension.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\ConditionalFormatting\\\\ConditionalFormattingRuleExtension\\:\\:parseExtLstXml\\(\\) has parameter \\$extLstXml with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormattingRuleExtension.php
-
-		-
-			message: "#^Cannot access property \\$minLength on SimpleXMLElement\\|null\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormattingRuleExtension.php
-
-		-
-			message: "#^Cannot access property \\$maxLength on SimpleXMLElement\\|null\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormattingRuleExtension.php
-
-		-
-			message: "#^Cannot access property \\$border on SimpleXMLElement\\|null\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormattingRuleExtension.php
-
-		-
-			message: "#^Cannot access property \\$gradient on SimpleXMLElement\\|null\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormattingRuleExtension.php
-
-		-
-			message: "#^Cannot access property \\$direction on SimpleXMLElement\\|null\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormattingRuleExtension.php
-
-		-
-			message: "#^Cannot access property \\$negativeBarBorderColorSameAsPositive on SimpleXMLElement\\|null\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormattingRuleExtension.php
-
-		-
-			message: "#^Cannot access property \\$axisPosition on SimpleXMLElement\\|null\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormattingRuleExtension.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\ConditionalFormatting\\\\ConditionalFormattingRuleExtension\\:\\:parseExtDataBarElementChildrenFromXml\\(\\) has parameter \\$ns with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormattingRuleExtension.php
-
-		-
-			message: "#^Offset 'rgb' does not exist on SimpleXMLElement\\|null\\.$#"
-			count: 4
-			path: src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormattingRuleExtension.php
-
-		-
-			message: "#^Offset 'theme' does not exist on SimpleXMLElement\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormattingRuleExtension.php
-
-		-
-			message: "#^Offset 'tint' does not exist on SimpleXMLElement\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormattingRuleExtension.php
-
-		-
-			message: "#^Parameter \\#1 \\$parent of method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Supervisor\\:\\:bindParent\\(\\) expects PhpOffice\\\\PhpSpreadsheet\\\\Spreadsheet\\|PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Style, \\$this\\(PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Fill\\) given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Style/Fill.php
-
-		-
-			message: "#^Call to an undefined method PhpOffice\\\\PhpSpreadsheet\\\\Spreadsheet\\|PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Style\\:\\:getSharedComponent\\(\\)\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/Fill.php
-
-		-
-			message: "#^Parameter \\#1 \\$parent of method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Supervisor\\:\\:bindParent\\(\\) expects PhpOffice\\\\PhpSpreadsheet\\\\Spreadsheet\\|PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Style, \\$this\\(PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\) given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/Font.php
-
-		-
-			message: "#^Call to an undefined method PhpOffice\\\\PhpSpreadsheet\\\\Spreadsheet\\|PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Style\\:\\:getSharedComponent\\(\\)\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/Font.php
-
-		-
-			message: "#^Call to an undefined method PhpOffice\\\\PhpSpreadsheet\\\\Spreadsheet\\|PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Style\\:\\:getSharedComponent\\(\\)\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/NumberFormat.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\NumberFormat\\:\\:\\$builtInFormatCode \\(int\\|false\\) does not accept bool\\|int\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/NumberFormat.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\NumberFormat\\\\DateFormatter\\:\\:format\\(\\) has parameter \\$value with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/NumberFormat/DateFormatter.php
-
-		-
-			message: "#^Parameter \\#2 \\$callback of function preg_replace_callback expects callable\\(\\)\\: mixed, array\\('self', 'setLowercaseCallback'\\) given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/NumberFormat/DateFormatter.php
-
-		-
-			message: "#^Parameter \\#3 \\$subject of function preg_replace_callback expects array\\|string, string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/NumberFormat/DateFormatter.php
-
-		-
-			message: "#^Parameter \\#2 \\$str of function explode expects string, string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/NumberFormat/DateFormatter.php
-
-		-
-			message: "#^Parameter \\#2 \\$replace of function str_replace expects array\\|string, int given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/NumberFormat/DateFormatter.php
-
-		-
-			message: "#^Parameter \\#2 \\$callback of function preg_replace_callback expects callable\\(\\)\\: mixed, array\\('self', 'escapeQuotesCallback'\\) given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/NumberFormat/DateFormatter.php
-
-		-
-			message: "#^Parameter \\#3 \\$subject of function preg_replace expects array\\|string, string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/NumberFormat/DateFormatter.php
-
-		-
-			message: "#^Parameter \\#1 \\$format of method DateTime\\:\\:format\\(\\) expects string, string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/NumberFormat/DateFormatter.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\NumberFormat\\\\DateFormatter\\:\\:setLowercaseCallback\\(\\) has parameter \\$matches with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/NumberFormat/DateFormatter.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\NumberFormat\\\\DateFormatter\\:\\:escapeQuotesCallback\\(\\) has parameter \\$matches with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/NumberFormat/DateFormatter.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\NumberFormat\\\\Formatter\\:\\:splitFormatCompare\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/NumberFormat/Formatter.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\NumberFormat\\\\Formatter\\:\\:splitFormatCompare\\(\\) has parameter \\$cond with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/NumberFormat/Formatter.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\NumberFormat\\\\Formatter\\:\\:splitFormatCompare\\(\\) has parameter \\$dfcond with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/NumberFormat/Formatter.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\NumberFormat\\\\Formatter\\:\\:splitFormatCompare\\(\\) has parameter \\$dfval with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/NumberFormat/Formatter.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\NumberFormat\\\\Formatter\\:\\:splitFormatCompare\\(\\) has parameter \\$val with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/NumberFormat/Formatter.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\NumberFormat\\\\Formatter\\:\\:splitFormatCompare\\(\\) has parameter \\$value with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/NumberFormat/Formatter.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\NumberFormat\\\\Formatter\\:\\:splitFormat\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/NumberFormat/Formatter.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\NumberFormat\\\\Formatter\\:\\:splitFormat\\(\\) has parameter \\$sections with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/NumberFormat/Formatter.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\NumberFormat\\\\Formatter\\:\\:splitFormat\\(\\) has parameter \\$value with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/NumberFormat/Formatter.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\NumberFormat\\\\Formatter\\:\\:toFormattedString\\(\\) should return string but returns float\\|int\\|string\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/NumberFormat/Formatter.php
-
-		-
-			message: "#^Parameter \\#3 \\$subject of function preg_replace expects array\\|string, string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/NumberFormat/Formatter.php
-
-		-
-			message: "#^Parameter \\#2 \\$subject of function preg_split expects string, string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/NumberFormat/Formatter.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\NumberFormat\\\\FractionFormatter\\:\\:format\\(\\) has parameter \\$value with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/NumberFormat/FractionFormatter.php
-
-		-
-			message: "#^Parameter \\#1 \\$str of function trim expects string, float given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/NumberFormat/FractionFormatter.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\NumberFormat\\\\NumberFormatter\\:\\:mergeComplexNumberFormatMasks\\(\\) has parameter \\$masks with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/NumberFormat/NumberFormatter.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\NumberFormat\\\\NumberFormatter\\:\\:mergeComplexNumberFormatMasks\\(\\) has parameter \\$numbers with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/NumberFormat/NumberFormatter.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\NumberFormat\\\\NumberFormatter\\:\\:processComplexNumberFormatMask\\(\\) has parameter \\$mask with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/NumberFormat/NumberFormatter.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\NumberFormat\\\\NumberFormatter\\:\\:processComplexNumberFormatMask\\(\\) has parameter \\$number with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/NumberFormat/NumberFormatter.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\NumberFormat\\\\NumberFormatter\\:\\:complexNumberFormatMask\\(\\) has parameter \\$mask with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/NumberFormat/NumberFormatter.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\NumberFormat\\\\NumberFormatter\\:\\:complexNumberFormatMask\\(\\) has parameter \\$number with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/NumberFormat/NumberFormatter.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\NumberFormat\\\\NumberFormatter\\:\\:complexNumberFormatMask\\(\\) has parameter \\$splitOnPoint with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/NumberFormat/NumberFormatter.php
-
-		-
-			message: "#^Parameter \\#1 \\$haystack of function strpos expects string, float\\|int given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/NumberFormat/NumberFormatter.php
-
-		-
-			message: "#^Parameter \\#2 \\$str of function explode expects string, float\\|int given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/NumberFormat/NumberFormatter.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\NumberFormat\\\\NumberFormatter\\:\\:formatStraightNumericValue\\(\\) has parameter \\$format with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/NumberFormat/NumberFormatter.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\NumberFormat\\\\NumberFormatter\\:\\:formatStraightNumericValue\\(\\) has parameter \\$useThousands with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/NumberFormat/NumberFormatter.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\NumberFormat\\\\NumberFormatter\\:\\:formatStraightNumericValue\\(\\) has parameter \\$value with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/NumberFormat/NumberFormatter.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\NumberFormat\\\\NumberFormatter\\:\\:format\\(\\) has parameter \\$format with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/NumberFormat/NumberFormatter.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\NumberFormat\\\\NumberFormatter\\:\\:format\\(\\) has parameter \\$value with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/NumberFormat/NumberFormatter.php
-
-		-
-			message: "#^Parameter \\#3 \\$subject of function preg_replace expects array\\|string, array\\|string\\|null given\\.$#"
-			count: 6
-			path: src/PhpSpreadsheet/Style/NumberFormat/NumberFormatter.php
-
-		-
-			message: "#^Parameter \\#2 \\$subject of function preg_match expects string, array\\|string\\|null given\\.$#"
-			count: 4
-			path: src/PhpSpreadsheet/Style/NumberFormat/NumberFormatter.php
-
-		-
-			message: "#^Parameter \\#2 \\$format of static method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\NumberFormat\\\\FractionFormatter\\:\\:format\\(\\) expects string, array\\|string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/NumberFormat/NumberFormatter.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\NumberFormat\\\\PercentageFormatter\\:\\:format\\(\\) has parameter \\$value with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/NumberFormat/PercentageFormatter.php
-
-		-
-			message: "#^Parameter \\#1 \\$format of function sprintf expects string, string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/NumberFormat/PercentageFormatter.php
-
-		-
-			message: "#^Call to an undefined method PhpOffice\\\\PhpSpreadsheet\\\\Spreadsheet\\|PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Style\\:\\:getSharedComponent\\(\\)\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/Protection.php
-
-		-
-			message: "#^Call to an undefined method PhpOffice\\\\PhpSpreadsheet\\\\Spreadsheet\\|PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Style\\:\\:getCellXfByIndex\\(\\)\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/Style.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Style\\:\\:getParent\\(\\) should return PhpOffice\\\\PhpSpreadsheet\\\\Spreadsheet but returns PhpOffice\\\\PhpSpreadsheet\\\\Spreadsheet\\|PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Style\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Style/Style.php
-
-		-
-			message: "#^Result of && is always true\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/AutoFilter.php
-
-		-
-			message: "#^Parameter \\#1 \\$excelTimestamp of static method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Date\\:\\:excelToTimestamp\\(\\) expects float\\|int, float\\|int\\|string given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Worksheet/AutoFilter.php
-
-		-
-			message: "#^Parameter \\#1 \\$number of function floor expects float, float\\|int\\<1, max\\>\\|string given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/AutoFilter.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\AutoFilter\\:\\:\\$toReplace has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/AutoFilter.php
-
-		-
-			message: "#^Parameter \\#2 \\$now of function strtotime expects int, int\\|false given\\.$#"
-			count: 6
-			path: src/PhpSpreadsheet/Worksheet/AutoFilter.php
-
-		-
-			message: "#^Parameter \\#5 \\$day of function gmmktime expects int, string given\\.$#"
-			count: 8
-			path: src/PhpSpreadsheet/Worksheet/AutoFilter.php
-
-		-
-			message: "#^Parameter \\#6 \\$year of function gmmktime expects int, string given\\.$#"
-			count: 13
-			path: src/PhpSpreadsheet/Worksheet/AutoFilter.php
-
-		-
-			message: "#^Parameter \\#4 \\$mon of function gmmktime expects int, string given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Worksheet/AutoFilter.php
-
-		-
-			message: "#^Parameter \\#5 \\$day of function gmmktime expects int, float given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Worksheet/AutoFilter.php
-
-		-
-			message: "#^Parameter \\#1 \\$attributes of method PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\AutoFilter\\\\Column\\:\\:setAttributes\\(\\) expects array\\<string\\>, array\\<string, float\\|int\\|null\\> given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/AutoFilter.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\AutoFilter\\:\\:calculateTopTenValue\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/AutoFilter.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\AutoFilter\\:\\:calculateTopTenValue\\(\\) has parameter \\$columnID with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/AutoFilter.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\AutoFilter\\:\\:calculateTopTenValue\\(\\) has parameter \\$endRow with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/AutoFilter.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\AutoFilter\\:\\:calculateTopTenValue\\(\\) has parameter \\$ruleType with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/AutoFilter.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\AutoFilter\\:\\:calculateTopTenValue\\(\\) has parameter \\$ruleValue with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/AutoFilter.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\AutoFilter\\:\\:calculateTopTenValue\\(\\) has parameter \\$startRow with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/AutoFilter.php
-
-		-
-			message: "#^Cannot call method rangeToArray\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/AutoFilter.php
-
-		-
-			message: "#^Cannot call method getRowDimension\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\|null\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Worksheet/AutoFilter.php
-
-		-
-			message: "#^Cannot assign offset 'year' to array\\<string\\>\\|string\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/AutoFilter.php
-
-		-
-			message: "#^Cannot assign offset 'month' to array\\<string\\>\\|string\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/AutoFilter.php
-
-		-
-			message: "#^Cannot assign offset 'day' to array\\<string\\>\\|string\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/AutoFilter.php
-
-		-
-			message: "#^Cannot assign offset 'hour' to array\\<string\\>\\|string\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/AutoFilter.php
-
-		-
-			message: "#^Cannot assign offset 'minute' to array\\<string\\>\\|string\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/AutoFilter.php
-
-		-
-			message: "#^Cannot assign offset 'second' to array\\<string\\>\\|string\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/AutoFilter.php
-
-		-
-			message: "#^Parameter \\#1 \\$str of function preg_quote expects string, array\\<string\\>\\|string given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/AutoFilter.php
-
-		-
-			message: "#^Cannot call method getCell\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\|null\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Worksheet/AutoFilter.php
-
-		-
-			message: "#^Binary operation \"\\*\" between 0\\|array\\<string\\>\\|string and float\\|int results in an error\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/AutoFilter.php
-
-		-
-			message: "#^Left side of && is always true\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/AutoFilter.php
-
-		-
-			message: "#^Parameter \\#1 \\$function of function call_user_func_array expects callable\\(\\)\\: mixed, array\\('PhpOffice\\\\\\\\PhpSpreadsheet\\\\\\\\Worksheet\\\\\\\\AutoFilter', mixed\\) given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/AutoFilter.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\AutoFilter\\\\Column\\\\Rule\\:\\:\\$ruleTypes has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/AutoFilter/Column/Rule.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\AutoFilter\\\\Column\\\\Rule\\:\\:\\$dateTimeGroups has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/AutoFilter/Column/Rule.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\AutoFilter\\\\Column\\\\Rule\\:\\:\\$dynamicTypes has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/AutoFilter/Column/Rule.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\AutoFilter\\\\Column\\\\Rule\\:\\:\\$operators has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/AutoFilter/Column/Rule.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\AutoFilter\\\\Column\\\\Rule\\:\\:\\$topTenValue has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/AutoFilter/Column/Rule.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\AutoFilter\\\\Column\\\\Rule\\:\\:\\$topTenType has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/AutoFilter/Column/Rule.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\AutoFilter\\\\Column\\\\Rule\\:\\:\\$parent \\(PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\AutoFilter\\\\Column\\) does not accept PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\AutoFilter\\\\Column\\|null\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Worksheet/AutoFilter/Column/Rule.php
-
-		-
-			message: "#^Cannot call method getCell\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/BaseDrawing.php
-
-		-
-			message: "#^Cannot call method getDrawingCollection\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/BaseDrawing.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\BaseDrawing\\:\\:\\$shadow \\(PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Drawing\\\\Shadow\\) does not accept PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Drawing\\\\Shadow\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/BaseDrawing.php
-
-		-
-			message: "#^Cannot call method getHashCode\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/BaseDrawing.php
-
-		-
-			message: "#^Class PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\CellIterator implements generic interface Iterator but does not specify its types\\: TKey, TValue$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/CellIterator.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\CellIterator\\:\\:adjustForExistingOnlyRange\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/CellIterator.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Column\\:\\:\\$parent \\(PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\) does not accept PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/Column.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\CellIterator\\:\\:\\$worksheet \\(PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\) does not accept PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/ColumnCellIterator.php
-
-		-
-			message: "#^Class PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\ColumnIterator implements generic interface Iterator but does not specify its types\\: TKey, TValue$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/ColumnIterator.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Drawing\\\\Shadow\\:\\:\\$color \\(PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Color\\) does not accept PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Color\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/Drawing/Shadow.php
-
-		-
-			message: "#^Class PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Iterator implements generic interface Iterator but does not specify its types\\: TKey, TValue$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/Iterator.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\PageSetup\\:\\:\\$pageOrder has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/PageSetup.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between int\\<min, \\-1\\> and null will always evaluate to false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/PageSetup.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\PageSetup\\:\\:getPrintArea\\(\\) should return string but returns string\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/PageSetup.php
-
-		-
-			message: "#^Parameter \\#2 \\$str of function explode expects string, string\\|null given\\.$#"
-			count: 5
-			path: src/PhpSpreadsheet/Worksheet/PageSetup.php
-
-		-
-			message: "#^Parameter \\#1 \\$value of method PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\PageSetup\\:\\:setFirstPageNumber\\(\\) expects int, null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/PageSetup.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Row\\:\\:\\$worksheet \\(PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\) does not accept PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/Row.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\CellIterator\\:\\:\\$worksheet \\(PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\) does not accept PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/RowCellIterator.php
-
-		-
-			message: "#^Class PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\RowIterator implements generic interface Iterator but does not specify its types\\: TKey, TValue$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/RowIterator.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\SheetView\\:\\:\\$sheetViewTypes has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/SheetView.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between int\\<min, 0\\> and null will always evaluate to false\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Worksheet/SheetView.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between string and null will always evaluate to false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/SheetView.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\:\\:\\$drawingCollection with generic class ArrayObject does not specify its types\\: TKey, TValue$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/Worksheet.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\:\\:\\$chartCollection with generic class ArrayObject does not specify its types\\: TKey, TValue$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/Worksheet.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\:\\:\\$parent \\(PhpOffice\\\\PhpSpreadsheet\\\\Spreadsheet\\) does not accept PhpOffice\\\\PhpSpreadsheet\\\\Spreadsheet\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/Worksheet.php
-
-		-
-			message: "#^Parameter \\#1 \\$pIndex of class PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\RowDimension constructor expects int, null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/Worksheet.php
-
-		-
-			message: "#^Parameter \\#1 \\$pIndex of class PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\ColumnDimension constructor expects string, null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/Worksheet.php
-
-		-
-			message: "#^Parameter \\#1 \\$pRange of class PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\AutoFilter constructor expects string, null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/Worksheet.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\:\\:getDrawingCollection\\(\\) return type with generic class ArrayObject does not specify its types\\: TKey, TValue$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/Worksheet.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\:\\:getChartCollection\\(\\) return type with generic class ArrayObject does not specify its types\\: TKey, TValue$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/Worksheet.php
-
-		-
-			message: "#^Parameter \\#1 \\$input of function array_splice expects array, ArrayObject&iterable\\<PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart\\> given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/Worksheet.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between string and null will always evaluate to false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/Worksheet.php
-
-		-
-			message: "#^Parameter \\#1 \\$pRange of static method PhpOffice\\\\PhpSpreadsheet\\\\Cell\\\\Coordinate\\:\\:rangeDimension\\(\\) expects string, string\\|false given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/Worksheet.php
-
-		-
-			message: "#^Parameter \\#2 \\$format of static method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\NumberFormat\\:\\:toFormattedString\\(\\) expects string, string\\|null given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Worksheet/Worksheet.php
-
-		-
-			message: "#^Parameter \\#3 \\$rotation of static method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Font\\:\\:calculateColumnWidth\\(\\) expects int, int\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/Worksheet.php
-
-		-
-			message: "#^If condition is always true\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Worksheet/Worksheet.php
-
-		-
-			message: "#^Left side of && is always true\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Worksheet/Worksheet.php
-
-		-
-			message: "#^Cannot call method renameCalculationCacheForWorksheet\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Calculation\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/Worksheet.php
-
-		-
-			message: "#^Parameter \\#2 \\$start of function substr expects int, int\\<0, max\\>\\|false given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Worksheet/Worksheet.php
-
-		-
-			message: "#^Result of && is always true\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/Worksheet.php
-
-		-
-			message: "#^Parameter \\#1 \\$pRange of method PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\AutoFilter\\:\\:setRange\\(\\) expects string, null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/Worksheet.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\:\\:getFreezePane\\(\\) should return string but returns string\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/Worksheet.php
-
-		-
-			message: "#^Parameter \\#1 \\$row of method PhpOffice\\\\PhpSpreadsheet\\\\Collection\\\\Cells\\:\\:removeRow\\(\\) expects string, int given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Worksheet/Worksheet.php
-
-		-
-			message: "#^Parameter \\#3 \\$subject of function preg_replace expects array\\|string, string\\|null given\\.$#"
-			count: 3
-			path: src/PhpSpreadsheet/Worksheet/Worksheet.php
-
-		-
-			message: "#^Parameter \\#1 \\$coord of static method PhpOffice\\\\PhpSpreadsheet\\\\Cell\\\\Coordinate\\:\\:coordinateIsRange\\(\\) expects string, string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/Worksheet.php
-
-		-
-			message: "#^Parameter \\#1 \\$pRange of static method PhpOffice\\\\PhpSpreadsheet\\\\Cell\\\\Coordinate\\:\\:splitRange\\(\\) expects string, string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/Worksheet.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\:\\:\\$activeCell \\(string\\) does not accept string\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/Worksheet.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\:\\:\\$selectedCells \\(string\\) does not accept string\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/Worksheet.php
-
-		-
-			message: "#^Cannot call method getValue\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Cell\\\\Cell\\|null\\.$#"
-			count: 4
-			path: src/PhpSpreadsheet/Worksheet/Worksheet.php
-
-		-
-			message: "#^Cannot call method getCalculatedValue\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Cell\\\\Cell\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/Worksheet.php
-
-		-
-			message: "#^Cannot call method getXfIndex\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Cell\\\\Cell\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/Worksheet.php
-
-		-
-			message: "#^Right side of && is always true\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/Worksheet.php
-
-		-
-			message: "#^Cannot call method getHashCode\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/Worksheet.php
-
-		-
-			message: "#^Cannot call method getWorksheet\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\DefinedName\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/Worksheet.php
-
-		-
-			message: "#^Cannot call method getValue\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\DefinedName\\|null\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Worksheet/Worksheet.php
-
-		-
-			message: "#^Cannot call method rangeToArray\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/Worksheet.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Csv\\:\\:\\$enclosureRequired has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Csv.php
-
-		-
-			message: "#^Call to function array_key_exists\\(\\) with int and array\\('none' \\=\\> 'none', 'dashDot' \\=\\> '1px dashed', 'dashDotDot' \\=\\> '1px dotted', 'dashed' \\=\\> '1px dashed', 'dotted' \\=\\> '1px dotted', 'double' \\=\\> '3px double', 'hair' \\=\\> '1px solid', 'medium' \\=\\> '2px solid', \\.\\.\\.\\) will always evaluate to false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:getSheetIndex\\(\\) should return int but returns int\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateMeta\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateMeta\\(\\) has parameter \\$desc with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateMeta\\(\\) has parameter \\$val with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateSheetPrep\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateSheetStarts\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateSheetStarts\\(\\) has parameter \\$rowMin with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateSheetStarts\\(\\) has parameter \\$sheet with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateSheetTags\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateSheetTags\\(\\) has parameter \\$row with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateSheetTags\\(\\) has parameter \\$tbodyStart with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateSheetTags\\(\\) has parameter \\$theadEnd with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateSheetTags\\(\\) has parameter \\$theadStart with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Parameter \\#1 \\$string of function htmlspecialchars expects string, string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Cannot access offset 'mime' on array\\|false\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Parameter \\#1 \\$im of function imagepng expects resource, GdImage\\|resource given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Parameter \\#1 \\$str of function base64_encode expects string, string\\|false given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Ternary operator condition is always true\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Parameter \\#3 \\$use_include_path of function fopen expects bool, int given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Parameter \\#2 \\$length of function fread expects int, int\\|false given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Cannot access offset 0 on array\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Cannot access offset 1 on array\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Parameter \\#1 \\$vAlign of method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:mapVAlign\\(\\) expects string, string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Parameter \\#1 \\$hAlign of method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:mapHAlign\\(\\) expects string, string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Parameter \\#1 \\$borderStyle of method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:mapBorderStyle\\(\\) expects int, string given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateHTMLFooter\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateTableTagInline\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateTableTagInline\\(\\) has parameter \\$id with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateTableTagInline\\(\\) has parameter \\$pSheet with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateTableTag\\(\\) has parameter \\$html with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateTableTag\\(\\) has parameter \\$id with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateTableTag\\(\\) has parameter \\$pSheet with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateTableTag\\(\\) has parameter \\$sheetIndex with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateTableFooter\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowCellCss\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowCellCss\\(\\) has parameter \\$cellAddress with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowCellCss\\(\\) has parameter \\$colNum with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowCellCss\\(\\) has parameter \\$pRow with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowCellCss\\(\\) has parameter \\$pSheet with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowCellDataValueRich\\(\\) has parameter \\$cell with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowCellDataValueRich\\(\\) has parameter \\$cellData with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Parameter \\#1 \\$pStyle of method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:createCSSStyleFont\\(\\) expects PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font, PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Cannot call method getSuperscript\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Cannot call method getSubscript\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowCellDataValue\\(\\) has parameter \\$cell with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowCellDataValue\\(\\) has parameter \\$cellData with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowCellDataValue\\(\\) has parameter \\$pSheet with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowCellData\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowCellData\\(\\) has parameter \\$cell with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowCellData\\(\\) has parameter \\$cellType with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowCellData\\(\\) has parameter \\$cssClass with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowCellData\\(\\) has parameter \\$pSheet with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowIncludeCharts\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowIncludeCharts\\(\\) has parameter \\$coordinate with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowIncludeCharts\\(\\) has parameter \\$pSheet with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowSpans\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowSpans\\(\\) has parameter \\$colSpan with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowSpans\\(\\) has parameter \\$html with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowSpans\\(\\) has parameter \\$rowSpan with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowWriteCell\\(\\) has parameter \\$cellData with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowWriteCell\\(\\) has parameter \\$cellType with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowWriteCell\\(\\) has parameter \\$colNum with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowWriteCell\\(\\) has parameter \\$colSpan with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowWriteCell\\(\\) has parameter \\$coordinate with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowWriteCell\\(\\) has parameter \\$cssClass with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowWriteCell\\(\\) has parameter \\$html with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowWriteCell\\(\\) has parameter \\$pRow with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowWriteCell\\(\\) has parameter \\$pSheet with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowWriteCell\\(\\) has parameter \\$rowSpan with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowWriteCell\\(\\) has parameter \\$sheetIndex with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:calculateSpansOmitRows\\(\\) has parameter \\$candidateSpannedRow with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:calculateSpansOmitRows\\(\\) has parameter \\$sheet with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:calculateSpansOmitRows\\(\\) has parameter \\$sheetIndex with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\IWriter\\:\\:save\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/IWriter.php
-
-		-
-			message: "#^Negated boolean expression is always false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Ods.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Ods\\\\Cell\\\\Style\\:\\:\\$writer has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Ods/Cell/Style.php
-
-		-
-			message: "#^If condition is always true\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Writer/Ods/Cell/Style.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Ods\\\\Content\\:\\:\\$formulaConvertor has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Ods/Content.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, int given\\.$#"
-			count: 4
-			path: src/PhpSpreadsheet/Writer/Ods/Content.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, int\\<2, max\\> given\\.$#"
-			count: 3
-			path: src/PhpSpreadsheet/Writer/Ods/Content.php
-
-		-
-			message: "#^Parameter \\#1 \\$pRange of static method PhpOffice\\\\PhpSpreadsheet\\\\Cell\\\\Coordinate\\:\\:splitRange\\(\\) expects string, string\\|false given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Ods/Content.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Ods\\\\Formula\\:\\:\\$definedNames has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Ods/Formula.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Ods\\\\NamedExpressions\\:\\:\\$objWriter has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Ods/NamedExpressions.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Ods\\\\NamedExpressions\\:\\:\\$spreadsheet has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Ods/NamedExpressions.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Ods\\\\NamedExpressions\\:\\:\\$formulaConvertor has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Ods/NamedExpressions.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Ods\\\\NamedExpressions\\:\\:__construct\\(\\) has parameter \\$formulaConvertor with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Ods/NamedExpressions.php
-
-		-
-			message: "#^Cannot call method getTitle\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\|null\\.$#"
-			count: 3
-			path: src/PhpSpreadsheet/Writer/Ods/NamedExpressions.php
-
-		-
-			message: "#^Parameter \\#1 \\$content of method XMLWriter\\:\\:text\\(\\) expects string, int given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Writer/Ods/Settings.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between int and null will always evaluate to false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Pdf/Dompdf.php
-
-		-
-			message: "#^Parameter \\#2 \\$str of function fwrite expects string, string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Pdf/Dompdf.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and int will always evaluate to false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Pdf/Mpdf.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between int and null will always evaluate to false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Pdf/Tcpdf.php
-
-		-
-			message: "#^Cannot call method getHashCode\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls.php
-
-		-
-			message: "#^Parameter \\#1 \\$font of method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xls\\\\Workbook\\:\\:addFont\\(\\) expects PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font, PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls.php
-
-		-
-			message: "#^Offset 'startCoordinates' does not exist on array\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls.php
-
-		-
-			message: "#^Offset 'startOffsetX' does not exist on array\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls.php
-
-		-
-			message: "#^Offset 'startOffsetY' does not exist on array\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls.php
-
-		-
-			message: "#^Offset 'endCoordinates' does not exist on array\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls.php
-
-		-
-			message: "#^Offset 'endOffsetX' does not exist on array\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls.php
-
-		-
-			message: "#^Offset 'endOffsetY' does not exist on array\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls.php
-
-		-
-			message: "#^Parameter \\#1 \\$data of method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\\\BstoreContainer\\\\BSE\\\\Blip\\:\\:setData\\(\\) expects string, string\\|false given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls.php
-
-		-
-			message: "#^Parameter \\#1 \\$im of function imagepng expects resource, resource\\|false given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls.php
-
-		-
-			message: "#^Parameter \\#1 \\$im of function imagepng expects resource, GdImage\\|resource given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls.php
-
-		-
-			message: "#^Parameter \\#1 \\$blipType of method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\\\DggContainer\\\\BstoreContainer\\\\BSE\\:\\:setBlipType\\(\\) expects int, int\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls.php
-
-		-
-			message: "#^Parameter \\#2 \\$pad_length of function str_pad expects int, float\\|int given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xls\\\\BIFFwriter\\:\\:writeEof\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls/BIFFwriter.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xls\\\\Escher\\:\\:\\$object has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls/Escher.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xls\\\\Escher\\:\\:\\$data has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls/Escher.php
-
-		-
-			message: "#^If condition is always true\\.$#"
-			count: 3
-			path: src/PhpSpreadsheet/Writer/Xls/Escher.php
-
-		-
-			message: "#^Elseif condition is always true\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls/Escher.php
-
-		-
-			message: "#^Parameter \\#1 \\$name of static method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Font\\:\\:getCharsetFromFontName\\(\\) expects string, string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls/Font.php
-
-		-
-			message: "#^If condition is always false\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Writer/Xls/Font.php
-
-		-
-			message: "#^Parameter \\#1 \\$bold of static method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xls\\\\Font\\:\\:mapBold\\(\\) expects bool, bool\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls/Font.php
-
-		-
-			message: "#^Parameter \\#1 \\$underline of static method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xls\\\\Font\\:\\:mapUnderline\\(\\) expects string, string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls/Font.php
-
-		-
-			message: "#^Parameter \\#1 \\$value of static method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\StringHelper\\:\\:UTF8toBIFF8UnicodeShort\\(\\) expects string, string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls/Font.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xls\\\\Parser\\:\\:\\$spreadsheet has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls/Parser.php
-
-		-
-			message: "#^Unreachable statement \\- code above always terminates\\.$#"
-			count: 5
-			path: src/PhpSpreadsheet/Writer/Xls/Parser.php
-
-		-
-			message: "#^Parameter \\#3 \\$subject of function preg_replace expects array\\|string, string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls/Parser.php
-
-		-
-			message: "#^Parameter \\#3 \\$subject of function str_replace expects array\\|string, string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls/Parser.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xls\\\\Parser\\:\\:advance\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls/Parser.php
-
-		-
-			message: "#^Offset 'left' does not exist on \\(array&nonEmpty\\)\\|string\\.$#"
-			count: 6
-			path: src/PhpSpreadsheet/Writer/Xls/Parser.php
-
-		-
-			message: "#^Offset 'right' does not exist on \\(array&nonEmpty\\)\\|string\\.$#"
-			count: 5
-			path: src/PhpSpreadsheet/Writer/Xls/Parser.php
-
-		-
-			message: "#^Offset 'value' does not exist on \\(array&nonEmpty\\)\\|string\\.$#"
-			count: 7
-			path: src/PhpSpreadsheet/Writer/Xls/Parser.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xls\\\\Workbook\\:\\:\\$colors has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls/Workbook.php
-
-		-
-			message: "#^Cannot call method getTitle\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls/Workbook.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xls\\\\Workbook\\:\\:writeAllDefinedNamesBiff8\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls/Workbook.php
-
-		-
-			message: "#^Parameter \\#1 \\$pSheet of method PhpOffice\\\\PhpSpreadsheet\\\\Spreadsheet\\:\\:getIndex\\(\\) expects PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet, PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls/Workbook.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xls\\\\Workbook\\:\\:writeSupbookInternal\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls/Workbook.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xls\\\\Workbook\\:\\:writeExternalsheetBiff8\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls/Workbook.php
-
-		-
-			message: "#^Cannot access offset 'encoding' on array\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls/Workbook.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xls\\\\Workbook\\:\\:writeMsoDrawingGroup\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls/Workbook.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xls\\\\Workbook\\:\\:\\$escher \\(PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\) does not accept PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls/Workbook.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xls\\\\Worksheet\\:\\:\\$colors has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls/Worksheet.php
-
-		-
-			message: "#^Cannot call method getHashCode\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls/Worksheet.php
-
-		-
-			message: "#^Parameter \\#4 \\$isError of method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xls\\\\Worksheet\\:\\:writeBoolErr\\(\\) expects bool, int given\\.$#"
-			count: 3
-			path: src/PhpSpreadsheet/Writer/Xls/Worksheet.php
-
-		-
-			message: "#^Parameter \\#2 \\$pieces of function implode expects array, array\\<int, string\\>\\|false given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls/Worksheet.php
-
-		-
-			message: "#^Parameter \\#3 \\$subject of function preg_replace expects array\\|string, string\\|null given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Writer/Xls/Worksheet.php
-
-		-
-			message: "#^Parameter \\#2 \\$subject of function preg_match expects string, string\\|null given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Writer/Xls/Worksheet.php
-
-		-
-			message: "#^Parameter \\#2 \\$subject of function preg_match_all expects string, string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls/Worksheet.php
-
-		-
-			message: "#^Parameter \\#1 \\$coordinates of static method PhpOffice\\\\PhpSpreadsheet\\\\Cell\\\\Coordinate\\:\\:indexesFromString\\(\\) expects string, string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls/Worksheet.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xls\\\\Worksheet\\:\\:\\$activePane \\(int\\) does not accept int\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls/Worksheet.php
-
-		-
-			message: "#^Parameter \\#5 \\$width of method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xls\\\\Worksheet\\:\\:positionImage\\(\\) expects int, float given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls/Worksheet.php
-
-		-
-			message: "#^Parameter \\#6 \\$height of method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xls\\\\Worksheet\\:\\:positionImage\\(\\) expects int, float given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls/Worksheet.php
-
-		-
-			message: "#^Parameter \\#1 \\$im of function imagesx expects resource, GdImage\\|resource given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls/Worksheet.php
-
-		-
-			message: "#^Parameter \\#1 \\$im of function imagesy expects resource, GdImage\\|resource given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls/Worksheet.php
-
-		-
-			message: "#^Parameter \\#1 \\$im of function imagecolorat expects resource, GdImage\\|resource given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls/Worksheet.php
-
-		-
-			message: "#^Parameter \\#1 \\$im of function imagecolorsforindex expects resource, GdImage\\|resource given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls/Worksheet.php
-
-		-
-			message: "#^Parameter \\#2 \\$col of function imagecolorsforindex expects int, int\\|false given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls/Worksheet.php
-
-		-
-			message: "#^Parameter \\#1 \\$ascii of function chr expects int, float given\\.$#"
-			count: 3
-			path: src/PhpSpreadsheet/Writer/Xls/Worksheet.php
-
-		-
-			message: "#^Parameter \\#2 \\$length of function fread expects int, int\\|false given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls/Worksheet.php
-
-		-
-			message: "#^Parameter \\#1 \\$string of function strlen expects string, string\\|false given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls/Worksheet.php
-
-		-
-			message: "#^Parameter \\#2 \\$data of function unpack expects string, string\\|false given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls/Worksheet.php
-
-		-
-			message: "#^Cannot access offset 'ident' on array\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls/Worksheet.php
-
-		-
-			message: "#^Parameter \\#1 \\$string of function substr expects string, string\\|false given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls/Worksheet.php
-
-		-
-			message: "#^Cannot access offset 'sa' on array\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls/Worksheet.php
-
-		-
-			message: "#^Cannot access offset 1 on array\\|false\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Writer/Xls/Worksheet.php
-
-		-
-			message: "#^Cannot access offset 2 on array\\|false\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Writer/Xls/Worksheet.php
-
-		-
-			message: "#^Cannot access offset 'comp' on array\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls/Worksheet.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xls\\\\Worksheet\\:\\:\\$escher \\(PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\) does not accept PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Escher\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls/Worksheet.php
-
-		-
-			message: "#^Parameter \\#1 \\$textRotation of static method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xls\\\\Xf\\:\\:mapTextRotation\\(\\) expects int, int\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xls/Xf.php
-
-		-
-			message: "#^Possibly invalid array key type array\\|string\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx.php
-
-		-
-			message: "#^Parameter \\#1 \\$path of function dirname expects string, array\\|string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx.php
-
-		-
-			message: "#^Argument of an invalid type array\\|null supplied for foreach, only iterables are supported\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx.php
-
-		-
-			message: "#^Parameter \\#1 \\$path of function basename expects string, array\\|string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx.php
-
-		-
-			message: "#^Parameter \\#1 \\$function of function call_user_func expects callable\\(\\)\\: mixed, string given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\:\\:\\$pathNames has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Chart\\:\\:\\$calculateCellValues has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Chart.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, int given\\.$#"
-			count: 45
-			path: src/PhpSpreadsheet/Writer/Xlsx/Chart.php
-
-		-
-			message: "#^Call to function is_array\\(\\) with string will always evaluate to false\\.$#"
-			count: 3
-			path: src/PhpSpreadsheet/Writer/Xlsx/Chart.php
-
-		-
-			message: "#^Result of && is always false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Chart.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\PlotArea and null will always evaluate to false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Chart.php
-
-		-
-			message: "#^Argument of an invalid type array\\|string supplied for foreach, only iterables are supported\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Chart.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, string\\|null given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Writer/Xlsx/Chart.php
-
-		-
-			message: "#^Parameter \\#2 \\$yAxisLabel of method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Chart\\:\\:writeValueAxis\\(\\) expects PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Title, PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Title\\|null given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Writer/Xlsx/Chart.php
-
-		-
-			message: "#^Parameter \\#4 \\$id1 of method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Chart\\:\\:writeValueAxis\\(\\) expects string, int\\|string given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Writer/Xlsx/Chart.php
-
-		-
-			message: "#^Parameter \\#5 \\$id2 of method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Chart\\:\\:writeValueAxis\\(\\) expects string, int\\|string given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Writer/Xlsx/Chart.php
-
-		-
-			message: "#^Parameter \\#7 \\$xAxis of method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Chart\\:\\:writeValueAxis\\(\\) expects PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Axis, PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Axis\\|null given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Writer/Xlsx/Chart.php
-
-		-
-			message: "#^Parameter \\#8 \\$majorGridlines of method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Chart\\:\\:writeValueAxis\\(\\) expects PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\GridLines, PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\GridLines\\|null given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Writer/Xlsx/Chart.php
-
-		-
-			message: "#^Parameter \\#9 \\$minorGridlines of method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Chart\\:\\:writeValueAxis\\(\\) expects PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\GridLines, PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\GridLines\\|null given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Writer/Xlsx/Chart.php
-
-		-
-			message: "#^Parameter \\#2 \\$xAxisLabel of method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Chart\\:\\:writeCategoryAxis\\(\\) expects PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Title, PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Title\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Chart.php
-
-		-
-			message: "#^Parameter \\#3 \\$id1 of method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Chart\\:\\:writeCategoryAxis\\(\\) expects string, int\\|string given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Chart.php
-
-		-
-			message: "#^Parameter \\#4 \\$id2 of method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Chart\\:\\:writeCategoryAxis\\(\\) expects string, int\\|string given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Chart.php
-
-		-
-			message: "#^Parameter \\#6 \\$yAxis of method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Chart\\:\\:writeCategoryAxis\\(\\) expects PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Axis, PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Axis\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Chart.php
-
-		-
-			message: "#^Part \\$xAxis\\-\\>getShadowProperty\\('effect'\\) \\(array\\|int\\|string\\|null\\) of encapsed string cannot be cast to string\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Chart.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, array\\|int\\|string given\\.$#"
-			count: 8
-			path: src/PhpSpreadsheet/Writer/Xlsx/Chart.php
-
-		-
-			message: "#^Part \\$xAxis\\-\\>getShadowProperty\\(\\['color', 'type'\\]\\) \\(array\\|int\\|string\\|null\\) of encapsed string cannot be cast to string\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Chart.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, array\\|int\\|string\\|null given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Writer/Xlsx/Chart.php
-
-		-
-			message: "#^Else branch is unreachable because previous condition is always true\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Chart.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Chart\\:\\:getChartType\\(\\) never returns string so it can be removed from the return typehint\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Chart.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\DataSeries and null will always evaluate to false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Chart.php
-
-		-
-			message: "#^Cannot call method getFillColor\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\DataSeriesValues\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Chart.php
-
-		-
-			message: "#^Cannot call method getDataValues\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\DataSeriesValues\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Chart.php
-
-		-
-			message: "#^Parameter \\#1 \\$plotSeriesValues of method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Chart\\:\\:writeBubbles\\(\\) expects PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\DataSeriesValues, PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\DataSeriesValues\\|false given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Chart.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\DataSeriesValues and null will always evaluate to false\\.$#"
-			count: 3
-			path: src/PhpSpreadsheet/Writer/Xlsx/Chart.php
-
-		-
-			message: "#^Parameter \\#1 \\$text of method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\XMLWriter\\:\\:writeRawData\\(\\) expects array\\<string\\>\\|string, int given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Chart.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, float\\|int given\\.$#"
-			count: 4
-			path: src/PhpSpreadsheet/Writer/Xlsx/Chart.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, float given\\.$#"
-			count: 6
-			path: src/PhpSpreadsheet/Writer/Xlsx/Chart.php
-
-		-
-			message: "#^Parameter \\#1 \\$string of function substr expects string, int given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Comments.php
-
-		-
-			message: "#^Parameter \\#2 \\$content of method XMLWriter\\:\\:writeElement\\(\\) expects string\\|null, int given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Writer/Xlsx/Comments.php
-
-		-
-			message: "#^Parameter \\#1 \\$arr1 of function array_diff expects array, array\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/ContentTypes.php
-
-		-
-			message: "#^Cannot access offset 2 on array\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/ContentTypes.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\DefinedNames\\:\\:\\$objWriter has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/DefinedNames.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\DefinedNames\\:\\:\\$spreadsheet has no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/DefinedNames.php
-
-		-
-			message: "#^Cannot call method getTitle\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/DefinedNames.php
-
-		-
-			message: "#^Parameter \\#2 \\$content of method XMLWriter\\:\\:writeElement\\(\\) expects string\\|null, int given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/DocProps.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, int given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Writer/Xlsx/DocProps.php
-
-		-
-			message: "#^Parameter \\#1 \\$index of method PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\:\\:getChartByIndex\\(\\) expects string, int given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Drawing.php
-
-		-
-			message: "#^Parameter \\#2 \\$pChart of method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Drawing\\:\\:writeChart\\(\\) expects PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart, PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart\\|false given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Drawing.php
-
-		-
-			message: "#^Parameter \\#2 \\$content of method XMLWriter\\:\\:writeElement\\(\\) expects string\\|null, int given\\.$#"
-			count: 12
-			path: src/PhpSpreadsheet/Writer/Xlsx/Drawing.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, int given\\.$#"
-			count: 8
-			path: src/PhpSpreadsheet/Writer/Xlsx/Drawing.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, int\\<0, max\\> given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Drawing.php
-
-		-
-			message: "#^Parameter \\#4 \\$pTarget of method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Rels\\:\\:writeRelationship\\(\\) expects string, array\\|string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Rels.php
-
-		-
-			message: "#^Parameter \\#2 \\$pId of method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Rels\\:\\:writeRelationship\\(\\) expects int, string given\\.$#"
-			count: 4
-			path: src/PhpSpreadsheet/Writer/Xlsx/Rels.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Rels\\:\\:writeUnparsedRelationship\\(\\) has parameter \\$relationship with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Rels.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Rels\\:\\:writeUnparsedRelationship\\(\\) has parameter \\$type with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Rels.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Rels\\:\\:writeDrawingHyperLink\\(\\) has parameter \\$i with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Rels.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Rels\\:\\:writeDrawingHyperLink\\(\\) has parameter \\$objWriter with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Rels.php
-
-		-
-			message: "#^Parameter \\#2 \\$pId of method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Rels\\:\\:writeRelationship\\(\\) expects int, float\\|int given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Rels.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Rels\\:\\:writeDrawingHyperLink\\(\\) should return int but returns float\\|int\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Rels.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, int\\<0, max\\> given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
-
-		-
-			message: "#^Instanceof between string and PhpOffice\\\\PhpSpreadsheet\\\\RichText\\\\RichText will always evaluate to false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
-
-		-
-			message: "#^Instanceof between \\*NEVER\\* and PhpOffice\\\\PhpSpreadsheet\\\\RichText\\\\RichText will always evaluate to false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
-
-		-
-			message: "#^Cannot call method getName\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, string\\|null given\\.$#"
-			count: 4
-			path: src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
-
-		-
-			message: "#^Cannot call method getBold\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
-
-		-
-			message: "#^Cannot call method getItalic\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
-
-		-
-			message: "#^Cannot call method getSubscript\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
-
-		-
-			message: "#^Cannot call method getSuperscript\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
-
-		-
-			message: "#^Cannot call method getStrikethrough\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
-
-		-
-			message: "#^Cannot call method getColor\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
-
-		-
-			message: "#^Cannot call method getSize\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, float\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
-
-		-
-			message: "#^Cannot call method getUnderline\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
-
-		-
-			message: "#^Parameter \\#1 \\$pText of method PhpOffice\\\\PhpSpreadsheet\\\\RichText\\\\RichText\\:\\:createTextRun\\(\\) expects string, string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, int given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, int given\\.$#"
-			count: 22
-			path: src/PhpSpreadsheet/Writer/Xlsx/Style.php
-
-		-
-			message: "#^Parameter \\#2 \\$pNumberFormat of method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Style\\:\\:writeNumFmt\\(\\) expects PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\NumberFormat, PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\NumberFormat\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Style.php
-
-		-
-			message: "#^Parameter \\#2 \\$pFont of method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Style\\:\\:writeFont\\(\\) expects PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font, PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Style.php
-
-		-
-			message: "#^Parameter \\#2 \\$pFill of method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Style\\:\\:writeFill\\(\\) expects PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Fill, PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Fill\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Style.php
-
-		-
-			message: "#^Parameter \\#2 \\$pBorders of method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Style\\:\\:writeBorder\\(\\) expects PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Borders, PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Borders\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Style.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, int\\<0, max\\> given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Style.php
-
-		-
-			message: "#^Cannot call method getStyle\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Conditional\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Style.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, string\\|null given\\.$#"
-			count: 4
-			path: src/PhpSpreadsheet/Writer/Xlsx/Style.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, float given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Style.php
-
-		-
-			message: "#^Comparison operation \"\\<\" between int\\<min, \\-1\\> and 0 is always true\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Writer/Xlsx/Style.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, int\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Style.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, int\\<1, max\\> given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Writer/Xlsx/Style.php
-
-		-
-			message: "#^Result of \\|\\| is always true\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Style.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, int given\\.$#"
-			count: 7
-			path: src/PhpSpreadsheet/Writer/Xlsx/Workbook.php
-
-		-
-			message: "#^Parameter \\#3 \\$pStringTable of method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Worksheet\\:\\:writeSheetData\\(\\) expects array\\<string\\>, array\\<string\\>\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, string\\|null given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, int given\\.$#"
-			count: 19
-			path: src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, int\\<1, max\\> given\\.$#"
-			count: 7
-			path: src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, int\\<0, max\\> given\\.$#"
-			count: 3
-			path: src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, int\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Worksheet\\:\\:writeAttributeIf\\(\\) has parameter \\$condition with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Worksheet\\:\\:writeElementIf\\(\\) has parameter \\$condition with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
-
-		-
-			message: "#^Parameter \\#3 \\$namespace of method XMLWriter\\:\\:startElementNs\\(\\) expects string, null given\\.$#"
-			count: 8
-			path: src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
-
-		-
-			message: "#^If condition is always true\\.$#"
-			count: 6
-			path: src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Worksheet\\:\\:writeDataBarElements\\(\\) has parameter \\$dataBar with no typehint specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
-
-		-
-			message: "#^Parameter \\#4 \\$val of static method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Worksheet\\:\\:writeAttributeIf\\(\\) expects string, int given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, array\\<string\\>\\|string given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
-
-		-
-			message: "#^Argument of an invalid type array\\<string\\>\\|string supplied for foreach, only iterables are supported\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
-
-		-
-			message: "#^Parameter \\#2 \\$content of method XMLWriter\\:\\:writeElement\\(\\) expects string\\|null, int\\|string given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
-
-		-
-			message: "#^Right side of && is always true\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Xlfn\\:\\:addXlfn\\(\\) should return string but returns string\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Xlfn.php
-
-		-
-			message: "#^Unreachable statement \\- code above always terminates\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Calculation/Engine/RangeTest.php
-
-		-
-			message: "#^Call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertSame\\(\\) with arguments PhpOffice\\\\PhpSpreadsheet\\\\Cell\\\\Cell, null and 'should get exact…' will always evaluate to false\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Collection/CellsTest.php
-
-		-
-			message: "#^Cannot call method getParent\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Cell\\\\Cell\\|null\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Collection/CellsTest.php
-
-		-
-			message: "#^Cannot call method getCoordinate\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Cell\\\\Cell\\|null\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Collection/CellsTest.php
-
-		-
-			message: "#^Parameter \\#1 \\$row of method PhpOffice\\\\PhpSpreadsheet\\\\Collection\\\\Cells\\:\\:getHighestColumn\\(\\) expects string\\|null, int given\\.$#"
-			count: 3
-			path: tests/PhpSpreadsheetTests/Collection/CellsTest.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheetTests\\\\Functional\\\\ColumnWidthTest\\:\\:testReadColumnWidth\\(\\) has parameter \\$format with no typehint specified\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Functional/ColumnWidthTest.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheetTests\\\\Functional\\\\CommentsTest\\:\\:testComments\\(\\) has parameter \\$format with no typehint specified\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Functional/CommentsTest.php
-
-		-
-			message: "#^Parameter \\#1 \\$pValue of method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Conditional\\:\\:addCondition\\(\\) expects string, float given\\.$#"
-			count: 2
-			path: tests/PhpSpreadsheetTests/Functional/ConditionalStopIfTrueTest.php
-
-		-
-			message: "#^Parameter \\#1 \\$im of function imagecolorallocate expects resource, resource\\|false given\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Functional/DrawingImageHyperlinkTest.php
-
-		-
-			message: "#^Parameter \\#1 \\$im of function imagestring expects resource, resource\\|false given\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Functional/DrawingImageHyperlinkTest.php
-
-		-
-			message: "#^Parameter \\#6 \\$col of function imagestring expects int, int\\|false given\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Functional/DrawingImageHyperlinkTest.php
-
-		-
-			message: "#^Parameter \\#1 \\$value of method PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\MemoryDrawing\\:\\:setImageResource\\(\\) expects GdImage\\|resource, resource\\|false given\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Functional/DrawingImageHyperlinkTest.php
-
-		-
-			message: "#^Cannot call method getUrl\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Cell\\\\Hyperlink\\|null\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Functional/DrawingImageHyperlinkTest.php
-
-		-
-			message: "#^Cannot call method getPageSetup\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\|null\\.$#"
-			count: 5
-			path: tests/PhpSpreadsheetTests/Functional/PrintAreaTest.php
-
-		-
-			message: "#^Cannot access offset 'size' on array\\(0 \\=\\> int, 1 \\=\\> int, 2 \\=\\> int, 3 \\=\\> int, 4 \\=\\> int, 5 \\=\\> int, 6 \\=\\> int, 7 \\=\\> int, \\.\\.\\.\\)\\|false\\.$#"
-			count: 2
-			path: tests/PhpSpreadsheetTests/Functional/StreamTest.php
-
-		-
-			message: "#^Parameter \\#1 \\$fp of function fstat expects resource, resource\\|false given\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Functional/StreamTest.php
-
-		-
-			message: "#^Parameter \\#1 \\$pFilename of method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\IWriter\\:\\:save\\(\\) expects resource\\|string, resource\\|false given\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Functional/StreamTest.php
-
-		-
-			message: "#^Parameter \\#1 \\$expected of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertInstanceOf\\(\\) expects class\\-string\\<object\\>, string given\\.$#"
-			count: 3
-			path: tests/PhpSpreadsheetTests/IOFactoryTest.php
-
-		-
-			message: "#^Cannot call method getValue\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\NamedFormula\\|null\\.$#"
-			count: 5
-			path: tests/PhpSpreadsheetTests/NamedFormulaTest.php
-
-		-
-			message: "#^Cannot call method getValue\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\NamedRange\\|null\\.$#"
-			count: 5
-			path: tests/PhpSpreadsheetTests/NamedRangeTest.php
-
-		-
-			message: "#^Unreachable statement \\- code above always terminates\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Reader/Ods/OdsTest.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheetTests\\\\Reader\\\\Security\\\\XmlScannerTest\\:\\:testValidXML\\(\\) has parameter \\$libxmlDisableEntityLoader with no typehint specified\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Reader/Security/XmlScannerTest.php
-
-		-
-			message: "#^Argument of an invalid type array\\<int, string\\>\\|false supplied for foreach, only iterables are supported\\.$#"
-			count: 3
-			path: tests/PhpSpreadsheetTests/Reader/Security/XmlScannerTest.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheetTests\\\\Reader\\\\Security\\\\XmlScannerTest\\:\\:testInvalidXML\\(\\) has parameter \\$libxmlDisableEntityLoader with no typehint specified\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Reader/Security/XmlScannerTest.php
-
-		-
-			message: "#^Cannot call method getFormattedValue\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Cell\\\\Cell\\|null\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Reader/XlsTest.php
-
-		-
-			message: "#^Cannot call method getCoordinate\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Cell\\\\Cell\\|null\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Reader/XlsTest.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheetTests\\\\Reader\\\\Xlsx\\\\AutoFilterTest\\:\\:getWorksheetInstance\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Reader/Xlsx/AutoFilterTest.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheetTests\\\\Reader\\\\Xlsx\\\\AutoFilterTest\\:\\:getXMLInstance\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Reader/Xlsx/AutoFilterTest.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheetTests\\\\Reader\\\\Xlsx\\\\AutoFilterTest\\:\\:getXMLInstance\\(\\) has parameter \\$ref with no typehint specified\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Reader/Xlsx/AutoFilterTest.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheetTests\\\\Reader\\\\Xlsx\\\\AutoFilterTest\\:\\:getAutoFilterInstance\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Reader/Xlsx/AutoFilterTest.php
-
-		-
-			message: "#^Function PhpOffice\\\\PhpSpreadsheetTests\\\\Reader\\\\getTitleText\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Reader/Xlsx/ChartsTitleTest.php
-
-		-
-			message: "#^Function PhpOffice\\\\PhpSpreadsheetTests\\\\Reader\\\\getTitleText\\(\\) has parameter \\$title with no typehint specified\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Reader/Xlsx/ChartsTitleTest.php
-
-		-
-			message: "#^Cannot call method setMinimumConditionalFormatValueObject\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\ConditionalFormatting\\\\ConditionalDataBar\\|null\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Reader/Xlsx/ConditionalFormattingDataBarXlsxTest.php
-
-		-
-			message: "#^Cannot call method getMinimumConditionalFormatValueObject\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\ConditionalFormatting\\\\ConditionalDataBar\\|null\\.$#"
-			count: 13
-			path: tests/PhpSpreadsheetTests/Reader/Xlsx/ConditionalFormattingDataBarXlsxTest.php
-
-		-
-			message: "#^Cannot call method getMaximumConditionalFormatValueObject\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\ConditionalFormatting\\\\ConditionalDataBar\\|null\\.$#"
-			count: 13
-			path: tests/PhpSpreadsheetTests/Reader/Xlsx/ConditionalFormattingDataBarXlsxTest.php
-
-		-
-			message: "#^Cannot call method getColor\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\ConditionalFormatting\\\\ConditionalDataBar\\|null\\.$#"
-			count: 5
-			path: tests/PhpSpreadsheetTests/Reader/Xlsx/ConditionalFormattingDataBarXlsxTest.php
-
-		-
-			message: "#^Cannot call method getConditionalFormattingRuleExt\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\ConditionalFormatting\\\\ConditionalDataBar\\|null\\.$#"
-			count: 8
-			path: tests/PhpSpreadsheetTests/Reader/Xlsx/ConditionalFormattingDataBarXlsxTest.php
-
-		-
-			message: "#^Cannot call method getShowValue\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\ConditionalFormatting\\\\ConditionalDataBar\\|null\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Reader/Xlsx/ConditionalFormattingDataBarXlsxTest.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheetTests\\\\Reader\\\\XlsxTest\\:\\:testStripsWhiteSpaceFromStyleString\\(\\) has parameter \\$string with no typehint specified\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Reader/XlsxTest.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheetTests\\\\Reader\\\\Xml\\\\XmlTest\\:\\:testInvalidSimpleXML\\(\\) has parameter \\$filename with no typehint specified\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Reader/Xml/XmlTest.php
-
-		-
-			message: "#^Argument of an invalid type array\\<int, string\\>\\|false supplied for foreach, only iterables are supported\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Reader/Xml/XmlTest.php
-
-		-
-			message: "#^Parameter \\#1 \\$pValue of static method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\StringHelper\\:\\:setCurrencyCode\\(\\) expects string, null given\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Shared/StringHelperTest.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheetTests\\\\SpreadsheetTest\\:\\:testGetSheetByName\\(\\) has parameter \\$index with no typehint specified\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/SpreadsheetTest.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheetTests\\\\SpreadsheetTest\\:\\:testGetSheetByName\\(\\) has parameter \\$sheetName with no typehint specified\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/SpreadsheetTest.php
-
-		-
-			message: "#^Parameter \\#1 \\$pValue of method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Conditional\\:\\:addCondition\\(\\) expects string, float given\\.$#"
-			count: 2
-			path: tests/PhpSpreadsheetTests/Style/ConditionalTest.php
-
-		-
-			message: "#^Parameter \\#1 \\$pValue of method PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Conditional\\:\\:setConditions\\(\\) expects array\\<string\\>\\|bool\\|float\\|int\\|string, array\\<int, float\\> given\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Style/ConditionalTest.php
-
-		-
-			message: "#^Parameter \\#1 \\$pValue of method PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\AutoFilter\\\\Column\\\\Rule\\:\\:setValue\\(\\) expects array\\<string\\>\\|string, int given\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Worksheet/AutoFilter/Column/RuleTest.php
-
-		-
-			message: "#^Parameter \\#1 \\$attributes of method PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\AutoFilter\\\\Column\\:\\:setAttributes\\(\\) expects array\\<string\\>, array\\<string, int\\> given\\.$#"
-			count: 3
-			path: tests/PhpSpreadsheetTests/Worksheet/AutoFilter/ColumnTest.php
-
-		-
-			message: "#^Parameter \\#2 \\$pValue of method PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\AutoFilter\\\\Column\\:\\:setAttribute\\(\\) expects string, int given\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Worksheet/AutoFilter/ColumnTest.php
-
-		-
-			message: "#^Parameter \\#1 \\$pColumn of method PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\AutoFilter\\:\\:setColumn\\(\\) expects PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\AutoFilter\\\\Column\\|string, float given\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Worksheet/AutoFilterTest.php
-
-		-
-			message: "#^Parameter \\#1 \\$im of function imagecolorallocate expects resource, resource\\|false given\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Worksheet/DrawingTest.php
-
-		-
-			message: "#^Parameter \\#1 \\$im of function imagestring expects resource, resource\\|false given\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Worksheet/DrawingTest.php
-
-		-
-			message: "#^Parameter \\#6 \\$col of function imagestring expects int, int\\|false given\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Worksheet/DrawingTest.php
-
-		-
-			message: "#^Parameter \\#1 \\$value of method PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\MemoryDrawing\\:\\:setImageResource\\(\\) expects GdImage\\|resource, resource\\|false given\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Worksheet/DrawingTest.php
-
-		-
-			message: "#^Parameter \\#2 \\$rowIndex of class PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\RowCellIterator constructor expects int, string given\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Worksheet/RowCellIterator2Test.php
-
-		-
-			message: "#^Parameter \\#1 \\$options of static method PhpOffice\\\\PhpSpreadsheet\\\\Settings\\:\\:setLibXmlLoaderOptions\\(\\) expects int, null given\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Worksheet/WorksheetNamedRangesTest.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheetTests\\\\Writer\\\\Csv\\\\CsvEnclosureTest\\:\\:\\$cellValues has no typehint specified\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Writer/Csv/CsvEnclosureTest.php
-
-		-
-			message: "#^Parameter \\#3 \\$subject of function preg_replace expects array\\|string, string\\|false given\\.$#"
-			count: 4
-			path: tests/PhpSpreadsheetTests/Writer/Csv/CsvEnclosureTest.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheetTests\\\\Writer\\\\Html\\\\CallbackTest\\:\\:yellowBody\\(\\) should return string but returns string\\|null\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Writer/Html/CallbackTest.php
-
-		-
-			message: "#^Parameter \\#1 \\$haystack of function strpos expects string, string\\|false given\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Writer/Html/CallbackTest.php
-
-		-
-			message: "#^Cannot call method getColor\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 3
-			path: tests/PhpSpreadsheetTests/Writer/Html/GridlinesTest.php
-
-		-
-			message: "#^Cannot call method setSuperScript\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Writer/Html/GridlinesTest.php
-
-		-
-			message: "#^Cannot call method setSubScript\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 3
-			path: tests/PhpSpreadsheetTests/Writer/Html/GridlinesTest.php
-
-		-
-			message: "#^Cannot call method setBold\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 3
-			path: tests/PhpSpreadsheetTests/Writer/Html/HtmlCommentsTest.php
-
-		-
-			message: "#^Parameter \\#1 \\$directory of function chdir expects string, string\\|false given\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Writer/Html/ImagesRootTest.php
-
-		-
-			message: "#^Parameter \\#1 \\$options of static method PhpOffice\\\\PhpSpreadsheet\\\\Settings\\:\\:setLibXmlLoaderOptions\\(\\) expects int, null given\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Writer/Xlsx/FloatsRetainedTest.php
-
-		-
-			message: "#^Parameter \\#2 \\$locale of function setlocale expects string\\|null, string\\|false given\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Writer/Xlsx/LocaleFloatsTest.php
-
-		-
-			message: "#^Parameter \\#2 \\$subject of function preg_match expects string, string\\|false given\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Writer/Xlsx/LocaleFloatsTest.php
-
-		-
-			message: "#^Parameter \\#1 \\$options of static method PhpOffice\\\\PhpSpreadsheet\\\\Settings\\:\\:setLibXmlLoaderOptions\\(\\) expects int, null given\\.$#"
-			count: 2
-			path: tests/PhpSpreadsheetTests/Writer/Xlsx/StartsWithHashTest.php
-
-		-
-			message: "#^Parameter \\#1 \\$options of static method PhpOffice\\\\PhpSpreadsheet\\\\Settings\\:\\:setLibXmlLoaderOptions\\(\\) expects int, null given\\.$#"
-			count: 2
-			path: tests/PhpSpreadsheetTests/Writer/Xlsx/UnparsedDataCloneTest.php
-
-		-
-			message: "#^Cannot call method getDrawingCollection\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\|null\\.$#"
-			count: 4
-			path: tests/PhpSpreadsheetTests/Writer/Xlsx/UnparsedDataCloneTest.php
-
-		-
-			message: "#^Cannot call method getCell\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\|null\\.$#"
-			count: 4
-			path: tests/PhpSpreadsheetTests/Writer/Xlsx/UnparsedDataCloneTest.php
-
-		-
-			message: "#^Parameter \\#1 \\$options of static method PhpOffice\\\\PhpSpreadsheet\\\\Settings\\:\\:setLibXmlLoaderOptions\\(\\) expects int, null given\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Writer/Xlsx/UnparsedDataTest.php
-
-		-
-			message: "#^Parameter \\#1 \\$data of function simplexml_load_string expects string, string\\|false given\\.$#"
-			count: 2
-			path: tests/PhpSpreadsheetTests/Writer/Xlsx/UnparsedDataTest.php
-
-		-
-			message: "#^Cannot access property \\$workbookProtection on SimpleXMLElement\\|false\\.$#"
-			count: 3
-			path: tests/PhpSpreadsheetTests/Writer/Xlsx/UnparsedDataTest.php
-
-		-
-			message: "#^Cannot access property \\$sheets on SimpleXMLElement\\|false\\.$#"
-			count: 2
-			path: tests/PhpSpreadsheetTests/Writer/Xlsx/UnparsedDataTest.php
-
-		-
-			message: "#^Cannot access property \\$pageSetup on SimpleXMLElement\\|false\\.$#"
-			count: 1
-			path: tests/PhpSpreadsheetTests/Writer/Xlsx/UnparsedDataTest.php
-
-		-
-			message: "#^Cannot access property \\$sheetProtection on SimpleXMLElement\\|false\\.$#"
-			count: 5
-			path: tests/PhpSpreadsheetTests/Writer/Xlsx/UnparsedDataTest.php
-
diff --git a/vendor/phpoffice/phpspreadsheet/phpstan.neon.dist b/vendor/phpoffice/phpspreadsheet/phpstan.neon.dist
index b7a4fca81f..06fbbcdd66 100644
--- a/vendor/phpoffice/phpspreadsheet/phpstan.neon.dist
+++ b/vendor/phpoffice/phpspreadsheet/phpstan.neon.dist
@@ -4,26 +4,26 @@ includes:
     - vendor/phpstan/phpstan-phpunit/rules.neon
 
 parameters:
-    level: max
+    level: 8
     paths:
+        - samples/
         - src/
         - tests/
+        - infra/
+        - bin/generate-document
+        - bin/generate-locales
+        - bin/check-phpdoc-types
+    excludePaths:
+        - src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
+        - src/PhpSpreadsheet/Chart/Renderer/JpGraphRendererBase.php
+        - src/PhpSpreadsheet/Collection/Memory/SimpleCache1.php
+        - src/PhpSpreadsheet/Collection/Memory/SimpleCache3.php
+        - src/PhpSpreadsheet/Writer/ZipStream2.php
+        - src/PhpSpreadsheet/Writer/ZipStream3.php
     parallel:
         processTimeout: 300.0
-    checkMissingIterableValueType: false
     ignoreErrors:
-        - '~^Class GdImage not found\.$~'
-        - '~^Return typehint of method .* has invalid type GdImage\.$~'
-        - '~^Property .* has unknown class GdImage as its type\.$~'
-        - '~^Parameter .* of method .* has invalid typehint type GdImage\.$~'
-        - '~^Parameter \#1 \$im of function (imagedestroy|imageistruecolor|imagealphablending|imagesavealpha|imagecolortransparent|imagecolorsforindex|imagesavealpha|imagesx|imagesy) expects resource, GdImage\|resource given\.$~'
-        - '~^Parameter \#2 \$src_im of function imagecopy expects resource, GdImage\|resource given\.$~'
         # Accept a bit anything for assert methods
         - '~^Parameter \#2 .* of static method PHPUnit\\Framework\\Assert\:\:assert\w+\(\) expects .*, .* given\.$~'
-        - '~^Method PhpOffice\\PhpSpreadsheetTests\\.*\:\:test.*\(\) has parameter \$args with no typehint specified\.$~'
-
-        # Ignore all JpGraph issues
-        - '~^Constant (MARK_CIRCLE|MARK_CROSS|MARK_DIAMOND|MARK_DTRIANGLE|MARK_FILLEDCIRCLE|MARK_SQUARE|MARK_STAR|MARK_UTRIANGLE|MARK_X|SIDE_RIGHT) not found\.$~'
-        - '~^Instantiated class (AccBarPlot|AccLinePlot|BarPlot|ContourPlot|Graph|GroupBarPlot|GroupBarPlot|LinePlot|LinePlot|PieGraph|PiePlot|PiePlot3D|PiePlotC|RadarGraph|RadarPlot|ScatterPlot|Spline|StockPlot) not found\.$~'
-        - '~^Call to method .*\(\) on an unknown class (AccBarPlot|AccLinePlot|BarPlot|ContourPlot|Graph|GroupBarPlot|GroupBarPlot|LinePlot|LinePlot|PieGraph|PiePlot|PiePlot3D|PiePlotC|RadarGraph|RadarPlot|ScatterPlot|Spline|StockPlot)\.$~'
-        - '~^Access to property .* on an unknown class (AccBarPlot|AccLinePlot|BarPlot|ContourPlot|Graph|GroupBarPlot|GroupBarPlot|LinePlot|LinePlot|PieGraph|PiePlot|PiePlot3D|PiePlotC|RadarGraph|RadarPlot|ScatterPlot|Spline|StockPlot)\.$~'
+        - '~^Variable \$helper might not be defined\.$~'
+        - identifier: missingType.iterableValue
diff --git a/vendor/phpoffice/phpspreadsheet/phpunit9.xml.dist b/vendor/phpoffice/phpspreadsheet/phpunit9.xml.dist
new file mode 100644
index 0000000000..896b73339f
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/phpunit9.xml.dist
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" bootstrap="./tests/bootstrap.php" backupGlobals="true" colors="true" cacheResultFile="/tmp/.phpspreadsheet.phpunit.result.cache" convertDeprecationsToExceptions="true">
+  <coverage>
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </coverage>
+  <php>
+    <ini name="memory_limit" value="2048M"/>
+    <ini name="error_reporting" value="E_ALL"/>
+  </php>
+  <testsuite name="PhpSpreadsheet Unit Test Suite">
+    <directory>./tests/PhpSpreadsheetTests</directory>
+  </testsuite>
+</phpunit>
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/ArrayEnabled.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/ArrayEnabled.php
new file mode 100644
index 0000000000..7b78b6f544
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/ArrayEnabled.php
@@ -0,0 +1,122 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Engine\ArrayArgumentHelper;
+use PhpOffice\PhpSpreadsheet\Calculation\Engine\ArrayArgumentProcessor;
+
+trait ArrayEnabled
+{
+    private static bool $initializationNeeded = true;
+
+    private static ArrayArgumentHelper $arrayArgumentHelper;
+
+    /**
+     * @param array|false $arguments Can be changed to array for Php8.1+
+     */
+    private static function initialiseHelper($arguments): void
+    {
+        if (self::$initializationNeeded === true) {
+            self::$arrayArgumentHelper = new ArrayArgumentHelper();
+            self::$initializationNeeded = false;
+        }
+        self::$arrayArgumentHelper->initialise(($arguments === false) ? [] : $arguments);
+    }
+
+    /**
+     * Handles array argument processing when the function accepts a single argument that can be an array argument.
+     * Example use for:
+     *         DAYOFMONTH() or FACT().
+     */
+    protected static function evaluateSingleArgumentArray(callable $method, array $values): array
+    {
+        $result = [];
+        foreach ($values as $value) {
+            $result[] = $method($value);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Handles array argument processing when the function accepts multiple arguments,
+     *     and any of them can be an array argument.
+     * Example use for:
+     *         ROUND() or DATE().
+     */
+    protected static function evaluateArrayArguments(callable $method, mixed ...$arguments): array
+    {
+        self::initialiseHelper($arguments);
+        $arguments = self::$arrayArgumentHelper->arguments();
+
+        return ArrayArgumentProcessor::processArguments(self::$arrayArgumentHelper, $method, ...$arguments);
+    }
+
+    /**
+     * Handles array argument processing when the function accepts multiple arguments,
+     *     but only the first few (up to limit) can be an array arguments.
+     * Example use for:
+     *         NETWORKDAYS() or CONCATENATE(), where the last argument is a matrix (or a series of values) that need
+     *                                         to be treated as a such rather than as an array arguments.
+     */
+    protected static function evaluateArrayArgumentsSubset(callable $method, int $limit, mixed ...$arguments): array
+    {
+        self::initialiseHelper(array_slice($arguments, 0, $limit));
+        $trailingArguments = array_slice($arguments, $limit);
+        $arguments = self::$arrayArgumentHelper->arguments();
+        $arguments = array_merge($arguments, $trailingArguments);
+
+        return ArrayArgumentProcessor::processArguments(self::$arrayArgumentHelper, $method, ...$arguments);
+    }
+
+    private static function testFalse(mixed $value): bool
+    {
+        return $value === false;
+    }
+
+    /**
+     * Handles array argument processing when the function accepts multiple arguments,
+     *     but only the last few (from start) can be an array arguments.
+     * Example use for:
+     *         Z.TEST() or INDEX(), where the first argument 1 is a matrix that needs to be treated as a dataset
+     *                   rather than as an array argument.
+     */
+    protected static function evaluateArrayArgumentsSubsetFrom(callable $method, int $start, mixed ...$arguments): array
+    {
+        $arrayArgumentsSubset = array_combine(
+            range($start, count($arguments) - $start),
+            array_slice($arguments, $start)
+        );
+        if (self::testFalse($arrayArgumentsSubset)) {
+            return ['#VALUE!'];
+        }
+
+        self::initialiseHelper($arrayArgumentsSubset);
+        $leadingArguments = array_slice($arguments, 0, $start);
+        $arguments = self::$arrayArgumentHelper->arguments();
+        $arguments = array_merge($leadingArguments, $arguments);
+
+        return ArrayArgumentProcessor::processArguments(self::$arrayArgumentHelper, $method, ...$arguments);
+    }
+
+    /**
+     * Handles array argument processing when the function accepts multiple arguments,
+     *     and any of them can be an array argument except for the one specified by ignore.
+     * Example use for:
+     *         HLOOKUP() and VLOOKUP(), where argument 1 is a matrix that needs to be treated as a database
+     *                                  rather than as an array argument.
+     */
+    protected static function evaluateArrayArgumentsIgnore(callable $method, int $ignore, mixed ...$arguments): array
+    {
+        $leadingArguments = array_slice($arguments, 0, $ignore);
+        $ignoreArgument = array_slice($arguments, $ignore, 1);
+        $trailingArguments = array_slice($arguments, $ignore + 1);
+
+        self::initialiseHelper(array_merge($leadingArguments, [[null]], $trailingArguments));
+        $arguments = self::$arrayArgumentHelper->arguments();
+
+        array_splice($arguments, $ignore, 1, $ignoreArgument);
+
+        return ArrayArgumentProcessor::processArguments(self::$arrayArgumentHelper, $method, ...$arguments);
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/BinaryComparison.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/BinaryComparison.php
new file mode 100644
index 0000000000..e4bc156af0
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/BinaryComparison.php
@@ -0,0 +1,136 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation;
+
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+
+class BinaryComparison
+{
+    /**
+     * Epsilon Precision used for comparisons in calculations.
+     */
+    private const DELTA = 0.1e-12;
+
+    /**
+     * Compare two strings in the same way as strcmp() except that lowercase come before uppercase letters.
+     *
+     * @param null|string $str1 First string value for the comparison
+     * @param null|string $str2 Second string value for the comparison
+     */
+    private static function strcmpLowercaseFirst(?string $str1, ?string $str2): int
+    {
+        $inversedStr1 = StringHelper::strCaseReverse($str1 ?? '');
+        $inversedStr2 = StringHelper::strCaseReverse($str2 ?? '');
+
+        return strcmp($inversedStr1, $inversedStr2);
+    }
+
+    /**
+     * PHP8.1 deprecates passing null to strcmp.
+     *
+     * @param null|string $str1 First string value for the comparison
+     * @param null|string $str2 Second string value for the comparison
+     */
+    private static function strcmpAllowNull(?string $str1, ?string $str2): int
+    {
+        return strcmp($str1 ?? '', $str2 ?? '');
+    }
+
+    public static function compare(mixed $operand1, mixed $operand2, string $operator): bool
+    {
+        //    Simple validate the two operands if they are string values
+        if (is_string($operand1) && $operand1 > '' && $operand1[0] == Calculation::FORMULA_STRING_QUOTE) {
+            $operand1 = Calculation::unwrapResult($operand1);
+        }
+        if (is_string($operand2) && $operand2 > '' && $operand2[0] == Calculation::FORMULA_STRING_QUOTE) {
+            $operand2 = Calculation::unwrapResult($operand2);
+        }
+
+        // Use case insensitive comparaison if not OpenOffice mode
+        if (Functions::getCompatibilityMode() != Functions::COMPATIBILITY_OPENOFFICE) {
+            if (is_string($operand1)) {
+                $operand1 = StringHelper::strToUpper($operand1);
+            }
+            if (is_string($operand2)) {
+                $operand2 = StringHelper::strToUpper($operand2);
+            }
+        }
+
+        $useLowercaseFirstComparison = is_string($operand1)
+            && is_string($operand2)
+            && Functions::getCompatibilityMode() === Functions::COMPATIBILITY_OPENOFFICE;
+
+        return self::evaluateComparison($operand1, $operand2, $operator, $useLowercaseFirstComparison);
+    }
+
+    private static function evaluateComparison(mixed $operand1, mixed $operand2, string $operator, bool $useLowercaseFirstComparison): bool
+    {
+        return match ($operator) {
+            '=' => self::equal($operand1, $operand2),
+            '>' => self::greaterThan($operand1, $operand2, $useLowercaseFirstComparison),
+            '<' => self::lessThan($operand1, $operand2, $useLowercaseFirstComparison),
+            '>=' => self::greaterThanOrEqual($operand1, $operand2, $useLowercaseFirstComparison),
+            '<=' => self::lessThanOrEqual($operand1, $operand2, $useLowercaseFirstComparison),
+            '<>' => self::notEqual($operand1, $operand2),
+            default => throw new Exception('Unsupported binary comparison operator'),
+        };
+    }
+
+    private static function equal(mixed $operand1, mixed $operand2): bool
+    {
+        if (is_numeric($operand1) && is_numeric($operand2)) {
+            $result = (abs($operand1 - $operand2) < self::DELTA);
+        } elseif (($operand1 === null && is_numeric($operand2)) || ($operand2 === null && is_numeric($operand1))) {
+            $result = $operand1 == $operand2;
+        } else {
+            $result = self::strcmpAllowNull($operand1, $operand2) == 0;
+        }
+
+        return $result;
+    }
+
+    private static function greaterThanOrEqual(mixed $operand1, mixed $operand2, bool $useLowercaseFirstComparison): bool
+    {
+        if (is_numeric($operand1) && is_numeric($operand2)) {
+            $result = ((abs($operand1 - $operand2) < self::DELTA) || ($operand1 > $operand2));
+        } elseif (($operand1 === null && is_numeric($operand2)) || ($operand2 === null && is_numeric($operand1))) {
+            $result = $operand1 >= $operand2;
+        } elseif ($useLowercaseFirstComparison) {
+            $result = self::strcmpLowercaseFirst($operand1, $operand2) >= 0;
+        } else {
+            $result = self::strcmpAllowNull($operand1, $operand2) >= 0;
+        }
+
+        return $result;
+    }
+
+    private static function lessThanOrEqual(mixed $operand1, mixed $operand2, bool $useLowercaseFirstComparison): bool
+    {
+        if (is_numeric($operand1) && is_numeric($operand2)) {
+            $result = ((abs($operand1 - $operand2) < self::DELTA) || ($operand1 < $operand2));
+        } elseif (($operand1 === null && is_numeric($operand2)) || ($operand2 === null && is_numeric($operand1))) {
+            $result = $operand1 <= $operand2;
+        } elseif ($useLowercaseFirstComparison) {
+            $result = self::strcmpLowercaseFirst($operand1, $operand2) <= 0;
+        } else {
+            $result = self::strcmpAllowNull($operand1, $operand2) <= 0;
+        }
+
+        return $result;
+    }
+
+    private static function greaterThan(mixed $operand1, mixed $operand2, bool $useLowercaseFirstComparison): bool
+    {
+        return self::lessThanOrEqual($operand1, $operand2, $useLowercaseFirstComparison) !== true;
+    }
+
+    private static function lessThan(mixed $operand1, mixed $operand2, bool $useLowercaseFirstComparison): bool
+    {
+        return self::greaterThanOrEqual($operand1, $operand2, $useLowercaseFirstComparison) !== true;
+    }
+
+    private static function notEqual(mixed $operand1, mixed $operand2): bool
+    {
+        return self::equal($operand1, $operand2) !== true;
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Calculation.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Calculation.php
index d03b36236f..6fa1dde2c9 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Calculation.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Calculation.php
@@ -2,17 +2,26 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation;
 
+use PhpOffice\PhpSpreadsheet\Calculation\Engine\BranchPruner;
 use PhpOffice\PhpSpreadsheet\Calculation\Engine\CyclicReferenceStack;
 use PhpOffice\PhpSpreadsheet\Calculation\Engine\Logger;
+use PhpOffice\PhpSpreadsheet\Calculation\Engine\Operands;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Calculation\Token\Stack;
+use PhpOffice\PhpSpreadsheet\Cell\AddressRange;
 use PhpOffice\PhpSpreadsheet\Cell\Cell;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Cell\DataType;
 use PhpOffice\PhpSpreadsheet\DefinedName;
+use PhpOffice\PhpSpreadsheet\NamedRange;
 use PhpOffice\PhpSpreadsheet\ReferenceHelper;
 use PhpOffice\PhpSpreadsheet\Shared;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use ReflectionClassConstant;
 use ReflectionMethod;
+use ReflectionParameter;
+use Throwable;
 
 class Calculation
 {
@@ -25,19 +34,25 @@ class Calculation
     //    Opening bracket
     const CALCULATION_REGEXP_OPENBRACE = '\(';
     //    Function (allow for the old @ symbol that could be used to prefix a function, but we'll ignore it)
-    const CALCULATION_REGEXP_FUNCTION = '@?(?:_xlfn\.)?([\p{L}][\p{L}\p{N}\.]*)[\s]*\(';
+    const CALCULATION_REGEXP_FUNCTION = '@?(?:_xlfn\.)?(?:_xlws\.)?([\p{L}][\p{L}\p{N}\.]*)[\s]*\(';
+    //    Strip xlfn and xlws prefixes from function name
+    const CALCULATION_REGEXP_STRIP_XLFN_XLWS = '/(_xlfn[.])?(_xlws[.])?(?=[\p{L}][\p{L}\p{N}\.]*[\s]*[(])/';
     //    Cell reference (cell or range of cells, with or without a sheet reference)
-    const CALCULATION_REGEXP_CELLREF = '((([^\s,!&%^\/\*\+<>=-]*)|(\'[^\']*\')|(\"[^\"]*\"))!)?\$?\b([a-z]{1,3})\$?(\d{1,7})(?![\w.])';
+    const CALCULATION_REGEXP_CELLREF = '((([^\s,!&%^\/\*\+<>=:`-]*)|(\'(?:[^\']|\'[^!])+?\')|(\"(?:[^\"]|\"[^!])+?\"))!)?\$?\b([a-z]{1,3})\$?(\d{1,7})(?![\w.])';
+    // Used only to detect spill operator #
+    const CALCULATION_REGEXP_CELLREF_SPILL = '/' . self::CALCULATION_REGEXP_CELLREF . '#/i';
     //    Cell reference (with or without a sheet reference) ensuring absolute/relative
-    const CALCULATION_REGEXP_CELLREF_RELATIVE = '((([^\s\(,!&%^\/\*\+<>=-]*)|(\'[^\']*\')|(\"[^\"]*\"))!)?(\$?\b[a-z]{1,3})(\$?\d{1,7})(?![\w.])';
-    const CALCULATION_REGEXP_COLUMN_RANGE = '(((([^\s\(,!&%^\/\*\+<>=-]*)|(\'[^\']*\')|(\"[^\"]*\"))!)?(\$?[a-z]{1,3})):(?![.*])';
-    const CALCULATION_REGEXP_ROW_RANGE = '(((([^\s\(,!&%^\/\*\+<>=-]*)|(\'[^\']*\')|(\"[^\"]*\"))!)?(\$?[1-9][0-9]{0,6})):(?![.*])';
+    const CALCULATION_REGEXP_CELLREF_RELATIVE = '((([^\s\(,!&%^\/\*\+<>=:`-]*)|(\'(?:[^\']|\'[^!])+?\')|(\"(?:[^\"]|\"[^!])+?\"))!)?(\$?\b[a-z]{1,3})(\$?\d{1,7})(?![\w.])';
+    const CALCULATION_REGEXP_COLUMN_RANGE = '(((([^\s\(,!&%^\/\*\+<>=:`-]*)|(\'(?:[^\']|\'[^!])+?\')|(\".(?:[^\"]|\"[^!])?\"))!)?(\$?[a-z]{1,3})):(?![.*])';
+    const CALCULATION_REGEXP_ROW_RANGE = '(((([^\s\(,!&%^\/\*\+<>=:`-]*)|(\'(?:[^\']|\'[^!])+?\')|(\"(?:[^\"]|\"[^!])+?\"))!)?(\$?[1-9][0-9]{0,6})):(?![.*])';
     //    Cell reference (with or without a sheet reference) ensuring absolute/relative
     //    Cell ranges ensuring absolute/relative
     const CALCULATION_REGEXP_COLUMNRANGE_RELATIVE = '(\$?[a-z]{1,3}):(\$?[a-z]{1,3})';
     const CALCULATION_REGEXP_ROWRANGE_RELATIVE = '(\$?\d{1,7}):(\$?\d{1,7})';
     //    Defined Names: Named Range of cells, or Named Formulae
-    const CALCULATION_REGEXP_DEFINEDNAME = '((([^\s,!&%^\/\*\+<>=-]*)|(\'[^\']*\')|(\"[^\"]*\"))!)?([_\p{L}][_\p{L}\p{N}\.]*)';
+    const CALCULATION_REGEXP_DEFINEDNAME = '((([^\s,!&%^\/\*\+<>=-]*)|(\'(?:[^\']|\'[^!])+?\')|(\"(?:[^\"]|\"[^!])+?\"))!)?([_\p{L}][_\p{L}\p{N}\.]*)';
+    // Structured Reference (Fully Qualified and Unqualified)
+    const CALCULATION_REGEXP_STRUCTURED_REFERENCE = '([\p{L}_\\\\][\p{L}\p{N}\._]+)?(\[(?:[^\d\]+-])?)';
     //    Error
     const CALCULATION_REGEXP_ERROR = '\#[A-Z][A-Z0_\/]*[!\?]?';
 
@@ -46,144 +61,108 @@ class Calculation
     const RETURN_ARRAY_AS_VALUE = 'value';
     const RETURN_ARRAY_AS_ARRAY = 'array';
 
-    const FORMULA_OPEN_FUNCTION_BRACE = '{';
-    const FORMULA_CLOSE_FUNCTION_BRACE = '}';
+    const FORMULA_OPEN_FUNCTION_BRACE = '(';
+    const FORMULA_CLOSE_FUNCTION_BRACE = ')';
+    const FORMULA_OPEN_MATRIX_BRACE = '{';
+    const FORMULA_CLOSE_MATRIX_BRACE = '}';
     const FORMULA_STRING_QUOTE = '"';
 
-    private static $returnArrayAsType = self::RETURN_ARRAY_AS_VALUE;
+    /** Preferable to use instance variable instanceArrayReturnType rather than this static property. */
+    private static string $returnArrayAsType = self::RETURN_ARRAY_AS_VALUE;
+
+    /** Preferable to use this instance variable rather than static returnArrayAsType */
+    private ?string $instanceArrayReturnType = null;
 
     /**
      * Instance of this class.
-     *
-     * @var Calculation
      */
-    private static $instance;
+    private static ?Calculation $instance = null;
 
     /**
      * Instance of the spreadsheet this Calculation Engine is using.
-     *
-     * @var Spreadsheet
      */
-    private $spreadsheet;
+    private ?Spreadsheet $spreadsheet;
 
     /**
      * Calculation cache.
-     *
-     * @var array
      */
-    private $calculationCache = [];
+    private array $calculationCache = [];
 
     /**
      * Calculation cache enabled.
-     *
-     * @var bool
      */
-    private $calculationCacheEnabled = true;
+    private bool $calculationCacheEnabled = true;
 
-    /**
-     * Used to generate unique store keys.
-     *
-     * @var int
-     */
-    private $branchStoreKeyCounter = 0;
+    private BranchPruner $branchPruner;
 
-    private $branchPruningEnabled = true;
+    private bool $branchPruningEnabled = true;
 
     /**
      * List of operators that can be used within formulae
      * The true/false value indicates whether it is a binary operator or a unary operator.
-     *
-     * @var array
      */
-    private static $operators = [
+    private const CALCULATION_OPERATORS = [
         '+' => true, '-' => true, '*' => true, '/' => true,
         '^' => true, '&' => true, '%' => false, '~' => false,
         '>' => true, '<' => true, '=' => true, '>=' => true,
-        '<=' => true, '<>' => true, '|' => true, ':' => true,
+        '<=' => true, '<>' => true, '∩' => true, '∪' => true,
+        ':' => true,
     ];
 
     /**
      * List of binary operators (those that expect two operands).
-     *
-     * @var array
      */
-    private static $binaryOperators = [
+    private const BINARY_OPERATORS = [
         '+' => true, '-' => true, '*' => true, '/' => true,
         '^' => true, '&' => true, '>' => true, '<' => true,
         '=' => true, '>=' => true, '<=' => true, '<>' => true,
-        '|' => true, ':' => true,
+        '∩' => true, '∪' => true, ':' => true,
     ];
 
     /**
      * The debug log generated by the calculation engine.
-     *
-     * @var Logger
      */
-    private $debugLog;
+    private Logger $debugLog;
 
-    /**
-     * Flag to determine how formula errors should be handled
-     *        If true, then a user error will be triggered
-     *        If false, then an exception will be thrown.
-     *
-     * @var bool
-     */
-    public $suppressFormulaErrors = false;
+    private bool $suppressFormulaErrors = false;
+
+    private bool $processingAnchorArray = false;
 
     /**
      * Error message for any error that was raised/thrown by the calculation engine.
-     *
-     * @var null|string
      */
-    public $formulaError;
+    public ?string $formulaError = null;
 
     /**
      * Reference Helper.
-     *
-     * @var ReferenceHelper
      */
-    private static $referenceHelper;
+    private static ReferenceHelper $referenceHelper;
 
     /**
      * An array of the nested cell references accessed by the calculation engine, used for the debug log.
-     *
-     * @var CyclicReferenceStack
      */
-    private $cyclicReferenceStack;
+    private CyclicReferenceStack $cyclicReferenceStack;
 
-    private $cellStack = [];
+    private array $cellStack = [];
 
     /**
      * Current iteration counter for cyclic formulae
      * If the value is 0 (or less) then cyclic formulae will throw an exception,
      * otherwise they will iterate to the limit defined here before returning a result.
-     *
-     * @var int
      */
-    private $cyclicFormulaCounter = 1;
+    private int $cyclicFormulaCounter = 1;
 
-    private $cyclicFormulaCell = '';
+    private string $cyclicFormulaCell = '';
 
     /**
      * Number of iterations for cyclic formulae.
-     *
-     * @var int
-     */
-    public $cyclicFormulaCount = 1;
-
-    /**
-     * Epsilon Precision used for comparisons in calculations.
-     *
-     * @var float
      */
-    private $delta = 0.1e-12;
+    public int $cyclicFormulaCount = 1;
 
     /**
      * The current locale setting.
-     *
-     * @var string
      */
-    private static $localeLanguage = 'en_us'; //    US English    (default locale)
+    private static string $localeLanguage = 'en_us'; //    US English    (default locale)
 
     /**
      * List of available locale settings
@@ -191,44 +170,61 @@ class Calculation
      *
      * @var string[]
      */
-    private static $validLocaleLanguages = [
+    private static array $validLocaleLanguages = [
         'en', //    English        (default language)
     ];
 
     /**
      * Locale-specific argument separator for function arguments.
-     *
-     * @var string
      */
-    private static $localeArgumentSeparator = ',';
+    private static string $localeArgumentSeparator = ',';
 
-    private static $localeFunctions = [];
+    private static array $localeFunctions = [];
 
     /**
      * Locale-specific translations for Excel constants (True, False and Null).
      *
      * @var array<string, string>
      */
-    public static $localeBoolean = [
+    private static array $localeBoolean = [
         'TRUE' => 'TRUE',
         'FALSE' => 'FALSE',
         'NULL' => 'NULL',
     ];
 
+    public static function getLocaleBoolean(string $index): string
+    {
+        return self::$localeBoolean[$index];
+    }
+
     /**
      * Excel constant string translations to their PHP equivalents
      * Constant conversion from text name/value to actual (datatyped) value.
      *
-     * @var array<string, mixed>
+     * @var array<string, null|bool>
      */
-    private static $excelConstants = [
+    private static array $excelConstants = [
         'TRUE' => true,
         'FALSE' => false,
         'NULL' => null,
     ];
 
-    // PhpSpreadsheet functions
-    private static $phpSpreadsheetFunctions = [
+    public static function keyInExcelConstants(string $key): bool
+    {
+        return array_key_exists($key, self::$excelConstants);
+    }
+
+    public static function getExcelConstants(string $key): bool|null
+    {
+        return self::$excelConstants[$key];
+    }
+
+    /**
+     * Array of functions usable on Spreadsheet.
+     * In theory, this could be const rather than static;
+     *   however, Phpstan breaks trying to analyze it when attempted.
+     */
+    private static array $phpSpreadsheetFunctions = [
         'ABS' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
             'functionCall' => [MathTrig\Absolute::class, 'evaluate'],
@@ -284,6 +280,13 @@ class Calculation
             'functionCall' => [Financial\Amortization::class, 'AMORLINC'],
             'argumentCount' => '6,7',
         ],
+        'ANCHORARRAY' => [
+            'category' => Category::CATEGORY_MICROSOFT_INTERNAL,
+            'functionCall' => [Internal\ExcelArrayPseudoFunctions::class, 'anchorArray'],
+            'argumentCount' => '1',
+            'passCellReference' => true,
+            'passByReference' => [true],
+        ],
         'AND' => [
             'category' => Category::CATEGORY_LOGICAL,
             'functionCall' => [Logical\Operations::class, 'logicalAnd'],
@@ -301,8 +304,8 @@ class Calculation
         ],
         'ARRAYTOTEXT' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
-            'functionCall' => [Functions::class, 'DUMMY'],
-            'argumentCount' => '?',
+            'functionCall' => [TextData\Text::class, 'fromArray'],
+            'argumentCount' => '1,2',
         ],
         'ASC' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
@@ -469,6 +472,16 @@ class Calculation
             'functionCall' => [Engineering\BitWise::class, 'BITRSHIFT'],
             'argumentCount' => '2',
         ],
+        'BYCOL' => [
+            'category' => Category::CATEGORY_LOGICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '*',
+        ],
+        'BYROW' => [
+            'category' => Category::CATEGORY_LOGICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '*',
+        ],
         'CEILING' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
             'functionCall' => [MathTrig\Ceiling::class, 'ceiling'],
@@ -539,6 +552,16 @@ class Calculation
             'functionCall' => [LookupRef\Selection::class, 'CHOOSE'],
             'argumentCount' => '2+',
         ],
+        'CHOOSECOLS' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2+',
+        ],
+        'CHOOSEROWS' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2+',
+        ],
         'CLEAN' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
             'functionCall' => [TextData\Trim::class, 'nonPrintable'],
@@ -583,7 +606,7 @@ class Calculation
         ],
         'CONCATENATE' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
-            'functionCall' => [TextData\Concatenate::class, 'CONCATENATE'],
+            'functionCall' => [TextData\Concatenate::class, 'actualCONCATENATE'],
             'argumentCount' => '1+',
         ],
         'CONFIDENCE' => [
@@ -901,6 +924,11 @@ class Calculation
             'functionCall' => [Database\DProduct::class, 'evaluate'],
             'argumentCount' => '3',
         ],
+        'DROP' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2-3',
+        ],
         'DSTDEV' => [
             'category' => Category::CATEGORY_DATABASE,
             'functionCall' => [Database\DStDev::class, 'evaluate'],
@@ -978,7 +1006,7 @@ class Calculation
         ],
         'ERROR.TYPE' => [
             'category' => Category::CATEGORY_INFORMATION,
-            'functionCall' => [Functions::class, 'errorType'],
+            'functionCall' => [ExcelError::class, 'type'],
             'argumentCount' => '1',
         ],
         'EVEN' => [
@@ -996,6 +1024,11 @@ class Calculation
             'functionCall' => [MathTrig\Exp::class, 'evaluate'],
             'argumentCount' => '1',
         ],
+        'EXPAND' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2-4',
+        ],
         'EXPONDIST' => [
             'category' => Category::CATEGORY_STATISTICAL,
             'functionCall' => [Statistical\Distributions\Exponential::class, 'distribution'],
@@ -1038,8 +1071,8 @@ class Calculation
         ],
         'FILTER' => [
             'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
-            'functionCall' => [Functions::class, 'DUMMY'],
-            'argumentCount' => '3+',
+            'functionCall' => [LookupRef\Filter::class, 'filter'],
+            'argumentCount' => '2-3',
         ],
         'FILTERXML' => [
             'category' => Category::CATEGORY_WEB,
@@ -1258,6 +1291,11 @@ class Calculation
             'functionCall' => [DateTimeExcel\TimeParts::class, 'hour'],
             'argumentCount' => '1',
         ],
+        'HSTACK' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '1+',
+        ],
         'HYPERLINK' => [
             'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
             'functionCall' => [LookupRef\Hyperlink::class, 'set'],
@@ -1277,7 +1315,7 @@ class Calculation
         'IF' => [
             'category' => Category::CATEGORY_LOGICAL,
             'functionCall' => [Logical\Conditional::class, 'statementIf'],
-            'argumentCount' => '1-3',
+            'argumentCount' => '2-3',
         ],
         'IFERROR' => [
             'category' => Category::CATEGORY_LOGICAL,
@@ -1422,7 +1460,7 @@ class Calculation
         'INDEX' => [
             'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
             'functionCall' => [LookupRef\Matrix::class, 'index'],
-            'argumentCount' => '1-4',
+            'argumentCount' => '2-4',
         ],
         'INDIRECT' => [
             'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
@@ -1462,49 +1500,49 @@ class Calculation
         ],
         'ISBLANK' => [
             'category' => Category::CATEGORY_INFORMATION,
-            'functionCall' => [Functions::class, 'isBlank'],
+            'functionCall' => [Information\Value::class, 'isBlank'],
             'argumentCount' => '1',
         ],
         'ISERR' => [
             'category' => Category::CATEGORY_INFORMATION,
-            'functionCall' => [Functions::class, 'isErr'],
+            'functionCall' => [Information\ErrorValue::class, 'isErr'],
             'argumentCount' => '1',
         ],
         'ISERROR' => [
             'category' => Category::CATEGORY_INFORMATION,
-            'functionCall' => [Functions::class, 'isError'],
+            'functionCall' => [Information\ErrorValue::class, 'isError'],
             'argumentCount' => '1',
         ],
         'ISEVEN' => [
             'category' => Category::CATEGORY_INFORMATION,
-            'functionCall' => [Functions::class, 'isEven'],
+            'functionCall' => [Information\Value::class, 'isEven'],
             'argumentCount' => '1',
         ],
         'ISFORMULA' => [
             'category' => Category::CATEGORY_INFORMATION,
-            'functionCall' => [Functions::class, 'isFormula'],
+            'functionCall' => [Information\Value::class, 'isFormula'],
             'argumentCount' => '1',
             'passCellReference' => true,
             'passByReference' => [true],
         ],
         'ISLOGICAL' => [
             'category' => Category::CATEGORY_INFORMATION,
-            'functionCall' => [Functions::class, 'isLogical'],
+            'functionCall' => [Information\Value::class, 'isLogical'],
             'argumentCount' => '1',
         ],
         'ISNA' => [
             'category' => Category::CATEGORY_INFORMATION,
-            'functionCall' => [Functions::class, 'isNa'],
+            'functionCall' => [Information\ErrorValue::class, 'isNa'],
             'argumentCount' => '1',
         ],
         'ISNONTEXT' => [
             'category' => Category::CATEGORY_INFORMATION,
-            'functionCall' => [Functions::class, 'isNonText'],
+            'functionCall' => [Information\Value::class, 'isNonText'],
             'argumentCount' => '1',
         ],
         'ISNUMBER' => [
             'category' => Category::CATEGORY_INFORMATION,
-            'functionCall' => [Functions::class, 'isNumber'],
+            'functionCall' => [Information\Value::class, 'isNumber'],
             'argumentCount' => '1',
         ],
         'ISO.CEILING' => [
@@ -1514,9 +1552,14 @@ class Calculation
         ],
         'ISODD' => [
             'category' => Category::CATEGORY_INFORMATION,
-            'functionCall' => [Functions::class, 'isOdd'],
+            'functionCall' => [Information\Value::class, 'isOdd'],
             'argumentCount' => '1',
         ],
+        'ISOMITTED' => [
+            'category' => Category::CATEGORY_INFORMATION,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '*',
+        ],
         'ISOWEEKNUM' => [
             'category' => Category::CATEGORY_DATE_AND_TIME,
             'functionCall' => [DateTimeExcel\Week::class, 'isoWeekNumber'],
@@ -1529,12 +1572,14 @@ class Calculation
         ],
         'ISREF' => [
             'category' => Category::CATEGORY_INFORMATION,
-            'functionCall' => [Functions::class, 'DUMMY'],
+            'functionCall' => [Information\Value::class, 'isRef'],
             'argumentCount' => '1',
+            'passCellReference' => true,
+            'passByReference' => [true],
         ],
         'ISTEXT' => [
             'category' => Category::CATEGORY_INFORMATION,
-            'functionCall' => [Functions::class, 'isText'],
+            'functionCall' => [Information\Value::class, 'isText'],
             'argumentCount' => '1',
         ],
         'ISTHAIDIGIT' => [
@@ -1552,6 +1597,11 @@ class Calculation
             'functionCall' => [Statistical\Deviations::class, 'kurtosis'],
             'argumentCount' => '1+',
         ],
+        'LAMBDA' => [
+            'category' => Category::CATEGORY_LOGICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '*',
+        ],
         'LARGE' => [
             'category' => Category::CATEGORY_STATISTICAL,
             'functionCall' => [Statistical\Size::class, 'large'],
@@ -1582,6 +1632,11 @@ class Calculation
             'functionCall' => [TextData\Text::class, 'length'],
             'argumentCount' => '1',
         ],
+        'LET' => [
+            'category' => Category::CATEGORY_LOGICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '*',
+        ],
         'LINEST' => [
             'category' => Category::CATEGORY_STATISTICAL,
             'functionCall' => [Statistical\Trends::class, 'LINEST'],
@@ -1637,6 +1692,16 @@ class Calculation
             'functionCall' => [TextData\CaseConvert::class, 'lower'],
             'argumentCount' => '1',
         ],
+        'MAKEARRAY' => [
+            'category' => Category::CATEGORY_LOGICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '*',
+        ],
+        'MAP' => [
+            'category' => Category::CATEGORY_LOGICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '*',
+        ],
         'MATCH' => [
             'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
             'functionCall' => [LookupRef\ExcelMatch::class, 'MATCH'],
@@ -1764,12 +1829,12 @@ class Calculation
         ],
         'N' => [
             'category' => Category::CATEGORY_INFORMATION,
-            'functionCall' => [Functions::class, 'n'],
+            'functionCall' => [Information\Value::class, 'asNumber'],
             'argumentCount' => '1',
         ],
         'NA' => [
             'category' => Category::CATEGORY_INFORMATION,
-            'functionCall' => [Functions::class, 'NA'],
+            'functionCall' => [ExcelError::class, 'NA'],
             'argumentCount' => '0',
         ],
         'NEGBINOMDIST' => [
@@ -2076,7 +2141,7 @@ class Calculation
         ],
         'RANDARRAY' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [Functions::class, 'DUMMY'],
+            'functionCall' => [MathTrig\Random::class, 'randArray'],
             'argumentCount' => '0-5',
         ],
         'RANDBETWEEN' => [
@@ -2109,6 +2174,11 @@ class Calculation
             'functionCall' => [Financial\Securities\Price::class, 'received'],
             'argumentCount' => '4-5',
         ],
+        'REDUCE' => [
+            'category' => Category::CATEGORY_LOGICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '*',
+        ],
         'REPLACE' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
             'functionCall' => [TextData\Replace::class, 'replace'],
@@ -2196,6 +2266,11 @@ class Calculation
             'functionCall' => [TextData\Search::class, 'insensitive'],
             'argumentCount' => '2,3',
         ],
+        'SCAN' => [
+            'category' => Category::CATEGORY_LOGICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '*',
+        ],
         'SEARCHB' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
             'functionCall' => [TextData\Search::class, 'insensitive'],
@@ -2218,8 +2293,8 @@ class Calculation
         ],
         'SEQUENCE' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
-            'functionCall' => [Functions::class, 'DUMMY'],
-            'argumentCount' => '2',
+            'functionCall' => [MathTrig\MatrixFunctions::class, 'sequence'],
+            'argumentCount' => '1-4',
         ],
         'SERIESSUM' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
@@ -2246,6 +2321,13 @@ class Calculation
             'functionCall' => [MathTrig\Trig\Sine::class, 'sin'],
             'argumentCount' => '1',
         ],
+        'SINGLE' => [
+            'category' => Category::CATEGORY_MICROSOFT_INTERNAL,
+            'functionCall' => [Internal\ExcelArrayPseudoFunctions::class, 'single'],
+            'argumentCount' => '1',
+            'passCellReference' => true,
+            'passByReference' => [true],
+        ],
         'SINH' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
             'functionCall' => [MathTrig\Trig\Sine::class, 'sinh'],
@@ -2278,12 +2360,12 @@ class Calculation
         ],
         'SORT' => [
             'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
-            'functionCall' => [Functions::class, 'DUMMY'],
-            'argumentCount' => '1+',
+            'functionCall' => [LookupRef\Sort::class, 'sort'],
+            'argumentCount' => '1-4',
         ],
         'SORTBY' => [
             'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
-            'functionCall' => [Functions::class, 'DUMMY'],
+            'functionCall' => [LookupRef\Sort::class, 'sortBy'],
             'argumentCount' => '2+',
         ],
         'SQRT' => [
@@ -2402,6 +2484,11 @@ class Calculation
             'functionCall' => [TextData\Text::class, 'test'],
             'argumentCount' => '1',
         ],
+        'TAKE' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2-3',
+        ],
         'TAN' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
             'functionCall' => [MathTrig\Trig\Tangent::class, 'tan'],
@@ -2452,11 +2539,26 @@ class Calculation
             'functionCall' => [TextData\Format::class, 'TEXTFORMAT'],
             'argumentCount' => '2',
         ],
+        'TEXTAFTER' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\Extract::class, 'after'],
+            'argumentCount' => '2-6',
+        ],
+        'TEXTBEFORE' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\Extract::class, 'before'],
+            'argumentCount' => '2-6',
+        ],
         'TEXTJOIN' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
             'functionCall' => [TextData\Concatenate::class, 'TEXTJOIN'],
             'argumentCount' => '3+',
         ],
+        'TEXTSPLIT' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [TextData\Text::class, 'split'],
+            'argumentCount' => '2-6',
+        ],
         'THAIDAYOFWEEK' => [
             'category' => Category::CATEGORY_DATE_AND_TIME,
             'functionCall' => [Functions::class, 'DUMMY'],
@@ -2522,6 +2624,16 @@ class Calculation
             'functionCall' => [DateTimeExcel\Current::class, 'today'],
             'argumentCount' => '0',
         ],
+        'TOCOL' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '1-3',
+        ],
+        'TOROW' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '1-3',
+        ],
         'TRANSPOSE' => [
             'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
             'functionCall' => [LookupRef\Matrix::class, 'transpose'],
@@ -2564,7 +2676,7 @@ class Calculation
         ],
         'TYPE' => [
             'category' => Category::CATEGORY_INFORMATION,
-            'functionCall' => [Functions::class, 'TYPE'],
+            'functionCall' => [Information\Value::class, 'type'],
             'argumentCount' => '1',
         ],
         'UNICHAR' => [
@@ -2579,7 +2691,7 @@ class Calculation
         ],
         'UNIQUE' => [
             'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
-            'functionCall' => [Functions::class, 'DUMMY'],
+            'functionCall' => [LookupRef\Unique::class, 'unique'],
             'argumentCount' => '1+',
         ],
         'UPPER' => [
@@ -2599,8 +2711,8 @@ class Calculation
         ],
         'VALUETOTEXT' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
-            'functionCall' => [Functions::class, 'DUMMY'],
-            'argumentCount' => '?',
+            'functionCall' => [TextData\Format::class, 'valueToText'],
+            'argumentCount' => '1,2',
         ],
         'VAR' => [
             'category' => Category::CATEGORY_STATISTICAL,
@@ -2642,6 +2754,11 @@ class Calculation
             'functionCall' => [LookupRef\VLookup::class, 'lookup'],
             'argumentCount' => '3,4',
         ],
+        'VSTACK' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '1+',
+        ],
         'WEBSERVICE' => [
             'category' => Category::CATEGORY_WEB,
             'functionCall' => [Web\Service::class, 'webService'],
@@ -2677,6 +2794,16 @@ class Calculation
             'functionCall' => [Functions::class, 'DUMMY'],
             'argumentCount' => '2-4',
         ],
+        'WRAPCOLS' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2-3',
+        ],
+        'WRAPROWS' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2-3',
+        ],
         'XIRR' => [
             'category' => Category::CATEGORY_FINANCIAL,
             'functionCall' => [Financial\CashFlow\Variable\NonPeriodic::class, 'rate'],
@@ -2739,15 +2866,17 @@ class Calculation
         ],
     ];
 
-    //    Internal functions used for special control purposes
-    private static $controlFunctions = [
+    /**
+     *    Internal functions used for special control purposes.
+     */
+    private static array $controlFunctions = [
         'MKMATRIX' => [
             'argumentCount' => '*',
             'functionCall' => [Internal\MakeMatrix::class, 'make'],
         ],
         'NAME.ERROR' => [
             'argumentCount' => '*',
-            'functionCall' => [Functions::class, 'NAME'],
+            'functionCall' => [ExcelError::class, 'NAME'],
         ],
         'WILDCARDMATCH' => [
             'argumentCount' => '2',
@@ -2757,18 +2886,18 @@ class Calculation
 
     public function __construct(?Spreadsheet $spreadsheet = null)
     {
-        $this->delta = 1 * 10 ** (0 - ini_get('precision'));
-
         $this->spreadsheet = $spreadsheet;
         $this->cyclicReferenceStack = new CyclicReferenceStack();
         $this->debugLog = new Logger($this->cyclicReferenceStack);
+        $this->branchPruner = new BranchPruner($this->branchPruningEnabled);
         self::$referenceHelper = ReferenceHelper::getInstance();
     }
 
     private static function loadLocales(): void
     {
         $localeFileDirectory = __DIR__ . '/locale/';
-        foreach (glob($localeFileDirectory . '*', GLOB_ONLYDIR) as $filename) {
+        $localeFileNames = glob($localeFileDirectory . '*', GLOB_ONLYDIR) ?: [];
+        foreach ($localeFileNames as $filename) {
             $filename = substr($filename, strlen($localeFileDirectory));
             if ($filename != 'en') {
                 self::$validLocaleLanguages[] = $filename;
@@ -2791,7 +2920,7 @@ public static function getInstance(?Spreadsheet $spreadsheet = null): self
             }
         }
 
-        if (!isset(self::$instance) || (self::$instance === null)) {
+        if (!self::$instance) {
             self::$instance = new self();
         }
 
@@ -2805,15 +2934,13 @@ public static function getInstance(?Spreadsheet $spreadsheet = null): self
     public function flushInstance(): void
     {
         $this->clearCalculationCache();
-        $this->clearBranchStore();
+        $this->branchPruner->clearBranchStore();
     }
 
     /**
      * Get the Logger for this calculation engine instance.
-     *
-     * @return Logger
      */
-    public function getDebugLog()
+    public function getDebugLog(): Logger
     {
         return $this->debugLog;
     }
@@ -2853,12 +2980,12 @@ public static function getFALSE(): string
      *
      * @return bool Success or failure
      */
-    public static function setArrayReturnType($returnType)
+    public static function setArrayReturnType(string $returnType): bool
     {
         if (
-            ($returnType == self::RETURN_ARRAY_AS_VALUE) ||
-            ($returnType == self::RETURN_ARRAY_AS_ERROR) ||
-            ($returnType == self::RETURN_ARRAY_AS_ARRAY)
+            ($returnType == self::RETURN_ARRAY_AS_VALUE)
+            || ($returnType == self::RETURN_ARRAY_AS_ERROR)
+            || ($returnType == self::RETURN_ARRAY_AS_ARRAY)
         ) {
             self::$returnArrayAsType = $returnType;
 
@@ -2873,29 +3000,57 @@ public static function setArrayReturnType($returnType)
      *
      * @return string $returnType Array return type
      */
-    public static function getArrayReturnType()
+    public static function getArrayReturnType(): string
     {
         return self::$returnArrayAsType;
     }
 
     /**
-     * Is calculation caching enabled?
+     * Set the Instance Array Return Type (Array or Value of first element in the array).
+     *
+     * @param string $returnType Array return type
+     *
+     * @return bool Success or failure
+     */
+    public function setInstanceArrayReturnType(string $returnType): bool
+    {
+        if (
+            ($returnType == self::RETURN_ARRAY_AS_VALUE)
+            || ($returnType == self::RETURN_ARRAY_AS_ERROR)
+            || ($returnType == self::RETURN_ARRAY_AS_ARRAY)
+        ) {
+            $this->instanceArrayReturnType = $returnType;
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Return the Array Return Type (Array or Value of first element in the array).
      *
-     * @return bool
+     * @return string $returnType Array return type for instance if non-null, otherwise static property
+     */
+    public function getInstanceArrayReturnType(): string
+    {
+        return $this->instanceArrayReturnType ?? self::$returnArrayAsType;
+    }
+
+    /**
+     * Is calculation caching enabled?
      */
-    public function getCalculationCacheEnabled()
+    public function getCalculationCacheEnabled(): bool
     {
         return $this->calculationCacheEnabled;
     }
 
     /**
      * Enable/disable calculation cache.
-     *
-     * @param bool $pValue
      */
-    public function setCalculationCacheEnabled($pValue): void
+    public function setCalculationCacheEnabled(bool $calculationCacheEnabled): void
     {
-        $this->calculationCacheEnabled = $pValue;
+        $this->calculationCacheEnabled = $calculationCacheEnabled;
         $this->clearCalculationCache();
     }
 
@@ -2925,10 +3080,8 @@ public function clearCalculationCache(): void
 
     /**
      * Clear calculation cache for a specified worksheet.
-     *
-     * @param string $worksheetName
      */
-    public function clearCalculationCacheForWorksheet($worksheetName): void
+    public function clearCalculationCacheForWorksheet(string $worksheetName): void
     {
         if (isset($this->calculationCache[$worksheetName])) {
             unset($this->calculationCache[$worksheetName]);
@@ -2937,11 +3090,8 @@ public function clearCalculationCacheForWorksheet($worksheetName): void
 
     /**
      * Rename calculation cache for a specified worksheet.
-     *
-     * @param string $fromWorksheetName
-     * @param string $toWorksheetName
      */
-    public function renameCalculationCacheForWorksheet($fromWorksheetName, $toWorksheetName): void
+    public function renameCalculationCacheForWorksheet(string $fromWorksheetName, string $toWorksheetName): void
     {
         if (isset($this->calculationCache[$fromWorksheetName])) {
             $this->calculationCache[$toWorksheetName] = &$this->calculationCache[$fromWorksheetName];
@@ -2951,12 +3101,11 @@ public function renameCalculationCacheForWorksheet($fromWorksheetName, $toWorksh
 
     /**
      * Enable/disable calculation cache.
-     *
-     * @param mixed $enabled
      */
-    public function setBranchPruningEnabled($enabled): void
+    public function setBranchPruningEnabled(mixed $enabled): void
     {
         $this->branchPruningEnabled = $enabled;
+        $this->branchPruner = new BranchPruner($this->branchPruningEnabled);
     }
 
     public function enableBranchPruning(): void
@@ -2969,25 +3118,18 @@ public function disableBranchPruning(): void
         $this->setBranchPruningEnabled(false);
     }
 
-    public function clearBranchStore(): void
-    {
-        $this->branchStoreKeyCounter = 0;
-    }
-
     /**
      * Get the currently defined locale code.
-     *
-     * @return string
      */
-    public function getLocale()
+    public function getLocale(): string
     {
         return self::$localeLanguage;
     }
 
     private function getLocaleFile(string $localeDir, string $locale, string $language, string $file): string
     {
-        $localeFileName = $localeDir . str_replace('_', DIRECTORY_SEPARATOR, $locale) .
-            DIRECTORY_SEPARATOR . $file;
+        $localeFileName = $localeDir . str_replace('_', DIRECTORY_SEPARATOR, $locale)
+            . DIRECTORY_SEPARATOR . $file;
         if (!file_exists($localeFileName)) {
             //    If there isn't a locale specific file, look for a language specific file
             $localeFileName = $localeDir . $language . DIRECTORY_SEPARATOR . $file;
@@ -3003,14 +3145,12 @@ private function getLocaleFile(string $localeDir, string $locale, string $langua
      * Set the locale code.
      *
      * @param string $locale The locale to use for formula translation, eg: 'en_us'
-     *
-     * @return bool
      */
-    public function setLocale(string $locale)
+    public function setLocale(string $locale): bool
     {
         //    Identify our locale and language
         $language = $locale = strtolower($locale);
-        if (strpos($locale, '_') !== false) {
+        if (str_contains($locale, '_')) {
             [$language] = explode('_', $locale);
         }
         if (count(self::$validLocaleLanguages) == 1) {
@@ -3018,7 +3158,7 @@ public function setLocale(string $locale)
         }
 
         //    Test whether we have any language data for this language (any locale)
-        if (in_array($language, self::$validLocaleLanguages)) {
+        if (in_array($language, self::$validLocaleLanguages, true)) {
             //    initialise language/locale settings
             self::$localeFunctions = [];
             self::$localeArgumentSeparator = ',';
@@ -3027,6 +3167,7 @@ public function setLocale(string $locale)
             //    Default is US English, if user isn't requesting US english, then read the necessary data from the locale files
             if ($locale !== 'en_us') {
                 $localeDir = implode(DIRECTORY_SEPARATOR, [__DIR__, 'locale', null]);
+
                 //    Search for a file with a list of function names for locale
                 try {
                     $functionNamesFile = $this->getLocaleFile($localeDir, $locale, $language, 'functions');
@@ -3035,12 +3176,12 @@ public function setLocale(string $locale)
                 }
 
                 //    Retrieve the list of locale or language specific function names
-                $localeFunctions = file($functionNamesFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+                $localeFunctions = file($functionNamesFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES) ?: [];
                 foreach ($localeFunctions as $localeFunction) {
                     [$localeFunction] = explode('##', $localeFunction); //    Strip out comments
-                    if (strpos($localeFunction, '=') !== false) {
+                    if (str_contains($localeFunction, '=')) {
                         [$fName, $lfName] = array_map('trim', explode('=', $localeFunction));
-                        if ((isset(self::$phpSpreadsheetFunctions[$fName])) && ($lfName != '') && ($fName != $lfName)) {
+                        if ((str_starts_with($fName, '*') || isset(self::$phpSpreadsheetFunctions[$fName])) && ($lfName != '') && ($fName != $lfName)) {
                             self::$localeFunctions[$fName] = $lfName;
                         }
                     }
@@ -3055,14 +3196,14 @@ public function setLocale(string $locale)
 
                 try {
                     $configFile = $this->getLocaleFile($localeDir, $locale, $language, 'config');
-                } catch (Exception $e) {
+                } catch (Exception) {
                     return false;
                 }
 
-                $localeSettings = file($configFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+                $localeSettings = file($configFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES) ?: [];
                 foreach ($localeSettings as $localeSetting) {
                     [$localeSetting] = explode('##', $localeSetting); //    Strip out comments
-                    if (strpos($localeSetting, '=') !== false) {
+                    if (str_contains($localeSetting, '=')) {
                         [$settingName, $settingValue] = array_map('trim', explode('=', $localeSetting));
                         $settingName = strtoupper($settingName);
                         if ($settingValue !== '') {
@@ -3077,8 +3218,8 @@ public function setLocale(string $locale)
                 }
             }
 
-            self::$functionReplaceFromExcel = self::$functionReplaceToExcel =
-            self::$functionReplaceFromLocale = self::$functionReplaceToLocale = null;
+            self::$functionReplaceFromExcel = self::$functionReplaceToExcel
+            = self::$functionReplaceFromLocale = self::$functionReplaceToLocale = null;
             self::$localeLanguage = $locale;
 
             return true;
@@ -3087,30 +3228,28 @@ public function setLocale(string $locale)
         return false;
     }
 
-    /**
-     * @param string $fromSeparator
-     * @param string $toSeparator
-     * @param string $formula
-     * @param bool $inBraces
-     *
-     * @return string
-     */
-    public static function translateSeparator($fromSeparator, $toSeparator, $formula, &$inBraces)
-    {
+    public static function translateSeparator(
+        string $fromSeparator,
+        string $toSeparator,
+        string $formula,
+        int &$inBracesLevel,
+        string $openBrace = self::FORMULA_OPEN_FUNCTION_BRACE,
+        string $closeBrace = self::FORMULA_CLOSE_FUNCTION_BRACE
+    ): string {
         $strlen = mb_strlen($formula);
         for ($i = 0; $i < $strlen; ++$i) {
             $chr = mb_substr($formula, $i, 1);
             switch ($chr) {
-                case self::FORMULA_OPEN_FUNCTION_BRACE:
-                    $inBraces = true;
+                case $openBrace:
+                    ++$inBracesLevel;
 
                     break;
-                case self::FORMULA_CLOSE_FUNCTION_BRACE:
-                    $inBraces = false;
+                case $closeBrace:
+                    --$inBracesLevel;
 
                     break;
                 case $fromSeparator:
-                    if (!$inBraces) {
+                    if ($inBracesLevel > 0) {
                         $formula = mb_substr($formula, 0, $i) . $toSeparator . mb_substr($formula, $i + 1);
                     }
             }
@@ -3119,31 +3258,48 @@ public static function translateSeparator($fromSeparator, $toSeparator, $formula
         return $formula;
     }
 
-    /**
-     * @param string[] $from
-     * @param string[] $to
-     * @param string $formula
-     * @param string $fromSeparator
-     * @param string $toSeparator
-     *
-     * @return string
-     */
-    private static function translateFormula(array $from, array $to, $formula, $fromSeparator, $toSeparator)
+    private static function translateFormulaBlock(
+        array $from,
+        array $to,
+        string $formula,
+        int &$inFunctionBracesLevel,
+        int &$inMatrixBracesLevel,
+        string $fromSeparator,
+        string $toSeparator
+    ): string {
+        // Function Names
+        $formula = (string) preg_replace($from, $to, $formula);
+
+        // Temporarily adjust matrix separators so that they won't be confused with function arguments
+        $formula = self::translateSeparator(';', '|', $formula, $inMatrixBracesLevel, self::FORMULA_OPEN_MATRIX_BRACE, self::FORMULA_CLOSE_MATRIX_BRACE);
+        $formula = self::translateSeparator(',', '!', $formula, $inMatrixBracesLevel, self::FORMULA_OPEN_MATRIX_BRACE, self::FORMULA_CLOSE_MATRIX_BRACE);
+        // Function Argument Separators
+        $formula = self::translateSeparator($fromSeparator, $toSeparator, $formula, $inFunctionBracesLevel);
+        // Restore matrix separators
+        $formula = self::translateSeparator('|', ';', $formula, $inMatrixBracesLevel, self::FORMULA_OPEN_MATRIX_BRACE, self::FORMULA_CLOSE_MATRIX_BRACE);
+        $formula = self::translateSeparator('!', ',', $formula, $inMatrixBracesLevel, self::FORMULA_OPEN_MATRIX_BRACE, self::FORMULA_CLOSE_MATRIX_BRACE);
+
+        return $formula;
+    }
+
+    private static function translateFormula(array $from, array $to, string $formula, string $fromSeparator, string $toSeparator): string
     {
-        //    Convert any Excel function names to the required language
+        // Convert any Excel function names and constant names to the required language;
+        //     and adjust function argument separators
         if (self::$localeLanguage !== 'en_us') {
-            $inBraces = false;
-            //    If there is the possibility of braces within a quoted string, then we don't treat those as matrix indicators
-            if (strpos($formula, self::FORMULA_STRING_QUOTE) !== false) {
-                //    So instead we skip replacing in any quoted strings by only replacing in every other array element after we've exploded
-                //        the formula
+            $inFunctionBracesLevel = 0;
+            $inMatrixBracesLevel = 0;
+            //    If there is the possibility of separators within a quoted string, then we treat them as literals
+            if (str_contains($formula, self::FORMULA_STRING_QUOTE)) {
+                //    So instead we skip replacing in any quoted strings by only replacing in every other array element
+                //       after we've exploded the formula
                 $temp = explode(self::FORMULA_STRING_QUOTE, $formula);
-                $i = false;
+                $notWithinQuotes = false;
                 foreach ($temp as &$value) {
-                    //    Only count/replace in alternating array entries
-                    if ($i = !$i) {
-                        $value = preg_replace($from, $to, $value);
-                        $value = self::translateSeparator($fromSeparator, $toSeparator, $value, $inBraces);
+                    //    Only adjust in alternating array entries
+                    $notWithinQuotes = $notWithinQuotes === false;
+                    if ($notWithinQuotes === true) {
+                        $value = self::translateFormulaBlock($from, $to, $value, $inFunctionBracesLevel, $inMatrixBracesLevel, $fromSeparator, $toSeparator);
                     }
                 }
                 unset($value);
@@ -3151,27 +3307,28 @@ private static function translateFormula(array $from, array $to, $formula, $from
                 $formula = implode(self::FORMULA_STRING_QUOTE, $temp);
             } else {
                 //    If there's no quoted strings, then we do a simple count/replace
-                $formula = preg_replace($from, $to, $formula);
-                $formula = self::translateSeparator($fromSeparator, $toSeparator, $formula, $inBraces);
+                $formula = self::translateFormulaBlock($from, $to, $formula, $inFunctionBracesLevel, $inMatrixBracesLevel, $fromSeparator, $toSeparator);
             }
         }
 
         return $formula;
     }
 
-    private static $functionReplaceFromExcel = null;
+    private static ?array $functionReplaceFromExcel;
 
-    private static $functionReplaceToLocale = null;
+    private static ?array $functionReplaceToLocale;
 
-    public function _translateFormulaToLocale($formula)
+    public function translateFormulaToLocale(string $formula): string
     {
+        $formula = preg_replace(self::CALCULATION_REGEXP_STRIP_XLFN_XLWS, '', $formula) ?? '';
+        // Build list of function names and constants for translation
         if (self::$functionReplaceFromExcel === null) {
             self::$functionReplaceFromExcel = [];
             foreach (array_keys(self::$localeFunctions) as $excelFunctionName) {
-                self::$functionReplaceFromExcel[] = '/(@?[^\w\.])' . preg_quote($excelFunctionName, '/') . '([\s]*\()/Ui';
+                self::$functionReplaceFromExcel[] = '/(@?[^\w\.])' . preg_quote($excelFunctionName, '/') . '([\s]*\()/ui';
             }
             foreach (array_keys(self::$localeBoolean) as $excelBoolean) {
-                self::$functionReplaceFromExcel[] = '/(@?[^\w\.])' . preg_quote($excelBoolean, '/') . '([^\w\.])/Ui';
+                self::$functionReplaceFromExcel[] = '/(@?[^\w\.])' . preg_quote($excelBoolean, '/') . '([^\w\.])/ui';
             }
         }
 
@@ -3185,22 +3342,28 @@ public function _translateFormulaToLocale($formula)
             }
         }
 
-        return self::translateFormula(self::$functionReplaceFromExcel, self::$functionReplaceToLocale, $formula, ',', self::$localeArgumentSeparator);
+        return self::translateFormula(
+            self::$functionReplaceFromExcel,
+            self::$functionReplaceToLocale,
+            $formula,
+            ',',
+            self::$localeArgumentSeparator
+        );
     }
 
-    private static $functionReplaceFromLocale = null;
+    private static ?array $functionReplaceFromLocale;
 
-    private static $functionReplaceToExcel = null;
+    private static ?array $functionReplaceToExcel;
 
-    public function _translateFormulaToEnglish($formula)
+    public function translateFormulaToEnglish(string $formula): string
     {
         if (self::$functionReplaceFromLocale === null) {
             self::$functionReplaceFromLocale = [];
             foreach (self::$localeFunctions as $localeFunctionName) {
-                self::$functionReplaceFromLocale[] = '/(@?[^\w\.])' . preg_quote($localeFunctionName, '/') . '([\s]*\()/Ui';
+                self::$functionReplaceFromLocale[] = '/(@?[^\w\.])' . preg_quote($localeFunctionName, '/') . '([\s]*\()/ui';
             }
             foreach (self::$localeBoolean as $excelBoolean) {
-                self::$functionReplaceFromLocale[] = '/(@?[^\w\.])' . preg_quote($excelBoolean, '/') . '([^\w\.])/Ui';
+                self::$functionReplaceFromLocale[] = '/(@?[^\w\.])' . preg_quote($excelBoolean, '/') . '([^\w\.])/ui';
             }
         }
 
@@ -3217,7 +3380,7 @@ public function _translateFormulaToEnglish($formula)
         return self::translateFormula(self::$functionReplaceFromLocale, self::$functionReplaceToExcel, $formula, self::$localeArgumentSeparator, ',');
     }
 
-    public static function localeFunc($function)
+    public static function localeFunc(string $function): string
     {
         if (self::$localeLanguage !== 'en_us') {
             $functionName = trim($function, '(');
@@ -3235,12 +3398,8 @@ public static function localeFunc($function)
 
     /**
      * Wrap string values in quotes.
-     *
-     * @param mixed $value
-     *
-     * @return mixed
      */
-    public static function wrapResult($value)
+    public static function wrapResult(mixed $value): mixed
     {
         if (is_string($value)) {
             //    Error values cannot be "wrapped"
@@ -3253,7 +3412,7 @@ public static function wrapResult($value)
             return self::FORMULA_STRING_QUOTE . $value . self::FORMULA_STRING_QUOTE;
         } elseif ((is_float($value)) && ((is_nan($value)) || (is_infinite($value)))) {
             //    Convert numeric errors to NaN error
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         return $value;
@@ -3261,12 +3420,8 @@ public static function wrapResult($value)
 
     /**
      * Remove quotes used as a wrapper to identify string values.
-     *
-     * @param mixed $value
-     *
-     * @return mixed
      */
-    public static function unwrapResult($value)
+    public static function unwrapResult(mixed $value): mixed
     {
         if (is_string($value)) {
             if ((isset($value[0])) && ($value[0] == self::FORMULA_STRING_QUOTE) && (substr($value, -1) == self::FORMULA_STRING_QUOTE)) {
@@ -3274,7 +3429,7 @@ public static function unwrapResult($value)
             }
             //    Convert numeric errors to NAN error
         } elseif ((is_float($value)) && ((is_nan($value)) || (is_infinite($value)))) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         return $value;
@@ -3284,14 +3439,12 @@ public static function unwrapResult($value)
      * Calculate cell value (using formula from a cell ID)
      * Retained for backward compatibility.
      *
-     * @param Cell $pCell Cell to calculate
-     *
-     * @return mixed
+     * @param ?Cell $cell Cell to calculate
      */
-    public function calculate(?Cell $pCell = null)
+    public function calculate(?Cell $cell = null): mixed
     {
         try {
-            return $this->calculateCellValue($pCell);
+            return $this->calculateCellValue($cell);
         } catch (\Exception $e) {
             throw new Exception($e->getMessage());
         }
@@ -3300,75 +3453,81 @@ public function calculate(?Cell $pCell = null)
     /**
      * Calculate the value of a cell formula.
      *
-     * @param Cell $pCell Cell to calculate
+     * @param ?Cell $cell Cell to calculate
      * @param bool $resetLog Flag indicating whether the debug log should be reset or not
-     *
-     * @return mixed
      */
-    public function calculateCellValue(?Cell $pCell = null, $resetLog = true)
+    public function calculateCellValue(?Cell $cell = null, bool $resetLog = true): mixed
     {
-        if ($pCell === null) {
+        if ($cell === null) {
             return null;
         }
 
-        $returnArrayAsType = self::$returnArrayAsType;
         if ($resetLog) {
             //    Initialise the logging settings if requested
             $this->formulaError = null;
             $this->debugLog->clearLog();
             $this->cyclicReferenceStack->clear();
             $this->cyclicFormulaCounter = 1;
-
-            self::$returnArrayAsType = self::RETURN_ARRAY_AS_ARRAY;
         }
 
         //    Execute the calculation for the cell formula
         $this->cellStack[] = [
-            'sheet' => $pCell->getWorksheet()->getTitle(),
-            'cell' => $pCell->getCoordinate(),
+            'sheet' => $cell->getWorksheet()->getTitle(),
+            'cell' => $cell->getCoordinate(),
         ];
 
+        $cellAddressAttempted = false;
+        $cellAddress = null;
+
         try {
-            $result = self::unwrapResult($this->_calculateFormulaValue($pCell->getValue(), $pCell->getCoordinate(), $pCell));
+            $value = $cell->getValue();
+            if ($cell->getDataType() === DataType::TYPE_FORMULA) {
+                $value = preg_replace_callback(
+                    self::CALCULATION_REGEXP_CELLREF_SPILL,
+                    fn (array $matches) => 'ANCHORARRAY(' . substr($matches[0], 0, -1) . ')',
+                    $value
+                );
+            }
+            $result = self::unwrapResult($this->_calculateFormulaValue($value, $cell->getCoordinate(), $cell));
+            if ($this->spreadsheet === null) {
+                throw new Exception('null spreadsheet in calculateCellValue');
+            }
+            $cellAddressAttempted = true;
             $cellAddress = array_pop($this->cellStack);
-            $this->spreadsheet->getSheetByName($cellAddress['sheet'])->getCell($cellAddress['cell']);
+            if ($cellAddress === null) {
+                throw new Exception('null cellAddress in calculateCellValue');
+            }
+            $testSheet = $this->spreadsheet->getSheetByName($cellAddress['sheet']);
+            if ($testSheet === null) {
+                throw new Exception('worksheet not found in calculateCellValue');
+            }
+            $testSheet->getCell($cellAddress['cell']);
         } catch (\Exception $e) {
-            $cellAddress = array_pop($this->cellStack);
-            $this->spreadsheet->getSheetByName($cellAddress['sheet'])->getCell($cellAddress['cell']);
+            if (!$cellAddressAttempted) {
+                $cellAddress = array_pop($this->cellStack);
+            }
+            if ($this->spreadsheet !== null && is_array($cellAddress) && array_key_exists('sheet', $cellAddress)) {
+                $testSheet = $this->spreadsheet->getSheetByName($cellAddress['sheet']);
+                if ($testSheet !== null && array_key_exists('cell', $cellAddress)) {
+                    $testSheet->getCell($cellAddress['cell']);
+                }
+            }
 
-            throw new Exception($e->getMessage());
+            throw new Exception($e->getMessage(), $e->getCode(), $e);
         }
 
-        if ((is_array($result)) && (self::$returnArrayAsType != self::RETURN_ARRAY_AS_ARRAY)) {
-            self::$returnArrayAsType = $returnArrayAsType;
+        if (is_array($result) && $this->getInstanceArrayReturnType() !== self::RETURN_ARRAY_AS_ARRAY) {
             $testResult = Functions::flattenArray($result);
-            if (self::$returnArrayAsType == self::RETURN_ARRAY_AS_ERROR) {
-                return Functions::VALUE();
-            }
-            //    If there's only a single cell in the array, then we allow it
-            if (count($testResult) != 1) {
-                //    If keys are numeric, then it's a matrix result rather than a cell range result, so we permit it
-                $r = array_keys($result);
-                $r = array_shift($r);
-                if (!is_numeric($r)) {
-                    return Functions::VALUE();
-                }
-                if (is_array($result[$r])) {
-                    $c = array_keys($result[$r]);
-                    $c = array_shift($c);
-                    if (!is_numeric($c)) {
-                        return Functions::VALUE();
-                    }
-                }
+            if ($this->getInstanceArrayReturnType() == self::RETURN_ARRAY_AS_ERROR) {
+                return ExcelError::VALUE();
             }
             $result = array_shift($testResult);
         }
-        self::$returnArrayAsType = $returnArrayAsType;
 
-        if ($result === null && $pCell->getWorksheet()->getSheetView()->getShowZeros()) {
+        if ($result === null && $cell->getWorksheet()->getSheetView()->getShowZeros()) {
             return 0;
         } elseif ((is_float($result)) && ((is_nan($result)) || (is_infinite($result)))) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         return $result;
@@ -3378,11 +3537,14 @@ public function calculateCellValue(?Cell $pCell = null, $resetLog = true)
      * Validate and parse a formula string.
      *
      * @param string $formula Formula to parse
-     *
-     * @return array|bool
      */
-    public function parseFormula($formula)
+    public function parseFormula(string $formula): array|bool
     {
+        $formula = preg_replace_callback(
+            self::CALCULATION_REGEXP_CELLREF_SPILL,
+            fn (array $matches) => 'ANCHORARRAY(' . substr($matches[0], 0, -1) . ')',
+            $formula
+        ) ?? $formula;
         //    Basic validation that this is indeed a formula
         //    We return an empty array if not
         $formula = trim($formula);
@@ -3402,12 +3564,10 @@ public function parseFormula($formula)
      * Calculate the value of a formula.
      *
      * @param string $formula Formula to parse
-     * @param string $cellID Address of the cell to calculate
-     * @param Cell $pCell Cell to calculate
-     *
-     * @return mixed
+     * @param ?string $cellID Address of the cell to calculate
+     * @param ?Cell $cell Cell to calculate
      */
-    public function calculateFormula($formula, $cellID = null, ?Cell $pCell = null)
+    public function calculateFormula(string $formula, ?string $cellID = null, ?Cell $cell = null): mixed
     {
         //    Initialise the logging settings
         $this->formulaError = null;
@@ -3415,9 +3575,9 @@ public function calculateFormula($formula, $cellID = null, ?Cell $pCell = null)
         $this->cyclicReferenceStack->clear();
 
         $resetCache = $this->getCalculationCacheEnabled();
-        if ($this->spreadsheet !== null && $cellID === null && $pCell === null) {
+        if ($this->spreadsheet !== null && $cellID === null && $cell === null) {
             $cellID = 'A1';
-            $pCell = $this->spreadsheet->getActiveSheet()->getCell($cellID);
+            $cell = $this->spreadsheet->getActiveSheet()->getCell($cellID);
         } else {
             //    Disable calculation cacheing because it only applies to cell calculations, not straight formulae
             //    But don't actually flush any cache
@@ -3426,7 +3586,7 @@ public function calculateFormula($formula, $cellID = null, ?Cell $pCell = null)
 
         //    Execute the calculation
         try {
-            $result = self::unwrapResult($this->_calculateFormulaValue($formula, $cellID, $pCell));
+            $result = self::unwrapResult($this->_calculateFormulaValue($formula, $cellID, $cell));
         } catch (\Exception $e) {
             throw new Exception($e->getMessage());
         }
@@ -3439,16 +3599,13 @@ public function calculateFormula($formula, $cellID = null, ?Cell $pCell = null)
         return $result;
     }
 
-    /**
-     * @param mixed $cellValue
-     */
-    public function getValueFromCache(string $cellReference, &$cellValue): bool
+    public function getValueFromCache(string $cellReference, mixed &$cellValue): bool
     {
-        $this->debugLog->writeDebugLog("Testing cache value for cell {$cellReference}");
+        $this->debugLog->writeDebugLog('Testing cache value for cell %s', $cellReference);
         // Is calculation cacheing enabled?
         // If so, is the required value present in calculation cache?
         if (($this->calculationCacheEnabled) && (isset($this->calculationCache[$cellReference]))) {
-            $this->debugLog->writeDebugLog("Retrieving value for cell {$cellReference} from cache");
+            $this->debugLog->writeDebugLog('Retrieving value for cell %s from cache', $cellReference);
             // Return the cached result
 
             $cellValue = $this->calculationCache[$cellReference];
@@ -3459,11 +3616,7 @@ public function getValueFromCache(string $cellReference, &$cellValue): bool
         return false;
     }
 
-    /**
-     * @param string $cellReference
-     * @param mixed $cellValue
-     */
-    public function saveValueToCache($cellReference, $cellValue): void
+    public function saveValueToCache(string $cellReference, mixed $cellValue): void
     {
         if ($this->calculationCacheEnabled) {
             $this->calculationCache[$cellReference] = $cellValue;
@@ -3474,17 +3627,16 @@ public function saveValueToCache($cellReference, $cellValue): void
      * Parse a cell formula and calculate its value.
      *
      * @param string $formula The formula to parse and calculate
-     * @param string $cellID The ID (e.g. A3) of the cell that we are calculating
-     * @param Cell $pCell Cell to calculate
-     *
-     * @return mixed
+     * @param ?string $cellID The ID (e.g. A3) of the cell that we are calculating
+     * @param ?Cell $cell Cell to calculate
+     * @param bool $ignoreQuotePrefix If set to true, evaluate the formyla even if the referenced cell is quote prefixed
      */
-    public function _calculateFormulaValue($formula, $cellID = null, ?Cell $pCell = null)
+    public function _calculateFormulaValue(string $formula, ?string $cellID = null, ?Cell $cell = null, bool $ignoreQuotePrefix = false): mixed
     {
         $cellValue = null;
 
         //  Quote-Prefixed cell values cannot be formulae, but are treated as strings
-        if ($pCell !== null && $pCell->getStyle()->getQuotePrefix() === true) {
+        if ($cell !== null && $ignoreQuotePrefix === false && $cell->getStyle()->getQuotePrefix() === true) {
             return self::wrapResult((string) $formula);
         }
 
@@ -3495,7 +3647,7 @@ public function _calculateFormulaValue($formula, $cellID = null, ?Cell $pCell =
         //    Basic validation that this is indeed a formula
         //    We simply return the cell value if not
         $formula = trim($formula);
-        if ($formula[0] != '=') {
+        if ($formula === '' || $formula[0] !== '=') {
             return self::wrapResult($formula);
         }
         $formula = ltrim(substr($formula, 1));
@@ -3503,14 +3655,14 @@ public function _calculateFormulaValue($formula, $cellID = null, ?Cell $pCell =
             return self::wrapResult($formula);
         }
 
-        $pCellParent = ($pCell !== null) ? $pCell->getWorksheet() : null;
+        $pCellParent = ($cell !== null) ? $cell->getWorksheet() : null;
         $wsTitle = ($pCellParent !== null) ? $pCellParent->getTitle() : "\x00Wrk";
         $wsCellReference = $wsTitle . '!' . $cellID;
 
         if (($cellID !== null) && ($this->getValueFromCache($wsCellReference, $cellValue))) {
             return $cellValue;
         }
-        $this->debugLog->writeDebugLog("Evaluating formula for cell {$wsCellReference}");
+        $this->debugLog->writeDebugLog('Evaluating formula for cell %s', $wsCellReference);
 
         if (($wsTitle[0] !== "\x00") && ($this->cyclicReferenceStack->onStack($wsCellReference))) {
             if ($this->cyclicFormulaCount <= 0) {
@@ -3532,11 +3684,11 @@ public function _calculateFormulaValue($formula, $cellID = null, ?Cell $pCell =
             }
         }
 
-        $this->debugLog->writeDebugLog("Formula for cell {$wsCellReference} is {$formula}");
+        $this->debugLog->writeDebugLog('Formula for cell %s is %s', $wsCellReference, $formula);
         //    Parse the formula onto the token stack and calculate the value
         $this->cyclicReferenceStack->push($wsCellReference);
 
-        $cellValue = $this->processTokenStack($this->internalParseFormula($formula, $pCell), $cellID, $pCell);
+        $cellValue = $this->processTokenStack($this->internalParseFormula($formula, $cell), $cellID, $cell);
         $this->cyclicReferenceStack->pop();
 
         // Save to calculation cache
@@ -3559,10 +3711,8 @@ public function _calculateFormulaValue($formula, $cellID = null, ?Cell $pCell =
      *                                            0 = no resize
      *                                            1 = shrink to fit
      *                                            2 = extend to fit
-     *
-     * @return array
      */
-    private static function checkMatrixOperands(&$operand1, &$operand2, $resize = 1)
+    public static function checkMatrixOperands(mixed &$operand1, mixed &$operand2, int $resize = 1): array
     {
         //    Examine each of the two operands, and turn them into an array if they aren't one already
         //    Note that this function should only be called if one or both of the operand is already an array
@@ -3578,7 +3728,9 @@ private static function checkMatrixOperands(&$operand1, &$operand2, $resize = 1)
 
         [$matrix1Rows, $matrix1Columns] = self::getMatrixDimensions($operand1);
         [$matrix2Rows, $matrix2Columns] = self::getMatrixDimensions($operand2);
-        if (($matrix1Rows == $matrix2Columns) && ($matrix2Rows == $matrix1Columns)) {
+        if ($resize === 3) {
+            $resize = 2;
+        } elseif (($matrix1Rows == $matrix2Columns) && ($matrix2Rows == $matrix1Columns)) {
             $resize = 1;
         }
 
@@ -3589,6 +3741,8 @@ private static function checkMatrixOperands(&$operand1, &$operand2, $resize = 1)
             //    Given two matrices of (potentially) unequal size, convert the larger in each dimension to match the smaller
             self::resizeMatricesShrink($operand1, $operand2, $matrix1Rows, $matrix1Columns, $matrix2Rows, $matrix2Columns);
         }
+        [$matrix1Rows, $matrix1Columns] = self::getMatrixDimensions($operand1);
+        [$matrix2Rows, $matrix2Columns] = self::getMatrixDimensions($operand2);
 
         return [$matrix1Rows, $matrix1Columns, $matrix2Rows, $matrix2Columns];
     }
@@ -3600,7 +3754,7 @@ private static function checkMatrixOperands(&$operand1, &$operand2, $resize = 1)
      *
      * @return int[] An array comprising the number of rows, and number of columns
      */
-    public static function getMatrixDimensions(array &$matrix)
+    public static function getMatrixDimensions(array &$matrix): array
     {
         $matrixRows = count($matrix);
         $matrixColumns = 0;
@@ -3621,14 +3775,14 @@ public static function getMatrixDimensions(array &$matrix)
     /**
      * Ensure that paired matrix operands are both matrices of the same size.
      *
-     * @param mixed $matrix1 First matrix operand
-     * @param mixed $matrix2 Second matrix operand
+     * @param array $matrix1 First matrix operand
+     * @param array $matrix2 Second matrix operand
      * @param int $matrix1Rows Row size of first matrix operand
      * @param int $matrix1Columns Column size of first matrix operand
      * @param int $matrix2Rows Row size of second matrix operand
      * @param int $matrix2Columns Column size of second matrix operand
      */
-    private static function resizeMatricesShrink(&$matrix1, &$matrix2, $matrix1Rows, $matrix1Columns, $matrix2Rows, $matrix2Columns): void
+    private static function resizeMatricesShrink(array &$matrix1, array &$matrix2, int $matrix1Rows, int $matrix1Columns, int $matrix2Rows, int $matrix2Columns): void
     {
         if (($matrix2Columns < $matrix1Columns) || ($matrix2Rows < $matrix1Rows)) {
             if ($matrix2Rows < $matrix1Rows) {
@@ -3664,14 +3818,14 @@ private static function resizeMatricesShrink(&$matrix1, &$matrix2, $matrix1Rows,
     /**
      * Ensure that paired matrix operands are both matrices of the same size.
      *
-     * @param mixed $matrix1 First matrix operand
-     * @param mixed $matrix2 Second matrix operand
+     * @param array $matrix1 First matrix operand
+     * @param array $matrix2 Second matrix operand
      * @param int $matrix1Rows Row size of first matrix operand
      * @param int $matrix1Columns Column size of first matrix operand
      * @param int $matrix2Rows Row size of second matrix operand
      * @param int $matrix2Columns Column size of second matrix operand
      */
-    private static function resizeMatricesExtend(&$matrix1, &$matrix2, $matrix1Rows, $matrix1Columns, $matrix2Rows, $matrix2Columns): void
+    private static function resizeMatricesExtend(array &$matrix1, array &$matrix2, int $matrix1Rows, int $matrix1Columns, int $matrix2Rows, int $matrix2Columns): void
     {
         if (($matrix2Columns < $matrix1Columns) || ($matrix2Rows < $matrix1Rows)) {
             if ($matrix2Columns < $matrix1Columns) {
@@ -3712,10 +3866,8 @@ private static function resizeMatricesExtend(&$matrix1, &$matrix2, $matrix1Rows,
      * Format details of an operand for display in the log (based on operand type).
      *
      * @param mixed $value First matrix operand
-     *
-     * @return mixed
      */
-    private function showValue($value)
+    private function showValue(mixed $value): mixed
     {
         if ($this->debugLog->getWriteDebugLog()) {
             $testArray = Functions::flattenArray($value);
@@ -3740,6 +3892,8 @@ private function showValue($value)
                 return self::FORMULA_STRING_QUOTE . $value . self::FORMULA_STRING_QUOTE;
             } elseif (is_bool($value)) {
                 return ($value) ? self::$localeBoolean['TRUE'] : self::$localeBoolean['FALSE'];
+            } elseif ($value === null) {
+                return self::$localeBoolean['NULL'];
             }
         }
 
@@ -3750,10 +3904,8 @@ private function showValue($value)
      * Format type and details of an operand for display in the log (based on operand type).
      *
      * @param mixed $value First matrix operand
-     *
-     * @return null|string
      */
-    private function showTypeDetails($value)
+    private function showTypeDetails(mixed $value): ?string
     {
         if ($this->debugLog->getWriteDebugLog()) {
             $testArray = Functions::flattenArray($value);
@@ -3787,30 +3939,29 @@ private function showTypeDetails($value)
     }
 
     /**
-     * @param string $formula
-     *
      * @return false|string False indicates an error
      */
-    private function convertMatrixReferences($formula)
+    private function convertMatrixReferences(string $formula): false|string
     {
-        static $matrixReplaceFrom = [self::FORMULA_OPEN_FUNCTION_BRACE, ';', self::FORMULA_CLOSE_FUNCTION_BRACE];
+        static $matrixReplaceFrom = [self::FORMULA_OPEN_MATRIX_BRACE, ';', self::FORMULA_CLOSE_MATRIX_BRACE];
         static $matrixReplaceTo = ['MKMATRIX(MKMATRIX(', '),MKMATRIX(', '))'];
 
         //    Convert any Excel matrix references to the MKMATRIX() function
-        if (strpos($formula, self::FORMULA_OPEN_FUNCTION_BRACE) !== false) {
+        if (str_contains($formula, self::FORMULA_OPEN_MATRIX_BRACE)) {
             //    If there is the possibility of braces within a quoted string, then we don't treat those as matrix indicators
-            if (strpos($formula, self::FORMULA_STRING_QUOTE) !== false) {
+            if (str_contains($formula, self::FORMULA_STRING_QUOTE)) {
                 //    So instead we skip replacing in any quoted strings by only replacing in every other array element after we've exploded
                 //        the formula
                 $temp = explode(self::FORMULA_STRING_QUOTE, $formula);
                 //    Open and Closed counts used for trapping mismatched braces in the formula
                 $openCount = $closeCount = 0;
-                $i = false;
+                $notWithinQuotes = false;
                 foreach ($temp as &$value) {
                     //    Only count/replace in alternating array entries
-                    if ($i = !$i) {
-                        $openCount += substr_count($value, self::FORMULA_OPEN_FUNCTION_BRACE);
-                        $closeCount += substr_count($value, self::FORMULA_CLOSE_FUNCTION_BRACE);
+                    $notWithinQuotes = $notWithinQuotes === false;
+                    if ($notWithinQuotes === true) {
+                        $openCount += substr_count($value, self::FORMULA_OPEN_MATRIX_BRACE);
+                        $closeCount += substr_count($value, self::FORMULA_CLOSE_MATRIX_BRACE);
                         $value = str_replace($matrixReplaceFrom, $matrixReplaceTo, $value);
                     }
                 }
@@ -3819,8 +3970,8 @@ private function convertMatrixReferences($formula)
                 $formula = implode(self::FORMULA_STRING_QUOTE, $temp);
             } else {
                 //    If there's no quoted strings, then we do a simple count/replace
-                $openCount = substr_count($formula, self::FORMULA_OPEN_FUNCTION_BRACE);
-                $closeCount = substr_count($formula, self::FORMULA_CLOSE_FUNCTION_BRACE);
+                $openCount = substr_count($formula, self::FORMULA_OPEN_MATRIX_BRACE);
+                $closeCount = substr_count($formula, self::FORMULA_CLOSE_MATRIX_BRACE);
                 $formula = str_replace($matrixReplaceFrom, $matrixReplaceTo, $formula);
             }
             //    Trap for mismatched braces and trigger an appropriate error
@@ -3842,28 +3993,35 @@ private function convertMatrixReferences($formula)
         return $formula;
     }
 
-    //    Binary Operators
-    //    These operators always work on two values
-    //    Array key is the operator, the value indicates whether this is a left or right associative operator
-    private static $operatorAssociativity = [
+    /**
+     *    Binary Operators.
+     *    These operators always work on two values.
+     *    Array key is the operator, the value indicates whether this is a left or right associative operator.
+     */
+    private static array $operatorAssociativity = [
         '^' => 0, //    Exponentiation
         '*' => 0, '/' => 0, //    Multiplication and Division
         '+' => 0, '-' => 0, //    Addition and Subtraction
         '&' => 0, //    Concatenation
-        '|' => 0, ':' => 0, //    Intersect and Range
+        '∪' => 0, '∩' => 0, ':' => 0, //    Union, Intersect and Range
         '>' => 0, '<' => 0, '=' => 0, '>=' => 0, '<=' => 0, '<>' => 0, //    Comparison
     ];
 
-    //    Comparison (Boolean) Operators
-    //    These operators work on two values, but always return a boolean result
-    private static $comparisonOperators = ['>' => true, '<' => true, '=' => true, '>=' => true, '<=' => true, '<>' => true];
+    /**
+     *    Comparison (Boolean) Operators.
+     *    These operators work on two values, but always return a boolean result.
+     */
+    private static array $comparisonOperators = ['>' => true, '<' => true, '=' => true, '>=' => true, '<=' => true, '<>' => true];
 
-    //    Operator Precedence
-    //    This list includes all valid operators, whether binary (including boolean) or unary (such as %)
-    //    Array key is the operator, the value is its precedence
-    private static $operatorPrecedence = [
-        ':' => 8, //    Range
-        '|' => 7, //    Intersect
+    /**
+     *    Operator Precedence.
+     *    This list includes all valid operators, whether binary (including boolean) or unary (such as %).
+     *    Array key is the operator, the value is its precedence.
+     */
+    private static array $operatorPrecedence = [
+        ':' => 9, //    Range
+        '∩' => 8, //    Intersect
+        '∪' => 7, //    Union
         '~' => 6, //    Negation
         '%' => 5, //    Percentage
         '^' => 4, //    Exponentiation
@@ -3876,11 +4034,9 @@ private function convertMatrixReferences($formula)
     // Convert infix to postfix notation
 
     /**
-     * @param string $formula
-     *
      * @return array<int, mixed>|false
      */
-    private function internalParseFormula($formula, ?Cell $pCell = null)
+    private function internalParseFormula(string $formula, ?Cell $cell = null): bool|array
     {
         if (($formula = $this->convertMatrixReferences(trim($formula))) === false) {
             return false;
@@ -3888,152 +4044,103 @@ private function internalParseFormula($formula, ?Cell $pCell = null)
 
         //    If we're using cell caching, then $pCell may well be flushed back to the cache (which detaches the parent worksheet),
         //        so we store the parent worksheet so that we can re-attach it when necessary
-        $pCellParent = ($pCell !== null) ? $pCell->getWorksheet() : null;
-
-        $regexpMatchString = '/^(' . self::CALCULATION_REGEXP_FUNCTION .
-            '|' . self::CALCULATION_REGEXP_CELLREF .
-            '|' . self::CALCULATION_REGEXP_COLUMN_RANGE .
-            '|' . self::CALCULATION_REGEXP_ROW_RANGE .
-            '|' . self::CALCULATION_REGEXP_NUMBER .
-            '|' . self::CALCULATION_REGEXP_STRING .
-            '|' . self::CALCULATION_REGEXP_OPENBRACE .
-            '|' . self::CALCULATION_REGEXP_DEFINEDNAME .
-            '|' . self::CALCULATION_REGEXP_ERROR .
-            ')/sui';
+        $pCellParent = ($cell !== null) ? $cell->getWorksheet() : null;
+
+        $regexpMatchString = '/^((?<string>' . self::CALCULATION_REGEXP_STRING
+                                . ')|(?<function>' . self::CALCULATION_REGEXP_FUNCTION
+                                . ')|(?<cellRef>' . self::CALCULATION_REGEXP_CELLREF
+                                . ')|(?<colRange>' . self::CALCULATION_REGEXP_COLUMN_RANGE
+                                . ')|(?<rowRange>' . self::CALCULATION_REGEXP_ROW_RANGE
+                                . ')|(?<number>' . self::CALCULATION_REGEXP_NUMBER
+                                . ')|(?<openBrace>' . self::CALCULATION_REGEXP_OPENBRACE
+                                . ')|(?<structuredReference>' . self::CALCULATION_REGEXP_STRUCTURED_REFERENCE
+                                . ')|(?<definedName>' . self::CALCULATION_REGEXP_DEFINEDNAME
+                                . ')|(?<error>' . self::CALCULATION_REGEXP_ERROR
+                                . '))/sui';
 
         //    Start with initialisation
         $index = 0;
-        $stack = new Stack();
+        $stack = new Stack($this->branchPruner);
         $output = [];
         $expectingOperator = false; //    We use this test in syntax-checking the expression to determine when a
         //        - is a negation or + is a positive operator rather than an operation
         $expectingOperand = false; //    We use this test in syntax-checking the expression to determine whether an operand
         //        should be null in a function call
 
-        // IF branch pruning
-        // currently pending storeKey (last item of the storeKeysStack
-        $pendingStoreKey = null;
-        // stores a list of storeKeys (string[])
-        $pendingStoreKeysStack = [];
-        $expectingConditionMap = []; // ['storeKey' => true, ...]
-        $expectingThenMap = []; // ['storeKey' => true, ...]
-        $expectingElseMap = []; // ['storeKey' => true, ...]
-        $parenthesisDepthMap = []; // ['storeKey' => 4, ...]
-
         //    The guts of the lexical parser
         //    Loop through the formula extracting each operator and operand in turn
         while (true) {
             // Branch pruning: we adapt the output item to the context (it will
             // be used to limit its computation)
-            $currentCondition = null;
-            $currentOnlyIf = null;
-            $currentOnlyIfNot = null;
-            $previousStoreKey = null;
-            $pendingStoreKey = end($pendingStoreKeysStack);
-
-            if ($this->branchPruningEnabled) {
-                // this is a condition ?
-                if (isset($expectingConditionMap[$pendingStoreKey]) && $expectingConditionMap[$pendingStoreKey]) {
-                    $currentCondition = $pendingStoreKey;
-                    $stackDepth = count($pendingStoreKeysStack);
-                    if ($stackDepth > 1) { // nested if
-                        $previousStoreKey = $pendingStoreKeysStack[$stackDepth - 2];
-                    }
-                }
-                if (isset($expectingThenMap[$pendingStoreKey]) && $expectingThenMap[$pendingStoreKey]) {
-                    $currentOnlyIf = $pendingStoreKey;
-                } elseif (isset($previousStoreKey)) {
-                    if (isset($expectingThenMap[$previousStoreKey]) && $expectingThenMap[$previousStoreKey]) {
-                        $currentOnlyIf = $previousStoreKey;
-                    }
-                }
-                if (isset($expectingElseMap[$pendingStoreKey]) && $expectingElseMap[$pendingStoreKey]) {
-                    $currentOnlyIfNot = $pendingStoreKey;
-                } elseif (isset($previousStoreKey)) {
-                    if (isset($expectingElseMap[$previousStoreKey]) && $expectingElseMap[$previousStoreKey]) {
-                        $currentOnlyIfNot = $previousStoreKey;
-                    }
-                }
-            }
+            $this->branchPruner->initialiseForLoop();
 
             $opCharacter = $formula[$index]; //    Get the first character of the value at the current index position
 
-            if ((isset(self::$comparisonOperators[$opCharacter])) && (strlen($formula) > $index) && (isset(self::$comparisonOperators[$formula[$index + 1]]))) {
+            // Check for two-character operators (e.g. >=, <=, <>)
+            if ((isset(self::$comparisonOperators[$opCharacter])) && (strlen($formula) > $index) && isset($formula[$index + 1], self::$comparisonOperators[$formula[$index + 1]])) {
                 $opCharacter .= $formula[++$index];
             }
-            //    Find out if we're currently at the beginning of a number, variable, cell reference, function, parenthesis or operand
+            //    Find out if we're currently at the beginning of a number, variable, cell/row/column reference,
+            //         function, defined name, structured reference, parenthesis, error or operand
             $isOperandOrFunction = (bool) preg_match($regexpMatchString, substr($formula, $index), $match);
 
-            if ($opCharacter == '-' && !$expectingOperator) {                //    Is it a negation instead of a minus?
+            $expectingOperatorCopy = $expectingOperator;
+            if ($opCharacter === '-' && !$expectingOperator) {                //    Is it a negation instead of a minus?
                 //    Put a negation on the stack
-                $stack->push('Unary Operator', '~', null, $currentCondition, $currentOnlyIf, $currentOnlyIfNot);
+                $stack->push('Unary Operator', '~');
                 ++$index; //        and drop the negation symbol
-            } elseif ($opCharacter == '%' && $expectingOperator) {
+            } elseif ($opCharacter === '%' && $expectingOperator) {
                 //    Put a percentage on the stack
-                $stack->push('Unary Operator', '%', null, $currentCondition, $currentOnlyIf, $currentOnlyIfNot);
+                $stack->push('Unary Operator', '%');
                 ++$index;
-            } elseif ($opCharacter == '+' && !$expectingOperator) {            //    Positive (unary plus rather than binary operator plus) can be discarded?
+            } elseif ($opCharacter === '+' && !$expectingOperator) {            //    Positive (unary plus rather than binary operator plus) can be discarded?
                 ++$index; //    Drop the redundant plus symbol
-            } elseif ((($opCharacter == '~') || ($opCharacter == '|')) && (!$isOperandOrFunction)) {    //    We have to explicitly deny a tilde or pipe, because they are legal
+            } elseif ((($opCharacter === '~') || ($opCharacter === '∩') || ($opCharacter === '∪')) && (!$isOperandOrFunction)) {
+                //    We have to explicitly deny a tilde, union or intersect because they are legal
                 return $this->raiseFormulaError("Formula Error: Illegal character '~'"); //        on the stack but not in the input expression
-            } elseif ((isset(self::$operators[$opCharacter]) || $isOperandOrFunction) && $expectingOperator) {    //    Are we putting an operator on the stack?
+            } elseif ((isset(self::CALCULATION_OPERATORS[$opCharacter]) || $isOperandOrFunction) && $expectingOperator) {    //    Are we putting an operator on the stack?
                 while (
-                    $stack->count() > 0 &&
-                    ($o2 = $stack->last()) &&
-                    isset(self::$operators[$o2['value']]) &&
-                    @(self::$operatorAssociativity[$opCharacter] ? self::$operatorPrecedence[$opCharacter] < self::$operatorPrecedence[$o2['value']] : self::$operatorPrecedence[$opCharacter] <= self::$operatorPrecedence[$o2['value']])
+                    $stack->count() > 0
+                    && ($o2 = $stack->last())
+                    && isset(self::CALCULATION_OPERATORS[$o2['value']])
+                    && @(self::$operatorAssociativity[$opCharacter] ? self::$operatorPrecedence[$opCharacter] < self::$operatorPrecedence[$o2['value']] : self::$operatorPrecedence[$opCharacter] <= self::$operatorPrecedence[$o2['value']])
                 ) {
                     $output[] = $stack->pop(); //    Swap operands and higher precedence operators from the stack to the output
                 }
 
                 //    Finally put our current operator onto the stack
-                $stack->push('Binary Operator', $opCharacter, null, $currentCondition, $currentOnlyIf, $currentOnlyIfNot);
+                $stack->push('Binary Operator', $opCharacter);
 
                 ++$index;
                 $expectingOperator = false;
-            } elseif ($opCharacter == ')' && $expectingOperator) {            //    Are we expecting to close a parenthesis?
+            } elseif ($opCharacter === ')' && $expectingOperator) { //    Are we expecting to close a parenthesis?
                 $expectingOperand = false;
-                while (($o2 = $stack->pop()) && $o2['value'] != '(') {        //    Pop off the stack back to the last (
-                    if ($o2 === null) {
-                        return $this->raiseFormulaError('Formula Error: Unexpected closing brace ")"');
-                    }
+                while (($o2 = $stack->pop()) && $o2['value'] !== '(') { //    Pop off the stack back to the last (
                     $output[] = $o2;
                 }
                 $d = $stack->last(2);
 
                 // Branch pruning we decrease the depth whether is it a function
                 // call or a parenthesis
-                if (!empty($pendingStoreKey)) {
-                    --$parenthesisDepthMap[$pendingStoreKey];
-                }
+                $this->branchPruner->decrementDepth();
 
-                if (is_array($d) && preg_match('/^' . self::CALCULATION_REGEXP_FUNCTION . '$/miu', $d['value'], $matches)) {    //    Did this parenthesis just close a function?
-                    if (!empty($pendingStoreKey) && $parenthesisDepthMap[$pendingStoreKey] == -1) {
-                        // we are closing an IF(
-                        if ($d['value'] != 'IF(') {
-                            return $this->raiseFormulaError('Parser bug we should be in an "IF("');
-                        }
-                        if ($expectingConditionMap[$pendingStoreKey]) {
-                            return $this->raiseFormulaError('We should not be expecting a condition');
-                        }
-                        $expectingThenMap[$pendingStoreKey] = false;
-                        $expectingElseMap[$pendingStoreKey] = false;
-                        --$parenthesisDepthMap[$pendingStoreKey];
-                        array_pop($pendingStoreKeysStack);
-                        unset($pendingStoreKey);
+                if (is_array($d) && preg_match('/^' . self::CALCULATION_REGEXP_FUNCTION . '$/miu', $d['value'], $matches)) {
+                    //    Did this parenthesis just close a function?
+                    try {
+                        $this->branchPruner->closingBrace($d['value']);
+                    } catch (Exception $e) {
+                        return $this->raiseFormulaError($e->getMessage(), $e->getCode(), $e);
                     }
 
                     $functionName = $matches[1]; //    Get the function name
                     $d = $stack->pop();
-                    $argumentCount = $d['value']; //    See how many arguments there were (argument count is the next value stored on the stack)
+                    $argumentCount = $d['value'] ?? 0; //    See how many arguments there were (argument count is the next value stored on the stack)
                     $output[] = $d; //    Dump the argument count on the output
                     $output[] = $stack->pop(); //    Pop the function and push onto the output
                     if (isset(self::$controlFunctions[$functionName])) {
                         $expectedArgumentCount = self::$controlFunctions[$functionName]['argumentCount'];
-                        $functionCall = self::$controlFunctions[$functionName]['functionCall'];
                     } elseif (isset(self::$phpSpreadsheetFunctions[$functionName])) {
                         $expectedArgumentCount = self::$phpSpreadsheetFunctions[$functionName]['argumentCount'];
-                        $functionCall = self::$phpSpreadsheetFunctions[$functionName]['functionCall'];
                     } else {    // did we somehow push a non-function on the stack? this should never happen
                         return $this->raiseFormulaError('Formula Error: Internal error, non-function on stack');
                     }
@@ -4053,8 +4160,8 @@ private function internalParseFormula($formula, ?Cell $pCell = null)
                             }
                         }
                     } elseif ($expectedArgumentCount != '*') {
-                        $isOperandOrFunction = preg_match('/(\d*)([-+,])(\d*)/', $expectedArgumentCount, $argMatch);
-                        switch ($argMatch[2]) {
+                        preg_match('/(\d*)([-+,])(\d*)/', $expectedArgumentCount, $argMatch);
+                        switch ($argMatch[2] ?? '') {
                             case '+':
                                 if ($argumentCount < $argMatch[1]) {
                                     $argumentCountError = true;
@@ -4083,61 +4190,55 @@ private function internalParseFormula($formula, ?Cell $pCell = null)
                     }
                 }
                 ++$index;
-            } elseif ($opCharacter == ',') {            //    Is this the separator for function arguments?
-                if (
-                    !empty($pendingStoreKey) &&
-                    $parenthesisDepthMap[$pendingStoreKey] == 0
-                ) {
-                    // We must go to the IF next argument
-                    if ($expectingConditionMap[$pendingStoreKey]) {
-                        $expectingConditionMap[$pendingStoreKey] = false;
-                        $expectingThenMap[$pendingStoreKey] = true;
-                    } elseif ($expectingThenMap[$pendingStoreKey]) {
-                        $expectingThenMap[$pendingStoreKey] = false;
-                        $expectingElseMap[$pendingStoreKey] = true;
-                    } elseif ($expectingElseMap[$pendingStoreKey]) {
-                        return $this->raiseFormulaError('Reaching fourth argument of an IF');
-                    }
+            } elseif ($opCharacter === ',') { // Is this the separator for function arguments?
+                try {
+                    $this->branchPruner->argumentSeparator();
+                } catch (Exception $e) {
+                    return $this->raiseFormulaError($e->getMessage(), $e->getCode(), $e);
                 }
-                while (($o2 = $stack->pop()) && $o2['value'] != '(') {        //    Pop off the stack back to the last (
-                    if ($o2 === null) {
-                        return $this->raiseFormulaError('Formula Error: Unexpected ,');
-                    }
+
+                while (($o2 = $stack->pop()) && $o2['value'] !== '(') {        //    Pop off the stack back to the last (
                     $output[] = $o2; // pop the argument expression stuff and push onto the output
                 }
                 //    If we've a comma when we're expecting an operand, then what we actually have is a null operand;
                 //        so push a null onto the stack
                 if (($expectingOperand) || (!$expectingOperator)) {
-                    $output[] = ['type' => 'NULL Value', 'value' => self::$excelConstants['NULL'], 'reference' => null];
+                    $output[] = $stack->getStackItem('Empty Argument', null, 'NULL');
                 }
                 // make sure there was a function
                 $d = $stack->last(2);
-                if (!preg_match('/^' . self::CALCULATION_REGEXP_FUNCTION . '$/miu', $d['value'], $matches)) {
+                if (!preg_match('/^' . self::CALCULATION_REGEXP_FUNCTION . '$/miu', $d['value'] ?? '', $matches)) {
+                    // Can we inject a dummy function at this point so that the braces at least have some context
+                    //     because at least the braces are paired up (at this stage in the formula)
+                    // MS Excel allows this if the content is cell references; but doesn't allow actual values,
+                    //    but at this point, we can't differentiate (so allow both)
                     return $this->raiseFormulaError('Formula Error: Unexpected ,');
                 }
+
+                /** @var array $d */
                 $d = $stack->pop();
-                $itemStoreKey = $d['storeKey'] ?? null;
-                $itemOnlyIf = $d['onlyIf'] ?? null;
-                $itemOnlyIfNot = $d['onlyIfNot'] ?? null;
-                $stack->push($d['type'], ++$d['value'], $d['reference'], $itemStoreKey, $itemOnlyIf, $itemOnlyIfNot); // increment the argument count
-                $stack->push('Brace', '(', null, $itemStoreKey, $itemOnlyIf, $itemOnlyIfNot); // put the ( back on, we'll need to pop back to it again
+                ++$d['value']; // increment the argument count
+
+                $stack->pushStackItem($d);
+                $stack->push('Brace', '('); // put the ( back on, we'll need to pop back to it again
+
                 $expectingOperator = false;
                 $expectingOperand = true;
                 ++$index;
-            } elseif ($opCharacter == '(' && !$expectingOperator) {
-                if (!empty($pendingStoreKey)) { // Branch pruning: we go deeper
-                    ++$parenthesisDepthMap[$pendingStoreKey];
-                }
-                $stack->push('Brace', '(', null, $currentCondition, $currentOnlyIf, $currentOnlyIf);
+            } elseif ($opCharacter === '(' && !$expectingOperator) {
+                // Branch pruning: we go deeper
+                $this->branchPruner->incrementDepth();
+                $stack->push('Brace', '(', null);
                 ++$index;
-            } elseif ($isOperandOrFunction && !$expectingOperator) {    // do we now have a function/variable/number?
+            } elseif ($isOperandOrFunction && !$expectingOperatorCopy) {
+                // do we now have a function/variable/number?
                 $expectingOperator = true;
                 $expectingOperand = false;
                 $val = $match[1];
                 $length = strlen($val);
 
                 if (preg_match('/^' . self::CALCULATION_REGEXP_FUNCTION . '$/miu', $val, $matches)) {
-                    $val = preg_replace('/\s/u', '', $val);
+                    $val = (string) preg_replace('/\s/u', '', $val);
                     if (isset(self::$phpSpreadsheetFunctions[strtoupper($matches[1])]) || isset(self::$controlFunctions[strtoupper($matches[1])])) {    // it's a function
                         $valToUpper = strtoupper($val);
                     } else {
@@ -4145,59 +4246,78 @@ private function internalParseFormula($formula, ?Cell $pCell = null)
                     }
                     // here $matches[1] will contain values like "IF"
                     // and $val "IF("
-                    if ($this->branchPruningEnabled && ($valToUpper == 'IF(')) { // we handle a new if
-                        $pendingStoreKey = $this->getUnusedBranchStoreKey();
-                        $pendingStoreKeysStack[] = $pendingStoreKey;
-                        $expectingConditionMap[$pendingStoreKey] = true;
-                        $parenthesisDepthMap[$pendingStoreKey] = 0;
-                    } else { // this is not an if but we go deeper
-                        if (!empty($pendingStoreKey) && array_key_exists($pendingStoreKey, $parenthesisDepthMap)) {
-                            ++$parenthesisDepthMap[$pendingStoreKey];
-                        }
-                    }
 
-                    $stack->push('Function', $valToUpper, null, $currentCondition, $currentOnlyIf, $currentOnlyIfNot);
+                    $this->branchPruner->functionCall($valToUpper);
+
+                    $stack->push('Function', $valToUpper);
                     // tests if the function is closed right after opening
                     $ax = preg_match('/^\s*\)/u', substr($formula, $index + $length));
                     if ($ax) {
-                        $stack->push('Operand Count for Function ' . $valToUpper . ')', 0, null, $currentCondition, $currentOnlyIf, $currentOnlyIfNot);
+                        $stack->push('Operand Count for Function ' . $valToUpper . ')', 0);
                         $expectingOperator = true;
                     } else {
-                        $stack->push('Operand Count for Function ' . $valToUpper . ')', 1, null, $currentCondition, $currentOnlyIf, $currentOnlyIfNot);
+                        $stack->push('Operand Count for Function ' . $valToUpper . ')', 1);
                         $expectingOperator = false;
                     }
                     $stack->push('Brace', '(');
-                } elseif (preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '$/i', $val, $matches)) {
+                } elseif (preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '$/miu', $val, $matches)) {
                     //    Watch for this case-change when modifying to allow cell references in different worksheets...
                     //    Should only be applied to the actual cell column, not the worksheet name
                     //    If the last entry on the stack was a : operator, then we have a cell range reference
                     $testPrevOp = $stack->last(1);
                     if ($testPrevOp !== null && $testPrevOp['value'] === ':') {
                         //    If we have a worksheet reference, then we're playing with a 3D reference
-                        if ($matches[2] == '') {
+                        if ($matches[2] === '') {
                             //    Otherwise, we 'inherit' the worksheet reference from the start cell reference
                             //    The start of the cell range reference should be the last entry in $output
-                            $rangeStartCellRef = $output[count($output) - 1]['value'];
-                            preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '$/i', $rangeStartCellRef, $rangeStartMatches);
-                            if ($rangeStartMatches[2] > '') {
-                                $val = $rangeStartMatches[2] . '!' . $val;
+                            $rangeStartCellRef = $output[count($output) - 1]['value'] ?? '';
+                            if ($rangeStartCellRef === ':') {
+                                // Do we have chained range operators?
+                                $rangeStartCellRef = $output[count($output) - 2]['value'] ?? '';
+                            }
+                            preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '$/miu', $rangeStartCellRef, $rangeStartMatches);
+                            if (array_key_exists(2, $rangeStartMatches)) {
+                                if ($rangeStartMatches[2] > '') {
+                                    $val = $rangeStartMatches[2] . '!' . $val;
+                                }
+                            } else {
+                                $val = ExcelError::REF();
                             }
                         } else {
-                            $rangeStartCellRef = $output[count($output) - 1]['value'];
-                            preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '$/i', $rangeStartCellRef, $rangeStartMatches);
+                            $rangeStartCellRef = $output[count($output) - 1]['value'] ?? '';
+                            if ($rangeStartCellRef === ':') {
+                                // Do we have chained range operators?
+                                $rangeStartCellRef = $output[count($output) - 2]['value'] ?? '';
+                            }
+                            preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '$/miu', $rangeStartCellRef, $rangeStartMatches);
                             if ($rangeStartMatches[2] !== $matches[2]) {
                                 return $this->raiseFormulaError('3D Range references are not yet supported');
                             }
                         }
-                    } elseif (strpos($val, '!') === false && $pCellParent !== null) {
+                    } elseif (!str_contains($val, '!') && $pCellParent !== null) {
                         $worksheet = $pCellParent->getTitle();
                         $val = "'{$worksheet}'!{$val}";
                     }
+                    // unescape any apostrophes or double quotes in worksheet name
+                    $val = str_replace(["''", '""'], ["'", '"'], $val);
+                    $outputItem = $stack->getStackItem('Cell Reference', $val, $val);
 
-                    $outputItem = $stack->getStackItem('Cell Reference', $val, $val, $currentCondition, $currentOnlyIf, $currentOnlyIfNot);
+                    $output[] = $outputItem;
+                } elseif (preg_match('/^' . self::CALCULATION_REGEXP_STRUCTURED_REFERENCE . '$/miu', $val, $matches)) {
+                    try {
+                        $structuredReference = Operands\StructuredReference::fromParser($formula, $index, $matches);
+                    } catch (Exception $e) {
+                        return $this->raiseFormulaError($e->getMessage(), $e->getCode(), $e);
+                    }
+
+                    $val = $structuredReference->value();
+                    $length = strlen($val);
+                    $outputItem = $stack->getStackItem(Operands\StructuredReference::NAME, $structuredReference, null);
 
                     $output[] = $outputItem;
-                } else {    // it's a variable, constant, string, number or boolean
+                    $expectingOperator = true;
+                } else {
+                    // it's a variable, constant, string, number or boolean
                     $localeConstant = false;
                     $stackItemType = 'Value';
                     $stackItemReference = null;
@@ -4206,53 +4326,88 @@ private function internalParseFormula($formula, ?Cell $pCell = null)
                     $testPrevOp = $stack->last(1);
                     if ($testPrevOp !== null && $testPrevOp['value'] === ':') {
                         $stackItemType = 'Cell Reference';
-                        $startRowColRef = $output[count($output) - 1]['value'];
-                        [$rangeWS1, $startRowColRef] = Worksheet::extractSheetTitle($startRowColRef, true);
-                        $rangeSheetRef = $rangeWS1;
-                        if ($rangeWS1 !== '') {
-                            $rangeWS1 .= '!';
-                        }
-                        $rangeSheetRef = trim($rangeSheetRef, "'");
-                        [$rangeWS2, $val] = Worksheet::extractSheetTitle($val, true);
-                        if ($rangeWS2 !== '') {
-                            $rangeWS2 .= '!';
+
+                        if (
+                            !is_numeric($val)
+                            && ((ctype_alpha($val) === false || strlen($val) > 3))
+                            && (preg_match('/^' . self::CALCULATION_REGEXP_DEFINEDNAME . '$/mui', $val) !== false)
+                            && ($this->spreadsheet === null || $this->spreadsheet->getNamedRange($val) !== null)
+                        ) {
+                            $namedRange = ($this->spreadsheet === null) ? null : $this->spreadsheet->getNamedRange($val);
+                            if ($namedRange !== null) {
+                                $stackItemType = 'Defined Name';
+                                $address = str_replace('$', '', $namedRange->getValue());
+                                $stackItemReference = $val;
+                                if (str_contains($address, ':')) {
+                                    // We'll need to manipulate the stack for an actual named range rather than a named cell
+                                    $fromTo = explode(':', $address);
+                                    $to = array_pop($fromTo);
+                                    foreach ($fromTo as $from) {
+                                        $output[] = $stack->getStackItem($stackItemType, $from, $stackItemReference);
+                                        $output[] = $stack->getStackItem('Binary Operator', ':');
+                                    }
+                                    $address = $to;
+                                }
+                                $val = $address;
+                            }
+                        } elseif ($val === ExcelError::REF()) {
+                            $stackItemReference = $val;
                         } else {
-                            $rangeWS2 = $rangeWS1;
-                        }
+                            /** @var non-empty-string $startRowColRef */
+                            $startRowColRef = $output[count($output) - 1]['value'] ?? '';
+                            [$rangeWS1, $startRowColRef] = Worksheet::extractSheetTitle($startRowColRef, true);
+                            $rangeSheetRef = $rangeWS1;
+                            if ($rangeWS1 !== '') {
+                                $rangeWS1 .= '!';
+                            }
+                            $rangeSheetRef = trim($rangeSheetRef, "'");
+                            [$rangeWS2, $val] = Worksheet::extractSheetTitle($val, true);
+                            if ($rangeWS2 !== '') {
+                                $rangeWS2 .= '!';
+                            } else {
+                                $rangeWS2 = $rangeWS1;
+                            }
 
-                        $refSheet = $pCellParent;
-                        if ($pCellParent !== null && $rangeSheetRef !== '' && $rangeSheetRef !== $pCellParent->getTitle()) {
-                            $refSheet = $pCellParent->getParent()->getSheetByName($rangeSheetRef);
-                        }
+                            $refSheet = $pCellParent;
+                            if ($pCellParent !== null && $rangeSheetRef !== '' && $rangeSheetRef !== $pCellParent->getTitle()) {
+                                $refSheet = $pCellParent->getParentOrThrow()->getSheetByName($rangeSheetRef);
+                            }
 
-                        if (ctype_digit($val) && $val <= 1048576) {
-                            //    Row range
-                            $stackItemType = 'Row Reference';
-                            $endRowColRef = ($refSheet !== null) ? $refSheet->getHighestDataColumn($val) : 'XFD'; //    Max 16,384 columns for Excel2007
-                            $val = "{$rangeWS2}{$endRowColRef}{$val}";
-                        } elseif (ctype_alpha($val) && strlen($val) <= 3) {
-                            //    Column range
-                            $stackItemType = 'Column Reference';
-                            $endRowColRef = ($refSheet !== null) ? $refSheet->getHighestDataRow($val) : 1048576; //    Max 1,048,576 rows for Excel2007
-                            $val = "{$rangeWS2}{$val}{$endRowColRef}";
+                            if (ctype_digit($val) && $val <= 1048576) {
+                                //    Row range
+                                $stackItemType = 'Row Reference';
+                                /** @var int $valx */
+                                $valx = $val;
+                                $endRowColRef = ($refSheet !== null) ? $refSheet->getHighestDataColumn($valx) : AddressRange::MAX_COLUMN; //    Max 16,384 columns for Excel2007
+                                $val = "{$rangeWS2}{$endRowColRef}{$val}";
+                            } elseif (ctype_alpha($val) && strlen($val ?? '') <= 3) {
+                                //    Column range
+                                $stackItemType = 'Column Reference';
+                                $endRowColRef = ($refSheet !== null) ? $refSheet->getHighestDataRow($val) : AddressRange::MAX_ROW; //    Max 1,048,576 rows for Excel2007
+                                $val = "{$rangeWS2}{$val}{$endRowColRef}";
+                            }
+                            $stackItemReference = $val;
                         }
-                        $stackItemReference = $val;
-                    } elseif ($opCharacter == self::FORMULA_STRING_QUOTE) {
+                    } elseif ($opCharacter === self::FORMULA_STRING_QUOTE) {
                         //    UnEscape any quotes within the string
                         $val = self::wrapResult(str_replace('""', self::FORMULA_STRING_QUOTE, self::unwrapResult($val)));
                     } elseif (isset(self::$excelConstants[trim(strtoupper($val))])) {
                         $stackItemType = 'Constant';
                         $excelConstant = trim(strtoupper($val));
                         $val = self::$excelConstants[$excelConstant];
+                        $stackItemReference = $excelConstant;
                     } elseif (($localeConstant = array_search(trim(strtoupper($val)), self::$localeBoolean)) !== false) {
                         $stackItemType = 'Constant';
                         $val = self::$excelConstants[$localeConstant];
+                        $stackItemReference = $localeConstant;
                     } elseif (
                         preg_match('/^' . self::CALCULATION_REGEXP_ROW_RANGE . '/miu', substr($formula, $index), $rowRangeReference)
                     ) {
                         $val = $rowRangeReference[1];
                         $length = strlen($rowRangeReference[1]);
                         $stackItemType = 'Row Reference';
+                        // unescape any apostrophes or double quotes in worksheet name
+                        $val = str_replace(["''", '""'], ["'", '"'], $val);
                         $column = 'A';
                         if (($testPrevOp !== null && $testPrevOp['value'] === ':') && $pCellParent !== null) {
                             $column = $pCellParent->getHighestDataColumn($val);
@@ -4265,6 +4420,8 @@ private function internalParseFormula($formula, ?Cell $pCell = null)
                         $val = $columnRangeReference[1];
                         $length = strlen($val);
                         $stackItemType = 'Column Reference';
+                        // unescape any apostrophes or double quotes in worksheet name
+                        $val = str_replace(["''", '""'], ["'", '"'], $val);
                         $row = '1';
                         if (($testPrevOp !== null && $testPrevOp['value'] === ':') && $pCellParent !== null) {
                             $row = $pCellParent->getHighestDataRow($val);
@@ -4275,31 +4432,31 @@ private function internalParseFormula($formula, ?Cell $pCell = null)
                         $stackItemType = 'Defined Name';
                         $stackItemReference = $val;
                     } elseif (is_numeric($val)) {
-                        if ((strpos($val, '.') !== false) || (stripos($val, 'e') !== false) || ($val > PHP_INT_MAX) || ($val < -PHP_INT_MAX)) {
+                        if ((str_contains((string) $val, '.')) || (stripos((string) $val, 'e') !== false) || ($val > PHP_INT_MAX) || ($val < -PHP_INT_MAX)) {
                             $val = (float) $val;
                         } else {
                             $val = (int) $val;
                         }
                     }
 
-                    $details = $stack->getStackItem($stackItemType, $val, $stackItemReference, $currentCondition, $currentOnlyIf, $currentOnlyIfNot);
+                    $details = $stack->getStackItem($stackItemType, $val, $stackItemReference);
                     if ($localeConstant) {
                         $details['localeValue'] = $localeConstant;
                     }
                     $output[] = $details;
                 }
                 $index += $length;
-            } elseif ($opCharacter == '$') {    // absolute row or column range
+            } elseif ($opCharacter === '$') { // absolute row or column range
                 ++$index;
-            } elseif ($opCharacter == ')') {    // miscellaneous error checking
+            } elseif ($opCharacter === ')') { // miscellaneous error checking
                 if ($expectingOperand) {
-                    $output[] = ['type' => 'NULL Value', 'value' => self::$excelConstants['NULL'], 'reference' => null];
+                    $output[] = $stack->getStackItem('Empty Argument', null, 'NULL');
                     $expectingOperand = false;
                     $expectingOperator = true;
                 } else {
                     return $this->raiseFormulaError("Formula Error: Unexpected ')'");
                 }
-            } elseif (isset(self::$operators[$opCharacter]) && !$expectingOperator) {
+            } elseif (isset(self::CALCULATION_OPERATORS[$opCharacter]) && !$expectingOperator) {
                 return $this->raiseFormulaError("Formula Error: Unexpected operator '$opCharacter'");
             } else {    // I don't even want to know what you did to get here
                 return $this->raiseFormulaError('Formula Error: An unexpected error occurred');
@@ -4308,48 +4465,56 @@ private function internalParseFormula($formula, ?Cell $pCell = null)
             if ($index == strlen($formula)) {
                 //    Did we end with an operator?.
                 //    Only valid for the % unary operator
-                if ((isset(self::$operators[$opCharacter])) && ($opCharacter != '%')) {
+                if ((isset(self::CALCULATION_OPERATORS[$opCharacter])) && ($opCharacter != '%')) {
                     return $this->raiseFormulaError("Formula Error: Operator '$opCharacter' has no operands");
                 }
 
                 break;
             }
             //    Ignore white space
-            while (($formula[$index] == "\n") || ($formula[$index] == "\r")) {
+            while (($formula[$index] === "\n") || ($formula[$index] === "\r")) {
                 ++$index;
             }
 
-            if ($formula[$index] == ' ') {
-                while ($formula[$index] == ' ') {
+            if ($formula[$index] === ' ') {
+                while ($formula[$index] === ' ') {
                     ++$index;
                 }
 
                 //    If we're expecting an operator, but only have a space between the previous and next operands (and both are
-                //        Cell References) then we have an INTERSECTION operator
+                //        Cell References, Defined Names or Structured References) then we have an INTERSECTION operator
+                $countOutputMinus1 = count($output) - 1;
                 if (
-                    ($expectingOperator) &&
-                    ((preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '.*/Ui', substr($formula, $index), $match)) &&
-                        ($output[count($output) - 1]['type'] == 'Cell Reference') ||
-                        (preg_match('/^' . self::CALCULATION_REGEXP_DEFINEDNAME . '.*/miu', substr($formula, $index), $match)) &&
-                        ($output[count($output) - 1]['type'] == 'Defined Name' || $output[count($output) - 1]['type'] == 'Value')
+                    ($expectingOperator)
+                    && array_key_exists($countOutputMinus1, $output)
+                    && is_array($output[$countOutputMinus1])
+                    && array_key_exists('type', $output[$countOutputMinus1])
+                    && (
+                        (preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '.*/miu', substr($formula, $index), $match))
+                            && ($output[$countOutputMinus1]['type'] === 'Cell Reference')
+                        || (preg_match('/^' . self::CALCULATION_REGEXP_DEFINEDNAME . '.*/miu', substr($formula, $index), $match))
+                            && ($output[$countOutputMinus1]['type'] === 'Defined Name' || $output[$countOutputMinus1]['type'] === 'Value')
+                        || (preg_match('/^' . self::CALCULATION_REGEXP_STRUCTURED_REFERENCE . '.*/miu', substr($formula, $index), $match))
+                            && ($output[$countOutputMinus1]['type'] === Operands\StructuredReference::NAME || $output[$countOutputMinus1]['type'] === 'Value')
                     )
                 ) {
                     while (
-                        $stack->count() > 0 &&
-                        ($o2 = $stack->last()) &&
-                        isset(self::$operators[$o2['value']]) &&
-                        @(self::$operatorAssociativity[$opCharacter] ? self::$operatorPrecedence[$opCharacter] < self::$operatorPrecedence[$o2['value']] : self::$operatorPrecedence[$opCharacter] <= self::$operatorPrecedence[$o2['value']])
+                        $stack->count() > 0
+                        && ($o2 = $stack->last())
+                        && isset(self::CALCULATION_OPERATORS[$o2['value']])
+                        && @(self::$operatorAssociativity[$opCharacter] ? self::$operatorPrecedence[$opCharacter] < self::$operatorPrecedence[$o2['value']] : self::$operatorPrecedence[$opCharacter] <= self::$operatorPrecedence[$o2['value']])
                     ) {
                         $output[] = $stack->pop(); //    Swap operands and higher precedence operators from the stack to the output
                     }
-                    $stack->push('Binary Operator', '|'); //    Put an Intersect Operator on the stack
+                    $stack->push('Binary Operator', '∩'); //    Put an Intersect Operator on the stack
                     $expectingOperator = false;
                 }
             }
         }
 
-        while (($op = $stack->pop()) !== null) {    // pop everything off the stack and push onto output
-            if ((is_array($op) && $op['value'] == '(') || ($op === '(')) {
+        while (($op = $stack->pop()) !== null) {
+            // pop everything off the stack and push onto output
+            if ((is_array($op) && $op['value'] == '(')) {
                 return $this->raiseFormulaError("Formula Error: Expecting ')'"); // if there are any opening braces on the stack, then braces were unbalanced
             }
             $output[] = $op;
@@ -4358,15 +4523,21 @@ private function internalParseFormula($formula, ?Cell $pCell = null)
         return $output;
     }
 
-    private static function dataTestReference(&$operandData)
+    private static function dataTestReference(array &$operandData): mixed
     {
         $operand = $operandData['value'];
         if (($operandData['reference'] === null) && (is_array($operand))) {
             $rKeys = array_keys($operand);
             $rowKey = array_shift($rKeys);
+            if (is_array($operand[$rowKey]) === false) {
+                $operandData['value'] = $operand[$rowKey];
+
+                return $operand[$rowKey];
+            }
+
             $cKeys = array_keys(array_keys($operand[$rowKey]));
             $colKey = array_shift($cKeys);
-            if (ctype_upper($colKey)) {
+            if (ctype_upper("$colKey")) {
                 $operandData['reference'] = $colKey . $rowKey;
             }
         }
@@ -4374,53 +4545,48 @@ private static function dataTestReference(&$operandData)
         return $operand;
     }
 
-    // evaluate postfix notation
-
     /**
-     * @param mixed $tokens
-     * @param null|string $cellID
-     *
      * @return array<int, mixed>|false
      */
-    private function processTokenStack($tokens, $cellID = null, ?Cell $pCell = null)
+    private function processTokenStack(mixed $tokens, ?string $cellID = null, ?Cell $cell = null)
     {
-        if ($tokens == false) {
+        if ($tokens === false) {
             return false;
         }
 
         //    If we're using cell caching, then $pCell may well be flushed back to the cache (which detaches the parent cell collection),
         //        so we store the parent cell collection so that we can re-attach it when necessary
-        $pCellWorksheet = ($pCell !== null) ? $pCell->getWorksheet() : null;
-        $pCellParent = ($pCell !== null) ? $pCell->getParent() : null;
-        $stack = new Stack();
+        $pCellWorksheet = ($cell !== null) ? $cell->getWorksheet() : null;
+        $originalCoordinate = $cell?->getCoordinate();
+        $pCellParent = ($cell !== null) ? $cell->getParent() : null;
+        $stack = new Stack($this->branchPruner);
 
         // Stores branches that have been pruned
         $fakedForBranchPruning = [];
         // help us to know when pruning ['branchTestId' => true/false]
         $branchStore = [];
         //    Loop through each token in turn
-        foreach ($tokens as $tokenData) {
+        foreach ($tokens as $tokenIdx => $tokenData) {
+            $this->processingAnchorArray = false;
+            if ($tokenData['type'] === 'Cell Reference' && isset($tokens[$tokenIdx + 1]) && $tokens[$tokenIdx + 1]['type'] === 'Operand Count for Function ANCHORARRAY()') {
+                $this->processingAnchorArray = true;
+            }
             $token = $tokenData['value'];
-
             // Branch pruning: skip useless resolutions
             $storeKey = $tokenData['storeKey'] ?? null;
             if ($this->branchPruningEnabled && isset($tokenData['onlyIf'])) {
                 $onlyIfStoreKey = $tokenData['onlyIf'];
                 $storeValue = $branchStore[$onlyIfStoreKey] ?? null;
-                $storeValueAsBool = ($storeValue === null) ?
-                    true : (bool) Functions::flattenSingleValue($storeValue);
+                $storeValueAsBool = ($storeValue === null)
+                    ? true : (bool) Functions::flattenSingleValue($storeValue);
                 if (is_array($storeValue)) {
                     $wrappedItem = end($storeValue);
-                    $storeValue = end($wrappedItem);
+                    $storeValue = is_array($wrappedItem) ? end($wrappedItem) : $wrappedItem;
                 }
 
                 if (
-                    isset($storeValue)
-                    && (
-                        !$storeValueAsBool
-                        || Functions::isError($storeValue)
-                        || ($storeValue === 'Pruned branch')
-                    )
+                    (isset($storeValue) || $tokenData['reference'] === 'NULL')
+                    && (!$storeValueAsBool || Information\ErrorValue::isError($storeValue) || ($storeValue === 'Pruned branch'))
                 ) {
                     // If branching value is not true, we don't need to compute
                     if (!isset($fakedForBranchPruning['onlyIf-' . $onlyIfStoreKey])) {
@@ -4443,18 +4609,16 @@ private function processTokenStack($tokens, $cellID = null, ?Cell $pCell = null)
             if ($this->branchPruningEnabled && isset($tokenData['onlyIfNot'])) {
                 $onlyIfNotStoreKey = $tokenData['onlyIfNot'];
                 $storeValue = $branchStore[$onlyIfNotStoreKey] ?? null;
-                $storeValueAsBool = ($storeValue === null) ?
-                    true : (bool) Functions::flattenSingleValue($storeValue);
+                $storeValueAsBool = ($storeValue === null)
+                    ? true : (bool) Functions::flattenSingleValue($storeValue);
                 if (is_array($storeValue)) {
                     $wrappedItem = end($storeValue);
-                    $storeValue = end($wrappedItem);
+                    $storeValue = is_array($wrappedItem) ? end($wrappedItem) : $wrappedItem;
                 }
+
                 if (
-                    isset($storeValue)
-                    && (
-                        $storeValueAsBool
-                        || Functions::isError($storeValue)
-                        || ($storeValue === 'Pruned branch'))
+                    (isset($storeValue) || $tokenData['reference'] === 'NULL')
+                    && ($storeValueAsBool || Information\ErrorValue::isError($storeValue) || ($storeValue === 'Pruned branch'))
                 ) {
                     // If branching value is true, we don't need to compute
                     if (!isset($fakedForBranchPruning['onlyIfNot-' . $onlyIfNotStoreKey])) {
@@ -4474,13 +4638,41 @@ private function processTokenStack($tokens, $cellID = null, ?Cell $pCell = null)
                 }
             }
 
-            // if the token is a binary operator, pop the top two values off the stack, do the operation, and push the result back on the stack
-            if (isset(self::$binaryOperators[$token])) {
+            if ($token instanceof Operands\StructuredReference) {
+                if ($cell === null) {
+                    return $this->raiseFormulaError('Structured References must exist in a Cell context');
+                }
+
+                try {
+                    $cellRange = $token->parse($cell);
+                    if (str_contains($cellRange, ':')) {
+                        $this->debugLog->writeDebugLog('Evaluating Structured Reference %s as Cell Range %s', $token->value(), $cellRange);
+                        $rangeValue = self::getInstance($cell->getWorksheet()->getParent())->_calculateFormulaValue("={$cellRange}", $cellRange, $cell);
+                        $stack->push('Value', $rangeValue);
+                        $this->debugLog->writeDebugLog('Evaluated Structured Reference %s as value %s', $token->value(), $this->showValue($rangeValue));
+                    } else {
+                        $this->debugLog->writeDebugLog('Evaluating Structured Reference %s as Cell %s', $token->value(), $cellRange);
+                        $cellValue = $cell->getWorksheet()->getCell($cellRange)->getCalculatedValue(false);
+                        $stack->push('Cell Reference', $cellValue, $cellRange);
+                        $this->debugLog->writeDebugLog('Evaluated Structured Reference %s as value %s', $token->value(), $this->showValue($cellValue));
+                    }
+                } catch (Exception $e) {
+                    if ($e->getCode() === Exception::CALCULATION_ENGINE_PUSH_TO_STACK) {
+                        $stack->push('Error', ExcelError::REF(), null);
+                        $this->debugLog->writeDebugLog('Evaluated Structured Reference %s as error value %s', $token->value(), ExcelError::REF());
+                    } else {
+                        return $this->raiseFormulaError($e->getMessage(), $e->getCode(), $e);
+                    }
+                }
+            } elseif (!is_numeric($token) && !is_object($token) && isset(self::BINARY_OPERATORS[$token])) {
+                // if the token is a binary operator, pop the top two values off the stack, do the operation, and push the result back on the stack
                 //    We must have two operands, error if we don't
-                if (($operand2Data = $stack->pop()) === null) {
+                $operand2Data = $stack->pop();
+                if ($operand2Data === null) {
                     return $this->raiseFormulaError('Internal error - Operand value missing from stack');
                 }
-                if (($operand1Data = $stack->pop()) === null) {
+                $operand1Data = $stack->pop();
+                if ($operand1Data === null) {
                     return $this->raiseFormulaError('Internal error - Operand value missing from stack');
                 }
 
@@ -4489,109 +4681,111 @@ private function processTokenStack($tokens, $cellID = null, ?Cell $pCell = null)
 
                 //    Log what we're doing
                 if ($token == ':') {
-                    $this->debugLog->writeDebugLog('Evaluating Range ', $this->showValue($operand1Data['reference']), ' ', $token, ' ', $this->showValue($operand2Data['reference']));
+                    $this->debugLog->writeDebugLog('Evaluating Range %s %s %s', $this->showValue($operand1Data['reference']), $token, $this->showValue($operand2Data['reference']));
                 } else {
-                    $this->debugLog->writeDebugLog('Evaluating ', $this->showValue($operand1), ' ', $token, ' ', $this->showValue($operand2));
+                    $this->debugLog->writeDebugLog('Evaluating %s %s %s', $this->showValue($operand1), $token, $this->showValue($operand2));
                 }
 
                 //    Process the operation in the appropriate manner
                 switch ($token) {
-                    //    Comparison (Boolean) Operators
-                    case '>':            //    Greater than
-                    case '<':            //    Less than
-                    case '>=':            //    Greater than or Equal to
-                    case '<=':            //    Less than or Equal to
-                    case '=':            //    Equality
-                    case '<>':            //    Inequality
-                        $result = $this->executeBinaryComparisonOperation($cellID, $operand1, $operand2, $token, $stack);
+                    // Comparison (Boolean) Operators
+                    case '>': // Greater than
+                    case '<': // Less than
+                    case '>=': // Greater than or Equal to
+                    case '<=': // Less than or Equal to
+                    case '=': // Equality
+                    case '<>': // Inequality
+                        $result = $this->executeBinaryComparisonOperation($operand1, $operand2, (string) $token, $stack);
                         if (isset($storeKey)) {
                             $branchStore[$storeKey] = $result;
                         }
 
                         break;
-                    //    Binary Operators
-                    case ':':            //    Range
-                        if (strpos($operand1Data['reference'], '!') !== false) {
+                    // Binary Operators
+                    case ':': // Range
+                        if ($operand1Data['type'] === 'Defined Name') {
+                            if (preg_match('/$' . self::CALCULATION_REGEXP_DEFINEDNAME . '^/mui', $operand1Data['reference']) !== false && $this->spreadsheet !== null) {
+                                $definedName = $this->spreadsheet->getNamedRange($operand1Data['reference']);
+                                if ($definedName !== null) {
+                                    $operand1Data['reference'] = $operand1Data['value'] = str_replace('$', '', $definedName->getValue());
+                                }
+                            }
+                        }
+                        if (str_contains($operand1Data['reference'] ?? '', '!')) {
                             [$sheet1, $operand1Data['reference']] = Worksheet::extractSheetTitle($operand1Data['reference'], true);
                         } else {
-                            $sheet1 = ($pCellParent !== null) ? $pCellWorksheet->getTitle() : '';
+                            $sheet1 = ($pCellWorksheet !== null) ? $pCellWorksheet->getTitle() : '';
                         }
+                        $sheet1 ??= '';
 
                         [$sheet2, $operand2Data['reference']] = Worksheet::extractSheetTitle($operand2Data['reference'], true);
                         if (empty($sheet2)) {
                             $sheet2 = $sheet1;
                         }
 
-                        if ($sheet1 == $sheet2) {
-                            if ($operand1Data['reference'] === null) {
-                                if ((trim($operand1Data['value']) != '') && (is_numeric($operand1Data['value']))) {
-                                    $operand1Data['reference'] = $pCell->getColumn() . $operand1Data['value'];
-                                } elseif (trim($operand1Data['reference']) == '') {
-                                    $operand1Data['reference'] = $pCell->getCoordinate();
+                        if (trim($sheet1, "'") === trim($sheet2, "'")) {
+                            if ($operand1Data['reference'] === null && $cell !== null) {
+                                if (is_array($operand1Data['value'])) {
+                                    $operand1Data['reference'] = $cell->getCoordinate();
+                                } elseif ((trim($operand1Data['value']) != '') && (is_numeric($operand1Data['value']))) {
+                                    $operand1Data['reference'] = $cell->getColumn() . $operand1Data['value'];
+                                } elseif (trim($operand1Data['value']) == '') {
+                                    $operand1Data['reference'] = $cell->getCoordinate();
                                 } else {
-                                    $operand1Data['reference'] = $operand1Data['value'] . $pCell->getRow();
+                                    $operand1Data['reference'] = $operand1Data['value'] . $cell->getRow();
                                 }
                             }
-                            if ($operand2Data['reference'] === null) {
-                                if ((trim($operand2Data['value']) != '') && (is_numeric($operand2Data['value']))) {
-                                    $operand2Data['reference'] = $pCell->getColumn() . $operand2Data['value'];
-                                } elseif (trim($operand2Data['reference']) == '') {
-                                    $operand2Data['reference'] = $pCell->getCoordinate();
+                            if ($operand2Data['reference'] === null && $cell !== null) {
+                                if (is_array($operand2Data['value'])) {
+                                    $operand2Data['reference'] = $cell->getCoordinate();
+                                } elseif ((trim($operand2Data['value']) != '') && (is_numeric($operand2Data['value']))) {
+                                    $operand2Data['reference'] = $cell->getColumn() . $operand2Data['value'];
+                                } elseif (trim($operand2Data['value']) == '') {
+                                    $operand2Data['reference'] = $cell->getCoordinate();
                                 } else {
-                                    $operand2Data['reference'] = $operand2Data['value'] . $pCell->getRow();
+                                    $operand2Data['reference'] = $operand2Data['value'] . $cell->getRow();
                                 }
                             }
 
-                            $oData = array_merge(explode(':', $operand1Data['reference']), explode(':', $operand2Data['reference']));
+                            $oData = array_merge(explode(':', $operand1Data['reference'] ?? ''), explode(':', $operand2Data['reference'] ?? ''));
                             $oCol = $oRow = [];
+                            $breakNeeded = false;
                             foreach ($oData as $oDatum) {
-                                $oCR = Coordinate::coordinateFromString($oDatum);
-                                $oCol[] = Coordinate::columnIndexFromString($oCR[0]) - 1;
-                                $oRow[] = $oCR[1];
+                                try {
+                                    $oCR = Coordinate::coordinateFromString($oDatum);
+                                    $oCol[] = Coordinate::columnIndexFromString($oCR[0]) - 1;
+                                    $oRow[] = $oCR[1];
+                                } catch (\Exception) {
+                                    $stack->push('Error', ExcelError::REF(), null);
+                                    $breakNeeded = true;
+
+                                    break;
+                                }
+                            }
+                            if ($breakNeeded) {
+                                break;
                             }
                             $cellRef = Coordinate::stringFromColumnIndex(min($oCol) + 1) . min($oRow) . ':' . Coordinate::stringFromColumnIndex(max($oCol) + 1) . max($oRow);
-                            if ($pCellParent !== null) {
+                            if ($pCellParent !== null && $this->spreadsheet !== null) {
                                 $cellValue = $this->extractCellRange($cellRef, $this->spreadsheet->getSheetByName($sheet1), false);
                             } else {
                                 return $this->raiseFormulaError('Unable to access Cell Reference');
                             }
 
+                            $this->debugLog->writeDebugLog('Evaluation Result is %s', $this->showTypeDetails($cellValue));
                             $stack->push('Cell Reference', $cellValue, $cellRef);
                         } else {
-                            $stack->push('Error', Functions::REF(), null);
+                            $this->debugLog->writeDebugLog('Evaluation Result is a #REF! Error');
+                            $stack->push('Error', ExcelError::REF(), null);
                         }
 
                         break;
                     case '+':            //    Addition
-                        $result = $this->executeNumericBinaryOperation($operand1, $operand2, $token, 'plusEquals', $stack);
-                        if (isset($storeKey)) {
-                            $branchStore[$storeKey] = $result;
-                        }
-
-                        break;
                     case '-':            //    Subtraction
-                        $result = $this->executeNumericBinaryOperation($operand1, $operand2, $token, 'minusEquals', $stack);
-                        if (isset($storeKey)) {
-                            $branchStore[$storeKey] = $result;
-                        }
-
-                        break;
                     case '*':            //    Multiplication
-                        $result = $this->executeNumericBinaryOperation($operand1, $operand2, $token, 'arrayTimesEquals', $stack);
-                        if (isset($storeKey)) {
-                            $branchStore[$storeKey] = $result;
-                        }
-
-                        break;
                     case '/':            //    Division
-                        $result = $this->executeNumericBinaryOperation($operand1, $operand2, $token, 'arrayRightDivide', $stack);
-                        if (isset($storeKey)) {
-                            $branchStore[$storeKey] = $result;
-                        }
-
-                        break;
                     case '^':            //    Exponential
-                        $result = $this->executeNumericBinaryOperation($operand1, $operand2, $token, 'power', $stack);
+                        $result = $this->executeNumericBinaryOperation($operand1, $operand2, $token, $stack);
                         if (isset($storeKey)) {
                             $branchStore[$storeKey] = $result;
                         }
@@ -4601,30 +4795,52 @@ private function processTokenStack($tokens, $cellID = null, ?Cell $pCell = null)
                         //    If either of the operands is a matrix, we need to treat them both as matrices
                         //        (converting the other operand to a matrix if need be); then perform the required
                         //        matrix operation
-                        if (is_bool($operand1)) {
-                            $operand1 = ($operand1) ? self::$localeBoolean['TRUE'] : self::$localeBoolean['FALSE'];
-                        }
-                        if (is_bool($operand2)) {
-                            $operand2 = ($operand2) ? self::$localeBoolean['TRUE'] : self::$localeBoolean['FALSE'];
-                        }
-                        if ((is_array($operand1)) || (is_array($operand2))) {
+                        $operand1 = self::boolToString($operand1);
+                        $operand2 = self::boolToString($operand2);
+                        if (is_array($operand1) || is_array($operand2)) {
+                            if (is_string($operand1)) {
+                                $operand1 = self::unwrapResult($operand1);
+                            }
+                            if (is_string($operand2)) {
+                                $operand2 = self::unwrapResult($operand2);
+                            }
                             //    Ensure that both operands are arrays/matrices
-                            self::checkMatrixOperands($operand1, $operand2, 2);
-
-                            try {
-                                //    Convert operand 1 from a PHP array to a matrix
-                                $matrix = new Shared\JAMA\Matrix($operand1);
-                                //    Perform the required operation against the operand 1 matrix, passing in operand 2
-                                $matrixResult = $matrix->concat($operand2);
-                                $result = $matrixResult->getArray();
-                            } catch (\Exception $ex) {
-                                $this->debugLog->writeDebugLog('JAMA Matrix Exception: ', $ex->getMessage());
-                                $result = '#VALUE!';
+                            [$rows, $columns] = self::checkMatrixOperands($operand1, $operand2, 2);
+
+                            for ($row = 0; $row < $rows; ++$row) {
+                                for ($column = 0; $column < $columns; ++$column) {
+                                    $op1x = self::boolToString($operand1[$row][$column]);
+                                    $op2x = self::boolToString($operand2[$row][$column]);
+                                    if (Information\ErrorValue::isError($op1x)) {
+                                        // no need to do anything
+                                    } elseif (Information\ErrorValue::isError($op2x)) {
+                                        $operand1[$row][$column] = $op2x;
+                                    } else {
+                                        $operand1[$row][$column]
+                                            = Shared\StringHelper::substring(
+                                                $op1x . $op2x,
+                                                0,
+                                                DataType::MAX_STRING_LENGTH
+                                            );
+                                    }
+                                }
                             }
+                            $result = $operand1;
                         } else {
-                            $result = self::FORMULA_STRING_QUOTE . str_replace('""', self::FORMULA_STRING_QUOTE, self::unwrapResult($operand1) . self::unwrapResult($operand2)) . self::FORMULA_STRING_QUOTE;
+                            // In theory, we should truncate here.
+                            // But I can't figure out a formula
+                            // using the concatenation operator
+                            // with literals that fits in 32K,
+                            // so I don't think we can overflow here.
+                            if (Information\ErrorValue::isError($operand1)) {
+                                $result = $operand1;
+                            } elseif (Information\ErrorValue::isError($operand2)) {
+                                $result = $operand2;
+                            } else {
+                                $result = self::FORMULA_STRING_QUOTE . str_replace('""', self::FORMULA_STRING_QUOTE, self::unwrapResult($operand1) . self::unwrapResult($operand2)) . self::FORMULA_STRING_QUOTE;
+                            }
                         }
-                        $this->debugLog->writeDebugLog('Evaluation Result is ', $this->showTypeDetails($result));
+                        $this->debugLog->writeDebugLog('Evaluation Result is %s', $this->showTypeDetails($result));
                         $stack->push('Value', $result);
 
                         if (isset($storeKey)) {
@@ -4632,7 +4848,7 @@ private function processTokenStack($tokens, $cellID = null, ?Cell $pCell = null)
                         }
 
                         break;
-                    case '|':            //    Intersect
+                    case '∩':            //    Intersect
                         $rowIntersect = array_intersect_key($operand1, $operand2);
                         $cellIntersect = $oCol = $oRow = [];
                         foreach (array_keys($rowIntersect) as $row) {
@@ -4643,138 +4859,146 @@ private function processTokenStack($tokens, $cellID = null, ?Cell $pCell = null)
                             }
                         }
                         if (count(Functions::flattenArray($cellIntersect)) === 0) {
-                            $this->debugLog->writeDebugLog('Evaluation Result is ', $this->showTypeDetails($cellIntersect));
-                            $stack->push('Error', Functions::null(), null);
+                            $this->debugLog->writeDebugLog('Evaluation Result is %s', $this->showTypeDetails($cellIntersect));
+                            $stack->push('Error', ExcelError::null(), null);
                         } else {
-                            $cellRef = Coordinate::stringFromColumnIndex(min($oCol) + 1) . min($oRow) . ':' .
-                                Coordinate::stringFromColumnIndex(max($oCol) + 1) . max($oRow);
-                            $this->debugLog->writeDebugLog('Evaluation Result is ', $this->showTypeDetails($cellIntersect));
+                            $cellRef = Coordinate::stringFromColumnIndex(min($oCol) + 1) . min($oRow) . ':'
+                                . Coordinate::stringFromColumnIndex(max($oCol) + 1) . max($oRow);
+                            $this->debugLog->writeDebugLog('Evaluation Result is %s', $this->showTypeDetails($cellIntersect));
                             $stack->push('Value', $cellIntersect, $cellRef);
                         }
 
                         break;
                 }
-
-                // if the token is a unary operator, pop one value off the stack, do the operation, and push it back on
             } elseif (($token === '~') || ($token === '%')) {
+                // if the token is a unary operator, pop one value off the stack, do the operation, and push it back on
                 if (($arg = $stack->pop()) === null) {
                     return $this->raiseFormulaError('Internal error - Operand value missing from stack');
                 }
                 $arg = $arg['value'];
                 if ($token === '~') {
-                    $this->debugLog->writeDebugLog('Evaluating Negation of ', $this->showValue($arg));
+                    $this->debugLog->writeDebugLog('Evaluating Negation of %s', $this->showValue($arg));
                     $multiplier = -1;
                 } else {
-                    $this->debugLog->writeDebugLog('Evaluating Percentile of ', $this->showValue($arg));
+                    $this->debugLog->writeDebugLog('Evaluating Percentile of %s', $this->showValue($arg));
                     $multiplier = 0.01;
                 }
                 if (is_array($arg)) {
-                    self::checkMatrixOperands($arg, $multiplier, 2);
-
-                    try {
-                        $matrix1 = new Shared\JAMA\Matrix($arg);
-                        $matrixResult = $matrix1->arrayTimesEquals($multiplier);
-                        $result = $matrixResult->getArray();
-                    } catch (\Exception $ex) {
-                        $this->debugLog->writeDebugLog('JAMA Matrix Exception: ', $ex->getMessage());
-                        $result = '#VALUE!';
+                    $operand2 = $multiplier;
+                    $result = $arg;
+                    [$rows, $columns] = self::checkMatrixOperands($result, $operand2, 0);
+                    for ($row = 0; $row < $rows; ++$row) {
+                        for ($column = 0; $column < $columns; ++$column) {
+                            if (self::isNumericOrBool($result[$row][$column])) {
+                                $result[$row][$column] *= $multiplier;
+                            } else {
+                                $result[$row][$column] = self::makeError($result[$row][$column]);
+                            }
+                        }
                     }
-                    $this->debugLog->writeDebugLog('Evaluation Result is ', $this->showTypeDetails($result));
+
+                    $this->debugLog->writeDebugLog('Evaluation Result is %s', $this->showTypeDetails($result));
                     $stack->push('Value', $result);
                     if (isset($storeKey)) {
                         $branchStore[$storeKey] = $result;
                     }
                 } else {
-                    $this->executeNumericBinaryOperation($multiplier, $arg, '*', 'arrayTimesEquals', $stack);
+                    $this->executeNumericBinaryOperation($multiplier, $arg, '*', $stack);
                 }
             } elseif (preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '$/i', $token ?? '', $matches)) {
                 $cellRef = null;
 
                 if (isset($matches[8])) {
-                    if ($pCell === null) {
-                        //                        We can't access the range, so return a REF error
-                        $cellValue = Functions::REF();
+                    if ($cell === null) {
+                        // We can't access the range, so return a REF error
+                        $cellValue = ExcelError::REF();
                     } else {
                         $cellRef = $matches[6] . $matches[7] . ':' . $matches[9] . $matches[10];
                         if ($matches[2] > '') {
                             $matches[2] = trim($matches[2], "\"'");
-                            if ((strpos($matches[2], '[') !== false) || (strpos($matches[2], ']') !== false)) {
+                            if ((str_contains($matches[2], '[')) || (str_contains($matches[2], ']'))) {
                                 //    It's a Reference to an external spreadsheet (not currently supported)
                                 return $this->raiseFormulaError('Unable to access External Workbook');
                             }
                             $matches[2] = trim($matches[2], "\"'");
-                            $this->debugLog->writeDebugLog('Evaluating Cell Range ', $cellRef, ' in worksheet ', $matches[2]);
-                            if ($pCellParent !== null) {
+                            $this->debugLog->writeDebugLog('Evaluating Cell Range %s in worksheet %s', $cellRef, $matches[2]);
+                            if ($pCellParent !== null && $this->spreadsheet !== null) {
                                 $cellValue = $this->extractCellRange($cellRef, $this->spreadsheet->getSheetByName($matches[2]), false);
                             } else {
                                 return $this->raiseFormulaError('Unable to access Cell Reference');
                             }
-                            $this->debugLog->writeDebugLog('Evaluation Result for cells ', $cellRef, ' in worksheet ', $matches[2], ' is ', $this->showTypeDetails($cellValue));
+                            $this->debugLog->writeDebugLog('Evaluation Result for cells %s in worksheet %s is %s', $cellRef, $matches[2], $this->showTypeDetails($cellValue));
                         } else {
-                            $this->debugLog->writeDebugLog('Evaluating Cell Range ', $cellRef, ' in current worksheet');
+                            $this->debugLog->writeDebugLog('Evaluating Cell Range %s in current worksheet', $cellRef);
                             if ($pCellParent !== null) {
                                 $cellValue = $this->extractCellRange($cellRef, $pCellWorksheet, false);
                             } else {
                                 return $this->raiseFormulaError('Unable to access Cell Reference');
                             }
-                            $this->debugLog->writeDebugLog('Evaluation Result for cells ', $cellRef, ' is ', $this->showTypeDetails($cellValue));
+                            $this->debugLog->writeDebugLog('Evaluation Result for cells %s is %s', $cellRef, $this->showTypeDetails($cellValue));
                         }
                     }
                 } else {
-                    if ($pCell === null) {
-                        //  We can't access the cell, so return a REF error
-                        $cellValue = Functions::REF();
+                    if ($cell === null) {
+                        // We can't access the cell, so return a REF error
+                        $cellValue = ExcelError::REF();
                     } else {
                         $cellRef = $matches[6] . $matches[7];
                         if ($matches[2] > '') {
                             $matches[2] = trim($matches[2], "\"'");
-                            if ((strpos($matches[2], '[') !== false) || (strpos($matches[2], ']') !== false)) {
+                            if ((str_contains($matches[2], '[')) || (str_contains($matches[2], ']'))) {
                                 //    It's a Reference to an external spreadsheet (not currently supported)
                                 return $this->raiseFormulaError('Unable to access External Workbook');
                             }
-                            $this->debugLog->writeDebugLog('Evaluating Cell ', $cellRef, ' in worksheet ', $matches[2]);
-                            if ($pCellParent !== null) {
+                            $this->debugLog->writeDebugLog('Evaluating Cell %s in worksheet %s', $cellRef, $matches[2]);
+                            if ($pCellParent !== null && $this->spreadsheet !== null) {
                                 $cellSheet = $this->spreadsheet->getSheetByName($matches[2]);
                                 if ($cellSheet && $cellSheet->cellExists($cellRef)) {
                                     $cellValue = $this->extractCellRange($cellRef, $this->spreadsheet->getSheetByName($matches[2]), false);
-                                    $pCell->attach($pCellParent);
+                                    $cell->attach($pCellParent);
                                 } else {
-                                    $cellRef = ($cellSheet !== null) ? "{$matches[2]}!{$cellRef}" : $cellRef;
-                                    $cellValue = null;
+                                    $cellRef = ($cellSheet !== null) ? "'{$matches[2]}'!{$cellRef}" : $cellRef;
+                                    $cellValue = ($cellSheet !== null) ? null : ExcelError::REF();
                                 }
                             } else {
                                 return $this->raiseFormulaError('Unable to access Cell Reference');
                             }
-                            $this->debugLog->writeDebugLog('Evaluation Result for cell ', $cellRef, ' in worksheet ', $matches[2], ' is ', $this->showTypeDetails($cellValue));
+                            $this->debugLog->writeDebugLog('Evaluation Result for cell %s in worksheet %s is %s', $cellRef, $matches[2], $this->showTypeDetails($cellValue));
                         } else {
-                            $this->debugLog->writeDebugLog('Evaluating Cell ', $cellRef, ' in current worksheet');
-                            if ($pCellParent->has($cellRef)) {
+                            $this->debugLog->writeDebugLog('Evaluating Cell %s in current worksheet', $cellRef);
+                            if ($pCellParent !== null && $pCellParent->has($cellRef)) {
                                 $cellValue = $this->extractCellRange($cellRef, $pCellWorksheet, false);
-                                $pCell->attach($pCellParent);
+                                $cell->attach($pCellParent);
                             } else {
                                 $cellValue = null;
                             }
-                            $this->debugLog->writeDebugLog('Evaluation Result for cell ', $cellRef, ' is ', $this->showTypeDetails($cellValue));
+                            $this->debugLog->writeDebugLog('Evaluation Result for cell %s is %s', $cellRef, $this->showTypeDetails($cellValue));
                         }
                     }
                 }
 
+                if ($this->getInstanceArrayReturnType() === self::RETURN_ARRAY_AS_ARRAY && !$this->processingAnchorArray && is_array($cellValue)) {
+                    while (is_array($cellValue)) {
+                        $cellValue = array_shift($cellValue);
+                    }
+                    $this->debugLog->writeDebugLog('Scalar Result for cell %s is %s', $cellRef, $this->showTypeDetails($cellValue));
+                }
+                $this->processingAnchorArray = false;
                 $stack->push('Cell Value', $cellValue, $cellRef);
                 if (isset($storeKey)) {
                     $branchStore[$storeKey] = $cellValue;
                 }
-
-                // if the token is a function, pop arguments off the stack, hand them to the function, and push the result back on
             } elseif (preg_match('/^' . self::CALCULATION_REGEXP_FUNCTION . '$/miu', $token ?? '', $matches)) {
-                if ($pCellParent) {
-                    $pCell->attach($pCellParent);
+                // if the token is a function, pop arguments off the stack, hand them to the function, and push the result back on
+                if ($cell !== null && $pCellParent !== null) {
+                    $cell->attach($pCellParent);
                 }
 
                 $functionName = $matches[1];
                 $argCount = $stack->pop();
                 $argCount = $argCount['value'];
-                if ($functionName != 'MKMATRIX') {
-                    $this->debugLog->writeDebugLog('Evaluating Function ', self::localeFunc($functionName), '() with ', (($argCount == 0) ? 'no' : $argCount), ' argument', (($argCount == 1) ? '' : 's'));
+                if ($functionName !== 'MKMATRIX') {
+                    $this->debugLog->writeDebugLog('Evaluating Function %s() with %s argument%s', self::localeFunc($functionName), (($argCount == 0) ? 'no' : $argCount), (($argCount == 1) ? '' : 's'));
                 }
                 if ((isset(self::$phpSpreadsheetFunctions[$functionName])) || (isset(self::$controlFunctions[$functionName]))) {    // function
                     $passByReference = false;
@@ -4789,30 +5013,50 @@ private function processTokenStack($tokens, $cellID = null, ?Cell $pCell = null)
                         $passByReference = isset(self::$controlFunctions[$functionName]['passByReference']);
                         $passCellReference = isset(self::$controlFunctions[$functionName]['passCellReference']);
                     }
+
                     // get the arguments for this function
                     $args = $argArrayVals = [];
+                    $emptyArguments = [];
                     for ($i = 0; $i < $argCount; ++$i) {
                         $arg = $stack->pop();
                         $a = $argCount - $i - 1;
                         if (
-                            ($passByReference) &&
-                            (isset(self::$phpSpreadsheetFunctions[$functionName]['passByReference'][$a])) &&
-                            (self::$phpSpreadsheetFunctions[$functionName]['passByReference'][$a])
+                            ($passByReference)
+                            && (isset(self::$phpSpreadsheetFunctions[$functionName]['passByReference'][$a]))
+                            && (self::$phpSpreadsheetFunctions[$functionName]['passByReference'][$a])
                         ) {
                             if ($arg['reference'] === null) {
-                                $args[] = $cellID;
-                                if ($functionName != 'MKMATRIX') {
+                                $nextArg = $cellID;
+                                if ($functionName === 'ISREF' && is_array($arg) && ($arg['type'] ?? '') === 'Value') {
+                                    if (array_key_exists('value', $arg)) {
+                                        $argValue = $arg['value'];
+                                        if (is_scalar($argValue)) {
+                                            $nextArg = $argValue;
+                                        } elseif (empty($argValue)) {
+                                            $nextArg = '';
+                                        }
+                                    }
+                                }
+                                $args[] = $nextArg;
+                                if ($functionName !== 'MKMATRIX') {
                                     $argArrayVals[] = $this->showValue($cellID);
                                 }
                             } else {
                                 $args[] = $arg['reference'];
-                                if ($functionName != 'MKMATRIX') {
+                                if ($functionName !== 'MKMATRIX') {
                                     $argArrayVals[] = $this->showValue($arg['reference']);
                                 }
                             }
                         } else {
-                            $args[] = self::unwrapResult($arg['value']);
-                            if ($functionName != 'MKMATRIX') {
+                            if ($arg['type'] === 'Empty Argument' && in_array($functionName, ['MIN', 'MINA', 'MAX', 'MAXA', 'IF'], true)) {
+                                $emptyArguments[] = false;
+                                $args[] = $arg['value'] = 0;
+                                $this->debugLog->writeDebugLog('Empty Argument reevaluated as 0');
+                            } else {
+                                $emptyArguments[] = $arg['type'] === 'Empty Argument';
+                                $args[] = self::unwrapResult($arg['value']);
+                            }
+                            if ($functionName !== 'MKMATRIX') {
                                 $argArrayVals[] = $this->showValue($arg['value']);
                             }
                         }
@@ -4820,21 +5064,29 @@ private function processTokenStack($tokens, $cellID = null, ?Cell $pCell = null)
 
                     //    Reverse the order of the arguments
                     krsort($args);
+                    krsort($emptyArguments);
+
+                    if ($argCount > 0 && is_array($functionCall)) {
+                        $args = $this->addDefaultArgumentValues($functionCall, $args, $emptyArguments);
+                    }
 
                     if (($passByReference) && ($argCount == 0)) {
                         $args[] = $cellID;
                         $argArrayVals[] = $this->showValue($cellID);
                     }
 
-                    if ($functionName != 'MKMATRIX') {
+                    if ($functionName !== 'MKMATRIX') {
                         if ($this->debugLog->getWriteDebugLog()) {
                             krsort($argArrayVals);
-                            $this->debugLog->writeDebugLog('Evaluating ', self::localeFunc($functionName), '( ', implode(self::$localeArgumentSeparator . ' ', Functions::flattenArray($argArrayVals)), ' )');
+                            $this->debugLog->writeDebugLog('Evaluating %s ( %s )', self::localeFunc($functionName), implode(self::$localeArgumentSeparator . ' ', Functions::flattenArray($argArrayVals)));
                         }
                     }
 
                     //    Process the argument with the appropriate function call
-                    $args = $this->addCellReference($args, $passCellReference, $functionCall, $pCell);
+                    if ($pCellWorksheet !== null && $originalCoordinate !== null) {
+                        $pCellWorksheet->getCell($originalCoordinate);
+                    }
+                    $args = $this->addCellReference($args, $passCellReference, $functionCall, $cell);
 
                     if (!is_array($functionCall)) {
                         foreach ($args as &$arg) {
@@ -4845,8 +5097,8 @@ private function processTokenStack($tokens, $cellID = null, ?Cell $pCell = null)
 
                     $result = call_user_func_array($functionCall, $args);
 
-                    if ($functionName != 'MKMATRIX') {
-                        $this->debugLog->writeDebugLog('Evaluation Result for ', self::localeFunc($functionName), '() function call is ', $this->showTypeDetails($result));
+                    if ($functionName !== 'MKMATRIX') {
+                        $this->debugLog->writeDebugLog('Evaluation Result for %s() function call is %s', self::localeFunc($functionName), $this->showTypeDetails($result));
                     }
                     $stack->push('Value', self::wrapResult($result));
                     if (isset($storeKey)) {
@@ -4861,26 +5113,47 @@ private function processTokenStack($tokens, $cellID = null, ?Cell $pCell = null)
                     if (isset($storeKey)) {
                         $branchStore[$storeKey] = self::$excelConstants[$excelConstant];
                     }
-                    $this->debugLog->writeDebugLog('Evaluating Constant ', $excelConstant, ' as ', $this->showTypeDetails(self::$excelConstants[$excelConstant]));
+                    $this->debugLog->writeDebugLog('Evaluating Constant %s as %s', $excelConstant, $this->showTypeDetails(self::$excelConstants[$excelConstant]));
                 } elseif ((is_numeric($token)) || ($token === null) || (is_bool($token)) || ($token == '') || ($token[0] == self::FORMULA_STRING_QUOTE) || ($token[0] == '#')) {
-                    $stack->push('Value', $token);
+                    $stack->push($tokenData['type'], $token, $tokenData['reference']);
                     if (isset($storeKey)) {
                         $branchStore[$storeKey] = $token;
                     }
-                    // if the token is a named range or formula, evaluate it and push the result onto the stack
                 } 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 ($pCell === null || $pCellWorksheet === null) {
+                    if ($cell === null || $pCellWorksheet === null) {
                         return $this->raiseFormulaError("undefined name '$token'");
                     }
-
-                    $this->debugLog->writeDebugLog('Evaluating Defined Name ', $definedName);
-                    $namedRange = DefinedName::resolveName($definedName, $pCellWorksheet);
+                    $specifiedWorksheet = trim($matches[2], "'");
+
+                    $this->debugLog->writeDebugLog('Evaluating Defined Name %s', $definedName);
+                    $namedRange = DefinedName::resolveName($definedName, $pCellWorksheet, $specifiedWorksheet);
+                    // If not Defined Name, try as Table.
+                    if ($namedRange === null && $this->spreadsheet !== null) {
+                        $table = $this->spreadsheet->getTableByName($definedName);
+                        if ($table !== null) {
+                            $tableRange = Coordinate::getRangeBoundaries($table->getRange());
+                            if ($table->getShowHeaderRow()) {
+                                ++$tableRange[0][1];
+                            }
+                            if ($table->getShowTotalsRow()) {
+                                --$tableRange[1][1];
+                            }
+                            $tableRangeString
+                                = '$' . $tableRange[0][0]
+                                . '$' . $tableRange[0][1]
+                                . ':'
+                                . '$' . $tableRange[1][0]
+                                . '$' . $tableRange[1][1];
+                            $namedRange = new NamedRange($definedName, $table->getWorksheet(), $tableRangeString);
+                        }
+                    }
                     if ($namedRange === null) {
                         return $this->raiseFormulaError("undefined name '$definedName'");
                     }
 
-                    $result = $this->evaluateDefinedName($pCell, $namedRange, $pCellWorksheet, $stack);
+                    $result = $this->evaluateDefinedName($cell, $namedRange, $pCellWorksheet, $stack, $specifiedWorksheet !== '');
                     if (isset($storeKey)) {
                         $branchStore[$storeKey] = $result;
                     }
@@ -4899,7 +5172,7 @@ private function processTokenStack($tokens, $cellID = null, ?Cell $pCell = null)
         return $output;
     }
 
-    private function validateBinaryOperand(&$operand, &$stack)
+    private function validateBinaryOperand(mixed &$operand, mixed &$stack): bool
     {
         if (is_array($operand)) {
             if ((count($operand, COUNT_RECURSIVE) - count($operand)) == 1) {
@@ -4920,47 +5193,39 @@ private function validateBinaryOperand(&$operand, &$stack)
                 //    If not a numeric, test to see if the value is an Excel error, and so can't be used in normal binary operations
                 if ($operand > '' && $operand[0] == '#') {
                     $stack->push('Value', $operand);
-                    $this->debugLog->writeDebugLog('Evaluation Result is ', $this->showTypeDetails($operand));
+                    $this->debugLog->writeDebugLog('Evaluation Result is %s', $this->showTypeDetails($operand));
 
                     return false;
-                } elseif (!Shared\StringHelper::convertToNumberIfFraction($operand)) {
-                    //    If not a numeric or a fraction, then it's a text string, and so can't be used in mathematical binary operations
+                } elseif (Engine\FormattedNumber::convertToNumberIfFormatted($operand) === false) {
+                    //    If not a numeric, a fraction or a percentage, then it's a text string, and so can't be used in mathematical binary operations
                     $stack->push('Error', '#VALUE!');
-                    $this->debugLog->writeDebugLog('Evaluation Result is a ', $this->showTypeDetails('#VALUE!'));
+                    $this->debugLog->writeDebugLog('Evaluation Result is a %s', $this->showTypeDetails('#VALUE!'));
 
                     return false;
                 }
             }
         }
 
-        //    return a true if the value of the operand is one that we can use in normal binary operations
+        //    return a true if the value of the operand is one that we can use in normal binary mathematical operations
         return true;
     }
 
-    /**
-     * @param null|string $cellID
-     * @param mixed $operand1
-     * @param mixed $operand2
-     * @param string $operation
-     *
-     * @return array
-     */
-    private function executeArrayComparison($cellID, $operand1, $operand2, $operation, Stack &$stack, bool $recursingArrays)
+    private function executeArrayComparison(mixed $operand1, mixed $operand2, string $operation, Stack &$stack, bool $recursingArrays): array
     {
         $result = [];
         if (!is_array($operand2)) {
             // Operand 1 is an array, Operand 2 is a scalar
             foreach ($operand1 as $x => $operandData) {
-                $this->debugLog->writeDebugLog('Evaluating Comparison ', $this->showValue($operandData), ' ', $operation, ' ', $this->showValue($operand2));
-                $this->executeBinaryComparisonOperation($cellID, $operandData, $operand2, $operation, $stack);
+                $this->debugLog->writeDebugLog('Evaluating Comparison %s %s %s', $this->showValue($operandData), $operation, $this->showValue($operand2));
+                $this->executeBinaryComparisonOperation($operandData, $operand2, $operation, $stack);
                 $r = $stack->pop();
                 $result[$x] = $r['value'];
             }
         } elseif (!is_array($operand1)) {
             // Operand 1 is a scalar, Operand 2 is an array
             foreach ($operand2 as $x => $operandData) {
-                $this->debugLog->writeDebugLog('Evaluating Comparison ', $this->showValue($operand1), ' ', $operation, ' ', $this->showValue($operandData));
-                $this->executeBinaryComparisonOperation($cellID, $operand1, $operandData, $operation, $stack);
+                $this->debugLog->writeDebugLog('Evaluating Comparison %s %s %s', $this->showValue($operand1), $operation, $this->showValue($operandData));
+                $this->executeBinaryComparisonOperation($operand1, $operandData, $operation, $stack);
                 $r = $stack->pop();
                 $result[$x] = $r['value'];
             }
@@ -4970,260 +5235,177 @@ private function executeArrayComparison($cellID, $operand1, $operand2, $operatio
                 self::checkMatrixOperands($operand1, $operand2, 2);
             }
             foreach ($operand1 as $x => $operandData) {
-                $this->debugLog->writeDebugLog('Evaluating Comparison ', $this->showValue($operandData), ' ', $operation, ' ', $this->showValue($operand2[$x]));
-                $this->executeBinaryComparisonOperation($cellID, $operandData, $operand2[$x], $operation, $stack, true);
+                $this->debugLog->writeDebugLog('Evaluating Comparison %s %s %s', $this->showValue($operandData), $operation, $this->showValue($operand2[$x]));
+                $this->executeBinaryComparisonOperation($operandData, $operand2[$x], $operation, $stack, true);
                 $r = $stack->pop();
                 $result[$x] = $r['value'];
             }
         }
         //    Log the result details
-        $this->debugLog->writeDebugLog('Comparison Evaluation Result is ', $this->showTypeDetails($result));
+        $this->debugLog->writeDebugLog('Comparison Evaluation Result is %s', $this->showTypeDetails($result));
         //    And push the result onto the stack
         $stack->push('Array', $result);
 
         return $result;
     }
 
-    /**
-     * @param null|string $cellID
-     * @param mixed $operand1
-     * @param mixed $operand2
-     * @param string $operation
-     * @param bool $recursingArrays
-     *
-     * @return mixed
-     */
-    private function executeBinaryComparisonOperation($cellID, $operand1, $operand2, $operation, Stack &$stack, $recursingArrays = false)
+    private function executeBinaryComparisonOperation(mixed $operand1, mixed $operand2, string $operation, Stack &$stack, bool $recursingArrays = false): array|bool
     {
         //    If we're dealing with matrix operations, we want a matrix result
         if ((is_array($operand1)) || (is_array($operand2))) {
-            return $this->executeArrayComparison($cellID, $operand1, $operand2, $operation, $stack, $recursingArrays);
-        }
-
-        //    Simple validate the two operands if they are string values
-        if (is_string($operand1) && $operand1 > '' && $operand1[0] == self::FORMULA_STRING_QUOTE) {
-            $operand1 = self::unwrapResult($operand1);
-        }
-        if (is_string($operand2) && $operand2 > '' && $operand2[0] == self::FORMULA_STRING_QUOTE) {
-            $operand2 = self::unwrapResult($operand2);
+            return $this->executeArrayComparison($operand1, $operand2, $operation, $stack, $recursingArrays);
         }
 
-        // Use case insensitive comparaison if not OpenOffice mode
-        if (Functions::getCompatibilityMode() != Functions::COMPATIBILITY_OPENOFFICE) {
-            if (is_string($operand1)) {
-                $operand1 = Shared\StringHelper::strToUpper($operand1);
-            }
-            if (is_string($operand2)) {
-                $operand2 = Shared\StringHelper::strToUpper($operand2);
-            }
-        }
-
-        $useLowercaseFirstComparison = is_string($operand1) && is_string($operand2) && Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE;
-
-        //    execute the necessary operation
-        switch ($operation) {
-            //    Greater than
-            case '>':
-                if ($useLowercaseFirstComparison) {
-                    $result = $this->strcmpLowercaseFirst($operand1, $operand2) > 0;
-                } else {
-                    $result = ($operand1 > $operand2);
-                }
-
-                break;
-            //    Less than
-            case '<':
-                if ($useLowercaseFirstComparison) {
-                    $result = $this->strcmpLowercaseFirst($operand1, $operand2) < 0;
-                } else {
-                    $result = ($operand1 < $operand2);
-                }
-
-                break;
-            //    Equality
-            case '=':
-                if (is_numeric($operand1) && is_numeric($operand2)) {
-                    $result = (abs($operand1 - $operand2) < $this->delta);
-                } else {
-                    $result = $this->strcmpAllowNull($operand1, $operand2) == 0;
-                }
-
-                break;
-            //    Greater than or equal
-            case '>=':
-                if (is_numeric($operand1) && is_numeric($operand2)) {
-                    $result = ((abs($operand1 - $operand2) < $this->delta) || ($operand1 > $operand2));
-                } elseif ($useLowercaseFirstComparison) {
-                    $result = $this->strcmpLowercaseFirst($operand1, $operand2) >= 0;
-                } else {
-                    $result = $this->strcmpAllowNull($operand1, $operand2) >= 0;
-                }
-
-                break;
-            //    Less than or equal
-            case '<=':
-                if (is_numeric($operand1) && is_numeric($operand2)) {
-                    $result = ((abs($operand1 - $operand2) < $this->delta) || ($operand1 < $operand2));
-                } elseif ($useLowercaseFirstComparison) {
-                    $result = $this->strcmpLowercaseFirst($operand1, $operand2) <= 0;
-                } else {
-                    $result = $this->strcmpAllowNull($operand1, $operand2) <= 0;
-                }
-
-                break;
-            //    Inequality
-            case '<>':
-                if (is_numeric($operand1) && is_numeric($operand2)) {
-                    $result = (abs($operand1 - $operand2) > 1E-14);
-                } else {
-                    $result = $this->strcmpAllowNull($operand1, $operand2) != 0;
-                }
-
-                break;
-
-            default:
-                throw new Exception('Unsupported binary comparison operation');
-        }
+        $result = BinaryComparison::compare($operand1, $operand2, $operation);
 
         //    Log the result details
-        $this->debugLog->writeDebugLog('Evaluation Result is ', $this->showTypeDetails($result));
+        $this->debugLog->writeDebugLog('Evaluation Result is %s', $this->showTypeDetails($result));
         //    And push the result onto the stack
         $stack->push('Value', $result);
 
         return $result;
     }
 
-    /**
-     * Compare two strings in the same way as strcmp() except that lowercase come before uppercase letters.
-     *
-     * @param null|string $str1 First string value for the comparison
-     * @param null|string $str2 Second string value for the comparison
-     *
-     * @return int
-     */
-    private function strcmpLowercaseFirst($str1, $str2)
-    {
-        $inversedStr1 = Shared\StringHelper::strCaseReverse($str1);
-        $inversedStr2 = Shared\StringHelper::strCaseReverse($str2);
-
-        return strcmp($inversedStr1 ?? '', $inversedStr2 ?? '');
-    }
-
-    /**
-     * PHP8.1 deprecates passing null to strcmp.
-     *
-     * @param null|string $str1 First string value for the comparison
-     * @param null|string $str2 Second string value for the comparison
-     *
-     * @return int
-     */
-    private function strcmpAllowNull($str1, $str2)
-    {
-        return strcmp($str1 ?? '', $str2 ?? '');
-    }
-
-    /**
-     * @param mixed $operand1
-     * @param mixed $operand2
-     * @param mixed $operation
-     * @param string $matrixFunction
-     * @param mixed $stack
-     *
-     * @return bool|mixed
-     */
-    private function executeNumericBinaryOperation($operand1, $operand2, $operation, $matrixFunction, &$stack)
+    private function executeNumericBinaryOperation(mixed $operand1, mixed $operand2, string $operation, Stack &$stack): mixed
     {
         //    Validate the two operands
-        if (!$this->validateBinaryOperand($operand1, $stack)) {
-            return false;
-        }
-        if (!$this->validateBinaryOperand($operand2, $stack)) {
+        if (
+            ($this->validateBinaryOperand($operand1, $stack) === false)
+            || ($this->validateBinaryOperand($operand2, $stack) === false)
+        ) {
             return false;
         }
 
-        //    If either of the operands is a matrix, we need to treat them both as matrices
-        //        (converting the other operand to a matrix if need be); then perform the required
-        //        matrix operation
-        if ((is_array($operand1)) || (is_array($operand2))) {
-            //    Ensure that both operands are arrays/matrices of the same size
-            self::checkMatrixOperands($operand1, $operand2, 2);
-
-            try {
-                //    Convert operand 1 from a PHP array to a matrix
-                $matrix = new Shared\JAMA\Matrix($operand1);
-                //    Perform the required operation against the operand 1 matrix, passing in operand 2
-                $matrixResult = $matrix->$matrixFunction($operand2);
-                $result = $matrixResult->getArray();
-            } catch (\Exception $ex) {
-                $this->debugLog->writeDebugLog('JAMA Matrix Exception: ', $ex->getMessage());
-                $result = '#VALUE!';
+        if (
+            (Functions::getCompatibilityMode() != Functions::COMPATIBILITY_OPENOFFICE)
+            && ((is_string($operand1) && !is_numeric($operand1) && $operand1 !== '')
+                || (is_string($operand2) && !is_numeric($operand2) && $operand2 !== ''))
+        ) {
+            $result = ExcelError::VALUE();
+        } elseif (is_array($operand1) || is_array($operand2)) {
+            //    Ensure that both operands are arrays/matrices
+            if (is_array($operand1)) {
+                foreach ($operand1 as $key => $value) {
+                    $operand1[$key] = Functions::flattenArray($value);
+                }
             }
-        } else {
-            if (
-                (Functions::getCompatibilityMode() != Functions::COMPATIBILITY_OPENOFFICE) &&
-                ((is_string($operand1) && !is_numeric($operand1) && strlen($operand1) > 0) ||
-                    (is_string($operand2) && !is_numeric($operand2) && strlen($operand2) > 0))
-            ) {
-                $result = Functions::VALUE();
-            } else {
-                //    If we're dealing with non-matrix operations, execute the necessary operation
-                switch ($operation) {
-                    //    Addition
-                    case '+':
-                        $result = $operand1 + $operand2;
+            if (is_array($operand2)) {
+                foreach ($operand2 as $key => $value) {
+                    $operand2[$key] = Functions::flattenArray($value);
+                }
+            }
+            [$rows, $columns] = self::checkMatrixOperands($operand1, $operand2, 3);
 
-                        break;
-                    //    Subtraction
-                    case '-':
-                        $result = $operand1 - $operand2;
+            for ($row = 0; $row < $rows; ++$row) {
+                for ($column = 0; $column < $columns; ++$column) {
+                    if ($operand1[$row][$column] === null) {
+                        $operand1[$row][$column] = 0;
+                    } elseif (!self::isNumericOrBool($operand1[$row][$column])) {
+                        $operand1[$row][$column] = self::makeError($operand1[$row][$column]);
 
-                        break;
-                    //    Multiplication
-                    case '*':
-                        $result = $operand1 * $operand2;
+                        continue;
+                    }
+                    if ($operand2[$row][$column] === null) {
+                        $operand2[$row][$column] = 0;
+                    } elseif (!self::isNumericOrBool($operand2[$row][$column])) {
+                        $operand1[$row][$column] = self::makeError($operand2[$row][$column]);
 
-                        break;
-                    //    Division
-                    case '/':
-                        if ($operand2 == 0) {
-                            //    Trap for Divide by Zero error
-                            $stack->push('Error', '#DIV/0!');
-                            $this->debugLog->writeDebugLog('Evaluation Result is ', $this->showTypeDetails('#DIV/0!'));
-
-                            return false;
-                        }
-                        $result = $operand1 / $operand2;
+                        continue;
+                    }
+                    switch ($operation) {
+                        case '+':
+                            $operand1[$row][$column] += $operand2[$row][$column];
+
+                            break;
+                        case '-':
+                            $operand1[$row][$column] -= $operand2[$row][$column];
+
+                            break;
+                        case '*':
+                            $operand1[$row][$column] *= $operand2[$row][$column];
+
+                            break;
+                        case '/':
+                            if ($operand2[$row][$column] == 0) {
+                                $operand1[$row][$column] = ExcelError::DIV0();
+                            } else {
+                                $operand1[$row][$column] /= $operand2[$row][$column];
+                            }
 
-                        break;
-                    //    Power
-                    case '^':
-                        $result = $operand1 ** $operand2;
+                            break;
+                        case '^':
+                            $operand1[$row][$column] = $operand1[$row][$column] ** $operand2[$row][$column];
 
-                        break;
+                            break;
 
-                    default:
-                        throw new Exception('Unsupported numeric binary operation');
+                        default:
+                            throw new Exception('Unsupported numeric binary operation');
+                    }
                 }
             }
+            $result = $operand1;
+        } else {
+            //    If we're dealing with non-matrix operations, execute the necessary operation
+            switch ($operation) {
+                //    Addition
+                case '+':
+                    $result = $operand1 + $operand2;
+
+                    break;
+                //    Subtraction
+                case '-':
+                    $result = $operand1 - $operand2;
+
+                    break;
+                //    Multiplication
+                case '*':
+                    $result = $operand1 * $operand2;
+
+                    break;
+                //    Division
+                case '/':
+                    if ($operand2 == 0) {
+                        //    Trap for Divide by Zero error
+                        $stack->push('Error', ExcelError::DIV0());
+                        $this->debugLog->writeDebugLog('Evaluation Result is %s', $this->showTypeDetails(ExcelError::DIV0()));
+
+                        return false;
+                    }
+                    $result = $operand1 / $operand2;
+
+                    break;
+                //    Power
+                case '^':
+                    $result = $operand1 ** $operand2;
+
+                    break;
+
+                default:
+                    throw new Exception('Unsupported numeric binary operation');
+            }
         }
 
         //    Log the result details
-        $this->debugLog->writeDebugLog('Evaluation Result is ', $this->showTypeDetails($result));
+        $this->debugLog->writeDebugLog('Evaluation Result is %s', $this->showTypeDetails($result));
         //    And push the result onto the stack
         $stack->push('Value', $result);
 
         return $result;
     }
 
-    // trigger an error, but nicely, if need be
-    protected function raiseFormulaError($errorMessage)
+    /**
+     * Trigger an error, but nicely, if need be.
+     *
+     * @return false
+     */
+    protected function raiseFormulaError(string $errorMessage, int $code = 0, ?Throwable $exception = null): bool
     {
         $this->formulaError = $errorMessage;
         $this->cyclicReferenceStack->clear();
-        if (!$this->suppressFormulaErrors) {
-            throw new Exception($errorMessage);
+        $suppress = $this->suppressFormulaErrors;
+        if (!$suppress) {
+            throw new Exception($errorMessage, $code, $exception);
         }
-        trigger_error($errorMessage, E_USER_ERROR);
 
         return false;
     }
@@ -5231,47 +5413,57 @@ protected function raiseFormulaError($errorMessage)
     /**
      * Extract range values.
      *
-     * @param string $pRange String based range representation
-     * @param Worksheet $pSheet Worksheet
+     * @param string $range String based range representation
+     * @param ?Worksheet $worksheet Worksheet
      * @param bool $resetLog Flag indicating whether calculation log should be reset or not
      *
-     * @return mixed Array of values in range if range contains more than one element. Otherwise, a single value is returned.
+     * @return array Array of values in range if range contains more than one element. Otherwise, a single value is returned.
      */
-    public function extractCellRange(&$pRange = 'A1', ?Worksheet $pSheet = null, $resetLog = true)
+    public function extractCellRange(string &$range = 'A1', ?Worksheet $worksheet = null, bool $resetLog = true): array
     {
         // Return value
         $returnValue = [];
 
-        if ($pSheet !== null) {
-            $pSheetName = $pSheet->getTitle();
+        if ($worksheet !== null) {
+            $worksheetName = $worksheet->getTitle();
 
-            if (strpos($pRange, '!') !== false) {
-                [$pSheetName, $pRange] = Worksheet::extractSheetTitle($pRange, true);
-                $pSheet = $this->spreadsheet->getSheetByName($pSheetName);
+            if (str_contains($range, '!')) {
+                [$worksheetName, $range] = Worksheet::extractSheetTitle($range, true);
+                $worksheet = ($this->spreadsheet === null) ? null : $this->spreadsheet->getSheetByName($worksheetName);
             }
 
             // Extract range
-            $aReferences = Coordinate::extractAllCellReferencesInRange($pRange);
-            $pRange = $pSheetName . '!' . $pRange;
+            $aReferences = Coordinate::extractAllCellReferencesInRange($range);
+            $range = "'" . $worksheetName . "'" . '!' . $range;
+            $currentCol = '';
+            $currentRow = 0;
             if (!isset($aReferences[1])) {
-                $currentCol = '';
-                $currentRow = 0;
                 //    Single cell in range
                 sscanf($aReferences[0], '%[A-Z]%d', $currentCol, $currentRow);
-                if ($pSheet->cellExists($aReferences[0])) {
-                    $returnValue[$currentRow][$currentCol] = $pSheet->getCell($aReferences[0])->getCalculatedValue($resetLog);
+                if ($worksheet !== null && $worksheet->cellExists($aReferences[0])) {
+                    $temp = $worksheet->getCell($aReferences[0])->getCalculatedValue($resetLog);
+                    if ($this->getInstanceArrayReturnType() === self::RETURN_ARRAY_AS_ARRAY) {
+                        while (is_array($temp)) {
+                            $temp = array_shift($temp);
+                        }
+                    }
+                    $returnValue[$currentRow][$currentCol] = $temp;
                 } else {
                     $returnValue[$currentRow][$currentCol] = null;
                 }
             } else {
                 // Extract cell data for all cells in the range
                 foreach ($aReferences as $reference) {
-                    $currentCol = '';
-                    $currentRow = 0;
                     // Extract range
                     sscanf($reference, '%[A-Z]%d', $currentCol, $currentRow);
-                    if ($pSheet->cellExists($reference)) {
-                        $returnValue[$currentRow][$currentCol] = $pSheet->getCell($reference)->getCalculatedValue($resetLog);
+                    if ($worksheet !== null && $worksheet->cellExists($reference)) {
+                        $temp = $worksheet->getCell($reference)->getCalculatedValue($resetLog);
+                        if ($this->getInstanceArrayReturnType() === self::RETURN_ARRAY_AS_ARRAY) {
+                            while (is_array($temp)) {
+                                $temp = array_shift($temp);
+                            }
+                        }
+                        $returnValue[$currentRow][$currentCol] = $temp;
                     } else {
                         $returnValue[$currentRow][$currentCol] = null;
                     }
@@ -5285,47 +5477,46 @@ public function extractCellRange(&$pRange = 'A1', ?Worksheet $pSheet = null, $re
     /**
      * Extract range values.
      *
-     * @param string $pRange String based range representation
-     * @param Worksheet $pSheet Worksheet
+     * @param string $range String based range representation
+     * @param null|Worksheet $worksheet Worksheet
      * @param bool $resetLog Flag indicating whether calculation log should be reset or not
      *
-     * @return mixed Array of values in range if range contains more than one element. Otherwise, a single value is returned.
+     * @return array|string Array of values in range if range contains more than one element. Otherwise, a single value is returned.
      */
-    public function extractNamedRange(&$pRange = 'A1', ?Worksheet $pSheet = null, $resetLog = true)
+    public function extractNamedRange(string &$range = 'A1', ?Worksheet $worksheet = null, bool $resetLog = true): string|array
     {
         // Return value
         $returnValue = [];
 
-        if ($pSheet !== null) {
-            $pSheetName = $pSheet->getTitle();
-            if (strpos($pRange, '!') !== false) {
-                [$pSheetName, $pRange] = Worksheet::extractSheetTitle($pRange, true);
-                $pSheet = $this->spreadsheet->getSheetByName($pSheetName);
+        if ($worksheet !== null) {
+            if (str_contains($range, '!')) {
+                [$worksheetName, $range] = Worksheet::extractSheetTitle($range, true);
+                $worksheet = ($this->spreadsheet === null) ? null : $this->spreadsheet->getSheetByName($worksheetName);
             }
 
             // Named range?
-            $namedRange = DefinedName::resolveName($pRange, $pSheet);
+            $namedRange = ($worksheet === null) ? null : DefinedName::resolveName($range, $worksheet);
             if ($namedRange === null) {
-                return Functions::REF();
+                return ExcelError::REF();
             }
 
-            $pSheet = $namedRange->getWorksheet();
-            $pRange = $namedRange->getValue();
-            $splitRange = Coordinate::splitRange($pRange);
+            $worksheet = $namedRange->getWorksheet();
+            $range = $namedRange->getValue();
+            $splitRange = Coordinate::splitRange($range);
             //    Convert row and column references
-            if (ctype_alpha($splitRange[0][0])) {
-                $pRange = $splitRange[0][0] . '1:' . $splitRange[0][1] . $namedRange->getWorksheet()->getHighestRow();
-            } elseif (ctype_digit($splitRange[0][0])) {
-                $pRange = 'A' . $splitRange[0][0] . ':' . $namedRange->getWorksheet()->getHighestColumn() . $splitRange[0][1];
+            if ($worksheet !== null && ctype_alpha($splitRange[0][0])) {
+                $range = $splitRange[0][0] . '1:' . $splitRange[0][1] . $worksheet->getHighestRow();
+            } elseif ($worksheet !== null && ctype_digit($splitRange[0][0])) {
+                $range = 'A' . $splitRange[0][0] . ':' . $worksheet->getHighestColumn() . $splitRange[0][1];
             }
 
             // Extract range
-            $aReferences = Coordinate::extractAllCellReferencesInRange($pRange);
+            $aReferences = Coordinate::extractAllCellReferencesInRange($range);
             if (!isset($aReferences[1])) {
                 //    Single cell (or single column or row) in range
                 [$currentCol, $currentRow] = Coordinate::coordinateFromString($aReferences[0]);
-                if ($pSheet->cellExists($aReferences[0])) {
-                    $returnValue[$currentRow][$currentCol] = $pSheet->getCell($aReferences[0])->getCalculatedValue($resetLog);
+                if ($worksheet !== null && $worksheet->cellExists($aReferences[0])) {
+                    $returnValue[$currentRow][$currentCol] = $worksheet->getCell($aReferences[0])->getCalculatedValue($resetLog);
                 } else {
                     $returnValue[$currentRow][$currentCol] = null;
                 }
@@ -5334,8 +5525,8 @@ public function extractNamedRange(&$pRange = 'A1', ?Worksheet $pSheet = null, $r
                 foreach ($aReferences as $reference) {
                     // Extract range
                     [$currentCol, $currentRow] = Coordinate::coordinateFromString($reference);
-                    if ($pSheet->cellExists($reference)) {
-                        $returnValue[$currentRow][$currentCol] = $pSheet->getCell($reference)->getCalculatedValue($resetLog);
+                    if ($worksheet !== null && $worksheet->cellExists($reference)) {
+                        $returnValue[$currentRow][$currentCol] = $worksheet->getCell($reference)->getCalculatedValue($resetLog);
                     } else {
                         $returnValue[$currentRow][$currentCol] = null;
                     }
@@ -5349,14 +5540,12 @@ public function extractNamedRange(&$pRange = 'A1', ?Worksheet $pSheet = null, $r
     /**
      * Is a specific function implemented?
      *
-     * @param string $pFunction Function Name
-     *
-     * @return bool
+     * @param string $function Function Name
      */
-    public function isImplemented($pFunction)
+    public function isImplemented(string $function): bool
     {
-        $pFunction = strtoupper($pFunction);
-        $notImplemented = !isset(self::$phpSpreadsheetFunctions[$pFunction]) || (is_array(self::$phpSpreadsheetFunctions[$pFunction]['functionCall']) && self::$phpSpreadsheetFunctions[$pFunction]['functionCall'][1] === 'DUMMY');
+        $function = strtoupper($function);
+        $notImplemented = !isset(self::$phpSpreadsheetFunctions[$function]) || (is_array(self::$phpSpreadsheetFunctions[$function]['functionCall']) && self::$phpSpreadsheetFunctions[$function]['functionCall'][1] === 'DUMMY');
 
         return !$notImplemented;
     }
@@ -5364,17 +5553,15 @@ public function isImplemented($pFunction)
     /**
      * Get a list of all implemented functions as an array of function objects.
      */
-    public function getFunctions(): array
+    public static function getFunctions(): array
     {
         return self::$phpSpreadsheetFunctions;
     }
 
     /**
      * Get a list of implemented Excel function names.
-     *
-     * @return array
      */
-    public function getImplementedFunctionNames()
+    public function getImplementedFunctionNames(): array
     {
         $returnValue = [];
         foreach (self::$phpSpreadsheetFunctions as $functionName => $function) {
@@ -5386,15 +5573,58 @@ public function getImplementedFunctionNames()
         return $returnValue;
     }
 
+    private function addDefaultArgumentValues(array $functionCall, array $args, array $emptyArguments): array
+    {
+        $reflector = new ReflectionMethod($functionCall[0], $functionCall[1]);
+        $methodArguments = $reflector->getParameters();
+
+        if (count($methodArguments) > 0) {
+            // Apply any defaults for empty argument values
+            foreach ($emptyArguments as $argumentId => $isArgumentEmpty) {
+                if ($isArgumentEmpty === true) {
+                    $reflectedArgumentId = count($args) - (int) $argumentId - 1;
+                    if (
+                        !array_key_exists($reflectedArgumentId, $methodArguments)
+                        || $methodArguments[$reflectedArgumentId]->isVariadic()
+                    ) {
+                        break;
+                    }
+
+                    $args[$argumentId] = $this->getArgumentDefaultValue($methodArguments[$reflectedArgumentId]);
+                }
+            }
+        }
+
+        return $args;
+    }
+
+    private function getArgumentDefaultValue(ReflectionParameter $methodArgument): mixed
+    {
+        $defaultValue = null;
+
+        if ($methodArgument->isDefaultValueAvailable()) {
+            $defaultValue = $methodArgument->getDefaultValue();
+            if ($methodArgument->isDefaultValueConstant()) {
+                $constantName = $methodArgument->getDefaultValueConstantName() ?? '';
+                // read constant value
+                if (str_contains($constantName, '::')) {
+                    [$className, $constantName] = explode('::', $constantName);
+                    $constantReflector = new ReflectionClassConstant($className, $constantName);
+
+                    return $constantReflector->getValue();
+                }
+
+                return constant($constantName);
+            }
+        }
+
+        return $defaultValue;
+    }
+
     /**
      * Add cell reference if needed while making sure that it is the last argument.
-     *
-     * @param bool $passCellReference
-     * @param array|string $functionCall
-     *
-     * @return array
      */
-    private function addCellReference(array $args, $passCellReference, $functionCall, ?Cell $pCell = null)
+    private function addCellReference(array $args, bool $passCellReference, array|string $functionCall, ?Cell $cell = null): array
     {
         if ($passCellReference) {
             if (is_array($functionCall)) {
@@ -5408,43 +5638,18 @@ private function addCellReference(array $args, $passCellReference, $functionCall
                 }
             }
 
-            $args[] = $pCell;
+            $args[] = $cell;
         }
 
         return $args;
     }
 
-    private function getUnusedBranchStoreKey()
-    {
-        $storeKeyValue = 'storeKey-' . $this->branchStoreKeyCounter;
-        ++$this->branchStoreKeyCounter;
-
-        return $storeKeyValue;
-    }
-
-    private function getTokensAsString($tokens)
-    {
-        $tokensStr = array_map(function ($token) {
-            $value = $token['value'] ?? 'no value';
-            while (is_array($value)) {
-                $value = array_pop($value);
-            }
-
-            return $value;
-        }, $tokens);
-
-        return '[ ' . implode(' | ', $tokensStr) . ' ]';
-    }
-
-    /**
-     * @return mixed|string
-     */
-    private function evaluateDefinedName(Cell $pCell, DefinedName $namedRange, Worksheet $pCellWorksheet, Stack $stack)
+    private function evaluateDefinedName(Cell $cell, DefinedName $namedRange, Worksheet $cellWorksheet, Stack $stack, bool $ignoreScope = false): mixed
     {
         $definedNameScope = $namedRange->getScope();
-        if ($definedNameScope !== null && $definedNameScope !== $pCellWorksheet) {
+        if ($definedNameScope !== null && $definedNameScope !== $cellWorksheet && !$ignoreScope) {
             // The defined name isn't in our current scope, so #REF
-            $result = Functions::REF();
+            $result = ExcelError::REF();
             $stack->push('Error', $result, $namedRange->getName());
 
             return $result;
@@ -5458,34 +5663,67 @@ private function evaluateDefinedName(Cell $pCell, DefinedName $namedRange, Works
             $definedNameValue = '=' . $definedNameValue;
         }
 
-        $this->debugLog->writeDebugLog("Defined Name is a {$definedNameType} with a value of {$definedNameValue}");
+        $this->debugLog->writeDebugLog('Defined Name is a %s with a value of %s', $definedNameType, $definedNameValue);
 
-        $recursiveCalculationCell = ($definedNameWorksheet !== null && $definedNameWorksheet !== $pCellWorksheet)
+        $originalCoordinate = $cell->getCoordinate();
+        $recursiveCalculationCell = ($definedNameType !== 'Formula' && $definedNameWorksheet !== null && $definedNameWorksheet !== $cellWorksheet)
             ? $definedNameWorksheet->getCell('A1')
-            : $pCell;
+            : $cell;
         $recursiveCalculationCellAddress = $recursiveCalculationCell->getCoordinate();
 
         // Adjust relative references in ranges and formulae so that we execute the calculation for the correct rows and columns
         $definedNameValue = self::$referenceHelper->updateFormulaReferencesAnyWorksheet(
             $definedNameValue,
-            Coordinate::columnIndexFromString($pCell->getColumn()) - 1,
-            $pCell->getRow() - 1
+            Coordinate::columnIndexFromString($cell->getColumn()) - 1,
+            $cell->getRow() - 1
         );
 
-        $this->debugLog->writeDebugLog("Value adjusted for relative references is {$definedNameValue}");
+        $this->debugLog->writeDebugLog('Value adjusted for relative references is %s', $definedNameValue);
 
         $recursiveCalculator = new self($this->spreadsheet);
         $recursiveCalculator->getDebugLog()->setWriteDebugLog($this->getDebugLog()->getWriteDebugLog());
         $recursiveCalculator->getDebugLog()->setEchoDebugLog($this->getDebugLog()->getEchoDebugLog());
-        $result = $recursiveCalculator->_calculateFormulaValue($definedNameValue, $recursiveCalculationCellAddress, $recursiveCalculationCell);
+        $result = $recursiveCalculator->_calculateFormulaValue($definedNameValue, $recursiveCalculationCellAddress, $recursiveCalculationCell, true);
+        $cellWorksheet->getCell($originalCoordinate);
 
         if ($this->getDebugLog()->getWriteDebugLog()) {
             $this->debugLog->mergeDebugLog(array_slice($recursiveCalculator->getDebugLog()->getLog(), 3));
-            $this->debugLog->writeDebugLog("Evaluation Result for Named {$definedNameType} {$namedRange->getName()} is {$this->showTypeDetails($result)}");
+            $this->debugLog->writeDebugLog('Evaluation Result for Named %s %s is %s', $definedNameType, $namedRange->getName(), $this->showTypeDetails($result));
         }
 
         $stack->push('Defined Name', $result, $namedRange->getName());
 
         return $result;
     }
+
+    public function setSuppressFormulaErrors(bool $suppressFormulaErrors): void
+    {
+        $this->suppressFormulaErrors = $suppressFormulaErrors;
+    }
+
+    public function getSuppressFormulaErrors(): bool
+    {
+        return $this->suppressFormulaErrors;
+    }
+
+    public static function boolToString(mixed $operand1): mixed
+    {
+        if (is_bool($operand1)) {
+            $operand1 = ($operand1) ? self::$localeBoolean['TRUE'] : self::$localeBoolean['FALSE'];
+        } elseif ($operand1 === null) {
+            $operand1 = '';
+        }
+
+        return $operand1;
+    }
+
+    private static function isNumericOrBool(mixed $operand): bool
+    {
+        return is_numeric($operand) || is_bool($operand);
+    }
+
+    private static function makeError(mixed $operand = ''): string
+    {
+        return Information\ErrorValue::isError($operand) ? $operand : ExcelError::VALUE();
+    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Category.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Category.php
index 96bb72ad4c..38c19b30b8 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Category.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Category.php
@@ -17,4 +17,6 @@ abstract class Category
     const CATEGORY_STATISTICAL = 'Statistical';
     const CATEGORY_TEXT_AND_DATA = 'Text and Data';
     const CATEGORY_WEB = 'Web';
+    const CATEGORY_UNCATEGORISED = 'Uncategorised';
+    const CATEGORY_MICROSOFT_INTERNAL = 'MS Internal';
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database.php
deleted file mode 100644
index 6503167475..0000000000
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database.php
+++ /dev/null
@@ -1,440 +0,0 @@
-<?php
-
-namespace PhpOffice\PhpSpreadsheet\Calculation;
-
-/**
- * @deprecated 1.17.0
- */
-class Database
-{
-    /**
-     * DAVERAGE.
-     *
-     * Averages the values in a column of a list or database that match conditions you specify.
-     *
-     * Excel Function:
-     *        DAVERAGE(database,field,criteria)
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Database\DAverage::evaluate()
-     *      Use the evaluate() method in the Database\DAverage class instead
-     *
-     * @param mixed[] $database The range of cells that makes up the list or database.
-     *                                        A database is a list of related data in which rows of related
-     *                                        information are records, and columns of data are fields. The
-     *                                        first row of the list contains labels for each column.
-     * @param int|string $field Indicates which column is used in the function. Enter the
-     *                                        column label enclosed between double quotation marks, such as
-     *                                        "Age" or "Yield," or a number (without quotation marks) that
-     *                                        represents the position of the column within the list: 1 for
-     *                                        the first column, 2 for the second column, and so on.
-     * @param mixed[] $criteria The range of cells that contains the conditions you specify.
-     *                                        You can use any range for the criteria argument, as long as it
-     *                                        includes at least one column label and at least one cell below
-     *                                        the column label in which you specify a condition for the
-     *                                        column.
-     *
-     * @return null|float|string
-     */
-    public static function DAVERAGE($database, $field, $criteria)
-    {
-        return Database\DAverage::evaluate($database, $field, $criteria);
-    }
-
-    /**
-     * DCOUNT.
-     *
-     * Counts the cells that contain numbers in a column of a list or database that match conditions
-     * that you specify.
-     *
-     * Excel Function:
-     *        DCOUNT(database,[field],criteria)
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Database\DCount::evaluate()
-     *      Use the evaluate() method in the Database\DCount class instead
-     *
-     * @param mixed[] $database The range of cells that makes up the list or database.
-     *                                        A database is a list of related data in which rows of related
-     *                                        information are records, and columns of data are fields. The
-     *                                        first row of the list contains labels for each column.
-     * @param null|int|string $field Indicates which column is used in the function. Enter the
-     *                                        column label enclosed between double quotation marks, such as
-     *                                        "Age" or "Yield," or a number (without quotation marks) that
-     *                                        represents the position of the column within the list: 1 for
-     *                                        the first column, 2 for the second column, and so on.
-     * @param mixed[] $criteria The range of cells that contains the conditions you specify.
-     *                                        You can use any range for the criteria argument, as long as it
-     *                                        includes at least one column label and at least one cell below
-     *                                        the column label in which you specify a condition for the
-     *                                        column.
-     *
-     * @return int
-     *
-     * @TODO    The field argument is optional. If field is omitted, DCOUNT counts all records in the
-     *            database that match the criteria.
-     */
-    public static function DCOUNT($database, $field, $criteria)
-    {
-        return Database\DCount::evaluate($database, $field, $criteria);
-    }
-
-    /**
-     * DCOUNTA.
-     *
-     * Counts the nonblank cells in a column of a list or database that match conditions that you specify.
-     *
-     * Excel Function:
-     *        DCOUNTA(database,[field],criteria)
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Database\DCountA::evaluate()
-     *      Use the evaluate() method in the Database\DCountA class instead
-     *
-     * @param mixed[] $database The range of cells that makes up the list or database.
-     *                                        A database is a list of related data in which rows of related
-     *                                        information are records, and columns of data are fields. The
-     *                                        first row of the list contains labels for each column.
-     * @param null|int|string $field Indicates which column is used in the function. Enter the
-     *                                        column label enclosed between double quotation marks, such as
-     *                                        "Age" or "Yield," or a number (without quotation marks) that
-     *                                        represents the position of the column within the list: 1 for
-     *                                        the first column, 2 for the second column, and so on.
-     * @param mixed[] $criteria The range of cells that contains the conditions you specify.
-     *                                        You can use any range for the criteria argument, as long as it
-     *                                        includes at least one column label and at least one cell below
-     *                                        the column label in which you specify a condition for the
-     *                                        column.
-     *
-     * @return int
-     */
-    public static function DCOUNTA($database, $field, $criteria)
-    {
-        return Database\DCountA::evaluate($database, $field, $criteria);
-    }
-
-    /**
-     * DGET.
-     *
-     * Extracts a single value from a column of a list or database that matches conditions that you
-     * specify.
-     *
-     * Excel Function:
-     *        DGET(database,field,criteria)
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Database\DGet::evaluate()
-     *      Use the evaluate() method in the Database\DGet class instead
-     *
-     * @param mixed[] $database The range of cells that makes up the list or database.
-     *                                        A database is a list of related data in which rows of related
-     *                                        information are records, and columns of data are fields. The
-     *                                        first row of the list contains labels for each column.
-     * @param int|string $field Indicates which column is used in the function. Enter the
-     *                                        column label enclosed between double quotation marks, such as
-     *                                        "Age" or "Yield," or a number (without quotation marks) that
-     *                                        represents the position of the column within the list: 1 for
-     *                                        the first column, 2 for the second column, and so on.
-     * @param mixed[] $criteria The range of cells that contains the conditions you specify.
-     *                                        You can use any range for the criteria argument, as long as it
-     *                                        includes at least one column label and at least one cell below
-     *                                        the column label in which you specify a condition for the
-     *                                        column.
-     *
-     * @return mixed
-     */
-    public static function DGET($database, $field, $criteria)
-    {
-        return Database\DGet::evaluate($database, $field, $criteria);
-    }
-
-    /**
-     * DMAX.
-     *
-     * Returns the largest number in a column of a list or database that matches conditions you that
-     * specify.
-     *
-     * Excel Function:
-     *        DMAX(database,field,criteria)
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Database\DMax::evaluate()
-     *      Use the evaluate() method in the Database\DMax class instead
-     *
-     * @param mixed[] $database The range of cells that makes up the list or database.
-     *                                        A database is a list of related data in which rows of related
-     *                                        information are records, and columns of data are fields. The
-     *                                        first row of the list contains labels for each column.
-     * @param int|string $field Indicates which column is used in the function. Enter the
-     *                                        column label enclosed between double quotation marks, such as
-     *                                        "Age" or "Yield," or a number (without quotation marks) that
-     *                                        represents the position of the column within the list: 1 for
-     *                                        the first column, 2 for the second column, and so on.
-     * @param mixed[] $criteria The range of cells that contains the conditions you specify.
-     *                                        You can use any range for the criteria argument, as long as it
-     *                                        includes at least one column label and at least one cell below
-     *                                        the column label in which you specify a condition for the
-     *                                        column.
-     *
-     * @return float
-     */
-    public static function DMAX($database, $field, $criteria)
-    {
-        return Database\DMax::evaluate($database, $field, $criteria);
-    }
-
-    /**
-     * DMIN.
-     *
-     * Returns the smallest number in a column of a list or database that matches conditions you that
-     * specify.
-     *
-     * Excel Function:
-     *        DMIN(database,field,criteria)
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Database\DMin::evaluate()
-     *      Use the evaluate() method in the Database\DMin class instead
-     *
-     * @param mixed[] $database The range of cells that makes up the list or database.
-     *                                        A database is a list of related data in which rows of related
-     *                                        information are records, and columns of data are fields. The
-     *                                        first row of the list contains labels for each column.
-     * @param int|string $field Indicates which column is used in the function. Enter the
-     *                                        column label enclosed between double quotation marks, such as
-     *                                        "Age" or "Yield," or a number (without quotation marks) that
-     *                                        represents the position of the column within the list: 1 for
-     *                                        the first column, 2 for the second column, and so on.
-     * @param mixed[] $criteria The range of cells that contains the conditions you specify.
-     *                                        You can use any range for the criteria argument, as long as it
-     *                                        includes at least one column label and at least one cell below
-     *                                        the column label in which you specify a condition for the
-     *                                        column.
-     *
-     * @return float
-     */
-    public static function DMIN($database, $field, $criteria)
-    {
-        return Database\DMin::evaluate($database, $field, $criteria);
-    }
-
-    /**
-     * DPRODUCT.
-     *
-     * Multiplies the values in a column of a list or database that match conditions that you specify.
-     *
-     * Excel Function:
-     *        DPRODUCT(database,field,criteria)
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Database\DProduct::evaluate()
-     *      Use the evaluate() method in the Database\DProduct class instead
-     *
-     * @param mixed[] $database The range of cells that makes up the list or database.
-     *                                        A database is a list of related data in which rows of related
-     *                                        information are records, and columns of data are fields. The
-     *                                        first row of the list contains labels for each column.
-     * @param int|string $field Indicates which column is used in the function. Enter the
-     *                                        column label enclosed between double quotation marks, such as
-     *                                        "Age" or "Yield," or a number (without quotation marks) that
-     *                                        represents the position of the column within the list: 1 for
-     *                                        the first column, 2 for the second column, and so on.
-     * @param mixed[] $criteria The range of cells that contains the conditions you specify.
-     *                                        You can use any range for the criteria argument, as long as it
-     *                                        includes at least one column label and at least one cell below
-     *                                        the column label in which you specify a condition for the
-     *                                        column.
-     *
-     * @return float|string
-     */
-    public static function DPRODUCT($database, $field, $criteria)
-    {
-        return Database\DProduct::evaluate($database, $field, $criteria);
-    }
-
-    /**
-     * DSTDEV.
-     *
-     * Estimates the standard deviation of a population based on a sample by using the numbers in a
-     * column of a list or database that match conditions that you specify.
-     *
-     * Excel Function:
-     *        DSTDEV(database,field,criteria)
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Database\DStDev::evaluate()
-     *      Use the evaluate() method in the Database\DStDev class instead
-     *
-     * @param mixed[] $database The range of cells that makes up the list or database.
-     *                                        A database is a list of related data in which rows of related
-     *                                        information are records, and columns of data are fields. The
-     *                                        first row of the list contains labels for each column.
-     * @param int|string $field Indicates which column is used in the function. Enter the
-     *                                        column label enclosed between double quotation marks, such as
-     *                                        "Age" or "Yield," or a number (without quotation marks) that
-     *                                        represents the position of the column within the list: 1 for
-     *                                        the first column, 2 for the second column, and so on.
-     * @param mixed[] $criteria The range of cells that contains the conditions you specify.
-     *                                        You can use any range for the criteria argument, as long as it
-     *                                        includes at least one column label and at least one cell below
-     *                                        the column label in which you specify a condition for the
-     *                                        column.
-     *
-     * @return float|string
-     */
-    public static function DSTDEV($database, $field, $criteria)
-    {
-        return Database\DStDev::evaluate($database, $field, $criteria);
-    }
-
-    /**
-     * DSTDEVP.
-     *
-     * Calculates the standard deviation of a population based on the entire population by using the
-     * numbers in a column of a list or database that match conditions that you specify.
-     *
-     * Excel Function:
-     *        DSTDEVP(database,field,criteria)
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Database\DStDevP::evaluate()
-     *      Use the evaluate() method in the Database\DStDevP class instead
-     *
-     * @param mixed[] $database The range of cells that makes up the list or database.
-     *                                        A database is a list of related data in which rows of related
-     *                                        information are records, and columns of data are fields. The
-     *                                        first row of the list contains labels for each column.
-     * @param int|string $field Indicates which column is used in the function. Enter the
-     *                                        column label enclosed between double quotation marks, such as
-     *                                        "Age" or "Yield," or a number (without quotation marks) that
-     *                                        represents the position of the column within the list: 1 for
-     *                                        the first column, 2 for the second column, and so on.
-     * @param mixed[] $criteria The range of cells that contains the conditions you specify.
-     *                                        You can use any range for the criteria argument, as long as it
-     *                                        includes at least one column label and at least one cell below
-     *                                        the column label in which you specify a condition for the
-     *                                        column.
-     *
-     * @return float|string
-     */
-    public static function DSTDEVP($database, $field, $criteria)
-    {
-        return Database\DStDevP::evaluate($database, $field, $criteria);
-    }
-
-    /**
-     * DSUM.
-     *
-     * Adds the numbers in a column of a list or database that match conditions that you specify.
-     *
-     * Excel Function:
-     *        DSUM(database,field,criteria)
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Database\DSum::evaluate()
-     *      Use the evaluate() method in the Database\DSum class instead
-     *
-     * @param mixed[] $database The range of cells that makes up the list or database.
-     *                                        A database is a list of related data in which rows of related
-     *                                        information are records, and columns of data are fields. The
-     *                                        first row of the list contains labels for each column.
-     * @param int|string $field Indicates which column is used in the function. Enter the
-     *                                        column label enclosed between double quotation marks, such as
-     *                                        "Age" or "Yield," or a number (without quotation marks) that
-     *                                        represents the position of the column within the list: 1 for
-     *                                        the first column, 2 for the second column, and so on.
-     * @param mixed[] $criteria The range of cells that contains the conditions you specify.
-     *                                        You can use any range for the criteria argument, as long as it
-     *                                        includes at least one column label and at least one cell below
-     *                                        the column label in which you specify a condition for the
-     *                                        column.
-     *
-     * @return float|string
-     */
-    public static function DSUM($database, $field, $criteria)
-    {
-        return Database\DSum::evaluate($database, $field, $criteria);
-    }
-
-    /**
-     * DVAR.
-     *
-     * Estimates the variance of a population based on a sample by using the numbers in a column
-     * of a list or database that match conditions that you specify.
-     *
-     * Excel Function:
-     *        DVAR(database,field,criteria)
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Database\DVar::evaluate()
-     *      Use the evaluate() method in the Database\DVar class instead
-     *
-     * @param mixed[] $database The range of cells that makes up the list or database.
-     *                                        A database is a list of related data in which rows of related
-     *                                        information are records, and columns of data are fields. The
-     *                                        first row of the list contains labels for each column.
-     * @param int|string $field Indicates which column is used in the function. Enter the
-     *                                        column label enclosed between double quotation marks, such as
-     *                                        "Age" or "Yield," or a number (without quotation marks) that
-     *                                        represents the position of the column within the list: 1 for
-     *                                        the first column, 2 for the second column, and so on.
-     * @param mixed[] $criteria The range of cells that contains the conditions you specify.
-     *                                        You can use any range for the criteria argument, as long as it
-     *                                        includes at least one column label and at least one cell below
-     *                                        the column label in which you specify a condition for the
-     *                                        column.
-     *
-     * @return float|string (string if result is an error)
-     */
-    public static function DVAR($database, $field, $criteria)
-    {
-        return Database\DVar::evaluate($database, $field, $criteria);
-    }
-
-    /**
-     * DVARP.
-     *
-     * Calculates the variance of a population based on the entire population by using the numbers
-     * in a column of a list or database that match conditions that you specify.
-     *
-     * Excel Function:
-     *        DVARP(database,field,criteria)
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Database\DVarP::evaluate()
-     *      Use the evaluate() method in the Database\DVarP class instead
-     *
-     * @param mixed[] $database The range of cells that makes up the list or database.
-     *                                        A database is a list of related data in which rows of related
-     *                                        information are records, and columns of data are fields. The
-     *                                        first row of the list contains labels for each column.
-     * @param int|string $field Indicates which column is used in the function. Enter the
-     *                                        column label enclosed between double quotation marks, such as
-     *                                        "Age" or "Yield," or a number (without quotation marks) that
-     *                                        represents the position of the column within the list: 1 for
-     *                                        the first column, 2 for the second column, and so on.
-     * @param mixed[] $criteria The range of cells that contains the conditions you specify.
-     *                                        You can use any range for the criteria argument, as long as it
-     *                                        includes at least one column label and at least one cell below
-     *                                        the column label in which you specify a condition for the
-     *                                        column.
-     *
-     * @return float|string (string if result is an error)
-     */
-    public static function DVARP($database, $field, $criteria)
-    {
-        return Database\DVarP::evaluate($database, $field, $criteria);
-    }
-}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DAverage.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DAverage.php
index e30842dc5e..e54f1bb3d6 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DAverage.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DAverage.php
@@ -2,6 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Database;
 
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Calculation\Statistical\Averages;
 
 class DAverage extends DatabaseAbstract
@@ -18,7 +19,7 @@ class DAverage extends DatabaseAbstract
      *                          A database is a list of related data in which rows of related
      *                              information are records, and columns of data are fields. The
      *                              first row of the list contains labels for each column.
-     * @param int|string $field Indicates which column is used in the function. Enter the
+     * @param null|array|int|string $field Indicates which column is used in the function. Enter the
      *                              column label enclosed between double quotation marks, such as
      *                              "Age" or "Yield," or a number (without quotation marks) that
      *                              represents the position of the column within the list: 1 for
@@ -28,14 +29,12 @@ class DAverage extends DatabaseAbstract
      *                              includes at least one column label and at least one cell below
      *                              the column label in which you specify a condition for the
      *                              column.
-     *
-     * @return null|float|string
      */
-    public static function evaluate($database, $field, $criteria)
+    public static function evaluate(array $database, array|null|int|string $field, array $criteria): string|int|float
     {
         $field = self::fieldExtract($database, $field);
         if ($field === null) {
-            return null;
+            return ExcelError::VALUE();
         }
 
         return Averages::average(
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DCount.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DCount.php
index bf41d6b5e9..fff7ab0d23 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DCount.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DCount.php
@@ -2,6 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Database;
 
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Calculation\Statistical\Counts;
 
 class DCount extends DatabaseAbstract
@@ -19,7 +20,7 @@ class DCount extends DatabaseAbstract
      *                                        A database is a list of related data in which rows of related
      *                                        information are records, and columns of data are fields. The
      *                                        first row of the list contains labels for each column.
-     * @param null|int|string $field Indicates which column is used in the function. Enter the
+     * @param null|array|int|string $field Indicates which column is used in the function. Enter the
      *                                        column label enclosed between double quotation marks, such as
      *                                        "Age" or "Yield," or a number (without quotation marks) that
      *                                        represents the position of the column within the list: 1 for
@@ -29,12 +30,13 @@ class DCount extends DatabaseAbstract
      *                                        includes at least one column label and at least one cell below
      *                                        the column label in which you specify a condition for the
      *                                        column.
-     *
-     * @return int
      */
-    public static function evaluate($database, $field, $criteria)
+    public static function evaluate(array $database, array|null|int|string $field, array $criteria, bool $returnError = true): string|int
     {
         $field = self::fieldExtract($database, $field);
+        if ($returnError && $field === null) {
+            return ExcelError::VALUE();
+        }
 
         return Counts::COUNT(
             self::getFilteredColumn($database, $field, $criteria)
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DCountA.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DCountA.php
index c48e53c58a..f1a68c1bef 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DCountA.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DCountA.php
@@ -2,6 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Database;
 
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Calculation\Statistical\Counts;
 
 class DCountA extends DatabaseAbstract
@@ -18,7 +19,7 @@ class DCountA extends DatabaseAbstract
      *                                        A database is a list of related data in which rows of related
      *                                        information are records, and columns of data are fields. The
      *                                        first row of the list contains labels for each column.
-     * @param int|string $field Indicates which column is used in the function. Enter the
+     * @param null|array|int|string $field Indicates which column is used in the function. Enter the
      *                                        column label enclosed between double quotation marks, such as
      *                                        "Age" or "Yield," or a number (without quotation marks) that
      *                                        represents the position of the column within the list: 1 for
@@ -28,15 +29,16 @@ class DCountA extends DatabaseAbstract
      *                                        includes at least one column label and at least one cell below
      *                                        the column label in which you specify a condition for the
      *                                        column.
-     *
-     * @return int
      */
-    public static function evaluate($database, $field, $criteria)
+    public static function evaluate(array $database, array|null|int|string $field, array $criteria): string|int
     {
         $field = self::fieldExtract($database, $field);
+        if ($field === null) {
+            return ExcelError::VALUE();
+        }
 
         return Counts::COUNTA(
-            self::getFilteredColumn($database, $field ?? 0, $criteria)
+            self::getFilteredColumn($database, $field, $criteria)
         );
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DGet.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DGet.php
index c2ffe30265..dd0f006100 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DGet.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DGet.php
@@ -2,7 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Database;
 
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class DGet extends DatabaseAbstract
 {
@@ -19,7 +19,7 @@ class DGet extends DatabaseAbstract
      *                                        A database is a list of related data in which rows of related
      *                                        information are records, and columns of data are fields. The
      *                                        first row of the list contains labels for each column.
-     * @param int|string $field Indicates which column is used in the function. Enter the
+     * @param null|array|int|string $field Indicates which column is used in the function. Enter the
      *                                        column label enclosed between double quotation marks, such as
      *                                        "Age" or "Yield," or a number (without quotation marks) that
      *                                        represents the position of the column within the list: 1 for
@@ -29,19 +29,17 @@ class DGet extends DatabaseAbstract
      *                                        includes at least one column label and at least one cell below
      *                                        the column label in which you specify a condition for the
      *                                        column.
-     *
-     * @return mixed
      */
-    public static function evaluate($database, $field, $criteria)
+    public static function evaluate(array $database, array|null|int|string $field, array $criteria): null|float|int|string
     {
         $field = self::fieldExtract($database, $field);
         if ($field === null) {
-            return null;
+            return ExcelError::VALUE();
         }
 
         $columnData = self::getFilteredColumn($database, $field, $criteria);
         if (count($columnData) > 1) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         $row = array_pop($columnData);
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DMax.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DMax.php
index 9c5c7301e9..23b95a7d4a 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DMax.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DMax.php
@@ -2,6 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Database;
 
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Calculation\Statistical\Maximum;
 
 class DMax extends DatabaseAbstract
@@ -19,7 +20,7 @@ class DMax extends DatabaseAbstract
      *                                        A database is a list of related data in which rows of related
      *                                        information are records, and columns of data are fields. The
      *                                        first row of the list contains labels for each column.
-     * @param int|string $field Indicates which column is used in the function. Enter the
+     * @param null|array|int|string $field Indicates which column is used in the function. Enter the
      *                                        column label enclosed between double quotation marks, such as
      *                                        "Age" or "Yield," or a number (without quotation marks) that
      *                                        represents the position of the column within the list: 1 for
@@ -29,14 +30,12 @@ class DMax extends DatabaseAbstract
      *                                        includes at least one column label and at least one cell below
      *                                        the column label in which you specify a condition for the
      *                                        column.
-     *
-     * @return null|float|string
      */
-    public static function evaluate($database, $field, $criteria)
+    public static function evaluate(array $database, array|null|int|string $field, array $criteria, bool $returnError = true): null|float|string
     {
         $field = self::fieldExtract($database, $field);
         if ($field === null) {
-            return null;
+            return $returnError ? ExcelError::VALUE() : null;
         }
 
         return Maximum::max(
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DMin.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DMin.php
index e7b473a75d..541803dc9a 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DMin.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DMin.php
@@ -2,6 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Database;
 
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Calculation\Statistical\Minimum;
 
 class DMin extends DatabaseAbstract
@@ -19,7 +20,7 @@ class DMin extends DatabaseAbstract
      *                                        A database is a list of related data in which rows of related
      *                                        information are records, and columns of data are fields. The
      *                                        first row of the list contains labels for each column.
-     * @param int|string $field Indicates which column is used in the function. Enter the
+     * @param null|array|int|string $field Indicates which column is used in the function. Enter the
      *                                        column label enclosed between double quotation marks, such as
      *                                        "Age" or "Yield," or a number (without quotation marks) that
      *                                        represents the position of the column within the list: 1 for
@@ -29,14 +30,12 @@ class DMin extends DatabaseAbstract
      *                                        includes at least one column label and at least one cell below
      *                                        the column label in which you specify a condition for the
      *                                        column.
-     *
-     * @return null|float|string
      */
-    public static function evaluate($database, $field, $criteria)
+    public static function evaluate(array $database, array|null|int|string $field, array $criteria, bool $returnError = true): float|string|null
     {
         $field = self::fieldExtract($database, $field);
         if ($field === null) {
-            return null;
+            return $returnError ? ExcelError::VALUE() : null;
         }
 
         return Minimum::min(
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DProduct.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DProduct.php
index 35e3d47984..b60aa0dca5 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DProduct.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DProduct.php
@@ -2,6 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Database;
 
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
 
 class DProduct extends DatabaseAbstract
@@ -18,7 +19,7 @@ class DProduct extends DatabaseAbstract
      *                                        A database is a list of related data in which rows of related
      *                                        information are records, and columns of data are fields. The
      *                                        first row of the list contains labels for each column.
-     * @param int|string $field Indicates which column is used in the function. Enter the
+     * @param null|array|int|string $field Indicates which column is used in the function. Enter the
      *                                        column label enclosed between double quotation marks, such as
      *                                        "Age" or "Yield," or a number (without quotation marks) that
      *                                        represents the position of the column within the list: 1 for
@@ -28,14 +29,12 @@ class DProduct extends DatabaseAbstract
      *                                        includes at least one column label and at least one cell below
      *                                        the column label in which you specify a condition for the
      *                                        column.
-     *
-     * @return null|float|string
      */
-    public static function evaluate($database, $field, $criteria)
+    public static function evaluate(array $database, array|null|int|string $field, array $criteria): string|float
     {
         $field = self::fieldExtract($database, $field);
         if ($field === null) {
-            return null;
+            return ExcelError::VALUE();
         }
 
         return MathTrig\Operations::product(
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DStDev.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DStDev.php
index 7ec42bc469..dc354056a6 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DStDev.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DStDev.php
@@ -2,6 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Database;
 
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Calculation\Statistical\StandardDeviations;
 
 class DStDev extends DatabaseAbstract
@@ -19,7 +20,7 @@ class DStDev extends DatabaseAbstract
      *                                        A database is a list of related data in which rows of related
      *                                        information are records, and columns of data are fields. The
      *                                        first row of the list contains labels for each column.
-     * @param int|string $field Indicates which column is used in the function. Enter the
+     * @param null|array|int|string $field Indicates which column is used in the function. Enter the
      *                                        column label enclosed between double quotation marks, such as
      *                                        "Age" or "Yield," or a number (without quotation marks) that
      *                                        represents the position of the column within the list: 1 for
@@ -29,14 +30,12 @@ class DStDev extends DatabaseAbstract
      *                                        includes at least one column label and at least one cell below
      *                                        the column label in which you specify a condition for the
      *                                        column.
-     *
-     * @return null|float|string
      */
-    public static function evaluate($database, $field, $criteria)
+    public static function evaluate(array $database, array|null|int|string $field, array $criteria): float|string
     {
         $field = self::fieldExtract($database, $field);
         if ($field === null) {
-            return null;
+            return ExcelError::VALUE();
         }
 
         return StandardDeviations::STDEV(
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DStDevP.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DStDevP.php
index cbe241f024..a05d59686c 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DStDevP.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DStDevP.php
@@ -2,6 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Database;
 
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Calculation\Statistical\StandardDeviations;
 
 class DStDevP extends DatabaseAbstract
@@ -19,7 +20,7 @@ class DStDevP extends DatabaseAbstract
      *                                        A database is a list of related data in which rows of related
      *                                        information are records, and columns of data are fields. The
      *                                        first row of the list contains labels for each column.
-     * @param int|string $field Indicates which column is used in the function. Enter the
+     * @param null|array|int|string $field Indicates which column is used in the function. Enter the
      *                                        column label enclosed between double quotation marks, such as
      *                                        "Age" or "Yield," or a number (without quotation marks) that
      *                                        represents the position of the column within the list: 1 for
@@ -29,14 +30,12 @@ class DStDevP extends DatabaseAbstract
      *                                        includes at least one column label and at least one cell below
      *                                        the column label in which you specify a condition for the
      *                                        column.
-     *
-     * @return null|float|string
      */
-    public static function evaluate($database, $field, $criteria)
+    public static function evaluate(array $database, array|null|int|string $field, array $criteria): float|string
     {
         $field = self::fieldExtract($database, $field);
         if ($field === null) {
-            return null;
+            return ExcelError::VALUE();
         }
 
         return StandardDeviations::STDEVP(
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DSum.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DSum.php
index 03841c4e38..f9f926b017 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DSum.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DSum.php
@@ -2,6 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Database;
 
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
 
 class DSum extends DatabaseAbstract
@@ -18,7 +19,7 @@ class DSum extends DatabaseAbstract
      *                                        A database is a list of related data in which rows of related
      *                                        information are records, and columns of data are fields. The
      *                                        first row of the list contains labels for each column.
-     * @param int|string $field Indicates which column is used in the function. Enter the
+     * @param null|array|int|string $field Indicates which column is used in the function. Enter the
      *                                        column label enclosed between double quotation marks, such as
      *                                        "Age" or "Yield," or a number (without quotation marks) that
      *                                        represents the position of the column within the list: 1 for
@@ -28,14 +29,12 @@ class DSum extends DatabaseAbstract
      *                                        includes at least one column label and at least one cell below
      *                                        the column label in which you specify a condition for the
      *                                        column.
-     *
-     * @return null|float|string
      */
-    public static function evaluate($database, $field, $criteria)
+    public static function evaluate(array $database, array|null|int|string $field, array $criteria, bool $returnNull = false): null|float|string
     {
         $field = self::fieldExtract($database, $field);
         if ($field === null) {
-            return null;
+            return $returnNull ? null : ExcelError::VALUE();
         }
 
         return MathTrig\Sum::sumIgnoringStrings(
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DVar.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DVar.php
index 0a998c0312..33b5b56ea6 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DVar.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DVar.php
@@ -2,6 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Database;
 
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Calculation\Statistical\Variances;
 
 class DVar extends DatabaseAbstract
@@ -19,7 +20,7 @@ class DVar extends DatabaseAbstract
      *                                        A database is a list of related data in which rows of related
      *                                        information are records, and columns of data are fields. The
      *                                        first row of the list contains labels for each column.
-     * @param int|string $field Indicates which column is used in the function. Enter the
+     * @param null|array|int|string $field Indicates which column is used in the function. Enter the
      *                                        column label enclosed between double quotation marks, such as
      *                                        "Age" or "Yield," or a number (without quotation marks) that
      *                                        represents the position of the column within the list: 1 for
@@ -30,13 +31,13 @@ class DVar extends DatabaseAbstract
      *                                        the column label in which you specify a condition for the
      *                                        column.
      *
-     * @return null|float|string (string if result is an error)
+     * @return float|string (string if result is an error)
      */
-    public static function evaluate($database, $field, $criteria)
+    public static function evaluate(array $database, array|null|int|string $field, array $criteria): string|float
     {
         $field = self::fieldExtract($database, $field);
         if ($field === null) {
-            return null;
+            return ExcelError::VALUE();
         }
 
         return Variances::VAR(
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DVarP.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DVarP.php
index 77acbdfcbd..942a4a1f6d 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DVarP.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DVarP.php
@@ -2,6 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Database;
 
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Calculation\Statistical\Variances;
 
 class DVarP extends DatabaseAbstract
@@ -19,7 +20,7 @@ class DVarP extends DatabaseAbstract
      *                                        A database is a list of related data in which rows of related
      *                                        information are records, and columns of data are fields. The
      *                                        first row of the list contains labels for each column.
-     * @param int|string $field Indicates which column is used in the function. Enter the
+     * @param null|array|int|string $field Indicates which column is used in the function. Enter the
      *                                        column label enclosed between double quotation marks, such as
      *                                        "Age" or "Yield," or a number (without quotation marks) that
      *                                        represents the position of the column within the list: 1 for
@@ -30,13 +31,13 @@ class DVarP extends DatabaseAbstract
      *                                        the column label in which you specify a condition for the
      *                                        column.
      *
-     * @return null|float|string (string if result is an error)
+     * @return float|string (string if result is an error)
      */
-    public static function evaluate($database, $field, $criteria)
+    public static function evaluate(array $database, array|null|int|string $field, array $criteria): string|float
     {
         $field = self::fieldExtract($database, $field);
         if ($field === null) {
-            return null;
+            return ExcelError::VALUE();
         }
 
         return Variances::VARP(
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DatabaseAbstract.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DatabaseAbstract.php
index 2c9bb2de14..7d9885ee90 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DatabaseAbstract.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database/DatabaseAbstract.php
@@ -8,7 +8,7 @@
 
 abstract class DatabaseAbstract
 {
-    abstract public static function evaluate($database, $field, $criteria);
+    abstract public static function evaluate(array $database, array|null|int|string $field, array $criteria): null|float|int|string;
 
     /**
      * fieldExtract.
@@ -25,16 +25,21 @@ abstract public static function evaluate($database, $field, $criteria);
      *                                        represents the position of the column within the list: 1 for
      *                                        the first column, 2 for the second column, and so on.
      */
-    protected static function fieldExtract(array $database, $field): ?int
+    protected static function fieldExtract(array $database, mixed $field): ?int
     {
-        $field = strtoupper(Functions::flattenSingleValue($field));
+        $field = strtoupper(Functions::flattenSingleValue($field) ?? '');
         if ($field === '') {
             return null;
         }
 
         $fieldNames = array_map('strtoupper', array_shift($database));
         if (is_numeric($field)) {
-            return ((int) $field) - 1;
+            $field = (int) $field - 1;
+            if ($field < 0 || $field >= count($fieldNames)) {
+                return null;
+            }
+
+            return $field;
         }
         $key = array_search($field, array_values($fieldNames), true);
 
@@ -95,7 +100,7 @@ private static function buildQuery(array $criteriaNames, array $criteria): strin
         foreach ($criteria as $key => $criterion) {
             foreach ($criterion as $field => $value) {
                 $criterionName = $criteriaNames[$field];
-                if ($value !== null && $value !== '') {
+                if ($value !== null) {
                     $condition = self::buildCondition($value, $criterionName);
                     $baseQuery[$key][] = $condition;
                 }
@@ -103,16 +108,14 @@ private static function buildQuery(array $criteriaNames, array $criteria): strin
         }
 
         $rowQuery = array_map(
-            function ($rowValue) {
-                return (count($rowValue) > 1) ? 'AND(' . implode(',', $rowValue) . ')' : $rowValue[0];
-            },
+            fn ($rowValue): string => (count($rowValue) > 1) ? 'AND(' . implode(',', $rowValue) . ')' : ($rowValue[0] ?? ''),
             $baseQuery
         );
 
-        return (count($rowQuery) > 1) ? 'OR(' . implode(',', $rowQuery) . ')' : $rowQuery[0];
+        return (count($rowQuery) > 1) ? 'OR(' . implode(',', $rowQuery) . ')' : ($rowQuery[0] ?? '');
     }
 
-    private static function buildCondition($criterion, string $criterionName): string
+    private static function buildCondition(mixed $criterion, string $criterionName): string
     {
         $ifCondition = Functions::ifCondition($criterion);
 
@@ -153,7 +156,7 @@ private static function executeQuery(array $database, string $query, array $crit
         return $database;
     }
 
-    private static function processCondition(string $criterion, array $fields, array $dataValues, string $conditions)
+    private static function processCondition(string $criterion, array $fields, array $dataValues, string $conditions): string
     {
         $key = array_search($criterion, $fields, true);
 
@@ -163,7 +166,7 @@ private static function processCondition(string $criterion, array $fields, array
         } elseif ($dataValues[$key] !== null) {
             $dataValue = $dataValues[$key];
             // escape quotes if we have a string containing quotes
-            if (is_string($dataValue) && strpos($dataValue, '"') !== false) {
+            if (is_string($dataValue) && str_contains($dataValue, '"')) {
                 $dataValue = str_replace('"', '""', $dataValue);
             }
             $dataValue = (is_string($dataValue)) ? Calculation::wrapResult(strtoupper($dataValue)) : $dataValue;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTime.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTime.php
deleted file mode 100644
index 44a38c19e0..0000000000
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTime.php
+++ /dev/null
@@ -1,915 +0,0 @@
-<?php
-
-namespace PhpOffice\PhpSpreadsheet\Calculation;
-
-use DateTimeInterface;
-
-/**
- * @deprecated 1.18.0
- */
-class DateTime
-{
-    /**
-     * Identify if a year is a leap year or not.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See DateTimeExcel\Helpers::isLeapYear()
-     *      Use the isLeapYear method in the DateTimeExcel\Helpers class instead
-     *
-     * @param int|string $year The year to test
-     *
-     * @return bool TRUE if the year is a leap year, otherwise FALSE
-     */
-    public static function isLeapYear($year)
-    {
-        return DateTimeExcel\Helpers::isLeapYear($year);
-    }
-
-    /**
-     * getDateValue.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See DateTimeExcel\Helpers::getDateValue()
-     *      Use the getDateValue method in the DateTimeExcel\Helpers class instead
-     *
-     * @param mixed $dateValue
-     *
-     * @return mixed Excel date/time serial value, or string if error
-     */
-    public static function getDateValue($dateValue)
-    {
-        try {
-            return DateTimeExcel\Helpers::getDateValue($dateValue);
-        } catch (Exception $e) {
-            return $e->getMessage();
-        }
-    }
-
-    /**
-     * DATETIMENOW.
-     *
-     * Returns the current date and time.
-     * The NOW function is useful when you need to display the current date and time on a worksheet or
-     * calculate a value based on the current date and time, and have that value updated each time you
-     * open the worksheet.
-     *
-     * NOTE: When used in a Cell Formula, MS Excel changes the cell format so that it matches the date
-     * and time format of your regional settings. PhpSpreadsheet does not change cell formatting in this way.
-     *
-     * Excel Function:
-     *        NOW()
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See DateTimeExcel\Current::now()
-     *      Use the now method in the DateTimeExcel\Current class instead
-     *
-     * @return mixed Excel date/time serial value, PHP date/time serial value or PHP date/time object,
-     *                        depending on the value of the ReturnDateType flag
-     */
-    public static function DATETIMENOW()
-    {
-        return DateTimeExcel\Current::now();
-    }
-
-    /**
-     * DATENOW.
-     *
-     * Returns the current date.
-     * The NOW function is useful when you need to display the current date and time on a worksheet or
-     * calculate a value based on the current date and time, and have that value updated each time you
-     * open the worksheet.
-     *
-     * NOTE: When used in a Cell Formula, MS Excel changes the cell format so that it matches the date
-     * and time format of your regional settings. PhpSpreadsheet does not change cell formatting in this way.
-     *
-     * Excel Function:
-     *        TODAY()
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See DateTimeExcel\Current::today()
-     *      Use the today method in the DateTimeExcel\Current class instead
-     *
-     * @return mixed Excel date/time serial value, PHP date/time serial value or PHP date/time object,
-     *                        depending on the value of the ReturnDateType flag
-     */
-    public static function DATENOW()
-    {
-        return DateTimeExcel\Current::today();
-    }
-
-    /**
-     * DATE.
-     *
-     * The DATE function returns a value that represents a particular date.
-     *
-     * NOTE: When used in a Cell Formula, MS Excel changes the cell format so that it matches the date
-     * format of your regional settings. PhpSpreadsheet does not change cell formatting in this way.
-     *
-     *
-     * Excel Function:
-     *        DATE(year,month,day)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See DateTimeExcel\Date::fromYMD()
-     *      Use the fromYMD method in the DateTimeExcel\Date class instead
-     *
-     * PhpSpreadsheet is a lot more forgiving than MS Excel when passing non numeric values to this function.
-     * A Month name or abbreviation (English only at this point) such as 'January' or 'Jan' will still be accepted,
-     *     as will a day value with a suffix (e.g. '21st' rather than simply 21); again only English language.
-     *
-     * @param int $year The value of the year argument can include one to four digits.
-     *                                Excel interprets the year argument according to the configured
-     *                                date system: 1900 or 1904.
-     *                                If year is between 0 (zero) and 1899 (inclusive), Excel adds that
-     *                                value to 1900 to calculate the year. For example, DATE(108,1,2)
-     *                                returns January 2, 2008 (1900+108).
-     *                                If year is between 1900 and 9999 (inclusive), Excel uses that
-     *                                value as the year. For example, DATE(2008,1,2) returns January 2,
-     *                                2008.
-     *                                If year is less than 0 or is 10000 or greater, Excel returns the
-     *                                #NUM! error value.
-     * @param int $month A positive or negative integer representing the month of the year
-     *                                from 1 to 12 (January to December).
-     *                                If month is greater than 12, month adds that number of months to
-     *                                the first month in the year specified. For example, DATE(2008,14,2)
-     *                                returns the serial number representing February 2, 2009.
-     *                                If month is less than 1, month subtracts the magnitude of that
-     *                                number of months, plus 1, from the first month in the year
-     *                                specified. For example, DATE(2008,-3,2) returns the serial number
-     *                                representing September 2, 2007.
-     * @param int $day A positive or negative integer representing the day of the month
-     *                                from 1 to 31.
-     *                                If day is greater than the number of days in the month specified,
-     *                                day adds that number of days to the first day in the month. For
-     *                                example, DATE(2008,1,35) returns the serial number representing
-     *                                February 4, 2008.
-     *                                If day is less than 1, day subtracts the magnitude that number of
-     *                                days, plus one, from the first day of the month specified. For
-     *                                example, DATE(2008,1,-15) returns the serial number representing
-     *                                December 16, 2007.
-     *
-     * @return mixed Excel date/time serial value, PHP date/time serial value or PHP date/time object,
-     *                        depending on the value of the ReturnDateType flag
-     */
-    public static function DATE($year = 0, $month = 1, $day = 1)
-    {
-        return DateTimeExcel\Date::fromYMD($year, $month, $day);
-    }
-
-    /**
-     * TIME.
-     *
-     * The TIME function returns a value that represents a particular time.
-     *
-     * NOTE: When used in a Cell Formula, MS Excel changes the cell format so that it matches the time
-     * format of your regional settings. PhpSpreadsheet does not change cell formatting in this way.
-     *
-     * Excel Function:
-     *        TIME(hour,minute,second)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See DateTimeExcel\Time::fromHMS()
-     *      Use the fromHMS method in the DateTimeExcel\Time class instead
-     *
-     * @param int $hour A number from 0 (zero) to 32767 representing the hour.
-     *                                    Any value greater than 23 will be divided by 24 and the remainder
-     *                                    will be treated as the hour value. For example, TIME(27,0,0) =
-     *                                    TIME(3,0,0) = .125 or 3:00 AM.
-     * @param int $minute A number from 0 to 32767 representing the minute.
-     *                                    Any value greater than 59 will be converted to hours and minutes.
-     *                                    For example, TIME(0,750,0) = TIME(12,30,0) = .520833 or 12:30 PM.
-     * @param int $second A number from 0 to 32767 representing the second.
-     *                                    Any value greater than 59 will be converted to hours, minutes,
-     *                                    and seconds. For example, TIME(0,0,2000) = TIME(0,33,22) = .023148
-     *                                    or 12:33:20 AM
-     *
-     * @return mixed Excel date/time serial value, PHP date/time serial value or PHP date/time object,
-     *                        depending on the value of the ReturnDateType flag
-     */
-    public static function TIME($hour = 0, $minute = 0, $second = 0)
-    {
-        return DateTimeExcel\Time::fromHMS($hour, $minute, $second);
-    }
-
-    /**
-     * DATEVALUE.
-     *
-     * Returns a value that represents a particular date.
-     * Use DATEVALUE to convert a date represented by a text string to an Excel or PHP date/time stamp
-     * value.
-     *
-     * NOTE: When used in a Cell Formula, MS Excel changes the cell format so that it matches the date
-     * format of your regional settings. PhpSpreadsheet does not change cell formatting in this way.
-     *
-     * Excel Function:
-     *        DATEVALUE(dateValue)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See DateTimeExcel\DateValue::fromString()
-     *      Use the fromString method in the DateTimeExcel\DateValue class instead
-     *
-     * @param string $dateValue Text that represents a date in a Microsoft Excel date format.
-     *                                    For example, "1/30/2008" or "30-Jan-2008" are text strings within
-     *                                    quotation marks that represent dates. Using the default date
-     *                                    system in Excel for Windows, date_text must represent a date from
-     *                                    January 1, 1900, to December 31, 9999. Using the default date
-     *                                    system in Excel for the Macintosh, date_text must represent a date
-     *                                    from January 1, 1904, to December 31, 9999. DATEVALUE returns the
-     *                                    #VALUE! error value if date_text is out of this range.
-     *
-     * @return mixed Excel date/time serial value, PHP date/time serial value or PHP date/time object,
-     *                        depending on the value of the ReturnDateType flag
-     */
-    public static function DATEVALUE($dateValue)
-    {
-        return DateTimeExcel\DateValue::fromString($dateValue);
-    }
-
-    /**
-     * TIMEVALUE.
-     *
-     * Returns a value that represents a particular time.
-     * Use TIMEVALUE to convert a time represented by a text string to an Excel or PHP date/time stamp
-     * value.
-     *
-     * NOTE: When used in a Cell Formula, MS Excel changes the cell format so that it matches the time
-     * format of your regional settings. PhpSpreadsheet does not change cell formatting in this way.
-     *
-     * Excel Function:
-     *        TIMEVALUE(timeValue)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See DateTimeExcel\TimeValue::fromString()
-     *      Use the fromString method in the DateTimeExcel\TimeValue class instead
-     *
-     * @param string $timeValue A text string that represents a time in any one of the Microsoft
-     *                                    Excel time formats; for example, "6:45 PM" and "18:45" text strings
-     *                                    within quotation marks that represent time.
-     *                                    Date information in time_text is ignored.
-     *
-     * @return mixed Excel date/time serial value, PHP date/time serial value or PHP date/time object,
-     *                        depending on the value of the ReturnDateType flag
-     */
-    public static function TIMEVALUE($timeValue)
-    {
-        return DateTimeExcel\TimeValue::fromString($timeValue);
-    }
-
-    /**
-     * DATEDIF.
-     *
-     * Excel Function:
-     *        DATEDIF(startdate, enddate, unit)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See DateTimeExcel\Difference::interval()
-     *      Use the interval method in the DateTimeExcel\Difference class instead
-     *
-     * @param mixed $startDate Excel date serial value, PHP date/time stamp, PHP DateTime object
-     *                                    or a standard date string
-     * @param mixed $endDate Excel date serial value, PHP date/time stamp, PHP DateTime object
-     *                                    or a standard date string
-     * @param string $unit
-     *
-     * @return int|string Interval between the dates
-     */
-    public static function DATEDIF($startDate = 0, $endDate = 0, $unit = 'D')
-    {
-        return DateTimeExcel\Difference::interval($startDate, $endDate, $unit);
-    }
-
-    /**
-     * DAYS.
-     *
-     * Returns the number of days between two dates
-     *
-     * Excel Function:
-     *        DAYS(endDate, startDate)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See DateTimeExcel\Days::between()
-     *      Use the between method in the DateTimeExcel\Days class instead
-     *
-     * @param DateTimeInterface|float|int|string $endDate Excel date serial value (float),
-     * PHP date timestamp (integer), PHP DateTime object, or a standard date string
-     * @param DateTimeInterface|float|int|string $startDate Excel date serial value (float),
-     * PHP date timestamp (integer), PHP DateTime object, or a standard date string
-     *
-     * @return int|string Number of days between start date and end date or an error
-     */
-    public static function DAYS($endDate = 0, $startDate = 0)
-    {
-        return DateTimeExcel\Days::between($endDate, $startDate);
-    }
-
-    /**
-     * DAYS360.
-     *
-     * Returns the number of days between two dates based on a 360-day year (twelve 30-day months),
-     * which is used in some accounting calculations. Use this function to help compute payments if
-     * your accounting system is based on twelve 30-day months.
-     *
-     * Excel Function:
-     *        DAYS360(startDate,endDate[,method])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See DateTimeExcel\Days360::between()
-     *      Use the between method in the DateTimeExcel\Days360 class instead
-     *
-     * @param mixed $startDate Excel date serial value (float), PHP date timestamp (integer),
-     *                                        PHP DateTime object, or a standard date string
-     * @param mixed $endDate Excel date serial value (float), PHP date timestamp (integer),
-     *                                        PHP DateTime object, or a standard date string
-     * @param bool $method US or European Method
-     *                                        FALSE or omitted: U.S. (NASD) method. If the starting date is
-     *                                        the last day of a month, it becomes equal to the 30th of the
-     *                                        same month. If the ending date is the last day of a month and
-     *                                        the starting date is earlier than the 30th of a month, the
-     *                                        ending date becomes equal to the 1st of the next month;
-     *                                        otherwise the ending date becomes equal to the 30th of the
-     *                                        same month.
-     *                                        TRUE: European method. Starting dates and ending dates that
-     *                                        occur on the 31st of a month become equal to the 30th of the
-     *                                        same month.
-     *
-     * @return int|string Number of days between start date and end date
-     */
-    public static function DAYS360($startDate = 0, $endDate = 0, $method = false)
-    {
-        return DateTimeExcel\Days360::between($startDate, $endDate, $method);
-    }
-
-    /**
-     * YEARFRAC.
-     *
-     * Calculates the fraction of the year represented by the number of whole days between two dates
-     * (the start_date and the end_date).
-     * Use the YEARFRAC worksheet function to identify the proportion of a whole year's benefits or
-     * obligations to assign to a specific term.
-     *
-     * Excel Function:
-     *        YEARFRAC(startDate,endDate[,method])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See DateTimeExcel\YearFrac::fraction()
-     *      Use the fraction method in the DateTimeExcel\YearFrac class instead
-     *
-     * See https://lists.oasis-open.org/archives/office-formula/200806/msg00039.html
-     *     for description of algorithm used in Excel
-     *
-     * @param mixed $startDate Excel date serial value (float), PHP date timestamp (integer),
-     *                                    PHP DateTime object, or a standard date string
-     * @param mixed $endDate Excel date serial value (float), PHP date timestamp (integer),
-     *                                    PHP DateTime object, or a standard date string
-     * @param int $method Method used for the calculation
-     *                                        0 or omitted    US (NASD) 30/360
-     *                                        1                Actual/actual
-     *                                        2                Actual/360
-     *                                        3                Actual/365
-     *                                        4                European 30/360
-     *
-     * @return float|string fraction of the year, or a string containing an error
-     */
-    public static function YEARFRAC($startDate = 0, $endDate = 0, $method = 0)
-    {
-        return DateTimeExcel\YearFrac::fraction($startDate, $endDate, $method);
-    }
-
-    /**
-     * NETWORKDAYS.
-     *
-     * Returns the number of whole working days between start_date and end_date. Working days
-     * exclude weekends and any dates identified in holidays.
-     * Use NETWORKDAYS to calculate employee benefits that accrue based on the number of days
-     * worked during a specific term.
-     *
-     * Excel Function:
-     *        NETWORKDAYS(startDate,endDate[,holidays[,holiday[,...]]])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See DateTimeExcel\NetworkDays::count()
-     *      Use the count method in the DateTimeExcel\NetworkDays class instead
-     *
-     * @param mixed $startDate Excel date serial value (float), PHP date timestamp (integer),
-     *                                            PHP DateTime object, or a standard date string
-     * @param mixed $endDate Excel date serial value (float), PHP date timestamp (integer),
-     *                                            PHP DateTime object, or a standard date string
-     * @param mixed $dateArgs
-     *
-     * @return int|string Interval between the dates
-     */
-    public static function NETWORKDAYS($startDate, $endDate, ...$dateArgs)
-    {
-        return DateTimeExcel\NetworkDays::count($startDate, $endDate, ...$dateArgs);
-    }
-
-    /**
-     * WORKDAY.
-     *
-     * Returns the date that is the indicated number of working days before or after a date (the
-     * starting date). Working days exclude weekends and any dates identified as holidays.
-     * Use WORKDAY to exclude weekends or holidays when you calculate invoice due dates, expected
-     * delivery times, or the number of days of work performed.
-     *
-     * Excel Function:
-     *        WORKDAY(startDate,endDays[,holidays[,holiday[,...]]])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See DateTimeExcel\WorkDay::date()
-     *      Use the date method in the DateTimeExcel\WorkDay class instead
-     *
-     * @param mixed $startDate Excel date serial value (float), PHP date timestamp (integer),
-     *                                        PHP DateTime object, or a standard date string
-     * @param int $endDays The number of nonweekend and nonholiday days before or after
-     *                                        startDate. A positive value for days yields a future date; a
-     *                                        negative value yields a past date.
-     * @param mixed $dateArgs
-     *
-     * @return mixed Excel date/time serial value, PHP date/time serial value or PHP date/time object,
-     *                        depending on the value of the ReturnDateType flag
-     */
-    public static function WORKDAY($startDate, $endDays, ...$dateArgs)
-    {
-        return DateTimeExcel\WorkDay::date($startDate, $endDays, ...$dateArgs);
-    }
-
-    /**
-     * DAYOFMONTH.
-     *
-     * Returns the day of the month, for a specified date. The day is given as an integer
-     * ranging from 1 to 31.
-     *
-     * Excel Function:
-     *        DAY(dateValue)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See DateTimeExcel\DateParts::day()
-     *      Use the day method in the DateTimeExcel\DateParts class instead
-     *
-     * @param mixed $dateValue Excel date serial value (float), PHP date timestamp (integer),
-     *                                    PHP DateTime object, or a standard date string
-     *
-     * @return int|string Day of the month
-     */
-    public static function DAYOFMONTH($dateValue = 1)
-    {
-        return DateTimeExcel\DateParts::day($dateValue);
-    }
-
-    /**
-     * WEEKDAY.
-     *
-     * Returns the day of the week for a specified date. The day is given as an integer
-     * ranging from 0 to 7 (dependent on the requested style).
-     *
-     * Excel Function:
-     *        WEEKDAY(dateValue[,style])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See DateTimeExcel\Week::day()
-     *      Use the day method in the DateTimeExcel\Week class instead
-     *
-     * @param float|int|string $dateValue Excel date serial value (float), PHP date timestamp (integer),
-     *                                    PHP DateTime object, or a standard date string
-     * @param int $style A number that determines the type of return value
-     *                                        1 or omitted    Numbers 1 (Sunday) through 7 (Saturday).
-     *                                        2                Numbers 1 (Monday) through 7 (Sunday).
-     *                                        3                Numbers 0 (Monday) through 6 (Sunday).
-     *
-     * @return int|string Day of the week value
-     */
-    public static function WEEKDAY($dateValue = 1, $style = 1)
-    {
-        return DateTimeExcel\Week::day($dateValue, $style);
-    }
-
-    /**
-     * STARTWEEK_SUNDAY.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use DateTimeExcel\Constants\STARTWEEK_SUNDAY instead
-     */
-    const STARTWEEK_SUNDAY = 1;
-
-    /**
-     * STARTWEEK_MONDAY.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use DateTimeExcel\Constants\STARTWEEK_MONDAY instead
-     */
-    const STARTWEEK_MONDAY = 2;
-
-    /**
-     * STARTWEEK_MONDAY_ALT.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use DateTimeExcel\Constants\STARTWEEK_MONDAY_ALT instead
-     */
-    const STARTWEEK_MONDAY_ALT = 11;
-
-    /**
-     * STARTWEEK_TUESDAY.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use DateTimeExcel\Constants\STARTWEEK_TUESDAY instead
-     */
-    const STARTWEEK_TUESDAY = 12;
-
-    /**
-     * STARTWEEK_WEDNESDAY.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use DateTimeExcel\Constants\STARTWEEK_WEDNESDAY instead
-     */
-    const STARTWEEK_WEDNESDAY = 13;
-
-    /**
-     * STARTWEEK_THURSDAY.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use DateTimeExcel\Constants\STARTWEEK_THURSDAY instead
-     */
-    const STARTWEEK_THURSDAY = 14;
-
-    /**
-     * STARTWEEK_FRIDAY.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use DateTimeExcel\Constants\STARTWEEK_FRIDAY instead
-     */
-    const STARTWEEK_FRIDAY = 15;
-
-    /**
-     * STARTWEEK_SATURDAY.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use DateTimeExcel\Constants\STARTWEEK_SATURDAY instead
-     */
-    const STARTWEEK_SATURDAY = 16;
-
-    /**
-     * STARTWEEK_SUNDAY_ALT.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use DateTimeExcel\Constants\STARTWEEK_SUNDAY_ALT instead
-     */
-    const STARTWEEK_SUNDAY_ALT = 17;
-
-    /**
-     * DOW_SUNDAY.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use DateTimeExcel\Constants\DOW_SUNDAY instead
-     */
-    const DOW_SUNDAY = 1;
-
-    /**
-     * DOW_MONDAY.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use DateTimeExcel\Constants\DOW_MONDAY instead
-     */
-    const DOW_MONDAY = 2;
-
-    /**
-     * DOW_TUESDAY.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use DateTimeExcel\Constants\DOW_TUESDAY instead
-     */
-    const DOW_TUESDAY = 3;
-
-    /**
-     * DOW_WEDNESDAY.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use DateTimeExcel\Constants\DOW_WEDNESDAY instead
-     */
-    const DOW_WEDNESDAY = 4;
-
-    /**
-     * DOW_THURSDAY.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use DateTimeExcel\Constants\DOW_THURSDAY instead
-     */
-    const DOW_THURSDAY = 5;
-
-    /**
-     * DOW_FRIDAY.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use DateTimeExcel\Constants\DOW_FRIDAY instead
-     */
-    const DOW_FRIDAY = 6;
-
-    /**
-     * DOW_SATURDAY.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use DateTimeExcel\Constants\DOW_SATURDAY instead
-     */
-    const DOW_SATURDAY = 7;
-
-    /**
-     * STARTWEEK_MONDAY_ISO.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use DateTimeExcel\Constants\STARTWEEK_MONDAY_ISO instead
-     */
-    const STARTWEEK_MONDAY_ISO = 21;
-
-    /**
-     * METHODARR.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use DateTimeExcel\Constants\METHODARR instead
-     */
-    const METHODARR = [
-        self::STARTWEEK_SUNDAY => self::DOW_SUNDAY,
-        self::DOW_MONDAY,
-        self::STARTWEEK_MONDAY_ALT => self::DOW_MONDAY,
-        self::DOW_TUESDAY,
-        self::DOW_WEDNESDAY,
-        self::DOW_THURSDAY,
-        self::DOW_FRIDAY,
-        self::DOW_SATURDAY,
-        self::DOW_SUNDAY,
-        self::STARTWEEK_MONDAY_ISO => self::STARTWEEK_MONDAY_ISO,
-    ];
-
-    /**
-     * WEEKNUM.
-     *
-     * Returns the week of the year for a specified date.
-     * The WEEKNUM function considers the week containing January 1 to be the first week of the year.
-     * However, there is a European standard that defines the first week as the one with the majority
-     * of days (four or more) falling in the new year. This means that for years in which there are
-     * three days or less in the first week of January, the WEEKNUM function returns week numbers
-     * that are incorrect according to the European standard.
-     *
-     * Excel Function:
-     *        WEEKNUM(dateValue[,style])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See DateTimeExcel\Week::number(()
-     *      Use the number method in the DateTimeExcel\Week class instead
-     *
-     * @param mixed $dateValue Excel date serial value (float), PHP date timestamp (integer),
-     *                                    PHP DateTime object, or a standard date string
-     * @param int $method Week begins on Sunday or Monday
-     *                                        1 or omitted    Week begins on Sunday.
-     *                                        2                Week begins on Monday.
-     *                                        11               Week begins on Monday.
-     *                                        12               Week begins on Tuesday.
-     *                                        13               Week begins on Wednesday.
-     *                                        14               Week begins on Thursday.
-     *                                        15               Week begins on Friday.
-     *                                        16               Week begins on Saturday.
-     *                                        17               Week begins on Sunday.
-     *                                        21               ISO (Jan. 4 is week 1, begins on Monday).
-     *
-     * @return int|string Week Number
-     */
-    public static function WEEKNUM($dateValue = 1, $method = self::STARTWEEK_SUNDAY)
-    {
-        return DateTimeExcel\Week::number($dateValue, $method);
-    }
-
-    /**
-     * ISOWEEKNUM.
-     *
-     * Returns the ISO 8601 week number of the year for a specified date.
-     *
-     * Excel Function:
-     *        ISOWEEKNUM(dateValue)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See DateTimeExcel\Week::isoWeekNumber()
-     *      Use the isoWeekNumber method in the DateTimeExcel\Week class instead
-     *
-     * @param mixed $dateValue Excel date serial value (float), PHP date timestamp (integer),
-     *                                    PHP DateTime object, or a standard date string
-     *
-     * @return int|string Week Number
-     */
-    public static function ISOWEEKNUM($dateValue = 1)
-    {
-        return DateTimeExcel\Week::isoWeekNumber($dateValue);
-    }
-
-    /**
-     * MONTHOFYEAR.
-     *
-     * Returns the month of a date represented by a serial number.
-     * The month is given as an integer, ranging from 1 (January) to 12 (December).
-     *
-     * Excel Function:
-     *        MONTH(dateValue)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See DateTimeExcel\DateParts::month()
-     *      Use the month method in the DateTimeExcel\DateParts class instead
-     *
-     * @param mixed $dateValue Excel date serial value (float), PHP date timestamp (integer),
-     *                                    PHP DateTime object, or a standard date string
-     *
-     * @return int|string Month of the year
-     */
-    public static function MONTHOFYEAR($dateValue = 1)
-    {
-        return DateTimeExcel\DateParts::month($dateValue);
-    }
-
-    /**
-     * YEAR.
-     *
-     * Returns the year corresponding to a date.
-     * The year is returned as an integer in the range 1900-9999.
-     *
-     * Excel Function:
-     *        YEAR(dateValue)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See DateTimeExcel\DateParts::year()
-     *      Use the ear method in the DateTimeExcel\DateParts class instead
-     *
-     * @param mixed $dateValue Excel date serial value (float), PHP date timestamp (integer),
-     *                                    PHP DateTime object, or a standard date string
-     *
-     * @return int|string Year
-     */
-    public static function YEAR($dateValue = 1)
-    {
-        return DateTimeExcel\DateParts::year($dateValue);
-    }
-
-    /**
-     * HOUROFDAY.
-     *
-     * Returns the hour of a time value.
-     * The hour is given as an integer, ranging from 0 (12:00 A.M.) to 23 (11:00 P.M.).
-     *
-     * Excel Function:
-     *        HOUR(timeValue)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See DateTimeExcel\TimeParts::hour()
-     *      Use the hour method in the DateTimeExcel\TimeParts class instead
-     *
-     * @param mixed $timeValue Excel date serial value (float), PHP date timestamp (integer),
-     *                                    PHP DateTime object, or a standard time string
-     *
-     * @return int|string Hour
-     */
-    public static function HOUROFDAY($timeValue = 0)
-    {
-        return DateTimeExcel\TimeParts::hour($timeValue);
-    }
-
-    /**
-     * MINUTE.
-     *
-     * Returns the minutes of a time value.
-     * The minute is given as an integer, ranging from 0 to 59.
-     *
-     * Excel Function:
-     *        MINUTE(timeValue)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See DateTimeExcel\TimeParts::minute()
-     *      Use the minute method in the DateTimeExcel\TimeParts class instead
-     *
-     * @param mixed $timeValue Excel date serial value (float), PHP date timestamp (integer),
-     *                                    PHP DateTime object, or a standard time string
-     *
-     * @return int|string Minute
-     */
-    public static function MINUTE($timeValue = 0)
-    {
-        return DateTimeExcel\TimeParts::minute($timeValue);
-    }
-
-    /**
-     * SECOND.
-     *
-     * Returns the seconds of a time value.
-     * The second is given as an integer in the range 0 (zero) to 59.
-     *
-     * Excel Function:
-     *        SECOND(timeValue)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See DateTimeExcel\TimeParts::second()
-     *      Use the second method in the DateTimeExcel\TimeParts class instead
-     *
-     * @param mixed $timeValue Excel date serial value (float), PHP date timestamp (integer),
-     *                                    PHP DateTime object, or a standard time string
-     *
-     * @return int|string Second
-     */
-    public static function SECOND($timeValue = 0)
-    {
-        return DateTimeExcel\TimeParts::second($timeValue);
-    }
-
-    /**
-     * EDATE.
-     *
-     * Returns the serial number that represents the date that is the indicated number of months
-     * before or after a specified date (the start_date).
-     * Use EDATE to calculate maturity dates or due dates that fall on the same day of the month
-     * as the date of issue.
-     *
-     * Excel Function:
-     *        EDATE(dateValue,adjustmentMonths)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See DateTimeExcel\Month::adjust()
-     *      Use the adjust method in the DateTimeExcel\Edate class instead
-     *
-     * @param mixed $dateValue Excel date serial value (float), PHP date timestamp (integer),
-     *                                        PHP DateTime object, or a standard date string
-     * @param int $adjustmentMonths The number of months before or after start_date.
-     *                                        A positive value for months yields a future date;
-     *                                        a negative value yields a past date.
-     *
-     * @return mixed Excel date/time serial value, PHP date/time serial value or PHP date/time object,
-     *                        depending on the value of the ReturnDateType flag
-     */
-    public static function EDATE($dateValue = 1, $adjustmentMonths = 0)
-    {
-        return DateTimeExcel\Month::adjust($dateValue, $adjustmentMonths);
-    }
-
-    /**
-     * EOMONTH.
-     *
-     * Returns the date value for the last day of the month that is the indicated number of months
-     * before or after start_date.
-     * Use EOMONTH to calculate maturity dates or due dates that fall on the last day of the month.
-     *
-     * Excel Function:
-     *        EOMONTH(dateValue,adjustmentMonths)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See DateTimeExcel\Month::lastDay()
-     *      Use the lastDay method in the DateTimeExcel\EoMonth class instead
-     *
-     * @param mixed $dateValue Excel date serial value (float), PHP date timestamp (integer),
-     *                                        PHP DateTime object, or a standard date string
-     * @param int $adjustmentMonths The number of months before or after start_date.
-     *                                        A positive value for months yields a future date;
-     *                                        a negative value yields a past date.
-     *
-     * @return mixed Excel date/time serial value, PHP date/time serial value or PHP date/time object,
-     *                        depending on the value of the ReturnDateType flag
-     */
-    public static function EOMONTH($dateValue = 1, $adjustmentMonths = 0)
-    {
-        return DateTimeExcel\Month::lastDay($dateValue, $adjustmentMonths);
-    }
-}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Current.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Current.php
index 7a70978ee2..088e3794c7 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Current.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Current.php
@@ -2,8 +2,9 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
 
+use DateTime;
 use DateTimeImmutable;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class Current
 {
@@ -21,15 +22,15 @@ class Current
      * Excel Function:
      *        TODAY()
      *
-     * @return mixed Excel date/time serial value, PHP date/time serial value or PHP date/time object,
+     * @return DateTime|float|int|string Excel date/time serial value, PHP date/time serial value or PHP date/time object,
      *                        depending on the value of the ReturnDateType flag
      */
-    public static function today()
+    public static function today(): DateTime|float|int|string
     {
         $dti = new DateTimeImmutable();
-        $dateArray = date_parse($dti->format('c'));
+        $dateArray = Helpers::dateParse($dti->format('c'));
 
-        return is_array($dateArray) ? Helpers::returnIn3FormatsArray($dateArray, true) : Functions::VALUE();
+        return Helpers::dateParseSucceeded($dateArray) ? Helpers::returnIn3FormatsArray($dateArray, true) : ExcelError::VALUE();
     }
 
     /**
@@ -46,14 +47,14 @@ public static function today()
      * Excel Function:
      *        NOW()
      *
-     * @return mixed Excel date/time serial value, PHP date/time serial value or PHP date/time object,
+     * @return DateTime|float|int|string Excel date/time serial value, PHP date/time serial value or PHP date/time object,
      *                        depending on the value of the ReturnDateType flag
      */
-    public static function now()
+    public static function now(): DateTime|float|int|string
     {
         $dti = new DateTimeImmutable();
-        $dateArray = date_parse($dti->format('c'));
+        $dateArray = Helpers::dateParse($dti->format('c'));
 
-        return is_array($dateArray) ? Helpers::returnIn3FormatsArray($dateArray) : Functions::VALUE();
+        return Helpers::dateParseSucceeded($dateArray) ? Helpers::returnIn3FormatsArray($dateArray) : ExcelError::VALUE();
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Date.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Date.php
index d18e2371c3..e0e4b25f88 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Date.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Date.php
@@ -2,13 +2,17 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
 
+use DateTime;
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Shared\Date as SharedDateHelper;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 
 class Date
 {
+    use ArrayEnabled;
+
     /**
      * DATE.
      *
@@ -24,7 +28,7 @@ class Date
      * A Month name or abbreviation (English only at this point) such as 'January' or 'Jan' will still be accepted,
      *     as will a day value with a suffix (e.g. '21st' rather than simply 21); again only English language.
      *
-     * @param int $year The value of the year argument can include one to four digits.
+     * @param array|float|int|string $year The value of the year argument can include one to four digits.
      *                                Excel interprets the year argument according to the configured
      *                                date system: 1900 or 1904.
      *                                If year is between 0 (zero) and 1899 (inclusive), Excel adds that
@@ -35,7 +39,7 @@ class Date
      *                                2008.
      *                                If year is less than 0 or is 10000 or greater, Excel returns the
      *                                #NUM! error value.
-     * @param int $month A positive or negative integer representing the month of the year
+     * @param array|float|int|string $month A positive or negative integer representing the month of the year
      *                                from 1 to 12 (January to December).
      *                                If month is greater than 12, month adds that number of months to
      *                                the first month in the year specified. For example, DATE(2008,14,2)
@@ -44,7 +48,7 @@ class Date
      *                                number of months, plus 1, from the first month in the year
      *                                specified. For example, DATE(2008,-3,2) returns the serial number
      *                                representing September 2, 2007.
-     * @param int $day A positive or negative integer representing the day of the month
+     * @param array|float|int|string $day A positive or negative integer representing the day of the month
      *                                from 1 to 31.
      *                                If day is greater than the number of days in the month specified,
      *                                day adds that number of days to the first day in the month. For
@@ -55,11 +59,17 @@ class Date
      *                                example, DATE(2008,1,-15) returns the serial number representing
      *                                December 16, 2007.
      *
-     * @return mixed Excel date/time serial value, PHP date/time serial value or PHP date/time object,
+     * @return array|DateTime|float|int|string Excel date/time serial value, PHP date/time serial value or PHP date/time object,
      *                        depending on the value of the ReturnDateType flag
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function fromYMD($year, $month, $day)
+    public static function fromYMD(array|float|int|string $year, array|float|int|string $month, array|float|int|string $day): float|int|DateTime|string|array
     {
+        if (is_array($year) || is_array($month) || is_array($day)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $year, $month, $day);
+        }
+
         $baseYear = SharedDateHelper::getExcelCalendar();
 
         try {
@@ -79,23 +89,20 @@ public static function fromYMD($year, $month, $day)
 
     /**
      * Convert year from multiple formats to int.
-     *
-     * @param mixed $year
      */
-    private static function getYear($year, int $baseYear): int
+    private static function getYear(mixed $year, int $baseYear): int
     {
-        $year = Functions::flattenSingleValue($year);
         $year = ($year !== null) ? StringHelper::testStringAsNumeric((string) $year) : 0;
         if (!is_numeric($year)) {
-            throw new Exception(Functions::VALUE());
+            throw new Exception(ExcelError::VALUE());
         }
         $year = (int) $year;
 
         if ($year < ($baseYear - 1900)) {
-            throw new Exception(Functions::NAN());
+            throw new Exception(ExcelError::NAN());
         }
         if ((($baseYear - 1900) !== 0) && ($year < $baseYear) && ($year >= 1900)) {
-            throw new Exception(Functions::NAN());
+            throw new Exception(ExcelError::NAN());
         }
 
         if (($year < $baseYear) && ($year >= ($baseYear - 1900))) {
@@ -107,20 +114,16 @@ private static function getYear($year, int $baseYear): int
 
     /**
      * Convert month from multiple formats to int.
-     *
-     * @param mixed $month
      */
-    private static function getMonth($month): int
+    private static function getMonth(mixed $month): int
     {
-        $month = Functions::flattenSingleValue($month);
-
         if (($month !== null) && (!is_numeric($month))) {
             $month = SharedDateHelper::monthStringToNumber($month);
         }
 
         $month = ($month !== null) ? StringHelper::testStringAsNumeric((string) $month) : 0;
         if (!is_numeric($month)) {
-            throw new Exception(Functions::VALUE());
+            throw new Exception(ExcelError::VALUE());
         }
 
         return (int) $month;
@@ -128,20 +131,16 @@ private static function getMonth($month): int
 
     /**
      * Convert day from multiple formats to int.
-     *
-     * @param mixed $day
      */
-    private static function getDay($day): int
+    private static function getDay(mixed $day): int
     {
-        $day = Functions::flattenSingleValue($day);
-
         if (($day !== null) && (!is_numeric($day))) {
             $day = SharedDateHelper::dayStringToNumber($day);
         }
 
         $day = ($day !== null) ? StringHelper::testStringAsNumeric((string) $day) : 0;
         if (!is_numeric($day)) {
-            throw new Exception(Functions::VALUE());
+            throw new Exception(ExcelError::VALUE());
         }
 
         return (int) $day;
@@ -162,7 +161,7 @@ private static function adjustYearMonth(int &$year, int &$month, int $baseYear):
 
         // Re-validate the year parameter after adjustments
         if (($year < $baseYear) || ($year >= 10000)) {
-            throw new Exception(Functions::NAN());
+            throw new Exception(ExcelError::NAN());
         }
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/DateParts.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/DateParts.php
index 37ea031515..60e4de19be 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/DateParts.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/DateParts.php
@@ -2,12 +2,15 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Shared\Date as SharedDateHelper;
 
 class DateParts
 {
+    use ArrayEnabled;
+
     /**
      * DAYOFMONTH.
      *
@@ -19,11 +22,18 @@ class DateParts
      *
      * @param mixed $dateValue Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard date string
+     *                         Or can be an array of date values
      *
-     * @return int|string Day of the month
+     * @return array|int|string Day of the month
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function day($dateValue)
+    public static function day(mixed $dateValue): array|int|string
     {
+        if (is_array($dateValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $dateValue);
+        }
+
         $weirdResult = self::weirdCondition($dateValue);
         if ($weirdResult >= 0) {
             return $weirdResult;
@@ -37,6 +47,7 @@ public static function day($dateValue)
 
         // Execute function
         $PHPDateObject = SharedDateHelper::excelToDateTimeObject($dateValue);
+        SharedDateHelper::roundMicroseconds($PHPDateObject);
 
         return (int) $PHPDateObject->format('j');
     }
@@ -52,11 +63,18 @@ public static function day($dateValue)
      *
      * @param mixed $dateValue Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard date string
+     *                         Or can be an array of date values
      *
-     * @return int|string Month of the year
+     * @return array|int|string Month of the year
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function month($dateValue)
+    public static function month(mixed $dateValue): array|string|int
     {
+        if (is_array($dateValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $dateValue);
+        }
+
         try {
             $dateValue = Helpers::getDateValue($dateValue);
         } catch (Exception $e) {
@@ -68,6 +86,7 @@ public static function month($dateValue)
 
         // Execute function
         $PHPDateObject = SharedDateHelper::excelToDateTimeObject($dateValue);
+        SharedDateHelper::roundMicroseconds($PHPDateObject);
 
         return (int) $PHPDateObject->format('n');
     }
@@ -83,11 +102,18 @@ public static function month($dateValue)
      *
      * @param mixed $dateValue Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard date string
+     *                         Or can be an array of date values
      *
-     * @return int|string Year
+     * @return array|int|string Year
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function year($dateValue)
+    public static function year(mixed $dateValue): array|string|int
     {
+        if (is_array($dateValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $dateValue);
+        }
+
         try {
             $dateValue = Helpers::getDateValue($dateValue);
         } catch (Exception $e) {
@@ -99,6 +125,7 @@ public static function year($dateValue)
         }
         // Execute function
         $PHPDateObject = SharedDateHelper::excelToDateTimeObject($dateValue);
+        SharedDateHelper::roundMicroseconds($PHPDateObject);
 
         return (int) $PHPDateObject->format('Y');
     }
@@ -107,7 +134,7 @@ public static function year($dateValue)
      * @param mixed $dateValue Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard date string
      */
-    private static function weirdCondition($dateValue): int
+    private static function weirdCondition(mixed $dateValue): int
     {
         // Excel does not treat 0 consistently for DAY vs. (MONTH or YEAR)
         if (SharedDateHelper::getExcelCalendar() === SharedDateHelper::CALENDAR_WINDOWS_1900 && Functions::getCompatibilityMode() == Functions::COMPATIBILITY_EXCEL) {
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/DateValue.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/DateValue.php
index de767fca6c..8c5fa71c94 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/DateValue.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/DateValue.php
@@ -2,12 +2,16 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
 
+use DateTime;
 use DateTimeImmutable;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Shared\Date as SharedDateHelper;
 
 class DateValue
 {
+    use ArrayEnabled;
+
     /**
      * DATEVALUE.
      *
@@ -21,7 +25,7 @@ class DateValue
      * Excel Function:
      *        DATEVALUE(dateValue)
      *
-     * @param string $dateValue Text that represents a date in a Microsoft Excel date format.
+     * @param null|array|bool|float|int|string $dateValue Text that represents a date in a Microsoft Excel date format.
      *                                    For example, "1/30/2008" or "30-Jan-2008" are text strings within
      *                                    quotation marks that represent dates. Using the default date
      *                                    system in Excel for Windows, date_text must represent a date from
@@ -29,17 +33,29 @@ class DateValue
      *                                    system in Excel for the Macintosh, date_text must represent a date
      *                                    from January 1, 1904, to December 31, 9999. DATEVALUE returns the
      *                                    #VALUE! error value if date_text is out of this range.
+     *                         Or can be an array of date values
      *
-     * @return mixed Excel date/time serial value, PHP date/time serial value or PHP date/time object,
+     * @return array|DateTime|float|int|string Excel date/time serial value, PHP date/time serial value or PHP date/time object,
      *                        depending on the value of the ReturnDateType flag
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function fromString($dateValue)
+    public static function fromString(null|array|string|int|bool|float $dateValue): array|string|float|int|DateTime
     {
+        if (is_array($dateValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $dateValue);
+        }
+
+        // try to parse as date iff there is at least one digit
+        if (is_string($dateValue) && preg_match('/\\d/', $dateValue) !== 1) {
+            return ExcelError::VALUE();
+        }
+
         $dti = new DateTimeImmutable();
         $baseYear = SharedDateHelper::getExcelCalendar();
-        $dateValue = trim(Functions::flattenSingleValue($dateValue), '"');
+        $dateValue = trim((string) $dateValue, '"');
         //    Strip any ordinals because they're allowed in Excel (English only)
-        $dateValue = preg_replace('/(\d)(st|nd|rd|th)([ -\/])/Ui', '$1$3', $dateValue) ?? '';
+        $dateValue = (string) preg_replace('/(\d)(st|nd|rd|th)([ -\/])/Ui', '$1$3', $dateValue);
         //    Convert separators (/ . or space) to hyphens (should also handle dot used for ordinals in some countries, e.g. Denmark, Germany)
         $dateValue = str_replace(['/', '.', '-', '  '], ' ', $dateValue);
 
@@ -49,7 +65,7 @@ public static function fromString($dateValue)
         foreach ($t1 as &$t) {
             if ((is_numeric($t)) && ($t > 31)) {
                 if ($yearFound) {
-                    return Functions::VALUE();
+                    return ExcelError::VALUE();
                 }
                 if ($t < 100) {
                     $t += 1900;
@@ -59,7 +75,7 @@ public static function fromString($dateValue)
         }
         if (count($t1) === 1) {
             //    We've been fed a time value without any date
-            return ((strpos((string) $t, ':') === false)) ? Functions::Value() : 0.0;
+            return ((!str_contains((string) $t, ':'))) ? ExcelError::Value() : 0.0;
         }
         unset($t);
 
@@ -92,13 +108,11 @@ private static function t1ToString(array $t1, DateTimeImmutable $dti, bool $year
 
     /**
      * Parse date.
-     *
-     * @return array|bool
      */
-    private static function setUpArray(string $dateValue, DateTimeImmutable $dti)
+    private static function setUpArray(string $dateValue, DateTimeImmutable $dti): array
     {
-        $PHPDateArray = date_parse($dateValue);
-        if (($PHPDateArray === false) || ($PHPDateArray['error_count'] > 0)) {
+        $PHPDateArray = Helpers::dateParse($dateValue);
+        if (!Helpers::dateParseSucceeded($PHPDateArray)) {
             // If original count was 1, we've already returned.
             // If it was 2, we added another.
             // Therefore, neither of the first 2 stroks below can fail.
@@ -106,9 +120,9 @@ private static function setUpArray(string $dateValue, DateTimeImmutable $dti)
             $testVal2 = strtok('- ');
             $testVal3 = strtok('- ') ?: $dti->format('Y');
             Helpers::adjustYear((string) $testVal1, (string) $testVal2, $testVal3);
-            $PHPDateArray = date_parse($testVal1 . '-' . $testVal2 . '-' . $testVal3);
-            if (($PHPDateArray === false) || ($PHPDateArray['error_count'] > 0)) {
-                $PHPDateArray = date_parse($testVal2 . '-' . $testVal1 . '-' . $testVal3);
+            $PHPDateArray = Helpers::dateParse($testVal1 . '-' . $testVal2 . '-' . $testVal3);
+            if (!Helpers::dateParseSucceeded($PHPDateArray)) {
+                $PHPDateArray = Helpers::dateParse($testVal2 . '-' . $testVal1 . '-' . $testVal3);
             }
         }
 
@@ -118,19 +132,17 @@ private static function setUpArray(string $dateValue, DateTimeImmutable $dti)
     /**
      * Final results.
      *
-     * @param array|bool $PHPDateArray
-     *
-     * @return mixed Excel date/time serial value, PHP date/time serial value or PHP date/time object,
+     * @return DateTime|float|int|string Excel date/time serial value, PHP date/time serial value or PHP date/time object,
      *                        depending on the value of the ReturnDateType flag
      */
-    private static function finalResults($PHPDateArray, DateTimeImmutable $dti, int $baseYear)
+    private static function finalResults(array $PHPDateArray, DateTimeImmutable $dti, int $baseYear): string|float|int|DateTime
     {
-        $retValue = Functions::Value();
-        if (is_array($PHPDateArray) && $PHPDateArray['error_count'] == 0) {
+        $retValue = ExcelError::Value();
+        if (Helpers::dateParseSucceeded($PHPDateArray)) {
             // Execute function
             Helpers::replaceIfEmpty($PHPDateArray['year'], $dti->format('Y'));
             if ($PHPDateArray['year'] < $baseYear) {
-                return Functions::VALUE();
+                return ExcelError::VALUE();
             }
             Helpers::replaceIfEmpty($PHPDateArray['month'], $dti->format('m'));
             Helpers::replaceIfEmpty($PHPDateArray['day'], $dti->format('d'));
@@ -141,7 +153,7 @@ private static function finalResults($PHPDateArray, DateTimeImmutable $dti, int
             $day = (int) $PHPDateArray['day'];
             $year = (int) $PHPDateArray['year'];
             if (!checkdate($month, $day, $year)) {
-                return ($year === 1900 && $month === 2 && $day === 29) ? Helpers::returnIn3FormatsFloat(60.0) : Functions::VALUE();
+                return ($year === 1900 && $month === 2 && $day === 29) ? Helpers::returnIn3FormatsFloat(60.0) : ExcelError::VALUE();
             }
             $retValue = Helpers::returnIn3FormatsArray($PHPDateArray, true);
         }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Days.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Days.php
index 5a97d8df8a..6c6fd3d7de 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Days.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Days.php
@@ -3,12 +3,15 @@
 namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
 
 use DateTimeInterface;
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Shared\Date as SharedDateHelper;
 
 class Days
 {
+    use ArrayEnabled;
+
     /**
      * DAYS.
      *
@@ -17,15 +20,23 @@ class Days
      * Excel Function:
      *        DAYS(endDate, startDate)
      *
-     * @param DateTimeInterface|float|int|string $endDate Excel date serial value (float),
-     * PHP date timestamp (integer), PHP DateTime object, or a standard date string
-     * @param DateTimeInterface|float|int|string $startDate Excel date serial value (float),
-     * PHP date timestamp (integer), PHP DateTime object, or a standard date string
+     * @param array|DateTimeInterface|float|int|string $endDate Excel date serial value (float),
+     *           PHP date timestamp (integer), PHP DateTime object, or a standard date string
+     *                         Or can be an array of date values
+     * @param array|DateTimeInterface|float|int|string $startDate Excel date serial value (float),
+     *           PHP date timestamp (integer), PHP DateTime object, or a standard date string
+     *                         Or can be an array of date values
      *
-     * @return int|string Number of days between start date and end date or an error
+     * @return array|int|string Number of days between start date and end date or an error
+     *         If an array of values is passed for the $startDate or $endDays,arguments, then the returned result
+     *            will also be an array with matching dimensions
      */
-    public static function between($endDate, $startDate)
+    public static function between(array|DateTimeInterface|float|int|string $endDate, array|DateTimeInterface|float|int|string $startDate): array|int|string
     {
+        if (is_array($endDate) || is_array($startDate)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $endDate, $startDate);
+        }
+
         try {
             $startDate = Helpers::getDateValue($startDate);
             $endDate = Helpers::getDateValue($endDate);
@@ -37,7 +48,7 @@ public static function between($endDate, $startDate)
         $PHPStartDateObject = SharedDateHelper::excelToDateTimeObject($startDate);
         $PHPEndDateObject = SharedDateHelper::excelToDateTimeObject($endDate);
 
-        $days = Functions::VALUE();
+        $days = ExcelError::VALUE();
         $diff = $PHPStartDateObject->diff($PHPEndDateObject);
         if ($diff !== false && !is_bool($diff->days)) {
             $days = $diff->days;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Days360.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Days360.php
index bbc5d16aaa..c7e03fc0e0 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Days360.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Days360.php
@@ -2,12 +2,15 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Shared\Date as SharedDateHelper;
 
 class Days360
 {
+    use ArrayEnabled;
+
     /**
      * DAYS360.
      *
@@ -18,11 +21,13 @@ class Days360
      * Excel Function:
      *        DAYS360(startDate,endDate[,method])
      *
-     * @param mixed $startDate Excel date serial value (float), PHP date timestamp (integer),
+     * @param array|mixed $startDate Excel date serial value (float), PHP date timestamp (integer),
      *                                        PHP DateTime object, or a standard date string
-     * @param mixed $endDate Excel date serial value (float), PHP date timestamp (integer),
+     *                         Or can be an array of date values
+     * @param array|mixed $endDate Excel date serial value (float), PHP date timestamp (integer),
      *                                        PHP DateTime object, or a standard date string
-     * @param mixed $method US or European Method as a bool
+     *                         Or can be an array of date values
+     * @param array|mixed $method US or European Method as a bool
      *                                        FALSE or omitted: U.S. (NASD) method. If the starting date is
      *                                        the last day of a month, it becomes equal to the 30th of the
      *                                        same month. If the ending date is the last day of a month and
@@ -33,11 +38,18 @@ class Days360
      *                                        TRUE: European method. Starting dates and ending dates that
      *                                        occur on the 31st of a month become equal to the 30th of the
      *                                        same month.
+     *                         Or can be an array of methods
      *
-     * @return int|string Number of days between start date and end date
+     * @return array|int|string Number of days between start date and end date
+     *         If an array of values is passed for the $startDate or $endDays,arguments, then the returned result
+     *            will also be an array with matching dimensions
      */
-    public static function between($startDate = 0, $endDate = 0, $method = false)
+    public static function between(mixed $startDate = 0, mixed $endDate = 0, mixed $method = false): array|string|int
     {
+        if (is_array($startDate) || is_array($endDate) || is_array($method)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $startDate, $endDate, $method);
+        }
+
         try {
             $startDate = Helpers::getDateValue($startDate);
             $endDate = Helpers::getDateValue($endDate);
@@ -46,7 +58,7 @@ public static function between($startDate = 0, $endDate = 0, $method = false)
         }
 
         if (!is_bool($method)) {
-            return Functions::VALUE();
+            return ExcelError::VALUE();
         }
 
         // Execute function
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Difference.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Difference.php
index 6adeca179a..199d5d85a7 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Difference.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Difference.php
@@ -4,30 +4,41 @@
 
 use DateInterval;
 use DateTime;
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Shared\Date as SharedDateHelper;
 
 class Difference
 {
+    use ArrayEnabled;
+
     /**
      * DATEDIF.
      *
      * @param mixed $startDate Excel date serial value, PHP date/time stamp, PHP DateTime object
      *                                    or a standard date string
+     *                         Or can be an array of date values
      * @param mixed $endDate Excel date serial value, PHP date/time stamp, PHP DateTime object
      *                                    or a standard date string
-     * @param string $unit
+     *                         Or can be an array of date values
+     * @param array|string $unit Or can be an array of unit values
      *
-     * @return int|string Interval between the dates
+     * @return array|int|string Interval between the dates
+     *         If an array of values is passed for the $startDate or $endDays,arguments, then the returned result
+     *            will also be an array with matching dimensions
      */
-    public static function interval($startDate, $endDate, $unit = 'D')
+    public static function interval(mixed $startDate, mixed $endDate, array|string $unit = 'D')
     {
+        if (is_array($startDate) || is_array($endDate) || is_array($unit)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $startDate, $endDate, $unit);
+        }
+
         try {
             $startDate = Helpers::getDateValue($startDate);
             $endDate = Helpers::getDateValue($endDate);
             $difference = self::initialDiff($startDate, $endDate);
-            $unit = strtoupper(Functions::flattenSingleValue($unit));
+            $unit = strtoupper($unit);
         } catch (Exception $e) {
             return $e->getMessage();
         }
@@ -35,12 +46,12 @@ public static function interval($startDate, $endDate, $unit = 'D')
         // Execute function
         $PHPStartDateObject = SharedDateHelper::excelToDateTimeObject($startDate);
         $startDays = (int) $PHPStartDateObject->format('j');
-        $startMonths = (int) $PHPStartDateObject->format('n');
+        //$startMonths = (int) $PHPStartDateObject->format('n');
         $startYears = (int) $PHPStartDateObject->format('Y');
 
         $PHPEndDateObject = SharedDateHelper::excelToDateTimeObject($endDate);
         $endDays = (int) $PHPEndDateObject->format('j');
-        $endMonths = (int) $PHPEndDateObject->format('n');
+        //$endMonths = (int) $PHPEndDateObject->format('n');
         $endYears = (int) $PHPEndDateObject->format('Y');
 
         $PHPDiffDateObject = $PHPEndDateObject->diff($PHPStartDateObject);
@@ -53,14 +64,14 @@ public static function interval($startDate, $endDate, $unit = 'D')
         $retVal = self::replaceRetValue($retVal, $unit, 'YD') ?? self::datedifYD($difference, $startYears, $endYears, $PHPStartDateObject, $PHPEndDateObject);
         $retVal = self::replaceRetValue($retVal, $unit, 'YM') ?? self::datedifYM($PHPDiffDateObject);
 
-        return is_bool($retVal) ? Functions::VALUE() : $retVal;
+        return is_bool($retVal) ? ExcelError::VALUE() : $retVal;
     }
 
     private static function initialDiff(float $startDate, float $endDate): float
     {
         // Validate parameters
         if ($startDate > $endDate) {
-            throw new Exception(Functions::NAN());
+            throw new Exception(ExcelError::NAN());
         }
 
         return $endDate - $startDate;
@@ -68,12 +79,8 @@ private static function initialDiff(float $startDate, float $endDate): float
 
     /**
      * Decide whether it's time to set retVal.
-     *
-     * @param bool|int $retVal
-     *
-     * @return null|bool|int
      */
-    private static function replaceRetValue($retVal, string $unit, string $compare)
+    private static function replaceRetValue(bool|int $retVal, string $unit, string $compare): null|bool|int
     {
         if ($retVal !== false || $unit !== $compare) {
             return $retVal;
@@ -121,12 +128,12 @@ private static function datedifYD(float $difference, int $startYears, int $endYe
             // Adjust end year to be as close as possible as start year
             while ($PHPEndDateObject >= $PHPStartDateObject) {
                 $PHPEndDateObject->modify('-1 year');
-                $endYears = $PHPEndDateObject->format('Y');
+                //$endYears = $PHPEndDateObject->format('Y');
             }
             $PHPEndDateObject->modify('+1 year');
 
             // Get the result
-            $retVal = $PHPEndDateObject->diff($PHPStartDateObject)->days;
+            $retVal = (int) $PHPEndDateObject->diff($PHPStartDateObject)->days;
 
             // Adjust for leap years cases
             $isLeapEndYear = $PHPEndDateObject->format('L');
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Helpers.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Helpers.php
index 9503401c0d..1e9af6cb5a 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Helpers.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Helpers.php
@@ -5,6 +5,7 @@
 use DateTime;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Shared\Date as SharedDateHelper;
 
 class Helpers
@@ -16,24 +17,24 @@ class Helpers
      *
      * @return bool TRUE if the year is a leap year, otherwise FALSE
      */
-    public static function isLeapYear($year): bool
+    public static function isLeapYear(int|string $year): bool
     {
+        $year = (int) $year;
+
         return (($year % 4) === 0) && (($year % 100) !== 0) || (($year % 400) === 0);
     }
 
     /**
      * getDateValue.
      *
-     * @param mixed $dateValue
-     *
      * @return float Excel date/time serial value
      */
-    public static function getDateValue($dateValue, bool $allowBool = true): float
+    public static function getDateValue(mixed $dateValue, bool $allowBool = true): float
     {
         if (is_object($dateValue)) {
             $retval = SharedDateHelper::PHPToExcel($dateValue);
             if (is_bool($retval)) {
-                throw new Exception(Functions::VALUE());
+                throw new Exception(ExcelError::VALUE());
             }
 
             return $retval;
@@ -46,11 +47,11 @@ public static function getDateValue($dateValue, bool $allowBool = true): float
             $dateValue = DateValue::fromString($dateValue);
             Functions::setReturnDateType($saveReturnDateType);
             if (!is_numeric($dateValue)) {
-                throw new Exception(Functions::VALUE());
+                throw new Exception(ExcelError::VALUE());
             }
         }
         if ($dateValue < 0 && Functions::getCompatibilityMode() !== Functions::COMPATIBILITY_OPENOFFICE) {
-            throw new Exception(Functions::NAN());
+            throw new Exception(ExcelError::NAN());
         }
 
         return (float) $dateValue;
@@ -59,14 +60,13 @@ public static function getDateValue($dateValue, bool $allowBool = true): float
     /**
      * getTimeValue.
      *
-     * @param string $timeValue
-     *
-     * @return mixed Excel date/time serial value, or string if error
+     * @return float|string Excel date/time serial value, or string if error
      */
-    public static function getTimeValue($timeValue)
+    public static function getTimeValue(string $timeValue): string|float
     {
         $saveReturnDateType = Functions::getReturnDateType();
         Functions::setReturnDateType(Functions::RETURNDATE_EXCEL);
+        /** @var float|string $timeValue */
         $timeValue = TimeValue::fromString($timeValue);
         Functions::setReturnDateType($saveReturnDateType);
 
@@ -75,10 +75,8 @@ public static function getTimeValue($timeValue)
 
     /**
      * Adjust date by given months.
-     *
-     * @param mixed $dateValue
      */
-    public static function adjustDateByMonths($dateValue = 0, float $adjustmentMonths = 0): DateTime
+    public static function adjustDateByMonths(mixed $dateValue = 0, float $adjustmentMonths = 0): DateTime
     {
         // Execute function
         $PHPDateObject = SharedDateHelper::excelToDateTimeObject($dateValue);
@@ -107,11 +105,8 @@ public static function adjustDateByMonths($dateValue = 0, float $adjustmentMonth
 
     /**
      * Help reduce perceived complexity of some tests.
-     *
-     * @param mixed $value
-     * @param mixed $altValue
      */
-    public static function replaceIfEmpty(&$value, $altValue): void
+    public static function replaceIfEmpty(mixed &$value, mixed $altValue): void
     {
         $value = $value ?: $altValue;
     }
@@ -132,10 +127,8 @@ public static function adjustYear(string $testVal1, string $testVal2, string &$t
 
     /**
      * Return result in one of three formats.
-     *
-     * @return mixed
      */
-    public static function returnIn3FormatsArray(array $dateArray, bool $noFrac = false)
+    public static function returnIn3FormatsArray(array $dateArray, bool $noFrac = false): DateTime|float|int
     {
         $retType = Functions::getReturnDateType();
         if ($retType === Functions::RETURNDATE_PHP_DATETIME_OBJECT) {
@@ -148,8 +141,8 @@ public static function returnIn3FormatsArray(array $dateArray, bool $noFrac = fa
                 . ':' . $dateArray['second']
             );
         }
-        $excelDateValue =
-            SharedDateHelper::formattedPHPToExcel(
+        $excelDateValue
+            = SharedDateHelper::formattedPHPToExcel(
                 $dateArray['year'],
                 $dateArray['month'],
                 $dateArray['day'],
@@ -158,26 +151,24 @@ public static function returnIn3FormatsArray(array $dateArray, bool $noFrac = fa
                 $dateArray['second']
             );
         if ($retType === Functions::RETURNDATE_EXCEL) {
-            return $noFrac ? floor($excelDateValue) : (float) $excelDateValue;
+            return $noFrac ? floor($excelDateValue) : $excelDateValue;
         }
         // RETURNDATE_UNIX_TIMESTAMP)
 
-        return (int) SharedDateHelper::excelToTimestamp($excelDateValue);
+        return SharedDateHelper::excelToTimestamp($excelDateValue);
     }
 
     /**
      * Return result in one of three formats.
-     *
-     * @return mixed
      */
-    public static function returnIn3FormatsFloat(float $excelDateValue)
+    public static function returnIn3FormatsFloat(float $excelDateValue): float|int|DateTime
     {
         $retType = Functions::getReturnDateType();
         if ($retType === Functions::RETURNDATE_EXCEL) {
             return $excelDateValue;
         }
         if ($retType === Functions::RETURNDATE_UNIX_TIMESTAMP) {
-            return (int) SharedDateHelper::excelToTimestamp($excelDateValue);
+            return SharedDateHelper::excelToTimestamp($excelDateValue);
         }
         // RETURNDATE_PHP_DATETIME_OBJECT
 
@@ -186,10 +177,8 @@ public static function returnIn3FormatsFloat(float $excelDateValue)
 
     /**
      * Return result in one of three formats.
-     *
-     * @return mixed
      */
-    public static function returnIn3FormatsObject(DateTime $PHPDateObject)
+    public static function returnIn3FormatsObject(DateTime $PHPDateObject): DateTime|float|int
     {
         $retType = Functions::getReturnDateType();
         if ($retType === Functions::RETURNDATE_PHP_DATETIME_OBJECT) {
@@ -202,7 +191,7 @@ public static function returnIn3FormatsObject(DateTime $PHPDateObject)
         $stamp = SharedDateHelper::PHPToExcel($PHPDateObject);
         $stamp = is_bool($stamp) ? ((int) $stamp) : $stamp;
 
-        return (int) SharedDateHelper::excelToTimestamp($stamp);
+        return SharedDateHelper::excelToTimestamp($stamp);
     }
 
     private static function baseDate(): int
@@ -219,10 +208,8 @@ private static function baseDate(): int
 
     /**
      * Many functions accept null/false/true argument treated as 0/0/1.
-     *
-     * @param mixed $number
      */
-    public static function nullFalseTrueToNumber(&$number, bool $allowBool = true): void
+    public static function nullFalseTrueToNumber(mixed &$number, bool $allowBool = true): void
     {
         $number = Functions::flattenSingleValue($number);
         $nullVal = self::baseDate();
@@ -235,12 +222,8 @@ public static function nullFalseTrueToNumber(&$number, bool $allowBool = true):
 
     /**
      * Many functions accept null argument treated as 0.
-     *
-     * @param mixed $number
-     *
-     * @return float|int
      */
-    public static function validateNumericNull($number)
+    public static function validateNumericNull(mixed $number): int|float
     {
         $number = Functions::flattenSingleValue($number);
         if ($number === null) {
@@ -253,26 +236,24 @@ public static function validateNumericNull($number)
             return (float) $number;
         }
 
-        throw new Exception(Functions::VALUE());
+        throw new Exception(ExcelError::VALUE());
     }
 
     /**
      * Many functions accept null/false/true argument treated as 0/0/1.
      *
-     * @param mixed $number
-     *
-     * @return float
+     * @phpstan-assert float $number
      */
-    public static function validateNotNegative($number)
+    public static function validateNotNegative(mixed $number): float
     {
         if (!is_numeric($number)) {
-            throw new Exception(Functions::VALUE());
+            throw new Exception(ExcelError::VALUE());
         }
         if ($number >= 0) {
             return (float) $number;
         }
 
-        throw new Exception(Functions::NAN());
+        throw new Exception(ExcelError::NAN());
     }
 
     public static function silly1900(DateTime $PHPDateObject, string $mod = '-1 day'): void
@@ -282,4 +263,25 @@ public static function silly1900(DateTime $PHPDateObject, string $mod = '-1 day'
             $PHPDateObject->modify($mod);
         }
     }
+
+    public static function dateParse(string $string): array
+    {
+        return self::forceArray(date_parse($string));
+    }
+
+    public static function dateParseSucceeded(array $dateArray): bool
+    {
+        return $dateArray['error_count'] === 0;
+    }
+
+    /**
+     * Despite documentation, date_parse probably never returns false.
+     * Just in case, this routine helps guarantee it.
+     *
+     * @param array|false $dateArray
+     */
+    private static function forceArray(array|bool $dateArray): array
+    {
+        return is_array($dateArray) ? $dateArray : ['error_count' => 1];
+    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Month.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Month.php
index 560b7a8071..a90c051734 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Month.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Month.php
@@ -2,10 +2,14 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
 
+use DateTime;
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 
 class Month
 {
+    use ArrayEnabled;
+
     /**
      * EDATE.
      *
@@ -19,21 +23,30 @@ class Month
      *
      * @param mixed $dateValue Excel date serial value (float), PHP date timestamp (integer),
      *                                        PHP DateTime object, or a standard date string
-     * @param int $adjustmentMonths The number of months before or after start_date.
+     *                         Or can be an array of date values
+     * @param array|int $adjustmentMonths The number of months before or after start_date.
      *                                        A positive value for months yields a future date;
      *                                        a negative value yields a past date.
+     *                         Or can be an array of adjustment values
      *
-     * @return mixed Excel date/time serial value, PHP date/time serial value or PHP date/time object,
+     * @return array|DateTime|float|int|string Excel date/time serial value, PHP date/time serial value or PHP date/time object,
      *                        depending on the value of the ReturnDateType flag
+     *         If an array of values is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function adjust($dateValue, $adjustmentMonths)
+    public static function adjust(mixed $dateValue, array|string|bool|float|int $adjustmentMonths): DateTime|float|int|string|array
     {
+        if (is_array($dateValue) || is_array($adjustmentMonths)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $dateValue, $adjustmentMonths);
+        }
+
         try {
             $dateValue = Helpers::getDateValue($dateValue, false);
             $adjustmentMonths = Helpers::validateNumericNull($adjustmentMonths);
         } catch (Exception $e) {
             return $e->getMessage();
         }
+        $dateValue = floor($dateValue);
         $adjustmentMonths = floor($adjustmentMonths);
 
         // Execute function
@@ -54,21 +67,30 @@ public static function adjust($dateValue, $adjustmentMonths)
      *
      * @param mixed $dateValue Excel date serial value (float), PHP date timestamp (integer),
      *                                        PHP DateTime object, or a standard date string
-     * @param int $adjustmentMonths The number of months before or after start_date.
+     *                         Or can be an array of date values
+     * @param array|int $adjustmentMonths The number of months before or after start_date.
      *                                        A positive value for months yields a future date;
      *                                        a negative value yields a past date.
+     *                         Or can be an array of adjustment values
      *
-     * @return mixed Excel date/time serial value, PHP date/time serial value or PHP date/time object,
+     * @return array|DateTime|float|int|string Excel date/time serial value, PHP date/time serial value or PHP date/time object,
      *                        depending on the value of the ReturnDateType flag
+     *         If an array of values is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function lastDay($dateValue, $adjustmentMonths)
+    public static function lastDay(mixed $dateValue, array|float|int|bool|string $adjustmentMonths): array|string|DateTime|float|int
     {
+        if (is_array($dateValue) || is_array($adjustmentMonths)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $dateValue, $adjustmentMonths);
+        }
+
         try {
             $dateValue = Helpers::getDateValue($dateValue, false);
             $adjustmentMonths = Helpers::validateNumericNull($adjustmentMonths);
         } catch (Exception $e) {
             return $e->getMessage();
         }
+        $dateValue = floor($dateValue);
         $adjustmentMonths = floor($adjustmentMonths);
 
         // Execute function
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/NetworkDays.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/NetworkDays.php
index d0f53cf392..503e30e849 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/NetworkDays.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/NetworkDays.php
@@ -2,11 +2,14 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 
 class NetworkDays
 {
+    use ArrayEnabled;
+
     /**
      * NETWORKDAYS.
      *
@@ -20,14 +23,28 @@ class NetworkDays
      *
      * @param mixed $startDate Excel date serial value (float), PHP date timestamp (integer),
      *                                            PHP DateTime object, or a standard date string
+     *                         Or can be an array of date values
      * @param mixed $endDate Excel date serial value (float), PHP date timestamp (integer),
      *                                            PHP DateTime object, or a standard date string
-     * @param mixed $dateArgs
+     *                         Or can be an array of date values
+     * @param mixed $dateArgs An array of dates (such as holidays) to exclude from the calculation
      *
-     * @return int|string Interval between the dates
+     * @return array|int|string Interval between the dates
+     *         If an array of values is passed for the $startDate or $endDate arguments, then the returned result
+     *            will also be an array with matching dimensions
      */
-    public static function count($startDate, $endDate, ...$dateArgs)
+    public static function count(mixed $startDate, mixed $endDate, mixed ...$dateArgs): array|string|int
     {
+        if (is_array($startDate) || is_array($endDate)) {
+            return self::evaluateArrayArgumentsSubset(
+                [self::class, __FUNCTION__],
+                2,
+                $startDate,
+                $endDate,
+                ...$dateArgs
+            );
+        }
+
         try {
             //    Retrieve the mandatory start and end date that are referenced in the function definition
             $sDate = Helpers::getDateValue($startDate);
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Time.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Time.php
index fb5e49652f..3f8f324c97 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Time.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Time.php
@@ -3,12 +3,16 @@
 namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
 
 use DateTime;
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Shared\Date as SharedDateHelper;
 
 class Time
 {
+    use ArrayEnabled;
+
     /**
      * TIME.
      *
@@ -20,23 +24,31 @@ class Time
      * Excel Function:
      *        TIME(hour,minute,second)
      *
-     * @param mixed $hour A number from 0 (zero) to 32767 representing the hour.
+     * @param null|array|bool|float|int|string $hour A number from 0 (zero) to 32767 representing the hour.
      *                                    Any value greater than 23 will be divided by 24 and the remainder
      *                                    will be treated as the hour value. For example, TIME(27,0,0) =
      *                                    TIME(3,0,0) = .125 or 3:00 AM.
-     * @param mixed $minute A number from 0 to 32767 representing the minute.
+     * @param null|array|bool|float|int|string $minute A number from 0 to 32767 representing the minute.
      *                                    Any value greater than 59 will be converted to hours and minutes.
      *                                    For example, TIME(0,750,0) = TIME(12,30,0) = .520833 or 12:30 PM.
-     * @param mixed $second A number from 0 to 32767 representing the second.
+     * @param null|array|bool|float|int|string $second A number from 0 to 32767 representing the second.
      *                                    Any value greater than 59 will be converted to hours, minutes,
      *                                    and seconds. For example, TIME(0,0,2000) = TIME(0,33,22) = .023148
      *                                    or 12:33:20 AM
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      *
-     * @return mixed Excel date/time serial value, PHP date/time serial value or PHP date/time object,
+     * @return array|DateTime|float|int|string Excel date/time serial value, PHP date/time serial value or PHP date/time object,
      *                        depending on the value of the ReturnDateType flag
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function fromHMS($hour, $minute, $second)
+    public static function fromHMS(array|int|float|bool|null|string $hour, array|int|float|bool|null|string $minute, array|int|float|bool|null|string $second): array|string|float|int|DateTime
     {
+        if (is_array($hour) || is_array($minute) || is_array($second)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $hour, $minute, $second);
+        }
+
         try {
             $hour = self::toIntWithNullBool($hour);
             $minute = self::toIntWithNullBool($minute);
@@ -51,7 +63,7 @@ public static function fromHMS($hour, $minute, $second)
         if ($hour > 23) {
             $hour = $hour % 24;
         } elseif ($hour < 0) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         // Execute function
@@ -103,15 +115,14 @@ private static function adjustMinute(int &$minute, int &$hour): void
     /**
      * @param mixed $value expect int
      */
-    private static function toIntWithNullBool($value): int
+    private static function toIntWithNullBool(mixed $value): int
     {
-        $value = Functions::flattenSingleValue($value);
         $value = $value ?? 0;
         if (is_bool($value)) {
             $value = (int) $value;
         }
         if (!is_numeric($value)) {
-            throw new Exception(Functions::VALUE());
+            throw new Exception(ExcelError::VALUE());
         }
 
         return (int) $value;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/TimeParts.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/TimeParts.php
index 49cd983d87..de52269249 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/TimeParts.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/TimeParts.php
@@ -2,12 +2,14 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Shared\Date as SharedDateHelper;
 
 class TimeParts
 {
+    use ArrayEnabled;
+
     /**
      * HOUROFDAY.
      *
@@ -19,13 +21,19 @@ class TimeParts
      *
      * @param mixed $timeValue Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard time string
+     *                         Or can be an array of date/time values
      *
-     * @return int|string Hour
+     * @return array|int|string Hour
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function hour($timeValue)
+    public static function hour(mixed $timeValue): array|string|int
     {
+        if (is_array($timeValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $timeValue);
+        }
+
         try {
-            $timeValue = Functions::flattenSingleValue($timeValue);
             Helpers::nullFalseTrueToNumber($timeValue);
             if (!is_numeric($timeValue)) {
                 $timeValue = Helpers::getTimeValue($timeValue);
@@ -38,6 +46,7 @@ public static function hour($timeValue)
         // Execute function
         $timeValue = fmod($timeValue, 1);
         $timeValue = SharedDateHelper::excelToDateTimeObject($timeValue);
+        SharedDateHelper::roundMicroseconds($timeValue);
 
         return (int) $timeValue->format('H');
     }
@@ -53,13 +62,19 @@ public static function hour($timeValue)
      *
      * @param mixed $timeValue Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard time string
+     *                         Or can be an array of date/time values
      *
-     * @return int|string Minute
+     * @return array|int|string Minute
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function minute($timeValue)
+    public static function minute(mixed $timeValue): array|string|int
     {
+        if (is_array($timeValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $timeValue);
+        }
+
         try {
-            $timeValue = Functions::flattenSingleValue($timeValue);
             Helpers::nullFalseTrueToNumber($timeValue);
             if (!is_numeric($timeValue)) {
                 $timeValue = Helpers::getTimeValue($timeValue);
@@ -72,6 +87,7 @@ public static function minute($timeValue)
         // Execute function
         $timeValue = fmod($timeValue, 1);
         $timeValue = SharedDateHelper::excelToDateTimeObject($timeValue);
+        SharedDateHelper::roundMicroseconds($timeValue);
 
         return (int) $timeValue->format('i');
     }
@@ -87,13 +103,19 @@ public static function minute($timeValue)
      *
      * @param mixed $timeValue Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard time string
+     *                         Or can be an array of date/time values
      *
-     * @return int|string Second
+     * @return array|int|string Second
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function second($timeValue)
+    public static function second(mixed $timeValue): array|string|int
     {
+        if (is_array($timeValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $timeValue);
+        }
+
         try {
-            $timeValue = Functions::flattenSingleValue($timeValue);
             Helpers::nullFalseTrueToNumber($timeValue);
             if (!is_numeric($timeValue)) {
                 $timeValue = Helpers::getTimeValue($timeValue);
@@ -106,6 +128,7 @@ public static function second($timeValue)
         // Execute function
         $timeValue = fmod($timeValue, 1);
         $timeValue = SharedDateHelper::excelToDateTimeObject($timeValue);
+        SharedDateHelper::roundMicroseconds($timeValue);
 
         return (int) $timeValue->format('s');
     }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/TimeValue.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/TimeValue.php
index 73b7ba91fe..d8c53b476f 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/TimeValue.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/TimeValue.php
@@ -3,11 +3,15 @@
 namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
 
 use Datetime;
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Shared\Date as SharedDateHelper;
 
 class TimeValue
 {
+    use ArrayEnabled;
+
     /**
      * TIMEVALUE.
      *
@@ -21,38 +25,53 @@ class TimeValue
      * Excel Function:
      *        TIMEVALUE(timeValue)
      *
-     * @param string $timeValue A text string that represents a time in any one of the Microsoft
+     * @param null|array|bool|float|int|string $timeValue A text string that represents a time in any one of the Microsoft
      *                                    Excel time formats; for example, "6:45 PM" and "18:45" text strings
      *                                    within quotation marks that represent time.
      *                                    Date information in time_text is ignored.
+     *                         Or can be an array of date/time values
      *
-     * @return mixed Excel date/time serial value, PHP date/time serial value or PHP date/time object,
+     * @return array|Datetime|float|int|string Excel date/time serial value, PHP date/time serial value or PHP date/time object,
      *                        depending on the value of the ReturnDateType flag
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function fromString($timeValue)
+    public static function fromString(null|array|string|int|bool|float $timeValue): array|string|Datetime|int|float
     {
-        $timeValue = trim(Functions::flattenSingleValue($timeValue), '"');
+        if (is_array($timeValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $timeValue);
+        }
+
+        // try to parse as time iff there is at least one digit
+        if (is_string($timeValue) && preg_match('/\\d/', $timeValue) !== 1) {
+            return ExcelError::VALUE();
+        }
+
+        $timeValue = trim((string) $timeValue, '"');
         $timeValue = str_replace(['/', '.'], '-', $timeValue);
 
         $arraySplit = preg_split('/[\/:\-\s]/', $timeValue) ?: [];
         if ((count($arraySplit) == 2 || count($arraySplit) == 3) && $arraySplit[0] > 24) {
-            $arraySplit[0] = ($arraySplit[0] % 24);
+            $arraySplit[0] = ((int) $arraySplit[0] % 24);
             $timeValue = implode(':', $arraySplit);
         }
 
-        $PHPDateArray = date_parse($timeValue);
-        $retValue = Functions::VALUE();
-        if (($PHPDateArray !== false) && ($PHPDateArray['error_count'] == 0)) {
+        $PHPDateArray = Helpers::dateParse($timeValue);
+        $retValue = ExcelError::VALUE();
+        if (Helpers::dateParseSucceeded($PHPDateArray)) {
+            $hour = $PHPDateArray['hour'];
+            $minute = $PHPDateArray['minute'];
+            $second = $PHPDateArray['second'];
             // OpenOffice-specific code removed - it works just like Excel
-            $excelDateValue = SharedDateHelper::formattedPHPToExcel(1900, 1, 1, $PHPDateArray['hour'], $PHPDateArray['minute'], $PHPDateArray['second']) - 1;
+            $excelDateValue = SharedDateHelper::formattedPHPToExcel(1900, 1, 1, $hour, $minute, $second) - 1;
 
             $retType = Functions::getReturnDateType();
             if ($retType === Functions::RETURNDATE_EXCEL) {
                 $retValue = (float) $excelDateValue;
             } elseif ($retType === Functions::RETURNDATE_UNIX_TIMESTAMP) {
-                $retValue = (int) $phpDateValue = SharedDateHelper::excelToTimestamp($excelDateValue + 25569) - 3600;
+                $retValue = (int) SharedDateHelper::excelToTimestamp($excelDateValue + 25569) - 3600;
             } else {
-                $retValue = new DateTime('1900-01-01 ' . $PHPDateArray['hour'] . ':' . $PHPDateArray['minute'] . ':' . $PHPDateArray['second']);
+                $retValue = new Datetime('1900-01-01 ' . $PHPDateArray['hour'] . ':' . $PHPDateArray['minute'] . ':' . $PHPDateArray['second']);
             }
         }
 
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Week.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Week.php
index 6636222104..e620b4ca0b 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Week.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/Week.php
@@ -3,12 +3,15 @@
 namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
 
 use DateTime;
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Shared\Date as SharedDateHelper;
 
 class Week
 {
+    use ArrayEnabled;
+
     /**
      * WEEKNUM.
      *
@@ -24,7 +27,8 @@ class Week
      *
      * @param mixed $dateValue Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard date string
-     * @param int $method Week begins on Sunday or Monday
+     *                         Or can be an array of date values
+     * @param array|int $method Week begins on Sunday or Monday
      *                                        1 or omitted    Week begins on Sunday.
      *                                        2                Week begins on Monday.
      *                                        11               Week begins on Monday.
@@ -35,11 +39,18 @@ class Week
      *                                        16               Week begins on Saturday.
      *                                        17               Week begins on Sunday.
      *                                        21               ISO (Jan. 4 is week 1, begins on Monday).
+     *                         Or can be an array of methods
      *
-     * @return int|string Week Number
+     * @return array|int|string Week Number
+     *         If an array of values is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function number($dateValue, $method = Constants::STARTWEEK_SUNDAY)
+    public static function number(mixed $dateValue, array|int|string|null $method = Constants::STARTWEEK_SUNDAY): array|int|string
     {
+        if (is_array($dateValue) || is_array($method)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $dateValue, $method);
+        }
+
         $origDateValueNull = empty($dateValue);
 
         try {
@@ -88,11 +99,18 @@ public static function number($dateValue, $method = Constants::STARTWEEK_SUNDAY)
      *
      * @param mixed $dateValue Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard date string
+     *                         Or can be an array of date values
      *
-     * @return int|string Week Number
+     * @return array|int|string Week Number
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function isoWeekNumber($dateValue)
+    public static function isoWeekNumber(mixed $dateValue): array|int|string
     {
+        if (is_array($dateValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $dateValue);
+        }
+
         if (self::apparentBug($dateValue)) {
             return 52;
         }
@@ -119,17 +137,25 @@ public static function isoWeekNumber($dateValue)
      * Excel Function:
      *        WEEKDAY(dateValue[,style])
      *
-     * @param null|float|int|string $dateValue Excel date serial value (float), PHP date timestamp (integer),
+     * @param null|array|bool|float|int|string $dateValue Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard date string
+     *                         Or can be an array of date values
      * @param mixed $style A number that determines the type of return value
      *                                        1 or omitted    Numbers 1 (Sunday) through 7 (Saturday).
      *                                        2                Numbers 1 (Monday) through 7 (Sunday).
      *                                        3                Numbers 0 (Monday) through 6 (Sunday).
+     *                         Or can be an array of styles
      *
-     * @return int|string Day of the week value
+     * @return array|int|string Day of the week value
+     *         If an array of values is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function day($dateValue, $style = 1)
+    public static function day(null|array|float|int|string|bool $dateValue, mixed $style = 1): array|string|int
     {
+        if (is_array($dateValue) || is_array($style)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $dateValue, $style);
+        }
+
         try {
             $dateValue = Helpers::getDateValue($dateValue);
             $style = self::validateStyle($style);
@@ -163,16 +189,14 @@ public static function day($dateValue, $style = 1)
     /**
      * @param mixed $style expect int
      */
-    private static function validateStyle($style): int
+    private static function validateStyle(mixed $style): int
     {
-        $style = Functions::flattenSingleValue($style);
-
         if (!is_numeric($style)) {
-            throw new Exception(Functions::VALUE());
+            throw new Exception(ExcelError::VALUE());
         }
         $style = (int) $style;
         if (($style < 1) || ($style > 3)) {
-            throw new Exception(Functions::NAN());
+            throw new Exception(ExcelError::NAN());
         }
 
         return $style;
@@ -187,7 +211,7 @@ private static function dow0Becomes7(int $DoW): int
      * @param mixed $dateValue Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard date string
      */
-    private static function apparentBug($dateValue): bool
+    private static function apparentBug(mixed $dateValue): bool
     {
         if (SharedDateHelper::getExcelCalendar() !== SharedDateHelper::CALENDAR_MAC_1904) {
             if (is_bool($dateValue)) {
@@ -203,13 +227,11 @@ private static function apparentBug($dateValue): bool
 
     /**
      * Validate dateValue parameter.
-     *
-     * @param mixed $dateValue
      */
-    private static function validateDateValue($dateValue): float
+    private static function validateDateValue(mixed $dateValue): float
     {
         if (is_bool($dateValue)) {
-            throw new Exception(Functions::VALUE());
+            throw new Exception(ExcelError::VALUE());
         }
 
         return Helpers::getDateValue($dateValue);
@@ -217,22 +239,20 @@ private static function validateDateValue($dateValue): float
 
     /**
      * Validate method parameter.
-     *
-     * @param mixed $method
      */
-    private static function validateMethod($method): int
+    private static function validateMethod(mixed $method): int
     {
         if ($method === null) {
             $method = Constants::STARTWEEK_SUNDAY;
         }
-        $method = Functions::flattenSingleValue($method);
+
         if (!is_numeric($method)) {
-            throw new Exception(Functions::VALUE());
+            throw new Exception(ExcelError::VALUE());
         }
 
         $method = (int) $method;
         if (!array_key_exists($method, Constants::METHODARR)) {
-            throw new Exception(Functions::NAN());
+            throw new Exception(ExcelError::NAN());
         }
         $method = Constants::METHODARR[$method];
 
@@ -248,7 +268,7 @@ private static function buggyWeekNum1904(int $method, bool $origNull, DateTime $
     {
         // This appears to be another Excel bug.
 
-        return $method === Constants::DOW_SUNDAY && SharedDateHelper::getExcelCalendar() === SharedDateHelper::CALENDAR_MAC_1904 &&
-            !$origNull && $dateObject->format('Y-m-d') === '1904-01-01';
+        return $method === Constants::DOW_SUNDAY && SharedDateHelper::getExcelCalendar() === SharedDateHelper::CALENDAR_MAC_1904
+            && !$origNull && $dateObject->format('Y-m-d') === '1904-01-01';
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/WorkDay.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/WorkDay.php
index 89e47b9690..4e4ed3c853 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/WorkDay.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/WorkDay.php
@@ -2,11 +2,15 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
 
+use DateTime;
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 
 class WorkDay
 {
+    use ArrayEnabled;
+
     /**
      * WORKDAY.
      *
@@ -18,27 +22,37 @@ class WorkDay
      * Excel Function:
      *        WORKDAY(startDate,endDays[,holidays[,holiday[,...]]])
      *
-     * @param mixed $startDate Excel date serial value (float), PHP date timestamp (integer),
+     * @param array|mixed $startDate Excel date serial value (float), PHP date timestamp (integer),
      *                                        PHP DateTime object, or a standard date string
-     * @param int $endDays The number of nonweekend and nonholiday days before or after
+     *                         Or can be an array of date values
+     * @param array|int $endDays The number of nonweekend and nonholiday days before or after
      *                                        startDate. A positive value for days yields a future date; a
      *                                        negative value yields a past date.
-     * @param mixed $dateArgs
+     *                         Or can be an array of int values
+     * @param null|mixed $dateArgs An array of dates (such as holidays) to exclude from the calculation
      *
-     * @return mixed Excel date/time serial value, PHP date/time serial value or PHP date/time object,
+     * @return array|DateTime|float|int|string Excel date/time serial value, PHP date/time serial value or PHP date/time object,
      *                        depending on the value of the ReturnDateType flag
+     *         If an array of values is passed for the $startDate or $endDays,arguments, then the returned result
+     *            will also be an array with matching dimensions
      */
-    public static function date($startDate, $endDays, ...$dateArgs)
+    public static function date(mixed $startDate, array|int|string $endDays, mixed ...$dateArgs): array|float|int|DateTime|string
     {
+        if (is_array($startDate) || is_array($endDays)) {
+            return self::evaluateArrayArgumentsSubset(
+                [self::class, __FUNCTION__],
+                2,
+                $startDate,
+                $endDays,
+                ...$dateArgs
+            );
+        }
+
         //    Retrieve the mandatory start date and days that are referenced in the function definition
         try {
             $startDate = Helpers::getDateValue($startDate);
             $endDays = Helpers::validateNumericNull($endDays);
-            $dateArgs = Functions::flattenArray($dateArgs);
-            $holidayArray = [];
-            foreach ($dateArgs as $holidayDate) {
-                $holidayArray[] = Helpers::getDateValue($holidayDate);
-            }
+            $holidayArray = array_map([Helpers::class, 'getDateValue'], Functions::flattenArray($dateArgs));
         } catch (Exception $e) {
             return $e->getMessage();
         }
@@ -58,15 +72,12 @@ public static function date($startDate, $endDays, ...$dateArgs)
 
     /**
      * Use incrementing logic to determine Workday.
-     *
-     * @return mixed
      */
-    private static function incrementing(float $startDate, int $endDays, array $holidayArray)
+    private static function incrementing(float $startDate, int $endDays, array $holidayArray): float|int|DateTime
     {
         //    Adjust the start date if it falls over a weekend
-
         $startDoW = self::getWeekDay($startDate, 3);
-        if (self::getWeekDay($startDate, 3) >= 5) {
+        if ($startDoW >= 5) {
             $startDate += 7 - $startDoW;
             --$endDays;
         }
@@ -120,15 +131,12 @@ private static function incrementingArray(float $startDate, float $endDate, arra
 
     /**
      * Use decrementing logic to determine Workday.
-     *
-     * @return mixed
      */
-    private static function decrementing(float $startDate, int $endDays, array $holidayArray)
+    private static function decrementing(float $startDate, int $endDays, array $holidayArray): float|int|DateTime
     {
         //    Adjust the start date if it falls over a weekend
-
         $startDoW = self::getWeekDay($startDate, 3);
-        if (self::getWeekDay($startDate, 3) >= 5) {
+        if ($startDoW >= 5) {
             $startDate += -$startDoW + 4;
             ++$endDays;
         }
@@ -172,6 +180,7 @@ private static function decrementingArray(float $startDate, float $endDate, arra
             }
             //    Adjust the calculated end date if it falls over a weekend
             $endDoW = self::getWeekDay($endDate, 3);
+            /** int $endDoW */
             if ($endDoW >= 5) {
                 $endDate += -$endDoW + 4;
             }
@@ -182,8 +191,8 @@ private static function decrementingArray(float $startDate, float $endDate, arra
 
     private static function getWeekDay(float $date, int $wd): int
     {
-        $result = Week::day($date, $wd);
+        $result = Functions::scalar(Week::day($date, $wd));
 
-        return is_string($result) ? -1 : $result;
+        return is_int($result) ? $result : -1;
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/YearFrac.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/YearFrac.php
index da2ac12fc5..2713754ac2 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/YearFrac.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTimeExcel/YearFrac.php
@@ -2,12 +2,16 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Shared\Date as SharedDateHelper;
 
 class YearFrac
 {
+    use ArrayEnabled;
+
     /**
      * YEARFRAC.
      *
@@ -23,19 +27,28 @@ class YearFrac
      *
      * @param mixed $startDate Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard date string
+     *                         Or can be an array of values
      * @param mixed $endDate Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard date string
-     * @param int $method Method used for the calculation
+     *                         Or can be an array of methods
+     * @param array|int $method Method used for the calculation
      *                                        0 or omitted    US (NASD) 30/360
      *                                        1                Actual/actual
      *                                        2                Actual/360
      *                                        3                Actual/365
      *                                        4                European 30/360
+     *                         Or can be an array of methods
      *
-     * @return float|string fraction of the year, or a string containing an error
+     * @return array|float|int|string fraction of the year, or a string containing an error
+     *         If an array of values is passed for the $startDate or $endDays,arguments, then the returned result
+     *            will also be an array with matching dimensions
      */
-    public static function fraction($startDate, $endDate, $method = 0)
+    public static function fraction(mixed $startDate, mixed $endDate, array|int|string|null $method = 0): array|string|int|float
     {
+        if (is_array($startDate) || is_array($endDate) || is_array($method)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $startDate, $endDate, $method);
+        }
+
         try {
             $method = (int) Helpers::validateNumericNull($method);
             $sDate = Helpers::getDateValue($startDate);
@@ -48,29 +61,20 @@ public static function fraction($startDate, $endDate, $method = 0)
             return $e->getMessage();
         }
 
-        switch ($method) {
-            case 0:
-                return Days360::between($startDate, $endDate) / 360;
-            case 1:
-                return self::method1($startDate, $endDate);
-            case 2:
-                return Difference::interval($startDate, $endDate) / 360;
-            case 3:
-                return Difference::interval($startDate, $endDate) / 365;
-            case 4:
-                return Days360::between($startDate, $endDate, true) / 360;
-        }
-
-        return Functions::NAN();
+        return match ($method) {
+            0 => Functions::scalar(Days360::between($startDate, $endDate)) / 360,
+            1 => self::method1($startDate, $endDate),
+            2 => Functions::scalar(Difference::interval($startDate, $endDate)) / 360,
+            3 => Functions::scalar(Difference::interval($startDate, $endDate)) / 365,
+            4 => Functions::scalar(Days360::between($startDate, $endDate, true)) / 360,
+            default => ExcelError::NAN(),
+        };
     }
 
     /**
      * Excel 1900 calendar treats date argument of null as 1900-01-00. Really.
-     *
-     * @param mixed $startDate
-     * @param mixed $endDate
      */
-    private static function excelBug(float $sDate, $startDate, $endDate, int $method): float
+    private static function excelBug(float $sDate, mixed $startDate, mixed $endDate, int $method): float
     {
         if (Functions::getCompatibilityMode() !== Functions::COMPATIBILITY_OPENOFFICE && SharedDateHelper::getExcelCalendar() !== SharedDateHelper::CALENDAR_MAC_1904) {
             if ($endDate === null && $startDate !== null) {
@@ -87,7 +91,7 @@ private static function excelBug(float $sDate, $startDate, $endDate, int $method
 
     private static function method1(float $startDate, float $endDate): float
     {
-        $days = Difference::interval($startDate, $endDate);
+        $days = Functions::scalar(Difference::interval($startDate, $endDate));
         $startYear = (int) DateParts::year($startDate);
         $endYear = (int) DateParts::year($endDate);
         $years = $endYear - $startYear + 1;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/ArrayArgumentHelper.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/ArrayArgumentHelper.php
new file mode 100644
index 0000000000..0107f40453
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/ArrayArgumentHelper.php
@@ -0,0 +1,190 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engine;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+
+class ArrayArgumentHelper
+{
+    protected int $indexStart = 0;
+
+    protected array $arguments;
+
+    protected int $argumentCount;
+
+    protected array $rows;
+
+    protected array $columns;
+
+    public function initialise(array $arguments): void
+    {
+        $keys = array_keys($arguments);
+        $this->indexStart = (int) array_shift($keys);
+        $this->rows = $this->rows($arguments);
+        $this->columns = $this->columns($arguments);
+
+        $this->argumentCount = count($arguments);
+        $this->arguments = $this->flattenSingleCellArrays($arguments, $this->rows, $this->columns);
+
+        $this->rows = $this->rows($arguments);
+        $this->columns = $this->columns($arguments);
+
+        if ($this->arrayArguments() > 2) {
+            throw new Exception('Formulae with more than two array arguments are not supported');
+        }
+    }
+
+    public function arguments(): array
+    {
+        return $this->arguments;
+    }
+
+    public function hasArrayArgument(): bool
+    {
+        return $this->arrayArguments() > 0;
+    }
+
+    public function getFirstArrayArgumentNumber(): int
+    {
+        $rowArrays = $this->filterArray($this->rows);
+        $columnArrays = $this->filterArray($this->columns);
+
+        for ($index = $this->indexStart; $index < $this->argumentCount; ++$index) {
+            if (isset($rowArrays[$index]) || isset($columnArrays[$index])) {
+                return ++$index;
+            }
+        }
+
+        return 0;
+    }
+
+    public function getSingleRowVector(): ?int
+    {
+        $rowVectors = $this->getRowVectors();
+
+        return count($rowVectors) === 1 ? array_pop($rowVectors) : null;
+    }
+
+    private function getRowVectors(): array
+    {
+        $rowVectors = [];
+        for ($index = $this->indexStart; $index < ($this->indexStart + $this->argumentCount); ++$index) {
+            if ($this->rows[$index] === 1 && $this->columns[$index] > 1) {
+                $rowVectors[] = $index;
+            }
+        }
+
+        return $rowVectors;
+    }
+
+    public function getSingleColumnVector(): ?int
+    {
+        $columnVectors = $this->getColumnVectors();
+
+        return count($columnVectors) === 1 ? array_pop($columnVectors) : null;
+    }
+
+    private function getColumnVectors(): array
+    {
+        $columnVectors = [];
+        for ($index = $this->indexStart; $index < ($this->indexStart + $this->argumentCount); ++$index) {
+            if ($this->rows[$index] > 1 && $this->columns[$index] === 1) {
+                $columnVectors[] = $index;
+            }
+        }
+
+        return $columnVectors;
+    }
+
+    public function getMatrixPair(): array
+    {
+        for ($i = $this->indexStart; $i < ($this->indexStart + $this->argumentCount - 1); ++$i) {
+            for ($j = $i + 1; $j < $this->argumentCount; ++$j) {
+                if (isset($this->rows[$i], $this->rows[$j])) {
+                    return [$i, $j];
+                }
+            }
+        }
+
+        return [];
+    }
+
+    public function isVector(int $argument): bool
+    {
+        return $this->rows[$argument] === 1 || $this->columns[$argument] === 1;
+    }
+
+    public function isRowVector(int $argument): bool
+    {
+        return $this->rows[$argument] === 1;
+    }
+
+    public function isColumnVector(int $argument): bool
+    {
+        return $this->columns[$argument] === 1;
+    }
+
+    public function rowCount(int $argument): int
+    {
+        return $this->rows[$argument];
+    }
+
+    public function columnCount(int $argument): int
+    {
+        return $this->columns[$argument];
+    }
+
+    private function rows(array $arguments): array
+    {
+        return array_map(
+            fn ($argument): int => is_countable($argument) ? count($argument) : 1,
+            $arguments
+        );
+    }
+
+    private function columns(array $arguments): array
+    {
+        return array_map(
+            function (mixed $argument): int {
+                return is_array($argument) && is_array($argument[array_keys($argument)[0]])
+                    ? count($argument[array_keys($argument)[0]])
+                    : 1;
+            },
+            $arguments
+        );
+    }
+
+    public function arrayArguments(): int
+    {
+        $count = 0;
+        foreach (array_keys($this->arguments) as $argument) {
+            if ($this->rows[$argument] > 1 || $this->columns[$argument] > 1) {
+                ++$count;
+            }
+        }
+
+        return $count;
+    }
+
+    private function flattenSingleCellArrays(array $arguments, array $rows, array $columns): array
+    {
+        foreach ($arguments as $index => $argument) {
+            if ($rows[$index] === 1 && $columns[$index] === 1) {
+                while (is_array($argument)) {
+                    $argument = array_pop($argument);
+                }
+                $arguments[$index] = $argument;
+            }
+        }
+
+        return $arguments;
+    }
+
+    private function filterArray(array $array): array
+    {
+        return array_filter(
+            $array,
+            fn ($value): bool => $value > 1
+        );
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/ArrayArgumentProcessor.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/ArrayArgumentProcessor.php
new file mode 100644
index 0000000000..fb2c853b3e
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/ArrayArgumentProcessor.php
@@ -0,0 +1,159 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engine;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+
+class ArrayArgumentProcessor
+{
+    private static ArrayArgumentHelper $arrayArgumentHelper;
+
+    public static function processArguments(
+        ArrayArgumentHelper $arrayArgumentHelper,
+        callable $method,
+        mixed ...$arguments
+    ): array {
+        self::$arrayArgumentHelper = $arrayArgumentHelper;
+
+        if (self::$arrayArgumentHelper->hasArrayArgument() === false) {
+            return [$method(...$arguments)];
+        }
+
+        if (self::$arrayArgumentHelper->arrayArguments() === 1) {
+            $nthArgument = self::$arrayArgumentHelper->getFirstArrayArgumentNumber();
+
+            return self::evaluateNthArgumentAsArray($method, $nthArgument, ...$arguments);
+        }
+
+        $singleRowVectorIndex = self::$arrayArgumentHelper->getSingleRowVector();
+        $singleColumnVectorIndex = self::$arrayArgumentHelper->getSingleColumnVector();
+
+        if ($singleRowVectorIndex !== null && $singleColumnVectorIndex !== null) {
+            // Basic logic for a single row vector and a single column vector
+            return self::evaluateVectorPair($method, $singleRowVectorIndex, $singleColumnVectorIndex, ...$arguments);
+        }
+
+        $matrixPair = self::$arrayArgumentHelper->getMatrixPair();
+        if ($matrixPair !== []) {
+            if (
+                (self::$arrayArgumentHelper->isVector($matrixPair[0]) === true
+                    && self::$arrayArgumentHelper->isVector($matrixPair[1]) === false)
+                || (self::$arrayArgumentHelper->isVector($matrixPair[0]) === false
+                    && self::$arrayArgumentHelper->isVector($matrixPair[1]) === true)
+            ) {
+                // Logic for a matrix and a vector (row or column)
+                return self::evaluateVectorMatrixPair($method, $matrixPair, ...$arguments);
+            }
+
+            // Logic for matrix/matrix, column vector/column vector or row vector/row vector
+            return self::evaluateMatrixPair($method, $matrixPair, ...$arguments);
+        }
+
+        // Still need to work out the logic for more than two array arguments,
+        // For the moment, we're throwing an Exception when we initialise the ArrayArgumentHelper
+        return ['#VALUE!'];
+    }
+
+    private static function evaluateVectorMatrixPair(callable $method, array $matrixIndexes, mixed ...$arguments): array
+    {
+        $matrix2 = array_pop($matrixIndexes);
+        /** @var array $matrixValues2 */
+        $matrixValues2 = $arguments[$matrix2];
+        $matrix1 = array_pop($matrixIndexes);
+        /** @var array $matrixValues1 */
+        $matrixValues1 = $arguments[$matrix1];
+
+        $rows = min(array_map([self::$arrayArgumentHelper, 'rowCount'], [$matrix1, $matrix2]));
+        $columns = min(array_map([self::$arrayArgumentHelper, 'columnCount'], [$matrix1, $matrix2]));
+
+        if ($rows === 1) {
+            $rows = max(array_map([self::$arrayArgumentHelper, 'rowCount'], [$matrix1, $matrix2]));
+        }
+        if ($columns === 1) {
+            $columns = max(array_map([self::$arrayArgumentHelper, 'columnCount'], [$matrix1, $matrix2]));
+        }
+
+        $result = [];
+        for ($rowIndex = 0; $rowIndex < $rows; ++$rowIndex) {
+            for ($columnIndex = 0; $columnIndex < $columns; ++$columnIndex) {
+                $rowIndex1 = self::$arrayArgumentHelper->isRowVector($matrix1) ? 0 : $rowIndex;
+                $columnIndex1 = self::$arrayArgumentHelper->isColumnVector($matrix1) ? 0 : $columnIndex;
+                $value1 = $matrixValues1[$rowIndex1][$columnIndex1];
+                $rowIndex2 = self::$arrayArgumentHelper->isRowVector($matrix2) ? 0 : $rowIndex;
+                $columnIndex2 = self::$arrayArgumentHelper->isColumnVector($matrix2) ? 0 : $columnIndex;
+                $value2 = $matrixValues2[$rowIndex2][$columnIndex2];
+                $arguments[$matrix1] = $value1;
+                $arguments[$matrix2] = $value2;
+
+                $result[$rowIndex][$columnIndex] = $method(...$arguments);
+            }
+        }
+
+        return $result;
+    }
+
+    private static function evaluateMatrixPair(callable $method, array $matrixIndexes, mixed ...$arguments): array
+    {
+        $matrix2 = array_pop($matrixIndexes);
+        /** @var array $matrixValues2 */
+        $matrixValues2 = $arguments[$matrix2];
+        $matrix1 = array_pop($matrixIndexes);
+        /** @var array $matrixValues1 */
+        $matrixValues1 = $arguments[$matrix1];
+
+        $result = [];
+        foreach ($matrixValues1 as $rowIndex => $row) {
+            foreach ($row as $columnIndex => $value1) {
+                if (isset($matrixValues2[$rowIndex][$columnIndex]) === false) {
+                    continue;
+                }
+
+                $value2 = $matrixValues2[$rowIndex][$columnIndex];
+                $arguments[$matrix1] = $value1;
+                $arguments[$matrix2] = $value2;
+
+                $result[$rowIndex][$columnIndex] = $method(...$arguments);
+            }
+        }
+
+        return $result;
+    }
+
+    private static function evaluateVectorPair(callable $method, int $rowIndex, int $columnIndex, mixed ...$arguments): array
+    {
+        $rowVector = Functions::flattenArray($arguments[$rowIndex]);
+        $columnVector = Functions::flattenArray($arguments[$columnIndex]);
+
+        $result = [];
+        foreach ($columnVector as $column) {
+            $rowResults = [];
+            foreach ($rowVector as $row) {
+                $arguments[$rowIndex] = $row;
+                $arguments[$columnIndex] = $column;
+
+                $rowResults[] = $method(...$arguments);
+            }
+            $result[] = $rowResults;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Note, offset is from 1 (for the first argument) rather than from 0.
+     */
+    private static function evaluateNthArgumentAsArray(callable $method, int $nthArgument, mixed ...$arguments): array
+    {
+        $values = array_slice($arguments, $nthArgument - 1, 1);
+        /** @var array $values */
+        $values = array_pop($values);
+
+        $result = [];
+        foreach ($values as $value) {
+            $arguments[$nthArgument - 1] = $value;
+            $result[] = $method(...$arguments);
+        }
+
+        return $result;
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/BranchPruner.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/BranchPruner.php
new file mode 100644
index 0000000000..e6dbbcbdee
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/BranchPruner.php
@@ -0,0 +1,201 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engine;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+
+class BranchPruner
+{
+    protected bool $branchPruningEnabled;
+
+    /**
+     * Used to generate unique store keys.
+     */
+    private int $branchStoreKeyCounter = 0;
+
+    /**
+     * currently pending storeKey (last item of the storeKeysStack.
+     */
+    protected ?string $pendingStoreKey = null;
+
+    /**
+     * @var string[]
+     */
+    protected array $storeKeysStack = [];
+
+    /**
+     * @var bool[]
+     */
+    protected array $conditionMap = [];
+
+    /**
+     * @var bool[]
+     */
+    protected array $thenMap = [];
+
+    /**
+     * @var bool[]
+     */
+    protected array $elseMap = [];
+
+    /**
+     * @var int[]
+     */
+    protected array $braceDepthMap = [];
+
+    protected ?string $currentCondition = null;
+
+    protected ?string $currentOnlyIf = null;
+
+    protected ?string $currentOnlyIfNot = null;
+
+    protected ?string $previousStoreKey = null;
+
+    public function __construct(bool $branchPruningEnabled)
+    {
+        $this->branchPruningEnabled = $branchPruningEnabled;
+    }
+
+    public function clearBranchStore(): void
+    {
+        $this->branchStoreKeyCounter = 0;
+    }
+
+    public function initialiseForLoop(): void
+    {
+        $this->currentCondition = null;
+        $this->currentOnlyIf = null;
+        $this->currentOnlyIfNot = null;
+        $this->previousStoreKey = null;
+        $this->pendingStoreKey = empty($this->storeKeysStack) ? null : end($this->storeKeysStack);
+
+        if ($this->branchPruningEnabled) {
+            $this->initialiseCondition();
+            $this->initialiseThen();
+            $this->initialiseElse();
+        }
+    }
+
+    private function initialiseCondition(): void
+    {
+        if (isset($this->conditionMap[$this->pendingStoreKey]) && $this->conditionMap[$this->pendingStoreKey]) {
+            $this->currentCondition = $this->pendingStoreKey;
+            $stackDepth = count($this->storeKeysStack);
+            if ($stackDepth > 1) {
+                // nested if
+                $this->previousStoreKey = $this->storeKeysStack[$stackDepth - 2];
+            }
+        }
+    }
+
+    private function initialiseThen(): void
+    {
+        if (isset($this->thenMap[$this->pendingStoreKey]) && $this->thenMap[$this->pendingStoreKey]) {
+            $this->currentOnlyIf = $this->pendingStoreKey;
+        } elseif (
+            isset($this->previousStoreKey, $this->thenMap[$this->previousStoreKey])
+            && $this->thenMap[$this->previousStoreKey]
+        ) {
+            $this->currentOnlyIf = $this->previousStoreKey;
+        }
+    }
+
+    private function initialiseElse(): void
+    {
+        if (isset($this->elseMap[$this->pendingStoreKey]) && $this->elseMap[$this->pendingStoreKey]) {
+            $this->currentOnlyIfNot = $this->pendingStoreKey;
+        } elseif (
+            isset($this->previousStoreKey, $this->elseMap[$this->previousStoreKey])
+            && $this->elseMap[$this->previousStoreKey]
+        ) {
+            $this->currentOnlyIfNot = $this->previousStoreKey;
+        }
+    }
+
+    public function decrementDepth(): void
+    {
+        if (!empty($this->pendingStoreKey)) {
+            --$this->braceDepthMap[$this->pendingStoreKey];
+        }
+    }
+
+    public function incrementDepth(): void
+    {
+        if (!empty($this->pendingStoreKey)) {
+            ++$this->braceDepthMap[$this->pendingStoreKey];
+        }
+    }
+
+    public function functionCall(string $functionName): void
+    {
+        if ($this->branchPruningEnabled && ($functionName === 'IF(')) {
+            // we handle a new if
+            $this->pendingStoreKey = $this->getUnusedBranchStoreKey();
+            $this->storeKeysStack[] = $this->pendingStoreKey;
+            $this->conditionMap[$this->pendingStoreKey] = true;
+            $this->braceDepthMap[$this->pendingStoreKey] = 0;
+        } elseif (!empty($this->pendingStoreKey) && array_key_exists($this->pendingStoreKey, $this->braceDepthMap)) {
+            // this is not an if but we go deeper
+            ++$this->braceDepthMap[$this->pendingStoreKey];
+        }
+    }
+
+    public function argumentSeparator(): void
+    {
+        if (!empty($this->pendingStoreKey) && $this->braceDepthMap[$this->pendingStoreKey] === 0) {
+            // We must go to the IF next argument
+            if ($this->conditionMap[$this->pendingStoreKey]) {
+                $this->conditionMap[$this->pendingStoreKey] = false;
+                $this->thenMap[$this->pendingStoreKey] = true;
+            } elseif ($this->thenMap[$this->pendingStoreKey]) {
+                $this->thenMap[$this->pendingStoreKey] = false;
+                $this->elseMap[$this->pendingStoreKey] = true;
+            } elseif ($this->elseMap[$this->pendingStoreKey]) {
+                throw new Exception('Reaching fourth argument of an IF');
+            }
+        }
+    }
+
+    public function closingBrace(mixed $value): void
+    {
+        if (!empty($this->pendingStoreKey) && $this->braceDepthMap[$this->pendingStoreKey] === -1) {
+            // we are closing an IF(
+            if ($value !== 'IF(') {
+                throw new Exception('Parser bug we should be in an "IF("');
+            }
+
+            if ($this->conditionMap[$this->pendingStoreKey]) {
+                throw new Exception('We should not be expecting a condition');
+            }
+
+            $this->thenMap[$this->pendingStoreKey] = false;
+            $this->elseMap[$this->pendingStoreKey] = false;
+            --$this->braceDepthMap[$this->pendingStoreKey];
+            array_pop($this->storeKeysStack);
+            $this->pendingStoreKey = null;
+        }
+    }
+
+    public function currentCondition(): ?string
+    {
+        return $this->currentCondition;
+    }
+
+    public function currentOnlyIf(): ?string
+    {
+        return $this->currentOnlyIf;
+    }
+
+    public function currentOnlyIfNot(): ?string
+    {
+        return $this->currentOnlyIfNot;
+    }
+
+    private function getUnusedBranchStoreKey(): string
+    {
+        $storeKeyValue = 'storeKey-' . $this->branchStoreKeyCounter;
+        ++$this->branchStoreKeyCounter;
+
+        return $storeKeyValue;
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/CyclicReferenceStack.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/CyclicReferenceStack.php
index b688e05634..f4806b477b 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/CyclicReferenceStack.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/CyclicReferenceStack.php
@@ -9,34 +9,28 @@ class CyclicReferenceStack
      *
      * @var mixed[]
      */
-    private $stack = [];
+    private array $stack = [];
 
     /**
      * Return the number of entries on the stack.
-     *
-     * @return int
      */
-    public function count()
+    public function count(): int
     {
         return count($this->stack);
     }
 
     /**
      * Push a new entry onto the stack.
-     *
-     * @param mixed $value
      */
-    public function push($value): void
+    public function push(mixed $value): void
     {
         $this->stack[$value] = $value;
     }
 
     /**
      * Pop the last entry from the stack.
-     *
-     * @return mixed
      */
-    public function pop()
+    public function pop(): mixed
     {
         return array_pop($this->stack);
     }
@@ -45,10 +39,8 @@ public function pop()
      * Test to see if a specified entry exists on the stack.
      *
      * @param mixed $value The value to test
-     *
-     * @return bool
      */
-    public function onStack($value)
+    public function onStack(mixed $value): bool
     {
         return isset($this->stack[$value]);
     }
@@ -66,7 +58,7 @@ public function clear(): void
      *
      * @return mixed[]
      */
-    public function showStack()
+    public function showStack(): array
     {
         return $this->stack;
     }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/FormattedNumber.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/FormattedNumber.php
new file mode 100644
index 0000000000..331fa448be
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/FormattedNumber.php
@@ -0,0 +1,147 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engine;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+
+class FormattedNumber
+{
+    /**    Constants                */
+    /**    Regular Expressions        */
+    private const STRING_REGEXP_FRACTION = '~^\s*(-?)((\d*)\s+)?(\d+\/\d+)\s*$~';
+
+    private const STRING_REGEXP_PERCENT = '~^(?:(?: *(?<PrefixedSign>[-+])? *\% *(?<PrefixedSign2>[-+])? *(?<PrefixedValue>[0-9]+\.?[0-9*]*(?:E[-+]?[0-9]*)?) *)|(?: *(?<PostfixedSign>[-+])? *(?<PostfixedValue>[0-9]+\.?[0-9]*(?:E[-+]?[0-9]*)?) *\% *))$~i';
+
+    // preg_quoted string for major currency symbols, with a %s for locale currency
+    private const CURRENCY_CONVERSION_LIST = '\$€£¥%s';
+
+    private const STRING_CONVERSION_LIST = [
+        [self::class, 'convertToNumberIfNumeric'],
+        [self::class, 'convertToNumberIfFraction'],
+        [self::class, 'convertToNumberIfPercent'],
+        [self::class, 'convertToNumberIfCurrency'],
+    ];
+
+    /**
+     * Identify whether a string contains a formatted numeric value,
+     * and convert it to a numeric if it is.
+     *
+     * @param string $operand string value to test
+     */
+    public static function convertToNumberIfFormatted(string &$operand): bool
+    {
+        foreach (self::STRING_CONVERSION_LIST as $conversionMethod) {
+            if ($conversionMethod($operand) === true) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Identify whether a string contains a numeric value,
+     * and convert it to a numeric if it is.
+     *
+     * @param string $operand string value to test
+     */
+    public static function convertToNumberIfNumeric(string &$operand): bool
+    {
+        $thousandsSeparator = preg_quote(StringHelper::getThousandsSeparator(), '/');
+        $value = preg_replace(['/(\d)' . $thousandsSeparator . '(\d)/u', '/([+-])\s+(\d)/u'], ['$1$2', '$1$2'], trim($operand));
+        $decimalSeparator = preg_quote(StringHelper::getDecimalSeparator(), '/');
+        $value = preg_replace(['/(\d)' . $decimalSeparator . '(\d)/u', '/([+-])\s+(\d)/u'], ['$1.$2', '$1$2'], $value ?? '');
+
+        if (is_numeric($value)) {
+            $operand = (float) $value;
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Identify whether a string contains a fractional numeric value,
+     * and convert it to a numeric if it is.
+     *
+     * @param string $operand string value to test
+     */
+    public static function convertToNumberIfFraction(string &$operand): bool
+    {
+        if (preg_match(self::STRING_REGEXP_FRACTION, $operand, $match)) {
+            $sign = ($match[1] === '-') ? '-' : '+';
+            $wholePart = ($match[3] === '') ? '' : ($sign . $match[3]);
+            $fractionFormula = '=' . $wholePart . $sign . $match[4];
+            $operand = Calculation::getInstance()->_calculateFormulaValue($fractionFormula);
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Identify whether a string contains a percentage, and if so,
+     * convert it to a numeric.
+     *
+     * @param string $operand string value to test
+     */
+    public static function convertToNumberIfPercent(string &$operand): bool
+    {
+        $thousandsSeparator = preg_quote(StringHelper::getThousandsSeparator(), '/');
+        $value = preg_replace('/(\d)' . $thousandsSeparator . '(\d)/u', '$1$2', trim($operand));
+        $decimalSeparator = preg_quote(StringHelper::getDecimalSeparator(), '/');
+        $value = preg_replace(['/(\d)' . $decimalSeparator . '(\d)/u', '/([+-])\s+(\d)/u'], ['$1.$2', '$1$2'], $value ?? '');
+
+        $match = [];
+        if ($value !== null && preg_match(self::STRING_REGEXP_PERCENT, $value, $match, PREG_UNMATCHED_AS_NULL)) {
+            //Calculate the percentage
+            $sign = ($match['PrefixedSign'] ?? $match['PrefixedSign2'] ?? $match['PostfixedSign']) ?? '';
+            $operand = (float) ($sign . ($match['PostfixedValue'] ?? $match['PrefixedValue'])) / 100;
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Identify whether a string contains a currency value, and if so,
+     * convert it to a numeric.
+     *
+     * @param string $operand string value to test
+     */
+    public static function convertToNumberIfCurrency(string &$operand): bool
+    {
+        $currencyRegexp = self::currencyMatcherRegexp();
+        $thousandsSeparator = preg_quote(StringHelper::getThousandsSeparator(), '/');
+        $value = preg_replace('/(\d)' . $thousandsSeparator . '(\d)/u', '$1$2', $operand);
+
+        $match = [];
+        if ($value !== null && preg_match($currencyRegexp, $value, $match, PREG_UNMATCHED_AS_NULL)) {
+            //Determine the sign
+            $sign = ($match['PrefixedSign'] ?? $match['PrefixedSign2'] ?? $match['PostfixedSign']) ?? '';
+            $decimalSeparator = StringHelper::getDecimalSeparator();
+            //Cast to a float
+            $intermediate = (string) ($match['PostfixedValue'] ?? $match['PrefixedValue']);
+            $intermediate = str_replace($decimalSeparator, '.', $intermediate);
+            if (is_numeric($intermediate)) {
+                $operand = (float) ($sign . str_replace($decimalSeparator, '.', $intermediate));
+
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public static function currencyMatcherRegexp(): string
+    {
+        $currencyCodes = sprintf(self::CURRENCY_CONVERSION_LIST, preg_quote(StringHelper::getCurrencyCode(), '/'));
+        $decimalSeparator = preg_quote(StringHelper::getDecimalSeparator(), '/');
+
+        return '~^(?:(?: *(?<PrefixedSign>[-+])? *(?<PrefixedCurrency>[' . $currencyCodes . ']) *(?<PrefixedSign2>[-+])? *(?<PrefixedValue>[0-9]+[' . $decimalSeparator . ']?[0-9*]*(?:E[-+]?[0-9]*)?) *)|(?: *(?<PostfixedSign>[-+])? *(?<PostfixedValue>[0-9]+' . $decimalSeparator . '?[0-9]*(?:E[-+]?[0-9]*)?) *(?<PostfixedCurrency>[' . $currencyCodes . ']) *))$~ui';
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/Logger.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/Logger.php
index 3c0f2377e4..9adcd55957 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/Logger.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/Logger.php
@@ -8,34 +8,28 @@ class Logger
      * Flag to determine whether a debug log should be generated by the calculation engine
      *        If true, then a debug log will be generated
      *        If false, then a debug log will not be generated.
-     *
-     * @var bool
      */
-    private $writeDebugLog = false;
+    private bool $writeDebugLog = false;
 
     /**
      * Flag to determine whether a debug log should be echoed by the calculation engine
      *        If true, then a debug log will be echoed
      *        If false, then a debug log will not be echoed
      * A debug log can only be echoed if it is generated.
-     *
-     * @var bool
      */
-    private $echoDebugLog = false;
+    private bool $echoDebugLog = false;
 
     /**
      * The debug log generated by the calculation engine.
      *
      * @var string[]
      */
-    private $debugLog = [];
+    private array $debugLog = [];
 
     /**
      * The calculation engine cell reference stack.
-     *
-     * @var CyclicReferenceStack
      */
-    private $cellStack;
+    private CyclicReferenceStack $cellStack;
 
     /**
      * Instantiate a Calculation engine logger.
@@ -47,40 +41,32 @@ public function __construct(CyclicReferenceStack $stack)
 
     /**
      * Enable/Disable Calculation engine logging.
-     *
-     * @param bool $pValue
      */
-    public function setWriteDebugLog($pValue): void
+    public function setWriteDebugLog(bool $writeDebugLog): void
     {
-        $this->writeDebugLog = $pValue;
+        $this->writeDebugLog = $writeDebugLog;
     }
 
     /**
      * Return whether calculation engine logging is enabled or disabled.
-     *
-     * @return bool
      */
-    public function getWriteDebugLog()
+    public function getWriteDebugLog(): bool
     {
         return $this->writeDebugLog;
     }
 
     /**
      * Enable/Disable echoing of debug log information.
-     *
-     * @param bool $pValue
      */
-    public function setEchoDebugLog($pValue): void
+    public function setEchoDebugLog(bool $echoDebugLog): void
     {
-        $this->echoDebugLog = $pValue;
+        $this->echoDebugLog = $echoDebugLog;
     }
 
     /**
      * Return whether echoing of debug log information is enabled or disabled.
-     *
-     * @return bool
      */
-    public function getEchoDebugLog()
+    public function getEchoDebugLog(): bool
     {
         return $this->echoDebugLog;
     }
@@ -88,21 +74,21 @@ public function getEchoDebugLog()
     /**
      * Write an entry to the calculation engine debug log.
      */
-    public function writeDebugLog(...$args): void
+    public function writeDebugLog(string $message, mixed ...$args): void
     {
         //    Only write the debug log if logging is enabled
         if ($this->writeDebugLog) {
-            $message = implode('', $args);
+            $message = sprintf($message, ...$args);
             $cellReference = implode(' -> ', $this->cellStack->showStack());
             if ($this->echoDebugLog) {
                 echo $cellReference,
-                    ($this->cellStack->count() > 0 ? ' => ' : ''),
-                    $message,
-                    PHP_EOL;
+                ($this->cellStack->count() > 0 ? ' => ' : ''),
+                $message,
+                PHP_EOL;
             }
-            $this->debugLog[] = $cellReference .
-                ($this->cellStack->count() > 0 ? ' => ' : '') .
-                $message;
+            $this->debugLog[] = $cellReference
+                . ($this->cellStack->count() > 0 ? ' => ' : '')
+                . $message;
         }
     }
 
@@ -133,7 +119,7 @@ public function clearLog(): void
      *
      * @return string[]
      */
-    public function getLog()
+    public function getLog(): array
     {
         return $this->debugLog;
     }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/Operands/Operand.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/Operands/Operand.php
new file mode 100644
index 0000000000..05264c3f19
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/Operands/Operand.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engine\Operands;
+
+interface Operand
+{
+    public static function fromParser(string $formula, int $index, array $matches): self;
+
+    public function value(): string;
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/Operands/StructuredReference.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/Operands/StructuredReference.php
new file mode 100644
index 0000000000..fc2b5ea47d
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engine/Operands/StructuredReference.php
@@ -0,0 +1,355 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Engine\Operands;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Worksheet\Table;
+use Stringable;
+
+final class StructuredReference implements Operand, Stringable
+{
+    public const NAME = 'Structured Reference';
+
+    private const OPEN_BRACE = '[';
+    private const CLOSE_BRACE = ']';
+
+    private const ITEM_SPECIFIER_ALL = '#All';
+    private const ITEM_SPECIFIER_HEADERS = '#Headers';
+    private const ITEM_SPECIFIER_DATA = '#Data';
+    private const ITEM_SPECIFIER_TOTALS = '#Totals';
+    private const ITEM_SPECIFIER_THIS_ROW = '#This Row';
+
+    private const ITEM_SPECIFIER_ROWS_SET = [
+        self::ITEM_SPECIFIER_ALL,
+        self::ITEM_SPECIFIER_HEADERS,
+        self::ITEM_SPECIFIER_DATA,
+        self::ITEM_SPECIFIER_TOTALS,
+    ];
+
+    private const TABLE_REFERENCE = '/([\p{L}_\\\\][\p{L}\p{N}\._]+)?(\[(?:[^\]\[]+|(?R))*+\])/miu';
+
+    private string $value;
+
+    private string $tableName;
+
+    private Table $table;
+
+    private string $reference;
+
+    private ?int $headersRow;
+
+    private int $firstDataRow;
+
+    private int $lastDataRow;
+
+    private ?int $totalsRow;
+
+    private array $columns;
+
+    public function __construct(string $structuredReference)
+    {
+        $this->value = $structuredReference;
+    }
+
+    public static function fromParser(string $formula, int $index, array $matches): self
+    {
+        $val = $matches[0];
+
+        $srCount = substr_count($val, self::OPEN_BRACE)
+            - substr_count($val, self::CLOSE_BRACE);
+        while ($srCount > 0) {
+            $srIndex = strlen($val);
+            $srStringRemainder = substr($formula, $index + $srIndex);
+            $closingPos = strpos($srStringRemainder, self::CLOSE_BRACE);
+            if ($closingPos === false) {
+                throw new Exception("Formula Error: No closing ']' to match opening '['");
+            }
+            $srStringRemainder = substr($srStringRemainder, 0, $closingPos + 1);
+            --$srCount;
+            if (str_contains($srStringRemainder, self::OPEN_BRACE)) {
+                ++$srCount;
+            }
+            $val .= $srStringRemainder;
+        }
+
+        return new self($val);
+    }
+
+    /**
+     * @throws Exception
+     * @throws \PhpOffice\PhpSpreadsheet\Exception
+     */
+    public function parse(Cell $cell): string
+    {
+        $this->getTableStructure($cell);
+        $cellRange = ($this->isRowReference()) ? $this->getRowReference($cell) : $this->getColumnReference();
+        $sheetName = '';
+        $worksheet = $this->table->getWorksheet();
+        if ($worksheet !== null && $worksheet !== $cell->getWorksheet()) {
+            $sheetName = "'" . $worksheet->getTitle() . "'!";
+        }
+
+        return $sheetName . $cellRange;
+    }
+
+    private function isRowReference(): bool
+    {
+        return str_contains($this->value, '[@')
+            || str_contains($this->value, '[' . self::ITEM_SPECIFIER_THIS_ROW . ']');
+    }
+
+    /**
+     * @throws Exception
+     * @throws \PhpOffice\PhpSpreadsheet\Exception
+     */
+    private function getTableStructure(Cell $cell): void
+    {
+        preg_match(self::TABLE_REFERENCE, $this->value, $matches);
+
+        $this->tableName = $matches[1];
+        $this->table = ($this->tableName === '')
+            ? $this->getTableForCell($cell)
+            : $this->getTableByName($cell);
+        $this->reference = $matches[2];
+        $tableRange = Coordinate::getRangeBoundaries($this->table->getRange());
+
+        $this->headersRow = ($this->table->getShowHeaderRow()) ? (int) $tableRange[0][1] : null;
+        $this->firstDataRow = ($this->table->getShowHeaderRow()) ? (int) $tableRange[0][1] + 1 : $tableRange[0][1];
+        $this->totalsRow = ($this->table->getShowTotalsRow()) ? (int) $tableRange[1][1] : null;
+        $this->lastDataRow = ($this->table->getShowTotalsRow()) ? (int) $tableRange[1][1] - 1 : $tableRange[1][1];
+
+        $cellParam = $cell;
+        $worksheet = $this->table->getWorksheet();
+        if ($worksheet !== null && $worksheet !== $cell->getWorksheet()) {
+            $cellParam = $worksheet->getCell('A1');
+        }
+        $this->columns = $this->getColumns($cellParam, $tableRange);
+    }
+
+    /**
+     * @throws Exception
+     * @throws \PhpOffice\PhpSpreadsheet\Exception
+     */
+    private function getTableForCell(Cell $cell): Table
+    {
+        $tables = $cell->getWorksheet()->getTableCollection();
+        foreach ($tables as $table) {
+            /** @var Table $table */
+            $range = $table->getRange();
+            if ($cell->isInRange($range) === true) {
+                $this->tableName = $table->getName();
+
+                return $table;
+            }
+        }
+
+        throw new Exception('Table for Structured Reference cannot be identified');
+    }
+
+    /**
+     * @throws Exception
+     * @throws \PhpOffice\PhpSpreadsheet\Exception
+     */
+    private function getTableByName(Cell $cell): Table
+    {
+        $table = $cell->getWorksheet()->getTableByName($this->tableName);
+
+        if ($table === null) {
+            $spreadsheet = $cell->getWorksheet()->getParent();
+            if ($spreadsheet !== null) {
+                $table = $spreadsheet->getTableByName($this->tableName);
+            }
+        }
+
+        if ($table === null) {
+            throw new Exception("Table {$this->tableName} for Structured Reference cannot be located");
+        }
+
+        return $table;
+    }
+
+    private function getColumns(Cell $cell, array $tableRange): array
+    {
+        $worksheet = $cell->getWorksheet();
+        $cellReference = $cell->getCoordinate();
+
+        $columns = [];
+        $lastColumn = ++$tableRange[1][0];
+        for ($column = $tableRange[0][0]; $column !== $lastColumn; ++$column) {
+            $columns[$column] = $worksheet
+                ->getCell($column . ($this->headersRow ?? ($this->firstDataRow - 1)))
+                ->getCalculatedValue();
+        }
+
+        $worksheet->getCell($cellReference);
+
+        return $columns;
+    }
+
+    private function getRowReference(Cell $cell): string
+    {
+        $reference = str_replace("\u{a0}", ' ', $this->reference);
+        /** @var string $reference */
+        $reference = str_replace('[' . self::ITEM_SPECIFIER_THIS_ROW . '],', '', $reference);
+
+        foreach ($this->columns as $columnId => $columnName) {
+            $columnName = str_replace("\u{a0}", ' ', $columnName);
+            $reference = $this->adjustRowReference($columnName, $reference, $cell, $columnId);
+        }
+
+        return $this->validateParsedReference(trim($reference, '[]@, '));
+    }
+
+    private function adjustRowReference(string $columnName, string $reference, Cell $cell, string $columnId): string
+    {
+        if ($columnName !== '') {
+            $cellReference = $columnId . $cell->getRow();
+            $pattern1 = '/\[' . preg_quote($columnName, '/') . '\]/miu';
+            $pattern2 = '/@' . preg_quote($columnName, '/') . '/miu';
+            if (preg_match($pattern1, $reference) === 1) {
+                $reference = preg_replace($pattern1, $cellReference, $reference);
+            } elseif (preg_match($pattern2, $reference) === 1) {
+                $reference = preg_replace($pattern2, $cellReference, $reference);
+            }
+            /** @var string $reference */
+        }
+
+        return $reference;
+    }
+
+    /**
+     * @throws Exception
+     * @throws \PhpOffice\PhpSpreadsheet\Exception
+     */
+    private function getColumnReference(): string
+    {
+        $reference = str_replace("\u{a0}", ' ', $this->reference);
+        $startRow = ($this->totalsRow === null) ? $this->lastDataRow : $this->totalsRow;
+        $endRow = ($this->headersRow === null) ? $this->firstDataRow : $this->headersRow;
+
+        [$startRow, $endRow] = $this->getRowsForColumnReference($reference, $startRow, $endRow);
+        $reference = $this->getColumnsForColumnReference($reference, $startRow, $endRow);
+
+        $reference = trim($reference, '[]@, ');
+        if (substr_count($reference, ':') > 1) {
+            $cells = explode(':', $reference);
+            $firstCell = array_shift($cells);
+            $lastCell = array_pop($cells);
+            $reference = "{$firstCell}:{$lastCell}";
+        }
+
+        return $this->validateParsedReference($reference);
+    }
+
+    /**
+     * @throws Exception
+     * @throws \PhpOffice\PhpSpreadsheet\Exception
+     */
+    private function validateParsedReference(string $reference): string
+    {
+        if (preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . ':' . Calculation::CALCULATION_REGEXP_CELLREF . '$/miu', $reference) !== 1) {
+            if (preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/miu', $reference) !== 1) {
+                throw new Exception(
+                    "Invalid Structured Reference {$this->reference} {$reference}",
+                    Exception::CALCULATION_ENGINE_PUSH_TO_STACK
+                );
+            }
+        }
+
+        return $reference;
+    }
+
+    private function fullData(int $startRow, int $endRow): string
+    {
+        $columns = array_keys($this->columns);
+        $firstColumn = array_shift($columns);
+        $lastColumn = (empty($columns)) ? $firstColumn : array_pop($columns);
+
+        return "{$firstColumn}{$startRow}:{$lastColumn}{$endRow}";
+    }
+
+    private function getMinimumRow(string $reference): int
+    {
+        return match ($reference) {
+            self::ITEM_SPECIFIER_ALL, self::ITEM_SPECIFIER_HEADERS => $this->headersRow ?? $this->firstDataRow,
+            self::ITEM_SPECIFIER_DATA => $this->firstDataRow,
+            self::ITEM_SPECIFIER_TOTALS => $this->totalsRow ?? $this->lastDataRow,
+            default => $this->headersRow ?? $this->firstDataRow,
+        };
+    }
+
+    private function getMaximumRow(string $reference): int
+    {
+        return match ($reference) {
+            self::ITEM_SPECIFIER_HEADERS => $this->headersRow ?? $this->firstDataRow,
+            self::ITEM_SPECIFIER_DATA => $this->lastDataRow,
+            self::ITEM_SPECIFIER_ALL, self::ITEM_SPECIFIER_TOTALS => $this->totalsRow ?? $this->lastDataRow,
+            default => $this->totalsRow ?? $this->lastDataRow,
+        };
+    }
+
+    public function value(): string
+    {
+        return $this->value;
+    }
+
+    /**
+     * @return array<int, int>
+     */
+    private function getRowsForColumnReference(string &$reference, int $startRow, int $endRow): array
+    {
+        $rowsSelected = false;
+        foreach (self::ITEM_SPECIFIER_ROWS_SET as $rowReference) {
+            $pattern = '/\[' . $rowReference . '\]/mui';
+            if (preg_match($pattern, $reference) === 1) {
+                if (($rowReference === self::ITEM_SPECIFIER_HEADERS) && ($this->table->getShowHeaderRow() === false)) {
+                    throw new Exception(
+                        'Table Headers are Hidden, and should not be Referenced',
+                        Exception::CALCULATION_ENGINE_PUSH_TO_STACK
+                    );
+                }
+                $rowsSelected = true;
+                $startRow = min($startRow, $this->getMinimumRow($rowReference));
+                $endRow = max($endRow, $this->getMaximumRow($rowReference));
+                $reference = preg_replace($pattern, '', $reference) ?? '';
+            }
+        }
+        if ($rowsSelected === false) {
+            // If there isn't any Special Item Identifier specified, then the selection defaults to data rows only.
+            $startRow = $this->firstDataRow;
+            $endRow = $this->lastDataRow;
+        }
+
+        return [$startRow, $endRow];
+    }
+
+    private function getColumnsForColumnReference(string $reference, int $startRow, int $endRow): string
+    {
+        $columnsSelected = false;
+        foreach ($this->columns as $columnId => $columnName) {
+            $columnName = str_replace("\u{a0}", ' ', $columnName ?? '');
+            $cellFrom = "{$columnId}{$startRow}";
+            $cellTo = "{$columnId}{$endRow}";
+            $cellReference = ($cellFrom === $cellTo) ? $cellFrom : "{$cellFrom}:{$cellTo}";
+            $pattern = '/\[' . preg_quote($columnName, '/') . '\]/mui';
+            if (preg_match($pattern, $reference) === 1) {
+                $columnsSelected = true;
+                $reference = preg_replace($pattern, $cellReference, $reference);
+            }
+            /** @var string $reference */
+        }
+        if ($columnsSelected === false) {
+            return $this->fullData($startRow, $endRow);
+        }
+
+        return $reference;
+    }
+
+    public function __toString(): string
+    {
+        return $this->value;
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering.php
deleted file mode 100644
index a70ddac5cf..0000000000
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering.php
+++ /dev/null
@@ -1,1446 +0,0 @@
-<?php
-
-namespace PhpOffice\PhpSpreadsheet\Calculation;
-
-use Complex\Complex;
-use PhpOffice\PhpSpreadsheet\Calculation\Engineering\ComplexFunctions;
-use PhpOffice\PhpSpreadsheet\Calculation\Engineering\ComplexOperations;
-
-/**
- * @deprecated 1.18.0
- */
-class Engineering
-{
-    /**
-     * EULER.
-     *
-     * @deprecated 1.18.0
-     * @see Use Engineering\Constants\EULER instead
-     */
-    public const EULER = 2.71828182845904523536;
-
-    /**
-     * parseComplex.
-     *
-     * Parses a complex number into its real and imaginary parts, and an I or J suffix
-     *
-     * @deprecated 1.12.0 No longer used by internal code. Please use the \Complex\Complex class instead
-     *
-     * @param string $complexNumber The complex number
-     *
-     * @return mixed[] Indexed on "real", "imaginary" and "suffix"
-     */
-    public static function parseComplex($complexNumber)
-    {
-        $complex = new Complex($complexNumber);
-
-        return [
-            'real' => $complex->getReal(),
-            'imaginary' => $complex->getImaginary(),
-            'suffix' => $complex->getSuffix(),
-        ];
-    }
-
-    /**
-     * BESSELI.
-     *
-     *    Returns the modified Bessel function In(x), which is equivalent to the Bessel function evaluated
-     *        for purely imaginary arguments
-     *
-     *    Excel Function:
-     *        BESSELI(x,ord)
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Use the BESSELI() method in the Engineering\BesselI class instead
-     *
-     * @param float $x The value at which to evaluate the function.
-     *                                If x is nonnumeric, BESSELI returns the #VALUE! error value.
-     * @param int $ord The order of the Bessel function.
-     *                                If ord is not an integer, it is truncated.
-     *                                If $ord is nonnumeric, BESSELI returns the #VALUE! error value.
-     *                                If $ord < 0, BESSELI returns the #NUM! error value.
-     *
-     * @return float|string Result, or a string containing an error
-     */
-    public static function BESSELI($x, $ord)
-    {
-        return Engineering\BesselI::BESSELI($x, $ord);
-    }
-
-    /**
-     * BESSELJ.
-     *
-     *    Returns the Bessel function
-     *
-     *    Excel Function:
-     *        BESSELJ(x,ord)
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Use the BESSELJ() method in the Engineering\BesselJ class instead
-     *
-     * @param float $x The value at which to evaluate the function.
-     *                                If x is nonnumeric, BESSELJ returns the #VALUE! error value.
-     * @param int $ord The order of the Bessel function. If n is not an integer, it is truncated.
-     *                                If $ord is nonnumeric, BESSELJ returns the #VALUE! error value.
-     *                                If $ord < 0, BESSELJ returns the #NUM! error value.
-     *
-     * @return float|string Result, or a string containing an error
-     */
-    public static function BESSELJ($x, $ord)
-    {
-        return Engineering\BesselJ::BESSELJ($x, $ord);
-    }
-
-    /**
-     * BESSELK.
-     *
-     *    Returns the modified Bessel function Kn(x), which is equivalent to the Bessel functions evaluated
-     *        for purely imaginary arguments.
-     *
-     *    Excel Function:
-     *        BESSELK(x,ord)
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Use the BESSELK() method in the Engineering\BesselK class instead
-     *
-     * @param float $x The value at which to evaluate the function.
-     *                                If x is nonnumeric, BESSELK returns the #VALUE! error value.
-     * @param int $ord The order of the Bessel function. If n is not an integer, it is truncated.
-     *                                If $ord is nonnumeric, BESSELK returns the #VALUE! error value.
-     *                                If $ord < 0, BESSELK returns the #NUM! error value.
-     *
-     * @return float|string Result, or a string containing an error
-     */
-    public static function BESSELK($x, $ord)
-    {
-        return Engineering\BesselK::BESSELK($x, $ord);
-    }
-
-    /**
-     * BESSELY.
-     *
-     * Returns the Bessel function, which is also called the Weber function or the Neumann function.
-     *
-     *    Excel Function:
-     *        BESSELY(x,ord)
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Use the BESSELY() method in the Engineering\BesselY class instead
-     *
-     * @param float $x The value at which to evaluate the function.
-     *                                If x is nonnumeric, BESSELY returns the #VALUE! error value.
-     * @param int $ord The order of the Bessel function. If n is not an integer, it is truncated.
-     *                                If $ord is nonnumeric, BESSELY returns the #VALUE! error value.
-     *                                If $ord < 0, BESSELY returns the #NUM! error value.
-     *
-     * @return float|string Result, or a string containing an error
-     */
-    public static function BESSELY($x, $ord)
-    {
-        return Engineering\BesselY::BESSELY($x, $ord);
-    }
-
-    /**
-     * BINTODEC.
-     *
-     * Return a binary value as decimal.
-     *
-     * Excel Function:
-     *        BIN2DEC(x)
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Use the toDecimal() method in the Engineering\ConvertBinary class instead
-     *
-     * @param mixed $x The binary number (as a string) that you want to convert. The number
-     *                                cannot contain more than 10 characters (10 bits). The most significant
-     *                                bit of number is the sign bit. The remaining 9 bits are magnitude bits.
-     *                                Negative numbers are represented using two's-complement notation.
-     *                                If number is not a valid binary number, or if number contains more than
-     *                                10 characters (10 bits), BIN2DEC returns the #NUM! error value.
-     *
-     * @return string
-     */
-    public static function BINTODEC($x)
-    {
-        return Engineering\ConvertBinary::toDecimal($x);
-    }
-
-    /**
-     * BINTOHEX.
-     *
-     * Return a binary value as hex.
-     *
-     * Excel Function:
-     *        BIN2HEX(x[,places])
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Use the toHex() method in the Engineering\ConvertBinary class instead
-     *
-     * @param mixed $x The binary number (as a string) that you want to convert. The number
-     *                                cannot contain more than 10 characters (10 bits). The most significant
-     *                                bit of number is the sign bit. The remaining 9 bits are magnitude bits.
-     *                                Negative numbers are represented using two's-complement notation.
-     *                                If number is not a valid binary number, or if number contains more than
-     *                                10 characters (10 bits), BIN2HEX returns the #NUM! error value.
-     * @param mixed $places The number of characters to use. If places is omitted, BIN2HEX uses the
-     *                                minimum number of characters necessary. Places is useful for padding the
-     *                                return value with leading 0s (zeros).
-     *                                If places is not an integer, it is truncated.
-     *                                If places is nonnumeric, BIN2HEX returns the #VALUE! error value.
-     *                                If places is negative, BIN2HEX returns the #NUM! error value.
-     *
-     * @return string
-     */
-    public static function BINTOHEX($x, $places = null)
-    {
-        return Engineering\ConvertBinary::toHex($x, $places);
-    }
-
-    /**
-     * BINTOOCT.
-     *
-     * Return a binary value as octal.
-     *
-     * Excel Function:
-     *        BIN2OCT(x[,places])
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Use the toOctal() method in the Engineering\ConvertBinary class instead
-     *
-     * @param mixed $x The binary number (as a string) that you want to convert. The number
-     *                                cannot contain more than 10 characters (10 bits). The most significant
-     *                                bit of number is the sign bit. The remaining 9 bits are magnitude bits.
-     *                                Negative numbers are represented using two's-complement notation.
-     *                                If number is not a valid binary number, or if number contains more than
-     *                                10 characters (10 bits), BIN2OCT returns the #NUM! error value.
-     * @param mixed $places The number of characters to use. If places is omitted, BIN2OCT uses the
-     *                                minimum number of characters necessary. Places is useful for padding the
-     *                                return value with leading 0s (zeros).
-     *                                If places is not an integer, it is truncated.
-     *                                If places is nonnumeric, BIN2OCT returns the #VALUE! error value.
-     *                                If places is negative, BIN2OCT returns the #NUM! error value.
-     *
-     * @return string
-     */
-    public static function BINTOOCT($x, $places = null)
-    {
-        return Engineering\ConvertBinary::toOctal($x, $places);
-    }
-
-    /**
-     * DECTOBIN.
-     *
-     * Return a decimal value as binary.
-     *
-     * Excel Function:
-     *        DEC2BIN(x[,places])
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Use the toBinary() method in the Engineering\ConvertDecimal class instead
-     *
-     * @param mixed $x The decimal integer you want to convert. If number is negative,
-     *                                valid place values are ignored and DEC2BIN returns a 10-character
-     *                                (10-bit) binary number in which the most significant bit is the sign
-     *                                bit. The remaining 9 bits are magnitude bits. Negative numbers are
-     *                                represented using two's-complement notation.
-     *                                If number < -512 or if number > 511, DEC2BIN returns the #NUM! error
-     *                                value.
-     *                                If number is nonnumeric, DEC2BIN returns the #VALUE! error value.
-     *                                If DEC2BIN requires more than places characters, it returns the #NUM!
-     *                                error value.
-     * @param mixed $places The number of characters to use. If places is omitted, DEC2BIN uses
-     *                                the minimum number of characters necessary. Places is useful for
-     *                                padding the return value with leading 0s (zeros).
-     *                                If places is not an integer, it is truncated.
-     *                                If places is nonnumeric, DEC2BIN returns the #VALUE! error value.
-     *                                If places is zero or negative, DEC2BIN returns the #NUM! error value.
-     *
-     * @return string
-     */
-    public static function DECTOBIN($x, $places = null)
-    {
-        return Engineering\ConvertDecimal::toBinary($x, $places);
-    }
-
-    /**
-     * DECTOHEX.
-     *
-     * Return a decimal value as hex.
-     *
-     * Excel Function:
-     *        DEC2HEX(x[,places])
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Use the toHex() method in the Engineering\ConvertDecimal class instead
-     *
-     * @param mixed $x The decimal integer you want to convert. If number is negative,
-     *                                places is ignored and DEC2HEX returns a 10-character (40-bit)
-     *                                hexadecimal number in which the most significant bit is the sign
-     *                                bit. The remaining 39 bits are magnitude bits. Negative numbers
-     *                                are represented using two's-complement notation.
-     *                                If number < -549,755,813,888 or if number > 549,755,813,887,
-     *                                DEC2HEX returns the #NUM! error value.
-     *                                If number is nonnumeric, DEC2HEX returns the #VALUE! error value.
-     *                                If DEC2HEX requires more than places characters, it returns the
-     *                                #NUM! error value.
-     * @param mixed $places The number of characters to use. If places is omitted, DEC2HEX uses
-     *                                the minimum number of characters necessary. Places is useful for
-     *                                padding the return value with leading 0s (zeros).
-     *                                If places is not an integer, it is truncated.
-     *                                If places is nonnumeric, DEC2HEX returns the #VALUE! error value.
-     *                                If places is zero or negative, DEC2HEX returns the #NUM! error value.
-     *
-     * @return string
-     */
-    public static function DECTOHEX($x, $places = null)
-    {
-        return Engineering\ConvertDecimal::toHex($x, $places);
-    }
-
-    /**
-     * DECTOOCT.
-     *
-     * Return an decimal value as octal.
-     *
-     * Excel Function:
-     *        DEC2OCT(x[,places])
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Use the toOctal() method in the Engineering\ConvertDecimal class instead
-     *
-     * @param mixed $x The decimal integer you want to convert. If number is negative,
-     *                                places is ignored and DEC2OCT returns a 10-character (30-bit)
-     *                                octal number in which the most significant bit is the sign bit.
-     *                                The remaining 29 bits are magnitude bits. Negative numbers are
-     *                                represented using two's-complement notation.
-     *                                If number < -536,870,912 or if number > 536,870,911, DEC2OCT
-     *                                returns the #NUM! error value.
-     *                                If number is nonnumeric, DEC2OCT returns the #VALUE! error value.
-     *                                If DEC2OCT requires more than places characters, it returns the
-     *                                #NUM! error value.
-     * @param mixed $places The number of characters to use. If places is omitted, DEC2OCT uses
-     *                                the minimum number of characters necessary. Places is useful for
-     *                                padding the return value with leading 0s (zeros).
-     *                                If places is not an integer, it is truncated.
-     *                                If places is nonnumeric, DEC2OCT returns the #VALUE! error value.
-     *                                If places is zero or negative, DEC2OCT returns the #NUM! error value.
-     *
-     * @return string
-     */
-    public static function DECTOOCT($x, $places = null)
-    {
-        return Engineering\ConvertDecimal::toOctal($x, $places);
-    }
-
-    /**
-     * HEXTOBIN.
-     *
-     * Return a hex value as binary.
-     *
-     * Excel Function:
-     *        HEX2BIN(x[,places])
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Use the toBinary() method in the Engineering\ConvertHex class instead
-     *
-     * @param mixed $x the hexadecimal number (as a string) that you want to convert.
-     *                  Number cannot contain more than 10 characters.
-     *                  The most significant bit of number is the sign bit (40th bit from the right).
-     *                  The remaining 9 bits are magnitude bits.
-     *                  Negative numbers are represented using two's-complement notation.
-     *                  If number is negative, HEX2BIN ignores places and returns a 10-character binary number.
-     *                  If number is negative, it cannot be less than FFFFFFFE00,
-     *                      and if number is positive, it cannot be greater than 1FF.
-     *                  If number is not a valid hexadecimal number, HEX2BIN returns the #NUM! error value.
-     *                  If HEX2BIN requires more than places characters, it returns the #NUM! error value.
-     * @param mixed $places The number of characters to use. If places is omitted,
-     *                                    HEX2BIN uses the minimum number of characters necessary. Places
-     *                                    is useful for padding the return value with leading 0s (zeros).
-     *                                    If places is not an integer, it is truncated.
-     *                                    If places is nonnumeric, HEX2BIN returns the #VALUE! error value.
-     *                                    If places is negative, HEX2BIN returns the #NUM! error value.
-     *
-     * @return string
-     */
-    public static function HEXTOBIN($x, $places = null)
-    {
-        return Engineering\ConvertHex::toBinary($x, $places);
-    }
-
-    /**
-     * HEXTODEC.
-     *
-     * Return a hex value as decimal.
-     *
-     * Excel Function:
-     *        HEX2DEC(x)
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Use the toDecimal() method in the Engineering\ConvertHex class instead
-     *
-     * @param mixed $x The hexadecimal number (as a string) that you want to convert. This number cannot
-     *                                contain more than 10 characters (40 bits). The most significant
-     *                                bit of number is the sign bit. The remaining 39 bits are magnitude
-     *                                bits. Negative numbers are represented using two's-complement
-     *                                notation.
-     *                                If number is not a valid hexadecimal number, HEX2DEC returns the
-     *                                #NUM! error value.
-     *
-     * @return string
-     */
-    public static function HEXTODEC($x)
-    {
-        return Engineering\ConvertHex::toDecimal($x);
-    }
-
-    /**
-     * HEXTOOCT.
-     *
-     * Return a hex value as octal.
-     *
-     * Excel Function:
-     *        HEX2OCT(x[,places])
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Use the toOctal() method in the Engineering\ConvertHex class instead
-     *
-     * @param mixed $x The hexadecimal number (as a string) that you want to convert. Number cannot
-     *                                    contain more than 10 characters. The most significant bit of
-     *                                    number is the sign bit. The remaining 39 bits are magnitude
-     *                                    bits. Negative numbers are represented using two's-complement
-     *                                    notation.
-     *                                    If number is negative, HEX2OCT ignores places and returns a
-     *                                    10-character octal number.
-     *                                    If number is negative, it cannot be less than FFE0000000, and
-     *                                    if number is positive, it cannot be greater than 1FFFFFFF.
-     *                                    If number is not a valid hexadecimal number, HEX2OCT returns
-     *                                    the #NUM! error value.
-     *                                    If HEX2OCT requires more than places characters, it returns
-     *                                    the #NUM! error value.
-     * @param mixed $places The number of characters to use. If places is omitted, HEX2OCT
-     *                                    uses the minimum number of characters necessary. Places is
-     *                                    useful for padding the return value with leading 0s (zeros).
-     *                                    If places is not an integer, it is truncated.
-     *                                    If places is nonnumeric, HEX2OCT returns the #VALUE! error
-     *                                    value.
-     *                                    If places is negative, HEX2OCT returns the #NUM! error value.
-     *
-     * @return string
-     */
-    public static function HEXTOOCT($x, $places = null)
-    {
-        return Engineering\ConvertHex::toOctal($x, $places);
-    }
-
-    /**
-     * OCTTOBIN.
-     *
-     * Return an octal value as binary.
-     *
-     * Excel Function:
-     *        OCT2BIN(x[,places])
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Use the toBinary() method in the Engineering\ConvertOctal class instead
-     *
-     * @param mixed $x The octal number you want to convert. Number may not
-     *                                    contain more than 10 characters. The most significant
-     *                                    bit of number is the sign bit. The remaining 29 bits
-     *                                    are magnitude bits. Negative numbers are represented
-     *                                    using two's-complement notation.
-     *                                    If number is negative, OCT2BIN ignores places and returns
-     *                                    a 10-character binary number.
-     *                                    If number is negative, it cannot be less than 7777777000,
-     *                                    and if number is positive, it cannot be greater than 777.
-     *                                    If number is not a valid octal number, OCT2BIN returns
-     *                                    the #NUM! error value.
-     *                                    If OCT2BIN requires more than places characters, it
-     *                                    returns the #NUM! error value.
-     * @param mixed $places The number of characters to use. If places is omitted,
-     *                                    OCT2BIN uses the minimum number of characters necessary.
-     *                                    Places is useful for padding the return value with
-     *                                    leading 0s (zeros).
-     *                                    If places is not an integer, it is truncated.
-     *                                    If places is nonnumeric, OCT2BIN returns the #VALUE!
-     *                                    error value.
-     *                                    If places is negative, OCT2BIN returns the #NUM! error
-     *                                    value.
-     *
-     * @return string
-     */
-    public static function OCTTOBIN($x, $places = null)
-    {
-        return Engineering\ConvertOctal::toBinary($x, $places);
-    }
-
-    /**
-     * OCTTODEC.
-     *
-     * Return an octal value as decimal.
-     *
-     * Excel Function:
-     *        OCT2DEC(x)
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Use the toDecimal() method in the Engineering\ConvertOctal class instead
-     *
-     * @param mixed $x The octal number you want to convert. Number may not contain
-     *                                more than 10 octal characters (30 bits). The most significant
-     *                                bit of number is the sign bit. The remaining 29 bits are
-     *                                magnitude bits. Negative numbers are represented using
-     *                                two's-complement notation.
-     *                                If number is not a valid octal number, OCT2DEC returns the
-     *                                #NUM! error value.
-     *
-     * @return string
-     */
-    public static function OCTTODEC($x)
-    {
-        return Engineering\ConvertOctal::toDecimal($x);
-    }
-
-    /**
-     * OCTTOHEX.
-     *
-     * Return an octal value as hex.
-     *
-     * Excel Function:
-     *        OCT2HEX(x[,places])
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Use the toHex() method in the Engineering\ConvertOctal class instead
-     *
-     * @param mixed $x The octal number you want to convert. Number may not contain
-     *                                    more than 10 octal characters (30 bits). The most significant
-     *                                    bit of number is the sign bit. The remaining 29 bits are
-     *                                    magnitude bits. Negative numbers are represented using
-     *                                    two's-complement notation.
-     *                                    If number is negative, OCT2HEX ignores places and returns a
-     *                                    10-character hexadecimal number.
-     *                                    If number is not a valid octal number, OCT2HEX returns the
-     *                                    #NUM! error value.
-     *                                    If OCT2HEX requires more than places characters, it returns
-     *                                    the #NUM! error value.
-     * @param mixed $places The number of characters to use. If places is omitted, OCT2HEX
-     *                                    uses the minimum number of characters necessary. Places is useful
-     *                                    for padding the return value with leading 0s (zeros).
-     *                                    If places is not an integer, it is truncated.
-     *                                    If places is nonnumeric, OCT2HEX returns the #VALUE! error value.
-     *                                    If places is negative, OCT2HEX returns the #NUM! error value.
-     *
-     * @return string
-     */
-    public static function OCTTOHEX($x, $places = null)
-    {
-        return Engineering\ConvertOctal::toHex($x, $places);
-    }
-
-    /**
-     * COMPLEX.
-     *
-     * Converts real and imaginary coefficients into a complex number of the form x +/- yi or x +/- yj.
-     *
-     * Excel Function:
-     *        COMPLEX(realNumber,imaginary[,suffix])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the COMPLEX() method in the Engineering\Complex class instead
-     *
-     * @param float $realNumber the real coefficient of the complex number
-     * @param float $imaginary the imaginary coefficient of the complex number
-     * @param string $suffix The suffix for the imaginary component of the complex number.
-     *                                        If omitted, the suffix is assumed to be "i".
-     *
-     * @return string
-     */
-    public static function COMPLEX($realNumber = 0.0, $imaginary = 0.0, $suffix = 'i')
-    {
-        return Engineering\Complex::COMPLEX($realNumber, $imaginary, $suffix);
-    }
-
-    /**
-     * IMAGINARY.
-     *
-     * Returns the imaginary coefficient of a complex number in x + yi or x + yj text format.
-     *
-     * Excel Function:
-     *        IMAGINARY(complexNumber)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the IMAGINARY() method in the Engineering\Complex class instead
-     *
-     * @param string $complexNumber the complex number for which you want the imaginary
-     *                                         coefficient
-     *
-     * @return float|string
-     */
-    public static function IMAGINARY($complexNumber)
-    {
-        return Engineering\Complex::IMAGINARY($complexNumber);
-    }
-
-    /**
-     * IMREAL.
-     *
-     * Returns the real coefficient of a complex number in x + yi or x + yj text format.
-     *
-     * Excel Function:
-     *        IMREAL(complexNumber)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the IMREAL() method in the Engineering\Complex class instead
-     *
-     * @param string $complexNumber the complex number for which you want the real coefficient
-     *
-     * @return float|string
-     */
-    public static function IMREAL($complexNumber)
-    {
-        return Engineering\Complex::IMREAL($complexNumber);
-    }
-
-    /**
-     * IMABS.
-     *
-     * Returns the absolute value (modulus) of a complex number in x + yi or x + yj text format.
-     *
-     * Excel Function:
-     *        IMABS(complexNumber)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the IMABS() method in the Engineering\ComplexFunctions class instead
-     *
-     * @param string $complexNumber the complex number for which you want the absolute value
-     *
-     * @return float|string
-     */
-    public static function IMABS($complexNumber)
-    {
-        return ComplexFunctions::IMABS($complexNumber);
-    }
-
-    /**
-     * IMARGUMENT.
-     *
-     * Returns the argument theta of a complex number, i.e. the angle in radians from the real
-     * axis to the representation of the number in polar coordinates.
-     *
-     * Excel Function:
-     *        IMARGUMENT(complexNumber)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the IMARGUMENT() method in the Engineering\ComplexFunctions class instead
-     *
-     * @param string $complexNumber the complex number for which you want the argument theta
-     *
-     * @return float|string
-     */
-    public static function IMARGUMENT($complexNumber)
-    {
-        return ComplexFunctions::IMARGUMENT($complexNumber);
-    }
-
-    /**
-     * IMCONJUGATE.
-     *
-     * Returns the complex conjugate of a complex number in x + yi or x + yj text format.
-     *
-     * Excel Function:
-     *        IMCONJUGATE(complexNumber)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the IMARGUMENT() method in the Engineering\ComplexFunctions class instead
-     *
-     * @param string $complexNumber the complex number for which you want the conjugate
-     *
-     * @return string
-     */
-    public static function IMCONJUGATE($complexNumber)
-    {
-        return ComplexFunctions::IMCONJUGATE($complexNumber);
-    }
-
-    /**
-     * IMCOS.
-     *
-     * Returns the cosine of a complex number in x + yi or x + yj text format.
-     *
-     * Excel Function:
-     *        IMCOS(complexNumber)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the IMCOS() method in the Engineering\ComplexFunctions class instead
-     *
-     * @param string $complexNumber the complex number for which you want the cosine
-     *
-     * @return float|string
-     */
-    public static function IMCOS($complexNumber)
-    {
-        return ComplexFunctions::IMCOS($complexNumber);
-    }
-
-    /**
-     * IMCOSH.
-     *
-     * Returns the hyperbolic cosine of a complex number in x + yi or x + yj text format.
-     *
-     * Excel Function:
-     *        IMCOSH(complexNumber)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the IMCOSH() method in the Engineering\ComplexFunctions class instead
-     *
-     * @param string $complexNumber the complex number for which you want the hyperbolic cosine
-     *
-     * @return float|string
-     */
-    public static function IMCOSH($complexNumber)
-    {
-        return ComplexFunctions::IMCOSH($complexNumber);
-    }
-
-    /**
-     * IMCOT.
-     *
-     * Returns the cotangent of a complex number in x + yi or x + yj text format.
-     *
-     * Excel Function:
-     *        IMCOT(complexNumber)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the IMCOT() method in the Engineering\ComplexFunctions class instead
-     *
-     * @param string $complexNumber the complex number for which you want the cotangent
-     *
-     * @return float|string
-     */
-    public static function IMCOT($complexNumber)
-    {
-        return ComplexFunctions::IMCOT($complexNumber);
-    }
-
-    /**
-     * IMCSC.
-     *
-     * Returns the cosecant of a complex number in x + yi or x + yj text format.
-     *
-     * Excel Function:
-     *        IMCSC(complexNumber)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the IMCSC() method in the Engineering\ComplexFunctions class instead
-     *
-     * @param string $complexNumber the complex number for which you want the cosecant
-     *
-     * @return float|string
-     */
-    public static function IMCSC($complexNumber)
-    {
-        return ComplexFunctions::IMCSC($complexNumber);
-    }
-
-    /**
-     * IMCSCH.
-     *
-     * Returns the hyperbolic cosecant of a complex number in x + yi or x + yj text format.
-     *
-     * Excel Function:
-     *        IMCSCH(complexNumber)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the IMCSCH() method in the Engineering\ComplexFunctions class instead
-     *
-     * @param string $complexNumber the complex number for which you want the hyperbolic cosecant
-     *
-     * @return float|string
-     */
-    public static function IMCSCH($complexNumber)
-    {
-        return ComplexFunctions::IMCSCH($complexNumber);
-    }
-
-    /**
-     * IMSIN.
-     *
-     * Returns the sine of a complex number in x + yi or x + yj text format.
-     *
-     * Excel Function:
-     *        IMSIN(complexNumber)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the IMSIN() method in the Engineering\ComplexFunctions class instead
-     *
-     * @param string $complexNumber the complex number for which you want the sine
-     *
-     * @return float|string
-     */
-    public static function IMSIN($complexNumber)
-    {
-        return ComplexFunctions::IMSIN($complexNumber);
-    }
-
-    /**
-     * IMSINH.
-     *
-     * Returns the hyperbolic sine of a complex number in x + yi or x + yj text format.
-     *
-     * Excel Function:
-     *        IMSINH(complexNumber)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the IMSINH() method in the Engineering\ComplexFunctions class instead
-     *
-     * @param string $complexNumber the complex number for which you want the hyperbolic sine
-     *
-     * @return float|string
-     */
-    public static function IMSINH($complexNumber)
-    {
-        return ComplexFunctions::IMSINH($complexNumber);
-    }
-
-    /**
-     * IMSEC.
-     *
-     * Returns the secant of a complex number in x + yi or x + yj text format.
-     *
-     * Excel Function:
-     *        IMSEC(complexNumber)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the IMSEC() method in the Engineering\ComplexFunctions class instead
-     *
-     * @param string $complexNumber the complex number for which you want the secant
-     *
-     * @return float|string
-     */
-    public static function IMSEC($complexNumber)
-    {
-        return ComplexFunctions::IMSEC($complexNumber);
-    }
-
-    /**
-     * IMSECH.
-     *
-     * Returns the hyperbolic secant of a complex number in x + yi or x + yj text format.
-     *
-     * Excel Function:
-     *        IMSECH(complexNumber)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the IMSECH() method in the Engineering\ComplexFunctions class instead
-     *
-     * @param string $complexNumber the complex number for which you want the hyperbolic secant
-     *
-     * @return float|string
-     */
-    public static function IMSECH($complexNumber)
-    {
-        return ComplexFunctions::IMSECH($complexNumber);
-    }
-
-    /**
-     * IMTAN.
-     *
-     * Returns the tangent of a complex number in x + yi or x + yj text format.
-     *
-     * Excel Function:
-     *        IMTAN(complexNumber)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the IMTAN() method in the Engineering\ComplexFunctions class instead
-     *
-     * @param string $complexNumber the complex number for which you want the tangent
-     *
-     * @return float|string
-     */
-    public static function IMTAN($complexNumber)
-    {
-        return ComplexFunctions::IMTAN($complexNumber);
-    }
-
-    /**
-     * IMSQRT.
-     *
-     * Returns the square root of a complex number in x + yi or x + yj text format.
-     *
-     * Excel Function:
-     *        IMSQRT(complexNumber)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the IMSQRT() method in the Engineering\ComplexFunctions class instead
-     *
-     * @param string $complexNumber the complex number for which you want the square root
-     *
-     * @return string
-     */
-    public static function IMSQRT($complexNumber)
-    {
-        return ComplexFunctions::IMSQRT($complexNumber);
-    }
-
-    /**
-     * IMLN.
-     *
-     * Returns the natural logarithm of a complex number in x + yi or x + yj text format.
-     *
-     * Excel Function:
-     *        IMLN(complexNumber)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the IMLN() method in the Engineering\ComplexFunctions class instead
-     *
-     * @param string $complexNumber the complex number for which you want the natural logarithm
-     *
-     * @return string
-     */
-    public static function IMLN($complexNumber)
-    {
-        return ComplexFunctions::IMLN($complexNumber);
-    }
-
-    /**
-     * IMLOG10.
-     *
-     * Returns the common logarithm (base 10) of a complex number in x + yi or x + yj text format.
-     *
-     * Excel Function:
-     *        IMLOG10(complexNumber)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the IMLOG10() method in the Engineering\ComplexFunctions class instead
-     *
-     * @param string $complexNumber the complex number for which you want the common logarithm
-     *
-     * @return string
-     */
-    public static function IMLOG10($complexNumber)
-    {
-        return ComplexFunctions::IMLOG10($complexNumber);
-    }
-
-    /**
-     * IMLOG2.
-     *
-     * Returns the base-2 logarithm of a complex number in x + yi or x + yj text format.
-     *
-     * Excel Function:
-     *        IMLOG2(complexNumber)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the IMLOG2() method in the Engineering\ComplexFunctions class instead
-     *
-     * @param string $complexNumber the complex number for which you want the base-2 logarithm
-     *
-     * @return string
-     */
-    public static function IMLOG2($complexNumber)
-    {
-        return ComplexFunctions::IMLOG2($complexNumber);
-    }
-
-    /**
-     * IMEXP.
-     *
-     * Returns the exponential of a complex number in x + yi or x + yj text format.
-     *
-     * Excel Function:
-     *        IMEXP(complexNumber)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the IMEXP() method in the Engineering\ComplexFunctions class instead
-     *
-     * @param string $complexNumber the complex number for which you want the exponential
-     *
-     * @return string
-     */
-    public static function IMEXP($complexNumber)
-    {
-        return ComplexFunctions::IMEXP($complexNumber);
-    }
-
-    /**
-     * IMPOWER.
-     *
-     * Returns a complex number in x + yi or x + yj text format raised to a power.
-     *
-     * Excel Function:
-     *        IMPOWER(complexNumber,realNumber)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the IMPOWER() method in the Engineering\ComplexFunctions class instead
-     *
-     * @param string $complexNumber the complex number you want to raise to a power
-     * @param float $realNumber the power to which you want to raise the complex number
-     *
-     * @return string
-     */
-    public static function IMPOWER($complexNumber, $realNumber)
-    {
-        return ComplexFunctions::IMPOWER($complexNumber, $realNumber);
-    }
-
-    /**
-     * IMDIV.
-     *
-     * Returns the quotient of two complex numbers in x + yi or x + yj text format.
-     *
-     * Excel Function:
-     *        IMDIV(complexDividend,complexDivisor)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the IMDIV() method in the Engineering\ComplexOperations class instead
-     *
-     * @param string $complexDividend the complex numerator or dividend
-     * @param string $complexDivisor the complex denominator or divisor
-     *
-     * @return string
-     */
-    public static function IMDIV($complexDividend, $complexDivisor)
-    {
-        return ComplexOperations::IMDIV($complexDividend, $complexDivisor);
-    }
-
-    /**
-     * IMSUB.
-     *
-     * Returns the difference of two complex numbers in x + yi or x + yj text format.
-     *
-     * Excel Function:
-     *        IMSUB(complexNumber1,complexNumber2)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the IMSUB() method in the Engineering\ComplexOperations class instead
-     *
-     * @param string $complexNumber1 the complex number from which to subtract complexNumber2
-     * @param string $complexNumber2 the complex number to subtract from complexNumber1
-     *
-     * @return string
-     */
-    public static function IMSUB($complexNumber1, $complexNumber2)
-    {
-        return ComplexOperations::IMSUB($complexNumber1, $complexNumber2);
-    }
-
-    /**
-     * IMSUM.
-     *
-     * Returns the sum of two or more complex numbers in x + yi or x + yj text format.
-     *
-     * Excel Function:
-     *        IMSUM(complexNumber[,complexNumber[,...]])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the IMSUM() method in the Engineering\ComplexOperations class instead
-     *
-     * @param string ...$complexNumbers Series of complex numbers to add
-     *
-     * @return string
-     */
-    public static function IMSUM(...$complexNumbers)
-    {
-        return ComplexOperations::IMSUM(...$complexNumbers);
-    }
-
-    /**
-     * IMPRODUCT.
-     *
-     * Returns the product of two or more complex numbers in x + yi or x + yj text format.
-     *
-     * Excel Function:
-     *        IMPRODUCT(complexNumber[,complexNumber[,...]])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the IMPRODUCT() method in the Engineering\ComplexOperations class instead
-     *
-     * @param string ...$complexNumbers Series of complex numbers to multiply
-     *
-     * @return string
-     */
-    public static function IMPRODUCT(...$complexNumbers)
-    {
-        return ComplexOperations::IMPRODUCT(...$complexNumbers);
-    }
-
-    /**
-     * DELTA.
-     *
-     * Tests whether two values are equal. Returns 1 if number1 = number2; returns 0 otherwise.
-     * Use this function to filter a set of values. For example, by summing several DELTA
-     *     functions you calculate the count of equal pairs. This function is also known as the
-     *     Kronecker Delta function.
-     *
-     *    Excel Function:
-     *        DELTA(a[,b])
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Use the DELTA() method in the Engineering\Compare class instead
-     *
-     * @param float $a the first number
-     * @param float $b The second number. If omitted, b is assumed to be zero.
-     *
-     * @return int|string (string in the event of an error)
-     */
-    public static function DELTA($a, $b = 0)
-    {
-        return Engineering\Compare::DELTA($a, $b);
-    }
-
-    /**
-     * GESTEP.
-     *
-     *    Excel Function:
-     *        GESTEP(number[,step])
-     *
-     *    Returns 1 if number >= step; returns 0 (zero) otherwise
-     *    Use this function to filter a set of values. For example, by summing several GESTEP
-     *        functions you calculate the count of values that exceed a threshold.
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Use the GESTEP() method in the Engineering\Compare class instead
-     *
-     * @param float $number the value to test against step
-     * @param float $step The threshold value. If you omit a value for step, GESTEP uses zero.
-     *
-     * @return int|string (string in the event of an error)
-     */
-    public static function GESTEP($number, $step = 0)
-    {
-        return Engineering\Compare::GESTEP($number, $step);
-    }
-
-    /**
-     * BITAND.
-     *
-     * Returns the bitwise AND of two integer values.
-     *
-     * Excel Function:
-     *        BITAND(number1, number2)
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Use the BITAND() method in the Engineering\BitWise class instead
-     *
-     * @param int $number1
-     * @param int $number2
-     *
-     * @return int|string
-     */
-    public static function BITAND($number1, $number2)
-    {
-        return Engineering\BitWise::BITAND($number1, $number2);
-    }
-
-    /**
-     * BITOR.
-     *
-     * Returns the bitwise OR of two integer values.
-     *
-     * Excel Function:
-     *        BITOR(number1, number2)
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Use the BITOR() method in the Engineering\BitWise class instead
-     *
-     * @param int $number1
-     * @param int $number2
-     *
-     * @return int|string
-     */
-    public static function BITOR($number1, $number2)
-    {
-        return Engineering\BitWise::BITOR($number1, $number2);
-    }
-
-    /**
-     * BITXOR.
-     *
-     * Returns the bitwise XOR of two integer values.
-     *
-     * Excel Function:
-     *        BITXOR(number1, number2)
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Use the BITXOR() method in the Engineering\BitWise class instead
-     *
-     * @param int $number1
-     * @param int $number2
-     *
-     * @return int|string
-     */
-    public static function BITXOR($number1, $number2)
-    {
-        return Engineering\BitWise::BITXOR($number1, $number2);
-    }
-
-    /**
-     * BITLSHIFT.
-     *
-     * Returns the number value shifted left by shift_amount bits.
-     *
-     * Excel Function:
-     *        BITLSHIFT(number, shift_amount)
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Use the BITLSHIFT() method in the Engineering\BitWise class instead
-     *
-     * @param int $number
-     * @param int $shiftAmount
-     *
-     * @return int|string
-     */
-    public static function BITLSHIFT($number, $shiftAmount)
-    {
-        return Engineering\BitWise::BITLSHIFT($number, $shiftAmount);
-    }
-
-    /**
-     * BITRSHIFT.
-     *
-     * Returns the number value shifted right by shift_amount bits.
-     *
-     * Excel Function:
-     *        BITRSHIFT(number, shift_amount)
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Use the BITRSHIFT() method in the Engineering\BitWise class instead
-     *
-     * @param int $number
-     * @param int $shiftAmount
-     *
-     * @return int|string
-     */
-    public static function BITRSHIFT($number, $shiftAmount)
-    {
-        return Engineering\BitWise::BITRSHIFT($number, $shiftAmount);
-    }
-
-    /**
-     * ERF.
-     *
-     * Returns the error function integrated between the lower and upper bound arguments.
-     *
-     *    Note: In Excel 2007 or earlier, if you input a negative value for the upper or lower bound arguments,
-     *            the function would return a #NUM! error. However, in Excel 2010, the function algorithm was
-     *            improved, so that it can now calculate the function for both positive and negative ranges.
-     *            PhpSpreadsheet follows Excel 2010 behaviour, and accepts negative arguments.
-     *
-     *    Excel Function:
-     *        ERF(lower[,upper])
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Use the ERF() method in the Engineering\Erf class instead
-     *
-     * @param float $lower lower bound for integrating ERF
-     * @param float $upper upper bound for integrating ERF.
-     *                                If omitted, ERF integrates between zero and lower_limit
-     *
-     * @return float|string
-     */
-    public static function ERF($lower, $upper = null)
-    {
-        return Engineering\Erf::ERF($lower, $upper);
-    }
-
-    /**
-     * ERFPRECISE.
-     *
-     * Returns the error function integrated between the lower and upper bound arguments.
-     *
-     *    Excel Function:
-     *        ERF.PRECISE(limit)
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Use the ERFPRECISE() method in the Engineering\Erf class instead
-     *
-     * @param float $limit bound for integrating ERF
-     *
-     * @return float|string
-     */
-    public static function ERFPRECISE($limit)
-    {
-        return Engineering\Erf::ERFPRECISE($limit);
-    }
-
-    /**
-     * ERFC.
-     *
-     *    Returns the complementary ERF function integrated between x and infinity
-     *
-     *    Note: In Excel 2007 or earlier, if you input a negative value for the lower bound argument,
-     *        the function would return a #NUM! error. However, in Excel 2010, the function algorithm was
-     *        improved, so that it can now calculate the function for both positive and negative x values.
-     *            PhpSpreadsheet follows Excel 2010 behaviour, and accepts nagative arguments.
-     *
-     *    Excel Function:
-     *        ERFC(x)
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Use the ERFC() method in the Engineering\ErfC class instead
-     *
-     * @param float $x The lower bound for integrating ERFC
-     *
-     * @return float|string
-     */
-    public static function ERFC($x)
-    {
-        return Engineering\ErfC::ERFC($x);
-    }
-
-    /**
-     *    getConversionGroups
-     * Returns a list of the different conversion groups for UOM conversions.
-     *
-     * @Deprecated 1.16.0
-     *
-     * @see Use the getConversionCategories() method in the Engineering\ConvertUOM class instead
-     *
-     * @return array
-     */
-    public static function getConversionGroups()
-    {
-        return Engineering\ConvertUOM::getConversionCategories();
-    }
-
-    /**
-     *    getConversionGroupUnits
-     * Returns an array of units of measure, for a specified conversion group, or for all groups.
-     *
-     * @Deprecated 1.16.0
-     *
-     * @see Use the getConversionCategoryUnits() method in the ConvertUOM class instead
-     *
-     * @param null|mixed $category
-     *
-     * @return array
-     */
-    public static function getConversionGroupUnits($category = null)
-    {
-        return Engineering\ConvertUOM::getConversionCategoryUnits($category);
-    }
-
-    /**
-     * getConversionGroupUnitDetails.
-     *
-     * @Deprecated 1.16.0
-     *
-     * @see Use the getConversionCategoryUnitDetails() method in the ConvertUOM class instead
-     *
-     * @param null|mixed $category
-     *
-     * @return array
-     */
-    public static function getConversionGroupUnitDetails($category = null)
-    {
-        return Engineering\ConvertUOM::getConversionCategoryUnitDetails($category);
-    }
-
-    /**
-     *    getConversionMultipliers
-     * Returns an array of the Multiplier prefixes that can be used with Units of Measure in CONVERTUOM().
-     *
-     * @Deprecated 1.16.0
-     *
-     * @see Use the getConversionMultipliers() method in the ConvertUOM class instead
-     *
-     * @return mixed[]
-     */
-    public static function getConversionMultipliers()
-    {
-        return Engineering\ConvertUOM::getConversionMultipliers();
-    }
-
-    /**
-     *    getBinaryConversionMultipliers.
-     *
-     * Returns an array of the additional Multiplier prefixes that can be used with Information Units of Measure
-     *     in CONVERTUOM().
-     *
-     * @Deprecated 1.16.0
-     *
-     * @see Use the getBinaryConversionMultipliers() method in the ConvertUOM class instead
-     *
-     * @return mixed[]
-     */
-    public static function getBinaryConversionMultipliers()
-    {
-        return Engineering\ConvertUOM::getBinaryConversionMultipliers();
-    }
-
-    /**
-     * CONVERTUOM.
-     *
-     * Converts a number from one measurement system to another.
-     *    For example, CONVERT can translate a table of distances in miles to a table of distances
-     * in kilometers.
-     *
-     *    Excel Function:
-     *        CONVERT(value,fromUOM,toUOM)
-     *
-     * @Deprecated 1.16.0
-     *
-     * @see Use the CONVERT() method in the ConvertUOM class instead
-     *
-     * @param float|int $value the value in fromUOM to convert
-     * @param string $fromUOM the units for value
-     * @param string $toUOM the units for the result
-     *
-     * @return float|string
-     */
-    public static function CONVERTUOM($value, $fromUOM, $toUOM)
-    {
-        return Engineering\ConvertUOM::CONVERT($value, $fromUOM, $toUOM);
-    }
-}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BesselI.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BesselI.php
index ea2577cdf8..5d564a05ae 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BesselI.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BesselI.php
@@ -2,11 +2,14 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class BesselI
 {
+    use ArrayEnabled;
+
     /**
      * BESSELI.
      *
@@ -21,17 +24,22 @@ class BesselI
      *
      * @param mixed $x A float value at which to evaluate the function.
      *                                If x is nonnumeric, BESSELI returns the #VALUE! error value.
+     *                      Or can be an array of values
      * @param mixed $ord The integer order of the Bessel function.
      *                                If ord is not an integer, it is truncated.
      *                                If $ord is nonnumeric, BESSELI returns the #VALUE! error value.
      *                                If $ord < 0, BESSELI returns the #NUM! error value.
+     *                      Or can be an array of values
      *
-     * @return float|string Result, or a string containing an error
+     * @return array|float|string Result, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function BESSELI($x, $ord)
+    public static function BESSELI(mixed $x, mixed $ord): array|string|float
     {
-        $x = Functions::flattenSingleValue($x);
-        $ord = Functions::flattenSingleValue($ord);
+        if (is_array($x) || is_array($ord)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $x, $ord);
+        }
 
         try {
             $x = EngineeringValidations::validateFloat($x);
@@ -41,25 +49,21 @@ public static function BESSELI($x, $ord)
         }
 
         if ($ord < 0) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         $fResult = self::calculate($x, $ord);
 
-        return (is_nan($fResult)) ? Functions::NAN() : $fResult;
+        return (is_nan($fResult)) ? ExcelError::NAN() : $fResult;
     }
 
     private static function calculate(float $x, int $ord): float
     {
-        // special cases
-        switch ($ord) {
-            case 0:
-                return self::besselI0($x);
-            case 1:
-                return self::besselI1($x);
-        }
-
-        return self::besselI2($x, $ord);
+        return match ($ord) {
+            0 => self::besselI0($x),
+            1 => self::besselI1($x),
+            default => self::besselI2($x, $ord),
+        };
     }
 
     private static function besselI0(float $x): float
@@ -77,8 +81,8 @@ private static function besselI0(float $x): float
         $y = 3.75 / $ax;
 
         return (exp($ax) / sqrt($ax)) * (0.39894228 + $y * (0.1328592e-1 + $y * (0.225319e-2 + $y * (-0.157565e-2
-                            + $y * (0.916281e-2 + $y * (-0.2057706e-1 + $y * (0.2635537e-1 +
-                                        $y * (-0.1647633e-1 + $y * 0.392377e-2))))))));
+                            + $y * (0.916281e-2 + $y * (-0.2057706e-1 + $y * (0.2635537e-1
+                                        + $y * (-0.1647633e-1 + $y * 0.392377e-2))))))));
     }
 
     private static function besselI1(float $x): float
@@ -88,16 +92,16 @@ private static function besselI1(float $x): float
         if ($ax < 3.75) {
             $y = $x / 3.75;
             $y = $y * $y;
-            $ans = $ax * (0.5 + $y * (0.87890594 + $y * (0.51498869 + $y * (0.15084934 + $y * (0.2658733e-1 +
-                                    $y * (0.301532e-2 + $y * 0.32411e-3))))));
+            $ans = $ax * (0.5 + $y * (0.87890594 + $y * (0.51498869 + $y * (0.15084934 + $y * (0.2658733e-1
+                                    + $y * (0.301532e-2 + $y * 0.32411e-3))))));
 
             return ($x < 0.0) ? -$ans : $ans;
         }
 
         $y = 3.75 / $ax;
         $ans = 0.2282967e-1 + $y * (-0.2895312e-1 + $y * (0.1787654e-1 - $y * 0.420059e-2));
-        $ans = 0.39894228 + $y * (-0.3988024e-1 + $y * (-0.362018e-2 + $y * (0.163801e-2 +
-                        $y * (-0.1031555e-1 + $y * $ans))));
+        $ans = 0.39894228 + $y * (-0.3988024e-1 + $y * (-0.362018e-2 + $y * (0.163801e-2
+                        + $y * (-0.1031555e-1 + $y * $ans))));
         $ans *= exp($ax) / sqrt($ax);
 
         return ($x < 0.0) ? -$ans : $ans;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BesselJ.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BesselJ.php
index 7ea45a74ff..4a9d9ffdc9 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BesselJ.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BesselJ.php
@@ -2,11 +2,14 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class BesselJ
 {
+    use ArrayEnabled;
+
     /**
      * BESSELJ.
      *
@@ -20,17 +23,22 @@ class BesselJ
      *
      * @param mixed $x A float value at which to evaluate the function.
      *                                If x is nonnumeric, BESSELJ returns the #VALUE! error value.
+     *                      Or can be an array of values
      * @param mixed $ord The integer order of the Bessel function.
      *                       If ord is not an integer, it is truncated.
      *                                If $ord is nonnumeric, BESSELJ returns the #VALUE! error value.
      *                                If $ord < 0, BESSELJ returns the #NUM! error value.
+     *                      Or can be an array of values
      *
-     * @return float|string Result, or a string containing an error
+     * @return array|float|string Result, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function BESSELJ($x, $ord)
+    public static function BESSELJ(mixed $x, mixed $ord): array|string|float
     {
-        $x = Functions::flattenSingleValue($x);
-        $ord = Functions::flattenSingleValue($ord);
+        if (is_array($x) || is_array($ord)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $x, $ord);
+        }
 
         try {
             $x = EngineeringValidations::validateFloat($x);
@@ -40,25 +48,21 @@ public static function BESSELJ($x, $ord)
         }
 
         if ($ord < 0) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         $fResult = self::calculate($x, $ord);
 
-        return (is_nan($fResult)) ? Functions::NAN() : $fResult;
+        return (is_nan($fResult)) ? ExcelError::NAN() : $fResult;
     }
 
     private static function calculate(float $x, int $ord): float
     {
-        // special cases
-        switch ($ord) {
-            case 0:
-                return self::besselJ0($x);
-            case 1:
-                return self::besselJ1($x);
-        }
-
-        return self::besselJ2($x, $ord);
+        return match ($ord) {
+            0 => self::besselJ0($x),
+            1 => self::besselJ1($x),
+            default => self::besselJ2($x, $ord),
+        };
     }
 
     private static function besselJ0(float $x): float
@@ -67,10 +71,10 @@ private static function besselJ0(float $x): float
 
         if ($ax < 8.0) {
             $y = $x * $x;
-            $ans1 = 57568490574.0 + $y * (-13362590354.0 + $y * (651619640.7 + $y * (-11214424.18 + $y *
-                            (77392.33017 + $y * (-184.9052456)))));
-            $ans2 = 57568490411.0 + $y * (1029532985.0 + $y * (9494680.718 + $y * (59272.64853 + $y *
-                            (267.8532712 + $y * 1.0))));
+            $ans1 = 57568490574.0 + $y * (-13362590354.0 + $y * (651619640.7 + $y * (-11214424.18 + $y
+                            * (77392.33017 + $y * (-184.9052456)))));
+            $ans2 = 57568490411.0 + $y * (1029532985.0 + $y * (9494680.718 + $y * (59272.64853 + $y
+                            * (267.8532712 + $y * 1.0))));
 
             return $ans1 / $ans2;
         }
@@ -79,8 +83,8 @@ private static function besselJ0(float $x): float
         $y = $z * $z;
         $xx = $ax - 0.785398164;
         $ans1 = 1.0 + $y * (-0.1098628627e-2 + $y * (0.2734510407e-4 + $y * (-0.2073370639e-5 + $y * 0.2093887211e-6)));
-        $ans2 = -0.1562499995e-1 + $y * (0.1430488765e-3 + $y * (-0.6911147651e-5 + $y *
-                    (0.7621095161e-6 - $y * 0.934935152e-7)));
+        $ans2 = -0.1562499995e-1 + $y * (0.1430488765e-3 + $y * (-0.6911147651e-5 + $y
+                    * (0.7621095161e-6 - $y * 0.934935152e-7)));
 
         return sqrt(0.636619772 / $ax) * (cos($xx) * $ans1 - $z * sin($xx) * $ans2);
     }
@@ -91,10 +95,10 @@ private static function besselJ1(float $x): float
 
         if ($ax < 8.0) {
             $y = $x * $x;
-            $ans1 = $x * (72362614232.0 + $y * (-7895059235.0 + $y * (242396853.1 + $y *
-                            (-2972611.439 + $y * (15704.48260 + $y * (-30.16036606))))));
-            $ans2 = 144725228442.0 + $y * (2300535178.0 + $y * (18583304.74 + $y * (99447.43394 + $y *
-                            (376.9991397 + $y * 1.0))));
+            $ans1 = $x * (72362614232.0 + $y * (-7895059235.0 + $y * (242396853.1 + $y
+                            * (-2972611.439 + $y * (15704.48260 + $y * (-30.16036606))))));
+            $ans2 = 144725228442.0 + $y * (2300535178.0 + $y * (18583304.74 + $y * (99447.43394 + $y
+                            * (376.9991397 + $y * 1.0))));
 
             return $ans1 / $ans2;
         }
@@ -104,8 +108,8 @@ private static function besselJ1(float $x): float
         $xx = $ax - 2.356194491;
 
         $ans1 = 1.0 + $y * (0.183105e-2 + $y * (-0.3516396496e-4 + $y * (0.2457520174e-5 + $y * (-0.240337019e-6))));
-        $ans2 = 0.04687499995 + $y * (-0.2002690873e-3 + $y * (0.8449199096e-5 + $y *
-                    (-0.88228987e-6 + $y * 0.105787412e-6)));
+        $ans2 = 0.04687499995 + $y * (-0.2002690873e-3 + $y * (0.8449199096e-5 + $y
+                    * (-0.88228987e-6 + $y * 0.105787412e-6)));
         $ans = sqrt(0.636619772 / $ax) * (cos($xx) * $ans1 - $z * sin($xx) * $ans2);
 
         return ($x < 0.0) ? -$ans : $ans;
@@ -125,7 +129,7 @@ private static function besselJ2(float $x, int $ord): float
         return self::besselj2b($ax, $ord, $x);
     }
 
-    private static function besselj2a(float $ax, int $ord, float $x)
+    private static function besselj2a(float $ax, int $ord, float $x): float
     {
         $tox = 2.0 / $ax;
         $bjm = self::besselJ0($ax);
@@ -140,7 +144,7 @@ private static function besselj2a(float $ax, int $ord, float $x)
         return ($x < 0.0 && ($ord % 2) == 1) ? -$ans : $ans;
     }
 
-    private static function besselj2b(float $ax, int $ord, float $x)
+    private static function besselj2b(float $ax, int $ord, float $x): float
     {
         $tox = 2.0 / $ax;
         $jsum = false;
@@ -159,7 +163,7 @@ private static function besselj2b(float $ax, int $ord, float $x)
             if ($jsum === true) {
                 $sum += $bj;
             }
-            $jsum = !$jsum;
+            $jsum = $jsum === false;
             if ($j === $ord) {
                 $ans = $bjp;
             }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BesselK.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BesselK.php
index 8facdffc79..5a9bd54c1f 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BesselK.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BesselK.php
@@ -2,11 +2,14 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class BesselK
 {
+    use ArrayEnabled;
+
     /**
      * BESSELK.
      *
@@ -18,17 +21,22 @@ class BesselK
      *
      * @param mixed $x A float value at which to evaluate the function.
      *                                If x is nonnumeric, BESSELK returns the #VALUE! error value.
+     *                      Or can be an array of values
      * @param mixed $ord The integer order of the Bessel function.
      *                       If ord is not an integer, it is truncated.
      *                                If $ord is nonnumeric, BESSELK returns the #VALUE! error value.
      *                       If $ord < 0, BESSELKI returns the #NUM! error value.
+     *                      Or can be an array of values
      *
-     * @return float|string Result, or a string containing an error
+     * @return array|float|string Result, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function BESSELK($x, $ord)
+    public static function BESSELK(mixed $x, mixed $ord): array|string|float
     {
-        $x = Functions::flattenSingleValue($x);
-        $ord = Functions::flattenSingleValue($ord);
+        if (is_array($x) || is_array($ord)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $x, $ord);
+        }
 
         try {
             $x = EngineeringValidations::validateFloat($x);
@@ -38,25 +46,36 @@ public static function BESSELK($x, $ord)
         }
 
         if (($ord < 0) || ($x <= 0.0)) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         $fBk = self::calculate($x, $ord);
 
-        return (is_nan($fBk)) ? Functions::NAN() : $fBk;
+        return (is_nan($fBk)) ? ExcelError::NAN() : $fBk;
     }
 
     private static function calculate(float $x, int $ord): float
     {
-        // special cases
-        switch ($ord) {
-            case 0:
-                return self::besselK0($x);
-            case 1:
-                return self::besselK1($x);
+        return match ($ord) {
+            0 => self::besselK0($x),
+            1 => self::besselK1($x),
+            default => self::besselK2($x, $ord),
+        };
+    }
+
+    /**
+     * Mollify Phpstan.
+     *
+     * @codeCoverageIgnore
+     */
+    private static function callBesselI(float $x, int $ord): float
+    {
+        $rslt = BesselI::BESSELI($x, $ord);
+        if (!is_float($rslt)) {
+            throw new Exception('Unexpected array or string');
         }
 
-        return self::besselK2($x, $ord);
+        return $rslt;
     }
 
     private static function besselK0(float $x): float
@@ -65,16 +84,16 @@ private static function besselK0(float $x): float
             $fNum2 = $x * 0.5;
             $y = ($fNum2 * $fNum2);
 
-            return -log($fNum2) * BesselI::BESSELI($x, 0) +
-                (-0.57721566 + $y * (0.42278420 + $y * (0.23069756 + $y * (0.3488590e-1 + $y * (0.262698e-2 + $y *
-                                    (0.10750e-3 + $y * 0.74e-5))))));
+            return -log($fNum2) * self::callBesselI($x, 0)
+                + (-0.57721566 + $y * (0.42278420 + $y * (0.23069756 + $y * (0.3488590e-1 + $y * (0.262698e-2 + $y
+                                    * (0.10750e-3 + $y * 0.74e-5))))));
         }
 
         $y = 2 / $x;
 
-        return exp(-$x) / sqrt($x) *
-            (1.25331414 + $y * (-0.7832358e-1 + $y * (0.2189568e-1 + $y * (-0.1062446e-1 + $y *
-                            (0.587872e-2 + $y * (-0.251540e-2 + $y * 0.53208e-3))))));
+        return exp(-$x) / sqrt($x)
+            * (1.25331414 + $y * (-0.7832358e-1 + $y * (0.2189568e-1 + $y * (-0.1062446e-1 + $y
+                            * (0.587872e-2 + $y * (-0.251540e-2 + $y * 0.53208e-3))))));
     }
 
     private static function besselK1(float $x): float
@@ -83,19 +102,19 @@ private static function besselK1(float $x): float
             $fNum2 = $x * 0.5;
             $y = ($fNum2 * $fNum2);
 
-            return log($fNum2) * BesselI::BESSELI($x, 1) +
-                (1 + $y * (0.15443144 + $y * (-0.67278579 + $y * (-0.18156897 + $y * (-0.1919402e-1 + $y *
-                                    (-0.110404e-2 + $y * (-0.4686e-4))))))) / $x;
+            return log($fNum2) * self::callBesselI($x, 1)
+                + (1 + $y * (0.15443144 + $y * (-0.67278579 + $y * (-0.18156897 + $y * (-0.1919402e-1 + $y
+                                    * (-0.110404e-2 + $y * (-0.4686e-4))))))) / $x;
         }
 
         $y = 2 / $x;
 
-        return exp(-$x) / sqrt($x) *
-            (1.25331414 + $y * (0.23498619 + $y * (-0.3655620e-1 + $y * (0.1504268e-1 + $y * (-0.780353e-2 + $y *
-                                (0.325614e-2 + $y * (-0.68245e-3)))))));
+        return exp(-$x) / sqrt($x)
+            * (1.25331414 + $y * (0.23498619 + $y * (-0.3655620e-1 + $y * (0.1504268e-1 + $y * (-0.780353e-2 + $y
+                                * (0.325614e-2 + $y * (-0.68245e-3)))))));
     }
 
-    private static function besselK2(float $x, int $ord)
+    private static function besselK2(float $x, int $ord): float
     {
         $fTox = 2 / $x;
         $fBkm = self::besselK0($x);
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BesselY.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BesselY.php
index 7f38749716..5d99638a5d 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BesselY.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BesselY.php
@@ -2,11 +2,14 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class BesselY
 {
+    use ArrayEnabled;
+
     /**
      * BESSELY.
      *
@@ -17,17 +20,22 @@ class BesselY
      *
      * @param mixed $x A float value at which to evaluate the function.
      *                   If x is nonnumeric, BESSELY returns the #VALUE! error value.
+     *                      Or can be an array of values
      * @param mixed $ord The integer order of the Bessel function.
      *                       If ord is not an integer, it is truncated.
      *                       If $ord is nonnumeric, BESSELY returns the #VALUE! error value.
      *                       If $ord < 0, BESSELY returns the #NUM! error value.
+     *                      Or can be an array of values
      *
-     * @return float|string Result, or a string containing an error
+     * @return array|float|string Result, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function BESSELY($x, $ord)
+    public static function BESSELY(mixed $x, mixed $ord): array|string|float
     {
-        $x = Functions::flattenSingleValue($x);
-        $ord = Functions::flattenSingleValue($ord);
+        if (is_array($x) || is_array($ord)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $x, $ord);
+        }
 
         try {
             $x = EngineeringValidations::validateFloat($x);
@@ -37,45 +45,56 @@ public static function BESSELY($x, $ord)
         }
 
         if (($ord < 0) || ($x <= 0.0)) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         $fBy = self::calculate($x, $ord);
 
-        return (is_nan($fBy)) ? Functions::NAN() : $fBy;
+        return (is_nan($fBy)) ? ExcelError::NAN() : $fBy;
     }
 
     private static function calculate(float $x, int $ord): float
     {
-        // special cases
-        switch ($ord) {
-            case 0:
-                return self::besselY0($x);
-            case 1:
-                return self::besselY1($x);
+        return match ($ord) {
+            0 => self::besselY0($x),
+            1 => self::besselY1($x),
+            default => self::besselY2($x, $ord),
+        };
+    }
+
+    /**
+     * Mollify Phpstan.
+     *
+     * @codeCoverageIgnore
+     */
+    private static function callBesselJ(float $x, int $ord): float
+    {
+        $rslt = BesselJ::BESSELJ($x, $ord);
+        if (!is_float($rslt)) {
+            throw new Exception('Unexpected array or string');
         }
 
-        return self::besselY2($x, $ord);
+        return $rslt;
     }
 
     private static function besselY0(float $x): float
     {
         if ($x < 8.0) {
             $y = ($x * $x);
-            $ans1 = -2957821389.0 + $y * (7062834065.0 + $y * (-512359803.6 + $y * (10879881.29 + $y *
-                            (-86327.92757 + $y * 228.4622733))));
-            $ans2 = 40076544269.0 + $y * (745249964.8 + $y * (7189466.438 + $y *
-                        (47447.26470 + $y * (226.1030244 + $y))));
+            $ans1 = -2957821389.0 + $y * (7062834065.0 + $y * (-512359803.6 + $y * (10879881.29 + $y
+                            * (-86327.92757 + $y * 228.4622733))));
+            $ans2 = 40076544269.0 + $y * (745249964.8 + $y * (7189466.438 + $y
+                        * (47447.26470 + $y * (226.1030244 + $y))));
 
-            return $ans1 / $ans2 + 0.636619772 * BesselJ::BESSELJ($x, 0) * log($x);
+            return $ans1 / $ans2 + 0.636619772 * self::callBesselJ($x, 0) * log($x);
         }
 
         $z = 8.0 / $x;
         $y = ($z * $z);
         $xx = $x - 0.785398164;
         $ans1 = 1 + $y * (-0.1098628627e-2 + $y * (0.2734510407e-4 + $y * (-0.2073370639e-5 + $y * 0.2093887211e-6)));
-        $ans2 = -0.1562499995e-1 + $y * (0.1430488765e-3 + $y * (-0.6911147651e-5 + $y * (0.7621095161e-6 + $y *
-                        (-0.934945152e-7))));
+        $ans2 = -0.1562499995e-1 + $y * (0.1430488765e-3 + $y * (-0.6911147651e-5 + $y * (0.7621095161e-6 + $y
+                        * (-0.934945152e-7))));
 
         return sqrt(0.636619772 / $x) * (sin($xx) * $ans1 + $z * cos($xx) * $ans2);
     }
@@ -84,20 +103,20 @@ private static function besselY1(float $x): float
     {
         if ($x < 8.0) {
             $y = ($x * $x);
-            $ans1 = $x * (-0.4900604943e13 + $y * (0.1275274390e13 + $y * (-0.5153438139e11 + $y *
-                            (0.7349264551e9 + $y * (-0.4237922726e7 + $y * 0.8511937935e4)))));
-            $ans2 = 0.2499580570e14 + $y * (0.4244419664e12 + $y * (0.3733650367e10 + $y * (0.2245904002e8 + $y *
-                            (0.1020426050e6 + $y * (0.3549632885e3 + $y)))));
+            $ans1 = $x * (-0.4900604943e13 + $y * (0.1275274390e13 + $y * (-0.5153438139e11 + $y
+                            * (0.7349264551e9 + $y * (-0.4237922726e7 + $y * 0.8511937935e4)))));
+            $ans2 = 0.2499580570e14 + $y * (0.4244419664e12 + $y * (0.3733650367e10 + $y * (0.2245904002e8 + $y
+                            * (0.1020426050e6 + $y * (0.3549632885e3 + $y)))));
 
-            return ($ans1 / $ans2) + 0.636619772 * (BesselJ::BESSELJ($x, 1) * log($x) - 1 / $x);
+            return ($ans1 / $ans2) + 0.636619772 * (self::callBesselJ($x, 1) * log($x) - 1 / $x);
         }
 
         $z = 8.0 / $x;
         $y = $z * $z;
         $xx = $x - 2.356194491;
         $ans1 = 1.0 + $y * (0.183105e-2 + $y * (-0.3516396496e-4 + $y * (0.2457520174e-5 + $y * (-0.240337019e-6))));
-        $ans2 = 0.04687499995 + $y * (-0.2002690873e-3 + $y * (0.8449199096e-5 + $y *
-                    (-0.88228987e-6 + $y * 0.105787412e-6)));
+        $ans2 = 0.04687499995 + $y * (-0.2002690873e-3 + $y * (0.8449199096e-5 + $y
+                    * (-0.88228987e-6 + $y * 0.105787412e-6)));
 
         return sqrt(0.636619772 / $x) * (sin($xx) * $ans1 + $z * cos($xx) * $ans2);
     }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BitWise.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BitWise.php
index 9958f054f2..c861c21a01 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BitWise.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/BitWise.php
@@ -2,21 +2,24 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class BitWise
 {
+    use ArrayEnabled;
+
     const SPLIT_DIVISOR = 2 ** 24;
 
     /**
      * Split a number into upper and lower portions for full 32-bit support.
      *
-     * @param float|int $number
+     * @return int[]
      */
-    private static function splitNumber($number): array
+    private static function splitNumber(float|int $number): array
     {
-        return [floor($number / self::SPLIT_DIVISOR), fmod($number, self::SPLIT_DIVISOR)];
+        return [(int) floor($number / self::SPLIT_DIVISOR), (int) fmod($number, self::SPLIT_DIVISOR)];
     }
 
     /**
@@ -27,13 +30,18 @@ private static function splitNumber($number): array
      * Excel Function:
      *        BITAND(number1, number2)
      *
-     * @param int $number1
-     * @param int $number2
+     * @param null|array|bool|float|int|string $number1 Or can be an array of values
+     * @param null|array|bool|float|int|string $number2 Or can be an array of values
      *
-     * @return int|string
+     * @return array|int|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function BITAND($number1, $number2)
+    public static function BITAND(null|array|bool|float|int|string $number1, null|array|bool|float|int|string $number2): array|string|int|float
     {
+        if (is_array($number1) || is_array($number2)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number1, $number2);
+        }
+
         try {
             $number1 = self::validateBitwiseArgument($number1);
             $number2 = self::validateBitwiseArgument($number2);
@@ -43,7 +51,7 @@ public static function BITAND($number1, $number2)
         $split1 = self::splitNumber($number1);
         $split2 = self::splitNumber($number2);
 
-        return  self::SPLIT_DIVISOR * ($split1[0] & $split2[0]) + ($split1[1] & $split2[1]);
+        return self::SPLIT_DIVISOR * ($split1[0] & $split2[0]) + ($split1[1] & $split2[1]);
     }
 
     /**
@@ -54,13 +62,18 @@ public static function BITAND($number1, $number2)
      * Excel Function:
      *        BITOR(number1, number2)
      *
-     * @param int $number1
-     * @param int $number2
+     * @param null|array|bool|float|int|string $number1 Or can be an array of values
+     * @param null|array|bool|float|int|string $number2 Or can be an array of values
      *
-     * @return int|string
+     * @return array|int|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function BITOR($number1, $number2)
+    public static function BITOR(null|array|bool|float|int|string $number1, null|array|bool|float|int|string $number2): array|string|int|float
     {
+        if (is_array($number1) || is_array($number2)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number1, $number2);
+        }
+
         try {
             $number1 = self::validateBitwiseArgument($number1);
             $number2 = self::validateBitwiseArgument($number2);
@@ -71,7 +84,7 @@ public static function BITOR($number1, $number2)
         $split1 = self::splitNumber($number1);
         $split2 = self::splitNumber($number2);
 
-        return  self::SPLIT_DIVISOR * ($split1[0] | $split2[0]) + ($split1[1] | $split2[1]);
+        return self::SPLIT_DIVISOR * ($split1[0] | $split2[0]) + ($split1[1] | $split2[1]);
     }
 
     /**
@@ -82,13 +95,18 @@ public static function BITOR($number1, $number2)
      * Excel Function:
      *        BITXOR(number1, number2)
      *
-     * @param int $number1
-     * @param int $number2
+     * @param null|array|bool|float|int|string $number1 Or can be an array of values
+     * @param null|array|bool|float|int|string $number2 Or can be an array of values
      *
-     * @return int|string
+     * @return array|int|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function BITXOR($number1, $number2)
+    public static function BITXOR(null|array|bool|float|int|string $number1, null|array|bool|float|int|string $number2): array|string|int|float
     {
+        if (is_array($number1) || is_array($number2)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number1, $number2);
+        }
+
         try {
             $number1 = self::validateBitwiseArgument($number1);
             $number2 = self::validateBitwiseArgument($number2);
@@ -99,7 +117,7 @@ public static function BITXOR($number1, $number2)
         $split1 = self::splitNumber($number1);
         $split2 = self::splitNumber($number2);
 
-        return  self::SPLIT_DIVISOR * ($split1[0] ^ $split2[0]) + ($split1[1] ^ $split2[1]);
+        return self::SPLIT_DIVISOR * ($split1[0] ^ $split2[0]) + ($split1[1] ^ $split2[1]);
     }
 
     /**
@@ -110,13 +128,18 @@ public static function BITXOR($number1, $number2)
      * Excel Function:
      *        BITLSHIFT(number, shift_amount)
      *
-     * @param int $number
-     * @param int $shiftAmount
+     * @param null|array|bool|float|int|string $number Or can be an array of values
+     * @param null|array|bool|float|int|string $shiftAmount Or can be an array of values
      *
-     * @return float|int|string
+     * @return array|float|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function BITLSHIFT($number, $shiftAmount)
+    public static function BITLSHIFT(null|array|bool|float|int|string $number, null|array|bool|float|int|string $shiftAmount): array|string|float
     {
+        if (is_array($number) || is_array($shiftAmount)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number, $shiftAmount);
+        }
+
         try {
             $number = self::validateBitwiseArgument($number);
             $shiftAmount = self::validateShiftAmount($shiftAmount);
@@ -126,7 +149,7 @@ public static function BITLSHIFT($number, $shiftAmount)
 
         $result = floor($number * (2 ** $shiftAmount));
         if ($result > 2 ** 48 - 1) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         return $result;
@@ -140,13 +163,18 @@ public static function BITLSHIFT($number, $shiftAmount)
      * Excel Function:
      *        BITRSHIFT(number, shift_amount)
      *
-     * @param int $number
-     * @param int $shiftAmount
+     * @param null|array|bool|float|int|string $number Or can be an array of values
+     * @param null|array|bool|float|int|string $shiftAmount Or can be an array of values
      *
-     * @return float|int|string
+     * @return array|float|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function BITRSHIFT($number, $shiftAmount)
+    public static function BITRSHIFT(null|array|bool|float|int|string $number, null|array|bool|float|int|string $shiftAmount): array|string|float
     {
+        if (is_array($number) || is_array($shiftAmount)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number, $shiftAmount);
+        }
+
         try {
             $number = self::validateBitwiseArgument($number);
             $shiftAmount = self::validateShiftAmount($shiftAmount);
@@ -156,7 +184,7 @@ public static function BITRSHIFT($number, $shiftAmount)
 
         $result = floor($number / (2 ** $shiftAmount));
         if ($result > 2 ** 48 - 1) { // possible because shiftAmount can be negative
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         return $result;
@@ -164,64 +192,56 @@ public static function BITRSHIFT($number, $shiftAmount)
 
     /**
      * Validate arguments passed to the bitwise functions.
-     *
-     * @param mixed $value
-     *
-     * @return float|int
      */
-    private static function validateBitwiseArgument($value)
+    private static function validateBitwiseArgument(mixed $value): float
     {
-        self::nullFalseTrueToNumber($value);
+        $value = self::nullFalseTrueToNumber($value);
 
         if (is_numeric($value)) {
+            $value = (float) $value;
             if ($value == floor($value)) {
                 if (($value > 2 ** 48 - 1) || ($value < 0)) {
-                    throw new Exception(Functions::NAN());
+                    throw new Exception(ExcelError::NAN());
                 }
 
                 return floor($value);
             }
 
-            throw new Exception(Functions::NAN());
+            throw new Exception(ExcelError::NAN());
         }
 
-        throw new Exception(Functions::VALUE());
+        throw new Exception(ExcelError::VALUE());
     }
 
     /**
      * Validate arguments passed to the bitwise functions.
-     *
-     * @param mixed $value
-     *
-     * @return int
      */
-    private static function validateShiftAmount($value)
+    private static function validateShiftAmount(mixed $value): int
     {
-        self::nullFalseTrueToNumber($value);
+        $value = self::nullFalseTrueToNumber($value);
 
         if (is_numeric($value)) {
             if (abs($value) > 53) {
-                throw new Exception(Functions::NAN());
+                throw new Exception(ExcelError::NAN());
             }
 
             return (int) $value;
         }
 
-        throw new Exception(Functions::VALUE());
+        throw new Exception(ExcelError::VALUE());
     }
 
     /**
      * Many functions accept null/false/true argument treated as 0/0/1.
-     *
-     * @param mixed $number
      */
-    public static function nullFalseTrueToNumber(&$number): void
+    private static function nullFalseTrueToNumber(mixed &$number): mixed
     {
-        $number = Functions::flattenSingleValue($number);
         if ($number === null) {
             $number = 0;
         } elseif (is_bool($number)) {
             $number = (int) $number;
         }
+
+        return $number;
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/Compare.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/Compare.php
index 0a6342069c..9e3275fc21 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/Compare.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/Compare.php
@@ -2,11 +2,13 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 
 class Compare
 {
+    use ArrayEnabled;
+
     /**
      * DELTA.
      *
@@ -18,15 +20,20 @@ class Compare
      *        functions you calculate the count of equal pairs. This function is also known as the
      *        Kronecker Delta function.
      *
-     * @param float $a the first number
-     * @param float $b The second number. If omitted, b is assumed to be zero.
+     * @param array|bool|float|int|string $a the first number
+     *                      Or can be an array of values
+     * @param array|bool|float|int|string $b The second number. If omitted, b is assumed to be zero.
+     *                      Or can be an array of values
      *
-     * @return int|string (string in the event of an error)
+     * @return array|int|string (string in the event of an error)
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function DELTA($a, $b = 0)
+    public static function DELTA(array|float|bool|string|int $a, array|float|bool|string|int $b = 0.0): array|string|int
     {
-        $a = Functions::flattenSingleValue($a);
-        $b = Functions::flattenSingleValue($b);
+        if (is_array($a) || is_array($b)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $a, $b);
+        }
 
         try {
             $a = EngineeringValidations::validateFloat($a);
@@ -35,7 +42,7 @@ public static function DELTA($a, $b = 0)
             return $e->getMessage();
         }
 
-        return (int) ($a == $b);
+        return (int) (abs($a - $b) < 1.0e-15);
     }
 
     /**
@@ -48,19 +55,24 @@ public static function DELTA($a, $b = 0)
      *    Use this function to filter a set of values. For example, by summing several GESTEP
      *        functions you calculate the count of values that exceed a threshold.
      *
-     * @param float $number the value to test against step
-     * @param float $step The threshold value. If you omit a value for step, GESTEP uses zero.
+     * @param array|bool|float|int|string $number the value to test against step
+     *                      Or can be an array of values
+     * @param null|array|bool|float|int|string $step The threshold value. If you omit a value for step, GESTEP uses zero.
+     *                      Or can be an array of values
      *
-     * @return int|string (string in the event of an error)
+     * @return array|int|string (string in the event of an error)
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function GESTEP($number, $step = 0)
+    public static function GESTEP(array|float|bool|string|int $number, $step = 0.0): array|string|int
     {
-        $number = Functions::flattenSingleValue($number);
-        $step = Functions::flattenSingleValue($step);
+        if (is_array($number) || is_array($step)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number, $step);
+        }
 
         try {
             $number = EngineeringValidations::validateFloat($number);
-            $step = EngineeringValidations::validateFloat($step);
+            $step = EngineeringValidations::validateFloat($step ?? 0.0);
         } catch (Exception $e) {
             return $e->getMessage();
         }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/Complex.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/Complex.php
index 1c2f5f773a..3e41371be3 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/Complex.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/Complex.php
@@ -4,11 +4,14 @@
 
 use Complex\Complex as ComplexObject;
 use Complex\Exception as ComplexException;
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class Complex
 {
+    use ArrayEnabled;
+
     /**
      * COMPLEX.
      *
@@ -18,17 +21,25 @@ class Complex
      *        COMPLEX(realNumber,imaginary[,suffix])
      *
      * @param mixed $realNumber the real float coefficient of the complex number
+     *                      Or can be an array of values
      * @param mixed $imaginary the imaginary float coefficient of the complex number
+     *                      Or can be an array of values
      * @param mixed $suffix The character suffix for the imaginary component of the complex number.
      *                          If omitted, the suffix is assumed to be "i".
+     *                      Or can be an array of values
      *
-     * @return string
+     * @return array|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function COMPLEX($realNumber = 0.0, $imaginary = 0.0, $suffix = 'i')
+    public static function COMPLEX(mixed $realNumber = 0.0, mixed $imaginary = 0.0, mixed $suffix = 'i'): array|string
     {
-        $realNumber = ($realNumber === null) ? 0.0 : Functions::flattenSingleValue($realNumber);
-        $imaginary = ($imaginary === null) ? 0.0 : Functions::flattenSingleValue($imaginary);
-        $suffix = ($suffix === null) ? 'i' : Functions::flattenSingleValue($suffix);
+        if (is_array($realNumber) || is_array($imaginary) || is_array($suffix)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $realNumber, $imaginary, $suffix);
+        }
+
+        $realNumber = $realNumber ?? 0.0;
+        $imaginary = $imaginary ?? 0.0;
+        $suffix = $suffix ?? 'i';
 
         try {
             $realNumber = EngineeringValidations::validateFloat($realNumber);
@@ -37,13 +48,13 @@ public static function COMPLEX($realNumber = 0.0, $imaginary = 0.0, $suffix = 'i
             return $e->getMessage();
         }
 
-        if (($suffix == 'i') || ($suffix == 'j') || ($suffix == '')) {
+        if (($suffix === 'i') || ($suffix === 'j') || ($suffix === '')) {
             $complex = new ComplexObject($realNumber, $imaginary, $suffix);
 
             return (string) $complex;
         }
 
-        return Functions::VALUE();
+        return ExcelError::VALUE();
     }
 
     /**
@@ -54,19 +65,24 @@ public static function COMPLEX($realNumber = 0.0, $imaginary = 0.0, $suffix = 'i
      * Excel Function:
      *        IMAGINARY(complexNumber)
      *
-     * @param string $complexNumber the complex number for which you want the imaginary
+     * @param array|string $complexNumber the complex number for which you want the imaginary
      *                                         coefficient
+     *                      Or can be an array of values
      *
-     * @return float|string
+     * @return array|float|string (string if an error)
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function IMAGINARY($complexNumber)
+    public static function IMAGINARY($complexNumber): array|string|float
     {
-        $complexNumber = Functions::flattenSingleValue($complexNumber);
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
 
         try {
             $complex = new ComplexObject($complexNumber);
-        } catch (ComplexException $e) {
-            return Functions::NAN();
+        } catch (ComplexException) {
+            return ExcelError::NAN();
         }
 
         return $complex->getImaginary();
@@ -80,18 +96,23 @@ public static function IMAGINARY($complexNumber)
      * Excel Function:
      *        IMREAL(complexNumber)
      *
-     * @param string $complexNumber the complex number for which you want the real coefficient
+     * @param array|string $complexNumber the complex number for which you want the real coefficient
+     *                      Or can be an array of values
      *
-     * @return float|string
+     * @return array|float|string (string if an error)
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function IMREAL($complexNumber)
+    public static function IMREAL($complexNumber): array|string|float
     {
-        $complexNumber = Functions::flattenSingleValue($complexNumber);
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
 
         try {
             $complex = new ComplexObject($complexNumber);
-        } catch (ComplexException $e) {
-            return Functions::NAN();
+        } catch (ComplexException) {
+            return ExcelError::NAN();
         }
 
         return $complex->getReal();
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ComplexFunctions.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ComplexFunctions.php
index 3f37f373ff..d1b7764af0 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ComplexFunctions.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ComplexFunctions.php
@@ -4,10 +4,13 @@
 
 use Complex\Complex as ComplexObject;
 use Complex\Exception as ComplexException;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class ComplexFunctions
 {
+    use ArrayEnabled;
+
     /**
      * IMABS.
      *
@@ -16,18 +19,22 @@ class ComplexFunctions
      * Excel Function:
      *        IMABS(complexNumber)
      *
-     * @param string $complexNumber the complex number for which you want the absolute value
+     * @param array|string $complexNumber the complex number for which you want the absolute value
+     *                      Or can be an array of values
      *
-     * @return float|string
+     * @return array|float|string         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function IMABS($complexNumber)
+    public static function IMABS(array|string $complexNumber): array|float|string
     {
-        $complexNumber = Functions::flattenSingleValue($complexNumber);
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
 
         try {
             $complex = new ComplexObject($complexNumber);
-        } catch (ComplexException $e) {
-            return Functions::NAN();
+        } catch (ComplexException) {
+            return ExcelError::NAN();
         }
 
         return $complex->abs();
@@ -42,22 +49,26 @@ public static function IMABS($complexNumber)
      * Excel Function:
      *        IMARGUMENT(complexNumber)
      *
-     * @param string $complexNumber the complex number for which you want the argument theta
+     * @param array|string $complexNumber the complex number for which you want the argument theta
+     *                      Or can be an array of values
      *
-     * @return float|string
+     * @return array|float|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function IMARGUMENT($complexNumber)
+    public static function IMARGUMENT(array|string $complexNumber): array|float|string
     {
-        $complexNumber = Functions::flattenSingleValue($complexNumber);
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
 
         try {
             $complex = new ComplexObject($complexNumber);
-        } catch (ComplexException $e) {
-            return Functions::NAN();
+        } catch (ComplexException) {
+            return ExcelError::NAN();
         }
 
         if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
-            return Functions::DIV0();
+            return ExcelError::DIV0();
         }
 
         return $complex->argument();
@@ -71,18 +82,22 @@ public static function IMARGUMENT($complexNumber)
      * Excel Function:
      *        IMCONJUGATE(complexNumber)
      *
-     * @param string $complexNumber the complex number for which you want the conjugate
+     * @param array|string $complexNumber the complex number for which you want the conjugate
+     *                      Or can be an array of values
      *
-     * @return string
+     * @return array|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function IMCONJUGATE($complexNumber)
+    public static function IMCONJUGATE(array|string $complexNumber): array|string
     {
-        $complexNumber = Functions::flattenSingleValue($complexNumber);
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
 
         try {
             $complex = new ComplexObject($complexNumber);
-        } catch (ComplexException $e) {
-            return Functions::NAN();
+        } catch (ComplexException) {
+            return ExcelError::NAN();
         }
 
         return (string) $complex->conjugate();
@@ -96,18 +111,22 @@ public static function IMCONJUGATE($complexNumber)
      * Excel Function:
      *        IMCOS(complexNumber)
      *
-     * @param string $complexNumber the complex number for which you want the cosine
+     * @param array|string $complexNumber the complex number for which you want the cosine
+     *                      Or can be an array of values
      *
-     * @return float|string
+     * @return array|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function IMCOS($complexNumber)
+    public static function IMCOS(array|string $complexNumber): array|string
     {
-        $complexNumber = Functions::flattenSingleValue($complexNumber);
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
 
         try {
             $complex = new ComplexObject($complexNumber);
-        } catch (ComplexException $e) {
-            return Functions::NAN();
+        } catch (ComplexException) {
+            return ExcelError::NAN();
         }
 
         return (string) $complex->cos();
@@ -121,18 +140,22 @@ public static function IMCOS($complexNumber)
      * Excel Function:
      *        IMCOSH(complexNumber)
      *
-     * @param string $complexNumber the complex number for which you want the hyperbolic cosine
+     * @param array|string $complexNumber the complex number for which you want the hyperbolic cosine
+     *                      Or can be an array of values
      *
-     * @return float|string
+     * @return array|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function IMCOSH($complexNumber)
+    public static function IMCOSH(array|string $complexNumber): array|string
     {
-        $complexNumber = Functions::flattenSingleValue($complexNumber);
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
 
         try {
             $complex = new ComplexObject($complexNumber);
-        } catch (ComplexException $e) {
-            return Functions::NAN();
+        } catch (ComplexException) {
+            return ExcelError::NAN();
         }
 
         return (string) $complex->cosh();
@@ -146,18 +169,22 @@ public static function IMCOSH($complexNumber)
      * Excel Function:
      *        IMCOT(complexNumber)
      *
-     * @param string $complexNumber the complex number for which you want the cotangent
+     * @param array|string $complexNumber the complex number for which you want the cotangent
+     *                      Or can be an array of values
      *
-     * @return float|string
+     * @return array|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function IMCOT($complexNumber)
+    public static function IMCOT(array|string $complexNumber): array|string
     {
-        $complexNumber = Functions::flattenSingleValue($complexNumber);
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
 
         try {
             $complex = new ComplexObject($complexNumber);
-        } catch (ComplexException $e) {
-            return Functions::NAN();
+        } catch (ComplexException) {
+            return ExcelError::NAN();
         }
 
         return (string) $complex->cot();
@@ -171,18 +198,22 @@ public static function IMCOT($complexNumber)
      * Excel Function:
      *        IMCSC(complexNumber)
      *
-     * @param string $complexNumber the complex number for which you want the cosecant
+     * @param array|string $complexNumber the complex number for which you want the cosecant
+     *                      Or can be an array of values
      *
-     * @return float|string
+     * @return array|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function IMCSC($complexNumber)
+    public static function IMCSC(array|string $complexNumber): array|string
     {
-        $complexNumber = Functions::flattenSingleValue($complexNumber);
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
 
         try {
             $complex = new ComplexObject($complexNumber);
-        } catch (ComplexException $e) {
-            return Functions::NAN();
+        } catch (ComplexException) {
+            return ExcelError::NAN();
         }
 
         return (string) $complex->csc();
@@ -196,18 +227,22 @@ public static function IMCSC($complexNumber)
      * Excel Function:
      *        IMCSCH(complexNumber)
      *
-     * @param string $complexNumber the complex number for which you want the hyperbolic cosecant
+     * @param array|string $complexNumber the complex number for which you want the hyperbolic cosecant
+     *                      Or can be an array of values
      *
-     * @return float|string
+     * @return array|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function IMCSCH($complexNumber)
+    public static function IMCSCH(array|string $complexNumber): array|string
     {
-        $complexNumber = Functions::flattenSingleValue($complexNumber);
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
 
         try {
             $complex = new ComplexObject($complexNumber);
-        } catch (ComplexException $e) {
-            return Functions::NAN();
+        } catch (ComplexException) {
+            return ExcelError::NAN();
         }
 
         return (string) $complex->csch();
@@ -221,18 +256,22 @@ public static function IMCSCH($complexNumber)
      * Excel Function:
      *        IMSIN(complexNumber)
      *
-     * @param string $complexNumber the complex number for which you want the sine
+     * @param array|string $complexNumber the complex number for which you want the sine
+     *                      Or can be an array of values
      *
-     * @return float|string
+     * @return array|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function IMSIN($complexNumber)
+    public static function IMSIN(array|string $complexNumber): array|string
     {
-        $complexNumber = Functions::flattenSingleValue($complexNumber);
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
 
         try {
             $complex = new ComplexObject($complexNumber);
-        } catch (ComplexException $e) {
-            return Functions::NAN();
+        } catch (ComplexException) {
+            return ExcelError::NAN();
         }
 
         return (string) $complex->sin();
@@ -246,18 +285,22 @@ public static function IMSIN($complexNumber)
      * Excel Function:
      *        IMSINH(complexNumber)
      *
-     * @param string $complexNumber the complex number for which you want the hyperbolic sine
+     * @param array|string $complexNumber the complex number for which you want the hyperbolic sine
+     *                      Or can be an array of values
      *
-     * @return float|string
+     * @return array|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function IMSINH($complexNumber)
+    public static function IMSINH(array|string $complexNumber): array|string
     {
-        $complexNumber = Functions::flattenSingleValue($complexNumber);
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
 
         try {
             $complex = new ComplexObject($complexNumber);
-        } catch (ComplexException $e) {
-            return Functions::NAN();
+        } catch (ComplexException) {
+            return ExcelError::NAN();
         }
 
         return (string) $complex->sinh();
@@ -271,18 +314,22 @@ public static function IMSINH($complexNumber)
      * Excel Function:
      *        IMSEC(complexNumber)
      *
-     * @param string $complexNumber the complex number for which you want the secant
+     * @param array|string $complexNumber the complex number for which you want the secant
+     *                      Or can be an array of values
      *
-     * @return float|string
+     * @return array|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function IMSEC($complexNumber)
+    public static function IMSEC(array|string $complexNumber): array|string
     {
-        $complexNumber = Functions::flattenSingleValue($complexNumber);
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
 
         try {
             $complex = new ComplexObject($complexNumber);
-        } catch (ComplexException $e) {
-            return Functions::NAN();
+        } catch (ComplexException) {
+            return ExcelError::NAN();
         }
 
         return (string) $complex->sec();
@@ -296,18 +343,22 @@ public static function IMSEC($complexNumber)
      * Excel Function:
      *        IMSECH(complexNumber)
      *
-     * @param string $complexNumber the complex number for which you want the hyperbolic secant
+     * @param array|string $complexNumber the complex number for which you want the hyperbolic secant
+     *                      Or can be an array of values
      *
-     * @return float|string
+     * @return array|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function IMSECH($complexNumber)
+    public static function IMSECH(array|string $complexNumber): array|string
     {
-        $complexNumber = Functions::flattenSingleValue($complexNumber);
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
 
         try {
             $complex = new ComplexObject($complexNumber);
-        } catch (ComplexException $e) {
-            return Functions::NAN();
+        } catch (ComplexException) {
+            return ExcelError::NAN();
         }
 
         return (string) $complex->sech();
@@ -321,18 +372,22 @@ public static function IMSECH($complexNumber)
      * Excel Function:
      *        IMTAN(complexNumber)
      *
-     * @param string $complexNumber the complex number for which you want the tangent
+     * @param array|string $complexNumber the complex number for which you want the tangent
+     *                      Or can be an array of values
      *
-     * @return float|string
+     * @return array|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function IMTAN($complexNumber)
+    public static function IMTAN(array|string $complexNumber): array|string
     {
-        $complexNumber = Functions::flattenSingleValue($complexNumber);
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
 
         try {
             $complex = new ComplexObject($complexNumber);
-        } catch (ComplexException $e) {
-            return Functions::NAN();
+        } catch (ComplexException) {
+            return ExcelError::NAN();
         }
 
         return (string) $complex->tan();
@@ -346,22 +401,26 @@ public static function IMTAN($complexNumber)
      * Excel Function:
      *        IMSQRT(complexNumber)
      *
-     * @param string $complexNumber the complex number for which you want the square root
+     * @param array|string $complexNumber the complex number for which you want the square root
+     *                      Or can be an array of values
      *
-     * @return string
+     * @return array|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function IMSQRT($complexNumber)
+    public static function IMSQRT(array|string $complexNumber): array|string
     {
-        $complexNumber = Functions::flattenSingleValue($complexNumber);
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
 
         try {
             $complex = new ComplexObject($complexNumber);
-        } catch (ComplexException $e) {
-            return Functions::NAN();
+        } catch (ComplexException) {
+            return ExcelError::NAN();
         }
 
         $theta = self::IMARGUMENT($complexNumber);
-        if ($theta === Functions::DIV0()) {
+        if ($theta === ExcelError::DIV0()) {
             return '0';
         }
 
@@ -376,22 +435,26 @@ public static function IMSQRT($complexNumber)
      * Excel Function:
      *        IMLN(complexNumber)
      *
-     * @param string $complexNumber the complex number for which you want the natural logarithm
+     * @param array|string $complexNumber the complex number for which you want the natural logarithm
+     *                      Or can be an array of values
      *
-     * @return string
+     * @return array|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function IMLN($complexNumber)
+    public static function IMLN(array|string $complexNumber): array|string
     {
-        $complexNumber = Functions::flattenSingleValue($complexNumber);
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
 
         try {
             $complex = new ComplexObject($complexNumber);
-        } catch (ComplexException $e) {
-            return Functions::NAN();
+        } catch (ComplexException) {
+            return ExcelError::NAN();
         }
 
         if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         return (string) $complex->ln();
@@ -405,22 +468,26 @@ public static function IMLN($complexNumber)
      * Excel Function:
      *        IMLOG10(complexNumber)
      *
-     * @param string $complexNumber the complex number for which you want the common logarithm
+     * @param array|string $complexNumber the complex number for which you want the common logarithm
+     *                      Or can be an array of values
      *
-     * @return string
+     * @return array|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function IMLOG10($complexNumber)
+    public static function IMLOG10(array|string $complexNumber): array|string
     {
-        $complexNumber = Functions::flattenSingleValue($complexNumber);
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
 
         try {
             $complex = new ComplexObject($complexNumber);
-        } catch (ComplexException $e) {
-            return Functions::NAN();
+        } catch (ComplexException) {
+            return ExcelError::NAN();
         }
 
         if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         return (string) $complex->log10();
@@ -434,22 +501,26 @@ public static function IMLOG10($complexNumber)
      * Excel Function:
      *        IMLOG2(complexNumber)
      *
-     * @param string $complexNumber the complex number for which you want the base-2 logarithm
+     * @param array|string $complexNumber the complex number for which you want the base-2 logarithm
+     *                      Or can be an array of values
      *
-     * @return string
+     * @return array|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function IMLOG2($complexNumber)
+    public static function IMLOG2(array|string $complexNumber): array|string
     {
-        $complexNumber = Functions::flattenSingleValue($complexNumber);
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
 
         try {
             $complex = new ComplexObject($complexNumber);
-        } catch (ComplexException $e) {
-            return Functions::NAN();
+        } catch (ComplexException) {
+            return ExcelError::NAN();
         }
 
         if ($complex->getReal() == 0.0 && $complex->getImaginary() == 0.0) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         return (string) $complex->log2();
@@ -463,18 +534,22 @@ public static function IMLOG2($complexNumber)
      * Excel Function:
      *        IMEXP(complexNumber)
      *
-     * @param string $complexNumber the complex number for which you want the exponential
+     * @param array|string $complexNumber the complex number for which you want the exponential
+     *                      Or can be an array of values
      *
-     * @return string
+     * @return array|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function IMEXP($complexNumber)
+    public static function IMEXP(array|string $complexNumber): array|string
     {
-        $complexNumber = Functions::flattenSingleValue($complexNumber);
+        if (is_array($complexNumber)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $complexNumber);
+        }
 
         try {
             $complex = new ComplexObject($complexNumber);
-        } catch (ComplexException $e) {
-            return Functions::NAN();
+        } catch (ComplexException) {
+            return ExcelError::NAN();
         }
 
         return (string) $complex->exp();
@@ -488,26 +563,30 @@ public static function IMEXP($complexNumber)
      * Excel Function:
      *        IMPOWER(complexNumber,realNumber)
      *
-     * @param string $complexNumber the complex number you want to raise to a power
-     * @param float $realNumber the power to which you want to raise the complex number
+     * @param array|string $complexNumber the complex number you want to raise to a power
+     *                      Or can be an array of values
+     * @param array|float|int|string $realNumber the power to which you want to raise the complex number
+     *                      Or can be an array of values
      *
-     * @return string
+     * @return array|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function IMPOWER($complexNumber, $realNumber)
+    public static function IMPOWER(array|string $complexNumber, array|float|int|string $realNumber): array|string
     {
-        $complexNumber = Functions::flattenSingleValue($complexNumber);
-        $realNumber = Functions::flattenSingleValue($realNumber);
+        if (is_array($complexNumber) || is_array($realNumber)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $complexNumber, $realNumber);
+        }
 
         try {
             $complex = new ComplexObject($complexNumber);
-        } catch (ComplexException $e) {
-            return Functions::NAN();
+        } catch (ComplexException) {
+            return ExcelError::NAN();
         }
 
         if (!is_numeric($realNumber)) {
-            return Functions::VALUE();
+            return ExcelError::VALUE();
         }
 
-        return (string) $complex->pow($realNumber);
+        return (string) $complex->pow((float) $realNumber);
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ComplexOperations.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ComplexOperations.php
index 681aad8caf..61efa84768 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ComplexOperations.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ComplexOperations.php
@@ -4,10 +4,14 @@
 
 use Complex\Complex as ComplexObject;
 use Complex\Exception as ComplexException;
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class ComplexOperations
 {
+    use ArrayEnabled;
+
     /**
      * IMDIV.
      *
@@ -16,20 +20,24 @@ class ComplexOperations
      * Excel Function:
      *        IMDIV(complexDividend,complexDivisor)
      *
-     * @param string $complexDividend the complex numerator or dividend
-     * @param string $complexDivisor the complex denominator or divisor
+     * @param array|string $complexDividend the complex numerator or dividend
+     *                      Or can be an array of values
+     * @param array|string $complexDivisor the complex denominator or divisor
+     *                      Or can be an array of values
      *
-     * @return string
+     * @return array|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function IMDIV($complexDividend, $complexDivisor)
+    public static function IMDIV(array|string $complexDividend, array|string $complexDivisor): array|string
     {
-        $complexDividend = Functions::flattenSingleValue($complexDividend);
-        $complexDivisor = Functions::flattenSingleValue($complexDivisor);
+        if (is_array($complexDividend) || is_array($complexDivisor)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $complexDividend, $complexDivisor);
+        }
 
         try {
             return (string) (new ComplexObject($complexDividend))->divideby(new ComplexObject($complexDivisor));
-        } catch (ComplexException $e) {
-            return Functions::NAN();
+        } catch (ComplexException) {
+            return ExcelError::NAN();
         }
     }
 
@@ -41,20 +49,24 @@ public static function IMDIV($complexDividend, $complexDivisor)
      * Excel Function:
      *        IMSUB(complexNumber1,complexNumber2)
      *
-     * @param string $complexNumber1 the complex number from which to subtract complexNumber2
-     * @param string $complexNumber2 the complex number to subtract from complexNumber1
+     * @param array|string $complexNumber1 the complex number from which to subtract complexNumber2
+     *                      Or can be an array of values
+     * @param array|string $complexNumber2 the complex number to subtract from complexNumber1
+     *                      Or can be an array of values
      *
-     * @return string
+     * @return array|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function IMSUB($complexNumber1, $complexNumber2)
+    public static function IMSUB(array|string $complexNumber1, array|string $complexNumber2): array|string
     {
-        $complexNumber1 = Functions::flattenSingleValue($complexNumber1);
-        $complexNumber2 = Functions::flattenSingleValue($complexNumber2);
+        if (is_array($complexNumber1) || is_array($complexNumber2)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $complexNumber1, $complexNumber2);
+        }
 
         try {
             return (string) (new ComplexObject($complexNumber1))->subtract(new ComplexObject($complexNumber2));
-        } catch (ComplexException $e) {
-            return Functions::NAN();
+        } catch (ComplexException) {
+            return ExcelError::NAN();
         }
     }
 
@@ -67,10 +79,8 @@ public static function IMSUB($complexNumber1, $complexNumber2)
      *        IMSUM(complexNumber[,complexNumber[,...]])
      *
      * @param string ...$complexNumbers Series of complex numbers to add
-     *
-     * @return string
      */
-    public static function IMSUM(...$complexNumbers)
+    public static function IMSUM(...$complexNumbers): string
     {
         // Return value
         $returnValue = new ComplexObject(0.0);
@@ -81,8 +91,8 @@ public static function IMSUM(...$complexNumbers)
             foreach ($aArgs as $complex) {
                 $returnValue = $returnValue->add(new ComplexObject($complex));
             }
-        } catch (ComplexException $e) {
-            return Functions::NAN();
+        } catch (ComplexException) {
+            return ExcelError::NAN();
         }
 
         return (string) $returnValue;
@@ -97,10 +107,8 @@ public static function IMSUM(...$complexNumbers)
      *        IMPRODUCT(complexNumber[,complexNumber[,...]])
      *
      * @param string ...$complexNumbers Series of complex numbers to multiply
-     *
-     * @return string
      */
-    public static function IMPRODUCT(...$complexNumbers)
+    public static function IMPRODUCT(...$complexNumbers): string
     {
         // Return value
         $returnValue = new ComplexObject(1.0);
@@ -111,8 +119,8 @@ public static function IMPRODUCT(...$complexNumbers)
             foreach ($aArgs as $complex) {
                 $returnValue = $returnValue->multiply(new ComplexObject($complex));
             }
-        } catch (ComplexException $e) {
-            return Functions::NAN();
+        } catch (ComplexException) {
+            return ExcelError::NAN();
         }
 
         return (string) $returnValue;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertBase.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertBase.php
index a095690d18..1222831a1e 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertBase.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertBase.php
@@ -2,16 +2,20 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
-class ConvertBase
+abstract class ConvertBase
 {
-    protected static function validateValue($value): string
+    use ArrayEnabled;
+
+    protected static function validateValue(mixed $value): string
     {
         if (is_bool($value)) {
             if (Functions::getCompatibilityMode() !== Functions::COMPATIBILITY_OPENOFFICE) {
-                throw new Exception(Functions::VALUE());
+                throw new Exception(ExcelError::VALUE());
             }
             $value = (int) $value;
         }
@@ -25,7 +29,7 @@ protected static function validateValue($value): string
         return strtoupper((string) $value);
     }
 
-    protected static function validatePlaces($places = null): ?int
+    protected static function validatePlaces(mixed $places = null): ?int
     {
         if ($places === null) {
             return $places;
@@ -33,13 +37,13 @@ protected static function validatePlaces($places = null): ?int
 
         if (is_numeric($places)) {
             if ($places < 0 || $places > 10) {
-                throw new Exception(Functions::NAN());
+                throw new Exception(ExcelError::NAN());
             }
 
             return (int) $places;
         }
 
-        throw new Exception(Functions::VALUE());
+        throw new Exception(ExcelError::VALUE());
     }
 
     /**
@@ -57,7 +61,7 @@ protected static function nbrConversionFormat(string $value, ?int $places): stri
                 return substr(str_pad($value, $places, '0', STR_PAD_LEFT), -10);
             }
 
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         return substr($value, -10);
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertBinary.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertBinary.php
index a662b78de3..9c00dcb54c 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertBinary.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertBinary.php
@@ -3,7 +3,7 @@
 namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class ConvertBinary extends ConvertBase
 {
@@ -15,23 +15,32 @@ class ConvertBinary extends ConvertBase
      * Excel Function:
      *        BIN2DEC(x)
      *
-     * @param string $value The binary number (as a string) that you want to convert. The number
+     * @param array|bool|float|int|string $value The binary number (as a string) that you want to convert. The number
      *                                cannot contain more than 10 characters (10 bits). The most significant
      *                                bit of number is the sign bit. The remaining 9 bits are magnitude bits.
      *                                Negative numbers are represented using two's-complement notation.
      *                                If number is not a valid binary number, or if number contains more than
      *                                10 characters (10 bits), BIN2DEC returns the #NUM! error value.
+     *                      Or can be an array of values
+     *
+     * @return array|string Result, or an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function toDecimal($value): string
+    public static function toDecimal($value)
     {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
         try {
-            $value = self::validateValue(Functions::flattenSingleValue($value));
+            $value = self::validateValue($value);
             $value = self::validateBinary($value);
         } catch (Exception $e) {
             return $e->getMessage();
         }
 
-        if (strlen($value) == 10) {
+        if (strlen($value) == 10 && $value[0] === '1') {
             //    Two's Complement
             $value = substr($value, -9);
 
@@ -49,30 +58,40 @@ public static function toDecimal($value): string
      * Excel Function:
      *        BIN2HEX(x[,places])
      *
-     * @param string $value The binary number (as a string) that you want to convert. The number
+     * @param array|bool|float|int|string $value The binary number (as a string) that you want to convert. The number
      *                                cannot contain more than 10 characters (10 bits). The most significant
      *                                bit of number is the sign bit. The remaining 9 bits are magnitude bits.
      *                                Negative numbers are represented using two's-complement notation.
      *                                If number is not a valid binary number, or if number contains more than
      *                                10 characters (10 bits), BIN2HEX returns the #NUM! error value.
-     * @param int $places The number of characters to use. If places is omitted, BIN2HEX uses the
+     *                      Or can be an array of values
+     * @param null|array|float|int|string $places The number of characters to use. If places is omitted, BIN2HEX uses the
      *                                minimum number of characters necessary. Places is useful for padding the
      *                                return value with leading 0s (zeros).
      *                                If places is not an integer, it is truncated.
      *                                If places is nonnumeric, BIN2HEX returns the #VALUE! error value.
      *                                If places is negative, BIN2HEX returns the #NUM! error value.
+     *                      Or can be an array of values
+     *
+     * @return array|string Result, or an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function toHex($value, $places = null): string
+    public static function toHex($value, $places = null): array|string
     {
+        if (is_array($value) || is_array($places)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $places);
+        }
+
         try {
-            $value = self::validateValue(Functions::flattenSingleValue($value));
+            $value = self::validateValue($value);
             $value = self::validateBinary($value);
-            $places = self::validatePlaces(Functions::flattenSingleValue($places));
+            $places = self::validatePlaces($places);
         } catch (Exception $e) {
             return $e->getMessage();
         }
 
-        if (strlen($value) == 10) {
+        if (strlen($value) == 10 && $value[0] === '1') {
             $high2 = substr($value, 0, 2);
             $low8 = substr($value, 2);
             $xarr = ['00' => '00000000', '01' => '00000001', '10' => 'FFFFFFFE', '11' => 'FFFFFFFF'];
@@ -92,30 +111,40 @@ public static function toHex($value, $places = null): string
      * Excel Function:
      *        BIN2OCT(x[,places])
      *
-     * @param string $value The binary number (as a string) that you want to convert. The number
+     * @param array|bool|float|int|string $value The binary number (as a string) that you want to convert. The number
      *                                cannot contain more than 10 characters (10 bits). The most significant
      *                                bit of number is the sign bit. The remaining 9 bits are magnitude bits.
      *                                Negative numbers are represented using two's-complement notation.
      *                                If number is not a valid binary number, or if number contains more than
      *                                10 characters (10 bits), BIN2OCT returns the #NUM! error value.
-     * @param int $places The number of characters to use. If places is omitted, BIN2OCT uses the
+     *                      Or can be an array of values
+     * @param null|array|float|int|string $places The number of characters to use. If places is omitted, BIN2OCT uses the
      *                                minimum number of characters necessary. Places is useful for padding the
      *                                return value with leading 0s (zeros).
      *                                If places is not an integer, it is truncated.
      *                                If places is nonnumeric, BIN2OCT returns the #VALUE! error value.
      *                                If places is negative, BIN2OCT returns the #NUM! error value.
+     *                      Or can be an array of values
+     *
+     * @return array|string Result, or an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function toOctal($value, $places = null): string
+    public static function toOctal($value, $places = null): array|string
     {
+        if (is_array($value) || is_array($places)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $places);
+        }
+
         try {
-            $value = self::validateValue(Functions::flattenSingleValue($value));
+            $value = self::validateValue($value);
             $value = self::validateBinary($value);
-            $places = self::validatePlaces(Functions::flattenSingleValue($places));
+            $places = self::validatePlaces($places);
         } catch (Exception $e) {
             return $e->getMessage();
         }
 
-        if (strlen($value) == 10 && substr($value, 0, 1) === '1') { //    Two's Complement
+        if (strlen($value) == 10 && $value[0] === '1') { //    Two's Complement
             return str_repeat('7', 6) . strtoupper(decoct((int) bindec("11$value")));
         }
         $octVal = (string) decoct((int) bindec($value));
@@ -126,7 +155,7 @@ public static function toOctal($value, $places = null): string
     protected static function validateBinary(string $value): string
     {
         if ((strlen($value) > preg_match_all('/[01]/', $value)) || (strlen($value) > 10)) {
-            throw new Exception(Functions::NAN());
+            throw new Exception(ExcelError::NAN());
         }
 
         return $value;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertDecimal.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertDecimal.php
index a34332fb35..923caa96de 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertDecimal.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertDecimal.php
@@ -3,7 +3,7 @@
 namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class ConvertDecimal extends ConvertBase
 {
@@ -22,7 +22,7 @@ class ConvertDecimal extends ConvertBase
      * Excel Function:
      *        DEC2BIN(x[,places])
      *
-     * @param string $value The decimal integer you want to convert. If number is negative,
+     * @param array|bool|float|int|string $value The decimal integer you want to convert. If number is negative,
      *                          valid place values are ignored and DEC2BIN returns a 10-character
      *                          (10-bit) binary number in which the most significant bit is the sign
      *                          bit. The remaining 9 bits are magnitude bits. Negative numbers are
@@ -32,26 +32,36 @@ class ConvertDecimal extends ConvertBase
      *                      If number is nonnumeric, DEC2BIN returns the #VALUE! error value.
      *                      If DEC2BIN requires more than places characters, it returns the #NUM!
      *                          error value.
-     * @param int $places The number of characters to use. If places is omitted, DEC2BIN uses
+     *                      Or can be an array of values
+     * @param null|array|float|int|string $places The number of characters to use. If places is omitted, DEC2BIN uses
      *                          the minimum number of characters necessary. Places is useful for
      *                          padding the return value with leading 0s (zeros).
      *                      If places is not an integer, it is truncated.
      *                      If places is nonnumeric, DEC2BIN returns the #VALUE! error value.
      *                      If places is zero or negative, DEC2BIN returns the #NUM! error value.
+     *                      Or can be an array of values
+     *
+     * @return array|string Result, or an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function toBinary($value, $places = null): string
+    public static function toBinary($value, $places = null): array|string
     {
+        if (is_array($value) || is_array($places)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $places);
+        }
+
         try {
-            $value = self::validateValue(Functions::flattenSingleValue($value));
+            $value = self::validateValue($value);
             $value = self::validateDecimal($value);
-            $places = self::validatePlaces(Functions::flattenSingleValue($places));
+            $places = self::validatePlaces($places);
         } catch (Exception $e) {
             return $e->getMessage();
         }
 
         $value = (int) floor((float) $value);
         if ($value > self::LARGEST_BINARY_IN_DECIMAL || $value < self::SMALLEST_BINARY_IN_DECIMAL) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         $r = decbin($value);
@@ -69,7 +79,7 @@ public static function toBinary($value, $places = null): string
      * Excel Function:
      *        DEC2HEX(x[,places])
      *
-     * @param string $value The decimal integer you want to convert. If number is negative,
+     * @param array|bool|float|int|string $value The decimal integer you want to convert. If number is negative,
      *                          places is ignored and DEC2HEX returns a 10-character (40-bit)
      *                          hexadecimal number in which the most significant bit is the sign
      *                          bit. The remaining 39 bits are magnitude bits. Negative numbers
@@ -79,26 +89,36 @@ public static function toBinary($value, $places = null): string
      *                      If number is nonnumeric, DEC2HEX returns the #VALUE! error value.
      *                      If DEC2HEX requires more than places characters, it returns the
      *                          #NUM! error value.
-     * @param int $places The number of characters to use. If places is omitted, DEC2HEX uses
+     *                      Or can be an array of values
+     * @param null|array|float|int|string $places The number of characters to use. If places is omitted, DEC2HEX uses
      *                          the minimum number of characters necessary. Places is useful for
      *                          padding the return value with leading 0s (zeros).
      *                      If places is not an integer, it is truncated.
      *                      If places is nonnumeric, DEC2HEX returns the #VALUE! error value.
      *                      If places is zero or negative, DEC2HEX returns the #NUM! error value.
+     *                      Or can be an array of values
+     *
+     * @return array|string Result, or an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function toHex($value, $places = null): string
+    public static function toHex($value, $places = null): array|string
     {
+        if (is_array($value) || is_array($places)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $places);
+        }
+
         try {
-            $value = self::validateValue(Functions::flattenSingleValue($value));
+            $value = self::validateValue($value);
             $value = self::validateDecimal($value);
-            $places = self::validatePlaces(Functions::flattenSingleValue($places));
+            $places = self::validatePlaces($places);
         } catch (Exception $e) {
             return $e->getMessage();
         }
 
         $value = floor((float) $value);
         if ($value > self::LARGEST_HEX_IN_DECIMAL || $value < self::SMALLEST_HEX_IN_DECIMAL) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
         $r = strtoupper(dechex((int) $value));
         $r = self::hex32bit($value, $r);
@@ -135,7 +155,7 @@ public static function hex32bit(float $value, string $hexstr, bool $force = fals
      * Excel Function:
      *        DEC2OCT(x[,places])
      *
-     * @param string $value The decimal integer you want to convert. If number is negative,
+     * @param array|bool|float|int|string $value The decimal integer you want to convert. If number is negative,
      *                          places is ignored and DEC2OCT returns a 10-character (30-bit)
      *                          octal number in which the most significant bit is the sign bit.
      *                          The remaining 29 bits are magnitude bits. Negative numbers are
@@ -145,26 +165,36 @@ public static function hex32bit(float $value, string $hexstr, bool $force = fals
      *                      If number is nonnumeric, DEC2OCT returns the #VALUE! error value.
      *                      If DEC2OCT requires more than places characters, it returns the
      *                          #NUM! error value.
-     * @param int $places The number of characters to use. If places is omitted, DEC2OCT uses
+     *                      Or can be an array of values
+     * @param array|int $places The number of characters to use. If places is omitted, DEC2OCT uses
      *                          the minimum number of characters necessary. Places is useful for
      *                          padding the return value with leading 0s (zeros).
      *                      If places is not an integer, it is truncated.
      *                      If places is nonnumeric, DEC2OCT returns the #VALUE! error value.
      *                      If places is zero or negative, DEC2OCT returns the #NUM! error value.
+     *                      Or can be an array of values
+     *
+     * @return array|string Result, or an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function toOctal($value, $places = null): string
+    public static function toOctal($value, $places = null): array|string
     {
+        if (is_array($value) || is_array($places)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $places);
+        }
+
         try {
-            $value = self::validateValue(Functions::flattenSingleValue($value));
+            $value = self::validateValue($value);
             $value = self::validateDecimal($value);
-            $places = self::validatePlaces(Functions::flattenSingleValue($places));
+            $places = self::validatePlaces($places);
         } catch (Exception $e) {
             return $e->getMessage();
         }
 
         $value = (int) floor((float) $value);
         if ($value > self::LARGEST_OCTAL_IN_DECIMAL || $value < self::SMALLEST_OCTAL_IN_DECIMAL) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
         $r = decoct($value);
         $r = substr($r, -10);
@@ -175,7 +205,7 @@ public static function toOctal($value, $places = null): string
     protected static function validateDecimal(string $value): string
     {
         if (strlen($value) > preg_match_all('/[-0123456789.]/', $value)) {
-            throw new Exception(Functions::VALUE());
+            throw new Exception(ExcelError::VALUE());
         }
 
         return $value;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertHex.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertHex.php
index de1b0704f7..0003a9fda1 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertHex.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertHex.php
@@ -3,7 +3,7 @@
 namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class ConvertHex extends ConvertBase
 {
@@ -15,7 +15,7 @@ class ConvertHex extends ConvertBase
      * Excel Function:
      *        HEX2BIN(x[,places])
      *
-     * @param string $value The hexadecimal number you want to convert.
+     * @param array|bool|float|string $value The hexadecimal number you want to convert.
      *                      Number cannot contain more than 10 characters.
      *                      The most significant bit of number is the sign bit (40th bit from the right).
      *                      The remaining 9 bits are magnitude bits.
@@ -25,19 +25,29 @@ class ConvertHex extends ConvertBase
      *                          and if number is positive, it cannot be greater than 1FF.
      *                      If number is not a valid hexadecimal number, HEX2BIN returns the #NUM! error value.
      *                      If HEX2BIN requires more than places characters, it returns the #NUM! error value.
-     * @param int $places The number of characters to use. If places is omitted,
+     *                      Or can be an array of values
+     * @param array|int $places The number of characters to use. If places is omitted,
      *                          HEX2BIN uses the minimum number of characters necessary. Places
      *                          is useful for padding the return value with leading 0s (zeros).
      *                      If places is not an integer, it is truncated.
      *                      If places is nonnumeric, HEX2BIN returns the #VALUE! error value.
      *                      If places is negative, HEX2BIN returns the #NUM! error value.
+     *                      Or can be an array of values
+     *
+     * @return array|string Result, or an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function toBinary($value, $places = null): string
+    public static function toBinary($value, $places = null): array|string
     {
+        if (is_array($value) || is_array($places)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $places);
+        }
+
         try {
-            $value = self::validateValue(Functions::flattenSingleValue($value));
+            $value = self::validateValue($value);
             $value = self::validateHex($value);
-            $places = self::validatePlaces(Functions::flattenSingleValue($places));
+            $places = self::validatePlaces($places);
         } catch (Exception $e) {
             return $e->getMessage();
         }
@@ -55,25 +65,34 @@ public static function toBinary($value, $places = null): string
      * Excel Function:
      *        HEX2DEC(x)
      *
-     * @param string $value The hexadecimal number you want to convert. This number cannot
+     * @param array|bool|float|int|string $value The hexadecimal number you want to convert. This number cannot
      *                          contain more than 10 characters (40 bits). The most significant
      *                          bit of number is the sign bit. The remaining 39 bits are magnitude
      *                          bits. Negative numbers are represented using two's-complement
      *                          notation.
      *                      If number is not a valid hexadecimal number, HEX2DEC returns the
      *                          #NUM! error value.
+     *                      Or can be an array of values
+     *
+     * @return array|string Result, or an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function toDecimal($value): string
+    public static function toDecimal($value)
     {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
         try {
-            $value = self::validateValue(Functions::flattenSingleValue($value));
+            $value = self::validateValue($value);
             $value = self::validateHex($value);
         } catch (Exception $e) {
             return $e->getMessage();
         }
 
         if (strlen($value) > 10) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         $binX = '';
@@ -99,7 +118,7 @@ public static function toDecimal($value): string
      * Excel Function:
      *        HEX2OCT(x[,places])
      *
-     * @param string $value The hexadecimal number you want to convert. Number cannot
+     * @param array|bool|float|int|string $value The hexadecimal number you want to convert. Number cannot
      *                                    contain more than 10 characters. The most significant bit of
      *                                    number is the sign bit. The remaining 39 bits are magnitude
      *                                    bits. Negative numbers are represented using two's-complement
@@ -112,20 +131,30 @@ public static function toDecimal($value): string
      *                                    the #NUM! error value.
      *                                    If HEX2OCT requires more than places characters, it returns
      *                                    the #NUM! error value.
-     * @param int $places The number of characters to use. If places is omitted, HEX2OCT
+     *                      Or can be an array of values
+     * @param array|int $places The number of characters to use. If places is omitted, HEX2OCT
      *                                    uses the minimum number of characters necessary. Places is
      *                                    useful for padding the return value with leading 0s (zeros).
      *                                    If places is not an integer, it is truncated.
      *                                    If places is nonnumeric, HEX2OCT returns the #VALUE! error
      *                                    value.
      *                                    If places is negative, HEX2OCT returns the #NUM! error value.
+     *                      Or can be an array of values
+     *
+     * @return array|string Result, or an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function toOctal($value, $places = null): string
+    public static function toOctal($value, $places = null): array|string
     {
+        if (is_array($value) || is_array($places)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $places);
+        }
+
         try {
-            $value = self::validateValue(Functions::flattenSingleValue($value));
+            $value = self::validateValue($value);
             $value = self::validateHex($value);
-            $places = self::validatePlaces(Functions::flattenSingleValue($places));
+            $places = self::validatePlaces($places);
         } catch (Exception $e) {
             return $e->getMessage();
         }
@@ -138,7 +167,7 @@ public static function toOctal($value, $places = null): string
     protected static function validateHex(string $value): string
     {
         if (strlen($value) > preg_match_all('/[0123456789ABCDEF]/', $value)) {
-            throw new Exception(Functions::NAN());
+            throw new Exception(ExcelError::NAN());
         }
 
         return $value;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertOctal.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertOctal.php
index 1181e2ee19..5e3c12482e 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertOctal.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertOctal.php
@@ -3,7 +3,7 @@
 namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class ConvertOctal extends ConvertBase
 {
@@ -15,7 +15,7 @@ class ConvertOctal extends ConvertBase
      * Excel Function:
      *        OCT2BIN(x[,places])
      *
-     * @param string $value The octal number you want to convert. Number may not
+     * @param array|bool|float|int|string $value The octal number you want to convert. Number may not
      *                          contain more than 10 characters. The most significant
      *                          bit of number is the sign bit. The remaining 29 bits
      *                          are magnitude bits. Negative numbers are represented
@@ -28,7 +28,8 @@ class ConvertOctal extends ConvertBase
      *                          the #NUM! error value.
      *                      If OCT2BIN requires more than places characters, it
      *                          returns the #NUM! error value.
-     * @param int $places The number of characters to use. If places is omitted,
+     *                      Or can be an array of values
+     * @param array|int $places The number of characters to use. If places is omitted,
      *                          OCT2BIN uses the minimum number of characters necessary.
      *                          Places is useful for padding the return value with
      *                          leading 0s (zeros).
@@ -37,13 +38,22 @@ class ConvertOctal extends ConvertBase
      *                          error value.
      *                      If places is negative, OCT2BIN returns the #NUM! error
      *                          value.
+     *                      Or can be an array of values
+     *
+     * @return array|string Result, or an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function toBinary($value, $places = null): string
+    public static function toBinary($value, $places = null): array|string
     {
+        if (is_array($value) || is_array($places)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $places);
+        }
+
         try {
-            $value = self::validateValue(Functions::flattenSingleValue($value));
+            $value = self::validateValue($value);
             $value = self::validateOctal($value);
-            $places = self::validatePlaces(Functions::flattenSingleValue($places));
+            $places = self::validatePlaces($places);
         } catch (Exception $e) {
             return $e->getMessage();
         }
@@ -59,18 +69,27 @@ public static function toBinary($value, $places = null): string
      * Excel Function:
      *        OCT2DEC(x)
      *
-     * @param string $value The octal number you want to convert. Number may not contain
+     * @param array|bool|float|int|string $value The octal number you want to convert. Number may not contain
      *                          more than 10 octal characters (30 bits). The most significant
      *                          bit of number is the sign bit. The remaining 29 bits are
      *                          magnitude bits. Negative numbers are represented using
      *                          two's-complement notation.
      *                      If number is not a valid octal number, OCT2DEC returns the
      *                          #NUM! error value.
+     *                      Or can be an array of values
+     *
+     * @return array|string Result, or an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function toDecimal($value): string
+    public static function toDecimal($value)
     {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
         try {
-            $value = self::validateValue(Functions::flattenSingleValue($value));
+            $value = self::validateValue($value);
             $value = self::validateOctal($value);
         } catch (Exception $e) {
             return $e->getMessage();
@@ -99,7 +118,7 @@ public static function toDecimal($value): string
      * Excel Function:
      *        OCT2HEX(x[,places])
      *
-     * @param string $value The octal number you want to convert. Number may not contain
+     * @param array|bool|float|int|string $value The octal number you want to convert. Number may not contain
      *                          more than 10 octal characters (30 bits). The most significant
      *                          bit of number is the sign bit. The remaining 29 bits are
      *                          magnitude bits. Negative numbers are represented using
@@ -110,25 +129,35 @@ public static function toDecimal($value): string
      *                          #NUM! error value.
      *                      If OCT2HEX requires more than places characters, it returns
      *                          the #NUM! error value.
-     * @param int $places The number of characters to use. If places is omitted, OCT2HEX
+     *                      Or can be an array of values
+     * @param array|int $places The number of characters to use. If places is omitted, OCT2HEX
      *                          uses the minimum number of characters necessary. Places is useful
      *                          for padding the return value with leading 0s (zeros).
      *                      If places is not an integer, it is truncated.
      *                      If places is nonnumeric, OCT2HEX returns the #VALUE! error value.
      *                      If places is negative, OCT2HEX returns the #NUM! error value.
+     *                      Or can be an array of values
+     *
+     * @return array|string Result, or an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function toHex($value, $places = null): string
+    public static function toHex($value, $places = null): array|string
     {
+        if (is_array($value) || is_array($places)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $places);
+        }
+
         try {
-            $value = self::validateValue(Functions::flattenSingleValue($value));
+            $value = self::validateValue($value);
             $value = self::validateOctal($value);
-            $places = self::validatePlaces(Functions::flattenSingleValue($places));
+            $places = self::validatePlaces($places);
         } catch (Exception $e) {
             return $e->getMessage();
         }
 
         $hexVal = strtoupper(dechex((int) self::toDecimal($value)));
-        $hexVal = (PHP_INT_SIZE === 4 && strlen($value) === 10 && $value[0] >= '4') ? "FF$hexVal" : $hexVal;
+        $hexVal = (PHP_INT_SIZE === 4 && strlen($value) === 10 && $value[0] >= '4') ? "FF{$hexVal}" : $hexVal;
 
         return self::nbrConversionFormat($hexVal, $places);
     }
@@ -137,7 +166,7 @@ protected static function validateOctal(string $value): string
     {
         $numDigits = (int) preg_match_all('/[01234567]/', $value);
         if (strlen($value) > $numDigits || $numDigits > 10) {
-            throw new Exception(Functions::NAN());
+            throw new Exception(ExcelError::NAN());
         }
 
         return $value;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertUOM.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertUOM.php
index d169ae54bb..969c270ad3 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertUOM.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ConvertUOM.php
@@ -2,11 +2,14 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class ConvertUOM
 {
+    use ArrayEnabled;
+
     public const CATEGORY_WEIGHT_AND_MASS = 'Weight and Mass';
     public const CATEGORY_DISTANCE = 'Distance';
     public const CATEGORY_TIME = 'Time';
@@ -24,182 +27,183 @@ class ConvertUOM
     /**
      * Details of the Units of measure that can be used in CONVERTUOM().
      *
-     * @var mixed[]
+     * @var array<string, array{Group: string, UnitName: string, AllowPrefix: bool}>
      */
-    private static $conversionUnits = [
+    private static array $conversionUnits = [
         // Weight and Mass
-        'g' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'Unit Name' => 'Gram', 'AllowPrefix' => true],
-        'sg' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'Unit Name' => 'Slug', 'AllowPrefix' => false],
-        'lbm' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'Unit Name' => 'Pound mass (avoirdupois)', 'AllowPrefix' => false],
-        'u' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'Unit Name' => 'U (atomic mass unit)', 'AllowPrefix' => true],
-        'ozm' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'Unit Name' => 'Ounce mass (avoirdupois)', 'AllowPrefix' => false],
-        'grain' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'Unit Name' => 'Grain', 'AllowPrefix' => false],
-        'cwt' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'Unit Name' => 'U.S. (short) hundredweight', 'AllowPrefix' => false],
-        'shweight' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'Unit Name' => 'U.S. (short) hundredweight', 'AllowPrefix' => false],
-        'uk_cwt' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'Unit Name' => 'Imperial hundredweight', 'AllowPrefix' => false],
-        'lcwt' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'Unit Name' => 'Imperial hundredweight', 'AllowPrefix' => false],
-        'hweight' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'Unit Name' => 'Imperial hundredweight', 'AllowPrefix' => false],
-        'stone' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'Unit Name' => 'Stone', 'AllowPrefix' => false],
-        'ton' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'Unit Name' => 'Ton', 'AllowPrefix' => false],
-        'uk_ton' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'Unit Name' => 'Imperial ton', 'AllowPrefix' => false],
-        'LTON' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'Unit Name' => 'Imperial ton', 'AllowPrefix' => false],
-        'brton' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'Unit Name' => 'Imperial ton', 'AllowPrefix' => false],
+        'g' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'UnitName' => 'Gram', 'AllowPrefix' => true],
+        'sg' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'UnitName' => 'Slug', 'AllowPrefix' => false],
+        'lbm' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'UnitName' => 'Pound mass (avoirdupois)', 'AllowPrefix' => false],
+        'u' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'UnitName' => 'U (atomic mass unit)', 'AllowPrefix' => true],
+        'ozm' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'UnitName' => 'Ounce mass (avoirdupois)', 'AllowPrefix' => false],
+        'grain' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'UnitName' => 'Grain', 'AllowPrefix' => false],
+        'cwt' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'UnitName' => 'U.S. (short) hundredweight', 'AllowPrefix' => false],
+        'shweight' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'UnitName' => 'U.S. (short) hundredweight', 'AllowPrefix' => false],
+        'uk_cwt' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'UnitName' => 'Imperial hundredweight', 'AllowPrefix' => false],
+        'lcwt' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'UnitName' => 'Imperial hundredweight', 'AllowPrefix' => false],
+        'hweight' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'UnitName' => 'Imperial hundredweight', 'AllowPrefix' => false],
+        'stone' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'UnitName' => 'Stone', 'AllowPrefix' => false],
+        'ton' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'UnitName' => 'Ton', 'AllowPrefix' => false],
+        'uk_ton' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'UnitName' => 'Imperial ton', 'AllowPrefix' => false],
+        'LTON' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'UnitName' => 'Imperial ton', 'AllowPrefix' => false],
+        'brton' => ['Group' => self::CATEGORY_WEIGHT_AND_MASS, 'UnitName' => 'Imperial ton', 'AllowPrefix' => false],
         // Distance
-        'm' => ['Group' => self::CATEGORY_DISTANCE, 'Unit Name' => 'Meter', 'AllowPrefix' => true],
-        'mi' => ['Group' => self::CATEGORY_DISTANCE, 'Unit Name' => 'Statute mile', 'AllowPrefix' => false],
-        'Nmi' => ['Group' => self::CATEGORY_DISTANCE, 'Unit Name' => 'Nautical mile', 'AllowPrefix' => false],
-        'in' => ['Group' => self::CATEGORY_DISTANCE, 'Unit Name' => 'Inch', 'AllowPrefix' => false],
-        'ft' => ['Group' => self::CATEGORY_DISTANCE, 'Unit Name' => 'Foot', 'AllowPrefix' => false],
-        'yd' => ['Group' => self::CATEGORY_DISTANCE, 'Unit Name' => 'Yard', 'AllowPrefix' => false],
-        'ang' => ['Group' => self::CATEGORY_DISTANCE, 'Unit Name' => 'Angstrom', 'AllowPrefix' => true],
-        'ell' => ['Group' => self::CATEGORY_DISTANCE, 'Unit Name' => 'Ell', 'AllowPrefix' => false],
-        'ly' => ['Group' => self::CATEGORY_DISTANCE, 'Unit Name' => 'Light Year', 'AllowPrefix' => false],
-        'parsec' => ['Group' => self::CATEGORY_DISTANCE, 'Unit Name' => 'Parsec', 'AllowPrefix' => false],
-        'pc' => ['Group' => self::CATEGORY_DISTANCE, 'Unit Name' => 'Parsec', 'AllowPrefix' => false],
-        'Pica' => ['Group' => self::CATEGORY_DISTANCE, 'Unit Name' => 'Pica (1/72 in)', 'AllowPrefix' => false],
-        'Picapt' => ['Group' => self::CATEGORY_DISTANCE, 'Unit Name' => 'Pica (1/72 in)', 'AllowPrefix' => false],
-        'pica' => ['Group' => self::CATEGORY_DISTANCE, 'Unit Name' => 'Pica (1/6 in)', 'AllowPrefix' => false],
-        'survey_mi' => ['Group' => self::CATEGORY_DISTANCE, 'Unit Name' => 'U.S survey mile (statute mile)', 'AllowPrefix' => false],
+        'm' => ['Group' => self::CATEGORY_DISTANCE, 'UnitName' => 'Meter', 'AllowPrefix' => true],
+        'mi' => ['Group' => self::CATEGORY_DISTANCE, 'UnitName' => 'Statute mile', 'AllowPrefix' => false],
+        'Nmi' => ['Group' => self::CATEGORY_DISTANCE, 'UnitName' => 'Nautical mile', 'AllowPrefix' => false],
+        'in' => ['Group' => self::CATEGORY_DISTANCE, 'UnitName' => 'Inch', 'AllowPrefix' => false],
+        'ft' => ['Group' => self::CATEGORY_DISTANCE, 'UnitName' => 'Foot', 'AllowPrefix' => false],
+        'yd' => ['Group' => self::CATEGORY_DISTANCE, 'UnitName' => 'Yard', 'AllowPrefix' => false],
+        'ang' => ['Group' => self::CATEGORY_DISTANCE, 'UnitName' => 'Angstrom', 'AllowPrefix' => true],
+        'ell' => ['Group' => self::CATEGORY_DISTANCE, 'UnitName' => 'Ell', 'AllowPrefix' => false],
+        'ly' => ['Group' => self::CATEGORY_DISTANCE, 'UnitName' => 'Light Year', 'AllowPrefix' => false],
+        'parsec' => ['Group' => self::CATEGORY_DISTANCE, 'UnitName' => 'Parsec', 'AllowPrefix' => false],
+        'pc' => ['Group' => self::CATEGORY_DISTANCE, 'UnitName' => 'Parsec', 'AllowPrefix' => false],
+        'Pica' => ['Group' => self::CATEGORY_DISTANCE, 'UnitName' => 'Pica (1/72 in)', 'AllowPrefix' => false],
+        'Picapt' => ['Group' => self::CATEGORY_DISTANCE, 'UnitName' => 'Pica (1/72 in)', 'AllowPrefix' => false],
+        'pica' => ['Group' => self::CATEGORY_DISTANCE, 'UnitName' => 'Pica (1/6 in)', 'AllowPrefix' => false],
+        'survey_mi' => ['Group' => self::CATEGORY_DISTANCE, 'UnitName' => 'U.S survey mile (statute mile)', 'AllowPrefix' => false],
         // Time
-        'yr' => ['Group' => self::CATEGORY_TIME, 'Unit Name' => 'Year', 'AllowPrefix' => false],
-        'day' => ['Group' => self::CATEGORY_TIME, 'Unit Name' => 'Day', 'AllowPrefix' => false],
-        'd' => ['Group' => self::CATEGORY_TIME, 'Unit Name' => 'Day', 'AllowPrefix' => false],
-        'hr' => ['Group' => self::CATEGORY_TIME, 'Unit Name' => 'Hour', 'AllowPrefix' => false],
-        'mn' => ['Group' => self::CATEGORY_TIME, 'Unit Name' => 'Minute', 'AllowPrefix' => false],
-        'min' => ['Group' => self::CATEGORY_TIME, 'Unit Name' => 'Minute', 'AllowPrefix' => false],
-        'sec' => ['Group' => self::CATEGORY_TIME, 'Unit Name' => 'Second', 'AllowPrefix' => true],
-        's' => ['Group' => self::CATEGORY_TIME, 'Unit Name' => 'Second', 'AllowPrefix' => true],
+        'yr' => ['Group' => self::CATEGORY_TIME, 'UnitName' => 'Year', 'AllowPrefix' => false],
+        'day' => ['Group' => self::CATEGORY_TIME, 'UnitName' => 'Day', 'AllowPrefix' => false],
+        'd' => ['Group' => self::CATEGORY_TIME, 'UnitName' => 'Day', 'AllowPrefix' => false],
+        'hr' => ['Group' => self::CATEGORY_TIME, 'UnitName' => 'Hour', 'AllowPrefix' => false],
+        'mn' => ['Group' => self::CATEGORY_TIME, 'UnitName' => 'Minute', 'AllowPrefix' => false],
+        'min' => ['Group' => self::CATEGORY_TIME, 'UnitName' => 'Minute', 'AllowPrefix' => false],
+        'sec' => ['Group' => self::CATEGORY_TIME, 'UnitName' => 'Second', 'AllowPrefix' => true],
+        's' => ['Group' => self::CATEGORY_TIME, 'UnitName' => 'Second', 'AllowPrefix' => true],
         // Pressure
-        'Pa' => ['Group' => self::CATEGORY_PRESSURE, 'Unit Name' => 'Pascal', 'AllowPrefix' => true],
-        'p' => ['Group' => self::CATEGORY_PRESSURE, 'Unit Name' => 'Pascal', 'AllowPrefix' => true],
-        'atm' => ['Group' => self::CATEGORY_PRESSURE, 'Unit Name' => 'Atmosphere', 'AllowPrefix' => true],
-        'at' => ['Group' => self::CATEGORY_PRESSURE, 'Unit Name' => 'Atmosphere', 'AllowPrefix' => true],
-        'mmHg' => ['Group' => self::CATEGORY_PRESSURE, 'Unit Name' => 'mm of Mercury', 'AllowPrefix' => true],
-        'psi' => ['Group' => self::CATEGORY_PRESSURE, 'Unit Name' => 'PSI', 'AllowPrefix' => true],
-        'Torr' => ['Group' => self::CATEGORY_PRESSURE, 'Unit Name' => 'Torr', 'AllowPrefix' => true],
+        'Pa' => ['Group' => self::CATEGORY_PRESSURE, 'UnitName' => 'Pascal', 'AllowPrefix' => true],
+        'p' => ['Group' => self::CATEGORY_PRESSURE, 'UnitName' => 'Pascal', 'AllowPrefix' => true],
+        'atm' => ['Group' => self::CATEGORY_PRESSURE, 'UnitName' => 'Atmosphere', 'AllowPrefix' => true],
+        'at' => ['Group' => self::CATEGORY_PRESSURE, 'UnitName' => 'Atmosphere', 'AllowPrefix' => true],
+        'mmHg' => ['Group' => self::CATEGORY_PRESSURE, 'UnitName' => 'mm of Mercury', 'AllowPrefix' => true],
+        'psi' => ['Group' => self::CATEGORY_PRESSURE, 'UnitName' => 'PSI', 'AllowPrefix' => true],
+        'Torr' => ['Group' => self::CATEGORY_PRESSURE, 'UnitName' => 'Torr', 'AllowPrefix' => true],
         // Force
-        'N' => ['Group' => self::CATEGORY_FORCE, 'Unit Name' => 'Newton', 'AllowPrefix' => true],
-        'dyn' => ['Group' => self::CATEGORY_FORCE, 'Unit Name' => 'Dyne', 'AllowPrefix' => true],
-        'dy' => ['Group' => self::CATEGORY_FORCE, 'Unit Name' => 'Dyne', 'AllowPrefix' => true],
-        'lbf' => ['Group' => self::CATEGORY_FORCE, 'Unit Name' => 'Pound force', 'AllowPrefix' => false],
-        'pond' => ['Group' => self::CATEGORY_FORCE, 'Unit Name' => 'Pond', 'AllowPrefix' => true],
+        'N' => ['Group' => self::CATEGORY_FORCE, 'UnitName' => 'Newton', 'AllowPrefix' => true],
+        'dyn' => ['Group' => self::CATEGORY_FORCE, 'UnitName' => 'Dyne', 'AllowPrefix' => true],
+        'dy' => ['Group' => self::CATEGORY_FORCE, 'UnitName' => 'Dyne', 'AllowPrefix' => true],
+        'lbf' => ['Group' => self::CATEGORY_FORCE, 'UnitName' => 'Pound force', 'AllowPrefix' => false],
+        'pond' => ['Group' => self::CATEGORY_FORCE, 'UnitName' => 'Pond', 'AllowPrefix' => true],
         // Energy
-        'J' => ['Group' => self::CATEGORY_ENERGY, 'Unit Name' => 'Joule', 'AllowPrefix' => true],
-        'e' => ['Group' => self::CATEGORY_ENERGY, 'Unit Name' => 'Erg', 'AllowPrefix' => true],
-        'c' => ['Group' => self::CATEGORY_ENERGY, 'Unit Name' => 'Thermodynamic calorie', 'AllowPrefix' => true],
-        'cal' => ['Group' => self::CATEGORY_ENERGY, 'Unit Name' => 'IT calorie', 'AllowPrefix' => true],
-        'eV' => ['Group' => self::CATEGORY_ENERGY, 'Unit Name' => 'Electron volt', 'AllowPrefix' => true],
-        'ev' => ['Group' => self::CATEGORY_ENERGY, 'Unit Name' => 'Electron volt', 'AllowPrefix' => true],
-        'HPh' => ['Group' => self::CATEGORY_ENERGY, 'Unit Name' => 'Horsepower-hour', 'AllowPrefix' => false],
-        'hh' => ['Group' => self::CATEGORY_ENERGY, 'Unit Name' => 'Horsepower-hour', 'AllowPrefix' => false],
-        'Wh' => ['Group' => self::CATEGORY_ENERGY, 'Unit Name' => 'Watt-hour', 'AllowPrefix' => true],
-        'wh' => ['Group' => self::CATEGORY_ENERGY, 'Unit Name' => 'Watt-hour', 'AllowPrefix' => true],
-        'flb' => ['Group' => self::CATEGORY_ENERGY, 'Unit Name' => 'Foot-pound', 'AllowPrefix' => false],
-        'BTU' => ['Group' => self::CATEGORY_ENERGY, 'Unit Name' => 'BTU', 'AllowPrefix' => false],
-        'btu' => ['Group' => self::CATEGORY_ENERGY, 'Unit Name' => 'BTU', 'AllowPrefix' => false],
+        'J' => ['Group' => self::CATEGORY_ENERGY, 'UnitName' => 'Joule', 'AllowPrefix' => true],
+        'e' => ['Group' => self::CATEGORY_ENERGY, 'UnitName' => 'Erg', 'AllowPrefix' => true],
+        'c' => ['Group' => self::CATEGORY_ENERGY, 'UnitName' => 'Thermodynamic calorie', 'AllowPrefix' => true],
+        'cal' => ['Group' => self::CATEGORY_ENERGY, 'UnitName' => 'IT calorie', 'AllowPrefix' => true],
+        'eV' => ['Group' => self::CATEGORY_ENERGY, 'UnitName' => 'Electron volt', 'AllowPrefix' => true],
+        'ev' => ['Group' => self::CATEGORY_ENERGY, 'UnitName' => 'Electron volt', 'AllowPrefix' => true],
+        'HPh' => ['Group' => self::CATEGORY_ENERGY, 'UnitName' => 'Horsepower-hour', 'AllowPrefix' => false],
+        'hh' => ['Group' => self::CATEGORY_ENERGY, 'UnitName' => 'Horsepower-hour', 'AllowPrefix' => false],
+        'Wh' => ['Group' => self::CATEGORY_ENERGY, 'UnitName' => 'Watt-hour', 'AllowPrefix' => true],
+        'wh' => ['Group' => self::CATEGORY_ENERGY, 'UnitName' => 'Watt-hour', 'AllowPrefix' => true],
+        'flb' => ['Group' => self::CATEGORY_ENERGY, 'UnitName' => 'Foot-pound', 'AllowPrefix' => false],
+        'BTU' => ['Group' => self::CATEGORY_ENERGY, 'UnitName' => 'BTU', 'AllowPrefix' => false],
+        'btu' => ['Group' => self::CATEGORY_ENERGY, 'UnitName' => 'BTU', 'AllowPrefix' => false],
         // Power
-        'HP' => ['Group' => self::CATEGORY_POWER, 'Unit Name' => 'Horsepower', 'AllowPrefix' => false],
-        'h' => ['Group' => self::CATEGORY_POWER, 'Unit Name' => 'Horsepower', 'AllowPrefix' => false],
-        'W' => ['Group' => self::CATEGORY_POWER, 'Unit Name' => 'Watt', 'AllowPrefix' => true],
-        'w' => ['Group' => self::CATEGORY_POWER, 'Unit Name' => 'Watt', 'AllowPrefix' => true],
-        'PS' => ['Group' => self::CATEGORY_POWER, 'Unit Name' => 'Pferdestärke', 'AllowPrefix' => false],
-        'T' => ['Group' => self::CATEGORY_MAGNETISM, 'Unit Name' => 'Tesla', 'AllowPrefix' => true],
-        'ga' => ['Group' => self::CATEGORY_MAGNETISM, 'Unit Name' => 'Gauss', 'AllowPrefix' => true],
+        'HP' => ['Group' => self::CATEGORY_POWER, 'UnitName' => 'Horsepower', 'AllowPrefix' => false],
+        'h' => ['Group' => self::CATEGORY_POWER, 'UnitName' => 'Horsepower', 'AllowPrefix' => false],
+        'W' => ['Group' => self::CATEGORY_POWER, 'UnitName' => 'Watt', 'AllowPrefix' => true],
+        'w' => ['Group' => self::CATEGORY_POWER, 'UnitName' => 'Watt', 'AllowPrefix' => true],
+        'PS' => ['Group' => self::CATEGORY_POWER, 'UnitName' => 'Pferdestärke', 'AllowPrefix' => false],
+        // Magnetism
+        'T' => ['Group' => self::CATEGORY_MAGNETISM, 'UnitName' => 'Tesla', 'AllowPrefix' => true],
+        'ga' => ['Group' => self::CATEGORY_MAGNETISM, 'UnitName' => 'Gauss', 'AllowPrefix' => true],
         // Temperature
-        'C' => ['Group' => self::CATEGORY_TEMPERATURE, 'Unit Name' => 'Degrees Celsius', 'AllowPrefix' => false],
-        'cel' => ['Group' => self::CATEGORY_TEMPERATURE, 'Unit Name' => 'Degrees Celsius', 'AllowPrefix' => false],
-        'F' => ['Group' => self::CATEGORY_TEMPERATURE, 'Unit Name' => 'Degrees Fahrenheit', 'AllowPrefix' => false],
-        'fah' => ['Group' => self::CATEGORY_TEMPERATURE, 'Unit Name' => 'Degrees Fahrenheit', 'AllowPrefix' => false],
-        'K' => ['Group' => self::CATEGORY_TEMPERATURE, 'Unit Name' => 'Kelvin', 'AllowPrefix' => false],
-        'kel' => ['Group' => self::CATEGORY_TEMPERATURE, 'Unit Name' => 'Kelvin', 'AllowPrefix' => false],
-        'Rank' => ['Group' => self::CATEGORY_TEMPERATURE, 'Unit Name' => 'Degrees Rankine', 'AllowPrefix' => false],
-        'Reau' => ['Group' => self::CATEGORY_TEMPERATURE, 'Unit Name' => 'Degrees Réaumur', 'AllowPrefix' => false],
+        'C' => ['Group' => self::CATEGORY_TEMPERATURE, 'UnitName' => 'Degrees Celsius', 'AllowPrefix' => false],
+        'cel' => ['Group' => self::CATEGORY_TEMPERATURE, 'UnitName' => 'Degrees Celsius', 'AllowPrefix' => false],
+        'F' => ['Group' => self::CATEGORY_TEMPERATURE, 'UnitName' => 'Degrees Fahrenheit', 'AllowPrefix' => false],
+        'fah' => ['Group' => self::CATEGORY_TEMPERATURE, 'UnitName' => 'Degrees Fahrenheit', 'AllowPrefix' => false],
+        'K' => ['Group' => self::CATEGORY_TEMPERATURE, 'UnitName' => 'Kelvin', 'AllowPrefix' => false],
+        'kel' => ['Group' => self::CATEGORY_TEMPERATURE, 'UnitName' => 'Kelvin', 'AllowPrefix' => false],
+        'Rank' => ['Group' => self::CATEGORY_TEMPERATURE, 'UnitName' => 'Degrees Rankine', 'AllowPrefix' => false],
+        'Reau' => ['Group' => self::CATEGORY_TEMPERATURE, 'UnitName' => 'Degrees Réaumur', 'AllowPrefix' => false],
         // Volume
-        'l' => ['Group' => self::CATEGORY_VOLUME, 'Unit Name' => 'Litre', 'AllowPrefix' => true],
-        'L' => ['Group' => self::CATEGORY_VOLUME, 'Unit Name' => 'Litre', 'AllowPrefix' => true],
-        'lt' => ['Group' => self::CATEGORY_VOLUME, 'Unit Name' => 'Litre', 'AllowPrefix' => true],
-        'tsp' => ['Group' => self::CATEGORY_VOLUME, 'Unit Name' => 'Teaspoon', 'AllowPrefix' => false],
-        'tspm' => ['Group' => self::CATEGORY_VOLUME, 'Unit Name' => 'Modern Teaspoon', 'AllowPrefix' => false],
-        'tbs' => ['Group' => self::CATEGORY_VOLUME, 'Unit Name' => 'Tablespoon', 'AllowPrefix' => false],
-        'oz' => ['Group' => self::CATEGORY_VOLUME, 'Unit Name' => 'Fluid Ounce', 'AllowPrefix' => false],
-        'cup' => ['Group' => self::CATEGORY_VOLUME, 'Unit Name' => 'Cup', 'AllowPrefix' => false],
-        'pt' => ['Group' => self::CATEGORY_VOLUME, 'Unit Name' => 'U.S. Pint', 'AllowPrefix' => false],
-        'us_pt' => ['Group' => self::CATEGORY_VOLUME, 'Unit Name' => 'U.S. Pint', 'AllowPrefix' => false],
-        'uk_pt' => ['Group' => self::CATEGORY_VOLUME, 'Unit Name' => 'U.K. Pint', 'AllowPrefix' => false],
-        'qt' => ['Group' => self::CATEGORY_VOLUME, 'Unit Name' => 'Quart', 'AllowPrefix' => false],
-        'uk_qt' => ['Group' => self::CATEGORY_VOLUME, 'Unit Name' => 'Imperial Quart (UK)', 'AllowPrefix' => false],
-        'gal' => ['Group' => self::CATEGORY_VOLUME, 'Unit Name' => 'Gallon', 'AllowPrefix' => false],
-        'uk_gal' => ['Group' => self::CATEGORY_VOLUME, 'Unit Name' => 'Imperial Gallon (UK)', 'AllowPrefix' => false],
-        'ang3' => ['Group' => self::CATEGORY_VOLUME, 'Unit Name' => 'Cubic Angstrom', 'AllowPrefix' => true],
-        'ang^3' => ['Group' => self::CATEGORY_VOLUME, 'Unit Name' => 'Cubic Angstrom', 'AllowPrefix' => true],
-        'barrel' => ['Group' => self::CATEGORY_VOLUME, 'Unit Name' => 'US Oil Barrel', 'AllowPrefix' => false],
-        'bushel' => ['Group' => self::CATEGORY_VOLUME, 'Unit Name' => 'US Bushel', 'AllowPrefix' => false],
-        'in3' => ['Group' => self::CATEGORY_VOLUME, 'Unit Name' => 'Cubic Inch', 'AllowPrefix' => false],
-        'in^3' => ['Group' => self::CATEGORY_VOLUME, 'Unit Name' => 'Cubic Inch', 'AllowPrefix' => false],
-        'ft3' => ['Group' => self::CATEGORY_VOLUME, 'Unit Name' => 'Cubic Foot', 'AllowPrefix' => false],
-        'ft^3' => ['Group' => self::CATEGORY_VOLUME, 'Unit Name' => 'Cubic Foot', 'AllowPrefix' => false],
-        'ly3' => ['Group' => self::CATEGORY_VOLUME, 'Unit Name' => 'Cubic Light Year', 'AllowPrefix' => false],
-        'ly^3' => ['Group' => self::CATEGORY_VOLUME, 'Unit Name' => 'Cubic Light Year', 'AllowPrefix' => false],
-        'm3' => ['Group' => self::CATEGORY_VOLUME, 'Unit Name' => 'Cubic Meter', 'AllowPrefix' => true],
-        'm^3' => ['Group' => self::CATEGORY_VOLUME, 'Unit Name' => 'Cubic Meter', 'AllowPrefix' => true],
-        'mi3' => ['Group' => self::CATEGORY_VOLUME, 'Unit Name' => 'Cubic Mile', 'AllowPrefix' => false],
-        'mi^3' => ['Group' => self::CATEGORY_VOLUME, 'Unit Name' => 'Cubic Mile', 'AllowPrefix' => false],
-        'yd3' => ['Group' => self::CATEGORY_VOLUME, 'Unit Name' => 'Cubic Yard', 'AllowPrefix' => false],
-        'yd^3' => ['Group' => self::CATEGORY_VOLUME, 'Unit Name' => 'Cubic Yard', 'AllowPrefix' => false],
-        'Nmi3' => ['Group' => self::CATEGORY_VOLUME, 'Unit Name' => 'Cubic Nautical Mile', 'AllowPrefix' => false],
-        'Nmi^3' => ['Group' => self::CATEGORY_VOLUME, 'Unit Name' => 'Cubic Nautical Mile', 'AllowPrefix' => false],
-        'Pica3' => ['Group' => self::CATEGORY_VOLUME, 'Unit Name' => 'Cubic Pica', 'AllowPrefix' => false],
-        'Pica^3' => ['Group' => self::CATEGORY_VOLUME, 'Unit Name' => 'Cubic Pica', 'AllowPrefix' => false],
-        'Picapt3' => ['Group' => self::CATEGORY_VOLUME, 'Unit Name' => 'Cubic Pica', 'AllowPrefix' => false],
-        'Picapt^3' => ['Group' => self::CATEGORY_VOLUME, 'Unit Name' => 'Cubic Pica', 'AllowPrefix' => false],
-        'GRT' => ['Group' => self::CATEGORY_VOLUME, 'Unit Name' => 'Gross Registered Ton', 'AllowPrefix' => false],
-        'regton' => ['Group' => self::CATEGORY_VOLUME, 'Unit Name' => 'Gross Registered Ton', 'AllowPrefix' => false],
-        'MTON' => ['Group' => self::CATEGORY_VOLUME, 'Unit Name' => 'Measurement Ton (Freight Ton)', 'AllowPrefix' => false],
+        'l' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Litre', 'AllowPrefix' => true],
+        'L' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Litre', 'AllowPrefix' => true],
+        'lt' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Litre', 'AllowPrefix' => true],
+        'tsp' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Teaspoon', 'AllowPrefix' => false],
+        'tspm' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Modern Teaspoon', 'AllowPrefix' => false],
+        'tbs' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Tablespoon', 'AllowPrefix' => false],
+        'oz' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Fluid Ounce', 'AllowPrefix' => false],
+        'cup' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Cup', 'AllowPrefix' => false],
+        'pt' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'U.S. Pint', 'AllowPrefix' => false],
+        'us_pt' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'U.S. Pint', 'AllowPrefix' => false],
+        'uk_pt' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'U.K. Pint', 'AllowPrefix' => false],
+        'qt' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Quart', 'AllowPrefix' => false],
+        'uk_qt' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Imperial Quart (UK)', 'AllowPrefix' => false],
+        'gal' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Gallon', 'AllowPrefix' => false],
+        'uk_gal' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Imperial Gallon (UK)', 'AllowPrefix' => false],
+        'ang3' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Cubic Angstrom', 'AllowPrefix' => true],
+        'ang^3' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Cubic Angstrom', 'AllowPrefix' => true],
+        'barrel' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'US Oil Barrel', 'AllowPrefix' => false],
+        'bushel' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'US Bushel', 'AllowPrefix' => false],
+        'in3' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Cubic Inch', 'AllowPrefix' => false],
+        'in^3' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Cubic Inch', 'AllowPrefix' => false],
+        'ft3' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Cubic Foot', 'AllowPrefix' => false],
+        'ft^3' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Cubic Foot', 'AllowPrefix' => false],
+        'ly3' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Cubic Light Year', 'AllowPrefix' => false],
+        'ly^3' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Cubic Light Year', 'AllowPrefix' => false],
+        'm3' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Cubic Meter', 'AllowPrefix' => true],
+        'm^3' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Cubic Meter', 'AllowPrefix' => true],
+        'mi3' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Cubic Mile', 'AllowPrefix' => false],
+        'mi^3' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Cubic Mile', 'AllowPrefix' => false],
+        'yd3' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Cubic Yard', 'AllowPrefix' => false],
+        'yd^3' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Cubic Yard', 'AllowPrefix' => false],
+        'Nmi3' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Cubic Nautical Mile', 'AllowPrefix' => false],
+        'Nmi^3' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Cubic Nautical Mile', 'AllowPrefix' => false],
+        'Pica3' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Cubic Pica', 'AllowPrefix' => false],
+        'Pica^3' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Cubic Pica', 'AllowPrefix' => false],
+        'Picapt3' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Cubic Pica', 'AllowPrefix' => false],
+        'Picapt^3' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Cubic Pica', 'AllowPrefix' => false],
+        'GRT' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Gross Registered Ton', 'AllowPrefix' => false],
+        'regton' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Gross Registered Ton', 'AllowPrefix' => false],
+        'MTON' => ['Group' => self::CATEGORY_VOLUME, 'UnitName' => 'Measurement Ton (Freight Ton)', 'AllowPrefix' => false],
         // Area
-        'ha' => ['Group' => self::CATEGORY_AREA, 'Unit Name' => 'Hectare', 'AllowPrefix' => true],
-        'uk_acre' => ['Group' => self::CATEGORY_AREA, 'Unit Name' => 'International Acre', 'AllowPrefix' => false],
-        'us_acre' => ['Group' => self::CATEGORY_AREA, 'Unit Name' => 'US Survey/Statute Acre', 'AllowPrefix' => false],
-        'ang2' => ['Group' => self::CATEGORY_AREA, 'Unit Name' => 'Square Angstrom', 'AllowPrefix' => true],
-        'ang^2' => ['Group' => self::CATEGORY_AREA, 'Unit Name' => 'Square Angstrom', 'AllowPrefix' => true],
-        'ar' => ['Group' => self::CATEGORY_AREA, 'Unit Name' => 'Are', 'AllowPrefix' => true],
-        'ft2' => ['Group' => self::CATEGORY_AREA, 'Unit Name' => 'Square Feet', 'AllowPrefix' => false],
-        'ft^2' => ['Group' => self::CATEGORY_AREA, 'Unit Name' => 'Square Feet', 'AllowPrefix' => false],
-        'in2' => ['Group' => self::CATEGORY_AREA, 'Unit Name' => 'Square Inches', 'AllowPrefix' => false],
-        'in^2' => ['Group' => self::CATEGORY_AREA, 'Unit Name' => 'Square Inches', 'AllowPrefix' => false],
-        'ly2' => ['Group' => self::CATEGORY_AREA, 'Unit Name' => 'Square Light Years', 'AllowPrefix' => false],
-        'ly^2' => ['Group' => self::CATEGORY_AREA, 'Unit Name' => 'Square Light Years', 'AllowPrefix' => false],
-        'm2' => ['Group' => self::CATEGORY_AREA, 'Unit Name' => 'Square Meters', 'AllowPrefix' => true],
-        'm^2' => ['Group' => self::CATEGORY_AREA, 'Unit Name' => 'Square Meters', 'AllowPrefix' => true],
-        'Morgen' => ['Group' => self::CATEGORY_AREA, 'Unit Name' => 'Morgen', 'AllowPrefix' => false],
-        'mi2' => ['Group' => self::CATEGORY_AREA, 'Unit Name' => 'Square Miles', 'AllowPrefix' => false],
-        'mi^2' => ['Group' => self::CATEGORY_AREA, 'Unit Name' => 'Square Miles', 'AllowPrefix' => false],
-        'Nmi2' => ['Group' => self::CATEGORY_AREA, 'Unit Name' => 'Square Nautical Miles', 'AllowPrefix' => false],
-        'Nmi^2' => ['Group' => self::CATEGORY_AREA, 'Unit Name' => 'Square Nautical Miles', 'AllowPrefix' => false],
-        'Pica2' => ['Group' => self::CATEGORY_AREA, 'Unit Name' => 'Square Pica', 'AllowPrefix' => false],
-        'Pica^2' => ['Group' => self::CATEGORY_AREA, 'Unit Name' => 'Square Pica', 'AllowPrefix' => false],
-        'Picapt2' => ['Group' => self::CATEGORY_AREA, 'Unit Name' => 'Square Pica', 'AllowPrefix' => false],
-        'Picapt^2' => ['Group' => self::CATEGORY_AREA, 'Unit Name' => 'Square Pica', 'AllowPrefix' => false],
-        'yd2' => ['Group' => self::CATEGORY_AREA, 'Unit Name' => 'Square Yards', 'AllowPrefix' => false],
-        'yd^2' => ['Group' => self::CATEGORY_AREA, 'Unit Name' => 'Square Yards', 'AllowPrefix' => false],
+        'ha' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Hectare', 'AllowPrefix' => true],
+        'uk_acre' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'International Acre', 'AllowPrefix' => false],
+        'us_acre' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'US Survey/Statute Acre', 'AllowPrefix' => false],
+        'ang2' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Square Angstrom', 'AllowPrefix' => true],
+        'ang^2' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Square Angstrom', 'AllowPrefix' => true],
+        'ar' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Are', 'AllowPrefix' => true],
+        'ft2' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Square Feet', 'AllowPrefix' => false],
+        'ft^2' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Square Feet', 'AllowPrefix' => false],
+        'in2' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Square Inches', 'AllowPrefix' => false],
+        'in^2' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Square Inches', 'AllowPrefix' => false],
+        'ly2' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Square Light Years', 'AllowPrefix' => false],
+        'ly^2' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Square Light Years', 'AllowPrefix' => false],
+        'm2' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Square Meters', 'AllowPrefix' => true],
+        'm^2' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Square Meters', 'AllowPrefix' => true],
+        'Morgen' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Morgen', 'AllowPrefix' => false],
+        'mi2' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Square Miles', 'AllowPrefix' => false],
+        'mi^2' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Square Miles', 'AllowPrefix' => false],
+        'Nmi2' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Square Nautical Miles', 'AllowPrefix' => false],
+        'Nmi^2' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Square Nautical Miles', 'AllowPrefix' => false],
+        'Pica2' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Square Pica', 'AllowPrefix' => false],
+        'Pica^2' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Square Pica', 'AllowPrefix' => false],
+        'Picapt2' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Square Pica', 'AllowPrefix' => false],
+        'Picapt^2' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Square Pica', 'AllowPrefix' => false],
+        'yd2' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Square Yards', 'AllowPrefix' => false],
+        'yd^2' => ['Group' => self::CATEGORY_AREA, 'UnitName' => 'Square Yards', 'AllowPrefix' => false],
         // Information
-        'byte' => ['Group' => self::CATEGORY_INFORMATION, 'Unit Name' => 'Byte', 'AllowPrefix' => true],
-        'bit' => ['Group' => self::CATEGORY_INFORMATION, 'Unit Name' => 'Bit', 'AllowPrefix' => true],
+        'byte' => ['Group' => self::CATEGORY_INFORMATION, 'UnitName' => 'Byte', 'AllowPrefix' => true],
+        'bit' => ['Group' => self::CATEGORY_INFORMATION, 'UnitName' => 'Bit', 'AllowPrefix' => true],
         // Speed
-        'm/s' => ['Group' => self::CATEGORY_SPEED, 'Unit Name' => 'Meters per second', 'AllowPrefix' => true],
-        'm/sec' => ['Group' => self::CATEGORY_SPEED, 'Unit Name' => 'Meters per second', 'AllowPrefix' => true],
-        'm/h' => ['Group' => self::CATEGORY_SPEED, 'Unit Name' => 'Meters per hour', 'AllowPrefix' => true],
-        'm/hr' => ['Group' => self::CATEGORY_SPEED, 'Unit Name' => 'Meters per hour', 'AllowPrefix' => true],
-        'mph' => ['Group' => self::CATEGORY_SPEED, 'Unit Name' => 'Miles per hour', 'AllowPrefix' => false],
-        'admkn' => ['Group' => self::CATEGORY_SPEED, 'Unit Name' => 'Admiralty Knot', 'AllowPrefix' => false],
-        'kn' => ['Group' => self::CATEGORY_SPEED, 'Unit Name' => 'Knot', 'AllowPrefix' => false],
+        'm/s' => ['Group' => self::CATEGORY_SPEED, 'UnitName' => 'Meters per second', 'AllowPrefix' => true],
+        'm/sec' => ['Group' => self::CATEGORY_SPEED, 'UnitName' => 'Meters per second', 'AllowPrefix' => true],
+        'm/h' => ['Group' => self::CATEGORY_SPEED, 'UnitName' => 'Meters per hour', 'AllowPrefix' => true],
+        'm/hr' => ['Group' => self::CATEGORY_SPEED, 'UnitName' => 'Meters per hour', 'AllowPrefix' => true],
+        'mph' => ['Group' => self::CATEGORY_SPEED, 'UnitName' => 'Miles per hour', 'AllowPrefix' => false],
+        'admkn' => ['Group' => self::CATEGORY_SPEED, 'UnitName' => 'Admiralty Knot', 'AllowPrefix' => false],
+        'kn' => ['Group' => self::CATEGORY_SPEED, 'UnitName' => 'Knot', 'AllowPrefix' => false],
     ];
 
     /**
      * Details of the Multiplier prefixes that can be used with Units of Measure in CONVERTUOM().
      *
-     * @var mixed[]
+     * @var array<string, array{multiplier: float, name: string}>
      */
-    private static $conversionMultipliers = [
+    private static array $conversionMultipliers = [
         'Y' => ['multiplier' => 1E24, 'name' => 'yotta'],
         'Z' => ['multiplier' => 1E21, 'name' => 'zetta'],
         'E' => ['multiplier' => 1E18, 'name' => 'exa'],
@@ -226,9 +230,9 @@ class ConvertUOM
     /**
      * Details of the Multiplier prefixes that can be used with Units of Measure in CONVERTUOM().
      *
-     * @var mixed[]
+     ** @var array<string, array{multiplier: float|int, name: string}>
      */
-    private static $binaryConversionMultipliers = [
+    private static array $binaryConversionMultipliers = [
         'Yi' => ['multiplier' => 2 ** 80, 'name' => 'yobi'],
         'Zi' => ['multiplier' => 2 ** 70, 'name' => 'zebi'],
         'Ei' => ['multiplier' => 2 ** 60, 'name' => 'exbi'],
@@ -242,9 +246,9 @@ class ConvertUOM
     /**
      * Details of the Units of measure conversion factors, organised by group.
      *
-     * @var mixed[]
+     * @var array<string, array<string, float>>
      */
-    private static $unitConversions = [
+    private static array $unitConversions = [
         // Conversion uses gram (g) as an intermediate unit
         self::CATEGORY_WEIGHT_AND_MASS => [
             'g' => 1.0,
@@ -431,10 +435,8 @@ class ConvertUOM
     /**
      *    getConversionGroups
      * Returns a list of the different conversion groups for UOM conversions.
-     *
-     * @return array
      */
-    public static function getConversionCategories()
+    public static function getConversionCategories(): array
     {
         $conversionGroups = [];
         foreach (self::$conversionUnits as $conversionUnit) {
@@ -448,11 +450,9 @@ public static function getConversionCategories()
      *    getConversionGroupUnits
      * Returns an array of units of measure, for a specified conversion group, or for all groups.
      *
-     * @param string $category The group whose units of measure you want to retrieve
-     *
-     * @return array
+     * @param ?string $category The group whose units of measure you want to retrieve
      */
-    public static function getConversionCategoryUnits($category = null)
+    public static function getConversionCategoryUnits(?string $category = null): array
     {
         $conversionGroups = [];
         foreach (self::$conversionUnits as $conversionUnit => $conversionGroup) {
@@ -467,18 +467,16 @@ public static function getConversionCategoryUnits($category = null)
     /**
      * getConversionGroupUnitDetails.
      *
-     * @param string $category The group whose units of measure you want to retrieve
-     *
-     * @return array
+     * @param ?string $category The group whose units of measure you want to retrieve
      */
-    public static function getConversionCategoryUnitDetails($category = null)
+    public static function getConversionCategoryUnitDetails(?string $category = null): array
     {
         $conversionGroups = [];
         foreach (self::$conversionUnits as $conversionUnit => $conversionGroup) {
             if (($category === null) || ($conversionGroup['Group'] == $category)) {
                 $conversionGroups[$conversionGroup['Group']][] = [
                     'unit' => $conversionUnit,
-                    'description' => $conversionGroup['Unit Name'],
+                    'description' => $conversionGroup['UnitName'],
                 ];
             }
         }
@@ -492,7 +490,7 @@ public static function getConversionCategoryUnitDetails($category = null)
      *
      * @return mixed[]
      */
-    public static function getConversionMultipliers()
+    public static function getConversionMultipliers(): array
     {
         return self::$conversionMultipliers;
     }
@@ -503,7 +501,7 @@ public static function getConversionMultipliers()
      *
      * @return mixed[]
      */
-    public static function getBinaryConversionMultipliers()
+    public static function getBinaryConversionMultipliers(): array
     {
         return self::$binaryConversionMultipliers;
     }
@@ -518,33 +516,39 @@ public static function getBinaryConversionMultipliers()
      *    Excel Function:
      *        CONVERT(value,fromUOM,toUOM)
      *
-     * @param float|int $value the value in fromUOM to convert
-     * @param string $fromUOM the units for value
-     * @param string $toUOM the units for the result
+     * @param array|float|int|string $value the value in fromUOM to convert
+     *                      Or can be an array of values
+     * @param array|string $fromUOM the units for value
+     *                      Or can be an array of values
+     * @param array|string $toUOM the units for the result
+     *                      Or can be an array of values
      *
-     * @return float|string
+     * @return array|float|string Result, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
     public static function CONVERT($value, $fromUOM, $toUOM)
     {
-        $value = Functions::flattenSingleValue($value);
-        $fromUOM = Functions::flattenSingleValue($fromUOM);
-        $toUOM = Functions::flattenSingleValue($toUOM);
+        if (is_array($value) || is_array($fromUOM) || is_array($toUOM)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $fromUOM, $toUOM);
+        }
 
         if (!is_numeric($value)) {
-            return Functions::VALUE();
+            return ExcelError::VALUE();
         }
 
         try {
             [$fromUOM, $fromCategory, $fromMultiplier] = self::getUOMDetails($fromUOM);
             [$toUOM, $toCategory, $toMultiplier] = self::getUOMDetails($toUOM);
-        } catch (Exception $e) {
-            return Functions::NA();
+        } catch (Exception) {
+            return ExcelError::NA();
         }
 
         if ($fromCategory !== $toCategory) {
-            return Functions::NA();
+            return ExcelError::NA();
         }
 
+        // @var float $value
         $value *= $fromMultiplier;
 
         if (($fromUOM === $toUOM) && ($fromMultiplier === $toMultiplier)) {
@@ -562,7 +566,7 @@ public static function CONVERT($value, $fromUOM, $toUOM)
         return ($baseValue * self::$unitConversions[$fromCategory][$toUOM]) / $toMultiplier;
     }
 
-    private static function getUOMDetails(string $uom)
+    private static function getUOMDetails(string $uom): array
     {
         if (isset(self::$conversionUnits[$uom])) {
             $unitCategory = self::$conversionUnits[$uom]['Group'];
@@ -611,12 +615,7 @@ private static function getUOMDetails(string $uom)
         throw new Exception('UoM Not Found');
     }
 
-    /**
-     * @param float|int $value
-     *
-     * @return float|int
-     */
-    protected static function convertTemperature(string $fromUOM, string $toUOM, $value)
+    protected static function convertTemperature(string $fromUOM, string $toUOM, float|int $value): float|int
     {
         $fromUOM = self::resolveTemperatureSynonyms($fromUOM);
         $toUOM = self::resolveTemperatureSynonyms($toUOM);
@@ -668,17 +667,13 @@ protected static function convertTemperature(string $fromUOM, string $toUOM, $va
         return $value;
     }
 
-    private static function resolveTemperatureSynonyms(string $uom)
+    private static function resolveTemperatureSynonyms(string $uom): string
     {
-        switch ($uom) {
-            case 'fah':
-                return 'F';
-            case 'cel':
-                return 'C';
-            case 'kel':
-                return 'K';
-        }
-
-        return $uom;
+        return match ($uom) {
+            'fah' => 'F',
+            'cel' => 'C',
+            'kel' => 'K',
+            default => $uom,
+        };
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/EngineeringValidations.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/EngineeringValidations.php
index 01630af341..7e5118ff00 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/EngineeringValidations.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/EngineeringValidations.php
@@ -3,29 +3,23 @@
 namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class EngineeringValidations
 {
-    /**
-     * @param mixed $value
-     */
-    public static function validateFloat($value): float
+    public static function validateFloat(mixed $value): float
     {
         if (!is_numeric($value)) {
-            throw new Exception(Functions::VALUE());
+            throw new Exception(ExcelError::VALUE());
         }
 
         return (float) $value;
     }
 
-    /**
-     * @param mixed $value
-     */
-    public static function validateInt($value): int
+    public static function validateInt(mixed $value): int
     {
         if (!is_numeric($value)) {
-            throw new Exception(Functions::VALUE());
+            throw new Exception(ExcelError::VALUE());
         }
 
         return (int) floor((float) $value);
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/Erf.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/Erf.php
index db87ec0d38..aee7e31751 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/Erf.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/Erf.php
@@ -2,11 +2,15 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class Erf
 {
-    private static $twoSqrtPi = 1.128379167095512574;
+    use ArrayEnabled;
+
+    private const TWO_SQRT_PI = 1.128379167095512574;
 
     /**
      * ERF.
@@ -22,15 +26,19 @@ class Erf
      *        ERF(lower[,upper])
      *
      * @param mixed $lower Lower bound float for integrating ERF
+     *                      Or can be an array of values
      * @param mixed $upper Upper bound float for integrating ERF.
      *                           If omitted, ERF integrates between zero and lower_limit
+     *                      Or can be an array of values
      *
-     * @return float|string
+     * @return array|float|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function ERF($lower, $upper = null)
+    public static function ERF(mixed $lower, mixed $upper = null): array|float|string
     {
-        $lower = Functions::flattenSingleValue($lower);
-        $upper = Functions::flattenSingleValue($upper);
+        if (is_array($lower) || is_array($upper)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $lower, $upper);
+        }
 
         if (is_numeric($lower)) {
             if ($upper === null) {
@@ -41,7 +49,7 @@ public static function ERF($lower, $upper = null)
             }
         }
 
-        return Functions::VALUE();
+        return ExcelError::VALUE();
     }
 
     /**
@@ -53,23 +61,33 @@ public static function ERF($lower, $upper = null)
      *        ERF.PRECISE(limit)
      *
      * @param mixed $limit Float bound for integrating ERF, other bound is zero
+     *                      Or can be an array of values
      *
-     * @return float|string
+     * @return array|float|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function ERFPRECISE($limit)
+    public static function ERFPRECISE(mixed $limit)
     {
-        $limit = Functions::flattenSingleValue($limit);
+        if (is_array($limit)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $limit);
+        }
 
         return self::ERF($limit);
     }
 
-    //
-    //    Private method to calculate the erf value
-    //
-    public static function erfValue($value)
+    private static function makeFloat(mixed $value): float
+    {
+        return is_numeric($value) ? ((float) $value) : 0.0;
+    }
+
+    /**
+     * Method to calculate the erf value.
+     */
+    public static function erfValue(float|int|string $value): float
     {
+        $value = (float) $value;
         if (abs($value) > 2.2) {
-            return 1 - ErfC::ERFC($value);
+            return 1 - self::makeFloat(ErfC::ERFC($value));
         }
         $sum = $term = $value;
         $xsqr = ($value * $value);
@@ -86,6 +104,6 @@ public static function erfValue($value)
             }
         } while (abs($term / $sum) > Functions::PRECISION);
 
-        return self::$twoSqrtPi * $sum;
+        return self::TWO_SQRT_PI * $sum;
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ErfC.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ErfC.php
index c57a28f490..4365feccd8 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ErfC.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering/ErfC.php
@@ -2,10 +2,14 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Engineering;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class ErfC
 {
+    use ArrayEnabled;
+
     /**
      * ERFC.
      *
@@ -20,37 +24,42 @@ class ErfC
      *        ERFC(x)
      *
      * @param mixed $value The float lower bound for integrating ERFC
+     *                      Or can be an array of values
      *
-     * @return float|string
+     * @return array|float|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function ERFC($value)
+    public static function ERFC(mixed $value)
     {
-        $value = Functions::flattenSingleValue($value);
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
 
         if (is_numeric($value)) {
             return self::erfcValue($value);
         }
 
-        return Functions::VALUE();
+        return ExcelError::VALUE();
     }
 
-    //
-    //    Private method to calculate the erfc value
-    //
-    private static $oneSqrtPi = 0.564189583547756287;
+    private const ONE_SQRT_PI = 0.564189583547756287;
 
-    private static function erfcValue($value)
+    /**
+     * Method to calculate the erfc value.
+     */
+    private static function erfcValue(float|int|string $value): float|int
     {
+        $value = (float) $value;
         if (abs($value) < 2.2) {
             return 1 - Erf::erfValue($value);
         }
         if ($value < 0) {
-            return 2 - self::ERFC(-$value);
+            return 2 - self::erfcValue(-$value);
         }
         $a = $n = 1;
         $b = $c = $value;
         $d = ($value * $value) + 0.5;
-        $q1 = $q2 = $b / $d;
+        $q2 = $b / $d;
         do {
             $t = $a * $n + $b * $value;
             $a = $b;
@@ -63,6 +72,6 @@ private static function erfcValue($value)
             $q2 = $b / $d;
         } while ((abs($q1 - $q2) / $q2) > Functions::PRECISION);
 
-        return self::$oneSqrtPi * exp(-$value * $value) * $q2;
+        return self::ONE_SQRT_PI * exp(-$value * $value) * $q2;
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Exception.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Exception.php
index 87c7d222be..ea893d6986 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Exception.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Exception.php
@@ -6,16 +6,12 @@
 
 class Exception extends PhpSpreadsheetException
 {
+    public const CALCULATION_ENGINE_PUSH_TO_STACK = 1;
+
     /**
      * Error handler callback.
-     *
-     * @param mixed $code
-     * @param mixed $string
-     * @param mixed $file
-     * @param mixed $line
-     * @param mixed $context
      */
-    public static function errorHandlerCallback($code, $string, $file, $line, $context): void
+    public static function errorHandlerCallback(int $code, string $string, string $file, int $line): void
     {
         $e = new self($string, $code);
         $e->line = $line;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/ExceptionHandler.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/ExceptionHandler.php
index 41e51d4aea..890da60b59 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/ExceptionHandler.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/ExceptionHandler.php
@@ -9,7 +9,9 @@ class ExceptionHandler
      */
     public function __construct()
     {
-        set_error_handler([Exception::class, 'errorHandlerCallback'], E_ALL);
+        /** @var callable $callable */
+        $callable = [Exception::class, 'errorHandlerCallback'];
+        set_error_handler($callable, E_ALL);
     }
 
     /**
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial.php
deleted file mode 100644
index 9d933b4a92..0000000000
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial.php
+++ /dev/null
@@ -1,1430 +0,0 @@
-<?php
-
-namespace PhpOffice\PhpSpreadsheet\Calculation;
-
-use PhpOffice\PhpSpreadsheet\Calculation\Financial\Amortization;
-use PhpOffice\PhpSpreadsheet\Calculation\Financial\Coupons;
-use PhpOffice\PhpSpreadsheet\Calculation\Financial\Depreciation;
-use PhpOffice\PhpSpreadsheet\Calculation\Financial\Dollar;
-use PhpOffice\PhpSpreadsheet\Calculation\Financial\InterestRate;
-use PhpOffice\PhpSpreadsheet\Calculation\Financial\Securities;
-use PhpOffice\PhpSpreadsheet\Calculation\Financial\TreasuryBill;
-
-/**
- * @deprecated 1.18.0
- */
-class Financial
-{
-    const FINANCIAL_MAX_ITERATIONS = 128;
-
-    const FINANCIAL_PRECISION = 1.0e-08;
-
-    /**
-     * ACCRINT.
-     *
-     * Returns the accrued interest for a security that pays periodic interest.
-     *
-     * Excel Function:
-     *        ACCRINT(issue,firstinterest,settlement,rate,par,frequency[,basis][,calc_method])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\Securities\AccruedInterest::periodic()
-     *      Use the periodic() method in the Financial\Securities\AccruedInterest class instead
-     *
-     * @param mixed $issue the security's issue date
-     * @param mixed $firstInterest the security's first interest date
-     * @param mixed $settlement The security's settlement date.
-     *                              The security settlement date is the date after the issue date
-     *                                  when the security is traded to the buyer.
-     * @param mixed $rate the security's annual coupon rate
-     * @param mixed $parValue The security's par value.
-     *                            If you omit par, ACCRINT uses $1,000.
-     * @param mixed $frequency The number of coupon payments per year.
-     *                             Valid frequency values are:
-     *                               1    Annual
-     *                               2    Semi-Annual
-     *                               4    Quarterly
-     * @param mixed $basis The type of day count to use.
-     *                         0 or omitted    US (NASD) 30/360
-     *                         1               Actual/actual
-     *                         2               Actual/360
-     *                         3               Actual/365
-     *                         4               European 30/360
-     * @param mixed $calcMethod
-     *                          If true, use Issue to Settlement
-     *                          If false, use FirstInterest to Settlement
-     *
-     * @return float|string Result, or a string containing an error
-     */
-    public static function ACCRINT(
-        $issue,
-        $firstInterest,
-        $settlement,
-        $rate,
-        $parValue = 1000,
-        $frequency = 1,
-        $basis = 0,
-        $calcMethod = true
-    ) {
-        return Securities\AccruedInterest::periodic(
-            $issue,
-            $firstInterest,
-            $settlement,
-            $rate,
-            $parValue,
-            $frequency,
-            $basis,
-            $calcMethod
-        );
-    }
-
-    /**
-     * ACCRINTM.
-     *
-     * Returns the accrued interest for a security that pays interest at maturity.
-     *
-     * Excel Function:
-     *        ACCRINTM(issue,settlement,rate[,par[,basis]])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\Securities\AccruedInterest::atMaturity()
-     *      Use the atMaturity() method in the Financial\Securities\AccruedInterest class instead
-     *
-     * @param mixed $issue The security's issue date
-     * @param mixed $settlement The security's settlement (or maturity) date
-     * @param mixed $rate The security's annual coupon rate
-     * @param mixed $parValue The security's par value.
-     *                            If you omit par, ACCRINT uses $1,000.
-     * @param mixed $basis The type of day count to use.
-     *                            0 or omitted    US (NASD) 30/360
-     *                            1               Actual/actual
-     *                            2               Actual/360
-     *                            3               Actual/365
-     *                            4               European 30/360
-     *
-     * @return float|string Result, or a string containing an error
-     */
-    public static function ACCRINTM($issue, $settlement, $rate, $parValue = 1000, $basis = 0)
-    {
-        return Securities\AccruedInterest::atMaturity($issue, $settlement, $rate, $parValue, $basis);
-    }
-
-    /**
-     * AMORDEGRC.
-     *
-     * Returns the depreciation for each accounting period.
-     * This function is provided for the French accounting system. If an asset is purchased in
-     * the middle of the accounting period, the prorated depreciation is taken into account.
-     * The function is similar to AMORLINC, except that a depreciation coefficient is applied in
-     * the calculation depending on the life of the assets.
-     * This function will return the depreciation until the last period of the life of the assets
-     * or until the cumulated value of depreciation is greater than the cost of the assets minus
-     * the salvage value.
-     *
-     * Excel Function:
-     *        AMORDEGRC(cost,purchased,firstPeriod,salvage,period,rate[,basis])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\Amortization::AMORDEGRC()
-     *      Use the AMORDEGRC() method in the Financial\Amortization class instead
-     *
-     * @param float $cost The cost of the asset
-     * @param mixed $purchased Date of the purchase of the asset
-     * @param mixed $firstPeriod Date of the end of the first period
-     * @param mixed $salvage The salvage value at the end of the life of the asset
-     * @param float $period The period
-     * @param float $rate Rate of depreciation
-     * @param int $basis The type of day count to use.
-     *                       0 or omitted    US (NASD) 30/360
-     *                       1                Actual/actual
-     *                       2                Actual/360
-     *                       3                Actual/365
-     *                       4                European 30/360
-     *
-     * @return float|string (string containing the error type if there is an error)
-     */
-    public static function AMORDEGRC($cost, $purchased, $firstPeriod, $salvage, $period, $rate, $basis = 0)
-    {
-        return Amortization::AMORDEGRC($cost, $purchased, $firstPeriod, $salvage, $period, $rate, $basis);
-    }
-
-    /**
-     * AMORLINC.
-     *
-     * Returns the depreciation for each accounting period.
-     * This function is provided for the French accounting system. If an asset is purchased in
-     * the middle of the accounting period, the prorated depreciation is taken into account.
-     *
-     * Excel Function:
-     *        AMORLINC(cost,purchased,firstPeriod,salvage,period,rate[,basis])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\Amortization::AMORLINC()
-     *      Use the AMORLINC() method in the Financial\Amortization class instead
-     *
-     * @param float $cost The cost of the asset
-     * @param mixed $purchased Date of the purchase of the asset
-     * @param mixed $firstPeriod Date of the end of the first period
-     * @param mixed $salvage The salvage value at the end of the life of the asset
-     * @param float $period The period
-     * @param float $rate Rate of depreciation
-     * @param int $basis The type of day count to use.
-     *                       0 or omitted    US (NASD) 30/360
-     *                       1               Actual/actual
-     *                       2               Actual/360
-     *                       3               Actual/365
-     *                       4               European 30/360
-     *
-     * @return float|string (string containing the error type if there is an error)
-     */
-    public static function AMORLINC($cost, $purchased, $firstPeriod, $salvage, $period, $rate, $basis = 0)
-    {
-        return Amortization::AMORLINC($cost, $purchased, $firstPeriod, $salvage, $period, $rate, $basis);
-    }
-
-    /**
-     * COUPDAYBS.
-     *
-     * Returns the number of days from the beginning of the coupon period to the settlement date.
-     *
-     * Excel Function:
-     *        COUPDAYBS(settlement,maturity,frequency[,basis])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\Coupons::COUPDAYBS()
-     *      Use the COUPDAYBS() method in the Financial\Coupons class instead
-     *
-     * @param mixed $settlement The security's settlement date.
-     *                                The security settlement date is the date after the issue
-     *                                date when the security is traded to the buyer.
-     * @param mixed $maturity The security's maturity date.
-     *                                The maturity date is the date when the security expires.
-     * @param int $frequency the number of coupon payments per year.
-     *                                    Valid frequency values are:
-     *                                        1    Annual
-     *                                        2    Semi-Annual
-     *                                        4    Quarterly
-     * @param int $basis The type of day count to use.
-     *                                        0 or omitted    US (NASD) 30/360
-     *                                        1                Actual/actual
-     *                                        2                Actual/360
-     *                                        3                Actual/365
-     *                                        4                European 30/360
-     *
-     * @return float|string
-     */
-    public static function COUPDAYBS($settlement, $maturity, $frequency, $basis = 0)
-    {
-        return Coupons::COUPDAYBS($settlement, $maturity, $frequency, $basis);
-    }
-
-    /**
-     * COUPDAYS.
-     *
-     * Returns the number of days in the coupon period that contains the settlement date.
-     *
-     * Excel Function:
-     *        COUPDAYS(settlement,maturity,frequency[,basis])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\Coupons::COUPDAYS()
-     *      Use the COUPDAYS() method in the Financial\Coupons class instead
-     *
-     * @param mixed $settlement The security's settlement date.
-     *                                The security settlement date is the date after the issue
-     *                                date when the security is traded to the buyer.
-     * @param mixed $maturity The security's maturity date.
-     *                                The maturity date is the date when the security expires.
-     * @param mixed $frequency the number of coupon payments per year.
-     *                                    Valid frequency values are:
-     *                                        1    Annual
-     *                                        2    Semi-Annual
-     *                                        4    Quarterly
-     * @param int $basis The type of day count to use.
-     *                                        0 or omitted    US (NASD) 30/360
-     *                                        1                Actual/actual
-     *                                        2                Actual/360
-     *                                        3                Actual/365
-     *                                        4                European 30/360
-     *
-     * @return float|string
-     */
-    public static function COUPDAYS($settlement, $maturity, $frequency, $basis = 0)
-    {
-        return Coupons::COUPDAYS($settlement, $maturity, $frequency, $basis);
-    }
-
-    /**
-     * COUPDAYSNC.
-     *
-     * Returns the number of days from the settlement date to the next coupon date.
-     *
-     * Excel Function:
-     *        COUPDAYSNC(settlement,maturity,frequency[,basis])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\Coupons::COUPDAYSNC()
-     *      Use the COUPDAYSNC() method in the Financial\Coupons class instead
-     *
-     * @param mixed $settlement The security's settlement date.
-     *                                The security settlement date is the date after the issue
-     *                                date when the security is traded to the buyer.
-     * @param mixed $maturity The security's maturity date.
-     *                                The maturity date is the date when the security expires.
-     * @param mixed $frequency the number of coupon payments per year.
-     *                                    Valid frequency values are:
-     *                                        1    Annual
-     *                                        2    Semi-Annual
-     *                                        4    Quarterly
-     * @param int $basis The type of day count to use.
-     *                                        0 or omitted    US (NASD) 30/360
-     *                                        1                Actual/actual
-     *                                        2                Actual/360
-     *                                        3                Actual/365
-     *                                        4                European 30/360
-     *
-     * @return float|string
-     */
-    public static function COUPDAYSNC($settlement, $maturity, $frequency, $basis = 0)
-    {
-        return Coupons::COUPDAYSNC($settlement, $maturity, $frequency, $basis);
-    }
-
-    /**
-     * COUPNCD.
-     *
-     * Returns the next coupon date after the settlement date.
-     *
-     * Excel Function:
-     *        COUPNCD(settlement,maturity,frequency[,basis])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\Coupons::COUPNCD()
-     *      Use the COUPNCD() method in the Financial\Coupons class instead
-     *
-     * @param mixed $settlement The security's settlement date.
-     *                                The security settlement date is the date after the issue
-     *                                date when the security is traded to the buyer.
-     * @param mixed $maturity The security's maturity date.
-     *                                The maturity date is the date when the security expires.
-     * @param mixed $frequency the number of coupon payments per year.
-     *                                    Valid frequency values are:
-     *                                        1    Annual
-     *                                        2    Semi-Annual
-     *                                        4    Quarterly
-     * @param int $basis The type of day count to use.
-     *                                        0 or omitted    US (NASD) 30/360
-     *                                        1                Actual/actual
-     *                                        2                Actual/360
-     *                                        3                Actual/365
-     *                                        4                European 30/360
-     *
-     * @return mixed Excel date/time serial value, PHP date/time serial value or PHP date/time object,
-     *                        depending on the value of the ReturnDateType flag
-     */
-    public static function COUPNCD($settlement, $maturity, $frequency, $basis = 0)
-    {
-        return Coupons::COUPNCD($settlement, $maturity, $frequency, $basis);
-    }
-
-    /**
-     * COUPNUM.
-     *
-     * Returns the number of coupons payable between the settlement date and maturity date,
-     * rounded up to the nearest whole coupon.
-     *
-     * Excel Function:
-     *        COUPNUM(settlement,maturity,frequency[,basis])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\Coupons::COUPNUM()
-     *      Use the COUPNUM() method in the Financial\Coupons class instead
-     *
-     * @param mixed $settlement The security's settlement date.
-     *                                The security settlement date is the date after the issue
-     *                                date when the security is traded to the buyer.
-     * @param mixed $maturity The security's maturity date.
-     *                                The maturity date is the date when the security expires.
-     * @param mixed $frequency the number of coupon payments per year.
-     *                                    Valid frequency values are:
-     *                                        1    Annual
-     *                                        2    Semi-Annual
-     *                                        4    Quarterly
-     * @param int $basis The type of day count to use.
-     *                                        0 or omitted    US (NASD) 30/360
-     *                                        1                Actual/actual
-     *                                        2                Actual/360
-     *                                        3                Actual/365
-     *                                        4                European 30/360
-     *
-     * @return int|string
-     */
-    public static function COUPNUM($settlement, $maturity, $frequency, $basis = 0)
-    {
-        return Coupons::COUPNUM($settlement, $maturity, $frequency, $basis);
-    }
-
-    /**
-     * COUPPCD.
-     *
-     * Returns the previous coupon date before the settlement date.
-     *
-     * Excel Function:
-     *        COUPPCD(settlement,maturity,frequency[,basis])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\Coupons::COUPPCD()
-     *      Use the COUPPCD() method in the Financial\Coupons class instead
-     *
-     * @param mixed $settlement The security's settlement date.
-     *                                The security settlement date is the date after the issue
-     *                                date when the security is traded to the buyer.
-     * @param mixed $maturity The security's maturity date.
-     *                                The maturity date is the date when the security expires.
-     * @param mixed $frequency the number of coupon payments per year.
-     *                                    Valid frequency values are:
-     *                                        1    Annual
-     *                                        2    Semi-Annual
-     *                                        4    Quarterly
-     * @param int $basis The type of day count to use.
-     *                                        0 or omitted    US (NASD) 30/360
-     *                                        1                Actual/actual
-     *                                        2                Actual/360
-     *                                        3                Actual/365
-     *                                        4                European 30/360
-     *
-     * @return mixed Excel date/time serial value, PHP date/time serial value or PHP date/time object,
-     *                        depending on the value of the ReturnDateType flag
-     */
-    public static function COUPPCD($settlement, $maturity, $frequency, $basis = 0)
-    {
-        return Coupons::COUPPCD($settlement, $maturity, $frequency, $basis);
-    }
-
-    /**
-     * CUMIPMT.
-     *
-     * Returns the cumulative interest paid on a loan between the start and end periods.
-     *
-     * Excel Function:
-     *        CUMIPMT(rate,nper,pv,start,end[,type])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\CashFlow\Constant\Periodic\Cumulative::interest()
-     *      Use the interest() method in the Financial\CashFlow\Constant\Periodic\Cumulative class instead
-     *
-     * @param float $rate The Interest rate
-     * @param int $nper The total number of payment periods
-     * @param float $pv Present Value
-     * @param int $start The first period in the calculation.
-     *                       Payment periods are numbered beginning with 1.
-     * @param int $end the last period in the calculation
-     * @param int $type A number 0 or 1 and indicates when payments are due:
-     *                    0 or omitted    At the end of the period.
-     *                    1               At the beginning of the period.
-     *
-     * @return float|string
-     */
-    public static function CUMIPMT($rate, $nper, $pv, $start, $end, $type = 0)
-    {
-        return Financial\CashFlow\Constant\Periodic\Cumulative::interest($rate, $nper, $pv, $start, $end, $type);
-    }
-
-    /**
-     * CUMPRINC.
-     *
-     * Returns the cumulative principal paid on a loan between the start and end periods.
-     *
-     * Excel Function:
-     *        CUMPRINC(rate,nper,pv,start,end[,type])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\CashFlow\Constant\Periodic\Cumulative::principal()
-     *      Use the principal() method in the Financial\CashFlow\Constant\Periodic\Cumulative class instead
-     *
-     * @param float $rate The Interest rate
-     * @param int $nper The total number of payment periods
-     * @param float $pv Present Value
-     * @param int $start The first period in the calculation.
-     *                       Payment periods are numbered beginning with 1.
-     * @param int $end the last period in the calculation
-     * @param int $type A number 0 or 1 and indicates when payments are due:
-     *                    0 or omitted    At the end of the period.
-     *                    1               At the beginning of the period.
-     *
-     * @return float|string
-     */
-    public static function CUMPRINC($rate, $nper, $pv, $start, $end, $type = 0)
-    {
-        return Financial\CashFlow\Constant\Periodic\Cumulative::principal($rate, $nper, $pv, $start, $end, $type);
-    }
-
-    /**
-     * DB.
-     *
-     * Returns the depreciation of an asset for a specified period using the
-     * fixed-declining balance method.
-     * This form of depreciation is used if you want to get a higher depreciation value
-     * at the beginning of the depreciation (as opposed to linear depreciation). The
-     * depreciation value is reduced with every depreciation period by the depreciation
-     * already deducted from the initial cost.
-     *
-     * Excel Function:
-     *        DB(cost,salvage,life,period[,month])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\Depreciation::DB()
-     *      Use the DB() method in the Financial\Depreciation class instead
-     *
-     * @param float $cost Initial cost of the asset
-     * @param float $salvage Value at the end of the depreciation.
-     *                                (Sometimes called the salvage value of the asset)
-     * @param int $life Number of periods over which the asset is depreciated.
-     *                                (Sometimes called the useful life of the asset)
-     * @param int $period The period for which you want to calculate the
-     *                                depreciation. Period must use the same units as life.
-     * @param int $month Number of months in the first year. If month is omitted,
-     *                                it defaults to 12.
-     *
-     * @return float|string
-     */
-    public static function DB($cost, $salvage, $life, $period, $month = 12)
-    {
-        return Depreciation::DB($cost, $salvage, $life, $period, $month);
-    }
-
-    /**
-     * DDB.
-     *
-     * Returns the depreciation of an asset for a specified period using the
-     * double-declining balance method or some other method you specify.
-     *
-     * Excel Function:
-     *        DDB(cost,salvage,life,period[,factor])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\Depreciation::DDB()
-     *      Use the DDB() method in the Financial\Depreciation class instead
-     *
-     * @param float $cost Initial cost of the asset
-     * @param float $salvage Value at the end of the depreciation.
-     *                                (Sometimes called the salvage value of the asset)
-     * @param int $life Number of periods over which the asset is depreciated.
-     *                                (Sometimes called the useful life of the asset)
-     * @param int $period The period for which you want to calculate the
-     *                                depreciation. Period must use the same units as life.
-     * @param float $factor The rate at which the balance declines.
-     *                                If factor is omitted, it is assumed to be 2 (the
-     *                                double-declining balance method).
-     *
-     * @return float|string
-     */
-    public static function DDB($cost, $salvage, $life, $period, $factor = 2.0)
-    {
-        return Depreciation::DDB($cost, $salvage, $life, $period, $factor);
-    }
-
-    /**
-     * DISC.
-     *
-     * Returns the discount rate for a security.
-     *
-     * Excel Function:
-     *        DISC(settlement,maturity,price,redemption[,basis])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\Securities\Rates::discount()
-     *      Use the discount() method in the Financial\Securities\Rates class instead
-     *
-     * @param mixed $settlement The security's settlement date.
-     *                                The security settlement date is the date after the issue
-     *                                date when the security is traded to the buyer.
-     * @param mixed $maturity The security's maturity date.
-     *                                The maturity date is the date when the security expires.
-     * @param int $price The security's price per $100 face value
-     * @param int $redemption The security's redemption value per $100 face value
-     * @param int $basis The type of day count to use.
-     *                                        0 or omitted    US (NASD) 30/360
-     *                                        1                Actual/actual
-     *                                        2                Actual/360
-     *                                        3                Actual/365
-     *                                        4                European 30/360
-     *
-     * @return float|string
-     */
-    public static function DISC($settlement, $maturity, $price, $redemption, $basis = 0)
-    {
-        return Financial\Securities\Rates::discount($settlement, $maturity, $price, $redemption, $basis);
-    }
-
-    /**
-     * DOLLARDE.
-     *
-     * Converts a dollar price expressed as an integer part and a fraction
-     *        part into a dollar price expressed as a decimal number.
-     * Fractional dollar numbers are sometimes used for security prices.
-     *
-     * Excel Function:
-     *        DOLLARDE(fractional_dollar,fraction)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\Dollar::decimal()
-     *      Use the decimal() method in the Financial\Dollar class instead
-     *
-     * @param float $fractional_dollar Fractional Dollar
-     * @param int $fraction Fraction
-     *
-     * @return float|string
-     */
-    public static function DOLLARDE($fractional_dollar = null, $fraction = 0)
-    {
-        return Dollar::decimal($fractional_dollar, $fraction);
-    }
-
-    /**
-     * DOLLARFR.
-     *
-     * Converts a dollar price expressed as a decimal number into a dollar price
-     *        expressed as a fraction.
-     * Fractional dollar numbers are sometimes used for security prices.
-     *
-     * Excel Function:
-     *        DOLLARFR(decimal_dollar,fraction)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\Dollar::fractional()
-     *      Use the fractional() method in the Financial\Dollar class instead
-     *
-     * @param float $decimal_dollar Decimal Dollar
-     * @param int $fraction Fraction
-     *
-     * @return float|string
-     */
-    public static function DOLLARFR($decimal_dollar = null, $fraction = 0)
-    {
-        return Dollar::fractional($decimal_dollar, $fraction);
-    }
-
-    /**
-     * EFFECT.
-     *
-     * Returns the effective interest rate given the nominal rate and the number of
-     *        compounding payments per year.
-     *
-     * Excel Function:
-     *        EFFECT(nominal_rate,npery)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\InterestRate::effective()
-     *      Use the effective() method in the Financial\InterestRate class instead
-     *
-     * @param float $nominalRate Nominal interest rate
-     * @param int $periodsPerYear Number of compounding payments per year
-     *
-     * @return float|string
-     */
-    public static function EFFECT($nominalRate = 0, $periodsPerYear = 0)
-    {
-        return Financial\InterestRate::effective($nominalRate, $periodsPerYear);
-    }
-
-    /**
-     * FV.
-     *
-     * Returns the Future Value of a cash flow with constant payments and interest rate (annuities).
-     *
-     * Excel Function:
-     *        FV(rate,nper,pmt[,pv[,type]])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\CashFlow\Constant\Periodic::futureValue()
-     *      Use the futureValue() method in the Financial\CashFlow\Constant\Periodic class instead
-     *
-     * @param float $rate The interest rate per period
-     * @param int $nper Total number of payment periods in an annuity
-     * @param float $pmt The payment made each period: it cannot change over the
-     *                            life of the annuity. Typically, pmt contains principal
-     *                            and interest but no other fees or taxes.
-     * @param float $pv present Value, or the lump-sum amount that a series of
-     *                            future payments is worth right now
-     * @param int $type A number 0 or 1 and indicates when payments are due:
-     *                                0 or omitted    At the end of the period.
-     *                                1                At the beginning of the period.
-     *
-     * @return float|string
-     */
-    public static function FV($rate = 0, $nper = 0, $pmt = 0, $pv = 0, $type = 0)
-    {
-        return Financial\CashFlow\Constant\Periodic::futureValue($rate, $nper, $pmt, $pv, $type);
-    }
-
-    /**
-     * FVSCHEDULE.
-     *
-     * Returns the future value of an initial principal after applying a series of compound interest rates.
-     * Use FVSCHEDULE to calculate the future value of an investment with a variable or adjustable rate.
-     *
-     * Excel Function:
-     *        FVSCHEDULE(principal,schedule)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\CashFlow\Single::futureValue()
-     *      Use the futureValue() method in the Financial\CashFlow\Single class instead
-     *
-     * @param float $principal the present value
-     * @param float[] $schedule an array of interest rates to apply
-     *
-     * @return float|string
-     */
-    public static function FVSCHEDULE($principal, $schedule)
-    {
-        return Financial\CashFlow\Single::futureValue($principal, $schedule);
-    }
-
-    /**
-     * INTRATE.
-     *
-     * Returns the interest rate for a fully invested security.
-     *
-     * Excel Function:
-     *        INTRATE(settlement,maturity,investment,redemption[,basis])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\Securities\Rates::interest()
-     *      Use the interest() method in the Financial\Securities\Rates class instead
-     *
-     * @param mixed $settlement The security's settlement date.
-     *                              The security settlement date is the date after the issue date when the security
-     *                                  is traded to the buyer.
-     * @param mixed $maturity The security's maturity date.
-     *                            The maturity date is the date when the security expires.
-     * @param int $investment the amount invested in the security
-     * @param int $redemption the amount to be received at maturity
-     * @param int $basis The type of day count to use.
-     *                       0 or omitted    US (NASD) 30/360
-     *                       1               Actual/actual
-     *                       2               Actual/360
-     *                       3               Actual/365
-     *                       4               European 30/360
-     *
-     * @return float|string
-     */
-    public static function INTRATE($settlement, $maturity, $investment, $redemption, $basis = 0)
-    {
-        return Financial\Securities\Rates::interest($settlement, $maturity, $investment, $redemption, $basis);
-    }
-
-    /**
-     * IPMT.
-     *
-     * Returns the interest payment for a given period for an investment based on periodic, constant payments
-     *         and a constant interest rate.
-     *
-     * Excel Function:
-     *        IPMT(rate,per,nper,pv[,fv][,type])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\CashFlow\Constant\Periodic\Interest::payment()
-     *      Use the payment() method in the Financial\CashFlow\Constant\Periodic class instead
-     *
-     * @param float $rate Interest rate per period
-     * @param int $per Period for which we want to find the interest
-     * @param int $nper Number of periods
-     * @param float $pv Present Value
-     * @param float $fv Future Value
-     * @param int $type Payment type: 0 = at the end of each period, 1 = at the beginning of each period
-     *
-     * @return float|string
-     */
-    public static function IPMT($rate, $per, $nper, $pv, $fv = 0, $type = 0)
-    {
-        return Financial\CashFlow\Constant\Periodic\Interest::payment($rate, $per, $nper, $pv, $fv, $type);
-    }
-
-    /**
-     * IRR.
-     *
-     * Returns the internal rate of return for a series of cash flows represented by the numbers in values.
-     * These cash flows do not have to be even, as they would be for an annuity. However, the cash flows must occur
-     * at regular intervals, such as monthly or annually. The internal rate of return is the interest rate received
-     * for an investment consisting of payments (negative values) and income (positive values) that occur at regular
-     * periods.
-     *
-     * Excel Function:
-     *        IRR(values[,guess])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\CashFlow\Variable\Periodic::rate()
-     *      Use the rate() method in the Financial\CashFlow\Variable\Periodic class instead
-     *
-     * @param mixed $values An array or a reference to cells that contain numbers for which you want
-     *                                    to calculate the internal rate of return.
-     *                                Values must contain at least one positive value and one negative value to
-     *                                    calculate the internal rate of return.
-     * @param mixed $guess A number that you guess is close to the result of IRR
-     *
-     * @return float|string
-     */
-    public static function IRR($values, $guess = 0.1)
-    {
-        return Financial\CashFlow\Variable\Periodic::rate($values, $guess);
-    }
-
-    /**
-     * ISPMT.
-     *
-     * Returns the interest payment for an investment based on an interest rate and a constant payment schedule.
-     *
-     * Excel Function:
-     *     =ISPMT(interest_rate, period, number_payments, pv)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\CashFlow\Constant\Periodic\Interest::schedulePayment()
-     *      Use the schedulePayment() method in the Financial\CashFlow\Constant\Periodic class instead
-     *
-     * interest_rate is the interest rate for the investment
-     *
-     * period is the period to calculate the interest rate.  It must be betweeen 1 and number_payments.
-     *
-     * number_payments is the number of payments for the annuity
-     *
-     * pv is the loan amount or present value of the payments
-     */
-    public static function ISPMT(...$args)
-    {
-        return Financial\CashFlow\Constant\Periodic\Interest::schedulePayment(...$args);
-    }
-
-    /**
-     * MIRR.
-     *
-     * Returns the modified internal rate of return for a series of periodic cash flows. MIRR considers both
-     *        the cost of the investment and the interest received on reinvestment of cash.
-     *
-     * Excel Function:
-     *        MIRR(values,finance_rate, reinvestment_rate)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\CashFlow\Variable\Periodic::modifiedRate()
-     *      Use the modifiedRate() method in the Financial\CashFlow\Variable\Periodic class instead
-     *
-     * @param mixed $values An array or a reference to cells that contain a series of payments and
-     *                         income occurring at regular intervals.
-     *                      Payments are negative value, income is positive values.
-     * @param mixed $finance_rate The interest rate you pay on the money used in the cash flows
-     * @param mixed $reinvestment_rate The interest rate you receive on the cash flows as you reinvest them
-     *
-     * @return float|string Result, or a string containing an error
-     */
-    public static function MIRR($values, $finance_rate, $reinvestment_rate)
-    {
-        return Financial\CashFlow\Variable\Periodic::modifiedRate($values, $finance_rate, $reinvestment_rate);
-    }
-
-    /**
-     * NOMINAL.
-     *
-     * Returns the nominal interest rate given the effective rate and the number of compounding payments per year.
-     *
-     * Excel Function:
-     *        NOMINAL(effect_rate, npery)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\InterestRate::nominal()
-     *      Use the nominal() method in the Financial\InterestRate class instead
-     *
-     * @param float $effectiveRate Effective interest rate
-     * @param int $periodsPerYear Number of compounding payments per year
-     *
-     * @return float|string Result, or a string containing an error
-     */
-    public static function NOMINAL($effectiveRate = 0, $periodsPerYear = 0)
-    {
-        return InterestRate::nominal($effectiveRate, $periodsPerYear);
-    }
-
-    /**
-     * NPER.
-     *
-     * Returns the number of periods for a cash flow with constant periodic payments (annuities), and interest rate.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @param float $rate Interest rate per period
-     * @param int $pmt Periodic payment (annuity)
-     * @param float $pv Present Value
-     * @param float $fv Future Value
-     * @param int $type Payment type: 0 = at the end of each period, 1 = at the beginning of each period
-     *
-     * @return float|string Result, or a string containing an error
-     *
-     *@see Financial\CashFlow\Constant\Periodic::periods()
-     *      Use the periods() method in the Financial\CashFlow\Constant\Periodic class instead
-     */
-    public static function NPER($rate = 0, $pmt = 0, $pv = 0, $fv = 0, $type = 0)
-    {
-        return Financial\CashFlow\Constant\Periodic::periods($rate, $pmt, $pv, $fv, $type);
-    }
-
-    /**
-     * NPV.
-     *
-     * Returns the Net Present Value of a cash flow series given a discount rate.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\CashFlow\Variable\Periodic::presentValue()
-     *      Use the presentValue() method in the Financial\CashFlow\Variable\Periodic class instead
-     *
-     * @return float
-     */
-    public static function NPV(...$args)
-    {
-        return Financial\CashFlow\Variable\Periodic::presentValue(...$args);
-    }
-
-    /**
-     * PDURATION.
-     *
-     * Calculates the number of periods required for an investment to reach a specified value.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\CashFlow\Single::periods()
-     *      Use the periods() method in the Financial\CashFlow\Single class instead
-     *
-     * @param float $rate Interest rate per period
-     * @param float $pv Present Value
-     * @param float $fv Future Value
-     *
-     * @return float|string Result, or a string containing an error
-     */
-    public static function PDURATION($rate = 0, $pv = 0, $fv = 0)
-    {
-        return Financial\CashFlow\Single::periods($rate, $pv, $fv);
-    }
-
-    /**
-     * PMT.
-     *
-     * Returns the constant payment (annuity) for a cash flow with a constant interest rate.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\CashFlow\Constant\Periodic\Payments::annuity()
-     *      Use the annuity() method in the Financial\CashFlow\Constant\Periodic\Payments class instead
-     *
-     * @param float $rate Interest rate per period
-     * @param int $nper Number of periods
-     * @param float $pv Present Value
-     * @param float $fv Future Value
-     * @param int $type Payment type: 0 = at the end of each period, 1 = at the beginning of each period
-     *
-     * @return float|string Result, or a string containing an error
-     */
-    public static function PMT($rate = 0, $nper = 0, $pv = 0, $fv = 0, $type = 0)
-    {
-        return Financial\CashFlow\Constant\Periodic\Payments::annuity($rate, $nper, $pv, $fv, $type);
-    }
-
-    /**
-     * PPMT.
-     *
-     * Returns the interest payment for a given period for an investment based on periodic, constant payments
-     *         and a constant interest rate.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\CashFlow\Constant\Periodic\Payments::interestPayment()
-     *      Use the interestPayment() method in the Financial\CashFlow\Constant\Periodic\Payments class instead
-     *
-     * @param float $rate Interest rate per period
-     * @param int $per Period for which we want to find the interest
-     * @param int $nper Number of periods
-     * @param float $pv Present Value
-     * @param float $fv Future Value
-     * @param int $type Payment type: 0 = at the end of each period, 1 = at the beginning of each period
-     *
-     * @return float|string Result, or a string containing an error
-     */
-    public static function PPMT($rate, $per, $nper, $pv, $fv = 0, $type = 0)
-    {
-        return Financial\CashFlow\Constant\Periodic\Payments::interestPayment($rate, $per, $nper, $pv, $fv, $type);
-    }
-
-    /**
-     * PRICE.
-     *
-     * Returns the price per $100 face value of a security that pays periodic interest.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\Securities\Price::price()
-     *      Use the price() method in the Financial\Securities\Price class instead
-     *
-     * @param mixed $settlement The security's settlement date.
-     *                              The security settlement date is the date after the issue date when the security
-     *                              is traded to the buyer.
-     * @param mixed $maturity The security's maturity date.
-     *                                The maturity date is the date when the security expires.
-     * @param float $rate the security's annual coupon rate
-     * @param float $yield the security's annual yield
-     * @param float $redemption The number of coupon payments per year.
-     *                              For annual payments, frequency = 1;
-     *                              for semiannual, frequency = 2;
-     *                              for quarterly, frequency = 4.
-     * @param int $frequency
-     * @param int $basis The type of day count to use.
-     *                       0 or omitted    US (NASD) 30/360
-     *                       1                Actual/actual
-     *                       2                Actual/360
-     *                       3                Actual/365
-     *                       4                European 30/360
-     *
-     * @return float|string Result, or a string containing an error
-     */
-    public static function PRICE($settlement, $maturity, $rate, $yield, $redemption, $frequency, $basis = 0)
-    {
-        return Securities\Price::price($settlement, $maturity, $rate, $yield, $redemption, $frequency, $basis);
-    }
-
-    /**
-     * PRICEDISC.
-     *
-     * Returns the price per $100 face value of a discounted security.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\Securities\Price::priceDiscounted()
-     *      Use the priceDiscounted() method in the Financial\Securities\Price class instead
-     *
-     * @param mixed $settlement The security's settlement date.
-     *                              The security settlement date is the date after the issue date when the security
-     *                              is traded to the buyer.
-     * @param mixed $maturity The security's maturity date.
-     *                            The maturity date is the date when the security expires.
-     * @param int $discount The security's discount rate
-     * @param int $redemption The security's redemption value per $100 face value
-     * @param int $basis The type of day count to use.
-     *                                        0 or omitted    US (NASD) 30/360
-     *                                        1                Actual/actual
-     *                                        2                Actual/360
-     *                                        3                Actual/365
-     *                                        4                European 30/360
-     *
-     * @return float|string Result, or a string containing an error
-     */
-    public static function PRICEDISC($settlement, $maturity, $discount, $redemption, $basis = 0)
-    {
-        return Securities\Price::priceDiscounted($settlement, $maturity, $discount, $redemption, $basis);
-    }
-
-    /**
-     * PRICEMAT.
-     *
-     * Returns the price per $100 face value of a security that pays interest at maturity.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\Securities\Price::priceAtMaturity()
-     *      Use the priceAtMaturity() method in the Financial\Securities\Price class instead
-     *
-     * @param mixed $settlement The security's settlement date.
-     *                              The security's settlement date is the date after the issue date when the security
-     *                              is traded to the buyer.
-     * @param mixed $maturity The security's maturity date.
-     *                            The maturity date is the date when the security expires.
-     * @param mixed $issue The security's issue date
-     * @param int $rate The security's interest rate at date of issue
-     * @param int $yield The security's annual yield
-     * @param int $basis The type of day count to use.
-     *                                        0 or omitted    US (NASD) 30/360
-     *                                        1                Actual/actual
-     *                                        2                Actual/360
-     *                                        3                Actual/365
-     *                                        4                European 30/360
-     *
-     * @return float|string Result, or a string containing an error
-     */
-    public static function PRICEMAT($settlement, $maturity, $issue, $rate, $yield, $basis = 0)
-    {
-        return Securities\Price::priceAtMaturity($settlement, $maturity, $issue, $rate, $yield, $basis);
-    }
-
-    /**
-     * PV.
-     *
-     * Returns the Present Value of a cash flow with constant payments and interest rate (annuities).
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\CashFlow\Constant\Periodic::presentValue()
-     *      Use the presentValue() method in the Financial\CashFlow\Constant\Periodic class instead
-     *
-     * @param float $rate Interest rate per period
-     * @param int $nper Number of periods
-     * @param float $pmt Periodic payment (annuity)
-     * @param float $fv Future Value
-     * @param int $type Payment type: 0 = at the end of each period, 1 = at the beginning of each period
-     *
-     * @return float|string Result, or a string containing an error
-     */
-    public static function PV($rate = 0, $nper = 0, $pmt = 0, $fv = 0, $type = 0)
-    {
-        return Financial\CashFlow\Constant\Periodic::presentValue($rate, $nper, $pmt, $fv, $type);
-    }
-
-    /**
-     * RATE.
-     *
-     * Returns the interest rate per period of an annuity.
-     * RATE is calculated by iteration and can have zero or more solutions.
-     * If the successive results of RATE do not converge to within 0.0000001 after 20 iterations,
-     * RATE returns the #NUM! error value.
-     *
-     * Excel Function:
-     *        RATE(nper,pmt,pv[,fv[,type[,guess]]])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\CashFlow\Constant\Periodic\Interest::rate()
-     *      Use the rate() method in the Financial\CashFlow\Constant\Periodic class instead
-     *
-     * @param mixed $nper The total number of payment periods in an annuity
-     * @param mixed $pmt The payment made each period and cannot change over the life
-     *                                    of the annuity.
-     *                                Typically, pmt includes principal and interest but no other
-     *                                    fees or taxes.
-     * @param mixed $pv The present value - the total amount that a series of future
-     *                                    payments is worth now
-     * @param mixed $fv The future value, or a cash balance you want to attain after
-     *                                    the last payment is made. If fv is omitted, it is assumed
-     *                                    to be 0 (the future value of a loan, for example, is 0).
-     * @param mixed $type A number 0 or 1 and indicates when payments are due:
-     *                                        0 or omitted    At the end of the period.
-     *                                        1                At the beginning of the period.
-     * @param mixed $guess Your guess for what the rate will be.
-     *                                    If you omit guess, it is assumed to be 10 percent.
-     *
-     * @return float|string
-     */
-    public static function RATE($nper, $pmt, $pv, $fv = 0.0, $type = 0, $guess = 0.1)
-    {
-        return Financial\CashFlow\Constant\Periodic\Interest::rate($nper, $pmt, $pv, $fv, $type, $guess);
-    }
-
-    /**
-     * RECEIVED.
-     *
-     * Returns the amount received at maturity for a fully invested Security.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\Securities\Price::received()
-     *      Use the received() method in the Financial\Securities\Price class instead
-     *
-     * @param mixed $settlement The security's settlement date.
-     *                              The security settlement date is the date after the issue date when the security
-     *                                  is traded to the buyer.
-     * @param mixed $maturity The security's maturity date.
-     *                            The maturity date is the date when the security expires.
-     * @param mixed $investment The amount invested in the security
-     * @param mixed $discount The security's discount rate
-     * @param mixed $basis The type of day count to use.
-     *                         0 or omitted    US (NASD) 30/360
-     *                         1               Actual/actual
-     *                         2               Actual/360
-     *                         3               Actual/365
-     *                         4               European 30/360
-     *
-     * @return float|string Result, or a string containing an error
-     */
-    public static function RECEIVED($settlement, $maturity, $investment, $discount, $basis = 0)
-    {
-        return Financial\Securities\Price::received($settlement, $maturity, $investment, $discount, $basis);
-    }
-
-    /**
-     * RRI.
-     *
-     * Calculates the interest rate required for an investment to grow to a specified future value .
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\CashFlow\Single::interestRate()
-     *      Use the interestRate() method in the Financial\CashFlow\Single class instead
-     *
-     * @param float $nper The number of periods over which the investment is made
-     * @param float $pv Present Value
-     * @param float $fv Future Value
-     *
-     * @return float|string Result, or a string containing an error
-     */
-    public static function RRI($nper = 0, $pv = 0, $fv = 0)
-    {
-        return Financial\CashFlow\Single::interestRate($nper, $pv, $fv);
-    }
-
-    /**
-     * SLN.
-     *
-     * Returns the straight-line depreciation of an asset for one period
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\Depreciation::SLN()
-     *      Use the SLN() method in the Financial\Depreciation class instead
-     *
-     * @param mixed $cost Initial cost of the asset
-     * @param mixed $salvage Value at the end of the depreciation
-     * @param mixed $life Number of periods over which the asset is depreciated
-     *
-     * @return float|string Result, or a string containing an error
-     */
-    public static function SLN($cost, $salvage, $life)
-    {
-        return Depreciation::SLN($cost, $salvage, $life);
-    }
-
-    /**
-     * SYD.
-     *
-     * Returns the sum-of-years' digits depreciation of an asset for a specified period.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\Depreciation::SYD()
-     *      Use the SYD() method in the Financial\Depreciation class instead
-     *
-     * @param mixed $cost Initial cost of the asset
-     * @param mixed $salvage Value at the end of the depreciation
-     * @param mixed $life Number of periods over which the asset is depreciated
-     * @param mixed $period Period
-     *
-     * @return float|string Result, or a string containing an error
-     */
-    public static function SYD($cost, $salvage, $life, $period)
-    {
-        return Depreciation::SYD($cost, $salvage, $life, $period);
-    }
-
-    /**
-     * TBILLEQ.
-     *
-     * Returns the bond-equivalent yield for a Treasury bill.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\TreasuryBill::bondEquivalentYield()
-     *      Use the bondEquivalentYield() method in the Financial\TreasuryBill class instead
-     *
-     * @param mixed $settlement The Treasury bill's settlement date.
-     *                          The Treasury bill's settlement date is the date after the issue date when the
-     *                              Treasury bill is traded to the buyer.
-     * @param mixed $maturity The Treasury bill's maturity date.
-     *                                The maturity date is the date when the Treasury bill expires.
-     * @param int $discount The Treasury bill's discount rate
-     *
-     * @return float|string Result, or a string containing an error
-     */
-    public static function TBILLEQ($settlement, $maturity, $discount)
-    {
-        return TreasuryBill::bondEquivalentYield($settlement, $maturity, $discount);
-    }
-
-    /**
-     * TBILLPRICE.
-     *
-     * Returns the price per $100 face value for a Treasury bill.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\TreasuryBill::price()
-     *      Use the price() method in the Financial\TreasuryBill class instead
-     *
-     * @param mixed $settlement The Treasury bill's settlement date.
-     *                                The Treasury bill's settlement date is the date after the issue date
-     *                                    when the Treasury bill is traded to the buyer.
-     * @param mixed $maturity The Treasury bill's maturity date.
-     *                                The maturity date is the date when the Treasury bill expires.
-     * @param int $discount The Treasury bill's discount rate
-     *
-     * @return float|string Result, or a string containing an error
-     */
-    public static function TBILLPRICE($settlement, $maturity, $discount)
-    {
-        return TreasuryBill::price($settlement, $maturity, $discount);
-    }
-
-    /**
-     * TBILLYIELD.
-     *
-     * Returns the yield for a Treasury bill.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\TreasuryBill::yield()
-     *      Use the yield() method in the Financial\TreasuryBill class instead
-     *
-     * @param mixed $settlement The Treasury bill's settlement date.
-     *                                The Treasury bill's settlement date is the date after the issue date
-     *                                    when the Treasury bill is traded to the buyer.
-     * @param mixed $maturity The Treasury bill's maturity date.
-     *                                The maturity date is the date when the Treasury bill expires.
-     * @param int $price The Treasury bill's price per $100 face value
-     *
-     * @return float|mixed|string
-     */
-    public static function TBILLYIELD($settlement, $maturity, $price)
-    {
-        return TreasuryBill::yield($settlement, $maturity, $price);
-    }
-
-    /**
-     * XIRR.
-     *
-     * Returns the internal rate of return for a schedule of cash flows that is not necessarily periodic.
-     *
-     * Excel Function:
-     *        =XIRR(values,dates,guess)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\CashFlow\Variable\NonPeriodic::rate()
-     *      Use the rate() method in the Financial\CashFlow\Variable\NonPeriodic class instead
-     *
-     * @param float[] $values     A series of cash flow payments
-     *                                The series of values must contain at least one positive value & one negative value
-     * @param mixed[] $dates      A series of payment dates
-     *                                The first payment date indicates the beginning of the schedule of payments
-     *                                All other dates must be later than this date, but they may occur in any order
-     * @param float $guess        An optional guess at the expected answer
-     *
-     * @return float|mixed|string
-     */
-    public static function XIRR($values, $dates, $guess = 0.1)
-    {
-        return Financial\CashFlow\Variable\NonPeriodic::rate($values, $dates, $guess);
-    }
-
-    /**
-     * XNPV.
-     *
-     * Returns the net present value for a schedule of cash flows that is not necessarily periodic.
-     * To calculate the net present value for a series of cash flows that is periodic, use the NPV function.
-     *
-     * Excel Function:
-     *        =XNPV(rate,values,dates)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\CashFlow\Variable\NonPeriodic::presentValue()
-     *      Use the presentValue() method in the Financial\CashFlow\Variable\NonPeriodic class instead
-     *
-     * @param float $rate the discount rate to apply to the cash flows
-     * @param float[] $values A series of cash flows that corresponds to a schedule of payments in dates.
-     *                          The first payment is optional and corresponds to a cost or payment that occurs
-     *                              at the beginning of the investment.
-     *                          If the first value is a cost or payment, it must be a negative value.
-     *                             All succeeding payments are discounted based on a 365-day year.
-     *                          The series of values must contain at least one positive value and one negative value.
-     * @param mixed[] $dates A schedule of payment dates that corresponds to the cash flow payments.
-     *                         The first payment date indicates the beginning of the schedule of payments.
-     *                         All other dates must be later than this date, but they may occur in any order.
-     *
-     * @return float|mixed|string
-     */
-    public static function XNPV($rate, $values, $dates)
-    {
-        return Financial\CashFlow\Variable\NonPeriodic::presentValue($rate, $values, $dates);
-    }
-
-    /**
-     * YIELDDISC.
-     *
-     * Returns the annual yield of a security that pays interest at maturity.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\Securities\Yields::yieldDiscounted()
-     *      Use the yieldDiscounted() method in the Financial\Securities\Yields class instead
-     *
-     * @param mixed $settlement The security's settlement date.
-     *                              The security's settlement date is the date after the issue date when the security
-     *                              is traded to the buyer.
-     * @param mixed $maturity The security's maturity date.
-     *                            The maturity date is the date when the security expires.
-     * @param int $price The security's price per $100 face value
-     * @param int $redemption The security's redemption value per $100 face value
-     * @param int $basis The type of day count to use.
-     *                                        0 or omitted    US (NASD) 30/360
-     *                                        1                Actual/actual
-     *                                        2                Actual/360
-     *                                        3                Actual/365
-     *                                        4                European 30/360
-     *
-     * @return float|string Result, or a string containing an error
-     */
-    public static function YIELDDISC($settlement, $maturity, $price, $redemption, $basis = 0)
-    {
-        return Securities\Yields::yieldDiscounted($settlement, $maturity, $price, $redemption, $basis);
-    }
-
-    /**
-     * YIELDMAT.
-     *
-     * Returns the annual yield of a security that pays interest at maturity.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Financial\Securities\Yields::yieldAtMaturity()
-     *      Use the yieldAtMaturity() method in the Financial\Securities\Yields class instead
-     *
-     * @param mixed $settlement The security's settlement date.
-     *                              The security's settlement date is the date after the issue date when the security
-     *                              is traded to the buyer.
-     * @param mixed $maturity The security's maturity date.
-     *                            The maturity date is the date when the security expires.
-     * @param mixed $issue The security's issue date
-     * @param int $rate The security's interest rate at date of issue
-     * @param int $price The security's price per $100 face value
-     * @param int $basis The type of day count to use.
-     *                       0 or omitted    US (NASD) 30/360
-     *                       1               Actual/actual
-     *                       2               Actual/360
-     *                       3               Actual/365
-     *                       4               European 30/360
-     *
-     * @return float|string Result, or a string containing an error
-     */
-    public static function YIELDMAT($settlement, $maturity, $issue, $rate, $price, $basis = 0)
-    {
-        return Securities\Yields::yieldAtMaturity($settlement, $maturity, $issue, $rate, $price, $basis);
-    }
-}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Amortization.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Amortization.php
index ba7fb5210d..b53829b767 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Amortization.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Amortization.php
@@ -40,14 +40,14 @@ class Amortization
      * @return float|string (string containing the error type if there is an error)
      */
     public static function AMORDEGRC(
-        $cost,
-        $purchased,
-        $firstPeriod,
-        $salvage,
-        $period,
-        $rate,
-        $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
-    ) {
+        mixed $cost,
+        mixed $purchased,
+        mixed $firstPeriod,
+        mixed $salvage,
+        mixed $period,
+        mixed $rate,
+        mixed $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ): string|float {
         $cost = Functions::flattenSingleValue($cost);
         $purchased = Functions::flattenSingleValue($purchased);
         $firstPeriod = Functions::flattenSingleValue($firstPeriod);
@@ -70,14 +70,17 @@ public static function AMORDEGRC(
             return $e->getMessage();
         }
 
-        $yearFrac = DateTimeExcel\YearFrac::fraction($purchased, $firstPeriod, $basis);
-        if (is_string($yearFrac)) {
-            return $yearFrac;
+        $yearFracx = DateTimeExcel\YearFrac::fraction($purchased, $firstPeriod, $basis);
+        if (is_string($yearFracx)) {
+            return $yearFracx;
         }
+        /** @var float $yearFrac */
+        $yearFrac = $yearFracx;
 
         $amortiseCoeff = self::getAmortizationCoefficient($rate);
 
         $rate *= $amortiseCoeff;
+        $rate = (float) (string) $rate; // ugly way to avoid rounding problem
         $fNRate = round($yearFrac * $rate * $cost, 0);
         $cost -= $fNRate;
         $fRest = $cost - $salvage;
@@ -87,13 +90,10 @@ public static function AMORDEGRC(
             $fRest -= $fNRate;
 
             if ($fRest < 0.0) {
-                switch ($period - $n) {
-                    case 0:
-                    case 1:
-                        return round($cost * 0.5, 0);
-                    default:
-                        return 0.0;
-                }
+                return match ($period - $n) {
+                    1 => round($cost * 0.5, 0),
+                    default => 0.0,
+                };
             }
             $cost -= $fNRate;
         }
@@ -127,14 +127,14 @@ public static function AMORDEGRC(
      * @return float|string (string containing the error type if there is an error)
      */
     public static function AMORLINC(
-        $cost,
-        $purchased,
-        $firstPeriod,
-        $salvage,
-        $period,
-        $rate,
-        $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
-    ) {
+        mixed $cost,
+        mixed $purchased,
+        mixed $firstPeriod,
+        mixed $salvage,
+        mixed $period,
+        mixed $rate,
+        mixed $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ): string|float {
         $cost = Functions::flattenSingleValue($cost);
         $purchased = Functions::flattenSingleValue($purchased);
         $firstPeriod = Functions::flattenSingleValue($firstPeriod);
@@ -161,14 +161,17 @@ public static function AMORLINC(
         $fCostDelta = $cost - $salvage;
         //    Note, quirky variation for leap years on the YEARFRAC for this function
         $purchasedYear = DateTimeExcel\DateParts::year($purchased);
-        $yearFrac = DateTimeExcel\YearFrac::fraction($purchased, $firstPeriod, $basis);
-        if (is_string($yearFrac)) {
-            return $yearFrac;
+        $yearFracx = DateTimeExcel\YearFrac::fraction($purchased, $firstPeriod, $basis);
+        if (is_string($yearFracx)) {
+            return $yearFracx;
         }
+        /** @var float $yearFrac */
+        $yearFrac = $yearFracx;
 
         if (
-            ($basis == FinancialConstants::BASIS_DAYS_PER_YEAR_ACTUAL) &&
-            ($yearFrac < 1) && (DateTimeExcel\Helpers::isLeapYear($purchasedYear))
+            $basis == FinancialConstants::BASIS_DAYS_PER_YEAR_ACTUAL
+            && $yearFrac < 1
+            && DateTimeExcel\Helpers::isLeapYear(Functions::scalar($purchasedYear))
         ) {
             $yearFrac *= 365 / 366;
         }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/CashFlowValidations.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/CashFlowValidations.php
index fde688605e..f5719b6992 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/CashFlowValidations.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/CashFlowValidations.php
@@ -5,51 +5,36 @@
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\Financial\Constants as FinancialConstants;
 use PhpOffice\PhpSpreadsheet\Calculation\Financial\FinancialValidations;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class CashFlowValidations extends FinancialValidations
 {
-    /**
-     * @param mixed $rate
-     */
-    public static function validateRate($rate): float
+    public static function validateRate(mixed $rate): float
     {
         $rate = self::validateFloat($rate);
-        if ($rate < 0.0) {
-            throw new Exception(Functions::NAN());
-        }
 
         return $rate;
     }
 
-    /**
-     * @param mixed $type
-     */
-    public static function validatePeriodType($type): int
+    public static function validatePeriodType(mixed $type): int
     {
         $rate = self::validateInt($type);
         if (
-            $type !== FinancialConstants::PAYMENT_END_OF_PERIOD &&
-            $type !== FinancialConstants::PAYMENT_BEGINNING_OF_PERIOD
+            $type !== FinancialConstants::PAYMENT_END_OF_PERIOD
+            && $type !== FinancialConstants::PAYMENT_BEGINNING_OF_PERIOD
         ) {
-            throw new Exception(Functions::NAN());
+            throw new Exception(ExcelError::NAN());
         }
 
         return $rate;
     }
 
-    /**
-     * @param mixed $presentValue
-     */
-    public static function validatePresentValue($presentValue): float
+    public static function validatePresentValue(mixed $presentValue): float
     {
         return self::validateFloat($presentValue);
     }
 
-    /**
-     * @param mixed $futureValue
-     */
-    public static function validateFutureValue($futureValue): float
+    public static function validateFutureValue(mixed $futureValue): float
     {
         return self::validateFloat($futureValue);
     }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic.php
index a9d9d0f5e0..08cef3ee99 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic.php
@@ -6,6 +6,7 @@
 use PhpOffice\PhpSpreadsheet\Calculation\Financial\CashFlow\CashFlowValidations;
 use PhpOffice\PhpSpreadsheet\Calculation\Financial\Constants as FinancialConstants;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class Periodic
 {
@@ -27,16 +28,14 @@ class Periodic
      * @param mixed $type A number 0 or 1 and indicates when payments are due:
      *                      0 or omitted    At the end of the period.
      *                      1               At the beginning of the period.
-     *
-     * @return float|string
      */
     public static function futureValue(
-        $rate,
-        $numberOfPeriods,
-        $payment = 0.0,
-        $presentValue = 0.0,
-        $type = FinancialConstants::PAYMENT_END_OF_PERIOD
-    ) {
+        mixed $rate,
+        mixed $numberOfPeriods,
+        mixed $payment = 0.0,
+        mixed $presentValue = 0.0,
+        mixed $type = FinancialConstants::PAYMENT_END_OF_PERIOD
+    ): string|float {
         $rate = Functions::flattenSingleValue($rate);
         $numberOfPeriods = Functions::flattenSingleValue($numberOfPeriods);
         $payment = ($payment === null) ? 0.0 : Functions::flattenSingleValue($payment);
@@ -44,7 +43,7 @@ public static function futureValue(
         $type = ($type === null) ? FinancialConstants::PAYMENT_END_OF_PERIOD : Functions::flattenSingleValue($type);
 
         try {
-            $rate = CashFlowValidations::validateFloat($rate);
+            $rate = CashFlowValidations::validateRate($rate);
             $numberOfPeriods = CashFlowValidations::validateInt($numberOfPeriods);
             $payment = CashFlowValidations::validateFloat($payment);
             $presentValue = CashFlowValidations::validatePresentValue($presentValue);
@@ -70,12 +69,12 @@ public static function futureValue(
      * @return float|string Result, or a string containing an error
      */
     public static function presentValue(
-        $rate,
-        $numberOfPeriods,
-        $payment = 0.0,
-        $futureValue = 0.0,
-        $type = FinancialConstants::PAYMENT_END_OF_PERIOD
-    ) {
+        mixed $rate,
+        mixed $numberOfPeriods,
+        mixed $payment = 0.0,
+        mixed $futureValue = 0.0,
+        mixed $type = FinancialConstants::PAYMENT_END_OF_PERIOD
+    ): string|float {
         $rate = Functions::flattenSingleValue($rate);
         $numberOfPeriods = Functions::flattenSingleValue($numberOfPeriods);
         $payment = ($payment === null) ? 0.0 : Functions::flattenSingleValue($payment);
@@ -94,7 +93,7 @@ public static function presentValue(
 
         // Validate parameters
         if ($numberOfPeriods < 0) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         return self::calculatePresentValue($rate, $numberOfPeriods, $payment, $futureValue, $type);
@@ -114,11 +113,11 @@ public static function presentValue(
      * @return float|string Result, or a string containing an error
      */
     public static function periods(
-        $rate,
-        $payment,
-        $presentValue,
-        $futureValue = 0.0,
-        $type = FinancialConstants::PAYMENT_END_OF_PERIOD
+        mixed $rate,
+        mixed $payment,
+        mixed $presentValue,
+        mixed $futureValue = 0.0,
+        mixed $type = FinancialConstants::PAYMENT_END_OF_PERIOD
     ) {
         $rate = Functions::flattenSingleValue($rate);
         $payment = Functions::flattenSingleValue($payment);
@@ -138,7 +137,7 @@ public static function periods(
 
         // Validate parameters
         if ($payment == 0.0) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         return self::calculatePeriods($rate, $payment, $presentValue, $futureValue, $type);
@@ -152,8 +151,8 @@ private static function calculateFutureValue(
         int $type
     ): float {
         if ($rate !== null && $rate != 0) {
-            return -$presentValue *
-                (1 + $rate) ** $numberOfPeriods - $payment * (1 + $rate * $type) * ((1 + $rate) ** $numberOfPeriods - 1)
+            return -$presentValue
+                * (1 + $rate) ** $numberOfPeriods - $payment * (1 + $rate * $type) * ((1 + $rate) ** $numberOfPeriods - 1)
                     / $rate;
         }
 
@@ -175,23 +174,20 @@ private static function calculatePresentValue(
         return -$futureValue - $payment * $numberOfPeriods;
     }
 
-    /**
-     * @return float|string
-     */
     private static function calculatePeriods(
         float $rate,
         float $payment,
         float $presentValue,
         float $futureValue,
         int $type
-    ) {
+    ): string|float {
         if ($rate != 0.0) {
             if ($presentValue == 0.0) {
-                return Functions::NAN();
+                return ExcelError::NAN();
             }
 
-            return log(($payment * (1 + $rate * $type) / $rate - $futureValue) /
-                    ($presentValue + $payment * (1 + $rate * $type) / $rate)) / log(1 + $rate);
+            return log(($payment * (1 + $rate * $type) / $rate - $futureValue)
+                    / ($presentValue + $payment * (1 + $rate * $type) / $rate)) / log(1 + $rate);
         }
 
         return (-$presentValue - $futureValue) / $payment;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/Cumulative.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/Cumulative.php
index b7f6011c31..9435909091 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/Cumulative.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/Cumulative.php
@@ -6,6 +6,7 @@
 use PhpOffice\PhpSpreadsheet\Calculation\Financial\CashFlow\CashFlowValidations;
 use PhpOffice\PhpSpreadsheet\Calculation\Financial\Constants as FinancialConstants;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class Cumulative
 {
@@ -26,17 +27,15 @@ class Cumulative
      * @param mixed $type A number 0 or 1 and indicates when payments are due:
      *                    0 or omitted    At the end of the period.
      *                    1               At the beginning of the period.
-     *
-     * @return float|string
      */
     public static function interest(
-        $rate,
-        $periods,
-        $presentValue,
-        $start,
-        $end,
-        $type = FinancialConstants::PAYMENT_END_OF_PERIOD
-    ) {
+        mixed $rate,
+        mixed $periods,
+        mixed $presentValue,
+        mixed $start,
+        mixed $end,
+        mixed $type = FinancialConstants::PAYMENT_END_OF_PERIOD
+    ): string|float|int {
         $rate = Functions::flattenSingleValue($rate);
         $periods = Functions::flattenSingleValue($periods);
         $presentValue = Functions::flattenSingleValue($presentValue);
@@ -57,7 +56,7 @@ public static function interest(
 
         // Validate parameters
         if ($start < 1 || $start > $end) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         // Calculate
@@ -91,17 +90,15 @@ public static function interest(
      * @param mixed $type A number 0 or 1 and indicates when payments are due:
      *                    0 or omitted    At the end of the period.
      *                    1               At the beginning of the period.
-     *
-     * @return float|string
      */
     public static function principal(
-        $rate,
-        $periods,
-        $presentValue,
-        $start,
-        $end,
-        $type = FinancialConstants::PAYMENT_END_OF_PERIOD
-    ) {
+        mixed $rate,
+        mixed $periods,
+        mixed $presentValue,
+        mixed $start,
+        mixed $end,
+        mixed $type = FinancialConstants::PAYMENT_END_OF_PERIOD
+    ): string|float|int {
         $rate = Functions::flattenSingleValue($rate);
         $periods = Functions::flattenSingleValue($periods);
         $presentValue = Functions::flattenSingleValue($presentValue);
@@ -122,7 +119,7 @@ public static function principal(
 
         // Validate parameters
         if ($start < 1 || $start > $end) {
-            return Functions::VALUE();
+            return ExcelError::VALUE();
         }
 
         // Calculate
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/Interest.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/Interest.php
index 56d2e37929..ad68ec133b 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/Interest.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/Interest.php
@@ -6,6 +6,7 @@
 use PhpOffice\PhpSpreadsheet\Calculation\Financial\CashFlow\CashFlowValidations;
 use PhpOffice\PhpSpreadsheet\Calculation\Financial\Constants as FinancialConstants;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class Interest
 {
@@ -28,17 +29,15 @@ class Interest
      * @param mixed $presentValue Present Value
      * @param mixed $futureValue Future Value
      * @param mixed $type Payment type: 0 = at the end of each period, 1 = at the beginning of each period
-     *
-     * @return float|string
      */
     public static function payment(
-        $interestRate,
-        $period,
-        $numberOfPeriods,
-        $presentValue,
-        $futureValue = 0,
-        $type = FinancialConstants::PAYMENT_END_OF_PERIOD
-    ) {
+        mixed $interestRate,
+        mixed $period,
+        mixed $numberOfPeriods,
+        mixed $presentValue,
+        mixed $futureValue = 0,
+        mixed $type = FinancialConstants::PAYMENT_END_OF_PERIOD
+    ): string|float {
         $interestRate = Functions::flattenSingleValue($interestRate);
         $period = Functions::flattenSingleValue($period);
         $numberOfPeriods = Functions::flattenSingleValue($numberOfPeriods);
@@ -59,7 +58,7 @@ public static function payment(
 
         // Validate parameters
         if ($period <= 0 || $period > $numberOfPeriods) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         // Calculate
@@ -88,7 +87,7 @@ public static function payment(
      * @param mixed $numberOfPeriods is the number of payments for the annuity
      * @param mixed $principleRemaining is the loan amount or present value of the payments
      */
-    public static function schedulePayment($interestRate, $period, $numberOfPeriods, $principleRemaining)
+    public static function schedulePayment(mixed $interestRate, mixed $period, mixed $numberOfPeriods, mixed $principleRemaining): string|float
     {
         $interestRate = Functions::flattenSingleValue($interestRate);
         $period = Functions::flattenSingleValue($period);
@@ -106,7 +105,7 @@ public static function schedulePayment($interestRate, $period, $numberOfPeriods,
 
         // Validate parameters
         if ($period <= 0 || $period > $numberOfPeriods) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         // Return value
@@ -149,17 +148,15 @@ public static function schedulePayment($interestRate, $period, $numberOfPeriods,
      *                      1               At the beginning of the period.
      * @param mixed $guess Your guess for what the rate will be.
      *                          If you omit guess, it is assumed to be 10 percent.
-     *
-     * @return float|string
      */
     public static function rate(
-        $numberOfPeriods,
-        $payment,
-        $presentValue,
-        $futureValue = 0.0,
-        $type = FinancialConstants::PAYMENT_END_OF_PERIOD,
-        $guess = 0.1
-    ) {
+        mixed $numberOfPeriods,
+        mixed $payment,
+        mixed $presentValue,
+        mixed $futureValue = 0.0,
+        mixed $type = FinancialConstants::PAYMENT_END_OF_PERIOD,
+        mixed $guess = 0.1
+    ): string|float {
         $numberOfPeriods = Functions::flattenSingleValue($numberOfPeriods);
         $payment = Functions::flattenSingleValue($payment);
         $presentValue = Functions::flattenSingleValue($presentValue);
@@ -168,7 +165,7 @@ public static function rate(
         $guess = ($guess === null) ? 0.1 : Functions::flattenSingleValue($guess);
 
         try {
-            $numberOfPeriods = CashFlowValidations::validateInt($numberOfPeriods);
+            $numberOfPeriods = CashFlowValidations::validateFloat($numberOfPeriods);
             $payment = CashFlowValidations::validateFloat($payment);
             $presentValue = CashFlowValidations::validatePresentValue($presentValue);
             $futureValue = CashFlowValidations::validateFutureValue($futureValue);
@@ -193,13 +190,13 @@ public static function rate(
             $rate = $rate1;
         }
 
-        return $close ? $rate : Functions::NAN();
+        return $close ? $rate : ExcelError::NAN();
     }
 
-    private static function rateNextGuess($rate, $numberOfPeriods, $payment, $presentValue, $futureValue, $type)
+    private static function rateNextGuess(float $rate, float $numberOfPeriods, float $payment, float $presentValue, float $futureValue, int $type): string|float
     {
         if ($rate == 0.0) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
         $tt1 = ($rate + 1) ** $numberOfPeriods;
         $tt2 = ($rate + 1) ** ($numberOfPeriods - 1);
@@ -208,7 +205,7 @@ private static function rateNextGuess($rate, $numberOfPeriods, $payment, $presen
             * ($rate * $type + 1) / ($rate * $rate) + $numberOfPeriods
             * $payment * $tt2 * ($rate * $type + 1) / $rate + $payment * ($tt1 - 1) * $type / $rate;
         if ($denominator == 0) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         return $numerator / $denominator;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/InterestAndPrincipal.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/InterestAndPrincipal.php
index ca989e0058..ea9abb9828 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/InterestAndPrincipal.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/InterestAndPrincipal.php
@@ -6,9 +6,9 @@
 
 class InterestAndPrincipal
 {
-    protected $interest;
+    protected float $interest;
 
-    protected $principal;
+    protected float $principal;
 
     public function __construct(
         float $rate = 0.0,
@@ -24,7 +24,7 @@ public function __construct(
         $principal = 0.0;
         for ($i = 1; $i <= $period; ++$i) {
             $interest = ($type === FinancialConstants::PAYMENT_BEGINNING_OF_PERIOD && $i == 1) ? 0 : -$capital * $rate;
-            $principal = $payment - $interest;
+            $principal = (float) $payment - $interest;
             $capital += $principal;
         }
 
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/Payments.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/Payments.php
index e103f92366..41e88f9a34 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/Payments.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/Payments.php
@@ -6,6 +6,7 @@
 use PhpOffice\PhpSpreadsheet\Calculation\Financial\CashFlow\CashFlowValidations;
 use PhpOffice\PhpSpreadsheet\Calculation\Financial\Constants as FinancialConstants;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class Payments
 {
@@ -23,12 +24,12 @@ class Payments
      * @return float|string Result, or a string containing an error
      */
     public static function annuity(
-        $interestRate,
-        $numberOfPeriods,
-        $presentValue,
-        $futureValue = 0,
-        $type = FinancialConstants::PAYMENT_END_OF_PERIOD
-    ) {
+        mixed $interestRate,
+        mixed $numberOfPeriods,
+        mixed $presentValue,
+        mixed $futureValue = 0,
+        mixed $type = FinancialConstants::PAYMENT_END_OF_PERIOD
+    ): string|float {
         $interestRate = Functions::flattenSingleValue($interestRate);
         $numberOfPeriods = Functions::flattenSingleValue($numberOfPeriods);
         $presentValue = Functions::flattenSingleValue($presentValue);
@@ -47,8 +48,8 @@ public static function annuity(
 
         // Calculate
         if ($interestRate != 0.0) {
-            return (-$futureValue - $presentValue * (1 + $interestRate) ** $numberOfPeriods) /
-                (1 + $interestRate * $type) / (((1 + $interestRate) ** $numberOfPeriods - 1) / $interestRate);
+            return (-$futureValue - $presentValue * (1 + $interestRate) ** $numberOfPeriods)
+                / (1 + $interestRate * $type) / (((1 + $interestRate) ** $numberOfPeriods - 1) / $interestRate);
         }
 
         return (-$presentValue - $futureValue) / $numberOfPeriods;
@@ -70,13 +71,13 @@ public static function annuity(
      * @return float|string Result, or a string containing an error
      */
     public static function interestPayment(
-        $interestRate,
-        $period,
-        $numberOfPeriods,
-        $presentValue,
-        $futureValue = 0,
-        $type = FinancialConstants::PAYMENT_END_OF_PERIOD
-    ) {
+        mixed $interestRate,
+        mixed $period,
+        mixed $numberOfPeriods,
+        mixed $presentValue,
+        mixed $futureValue = 0,
+        mixed $type = FinancialConstants::PAYMENT_END_OF_PERIOD
+    ): string|float {
         $interestRate = Functions::flattenSingleValue($interestRate);
         $period = Functions::flattenSingleValue($period);
         $numberOfPeriods = Functions::flattenSingleValue($numberOfPeriods);
@@ -97,7 +98,7 @@ public static function interestPayment(
 
         // Validate parameters
         if ($period <= 0 || $period > $numberOfPeriods) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         // Calculate
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Single.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Single.php
index a30634da3b..6f60a2af18 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Single.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Single.php
@@ -4,6 +4,7 @@
 
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class Single
 {
@@ -18,10 +19,8 @@ class Single
      *
      * @param mixed $principal the present value
      * @param float[] $schedule an array of interest rates to apply
-     *
-     * @return float|string
      */
-    public static function futureValue($principal, $schedule)
+    public static function futureValue(mixed $principal, array $schedule): string|float
     {
         $principal = Functions::flattenSingleValue($principal);
         $schedule = Functions::flattenArray($schedule);
@@ -51,7 +50,7 @@ public static function futureValue($principal, $schedule)
      *
      * @return float|string Result, or a string containing an error
      */
-    public static function periods($rate, $presentValue, $futureValue)
+    public static function periods(mixed $rate, mixed $presentValue, mixed $futureValue): string|float
     {
         $rate = Functions::flattenSingleValue($rate);
         $presentValue = Functions::flattenSingleValue($presentValue);
@@ -67,7 +66,7 @@ public static function periods($rate, $presentValue, $futureValue)
 
         // Validate parameters
         if ($rate <= 0.0 || $presentValue <= 0.0 || $futureValue <= 0.0) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         return (log($futureValue) - log($presentValue)) / log(1 + $rate);
@@ -78,13 +77,13 @@ public static function periods($rate, $presentValue, $futureValue)
      *
      * Calculates the interest rate required for an investment to grow to a specified future value .
      *
-     * @param float $periods The number of periods over which the investment is made
-     * @param float $presentValue Present Value
-     * @param float $futureValue Future Value
+     * @param array|float $periods The number of periods over which the investment is made
+     * @param array|float $presentValue Present Value
+     * @param array|float $futureValue Future Value
      *
      * @return float|string Result, or a string containing an error
      */
-    public static function interestRate($periods = 0.0, $presentValue = 0.0, $futureValue = 0.0)
+    public static function interestRate(array|float $periods = 0.0, array|float $presentValue = 0.0, array|float $futureValue = 0.0): string|float
     {
         $periods = Functions::flattenSingleValue($periods);
         $presentValue = Functions::flattenSingleValue($presentValue);
@@ -100,7 +99,7 @@ public static function interestRate($periods = 0.0, $presentValue = 0.0, $future
 
         // Validate parameters
         if ($periods <= 0.0 || $presentValue <= 0.0 || $futureValue < 0.0) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         return ($futureValue / $presentValue) ** (1 / $periods) - 1;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/NonPeriodic.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/NonPeriodic.php
index 6a32bdfcf3..8c6f615b87 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/NonPeriodic.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/NonPeriodic.php
@@ -5,6 +5,7 @@
 use PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class NonPeriodic
 {
@@ -12,6 +13,8 @@ class NonPeriodic
 
     const FINANCIAL_PRECISION = 1.0e-08;
 
+    const DEFAULT_GUESS = 0.1;
+
     /**
      * XIRR.
      *
@@ -25,43 +28,73 @@ class NonPeriodic
      * @param mixed[] $dates      A series of payment dates
      *                                The first payment date indicates the beginning of the schedule of payments
      *                                All other dates must be later than this date, but they may occur in any order
-     * @param float $guess        An optional guess at the expected answer
-     *
-     * @return float|string
+     * @param mixed $guess        An optional guess at the expected answer
      */
-    public static function rate($values, $dates, $guess = 0.1)
+    public static function rate(array $values, array $dates, mixed $guess = self::DEFAULT_GUESS): float|string
     {
         $rslt = self::xirrPart1($values, $dates);
-        if ($rslt) {
+        if ($rslt !== '') {
             return $rslt;
         }
 
         // create an initial range, with a root somewhere between 0 and guess
-        $guess = Functions::flattenSingleValue($guess);
+        $guess = Functions::flattenSingleValue($guess) ?? self::DEFAULT_GUESS;
+        if (!is_numeric($guess)) {
+            return ExcelError::VALUE();
+        }
+        $guess = ($guess + 0.0) ?: self::DEFAULT_GUESS;
         $x1 = 0.0;
-        $x2 = $guess ?: 0.1;
+        $x2 = $guess + 0.0;
         $f1 = self::xnpvOrdered($x1, $values, $dates, false);
         $f2 = self::xnpvOrdered($x2, $values, $dates, false);
         $found = false;
         for ($i = 0; $i < self::FINANCIAL_MAX_ITERATIONS; ++$i) {
-            if (!is_numeric($f1) || !is_numeric($f2)) {
-                break;
+            if (!is_numeric($f1)) {
+                return $f1;
+            }
+            if (!is_numeric($f2)) {
+                return $f2;
             }
+            $f1 = (float) $f1;
+            $f2 = (float) $f2;
             if (($f1 * $f2) < 0.0) {
                 $found = true;
 
                 break;
             } elseif (abs($f1) < abs($f2)) {
-                $f1 = self::xnpvOrdered($x1 += 1.6 * ($x1 - $x2), $values, $dates, false);
+                $x1 += 1.6 * ($x1 - $x2);
+                $f1 = self::xnpvOrdered($x1, $values, $dates, false);
             } else {
-                $f2 = self::xnpvOrdered($x2 += 1.6 * ($x2 - $x1), $values, $dates, false);
+                $x2 += 1.6 * ($x2 - $x1);
+                $f2 = self::xnpvOrdered($x2, $values, $dates, false);
+            }
+        }
+        if ($found) {
+            return self::xirrPart3($values, $dates, $x1, $x2);
+        }
+
+        // Newton-Raphson didn't work - try bisection
+        $x1 = $guess - 0.5;
+        $x2 = $guess + 0.5;
+        for ($i = 0; $i < self::FINANCIAL_MAX_ITERATIONS; ++$i) {
+            $f1 = self::xnpvOrdered($x1, $values, $dates, false, true);
+            $f2 = self::xnpvOrdered($x2, $values, $dates, false, true);
+            if (!is_numeric($f1) || !is_numeric($f2)) {
+                break;
+            }
+            if ($f1 * $f2 <= 0) {
+                $found = true;
+
+                break;
             }
+            $x1 -= 0.5;
+            $x2 += 0.5;
         }
-        if (!$found) {
-            return Functions::NAN();
+        if ($found) {
+            return self::xirrBisection($values, $dates, $x1, $x2);
         }
 
-        return self::xirrPart3($values, $dates, $x1, $x2);
+        return ExcelError::NAN();
     }
 
     /**
@@ -73,7 +106,7 @@ public static function rate($values, $dates, $guess = 0.1)
      * Excel Function:
      *        =XNPV(rate,values,dates)
      *
-     * @param float $rate the discount rate to apply to the cash flows
+     * @param array|float $rate the discount rate to apply to the cash flows
      * @param float[] $values A series of cash flows that corresponds to a schedule of payments in dates.
      *                          The first payment is optional and corresponds to a cost or payment that occurs
      *                              at the beginning of the investment.
@@ -83,28 +116,28 @@ public static function rate($values, $dates, $guess = 0.1)
      * @param mixed[] $dates A schedule of payment dates that corresponds to the cash flow payments.
      *                         The first payment date indicates the beginning of the schedule of payments.
      *                         All other dates must be later than this date, but they may occur in any order.
-     *
-     * @return float|string
      */
-    public static function presentValue($rate, $values, $dates)
+    public static function presentValue(array|float $rate, array $values, array $dates): float|string
     {
         return self::xnpvOrdered($rate, $values, $dates, true);
     }
 
-    private static function bothNegAndPos($neg, $pos)
+    private static function bothNegAndPos(bool $neg, bool $pos): bool
     {
         return $neg && $pos;
     }
 
-    private static function xirrPart1(&$values, &$dates)
+    private static function xirrPart1(mixed &$values, mixed &$dates): string
     {
-        if ((!is_array($values)) && (!is_array($dates))) {
-            return Functions::NA();
-        }
         $values = Functions::flattenArray($values);
         $dates = Functions::flattenArray($dates);
+        $valuesIsArray = count($values) > 1;
+        $datesIsArray = count($dates) > 1;
+        if (!$valuesIsArray && !$datesIsArray) {
+            return ExcelError::NA();
+        }
         if (count($values) != count($dates)) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         $datesCount = count($dates);
@@ -119,7 +152,7 @@ private static function xirrPart1(&$values, &$dates)
         return self::xirrPart2($values);
     }
 
-    private static function xirrPart2(&$values)
+    private static function xirrPart2(array &$values): string
     {
         $valCount = count($values);
         $foundpos = false;
@@ -127,7 +160,7 @@ private static function xirrPart2(&$values)
         for ($i = 0; $i < $valCount; ++$i) {
             $fld = $values[$i];
             if (!is_numeric($fld)) {
-                return Functions::VALUE();
+                return ExcelError::VALUE();
             } elseif ($fld > 0) {
                 $foundpos = true;
             } elseif ($fld < 0) {
@@ -135,13 +168,13 @@ private static function xirrPart2(&$values)
             }
         }
         if (!self::bothNegAndPos($foundneg, $foundpos)) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         return '';
     }
 
-    private static function xirrPart3($values, $dates, $x1, $x2)
+    private static function xirrPart3(array $values, array $dates, float $x1, float $x2): float|string
     {
         $f = self::xnpvOrdered($x1, $values, $dates, false);
         if ($f < 0.0) {
@@ -152,11 +185,11 @@ private static function xirrPart3($values, $dates, $x1, $x2)
             $dx = $x1 - $x2;
         }
 
-        $rslt = Functions::VALUE();
+        $rslt = ExcelError::VALUE();
         for ($i = 0; $i < self::FINANCIAL_MAX_ITERATIONS; ++$i) {
             $dx *= 0.5;
             $x_mid = $rtb + $dx;
-            $f_mid = self::xnpvOrdered($x_mid, $values, $dates, false);
+            $f_mid = (float) self::xnpvOrdered($x_mid, $values, $dates, false);
             if ($f_mid <= 0.0) {
                 $rtb = $x_mid;
             }
@@ -170,7 +203,43 @@ private static function xirrPart3($values, $dates, $x1, $x2)
         return $rslt;
     }
 
-    private static function xnpvOrdered($rate, $values, $dates, $ordered = true)
+    private static function xirrBisection(array $values, array $dates, float $x1, float $x2): string|float
+    {
+        $rslt = ExcelError::NAN();
+        for ($i = 0; $i < self::FINANCIAL_MAX_ITERATIONS; ++$i) {
+            $rslt = ExcelError::NAN();
+            $f1 = self::xnpvOrdered($x1, $values, $dates, false, true);
+            $f2 = self::xnpvOrdered($x2, $values, $dates, false, true);
+            if (!is_numeric($f1) || !is_numeric($f2)) {
+                break;
+            }
+            $f1 = (float) $f1;
+            $f2 = (float) $f2;
+            if (abs($f1) < self::FINANCIAL_PRECISION && abs($f2) < self::FINANCIAL_PRECISION) {
+                break;
+            }
+            if ($f1 * $f2 > 0) {
+                break;
+            }
+            $rslt = ($x1 + $x2) / 2;
+            $f3 = self::xnpvOrdered($rslt, $values, $dates, false, true);
+            if (!is_float($f3)) {
+                break;
+            }
+            if ($f3 * $f1 < 0) {
+                $x2 = $rslt;
+            } else {
+                $x1 = $rslt;
+            }
+            if (abs($f3) < self::FINANCIAL_PRECISION) {
+                break;
+            }
+        }
+
+        return $rslt;
+    }
+
+    private static function xnpvOrdered(mixed $rate, mixed $values, mixed $dates, bool $ordered = true, bool $capAtNegative1 = false): float|string
     {
         $rate = Functions::flattenSingleValue($rate);
         $values = Functions::flattenArray($values);
@@ -179,6 +248,9 @@ private static function xnpvOrdered($rate, $values, $dates, $ordered = true)
 
         try {
             self::validateXnpv($rate, $values, $dates);
+            if ($capAtNegative1 && $rate <= -1) {
+                $rate = -1.0 + 1.0E-10;
+            }
             $date0 = DateTimeExcel\Helpers::getDateValue($dates[0]);
         } catch (Exception $e) {
             return $e->getMessage();
@@ -187,7 +259,7 @@ private static function xnpvOrdered($rate, $values, $dates, $ordered = true)
         $xnpv = 0.0;
         for ($i = 0; $i < $valCount; ++$i) {
             if (!is_numeric($values[$i])) {
-                return Functions::VALUE();
+                return ExcelError::VALUE();
             }
 
             try {
@@ -196,30 +268,34 @@ private static function xnpvOrdered($rate, $values, $dates, $ordered = true)
                 return $e->getMessage();
             }
             if ($date0 > $datei) {
-                $dif = $ordered ? Functions::NAN() : -((int) DateTimeExcel\Difference::interval($datei, $date0, 'd'));
+                $dif = $ordered ? ExcelError::NAN() : -((int) DateTimeExcel\Difference::interval($datei, $date0, 'd'));
             } else {
-                $dif = DateTimeExcel\Difference::interval($date0, $datei, 'd');
+                $dif = Functions::scalar(DateTimeExcel\Difference::interval($date0, $datei, 'd'));
             }
             if (!is_numeric($dif)) {
                 return $dif;
             }
-            $xnpv += $values[$i] / (1 + $rate) ** ($dif / 365);
+            if ($rate <= -1.0) {
+                $xnpv += -abs($values[$i]) / (-1 - $rate) ** ($dif / 365);
+            } else {
+                $xnpv += $values[$i] / (1 + $rate) ** ($dif / 365);
+            }
         }
 
-        return is_finite($xnpv) ? $xnpv : Functions::VALUE();
+        return is_finite($xnpv) ? $xnpv : ExcelError::VALUE();
     }
 
-    private static function validateXnpv($rate, $values, $dates): void
+    private static function validateXnpv(mixed $rate, array $values, array $dates): void
     {
         if (!is_numeric($rate)) {
-            throw new Exception(Functions::VALUE());
+            throw new Exception(ExcelError::VALUE());
         }
         $valCount = count($values);
         if ($valCount != count($dates)) {
-            throw new Exception(Functions::NAN());
+            throw new Exception(ExcelError::NAN());
         }
         if ($valCount > 1 && ((min($values) > 0) || (max($values) < 0))) {
-            throw new Exception(Functions::NAN());
+            throw new Exception(ExcelError::NAN());
         }
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/Periodic.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/Periodic.php
index c42df0c39e..21e537be2d 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/Periodic.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/Periodic.php
@@ -3,6 +3,7 @@
 namespace PhpOffice\PhpSpreadsheet\Calculation\Financial\CashFlow\Variable;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class Periodic
 {
@@ -27,13 +28,11 @@ class Periodic
      *                                Values must contain at least one positive value and one negative value to
      *                                    calculate the internal rate of return.
      * @param mixed $guess A number that you guess is close to the result of IRR
-     *
-     * @return float|string
      */
-    public static function rate($values, $guess = 0.1)
+    public static function rate(mixed $values, mixed $guess = 0.1): string|float
     {
         if (!is_array($values)) {
-            return Functions::VALUE();
+            return ExcelError::VALUE();
         }
         $values = Functions::flattenArray($values);
         $guess = Functions::flattenSingleValue($guess);
@@ -54,7 +53,7 @@ public static function rate($values, $guess = 0.1)
             }
         }
         if (($f1 * $f2) > 0.0) {
-            return Functions::VALUE();
+            return ExcelError::VALUE();
         }
 
         $f = self::presentValue($x1, $values);
@@ -78,7 +77,7 @@ public static function rate($values, $guess = 0.1)
             }
         }
 
-        return Functions::VALUE();
+        return ExcelError::VALUE();
     }
 
     /**
@@ -98,10 +97,10 @@ public static function rate($values, $guess = 0.1)
      *
      * @return float|string Result, or a string containing an error
      */
-    public static function modifiedRate($values, $financeRate, $reinvestmentRate)
+    public static function modifiedRate(mixed $values, mixed $financeRate, mixed $reinvestmentRate): string|float
     {
         if (!is_array($values)) {
-            return Functions::VALUE();
+            return ExcelError::DIV0();
         }
         $values = Functions::flattenArray($values);
         $financeRate = Functions::flattenSingleValue($financeRate);
@@ -120,14 +119,14 @@ public static function modifiedRate($values, $financeRate, $reinvestmentRate)
             }
         }
 
-        if (($npvNeg === 0.0) || ($npvPos === 0.0) || ($reinvestmentRate <= -1.0)) {
-            return Functions::VALUE();
+        if ($npvNeg === 0.0 || $npvPos === 0.0) {
+            return ExcelError::DIV0();
         }
 
         $mirr = ((-$npvPos * $rr ** $n)
                 / ($npvNeg * ($rr))) ** (1.0 / ($n - 1)) - 1.0;
 
-        return is_finite($mirr) ? $mirr : Functions::VALUE();
+        return is_finite($mirr) ? $mirr : ExcelError::NAN();
     }
 
     /**
@@ -135,11 +134,9 @@ public static function modifiedRate($values, $financeRate, $reinvestmentRate)
      *
      * Returns the Net Present Value of a cash flow series given a discount rate.
      *
-     * @param mixed $rate
-     *
-     * @return float
+     * @param array $args
      */
-    public static function presentValue($rate, ...$args)
+    public static function presentValue(mixed $rate, ...$args): int|float
     {
         $returnValue = 0;
 
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Coupons.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Coupons.php
index 3fd6c1d2de..c2fcab39b1 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Coupons.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Coupons.php
@@ -7,6 +7,7 @@
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\Financial\Constants as FinancialConstants;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Shared\Date;
 
 class Coupons
@@ -38,15 +39,13 @@ class Coupons
      *                         2               Actual/360
      *                         3               Actual/365
      *                         4               European 30/360
-     *
-     * @return float|string
      */
     public static function COUPDAYBS(
-        $settlement,
-        $maturity,
-        $frequency,
-        $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
-    ) {
+        mixed $settlement,
+        mixed $maturity,
+        mixed $frequency,
+        mixed $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ): string|int|float {
         $settlement = Functions::flattenSingleValue($settlement);
         $maturity = Functions::flattenSingleValue($maturity);
         $frequency = Functions::flattenSingleValue($frequency);
@@ -64,9 +63,9 @@ public static function COUPDAYBS(
             return $e->getMessage();
         }
 
-        $daysPerYear = Helpers::daysPerYear(DateTimeExcel\DateParts::year($settlement), $basis);
+        $daysPerYear = Helpers::daysPerYear(Functions::scalar(DateTimeExcel\DateParts::year($settlement)), $basis);
         if (is_string($daysPerYear)) {
-            return Functions::VALUE();
+            return ExcelError::VALUE();
         }
         $prev = self::couponFirstPeriodDate($settlement, $maturity, $frequency, self::PERIOD_DATE_PREVIOUS);
 
@@ -101,15 +100,13 @@ public static function COUPDAYBS(
      *                         2               Actual/360
      *                         3               Actual/365
      *                         4               European 30/360
-     *
-     * @return float|string
      */
     public static function COUPDAYS(
-        $settlement,
-        $maturity,
-        $frequency,
-        $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
-    ) {
+        mixed $settlement,
+        mixed $maturity,
+        mixed $frequency,
+        mixed $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ): string|int|float {
         $settlement = Functions::flattenSingleValue($settlement);
         $maturity = Functions::flattenSingleValue($maturity);
         $frequency = Functions::flattenSingleValue($frequency);
@@ -134,7 +131,7 @@ public static function COUPDAYS(
             case FinancialConstants::BASIS_DAYS_PER_YEAR_ACTUAL:
                 // Actual/actual
                 if ($frequency == FinancialConstants::FREQUENCY_ANNUAL) {
-                    $daysPerYear = Helpers::daysPerYear(DateTimeExcel\DateParts::year($settlement), $basis);
+                    $daysPerYear = (int) Helpers::daysPerYear(Functions::scalar(DateTimeExcel\DateParts::year($settlement)), $basis);
 
                     return $daysPerYear / $frequency;
                 }
@@ -172,15 +169,13 @@ public static function COUPDAYS(
      *                         2               Actual/360
      *                         3               Actual/365
      *                         4               European 30/360
-     *
-     * @return float|string
      */
     public static function COUPDAYSNC(
-        $settlement,
-        $maturity,
-        $frequency,
-        $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
-    ) {
+        mixed $settlement,
+        mixed $maturity,
+        mixed $frequency,
+        mixed $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ): string|float {
         $settlement = Functions::flattenSingleValue($settlement);
         $maturity = Functions::flattenSingleValue($maturity);
         $frequency = Functions::flattenSingleValue($frequency);
@@ -198,7 +193,8 @@ public static function COUPDAYSNC(
             return $e->getMessage();
         }
 
-        $daysPerYear = Helpers::daysPerYear(DateTimeExcel\DateParts::year($settlement), $basis);
+        /** @var int $daysPerYear */
+        $daysPerYear = Helpers::daysPerYear(Functions::Scalar(DateTimeExcel\DateParts::year($settlement)), $basis);
         $next = self::couponFirstPeriodDate($settlement, $maturity, $frequency, self::PERIOD_DATE_NEXT);
 
         if ($basis === FinancialConstants::BASIS_DAYS_PER_YEAR_NASD) {
@@ -237,15 +233,14 @@ public static function COUPDAYSNC(
      *                         3               Actual/365
      *                         4               European 30/360
      *
-     * @return mixed Excel date/time serial value, PHP date/time serial value or PHP date/time object,
-     *                     depending on the value of the ReturnDateType flag
+     * @return float|string Excel date/time serial value or error message
      */
     public static function COUPNCD(
-        $settlement,
-        $maturity,
-        $frequency,
-        $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
-    ) {
+        mixed $settlement,
+        mixed $maturity,
+        mixed $frequency,
+        mixed $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ): string|float {
         $settlement = Functions::flattenSingleValue($settlement);
         $maturity = Functions::flattenSingleValue($maturity);
         $frequency = Functions::flattenSingleValue($frequency);
@@ -258,7 +253,7 @@ public static function COUPNCD(
             $maturity = FinancialValidations::validateMaturityDate($maturity);
             self::validateCouponPeriod($settlement, $maturity);
             $frequency = FinancialValidations::validateFrequency($frequency);
-            $basis = FinancialValidations::validateBasis($basis);
+            FinancialValidations::validateBasis($basis);
         } catch (Exception $e) {
             return $e->getMessage();
         }
@@ -291,15 +286,13 @@ public static function COUPNCD(
      *                         2               Actual/360
      *                         3               Actual/365
      *                         4               European 30/360
-     *
-     * @return int|string
      */
     public static function COUPNUM(
-        $settlement,
-        $maturity,
-        $frequency,
-        $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
-    ) {
+        mixed $settlement,
+        mixed $maturity,
+        mixed $frequency,
+        mixed $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ): string|int {
         $settlement = Functions::flattenSingleValue($settlement);
         $maturity = Functions::flattenSingleValue($maturity);
         $frequency = Functions::flattenSingleValue($frequency);
@@ -312,7 +305,7 @@ public static function COUPNUM(
             $maturity = FinancialValidations::validateMaturityDate($maturity);
             self::validateCouponPeriod($settlement, $maturity);
             $frequency = FinancialValidations::validateFrequency($frequency);
-            $basis = FinancialValidations::validateBasis($basis);
+            FinancialValidations::validateBasis($basis);
         } catch (Exception $e) {
             return $e->getMessage();
         }
@@ -351,15 +344,14 @@ public static function COUPNUM(
      *                         3               Actual/365
      *                         4               European 30/360
      *
-     * @return mixed Excel date/time serial value, PHP date/time serial value or PHP date/time object,
-     *                     depending on the value of the ReturnDateType flag
+     * @return float|string Excel date/time serial value or error message
      */
     public static function COUPPCD(
-        $settlement,
-        $maturity,
-        $frequency,
-        $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
-    ) {
+        mixed $settlement,
+        mixed $maturity,
+        mixed $frequency,
+        mixed $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ): string|float {
         $settlement = Functions::flattenSingleValue($settlement);
         $maturity = Functions::flattenSingleValue($maturity);
         $frequency = Functions::flattenSingleValue($frequency);
@@ -372,7 +364,7 @@ public static function COUPPCD(
             $maturity = FinancialValidations::validateMaturityDate($maturity);
             self::validateCouponPeriod($settlement, $maturity);
             $frequency = FinancialValidations::validateFrequency($frequency);
-            $basis = FinancialValidations::validateBasis($basis);
+            FinancialValidations::validateBasis($basis);
         } catch (Exception $e) {
             return $e->getMessage();
         }
@@ -409,7 +401,7 @@ private static function couponFirstPeriodDate(float $settlement, float $maturity
     private static function validateCouponPeriod(float $settlement, float $maturity): void
     {
         if ($settlement >= $maturity) {
-            throw new Exception(Functions::NAN());
+            throw new Exception(ExcelError::NAN());
         }
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Depreciation.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Depreciation.php
index 650a4861b2..6ef1899957 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Depreciation.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Depreciation.php
@@ -4,9 +4,12 @@
 
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class Depreciation
 {
+    private static float $zeroPointZero = 0.0;
+
     /**
      * DB.
      *
@@ -29,10 +32,8 @@ class Depreciation
      *                          depreciation. Period must use the same units as life.
      * @param mixed $month Number of months in the first year. If month is omitted,
      *                         it defaults to 12.
-     *
-     * @return float|string
      */
-    public static function DB($cost, $salvage, $life, $period, $month = 12)
+    public static function DB(mixed $cost, mixed $salvage, mixed $life, mixed $period, mixed $month = 12): string|float|int
     {
         $cost = Functions::flattenSingleValue($cost);
         $salvage = Functions::flattenSingleValue($salvage);
@@ -50,7 +51,7 @@ public static function DB($cost, $salvage, $life, $period, $month = 12)
             return $e->getMessage();
         }
 
-        if ($cost === 0.0) {
+        if ($cost === self::$zeroPointZero) {
             return 0.0;
         }
 
@@ -95,10 +96,8 @@ public static function DB($cost, $salvage, $life, $period, $month = 12)
      * @param mixed $factor The rate at which the balance declines.
      *                                If factor is omitted, it is assumed to be 2 (the
      *                                double-declining balance method).
-     *
-     * @return float|string
      */
-    public static function DDB($cost, $salvage, $life, $period, $factor = 2.0)
+    public static function DDB(mixed $cost, mixed $salvage, mixed $life, mixed $period, mixed $factor = 2.0): float|string
     {
         $cost = Functions::flattenSingleValue($cost);
         $salvage = Functions::flattenSingleValue($salvage);
@@ -117,7 +116,7 @@ public static function DDB($cost, $salvage, $life, $period, $factor = 2.0)
         }
 
         if ($period > $life) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         // Loop through each period calculating the depreciation
@@ -146,7 +145,7 @@ public static function DDB($cost, $salvage, $life, $period, $factor = 2.0)
      *
      * @return float|string Result, or a string containing an error
      */
-    public static function SLN($cost, $salvage, $life)
+    public static function SLN(mixed $cost, mixed $salvage, mixed $life): string|float
     {
         $cost = Functions::flattenSingleValue($cost);
         $salvage = Functions::flattenSingleValue($salvage);
@@ -160,8 +159,8 @@ public static function SLN($cost, $salvage, $life)
             return $e->getMessage();
         }
 
-        if ($life === 0.0) {
-            return Functions::DIV0();
+        if ($life === self::$zeroPointZero) {
+            return ExcelError::DIV0();
         }
 
         return ($cost - $salvage) / $life;
@@ -179,7 +178,7 @@ public static function SLN($cost, $salvage, $life)
      *
      * @return float|string Result, or a string containing an error
      */
-    public static function SYD($cost, $salvage, $life, $period)
+    public static function SYD(mixed $cost, mixed $salvage, mixed $life, mixed $period): string|float
     {
         $cost = Functions::flattenSingleValue($cost);
         $salvage = Functions::flattenSingleValue($salvage);
@@ -196,7 +195,7 @@ public static function SYD($cost, $salvage, $life, $period)
         }
 
         if ($period > $life) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         $syd = (($cost - $salvage) * ($life - $period + 1) * 2) / ($life * ($life + 1));
@@ -204,61 +203,61 @@ public static function SYD($cost, $salvage, $life, $period)
         return $syd;
     }
 
-    private static function validateCost($cost, bool $negativeValueAllowed = false): float
+    private static function validateCost(mixed $cost, bool $negativeValueAllowed = false): float
     {
         $cost = FinancialValidations::validateFloat($cost);
         if ($cost < 0.0 && $negativeValueAllowed === false) {
-            throw new Exception(Functions::NAN());
+            throw new Exception(ExcelError::NAN());
         }
 
         return $cost;
     }
 
-    private static function validateSalvage($salvage, bool $negativeValueAllowed = false): float
+    private static function validateSalvage(mixed $salvage, bool $negativeValueAllowed = false): float
     {
         $salvage = FinancialValidations::validateFloat($salvage);
         if ($salvage < 0.0 && $negativeValueAllowed === false) {
-            throw new Exception(Functions::NAN());
+            throw new Exception(ExcelError::NAN());
         }
 
         return $salvage;
     }
 
-    private static function validateLife($life, bool $negativeValueAllowed = false): float
+    private static function validateLife(mixed $life, bool $negativeValueAllowed = false): float
     {
         $life = FinancialValidations::validateFloat($life);
         if ($life < 0.0 && $negativeValueAllowed === false) {
-            throw new Exception(Functions::NAN());
+            throw new Exception(ExcelError::NAN());
         }
 
         return $life;
     }
 
-    private static function validatePeriod($period, bool $negativeValueAllowed = false): float
+    private static function validatePeriod(mixed $period, bool $negativeValueAllowed = false): float
     {
         $period = FinancialValidations::validateFloat($period);
         if ($period <= 0.0 && $negativeValueAllowed === false) {
-            throw new Exception(Functions::NAN());
+            throw new Exception(ExcelError::NAN());
         }
 
         return $period;
     }
 
-    private static function validateMonth($month): int
+    private static function validateMonth(mixed $month): int
     {
         $month = FinancialValidations::validateInt($month);
         if ($month < 1) {
-            throw new Exception(Functions::NAN());
+            throw new Exception(ExcelError::NAN());
         }
 
         return $month;
     }
 
-    private static function validateFactor($factor): float
+    private static function validateFactor(mixed $factor): float
     {
         $factor = FinancialValidations::validateFloat($factor);
         if ($factor <= 0.0) {
-            throw new Exception(Functions::NAN());
+            throw new Exception(ExcelError::NAN());
         }
 
         return $factor;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Dollar.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Dollar.php
index 7bebb39178..b0581f66c8 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Dollar.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Dollar.php
@@ -2,23 +2,33 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Financial;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Calculation\TextData\Format;
 
 class Dollar
 {
+    use ArrayEnabled;
+
     /**
      * DOLLAR.
      *
      * This function converts a number to text using currency format, with the decimals rounded to the specified place.
      * The format used is $#,##0.00_);($#,##0.00)..
      *
-     * @param mixed $number The value to format
+     * @param mixed $number The value to format, or can be an array of numbers
+     *                         Or can be an array of values
      * @param mixed $precision The number of digits to display to the right of the decimal point (as an integer).
      *                            If precision is negative, number is rounded to the left of the decimal point.
      *                            If you omit precision, it is assumed to be 2
+     *              Or can be an array of precision values
+     *
+     * @return array|string If an array of values is passed for either of the arguments, then the returned result
+     *            will also be an array with matching dimensions
      */
-    public static function format($number, $precision = 2): string
+    public static function format(mixed $number, mixed $precision = 2)
     {
         return Format::DOLLAR($number, $precision);
     }
@@ -34,25 +44,35 @@ public static function format($number, $precision = 2): string
      *        DOLLARDE(fractional_dollar,fraction)
      *
      * @param mixed $fractionalDollar Fractional Dollar
+     *              Or can be an array of values
      * @param mixed $fraction Fraction
-     *
-     * @return float|string
+     *              Or can be an array of values
      */
-    public static function decimal($fractionalDollar = null, $fraction = 0)
+    public static function decimal(mixed $fractionalDollar = null, mixed $fraction = 0): array|string|float
     {
-        $fractionalDollar = Functions::flattenSingleValue($fractionalDollar);
-        $fraction = (int) Functions::flattenSingleValue($fraction);
+        if (is_array($fractionalDollar) || is_array($fraction)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $fractionalDollar, $fraction);
+        }
+
+        try {
+            $fractionalDollar = FinancialValidations::validateFloat(
+                Functions::flattenSingleValue($fractionalDollar) ?? 0.0
+            );
+            $fraction = FinancialValidations::validateInt(Functions::flattenSingleValue($fraction));
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
 
-        // Validate parameters
-        if ($fractionalDollar === null || $fraction < 0) {
-            return Functions::NAN();
+        // Additional parameter validations
+        if ($fraction < 0) {
+            return ExcelError::NAN();
         }
         if ($fraction == 0) {
-            return Functions::DIV0();
+            return ExcelError::DIV0();
         }
 
-        $dollars = floor($fractionalDollar);
-        $cents = fmod($fractionalDollar, 1);
+        $dollars = ($fractionalDollar < 0) ? ceil($fractionalDollar) : floor($fractionalDollar);
+        $cents = fmod($fractionalDollar, 1.0);
         $cents /= $fraction;
         $cents *= 10 ** ceil(log10($fraction));
 
@@ -70,24 +90,34 @@ public static function decimal($fractionalDollar = null, $fraction = 0)
      *        DOLLARFR(decimal_dollar,fraction)
      *
      * @param mixed $decimalDollar Decimal Dollar
+     *              Or can be an array of values
      * @param mixed $fraction Fraction
-     *
-     * @return float|string
+     *              Or can be an array of values
      */
-    public static function fractional($decimalDollar = null, $fraction = 0)
+    public static function fractional(mixed $decimalDollar = null, mixed $fraction = 0): array|string|float
     {
-        $decimalDollar = Functions::flattenSingleValue($decimalDollar);
-        $fraction = (int) Functions::flattenSingleValue($fraction);
+        if (is_array($decimalDollar) || is_array($fraction)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $decimalDollar, $fraction);
+        }
+
+        try {
+            $decimalDollar = FinancialValidations::validateFloat(
+                Functions::flattenSingleValue($decimalDollar) ?? 0.0
+            );
+            $fraction = FinancialValidations::validateInt(Functions::flattenSingleValue($fraction));
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
 
-        // Validate parameters
-        if ($decimalDollar === null || $fraction < 0) {
-            return Functions::NAN();
+        // Additional parameter validations
+        if ($fraction < 0) {
+            return ExcelError::NAN();
         }
         if ($fraction == 0) {
-            return Functions::DIV0();
+            return ExcelError::DIV0();
         }
 
-        $dollars = floor($decimalDollar);
+        $dollars = ($decimalDollar < 0.0) ? ceil($decimalDollar) : floor($decimalDollar);
         $cents = fmod($decimalDollar, 1);
         $cents *= $fraction;
         $cents *= 10 ** (-ceil(log10($fraction)));
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/FinancialValidations.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/FinancialValidations.php
index 310e0051c9..e596fc30cf 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/FinancialValidations.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/FinancialValidations.php
@@ -5,152 +5,116 @@
 use PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\Financial\Constants as FinancialConstants;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class FinancialValidations
 {
-    /**
-     * @param mixed $date
-     */
-    public static function validateDate($date): float
+    public static function validateDate(mixed $date): float
     {
         return DateTimeExcel\Helpers::getDateValue($date);
     }
 
-    /**
-     * @param mixed $settlement
-     */
-    public static function validateSettlementDate($settlement): float
+    public static function validateSettlementDate(mixed $settlement): float
     {
         return self::validateDate($settlement);
     }
 
-    /**
-     * @param mixed $maturity
-     */
-    public static function validateMaturityDate($maturity): float
+    public static function validateMaturityDate(mixed $maturity): float
     {
         return self::validateDate($maturity);
     }
 
-    /**
-     * @param mixed $value
-     */
-    public static function validateFloat($value): float
+    public static function validateFloat(mixed $value): float
     {
         if (!is_numeric($value)) {
-            throw new Exception(Functions::VALUE());
+            throw new Exception(ExcelError::VALUE());
         }
 
         return (float) $value;
     }
 
-    /**
-     * @param mixed $value
-     */
-    public static function validateInt($value): int
+    public static function validateInt(mixed $value): int
     {
         if (!is_numeric($value)) {
-            throw new Exception(Functions::VALUE());
+            throw new Exception(ExcelError::VALUE());
         }
 
         return (int) floor((float) $value);
     }
 
-    /**
-     * @param mixed $rate
-     */
-    public static function validateRate($rate): float
+    public static function validateRate(mixed $rate): float
     {
         $rate = self::validateFloat($rate);
         if ($rate < 0.0) {
-            throw new Exception(Functions::NAN());
+            throw new Exception(ExcelError::NAN());
         }
 
         return $rate;
     }
 
-    /**
-     * @param mixed $frequency
-     */
-    public static function validateFrequency($frequency): int
+    public static function validateFrequency(mixed $frequency): int
     {
         $frequency = self::validateInt($frequency);
         if (
-            ($frequency !== FinancialConstants::FREQUENCY_ANNUAL) &&
-            ($frequency !== FinancialConstants::FREQUENCY_SEMI_ANNUAL) &&
-            ($frequency !== FinancialConstants::FREQUENCY_QUARTERLY)
+            ($frequency !== FinancialConstants::FREQUENCY_ANNUAL)
+            && ($frequency !== FinancialConstants::FREQUENCY_SEMI_ANNUAL)
+            && ($frequency !== FinancialConstants::FREQUENCY_QUARTERLY)
         ) {
-            throw new Exception(Functions::NAN());
+            throw new Exception(ExcelError::NAN());
         }
 
         return $frequency;
     }
 
-    /**
-     * @param mixed $basis
-     */
-    public static function validateBasis($basis): int
+    public static function validateBasis(mixed $basis): int
     {
         if (!is_numeric($basis)) {
-            throw new Exception(Functions::VALUE());
+            throw new Exception(ExcelError::VALUE());
         }
 
         $basis = (int) $basis;
         if (($basis < 0) || ($basis > 4)) {
-            throw new Exception(Functions::NAN());
+            throw new Exception(ExcelError::NAN());
         }
 
         return $basis;
     }
 
-    /**
-     * @param mixed $price
-     */
-    public static function validatePrice($price): float
+    public static function validatePrice(mixed $price): float
     {
         $price = self::validateFloat($price);
         if ($price < 0.0) {
-            throw new Exception(Functions::NAN());
+            throw new Exception(ExcelError::NAN());
         }
 
         return $price;
     }
 
-    /**
-     * @param mixed $parValue
-     */
-    public static function validateParValue($parValue): float
+    public static function validateParValue(mixed $parValue): float
     {
         $parValue = self::validateFloat($parValue);
         if ($parValue < 0.0) {
-            throw new Exception(Functions::NAN());
+            throw new Exception(ExcelError::NAN());
         }
 
         return $parValue;
     }
 
-    /**
-     * @param mixed $yield
-     */
-    public static function validateYield($yield): float
+    public static function validateYield(mixed $yield): float
     {
         $yield = self::validateFloat($yield);
         if ($yield < 0.0) {
-            throw new Exception(Functions::NAN());
+            throw new Exception(ExcelError::NAN());
         }
 
         return $yield;
     }
 
-    /**
-     * @param mixed $discount
-     */
-    public static function validateDiscount($discount): float
+    public static function validateDiscount(mixed $discount): float
     {
         $discount = self::validateFloat($discount);
         if ($discount <= 0.0) {
-            throw new Exception(Functions::NAN());
+            throw new Exception(ExcelError::NAN());
         }
 
         return $discount;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Helpers.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Helpers.php
index d339b13416..aa2871295a 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Helpers.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Helpers.php
@@ -5,7 +5,7 @@
 use DateTimeInterface;
 use PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
 use PhpOffice\PhpSpreadsheet\Calculation\Financial\Constants as FinancialConstants;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class Helpers
 {
@@ -24,10 +24,10 @@ class Helpers
      *
      * @return int|string Result, or a string containing an error
      */
-    public static function daysPerYear($year, $basis = 0)
+    public static function daysPerYear($year, $basis = 0): string|int
     {
         if (!is_numeric($basis)) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         switch ($basis) {
@@ -41,7 +41,7 @@ public static function daysPerYear($year, $basis = 0)
                 return (DateTimeExcel\Helpers::isLeapYear($year)) ? 366 : 365;
         }
 
-        return Functions::NAN();
+        return ExcelError::NAN();
     }
 
     /**
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/InterestRate.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/InterestRate.php
index 72df31e164..2916df6b6a 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/InterestRate.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/InterestRate.php
@@ -4,6 +4,7 @@
 
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class InterestRate
 {
@@ -18,10 +19,8 @@ class InterestRate
      *
      * @param mixed $nominalRate Nominal interest rate as a float
      * @param mixed $periodsPerYear Integer number of compounding payments per year
-     *
-     * @return float|string
      */
-    public static function effective($nominalRate = 0, $periodsPerYear = 0)
+    public static function effective(mixed $nominalRate = 0, mixed $periodsPerYear = 0): string|float
     {
         $nominalRate = Functions::flattenSingleValue($nominalRate);
         $periodsPerYear = Functions::flattenSingleValue($periodsPerYear);
@@ -34,7 +33,7 @@ public static function effective($nominalRate = 0, $periodsPerYear = 0)
         }
 
         if ($nominalRate <= 0 || $periodsPerYear < 1) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         return ((1 + $nominalRate / $periodsPerYear) ** $periodsPerYear) - 1;
@@ -50,7 +49,7 @@ public static function effective($nominalRate = 0, $periodsPerYear = 0)
      *
      * @return float|string Result, or a string containing an error
      */
-    public static function nominal($effectiveRate = 0, $periodsPerYear = 0)
+    public static function nominal(mixed $effectiveRate = 0, mixed $periodsPerYear = 0): string|float
     {
         $effectiveRate = Functions::flattenSingleValue($effectiveRate);
         $periodsPerYear = Functions::flattenSingleValue($periodsPerYear);
@@ -63,7 +62,7 @@ public static function nominal($effectiveRate = 0, $periodsPerYear = 0)
         }
 
         if ($effectiveRate <= 0 || $periodsPerYear < 1) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         // Calculate
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/AccruedInterest.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/AccruedInterest.php
index e167429b72..eb57abfca8 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/AccruedInterest.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/AccruedInterest.php
@@ -40,19 +40,19 @@ class AccruedInterest
      *                         2               Actual/360
      *                         3               Actual/365
      *                         4               European 30/360
-     * @param mixed $calcMethod
+     * @param mixed $calcMethod Unused by PhpSpreadsheet, and apparently by Excel (https://exceljet.net/functions/accrint-function)
      *
      * @return float|string Result, or a string containing an error
      */
     public static function periodic(
-        $issue,
-        $firstInterest,
-        $settlement,
-        $rate,
-        $parValue = 1000,
-        $frequency = FinancialConstants::FREQUENCY_ANNUAL,
-        $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD,
-        $calcMethod = self::ACCRINT_CALCMODE_ISSUE_TO_SETTLEMENT
+        mixed $issue,
+        mixed $firstInterest,
+        mixed $settlement,
+        mixed $rate,
+        mixed $parValue = 1000,
+        mixed $frequency = FinancialConstants::FREQUENCY_ANNUAL,
+        mixed $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD,
+        mixed $calcMethod = self::ACCRINT_CALCMODE_ISSUE_TO_SETTLEMENT
     ) {
         $issue = Functions::flattenSingleValue($issue);
         $firstInterest = Functions::flattenSingleValue($firstInterest);
@@ -72,18 +72,18 @@ public static function periodic(
             SecurityValidations::validateSecurityPeriod($issue, $settlement);
             $rate = SecurityValidations::validateRate($rate);
             $parValue = SecurityValidations::validateParValue($parValue);
-            $frequency = SecurityValidations::validateFrequency($frequency);
+            SecurityValidations::validateFrequency($frequency);
             $basis = SecurityValidations::validateBasis($basis);
         } catch (Exception $e) {
             return $e->getMessage();
         }
 
-        $daysBetweenIssueAndSettlement = YearFrac::fraction($issue, $settlement, $basis);
+        $daysBetweenIssueAndSettlement = Functions::scalar(YearFrac::fraction($issue, $settlement, $basis));
         if (!is_numeric($daysBetweenIssueAndSettlement)) {
             //    return date error
             return $daysBetweenIssueAndSettlement;
         }
-        $daysBetweenFirstInterestAndSettlement = YearFrac::fraction($firstInterest, $settlement, $basis);
+        $daysBetweenFirstInterestAndSettlement = Functions::scalar(YearFrac::fraction($firstInterest, $settlement, $basis));
         if (!is_numeric($daysBetweenFirstInterestAndSettlement)) {
             //    return date error
             return $daysBetweenFirstInterestAndSettlement;
@@ -115,11 +115,11 @@ public static function periodic(
      * @return float|string Result, or a string containing an error
      */
     public static function atMaturity(
-        $issue,
-        $settlement,
-        $rate,
-        $parValue = 1000,
-        $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+        mixed $issue,
+        mixed $settlement,
+        mixed $rate,
+        mixed $parValue = 1000,
+        mixed $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
     ) {
         $issue = Functions::flattenSingleValue($issue);
         $settlement = Functions::flattenSingleValue($settlement);
@@ -140,7 +140,7 @@ public static function atMaturity(
             return $e->getMessage();
         }
 
-        $daysBetweenIssueAndSettlement = YearFrac::fraction($issue, $settlement, $basis);
+        $daysBetweenIssueAndSettlement = Functions::scalar(YearFrac::fraction($issue, $settlement, $basis));
         if (!is_numeric($daysBetweenIssueAndSettlement)) {
             //    return date error
             return $daysBetweenIssueAndSettlement;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/Price.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/Price.php
index 7d8d5a3210..b07b2c9fce 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/Price.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/Price.php
@@ -8,6 +8,7 @@
 use PhpOffice\PhpSpreadsheet\Calculation\Financial\Coupons;
 use PhpOffice\PhpSpreadsheet\Calculation\Financial\Helpers;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class Price
 {
@@ -27,7 +28,6 @@ class Price
      *                              For annual payments, frequency = 1;
      *                              for semiannual, frequency = 2;
      *                              for quarterly, frequency = 4.
-     * @param mixed $frequency
      * @param mixed $basis The type of day count to use.
      *                         0 or omitted    US (NASD) 30/360
      *                         1               Actual/actual
@@ -38,14 +38,14 @@ class Price
      * @return float|string Result, or a string containing an error
      */
     public static function price(
-        $settlement,
-        $maturity,
-        $rate,
-        $yield,
-        $redemption,
-        $frequency,
-        $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
-    ) {
+        mixed $settlement,
+        mixed $maturity,
+        mixed $rate,
+        mixed $yield,
+        mixed $redemption,
+        mixed $frequency,
+        mixed $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ): string|float {
         $settlement = Functions::flattenSingleValue($settlement);
         $maturity = Functions::flattenSingleValue($maturity);
         $rate = Functions::flattenSingleValue($rate);
@@ -69,10 +69,10 @@ public static function price(
             return $e->getMessage();
         }
 
-        $dsc = Coupons::COUPDAYSNC($settlement, $maturity, $frequency, $basis);
-        $e = Coupons::COUPDAYS($settlement, $maturity, $frequency, $basis);
-        $n = Coupons::COUPNUM($settlement, $maturity, $frequency, $basis);
-        $a = Coupons::COUPDAYBS($settlement, $maturity, $frequency, $basis);
+        $dsc = (float) Coupons::COUPDAYSNC($settlement, $maturity, $frequency, $basis);
+        $e = (float) Coupons::COUPDAYS($settlement, $maturity, $frequency, $basis);
+        $n = (int) Coupons::COUPNUM($settlement, $maturity, $frequency, $basis);
+        $a = (float) Coupons::COUPDAYBS($settlement, $maturity, $frequency, $basis);
 
         $baseYF = 1.0 + ($yield / $frequency);
         $rfp = 100 * ($rate / $frequency);
@@ -109,11 +109,11 @@ public static function price(
      * @return float|string Result, or a string containing an error
      */
     public static function priceDiscounted(
-        $settlement,
-        $maturity,
-        $discount,
-        $redemption,
-        $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+        mixed $settlement,
+        mixed $maturity,
+        mixed $discount,
+        mixed $redemption,
+        mixed $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
     ) {
         $settlement = Functions::flattenSingleValue($settlement);
         $maturity = Functions::flattenSingleValue($maturity);
@@ -134,7 +134,7 @@ public static function priceDiscounted(
             return $e->getMessage();
         }
 
-        $daysBetweenSettlementAndMaturity = DateTimeExcel\YearFrac::fraction($settlement, $maturity, $basis);
+        $daysBetweenSettlementAndMaturity = Functions::scalar(DateTimeExcel\YearFrac::fraction($settlement, $maturity, $basis));
         if (!is_numeric($daysBetweenSettlementAndMaturity)) {
             //    return date error
             return $daysBetweenSettlementAndMaturity;
@@ -166,12 +166,12 @@ public static function priceDiscounted(
      * @return float|string Result, or a string containing an error
      */
     public static function priceAtMaturity(
-        $settlement,
-        $maturity,
-        $issue,
-        $rate,
-        $yield,
-        $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+        mixed $settlement,
+        mixed $maturity,
+        mixed $issue,
+        mixed $rate,
+        mixed $yield,
+        mixed $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
     ) {
         $settlement = Functions::flattenSingleValue($settlement);
         $maturity = Functions::flattenSingleValue($maturity);
@@ -194,32 +194,32 @@ public static function priceAtMaturity(
             return $e->getMessage();
         }
 
-        $daysPerYear = Helpers::daysPerYear(DateTimeExcel\DateParts::year($settlement), $basis);
+        $daysPerYear = Helpers::daysPerYear(Functions::scalar(DateTimeExcel\DateParts::year($settlement)), $basis);
         if (!is_numeric($daysPerYear)) {
             return $daysPerYear;
         }
-        $daysBetweenIssueAndSettlement = DateTimeExcel\YearFrac::fraction($issue, $settlement, $basis);
+        $daysBetweenIssueAndSettlement = Functions::scalar(DateTimeExcel\YearFrac::fraction($issue, $settlement, $basis));
         if (!is_numeric($daysBetweenIssueAndSettlement)) {
             //    return date error
             return $daysBetweenIssueAndSettlement;
         }
         $daysBetweenIssueAndSettlement *= $daysPerYear;
-        $daysBetweenIssueAndMaturity = DateTimeExcel\YearFrac::fraction($issue, $maturity, $basis);
+        $daysBetweenIssueAndMaturity = Functions::scalar(DateTimeExcel\YearFrac::fraction($issue, $maturity, $basis));
         if (!is_numeric($daysBetweenIssueAndMaturity)) {
             //    return date error
             return $daysBetweenIssueAndMaturity;
         }
         $daysBetweenIssueAndMaturity *= $daysPerYear;
-        $daysBetweenSettlementAndMaturity = DateTimeExcel\YearFrac::fraction($settlement, $maturity, $basis);
+        $daysBetweenSettlementAndMaturity = Functions::scalar(DateTimeExcel\YearFrac::fraction($settlement, $maturity, $basis));
         if (!is_numeric($daysBetweenSettlementAndMaturity)) {
             //    return date error
             return $daysBetweenSettlementAndMaturity;
         }
         $daysBetweenSettlementAndMaturity *= $daysPerYear;
 
-        return (100 + (($daysBetweenIssueAndMaturity / $daysPerYear) * $rate * 100)) /
-            (1 + (($daysBetweenSettlementAndMaturity / $daysPerYear) * $yield)) -
-            (($daysBetweenIssueAndSettlement / $daysPerYear) * $rate * 100);
+        return (100 + (($daysBetweenIssueAndMaturity / $daysPerYear) * $rate * 100))
+            / (1 + (($daysBetweenSettlementAndMaturity / $daysPerYear) * $yield))
+            - (($daysBetweenIssueAndSettlement / $daysPerYear) * $rate * 100);
     }
 
     /**
@@ -244,11 +244,11 @@ public static function priceAtMaturity(
      * @return float|string Result, or a string containing an error
      */
     public static function received(
-        $settlement,
-        $maturity,
-        $investment,
-        $discount,
-        $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+        mixed $settlement,
+        mixed $maturity,
+        mixed $investment,
+        mixed $discount,
+        mixed $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
     ) {
         $settlement = Functions::flattenSingleValue($settlement);
         $maturity = Functions::flattenSingleValue($maturity);
@@ -270,12 +270,12 @@ public static function received(
         }
 
         if ($investment <= 0) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
         $daysBetweenSettlementAndMaturity = DateTimeExcel\YearFrac::fraction($settlement, $maturity, $basis);
         if (!is_numeric($daysBetweenSettlementAndMaturity)) {
             //    return date error
-            return $daysBetweenSettlementAndMaturity;
+            return Functions::scalar($daysBetweenSettlementAndMaturity);
         }
 
         return $investment / (1 - ($discount * $daysBetweenSettlementAndMaturity));
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/Rates.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/Rates.php
index c5c5211b70..2989a29b31 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/Rates.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/Rates.php
@@ -6,6 +6,7 @@
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\Financial\Constants as FinancialConstants;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class Rates
 {
@@ -30,16 +31,14 @@ class Rates
      *                         2               Actual/360
      *                         3               Actual/365
      *                         4               European 30/360
-     *
-     * @return float|string
      */
     public static function discount(
-        $settlement,
-        $maturity,
-        $price,
-        $redemption,
-        $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
-    ) {
+        mixed $settlement,
+        mixed $maturity,
+        mixed $price,
+        mixed $redemption,
+        mixed $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ): float|string {
         $settlement = Functions::flattenSingleValue($settlement);
         $maturity = Functions::flattenSingleValue($maturity);
         $price = Functions::flattenSingleValue($price);
@@ -60,10 +59,10 @@ public static function discount(
         }
 
         if ($price <= 0.0) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
-        $daysBetweenSettlementAndMaturity = DateTimeExcel\YearFrac::fraction($settlement, $maturity, $basis);
+        $daysBetweenSettlementAndMaturity = Functions::scalar(DateTimeExcel\YearFrac::fraction($settlement, $maturity, $basis));
         if (!is_numeric($daysBetweenSettlementAndMaturity)) {
             //    return date error
             return $daysBetweenSettlementAndMaturity;
@@ -93,16 +92,14 @@ public static function discount(
      *                         2               Actual/360
      *                         3               Actual/365
      *                         4               European 30/360
-     *
-     * @return float|string
      */
     public static function interest(
-        $settlement,
-        $maturity,
-        $investment,
-        $redemption,
-        $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
-    ) {
+        mixed $settlement,
+        mixed $maturity,
+        mixed $investment,
+        mixed $redemption,
+        mixed $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+    ): float|string {
         $settlement = Functions::flattenSingleValue($settlement);
         $maturity = Functions::flattenSingleValue($maturity);
         $investment = Functions::flattenSingleValue($investment);
@@ -123,10 +120,10 @@ public static function interest(
         }
 
         if ($investment <= 0) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
-        $daysBetweenSettlementAndMaturity = DateTimeExcel\YearFrac::fraction($settlement, $maturity, $basis);
+        $daysBetweenSettlementAndMaturity = Functions::scalar(DateTimeExcel\YearFrac::fraction($settlement, $maturity, $basis));
         if (!is_numeric($daysBetweenSettlementAndMaturity)) {
             //    return date error
             return $daysBetweenSettlementAndMaturity;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/SecurityValidations.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/SecurityValidations.php
index 497197b843..a0804cb82c 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/SecurityValidations.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/SecurityValidations.php
@@ -4,37 +4,27 @@
 
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\Financial\FinancialValidations;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class SecurityValidations extends FinancialValidations
 {
-    /**
-     * @param mixed $issue
-     */
-    public static function validateIssueDate($issue): float
+    public static function validateIssueDate(mixed $issue): float
     {
         return self::validateDate($issue);
     }
 
-    /**
-     * @param mixed $settlement
-     * @param mixed $maturity
-     */
-    public static function validateSecurityPeriod($settlement, $maturity): void
+    public static function validateSecurityPeriod(mixed $settlement, mixed $maturity): void
     {
         if ($settlement >= $maturity) {
-            throw new Exception(Functions::NAN());
+            throw new Exception(ExcelError::NAN());
         }
     }
 
-    /**
-     * @param mixed $redemption
-     */
-    public static function validateRedemption($redemption): float
+    public static function validateRedemption(mixed $redemption): float
     {
         $redemption = self::validateFloat($redemption);
         if ($redemption <= 0.0) {
-            throw new Exception(Functions::NAN());
+            throw new Exception(ExcelError::NAN());
         }
 
         return $redemption;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/Yields.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/Yields.php
index aa6269354b..a4c5a48fd8 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/Yields.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/Securities/Yields.php
@@ -32,11 +32,11 @@ class Yields
      * @return float|string Result, or a string containing an error
      */
     public static function yieldDiscounted(
-        $settlement,
-        $maturity,
-        $price,
-        $redemption,
-        $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+        mixed $settlement,
+        mixed $maturity,
+        mixed $price,
+        mixed $redemption,
+        mixed $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
     ) {
         $settlement = Functions::flattenSingleValue($settlement);
         $maturity = Functions::flattenSingleValue($maturity);
@@ -57,11 +57,11 @@ public static function yieldDiscounted(
             return $e->getMessage();
         }
 
-        $daysPerYear = Helpers::daysPerYear(DateTimeExcel\DateParts::year($settlement), $basis);
+        $daysPerYear = Helpers::daysPerYear(Functions::scalar(DateTimeExcel\DateParts::year($settlement)), $basis);
         if (!is_numeric($daysPerYear)) {
             return $daysPerYear;
         }
-        $daysBetweenSettlementAndMaturity = DateTimeExcel\YearFrac::fraction($settlement, $maturity, $basis);
+        $daysBetweenSettlementAndMaturity = Functions::scalar(DateTimeExcel\YearFrac::fraction($settlement, $maturity, $basis));
         if (!is_numeric($daysBetweenSettlementAndMaturity)) {
             //    return date error
             return $daysBetweenSettlementAndMaturity;
@@ -94,12 +94,12 @@ public static function yieldDiscounted(
      * @return float|string Result, or a string containing an error
      */
     public static function yieldAtMaturity(
-        $settlement,
-        $maturity,
-        $issue,
-        $rate,
-        $price,
-        $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
+        mixed $settlement,
+        mixed $maturity,
+        mixed $issue,
+        mixed $rate,
+        mixed $price,
+        mixed $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD
     ) {
         $settlement = Functions::flattenSingleValue($settlement);
         $maturity = Functions::flattenSingleValue($maturity);
@@ -122,32 +122,32 @@ public static function yieldAtMaturity(
             return $e->getMessage();
         }
 
-        $daysPerYear = Helpers::daysPerYear(DateTimeExcel\DateParts::year($settlement), $basis);
+        $daysPerYear = Helpers::daysPerYear(Functions::scalar(DateTimeExcel\DateParts::year($settlement)), $basis);
         if (!is_numeric($daysPerYear)) {
             return $daysPerYear;
         }
-        $daysBetweenIssueAndSettlement = DateTimeExcel\YearFrac::fraction($issue, $settlement, $basis);
+        $daysBetweenIssueAndSettlement = Functions::scalar(DateTimeExcel\YearFrac::fraction($issue, $settlement, $basis));
         if (!is_numeric($daysBetweenIssueAndSettlement)) {
             //    return date error
             return $daysBetweenIssueAndSettlement;
         }
         $daysBetweenIssueAndSettlement *= $daysPerYear;
-        $daysBetweenIssueAndMaturity = DateTimeExcel\YearFrac::fraction($issue, $maturity, $basis);
+        $daysBetweenIssueAndMaturity = Functions::scalar(DateTimeExcel\YearFrac::fraction($issue, $maturity, $basis));
         if (!is_numeric($daysBetweenIssueAndMaturity)) {
             //    return date error
             return $daysBetweenIssueAndMaturity;
         }
         $daysBetweenIssueAndMaturity *= $daysPerYear;
-        $daysBetweenSettlementAndMaturity = DateTimeExcel\YearFrac::fraction($settlement, $maturity, $basis);
+        $daysBetweenSettlementAndMaturity = Functions::scalar(DateTimeExcel\YearFrac::fraction($settlement, $maturity, $basis));
         if (!is_numeric($daysBetweenSettlementAndMaturity)) {
             //    return date error
             return $daysBetweenSettlementAndMaturity;
         }
         $daysBetweenSettlementAndMaturity *= $daysPerYear;
 
-        return ((1 + (($daysBetweenIssueAndMaturity / $daysPerYear) * $rate) -
-                    (($price / 100) + (($daysBetweenIssueAndSettlement / $daysPerYear) * $rate))) /
-                (($price / 100) + (($daysBetweenIssueAndSettlement / $daysPerYear) * $rate))) *
-            ($daysPerYear / $daysBetweenSettlementAndMaturity);
+        return ((1 + (($daysBetweenIssueAndMaturity / $daysPerYear) * $rate)
+                    - (($price / 100) + (($daysBetweenIssueAndSettlement / $daysPerYear) * $rate)))
+                / (($price / 100) + (($daysBetweenIssueAndSettlement / $daysPerYear) * $rate)))
+            * ($daysPerYear / $daysBetweenSettlementAndMaturity);
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/TreasuryBill.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/TreasuryBill.php
index c60af0b0d0..699efcc6f8 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/TreasuryBill.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial/TreasuryBill.php
@@ -6,6 +6,7 @@
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\Financial\Constants as FinancialConstants;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class TreasuryBill
 {
@@ -23,7 +24,7 @@ class TreasuryBill
      *
      * @return float|string Result, or a string containing an error
      */
-    public static function bondEquivalentYield($settlement, $maturity, $discount)
+    public static function bondEquivalentYield(mixed $settlement, mixed $maturity, mixed $discount): string|float
     {
         $settlement = Functions::flattenSingleValue($settlement);
         $maturity = Functions::flattenSingleValue($maturity);
@@ -38,17 +39,17 @@ public static function bondEquivalentYield($settlement, $maturity, $discount)
         }
 
         if ($discount <= 0) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         $daysBetweenSettlementAndMaturity = $maturity - $settlement;
         $daysPerYear = Helpers::daysPerYear(
-            DateTimeExcel\DateParts::year($maturity),
+            Functions::scalar(DateTimeExcel\DateParts::year($maturity)),
             FinancialConstants::BASIS_DAYS_PER_YEAR_ACTUAL
         );
 
         if ($daysBetweenSettlementAndMaturity > $daysPerYear || $daysBetweenSettlementAndMaturity < 0) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         return (365 * $discount) / (360 - $discount * $daysBetweenSettlementAndMaturity);
@@ -68,7 +69,7 @@ public static function bondEquivalentYield($settlement, $maturity, $discount)
      *
      * @return float|string Result, or a string containing an error
      */
-    public static function price($settlement, $maturity, $discount)
+    public static function price(mixed $settlement, mixed $maturity, mixed $discount): string|float
     {
         $settlement = Functions::flattenSingleValue($settlement);
         $maturity = Functions::flattenSingleValue($maturity);
@@ -83,22 +84,22 @@ public static function price($settlement, $maturity, $discount)
         }
 
         if ($discount <= 0) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         $daysBetweenSettlementAndMaturity = $maturity - $settlement;
         $daysPerYear = Helpers::daysPerYear(
-            DateTimeExcel\DateParts::year($maturity),
+            Functions::scalar(DateTimeExcel\DateParts::year($maturity)),
             FinancialConstants::BASIS_DAYS_PER_YEAR_ACTUAL
         );
 
         if ($daysBetweenSettlementAndMaturity > $daysPerYear || $daysBetweenSettlementAndMaturity < 0) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         $price = 100 * (1 - (($discount * $daysBetweenSettlementAndMaturity) / 360));
         if ($price < 0.0) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         return $price;
@@ -114,11 +115,9 @@ public static function price($settlement, $maturity, $discount)
      *                                    the Treasury bill is traded to the buyer.
      * @param mixed $maturity The Treasury bill's maturity date.
      *                                The maturity date is the date when the Treasury bill expires.
-     * @param mixed $price The Treasury bill's price per $100 face value
-     *
-     * @return float|string
+     * @param float|string $price The Treasury bill's price per $100 face value
      */
-    public static function yield($settlement, $maturity, $price)
+    public static function yield(mixed $settlement, mixed $maturity, $price): string|float
     {
         $settlement = Functions::flattenSingleValue($settlement);
         $maturity = Functions::flattenSingleValue($maturity);
@@ -134,12 +133,12 @@ public static function yield($settlement, $maturity, $price)
 
         $daysBetweenSettlementAndMaturity = $maturity - $settlement;
         $daysPerYear = Helpers::daysPerYear(
-            DateTimeExcel\DateParts::year($maturity),
+            Functions::scalar(DateTimeExcel\DateParts::year($maturity)),
             FinancialConstants::BASIS_DAYS_PER_YEAR_ACTUAL
         );
 
         if ($daysBetweenSettlementAndMaturity > $daysPerYear || $daysBetweenSettlementAndMaturity < 0) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         return ((100 - $price) / $price) * (360 / $daysBetweenSettlementAndMaturity);
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/FormulaParser.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/FormulaParser.php
index cd1402fd89..9868b82840 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/FormulaParser.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/FormulaParser.php
@@ -46,42 +46,38 @@ class FormulaParser
 
     /**
      * Formula.
-     *
-     * @var string
      */
-    private $formula;
+    private string $formula;
 
     /**
      * Tokens.
      *
      * @var FormulaToken[]
      */
-    private $tokens = [];
+    private array $tokens = [];
 
     /**
      * Create a new FormulaParser.
      *
-     * @param string $pFormula Formula to parse
+     * @param ?string $formula Formula to parse
      */
-    public function __construct($pFormula = '')
+    public function __construct(?string $formula = '')
     {
         // Check parameters
-        if ($pFormula === null) {
+        if ($formula === null) {
             throw new Exception('Invalid parameter passed: formula');
         }
 
         // Initialise values
-        $this->formula = trim($pFormula);
+        $this->formula = trim($formula);
         // Parse!
         $this->parseToTokens();
     }
 
     /**
      * Get Formula.
-     *
-     * @return string
      */
-    public function getFormula()
+    public function getFormula(): string
     {
         return $this->formula;
     }
@@ -89,23 +85,21 @@ public function getFormula()
     /**
      * Get Token.
      *
-     * @param int $pId Token id
+     * @param int $id Token id
      */
-    public function getToken(int $pId = 0): FormulaToken
+    public function getToken(int $id = 0): FormulaToken
     {
-        if (isset($this->tokens[$pId])) {
-            return $this->tokens[$pId];
+        if (isset($this->tokens[$id])) {
+            return $this->tokens[$id];
         }
 
-        throw new Exception("Token with id $pId does not exist.");
+        throw new Exception("Token with id $id does not exist.");
     }
 
     /**
      * Get Token count.
-     *
-     * @return int
      */
-    public function getTokenCount()
+    public function getTokenCount(): int
     {
         return count($this->tokens);
     }
@@ -115,7 +109,7 @@ public function getTokenCount()
      *
      * @return FormulaToken[]
      */
-    public function getTokens()
+    public function getTokens(): array
     {
         return $this->tokens;
     }
@@ -137,7 +131,8 @@ private function parseToTokens(): void
         // Helper variables
         $tokens1 = $tokens2 = $stack = [];
         $inString = $inPath = $inRange = $inError = false;
-        $token = $previousToken = $nextToken = null;
+        $nextToken = null;
+        //$token = $previousToken = null;
 
         $index = 1;
         $value = '';
@@ -216,7 +211,7 @@ private function parseToTokens(): void
             }
 
             // scientific notation check
-            if (strpos(self::OPERATORS_SN, $this->formula[$index]) !== false) {
+            if (str_contains(self::OPERATORS_SN, $this->formula[$index])) {
                 if (strlen($value) > 1) {
                     if (preg_match('/^[1-9]{1}(\\.\\d+)?E{1}$/', $this->formula[$index]) != 0) {
                         $value .= $this->formula[$index];
@@ -231,7 +226,7 @@ private function parseToTokens(): void
 
             // establish state-dependent character evaluations
             if ($this->formula[$index] == self::QUOTE_DOUBLE) {
-                if (strlen($value) > 0) {
+                if ($value !== '') {
                     // unexpected
                     $tokens1[] = new FormulaToken($value, FormulaToken::TOKEN_TYPE_UNKNOWN);
                     $value = '';
@@ -243,7 +238,7 @@ private function parseToTokens(): void
             }
 
             if ($this->formula[$index] == self::QUOTE_SINGLE) {
-                if (strlen($value) > 0) {
+                if ($value !== '') {
                     // unexpected
                     $tokens1[] = new FormulaToken($value, FormulaToken::TOKEN_TYPE_UNKNOWN);
                     $value = '';
@@ -263,7 +258,7 @@ private function parseToTokens(): void
             }
 
             if ($this->formula[$index] == self::ERROR_START) {
-                if (strlen($value) > 0) {
+                if ($value !== '') {
                     // unexpected
                     $tokens1[] = new FormulaToken($value, FormulaToken::TOKEN_TYPE_UNKNOWN);
                     $value = '';
@@ -277,7 +272,7 @@ private function parseToTokens(): void
 
             // mark start and end of arrays and array rows
             if ($this->formula[$index] == self::BRACE_OPEN) {
-                if (strlen($value) > 0) {
+                if ($value !== '') {
                     // unexpected
                     $tokens1[] = new FormulaToken($value, FormulaToken::TOKEN_TYPE_UNKNOWN);
                     $value = '';
@@ -297,11 +292,12 @@ private function parseToTokens(): void
             }
 
             if ($this->formula[$index] == self::SEMICOLON) {
-                if (strlen($value) > 0) {
+                if ($value !== '') {
                     $tokens1[] = new FormulaToken($value, FormulaToken::TOKEN_TYPE_OPERAND);
                     $value = '';
                 }
 
+                /** @var FormulaToken $tmp */
                 $tmp = array_pop($stack);
                 $tmp->setValue('');
                 $tmp->setTokenSubType(FormulaToken::TOKEN_SUBTYPE_STOP);
@@ -320,16 +316,18 @@ private function parseToTokens(): void
             }
 
             if ($this->formula[$index] == self::BRACE_CLOSE) {
-                if (strlen($value) > 0) {
+                if ($value !== '') {
                     $tokens1[] = new FormulaToken($value, FormulaToken::TOKEN_TYPE_OPERAND);
                     $value = '';
                 }
 
+                /** @var FormulaToken $tmp */
                 $tmp = array_pop($stack);
                 $tmp->setValue('');
                 $tmp->setTokenSubType(FormulaToken::TOKEN_SUBTYPE_STOP);
                 $tokens1[] = $tmp;
 
+                /** @var FormulaToken $tmp */
                 $tmp = array_pop($stack);
                 $tmp->setValue('');
                 $tmp->setTokenSubType(FormulaToken::TOKEN_SUBTYPE_STOP);
@@ -342,7 +340,7 @@ private function parseToTokens(): void
 
             // trim white-space
             if ($this->formula[$index] == self::WHITESPACE) {
-                if (strlen($value) > 0) {
+                if ($value !== '') {
                     $tokens1[] = new FormulaToken($value, FormulaToken::TOKEN_TYPE_OPERAND);
                     $value = '';
                 }
@@ -358,7 +356,7 @@ private function parseToTokens(): void
             // multi-character comparators
             if (($index + 2) <= $formulaLength) {
                 if (in_array(substr($this->formula, $index, 2), $COMPARATORS_MULTI)) {
-                    if (strlen($value) > 0) {
+                    if ($value !== '') {
                         $tokens1[] = new FormulaToken($value, FormulaToken::TOKEN_TYPE_OPERAND);
                         $value = '';
                     }
@@ -370,8 +368,8 @@ private function parseToTokens(): void
             }
 
             // standard infix operators
-            if (strpos(self::OPERATORS_INFIX, $this->formula[$index]) !== false) {
-                if (strlen($value) > 0) {
+            if (str_contains(self::OPERATORS_INFIX, $this->formula[$index])) {
+                if ($value !== '') {
                     $tokens1[] = new FormulaToken($value, FormulaToken::TOKEN_TYPE_OPERAND);
                     $value = '';
                 }
@@ -382,8 +380,8 @@ private function parseToTokens(): void
             }
 
             // standard postfix operators (only one)
-            if (strpos(self::OPERATORS_POSTFIX, $this->formula[$index]) !== false) {
-                if (strlen($value) > 0) {
+            if (str_contains(self::OPERATORS_POSTFIX, $this->formula[$index])) {
+                if ($value !== '') {
                     $tokens1[] = new FormulaToken($value, FormulaToken::TOKEN_TYPE_OPERAND);
                     $value = '';
                 }
@@ -395,7 +393,7 @@ private function parseToTokens(): void
 
             // start subexpression or function
             if ($this->formula[$index] == self::PAREN_OPEN) {
-                if (strlen($value) > 0) {
+                if ($value !== '') {
                     $tmp = new FormulaToken($value, FormulaToken::TOKEN_TYPE_FUNCTION, FormulaToken::TOKEN_SUBTYPE_START);
                     $tokens1[] = $tmp;
                     $stack[] = clone $tmp;
@@ -412,11 +410,12 @@ private function parseToTokens(): void
 
             // function, subexpression, or array parameters, or operand unions
             if ($this->formula[$index] == self::COMMA) {
-                if (strlen($value) > 0) {
+                if ($value !== '') {
                     $tokens1[] = new FormulaToken($value, FormulaToken::TOKEN_TYPE_OPERAND);
                     $value = '';
                 }
 
+                /** @var FormulaToken $tmp */
                 $tmp = array_pop($stack);
                 $tmp->setValue('');
                 $tmp->setTokenSubType(FormulaToken::TOKEN_SUBTYPE_STOP);
@@ -434,11 +433,12 @@ private function parseToTokens(): void
 
             // stop subexpression
             if ($this->formula[$index] == self::PAREN_CLOSE) {
-                if (strlen($value) > 0) {
+                if ($value !== '') {
                     $tokens1[] = new FormulaToken($value, FormulaToken::TOKEN_TYPE_OPERAND);
                     $value = '';
                 }
 
+                /** @var FormulaToken $tmp */
                 $tmp = array_pop($stack);
                 $tmp->setValue('');
                 $tmp->setTokenSubType(FormulaToken::TOKEN_SUBTYPE_STOP);
@@ -455,7 +455,7 @@ private function parseToTokens(): void
         }
 
         // dump remaining accumulation
-        if (strlen($value) > 0) {
+        if ($value !== '') {
             $tokens1[] = new FormulaToken($value, FormulaToken::TOKEN_TYPE_OPERAND);
         }
 
@@ -474,10 +474,6 @@ private function parseToTokens(): void
                 $nextToken = null;
             }
 
-            if ($token === null) {
-                continue;
-            }
-
             if ($token->getTokenType() != FormulaToken::TOKEN_TYPE_WHITESPACE) {
                 $tokens2[] = $token;
 
@@ -490,9 +486,9 @@ private function parseToTokens(): void
 
             if (
                 !(
-                (($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_FUNCTION) && ($previousToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP)) ||
-                (($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_SUBEXPRESSION) && ($previousToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP)) ||
-                ($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_OPERAND)
+                    (($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_FUNCTION) && ($previousToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP))
+                || (($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_SUBEXPRESSION) && ($previousToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP))
+                || ($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_OPERAND)
                 )
             ) {
                 continue;
@@ -504,9 +500,9 @@ private function parseToTokens(): void
 
             if (
                 !(
-                (($nextToken->getTokenType() == FormulaToken::TOKEN_TYPE_FUNCTION) && ($nextToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_START)) ||
-                (($nextToken->getTokenType() == FormulaToken::TOKEN_TYPE_SUBEXPRESSION) && ($nextToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_START)) ||
-                ($nextToken->getTokenType() == FormulaToken::TOKEN_TYPE_OPERAND)
+                    (($nextToken->getTokenType() == FormulaToken::TOKEN_TYPE_FUNCTION) && ($nextToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_START))
+                || (($nextToken->getTokenType() == FormulaToken::TOKEN_TYPE_SUBEXPRESSION) && ($nextToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_START))
+                || ($nextToken->getTokenType() == FormulaToken::TOKEN_TYPE_OPERAND)
                 )
             ) {
                 continue;
@@ -527,26 +523,17 @@ private function parseToTokens(): void
             } else {
                 $previousToken = null;
             }
-            if (isset($tokens2[$i + 1])) {
-                $nextToken = $tokens2[$i + 1];
-            } else {
-                $nextToken = null;
-            }
-
-            if ($token === null) {
-                continue;
-            }
 
             if ($token->getTokenType() == FormulaToken::TOKEN_TYPE_OPERATORINFIX && $token->getValue() == '-') {
                 if ($i == 0) {
                     $token->setTokenType(FormulaToken::TOKEN_TYPE_OPERATORPREFIX);
                 } elseif (
-                    (($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_FUNCTION) &&
-                        ($previousToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP)) ||
-                    (($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_SUBEXPRESSION) &&
-                        ($previousToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP)) ||
-                    ($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_OPERATORPOSTFIX) ||
-                    ($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_OPERAND)
+                    (($previousToken?->getTokenType() == FormulaToken::TOKEN_TYPE_FUNCTION)
+                        && ($previousToken?->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP))
+                    || (($previousToken?->getTokenType() == FormulaToken::TOKEN_TYPE_SUBEXPRESSION)
+                        && ($previousToken?->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP))
+                    || ($previousToken?->getTokenType() == FormulaToken::TOKEN_TYPE_OPERATORPOSTFIX)
+                    || ($previousToken?->getTokenType() == FormulaToken::TOKEN_TYPE_OPERAND)
                 ) {
                     $token->setTokenSubType(FormulaToken::TOKEN_SUBTYPE_MATH);
                 } else {
@@ -562,12 +549,12 @@ private function parseToTokens(): void
                 if ($i == 0) {
                     continue;
                 } elseif (
-                    (($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_FUNCTION) &&
-                        ($previousToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP)) ||
-                    (($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_SUBEXPRESSION) &&
-                        ($previousToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP)) ||
-                    ($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_OPERATORPOSTFIX) ||
-                    ($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_OPERAND)
+                    (($previousToken?->getTokenType() == FormulaToken::TOKEN_TYPE_FUNCTION)
+                        && ($previousToken?->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP))
+                    || (($previousToken?->getTokenType() == FormulaToken::TOKEN_TYPE_SUBEXPRESSION)
+                        && ($previousToken?->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP))
+                    || ($previousToken?->getTokenType() == FormulaToken::TOKEN_TYPE_OPERATORPOSTFIX)
+                    || ($previousToken?->getTokenType() == FormulaToken::TOKEN_TYPE_OPERAND)
                 ) {
                     $token->setTokenSubType(FormulaToken::TOKEN_SUBTYPE_MATH);
                 } else {
@@ -580,10 +567,10 @@ private function parseToTokens(): void
             }
 
             if (
-                $token->getTokenType() == FormulaToken::TOKEN_TYPE_OPERATORINFIX &&
-                $token->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_NOTHING
+                $token->getTokenType() == FormulaToken::TOKEN_TYPE_OPERATORINFIX
+                && $token->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_NOTHING
             ) {
-                if (strpos('<>=', substr($token->getValue(), 0, 1)) !== false) {
+                if (str_contains('<>=', substr($token->getValue(), 0, 1))) {
                     $token->setTokenSubType(FormulaToken::TOKEN_SUBTYPE_LOGICAL);
                 } elseif ($token->getValue() == '&') {
                     $token->setTokenSubType(FormulaToken::TOKEN_SUBTYPE_CONCATENATION);
@@ -597,8 +584,8 @@ private function parseToTokens(): void
             }
 
             if (
-                $token->getTokenType() == FormulaToken::TOKEN_TYPE_OPERAND &&
-                $token->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_NOTHING
+                $token->getTokenType() == FormulaToken::TOKEN_TYPE_OPERAND
+                && $token->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_NOTHING
             ) {
                 if (!is_numeric($token->getValue())) {
                     if (strtoupper($token->getValue()) == 'TRUE' || strtoupper($token->getValue()) == 'FALSE') {
@@ -616,8 +603,8 @@ private function parseToTokens(): void
             }
 
             if ($token->getTokenType() == FormulaToken::TOKEN_TYPE_FUNCTION) {
-                if (strlen($token->getValue()) > 0) {
-                    if (substr($token->getValue(), 0, 1) == '@') {
+                if ($token->getValue() !== '') {
+                    if (str_starts_with($token->getValue(), '@')) {
                         $token->setValue(substr($token->getValue(), 1));
                     }
                 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/FormulaToken.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/FormulaToken.php
index 4d225de2d5..cc7d48fcd2 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/FormulaToken.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/FormulaToken.php
@@ -54,96 +54,77 @@ class FormulaToken
 
     /**
      * Value.
-     *
-     * @var string
      */
-    private $value;
+    private string $value;
 
     /**
      * Token Type (represented by TOKEN_TYPE_*).
-     *
-     * @var string
      */
-    private $tokenType;
+    private string $tokenType;
 
     /**
      * Token SubType (represented by TOKEN_SUBTYPE_*).
-     *
-     * @var string
      */
-    private $tokenSubType;
+    private string $tokenSubType;
 
     /**
      * Create a new FormulaToken.
      *
-     * @param string $pValue
-     * @param string $pTokenType Token type (represented by TOKEN_TYPE_*)
-     * @param string $pTokenSubType Token Subtype (represented by TOKEN_SUBTYPE_*)
+     * @param string $tokenType Token type (represented by TOKEN_TYPE_*)
+     * @param string $tokenSubType Token Subtype (represented by TOKEN_SUBTYPE_*)
      */
-    public function __construct($pValue, $pTokenType = self::TOKEN_TYPE_UNKNOWN, $pTokenSubType = self::TOKEN_SUBTYPE_NOTHING)
+    public function __construct(string $value, string $tokenType = self::TOKEN_TYPE_UNKNOWN, string $tokenSubType = self::TOKEN_SUBTYPE_NOTHING)
     {
         // Initialise values
-        $this->value = $pValue;
-        $this->tokenType = $pTokenType;
-        $this->tokenSubType = $pTokenSubType;
+        $this->value = $value;
+        $this->tokenType = $tokenType;
+        $this->tokenSubType = $tokenSubType;
     }
 
     /**
      * Get Value.
-     *
-     * @return string
      */
-    public function getValue()
+    public function getValue(): string
     {
         return $this->value;
     }
 
     /**
      * Set Value.
-     *
-     * @param string $value
      */
-    public function setValue($value): void
+    public function setValue(string $value): void
     {
         $this->value = $value;
     }
 
     /**
      * Get Token Type (represented by TOKEN_TYPE_*).
-     *
-     * @return string
      */
-    public function getTokenType()
+    public function getTokenType(): string
     {
         return $this->tokenType;
     }
 
     /**
      * Set Token Type (represented by TOKEN_TYPE_*).
-     *
-     * @param string $value
      */
-    public function setTokenType($value): void
+    public function setTokenType(string $value): void
     {
         $this->tokenType = $value;
     }
 
     /**
      * Get Token SubType (represented by TOKEN_SUBTYPE_*).
-     *
-     * @return string
      */
-    public function getTokenSubType()
+    public function getTokenSubType(): string
     {
         return $this->tokenSubType;
     }
 
     /**
      * Set Token SubType (represented by TOKEN_SUBTYPE_*).
-     *
-     * @param string $value
      */
-    public function setTokenSubType($value): void
+    public function setTokenSubType(string $value): void
     {
         $this->tokenSubType = $value;
     }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Functions.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Functions.php
index aea2323e37..77f8317ae8 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Functions.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Functions.php
@@ -14,64 +14,47 @@ class Functions
      */
     const M_2DIVPI = 0.63661977236758134307553505349006;
 
-    /** constants */
     const COMPATIBILITY_EXCEL = 'Excel';
     const COMPATIBILITY_GNUMERIC = 'Gnumeric';
     const COMPATIBILITY_OPENOFFICE = 'OpenOfficeCalc';
 
+    /** Use of RETURNDATE_PHP_NUMERIC is discouraged - not 32-bit Y2038-safe, no timezone. */
     const RETURNDATE_PHP_NUMERIC = 'P';
+    /** Use of RETURNDATE_UNIX_TIMESTAMP is discouraged - not 32-bit Y2038-safe, no timezone. */
     const RETURNDATE_UNIX_TIMESTAMP = 'P';
     const RETURNDATE_PHP_OBJECT = 'O';
     const RETURNDATE_PHP_DATETIME_OBJECT = 'O';
     const RETURNDATE_EXCEL = 'E';
 
+    public const NOT_YET_IMPLEMENTED = '#Not Yet Implemented';
+
     /**
      * Compatibility mode to use for error checking and responses.
-     *
-     * @var string
      */
-    protected static $compatibilityMode = self::COMPATIBILITY_EXCEL;
+    protected static string $compatibilityMode = self::COMPATIBILITY_EXCEL;
 
     /**
      * Data Type to use when returning date values.
-     *
-     * @var string
-     */
-    protected static $returnDateType = self::RETURNDATE_EXCEL;
-
-    /**
-     * List of error codes.
-     *
-     * @var array
      */
-    protected static $errorCodes = [
-        'null' => '#NULL!',
-        'divisionbyzero' => '#DIV/0!',
-        'value' => '#VALUE!',
-        'reference' => '#REF!',
-        'name' => '#NAME?',
-        'num' => '#NUM!',
-        'na' => '#N/A',
-        'gettingdata' => '#GETTING_DATA',
-    ];
+    protected static string $returnDateType = self::RETURNDATE_EXCEL;
 
     /**
      * Set the Compatibility Mode.
      *
      * @param string $compatibilityMode Compatibility Mode
-     *                                                Permitted values are:
-     *                                                    Functions::COMPATIBILITY_EXCEL            'Excel'
-     *                                                    Functions::COMPATIBILITY_GNUMERIC        'Gnumeric'
-     *                                                    Functions::COMPATIBILITY_OPENOFFICE    'OpenOfficeCalc'
+     *                                  Permitted values are:
+     *                                      Functions::COMPATIBILITY_EXCEL        'Excel'
+     *                                      Functions::COMPATIBILITY_GNUMERIC     'Gnumeric'
+     *                                      Functions::COMPATIBILITY_OPENOFFICE   'OpenOfficeCalc'
      *
      * @return bool (Success or Failure)
      */
-    public static function setCompatibilityMode($compatibilityMode)
+    public static function setCompatibilityMode(string $compatibilityMode): bool
     {
         if (
-            ($compatibilityMode == self::COMPATIBILITY_EXCEL) ||
-            ($compatibilityMode == self::COMPATIBILITY_GNUMERIC) ||
-            ($compatibilityMode == self::COMPATIBILITY_OPENOFFICE)
+            ($compatibilityMode == self::COMPATIBILITY_EXCEL)
+            || ($compatibilityMode == self::COMPATIBILITY_GNUMERIC)
+            || ($compatibilityMode == self::COMPATIBILITY_OPENOFFICE)
         ) {
             self::$compatibilityMode = $compatibilityMode;
 
@@ -85,33 +68,33 @@ public static function setCompatibilityMode($compatibilityMode)
      * Return the current Compatibility Mode.
      *
      * @return string Compatibility Mode
-     *                            Possible Return values are:
-     *                                Functions::COMPATIBILITY_EXCEL            'Excel'
-     *                                Functions::COMPATIBILITY_GNUMERIC        'Gnumeric'
-     *                                Functions::COMPATIBILITY_OPENOFFICE    'OpenOfficeCalc'
+     *                Possible Return values are:
+     *                    Functions::COMPATIBILITY_EXCEL        'Excel'
+     *                    Functions::COMPATIBILITY_GNUMERIC     'Gnumeric'
+     *                    Functions::COMPATIBILITY_OPENOFFICE   'OpenOfficeCalc'
      */
-    public static function getCompatibilityMode()
+    public static function getCompatibilityMode(): string
     {
         return self::$compatibilityMode;
     }
 
     /**
-     * Set the Return Date Format used by functions that return a date/time (Excel, PHP Serialized Numeric or PHP Object).
+     * Set the Return Date Format used by functions that return a date/time (Excel, PHP Serialized Numeric or PHP DateTime Object).
      *
      * @param string $returnDateType Return Date Format
-     *                                                Permitted values are:
-     *                                                    Functions::RETURNDATE_UNIX_TIMESTAMP        'P'
-     *                                                    Functions::RETURNDATE_PHP_DATETIME_OBJECT        'O'
-     *                                                    Functions::RETURNDATE_EXCEL            'E'
+     *                               Permitted values are:
+     *                                   Functions::RETURNDATE_UNIX_TIMESTAMP       'P'
+     *                                   Functions::RETURNDATE_PHP_DATETIME_OBJECT  'O'
+     *                                   Functions::RETURNDATE_EXCEL                'E'
      *
      * @return bool Success or failure
      */
-    public static function setReturnDateType($returnDateType)
+    public static function setReturnDateType(string $returnDateType): bool
     {
         if (
-            ($returnDateType == self::RETURNDATE_UNIX_TIMESTAMP) ||
-            ($returnDateType == self::RETURNDATE_PHP_DATETIME_OBJECT) ||
-            ($returnDateType == self::RETURNDATE_EXCEL)
+            ($returnDateType == self::RETURNDATE_UNIX_TIMESTAMP)
+            || ($returnDateType == self::RETURNDATE_PHP_DATETIME_OBJECT)
+            || ($returnDateType == self::RETURNDATE_EXCEL)
         ) {
             self::$returnDateType = $returnDateType;
 
@@ -125,12 +108,12 @@ public static function setReturnDateType($returnDateType)
      * Return the current Return Date Format for functions that return a date/time (Excel, PHP Serialized Numeric or PHP Object).
      *
      * @return string Return Date Format
-     *                            Possible Return values are:
-     *                                Functions::RETURNDATE_UNIX_TIMESTAMP        'P'
-     *                                Functions::RETURNDATE_PHP_DATETIME_OBJECT        'O'
-     *                                Functions::RETURNDATE_EXCEL            'E'
+     *                Possible Return values are:
+     *                    Functions::RETURNDATE_UNIX_TIMESTAMP         'P'
+     *                    Functions::RETURNDATE_PHP_DATETIME_OBJECT    'O'
+     *                    Functions::RETURNDATE_EXCEL            '     'E'
      */
-    public static function getReturnDateType()
+    public static function getReturnDateType(): string
     {
         return self::$returnDateType;
     }
@@ -140,124 +123,42 @@ public static function getReturnDateType()
      *
      * @return string #Not Yet Implemented
      */
-    public static function DUMMY()
-    {
-        return '#Not Yet Implemented';
-    }
-
-    /**
-     * DIV0.
-     *
-     * @return string #Not Yet Implemented
-     */
-    public static function DIV0()
-    {
-        return self::$errorCodes['divisionbyzero'];
-    }
-
-    /**
-     * NA.
-     *
-     * Excel Function:
-     *        =NA()
-     *
-     * Returns the error value #N/A
-     *        #N/A is the error value that means "no value is available."
-     *
-     * @return string #N/A!
-     */
-    public static function NA()
-    {
-        return self::$errorCodes['na'];
-    }
-
-    /**
-     * NaN.
-     *
-     * Returns the error value #NUM!
-     *
-     * @return string #NUM!
-     */
-    public static function NAN()
-    {
-        return self::$errorCodes['num'];
-    }
-
-    /**
-     * NAME.
-     *
-     * Returns the error value #NAME?
-     *
-     * @return string #NAME?
-     */
-    public static function NAME()
-    {
-        return self::$errorCodes['name'];
-    }
-
-    /**
-     * REF.
-     *
-     * Returns the error value #REF!
-     *
-     * @return string #REF!
-     */
-    public static function REF()
-    {
-        return self::$errorCodes['reference'];
-    }
-
-    /**
-     * NULL.
-     *
-     * Returns the error value #NULL!
-     *
-     * @return string #NULL!
-     */
-    public static function null()
-    {
-        return self::$errorCodes['null'];
-    }
-
-    /**
-     * VALUE.
-     *
-     * Returns the error value #VALUE!
-     *
-     * @return string #VALUE!
-     */
-    public static function VALUE()
+    public static function DUMMY(): string
     {
-        return self::$errorCodes['value'];
+        return self::NOT_YET_IMPLEMENTED;
     }
 
-    public static function isMatrixValue($idx)
+    public static function isMatrixValue(mixed $idx): bool
     {
         return (substr_count($idx, '.') <= 1) || (preg_match('/\.[A-Z]/', $idx) > 0);
     }
 
-    public static function isValue($idx)
+    public static function isValue(mixed $idx): bool
     {
-        return substr_count($idx, '.') == 0;
+        return substr_count($idx, '.') === 0;
     }
 
-    public static function isCellValue($idx)
+    public static function isCellValue(mixed $idx): bool
     {
         return substr_count($idx, '.') > 1;
     }
 
-    public static function ifCondition($condition)
+    public static function ifCondition(mixed $condition): string
     {
         $condition = self::flattenSingleValue($condition);
 
-        if ($condition === '') {
-            $condition = '=""';
+        if ($condition === '' || $condition === null) {
+            return '=""';
         }
-        if (!is_string($condition) || !in_array($condition[0], ['>', '<', '='])) {
+        if (!is_string($condition) || !in_array($condition[0], ['>', '<', '='], true)) {
             $condition = self::operandSpecialHandling($condition);
             if (is_bool($condition)) {
                 return '=' . ($condition ? 'TRUE' : 'FALSE');
             } elseif (!is_numeric($condition)) {
+                if ($condition !== '""') { // Not an empty string
+                    // Escape any quotes in the string value
+                    $condition = (string) preg_replace('/"/ui', '""', $condition);
+                }
                 $condition = Calculation::wrapResult(strtoupper($condition));
             }
 
@@ -277,7 +178,7 @@ public static function ifCondition($condition)
         return str_replace('""""', '""', $operator . $operand);
     }
 
-    private static function operandSpecialHandling($operand)
+    private static function operandSpecialHandling(mixed $operand): mixed
     {
         if (is_numeric($operand) || is_bool($operand)) {
             return $operand;
@@ -299,311 +200,45 @@ private static function operandSpecialHandling($operand)
     }
 
     /**
-     * ERROR_TYPE.
-     *
-     * @param mixed $value Value to check
-     *
-     * @return int|string
-     */
-    public static function errorType($value = '')
-    {
-        $value = self::flattenSingleValue($value);
-
-        $i = 1;
-        foreach (self::$errorCodes as $errorCode) {
-            if ($value === $errorCode) {
-                return $i;
-            }
-            ++$i;
-        }
-
-        return self::NA();
-    }
-
-    /**
-     * IS_BLANK.
-     *
-     * @param mixed $value Value to check
-     *
-     * @return bool
-     */
-    public static function isBlank($value = null)
-    {
-        if ($value !== null) {
-            $value = self::flattenSingleValue($value);
-        }
-
-        return $value === null;
-    }
-
-    /**
-     * IS_ERR.
-     *
-     * @param mixed $value Value to check
-     *
-     * @return bool
-     */
-    public static function isErr($value = '')
-    {
-        $value = self::flattenSingleValue($value);
-
-        return self::isError($value) && (!self::isNa(($value)));
-    }
-
-    /**
-     * IS_ERROR.
-     *
-     * @param mixed $value Value to check
-     *
-     * @return bool
-     */
-    public static function isError($value = '')
-    {
-        $value = self::flattenSingleValue($value);
-
-        if (!is_string($value)) {
-            return false;
-        }
-
-        return in_array($value, self::$errorCodes);
-    }
-
-    /**
-     * IS_NA.
-     *
-     * @param mixed $value Value to check
-     *
-     * @return bool
-     */
-    public static function isNa($value = '')
-    {
-        $value = self::flattenSingleValue($value);
-
-        return $value === self::NA();
-    }
-
-    /**
-     * IS_EVEN.
-     *
-     * @param mixed $value Value to check
-     *
-     * @return bool|string
-     */
-    public static function isEven($value = null)
-    {
-        $value = self::flattenSingleValue($value);
-
-        if ($value === null) {
-            return self::NAME();
-        } elseif ((is_bool($value)) || ((is_string($value)) && (!is_numeric($value)))) {
-            return self::VALUE();
-        }
-
-        return $value % 2 == 0;
-    }
-
-    /**
-     * IS_ODD.
-     *
-     * @param mixed $value Value to check
-     *
-     * @return bool|string
-     */
-    public static function isOdd($value = null)
-    {
-        $value = self::flattenSingleValue($value);
-
-        if ($value === null) {
-            return self::NAME();
-        } elseif ((is_bool($value)) || ((is_string($value)) && (!is_numeric($value)))) {
-            return self::VALUE();
-        }
-
-        return abs($value) % 2 == 1;
-    }
-
-    /**
-     * IS_NUMBER.
-     *
-     * @param mixed $value Value to check
-     *
-     * @return bool
-     */
-    public static function isNumber($value = null)
-    {
-        $value = self::flattenSingleValue($value);
-
-        if (is_string($value)) {
-            return false;
-        }
-
-        return is_numeric($value);
-    }
-
-    /**
-     * IS_LOGICAL.
-     *
-     * @param mixed $value Value to check
-     *
-     * @return bool
-     */
-    public static function isLogical($value = null)
-    {
-        $value = self::flattenSingleValue($value);
-
-        return is_bool($value);
-    }
-
-    /**
-     * IS_TEXT.
-     *
-     * @param mixed $value Value to check
-     *
-     * @return bool
-     */
-    public static function isText($value = null)
-    {
-        $value = self::flattenSingleValue($value);
-
-        return is_string($value) && !self::isError($value);
-    }
-
-    /**
-     * IS_NONTEXT.
-     *
-     * @param mixed $value Value to check
-     *
-     * @return bool
-     */
-    public static function isNonText($value = null)
-    {
-        return !self::isText($value);
-    }
-
-    /**
-     * N.
-     *
-     * Returns a value converted to a number
+     * Convert a multi-dimensional array to a simple 1-dimensional array.
      *
-     * @param null|mixed $value The value you want converted
+     * @param mixed $array Array to be flattened
      *
-     * @return number N converts values listed in the following table
-     *        If value is or refers to N returns
-     *        A number            That number
-     *        A date                The serial number of that date
-     *        TRUE                1
-     *        FALSE                0
-     *        An error value        The error value
-     *        Anything else        0
+     * @return array Flattened array
      */
-    public static function n($value = null)
+    public static function flattenArray(mixed $array): array
     {
-        while (is_array($value)) {
-            $value = array_shift($value);
+        if (!is_array($array)) {
+            return (array) $array;
         }
 
-        switch (gettype($value)) {
-            case 'double':
-            case 'float':
-            case 'integer':
-                return $value;
-            case 'boolean':
-                return (int) $value;
-            case 'string':
-                //    Errors
-                if ((strlen($value) > 0) && ($value[0] == '#')) {
-                    return $value;
-                }
-
-                break;
-        }
+        $flattened = [];
+        $stack = array_values($array);
 
-        return 0;
-    }
+        while (!empty($stack)) {
+            $value = array_shift($stack);
 
-    /**
-     * TYPE.
-     *
-     * Returns a number that identifies the type of a value
-     *
-     * @param null|mixed $value The value you want tested
-     *
-     * @return number N converts values listed in the following table
-     *        If value is or refers to N returns
-     *        A number            1
-     *        Text                2
-     *        Logical Value        4
-     *        An error value        16
-     *        Array or Matrix        64
-     */
-    public static function TYPE($value = null)
-    {
-        $value = self::flattenArrayIndexed($value);
-        if (is_array($value) && (count($value) > 1)) {
-            end($value);
-            $a = key($value);
-            //    Range of cells is an error
-            if (self::isCellValue($a)) {
-                return 16;
-            //    Test for Matrix
-            } elseif (self::isMatrixValue($a)) {
-                return 64;
-            }
-        } elseif (empty($value)) {
-            //    Empty Cell
-            return 1;
-        }
-        $value = self::flattenSingleValue($value);
-
-        if (($value === null) || (is_float($value)) || (is_int($value))) {
-            return 1;
-        } elseif (is_bool($value)) {
-            return 4;
-        } elseif (is_array($value)) {
-            return 64;
-        } elseif (is_string($value)) {
-            //    Errors
-            if ((strlen($value) > 0) && ($value[0] == '#')) {
-                return 16;
+            if (is_array($value)) {
+                array_unshift($stack, ...array_values($value));
+            } else {
+                $flattened[] = $value;
             }
-
-            return 2;
         }
 
-        return 0;
+        return $flattened;
     }
 
-    /**
-     * Convert a multi-dimensional array to a simple 1-dimensional array.
-     *
-     * @param array|mixed $array Array to be flattened
-     *
-     * @return array Flattened array
-     */
-    public static function flattenArray($array)
+    public static function scalar(mixed $value): mixed
     {
-        if (!is_array($array)) {
-            return (array) $array;
+        if (!is_array($value)) {
+            return $value;
         }
 
-        $arrayValues = [];
-        foreach ($array as $value) {
-            if (is_array($value)) {
-                foreach ($value as $val) {
-                    if (is_array($val)) {
-                        foreach ($val as $v) {
-                            $arrayValues[] = $v;
-                        }
-                    } else {
-                        $arrayValues[] = $val;
-                    }
-                }
-            } else {
-                $arrayValues[] = $value;
-            }
-        }
+        do {
+            $value = array_pop($value);
+        } while (is_array($value));
 
-        return $arrayValues;
+        return $value;
     }
 
     /**
@@ -613,7 +248,7 @@ public static function flattenArray($array)
      *
      * @return array Flattened array
      */
-    public static function flattenArrayIndexed($array)
+    public static function flattenArrayIndexed($array): array
     {
         if (!is_array($array)) {
             return (array) $array;
@@ -643,10 +278,8 @@ public static function flattenArrayIndexed($array)
      * Convert an array to a single scalar value by extracting the first element.
      *
      * @param mixed $value Array or scalar value
-     *
-     * @return mixed
      */
-    public static function flattenSingleValue($value = '')
+    public static function flattenSingleValue(mixed $value): mixed
     {
         while (is_array($value)) {
             $value = array_shift($value);
@@ -655,29 +288,37 @@ public static function flattenSingleValue($value = '')
         return $value;
     }
 
-    /**
-     * ISFORMULA.
-     *
-     * @param mixed $cellReference The cell to check
-     * @param Cell $pCell The current cell (containing this formula)
-     *
-     * @return bool|string
-     */
-    public static function isFormula($cellReference = '', ?Cell $pCell = null)
-    {
-        if ($pCell === null) {
-            return self::REF();
+    public static function expandDefinedName(string $coordinate, Cell $cell): string
+    {
+        $worksheet = $cell->getWorksheet();
+        $spreadsheet = $worksheet->getParentOrThrow();
+        // Uppercase coordinate
+        $pCoordinatex = strtoupper($coordinate);
+        // Eliminate leading equal sign
+        $pCoordinatex = (string) preg_replace('/^=/', '', $pCoordinatex);
+        $defined = $spreadsheet->getDefinedName($pCoordinatex, $worksheet);
+        if ($defined !== null) {
+            $worksheet2 = $defined->getWorkSheet();
+            if (!$defined->isFormula() && $worksheet2 !== null) {
+                $coordinate = "'" . $worksheet2->getTitle() . "'!"
+                    . (string) preg_replace('/^=/', '', str_replace('$', '', $defined->getValue()));
+            }
         }
 
-        preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/i', $cellReference, $matches);
+        return $coordinate;
+    }
 
-        $cellReference = $matches[6] . $matches[7];
-        $worksheetName = str_replace("''", "'", trim($matches[2], "'"));
+    public static function trimTrailingRange(string $coordinate): string
+    {
+        return (string) preg_replace('/:[\\w\$]+$/', '', $coordinate);
+    }
 
-        $worksheet = (!empty($worksheetName))
-            ? $pCell->getWorksheet()->getParent()->getSheetByName($worksheetName)
-            : $pCell->getWorksheet();
+    public static function trimSheetFromCellReference(string $coordinate): string
+    {
+        if (str_contains($coordinate, '!')) {
+            $coordinate = substr($coordinate, strrpos($coordinate, '!') + 1);
+        }
 
-        return $worksheet->getCell($cellReference)->isFormula();
+        return $coordinate;
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Information/ErrorValue.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Information/ErrorValue.php
new file mode 100644
index 0000000000..f3a746273b
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Information/ErrorValue.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Information;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+
+class ErrorValue
+{
+    use ArrayEnabled;
+
+    /**
+     * IS_ERR.
+     *
+     * @param mixed $value Value to check
+     *                      Or can be an array of values
+     *
+     * @return array|bool If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function isErr(mixed $value = ''): array|bool
+    {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
+        return self::isError($value) && (!self::isNa(($value)));
+    }
+
+    /**
+     * IS_ERROR.
+     *
+     * @param mixed $value Value to check
+     *                      Or can be an array of values
+     *
+     * @return array|bool If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function isError(mixed $value = '', bool $tryNotImplemented = false): array|bool
+    {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
+        if (!is_string($value)) {
+            return false;
+        }
+        if ($tryNotImplemented && $value === Functions::NOT_YET_IMPLEMENTED) {
+            return true;
+        }
+
+        return in_array($value, ExcelError::ERROR_CODES, true);
+    }
+
+    /**
+     * IS_NA.
+     *
+     * @param mixed $value Value to check
+     *                      Or can be an array of values
+     *
+     * @return array|bool If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function isNa(mixed $value = ''): array|bool
+    {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
+        return $value === ExcelError::NA();
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Information/ExcelError.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Information/ExcelError.php
new file mode 100644
index 0000000000..f4ea42d96c
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Information/ExcelError.php
@@ -0,0 +1,165 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Information;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+
+class ExcelError
+{
+    use ArrayEnabled;
+
+    /**
+     * List of error codes.
+     *
+     * @var array<string, string>
+     */
+    public const ERROR_CODES = [
+        'null' => '#NULL!', // 1
+        'divisionbyzero' => '#DIV/0!', // 2
+        'value' => '#VALUE!', // 3
+        'reference' => '#REF!', // 4
+        'name' => '#NAME?', // 5
+        'num' => '#NUM!', // 6
+        'na' => '#N/A', // 7
+        'gettingdata' => '#GETTING_DATA', // 8
+        'spill' => '#SPILL!', // 9
+        'connect' => '#CONNECT!', //10
+        'blocked' => '#BLOCKED!', //11
+        'unknown' => '#UNKNOWN!', //12
+        'field' => '#FIELD!', //13
+        'calculation' => '#CALC!', //14
+    ];
+
+    public static function throwError(mixed $value): string
+    {
+        return in_array($value, self::ERROR_CODES, true) ? $value : self::ERROR_CODES['value'];
+    }
+
+    /**
+     * ERROR_TYPE.
+     *
+     * @param mixed $value Value to check
+     */
+    public static function type(mixed $value = ''): array|int|string
+    {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
+        $i = 1;
+        foreach (self::ERROR_CODES as $errorCode) {
+            if ($value === $errorCode) {
+                return $i;
+            }
+            ++$i;
+        }
+
+        return self::NA();
+    }
+
+    /**
+     * NULL.
+     *
+     * Returns the error value #NULL!
+     *
+     * @return string #NULL!
+     */
+    public static function null(): string
+    {
+        return self::ERROR_CODES['null'];
+    }
+
+    /**
+     * NaN.
+     *
+     * Returns the error value #NUM!
+     *
+     * @return string #NUM!
+     */
+    public static function NAN(): string
+    {
+        return self::ERROR_CODES['num'];
+    }
+
+    /**
+     * REF.
+     *
+     * Returns the error value #REF!
+     *
+     * @return string #REF!
+     */
+    public static function REF(): string
+    {
+        return self::ERROR_CODES['reference'];
+    }
+
+    /**
+     * NA.
+     *
+     * Excel Function:
+     *        =NA()
+     *
+     * Returns the error value #N/A
+     *        #N/A is the error value that means "no value is available."
+     *
+     * @return string #N/A!
+     */
+    public static function NA(): string
+    {
+        return self::ERROR_CODES['na'];
+    }
+
+    /**
+     * VALUE.
+     *
+     * Returns the error value #VALUE!
+     *
+     * @return string #VALUE!
+     */
+    public static function VALUE(): string
+    {
+        return self::ERROR_CODES['value'];
+    }
+
+    /**
+     * NAME.
+     *
+     * Returns the error value #NAME?
+     *
+     * @return string #NAME?
+     */
+    public static function NAME(): string
+    {
+        return self::ERROR_CODES['name'];
+    }
+
+    /**
+     * DIV0.
+     *
+     * @return string #DIV/0!
+     */
+    public static function DIV0(): string
+    {
+        return self::ERROR_CODES['divisionbyzero'];
+    }
+
+    /**
+     * CALC.
+     *
+     * @return string #CALC!
+     */
+    public static function CALC(): string
+    {
+        return self::ERROR_CODES['calculation'];
+    }
+
+    /**
+     * SPILL.
+     *
+     * @return string #SPILL!
+     */
+    public static function SPILL(): string
+    {
+        return self::ERROR_CODES['spill'];
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Information/Value.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Information/Value.php
new file mode 100644
index 0000000000..a99c2343fb
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Information/Value.php
@@ -0,0 +1,317 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Information;
+
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\NamedRange;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class Value
+{
+    use ArrayEnabled;
+
+    /**
+     * IS_BLANK.
+     *
+     * @param mixed $value Value to check
+     *                      Or can be an array of values
+     *
+     * @return array|bool If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function isBlank(mixed $value = null): array|bool
+    {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
+        return $value === null;
+    }
+
+    /**
+     * IS_REF.
+     *
+     * @param mixed $value Value to check
+     */
+    public static function isRef(mixed $value, ?Cell $cell = null): bool
+    {
+        if ($cell === null) {
+            return false;
+        }
+
+        $cellValue = Functions::trimTrailingRange($value);
+        if (preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/ui', $cellValue) === 1) {
+            [$worksheet, $cellValue] = Worksheet::extractSheetTitle($cellValue, true);
+            if (!empty($worksheet) && $cell->getWorksheet()->getParentOrThrow()->getSheetByName($worksheet) === null) {
+                return false;
+            }
+            [$column, $row] = Coordinate::indexesFromString($cellValue ?? '');
+            if ($column > 16384 || $row > 1048576) {
+                return false;
+            }
+
+            return true;
+        }
+
+        $namedRange = $cell->getWorksheet()->getParentOrThrow()->getNamedRange($value);
+
+        return $namedRange instanceof NamedRange;
+    }
+
+    /**
+     * IS_EVEN.
+     *
+     * @param mixed $value Value to check
+     *                      Or can be an array of values
+     *
+     * @return array|bool|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function isEven(mixed $value = null): array|string|bool
+    {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
+        if ($value === null) {
+            return ExcelError::NAME();
+        } elseif ((is_bool($value)) || ((is_string($value)) && (!is_numeric($value)))) {
+            return ExcelError::VALUE();
+        }
+
+        return ((int) fmod($value, 2)) === 0;
+    }
+
+    /**
+     * IS_ODD.
+     *
+     * @param mixed $value Value to check
+     *                      Or can be an array of values
+     *
+     * @return array|bool|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function isOdd(mixed $value = null): array|string|bool
+    {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
+        if ($value === null) {
+            return ExcelError::NAME();
+        } elseif ((is_bool($value)) || ((is_string($value)) && (!is_numeric($value)))) {
+            return ExcelError::VALUE();
+        }
+
+        return ((int) fmod($value, 2)) !== 0;
+    }
+
+    /**
+     * IS_NUMBER.
+     *
+     * @param mixed $value Value to check
+     *                      Or can be an array of values
+     *
+     * @return array|bool If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function isNumber(mixed $value = null): array|bool
+    {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
+        if (is_string($value)) {
+            return false;
+        }
+
+        return is_numeric($value);
+    }
+
+    /**
+     * IS_LOGICAL.
+     *
+     * @param mixed $value Value to check
+     *                      Or can be an array of values
+     *
+     * @return array|bool If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function isLogical(mixed $value = null): array|bool
+    {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
+        return is_bool($value);
+    }
+
+    /**
+     * IS_TEXT.
+     *
+     * @param mixed $value Value to check
+     *                      Or can be an array of values
+     *
+     * @return array|bool If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function isText(mixed $value = null): array|bool
+    {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
+        return is_string($value) && !ErrorValue::isError($value);
+    }
+
+    /**
+     * IS_NONTEXT.
+     *
+     * @param mixed $value Value to check
+     *                      Or can be an array of values
+     *
+     * @return array|bool If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
+     */
+    public static function isNonText(mixed $value = null): array|bool
+    {
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
+        return !self::isText($value);
+    }
+
+    /**
+     * ISFORMULA.
+     *
+     * @param mixed $cellReference The cell to check
+     * @param ?Cell $cell The current cell (containing this formula)
+     */
+    public static function isFormula(mixed $cellReference = '', ?Cell $cell = null): array|bool|string
+    {
+        if ($cell === null) {
+            return ExcelError::REF();
+        }
+
+        $fullCellReference = Functions::expandDefinedName((string) $cellReference, $cell);
+
+        if (str_contains($cellReference, '!')) {
+            $cellReference = Functions::trimSheetFromCellReference($cellReference);
+            $cellReferences = Coordinate::extractAllCellReferencesInRange($cellReference);
+            if (count($cellReferences) > 1) {
+                return self::evaluateArrayArgumentsSubset([self::class, __FUNCTION__], 1, $cellReferences, $cell);
+            }
+        }
+
+        $fullCellReference = Functions::trimTrailingRange($fullCellReference);
+
+        preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/i', $fullCellReference, $matches);
+
+        $fullCellReference = $matches[6] . $matches[7];
+        $worksheetName = str_replace("''", "'", trim($matches[2], "'"));
+
+        $worksheet = (!empty($worksheetName))
+            ? $cell->getWorksheet()->getParentOrThrow()->getSheetByName($worksheetName)
+            : $cell->getWorksheet();
+
+        return ($worksheet !== null) ? $worksheet->getCell($fullCellReference)->isFormula() : ExcelError::REF();
+    }
+
+    /**
+     * N.
+     *
+     * Returns a value converted to a number
+     *
+     * @param null|mixed $value The value you want converted
+     *
+     * @return number|string N converts values listed in the following table
+     *        If value is or refers to N returns
+     *        A number            That number value
+     *        A date              The Excel serialized number of that date
+     *        TRUE                1
+     *        FALSE               0
+     *        An error value      The error value
+     *        Anything else       0
+     */
+    public static function asNumber($value = null)
+    {
+        while (is_array($value)) {
+            $value = array_shift($value);
+        }
+
+        switch (gettype($value)) {
+            case 'double':
+            case 'float':
+            case 'integer':
+                return $value;
+            case 'boolean':
+                return (int) $value;
+            case 'string':
+                //    Errors
+                if (($value !== '') && ($value[0] == '#')) {
+                    return $value;
+                }
+
+                break;
+        }
+
+        return 0;
+    }
+
+    /**
+     * TYPE.
+     *
+     * Returns a number that identifies the type of a value
+     *
+     * @param null|mixed $value The value you want tested
+     *
+     * @return int N converts values listed in the following table
+     *        If value is or refers to N returns
+     *        A number            1
+     *        Text                2
+     *        Logical Value       4
+     *        An error value      16
+     *        Array or Matrix     64
+     */
+    public static function type($value = null): int
+    {
+        $value = Functions::flattenArrayIndexed($value);
+        if (is_array($value) && (count($value) > 1)) {
+            end($value);
+            $a = key($value);
+            //    Range of cells is an error
+            if (Functions::isCellValue($a)) {
+                return 16;
+            //    Test for Matrix
+            } elseif (Functions::isMatrixValue($a)) {
+                return 64;
+            }
+        } elseif (empty($value)) {
+            //    Empty Cell
+            return 1;
+        }
+
+        $value = Functions::flattenSingleValue($value);
+        if (($value === null) || (is_float($value)) || (is_int($value))) {
+            return 1;
+        } elseif (is_bool($value)) {
+            return 4;
+        } elseif (is_array($value)) {
+            return 64;
+        } elseif (is_string($value)) {
+            //    Errors
+            if (($value !== '') && ($value[0] == '#')) {
+                return 16;
+            }
+
+            return 2;
+        }
+
+        return 0;
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Internal/ExcelArrayPseudoFunctions.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Internal/ExcelArrayPseudoFunctions.php
new file mode 100644
index 0000000000..2bccab8da6
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Internal/ExcelArrayPseudoFunctions.php
@@ -0,0 +1,103 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\Internal;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class ExcelArrayPseudoFunctions
+{
+    public static function single(string $cellReference, Cell $cell): mixed
+    {
+        $worksheet = $cell->getWorksheet();
+
+        [$referenceWorksheetName, $referenceCellCoordinate] = Worksheet::extractSheetTitle($cellReference, true);
+        if (preg_match('/^([$]?[a-z]{1,3})([$]?([0-9]{1,7})):([$]?[a-z]{1,3})([$]?([0-9]{1,7}))$/i', "$referenceCellCoordinate", $matches) === 1) {
+            $ourRow = $cell->getRow();
+            $firstRow = (int) $matches[3];
+            $lastRow = (int) $matches[6];
+            if ($ourRow < $firstRow || $ourRow > $lastRow || $matches[1] !== $matches[4]) {
+                return ExcelError::VALUE();
+            }
+            $referenceCellCoordinate = $matches[1] . $ourRow;
+        }
+        $referenceCell = ($referenceWorksheetName === '')
+            ? $worksheet->getCell((string) $referenceCellCoordinate)
+            : $worksheet->getParentOrThrow()
+                ->getSheetByNameOrThrow((string) $referenceWorksheetName)
+                ->getCell((string) $referenceCellCoordinate);
+
+        $result = $referenceCell->getCalculatedValue();
+        while (is_array($result)) {
+            $result = array_shift($result);
+        }
+
+        return $result;
+    }
+
+    public static function anchorArray(string $cellReference, Cell $cell): array|string
+    {
+        //$coordinate = $cell->getCoordinate();
+        $worksheet = $cell->getWorksheet();
+
+        [$referenceWorksheetName, $referenceCellCoordinate] = Worksheet::extractSheetTitle($cellReference, true);
+        $referenceCell = ($referenceWorksheetName === '')
+            ? $worksheet->getCell((string) $referenceCellCoordinate)
+            : $worksheet->getParentOrThrow()
+                ->getSheetByNameOrThrow((string) $referenceWorksheetName)
+                ->getCell((string) $referenceCellCoordinate);
+
+        // We should always use the sizing for the array formula range from the referenced cell formula
+        //$referenceRange = null;
+        /*if ($referenceCell->isFormula() && $referenceCell->isArrayFormula()) {
+            $referenceRange = $referenceCell->arrayFormulaRange();
+        }*/
+
+        $calcEngine = Calculation::getInstance($worksheet->getParent());
+        $result = $calcEngine->calculateCellValue($referenceCell, false);
+        if (!is_array($result)) {
+            $result = ExcelError::REF();
+        }
+
+        // Ensure that our array result dimensions match the specified array formula range dimensions,
+        //    from the referenced cell, expanding or shrinking it as necessary.
+        /*$result = Functions::resizeMatrix(
+            $result,
+            ...Coordinate::rangeDimension($referenceRange ?? $coordinate)
+        );*/
+
+        // Set the result for our target cell (with spillage)
+        // But if we do write it, we get problems with #SPILL! Errors if the spreadsheet is saved
+        // TODO How are we going to identify and handle a #SPILL! or a #CALC! error?
+//        IOFactory::setLoading(true);
+//        $worksheet->fromArray(
+//            $result,
+//            null,
+//            $coordinate,
+//            true
+//        );
+//        IOFactory::setLoading(true);
+
+        // Calculate the array formula range that we should set for our target, based on our target cell coordinate
+//        [$col, $row] = Coordinate::indexesFromString($coordinate);
+//        $row += count($result) - 1;
+//        $col = Coordinate::stringFromColumnIndex($col + count($result[0]) - 1);
+//        $arrayFormulaRange = "{$coordinate}:{$col}{$row}";
+//        $formulaAttributes = ['t' => 'array', 'ref' => $arrayFormulaRange];
+
+        // Using fromArray() would reset the value for this cell with the calculation result
+        //      as well as updating the spillage cells,
+        //  so we need to restore this cell to its formula value, attributes, and datatype
+//        $cell = $worksheet->getCell($coordinate);
+//        $cell->setValueExplicit($value, DataType::TYPE_FORMULA, true, $arrayFormulaRange);
+//        $cell->setFormulaAttributes($formulaAttributes);
+
+//        $cell->updateInCollection();
+
+        return $result;
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Internal/MakeMatrix.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Internal/MakeMatrix.php
index 8b53464fc4..22c95e86cd 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Internal/MakeMatrix.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Internal/MakeMatrix.php
@@ -4,6 +4,7 @@
 
 class MakeMatrix
 {
+    /** @param array $args */
     public static function make(...$args): array
     {
         return $args;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Internal/WildcardMatch.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Internal/WildcardMatch.php
index 2ba2034686..371ad8b3d1 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Internal/WildcardMatch.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Internal/WildcardMatch.php
@@ -5,33 +5,33 @@
 class WildcardMatch
 {
     private const SEARCH_SET = [
-        '/(?<!~)\*/ui',
-        '/~\*/ui',
-        '/(?<!~)\?/ui',
-        '/~\?/ui',
+        '~~', // convert double tilde to unprintable value
+        '~\\*', // convert tilde backslash asterisk to [*] (matches literal asterisk in regexp)
+        '\\*', // convert backslash asterisk to .* (matches string of any length in regexp)
+        '~\\?', // convert tilde backslash question to [?] (matches literal question mark in regexp)
+        '\\?', // convert backslash question to . (matches one character in regexp)
+        "\x1c", // convert original double tilde to single tilde
     ];
 
     private const REPLACEMENT_SET = [
-        '${1}.*',
-        '\*',
-        '${1}.',
-        '\?',
+        "\x1c",
+        '[*]',
+        '.*',
+        '[?]',
+        '.',
+        '~',
     ];
 
     public static function wildcard(string $wildcard): string
     {
         // Preg Escape the wildcard, but protecting the Excel * and ? search characters
-        $wildcard = str_replace(['*', '?'], [0x1A, 0x1B], $wildcard);
-        $wildcard = preg_quote($wildcard);
-        $wildcard = str_replace([0x1A, 0x1B], ['*', '?'], $wildcard);
-
-        return preg_replace(self::SEARCH_SET, self::REPLACEMENT_SET, $wildcard);
+        return str_replace(self::SEARCH_SET, self::REPLACEMENT_SET, preg_quote($wildcard, '/'));
     }
 
-    public static function compare($value, string $wildcard): bool
+    public static function compare(?string $value, string $wildcard): bool
     {
-        if ($value === '') {
-            return true;
+        if ($value === '' || $value === null) {
+            return false;
         }
 
         return (bool) preg_match("/^{$wildcard}\$/mui", $value);
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Logical.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Logical.php
deleted file mode 100644
index b267e1f0b5..0000000000
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Logical.php
+++ /dev/null
@@ -1,314 +0,0 @@
-<?php
-
-namespace PhpOffice\PhpSpreadsheet\Calculation;
-
-use PhpOffice\PhpSpreadsheet\Calculation\Logical\Boolean;
-
-/**
- * @deprecated 1.17.0
- */
-class Logical
-{
-    /**
-     * TRUE.
-     *
-     * Returns the boolean TRUE.
-     *
-     * Excel Function:
-     *        =TRUE()
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Logical\Boolean::TRUE()
-     * Use the TRUE() method in the Logical\Boolean class instead
-     *
-     * @return bool True
-     */
-    public static function true(): bool
-    {
-        return Boolean::true();
-    }
-
-    /**
-     * FALSE.
-     *
-     * Returns the boolean FALSE.
-     *
-     * Excel Function:
-     *        =FALSE()
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Logical\Boolean::FALSE()
-     * Use the FALSE() method in the Logical\Boolean class instead
-     *
-     * @return bool False
-     */
-    public static function false(): bool
-    {
-        return Boolean::false();
-    }
-
-    /**
-     * LOGICAL_AND.
-     *
-     * Returns boolean TRUE if all its arguments are TRUE; returns FALSE if one or more argument is FALSE.
-     *
-     * Excel Function:
-     *        =AND(logical1[,logical2[, ...]])
-     *
-     *        The arguments must evaluate to logical values such as TRUE or FALSE, or the arguments must be arrays
-     *            or references that contain logical values.
-     *
-     *        Boolean arguments are treated as True or False as appropriate
-     *        Integer or floating point arguments are treated as True, except for 0 or 0.0 which are False
-     *        If any argument value is a string, or a Null, the function returns a #VALUE! error, unless the string
-     *            holds the value TRUE or FALSE, in which case it is evaluated as the corresponding boolean value
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Logical\Operations::logicalAnd()
-     * Use the logicalAnd() method in the Logical\Operations class instead
-     *
-     * @param mixed ...$args Data values
-     *
-     * @return bool|string the logical AND of the arguments
-     */
-    public static function logicalAnd(...$args)
-    {
-        return Logical\Operations::logicalAnd(...$args);
-    }
-
-    /**
-     * LOGICAL_OR.
-     *
-     * Returns boolean TRUE if any argument is TRUE; returns FALSE if all arguments are FALSE.
-     *
-     * Excel Function:
-     *        =OR(logical1[,logical2[, ...]])
-     *
-     *        The arguments must evaluate to logical values such as TRUE or FALSE, or the arguments must be arrays
-     *            or references that contain logical values.
-     *
-     *        Boolean arguments are treated as True or False as appropriate
-     *        Integer or floating point arguments are treated as True, except for 0 or 0.0 which are False
-     *        If any argument value is a string, or a Null, the function returns a #VALUE! error, unless the string
-     *            holds the value TRUE or FALSE, in which case it is evaluated as the corresponding boolean value
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Logical\Operations::logicalOr()
-     * Use the logicalOr() method in the Logical\Operations class instead
-     *
-     * @param mixed $args Data values
-     *
-     * @return bool|string the logical OR of the arguments
-     */
-    public static function logicalOr(...$args)
-    {
-        return Logical\Operations::logicalOr(...$args);
-    }
-
-    /**
-     * LOGICAL_XOR.
-     *
-     * Returns the Exclusive Or logical operation for one or more supplied conditions.
-     * i.e. the Xor function returns TRUE if an odd number of the supplied conditions evaluate to TRUE,
-     *      and FALSE otherwise.
-     *
-     * Excel Function:
-     *        =XOR(logical1[,logical2[, ...]])
-     *
-     *        The arguments must evaluate to logical values such as TRUE or FALSE, or the arguments must be arrays
-     *            or references that contain logical values.
-     *
-     *        Boolean arguments are treated as True or False as appropriate
-     *        Integer or floating point arguments are treated as True, except for 0 or 0.0 which are False
-     *        If any argument value is a string, or a Null, the function returns a #VALUE! error, unless the string
-     *            holds the value TRUE or FALSE, in which case it is evaluated as the corresponding boolean value
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Logical\Operations::logicalXor()
-     * Use the logicalXor() method in the Logical\Operations class instead
-     *
-     * @param mixed $args Data values
-     *
-     * @return bool|string the logical XOR of the arguments
-     */
-    public static function logicalXor(...$args)
-    {
-        return Logical\Operations::logicalXor(...$args);
-    }
-
-    /**
-     * NOT.
-     *
-     * Returns the boolean inverse of the argument.
-     *
-     * Excel Function:
-     *        =NOT(logical)
-     *
-     *        The argument must evaluate to a logical value such as TRUE or FALSE
-     *
-     *        Boolean arguments are treated as True or False as appropriate
-     *        Integer or floating point arguments are treated as True, except for 0 or 0.0 which are False
-     *        If any argument value is a string, or a Null, the function returns a #VALUE! error, unless the string
-     *            holds the value TRUE or FALSE, in which case it is evaluated as the corresponding boolean value
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Logical\Operations::NOT()
-     * Use the NOT() method in the Logical\Operations class instead
-     *
-     * @param mixed $logical A value or expression that can be evaluated to TRUE or FALSE
-     *
-     * @return bool|string the boolean inverse of the argument
-     */
-    public static function NOT($logical = false)
-    {
-        return Logical\Operations::NOT($logical);
-    }
-
-    /**
-     * STATEMENT_IF.
-     *
-     * Returns one value if a condition you specify evaluates to TRUE and another value if it evaluates to FALSE.
-     *
-     * Excel Function:
-     *        =IF(condition[,returnIfTrue[,returnIfFalse]])
-     *
-     *        Condition is any value or expression that can be evaluated to TRUE or FALSE.
-     *            For example, A10=100 is a logical expression; if the value in cell A10 is equal to 100,
-     *            the expression evaluates to TRUE. Otherwise, the expression evaluates to FALSE.
-     *            This argument can use any comparison calculation operator.
-     *        ReturnIfTrue is the value that is returned if condition evaluates to TRUE.
-     *            For example, if this argument is the text string "Within budget" and the condition argument
-     *                evaluates to TRUE, then the IF function returns the text "Within budget"
-     *            If condition is TRUE and ReturnIfTrue is blank, this argument returns 0 (zero).
-     *               To display the word TRUE, use the logical value TRUE for this argument.
-     *            ReturnIfTrue can be another formula.
-     *        ReturnIfFalse is the value that is returned if condition evaluates to FALSE.
-     *            For example, if this argument is the text string "Over budget" and the condition argument
-     *                evaluates to FALSE, then the IF function returns the text "Over budget".
-     *            If condition is FALSE and ReturnIfFalse is omitted, then the logical value FALSE is returned.
-     *            If condition is FALSE and ReturnIfFalse is blank, then the value 0 (zero) is returned.
-     *            ReturnIfFalse can be another formula.
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Logical\Conditional::statementIf()
-     * Use the statementIf() method in the Logical\Conditional class instead
-     *
-     * @param mixed $condition Condition to evaluate
-     * @param mixed $returnIfTrue Value to return when condition is true
-     * @param mixed $returnIfFalse Optional value to return when condition is false
-     *
-     * @return mixed The value of returnIfTrue or returnIfFalse determined by condition
-     */
-    public static function statementIf($condition = true, $returnIfTrue = 0, $returnIfFalse = false)
-    {
-        return Logical\Conditional::statementIf($condition, $returnIfTrue, $returnIfFalse);
-    }
-
-    /**
-     * STATEMENT_SWITCH.
-     *
-     * Returns corresponding with first match (any data type such as a string, numeric, date, etc).
-     *
-     * Excel Function:
-     *        =SWITCH (expression, value1, result1, value2, result2, ... value_n, result_n [, default])
-     *
-     *        Expression
-     *              The expression to compare to a list of values.
-     *        value1, value2, ... value_n
-     *              A list of values that are compared to expression.
-     *              The SWITCH function is looking for the first value that matches the expression.
-     *        result1, result2, ... result_n
-     *              A list of results. The SWITCH function returns the corresponding result when a value
-     *              matches expression.
-     *         default
-     *              Optional. It is the default to return if expression does not match any of the values
-     *              (value1, value2, ... value_n).
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Logical\Conditional::statementSwitch()
-     * Use the statementSwitch() method in the Logical\Conditional class instead
-     *
-     * @param mixed $arguments Statement arguments
-     *
-     * @return mixed The value of matched expression
-     */
-    public static function statementSwitch(...$arguments)
-    {
-        return Logical\Conditional::statementSwitch(...$arguments);
-    }
-
-    /**
-     * IFERROR.
-     *
-     * Excel Function:
-     *        =IFERROR(testValue,errorpart)
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Logical\Conditional::IFERROR()
-     * Use the IFERROR() method in the Logical\Conditional class instead
-     *
-     * @param mixed $testValue Value to check, is also the value returned when no error
-     * @param mixed $errorpart Value to return when testValue is an error condition
-     *
-     * @return mixed The value of errorpart or testValue determined by error condition
-     */
-    public static function IFERROR($testValue = '', $errorpart = '')
-    {
-        return Logical\Conditional::IFERROR($testValue, $errorpart);
-    }
-
-    /**
-     * IFNA.
-     *
-     * Excel Function:
-     *        =IFNA(testValue,napart)
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Logical\Conditional::IFNA()
-     * Use the IFNA() method in the Logical\Conditional class instead
-     *
-     * @param mixed $testValue Value to check, is also the value returned when not an NA
-     * @param mixed $napart Value to return when testValue is an NA condition
-     *
-     * @return mixed The value of errorpart or testValue determined by error condition
-     */
-    public static function IFNA($testValue = '', $napart = '')
-    {
-        return Logical\Conditional::IFNA($testValue, $napart);
-    }
-
-    /**
-     * IFS.
-     *
-     * Excel Function:
-     *         =IFS(testValue1;returnIfTrue1;testValue2;returnIfTrue2;...;testValue_n;returnIfTrue_n)
-     *
-     *         testValue1 ... testValue_n
-     *             Conditions to Evaluate
-     *         returnIfTrue1 ... returnIfTrue_n
-     *             Value returned if corresponding testValue (nth) was true
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Logical\Conditional::IFS()
-     * Use the IFS() method in the Logical\Conditional class instead
-     *
-     * @param mixed ...$arguments Statement arguments
-     *
-     * @return mixed|string The value of returnIfTrue_n, if testValue_n was true. #N/A if none of testValues was true
-     */
-    public static function IFS(...$arguments)
-    {
-        return Logical\Conditional::IFS(...$arguments);
-    }
-}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Logical/Conditional.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Logical/Conditional.php
index e84d0f33e4..9ac36c5b21 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Logical/Conditional.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Logical/Conditional.php
@@ -2,11 +2,17 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Logical;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ErrorValue;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\Value;
 
 class Conditional
 {
+    use ArrayEnabled;
+
     /**
      * STATEMENT_IF.
      *
@@ -34,21 +40,24 @@ class Conditional
      *
      * @param mixed $condition Condition to evaluate
      * @param mixed $returnIfTrue Value to return when condition is true
+     *              Note that this can be an array value
      * @param mixed $returnIfFalse Optional value to return when condition is false
+     *              Note that this can be an array value
      *
      * @return mixed The value of returnIfTrue or returnIfFalse determined by condition
      */
-    public static function statementIf($condition = true, $returnIfTrue = 0, $returnIfFalse = false)
+    public static function statementIf(mixed $condition = true, mixed $returnIfTrue = 0, mixed $returnIfFalse = false): mixed
     {
-        if (Functions::isError($condition)) {
+        $condition = ($condition === null) ? true : Functions::flattenSingleValue($condition);
+
+        if (ErrorValue::isError($condition)) {
             return $condition;
         }
 
-        $condition = ($condition === null) ? true : (bool) Functions::flattenSingleValue($condition);
-        $returnIfTrue = ($returnIfTrue === null) ? 0 : Functions::flattenSingleValue($returnIfTrue);
-        $returnIfFalse = ($returnIfFalse === null) ? false : Functions::flattenSingleValue($returnIfFalse);
+        $returnIfTrue = $returnIfTrue ?? 0;
+        $returnIfFalse = $returnIfFalse ?? false;
 
-        return ($condition) ? $returnIfTrue : $returnIfFalse;
+        return ((bool) $condition) ? $returnIfTrue : $returnIfFalse;
     }
 
     /**
@@ -67,17 +76,19 @@ public static function statementIf($condition = true, $returnIfTrue = 0, $return
      *        result1, result2, ... result_n
      *              A list of results. The SWITCH function returns the corresponding result when a value
      *              matches expression.
+     *              Note that these can be array values to be returned
      *         default
      *              Optional. It is the default to return if expression does not match any of the values
      *              (value1, value2, ... value_n).
+     *              Note that this can be an array value to be returned
      *
      * @param mixed $arguments Statement arguments
      *
      * @return mixed The value of matched expression
      */
-    public static function statementSwitch(...$arguments)
+    public static function statementSwitch(mixed ...$arguments): mixed
     {
-        $result = Functions::VALUE();
+        $result = ExcelError::VALUE();
 
         if (count($arguments) > 0) {
             $targetValue = Functions::flattenSingleValue($arguments[0]);
@@ -89,7 +100,7 @@ public static function statementSwitch(...$arguments)
             $switchSatisfied = false;
             if ($switchCount > 0) {
                 for ($index = 0; $index < $switchCount; ++$index) {
-                    if ($targetValue == $arguments[$index * 2 + 1]) {
+                    if ($targetValue == Functions::flattenSingleValue($arguments[$index * 2 + 1])) {
                         $result = $arguments[$index * 2 + 2];
                         $switchSatisfied = true;
 
@@ -99,7 +110,7 @@ public static function statementSwitch(...$arguments)
             }
 
             if ($switchSatisfied !== true) {
-                $result = $hasDefaultClause ? $defaultClause : Functions::NA();
+                $result = $hasDefaultClause ? $defaultClause : ExcelError::NA();
             }
         }
 
@@ -113,16 +124,24 @@ public static function statementSwitch(...$arguments)
      *        =IFERROR(testValue,errorpart)
      *
      * @param mixed $testValue Value to check, is also the value returned when no error
+     *                      Or can be an array of values
      * @param mixed $errorpart Value to return when testValue is an error condition
+     *              Note that this can be an array value to be returned
      *
      * @return mixed The value of errorpart or testValue determined by error condition
+     *         If an array of values is passed as the $testValue argument, then the returned result will also be
+     *            an array with the same dimensions
      */
-    public static function IFERROR($testValue = '', $errorpart = '')
+    public static function IFERROR(mixed $testValue = '', mixed $errorpart = ''): mixed
     {
-        $testValue = ($testValue === null) ? '' : Functions::flattenSingleValue($testValue);
-        $errorpart = ($errorpart === null) ? '' : Functions::flattenSingleValue($errorpart);
+        if (is_array($testValue)) {
+            return self::evaluateArrayArgumentsSubset([self::class, __FUNCTION__], 1, $testValue, $errorpart);
+        }
 
-        return self::statementIf(Functions::isError($testValue), $errorpart, $testValue);
+        $errorpart = $errorpart ?? '';
+        $testValue = $testValue ?? 0; // this is how Excel handles empty cell
+
+        return self::statementIf(ErrorValue::isError($testValue), $errorpart, $testValue);
     }
 
     /**
@@ -132,16 +151,24 @@ public static function IFERROR($testValue = '', $errorpart = '')
      *        =IFNA(testValue,napart)
      *
      * @param mixed $testValue Value to check, is also the value returned when not an NA
+     *                      Or can be an array of values
      * @param mixed $napart Value to return when testValue is an NA condition
+     *              Note that this can be an array value to be returned
      *
      * @return mixed The value of errorpart or testValue determined by error condition
+     *         If an array of values is passed as the $testValue argument, then the returned result will also be
+     *            an array with the same dimensions
      */
-    public static function IFNA($testValue = '', $napart = '')
+    public static function IFNA(mixed $testValue = '', mixed $napart = ''): mixed
     {
-        $testValue = ($testValue === null) ? '' : Functions::flattenSingleValue($testValue);
-        $napart = ($napart === null) ? '' : Functions::flattenSingleValue($napart);
+        if (is_array($testValue)) {
+            return self::evaluateArrayArgumentsSubset([self::class, __FUNCTION__], 1, $testValue, $napart);
+        }
+
+        $napart = $napart ?? '';
+        $testValue = $testValue ?? 0; // this is how Excel handles empty cell
 
-        return self::statementIf(Functions::isNa($testValue), $napart, $testValue);
+        return self::statementIf(ErrorValue::isNa($testValue), $napart, $testValue);
     }
 
     /**
@@ -156,21 +183,22 @@ public static function IFNA($testValue = '', $napart = '')
      *             Value returned if corresponding testValue (nth) was true
      *
      * @param mixed ...$arguments Statement arguments
+     *              Note that this can be an array value to be returned
      *
      * @return mixed|string The value of returnIfTrue_n, if testValue_n was true. #N/A if none of testValues was true
      */
-    public static function IFS(...$arguments)
+    public static function IFS(mixed ...$arguments)
     {
         $argumentCount = count($arguments);
 
         if ($argumentCount % 2 != 0) {
-            return Functions::NA();
+            return ExcelError::NA();
         }
         // We use instance of Exception as a falseValue in order to prevent string collision with value in cell
         $falseValueException = new Exception();
         for ($i = 0; $i < $argumentCount; $i += 2) {
             $testValue = ($arguments[$i] === null) ? '' : Functions::flattenSingleValue($arguments[$i]);
-            $returnIfTrue = ($arguments[$i + 1] === null) ? '' : Functions::flattenSingleValue($arguments[$i + 1]);
+            $returnIfTrue = ($arguments[$i + 1] === null) ? '' : $arguments[$i + 1];
             $result = self::statementIf($testValue, $returnIfTrue, $falseValueException);
 
             if ($result !== $falseValueException) {
@@ -178,6 +206,6 @@ public static function IFS(...$arguments)
             }
         }
 
-        return Functions::NA();
+        return ExcelError::NA();
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Logical/Operations.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Logical/Operations.php
index 6bfb6a545b..16bb5dd4c7 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Logical/Operations.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Logical/Operations.php
@@ -2,11 +2,15 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Logical;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class Operations
 {
+    use ArrayEnabled;
+
     /**
      * LOGICAL_AND.
      *
@@ -27,25 +31,9 @@ class Operations
      *
      * @return bool|string the logical AND of the arguments
      */
-    public static function logicalAnd(...$args)
+    public static function logicalAnd(mixed ...$args)
     {
-        $args = Functions::flattenArray($args);
-
-        if (count($args) == 0) {
-            return Functions::VALUE();
-        }
-
-        $args = array_filter($args, function ($value) {
-            return $value !== null || (is_string($value) && trim($value) == '');
-        });
-
-        $returnValue = self::countTrueValues($args);
-        if (is_string($returnValue)) {
-            return $returnValue;
-        }
-        $argCount = count($args);
-
-        return ($returnValue > 0) && ($returnValue == $argCount);
+        return self::countTrueValues($args, fn (int $trueValueCount, int $count): bool => $trueValueCount === $count);
     }
 
     /**
@@ -68,24 +56,9 @@ public static function logicalAnd(...$args)
      *
      * @return bool|string the logical OR of the arguments
      */
-    public static function logicalOr(...$args)
+    public static function logicalOr(mixed ...$args)
     {
-        $args = Functions::flattenArray($args);
-
-        if (count($args) == 0) {
-            return Functions::VALUE();
-        }
-
-        $args = array_filter($args, function ($value) {
-            return $value !== null || (is_string($value) && trim($value) == '');
-        });
-
-        $returnValue = self::countTrueValues($args);
-        if (is_string($returnValue)) {
-            return $returnValue;
-        }
-
-        return $returnValue > 0;
+        return self::countTrueValues($args, fn (int $trueValueCount): bool => $trueValueCount > 0);
     }
 
     /**
@@ -110,24 +83,9 @@ public static function logicalOr(...$args)
      *
      * @return bool|string the logical XOR of the arguments
      */
-    public static function logicalXor(...$args)
+    public static function logicalXor(mixed ...$args)
     {
-        $args = Functions::flattenArray($args);
-
-        if (count($args) == 0) {
-            return Functions::VALUE();
-        }
-
-        $args = array_filter($args, function ($value) {
-            return $value !== null || (is_string($value) && trim($value) == '');
-        });
-
-        $returnValue = self::countTrueValues($args);
-        if (is_string($returnValue)) {
-            return $returnValue;
-        }
-
-        return $returnValue % 2 == 1;
+        return self::countTrueValues($args, fn (int $trueValueCount): bool => $trueValueCount % 2 === 1);
     }
 
     /**
@@ -146,12 +104,17 @@ public static function logicalXor(...$args)
      *            holds the value TRUE or FALSE, in which case it is evaluated as the corresponding boolean value
      *
      * @param mixed $logical A value or expression that can be evaluated to TRUE or FALSE
+     *                      Or can be an array of values
      *
-     * @return bool|string the boolean inverse of the argument
+     * @return array|bool|string the boolean inverse of the argument
+     *         If an array of values is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function NOT($logical = false)
+    public static function NOT(mixed $logical = false): array|bool|string
     {
-        $logical = Functions::flattenSingleValue($logical);
+        if (is_array($logical)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $logical);
+        }
 
         if (is_string($logical)) {
             $logical = mb_strtoupper($logical, 'UTF-8');
@@ -161,38 +124,40 @@ public static function NOT($logical = false)
                 return true;
             }
 
-            return Functions::VALUE();
+            return ExcelError::VALUE();
         }
 
         return !$logical;
     }
 
-    /**
-     * @return int|string
-     */
-    private static function countTrueValues(array $args)
+    private static function countTrueValues(array $args, callable $func): bool|string
     {
         $trueValueCount = 0;
+        $count = 0;
 
-        foreach ($args as $arg) {
+        $aArgs = Functions::flattenArrayIndexed($args);
+        foreach ($aArgs as $k => $arg) {
+            ++$count;
             // Is it a boolean value?
             if (is_bool($arg)) {
                 $trueValueCount += $arg;
-            } elseif ((is_numeric($arg)) && (!is_string($arg))) {
-                $trueValueCount += ((int) $arg != 0);
             } elseif (is_string($arg)) {
+                $isLiteral = !Functions::isCellValue($k);
                 $arg = mb_strtoupper($arg, 'UTF-8');
-                if (($arg == 'TRUE') || ($arg == Calculation::getTRUE())) {
-                    $arg = true;
-                } elseif (($arg == 'FALSE') || ($arg == Calculation::getFALSE())) {
-                    $arg = false;
+                if ($isLiteral && ($arg == 'TRUE' || $arg == Calculation::getTRUE())) {
+                    ++$trueValueCount;
+                } elseif ($isLiteral && ($arg == 'FALSE' || $arg == Calculation::getFALSE())) {
+                    //$trueValueCount += 0;
                 } else {
-                    return Functions::VALUE();
+                    --$count;
                 }
-                $trueValueCount += ($arg != 0);
+            } elseif (is_int($arg) || is_float($arg)) {
+                $trueValueCount += (int) ($arg != 0);
+            } else {
+                --$count;
             }
         }
 
-        return $trueValueCount;
+        return ($count === 0) ? ExcelError::VALUE() : $func($trueValueCount, $count);
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef.php
deleted file mode 100644
index c213396d6f..0000000000
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef.php
+++ /dev/null
@@ -1,416 +0,0 @@
-<?php
-
-namespace PhpOffice\PhpSpreadsheet\Calculation;
-
-use PhpOffice\PhpSpreadsheet\Calculation\LookupRef\Address;
-use PhpOffice\PhpSpreadsheet\Calculation\LookupRef\HLookup;
-use PhpOffice\PhpSpreadsheet\Calculation\LookupRef\Indirect;
-use PhpOffice\PhpSpreadsheet\Calculation\LookupRef\Lookup;
-use PhpOffice\PhpSpreadsheet\Calculation\LookupRef\Matrix;
-use PhpOffice\PhpSpreadsheet\Calculation\LookupRef\Offset;
-use PhpOffice\PhpSpreadsheet\Calculation\LookupRef\RowColumnInformation;
-use PhpOffice\PhpSpreadsheet\Calculation\LookupRef\VLookup;
-use PhpOffice\PhpSpreadsheet\Cell\Cell;
-use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
-
-/**
- * @deprecated 1.18.0
- */
-class LookupRef
-{
-    /**
-     * CELL_ADDRESS.
-     *
-     * Creates a cell address as text, given specified row and column numbers.
-     *
-     * Excel Function:
-     *        =ADDRESS(row, column, [relativity], [referenceStyle], [sheetText])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see LookupRef\Address::cell()
-     *      Use the cell() method in the LookupRef\Address class instead
-     *
-     * @param mixed $row Row number to use in the cell reference
-     * @param mixed $column Column number to use in the cell reference
-     * @param int $relativity Flag indicating the type of reference to return
-     *                                1 or omitted    Absolute
-     *                                2               Absolute row; relative column
-     *                                3               Relative row; absolute column
-     *                                4               Relative
-     * @param bool $referenceStyle A logical value that specifies the A1 or R1C1 reference style.
-     *                                TRUE or omitted      CELL_ADDRESS returns an A1-style reference
-     *                                FALSE                CELL_ADDRESS returns an R1C1-style reference
-     * @param string $sheetText Optional Name of worksheet to use
-     *
-     * @return string
-     */
-    public static function cellAddress($row, $column, $relativity = 1, $referenceStyle = true, $sheetText = '')
-    {
-        return Address::cell($row, $column, $relativity, $referenceStyle, $sheetText);
-    }
-
-    /**
-     * COLUMN.
-     *
-     * Returns the column number of the given cell reference
-     *     If the cell reference is a range of cells, COLUMN returns the column numbers of each column
-     *        in the reference as a horizontal array.
-     *     If cell reference is omitted, and the function is being called through the calculation engine,
-     *        then it is assumed to be the reference of the cell in which the COLUMN function appears;
-     *        otherwise this function returns 1.
-     *
-     * Excel Function:
-     *        =COLUMN([cellAddress])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see LookupRef\RowColumnInformation::COLUMN()
-     *      Use the COLUMN() method in the LookupRef\RowColumnInformation class instead
-     *
-     * @param null|array|string $cellAddress A reference to a range of cells for which you want the column numbers
-     *
-     * @return int|int[]|string
-     */
-    public static function COLUMN($cellAddress = null, ?Cell $cell = null)
-    {
-        return RowColumnInformation::COLUMN($cellAddress, $cell);
-    }
-
-    /**
-     * COLUMNS.
-     *
-     * Returns the number of columns in an array or reference.
-     *
-     * Excel Function:
-     *        =COLUMNS(cellAddress)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see LookupRef\RowColumnInformation::COLUMNS()
-     *      Use the COLUMNS() method in the LookupRef\RowColumnInformation class instead
-     *
-     * @param null|array|string $cellAddress An array or array formula, or a reference to a range of cells
-     *                                          for which you want the number of columns
-     *
-     * @return int|string The number of columns in cellAddress, or a string if arguments are invalid
-     */
-    public static function COLUMNS($cellAddress = null)
-    {
-        return RowColumnInformation::COLUMNS($cellAddress);
-    }
-
-    /**
-     * ROW.
-     *
-     * Returns the row number of the given cell reference
-     *     If the cell reference is a range of cells, ROW returns the row numbers of each row in the reference
-     *        as a vertical array.
-     *     If cell reference is omitted, and the function is being called through the calculation engine,
-     *        then it is assumed to be the reference of the cell in which the ROW function appears;
-     *        otherwise this function returns 1.
-     *
-     * Excel Function:
-     *        =ROW([cellAddress])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see LookupRef\RowColumnInformation::ROW()
-     *      Use the ROW() method in the LookupRef\RowColumnInformation class instead
-     *
-     * @param null|array|string $cellAddress A reference to a range of cells for which you want the row numbers
-     *
-     * @return int|mixed[]|string
-     */
-    public static function ROW($cellAddress = null, ?Cell $cell = null)
-    {
-        return RowColumnInformation::ROW($cellAddress, $cell);
-    }
-
-    /**
-     * ROWS.
-     *
-     * Returns the number of rows in an array or reference.
-     *
-     * Excel Function:
-     *        =ROWS(cellAddress)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see LookupRef\RowColumnInformation::ROWS()
-     *      Use the ROWS() method in the LookupRef\RowColumnInformation class instead
-     *
-     * @param null|array|string $cellAddress An array or array formula, or a reference to a range of cells
-     *                                          for which you want the number of rows
-     *
-     * @return int|string The number of rows in cellAddress, or a string if arguments are invalid
-     */
-    public static function ROWS($cellAddress = null)
-    {
-        return RowColumnInformation::ROWS($cellAddress);
-    }
-
-    /**
-     * HYPERLINK.
-     *
-     * Excel Function:
-     *        =HYPERLINK(linkURL,displayName)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see LookupRef\Hyperlink::set()
-     *      Use the set() method in the LookupRef\Hyperlink class instead
-     *
-     * @param mixed $linkURL Expect string. Value to check, is also the value returned when no error
-     * @param mixed $displayName Expect string. Value to return when testValue is an error condition
-     * @param Cell $pCell The cell to set the hyperlink in
-     *
-     * @return string The value of $displayName (or $linkURL if $displayName was blank)
-     */
-    public static function HYPERLINK($linkURL = '', $displayName = null, ?Cell $pCell = null)
-    {
-        return LookupRef\Hyperlink::set($linkURL, $displayName, $pCell);
-    }
-
-    /**
-     * INDIRECT.
-     *
-     * Returns the reference specified by a text string.
-     * References are immediately evaluated to display their contents.
-     *
-     * Excel Function:
-     *        =INDIRECT(cellAddress)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see LookupRef\Indirect::INDIRECT()
-     *      Use the INDIRECT() method in the LookupRef\Indirect class instead
-     *
-     * NOTE - INDIRECT() does not yet support the optional a1 parameter introduced in Excel 2010
-     *
-     * @param array|string $cellAddress $cellAddress The cell address of the current cell (containing this formula)
-     * @param Cell $pCell The current cell (containing this formula)
-     *
-     * @return array|string An array containing a cell or range of cells, or a string on error
-     */
-    public static function INDIRECT($cellAddress, Cell $pCell)
-    {
-        return Indirect::INDIRECT($cellAddress, true, $pCell);
-    }
-
-    /**
-     * OFFSET.
-     *
-     * Returns a reference to a range that is a specified number of rows and columns from a cell or range of cells.
-     * The reference that is returned can be a single cell or a range of cells. You can specify the number of rows and
-     * the number of columns to be returned.
-     *
-     * Excel Function:
-     *        =OFFSET(cellAddress, rows, cols, [height], [width])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see LookupRef\Offset::OFFSET()
-     *      Use the OFFSET() method in the LookupRef\Offset class instead
-     *
-     * @param null|string $cellAddress The reference from which you want to base the offset.
-     *                                     Reference must refer to a cell or range of adjacent cells;
-     *                                     otherwise, OFFSET returns the #VALUE! error value.
-     * @param mixed $rows The number of rows, up or down, that you want the upper-left cell to refer to.
-     *                        Using 5 as the rows argument specifies that the upper-left cell in the
-     *                        reference is five rows below reference. Rows can be positive (which means
-     *                        below the starting reference) or negative (which means above the starting
-     *                        reference).
-     * @param mixed $columns The number of columns, to the left or right, that you want the upper-left cell
-     *                           of the result to refer to. Using 5 as the cols argument specifies that the
-     *                           upper-left cell in the reference is five columns to the right of reference.
-     *                           Cols can be positive (which means to the right of the starting reference)
-     *                           or negative (which means to the left of the starting reference).
-     * @param mixed $height The height, in number of rows, that you want the returned reference to be.
-     *                          Height must be a positive number.
-     * @param mixed $width The width, in number of columns, that you want the returned reference to be.
-     *                         Width must be a positive number.
-     *
-     * @return array|string An array containing a cell or range of cells, or a string on error
-     */
-    public static function OFFSET($cellAddress = null, $rows = 0, $columns = 0, $height = null, $width = null, ?Cell $pCell = null)
-    {
-        return Offset::OFFSET($cellAddress, $rows, $columns, $height, $width, $pCell);
-    }
-
-    /**
-     * CHOOSE.
-     *
-     * Uses lookup_value to return a value from the list of value arguments.
-     * Use CHOOSE to select one of up to 254 values based on the lookup_value.
-     *
-     * Excel Function:
-     *        =CHOOSE(index_num, value1, [value2], ...)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see LookupRef\Selection::choose()
-     *      Use the choose() method in the LookupRef\Selection class instead
-     *
-     * @return mixed The selected value
-     */
-    public static function CHOOSE(...$chooseArgs)
-    {
-        return LookupRef\Selection::choose(...$chooseArgs);
-    }
-
-    /**
-     * MATCH.
-     *
-     * The MATCH function searches for a specified item in a range of cells
-     *
-     * Excel Function:
-     *        =MATCH(lookup_value, lookup_array, [match_type])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see LookupRef\ExcelMatch::MATCH()
-     *      Use the MATCH() method in the LookupRef\ExcelMatch class instead
-     *
-     * @param mixed $lookupValue The value that you want to match in lookup_array
-     * @param mixed $lookupArray The range of cells being searched
-     * @param mixed $matchType The number -1, 0, or 1. -1 means above, 0 means exact match, 1 means below.
-     *                         If match_type is 1 or -1, the list has to be ordered.
-     *
-     * @return int|string The relative position of the found item
-     */
-    public static function MATCH($lookupValue, $lookupArray, $matchType = 1)
-    {
-        return LookupRef\ExcelMatch::MATCH($lookupValue, $lookupArray, $matchType);
-    }
-
-    /**
-     * INDEX.
-     *
-     * Uses an index to choose a value from a reference or array
-     *
-     * Excel Function:
-     *        =INDEX(range_array, row_num, [column_num])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see LookupRef\Matrix::index()
-     *      Use the index() method in the LookupRef\Matrix class instead
-     *
-     * @param mixed $rowNum The row in the array or range from which to return a value.
-     *                          If row_num is omitted, column_num is required.
-     * @param mixed $columnNum The column in the array or range from which to return a value.
-     *                             If column_num is omitted, row_num is required.
-     * @param mixed $matrix
-     *
-     * @return mixed the value of a specified cell or array of cells
-     */
-    public static function INDEX($matrix, $rowNum = 0, $columnNum = 0)
-    {
-        return Matrix::index($matrix, $rowNum, $columnNum);
-    }
-
-    /**
-     * TRANSPOSE.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see LookupRef\Matrix::transpose()
-     *      Use the transpose() method in the LookupRef\Matrix class instead
-     *
-     * @param array $matrixData A matrix of values
-     *
-     * @return array
-     *
-     * Unlike the Excel TRANSPOSE function, which will only work on a single row or column,
-     *     this function will transpose a full matrix
-     */
-    public static function TRANSPOSE($matrixData)
-    {
-        return Matrix::transpose($matrixData);
-    }
-
-    /**
-     * VLOOKUP
-     * The VLOOKUP function searches for value in the left-most column of lookup_array and returns the value
-     *     in the same row based on the index_number.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see LookupRef\VLookup::lookup()
-     *      Use the lookup() method in the LookupRef\VLookup class instead
-     *
-     * @param mixed $lookup_value The value that you want to match in lookup_array
-     * @param mixed $lookup_array The range of cells being searched
-     * @param mixed $index_number The column number in table_array from which the matching value must be returned.
-     *                                The first column is 1.
-     * @param mixed $not_exact_match determines if you are looking for an exact match based on lookup_value
-     *
-     * @return mixed The value of the found cell
-     */
-    public static function VLOOKUP($lookup_value, $lookup_array, $index_number, $not_exact_match = true)
-    {
-        return VLookup::lookup($lookup_value, $lookup_array, $index_number, $not_exact_match);
-    }
-
-    /**
-     * HLOOKUP
-     * The HLOOKUP function searches for value in the top-most row of lookup_array and returns the value
-     *     in the same column based on the index_number.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see LookupRef\HLookup::lookup()
-     *      Use the lookup() method in the LookupRef\HLookup class instead
-     *
-     * @param mixed $lookup_value The value that you want to match in lookup_array
-     * @param mixed $lookup_array The range of cells being searched
-     * @param mixed $index_number The row number in table_array from which the matching value must be returned.
-     *                                The first row is 1.
-     * @param mixed $not_exact_match determines if you are looking for an exact match based on lookup_value
-     *
-     * @return mixed The value of the found cell
-     */
-    public static function HLOOKUP($lookup_value, $lookup_array, $index_number, $not_exact_match = true)
-    {
-        return HLookup::lookup($lookup_value, $lookup_array, $index_number, $not_exact_match);
-    }
-
-    /**
-     * LOOKUP
-     * The LOOKUP function searches for value either from a one-row or one-column range or from an array.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see LookupRef\Lookup::lookup()
-     *      Use the lookup() method in the LookupRef\Lookup class instead
-     *
-     * @param mixed $lookup_value The value that you want to match in lookup_array
-     * @param mixed $lookup_vector The range of cells being searched
-     * @param null|mixed $result_vector The column from which the matching value must be returned
-     *
-     * @return mixed The value of the found cell
-     */
-    public static function LOOKUP($lookup_value, $lookup_vector, $result_vector = null)
-    {
-        return Lookup::lookup($lookup_value, $lookup_vector, $result_vector);
-    }
-
-    /**
-     * FORMULATEXT.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see LookupRef\Formula::text()
-     *      Use the text() method in the LookupRef\Formula class instead
-     *
-     * @param mixed $cellReference The cell to check
-     * @param Cell $pCell The current cell (containing this formula)
-     *
-     * @return string
-     */
-    public static function FORMULATEXT($cellReference = '', ?Cell $pCell = null)
-    {
-        return LookupRef\Formula::text($cellReference, $pCell);
-    }
-}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Address.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Address.php
index 58215f2748..0a5347b837 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Address.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Address.php
@@ -2,11 +2,15 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
 
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Cell\AddressHelper;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 
 class Address
 {
+    use ArrayEnabled;
+
     public const ADDRESS_ABSOLUTE = 1;
     public const ADDRESS_COLUMN_RELATIVE = 2;
     public const ADDRESS_ROW_RELATIVE = 3;
@@ -24,33 +28,53 @@ class Address
      *        =ADDRESS(row, column, [relativity], [referenceStyle], [sheetText])
      *
      * @param mixed $row Row number (integer) to use in the cell reference
+     *                      Or can be an array of values
      * @param mixed $column Column number (integer) to use in the cell reference
+     *                      Or can be an array of values
      * @param mixed $relativity Integer flag indicating the type of reference to return
      *                             1 or omitted    Absolute
      *                             2               Absolute row; relative column
      *                             3               Relative row; absolute column
      *                             4               Relative
+     *                      Or can be an array of values
      * @param mixed $referenceStyle A logical (boolean) value that specifies the A1 or R1C1 reference style.
      *                                TRUE or omitted    ADDRESS returns an A1-style reference
      *                                FALSE              ADDRESS returns an R1C1-style reference
+     *                      Or can be an array of values
      * @param mixed $sheetName Optional Name of worksheet to use
+     *                      Or can be an array of values
      *
-     * @return string
+     * @return array|string If an array of values is passed as the $testValue argument, then the returned result will also be
+     *            an array with the same dimensions
      */
-    public static function cell($row, $column, $relativity = 1, $referenceStyle = true, $sheetName = '')
+    public static function cell(mixed $row, mixed $column, mixed $relativity = 1, mixed $referenceStyle = true, mixed $sheetName = ''): array|string
     {
-        $row = Functions::flattenSingleValue($row);
-        $column = Functions::flattenSingleValue($column);
-        $relativity = ($relativity === null) ? 1 : Functions::flattenSingleValue($relativity);
-        $referenceStyle = ($referenceStyle === null) ? true : Functions::flattenSingleValue($referenceStyle);
-        $sheetName = Functions::flattenSingleValue($sheetName);
+        if (
+            is_array($row) || is_array($column)
+            || is_array($relativity) || is_array($referenceStyle) || is_array($sheetName)
+        ) {
+            return self::evaluateArrayArguments(
+                [self::class, __FUNCTION__],
+                $row,
+                $column,
+                $relativity,
+                $referenceStyle,
+                $sheetName
+            );
+        }
+
+        $relativity = $relativity ?? 1;
+        $referenceStyle = $referenceStyle ?? true;
 
         if (($row < 1) || ($column < 1)) {
-            return Functions::VALUE();
+            return ExcelError::VALUE();
         }
 
         $sheetName = self::sheetName($sheetName);
 
+        if (is_int($referenceStyle)) {
+            $referenceStyle = (bool) $referenceStyle;
+        }
         if ((!is_bool($referenceStyle)) || $referenceStyle === self::REFERENCE_STYLE_A1) {
             return self::formatAsA1($row, $column, $relativity, $sheetName);
         }
@@ -58,10 +82,10 @@ public static function cell($row, $column, $relativity = 1, $referenceStyle = tr
         return self::formatAsR1C1($row, $column, $relativity, $sheetName);
     }
 
-    private static function sheetName(string $sheetName)
+    private static function sheetName(string $sheetName): string
     {
         if ($sheetName > '') {
-            if (strpos($sheetName, ' ') !== false || strpos($sheetName, '[') !== false) {
+            if (str_contains($sheetName, ' ') || str_contains($sheetName, '[')) {
                 $sheetName = "'{$sheetName}'";
             }
             $sheetName .= '!';
@@ -92,7 +116,8 @@ private static function formatAsR1C1(int $row, int $column, int $relativity, str
         if (($relativity == self::ADDRESS_ROW_RELATIVE) || ($relativity == self::ADDRESS_RELATIVE)) {
             $row = "[{$row}]";
         }
+        [$rowChar, $colChar] = AddressHelper::getRowAndColumnChars();
 
-        return "{$sheetName}R{$row}C{$column}";
+        return "{$sheetName}$rowChar{$row}$colChar{$column}";
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/ExcelMatch.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/ExcelMatch.php
index 71358bf30a..43e89c9b9c 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/ExcelMatch.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/ExcelMatch.php
@@ -2,13 +2,17 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Calculation\Internal\WildcardMatch;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 
 class ExcelMatch
 {
+    use ArrayEnabled;
+
     public const MATCHTYPE_SMALLEST_VALUE = -1;
     public const MATCHTYPE_FIRST_VALUE = 0;
     public const MATCHTYPE_LARGEST_VALUE = 1;
@@ -26,20 +30,20 @@ class ExcelMatch
      * @param mixed $matchType The number -1, 0, or 1. -1 means above, 0 means exact match, 1 means below.
      *                         If match_type is 1 or -1, the list has to be ordered.
      *
-     * @return int|string The relative position of the found item
+     * @return array|float|int|string The relative position of the found item
      */
-    public static function MATCH($lookupValue, $lookupArray, $matchType = self::MATCHTYPE_LARGEST_VALUE)
+    public static function MATCH(mixed $lookupValue, mixed $lookupArray, mixed $matchType = self::MATCHTYPE_LARGEST_VALUE): array|string|int|float
     {
+        if (is_array($lookupValue)) {
+            return self::evaluateArrayArgumentsIgnore([self::class, __FUNCTION__], 1, $lookupValue, $lookupArray, $matchType);
+        }
+
         $lookupArray = Functions::flattenArray($lookupArray);
-        $lookupValue = Functions::flattenSingleValue($lookupValue);
-        $matchType = ($matchType === null)
-            ? self::MATCHTYPE_LARGEST_VALUE
-            : (int) Functions::flattenSingleValue($matchType);
 
         try {
             // Input validation
             self::validateLookupValue($lookupValue);
-            self::validateMatchType($matchType);
+            $matchType = self::validateMatchType($matchType);
             self::validateLookupArray($lookupArray);
 
             $keySet = array_keys($lookupArray);
@@ -59,59 +63,82 @@ public static function MATCH($lookupValue, $lookupArray, $matchType = self::MATC
             $lookupValue = StringHelper::strToLower($lookupValue);
         }
 
-        $valueKey = null;
-        switch ($matchType) {
-            case self::MATCHTYPE_LARGEST_VALUE:
-                $valueKey = self::matchLargestValue($lookupArray, $lookupValue, $keySet);
-
-                break;
-            case self::MATCHTYPE_FIRST_VALUE:
-                $valueKey = self::matchFirstValue($lookupArray, $lookupValue);
-
-                break;
-            case self::MATCHTYPE_SMALLEST_VALUE:
-            default:
-                $valueKey = self::matchSmallestValue($lookupArray, $lookupValue);
-        }
+        $valueKey = match ($matchType) {
+            self::MATCHTYPE_LARGEST_VALUE => self::matchLargestValue($lookupArray, $lookupValue, $keySet),
+            self::MATCHTYPE_FIRST_VALUE => self::matchFirstValue($lookupArray, $lookupValue),
+            default => self::matchSmallestValue($lookupArray, $lookupValue),
+        };
 
         if ($valueKey !== null) {
             return ++$valueKey;
         }
 
         // Unsuccessful in finding a match, return #N/A error value
-        return Functions::NA();
+        return ExcelError::NA();
     }
 
-    private static function matchFirstValue($lookupArray, $lookupValue)
+    private static function matchFirstValue(array $lookupArray, mixed $lookupValue): int|string|null
     {
-        $wildcardLookup = ((bool) preg_match('/([\?\*])/', $lookupValue));
-        $wildcard = WildcardMatch::wildcard($lookupValue);
+        if (is_string($lookupValue)) {
+            $valueIsString = true;
+            $wildcard = WildcardMatch::wildcard($lookupValue);
+        } else {
+            $valueIsString = false;
+            $wildcard = '';
+        }
 
+        $valueIsNumeric = is_int($lookupValue) || is_float($lookupValue);
         foreach ($lookupArray as $i => $lookupArrayValue) {
-            $typeMatch = ((gettype($lookupValue) === gettype($lookupArrayValue)) ||
-                (is_numeric($lookupValue) && is_numeric($lookupArrayValue)));
-
             if (
-                $typeMatch && is_string($lookupValue) &&
-                $wildcardLookup && WildcardMatch::compare($lookupArrayValue, $wildcard)
+                $valueIsString
+                && is_string($lookupArrayValue)
             ) {
-                // wildcard match
-                return $i;
-            } elseif ($lookupArrayValue === $lookupValue) {
-                // exact match
-                return $i;
+                if (WildcardMatch::compare($lookupArrayValue, $wildcard)) {
+                    return $i; // wildcard match
+                }
+            } else {
+                if ($lookupArrayValue === $lookupValue) {
+                    return $i; // exact match
+                }
+                if (
+                    $valueIsNumeric
+                    && (is_float($lookupArrayValue) || is_int($lookupArrayValue))
+                    && $lookupArrayValue == $lookupValue
+                ) {
+                    return $i; // exact match
+                }
             }
         }
 
         return null;
     }
 
-    private static function matchLargestValue($lookupArray, $lookupValue, $keySet)
+    private static function matchLargestValue(array $lookupArray, mixed $lookupValue, array $keySet): mixed
     {
+        if (is_string($lookupValue)) {
+            if (Functions::getCompatibilityMode() === Functions::COMPATIBILITY_OPENOFFICE) {
+                $wildcard = WildcardMatch::wildcard($lookupValue);
+                foreach (array_reverse($lookupArray) as $i => $lookupArrayValue) {
+                    if (is_string($lookupArrayValue) && WildcardMatch::compare($lookupArrayValue, $wildcard)) {
+                        return $i;
+                    }
+                }
+            } else {
+                foreach ($lookupArray as $i => $lookupArrayValue) {
+                    if ($lookupArrayValue === $lookupValue) {
+                        return $keySet[$i];
+                    }
+                }
+            }
+        }
+        $valueIsNumeric = is_int($lookupValue) || is_float($lookupValue);
         foreach ($lookupArray as $i => $lookupArrayValue) {
-            $typeMatch = ((gettype($lookupValue) === gettype($lookupArrayValue)) ||
-                (is_numeric($lookupValue) && is_numeric($lookupArrayValue)));
-
+            if ($valueIsNumeric && (is_int($lookupArrayValue) || is_float($lookupArrayValue))) {
+                if ($lookupArrayValue <= $lookupValue) {
+                    return array_search($i, $keySet);
+                }
+            }
+            $typeMatch = gettype($lookupValue) === gettype($lookupArrayValue);
             if ($typeMatch && ($lookupArrayValue <= $lookupValue)) {
                 return array_search($i, $keySet);
             }
@@ -120,21 +147,37 @@ private static function matchLargestValue($lookupArray, $lookupValue, $keySet)
         return null;
     }
 
-    private static function matchSmallestValue($lookupArray, $lookupValue)
+    private static function matchSmallestValue(array $lookupArray, mixed $lookupValue): int|string|null
     {
         $valueKey = null;
+        if (is_string($lookupValue)) {
+            if (Functions::getCompatibilityMode() === Functions::COMPATIBILITY_OPENOFFICE) {
+                $wildcard = WildcardMatch::wildcard($lookupValue);
+                foreach ($lookupArray as $i => $lookupArrayValue) {
+                    if (is_string($lookupArrayValue) && WildcardMatch::compare($lookupArrayValue, $wildcard)) {
+                        return $i;
+                    }
+                }
+            }
+        }
 
+        $valueIsNumeric = is_int($lookupValue) || is_float($lookupValue);
         // The basic algorithm is:
         // Iterate and keep the highest match until the next element is smaller than the searched value.
         // Return immediately if perfect match is found
         foreach ($lookupArray as $i => $lookupArrayValue) {
             $typeMatch = gettype($lookupValue) === gettype($lookupArrayValue);
+            $bothNumeric = $valueIsNumeric && (is_int($lookupArrayValue) || is_float($lookupArrayValue));
 
             if ($lookupArrayValue === $lookupValue) {
                 // Another "special" case. If a perfect match is found,
                 // the algorithm gives up immediately
                 return $i;
-            } elseif ($typeMatch && $lookupArrayValue >= $lookupValue) {
+            }
+            if ($bothNumeric && $lookupValue == $lookupArrayValue) {
+                return $i; // exact match, as above
+            }
+            if (($typeMatch || $bothNumeric) && $lookupArrayValue >= $lookupValue) {
                 $valueKey = $i;
             } elseif ($typeMatch && $lookupArrayValue < $lookupValue) {
                 //Excel algorithm gives up immediately if the first element is smaller than the searched value
@@ -145,49 +188,57 @@ private static function matchSmallestValue($lookupArray, $lookupValue)
         return $valueKey;
     }
 
-    private static function validateLookupValue($lookupValue): void
+    private static function validateLookupValue(mixed $lookupValue): void
     {
         // Lookup_value type has to be number, text, or logical values
         if ((!is_numeric($lookupValue)) && (!is_string($lookupValue)) && (!is_bool($lookupValue))) {
-            throw new Exception(Functions::NA());
+            throw new Exception(ExcelError::NA());
         }
     }
 
-    private static function validateMatchType($matchType): void
+    private static function validateMatchType(mixed $matchType): int
     {
         // Match_type is 0, 1 or -1
-        if (
-            ($matchType !== self::MATCHTYPE_FIRST_VALUE) &&
-            ($matchType !== self::MATCHTYPE_LARGEST_VALUE) && ($matchType !== self::MATCHTYPE_SMALLEST_VALUE)
-        ) {
-            throw new Exception(Functions::NA());
+        // However Excel accepts other numeric values,
+        //  including numeric strings and floats.
+        //  It seems to just be interested in the sign.
+        if (!is_numeric($matchType)) {
+            throw new Exception(ExcelError::Value());
         }
+        if ($matchType > 0) {
+            return self::MATCHTYPE_LARGEST_VALUE;
+        }
+        if ($matchType < 0) {
+            return self::MATCHTYPE_SMALLEST_VALUE;
+        }
+
+        return self::MATCHTYPE_FIRST_VALUE;
     }
 
-    private static function validateLookupArray($lookupArray): void
+    private static function validateLookupArray(array $lookupArray): void
     {
         // Lookup_array should not be empty
         $lookupArraySize = count($lookupArray);
         if ($lookupArraySize <= 0) {
-            throw new Exception(Functions::NA());
+            throw new Exception(ExcelError::NA());
         }
     }
 
-    private static function prepareLookupArray($lookupArray, $matchType)
+    private static function prepareLookupArray(array $lookupArray, mixed $matchType): array
     {
         // Lookup_array should contain only number, text, or logical values, or empty (null) cells
         foreach ($lookupArray as $i => $value) {
             //    check the type of the value
             if ((!is_numeric($value)) && (!is_string($value)) && (!is_bool($value)) && ($value !== null)) {
-                throw new Exception(Functions::NA());
+                throw new Exception(ExcelError::NA());
             }
             // Convert strings to lowercase for case-insensitive testing
             if (is_string($value)) {
                 $lookupArray[$i] = StringHelper::strToLower($value);
             }
             if (
-                ($value === null) &&
-                (($matchType == self::MATCHTYPE_LARGEST_VALUE) || ($matchType == self::MATCHTYPE_SMALLEST_VALUE))
+                ($value === null)
+                && (($matchType == self::MATCHTYPE_LARGEST_VALUE) || ($matchType == self::MATCHTYPE_SMALLEST_VALUE))
             ) {
                 unset($lookupArray[$i]);
             }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Filter.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Filter.php
new file mode 100644
index 0000000000..e3b6cbe51d
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Filter.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Filter
+{
+    public static function filter(array $lookupArray, mixed $matchArray, mixed $ifEmpty = null): mixed
+    {
+        if (!is_array($matchArray)) {
+            return ExcelError::VALUE();
+        }
+
+        $matchArray = self::enumerateArrayKeys($matchArray);
+
+        $result = (Matrix::isColumnVector($matchArray))
+            ? self::filterByRow($lookupArray, $matchArray)
+            : self::filterByColumn($lookupArray, $matchArray);
+
+        if (empty($result)) {
+            return $ifEmpty ?? ExcelError::CALC();
+        }
+
+        return array_values(array_map('array_values', $result));
+    }
+
+    private static function enumerateArrayKeys(array $sortArray): array
+    {
+        array_walk(
+            $sortArray,
+            function (&$columns): void {
+                if (is_array($columns)) {
+                    $columns = array_values($columns);
+                }
+            }
+        );
+
+        return array_values($sortArray);
+    }
+
+    private static function filterByRow(array $lookupArray, array $matchArray): array
+    {
+        $matchArray = array_values(array_column($matchArray, 0));
+
+        return array_filter(
+            array_values($lookupArray),
+            fn ($index): bool => (bool) $matchArray[$index],
+            ARRAY_FILTER_USE_KEY
+        );
+    }
+
+    private static function filterByColumn(array $lookupArray, array $matchArray): array
+    {
+        $lookupArray = Matrix::transpose($lookupArray);
+
+        if (count($matchArray) === 1) {
+            $matchArray = array_pop($matchArray);
+        }
+
+        array_walk(
+            $matchArray,
+            function (&$value): void {
+                $value = [$value];
+            }
+        );
+
+        $result = self::filterByRow($lookupArray, $matchArray);
+
+        return Matrix::transpose($result);
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Formula.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Formula.php
index d96b504068..5c7f4051ca 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Formula.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Formula.php
@@ -3,7 +3,7 @@
 namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Cell\Cell;
 
 class Formula
@@ -12,14 +12,12 @@ class Formula
      * FORMULATEXT.
      *
      * @param mixed $cellReference The cell to check
-     * @param Cell $pCell The current cell (containing this formula)
-     *
-     * @return string
+     * @param ?Cell $cell The current cell (containing this formula)
      */
-    public static function text($cellReference = '', ?Cell $pCell = null)
+    public static function text(mixed $cellReference = '', ?Cell $cell = null): string
     {
-        if ($pCell === null) {
-            return Functions::REF();
+        if ($cell === null) {
+            return ExcelError::REF();
         }
 
         preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/i', $cellReference, $matches);
@@ -27,15 +25,15 @@ public static function text($cellReference = '', ?Cell $pCell = null)
         $cellReference = $matches[6] . $matches[7];
         $worksheetName = trim($matches[3], "'");
         $worksheet = (!empty($worksheetName))
-            ? $pCell->getWorksheet()->getParent()->getSheetByName($worksheetName)
-            : $pCell->getWorksheet();
+            ? $cell->getWorksheet()->getParentOrThrow()->getSheetByName($worksheetName)
+            : $cell->getWorksheet();
 
         if (
-            $worksheet === null ||
-            !$worksheet->cellExists($cellReference) ||
-            !$worksheet->getCell($cellReference)->isFormula()
+            $worksheet === null
+            || !$worksheet->cellExists($cellReference)
+            || !$worksheet->getCell($cellReference)->isFormula()
         ) {
-            return Functions::NA();
+            return ExcelError::NA();
         }
 
         return $worksheet->getCell($cellReference)->getValue();
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/HLookup.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/HLookup.php
index 96cfd7ab7b..fd83700b4b 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/HLookup.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/HLookup.php
@@ -2,12 +2,16 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 
 class HLookup extends LookupBase
 {
+    use ArrayEnabled;
+
     /**
      * HLOOKUP
      * The HLOOKUP function searches for value in the top-most row of lookup_array and returns the value
@@ -21,13 +25,17 @@ class HLookup extends LookupBase
      *
      * @return mixed The value of the found cell
      */
-    public static function lookup($lookupValue, $lookupArray, $indexNumber, $notExactMatch = true)
+    public static function lookup(mixed $lookupValue, mixed $lookupArray, mixed $indexNumber, mixed $notExactMatch = true): mixed
     {
-        $lookupValue = Functions::flattenSingleValue($lookupValue);
-        $indexNumber = Functions::flattenSingleValue($indexNumber);
-        $notExactMatch = ($notExactMatch === null) ? true : Functions::flattenSingleValue($notExactMatch);
+        if (is_array($lookupValue) || is_array($indexNumber)) {
+            return self::evaluateArrayArgumentsIgnore([self::class, __FUNCTION__], 1, $lookupValue, $lookupArray, $indexNumber, $notExactMatch);
+        }
+
+        $notExactMatch = (bool) ($notExactMatch ?? true);
 
         try {
+            self::validateLookupArray($lookupArray);
+            $lookupArray = self::convertLiteralArray($lookupArray);
             $indexNumber = self::validateIndexLookup($lookupArray, $indexNumber);
         } catch (Exception $e) {
             return $e->getMessage();
@@ -36,36 +44,40 @@ public static function lookup($lookupValue, $lookupArray, $indexNumber, $notExac
         $f = array_keys($lookupArray);
         $firstRow = reset($f);
         if ((!is_array($lookupArray[$firstRow])) || ($indexNumber > count($lookupArray))) {
-            return Functions::REF();
+            return ExcelError::REF();
         }
 
         $firstkey = $f[0] - 1;
         $returnColumn = $firstkey + $indexNumber;
-        $firstColumn = array_shift($f);
+        $firstColumn = array_shift($f) ?? 1;
         $rowNumber = self::hLookupSearch($lookupValue, $lookupArray, $firstColumn, $notExactMatch);
 
         if ($rowNumber !== null) {
             //  otherwise return the appropriate value
-            return $lookupArray[$returnColumn][$rowNumber];
+            return $lookupArray[$returnColumn][Coordinate::stringFromColumnIndex($rowNumber)];
         }
 
-        return Functions::NA();
+        return ExcelError::NA();
     }
 
-    private static function hLookupSearch($lookupValue, $lookupArray, $column, $notExactMatch)
+    /**
+     * @param mixed $lookupValue The value that you want to match in lookup_array
+     * @param  int|string $column
+     */
+    private static function hLookupSearch(mixed $lookupValue, array $lookupArray, $column, bool $notExactMatch): ?int
     {
-        $lookupLower = StringHelper::strToLower($lookupValue);
+        $lookupLower = StringHelper::strToLower((string) $lookupValue);
 
         $rowNumber = null;
         foreach ($lookupArray[$column] as $rowKey => $rowData) {
             // break if we have passed possible keys
             $bothNumeric = is_numeric($lookupValue) && is_numeric($rowData);
             $bothNotNumeric = !is_numeric($lookupValue) && !is_numeric($rowData);
-            $cellDataLower = StringHelper::strToLower($rowData);
+            $cellDataLower = StringHelper::strToLower((string) $rowData);
 
             if (
-                $notExactMatch &&
-                (($bothNumeric && $rowData > $lookupValue) || ($bothNotNumeric && $cellDataLower > $lookupLower))
+                $notExactMatch
+                && (($bothNumeric && $rowData > $lookupValue) || ($bothNotNumeric && $cellDataLower > $lookupLower))
             ) {
                 break;
             }
@@ -74,7 +86,7 @@ private static function hLookupSearch($lookupValue, $lookupArray, $column, $notE
                 $bothNumeric,
                 $bothNotNumeric,
                 $notExactMatch,
-                $rowKey,
+                Coordinate::columnIndexFromString($rowKey),
                 $cellDataLower,
                 $lookupLower,
                 $rowNumber
@@ -83,4 +95,27 @@ private static function hLookupSearch($lookupValue, $lookupArray, $column, $notE
 
         return $rowNumber;
     }
+
+    private static function convertLiteralArray(array $lookupArray): array
+    {
+        if (array_key_exists(0, $lookupArray)) {
+            $lookupArray2 = [];
+            $row = 0;
+            foreach ($lookupArray as $arrayVal) {
+                ++$row;
+                if (!is_array($arrayVal)) {
+                    $arrayVal = [$arrayVal];
+                }
+                $arrayVal2 = [];
+                foreach ($arrayVal as $key2 => $val2) {
+                    $index = Coordinate::stringFromColumnIndex($key2 + 1);
+                    $arrayVal2[$index] = $val2;
+                }
+                $lookupArray2[$row] = $arrayVal2;
+            }
+            $lookupArray = $lookupArray2;
+        }
+
+        return $lookupArray;
+    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Helpers.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Helpers.php
index 87ea738147..191144bfd1 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Helpers.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Helpers.php
@@ -13,12 +13,12 @@ class Helpers
 
     public const CELLADDRESS_USE_R1C1 = false;
 
-    private static function convertR1C1(string &$cellAddress1, ?string &$cellAddress2, bool $a1): string
+    private static function convertR1C1(string &$cellAddress1, ?string &$cellAddress2, bool $a1, ?int $baseRow = null, ?int $baseCol = null): string
     {
         if ($a1 === self::CELLADDRESS_USE_R1C1) {
-            $cellAddress1 = AddressHelper::convertToA1($cellAddress1);
+            $cellAddress1 = AddressHelper::convertToA1($cellAddress1, $baseRow ?? 1, $baseCol ?? 1);
             if ($cellAddress2) {
-                $cellAddress2 = AddressHelper::convertToA1($cellAddress2);
+                $cellAddress2 = AddressHelper::convertToA1($cellAddress2, $baseRow ?? 1, $baseCol ?? 1);
             }
         }
 
@@ -35,7 +35,7 @@ private static function adjustSheetTitle(string &$sheetTitle, ?string $value): v
         }
     }
 
-    public static function extractCellAddresses(string $cellAddress, bool $a1, Worksheet $sheet, string $sheetName = ''): array
+    public static function extractCellAddresses(string $cellAddress, bool $a1, Worksheet $sheet, string $sheetName = '', ?int $baseRow = null, ?int $baseCol = null): array
     {
         $cellAddress1 = $cellAddress;
         $cellAddress2 = null;
@@ -43,32 +43,32 @@ public static function extractCellAddresses(string $cellAddress, bool $a1, Works
         if ($namedRange !== null) {
             $workSheet = $namedRange->getWorkSheet();
             $sheetTitle = ($workSheet === null) ? '' : $workSheet->getTitle();
-            $value = preg_replace('/^=/', '', $namedRange->getValue());
+            $value = (string) preg_replace('/^=/', '', $namedRange->getValue());
             self::adjustSheetTitle($sheetTitle, $value);
             $cellAddress1 = $sheetTitle . $value;
             $cellAddress = $cellAddress1;
             $a1 = self::CELLADDRESS_USE_A1;
         }
-        if (strpos($cellAddress, ':') !== false) {
+        if (str_contains($cellAddress, ':')) {
             [$cellAddress1, $cellAddress2] = explode(':', $cellAddress);
         }
-        $cellAddress = self::convertR1C1($cellAddress1, $cellAddress2, $a1);
+        $cellAddress = self::convertR1C1($cellAddress1, $cellAddress2, $a1, $baseRow, $baseCol);
 
         return [$cellAddress1, $cellAddress2, $cellAddress];
     }
 
-    public static function extractWorksheet(string $cellAddress, Cell $pCell): array
+    public static function extractWorksheet(string $cellAddress, Cell $cell): array
     {
         $sheetName = '';
-        if (strpos($cellAddress, '!') !== false) {
+        if (str_contains($cellAddress, '!')) {
             [$sheetName, $cellAddress] = Worksheet::extractSheetTitle($cellAddress, true);
             $sheetName = trim($sheetName, "'");
         }
 
-        $pSheet = ($sheetName !== '')
-            ? $pCell->getWorksheet()->getParent()->getSheetByName($sheetName)
-            : $pCell->getWorksheet();
+        $worksheet = ($sheetName !== '')
+            ? $cell->getWorksheet()->getParentOrThrow()->getSheetByName($sheetName)
+            : $cell->getWorksheet();
 
-        return [$cellAddress, $pSheet, $sheetName];
+        return [$cellAddress, $worksheet, $sheetName];
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Hyperlink.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Hyperlink.php
index 823d70c60c..455442a8eb 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Hyperlink.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Hyperlink.php
@@ -3,6 +3,7 @@
 namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Cell\Cell;
 
 class Hyperlink
@@ -15,25 +16,25 @@ class Hyperlink
      *
      * @param mixed $linkURL Expect string. Value to check, is also the value returned when no error
      * @param mixed $displayName Expect string. Value to return when testValue is an error condition
-     * @param Cell $pCell The cell to set the hyperlink in
+     * @param ?Cell $cell The cell to set the hyperlink in
      *
-     * @return mixed The value of $displayName (or $linkURL if $displayName was blank)
+     * @return string The value of $displayName (or $linkURL if $displayName was blank)
      */
-    public static function set($linkURL = '', $displayName = null, ?Cell $pCell = null)
+    public static function set(mixed $linkURL = '', mixed $displayName = null, ?Cell $cell = null): string
     {
         $linkURL = ($linkURL === null) ? '' : Functions::flattenSingleValue($linkURL);
         $displayName = ($displayName === null) ? '' : Functions::flattenSingleValue($displayName);
 
-        if ((!is_object($pCell)) || (trim($linkURL) == '')) {
-            return Functions::REF();
+        if ((!is_object($cell)) || (trim($linkURL) == '')) {
+            return ExcelError::REF();
         }
 
         if ((is_object($displayName)) || trim($displayName) == '') {
             $displayName = $linkURL;
         }
 
-        $pCell->getHyperlink()->setUrl($linkURL);
-        $pCell->getHyperlink()->setTooltip($displayName);
+        $cell->getHyperlink()->setUrl($linkURL);
+        $cell->getHyperlink()->setTooltip($displayName);
 
         return $displayName;
     }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Indirect.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Indirect.php
index d3314ff460..d53900d420 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Indirect.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Indirect.php
@@ -5,7 +5,10 @@
 use Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Cell\AddressRange;
 use PhpOffice\PhpSpreadsheet\Cell\Cell;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 
 class Indirect
@@ -16,14 +19,14 @@ class Indirect
      * @param mixed $a1fmt Expect bool Helpers::CELLADDRESS_USE_A1 or CELLADDRESS_USE_R1C1,
      *                      but can be provided as numeric which is cast to bool
      */
-    private static function a1Format($a1fmt): bool
+    private static function a1Format(mixed $a1fmt): bool
     {
         $a1fmt = Functions::flattenSingleValue($a1fmt);
         if ($a1fmt === null) {
             return Helpers::CELLADDRESS_USE_A1;
         }
         if (is_string($a1fmt)) {
-            throw new Exception(Functions::VALUE());
+            throw new Exception(ExcelError::VALUE());
         }
 
         return (bool) $a1fmt;
@@ -31,14 +34,12 @@ private static function a1Format($a1fmt): bool
 
     /**
      * Convert cellAddress to string, verify not null string.
-     *
-     * @param array|string $cellAddress
      */
-    private static function validateAddress($cellAddress): string
+    private static function validateAddress(array|string|null $cellAddress): string
     {
         $cellAddress = Functions::flattenSingleValue($cellAddress);
         if (!is_string($cellAddress) || !$cellAddress) {
-            throw new Exception(Functions::REF());
+            throw new Exception(ExcelError::REF());
         }
 
         return $cellAddress;
@@ -56,12 +57,14 @@ private static function validateAddress($cellAddress): string
      * @param array|string $cellAddress $cellAddress The cell address of the current cell (containing this formula)
      * @param mixed $a1fmt Expect bool Helpers::CELLADDRESS_USE_A1 or CELLADDRESS_USE_R1C1,
      *                      but can be provided as numeric which is cast to bool
-     * @param Cell $pCell The current cell (containing this formula)
+     * @param Cell $cell The current cell (containing this formula)
      *
      * @return array|string An array containing a cell or range of cells, or a string on error
      */
-    public static function INDIRECT($cellAddress, $a1fmt, Cell $pCell)
+    public static function INDIRECT($cellAddress, mixed $a1fmt, Cell $cell): string|array
     {
+        [$baseCol, $baseRow] = Coordinate::indexesFromString($cell->getCoordinate());
+
         try {
             $a1 = self::a1Format($a1fmt);
             $cellAddress = self::validateAddress($cellAddress);
@@ -69,29 +72,57 @@ public static function INDIRECT($cellAddress, $a1fmt, Cell $pCell)
             return $e->getMessage();
         }
 
-        [$cellAddress, $pSheet, $sheetName] = Helpers::extractWorksheet($cellAddress, $pCell);
+        [$cellAddress, $worksheet, $sheetName] = Helpers::extractWorksheet($cellAddress, $cell);
 
-        [$cellAddress1, $cellAddress2, $cellAddress] = Helpers::extractCellAddresses($cellAddress, $a1, $pCell->getWorkSheet(), $sheetName);
+        if (preg_match('/^' . Calculation::CALCULATION_REGEXP_COLUMNRANGE_RELATIVE . '$/miu', $cellAddress, $matches)) {
+            $cellAddress = self::handleRowColumnRanges($worksheet, ...explode(':', $cellAddress));
+        } elseif (preg_match('/^' . Calculation::CALCULATION_REGEXP_ROWRANGE_RELATIVE . '$/miu', $cellAddress, $matches)) {
+            $cellAddress = self::handleRowColumnRanges($worksheet, ...explode(':', $cellAddress));
+        }
+
+        try {
+            [$cellAddress1, $cellAddress2, $cellAddress] = Helpers::extractCellAddresses($cellAddress, $a1, $cell->getWorkSheet(), $sheetName, $baseRow, $baseCol);
+        } catch (Exception) {
+            return ExcelError::REF();
+        }
 
         if (
-            (!preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/i', $cellAddress1, $matches)) ||
-            (($cellAddress2 !== null) && (!preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/i', $cellAddress2, $matches)))
+            (!preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/miu', $cellAddress1, $matches))
+            || (($cellAddress2 !== null) && (!preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/miu', $cellAddress2, $matches)))
         ) {
-            return Functions::REF();
+            return ExcelError::REF();
         }
 
-        return self::extractRequiredCells($pSheet, $cellAddress);
+        return self::extractRequiredCells($worksheet, $cellAddress);
     }
 
     /**
      * Extract range values.
      *
-     * @return mixed Array of values in range if range contains more than one element.
+     * @return array Array of values in range if range contains more than one element.
      *                  Otherwise, a single value is returned.
      */
-    private static function extractRequiredCells(?Worksheet $pSheet, string $cellAddress)
+    private static function extractRequiredCells(?Worksheet $worksheet, string $cellAddress): array
     {
-        return Calculation::getInstance($pSheet !== null ? $pSheet->getParent() : null)
-            ->extractCellRange($cellAddress, $pSheet, false);
+        return Calculation::getInstance($worksheet !== null ? $worksheet->getParent() : null)
+            ->extractCellRange($cellAddress, $worksheet, false);
+    }
+
+    private static function handleRowColumnRanges(?Worksheet $worksheet, string $start, string $end): string
+    {
+        // Being lazy, we're only checking a single row/column to get the max
+        if (ctype_digit($start) && $start <= 1048576) {
+            // Max 16,384 columns for Excel2007
+            $endColRef = ($worksheet !== null) ? $worksheet->getHighestDataColumn((int) $start) : AddressRange::MAX_COLUMN;
+
+            return "A{$start}:{$endColRef}{$end}";
+        } elseif (ctype_alpha($start) && strlen($start) <= 3) {
+            // Max 1,048,576 rows for Excel2007
+            $endRowRef = ($worksheet !== null) ? $worksheet->getHighestDataRow($start) : AddressRange::MAX_ROW;
+
+            return "{$start}1:{$end}{$endRowRef}";
+        }
+
+        return "{$start}:{$end}";
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Lookup.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Lookup.php
index e21d35dc56..b187620783 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Lookup.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Lookup.php
@@ -2,11 +2,13 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
 
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
-use PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class Lookup
 {
+    use ArrayEnabled;
+
     /**
      * LOOKUP
      * The LOOKUP function searches for value either from a one-row or one-column range or from an array.
@@ -17,24 +19,26 @@ class Lookup
      *
      * @return mixed The value of the found cell
      */
-    public static function lookup($lookupValue, $lookupVector, $resultVector = null)
+    public static function lookup(mixed $lookupValue, mixed $lookupVector, $resultVector = null): mixed
     {
-        $lookupValue = Functions::flattenSingleValue($lookupValue);
+        if (is_array($lookupValue)) {
+            return self::evaluateArrayArgumentsSubset([self::class, __FUNCTION__], 1, $lookupValue, $lookupVector, $resultVector);
+        }
 
         if (!is_array($lookupVector)) {
-            return Functions::NA();
+            return ExcelError::NA();
         }
         $hasResultVector = isset($resultVector);
         $lookupRows = self::rowCount($lookupVector);
         $lookupColumns = self::columnCount($lookupVector);
         // we correctly orient our results
         if (($lookupRows === 1 && $lookupColumns > 1) || (!$hasResultVector && $lookupRows === 2 && $lookupColumns !== 2)) {
-            $lookupVector = LookupRef\Matrix::transpose($lookupVector);
+            $lookupVector = Matrix::transpose($lookupVector);
             $lookupRows = self::rowCount($lookupVector);
             $lookupColumns = self::columnCount($lookupVector);
         }
 
-        $resultVector = self::verifyResultVector($lookupVector, $resultVector);
+        $resultVector = self::verifyResultVector($resultVector ?? $lookupVector);
 
         if ($lookupRows === 2 && !$hasResultVector) {
             $resultVector = array_pop($lookupVector);
@@ -73,18 +77,14 @@ private static function verifyLookupValues(array $lookupVector, array $resultVec
         return $lookupVector;
     }
 
-    private static function verifyResultVector(array $lookupVector, $resultVector)
+    private static function verifyResultVector(array $resultVector): array
     {
-        if ($resultVector === null) {
-            $resultVector = $lookupVector;
-        }
-
         $resultRows = self::rowCount($resultVector);
         $resultColumns = self::columnCount($resultVector);
 
         // we correctly orient our results
         if ($resultRows === 1 && $resultColumns > 1) {
-            $resultVector = LookupRef\Matrix::transpose($resultVector);
+            $resultVector = Matrix::transpose($resultVector);
         }
 
         return $resultVector;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/LookupBase.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/LookupBase.php
index 80fc99ad37..7d21cce0d3 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/LookupBase.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/LookupBase.php
@@ -3,20 +3,36 @@
 namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 abstract class LookupBase
 {
-    protected static function validateIndexLookup($lookup_array, $index_number)
+    protected static function validateLookupArray(mixed $lookup_array): void
     {
-        // index_number must be a number greater than or equal to 1
-        if (!is_numeric($index_number) || $index_number < 1) {
-            throw new Exception(Functions::VALUE());
+        if (!is_array($lookup_array)) {
+            throw new Exception(ExcelError::REF());
+        }
+    }
+
+    /** @param float|int|string $index_number */
+    protected static function validateIndexLookup(array $lookup_array, $index_number): int
+    {
+        // index_number must be a number greater than or equal to 1.
+        // Excel results are inconsistent when index is non-numeric.
+        // VLOOKUP(whatever, whatever, SQRT(-1)) yields NUM error, but
+        // VLOOKUP(whatever, whatever, cellref) yields REF error
+        //   when cellref is '=SQRT(-1)'. So just try our best here.
+        // Similar results if string (literal yields VALUE, cellRef REF).
+        if (!is_numeric($index_number)) {
+            throw new Exception(ExcelError::throwError($index_number));
+        }
+        if ($index_number < 1) {
+            throw new Exception(ExcelError::VALUE());
         }
 
         // index_number must be less than or equal to the number of columns in lookup_array
-        if ((!is_array($lookup_array)) || (empty($lookup_array))) {
-            throw new Exception(Functions::REF());
+        if (empty($lookup_array)) {
+            throw new Exception(ExcelError::REF());
         }
 
         return (int) $index_number;
@@ -25,7 +41,7 @@ protected static function validateIndexLookup($lookup_array, $index_number)
     protected static function checkMatch(
         bool $bothNumeric,
         bool $bothNotNumeric,
-        $notExactMatch,
+        bool $notExactMatch,
         int $rowKey,
         string $cellDataLower,
         string $lookupLower,
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/LookupRefValidations.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/LookupRefValidations.php
index b0739eb300..74c313ccff 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/LookupRefValidations.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/LookupRefValidations.php
@@ -3,35 +3,30 @@
 namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ErrorValue;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class LookupRefValidations
 {
-    /**
-     * @param mixed $value
-     */
-    public static function validateInt($value): int
+    public static function validateInt(mixed $value): int
     {
         if (!is_numeric($value)) {
-            if (Functions::isError($value)) {
+            if (ErrorValue::isError($value)) {
                 throw new Exception($value);
             }
 
-            throw new Exception(Functions::VALUE());
+            throw new Exception(ExcelError::VALUE());
         }
 
         return (int) floor((float) $value);
     }
 
-    /**
-     * @param mixed $value
-     */
-    public static function validatePositiveInt($value, bool $allowZero = true): int
+    public static function validatePositiveInt(mixed $value, bool $allowZero = true): int
     {
         $value = self::validateInt($value);
 
         if (($allowZero === false && $value <= 0) || $value < 0) {
-            throw new Exception(Functions::VALUE());
+            throw new Exception(ExcelError::VALUE());
         }
 
         return $value;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Matrix.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Matrix.php
index 71d22b3d0f..228b464485 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Matrix.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Matrix.php
@@ -2,19 +2,37 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class Matrix
 {
+    use ArrayEnabled;
+
+    /**
+     * Helper function; NOT an implementation of any Excel Function.
+     */
+    public static function isColumnVector(array $values): bool
+    {
+        return count($values, COUNT_RECURSIVE) === (count($values, COUNT_NORMAL) * 2);
+    }
+
+    /**
+     * Helper function; NOT an implementation of any Excel Function.
+     */
+    public static function isRowVector(array $values): bool
+    {
+        return count($values, COUNT_RECURSIVE) > 1
+            && (count($values, COUNT_NORMAL) === 1 || count($values, COUNT_RECURSIVE) === count($values, COUNT_NORMAL));
+    }
+
     /**
      * TRANSPOSE.
      *
      * @param array|mixed $matrixData A matrix of values
-     *
-     * @return array
      */
-    public static function transpose($matrixData)
+    public static function transpose($matrixData): array
     {
         $returnMatrix = [];
         if (!is_array($matrixData)) {
@@ -45,17 +63,25 @@ public static function transpose($matrixData)
      * @param mixed $matrix A range of cells or an array constant
      * @param mixed $rowNum The row in the array or range from which to return a value.
      *                          If row_num is omitted, column_num is required.
+     *                      Or can be an array of values
      * @param mixed $columnNum The column in the array or range from which to return a value.
      *                          If column_num is omitted, row_num is required.
+     *                      Or can be an array of values
      *
      * TODO Provide support for area_num, currently not supported
      *
      * @return mixed the value of a specified cell or array of cells
+     *         If an array of values is passed as the $rowNum and/or $columnNum arguments, then the returned result
+     *            will also be an array with the same dimensions
      */
-    public static function index($matrix, $rowNum = 0, $columnNum = 0)
+    public static function index(mixed $matrix, mixed $rowNum = 0, mixed $columnNum = null): mixed
     {
-        $rowNum = ($rowNum === null) ? 0 : Functions::flattenSingleValue($rowNum);
-        $columnNum = ($columnNum === null) ? 0 : Functions::flattenSingleValue($columnNum);
+        if (is_array($rowNum) || is_array($columnNum)) {
+            return self::evaluateArrayArgumentsSubsetFrom([self::class, __FUNCTION__], 1, $matrix, $rowNum, $columnNum);
+        }
+
+        $rowNum = $rowNum ?? 0;
+        $columnNum = $columnNum ?? 0;
 
         try {
             $rowNum = LookupRefValidations::validatePositiveInt($rowNum);
@@ -64,15 +90,26 @@ public static function index($matrix, $rowNum = 0, $columnNum = 0)
             return $e->getMessage();
         }
 
+        if (is_array($matrix) && count($matrix) === 1 && $rowNum > 1) {
+            $matrixKey = array_keys($matrix)[0];
+            if (is_array($matrix[$matrixKey])) {
+                $tempMatrix = [];
+                foreach ($matrix[$matrixKey] as $key => $value) {
+                    $tempMatrix[$key] = [$value];
+                }
+                $matrix = $tempMatrix;
+            }
+        }
+
         if (!is_array($matrix) || ($rowNum > count($matrix))) {
-            return Functions::REF();
+            return ExcelError::REF();
         }
 
         $rowKeys = array_keys($matrix);
         $columnKeys = @array_keys($matrix[$rowKeys[0]]);
 
         if ($columnNum > count($columnKeys)) {
-            return Functions::REF();
+            return ExcelError::REF();
         }
 
         if ($columnNum === 0) {
@@ -82,9 +119,7 @@ public static function index($matrix, $rowNum = 0, $columnNum = 0)
         $columnNum = $columnKeys[--$columnNum];
         if ($rowNum === 0) {
             return array_map(
-                function ($value) {
-                    return [$value];
-                },
+                fn ($value): array => [$value],
                 array_column($matrix, $columnNum)
             );
         }
@@ -93,7 +128,7 @@ function ($value) {
         return $matrix[$rowNum][$columnNum];
     }
 
-    private static function extractRowValue(array $matrix, array $rowKeys, int $rowNum)
+    private static function extractRowValue(array $matrix, array $rowKeys, int $rowNum): mixed
     {
         if ($rowNum === 0) {
             return $matrix;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Offset.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Offset.php
index c027d83c79..260ccc3a59 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Offset.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Offset.php
@@ -4,6 +4,7 @@
 
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Cell\Cell;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
@@ -38,9 +39,9 @@ class Offset
      * @param mixed $width The width, in number of columns, that you want the returned reference to be.
      *                         Width must be a positive number.
      *
-     * @return array|int|string An array containing a cell or range of cells, or a string on error
+     * @return array|string An array containing a cell or range of cells, or a string on error
      */
-    public static function OFFSET($cellAddress = null, $rows = 0, $columns = 0, $height = null, $width = null, ?Cell $pCell = null)
+    public static function OFFSET(?string $cellAddress = null, mixed $rows = 0, mixed $columns = 0, mixed $height = null, mixed $width = null, ?Cell $cell = null): string|array
     {
         $rows = Functions::flattenSingleValue($rows);
         $columns = Functions::flattenSingleValue($columns);
@@ -48,14 +49,14 @@ public static function OFFSET($cellAddress = null, $rows = 0, $columns = 0, $hei
         $width = Functions::flattenSingleValue($width);
 
         if ($cellAddress === null || $cellAddress === '') {
-            return 0;
+            return ExcelError::VALUE();
         }
 
-        if (!is_object($pCell)) {
-            return Functions::REF();
+        if (!is_object($cell)) {
+            return ExcelError::REF();
         }
 
-        [$cellAddress, $pSheet] = self::extractWorksheet($cellAddress, $pCell);
+        [$cellAddress, $worksheet] = self::extractWorksheet($cellAddress, $cell);
 
         $startCell = $endCell = $cellAddress;
         if (strpos($cellAddress, ':')) {
@@ -69,7 +70,7 @@ public static function OFFSET($cellAddress = null, $rows = 0, $columns = 0, $hei
         $startCellColumn += $columns;
 
         if (($startCellRow <= 0) || ($startCellColumn < 0)) {
-            return Functions::REF();
+            return ExcelError::REF();
         }
 
         $endCellColumn = self::adjustEndCellColumnForWidth($endCellColumn, $width, $startCellColumn, $columns);
@@ -78,7 +79,7 @@ public static function OFFSET($cellAddress = null, $rows = 0, $columns = 0, $hei
         $endCellRow = self::adustEndCellRowForHeight($height, $startCellRow, $rows, $endCellRow);
 
         if (($endCellRow <= 0) || ($endCellColumn < 0)) {
-            return Functions::REF();
+            return ExcelError::REF();
         }
         $endCellColumn = Coordinate::stringFromColumnIndex($endCellColumn + 1);
 
@@ -87,31 +88,42 @@ public static function OFFSET($cellAddress = null, $rows = 0, $columns = 0, $hei
             $cellAddress .= ":{$endCellColumn}{$endCellRow}";
         }
 
-        return self::extractRequiredCells($pSheet, $cellAddress);
+        return self::extractRequiredCells($worksheet, $cellAddress);
     }
 
-    private static function extractRequiredCells(?Worksheet $pSheet, string $cellAddress)
+    private static function extractRequiredCells(?Worksheet $worksheet, string $cellAddress): array
     {
-        return Calculation::getInstance($pSheet !== null ? $pSheet->getParent() : null)
-            ->extractCellRange($cellAddress, $pSheet, false);
+        return Calculation::getInstance($worksheet !== null ? $worksheet->getParent() : null)
+            ->extractCellRange($cellAddress, $worksheet, false);
     }
 
-    private static function extractWorksheet($cellAddress, Cell $pCell): array
+    private static function extractWorksheet(?string $cellAddress, Cell $cell): array
     {
+        $cellAddress = self::assessCellAddress($cellAddress ?? '', $cell);
+
         $sheetName = '';
-        if (strpos($cellAddress, '!') !== false) {
+        if (str_contains($cellAddress, '!')) {
             [$sheetName, $cellAddress] = Worksheet::extractSheetTitle($cellAddress, true);
             $sheetName = trim($sheetName, "'");
         }
 
-        $pSheet = ($sheetName !== '')
-            ? $pCell->getWorksheet()->getParent()->getSheetByName($sheetName)
-            : $pCell->getWorksheet();
+        $worksheet = ($sheetName !== '')
+            ? $cell->getWorksheet()->getParentOrThrow()->getSheetByName($sheetName)
+            : $cell->getWorksheet();
+
+        return [$cellAddress, $worksheet];
+    }
+
+    private static function assessCellAddress(string $cellAddress, Cell $cell): string
+    {
+        if (preg_match('/^' . Calculation::CALCULATION_REGEXP_DEFINEDNAME . '$/mui', $cellAddress) !== false) {
+            $cellAddress = Functions::expandDefinedName($cellAddress, $cell);
+        }
 
-        return [$cellAddress, $pSheet];
+        return $cellAddress;
     }
 
-    private static function adjustEndCellColumnForWidth(string $endCellColumn, $width, int $startCellColumn, $columns)
+    private static function adjustEndCellColumnForWidth(string $endCellColumn, mixed $width, int $startCellColumn, mixed $columns): int
     {
         $endCellColumn = Coordinate::columnIndexFromString($endCellColumn) - 1;
         if (($width !== null) && (!is_object($width))) {
@@ -123,7 +135,7 @@ private static function adjustEndCellColumnForWidth(string $endCellColumn, $widt
         return $endCellColumn;
     }
 
-    private static function adustEndCellRowForHeight($height, int $startCellRow, $rows, $endCellRow): int
+    private static function adustEndCellRowForHeight(mixed $height, int $startCellRow, mixed $rows, mixed $endCellRow): int
     {
         if (($height !== null) && (!is_object($height))) {
             $endCellRow = $startCellRow + (int) $height - 1;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/RowColumnInformation.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/RowColumnInformation.php
index 02c9a79e86..ea3ce44cda 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/RowColumnInformation.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/RowColumnInformation.php
@@ -3,7 +3,7 @@
 namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Cell\Cell;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
@@ -20,9 +20,9 @@ private static function cellAddressNullOrWhitespace($cellAddress): bool
         return $cellAddress === null || (!is_array($cellAddress) && trim($cellAddress) === '');
     }
 
-    private static function cellColumn(?Cell $pCell): int
+    private static function cellColumn(?Cell $cell): int
     {
-        return ($pCell !== null) ? (int) Coordinate::columnIndexFromString($pCell->getColumn()) : 1;
+        return ($cell !== null) ? Coordinate::columnIndexFromString($cell->getColumn()) : 1;
     }
 
     /**
@@ -42,42 +42,44 @@ private static function cellColumn(?Cell $pCell): int
      *
      * @return int|int[]
      */
-    public static function COLUMN($cellAddress = null, ?Cell $pCell = null)
+    public static function COLUMN($cellAddress = null, ?Cell $cell = null): int|array
     {
         if (self::cellAddressNullOrWhitespace($cellAddress)) {
-            return self::cellColumn($pCell);
+            return self::cellColumn($cell);
         }
 
         if (is_array($cellAddress)) {
             foreach ($cellAddress as $columnKey => $value) {
-                $columnKey = preg_replace('/[^a-z]/i', '', $columnKey);
+                $columnKey = (string) preg_replace('/[^a-z]/i', '', $columnKey);
 
-                return (int) Coordinate::columnIndexFromString($columnKey);
+                return Coordinate::columnIndexFromString($columnKey);
             }
 
-            return self::cellColumn($pCell);
+            return self::cellColumn($cell);
         }
 
         $cellAddress = $cellAddress ?? '';
-        if ($pCell != null) {
-            [,, $sheetName] = Helpers::extractWorksheet($cellAddress, $pCell);
-            [,, $cellAddress] = Helpers::extractCellAddresses($cellAddress, true, $pCell->getWorksheet(), $sheetName);
+        if ($cell != null) {
+            [,, $sheetName] = Helpers::extractWorksheet($cellAddress, $cell);
+            [,, $cellAddress] = Helpers::extractCellAddresses($cellAddress, true, $cell->getWorksheet(), $sheetName);
         }
         [, $cellAddress] = Worksheet::extractSheetTitle($cellAddress, true);
-        if (strpos($cellAddress, ':') !== false) {
+        $cellAddress ??= '';
+
+        if (str_contains($cellAddress, ':')) {
             [$startAddress, $endAddress] = explode(':', $cellAddress);
-            $startAddress = preg_replace('/[^a-z]/i', '', $startAddress);
-            $endAddress = preg_replace('/[^a-z]/i', '', $endAddress);
+            $startAddress = (string) preg_replace('/[^a-z]/i', '', $startAddress);
+            $endAddress = (string) preg_replace('/[^a-z]/i', '', $endAddress);
 
             return range(
-                (int) Coordinate::columnIndexFromString($startAddress),
-                (int) Coordinate::columnIndexFromString($endAddress)
+                Coordinate::columnIndexFromString($startAddress),
+                Coordinate::columnIndexFromString($endAddress)
             );
         }
 
-        $cellAddress = preg_replace('/[^a-z]/i', '', $cellAddress);
+        $cellAddress = (string) preg_replace('/[^a-z]/i', '', $cellAddress);
 
-        return (int) Coordinate::columnIndexFromString($cellAddress);
+        return Coordinate::columnIndexFromString($cellAddress);
     }
 
     /**
@@ -99,7 +101,7 @@ public static function COLUMNS($cellAddress = null)
             return 1;
         }
         if (!is_array($cellAddress)) {
-            return Functions::VALUE();
+            return ExcelError::VALUE();
         }
 
         reset($cellAddress);
@@ -113,9 +115,9 @@ public static function COLUMNS($cellAddress = null)
         return $columns;
     }
 
-    private static function cellRow(?Cell $pCell): int
+    private static function cellRow(?Cell $cell): int
     {
-        return ($pCell !== null) ? $pCell->getRow() : 1;
+        return ($cell !== null) ? $cell->getRow() : 1;
     }
 
     /**
@@ -133,12 +135,12 @@ private static function cellRow(?Cell $pCell): int
      *
      * @param null|array|string $cellAddress A reference to a range of cells for which you want the row numbers
      *
-     * @return int|mixed[]|string
+     * @return int|mixed[]
      */
-    public static function ROW($cellAddress = null, ?Cell $pCell = null)
+    public static function ROW($cellAddress = null, ?Cell $cell = null): int|array
     {
         if (self::cellAddressNullOrWhitespace($cellAddress)) {
-            return self::cellRow($pCell);
+            return self::cellRow($cell);
         }
 
         if (is_array($cellAddress)) {
@@ -148,24 +150,23 @@ public static function ROW($cellAddress = null, ?Cell $pCell = null)
                 }
             }
 
-            return self::cellRow($pCell);
+            return self::cellRow($cell);
         }
 
         $cellAddress = $cellAddress ?? '';
-        if ($pCell !== null) {
-            [,, $sheetName] = Helpers::extractWorksheet($cellAddress, $pCell);
-            [,, $cellAddress] = Helpers::extractCellAddresses($cellAddress, true, $pCell->getWorksheet(), $sheetName);
+        if ($cell !== null) {
+            [,, $sheetName] = Helpers::extractWorksheet($cellAddress, $cell);
+            [,, $cellAddress] = Helpers::extractCellAddresses($cellAddress, true, $cell->getWorksheet(), $sheetName);
         }
         [, $cellAddress] = Worksheet::extractSheetTitle($cellAddress, true);
-        if (strpos($cellAddress, ':') !== false) {
+        $cellAddress ??= '';
+        if (str_contains($cellAddress, ':')) {
             [$startAddress, $endAddress] = explode(':', $cellAddress);
-            $startAddress = preg_replace('/\D/', '', $startAddress);
-            $endAddress = preg_replace('/\D/', '', $endAddress);
+            $startAddress = (int) (string) preg_replace('/\D/', '', $startAddress);
+            $endAddress = (int) (string) preg_replace('/\D/', '', $endAddress);
 
             return array_map(
-                function ($value) {
-                    return [$value];
-                },
+                fn ($value): array => [$value],
                 range($startAddress, $endAddress)
             );
         }
@@ -193,7 +194,7 @@ public static function ROWS($cellAddress = null)
             return 1;
         }
         if (!is_array($cellAddress)) {
-            return Functions::VALUE();
+            return ExcelError::VALUE();
         }
 
         reset($cellAddress);
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Selection.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Selection.php
index 6c18d73b83..53396c9c9d 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Selection.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Selection.php
@@ -2,10 +2,14 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class Selection
 {
+    use ArrayEnabled;
+
     /**
      * CHOOSE.
      *
@@ -15,26 +19,27 @@ class Selection
      * Excel Function:
      *        =CHOOSE(index_num, value1, [value2], ...)
      *
+     * @param mixed $chosenEntry The entry to select from the list (indexed from 1)
      * @param mixed ...$chooseArgs Data values
      *
      * @return mixed The selected value
      */
-    public static function choose(...$chooseArgs)
+    public static function choose(mixed $chosenEntry, mixed ...$chooseArgs): mixed
     {
-        $chosenEntry = Functions::flattenArray(array_shift($chooseArgs));
-        $entryCount = count($chooseArgs) - 1;
-
         if (is_array($chosenEntry)) {
-            $chosenEntry = array_shift($chosenEntry);
+            return self::evaluateArrayArgumentsSubset([self::class, __FUNCTION__], 1, $chosenEntry, ...$chooseArgs);
         }
+
+        $entryCount = count($chooseArgs) - 1;
+
         if (is_numeric($chosenEntry)) {
             --$chosenEntry;
         } else {
-            return Functions::VALUE();
+            return ExcelError::VALUE();
         }
         $chosenEntry = floor($chosenEntry);
         if (($chosenEntry < 0) || ($chosenEntry > $entryCount)) {
-            return Functions::VALUE();
+            return ExcelError::VALUE();
         }
 
         if (is_array($chooseArgs[$chosenEntry])) {
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Sort.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Sort.php
new file mode 100644
index 0000000000..9ad47b4ed9
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Sort.php
@@ -0,0 +1,309 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+
+class Sort extends LookupRefValidations
+{
+    public const ORDER_ASCENDING = 1;
+    public const ORDER_DESCENDING = -1;
+
+    /**
+     * SORT
+     * The SORT function returns a sorted array of the elements in an array.
+     * The returned array is the same shape as the provided array argument.
+     * Both $sortIndex and $sortOrder can be arrays, to provide multi-level sorting.
+     *
+     * @param mixed $sortArray The range of cells being sorted
+     * @param mixed $sortIndex The column or row number within the sortArray to sort on
+     * @param mixed $sortOrder Flag indicating whether to sort ascending or descending
+     *                          Ascending = 1 (self::ORDER_ASCENDING)
+     *                          Descending = -1 (self::ORDER_DESCENDING)
+     * @param mixed $byColumn Whether the sort should be determined by row (the default) or by column
+     *
+     * @return mixed The sorted values from the sort range
+     */
+    public static function sort(mixed $sortArray, mixed $sortIndex = 1, mixed $sortOrder = self::ORDER_ASCENDING, mixed $byColumn = false): mixed
+    {
+        if (!is_array($sortArray)) {
+            // Scalars are always returned "as is"
+            return $sortArray;
+        }
+
+        $sortArray = self::enumerateArrayKeys($sortArray);
+
+        $byColumn = (bool) $byColumn;
+        $lookupIndexSize = $byColumn ? count($sortArray) : count($sortArray[0]);
+
+        try {
+            // If $sortIndex and $sortOrder are scalars, then convert them into arrays
+            if (is_scalar($sortIndex)) {
+                $sortIndex = [$sortIndex];
+                $sortOrder = is_scalar($sortOrder) ? [$sortOrder] : $sortOrder;
+            }
+            // but the values of those array arguments still need validation
+            $sortOrder = (empty($sortOrder) ? [self::ORDER_ASCENDING] : $sortOrder);
+            self::validateArrayArgumentsForSort($sortIndex, $sortOrder, $lookupIndexSize);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        // We want a simple, enumrated array of arrays where we can reference column by its index number.
+        $sortArray = array_values(array_map('array_values', $sortArray));
+
+        return ($byColumn === true)
+            ? self::sortByColumn($sortArray, $sortIndex, $sortOrder)
+            : self::sortByRow($sortArray, $sortIndex, $sortOrder);
+    }
+
+    /**
+     * SORTBY
+     * The SORTBY function sorts the contents of a range or array based on the values in a corresponding range or array.
+     * The returned array is the same shape as the provided array argument.
+     * Both $sortIndex and $sortOrder can be arrays, to provide multi-level sorting.
+     *
+     * @param mixed $sortArray The range of cells being sorted
+     * @param mixed $args
+     *              At least one additional argument must be provided, The vector or range to sort on
+     *              After that, arguments are passed as pairs:
+     *                    sort order: ascending or descending
+     *                         Ascending = 1 (self::ORDER_ASCENDING)
+     *                         Descending = -1 (self::ORDER_DESCENDING)
+     *                    additional arrays or ranges for multi-level sorting
+     *
+     * @return mixed The sorted values from the sort range
+     */
+    public static function sortBy(mixed $sortArray, mixed ...$args): mixed
+    {
+        if (!is_array($sortArray)) {
+            // Scalars are always returned "as is"
+            return $sortArray;
+        }
+
+        $sortArray = self::enumerateArrayKeys($sortArray);
+
+        $lookupArraySize = count($sortArray);
+        $argumentCount = count($args);
+
+        try {
+            $sortBy = $sortOrder = [];
+            for ($i = 0; $i < $argumentCount; $i += 2) {
+                $sortBy[] = self::validateSortVector($args[$i], $lookupArraySize);
+                $sortOrder[] = self::validateSortOrder($args[$i + 1] ?? self::ORDER_ASCENDING);
+            }
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return self::processSortBy($sortArray, $sortBy, $sortOrder);
+    }
+
+    private static function enumerateArrayKeys(array $sortArray): array
+    {
+        array_walk(
+            $sortArray,
+            function (&$columns): void {
+                if (is_array($columns)) {
+                    $columns = array_values($columns);
+                }
+            }
+        );
+
+        return array_values($sortArray);
+    }
+
+    private static function validateScalarArgumentsForSort(mixed &$sortIndex, mixed &$sortOrder, int $sortArraySize): void
+    {
+        if (is_array($sortIndex) || is_array($sortOrder)) {
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        $sortIndex = self::validatePositiveInt($sortIndex, false);
+
+        if ($sortIndex > $sortArraySize) {
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        $sortOrder = self::validateSortOrder($sortOrder);
+    }
+
+    private static function validateSortVector(mixed $sortVector, int $sortArraySize): array
+    {
+        if (!is_array($sortVector)) {
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        // It doesn't matter if it's a row or a column vectors, it works either way
+        $sortVector = Functions::flattenArray($sortVector);
+        if (count($sortVector) !== $sortArraySize) {
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        return $sortVector;
+    }
+
+    private static function validateSortOrder(mixed $sortOrder): int
+    {
+        $sortOrder = self::validateInt($sortOrder);
+        if (($sortOrder == self::ORDER_ASCENDING || $sortOrder === self::ORDER_DESCENDING) === false) {
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        return $sortOrder;
+    }
+
+    private static function validateArrayArgumentsForSort(array &$sortIndex, mixed &$sortOrder, int $sortArraySize): void
+    {
+        // It doesn't matter if they're row or column vectors, it works either way
+        $sortIndex = Functions::flattenArray($sortIndex);
+        $sortOrder = Functions::flattenArray($sortOrder);
+
+        if (
+            count($sortOrder) === 0 || count($sortOrder) > $sortArraySize
+            || (count($sortOrder) > count($sortIndex))
+        ) {
+            throw new Exception(ExcelError::VALUE());
+        }
+
+        if (count($sortIndex) > count($sortOrder)) {
+            // If $sortOrder has fewer elements than $sortIndex, then the last order element is repeated.
+            $sortOrder = array_merge(
+                $sortOrder,
+                array_fill(0, count($sortIndex) - count($sortOrder), array_pop($sortOrder))
+            );
+        }
+
+        foreach ($sortIndex as $key => &$value) {
+            self::validateScalarArgumentsForSort($value, $sortOrder[$key], $sortArraySize);
+        }
+    }
+
+    private static function prepareSortVectorValues(array $sortVector): array
+    {
+        // Strings should be sorted case-insensitive; with booleans converted to locale-strings
+        return array_map(
+            function ($value) {
+                if (is_bool($value)) {
+                    return ($value) ? Calculation::getTRUE() : Calculation::getFALSE();
+                } elseif (is_string($value)) {
+                    return StringHelper::strToLower($value);
+                }
+
+                return $value;
+            },
+            $sortVector
+        );
+    }
+
+    /**
+     * @param array[] $sortIndex
+     * @param int[] $sortOrder
+     */
+    private static function processSortBy(array $sortArray, array $sortIndex, array $sortOrder): array
+    {
+        $sortArguments = [];
+        $sortData = [];
+        foreach ($sortIndex as $index => $sortValues) {
+            $sortData[] = $sortValues;
+            $sortArguments[] = self::prepareSortVectorValues($sortValues);
+            $sortArguments[] = $sortOrder[$index] === self::ORDER_ASCENDING ? SORT_ASC : SORT_DESC;
+        }
+
+        $sortVector = self::executeVectorSortQuery($sortData, $sortArguments);
+
+        return self::sortLookupArrayFromVector($sortArray, $sortVector);
+    }
+
+    /**
+     * @param int[] $sortIndex
+     * @param int[] $sortOrder
+     */
+    private static function sortByRow(array $sortArray, array $sortIndex, array $sortOrder): array
+    {
+        $sortVector = self::buildVectorForSort($sortArray, $sortIndex, $sortOrder);
+
+        return self::sortLookupArrayFromVector($sortArray, $sortVector);
+    }
+
+    /**
+     * @param int[] $sortIndex
+     * @param int[] $sortOrder
+     */
+    private static function sortByColumn(array $sortArray, array $sortIndex, array $sortOrder): array
+    {
+        $sortArray = Matrix::transpose($sortArray);
+        $result = self::sortByRow($sortArray, $sortIndex, $sortOrder);
+
+        return Matrix::transpose($result);
+    }
+
+    /**
+     * @param int[] $sortIndex
+     * @param int[] $sortOrder
+     */
+    private static function buildVectorForSort(array $sortArray, array $sortIndex, array $sortOrder): array
+    {
+        $sortArguments = [];
+        $sortData = [];
+        foreach ($sortIndex as $index => $sortIndexValue) {
+            $sortValues = array_column($sortArray, $sortIndexValue - 1);
+            $sortData[] = $sortValues;
+            $sortArguments[] = self::prepareSortVectorValues($sortValues);
+            $sortArguments[] = $sortOrder[$index] === self::ORDER_ASCENDING ? SORT_ASC : SORT_DESC;
+        }
+
+        $sortData = self::executeVectorSortQuery($sortData, $sortArguments);
+
+        return $sortData;
+    }
+
+    private static function executeVectorSortQuery(array $sortData, array $sortArguments): array
+    {
+        $sortData = Matrix::transpose($sortData);
+
+        // We need to set an index that can be retained, as array_multisort doesn't maintain numeric keys.
+        $sortDataIndexed = [];
+        foreach ($sortData as $key => $value) {
+            $sortDataIndexed[Coordinate::stringFromColumnIndex($key + 1)] = $value;
+        }
+        unset($sortData);
+
+        $sortArguments[] = &$sortDataIndexed;
+
+        array_multisort(...$sortArguments);
+
+        // After the sort, we restore the numeric keys that will now be in the correct, sorted order
+        $sortedData = [];
+        foreach (array_keys($sortDataIndexed) as $key) {
+            $sortedData[] = Coordinate::columnIndexFromString($key) - 1;
+        }
+
+        return $sortedData;
+    }
+
+    private static function sortLookupArrayFromVector(array $sortArray, array $sortVector): array
+    {
+        // Building a new array in the correct (sorted) order works; but may be memory heavy for larger arrays
+        $sortedArray = [];
+        foreach ($sortVector as $index) {
+            $sortedArray[] = $sortArray[$index];
+        }
+
+        return $sortedArray;
+
+//        uksort(
+//            $lookupArray,
+//            function (int $a, int $b) use (array $sortVector) {
+//                return $sortVector[$a] <=> $sortVector[$b];
+//            }
+//        );
+//
+//        return $lookupArray;
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Unique.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Unique.php
new file mode 100644
index 0000000000..103520ed27
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/Unique.php
@@ -0,0 +1,148 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+
+class Unique
+{
+    /**
+     * UNIQUE
+     * The UNIQUE function searches for value either from a one-row or one-column range or from an array.
+     *
+     * @param mixed $lookupVector The range of cells being searched
+     * @param mixed $byColumn Whether the uniqueness should be determined by row (the default) or by column
+     * @param mixed $exactlyOnce Whether the function should return only entries that occur just once in the list
+     *
+     * @return mixed The unique values from the search range
+     */
+    public static function unique(mixed $lookupVector, mixed $byColumn = false, mixed $exactlyOnce = false): mixed
+    {
+        if (!is_array($lookupVector)) {
+            // Scalars are always returned "as is"
+            return $lookupVector;
+        }
+
+        $byColumn = (bool) $byColumn;
+        $exactlyOnce = (bool) $exactlyOnce;
+
+        return ($byColumn === true)
+            ? self::uniqueByColumn($lookupVector, $exactlyOnce)
+            : self::uniqueByRow($lookupVector, $exactlyOnce);
+    }
+
+    private static function uniqueByRow(array $lookupVector, bool $exactlyOnce): mixed
+    {
+        // When not $byColumn, we count whole rows or values, not individual values
+        //      so implode each row into a single string value
+        array_walk(
+            $lookupVector,
+            function (array &$value): void {
+                $valuex = '';
+                $separator = '';
+                $numericIndicator = "\x01";
+                foreach ($value as $cellValue) {
+                    $valuex .= $separator . $cellValue;
+                    $separator = "\x00";
+                    if (is_int($cellValue) || is_float($cellValue)) {
+                        $valuex .= $numericIndicator;
+                    }
+                }
+                $value = $valuex;
+            }
+        );
+
+        $result = self::countValuesCaseInsensitive($lookupVector);
+
+        if ($exactlyOnce === true) {
+            $result = self::exactlyOnceFilter($result);
+        }
+
+        if (count($result) === 0) {
+            return ExcelError::CALC();
+        }
+
+        $result = array_keys($result);
+
+        // restore rows from their strings
+        array_walk(
+            $result,
+            function (string &$value): void {
+                $value = explode("\x00", $value);
+                foreach ($value as &$stringValue) {
+                    if (str_ends_with($stringValue, "\x01")) {
+                        // x01 should only end a string which is otherwise a float or int,
+                        // so phpstan is technically correct but what it fears should not happen.
+                        $stringValue = 0 + substr($stringValue, 0, -1); //@phpstan-ignore-line
+                    }
+                }
+            }
+        );
+
+        return (count($result) === 1) ? array_pop($result) : $result;
+    }
+
+    private static function uniqueByColumn(array $lookupVector, bool $exactlyOnce): mixed
+    {
+        $flattenedLookupVector = Functions::flattenArray($lookupVector);
+
+        if (count($lookupVector, COUNT_RECURSIVE) > count($flattenedLookupVector, COUNT_RECURSIVE) + 1) {
+            // We're looking at a full column check (multiple rows)
+            $transpose = Matrix::transpose($lookupVector);
+            $result = self::uniqueByRow($transpose, $exactlyOnce);
+
+            return (is_array($result)) ? Matrix::transpose($result) : $result;
+        }
+
+        $result = self::countValuesCaseInsensitive($flattenedLookupVector);
+
+        if ($exactlyOnce === true) {
+            $result = self::exactlyOnceFilter($result);
+        }
+
+        if (count($result) === 0) {
+            return ExcelError::CALC();
+        }
+
+        $result = array_keys($result);
+
+        return $result;
+    }
+
+    private static function countValuesCaseInsensitive(array $caseSensitiveLookupValues): array
+    {
+        $caseInsensitiveCounts = array_count_values(
+            array_map(
+                fn (string $value): string => StringHelper::strToUpper($value),
+                $caseSensitiveLookupValues
+            )
+        );
+
+        $caseSensitiveCounts = [];
+        foreach ($caseInsensitiveCounts as $caseInsensitiveKey => $count) {
+            if (is_numeric($caseInsensitiveKey)) {
+                $caseSensitiveCounts[$caseInsensitiveKey] = $count;
+            } else {
+                foreach ($caseSensitiveLookupValues as $caseSensitiveValue) {
+                    if ($caseInsensitiveKey === StringHelper::strToUpper($caseSensitiveValue)) {
+                        $caseSensitiveCounts[$caseSensitiveValue] = $count;
+
+                        break;
+                    }
+                }
+            }
+        }
+
+        return $caseSensitiveCounts;
+    }
+
+    private static function exactlyOnceFilter(array $values): array
+    {
+        return array_filter(
+            $values,
+            fn ($value): bool => $value === 1
+        );
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/VLookup.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/VLookup.php
index ddd5d9ee36..1c24b2a339 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/VLookup.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef/VLookup.php
@@ -2,12 +2,15 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 
 class VLookup extends LookupBase
 {
+    use ArrayEnabled;
+
     /**
      * VLOOKUP
      * The VLOOKUP function searches for value in the left-most column of lookup_array and returns the value
@@ -21,13 +24,16 @@ class VLookup extends LookupBase
      *
      * @return mixed The value of the found cell
      */
-    public static function lookup($lookupValue, $lookupArray, $indexNumber, $notExactMatch = true)
+    public static function lookup(mixed $lookupValue, mixed $lookupArray, mixed $indexNumber, mixed $notExactMatch = true): mixed
     {
-        $lookupValue = Functions::flattenSingleValue($lookupValue);
-        $indexNumber = Functions::flattenSingleValue($indexNumber);
-        $notExactMatch = ($notExactMatch === null) ? true : Functions::flattenSingleValue($notExactMatch);
+        if (is_array($lookupValue) || is_array($indexNumber)) {
+            return self::evaluateArrayArgumentsIgnore([self::class, __FUNCTION__], 1, $lookupValue, $lookupArray, $indexNumber, $notExactMatch);
+        }
+
+        $notExactMatch = (bool) ($notExactMatch ?? true);
 
         try {
+            self::validateLookupArray($lookupArray);
             $indexNumber = self::validateIndexLookup($lookupArray, $indexNumber);
         } catch (Exception $e) {
             return $e->getMessage();
@@ -36,14 +42,16 @@ public static function lookup($lookupValue, $lookupArray, $indexNumber, $notExac
         $f = array_keys($lookupArray);
         $firstRow = array_pop($f);
         if ((!is_array($lookupArray[$firstRow])) || ($indexNumber > count($lookupArray[$firstRow]))) {
-            return Functions::REF();
+            return ExcelError::REF();
         }
         $columnKeys = array_keys($lookupArray[$firstRow]);
         $returnColumn = $columnKeys[--$indexNumber];
-        $firstColumn = array_shift($columnKeys);
+        $firstColumn = array_shift($columnKeys) ?? 1;
 
         if (!$notExactMatch) {
-            uasort($lookupArray, ['self', 'vlookupSort']);
+            /** @var callable $callable */
+            $callable = [self::class, 'vlookupSort'];
+            uasort($lookupArray, $callable);
         }
 
         $rowNumber = self::vLookupSearch($lookupValue, $lookupArray, $firstColumn, $notExactMatch);
@@ -53,15 +61,15 @@ public static function lookup($lookupValue, $lookupArray, $indexNumber, $notExac
             return $lookupArray[$rowNumber][$returnColumn];
         }
 
-        return Functions::NA();
+        return ExcelError::NA();
     }
 
-    private static function vlookupSort($a, $b)
+    private static function vlookupSort(array $a, array $b): int
     {
         reset($a);
         $firstColumn = key($a);
-        $aLower = StringHelper::strToLower($a[$firstColumn]);
-        $bLower = StringHelper::strToLower($b[$firstColumn]);
+        $aLower = StringHelper::strToLower((string) $a[$firstColumn]);
+        $bLower = StringHelper::strToLower((string) $b[$firstColumn]);
 
         if ($aLower == $bLower) {
             return 0;
@@ -70,21 +78,25 @@ private static function vlookupSort($a, $b)
         return ($aLower < $bLower) ? -1 : 1;
     }
 
-    private static function vLookupSearch($lookupValue, $lookupArray, $column, $notExactMatch)
+    /**
+     * @param mixed $lookupValue The value that you want to match in lookup_array
+     * @param  int|string $column
+     */
+    private static function vLookupSearch(mixed $lookupValue, array $lookupArray, $column, bool $notExactMatch): ?int
     {
-        $lookupLower = StringHelper::strToLower($lookupValue);
+        $lookupLower = StringHelper::strToLower((string) $lookupValue);
 
         $rowNumber = null;
         foreach ($lookupArray as $rowKey => $rowData) {
-            $bothNumeric = is_numeric($lookupValue) && is_numeric($rowData[$column]);
-            $bothNotNumeric = !is_numeric($lookupValue) && !is_numeric($rowData[$column]);
-            $cellDataLower = StringHelper::strToLower($rowData[$column]);
+            $bothNumeric = self::numeric($lookupValue) && self::numeric($rowData[$column]);
+            $bothNotNumeric = !self::numeric($lookupValue) && !self::numeric($rowData[$column]);
+            $cellDataLower = StringHelper::strToLower((string) $rowData[$column]);
 
             // break if we have passed possible keys
             if (
-                $notExactMatch &&
-                (($bothNumeric && ($rowData[$column] > $lookupValue)) ||
-                ($bothNotNumeric && ($cellDataLower > $lookupLower)))
+                $notExactMatch
+                && (($bothNumeric && ($rowData[$column] > $lookupValue))
+                || ($bothNotNumeric && ($cellDataLower > $lookupLower)))
             ) {
                 break;
             }
@@ -102,4 +114,9 @@ private static function vLookupSearch($lookupValue, $lookupArray, $column, $notE
 
         return $rowNumber;
     }
+
+    private static function numeric(mixed $value): bool
+    {
+        return is_int($value) || is_float($value);
+    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig.php
deleted file mode 100644
index ec251f6d25..0000000000
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig.php
+++ /dev/null
@@ -1,1520 +0,0 @@
-<?php
-
-namespace PhpOffice\PhpSpreadsheet\Calculation;
-
-/**
- * @deprecated 1.18.0
- */
-class MathTrig
-{
-    /**
-     * ARABIC.
-     *
-     * Converts a Roman numeral to an Arabic numeral.
-     *
-     * Excel Function:
-     *        ARABIC(text)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\Arabic::evaluate()
-     *      Use the evaluate method in the MathTrig\Arabic class instead
-     *
-     * @param string $roman
-     *
-     * @return int|string the arabic numberal contrived from the roman numeral
-     */
-    public static function ARABIC($roman)
-    {
-        return MathTrig\Arabic::evaluate($roman);
-    }
-
-    /**
-     * ATAN2.
-     *
-     * This function calculates the arc tangent of the two variables x and y. It is similar to
-     *        calculating the arc tangent of y ÷ x, except that the signs of both arguments are used
-     *        to determine the quadrant of the result.
-     * The arctangent is the angle from the x-axis to a line containing the origin (0, 0) and a
-     *        point with coordinates (xCoordinate, yCoordinate). The angle is given in radians between
-     *        -pi and pi, excluding -pi.
-     *
-     * Note that the Excel ATAN2() function accepts its arguments in the reverse order to the standard
-     *        PHP atan2() function, so we need to reverse them here before calling the PHP atan() function.
-     *
-     * Excel Function:
-     *        ATAN2(xCoordinate,yCoordinate)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\Trig\Tangent::atan2()
-     *      Use the atan2 method in the MathTrig\Trig\Tangent class instead
-     *
-     * @param float $xCoordinate the x-coordinate of the point
-     * @param float $yCoordinate the y-coordinate of the point
-     *
-     * @return float|string the inverse tangent of the specified x- and y-coordinates, or a string containing an error
-     */
-    public static function ATAN2($xCoordinate = null, $yCoordinate = null)
-    {
-        return MathTrig\Trig\Tangent::atan2($xCoordinate, $yCoordinate);
-    }
-
-    /**
-     * BASE.
-     *
-     * Converts a number into a text representation with the given radix (base).
-     *
-     * Excel Function:
-     *        BASE(Number, Radix [Min_length])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\Base::evaluate()
-     *      Use the evaluate method in the MathTrig\Base class instead
-     *
-     * @param float $number
-     * @param float $radix
-     * @param int $minLength
-     *
-     * @return string the text representation with the given radix (base)
-     */
-    public static function BASE($number, $radix, $minLength = null)
-    {
-        return MathTrig\Base::evaluate($number, $radix, $minLength);
-    }
-
-    /**
-     * CEILING.
-     *
-     * Returns number rounded up, away from zero, to the nearest multiple of significance.
-     *        For example, if you want to avoid using pennies in your prices and your product is
-     *        priced at $4.42, use the formula =CEILING(4.42,0.05) to round prices up to the
-     *        nearest nickel.
-     *
-     * Excel Function:
-     *        CEILING(number[,significance])
-     *
-     * @Deprecated 1.17.0
-     *
-     * @param float $number the number you want to round
-     * @param float $significance the multiple to which you want to round
-     *
-     * @return float|string Rounded Number, or a string containing an error
-     *
-     * @see MathTrig\Ceiling::ceiling()
-     *      Use the ceiling() method in the MathTrig\Ceiling class instead
-     */
-    public static function CEILING($number, $significance = null)
-    {
-        return MathTrig\Ceiling::ceiling($number, $significance);
-    }
-
-    /**
-     * COMBIN.
-     *
-     * Returns the number of combinations for a given number of items. Use COMBIN to
-     *        determine the total possible number of groups for a given number of items.
-     *
-     * Excel Function:
-     *        COMBIN(numObjs,numInSet)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see MathTrig\Combinations::withoutRepetition()
-     *      Use the withoutRepetition() method in the MathTrig\Combinations class instead
-     *
-     * @param int $numObjs Number of different objects
-     * @param int $numInSet Number of objects in each combination
-     *
-     * @return float|int|string Number of combinations, or a string containing an error
-     */
-    public static function COMBIN($numObjs, $numInSet)
-    {
-        return MathTrig\Combinations::withoutRepetition($numObjs, $numInSet);
-    }
-
-    /**
-     * EVEN.
-     *
-     * Returns number rounded up to the nearest even integer.
-     * You can use this function for processing items that come in twos. For example,
-     *        a packing crate accepts rows of one or two items. The crate is full when
-     *        the number of items, rounded up to the nearest two, matches the crate's
-     *        capacity.
-     *
-     * Excel Function:
-     *        EVEN(number)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see MathTrig\Round::even()
-     *      Use the even() method in the MathTrig\Round class instead
-     *
-     * @param float $number Number to round
-     *
-     * @return float|int|string Rounded Number, or a string containing an error
-     */
-    public static function EVEN($number)
-    {
-        return MathTrig\Round::even($number);
-    }
-
-    /**
-     * Helper function for Even.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see MathTrig\Helpers::getEven()
-     *      Use the evaluate() method in the MathTrig\Helpers class instead
-     */
-    public static function getEven(float $number): int
-    {
-        return (int) MathTrig\Helpers::getEven($number);
-    }
-
-    /**
-     * FACT.
-     *
-     * Returns the factorial of a number.
-     * The factorial of a number is equal to 1*2*3*...* number.
-     *
-     * Excel Function:
-     *        FACT(factVal)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @param float $factVal Factorial Value
-     *
-     * @return float|int|string Factorial, or a string containing an error
-     *
-     *@see MathTrig\Factorial::fact()
-     *      Use the fact() method in the MathTrig\Factorial class instead
-     */
-    public static function FACT($factVal)
-    {
-        return MathTrig\Factorial::fact($factVal);
-    }
-
-    /**
-     * FACTDOUBLE.
-     *
-     * Returns the double factorial of a number.
-     *
-     * Excel Function:
-     *        FACTDOUBLE(factVal)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @param float $factVal Factorial Value
-     *
-     * @return float|int|string Double Factorial, or a string containing an error
-     *
-     *@see MathTrig\Factorial::factDouble()
-     *      Use the factDouble() method in the MathTrig\Factorial class instead
-     */
-    public static function FACTDOUBLE($factVal)
-    {
-        return MathTrig\Factorial::factDouble($factVal);
-    }
-
-    /**
-     * FLOOR.
-     *
-     * Rounds number down, toward zero, to the nearest multiple of significance.
-     *
-     * Excel Function:
-     *        FLOOR(number[,significance])
-     *
-     * @Deprecated 1.17.0
-     *
-     * @param float $number Number to round
-     * @param float $significance Significance
-     *
-     * @return float|string Rounded Number, or a string containing an error
-     *
-     *@see MathTrig\Floor::floor()
-     *      Use the floor() method in the MathTrig\Floor class instead
-     */
-    public static function FLOOR($number, $significance = null)
-    {
-        return MathTrig\Floor::floor($number, $significance);
-    }
-
-    /**
-     * FLOOR.MATH.
-     *
-     * Round a number down to the nearest integer or to the nearest multiple of significance.
-     *
-     * Excel Function:
-     *        FLOOR.MATH(number[,significance[,mode]])
-     *
-     * @Deprecated 1.17.0
-     *
-     * @param float $number Number to round
-     * @param float $significance Significance
-     * @param int $mode direction to round negative numbers
-     *
-     * @return float|string Rounded Number, or a string containing an error
-     *
-     *@see MathTrig\Floor::math()
-     *      Use the math() method in the MathTrig\Floor class instead
-     */
-    public static function FLOORMATH($number, $significance = null, $mode = 0)
-    {
-        return MathTrig\Floor::math($number, $significance, $mode);
-    }
-
-    /**
-     * FLOOR.PRECISE.
-     *
-     * Rounds number down, toward zero, to the nearest multiple of significance.
-     *
-     * Excel Function:
-     *        FLOOR.PRECISE(number[,significance])
-     *
-     * @Deprecated 1.17.0
-     *
-     * @param float $number Number to round
-     * @param float $significance Significance
-     *
-     * @return float|string Rounded Number, or a string containing an error
-     *
-     *@see MathTrig\Floor::precise()
-     *      Use the precise() method in the MathTrig\Floor class instead
-     */
-    public static function FLOORPRECISE($number, $significance = 1)
-    {
-        return MathTrig\Floor::precise($number, $significance);
-    }
-
-    /**
-     * INT.
-     *
-     * Casts a floating point value to an integer
-     *
-     * Excel Function:
-     *        INT(number)
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see MathTrig\IntClass::evaluate()
-     *      Use the evaluate() method in the MathTrig\IntClass class instead
-     *
-     * @param float $number Number to cast to an integer
-     *
-     * @return int|string Integer value, or a string containing an error
-     */
-    public static function INT($number)
-    {
-        return MathTrig\IntClass::evaluate($number);
-    }
-
-    /**
-     * GCD.
-     *
-     * Returns the greatest common divisor of a series of numbers.
-     * The greatest common divisor is the largest integer that divides both
-     *        number1 and number2 without a remainder.
-     *
-     * Excel Function:
-     *        GCD(number1[,number2[, ...]])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see MathTrig\Gcd::evaluate()
-     *      Use the evaluate() method in the MathTrig\Gcd class instead
-     *
-     * @param mixed ...$args Data values
-     *
-     * @return int|mixed|string Greatest Common Divisor, or a string containing an error
-     */
-    public static function GCD(...$args)
-    {
-        return MathTrig\Gcd::evaluate(...$args);
-    }
-
-    /**
-     * LCM.
-     *
-     * Returns the lowest common multiplier of a series of numbers
-     * The least common multiple is the smallest positive integer that is a multiple
-     * of all integer arguments number1, number2, and so on. Use LCM to add fractions
-     * with different denominators.
-     *
-     * Excel Function:
-     *        LCM(number1[,number2[, ...]])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see MathTrig\Lcm::evaluate()
-     *      Use the evaluate() method in the MathTrig\Lcm class instead
-     *
-     * @param mixed ...$args Data values
-     *
-     * @return int|string Lowest Common Multiplier, or a string containing an error
-     */
-    public static function LCM(...$args)
-    {
-        return MathTrig\Lcm::evaluate(...$args);
-    }
-
-    /**
-     * LOG_BASE.
-     *
-     * Returns the logarithm of a number to a specified base. The default base is 10.
-     *
-     * Excel Function:
-     *        LOG(number[,base])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see MathTrig\Logarithms::withBase()
-     *      Use the withBase() method in the MathTrig\Logarithms class instead
-     *
-     * @param float $number The positive real number for which you want the logarithm
-     * @param float $base The base of the logarithm. If base is omitted, it is assumed to be 10.
-     *
-     * @return float|string The result, or a string containing an error
-     */
-    public static function logBase($number, $base = 10)
-    {
-        return MathTrig\Logarithms::withBase($number, $base);
-    }
-
-    /**
-     * MDETERM.
-     *
-     * Returns the matrix determinant of an array.
-     *
-     * Excel Function:
-     *        MDETERM(array)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see MathTrig\MatrixFunctions::determinant()
-     *      Use the determinant() method in the MathTrig\MatrixFunctions class instead
-     *
-     * @param array $matrixValues A matrix of values
-     *
-     * @return float|string The result, or a string containing an error
-     */
-    public static function MDETERM($matrixValues)
-    {
-        return MathTrig\MatrixFunctions::determinant($matrixValues);
-    }
-
-    /**
-     * MINVERSE.
-     *
-     * Returns the inverse matrix for the matrix stored in an array.
-     *
-     * Excel Function:
-     *        MINVERSE(array)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see MathTrig\MatrixFunctions::inverse()
-     *      Use the inverse() method in the MathTrig\MatrixFunctions class instead
-     *
-     * @param array $matrixValues A matrix of values
-     *
-     * @return array|string The result, or a string containing an error
-     */
-    public static function MINVERSE($matrixValues)
-    {
-        return MathTrig\MatrixFunctions::inverse($matrixValues);
-    }
-
-    /**
-     * MMULT.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see MathTrig\MatrixFunctions::multiply()
-     *      Use the multiply() method in the MathTrig\MatrixFunctions class instead
-     *
-     * @param array $matrixData1 A matrix of values
-     * @param array $matrixData2 A matrix of values
-     *
-     * @return array|string The result, or a string containing an error
-     */
-    public static function MMULT($matrixData1, $matrixData2)
-    {
-        return MathTrig\MatrixFunctions::multiply($matrixData1, $matrixData2);
-    }
-
-    /**
-     * MOD.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see MathTrig\Operations::mod()
-     *      Use the mod() method in the MathTrig\Operations class instead
-     *
-     * @param int $a Dividend
-     * @param int $b Divisor
-     *
-     * @return float|int|string Remainder, or a string containing an error
-     */
-    public static function MOD($a = 1, $b = 1)
-    {
-        return MathTrig\Operations::mod($a, $b);
-    }
-
-    /**
-     * MROUND.
-     *
-     * Rounds a number to the nearest multiple of a specified value
-     *
-     * @Deprecated 1.17.0
-     *
-     * @param float $number Number to round
-     * @param int $multiple Multiple to which you want to round $number
-     *
-     * @return float|string Rounded Number, or a string containing an error
-     *
-     *@see MathTrig\Round::multiple()
-     *      Use the multiple() method in the MathTrig\Mround class instead
-     */
-    public static function MROUND($number, $multiple)
-    {
-        return MathTrig\Round::multiple($number, $multiple);
-    }
-
-    /**
-     * MULTINOMIAL.
-     *
-     * Returns the ratio of the factorial of a sum of values to the product of factorials.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\Factorial::multinomial()
-     *      Use the multinomial method in the MathTrig\Factorial class instead
-     *
-     * @param mixed[] $args An array of mixed values for the Data Series
-     *
-     * @return float|string The result, or a string containing an error
-     */
-    public static function MULTINOMIAL(...$args)
-    {
-        return MathTrig\Factorial::multinomial(...$args);
-    }
-
-    /**
-     * ODD.
-     *
-     * Returns number rounded up to the nearest odd integer.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\Round::odd()
-     *      Use the odd method in the MathTrig\Round class instead
-     *
-     * @param float $number Number to round
-     *
-     * @return float|int|string Rounded Number, or a string containing an error
-     */
-    public static function ODD($number)
-    {
-        return MathTrig\Round::odd($number);
-    }
-
-    /**
-     * POWER.
-     *
-     * Computes x raised to the power y.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\Operations::power()
-     *      Use the evaluate method in the MathTrig\Power class instead
-     *
-     * @param float $x
-     * @param float $y
-     *
-     * @return float|int|string The result, or a string containing an error
-     */
-    public static function POWER($x = 0, $y = 2)
-    {
-        return MathTrig\Operations::power($x, $y);
-    }
-
-    /**
-     * PRODUCT.
-     *
-     * PRODUCT returns the product of all the values and cells referenced in the argument list.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\Operations::product()
-     *      Use the product method in the MathTrig\Operations class instead
-     *
-     * Excel Function:
-     *        PRODUCT(value1[,value2[, ...]])
-     *
-     * @param mixed ...$args Data values
-     *
-     * @return float|string
-     */
-    public static function PRODUCT(...$args)
-    {
-        return MathTrig\Operations::product(...$args);
-    }
-
-    /**
-     * QUOTIENT.
-     *
-     * QUOTIENT function returns the integer portion of a division. Numerator is the divided number
-     *        and denominator is the divisor.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\Operations::quotient()
-     *      Use the quotient method in the MathTrig\Operations class instead
-     *
-     * Excel Function:
-     *        QUOTIENT(value1[,value2[, ...]])
-     *
-     * @param mixed $numerator
-     * @param mixed $denominator
-     *
-     * @return int|string
-     */
-    public static function QUOTIENT($numerator, $denominator)
-    {
-        return MathTrig\Operations::quotient($numerator, $denominator);
-    }
-
-    /**
-     * RAND/RANDBETWEEN.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\Random::randBetween()
-     *      Use the randBetween or randBetween method in the MathTrig\Random class instead
-     *
-     * @param int $min Minimal value
-     * @param int $max Maximal value
-     *
-     * @return float|int|string Random number
-     */
-    public static function RAND($min = 0, $max = 0)
-    {
-        return MathTrig\Random::randBetween($min, $max);
-    }
-
-    /**
-     * ROMAN.
-     *
-     * Converts a number to Roman numeral
-     *
-     * @Deprecated 1.17.0
-     *
-     * @Ssee MathTrig\Roman::evaluate()
-     *      Use the evaluate() method in the MathTrig\Roman class instead
-     *
-     * @param mixed $aValue Number to convert
-     * @param mixed $style Number indicating one of five possible forms
-     *
-     * @return string Roman numeral, or a string containing an error
-     */
-    public static function ROMAN($aValue, $style = 0)
-    {
-        return MathTrig\Roman::evaluate($aValue, $style);
-    }
-
-    /**
-     * ROUNDUP.
-     *
-     * Rounds a number up to a specified number of decimal places
-     *
-     * @Deprecated 1.17.0
-     *
-     * @See MathTrig\Round::up()
-     *      Use the up() method in the MathTrig\Round class instead
-     *
-     * @param float $number Number to round
-     * @param int $digits Number of digits to which you want to round $number
-     *
-     * @return float|string Rounded Number, or a string containing an error
-     */
-    public static function ROUNDUP($number, $digits)
-    {
-        return MathTrig\Round::up($number, $digits);
-    }
-
-    /**
-     * ROUNDDOWN.
-     *
-     * Rounds a number down to a specified number of decimal places
-     *
-     * @Deprecated 1.17.0
-     *
-     * @See MathTrig\Round::down()
-     *      Use the down() method in the MathTrig\Round class instead
-     *
-     * @param float $number Number to round
-     * @param int $digits Number of digits to which you want to round $number
-     *
-     * @return float|string Rounded Number, or a string containing an error
-     */
-    public static function ROUNDDOWN($number, $digits)
-    {
-        return MathTrig\Round::down($number, $digits);
-    }
-
-    /**
-     * SERIESSUM.
-     *
-     * Returns the sum of a power series
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\SeriesSum::evaluate()
-     *      Use the evaluate method in the MathTrig\SeriesSum class instead
-     *
-     * @param mixed $x Input value
-     * @param mixed $n Initial power
-     * @param mixed $m Step
-     * @param mixed[] $args An array of coefficients for the Data Series
-     *
-     * @return float|string The result, or a string containing an error
-     */
-    public static function SERIESSUM($x, $n, $m, ...$args)
-    {
-        return MathTrig\SeriesSum::evaluate($x, $n, $m, ...$args);
-    }
-
-    /**
-     * SIGN.
-     *
-     * Determines the sign of a number. Returns 1 if the number is positive, zero (0)
-     *        if the number is 0, and -1 if the number is negative.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\Sign::evaluate()
-     *      Use the evaluate method in the MathTrig\Sign class instead
-     *
-     * @param float $number Number to round
-     *
-     * @return int|string sign value, or a string containing an error
-     */
-    public static function SIGN($number)
-    {
-        return MathTrig\Sign::evaluate($number);
-    }
-
-    /**
-     * returnSign = returns 0/-1/+1.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\Helpers::returnSign()
-     *      Use the returnSign method in the MathTrig\Helpers class instead
-     */
-    public static function returnSign(float $number): int
-    {
-        return MathTrig\Helpers::returnSign($number);
-    }
-
-    /**
-     * SQRTPI.
-     *
-     * Returns the square root of (number * pi).
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\Sqrt::sqrt()
-     *      Use the pi method in the MathTrig\Sqrt class instead
-     *
-     * @param float $number Number
-     *
-     * @return float|string Square Root of Number * Pi, or a string containing an error
-     */
-    public static function SQRTPI($number)
-    {
-        return MathTrig\Sqrt::pi($number);
-    }
-
-    /**
-     * SUBTOTAL.
-     *
-     * Returns a subtotal in a list or database.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\Subtotal::evaluate()
-     *      Use the evaluate method in the MathTrig\Subtotal class instead
-     *
-     * @param int $functionType
-     *            A number 1 to 11 that specifies which function to
-     *                    use in calculating subtotals within a range
-     *                    list
-     *            Numbers 101 to 111 shadow the functions of 1 to 11
-     *                    but ignore any values in the range that are
-     *                    in hidden rows or columns
-     * @param mixed[] $args A mixed data series of values
-     *
-     * @return float|string
-     */
-    public static function SUBTOTAL($functionType, ...$args)
-    {
-        return MathTrig\Subtotal::evaluate($functionType, ...$args);
-    }
-
-    /**
-     * SUM.
-     *
-     * SUM computes the sum of all the values and cells referenced in the argument list.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\Sum::sumErroringStrings()
-     *      Use the sumErroringStrings method in the MathTrig\Sum class instead
-     *
-     * Excel Function:
-     *        SUM(value1[,value2[, ...]])
-     *
-     * @param mixed ...$args Data values
-     *
-     * @return float|string
-     */
-    public static function SUM(...$args)
-    {
-        return MathTrig\Sum::sumIgnoringStrings(...$args);
-    }
-
-    /**
-     * SUMIF.
-     *
-     * Totals the values of cells that contain numbers within the list of arguments
-     *
-     * Excel Function:
-     *        SUMIF(range, criteria, [sum_range])
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Statistical\Conditional::SUMIF()
-     *      Use the SUMIF() method in the Statistical\Conditional class instead
-     *
-     * @param mixed $range Data values
-     * @param string $criteria the criteria that defines which cells will be summed
-     * @param mixed $sumRange
-     *
-     * @return float|string
-     */
-    public static function SUMIF($range, $criteria, $sumRange = [])
-    {
-        return Statistical\Conditional::SUMIF($range, $criteria, $sumRange);
-    }
-
-    /**
-     * SUMIFS.
-     *
-     *    Totals the values of cells that contain numbers within the list of arguments
-     *
-     *    Excel Function:
-     *        SUMIFS(sum_range, criteria_range1, criteria1, [criteria_range2, criteria2], ...)
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Statistical\Conditional::SUMIFS()
-     *      Use the SUMIFS() method in the Statistical\Conditional class instead
-     *
-     * @param mixed $args Data values
-     *
-     * @return null|float|string
-     */
-    public static function SUMIFS(...$args)
-    {
-        return Statistical\Conditional::SUMIFS(...$args);
-    }
-
-    /**
-     * SUMPRODUCT.
-     *
-     * Excel Function:
-     *        SUMPRODUCT(value1[,value2[, ...]])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\Sum::product()
-     *      Use the product method in the MathTrig\Sum class instead
-     *
-     * @param mixed ...$args Data values
-     *
-     * @return float|string The result, or a string containing an error
-     */
-    public static function SUMPRODUCT(...$args)
-    {
-        return MathTrig\Sum::product(...$args);
-    }
-
-    /**
-     * SUMSQ.
-     *
-     * SUMSQ returns the sum of the squares of the arguments
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\SumSquares::sumSquare()
-     *      Use the sumSquare method in the MathTrig\SumSquares class instead
-     *
-     * Excel Function:
-     *        SUMSQ(value1[,value2[, ...]])
-     *
-     * @param mixed ...$args Data values
-     *
-     * @return float|string
-     */
-    public static function SUMSQ(...$args)
-    {
-        return MathTrig\SumSquares::sumSquare(...$args);
-    }
-
-    /**
-     * SUMX2MY2.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\SumSquares::sumXSquaredMinusYSquared()
-     *     Use the sumXSquaredMinusYSquared method in the MathTrig\SumSquares class instead
-     *
-     * @param mixed[] $matrixData1 Matrix #1
-     * @param mixed[] $matrixData2 Matrix #2
-     *
-     * @return float|string
-     */
-    public static function SUMX2MY2($matrixData1, $matrixData2)
-    {
-        return MathTrig\SumSquares::sumXSquaredMinusYSquared($matrixData1, $matrixData2);
-    }
-
-    /**
-     * SUMX2PY2.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\SumSquares::sumXSquaredPlusYSquared()
-     *     Use the sumXSquaredPlusYSquared method in the MathTrig\SumSquares class instead
-     *
-     * @param mixed[] $matrixData1 Matrix #1
-     * @param mixed[] $matrixData2 Matrix #2
-     *
-     * @return float|string
-     */
-    public static function SUMX2PY2($matrixData1, $matrixData2)
-    {
-        return MathTrig\SumSquares::sumXSquaredPlusYSquared($matrixData1, $matrixData2);
-    }
-
-    /**
-     * SUMXMY2.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\SumSquares::sumXMinusYSquared()
-     *      Use the sumXMinusYSquared method in the MathTrig\SumSquares class instead
-     *
-     * @param mixed[] $matrixData1 Matrix #1
-     * @param mixed[] $matrixData2 Matrix #2
-     *
-     * @return float|string
-     */
-    public static function SUMXMY2($matrixData1, $matrixData2)
-    {
-        return MathTrig\SumSquares::sumXMinusYSquared($matrixData1, $matrixData2);
-    }
-
-    /**
-     * TRUNC.
-     *
-     * Truncates value to the number of fractional digits by number_digits.
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see MathTrig\Trunc::evaluate()
-     *      Use the evaluate() method in the MathTrig\Trunc class instead
-     *
-     * @param float $value
-     * @param int $digits
-     *
-     * @return float|string Truncated value, or a string containing an error
-     */
-    public static function TRUNC($value = 0, $digits = 0)
-    {
-        return MathTrig\Trunc::evaluate($value, $digits);
-    }
-
-    /**
-     * SEC.
-     *
-     * Returns the secant of an angle.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\Trig\Secant::sec()
-     *      Use the sec method in the MathTrig\Trig\Secant class instead
-     *
-     * @param float $angle Number
-     *
-     * @return float|string The secant of the angle
-     */
-    public static function SEC($angle)
-    {
-        return MathTrig\Trig\Secant::sec($angle);
-    }
-
-    /**
-     * SECH.
-     *
-     * Returns the hyperbolic secant of an angle.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\Trig\Secant::sech()
-     *      Use the sech method in the MathTrig\Trig\Secant class instead
-     *
-     * @param float $angle Number
-     *
-     * @return float|string The hyperbolic secant of the angle
-     */
-    public static function SECH($angle)
-    {
-        return MathTrig\Trig\Secant::sech($angle);
-    }
-
-    /**
-     * CSC.
-     *
-     * Returns the cosecant of an angle.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\Trig\Cosecant::csc()
-     *      Use the csc method in the MathTrig\Trig\Cosecant class instead
-     *
-     * @param float $angle Number
-     *
-     * @return float|string The cosecant of the angle
-     */
-    public static function CSC($angle)
-    {
-        return MathTrig\Trig\Cosecant::csc($angle);
-    }
-
-    /**
-     * CSCH.
-     *
-     * Returns the hyperbolic cosecant of an angle.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\Trig\Cosecant::csch()
-     *      Use the csch method in the MathTrig\Trig\Cosecant class instead
-     *
-     * @param float $angle Number
-     *
-     * @return float|string The hyperbolic cosecant of the angle
-     */
-    public static function CSCH($angle)
-    {
-        return MathTrig\Trig\Cosecant::csch($angle);
-    }
-
-    /**
-     * COT.
-     *
-     * Returns the cotangent of an angle.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\Trig\Cotangent::cot()
-     *      Use the cot method in the MathTrig\Trig\Cotangent class instead
-     *
-     * @param float $angle Number
-     *
-     * @return float|string The cotangent of the angle
-     */
-    public static function COT($angle)
-    {
-        return MathTrig\Trig\Cotangent::cot($angle);
-    }
-
-    /**
-     * COTH.
-     *
-     * Returns the hyperbolic cotangent of an angle.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\Trig\Cotangent::coth()
-     *      Use the coth method in the MathTrig\Trig\Cotangent class instead
-     *
-     * @param float $angle Number
-     *
-     * @return float|string The hyperbolic cotangent of the angle
-     */
-    public static function COTH($angle)
-    {
-        return MathTrig\Trig\Cotangent::coth($angle);
-    }
-
-    /**
-     * ACOT.
-     *
-     * Returns the arccotangent of a number.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\Trig\Cotangent::acot()
-     *      Use the acot method in the MathTrig\Trig\Cotangent class instead
-     *
-     * @param float $number Number
-     *
-     * @return float|string The arccotangent of the number
-     */
-    public static function ACOT($number)
-    {
-        return MathTrig\Trig\Cotangent::acot($number);
-    }
-
-    /**
-     * Return NAN or value depending on argument.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\Helpers::numberOrNan()
-     *      Use the numberOrNan method in the MathTrig\Helpers class instead
-     *
-     * @param float $result Number
-     *
-     * @return float|string
-     */
-    public static function numberOrNan($result)
-    {
-        return MathTrig\Helpers::numberOrNan($result);
-    }
-
-    /**
-     * ACOTH.
-     *
-     * Returns the hyperbolic arccotangent of a number.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\Trig\Cotangent::acoth()
-     *      Use the acoth method in the MathTrig\Trig\Cotangent class instead
-     *
-     * @param float $number Number
-     *
-     * @return float|string The hyperbolic arccotangent of the number
-     */
-    public static function ACOTH($number)
-    {
-        return MathTrig\Trig\Cotangent::acoth($number);
-    }
-
-    /**
-     * ROUND.
-     *
-     * Returns the result of builtin function round after validating args.
-     *
-     * @Deprecated 1.17.0
-     *
-     * @See MathTrig\Round::round()
-     *      Use the round() method in the MathTrig\Round class instead
-     *
-     * @param mixed $number Should be numeric
-     * @param mixed $precision Should be int
-     *
-     * @return float|string Rounded number
-     */
-    public static function builtinROUND($number, $precision)
-    {
-        return MathTrig\Round::round($number, $precision);
-    }
-
-    /**
-     * ABS.
-     *
-     * Returns the result of builtin function abs after validating args.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\Absolute::evaluate()
-     *      Use the evaluate method in the MathTrig\Absolute class instead
-     *
-     * @param mixed $number Should be numeric
-     *
-     * @return float|int|string Rounded number
-     */
-    public static function builtinABS($number)
-    {
-        return MathTrig\Absolute::evaluate($number);
-    }
-
-    /**
-     * ACOS.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\Trig\Cosine::acos()
-     *      Use the acos method in the MathTrig\Trig\Cosine class instead
-     *
-     * Returns the result of builtin function acos after validating args.
-     *
-     * @param mixed $number Should be numeric
-     *
-     * @return float|string Rounded number
-     */
-    public static function builtinACOS($number)
-    {
-        return MathTrig\Trig\Cosine::acos($number);
-    }
-
-    /**
-     * ACOSH.
-     *
-     * Returns the result of builtin function acosh after validating args.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\Trig\Cosine::acosh()
-     *      Use the acosh method in the MathTrig\Trig\Cosine class instead
-     *
-     * @param mixed $number Should be numeric
-     *
-     * @return float|string Rounded number
-     */
-    public static function builtinACOSH($number)
-    {
-        return MathTrig\Trig\Cosine::acosh($number);
-    }
-
-    /**
-     * ASIN.
-     *
-     * Returns the result of builtin function asin after validating args.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\Trig\Sine::asin()
-     *      Use the asin method in the MathTrig\Trig\Sine class instead
-     *
-     * @param mixed $number Should be numeric
-     *
-     * @return float|string Rounded number
-     */
-    public static function builtinASIN($number)
-    {
-        return MathTrig\Trig\Sine::asin($number);
-    }
-
-    /**
-     * ASINH.
-     *
-     * Returns the result of builtin function asinh after validating args.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\Trig\Sine::asinh()
-     *      Use the asinh method in the MathTrig\Trig\Sine class instead
-     *
-     * @param mixed $number Should be numeric
-     *
-     * @return float|string Rounded number
-     */
-    public static function builtinASINH($number)
-    {
-        return MathTrig\Trig\Sine::asinh($number);
-    }
-
-    /**
-     * ATAN.
-     *
-     * Returns the result of builtin function atan after validating args.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\Trig\Tangent::atan()
-     *      Use the atan method in the MathTrig\Trig\Tangent class instead
-     *
-     * @param mixed $number Should be numeric
-     *
-     * @return float|string Rounded number
-     */
-    public static function builtinATAN($number)
-    {
-        return MathTrig\Trig\Tangent::atan($number);
-    }
-
-    /**
-     * ATANH.
-     *
-     * Returns the result of builtin function atanh after validating args.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\Trig\Tangent::atanh()
-     *      Use the atanh method in the MathTrig\Trig\Tangent class instead
-     *
-     * @param mixed $number Should be numeric
-     *
-     * @return float|string Rounded number
-     */
-    public static function builtinATANH($number)
-    {
-        return MathTrig\Trig\Tangent::atanh($number);
-    }
-
-    /**
-     * COS.
-     *
-     * Returns the result of builtin function cos after validating args.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\Trig\Cosine::cos()
-     *      Use the cos method in the MathTrig\Trig\Cosine class instead
-     *
-     * @param mixed $number Should be numeric
-     *
-     * @return float|string Rounded number
-     */
-    public static function builtinCOS($number)
-    {
-        return MathTrig\Trig\Cosine::cos($number);
-    }
-
-    /**
-     * COSH.
-     *
-     * Returns the result of builtin function cos after validating args.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\Trig\Cosine::cosh()
-     *      Use the cosh method in the MathTrig\Trig\Cosine class instead
-     *
-     * @param mixed $number Should be numeric
-     *
-     * @return float|string Rounded number
-     */
-    public static function builtinCOSH($number)
-    {
-        return MathTrig\Trig\Cosine::cosh($number);
-    }
-
-    /**
-     * DEGREES.
-     *
-     * Returns the result of builtin function rad2deg after validating args.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\Angle::toDegrees()
-     *      Use the toDegrees method in the MathTrig\Angle class instead
-     *
-     * @param mixed $number Should be numeric
-     *
-     * @return float|string Rounded number
-     */
-    public static function builtinDEGREES($number)
-    {
-        return MathTrig\Angle::toDegrees($number);
-    }
-
-    /**
-     * EXP.
-     *
-     * Returns the result of builtin function exp after validating args.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\Exp::evaluate()
-     *      Use the evaluate method in the MathTrig\Exp class instead
-     *
-     * @param mixed $number Should be numeric
-     *
-     * @return float|string Rounded number
-     */
-    public static function builtinEXP($number)
-    {
-        return MathTrig\Exp::evaluate($number);
-    }
-
-    /**
-     * LN.
-     *
-     * Returns the result of builtin function log after validating args.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\Logarithms::natural()
-     *      Use the natural method in the MathTrig\Logarithms class instead
-     *
-     * @param mixed $number Should be numeric
-     *
-     * @return float|string Rounded number
-     */
-    public static function builtinLN($number)
-    {
-        return MathTrig\Logarithms::natural($number);
-    }
-
-    /**
-     * LOG10.
-     *
-     * Returns the result of builtin function log after validating args.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\Logarithms::base10()
-     *      Use the natural method in the MathTrig\Logarithms class instead
-     *
-     * @param mixed $number Should be numeric
-     *
-     * @return float|string Rounded number
-     */
-    public static function builtinLOG10($number)
-    {
-        return MathTrig\Logarithms::base10($number);
-    }
-
-    /**
-     * RADIANS.
-     *
-     * Returns the result of builtin function deg2rad after validating args.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\Angle::toRadians()
-     *      Use the toRadians method in the MathTrig\Angle class instead
-     *
-     * @param mixed $number Should be numeric
-     *
-     * @return float|string Rounded number
-     */
-    public static function builtinRADIANS($number)
-    {
-        return MathTrig\Angle::toRadians($number);
-    }
-
-    /**
-     * SIN.
-     *
-     * Returns the result of builtin function sin after validating args.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\Trig\Sine::evaluate()
-     *      Use the sin method in the MathTrig\Trig\Sine class instead
-     *
-     * @param mixed $number Should be numeric
-     *
-     * @return float|string sine
-     */
-    public static function builtinSIN($number)
-    {
-        return MathTrig\Trig\Sine::sin($number);
-    }
-
-    /**
-     * SINH.
-     *
-     * Returns the result of builtin function sinh after validating args.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\Trig\Sine::sinh()
-     *      Use the sinh method in the MathTrig\Trig\Sine class instead
-     *
-     * @param mixed $number Should be numeric
-     *
-     * @return float|string Rounded number
-     */
-    public static function builtinSINH($number)
-    {
-        return MathTrig\Trig\Sine::sinh($number);
-    }
-
-    /**
-     * SQRT.
-     *
-     * Returns the result of builtin function sqrt after validating args.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\Sqrt::sqrt()
-     *      Use the sqrt method in the MathTrig\Sqrt class instead
-     *
-     * @param mixed $number Should be numeric
-     *
-     * @return float|string Rounded number
-     */
-    public static function builtinSQRT($number)
-    {
-        return MathTrig\Sqrt::sqrt($number);
-    }
-
-    /**
-     * TAN.
-     *
-     * Returns the result of builtin function tan after validating args.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\Trig\Tangent::tan()
-     *      Use the tan method in the MathTrig\Trig\Tangent class instead
-     *
-     * @param mixed $number Should be numeric
-     *
-     * @return float|string Rounded number
-     */
-    public static function builtinTAN($number)
-    {
-        return MathTrig\Trig\Tangent::tan($number);
-    }
-
-    /**
-     * TANH.
-     *
-     * Returns the result of builtin function sinh after validating args.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\Trig\Tangent::tanh()
-     *      Use the tanh method in the MathTrig\Trig\Tangent class instead
-     *
-     * @param mixed $number Should be numeric
-     *
-     * @return float|string Rounded number
-     */
-    public static function builtinTANH($number)
-    {
-        return MathTrig\Trig\Tangent::tanh($number);
-    }
-
-    /**
-     * Many functions accept null/false/true argument treated as 0/0/1.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @See MathTrig\Helpers::validateNumericNullBool()
-     *      Use the validateNumericNullBool method in the MathTrig\Helpers class instead
-     *
-     * @param mixed $number
-     */
-    public static function nullFalseTrueToNumber(&$number): void
-    {
-        $number = Functions::flattenSingleValue($number);
-        if ($number === null) {
-            $number = 0;
-        } elseif (is_bool($number)) {
-            $number = (int) $number;
-        }
-    }
-}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Absolute.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Absolute.php
index 9f1bd80497..03e6139912 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Absolute.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Absolute.php
@@ -2,21 +2,30 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 
 class Absolute
 {
+    use ArrayEnabled;
+
     /**
      * ABS.
      *
      * Returns the result of builtin function abs after validating args.
      *
-     * @param mixed $number Should be numeric
+     * @param mixed $number Should be numeric, or can be an array of numbers
      *
-     * @return float|int|string Rounded number
+     * @return array|float|int|string rounded number
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function evaluate($number)
+    public static function evaluate(mixed $number): array|string|int|float
     {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
         try {
             $number = Helpers::validateNumericNullBool($number);
         } catch (Exception $e) {
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Angle.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Angle.php
index 3062481f0e..e7de7aacb6 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Angle.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Angle.php
@@ -2,21 +2,30 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 
 class Angle
 {
+    use ArrayEnabled;
+
     /**
      * DEGREES.
      *
      * Returns the result of builtin function rad2deg after validating args.
      *
-     * @param mixed $number Should be numeric
+     * @param mixed $number Should be numeric, or can be an array of numbers
      *
-     * @return float|string Rounded number
+     * @return array|float|string Rounded number
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function toDegrees($number)
+    public static function toDegrees(mixed $number): array|string|float
     {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
         try {
             $number = Helpers::validateNumericNullBool($number);
         } catch (Exception $e) {
@@ -31,12 +40,18 @@ public static function toDegrees($number)
      *
      * Returns the result of builtin function deg2rad after validating args.
      *
-     * @param mixed $number Should be numeric
+     * @param mixed $number Should be numeric, or can be an array of numbers
      *
-     * @return float|string Rounded number
+     * @return array|float|string Rounded number
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function toRadians($number)
+    public static function toRadians(mixed $number): array|string|float
     {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
         try {
             $number = Helpers::validateNumericNullBool($number);
         } catch (Exception $e) {
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Arabic.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Arabic.php
index b852eeacf1..98c3e3dce6 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Arabic.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Arabic.php
@@ -2,11 +2,14 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class Arabic
 {
+    use ArrayEnabled;
+
     private const ROMAN_LOOKUP = [
         'M' => 1000,
         'D' => 500,
@@ -19,13 +22,8 @@ class Arabic
 
     /**
      * Recursively calculate the arabic value of a roman numeral.
-     *
-     * @param int $sum
-     * @param int $subtract
-     *
-     * @return int
      */
-    private static function calculateArabic(array $roman, &$sum = 0, $subtract = 0)
+    private static function calculateArabic(array $roman, int &$sum = 0, int $subtract = 0): int
     {
         $numeral = array_shift($roman);
         if (!isset(self::ROMAN_LOOKUP[$numeral])) {
@@ -47,21 +45,6 @@ private static function calculateArabic(array $roman, &$sum = 0, $subtract = 0)
         return $sum;
     }
 
-    /**
-     * @param mixed $value
-     */
-    private static function mollifyScrutinizer($value): array
-    {
-        return is_array($value) ? $value : [];
-    }
-
-    private static function strSplit(string $roman): array
-    {
-        $rslt = str_split($roman);
-
-        return self::mollifyScrutinizer($rslt);
-    }
-
     /**
      * ARABIC.
      *
@@ -70,14 +53,20 @@ private static function strSplit(string $roman): array
      * Excel Function:
      *        ARABIC(text)
      *
-     * @param string $roman
+     * @param string|string[] $roman Should be a string, or can be an array of strings
      *
-     * @return int|string the arabic numberal contrived from the roman numeral
+     * @return array|int|string the arabic numberal contrived from the roman numeral
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function evaluate($roman)
+    public static function evaluate(mixed $roman): array|int|string
     {
+        if (is_array($roman)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $roman);
+        }
+
         // An empty string should return 0
-        $roman = substr(trim(strtoupper((string) Functions::flattenSingleValue($roman))), 0, 255);
+        $roman = substr(trim(strtoupper((string) $roman)), 0, 255);
         if ($roman === '') {
             return 0;
         }
@@ -89,9 +78,9 @@ public static function evaluate($roman)
         }
 
         try {
-            $arabic = self::calculateArabic(self::strSplit($roman));
-        } catch (Exception $e) {
-            return Functions::VALUE(); // Invalid character detected
+            $arabic = self::calculateArabic(str_split($roman));
+        } catch (Exception) {
+            return ExcelError::VALUE(); // Invalid character detected
         }
 
         if ($negativeNumber) {
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Base.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Base.php
index 4be7b7c798..7eda72c39d 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Base.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Base.php
@@ -2,11 +2,14 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class Base
 {
+    use ArrayEnabled;
+
     /**
      * BASE.
      *
@@ -16,24 +19,37 @@ class Base
      *        BASE(Number, Radix [Min_length])
      *
      * @param mixed $number expect float
+     *                      Or can be an array of values
      * @param mixed $radix expect float
+     *                      Or can be an array of values
      * @param mixed $minLength expect int or null
+     *                      Or can be an array of values
      *
-     * @return string the text representation with the given radix (base)
+     * @return array|string the text representation with the given radix (base)
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function evaluate($number, $radix, $minLength = null)
+    public static function evaluate(mixed $number, mixed $radix, mixed $minLength = null): array|string
     {
+        if (is_array($number) || is_array($radix) || is_array($minLength)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number, $radix, $minLength);
+        }
+
         try {
             $number = (float) floor(Helpers::validateNumericNullBool($number));
             $radix = (int) Helpers::validateNumericNullBool($radix);
         } catch (Exception $e) {
             return $e->getMessage();
         }
-        $minLength = Functions::flattenSingleValue($minLength);
 
+        return self::calculate($number, $radix, $minLength);
+    }
+
+    private static function calculate(float $number, int $radix, mixed $minLength): string
+    {
         if ($minLength === null || is_numeric($minLength)) {
             if ($number < 0 || $number >= 2 ** 53 || $radix < 2 || $radix > 36) {
-                return Functions::NAN(); // Numeric range constraints
+                return ExcelError::NAN(); // Numeric range constraints
             }
 
             $outcome = strtoupper((string) base_convert("$number", 10, $radix));
@@ -44,6 +60,6 @@ public static function evaluate($number, $radix, $minLength = null)
             return $outcome;
         }
 
-        return Functions::VALUE();
+        return ExcelError::VALUE();
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Ceiling.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Ceiling.php
index 73f54a52f6..365ec2e983 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Ceiling.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Ceiling.php
@@ -2,11 +2,15 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class Ceiling
 {
+    use ArrayEnabled;
+
     /**
      * CEILING.
      *
@@ -18,13 +22,21 @@ class Ceiling
      * Excel Function:
      *        CEILING(number[,significance])
      *
-     * @param float $number the number you want the ceiling
-     * @param float $significance the multiple to which you want to round
+     * @param array|float $number the number you want the ceiling
+     *                      Or can be an array of values
+     * @param array|float $significance the multiple to which you want to round
+     *                      Or can be an array of values
      *
-     * @return float|string Rounded Number, or a string containing an error
+     * @return array|float|string Rounded Number, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
     public static function ceiling($number, $significance = null)
     {
+        if (is_array($number) || is_array($significance)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number, $significance);
+        }
+
         if ($significance === null) {
             self::floorCheck1Arg();
         }
@@ -48,13 +60,22 @@ public static function ceiling($number, $significance = null)
      *        CEILING.MATH(number[,significance[,mode]])
      *
      * @param mixed $number Number to round
+     *                      Or can be an array of values
      * @param mixed $significance Significance
-     * @param int $mode direction to round negative numbers
+     *                      Or can be an array of values
+     * @param array|int $mode direction to round negative numbers
+     *                      Or can be an array of values
      *
-     * @return float|string Rounded Number, or a string containing an error
+     * @return array|float|string Rounded Number, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function math($number, $significance = null, $mode = 0)
+    public static function math(mixed $number, mixed $significance = null, $mode = 0): array|string|float
     {
+        if (is_array($number) || is_array($significance) || is_array($mode)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number, $significance, $mode);
+        }
+
         try {
             $number = Helpers::validateNumericNullBool($number);
             $significance = Helpers::validateNumericNullSubstitution($significance, ($number < 0) ? -1 : 1);
@@ -82,12 +103,20 @@ public static function math($number, $significance = null, $mode = 0)
      *        CEILING.PRECISE(number[,significance])
      *
      * @param mixed $number the number you want to round
-     * @param float $significance the multiple to which you want to round
+     *                      Or can be an array of values
+     * @param array|float $significance the multiple to which you want to round
+     *                      Or can be an array of values
      *
-     * @return float|string Rounded Number, or a string containing an error
+     * @return array|float|string Rounded Number, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function precise($number, $significance = 1)
+    public static function precise(mixed $number, $significance = 1): array|string|float
     {
+        if (is_array($number) || is_array($significance)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number, $significance);
+        }
+
         try {
             $number = Helpers::validateNumericNullBool($number);
             $significance = Helpers::validateNumericNullSubstitution($significance, null);
@@ -108,15 +137,13 @@ public static function precise($number, $significance = 1)
      */
     private static function ceilingMathTest(float $significance, float $number, int $mode): bool
     {
-        return ((float) $significance < 0) || ((float) $number < 0 && !empty($mode));
+        return ($significance < 0) || ($number < 0 && !empty($mode));
     }
 
     /**
      * Avoid Scrutinizer problems concerning complexity.
-     *
-     * @return float|string
      */
-    private static function argumentsOk(float $number, float $significance)
+    private static function argumentsOk(float $number, float $significance): float|string
     {
         if (empty($number * $significance)) {
             return 0.0;
@@ -125,7 +152,7 @@ private static function argumentsOk(float $number, float $significance)
             return ceil($number / $significance) * $significance;
         }
 
-        return Functions::NAN();
+        return ExcelError::NAN();
     }
 
     private static function floorCheck1Arg(): void
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Combinations.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Combinations.php
index 97508bb1ef..99eb05a5ac 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Combinations.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Combinations.php
@@ -2,10 +2,13 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 
 class Combinations
 {
+    use ArrayEnabled;
+
     /**
      * COMBIN.
      *
@@ -15,13 +18,19 @@ class Combinations
      * Excel Function:
      *        COMBIN(numObjs,numInSet)
      *
-     * @param mixed $numObjs Number of different objects
-     * @param mixed $numInSet Number of objects in each combination
+     * @param mixed $numObjs Number of different objects, or can be an array of numbers
+     * @param mixed $numInSet Number of objects in each combination, or can be an array of numbers
      *
-     * @return float|int|string Number of combinations, or a string containing an error
+     * @return array|float|string Number of combinations, or a string containing an error
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function withoutRepetition($numObjs, $numInSet)
+    public static function withoutRepetition(mixed $numObjs, mixed $numInSet): array|string|float
     {
+        if (is_array($numObjs) || is_array($numInSet)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $numObjs, $numInSet);
+        }
+
         try {
             $numObjs = Helpers::validateNumericNullSubstitution($numObjs, null);
             $numInSet = Helpers::validateNumericNullSubstitution($numInSet, null);
@@ -31,25 +40,38 @@ public static function withoutRepetition($numObjs, $numInSet)
             return $e->getMessage();
         }
 
-        return round(Factorial::fact($numObjs) / Factorial::fact($numObjs - $numInSet)) / Factorial::fact($numInSet);
+        /** @var float */
+        $quotient = Factorial::fact($numObjs);
+        /** @var float */
+        $divisor1 = Factorial::fact($numObjs - $numInSet);
+        /** @var float */
+        $divisor2 = Factorial::fact($numInSet);
+
+        return round($quotient / ($divisor1 * $divisor2));
     }
 
     /**
-     * COMBIN.
+     * COMBINA.
      *
      * Returns the number of combinations for a given number of items. Use COMBIN to
      *        determine the total possible number of groups for a given number of items.
      *
      * Excel Function:
-     *        COMBIN(numObjs,numInSet)
+     *        COMBINA(numObjs,numInSet)
      *
-     * @param mixed $numObjs Number of different objects
-     * @param mixed $numInSet Number of objects in each combination
+     * @param mixed $numObjs Number of different objects, or can be an array of numbers
+     * @param mixed $numInSet Number of objects in each combination, or can be an array of numbers
      *
-     * @return float|int|string Number of combinations, or a string containing an error
+     * @return array|float|int|string Number of combinations, or a string containing an error
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function withRepetition($numObjs, $numInSet)
+    public static function withRepetition(mixed $numObjs, mixed $numInSet): array|int|string|float
     {
+        if (is_array($numObjs) || is_array($numInSet)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $numObjs, $numInSet);
+        }
+
         try {
             $numObjs = Helpers::validateNumericNullSubstitution($numObjs, null);
             $numInSet = Helpers::validateNumericNullSubstitution($numInSet, null);
@@ -69,6 +91,13 @@ public static function withRepetition($numObjs, $numInSet)
             return $e->getMessage();
         }
 
-        return round(Factorial::fact($numObjs + $numInSet - 1) / Factorial::fact($numObjs - 1)) / Factorial::fact($numInSet);
+        /** @var float */
+        $quotient = Factorial::fact($numObjs + $numInSet - 1);
+        /** @var float */
+        $divisor1 = Factorial::fact($numObjs - 1);
+        /** @var float */
+        $divisor2 = Factorial::fact($numInSet);
+
+        return round($quotient / ($divisor1 * $divisor2));
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Exp.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Exp.php
index ce930a83ab..ea67d5fd62 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Exp.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Exp.php
@@ -2,21 +2,30 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 
 class Exp
 {
+    use ArrayEnabled;
+
     /**
      * EXP.
      *
      * Returns the result of builtin function exp after validating args.
      *
-     * @param mixed $number Should be numeric
+     * @param mixed $number Should be numeric, or can be an array of numbers
      *
-     * @return float|string Rounded number
+     * @return array|float|string Rounded number
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function evaluate($number)
+    public static function evaluate(mixed $number): array|string|float
     {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
         try {
             $number = Helpers::validateNumericNullBool($number);
         } catch (Exception $e) {
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Factorial.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Factorial.php
index f443f8e59c..7bbd4d8be3 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Factorial.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Factorial.php
@@ -2,12 +2,16 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
 
 class Factorial
 {
+    use ArrayEnabled;
+
     /**
      * FACT.
      *
@@ -17,12 +21,18 @@ class Factorial
      * Excel Function:
      *        FACT(factVal)
      *
-     * @param float $factVal Factorial Value
+     * @param array|float $factVal Factorial Value, or can be an array of numbers
      *
-     * @return float|int|string Factorial, or a string containing an error
+     * @return array|float|int|string Factorial, or a string containing an error
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function fact($factVal)
+    public static function fact($factVal): array|string|float|int
     {
+        if (is_array($factVal)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $factVal);
+        }
+
         try {
             $factVal = Helpers::validateNumericNullBool($factVal);
             Helpers::validateNotNegative($factVal);
@@ -53,12 +63,18 @@ public static function fact($factVal)
      * Excel Function:
      *        FACTDOUBLE(factVal)
      *
-     * @param float $factVal Factorial Value
+     * @param array|float $factVal Factorial Value, or can be an array of numbers
      *
-     * @return float|int|string Double Factorial, or a string containing an error
+     * @return array|float|int|string Double Factorial, or a string containing an error
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function factDouble($factVal)
+    public static function factDouble($factVal): array|string|float|int
     {
+        if (is_array($factVal)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $factVal);
+        }
+
         try {
             $factVal = Helpers::validateNumericNullSubstitution($factVal, 0);
             Helpers::validateNotNegative($factVal);
@@ -83,9 +99,9 @@ public static function factDouble($factVal)
      *
      * @param mixed[] $args An array of mixed values for the Data Series
      *
-     * @return float|string The result, or a string containing an error
+     * @return float|int|string The result, or a string containing an error
      */
-    public static function multinomial(...$args)
+    public static function multinomial(...$args): string|int|float
     {
         $summer = 0;
         $divisor = 1;
@@ -105,6 +121,6 @@ public static function multinomial(...$args)
 
         $summer = self::fact($summer);
 
-        return $summer / $divisor;
+        return is_numeric($summer) ? ($summer / $divisor) : ExcelError::VALUE();
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Floor.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Floor.php
index 04e122058d..83cf0515a0 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Floor.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Floor.php
@@ -2,11 +2,15 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class Floor
 {
+    use ArrayEnabled;
+
     private static function floorCheck1Arg(): void
     {
         $compatibility = Functions::getCompatibilityMode();
@@ -24,12 +28,20 @@ private static function floorCheck1Arg(): void
      *        FLOOR(number[,significance])
      *
      * @param mixed $number Expect float. Number to round
+     *                      Or can be an array of values
      * @param mixed $significance Expect float. Significance
+     *                      Or can be an array of values
      *
-     * @return float|string Rounded Number, or a string containing an error
+     * @return array|float|string Rounded Number, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function floor($number, $significance = null)
+    public static function floor(mixed $number, mixed $significance = null)
     {
+        if (is_array($number) || is_array($significance)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number, $significance);
+        }
+
         if ($significance === null) {
             self::floorCheck1Arg();
         }
@@ -53,13 +65,22 @@ public static function floor($number, $significance = null)
      *        FLOOR.MATH(number[,significance[,mode]])
      *
      * @param mixed $number Number to round
+     *                      Or can be an array of values
      * @param mixed $significance Significance
+     *                      Or can be an array of values
      * @param mixed $mode direction to round negative numbers
+     *                      Or can be an array of values
      *
-     * @return float|string Rounded Number, or a string containing an error
+     * @return array|float|string Rounded Number, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function math($number, $significance = null, $mode = 0)
+    public static function math(mixed $number, mixed $significance = null, mixed $mode = 0)
     {
+        if (is_array($number) || is_array($significance) || is_array($mode)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number, $significance, $mode);
+        }
+
         try {
             $number = Helpers::validateNumericNullBool($number);
             $significance = Helpers::validateNumericNullSubstitution($significance, ($number < 0) ? -1 : 1);
@@ -79,13 +100,21 @@ public static function math($number, $significance = null, $mode = 0)
      * Excel Function:
      *        FLOOR.PRECISE(number[,significance])
      *
-     * @param float $number Number to round
-     * @param float $significance Significance
+     * @param array|float $number Number to round
+     *                      Or can be an array of values
+     * @param array|float $significance Significance
+     *                      Or can be an array of values
      *
-     * @return float|string Rounded Number, or a string containing an error
+     * @return array|float|string Rounded Number, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
     public static function precise($number, $significance = 1)
     {
+        if (is_array($number) || is_array($significance)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number, $significance);
+        }
+
         try {
             $number = Helpers::validateNumericNullBool($number);
             $significance = Helpers::validateNumericNullSubstitution($significance, null);
@@ -98,13 +127,11 @@ public static function precise($number, $significance = 1)
 
     /**
      * Avoid Scrutinizer problems concerning complexity.
-     *
-     * @return float|string
      */
-    private static function argumentsOkPrecise(float $number, float $significance)
+    private static function argumentsOkPrecise(float $number, float $significance): string|float
     {
         if ($significance == 0.0) {
-            return Functions::DIV0();
+            return ExcelError::DIV0();
         }
         if ($number == 0.0) {
             return 0.0;
@@ -118,10 +145,10 @@ private static function argumentsOkPrecise(float $number, float $significance)
      *
      * @return float|string Rounded Number, or a string containing an error
      */
-    private static function argsOk(float $number, float $significance, int $mode)
+    private static function argsOk(float $number, float $significance, int $mode): string|float
     {
         if (!$significance) {
-            return Functions::DIV0();
+            return ExcelError::DIV0();
         }
         if (!$number) {
             return 0.0;
@@ -143,13 +170,11 @@ private static function floorMathTest(float $number, float $significance, int $m
 
     /**
      * Avoid Scrutinizer problems concerning complexity.
-     *
-     * @return float|string
      */
-    private static function argumentsOk(float $number, float $significance)
+    private static function argumentsOk(float $number, float $significance): string|float
     {
         if ($significance == 0.0) {
-            return Functions::DIV0();
+            return ExcelError::DIV0();
         }
         if ($number == 0.0) {
             return 0.0;
@@ -161,6 +186,6 @@ private static function argumentsOk(float $number, float $significance)
             return floor($number / $significance) * $significance;
         }
 
-        return Functions::NAN();
+        return ExcelError::NAN();
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Gcd.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Gcd.php
index 1dd52faa75..f2aedb60b2 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Gcd.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Gcd.php
@@ -4,6 +4,7 @@
 
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class Gcd
 {
@@ -16,13 +17,8 @@ class Gcd
      *
      * Excel Function:
      *        GCD(number1[,number2[, ...]])
-     *
-     * @param float|int $a
-     * @param float|int $b
-     *
-     * @return float|int
      */
-    private static function evaluateGCD($a, $b)
+    private static function evaluateGCD(float|int $a, float|int $b): float|int
     {
         return $b ? self::evaluateGCD($b, $a % $b) : $a;
     }
@@ -41,7 +37,7 @@ private static function evaluateGCD($a, $b)
      *
      * @return float|int|string Greatest Common Divisor, or a string containing an error
      */
-    public static function evaluate(...$args)
+    public static function evaluate(mixed ...$args)
     {
         try {
             $arrayArgs = [];
@@ -57,7 +53,7 @@ public static function evaluate(...$args)
         }
 
         if (count($arrayArgs) <= 0) {
-            return Functions::VALUE();
+            return ExcelError::VALUE();
         }
         $gcd = (int) array_pop($arrayArgs);
         do {
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Helpers.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Helpers.php
index b89644a971..57e05b1910 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Helpers.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Helpers.php
@@ -4,6 +4,7 @@
 
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class Helpers
 {
@@ -12,19 +13,15 @@ class Helpers
      *
      * @return float|string quotient or DIV0 if denominator is too small
      */
-    public static function verySmallDenominator(float $numerator, float $denominator)
+    public static function verySmallDenominator(float $numerator, float $denominator): string|float
     {
-        return (abs($denominator) < 1.0E-12) ? Functions::DIV0() : ($numerator / $denominator);
+        return (abs($denominator) < 1.0E-12) ? ExcelError::DIV0() : ($numerator / $denominator);
     }
 
     /**
      * Many functions accept null/false/true argument treated as 0/0/1.
-     *
-     * @param mixed $number
-     *
-     * @return float|int
      */
-    public static function validateNumericNullBool($number)
+    public static function validateNumericNullBool(mixed $number): int|float
     {
         $number = Functions::flattenSingleValue($number);
         if ($number === null) {
@@ -37,18 +34,13 @@ public static function validateNumericNullBool($number)
             return 0 + $number;
         }
 
-        throw new Exception(Functions::VALUE());
+        throw new Exception(ExcelError::throwError($number));
     }
 
     /**
      * Validate numeric, but allow substitute for null.
-     *
-     * @param mixed $number
-     * @param null|float|int $substitute
-     *
-     * @return float|int
      */
-    public static function validateNumericNullSubstitution($number, $substitute)
+    public static function validateNumericNullSubstitution(mixed $number, null|float|int $substitute): float|int
     {
         $number = Functions::flattenSingleValue($number);
         if ($number === null && $substitute !== null) {
@@ -58,49 +50,43 @@ public static function validateNumericNullSubstitution($number, $substitute)
             return 0 + $number;
         }
 
-        throw new Exception(Functions::VALUE());
+        throw new Exception(ExcelError::throwError($number));
     }
 
     /**
      * Confirm number >= 0.
-     *
-     * @param float|int $number
      */
-    public static function validateNotNegative($number, ?string $except = null): void
+    public static function validateNotNegative(float|int $number, ?string $except = null): void
     {
         if ($number >= 0) {
             return;
         }
 
-        throw new Exception($except ?? Functions::NAN());
+        throw new Exception($except ?? ExcelError::NAN());
     }
 
     /**
      * Confirm number > 0.
-     *
-     * @param float|int $number
      */
-    public static function validatePositive($number, ?string $except = null): void
+    public static function validatePositive(float|int $number, ?string $except = null): void
     {
         if ($number > 0) {
             return;
         }
 
-        throw new Exception($except ?? Functions::NAN());
+        throw new Exception($except ?? ExcelError::NAN());
     }
 
     /**
      * Confirm number != 0.
-     *
-     * @param float|int $number
      */
-    public static function validateNotZero($number): void
+    public static function validateNotZero(float|int $number): void
     {
         if ($number) {
             return;
         }
 
-        throw new Exception(Functions::DIV0());
+        throw new Exception(ExcelError::DIV0());
     }
 
     public static function returnSign(float $number): int
@@ -117,13 +103,9 @@ public static function getEven(float $number): float
 
     /**
      * Return NAN or value depending on argument.
-     *
-     * @param float $result Number
-     *
-     * @return float|string
      */
-    public static function numberOrNan($result)
+    public static function numberOrNan(float $result): float|string
     {
-        return is_nan($result) ? Functions::NAN() : $result;
+        return is_nan($result) ? ExcelError::NAN() : $result;
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/IntClass.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/IntClass.php
index 7aa3d06ae2..76bbced8d5 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/IntClass.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/IntClass.php
@@ -2,10 +2,13 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 
 class IntClass
 {
+    use ArrayEnabled;
+
     /**
      * INT.
      *
@@ -14,12 +17,18 @@ class IntClass
      * Excel Function:
      *        INT(number)
      *
-     * @param float $number Number to cast to an integer
+     * @param array|float $number Number to cast to an integer, or can be an array of numbers
      *
-     * @return int|string Integer value, or a string containing an error
+     * @return array|int|string Integer value, or a string containing an error
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function evaluate($number)
+    public static function evaluate($number): array|string|int
     {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
         try {
             $number = Helpers::validateNumericNullBool($number);
         } catch (Exception $e) {
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Lcm.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Lcm.php
index 46e9816dc6..979b6df2dd 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Lcm.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Lcm.php
@@ -4,6 +4,7 @@
 
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class Lcm
 {
@@ -48,7 +49,7 @@ private static function factors(float $value): array
      *
      * @return int|string Lowest Common Multiplier, or a string containing an error
      */
-    public static function evaluate(...$args)
+    public static function evaluate(mixed ...$args): int|string
     {
         try {
             $arrayArgs = [];
@@ -104,7 +105,7 @@ private static function processPoweredFactors(array &$allPoweredFactors, array &
     private static function testNonNulls(int $anyNonNulls): void
     {
         if (!$anyNonNulls) {
-            throw new Exception(Functions::VALUE());
+            throw new Exception(ExcelError::VALUE());
         }
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Logarithms.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Logarithms.php
index d6878d88c9..3de0a2bb62 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Logarithms.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Logarithms.php
@@ -2,10 +2,13 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 
 class Logarithms
 {
+    use ArrayEnabled;
+
     /**
      * LOG_BASE.
      *
@@ -15,12 +18,20 @@ class Logarithms
      *        LOG(number[,base])
      *
      * @param mixed $number The positive real number for which you want the logarithm
+     *                      Or can be an array of values
      * @param mixed $base The base of the logarithm. If base is omitted, it is assumed to be 10.
+     *                      Or can be an array of values
      *
-     * @return float|string The result, or a string containing an error
+     * @return array|float|string The result, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function withBase($number, $base = 10)
+    public static function withBase(mixed $number, mixed $base = 10): array|string|float
     {
+        if (is_array($number) || is_array($base)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number, $base);
+        }
+
         try {
             $number = Helpers::validateNumericNullBool($number);
             Helpers::validatePositive($number);
@@ -39,11 +50,18 @@ public static function withBase($number, $base = 10)
      * Returns the result of builtin function log after validating args.
      *
      * @param mixed $number Should be numeric
+     *                      Or can be an array of values
      *
-     * @return float|string Rounded number
+     * @return array|float|string Rounded number
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function base10($number)
+    public static function base10(mixed $number): array|string|float
     {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
         try {
             $number = Helpers::validateNumericNullBool($number);
             Helpers::validatePositive($number);
@@ -60,11 +78,18 @@ public static function base10($number)
      * Returns the result of builtin function log after validating args.
      *
      * @param mixed $number Should be numeric
+     *                      Or can be an array of values
      *
-     * @return float|string Rounded number
+     * @return array|float|string Rounded number
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function natural($number)
+    public static function natural(mixed $number): array|string|float
     {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
         try {
             $number = Helpers::validateNumericNullBool($number);
             Helpers::validatePositive($number);
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/MatrixFunctions.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/MatrixFunctions.php
index 1e3224ea4a..fad01086ac 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/MatrixFunctions.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/MatrixFunctions.php
@@ -3,19 +3,20 @@
 namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
 
 use Matrix\Builder;
+use Matrix\Div0Exception as MatrixDiv0Exception;
 use Matrix\Exception as MatrixException;
 use Matrix\Matrix;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class MatrixFunctions
 {
     /**
-     * Convert parameter to matrix.
+     * Convert parameter to Matrix.
      *
      * @param mixed $matrixValues A matrix of values
      */
-    private static function getMatrix($matrixValues): Matrix
+    private static function getMatrix(mixed $matrixValues): Matrix
     {
         $matrixData = [];
         if (!is_array($matrixValues)) {
@@ -30,7 +31,7 @@ private static function getMatrix($matrixValues): Matrix
             $column = 0;
             foreach ($matrixRow as $matrixCell) {
                 if ((is_string($matrixCell)) || ($matrixCell === null)) {
-                    throw new Exception(Functions::VALUE());
+                    throw new Exception(ExcelError::VALUE());
                 }
                 $matrixData[$row][$column] = $matrixCell;
                 ++$column;
@@ -41,6 +42,47 @@ private static function getMatrix($matrixValues): Matrix
         return new Matrix($matrixData);
     }
 
+    /**
+     * SEQUENCE.
+     *
+     * Generates a list of sequential numbers in an array.
+     *
+     * Excel Function:
+     *      SEQUENCE(rows,[columns],[start],[step])
+     *
+     * @param mixed $rows the number of rows to return, defaults to 1
+     * @param mixed $columns the number of columns to return, defaults to 1
+     * @param mixed $start the first number in the sequence, defaults to 1
+     * @param mixed $step the amount to increment each subsequent value in the array, defaults to 1
+     *
+     * @return array|string The resulting array, or a string containing an error
+     */
+    public static function sequence(mixed $rows = 1, mixed $columns = 1, mixed $start = 1, mixed $step = 1): string|array
+    {
+        try {
+            $rows = (int) Helpers::validateNumericNullSubstitution($rows, 1);
+            Helpers::validatePositive($rows);
+            $columns = (int) Helpers::validateNumericNullSubstitution($columns, 1);
+            Helpers::validatePositive($columns);
+            $start = Helpers::validateNumericNullSubstitution($start, 1);
+            $step = Helpers::validateNumericNullSubstitution($step, 1);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        if ($step === 0) {
+            return array_chunk(
+                array_fill(0, $rows * $columns, $start),
+                max($columns, 1)
+            );
+        }
+
+        return array_chunk(
+            range($start, $start + (($rows * $columns - 1) * $step), $step),
+            max($columns, 1)
+        );
+    }
+
     /**
      * MDETERM.
      *
@@ -53,14 +95,14 @@ private static function getMatrix($matrixValues): Matrix
      *
      * @return float|string The result, or a string containing an error
      */
-    public static function determinant($matrixValues)
+    public static function determinant(mixed $matrixValues)
     {
         try {
             $matrix = self::getMatrix($matrixValues);
 
             return $matrix->determinant();
-        } catch (MatrixException $ex) {
-            return Functions::VALUE();
+        } catch (MatrixException) {
+            return ExcelError::VALUE();
         } catch (Exception $e) {
             return $e->getMessage();
         }
@@ -78,14 +120,16 @@ public static function determinant($matrixValues)
      *
      * @return array|string The result, or a string containing an error
      */
-    public static function inverse($matrixValues)
+    public static function inverse(mixed $matrixValues): array|string
     {
         try {
             $matrix = self::getMatrix($matrixValues);
 
             return $matrix->inverse()->toArray();
-        } catch (MatrixException $e) {
-            return (strpos($e->getMessage(), 'determinant') === false) ? Functions::VALUE() : Functions::NAN();
+        } catch (MatrixDiv0Exception) {
+            return ExcelError::NAN();
+        } catch (MatrixException) {
+            return ExcelError::VALUE();
         } catch (Exception $e) {
             return $e->getMessage();
         }
@@ -99,15 +143,15 @@ public static function inverse($matrixValues)
      *
      * @return array|string The result, or a string containing an error
      */
-    public static function multiply($matrixData1, $matrixData2)
+    public static function multiply(mixed $matrixData1, mixed $matrixData2): array|string
     {
         try {
             $matrixA = self::getMatrix($matrixData1);
             $matrixB = self::getMatrix($matrixData2);
 
             return $matrixA->multiply($matrixB)->toArray();
-        } catch (MatrixException $ex) {
-            return Functions::VALUE();
+        } catch (MatrixException) {
+            return ExcelError::VALUE();
         } catch (Exception $e) {
             return $e->getMessage();
         }
@@ -120,15 +164,12 @@ public static function multiply($matrixData1, $matrixData2)
      *
      * @return array|string The result, or a string containing an error
      */
-    public static function identity($dimension)
+    public static function identity(mixed $dimension)
     {
         try {
             $dimension = (int) Helpers::validateNumericNullBool($dimension);
-            Helpers::validatePositive($dimension, Functions::VALUE());
-            $matrix = Builder::createFilledMatrix(0, $dimension)->toArray();
-            for ($x = 0; $x < $dimension; ++$x) {
-                $matrix[$x][$x] = 1;
-            }
+            Helpers::validatePositive($dimension, ExcelError::VALUE());
+            $matrix = Builder::createIdentityMatrix($dimension, 0)->toArray();
 
             return $matrix;
         } catch (Exception $e) {
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Operations.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Operations.php
index 595c7fdcce..0eca549b96 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Operations.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Operations.php
@@ -2,21 +2,33 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class Operations
 {
+    use ArrayEnabled;
+
     /**
      * MOD.
      *
      * @param mixed $dividend Dividend
+     *                      Or can be an array of values
      * @param mixed $divisor Divisor
+     *                      Or can be an array of values
      *
-     * @return float|int|string Remainder, or a string containing an error
+     * @return array|float|string Remainder, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function mod($dividend, $divisor)
+    public static function mod(mixed $dividend, mixed $divisor): array|string|float
     {
+        if (is_array($dividend) || is_array($divisor)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $dividend, $divisor);
+        }
+
         try {
             $dividend = Helpers::validateNumericNullBool($dividend);
             $divisor = Helpers::validateNumericNullBool($divisor);
@@ -40,13 +52,19 @@ public static function mod($dividend, $divisor)
      *
      * Computes x raised to the power y.
      *
-     * @param float|int $x
-     * @param float|int $y
+     * @param null|array|bool|float|int|string $x Or can be an array of values
+     * @param null|array|bool|float|int|string $y Or can be an array of values
      *
-     * @return float|int|string The result, or a string containing an error
+     * @return array|float|int|string The result, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function power($x, $y)
+    public static function power(null|array|bool|float|int|string $x, null|array|bool|float|int|string $y): array|float|int|string
     {
+        if (is_array($x) || is_array($y)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $x, $y);
+        }
+
         try {
             $x = Helpers::validateNumericNullBool($x);
             $y = Helpers::validateNumericNullBool($y);
@@ -56,10 +74,10 @@ public static function power($x, $y)
 
         // Validate parameters
         if (!$x && !$y) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
         if (!$x && $y < 0.0) {
-            return Functions::DIV0();
+            return ExcelError::DIV0();
         }
 
         // Return
@@ -77,34 +95,28 @@ public static function power($x, $y)
      *        PRODUCT(value1[,value2[, ...]])
      *
      * @param mixed ...$args Data values
-     *
-     * @return float|string
      */
-    public static function product(...$args)
+    public static function product(mixed ...$args): string|float
     {
+        $args = array_filter(
+            Functions::flattenArray($args),
+            fn ($value): bool => $value !== null
+        );
+
         // Return value
-        $returnValue = null;
+        $returnValue = (count($args) === 0) ? 0.0 : 1.0;
 
         // Loop through arguments
-        foreach (Functions::flattenArray($args) as $arg) {
+        foreach ($args as $arg) {
             // Is it a numeric value?
             if (is_numeric($arg)) {
-                if ($returnValue === null) {
-                    $returnValue = $arg;
-                } else {
-                    $returnValue *= $arg;
-                }
+                $returnValue *= $arg;
             } else {
-                return Functions::VALUE();
+                return ExcelError::throwError($arg);
             }
         }
 
-        // Return
-        if ($returnValue === null) {
-            return 0;
-        }
-
-        return $returnValue;
+        return (float) $returnValue;
     }
 
     /**
@@ -117,12 +129,19 @@ public static function product(...$args)
      *        QUOTIENT(value1,value2)
      *
      * @param mixed $numerator Expect float|int
+     *                      Or can be an array of values
      * @param mixed $denominator Expect float|int
+     *                      Or can be an array of values
      *
-     * @return int|string
+     * @return array|int|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function quotient($numerator, $denominator)
+    public static function quotient(mixed $numerator, mixed $denominator): array|string|int
     {
+        if (is_array($numerator) || is_array($denominator)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $numerator, $denominator);
+        }
+
         try {
             $numerator = Helpers::validateNumericNullSubstitution($numerator, 0);
             $denominator = Helpers::validateNumericNullSubstitution($denominator, 0);
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Random.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Random.php
index 963a789ac5..5d3516777a 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Random.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Random.php
@@ -2,30 +2,42 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class Random
 {
+    use ArrayEnabled;
+
     /**
      * RAND.
      *
-     * @return float Random number
+     * @return float|int Random number
      */
-    public static function rand()
+    public static function rand(): int|float
     {
-        return (mt_rand(0, 10000000)) / 10000000;
+        return mt_rand(0, 10000000) / 10000000;
     }
 
     /**
      * RANDBETWEEN.
      *
      * @param mixed $min Minimal value
+     *                      Or can be an array of values
      * @param mixed $max Maximal value
+     *                      Or can be an array of values
      *
-     * @return float|int|string Random number
+     * @return array|int|string Random number
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function randBetween($min, $max)
+    public static function randBetween(mixed $min, mixed $max): array|string|int
     {
+        if (is_array($min) || is_array($max)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $min, $max);
+        }
+
         try {
             $min = (int) Helpers::validateNumericNullBool($min);
             $max = (int) Helpers::validateNumericNullBool($max);
@@ -36,4 +48,52 @@ public static function randBetween($min, $max)
 
         return mt_rand($min, $max);
     }
+
+    /**
+     * RANDARRAY.
+     *
+     * Generates a list of sequential numbers in an array.
+     *
+     * Excel Function:
+     *      RANDARRAY([rows],[columns],[start],[step])
+     *
+     * @param mixed $rows the number of rows to return, defaults to 1
+     * @param mixed $columns the number of columns to return, defaults to 1
+     * @param mixed $min the minimum number to be returned, defaults to 0
+     * @param mixed $max the maximum number to be returned, defaults to 1
+     * @param bool $wholeNumber the type of numbers to return:
+     *                             False - Decimal numbers to 15 decimal places. (default)
+     *                             True - Whole (integer) numbers
+     *
+     * @return array|string The resulting array, or a string containing an error
+     */
+    public static function randArray(mixed $rows = 1, mixed $columns = 1, mixed $min = 0, mixed $max = 1, bool $wholeNumber = false): string|array
+    {
+        try {
+            $rows = (int) Helpers::validateNumericNullSubstitution($rows, 1);
+            Helpers::validatePositive($rows);
+            $columns = (int) Helpers::validateNumericNullSubstitution($columns, 1);
+            Helpers::validatePositive($columns);
+            $min = Helpers::validateNumericNullSubstitution($min, 1);
+            $max = Helpers::validateNumericNullSubstitution($max, 1);
+
+            if ($max <= $min) {
+                return ExcelError::VALUE();
+            }
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+
+        return array_chunk(
+            array_map(
+                function () use ($min, $max, $wholeNumber): int|float {
+                    return $wholeNumber
+                        ? mt_rand((int) $min, (int) $max)
+                        : (mt_rand() / mt_getrandmax()) * ($max - $min) + $min;
+                },
+                array_fill(0, $rows * $columns, $min)
+            ),
+            max($columns, 1)
+        );
+    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Roman.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Roman.php
index 71a6df3ad7..7c6f8e7800 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Roman.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Roman.php
@@ -2,11 +2,14 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class Roman
 {
+    use ArrayEnabled;
+
     private const VALUES = [
         45 => ['VL'],
         46 => ['VLI'],
@@ -800,12 +803,12 @@ private static function valueOk(int $aValue, int $style): string
 
     private static function styleOk(int $aValue, int $style): string
     {
-        return ($aValue < 0 || $aValue > self::MAX_ROMAN_VALUE) ? Functions::VALUE() : self::valueOk($aValue, $style);
+        return ($aValue < 0 || $aValue > self::MAX_ROMAN_VALUE) ? ExcelError::VALUE() : self::valueOk($aValue, $style);
     }
 
     public static function calculateRoman(int $aValue, int $style): string
     {
-        return ($style < 0 || $style > self::MAX_ROMAN_STYLE) ? Functions::VALUE() : self::styleOk($aValue, $style);
+        return ($style < 0 || $style > self::MAX_ROMAN_STYLE) ? ExcelError::VALUE() : self::styleOk($aValue, $style);
     }
 
     /**
@@ -814,12 +817,20 @@ public static function calculateRoman(int $aValue, int $style): string
      * Converts a number to Roman numeral
      *
      * @param mixed $aValue Number to convert
+     *                      Or can be an array of numbers
      * @param mixed $style Number indicating one of five possible forms
+     *                      Or can be an array of styles
      *
-     * @return string Roman numeral, or a string containing an error
+     * @return array|string Roman numeral, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function evaluate($aValue, $style = 0)
+    public static function evaluate(mixed $aValue, mixed $style = 0): array|string
     {
+        if (is_array($aValue) || is_array($style)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $aValue, $style);
+        }
+
         try {
             $aValue = Helpers::validateNumericNullBool($aValue);
             if (is_bool($style)) {
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Round.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Round.php
index 2ddde90008..d2aa1c0b13 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Round.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Round.php
@@ -2,23 +2,32 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class Round
 {
+    use ArrayEnabled;
+
     /**
      * ROUND.
      *
      * Returns the result of builtin function round after validating args.
      *
-     * @param mixed $number Should be numeric
-     * @param mixed $precision Should be int
+     * @param mixed $number Should be numeric, or can be an array of numbers
+     * @param mixed $precision Should be int, or can be an array of numbers
      *
-     * @return float|string Rounded number
+     * @return array|float|string Rounded number
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function round($number, $precision)
+    public static function round(mixed $number, mixed $precision): array|string|float
     {
+        if (is_array($number) || is_array($precision)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number, $precision);
+        }
+
         try {
             $number = Helpers::validateNumericNullBool($number);
             $precision = Helpers::validateNumericNullBool($precision);
@@ -34,13 +43,19 @@ public static function round($number, $precision)
      *
      * Rounds a number up to a specified number of decimal places
      *
-     * @param float $number Number to round
-     * @param int $digits Number of digits to which you want to round $number
+     * @param array|float $number Number to round, or can be an array of numbers
+     * @param array|int $digits Number of digits to which you want to round $number, or can be an array of numbers
      *
-     * @return float|string Rounded Number, or a string containing an error
+     * @return array|float|string Rounded Number, or a string containing an error
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function up($number, $digits)
+    public static function up($number, $digits): array|string|float
     {
+        if (is_array($number) || is_array($digits)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number, $digits);
+        }
+
         try {
             $number = Helpers::validateNumericNullBool($number);
             $digits = (int) Helpers::validateNumericNullSubstitution($digits, null);
@@ -52,11 +67,22 @@ public static function up($number, $digits)
             return 0.0;
         }
 
+        $digitsPlus1 = $digits + 1;
         if ($number < 0.0) {
-            return round($number - 0.5 * 0.1 ** $digits, $digits, PHP_ROUND_HALF_DOWN);
+            if ($digitsPlus1 < 0) {
+                return round($number - 0.5 * 0.1 ** $digits, $digits, PHP_ROUND_HALF_DOWN);
+            }
+            $result = sprintf("%.{$digitsPlus1}F", $number - 0.5 * 0.1 ** $digits);
+
+            return round((float) $result, $digits, PHP_ROUND_HALF_DOWN);
+        }
+
+        if ($digitsPlus1 < 0) {
+            return round($number + 0.5 * 0.1 ** $digits, $digits, PHP_ROUND_HALF_DOWN);
         }
+        $result = sprintf("%.{$digitsPlus1}F", $number + 0.5 * 0.1 ** $digits);
 
-        return round($number + 0.5 * 0.1 ** $digits, $digits, PHP_ROUND_HALF_DOWN);
+        return round((float) $result, $digits, PHP_ROUND_HALF_DOWN);
     }
 
     /**
@@ -64,13 +90,19 @@ public static function up($number, $digits)
      *
      * Rounds a number down to a specified number of decimal places
      *
-     * @param float $number Number to round
-     * @param int $digits Number of digits to which you want to round $number
+     * @param array|float $number Number to round, or can be an array of numbers
+     * @param array|int $digits Number of digits to which you want to round $number, or can be an array of numbers
      *
-     * @return float|string Rounded Number, or a string containing an error
+     * @return array|float|string Rounded Number, or a string containing an error
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function down($number, $digits)
+    public static function down($number, $digits): array|string|float
     {
+        if (is_array($number) || is_array($digits)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number, $digits);
+        }
+
         try {
             $number = Helpers::validateNumericNullBool($number);
             $digits = (int) Helpers::validateNumericNullSubstitution($digits, null);
@@ -82,11 +114,23 @@ public static function down($number, $digits)
             return 0.0;
         }
 
+        $digitsPlus1 = $digits + 1;
         if ($number < 0.0) {
-            return round($number + 0.5 * 0.1 ** $digits, $digits, PHP_ROUND_HALF_UP);
+            if ($digitsPlus1 < 0) {
+                return round($number + 0.5 * 0.1 ** $digits, $digits, PHP_ROUND_HALF_UP);
+            }
+            $result = sprintf("%.{$digitsPlus1}F", $number + 0.5 * 0.1 ** $digits);
+
+            return round((float) $result, $digits, PHP_ROUND_HALF_UP);
+        }
+
+        if ($digitsPlus1 < 0) {
+            return round($number - 0.5 * 0.1 ** $digits, $digits, PHP_ROUND_HALF_UP);
         }
 
-        return round($number - 0.5 * 0.1 ** $digits, $digits, PHP_ROUND_HALF_UP);
+        $result = sprintf("%.{$digitsPlus1}F", $number - 0.5 * 0.1 ** $digits);
+
+        return round((float) $result, $digits, PHP_ROUND_HALF_UP);
     }
 
     /**
@@ -94,13 +138,19 @@ public static function down($number, $digits)
      *
      * Rounds a number to the nearest multiple of a specified value
      *
-     * @param mixed $number Expect float. Number to round.
-     * @param mixed $multiple Expect int. Multiple to which you want to round.
+     * @param mixed $number Expect float. Number to round, or can be an array of numbers
+     * @param mixed $multiple Expect int. Multiple to which you want to round, or can be an array of numbers.
      *
-     * @return float|string Rounded Number, or a string containing an error
+     * @return array|float|int|string Rounded Number, or a string containing an error
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function multiple($number, $multiple)
+    public static function multiple(mixed $number, mixed $multiple): array|string|int|float
     {
+        if (is_array($number) || is_array($multiple)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $number, $multiple);
+        }
+
         try {
             $number = Helpers::validateNumericNullSubstitution($number, 0);
             $multiple = Helpers::validateNumericNullSubstitution($multiple, null);
@@ -117,7 +167,7 @@ public static function multiple($number, $multiple)
             return round($number * $multiplier) / $multiplier;
         }
 
-        return Functions::NAN();
+        return ExcelError::NAN();
     }
 
     /**
@@ -132,12 +182,18 @@ public static function multiple($number, $multiple)
      * Excel Function:
      *        EVEN(number)
      *
-     * @param float $number Number to round
+     * @param array|float $number Number to round, or can be an array of numbers
      *
-     * @return float|string Rounded Number, or a string containing an error
+     * @return array|float|string Rounded Number, or a string containing an error
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function even($number)
+    public static function even($number): array|string|float
     {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
         try {
             $number = Helpers::validateNumericNullBool($number);
         } catch (Exception $e) {
@@ -152,12 +208,18 @@ public static function even($number)
      *
      * Returns number rounded up to the nearest odd integer.
      *
-     * @param float $number Number to round
+     * @param array|float $number Number to round, or can be an array of numbers
      *
-     * @return float|string Rounded Number, or a string containing an error
+     * @return array|float|int|string Rounded Number, or a string containing an error
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function odd($number)
+    public static function odd($number): array|string|int|float
     {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
         try {
             $number = Helpers::validateNumericNullBool($number);
         } catch (Exception $e) {
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/SeriesSum.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/SeriesSum.php
index 2ada9df4ea..bb10090124 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/SeriesSum.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/SeriesSum.php
@@ -2,11 +2,14 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 
 class SeriesSum
 {
+    use ArrayEnabled;
+
     /**
      * SERIESSUM.
      *
@@ -17,10 +20,14 @@ class SeriesSum
      * @param mixed $m Step
      * @param mixed[] $args An array of coefficients for the Data Series
      *
-     * @return float|string The result, or a string containing an error
+     * @return array|float|int|string The result, or a string containing an error
      */
-    public static function evaluate($x, $n, $m, ...$args)
+    public static function evaluate(mixed $x, mixed $n, mixed $m, ...$args): array|string|float|int
     {
+        if (is_array($x) || is_array($n) || is_array($m)) {
+            return self::evaluateArrayArgumentsSubset([self::class, __FUNCTION__], 3, $x, $n, $m, ...$args);
+        }
+
         try {
             $x = Helpers::validateNumericNullSubstitution($x, 0);
             $n = Helpers::validateNumericNullSubstitution($n, 0);
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Sign.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Sign.php
index a48cf0f9bb..86a55092c7 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Sign.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Sign.php
@@ -2,22 +2,31 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 
 class Sign
 {
+    use ArrayEnabled;
+
     /**
      * SIGN.
      *
      * Determines the sign of a number. Returns 1 if the number is positive, zero (0)
      *        if the number is 0, and -1 if the number is negative.
      *
-     * @param float $number Number to round
+     * @param array|float $number Number to round, or can be an array of numbers
      *
-     * @return int|string sign value, or a string containing an error
+     * @return array|int|string sign value, or a string containing an error
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function evaluate($number)
+    public static function evaluate($number): array|string|int
     {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
         try {
             $number = Helpers::validateNumericNullBool($number);
         } catch (Exception $e) {
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Sqrt.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Sqrt.php
index 8ead578e32..18289f7bd6 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Sqrt.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Sqrt.php
@@ -2,21 +2,30 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 
 class Sqrt
 {
+    use ArrayEnabled;
+
     /**
      * SQRT.
      *
      * Returns the result of builtin function sqrt after validating args.
      *
-     * @param mixed $number Should be numeric
+     * @param mixed $number Should be numeric, or can be an array of numbers
      *
-     * @return float|string square roor
+     * @return array|float|string square root
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function sqrt($number)
+    public static function sqrt(mixed $number)
     {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
         try {
             $number = Helpers::validateNumericNullBool($number);
         } catch (Exception $e) {
@@ -31,12 +40,18 @@ public static function sqrt($number)
      *
      * Returns the square root of (number * pi).
      *
-     * @param float $number Number
+     * @param array|float $number Number, or can be an array of numbers
      *
-     * @return float|string Square Root of Number * Pi, or a string containing an error
+     * @return array|float|string Square Root of Number * Pi, or a string containing an error
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function pi($number)
+    public static function pi($number): array|string|float
     {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
         try {
             $number = Helpers::validateNumericNullSubstitution($number, 0);
             Helpers::validateNotNegative($number);
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Subtotal.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Subtotal.php
index 2edb86f7e7..cfced9e43f 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Subtotal.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Subtotal.php
@@ -4,20 +4,21 @@
 
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
 
 class Subtotal
 {
-    /**
-     * @param mixed $cellReference
-     * @param mixed $args
-     */
-    protected static function filterHiddenArgs($cellReference, $args): array
+    protected static function filterHiddenArgs(mixed $cellReference, mixed $args): array
     {
         return array_filter(
             $args,
             function ($index) use ($cellReference) {
-                [, $row, ] = explode('.', $index);
+                $explodeArray = explode('.', $index);
+                $row = $explodeArray[1] ?? '';
+                if (!is_numeric($row)) {
+                    return true;
+                }
 
                 return $cellReference->getWorksheet()->getRowDimension($row)->getVisible();
             },
@@ -25,21 +26,22 @@ function ($index) use ($cellReference) {
         );
     }
 
-    /**
-     * @param mixed $cellReference
-     * @param mixed $args
-     */
-    protected static function filterFormulaArgs($cellReference, $args): array
+    protected static function filterFormulaArgs(mixed $cellReference, mixed $args): array
     {
         return array_filter(
             $args,
-            function ($index) use ($cellReference) {
-                [, $row, $column] = explode('.', $index);
+            function ($index) use ($cellReference): bool {
+                $explodeArray = explode('.', $index);
+                $row = $explodeArray[1] ?? '';
+                $column = $explodeArray[2] ?? '';
                 $retVal = true;
                 if ($cellReference->getWorksheet()->cellExists($column . $row)) {
                     //take this cell out if it contains the SUBTOTAL or AGGREGATE functions in a formula
                     $isFormula = $cellReference->getWorksheet()->getCell($column . $row)->isFormula();
-                    $cellFormula = !preg_match('/^=.*\b(SUBTOTAL|AGGREGATE)\s*\(/i', $cellReference->getWorksheet()->getCell($column . $row)->getValue());
+                    $cellFormula = !preg_match(
+                        '/^=.*\b(SUBTOTAL|AGGREGATE)\s*\(/i',
+                        $cellReference->getWorksheet()->getCell($column . $row)->getValue() ?? ''
+                    );
 
                     $retVal = !$isFormula || $cellFormula;
                 }
@@ -50,19 +52,21 @@ function ($index) use ($cellReference) {
         );
     }
 
-    /** @var callable[] */
+    /**
+     * @var array<int, callable>
+     */
     private const CALL_FUNCTIONS = [
-        1 => [Statistical\Averages::class, 'average'],
-        [Statistical\Counts::class, 'COUNT'], // 2
-        [Statistical\Counts::class, 'COUNTA'], // 3
-        [Statistical\Maximum::class, 'max'], // 4
-        [Statistical\Minimum::class, 'min'], // 5
-        [Operations::class, 'product'], // 6
-        [Statistical\StandardDeviations::class, 'STDEV'], // 7
-        [Statistical\StandardDeviations::class, 'STDEVP'], // 8
-        [Sum::class, 'sumIgnoringStrings'], // 9
-        [Statistical\Variances::class, 'VAR'], // 10
-        [Statistical\Variances::class, 'VARP'], // 11
+        1 => [Statistical\Averages::class, 'average'], // 1 and 101
+        [Statistical\Counts::class, 'COUNT'], // 2 and 102
+        [Statistical\Counts::class, 'COUNTA'], // 3 and 103
+        [Statistical\Maximum::class, 'max'], // 4 and 104
+        [Statistical\Minimum::class, 'min'], // 5 and 105
+        [Operations::class, 'product'], // 6 and 106
+        [Statistical\StandardDeviations::class, 'STDEV'], // 7 and 107
+        [Statistical\StandardDeviations::class, 'STDEVP'], // 8 and 108
+        [Sum::class, 'sumIgnoringStrings'], // 9 and 109
+        [Statistical\Variances::class, 'VAR'], // 10 and 110
+        [Statistical\Variances::class, 'VARP'], // 111 and 111
     ];
 
     /**
@@ -78,13 +82,26 @@ function ($index) use ($cellReference) {
      *                    but ignore any values in the range that are
      *                    in hidden rows
      * @param mixed[] $args A mixed data series of values
-     *
-     * @return float|string
      */
-    public static function evaluate($functionType, ...$args)
+    public static function evaluate(mixed $functionType, ...$args): float|int|string
     {
         $cellReference = array_pop($args);
-        $aArgs = Functions::flattenArrayIndexed($args);
+        $bArgs = Functions::flattenArrayIndexed($args);
+        $aArgs = [];
+        // int keys must come before string keys for PHP 8.0+
+        // Otherwise, PHP thinks positional args follow keyword
+        //    in the subsequent call to call_user_func_array.
+        // Fortunately, order of args is unimportant to Subtotal.
+        foreach ($bArgs as $key => $value) {
+            if (is_int($key)) {
+                $aArgs[$key] = $value;
+            }
+        }
+        foreach ($bArgs as $key => $value) {
+            if (!is_int($key)) {
+                $aArgs[$key] = $value;
+            }
+        }
 
         try {
             $subtotal = (int) Helpers::validateNumericNullBool($functionType);
@@ -100,12 +117,11 @@ public static function evaluate($functionType, ...$args)
 
         $aArgs = self::filterFormulaArgs($cellReference, $aArgs);
         if (array_key_exists($subtotal, self::CALL_FUNCTIONS)) {
-            /** @var callable */
             $call = self::CALL_FUNCTIONS[$subtotal];
 
             return call_user_func_array($call, $aArgs);
         }
 
-        return Functions::VALUE();
+        return ExcelError::VALUE();
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Sum.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Sum.php
index 741734d90a..f939d9e747 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Sum.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Sum.php
@@ -3,6 +3,8 @@
 namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ErrorValue;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class Sum
 {
@@ -15,10 +17,8 @@ class Sum
      *        SUM(value1[,value2[, ...]])
      *
      * @param mixed ...$args Data values
-     *
-     * @return float|string
      */
-    public static function sumIgnoringStrings(...$args)
+    public static function sumIgnoringStrings(mixed ...$args): float|int|string
     {
         $returnValue = 0;
 
@@ -27,7 +27,7 @@ public static function sumIgnoringStrings(...$args)
             // Is it a numeric value?
             if (is_numeric($arg)) {
                 $returnValue += $arg;
-            } elseif (Functions::isError($arg)) {
+            } elseif (ErrorValue::isError($arg)) {
                 return $arg;
             }
         }
@@ -44,28 +44,23 @@ public static function sumIgnoringStrings(...$args)
      *        SUM(value1[,value2[, ...]])
      *
      * @param mixed ...$args Data values
-     *
-     * @return float|string
      */
-    public static function sumErroringStrings(...$args)
+    public static function sumErroringStrings(mixed ...$args): float|int|string|array
     {
         $returnValue = 0;
         // Loop through the arguments
         $aArgs = Functions::flattenArrayIndexed($args);
         foreach ($aArgs as $k => $arg) {
             // Is it a numeric value?
-            if (is_numeric($arg) || empty($arg)) {
-                if (is_string($arg)) {
-                    $arg = (int) $arg;
-                }
+            if (is_numeric($arg)) {
                 $returnValue += $arg;
             } elseif (is_bool($arg)) {
                 $returnValue += (int) $arg;
-            } elseif (Functions::isError($arg)) {
+            } elseif (ErrorValue::isError($arg)) {
                 return $arg;
-            // ignore non-numerics from cell, but fail as literals (except null)
             } elseif ($arg !== null && !Functions::isCellValue($k)) {
-                return Functions::VALUE();
+                // ignore non-numerics from cell, but fail as literals (except null)
+                return ExcelError::VALUE();
             }
         }
 
@@ -80,9 +75,9 @@ public static function sumErroringStrings(...$args)
      *
      * @param mixed ...$args Data values
      *
-     * @return float|string The result, or a string containing an error
+     * @return float|int|string The result, or a string containing an error
      */
-    public static function product(...$args)
+    public static function product(mixed ...$args): string|int|float
     {
         $arrayList = $args;
 
@@ -99,7 +94,7 @@ public static function product(...$args)
             $array2 = Functions::flattenArray($matrixData);
             $count = count($array2);
             if ($wrkCellCount != $count) {
-                return Functions::VALUE();
+                return ExcelError::VALUE();
             }
 
             foreach ($array2 as $i => $val) {
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/SumSquares.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/SumSquares.php
index 49fa638112..b2e9cea2b4 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/SumSquares.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/SumSquares.php
@@ -4,6 +4,7 @@
 
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class SumSquares
 {
@@ -16,10 +17,8 @@ class SumSquares
      *        SUMSQ(value1[,value2[, ...]])
      *
      * @param mixed ...$args Data values
-     *
-     * @return float|string
      */
-    public static function sumSquare(...$args)
+    public static function sumSquare(mixed ...$args): string|int|float
     {
         try {
             $returnValue = 0;
@@ -40,7 +39,7 @@ private static function getCount(array $array1, array $array2): int
     {
         $count = count($array1);
         if ($count !== count($array2)) {
-            throw new Exception(Functions::NA());
+            throw new Exception(ExcelError::NA());
         }
 
         return $count;
@@ -48,10 +47,8 @@ private static function getCount(array $array1, array $array2): int
 
     /**
      * These functions accept only numeric arguments, not even strings which are numeric.
-     *
-     * @param mixed $item
      */
-    private static function numericNotString($item): bool
+    private static function numericNotString(mixed $item): bool
     {
         return is_numeric($item) && !is_string($item);
     }
@@ -61,10 +58,8 @@ private static function numericNotString($item): bool
      *
      * @param mixed[] $matrixData1 Matrix #1
      * @param mixed[] $matrixData2 Matrix #2
-     *
-     * @return float|string
      */
-    public static function sumXSquaredMinusYSquared($matrixData1, $matrixData2)
+    public static function sumXSquaredMinusYSquared(array $matrixData1, array $matrixData2): string|int|float
     {
         try {
             $array1 = Functions::flattenArray($matrixData1);
@@ -89,10 +84,8 @@ public static function sumXSquaredMinusYSquared($matrixData1, $matrixData2)
      *
      * @param mixed[] $matrixData1 Matrix #1
      * @param mixed[] $matrixData2 Matrix #2
-     *
-     * @return float|string
      */
-    public static function sumXSquaredPlusYSquared($matrixData1, $matrixData2)
+    public static function sumXSquaredPlusYSquared(array $matrixData1, array $matrixData2): string|int|float
     {
         try {
             $array1 = Functions::flattenArray($matrixData1);
@@ -117,10 +110,8 @@ public static function sumXSquaredPlusYSquared($matrixData1, $matrixData2)
      *
      * @param mixed[] $matrixData1 Matrix #1
      * @param mixed[] $matrixData2 Matrix #2
-     *
-     * @return float|string
      */
-    public static function sumXMinusYSquared($matrixData1, $matrixData2)
+    public static function sumXMinusYSquared(array $matrixData1, array $matrixData2): string|int|float
     {
         try {
             $array1 = Functions::flattenArray($matrixData1);
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Cosecant.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Cosecant.php
index 3038e6cc0e..845b6c1465 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Cosecant.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Cosecant.php
@@ -2,22 +2,31 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig\Trig;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\MathTrig\Helpers;
 
 class Cosecant
 {
+    use ArrayEnabled;
+
     /**
      * CSC.
      *
      * Returns the cosecant of an angle.
      *
-     * @param float $angle Number
+     * @param array|float $angle Number, or can be an array of numbers
      *
-     * @return float|string The cosecant of the angle
+     * @return array|float|string The cosecant of the angle
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
     public static function csc($angle)
     {
+        if (is_array($angle)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $angle);
+        }
+
         try {
             $angle = Helpers::validateNumericNullBool($angle);
         } catch (Exception $e) {
@@ -32,12 +41,18 @@ public static function csc($angle)
      *
      * Returns the hyperbolic cosecant of an angle.
      *
-     * @param float $angle Number
+     * @param array|float $angle Number, or can be an array of numbers
      *
-     * @return float|string The hyperbolic cosecant of the angle
+     * @return array|float|string The hyperbolic cosecant of the angle
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
     public static function csch($angle)
     {
+        if (is_array($angle)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $angle);
+        }
+
         try {
             $angle = Helpers::validateNumericNullBool($angle);
         } catch (Exception $e) {
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Cosine.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Cosine.php
index 6c69e126d7..733e3d61f6 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Cosine.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Cosine.php
@@ -2,22 +2,31 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig\Trig;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\MathTrig\Helpers;
 
 class Cosine
 {
+    use ArrayEnabled;
+
     /**
      * COS.
      *
      * Returns the result of builtin function cos after validating args.
      *
-     * @param mixed $number Should be numeric
+     * @param mixed $number Should be numeric, or can be an array of numbers
      *
-     * @return float|string cosine
+     * @return array|float|string cosine
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function cos($number)
+    public static function cos(mixed $number): array|string|float
     {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
         try {
             $number = Helpers::validateNumericNullBool($number);
         } catch (Exception $e) {
@@ -32,12 +41,18 @@ public static function cos($number)
      *
      * Returns the result of builtin function cosh after validating args.
      *
-     * @param mixed $number Should be numeric
+     * @param mixed $number Should be numeric, or can be an array of numbers
      *
-     * @return float|string hyperbolic cosine
+     * @return array|float|string hyperbolic cosine
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function cosh($number)
+    public static function cosh(mixed $number): array|string|float
     {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
         try {
             $number = Helpers::validateNumericNullBool($number);
         } catch (Exception $e) {
@@ -52,12 +67,18 @@ public static function cosh($number)
      *
      * Returns the arccosine of a number.
      *
-     * @param float $number Number
+     * @param array|float $number Number, or can be an array of numbers
      *
-     * @return float|string The arccosine of the number
+     * @return array|float|string The arccosine of the number
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
     public static function acos($number)
     {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
         try {
             $number = Helpers::validateNumericNullBool($number);
         } catch (Exception $e) {
@@ -72,12 +93,18 @@ public static function acos($number)
      *
      * Returns the arc inverse hyperbolic cosine of a number.
      *
-     * @param float $number Number
+     * @param array|float $number Number, or can be an array of numbers
      *
-     * @return float|string The inverse hyperbolic cosine of the number, or an error string
+     * @return array|float|string The inverse hyperbolic cosine of the number, or an error string
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
     public static function acosh($number)
     {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
         try {
             $number = Helpers::validateNumericNullBool($number);
         } catch (Exception $e) {
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Cotangent.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Cotangent.php
index 1b796f50f6..861159a3bd 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Cotangent.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Cotangent.php
@@ -2,22 +2,31 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig\Trig;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\MathTrig\Helpers;
 
 class Cotangent
 {
+    use ArrayEnabled;
+
     /**
      * COT.
      *
      * Returns the cotangent of an angle.
      *
-     * @param float $angle Number
+     * @param array|float $angle Number, or can be an array of numbers
      *
-     * @return float|string The cotangent of the angle
+     * @return array|float|string The cotangent of the angle
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
     public static function cot($angle)
     {
+        if (is_array($angle)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $angle);
+        }
+
         try {
             $angle = Helpers::validateNumericNullBool($angle);
         } catch (Exception $e) {
@@ -32,12 +41,18 @@ public static function cot($angle)
      *
      * Returns the hyperbolic cotangent of an angle.
      *
-     * @param float $angle Number
+     * @param array|float $angle Number, or can be an array of numbers
      *
-     * @return float|string The hyperbolic cotangent of the angle
+     * @return array|float|string The hyperbolic cotangent of the angle
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
     public static function coth($angle)
     {
+        if (is_array($angle)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $angle);
+        }
+
         try {
             $angle = Helpers::validateNumericNullBool($angle);
         } catch (Exception $e) {
@@ -52,12 +67,18 @@ public static function coth($angle)
      *
      * Returns the arccotangent of a number.
      *
-     * @param float $number Number
+     * @param array|float $number Number, or can be an array of numbers
      *
-     * @return float|string The arccotangent of the number
+     * @return array|float|string The arccotangent of the number
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function acot($number)
+    public static function acot($number): array|string|float
     {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
         try {
             $number = Helpers::validateNumericNullBool($number);
         } catch (Exception $e) {
@@ -72,12 +93,18 @@ public static function acot($number)
      *
      * Returns the hyperbolic arccotangent of a number.
      *
-     * @param float $number Number
+     * @param array|float $number Number, or can be an array of numbers
      *
-     * @return float|string The hyperbolic arccotangent of the number
+     * @return array|float|string The hyperbolic arccotangent of the number
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
     public static function acoth($number)
     {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
         try {
             $number = Helpers::validateNumericNullBool($number);
         } catch (Exception $e) {
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Secant.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Secant.php
index 70299cb7e3..2d26e5ddf3 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Secant.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Secant.php
@@ -2,22 +2,31 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig\Trig;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\MathTrig\Helpers;
 
 class Secant
 {
+    use ArrayEnabled;
+
     /**
      * SEC.
      *
      * Returns the secant of an angle.
      *
-     * @param float $angle Number
+     * @param array|float $angle Number, or can be an array of numbers
      *
-     * @return float|string The secant of the angle
+     * @return array|float|string The secant of the angle
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
     public static function sec($angle)
     {
+        if (is_array($angle)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $angle);
+        }
+
         try {
             $angle = Helpers::validateNumericNullBool($angle);
         } catch (Exception $e) {
@@ -32,12 +41,18 @@ public static function sec($angle)
      *
      * Returns the hyperbolic secant of an angle.
      *
-     * @param float $angle Number
+     * @param array|float $angle Number, or can be an array of numbers
      *
-     * @return float|string The hyperbolic secant of the angle
+     * @return array|float|string The hyperbolic secant of the angle
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
     public static function sech($angle)
     {
+        if (is_array($angle)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $angle);
+        }
+
         try {
             $angle = Helpers::validateNumericNullBool($angle);
         } catch (Exception $e) {
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Sine.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Sine.php
index 2c6a8a0718..924466e92b 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Sine.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Sine.php
@@ -2,22 +2,31 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig\Trig;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\MathTrig\Helpers;
 
 class Sine
 {
+    use ArrayEnabled;
+
     /**
      * SIN.
      *
      * Returns the result of builtin function sin after validating args.
      *
-     * @param mixed $angle Should be numeric
+     * @param mixed $angle Should be numeric, or can be an array of numbers
      *
-     * @return float|string sine
+     * @return array|float|string sine
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function sin($angle)
+    public static function sin(mixed $angle): array|string|float
     {
+        if (is_array($angle)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $angle);
+        }
+
         try {
             $angle = Helpers::validateNumericNullBool($angle);
         } catch (Exception $e) {
@@ -32,12 +41,18 @@ public static function sin($angle)
      *
      * Returns the result of builtin function sinh after validating args.
      *
-     * @param mixed $angle Should be numeric
+     * @param mixed $angle Should be numeric, or can be an array of numbers
      *
-     * @return float|string hyperbolic sine
+     * @return array|float|string hyperbolic sine
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function sinh($angle)
+    public static function sinh(mixed $angle): array|string|float
     {
+        if (is_array($angle)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $angle);
+        }
+
         try {
             $angle = Helpers::validateNumericNullBool($angle);
         } catch (Exception $e) {
@@ -52,12 +67,18 @@ public static function sinh($angle)
      *
      * Returns the arcsine of a number.
      *
-     * @param float $number Number
+     * @param array|float $number Number, or can be an array of numbers
      *
-     * @return float|string The arcsine of the number
+     * @return array|float|string The arcsine of the number
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
     public static function asin($number)
     {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
         try {
             $number = Helpers::validateNumericNullBool($number);
         } catch (Exception $e) {
@@ -72,12 +93,18 @@ public static function asin($number)
      *
      * Returns the inverse hyperbolic sine of a number.
      *
-     * @param float $number Number
+     * @param array|float $number Number, or can be an array of numbers
      *
-     * @return float|string The inverse hyperbolic sine of the number
+     * @return array|float|string The inverse hyperbolic sine of the number
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
     public static function asinh($number)
     {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
         try {
             $number = Helpers::validateNumericNullBool($number);
         } catch (Exception $e) {
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Tangent.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Tangent.php
index 6cd235fb70..9d6775f4f1 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Tangent.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trig/Tangent.php
@@ -2,23 +2,32 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig\Trig;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Calculation\MathTrig\Helpers;
 
 class Tangent
 {
+    use ArrayEnabled;
+
     /**
      * TAN.
      *
      * Returns the result of builtin function tan after validating args.
      *
-     * @param mixed $angle Should be numeric
+     * @param mixed $angle Should be numeric, or can be an array of numbers
      *
-     * @return float|string tangent
+     * @return array|float|string tangent
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function tan($angle)
+    public static function tan(mixed $angle)
     {
+        if (is_array($angle)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $angle);
+        }
+
         try {
             $angle = Helpers::validateNumericNullBool($angle);
         } catch (Exception $e) {
@@ -33,12 +42,18 @@ public static function tan($angle)
      *
      * Returns the result of builtin function sinh after validating args.
      *
-     * @param mixed $angle Should be numeric
+     * @param mixed $angle Should be numeric, or can be an array of numbers
      *
-     * @return float|string hyperbolic tangent
+     * @return array|float|string hyperbolic tangent
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function tanh($angle)
+    public static function tanh(mixed $angle): array|string|float
     {
+        if (is_array($angle)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $angle);
+        }
+
         try {
             $angle = Helpers::validateNumericNullBool($angle);
         } catch (Exception $e) {
@@ -53,12 +68,18 @@ public static function tanh($angle)
      *
      * Returns the arctangent of a number.
      *
-     * @param float $number Number
+     * @param array|float $number Number, or can be an array of numbers
      *
-     * @return float|string The arctangent of the number
+     * @return array|float|string The arctangent of the number
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
     public static function atan($number)
     {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
         try {
             $number = Helpers::validateNumericNullBool($number);
         } catch (Exception $e) {
@@ -73,12 +94,18 @@ public static function atan($number)
      *
      * Returns the inverse hyperbolic tangent of a number.
      *
-     * @param float $number Number
+     * @param array|float $number Number, or can be an array of numbers
      *
-     * @return float|string The inverse hyperbolic tangent of the number
+     * @return array|float|string The inverse hyperbolic tangent of the number
+     *         If an array of numbers is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
     public static function atanh($number)
     {
+        if (is_array($number)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $number);
+        }
+
         try {
             $number = Helpers::validateNumericNullBool($number);
         } catch (Exception $e) {
@@ -104,13 +131,19 @@ public static function atanh($number)
      * Excel Function:
      *        ATAN2(xCoordinate,yCoordinate)
      *
-     * @param mixed $xCoordinate should be float, the x-coordinate of the point
-     * @param mixed $yCoordinate should be float, the y-coordinate of the point
+     * @param mixed $xCoordinate should be float, the x-coordinate of the point, or can be an array of numbers
+     * @param mixed $yCoordinate should be float, the y-coordinate of the point, or can be an array of numbers
      *
-     * @return float|string the inverse tangent of the specified x- and y-coordinates, or a string containing an error
+     * @return array|float|string The inverse tangent of the specified x- and y-coordinates, or a string containing an error
+     *         If an array of numbers is passed as one of the arguments, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function atan2($xCoordinate, $yCoordinate)
+    public static function atan2(mixed $xCoordinate, mixed $yCoordinate): array|string|float
     {
+        if (is_array($xCoordinate) || is_array($yCoordinate)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $xCoordinate, $yCoordinate);
+        }
+
         try {
             $xCoordinate = Helpers::validateNumericNullBool($xCoordinate);
             $yCoordinate = Helpers::validateNumericNullBool($yCoordinate);
@@ -119,7 +152,7 @@ public static function atan2($xCoordinate, $yCoordinate)
         }
 
         if (($xCoordinate == 0) && ($yCoordinate == 0)) {
-            return Functions::DIV0();
+            return ExcelError::DIV0();
         }
 
         return atan2($yCoordinate, $xCoordinate);
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trunc.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trunc.php
index 4b3670f680..f36f14d704 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trunc.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig/Trunc.php
@@ -2,22 +2,36 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 
 class Trunc
 {
+    use ArrayEnabled;
+
     /**
      * TRUNC.
      *
      * Truncates value to the number of fractional digits by number_digits.
+     * This will probably not be the precise result in the unlikely
+     * event that the number of digits to the left of the decimal
+     * plus the number of digits to the right exceeds PHP_FLOAT_DIG
+     * (or possibly that value minus 1).
+     * Excel is unlikely to do any better.
      *
-     * @param float $value
-     * @param int $digits
+     * @param array|float $value Or can be an array of values
+     * @param array|int $digits Or can be an array of values
      *
-     * @return float|string Truncated value, or a string containing an error
+     * @return array|float|string Truncated value, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function evaluate($value = 0, $digits = 0)
+    public static function evaluate(array|float|string|null $value = 0, array|int|string $digits = 0): array|float|string
     {
+        if (is_array($value) || is_array($digits)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $digits);
+        }
+
         try {
             $value = Helpers::validateNumericNullBool($value);
             $digits = Helpers::validateNumericNullSubstitution($digits, null);
@@ -25,15 +39,27 @@ public static function evaluate($value = 0, $digits = 0)
             return $e->getMessage();
         }
 
-        $digits = floor($digits);
+        if ($value == 0) {
+            return $value;
+        }
 
-        // Truncate
-        $adjust = 10 ** $digits;
+        if ($value >= 0) {
+            $minusSign = '';
+        } else {
+            $minusSign = '-';
+            $value = -$value;
+        }
+        $digits = (int) floor($digits);
+        if ($digits < 0) {
+            $result = (float) (substr(sprintf('%.0F', $value), 0, $digits) . str_repeat('0', -$digits));
 
-        if (($digits > 0) && (rtrim((string) (int) ((abs($value) - abs((int) $value)) * $adjust), '0') < $adjust / 10)) {
-            return $value;
+            return ($minusSign === '') ? $result : -$result;
         }
+        $decimals = (floor($value) == (int) $value) ? (PHP_FLOAT_DIG - strlen((string) (int) $value)) : $digits;
+        $resultString = ($decimals < 0) ? sprintf('%F', $value) : sprintf('%.' . $decimals . 'F', $value);
+        $regExp = '/([.]\\d{' . $digits . '})\\d+$/';
+        $result = $minusSign . (preg_replace($regExp, '$1', $resultString) ?? $resultString);
 
-        return ((int) ($value * $adjust)) / $adjust;
+        return (float) $result;
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical.php
deleted file mode 100644
index d43a85f904..0000000000
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical.php
+++ /dev/null
@@ -1,1820 +0,0 @@
-<?php
-
-namespace PhpOffice\PhpSpreadsheet\Calculation;
-
-use PhpOffice\PhpSpreadsheet\Calculation\Statistical\Averages;
-use PhpOffice\PhpSpreadsheet\Calculation\Statistical\Conditional;
-use PhpOffice\PhpSpreadsheet\Calculation\Statistical\Confidence;
-use PhpOffice\PhpSpreadsheet\Calculation\Statistical\Counts;
-use PhpOffice\PhpSpreadsheet\Calculation\Statistical\Maximum;
-use PhpOffice\PhpSpreadsheet\Calculation\Statistical\Minimum;
-use PhpOffice\PhpSpreadsheet\Calculation\Statistical\Permutations;
-use PhpOffice\PhpSpreadsheet\Calculation\Statistical\StandardDeviations;
-use PhpOffice\PhpSpreadsheet\Calculation\Statistical\Trends;
-use PhpOffice\PhpSpreadsheet\Calculation\Statistical\Variances;
-
-/**
- * @deprecated 1.18.0
- */
-class Statistical
-{
-    const LOG_GAMMA_X_MAX_VALUE = 2.55e305;
-    const EPS = 2.22e-16;
-    const MAX_VALUE = 1.2e308;
-    const SQRT2PI = 2.5066282746310005024157652848110452530069867406099;
-
-    /**
-     * AVEDEV.
-     *
-     * Returns the average of the absolute deviations of data points from their mean.
-     * AVEDEV is a measure of the variability in a data set.
-     *
-     * Excel Function:
-     *        AVEDEV(value1[,value2[, ...]])
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Statistical\Averages::averageDeviations()
-     *      Use the averageDeviations() method in the Statistical\Averages class instead
-     *
-     * @param mixed ...$args Data values
-     *
-     * @return float|string
-     */
-    public static function AVEDEV(...$args)
-    {
-        return Averages::averageDeviations(...$args);
-    }
-
-    /**
-     * AVERAGE.
-     *
-     * Returns the average (arithmetic mean) of the arguments
-     *
-     * Excel Function:
-     *        AVERAGE(value1[,value2[, ...]])
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Statistical\Averages::average()
-     *      Use the average() method in the Statistical\Averages class instead
-     *
-     * @param mixed ...$args Data values
-     *
-     * @return float|string
-     */
-    public static function AVERAGE(...$args)
-    {
-        return Averages::average(...$args);
-    }
-
-    /**
-     * AVERAGEA.
-     *
-     * Returns the average of its arguments, including numbers, text, and logical values
-     *
-     * Excel Function:
-     *        AVERAGEA(value1[,value2[, ...]])
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Statistical\Averages::averageA()
-     *      Use the averageA() method in the Statistical\Averages class instead
-     *
-     * @param mixed ...$args Data values
-     *
-     * @return float|string
-     */
-    public static function AVERAGEA(...$args)
-    {
-        return Averages::averageA(...$args);
-    }
-
-    /**
-     * AVERAGEIF.
-     *
-     * Returns the average value from a range of cells that contain numbers within the list of arguments
-     *
-     * Excel Function:
-     *        AVERAGEIF(value1[,value2[, ...]],condition)
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Statistical\Conditional::AVERAGEIF()
-     *      Use the AVERAGEIF() method in the Statistical\Conditional class instead
-     *
-     * @param mixed $range Data values
-     * @param string $condition the criteria that defines which cells will be checked
-     * @param mixed[] $averageRange Data values
-     *
-     * @return null|float|string
-     */
-    public static function AVERAGEIF($range, $condition, $averageRange = [])
-    {
-        return Conditional::AVERAGEIF($range, $condition, $averageRange);
-    }
-
-    /**
-     * BETADIST.
-     *
-     * Returns the beta distribution.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Distributions\Beta::distribution()
-     *      Use the distribution() method in the Statistical\Distributions\Beta class instead
-     *
-     * @param float $value Value at which you want to evaluate the distribution
-     * @param float $alpha Parameter to the distribution
-     * @param float $beta Parameter to the distribution
-     * @param mixed $rMin
-     * @param mixed $rMax
-     *
-     * @return float|string
-     */
-    public static function BETADIST($value, $alpha, $beta, $rMin = 0, $rMax = 1)
-    {
-        return Statistical\Distributions\Beta::distribution($value, $alpha, $beta, $rMin, $rMax);
-    }
-
-    /**
-     * BETAINV.
-     *
-     * Returns the inverse of the Beta distribution.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Distributions\Beta::inverse()
-     *      Use the inverse() method in the Statistical\Distributions\Beta class instead
-     *
-     * @param float $probability Probability at which you want to evaluate the distribution
-     * @param float $alpha Parameter to the distribution
-     * @param float $beta Parameter to the distribution
-     * @param float $rMin Minimum value
-     * @param float $rMax Maximum value
-     *
-     * @return float|string
-     */
-    public static function BETAINV($probability, $alpha, $beta, $rMin = 0, $rMax = 1)
-    {
-        return Statistical\Distributions\Beta::inverse($probability, $alpha, $beta, $rMin, $rMax);
-    }
-
-    /**
-     * BINOMDIST.
-     *
-     * Returns the individual term binomial distribution probability. Use BINOMDIST in problems with
-     *        a fixed number of tests or trials, when the outcomes of any trial are only success or failure,
-     *        when trials are independent, and when the probability of success is constant throughout the
-     *        experiment. For example, BINOMDIST can calculate the probability that two of the next three
-     *        babies born are male.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Distributions\Binomial::distribution()
-     *      Use the distribution() method in the Statistical\Distributions\Binomial class instead
-     *
-     * @param mixed $value Number of successes in trials
-     * @param mixed $trials Number of trials
-     * @param mixed $probability Probability of success on each trial
-     * @param mixed $cumulative
-     *
-     * @return float|string
-     */
-    public static function BINOMDIST($value, $trials, $probability, $cumulative)
-    {
-        return Statistical\Distributions\Binomial::distribution($value, $trials, $probability, $cumulative);
-    }
-
-    /**
-     * CHIDIST.
-     *
-     * Returns the one-tailed probability of the chi-squared distribution.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Distributions\ChiSquared::distributionRightTail()
-     *      Use the distributionRightTail() method in the Statistical\Distributions\ChiSquared class instead
-     *
-     * @param float $value Value for the function
-     * @param float $degrees degrees of freedom
-     *
-     * @return float|string
-     */
-    public static function CHIDIST($value, $degrees)
-    {
-        return Statistical\Distributions\ChiSquared::distributionRightTail($value, $degrees);
-    }
-
-    /**
-     * CHIINV.
-     *
-     * Returns the one-tailed probability of the chi-squared distribution.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Distributions\ChiSquared::inverseRightTail()
-     *      Use the inverseRightTail() method in the Statistical\Distributions\ChiSquared class instead
-     *
-     * @param float $probability Probability for the function
-     * @param float $degrees degrees of freedom
-     *
-     * @return float|string
-     */
-    public static function CHIINV($probability, $degrees)
-    {
-        return Statistical\Distributions\ChiSquared::inverseRightTail($probability, $degrees);
-    }
-
-    /**
-     * CONFIDENCE.
-     *
-     * Returns the confidence interval for a population mean
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Confidence::CONFIDENCE()
-     *      Use the CONFIDENCE() method in the Statistical\Confidence class instead
-     *
-     * @param float $alpha
-     * @param float $stdDev Standard Deviation
-     * @param float $size
-     *
-     * @return float|string
-     */
-    public static function CONFIDENCE($alpha, $stdDev, $size)
-    {
-        return Confidence::CONFIDENCE($alpha, $stdDev, $size);
-    }
-
-    /**
-     * CORREL.
-     *
-     * Returns covariance, the average of the products of deviations for each data point pair.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Trends::CORREL()
-     *      Use the CORREL() method in the Statistical\Trends class instead
-     *
-     * @param mixed $yValues array of mixed Data Series Y
-     * @param null|mixed $xValues array of mixed Data Series X
-     *
-     * @return float|string
-     */
-    public static function CORREL($yValues, $xValues = null)
-    {
-        return Trends::CORREL($xValues, $yValues);
-    }
-
-    /**
-     * COUNT.
-     *
-     * Counts the number of cells that contain numbers within the list of arguments
-     *
-     * Excel Function:
-     *        COUNT(value1[,value2[, ...]])
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Statistical\Counts::COUNT()
-     *      Use the COUNT() method in the Statistical\Counts class instead
-     *
-     * @param mixed ...$args Data values
-     *
-     * @return int
-     */
-    public static function COUNT(...$args)
-    {
-        return Counts::COUNT(...$args);
-    }
-
-    /**
-     * COUNTA.
-     *
-     * Counts the number of cells that are not empty within the list of arguments
-     *
-     * Excel Function:
-     *        COUNTA(value1[,value2[, ...]])
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Statistical\Counts::COUNTA()
-     *      Use the COUNTA() method in the Statistical\Counts class instead
-     *
-     * @param mixed ...$args Data values
-     *
-     * @return int
-     */
-    public static function COUNTA(...$args)
-    {
-        return Counts::COUNTA(...$args);
-    }
-
-    /**
-     * COUNTBLANK.
-     *
-     * Counts the number of empty cells within the list of arguments
-     *
-     * Excel Function:
-     *        COUNTBLANK(value1[,value2[, ...]])
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Statistical\Counts::COUNTBLANK()
-     *      Use the COUNTBLANK() method in the Statistical\Counts class instead
-     *
-     * @param mixed ...$args Data values
-     *
-     * @return int
-     */
-    public static function COUNTBLANK(...$args)
-    {
-        return Counts::COUNTBLANK(...$args);
-    }
-
-    /**
-     * COUNTIF.
-     *
-     * Counts the number of cells that contain numbers within the list of arguments
-     *
-     * Excel Function:
-     *        COUNTIF(range,condition)
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Statistical\Conditional::COUNTIF()
-     *      Use the COUNTIF() method in the Statistical\Conditional class instead
-     *
-     * @param mixed $range Data values
-     * @param string $condition the criteria that defines which cells will be counted
-     *
-     * @return int
-     */
-    public static function COUNTIF($range, $condition)
-    {
-        return Conditional::COUNTIF($range, $condition);
-    }
-
-    /**
-     * COUNTIFS.
-     *
-     * Counts the number of cells that contain numbers within the list of arguments
-     *
-     * Excel Function:
-     *        COUNTIFS(criteria_range1, criteria1, [criteria_range2, criteria2]…)
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Statistical\Conditional::COUNTIFS()
-     *      Use the COUNTIFS() method in the Statistical\Conditional class instead
-     *
-     * @param mixed $args Pairs of Ranges and Criteria
-     *
-     * @return int
-     */
-    public static function COUNTIFS(...$args)
-    {
-        return Conditional::COUNTIFS(...$args);
-    }
-
-    /**
-     * COVAR.
-     *
-     * Returns covariance, the average of the products of deviations for each data point pair.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Trends::COVAR()
-     *      Use the COVAR() method in the Statistical\Trends class instead
-     *
-     * @param mixed $yValues array of mixed Data Series Y
-     * @param mixed $xValues array of mixed Data Series X
-     *
-     * @return float|string
-     */
-    public static function COVAR($yValues, $xValues)
-    {
-        return Trends::COVAR($yValues, $xValues);
-    }
-
-    /**
-     * CRITBINOM.
-     *
-     * Returns the smallest value for which the cumulative binomial distribution is greater
-     *        than or equal to a criterion value
-     *
-     * See https://support.microsoft.com/en-us/help/828117/ for details of the algorithm used
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Distributions\Binomial::inverse()
-     *      Use the inverse() method in the Statistical\Distributions\Binomial class instead
-     *
-     * @param float $trials number of Bernoulli trials
-     * @param float $probability probability of a success on each trial
-     * @param float $alpha criterion value
-     *
-     * @return int|string
-     */
-    public static function CRITBINOM($trials, $probability, $alpha)
-    {
-        return Statistical\Distributions\Binomial::inverse($trials, $probability, $alpha);
-    }
-
-    /**
-     * DEVSQ.
-     *
-     * Returns the sum of squares of deviations of data points from their sample mean.
-     *
-     * Excel Function:
-     *        DEVSQ(value1[,value2[, ...]])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Deviations::sumSquares()
-     *      Use the sumSquares() method in the Statistical\Deviations class instead
-     *
-     * @param mixed ...$args Data values
-     *
-     * @return float|string
-     */
-    public static function DEVSQ(...$args)
-    {
-        return Statistical\Deviations::sumSquares(...$args);
-    }
-
-    /**
-     * EXPONDIST.
-     *
-     *    Returns the exponential distribution. Use EXPONDIST to model the time between events,
-     *        such as how long an automated bank teller takes to deliver cash. For example, you can
-     *        use EXPONDIST to determine the probability that the process takes at most 1 minute.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Distributions\Exponential::distribution()
-     *      Use the distribution() method in the Statistical\Distributions\Exponential class instead
-     *
-     * @param float $value Value of the function
-     * @param float $lambda The parameter value
-     * @param bool $cumulative
-     *
-     * @return float|string
-     */
-    public static function EXPONDIST($value, $lambda, $cumulative)
-    {
-        return Statistical\Distributions\Exponential::distribution($value, $lambda, $cumulative);
-    }
-
-    /**
-     * F.DIST.
-     *
-     *    Returns the F probability distribution.
-     *    You can use this function to determine whether two data sets have different degrees of diversity.
-     *    For example, you can examine the test scores of men and women entering high school, and determine
-     *        if the variability in the females is different from that found in the males.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Distributions\F::distribution()
-     *      Use the distribution() method in the Statistical\Distributions\Exponential class instead
-     *
-     * @param float $value Value of the function
-     * @param int $u The numerator degrees of freedom
-     * @param int $v The denominator degrees of freedom
-     * @param bool $cumulative If cumulative is TRUE, F.DIST returns the cumulative distribution function;
-     *                         if FALSE, it returns the probability density function.
-     *
-     * @return float|string
-     */
-    public static function FDIST2($value, $u, $v, $cumulative)
-    {
-        return Statistical\Distributions\F::distribution($value, $u, $v, $cumulative);
-    }
-
-    /**
-     * FISHER.
-     *
-     * Returns the Fisher transformation at x. This transformation produces a function that
-     *        is normally distributed rather than skewed. Use this function to perform hypothesis
-     *        testing on the correlation coefficient.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Distributions\Fisher::distribution()
-     *      Use the distribution() method in the Statistical\Distributions\Fisher class instead
-     *
-     * @param float $value
-     *
-     * @return float|string
-     */
-    public static function FISHER($value)
-    {
-        return Statistical\Distributions\Fisher::distribution($value);
-    }
-
-    /**
-     * FISHERINV.
-     *
-     * Returns the inverse of the Fisher transformation. Use this transformation when
-     *        analyzing correlations between ranges or arrays of data. If y = FISHER(x), then
-     *        FISHERINV(y) = x.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Distributions\Fisher::inverse()
-     *      Use the inverse() method in the Statistical\Distributions\Fisher class instead
-     *
-     * @param float $value
-     *
-     * @return float|string
-     */
-    public static function FISHERINV($value)
-    {
-        return Statistical\Distributions\Fisher::inverse($value);
-    }
-
-    /**
-     * FORECAST.
-     *
-     * Calculates, or predicts, a future value by using existing values. The predicted value is a y-value for a given x-value.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Trends::FORECAST()
-     *      Use the FORECAST() method in the Statistical\Trends class instead
-     *
-     * @param float $xValue Value of X for which we want to find Y
-     * @param mixed $yValues array of mixed Data Series Y
-     * @param mixed $xValues of mixed Data Series X
-     *
-     * @return bool|float|string
-     */
-    public static function FORECAST($xValue, $yValues, $xValues)
-    {
-        return Trends::FORECAST($xValue, $yValues, $xValues);
-    }
-
-    /**
-     * GAMMA.
-     *
-     * Returns the gamma function value.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Distributions\Gamma::gamma()
-     *      Use the gamma() method in the Statistical\Distributions\Gamma class instead
-     *
-     * @param float $value
-     *
-     * @return float|string The result, or a string containing an error
-     */
-    public static function GAMMAFunction($value)
-    {
-        return Statistical\Distributions\Gamma::gamma($value);
-    }
-
-    /**
-     * GAMMADIST.
-     *
-     * Returns the gamma distribution.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Distributions\Gamma::distribution()
-     *      Use the distribution() method in the Statistical\Distributions\Gamma class instead
-     *
-     * @param float $value Value at which you want to evaluate the distribution
-     * @param float $a Parameter to the distribution
-     * @param float $b Parameter to the distribution
-     * @param bool $cumulative
-     *
-     * @return float|string
-     */
-    public static function GAMMADIST($value, $a, $b, $cumulative)
-    {
-        return Statistical\Distributions\Gamma::distribution($value, $a, $b, $cumulative);
-    }
-
-    /**
-     * GAMMAINV.
-     *
-     * Returns the inverse of the Gamma distribution.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Distributions\Gamma::inverse()
-     *      Use the inverse() method in the Statistical\Distributions\Gamma class instead
-     *
-     * @param float $probability Probability at which you want to evaluate the distribution
-     * @param float $alpha Parameter to the distribution
-     * @param float $beta Parameter to the distribution
-     *
-     * @return float|string
-     */
-    public static function GAMMAINV($probability, $alpha, $beta)
-    {
-        return Statistical\Distributions\Gamma::inverse($probability, $alpha, $beta);
-    }
-
-    /**
-     * GAMMALN.
-     *
-     * Returns the natural logarithm of the gamma function.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Distributions\Gamma::ln()
-     *      Use the ln() method in the Statistical\Distributions\Gamma class instead
-     *
-     * @param float $value
-     *
-     * @return float|string
-     */
-    public static function GAMMALN($value)
-    {
-        return Statistical\Distributions\Gamma::ln($value);
-    }
-
-    /**
-     * GAUSS.
-     *
-     * Calculates the probability that a member of a standard normal population will fall between
-     *     the mean and z standard deviations from the mean.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Distributions\StandardNormal::gauss()
-     *      Use the gauss() method in the Statistical\Distributions\StandardNormal class instead
-     *
-     * @param float $value
-     *
-     * @return float|string The result, or a string containing an error
-     */
-    public static function GAUSS($value)
-    {
-        return Statistical\Distributions\StandardNormal::gauss($value);
-    }
-
-    /**
-     * GEOMEAN.
-     *
-     * Returns the geometric mean of an array or range of positive data. For example, you
-     *        can use GEOMEAN to calculate average growth rate given compound interest with
-     *        variable rates.
-     *
-     * Excel Function:
-     *        GEOMEAN(value1[,value2[, ...]])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Averages\Mean::geometric()
-     *      Use the geometric() method in the Statistical\Averages\Mean class instead
-     *
-     * @param mixed ...$args Data values
-     *
-     * @return float|string
-     */
-    public static function GEOMEAN(...$args)
-    {
-        return Statistical\Averages\Mean::geometric(...$args);
-    }
-
-    /**
-     * GROWTH.
-     *
-     * Returns values along a predicted exponential Trend
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Trends::GROWTH()
-     *      Use the GROWTH() method in the Statistical\Trends class instead
-     *
-     * @param mixed[] $yValues Data Series Y
-     * @param mixed[] $xValues Data Series X
-     * @param mixed[] $newValues Values of X for which we want to find Y
-     * @param bool $const a logical value specifying whether to force the intersect to equal 0
-     *
-     * @return float[]
-     */
-    public static function GROWTH($yValues, $xValues = [], $newValues = [], $const = true)
-    {
-        return Trends::GROWTH($yValues, $xValues, $newValues, $const);
-    }
-
-    /**
-     * HARMEAN.
-     *
-     * Returns the harmonic mean of a data set. The harmonic mean is the reciprocal of the
-     *        arithmetic mean of reciprocals.
-     *
-     * Excel Function:
-     *        HARMEAN(value1[,value2[, ...]])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Averages\Mean::harmonic()
-     *      Use the harmonic() method in the Statistical\Averages\Mean class instead
-     *
-     * @param mixed ...$args Data values
-     *
-     * @return float|string
-     */
-    public static function HARMEAN(...$args)
-    {
-        return Statistical\Averages\Mean::harmonic(...$args);
-    }
-
-    /**
-     * HYPGEOMDIST.
-     *
-     * Returns the hypergeometric distribution. HYPGEOMDIST returns the probability of a given number of
-     * sample successes, given the sample size, population successes, and population size.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Distributions\HyperGeometric::distribution()
-     *      Use the distribution() method in the Statistical\Distributions\HyperGeometric class instead
-     *
-     * @param mixed $sampleSuccesses Number of successes in the sample
-     * @param mixed $sampleNumber Size of the sample
-     * @param mixed $populationSuccesses Number of successes in the population
-     * @param mixed $populationNumber Population size
-     *
-     * @return float|string
-     */
-    public static function HYPGEOMDIST($sampleSuccesses, $sampleNumber, $populationSuccesses, $populationNumber)
-    {
-        return Statistical\Distributions\HyperGeometric::distribution(
-            $sampleSuccesses,
-            $sampleNumber,
-            $populationSuccesses,
-            $populationNumber
-        );
-    }
-
-    /**
-     * INTERCEPT.
-     *
-     * Calculates the point at which a line will intersect the y-axis by using existing x-values and y-values.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Trends::INTERCEPT()
-     *      Use the INTERCEPT() method in the Statistical\Trends class instead
-     *
-     * @param mixed[] $yValues Data Series Y
-     * @param mixed[] $xValues Data Series X
-     *
-     * @return float|string
-     */
-    public static function INTERCEPT($yValues, $xValues)
-    {
-        return Trends::INTERCEPT($yValues, $xValues);
-    }
-
-    /**
-     * KURT.
-     *
-     * Returns the kurtosis of a data set. Kurtosis characterizes the relative peakedness
-     * or flatness of a distribution compared with the normal distribution. Positive
-     * kurtosis indicates a relatively peaked distribution. Negative kurtosis indicates a
-     * relatively flat distribution.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Deviations::kurtosis()
-     *      Use the kurtosis() method in the Statistical\Deviations class instead
-     *
-     * @param array ...$args Data Series
-     *
-     * @return float|string
-     */
-    public static function KURT(...$args)
-    {
-        return Statistical\Deviations::kurtosis(...$args);
-    }
-
-    /**
-     * LARGE.
-     *
-     * Returns the nth largest value in a data set. You can use this function to
-     *        select a value based on its relative standing.
-     *
-     * Excel Function:
-     *        LARGE(value1[,value2[, ...]],entry)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Size::large()
-     *      Use the large() method in the Statistical\Size class instead
-     *
-     * @param mixed $args Data values
-     *
-     * @return float|string The result, or a string containing an error
-     */
-    public static function LARGE(...$args)
-    {
-        return Statistical\Size::large(...$args);
-    }
-
-    /**
-     * LINEST.
-     *
-     * Calculates the statistics for a line by using the "least squares" method to calculate a straight line that best fits your data,
-     *        and then returns an array that describes the line.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Trends::LINEST()
-     *      Use the LINEST() method in the Statistical\Trends class instead
-     *
-     * @param mixed[] $yValues Data Series Y
-     * @param null|mixed[] $xValues Data Series X
-     * @param bool $const a logical value specifying whether to force the intersect to equal 0
-     * @param bool $stats a logical value specifying whether to return additional regression statistics
-     *
-     * @return array|int|string The result, or a string containing an error
-     */
-    public static function LINEST($yValues, $xValues = null, $const = true, $stats = false)
-    {
-        return Trends::LINEST($yValues, $xValues, $const, $stats);
-    }
-
-    /**
-     * LOGEST.
-     *
-     * Calculates an exponential curve that best fits the X and Y data series,
-     *        and then returns an array that describes the line.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Trends::LOGEST()
-     *      Use the LOGEST() method in the Statistical\Trends class instead
-     *
-     * @param mixed[] $yValues Data Series Y
-     * @param null|mixed[] $xValues Data Series X
-     * @param bool $const a logical value specifying whether to force the intersect to equal 0
-     * @param bool $stats a logical value specifying whether to return additional regression statistics
-     *
-     * @return array|int|string The result, or a string containing an error
-     */
-    public static function LOGEST($yValues, $xValues = null, $const = true, $stats = false)
-    {
-        return Trends::LOGEST($yValues, $xValues, $const, $stats);
-    }
-
-    /**
-     * LOGINV.
-     *
-     * Returns the inverse of the normal cumulative distribution
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Distributions\LogNormal::inverse()
-     *      Use the inverse() method in the Statistical\Distributions\LogNormal class instead
-     *
-     * @param float $probability
-     * @param float $mean
-     * @param float $stdDev
-     *
-     * @return float|string The result, or a string containing an error
-     *
-     * @TODO    Try implementing P J Acklam's refinement algorithm for greater
-     *            accuracy if I can get my head round the mathematics
-     *            (as described at) http://home.online.no/~pjacklam/notes/invnorm/
-     */
-    public static function LOGINV($probability, $mean, $stdDev)
-    {
-        return Statistical\Distributions\LogNormal::inverse($probability, $mean, $stdDev);
-    }
-
-    /**
-     * LOGNORMDIST.
-     *
-     * Returns the cumulative lognormal distribution of x, where ln(x) is normally distributed
-     * with parameters mean and standard_dev.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Distributions\LogNormal::cumulative()
-     *      Use the cumulative() method in the Statistical\Distributions\LogNormal class instead
-     *
-     * @param float $value
-     * @param float $mean
-     * @param float $stdDev
-     *
-     * @return float|string The result, or a string containing an error
-     */
-    public static function LOGNORMDIST($value, $mean, $stdDev)
-    {
-        return Statistical\Distributions\LogNormal::cumulative($value, $mean, $stdDev);
-    }
-
-    /**
-     * LOGNORM.DIST.
-     *
-     * Returns the lognormal distribution of x, where ln(x) is normally distributed
-     * with parameters mean and standard_dev.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Distributions\LogNormal::distribution()
-     *      Use the distribution() method in the Statistical\Distributions\LogNormal class instead
-     *
-     * @param float $value
-     * @param float $mean
-     * @param float $stdDev
-     * @param bool $cumulative
-     *
-     * @return float|string The result, or a string containing an error
-     */
-    public static function LOGNORMDIST2($value, $mean, $stdDev, $cumulative = false)
-    {
-        return Statistical\Distributions\LogNormal::distribution($value, $mean, $stdDev, $cumulative);
-    }
-
-    /**
-     * MAX.
-     *
-     * MAX returns the value of the element of the values passed that has the highest value,
-     *        with negative numbers considered smaller than positive numbers.
-     *
-     * Excel Function:
-     *        max(value1[,value2[, ...]])
-     *
-     * @Deprecated 1.17.0
-     *
-     * @param mixed ...$args Data values
-     *
-     * @return float
-     *
-     *@see Statistical\Maximum::max()
-     *      Use the MAX() method in the Statistical\Maximum class instead
-     */
-    public static function MAX(...$args)
-    {
-        return Maximum::max(...$args);
-    }
-
-    /**
-     * MAXA.
-     *
-     * Returns the greatest value in a list of arguments, including numbers, text, and logical values
-     *
-     * Excel Function:
-     *        maxA(value1[,value2[, ...]])
-     *
-     * @Deprecated 1.17.0
-     *
-     * @param mixed ...$args Data values
-     *
-     * @return float
-     *
-     *@see Statistical\Maximum::maxA()
-     *      Use the MAXA() method in the Statistical\Maximum class instead
-     */
-    public static function MAXA(...$args)
-    {
-        return Maximum::maxA(...$args);
-    }
-
-    /**
-     * MAXIFS.
-     *
-     * Counts the maximum value within a range of cells that contain numbers within the list of arguments
-     *
-     * Excel Function:
-     *        MAXIFS(max_range, criteria_range1, criteria1, [criteria_range2, criteria2], ...)
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Statistical\Conditional::MAXIFS()
-     *      Use the MAXIFS() method in the Statistical\Conditional class instead
-     *
-     * @param mixed $args Data range and criterias
-     *
-     * @return float
-     */
-    public static function MAXIFS(...$args)
-    {
-        return Conditional::MAXIFS(...$args);
-    }
-
-    /**
-     * MEDIAN.
-     *
-     * Returns the median of the given numbers. The median is the number in the middle of a set of numbers.
-     *
-     * Excel Function:
-     *        MEDIAN(value1[,value2[, ...]])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Averages::median()
-     *      Use the median() method in the Statistical\Averages class instead
-     *
-     * @param mixed ...$args Data values
-     *
-     * @return float|string The result, or a string containing an error
-     */
-    public static function MEDIAN(...$args)
-    {
-        return Statistical\Averages::median(...$args);
-    }
-
-    /**
-     * MIN.
-     *
-     * MIN returns the value of the element of the values passed that has the smallest value,
-     *        with negative numbers considered smaller than positive numbers.
-     *
-     * Excel Function:
-     *        MIN(value1[,value2[, ...]])
-     *
-     * @Deprecated 1.17.0
-     *
-     * @param mixed ...$args Data values
-     *
-     * @return float
-     *
-     *@see Statistical\Minimum::min()
-     *      Use the min() method in the Statistical\Minimum class instead
-     */
-    public static function MIN(...$args)
-    {
-        return Minimum::min(...$args);
-    }
-
-    /**
-     * MINA.
-     *
-     * Returns the smallest value in a list of arguments, including numbers, text, and logical values
-     *
-     * Excel Function:
-     *        MINA(value1[,value2[, ...]])
-     *
-     * @Deprecated 1.17.0
-     *
-     * @param mixed ...$args Data values
-     *
-     * @return float
-     *
-     *@see Statistical\Minimum::minA()
-     *      Use the minA() method in the Statistical\Minimum class instead
-     */
-    public static function MINA(...$args)
-    {
-        return Minimum::minA(...$args);
-    }
-
-    /**
-     * MINIFS.
-     *
-     * Returns the minimum value within a range of cells that contain numbers within the list of arguments
-     *
-     * Excel Function:
-     *        MINIFS(min_range, criteria_range1, criteria1, [criteria_range2, criteria2], ...)
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Statistical\Conditional::MINIFS()
-     *      Use the MINIFS() method in the Statistical\Conditional class instead
-     *
-     * @param mixed $args Data range and criterias
-     *
-     * @return float
-     */
-    public static function MINIFS(...$args)
-    {
-        return Conditional::MINIFS(...$args);
-    }
-
-    /**
-     * MODE.
-     *
-     * Returns the most frequently occurring, or repetitive, value in an array or range of data
-     *
-     * Excel Function:
-     *        MODE(value1[,value2[, ...]])
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Averages::mode()
-     *      Use the mode() method in the Statistical\Averages class instead
-     *
-     * @param mixed ...$args Data values
-     *
-     * @return float|string The result, or a string containing an error
-     */
-    public static function MODE(...$args)
-    {
-        return Statistical\Averages::mode(...$args);
-    }
-
-    /**
-     * NEGBINOMDIST.
-     *
-     * Returns the negative binomial distribution. NEGBINOMDIST returns the probability that
-     *        there will be number_f failures before the number_s-th success, when the constant
-     *        probability of a success is probability_s. This function is similar to the binomial
-     *        distribution, except that the number of successes is fixed, and the number of trials is
-     *        variable. Like the binomial, trials are assumed to be independent.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Distributions\Binomial::negative()
-     *      Use the negative() method in the Statistical\Distributions\Binomial class instead
-     *
-     * @param mixed $failures Number of Failures
-     * @param mixed $successes Threshold number of Successes
-     * @param mixed $probability Probability of success on each trial
-     *
-     * @return float|string The result, or a string containing an error
-     */
-    public static function NEGBINOMDIST($failures, $successes, $probability)
-    {
-        return Statistical\Distributions\Binomial::negative($failures, $successes, $probability);
-    }
-
-    /**
-     * NORMDIST.
-     *
-     * Returns the normal distribution for the specified mean and standard deviation. This
-     * function has a very wide range of applications in statistics, including hypothesis
-     * testing.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Distributions\Normal::distribution()
-     *      Use the distribution() method in the Statistical\Distributions\Normal class instead
-     *
-     * @param mixed $value
-     * @param mixed $mean Mean Value
-     * @param mixed $stdDev Standard Deviation
-     * @param mixed $cumulative
-     *
-     * @return float|string The result, or a string containing an error
-     */
-    public static function NORMDIST($value, $mean, $stdDev, $cumulative)
-    {
-        return Statistical\Distributions\Normal::distribution($value, $mean, $stdDev, $cumulative);
-    }
-
-    /**
-     * NORMINV.
-     *
-     * Returns the inverse of the normal cumulative distribution for the specified mean and standard deviation.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Distributions\Normal::inverse()
-     *      Use the inverse() method in the Statistical\Distributions\Normal class instead
-     *
-     * @param mixed $probability
-     * @param mixed $mean Mean Value
-     * @param mixed $stdDev Standard Deviation
-     *
-     * @return float|string The result, or a string containing an error
-     */
-    public static function NORMINV($probability, $mean, $stdDev)
-    {
-        return Statistical\Distributions\Normal::inverse($probability, $mean, $stdDev);
-    }
-
-    /**
-     * NORMSDIST.
-     *
-     * Returns the standard normal cumulative distribution function. The distribution has
-     * a mean of 0 (zero) and a standard deviation of one. Use this function in place of a
-     * table of standard normal curve areas.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Distributions\StandardNormal::cumulative()
-     *      Use the cumulative() method in the Statistical\Distributions\StandardNormal class instead
-     *
-     * @param mixed $value
-     *
-     * @return float|string The result, or a string containing an error
-     */
-    public static function NORMSDIST($value)
-    {
-        return Statistical\Distributions\StandardNormal::cumulative($value);
-    }
-
-    /**
-     * NORM.S.DIST.
-     *
-     * Returns the standard normal cumulative distribution function. The distribution has
-     * a mean of 0 (zero) and a standard deviation of one. Use this function in place of a
-     * table of standard normal curve areas.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Distributions\StandardNormal::distribution()
-     *      Use the distribution() method in the Statistical\Distributions\StandardNormal class instead
-     *
-     * @param mixed $value
-     * @param mixed $cumulative
-     *
-     * @return float|string The result, or a string containing an error
-     */
-    public static function NORMSDIST2($value, $cumulative)
-    {
-        return Statistical\Distributions\StandardNormal::distribution($value, $cumulative);
-    }
-
-    /**
-     * NORMSINV.
-     *
-     * Returns the inverse of the standard normal cumulative distribution
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Distributions\StandardNormal::inverse()
-     *      Use the inverse() method in the Statistical\Distributions\StandardNormal class instead
-     *
-     * @param mixed $value
-     *
-     * @return float|string The result, or a string containing an error
-     */
-    public static function NORMSINV($value)
-    {
-        return Statistical\Distributions\StandardNormal::inverse($value);
-    }
-
-    /**
-     * PERCENTILE.
-     *
-     * Returns the nth percentile of values in a range..
-     *
-     * Excel Function:
-     *        PERCENTILE(value1[,value2[, ...]],entry)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Percentiles::PERCENTILE()
-     * Use the PERCENTILE() method in the Statistical\Percentiles class instead
-     *
-     * @param mixed $args Data values
-     *
-     * @return float|string The result, or a string containing an error
-     */
-    public static function PERCENTILE(...$args)
-    {
-        return Statistical\Percentiles::PERCENTILE(...$args);
-    }
-
-    /**
-     * PERCENTRANK.
-     *
-     * Returns the rank of a value in a data set as a percentage of the data set.
-     * Note that the returned rank is simply rounded to the appropriate significant digits,
-     *      rather than floored (as MS Excel), so value 3 for a value set of  1, 2, 3, 4 will return
-     *      0.667 rather than 0.666
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Percentiles::PERCENTRANK()
-     * Use the PERCENTRANK() method in the Statistical\Percentiles class instead
-     *
-     * @param mixed $valueSet An array of, or a reference to, a list of numbers
-     * @param mixed $value the number whose rank you want to find
-     * @param mixed $significance the number of significant digits for the returned percentage value
-     *
-     * @return float|string (string if result is an error)
-     */
-    public static function PERCENTRANK($valueSet, $value, $significance = 3)
-    {
-        return Statistical\Percentiles::PERCENTRANK($valueSet, $value, $significance);
-    }
-
-    /**
-     * PERMUT.
-     *
-     * Returns the number of permutations for a given number of objects that can be
-     *        selected from number objects. A permutation is any set or subset of objects or
-     *        events where internal order is significant. Permutations are different from
-     *        combinations, for which the internal order is not significant. Use this function
-     *        for lottery-style probability calculations.
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Statistical\Permutations::PERMUT()
-     * Use the PERMUT() method in the Statistical\Permutations class instead
-     *
-     * @param int $numObjs Number of different objects
-     * @param int $numInSet Number of objects in each permutation
-     *
-     * @return float|int|string Number of permutations, or a string containing an error
-     */
-    public static function PERMUT($numObjs, $numInSet)
-    {
-        return Permutations::PERMUT($numObjs, $numInSet);
-    }
-
-    /**
-     * POISSON.
-     *
-     * Returns the Poisson distribution. A common application of the Poisson distribution
-     * is predicting the number of events over a specific time, such as the number of
-     * cars arriving at a toll plaza in 1 minute.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Distributions\Poisson::distribution()
-     * Use the distribution() method in the Statistical\Distributions\Poisson class instead
-     *
-     * @param mixed $value
-     * @param mixed $mean Mean Value
-     * @param mixed $cumulative
-     *
-     * @return float|string The result, or a string containing an error
-     */
-    public static function POISSON($value, $mean, $cumulative)
-    {
-        return Statistical\Distributions\Poisson::distribution($value, $mean, $cumulative);
-    }
-
-    /**
-     * QUARTILE.
-     *
-     * Returns the quartile of a data set.
-     *
-     * Excel Function:
-     *        QUARTILE(value1[,value2[, ...]],entry)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Percentiles::QUARTILE()
-     * Use the QUARTILE() method in the Statistical\Percentiles class instead
-     *
-     * @param mixed $args Data values
-     *
-     * @return float|string The result, or a string containing an error
-     */
-    public static function QUARTILE(...$args)
-    {
-        return Statistical\Percentiles::QUARTILE(...$args);
-    }
-
-    /**
-     * RANK.
-     *
-     * Returns the rank of a number in a list of numbers.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Percentiles::RANK()
-     * Use the RANK() method in the Statistical\Percentiles class instead
-     *
-     * @param mixed $value the number whose rank you want to find
-     * @param mixed $valueSet An array of, or a reference to, a list of numbers
-     * @param mixed $order Order to sort the values in the value set
-     *
-     * @return float|string The result, or a string containing an error
-     */
-    public static function RANK($value, $valueSet, $order = 0)
-    {
-        return Statistical\Percentiles::RANK($value, $valueSet, $order);
-    }
-
-    /**
-     * RSQ.
-     *
-     * Returns the square of the Pearson product moment correlation coefficient through data points in known_y's and known_x's.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Trends::RSQ()
-     *      Use the RSQ() method in the Statistical\Trends class instead
-     *
-     * @param mixed[] $yValues Data Series Y
-     * @param mixed[] $xValues Data Series X
-     *
-     * @return float|string The result, or a string containing an error
-     */
-    public static function RSQ($yValues, $xValues)
-    {
-        return Trends::RSQ($yValues, $xValues);
-    }
-
-    /**
-     * SKEW.
-     *
-     * Returns the skewness of a distribution. Skewness characterizes the degree of asymmetry
-     * of a distribution around its mean. Positive skewness indicates a distribution with an
-     * asymmetric tail extending toward more positive values. Negative skewness indicates a
-     * distribution with an asymmetric tail extending toward more negative values.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Deviations::skew()
-     *      Use the skew() method in the Statistical\Deviations class instead
-     *
-     * @param array ...$args Data Series
-     *
-     * @return float|string The result, or a string containing an error
-     */
-    public static function SKEW(...$args)
-    {
-        return Statistical\Deviations::skew(...$args);
-    }
-
-    /**
-     * SLOPE.
-     *
-     * Returns the slope of the linear regression line through data points in known_y's and known_x's.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Trends::SLOPE()
-     *      Use the SLOPE() method in the Statistical\Trends class instead
-     *
-     * @param mixed[] $yValues Data Series Y
-     * @param mixed[] $xValues Data Series X
-     *
-     * @return float|string The result, or a string containing an error
-     */
-    public static function SLOPE($yValues, $xValues)
-    {
-        return Trends::SLOPE($yValues, $xValues);
-    }
-
-    /**
-     * SMALL.
-     *
-     * Returns the nth smallest value in a data set. You can use this function to
-     *        select a value based on its relative standing.
-     *
-     * Excel Function:
-     *        SMALL(value1[,value2[, ...]],entry)
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Size::small()
-     *      Use the small() method in the Statistical\Size class instead
-     *
-     * @param mixed $args Data values
-     *
-     * @return float|string The result, or a string containing an error
-     */
-    public static function SMALL(...$args)
-    {
-        return Statistical\Size::small(...$args);
-    }
-
-    /**
-     * STANDARDIZE.
-     *
-     * Returns a normalized value from a distribution characterized by mean and standard_dev.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Standardize::execute()
-     *      Use the execute() method in the Statistical\Standardize class instead
-     *
-     * @param float $value Value to normalize
-     * @param float $mean Mean Value
-     * @param float $stdDev Standard Deviation
-     *
-     * @return float|string Standardized value, or a string containing an error
-     */
-    public static function STANDARDIZE($value, $mean, $stdDev)
-    {
-        return Statistical\Standardize::execute($value, $mean, $stdDev);
-    }
-
-    /**
-     * STDEV.
-     *
-     * Estimates standard deviation based on a sample. The standard deviation is a measure of how
-     *        widely values are dispersed from the average value (the mean).
-     *
-     * Excel Function:
-     *        STDEV(value1[,value2[, ...]])
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Statistical\StandardDeviations::STDEV()
-     *      Use the STDEV() method in the Statistical\StandardDeviations class instead
-     *
-     * @param mixed ...$args Data values
-     *
-     * @return float|string The result, or a string containing an error
-     */
-    public static function STDEV(...$args)
-    {
-        return StandardDeviations::STDEV(...$args);
-    }
-
-    /**
-     * STDEVA.
-     *
-     * Estimates standard deviation based on a sample, including numbers, text, and logical values
-     *
-     * Excel Function:
-     *        STDEVA(value1[,value2[, ...]])
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Statistical\StandardDeviations::STDEVA()
-     *      Use the STDEVA() method in the Statistical\StandardDeviations class instead
-     *
-     * @param mixed ...$args Data values
-     *
-     * @return float|string
-     */
-    public static function STDEVA(...$args)
-    {
-        return StandardDeviations::STDEVA(...$args);
-    }
-
-    /**
-     * STDEVP.
-     *
-     * Calculates standard deviation based on the entire population
-     *
-     * Excel Function:
-     *        STDEVP(value1[,value2[, ...]])
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Statistical\StandardDeviations::STDEVP()
-     *      Use the STDEVP() method in the Statistical\StandardDeviations class instead
-     *
-     * @param mixed ...$args Data values
-     *
-     * @return float|string
-     */
-    public static function STDEVP(...$args)
-    {
-        return StandardDeviations::STDEVP(...$args);
-    }
-
-    /**
-     * STDEVPA.
-     *
-     * Calculates standard deviation based on the entire population, including numbers, text, and logical values
-     *
-     * Excel Function:
-     *        STDEVPA(value1[,value2[, ...]])
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Statistical\StandardDeviations::STDEVPA()
-     *      Use the STDEVPA() method in the Statistical\StandardDeviations class instead
-     *
-     * @param mixed ...$args Data values
-     *
-     * @return float|string
-     */
-    public static function STDEVPA(...$args)
-    {
-        return StandardDeviations::STDEVPA(...$args);
-    }
-
-    /**
-     * STEYX.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Trends::STEYX()
-     *      Use the STEYX() method in the Statistical\Trends class instead
-     *
-     * Returns the standard error of the predicted y-value for each x in the regression.
-     *
-     * @param mixed[] $yValues Data Series Y
-     * @param mixed[] $xValues Data Series X
-     *
-     * @return float|string
-     */
-    public static function STEYX($yValues, $xValues)
-    {
-        return Trends::STEYX($yValues, $xValues);
-    }
-
-    /**
-     * TDIST.
-     *
-     * Returns the probability of Student's T distribution.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Distributions\StudentT::distribution()
-     *      Use the distribution() method in the Statistical\Distributions\StudentT class instead
-     *
-     * @param float $value Value for the function
-     * @param float $degrees degrees of freedom
-     * @param float $tails number of tails (1 or 2)
-     *
-     * @return float|string The result, or a string containing an error
-     */
-    public static function TDIST($value, $degrees, $tails)
-    {
-        return Statistical\Distributions\StudentT::distribution($value, $degrees, $tails);
-    }
-
-    /**
-     * TINV.
-     *
-     * Returns the one-tailed probability of the Student-T distribution.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Distributions\StudentT::inverse()
-     *      Use the inverse() method in the Statistical\Distributions\StudentT class instead
-     *
-     * @param float $probability Probability for the function
-     * @param float $degrees degrees of freedom
-     *
-     * @return float|string The result, or a string containing an error
-     */
-    public static function TINV($probability, $degrees)
-    {
-        return Statistical\Distributions\StudentT::inverse($probability, $degrees);
-    }
-
-    /**
-     * TREND.
-     *
-     * Returns values along a linear Trend
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Trends::TREND()
-     *      Use the TREND() method in the Statistical\Trends class instead
-     *
-     * @param mixed[] $yValues Data Series Y
-     * @param mixed[] $xValues Data Series X
-     * @param mixed[] $newValues Values of X for which we want to find Y
-     * @param bool $const a logical value specifying whether to force the intersect to equal 0
-     *
-     * @return float[]
-     */
-    public static function TREND($yValues, $xValues = [], $newValues = [], $const = true)
-    {
-        return Trends::TREND($yValues, $xValues, $newValues, $const);
-    }
-
-    /**
-     * TRIMMEAN.
-     *
-     * Returns the mean of the interior of a data set. TRIMMEAN calculates the mean
-     *        taken by excluding a percentage of data points from the top and bottom tails
-     *        of a data set.
-     *
-     * Excel Function:
-     *        TRIMEAN(value1[,value2[, ...]], $discard)
-     *
-     * @Deprecated 1.18.0
-     *
-     *@see Statistical\Averages\Mean::trim()
-     *      Use the trim() method in the Statistical\Averages\Mean class instead
-     *
-     * @param mixed $args Data values
-     *
-     * @return float|string
-     */
-    public static function TRIMMEAN(...$args)
-    {
-        return Statistical\Averages\Mean::trim(...$args);
-    }
-
-    /**
-     * VARFunc.
-     *
-     * Estimates variance based on a sample.
-     *
-     * Excel Function:
-     *        VAR(value1[,value2[, ...]])
-     *
-     * @Deprecated 1.17.0
-     *
-     *@see Statistical\Variances::VAR()
-     *      Use the VAR() method in the Statistical\Variances class instead
-     *
-     * @param mixed ...$args Data values
-     *
-     * @return float|string (string if result is an error)
-     */
-    public static function VARFunc(...$args)
-    {
-        return Variances::VAR(...$args);
-    }
-
-    /**
-     * VARA.
-     *
-     * Estimates variance based on a sample, including numbers, text, and logical values
-     *
-     * Excel Function:
-     *        VARA(value1[,value2[, ...]])
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Statistical\Variances::VARA()
-     *      Use the VARA() method in the Statistical\Variances class instead
-     *
-     * @param mixed ...$args Data values
-     *
-     * @return float|string (string if result is an error)
-     */
-    public static function VARA(...$args)
-    {
-        return Variances::VARA(...$args);
-    }
-
-    /**
-     * VARP.
-     *
-     * Calculates variance based on the entire population
-     *
-     * Excel Function:
-     *        VARP(value1[,value2[, ...]])
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Statistical\Variances::VARP()
-     *      Use the VARP() method in the Statistical\Variances class instead
-     *
-     * @param mixed ...$args Data values
-     *
-     * @return float|string (string if result is an error)
-     */
-    public static function VARP(...$args)
-    {
-        return Variances::VARP(...$args);
-    }
-
-    /**
-     * VARPA.
-     *
-     * Calculates variance based on the entire population, including numbers, text, and logical values
-     *
-     * Excel Function:
-     *        VARPA(value1[,value2[, ...]])
-     *
-     * @Deprecated 1.17.0
-     *
-     * @see Statistical\Variances::VARPA()
-     *      Use the VARPA() method in the Statistical\Variances class instead
-     *
-     * @param mixed ...$args Data values
-     *
-     * @return float|string (string if result is an error)
-     */
-    public static function VARPA(...$args)
-    {
-        return Variances::VARPA(...$args);
-    }
-
-    /**
-     * WEIBULL.
-     *
-     * Returns the Weibull distribution. Use this distribution in reliability
-     * analysis, such as calculating a device's mean time to failure.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Distributions\Weibull::distribution()
-     *      Use the distribution() method in the Statistical\Distributions\Weibull class instead
-     *
-     * @param float $value
-     * @param float $alpha Alpha Parameter
-     * @param float $beta Beta Parameter
-     * @param bool $cumulative
-     *
-     * @return float|string (string if result is an error)
-     */
-    public static function WEIBULL($value, $alpha, $beta, $cumulative)
-    {
-        return Statistical\Distributions\Weibull::distribution($value, $alpha, $beta, $cumulative);
-    }
-
-    /**
-     * ZTEST.
-     *
-     * Returns the one-tailed P-value of a z-test.
-     *
-     * For a given hypothesized population mean, x, Z.TEST returns the probability that the sample mean would be
-     *     greater than the average of observations in the data set (array) — that is, the observed sample mean.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Statistical\Distributions\StandardNormal::zTest()
-     *      Use the zTest() method in the Statistical\Distributions\StandardNormal class instead
-     *
-     * @param float $dataSet
-     * @param float $m0 Alpha Parameter
-     * @param float $sigma Beta Parameter
-     *
-     * @return float|string (string if result is an error)
-     */
-    public static function ZTEST($dataSet, $m0, $sigma = null)
-    {
-        return Statistical\Distributions\StandardNormal::zTest($dataSet, $m0, $sigma);
-    }
-}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/AggregateBase.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/AggregateBase.php
index 75c012dc32..a10b278092 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/AggregateBase.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/AggregateBase.php
@@ -10,38 +10,47 @@ abstract class AggregateBase
      * MS Excel does not count Booleans if passed as cell values, but they are counted if passed as literals.
      * OpenOffice Calc always counts Booleans.
      * Gnumeric never counts Booleans.
-     *
-     * @param mixed $arg
-     * @param mixed $k
-     *
-     * @return int|mixed
      */
-    protected static function testAcceptedBoolean($arg, $k)
+    protected static function testAcceptedBoolean(mixed $arg, mixed $k): mixed
     {
-        if (
+        if (!is_bool($arg)) {
+            return $arg;
+        }
+        if (Functions::getCompatibilityMode() === Functions::COMPATIBILITY_GNUMERIC) {
+            return $arg;
+        }
+        if (Functions::getCompatibilityMode() === Functions::COMPATIBILITY_OPENOFFICE) {
+            return (int) $arg;
+        }
+        if (!Functions::isCellValue($k)) {
+            return (int) $arg;
+        }
+        /*if (
             (is_bool($arg)) &&
             ((!Functions::isCellValue($k) && (Functions::getCompatibilityMode() === Functions::COMPATIBILITY_EXCEL)) ||
                 (Functions::getCompatibilityMode() === Functions::COMPATIBILITY_OPENOFFICE))
         ) {
             $arg = (int) $arg;
-        }
+        }*/
 
         return $arg;
     }
 
-    /**
-     * @param mixed $arg
-     * @param mixed $k
-     *
-     * @return bool
-     */
-    protected static function isAcceptedCountable($arg, $k)
+    protected static function isAcceptedCountable(mixed $arg, mixed $k, bool $countNull = false): bool
     {
-        if (
-            ((is_numeric($arg)) && (!is_string($arg))) ||
-            ((is_numeric($arg)) && (!Functions::isCellValue($k)) &&
-                (Functions::getCompatibilityMode() !== Functions::COMPATIBILITY_GNUMERIC))
-        ) {
+        if ($countNull && $arg === null && !Functions::isCellValue($k) && Functions::getCompatibilityMode() !== Functions::COMPATIBILITY_GNUMERIC) {
+            return true;
+        }
+        if (!is_numeric($arg)) {
+            return false;
+        }
+        if (!is_string($arg)) {
+            return true;
+        }
+        if (!Functions::isCellValue($k) && Functions::getCompatibilityMode() === Functions::COMPATIBILITY_OPENOFFICE) {
+            return true;
+        }
+        if (!Functions::isCellValue($k) && Functions::getCompatibilityMode() !== Functions::COMPATIBILITY_GNUMERIC) {
             return true;
         }
 
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Averages.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Averages.php
index 1a627e99d6..998e14df5d 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Averages.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Averages.php
@@ -3,6 +3,7 @@
 namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class Averages extends AggregateBase
 {
@@ -19,18 +20,18 @@ class Averages extends AggregateBase
      *
      * @return float|string (string if result is an error)
      */
-    public static function averageDeviations(...$args)
+    public static function averageDeviations(mixed ...$args): string|float
     {
         $aArgs = Functions::flattenArrayIndexed($args);
 
         // Return value
-        $returnValue = 0;
+        $returnValue = 0.0;
 
         $aMean = self::average(...$args);
-        if ($aMean === Functions::DIV0()) {
-            return Functions::NAN();
-        } elseif ($aMean === Functions::VALUE()) {
-            return Functions::VALUE();
+        if ($aMean === ExcelError::DIV0()) {
+            return ExcelError::NAN();
+        } elseif ($aMean === ExcelError::VALUE()) {
+            return ExcelError::VALUE();
         }
 
         $aCount = 0;
@@ -40,7 +41,7 @@ public static function averageDeviations(...$args)
             // Strings containing numeric values are only counted if they are string literals (not cell values)
             //    and then only in MS Excel and in Open Office, not in Gnumeric
             if ((is_string($arg)) && (!is_numeric($arg)) && (!Functions::isCellValue($k))) {
-                return Functions::VALUE();
+                return ExcelError::VALUE();
             }
             if (self::isAcceptedCountable($arg, $k)) {
                 $returnValue += abs($arg - $aMean);
@@ -50,7 +51,7 @@ public static function averageDeviations(...$args)
 
         // Return
         if ($aCount === 0) {
-            return Functions::DIV0();
+            return ExcelError::DIV0();
         }
 
         return $returnValue / $aCount;
@@ -66,9 +67,9 @@ public static function averageDeviations(...$args)
      *
      * @param mixed ...$args Data values
      *
-     * @return float|string (string if result is an error)
+     * @return float|int|string (string if result is an error)
      */
-    public static function average(...$args)
+    public static function average(mixed ...$args): string|int|float
     {
         $returnValue = $aCount = 0;
 
@@ -79,7 +80,7 @@ public static function average(...$args)
             // Strings containing numeric values are only counted if they are string literals (not cell values)
             //    and then only in MS Excel and in Open Office, not in Gnumeric
             if ((is_string($arg)) && (!is_numeric($arg)) && (!Functions::isCellValue($k))) {
-                return Functions::VALUE();
+                return ExcelError::VALUE();
             }
             if (self::isAcceptedCountable($arg, $k)) {
                 $returnValue += $arg;
@@ -92,7 +93,7 @@ public static function average(...$args)
             return $returnValue / $aCount;
         }
 
-        return Functions::DIV0();
+        return ExcelError::DIV0();
     }
 
     /**
@@ -105,34 +106,33 @@ public static function average(...$args)
      *
      * @param mixed ...$args Data values
      *
-     * @return float|string (string if result is an error)
+     * @return float|int|string (string if result is an error)
      */
-    public static function averageA(...$args)
+    public static function averageA(mixed ...$args): string|int|float
     {
         $returnValue = null;
 
         $aCount = 0;
         // Loop through arguments
         foreach (Functions::flattenArrayIndexed($args) as $k => $arg) {
-            if ((is_bool($arg)) && (!Functions::isMatrixValue($k))) {
+            if (is_numeric($arg)) {
+                // do nothing
+            } elseif (is_bool($arg)) {
+                $arg = (int) $arg;
+            } elseif (!Functions::isMatrixValue($k)) {
+                $arg = 0;
             } else {
-                if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) && ($arg != '')))) {
-                    if (is_bool($arg)) {
-                        $arg = (int) $arg;
-                    } elseif (is_string($arg)) {
-                        $arg = 0;
-                    }
-                    $returnValue += $arg;
-                    ++$aCount;
-                }
+                return ExcelError::VALUE();
             }
+            $returnValue += $arg;
+            ++$aCount;
         }
 
         if ($aCount > 0) {
             return $returnValue / $aCount;
         }
 
-        return Functions::DIV0();
+        return ExcelError::DIV0();
     }
 
     /**
@@ -147,11 +147,11 @@ public static function averageA(...$args)
      *
      * @return float|string The result, or a string containing an error
      */
-    public static function median(...$args)
+    public static function median(mixed ...$args): float|string
     {
         $aArgs = Functions::flattenArray($args);
 
-        $returnValue = Functions::NAN();
+        $returnValue = ExcelError::NAN();
 
         $aArgs = self::filterArguments($aArgs);
         $valueCount = count($aArgs);
@@ -181,9 +181,9 @@ public static function median(...$args)
      *
      * @return float|string The result, or a string containing an error
      */
-    public static function mode(...$args)
+    public static function mode(mixed ...$args): float|string
     {
-        $returnValue = Functions::NA();
+        $returnValue = ExcelError::NA();
 
         // Loop through arguments
         $aArgs = Functions::flattenArray($args);
@@ -196,22 +196,22 @@ public static function mode(...$args)
         return $returnValue;
     }
 
-    protected static function filterArguments($args)
+    protected static function filterArguments(array $args): array
     {
         return array_filter(
             $args,
-            function ($value) {
+            function ($value): bool {
                 // Is it a numeric value?
-                return  (is_numeric($value)) && (!is_string($value));
+                return is_numeric($value) && (!is_string($value));
             }
         );
     }
 
-    //
-    //    Special variant of array_count_values that isn't limited to strings and integers,
-    //        but can work with floating point numbers as values
-    //
-    private static function modeCalc($data)
+    /**
+     * Special variant of array_count_values that isn't limited to strings and integers,
+     * but can work with floating point numbers as values.
+     */
+    private static function modeCalc(array $data): float|string
     {
         $frequencyArray = [];
         $index = 0;
@@ -251,7 +251,7 @@ private static function modeCalc($data)
         }
 
         if ($maxfreq <= 1) {
-            return Functions::NA();
+            return ExcelError::NA();
         }
 
         return $maxfreqdatum;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Averages/Mean.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Averages/Mean.php
index d4d0c7ee50..2051675c34 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Averages/Mean.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Averages/Mean.php
@@ -3,6 +3,7 @@
 namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Averages;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
 use PhpOffice\PhpSpreadsheet\Calculation\Statistical\Averages;
 use PhpOffice\PhpSpreadsheet\Calculation\Statistical\Counts;
@@ -21,10 +22,8 @@ class Mean
      *        GEOMEAN(value1[,value2[, ...]])
      *
      * @param mixed ...$args Data values
-     *
-     * @return float|string
      */
-    public static function geometric(...$args)
+    public static function geometric(mixed ...$args): float|int|string
     {
         $aArgs = Functions::flattenArray($args);
 
@@ -36,7 +35,7 @@ public static function geometric(...$args)
             }
         }
 
-        return Functions::NAN();
+        return ExcelError::NAN();
     }
 
     /**
@@ -49,15 +48,13 @@ public static function geometric(...$args)
      *        HARMEAN(value1[,value2[, ...]])
      *
      * @param mixed ...$args Data values
-     *
-     * @return float|string
      */
-    public static function harmonic(...$args)
+    public static function harmonic(mixed ...$args): string|float|int
     {
         // Loop through arguments
         $aArgs = Functions::flattenArray($args);
         if (Minimum::min($aArgs) < 0) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         $returnValue = 0;
@@ -66,7 +63,7 @@ public static function harmonic(...$args)
             // Is it a numeric value?
             if ((is_numeric($arg)) && (!is_string($arg))) {
                 if ($arg <= 0) {
-                    return Functions::NAN();
+                    return ExcelError::NAN();
                 }
                 $returnValue += (1 / $arg);
                 ++$aCount;
@@ -78,7 +75,7 @@ public static function harmonic(...$args)
             return 1 / ($returnValue / $aCount);
         }
 
-        return Functions::NA();
+        return ExcelError::NA();
     }
 
     /**
@@ -92,10 +89,8 @@ public static function harmonic(...$args)
      *        TRIMEAN(value1[,value2[, ...]], $discard)
      *
      * @param mixed $args Data values
-     *
-     * @return float|string
      */
-    public static function trim(...$args)
+    public static function trim(mixed ...$args): float|string
     {
         $aArgs = Functions::flattenArray($args);
 
@@ -104,7 +99,7 @@ public static function trim(...$args)
 
         if ((is_numeric($percent)) && (!is_string($percent))) {
             if (($percent < 0) || ($percent > 1)) {
-                return Functions::NAN();
+                return ExcelError::NAN();
             }
 
             $mArgs = [];
@@ -126,6 +121,6 @@ public static function trim(...$args)
             return Averages::average($mArgs);
         }
 
-        return Functions::VALUE();
+        return ExcelError::VALUE();
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Conditional.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Conditional.php
index 51e6b00430..ae98c60802 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Conditional.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Conditional.php
@@ -7,6 +7,7 @@
 use PhpOffice\PhpSpreadsheet\Calculation\Database\DMax;
 use PhpOffice\PhpSpreadsheet\Calculation\Database\DMin;
 use PhpOffice\PhpSpreadsheet\Calculation\Database\DSum;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception as CalcException;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 
 class Conditional
@@ -23,14 +24,15 @@ class Conditional
      * Excel Function:
      *        AVERAGEIF(range,condition[, average_range])
      *
-     * @param mixed[] $range Data values
-     * @param string $condition the criteria that defines which cells will be checked
-     * @param mixed[] $averageRange Data values
-     *
-     * @return null|float|string
+     * @param mixed $range Data values
+     * @param null|array|string $condition the criteria that defines which cells will be checked
+     * @param mixed $averageRange Data values
      */
-    public static function AVERAGEIF($range, $condition, $averageRange = [])
+    public static function AVERAGEIF(mixed $range, null|array|string $condition, mixed $averageRange = []): null|int|float|string
     {
+        if (!is_array($range) || !is_array($averageRange) || array_key_exists(0, $range) || array_key_exists(0, $averageRange)) {
+            throw new CalcException('Must specify range of cells, not any kind of literal');
+        }
         $database = self::databaseFromRangeAndValue($range, $averageRange);
         $condition = [[self::CONDITION_COLUMN_NAME, self::VALUE_COLUMN_NAME], [$condition, null]];
 
@@ -46,16 +48,19 @@ public static function AVERAGEIF($range, $condition, $averageRange = [])
      *        AVERAGEIFS(average_range, criteria_range1, criteria1, [criteria_range2, criteria2]…)
      *
      * @param mixed $args Pairs of Ranges and Criteria
-     *
-     * @return null|float|string
      */
-    public static function AVERAGEIFS(...$args)
+    public static function AVERAGEIFS(mixed ...$args): null|int|float|string
     {
         if (empty($args)) {
             return 0.0;
         } elseif (count($args) === 3) {
             return self::AVERAGEIF($args[1], $args[2], $args[0]);
         }
+        foreach ($args as $arg) {
+            if (is_array($arg) && array_key_exists(0, $arg)) {
+                throw new CalcException('Must specify range of cells, not any kind of literal');
+            }
+        }
 
         $conditions = self::buildConditionSetForValueRange(...$args);
         $database = self::buildDatabaseWithValueRange(...$args);
@@ -72,24 +77,20 @@ public static function AVERAGEIFS(...$args)
      *        COUNTIF(range,condition)
      *
      * @param mixed[] $range Data values
-     * @param string $condition the criteria that defines which cells will be counted
-     *
-     * @return int
+     * @param null|array|string $condition the criteria that defines which cells will be counted
      */
-    public static function COUNTIF($range, $condition)
+    public static function COUNTIF(array $range, null|array|string $condition): string|int
     {
         // Filter out any empty values that shouldn't be included in a COUNT
         $range = array_filter(
             Functions::flattenArray($range),
-            function ($value) {
-                return $value !== null && $value !== '';
-            }
+            fn ($value): bool => $value !== null && $value !== ''
         );
 
         $range = array_merge([[self::CONDITION_COLUMN_NAME]], array_chunk($range, 1));
         $condition = array_merge([[self::CONDITION_COLUMN_NAME]], [[$condition]]);
 
-        return DCount::evaluate($range, null, $condition);
+        return DCount::evaluate($range, null, $condition, false);
     }
 
     /**
@@ -101,10 +102,8 @@ function ($value) {
      *        COUNTIFS(criteria_range1, criteria1, [criteria_range2, criteria2]…)
      *
      * @param mixed $args Pairs of Ranges and Criteria
-     *
-     * @return int
      */
-    public static function COUNTIFS(...$args)
+    public static function COUNTIFS(mixed ...$args): int|string
     {
         if (empty($args)) {
             return 0;
@@ -115,7 +114,7 @@ public static function COUNTIFS(...$args)
         $database = self::buildDatabase(...$args);
         $conditions = self::buildConditionSet(...$args);
 
-        return DCount::evaluate($database, null, $conditions);
+        return DCount::evaluate($database, null, $conditions, false);
     }
 
     /**
@@ -127,10 +126,8 @@ public static function COUNTIFS(...$args)
      *        MAXIFS(max_range, criteria_range1, criteria1, [criteria_range2, criteria2]…)
      *
      * @param mixed $args Pairs of Ranges and Criteria
-     *
-     * @return null|float|string
      */
-    public static function MAXIFS(...$args)
+    public static function MAXIFS(mixed ...$args): null|float|string
     {
         if (empty($args)) {
             return 0.0;
@@ -139,7 +136,7 @@ public static function MAXIFS(...$args)
         $conditions = self::buildConditionSetForValueRange(...$args);
         $database = self::buildDatabaseWithValueRange(...$args);
 
-        return DMax::evaluate($database, self::VALUE_COLUMN_NAME, $conditions);
+        return DMax::evaluate($database, self::VALUE_COLUMN_NAME, $conditions, false);
     }
 
     /**
@@ -151,10 +148,8 @@ public static function MAXIFS(...$args)
      *        MINIFS(min_range, criteria_range1, criteria1, [criteria_range2, criteria2]…)
      *
      * @param mixed $args Pairs of Ranges and Criteria
-     *
-     * @return null|float|string
      */
-    public static function MINIFS(...$args)
+    public static function MINIFS(mixed ...$args): null|float|string
     {
         if (empty($args)) {
             return 0.0;
@@ -163,7 +158,7 @@ public static function MINIFS(...$args)
         $conditions = self::buildConditionSetForValueRange(...$args);
         $database = self::buildDatabaseWithValueRange(...$args);
 
-        return DMin::evaluate($database, self::VALUE_COLUMN_NAME, $conditions);
+        return DMin::evaluate($database, self::VALUE_COLUMN_NAME, $conditions, false);
     }
 
     /**
@@ -174,13 +169,9 @@ public static function MINIFS(...$args)
      * Excel Function:
      *        SUMIF(range, criteria, [sum_range])
      *
-     * @param mixed $range Data values
-     * @param mixed $sumRange
-     * @param mixed $condition
-     *
-     * @return float|string
+     * @param array $range Data values
      */
-    public static function SUMIF($range, $condition, $sumRange = [])
+    public static function SUMIF(array $range, mixed $condition, array $sumRange = []): null|float|string
     {
         $database = self::databaseFromRangeAndValue($range, $sumRange);
         $condition = [[self::CONDITION_COLUMN_NAME, self::VALUE_COLUMN_NAME], [$condition, null]];
@@ -197,10 +188,8 @@ public static function SUMIF($range, $condition, $sumRange = [])
      *        SUMIFS(average_range, criteria_range1, criteria1, [criteria_range2, criteria2]…)
      *
      * @param mixed $args Pairs of Ranges and Criteria
-     *
-     * @return null|float|string
      */
-    public static function SUMIFS(...$args)
+    public static function SUMIFS(mixed ...$args): null|float|string
     {
         if (empty($args)) {
             return 0.0;
@@ -214,6 +203,7 @@ public static function SUMIFS(...$args)
         return DSum::evaluate($database, self::VALUE_COLUMN_NAME, $conditions);
     }
 
+    /** @param array $args */
     private static function buildConditionSet(...$args): array
     {
         $conditions = self::buildConditions(1, ...$args);
@@ -221,15 +211,14 @@ private static function buildConditionSet(...$args): array
         return array_map(null, ...$conditions);
     }
 
+    /** @param array $args */
     private static function buildConditionSetForValueRange(...$args): array
     {
         $conditions = self::buildConditions(2, ...$args);
 
         if (count($conditions) === 1) {
             return array_map(
-                function ($value) {
-                    return [$value];
-                },
+                fn ($value): array => [$value],
                 $conditions[0]
             );
         }
@@ -237,6 +226,7 @@ function ($value) {
         return array_map(null, ...$conditions);
     }
 
+    /** @param array $args */
     private static function buildConditions(int $startOffset, ...$args): array
     {
         $conditions = [];
@@ -251,6 +241,7 @@ private static function buildConditions(int $startOffset, ...$args): array
         return $conditions;
     }
 
+    /** @param array $args */
     private static function buildDatabase(...$args): array
     {
         $database = [];
@@ -258,6 +249,7 @@ private static function buildDatabase(...$args): array
         return self::buildDataSet(0, $database, ...$args);
     }
 
+    /** @param array $args */
     private static function buildDatabaseWithValueRange(...$args): array
     {
         $database = [];
@@ -269,6 +261,7 @@ private static function buildDatabaseWithValueRange(...$args): array
         return self::buildDataSet(1, $database, ...$args);
     }
 
+    /** @param array $args */
     private static function buildDataSet(int $startOffset, array $database, ...$args): array
     {
         $pairCount = 1;
@@ -293,11 +286,7 @@ private static function databaseFromRangeAndValue(array $range, array $valueRang
             $valueRange = $range;
         }
 
-        $database = array_map(
-            null,
-            array_merge([self::CONDITION_COLUMN_NAME], $range),
-            array_merge([self::VALUE_COLUMN_NAME], $valueRange)
-        );
+        $database = array_map(null, array_merge([self::CONDITION_COLUMN_NAME], $range), array_merge([self::VALUE_COLUMN_NAME], $valueRange));
 
         return $database;
     }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Confidence.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Confidence.php
index c59c3a9ecd..492438add9 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Confidence.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Confidence.php
@@ -2,27 +2,35 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class Confidence
 {
+    use ArrayEnabled;
+
     /**
      * CONFIDENCE.
      *
      * Returns the confidence interval for a population mean
      *
      * @param mixed $alpha As a float
+     *                      Or can be an array of values
      * @param mixed $stdDev Standard Deviation as a float
+     *                      Or can be an array of values
      * @param mixed $size As an integer
+     *                      Or can be an array of values
      *
-     * @return float|string
+     * @return array|float|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function CONFIDENCE($alpha, $stdDev, $size)
+    public static function CONFIDENCE(mixed $alpha, mixed $stdDev, mixed $size)
     {
-        $alpha = Functions::flattenSingleValue($alpha);
-        $stdDev = Functions::flattenSingleValue($stdDev);
-        $size = Functions::flattenSingleValue($size);
+        if (is_array($alpha) || is_array($stdDev) || is_array($size)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $alpha, $stdDev, $size);
+        }
 
         try {
             $alpha = StatisticalValidations::validateFloat($alpha);
@@ -33,9 +41,11 @@ public static function CONFIDENCE($alpha, $stdDev, $size)
         }
 
         if (($alpha <= 0) || ($alpha >= 1) || ($stdDev <= 0) || ($size < 1)) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
+        /** @var float $temp */
+        $temp = Distributions\StandardNormal::inverse(1 - $alpha / 2);
 
-        return Distributions\StandardNormal::inverse(1 - $alpha / 2) * $stdDev / sqrt($size);
+        return Functions::scalar($temp * $stdDev / sqrt($size));
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Counts.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Counts.php
index 13e7af7991..20ed634928 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Counts.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Counts.php
@@ -2,6 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
 
+use PhpOffice\PhpSpreadsheet\Calculation\Exception as CalcException;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 
 class Counts extends AggregateBase
@@ -15,10 +16,8 @@ class Counts extends AggregateBase
      *        COUNT(value1[,value2[, ...]])
      *
      * @param mixed ...$args Data values
-     *
-     * @return int
      */
-    public static function COUNT(...$args)
+    public static function COUNT(mixed ...$args): int
     {
         $returnValue = 0;
 
@@ -29,7 +28,7 @@ public static function COUNT(...$args)
             // Is it a numeric value?
             // Strings containing numeric values are only counted if they are string literals (not cell values)
             //    and then only in MS Excel and in Open Office, not in Gnumeric
-            if (self::isAcceptedCountable($arg, $k)) {
+            if (self::isAcceptedCountable($arg, $k, true)) {
                 ++$returnValue;
             }
         }
@@ -46,10 +45,8 @@ public static function COUNT(...$args)
      *        COUNTA(value1[,value2[, ...]])
      *
      * @param mixed ...$args Data values
-     *
-     * @return int
      */
-    public static function COUNTA(...$args)
+    public static function COUNTA(mixed ...$args): int
     {
         $returnValue = 0;
 
@@ -73,16 +70,20 @@ public static function COUNTA(...$args)
      * Excel Function:
      *        COUNTBLANK(value1[,value2[, ...]])
      *
-     * @param mixed ...$args Data values
-     *
-     * @return int
+     * @param mixed $range Data values
      */
-    public static function COUNTBLANK(...$args)
+    public static function COUNTBLANK(mixed $range): int
     {
+        if ($range === null) {
+            return 1;
+        }
+        if (!is_array($range) || array_key_exists(0, $range)) {
+            throw new CalcException('Must specify range of cells, not any kind of literal');
+        }
         $returnValue = 0;
 
         // Loop through arguments
-        $aArgs = Functions::flattenArray($args);
+        $aArgs = Functions::flattenArray($range);
         foreach ($aArgs as $arg) {
             // Is it a blank cell?
             if (($arg === null) || ((is_string($arg)) && ($arg == ''))) {
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Deviations.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Deviations.php
index 1b64fe2cfa..77c0d38f60 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Deviations.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Deviations.php
@@ -3,6 +3,7 @@
 namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class Deviations
 {
@@ -15,16 +16,14 @@ class Deviations
      *        DEVSQ(value1[,value2[, ...]])
      *
      * @param mixed ...$args Data values
-     *
-     * @return float|string
      */
-    public static function sumSquares(...$args)
+    public static function sumSquares(mixed ...$args): string|float
     {
         $aArgs = Functions::flattenArrayIndexed($args);
 
         $aMean = Averages::average($aArgs);
         if (!is_numeric($aMean)) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         // Return value
@@ -33,9 +32,9 @@ public static function sumSquares(...$args)
         foreach ($aArgs as $k => $arg) {
             // Is it a numeric value?
             if (
-                (is_bool($arg)) &&
-                ((!Functions::isCellValue($k)) ||
-                    (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE))
+                (is_bool($arg))
+                && ((!Functions::isCellValue($k))
+                    || (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE))
             ) {
                 $arg = (int) $arg;
             }
@@ -45,7 +44,7 @@ public static function sumSquares(...$args)
             }
         }
 
-        return $aCount === 0 ? Functions::VALUE() : $returnValue;
+        return $aCount === 0 ? ExcelError::VALUE() : $returnValue;
     }
 
     /**
@@ -57,17 +56,15 @@ public static function sumSquares(...$args)
      * relatively flat distribution.
      *
      * @param array ...$args Data Series
-     *
-     * @return float|string
      */
-    public static function kurtosis(...$args)
+    public static function kurtosis(...$args): string|int|float
     {
         $aArgs = Functions::flattenArrayIndexed($args);
         $mean = Averages::average($aArgs);
         if (!is_numeric($mean)) {
-            return Functions::DIV0();
+            return ExcelError::DIV0();
         }
-        $stdDev = StandardDeviations::STDEV($aArgs);
+        $stdDev = (float) StandardDeviations::STDEV($aArgs);
 
         if ($stdDev > 0) {
             $count = $summer = 0;
@@ -84,13 +81,13 @@ public static function kurtosis(...$args)
             }
 
             if ($count > 3) {
-                return $summer * ($count * ($count + 1) /
-                        (($count - 1) * ($count - 2) * ($count - 3))) - (3 * ($count - 1) ** 2 /
-                        (($count - 2) * ($count - 3)));
+                return $summer * ($count * ($count + 1)
+                        / (($count - 1) * ($count - 2) * ($count - 3))) - (3 * ($count - 1) ** 2
+                        / (($count - 2) * ($count - 3)));
             }
         }
 
-        return Functions::DIV0();
+        return ExcelError::DIV0();
     }
 
     /**
@@ -103,18 +100,18 @@ public static function kurtosis(...$args)
      *
      * @param array ...$args Data Series
      *
-     * @return float|string The result, or a string containing an error
+     * @return float|int|string The result, or a string containing an error
      */
-    public static function skew(...$args)
+    public static function skew(...$args): string|int|float
     {
         $aArgs = Functions::flattenArrayIndexed($args);
         $mean = Averages::average($aArgs);
         if (!is_numeric($mean)) {
-            return Functions::DIV0();
+            return ExcelError::DIV0();
         }
         $stdDev = StandardDeviations::STDEV($aArgs);
         if ($stdDev === 0.0 || is_string($stdDev)) {
-            return Functions::DIV0();
+            return ExcelError::DIV0();
         }
 
         $count = $summer = 0;
@@ -122,7 +119,7 @@ public static function skew(...$args)
         foreach ($aArgs as $k => $arg) {
             if ((is_bool($arg)) && (!Functions::isMatrixValue($k))) {
             } elseif (!is_numeric($arg)) {
-                return Functions::VALUE();
+                return ExcelError::VALUE();
             } else {
                 // Is it a numeric value?
                 if ((is_numeric($arg)) && (!is_string($arg))) {
@@ -136,6 +133,6 @@ public static function skew(...$args)
             return $summer * ($count / (($count - 1) * ($count - 2)));
         }
 
-        return Functions::DIV0();
+        return ExcelError::DIV0();
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Beta.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Beta.php
index 63e6eb4d65..16817ce6a5 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Beta.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Beta.php
@@ -2,11 +2,15 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class Beta
 {
+    use ArrayEnabled;
+
     private const MAX_ITERATIONS = 256;
 
     private const LOG_GAMMA_X_MAX_VALUE = 2.55e305;
@@ -19,20 +23,27 @@ class Beta
      * Returns the beta distribution.
      *
      * @param mixed $value Float value at which you want to evaluate the distribution
+     *                      Or can be an array of values
      * @param mixed $alpha Parameter to the distribution as a float
+     *                      Or can be an array of values
      * @param mixed $beta Parameter to the distribution as a float
+     *                      Or can be an array of values
      * @param mixed $rMin as an float
+     *                      Or can be an array of values
      * @param mixed $rMax as an float
+     *                      Or can be an array of values
      *
-     * @return float|string
+     * @return array|float|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function distribution($value, $alpha, $beta, $rMin = 0.0, $rMax = 1.0)
+    public static function distribution(mixed $value, mixed $alpha, mixed $beta, mixed $rMin = 0.0, mixed $rMax = 1.0): array|string|float
     {
-        $value = Functions::flattenSingleValue($value);
-        $alpha = Functions::flattenSingleValue($alpha);
-        $beta = Functions::flattenSingleValue($beta);
-        $rMin = ($rMin === null) ? 0.0 : Functions::flattenSingleValue($rMin);
-        $rMax = ($rMax === null) ? 1.0 : Functions::flattenSingleValue($rMax);
+        if (is_array($value) || is_array($alpha) || is_array($beta) || is_array($rMin) || is_array($rMax)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $alpha, $beta, $rMin, $rMax);
+        }
+
+        $rMin = $rMin ?? 0.0;
+        $rMax = $rMax ?? 1.0;
 
         try {
             $value = DistributionValidations::validateFloat($value);
@@ -50,7 +61,7 @@ public static function distribution($value, $alpha, $beta, $rMin = 0.0, $rMax =
             $rMax = $tmp;
         }
         if (($value < $rMin) || ($value > $rMax) || ($alpha <= 0) || ($beta <= 0) || ($rMin == $rMax)) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         $value -= $rMin;
@@ -65,20 +76,27 @@ public static function distribution($value, $alpha, $beta, $rMin = 0.0, $rMax =
      * Returns the inverse of the Beta distribution.
      *
      * @param mixed $probability Float probability at which you want to evaluate the distribution
+     *                      Or can be an array of values
      * @param mixed $alpha Parameter to the distribution as a float
+     *                      Or can be an array of values
      * @param mixed $beta Parameter to the distribution as a float
+     *                      Or can be an array of values
      * @param mixed $rMin Minimum value as a float
+     *                      Or can be an array of values
      * @param mixed $rMax Maximum value as a float
+     *                      Or can be an array of values
      *
-     * @return float|string
+     * @return array|float|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function inverse($probability, $alpha, $beta, $rMin = 0.0, $rMax = 1.0)
+    public static function inverse(mixed $probability, mixed $alpha, mixed $beta, mixed $rMin = 0.0, mixed $rMax = 1.0): array|string|float
     {
-        $probability = Functions::flattenSingleValue($probability);
-        $alpha = Functions::flattenSingleValue($alpha);
-        $beta = Functions::flattenSingleValue($beta);
-        $rMin = ($rMin === null) ? 0.0 : Functions::flattenSingleValue($rMin);
-        $rMax = ($rMax === null) ? 1.0 : Functions::flattenSingleValue($rMax);
+        if (is_array($probability) || is_array($alpha) || is_array($beta) || is_array($rMin) || is_array($rMax)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $probability, $alpha, $beta, $rMin, $rMax);
+        }
+
+        $rMin = $rMin ?? 0.0;
+        $rMax = $rMax ?? 1.0;
 
         try {
             $probability = DistributionValidations::validateProbability($probability);
@@ -96,19 +114,17 @@ public static function inverse($probability, $alpha, $beta, $rMin = 0.0, $rMax =
             $rMax = $tmp;
         }
         if (($alpha <= 0) || ($beta <= 0) || ($rMin == $rMax) || ($probability <= 0.0)) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         return self::calculateInverse($probability, $alpha, $beta, $rMin, $rMax);
     }
 
-    /**
-     * @return float|string
-     */
-    private static function calculateInverse(float $probability, float $alpha, float $beta, float $rMin, float $rMax)
+    private static function calculateInverse(float $probability, float $alpha, float $beta, float $rMin, float $rMax): string|float
     {
         $a = 0;
         $b = 2;
+        $guess = ($a + $b) / 2;
 
         $i = 0;
         while ((($b - $a) > Functions::PRECISION) && (++$i <= self::MAX_ITERATIONS)) {
@@ -124,7 +140,7 @@ private static function calculateInverse(float $probability, float $alpha, float
         }
 
         if ($i === self::MAX_ITERATIONS) {
-            return Functions::NA();
+            return ExcelError::NA();
         }
 
         return round($rMin + $guess * ($rMax - $rMin), 12);
@@ -163,11 +179,12 @@ public static function incompleteBeta(float $x, float $p, float $q): float
     }
 
     // Function cache for logBeta function
-    private static $logBetaCacheP = 0.0;
 
-    private static $logBetaCacheQ = 0.0;
+    private static float $logBetaCacheP = 0.0;
+
+    private static float $logBetaCacheQ = 0.0;
 
-    private static $logBetaCacheResult = 0.0;
+    private static float $logBetaCacheResult = 0.0;
 
     /**
      * The natural logarithm of the beta function.
@@ -247,6 +264,7 @@ private static function betaFraction(float $x, float $p, float $q): float
         return $frac;
     }
 
+    /*
     private static function betaValue(float $a, float $b): float
     {
         return (Gamma::gammaValue($a) * Gamma::gammaValue($b)) /
@@ -257,4 +275,5 @@ private static function regularizedIncompleteBeta(float $value, float $a, float
     {
         return self::incompleteBeta($value, $a, $b) / self::betaValue($a, $b);
     }
+    */
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Binomial.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Binomial.php
index 9631236ab8..2ce3fd5a9d 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Binomial.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Binomial.php
@@ -2,12 +2,16 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Calculation\MathTrig\Combinations;
 
 class Binomial
 {
+    use ArrayEnabled;
+
     /**
      * BINOMDIST.
      *
@@ -18,17 +22,22 @@ class Binomial
      *        babies born are male.
      *
      * @param mixed $value Integer number of successes in trials
+     *                      Or can be an array of values
      * @param mixed $trials Integer umber of trials
+     *                      Or can be an array of values
      * @param mixed $probability Probability of success on each trial as a float
+     *                      Or can be an array of values
      * @param mixed $cumulative Boolean value indicating if we want the cdf (true) or the pdf (false)
+     *                      Or can be an array of values
      *
-     * @return float|string
+     * @return array|float|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function distribution($value, $trials, $probability, $cumulative)
+    public static function distribution(mixed $value, mixed $trials, mixed $probability, mixed $cumulative)
     {
-        $value = Functions::flattenSingleValue($value);
-        $trials = Functions::flattenSingleValue($trials);
-        $probability = Functions::flattenSingleValue($probability);
+        if (is_array($value) || is_array($trials) || is_array($probability) || is_array($cumulative)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $trials, $probability, $cumulative);
+        }
 
         try {
             $value = DistributionValidations::validateInt($value);
@@ -40,14 +49,16 @@ public static function distribution($value, $trials, $probability, $cumulative)
         }
 
         if (($value < 0) || ($value > $trials)) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         if ($cumulative) {
             return self::calculateCumulativeBinomial($value, $trials, $probability);
         }
+        /** @var float $comb */
+        $comb = Combinations::withoutRepetition($trials, $value);
 
-        return Combinations::withoutRepetition($trials, $value) * $probability ** $value
+        return $comb * $probability ** $value
             * (1 - $probability) ** ($trials - $value);
     }
 
@@ -58,19 +69,25 @@ public static function distribution($value, $trials, $probability, $cumulative)
      *     of trials falling into a specified range.
      *
      * @param mixed $trials Integer number of trials
+     *                      Or can be an array of values
      * @param mixed $probability Probability of success on each trial as a float
+     *                      Or can be an array of values
      * @param mixed $successes The integer number of successes in trials
+     *                      Or can be an array of values
      * @param mixed $limit Upper limit for successes in trials as null, or an integer
      *                           If null, then this will indicate the same as the number of Successes
+     *                      Or can be an array of values
      *
-     * @return float|string
+     * @return array|float|int|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function range($trials, $probability, $successes, $limit = null)
+    public static function range(mixed $trials, mixed $probability, mixed $successes, mixed $limit = null): array|string|float|int
     {
-        $trials = Functions::flattenSingleValue($trials);
-        $probability = Functions::flattenSingleValue($probability);
-        $successes = Functions::flattenSingleValue($successes);
-        $limit = ($limit === null) ? $successes : Functions::flattenSingleValue($limit);
+        if (is_array($trials) || is_array($probability) || is_array($successes) || is_array($limit)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $trials, $probability, $successes, $limit);
+        }
+
+        $limit = $limit ?? $successes;
 
         try {
             $trials = DistributionValidations::validateInt($trials);
@@ -82,15 +99,17 @@ public static function range($trials, $probability, $successes, $limit = null)
         }
 
         if (($successes < 0) || ($successes > $trials)) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
         if (($limit < 0) || ($limit > $trials) || $limit < $successes) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         $summer = 0;
         for ($i = $successes; $i <= $limit; ++$i) {
-            $summer += Combinations::withoutRepetition($trials, $i) * $probability ** $i
+            /** @var float $comb */
+            $comb = Combinations::withoutRepetition($trials, $i);
+            $summer += $comb * $probability ** $i
                 * (1 - $probability) ** ($trials - $i);
         }
 
@@ -107,19 +126,24 @@ public static function range($trials, $probability, $successes, $limit = null)
      *        variable. Like the binomial, trials are assumed to be independent.
      *
      * @param mixed $failures Number of Failures as an integer
+     *                      Or can be an array of values
      * @param mixed $successes Threshold number of Successes as an integer
+     *                      Or can be an array of values
      * @param mixed $probability Probability of success on each trial as a float
+     *                      Or can be an array of values
      *
-     * @return float|string The result, or a string containing an error
+     * @return array|float|string The result, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      *
      * TODO Add support for the cumulative flag not present for NEGBINOMDIST, but introduced for NEGBINOM.DIST
      *      The cumulative default should be false to reflect the behaviour of NEGBINOMDIST
      */
-    public static function negative($failures, $successes, $probability)
+    public static function negative(mixed $failures, mixed $successes, mixed $probability): array|string|float
     {
-        $failures = Functions::flattenSingleValue($failures);
-        $successes = Functions::flattenSingleValue($successes);
-        $probability = Functions::flattenSingleValue($probability);
+        if (is_array($failures) || is_array($successes) || is_array($probability)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $failures, $successes, $probability);
+        }
 
         try {
             $failures = DistributionValidations::validateInt($failures);
@@ -130,35 +154,41 @@ public static function negative($failures, $successes, $probability)
         }
 
         if (($failures < 0) || ($successes < 1)) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
         if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) {
             if (($failures + $successes - 1) <= 0) {
-                return Functions::NAN();
+                return ExcelError::NAN();
             }
         }
+        /** @var float $comb */
+        $comb = Combinations::withoutRepetition($failures + $successes - 1, $successes - 1);
 
-        return (Combinations::withoutRepetition($failures + $successes - 1, $successes - 1))
+        return $comb
             * ($probability ** $successes) * ((1 - $probability) ** $failures);
     }
 
     /**
-     * CRITBINOM.
+     * BINOM.INV.
      *
      * Returns the smallest value for which the cumulative binomial distribution is greater
      *        than or equal to a criterion value
      *
      * @param mixed $trials number of Bernoulli trials as an integer
+     *                      Or can be an array of values
      * @param mixed $probability probability of a success on each trial as a float
+     *                      Or can be an array of values
      * @param mixed $alpha criterion value as a float
+     *                      Or can be an array of values
      *
-     * @return int|string
+     * @return array|int|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function inverse($trials, $probability, $alpha)
+    public static function inverse(mixed $trials, mixed $probability, mixed $alpha): array|string|int
     {
-        $trials = Functions::flattenSingleValue($trials);
-        $probability = Functions::flattenSingleValue($probability);
-        $alpha = Functions::flattenSingleValue($alpha);
+        if (is_array($trials) || is_array($probability) || is_array($alpha)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $trials, $probability, $alpha);
+        }
 
         try {
             $trials = DistributionValidations::validateInt($trials);
@@ -169,9 +199,9 @@ public static function inverse($trials, $probability, $alpha)
         }
 
         if ($trials < 0) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         } elseif (($alpha < 0.0) || ($alpha > 1.0)) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         $successes = 0;
@@ -186,14 +216,13 @@ public static function inverse($trials, $probability, $alpha)
         return $successes;
     }
 
-    /**
-     * @return float|int
-     */
-    private static function calculateCumulativeBinomial(int $value, int $trials, float $probability)
+    private static function calculateCumulativeBinomial(int $value, int $trials, float $probability): float|int
     {
         $summer = 0;
         for ($i = 0; $i <= $value; ++$i) {
-            $summer += Combinations::withoutRepetition($trials, $i) * $probability ** $i
+            /** @var float $comb */
+            $comb = Combinations::withoutRepetition($trials, $i);
+            $summer += $comb * $probability ** $i
                 * (1 - $probability) ** ($trials - $i);
         }
 
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/ChiSquared.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/ChiSquared.php
index 5165d6397e..49b0dfc924 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/ChiSquared.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/ChiSquared.php
@@ -2,12 +2,14 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class ChiSquared
 {
-    private const MAX_ITERATIONS = 256;
+    use ArrayEnabled;
 
     private const EPS = 2.22e-16;
 
@@ -17,14 +19,18 @@ class ChiSquared
      * Returns the one-tailed probability of the chi-squared distribution.
      *
      * @param mixed $value Float value for which we want the probability
+     *                      Or can be an array of values
      * @param mixed $degrees Integer degrees of freedom
+     *                      Or can be an array of values
      *
-     * @return float|string
+     * @return array|float|int|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function distributionRightTail($value, $degrees)
+    public static function distributionRightTail(mixed $value, mixed $degrees): array|string|int|float
     {
-        $value = Functions::flattenSingleValue($value);
-        $degrees = Functions::flattenSingleValue($degrees);
+        if (is_array($value) || is_array($degrees)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $degrees);
+        }
 
         try {
             $value = DistributionValidations::validateFloat($value);
@@ -34,14 +40,14 @@ public static function distributionRightTail($value, $degrees)
         }
 
         if ($degrees < 1) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
         if ($value < 0) {
             if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) {
                 return 1;
             }
 
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         return 1 - (Gamma::incompleteGamma($degrees / 2, $value / 2) / Gamma::gammaValue($degrees / 2));
@@ -53,16 +59,20 @@ public static function distributionRightTail($value, $degrees)
      * Returns the one-tailed probability of the chi-squared distribution.
      *
      * @param mixed $value Float value for which we want the probability
+     *                      Or can be an array of values
      * @param mixed $degrees Integer degrees of freedom
+     *                      Or can be an array of values
      * @param mixed $cumulative Boolean value indicating if we want the cdf (true) or the pdf (false)
+     *                      Or can be an array of values
      *
-     * @return float|string
+     * @return array|float|int|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function distributionLeftTail($value, $degrees, $cumulative)
+    public static function distributionLeftTail(mixed $value, mixed $degrees, mixed $cumulative): array|string|int|float
     {
-        $value = Functions::flattenSingleValue($value);
-        $degrees = Functions::flattenSingleValue($degrees);
-        $cumulative = Functions::flattenSingleValue($cumulative);
+        if (is_array($value) || is_array($degrees) || is_array($cumulative)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $degrees, $cumulative);
+        }
 
         try {
             $value = DistributionValidations::validateFloat($value);
@@ -73,22 +83,24 @@ public static function distributionLeftTail($value, $degrees, $cumulative)
         }
 
         if ($degrees < 1) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
         if ($value < 0) {
             if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) {
                 return 1;
             }
 
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         if ($cumulative === true) {
-            return 1 - self::distributionRightTail($value, $degrees);
+            $temp = self::distributionRightTail($value, $degrees);
+
+            return 1 - (is_numeric($temp) ? $temp : 0);
         }
 
-        return (($value ** (($degrees / 2) - 1) * exp(-$value / 2))) /
-            ((2 ** ($degrees / 2)) * Gamma::gammaValue($degrees / 2));
+        return ($value ** (($degrees / 2) - 1) * exp(-$value / 2))
+            / ((2 ** ($degrees / 2)) * Gamma::gammaValue($degrees / 2));
     }
 
     /**
@@ -97,14 +109,18 @@ public static function distributionLeftTail($value, $degrees, $cumulative)
      * Returns the inverse of the right-tailed probability of the chi-squared distribution.
      *
      * @param mixed $probability Float probability at which you want to evaluate the distribution
+     *                      Or can be an array of values
      * @param mixed $degrees Integer degrees of freedom
+     *                      Or can be an array of values
      *
-     * @return float|string
+     * @return array|float|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function inverseRightTail($probability, $degrees)
+    public static function inverseRightTail(mixed $probability, mixed $degrees)
     {
-        $probability = Functions::flattenSingleValue($probability);
-        $degrees = Functions::flattenSingleValue($degrees);
+        if (is_array($probability) || is_array($degrees)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $probability, $degrees);
+        }
 
         try {
             $probability = DistributionValidations::validateProbability($probability);
@@ -114,10 +130,10 @@ public static function inverseRightTail($probability, $degrees)
         }
 
         if ($degrees < 1) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
-        $callback = function ($value) use ($degrees) {
+        $callback = function ($value) use ($degrees): float {
             return 1 - (Gamma::incompleteGamma($degrees / 2, $value / 2)
                     / Gamma::gammaValue($degrees / 2));
         };
@@ -133,14 +149,18 @@ public static function inverseRightTail($probability, $degrees)
      * Returns the inverse of the left-tailed probability of the chi-squared distribution.
      *
      * @param mixed $probability Float probability at which you want to evaluate the distribution
+     *                      Or can be an array of values
      * @param mixed $degrees Integer degrees of freedom
+     *                      Or can be an array of values
      *
-     * @return float|string
+     * @return array|float|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function inverseLeftTail($probability, $degrees)
+    public static function inverseLeftTail(mixed $probability, mixed $degrees): array|string|float
     {
-        $probability = Functions::flattenSingleValue($probability);
-        $degrees = Functions::flattenSingleValue($degrees);
+        if (is_array($probability) || is_array($degrees)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $probability, $degrees);
+        }
 
         try {
             $probability = DistributionValidations::validateProbability($probability);
@@ -150,7 +170,7 @@ public static function inverseLeftTail($probability, $degrees)
         }
 
         if ($degrees < 1) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         return self::inverseLeftTailCalculation($probability, $degrees);
@@ -165,35 +185,33 @@ public static function inverseLeftTail($probability, $degrees)
      *
      * @param mixed $actual an array of observed frequencies
      * @param mixed $expected an array of expected frequencies
-     *
-     * @return float|string
      */
-    public static function test($actual, $expected)
+    public static function test(mixed $actual, mixed $expected): float|string
     {
         $rows = count($actual);
         $actual = Functions::flattenArray($actual);
         $expected = Functions::flattenArray($expected);
-        $columns = count($actual) / $rows;
+        $columns = intdiv(count($actual), $rows);
 
         $countActuals = count($actual);
         $countExpected = count($expected);
         if ($countActuals !== $countExpected || $countActuals === 1) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         $result = 0.0;
         for ($i = 0; $i < $countActuals; ++$i) {
             if ($expected[$i] == 0.0) {
-                return Functions::DIV0();
+                return ExcelError::DIV0();
             } elseif ($expected[$i] < 0.0) {
-                return Functions::NAN();
+                return ExcelError::NAN();
             }
             $result += (($actual[$i] - $expected[$i]) ** 2) / $expected[$i];
         }
 
         $degrees = self::degrees($rows, $columns);
 
-        $result = self::distributionRightTail($result, $degrees);
+        $result = Functions::scalar(self::distributionRightTail($result, $degrees));
 
         return $result;
     }
@@ -237,12 +255,12 @@ private static function inverseLeftTailCalculation(float $probability, int $degr
         return $chi2;
     }
 
-    private static function pchisq($chi2, $degrees)
+    private static function pchisq(float $chi2, int $degrees): float
     {
         return self::gammp($degrees, 0.5 * $chi2);
     }
 
-    private static function gammp($n, $x)
+    private static function gammp(int $n, float $x): float
     {
         if ($x < 0.5 * $n + 1) {
             return self::gser($n, $x);
@@ -255,8 +273,9 @@ private static function gammp($n, $x)
     // series representation. Algorithm from numerical recipe.
     // Assume that n is a positive integer and x>0, won't check arguments.
     // Relative error controlled by the eps parameter
-    private static function gser($n, $x)
+    private static function gser(int $n, float $x): float
     {
+        /** @var float $gln */
         $gln = Gamma::ln($n / 2);
         $a = 0.5 * $n;
         $ap = $a;
@@ -278,8 +297,9 @@ private static function gser($n, $x)
     // its continued fraction representation. Algorithm from numerical recipe.
     // Assume that n is a postive integer and x>0, won't check arguments.
     // Relative error controlled by the eps parameter
-    private static function gcf($n, $x)
+    private static function gcf(int $n, float $x): float
     {
+        /** @var float $gln */
         $gln = Gamma::ln($n / 2);
         $a = 0.5 * $n;
         $b = $x + 1 - $a;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/DistributionValidations.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/DistributionValidations.php
index 57ef00af04..61c62f6aec 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/DistributionValidations.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/DistributionValidations.php
@@ -3,20 +3,17 @@
 namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Calculation\Statistical\StatisticalValidations;
 
 class DistributionValidations extends StatisticalValidations
 {
-    /**
-     * @param mixed $probability
-     */
-    public static function validateProbability($probability): float
+    public static function validateProbability(mixed $probability): float
     {
         $probability = self::validateFloat($probability);
 
         if ($probability < 0.0 || $probability > 1.0) {
-            throw new Exception(Functions::NAN());
+            throw new Exception(ExcelError::NAN());
         }
 
         return $probability;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Exponential.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Exponential.php
index b3fd9460c1..55264737fd 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Exponential.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Exponential.php
@@ -2,11 +2,14 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class Exponential
 {
+    use ArrayEnabled;
+
     /**
      * EXPONDIST.
      *
@@ -15,16 +18,20 @@ class Exponential
      *        use EXPONDIST to determine the probability that the process takes at most 1 minute.
      *
      * @param mixed $value Float value for which we want the probability
+     *                      Or can be an array of values
      * @param mixed $lambda The parameter value as a float
+     *                      Or can be an array of values
      * @param mixed $cumulative Boolean value indicating if we want the cdf (true) or the pdf (false)
+     *                      Or can be an array of values
      *
-     * @return float|string
+     * @return array|float|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function distribution($value, $lambda, $cumulative)
+    public static function distribution(mixed $value, mixed $lambda, mixed $cumulative): array|string|float
     {
-        $value = Functions::flattenSingleValue($value);
-        $lambda = Functions::flattenSingleValue($lambda);
-        $cumulative = Functions::flattenSingleValue($cumulative);
+        if (is_array($value) || is_array($lambda) || is_array($cumulative)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $lambda, $cumulative);
+        }
 
         try {
             $value = DistributionValidations::validateFloat($value);
@@ -35,7 +42,7 @@ public static function distribution($value, $lambda, $cumulative)
         }
 
         if (($value < 0) || ($lambda < 0)) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         if ($cumulative === true) {
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/F.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/F.php
index 54b1950d6d..aa7a19dcf2 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/F.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/F.php
@@ -2,11 +2,14 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class F
 {
+    use ArrayEnabled;
+
     /**
      * F.DIST.
      *
@@ -16,18 +19,22 @@ class F
      *        if the variability in the females is different from that found in the males.
      *
      * @param mixed $value Float value for which we want the probability
+     *                      Or can be an array of values
      * @param mixed $u The numerator degrees of freedom as an integer
+     *                      Or can be an array of values
      * @param mixed $v The denominator degrees of freedom as an integer
+     *                      Or can be an array of values
      * @param mixed $cumulative Boolean value indicating if we want the cdf (true) or the pdf (false)
+     *                      Or can be an array of values
      *
-     * @return float|string
+     * @return array|float|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function distribution($value, $u, $v, $cumulative)
+    public static function distribution(mixed $value, mixed $u, mixed $v, mixed $cumulative): array|string|float
     {
-        $value = Functions::flattenSingleValue($value);
-        $u = Functions::flattenSingleValue($u);
-        $v = Functions::flattenSingleValue($v);
-        $cumulative = Functions::flattenSingleValue($cumulative);
+        if (is_array($value) || is_array($u) || is_array($v) || is_array($cumulative)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $u, $v, $cumulative);
+        }
 
         try {
             $value = DistributionValidations::validateFloat($value);
@@ -39,7 +46,7 @@ public static function distribution($value, $u, $v, $cumulative)
         }
 
         if ($value < 0 || $u < 1 || $v < 1) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         if ($cumulative) {
@@ -48,9 +55,9 @@ public static function distribution($value, $u, $v, $cumulative)
             return Beta::incompleteBeta($adjustedValue, $u / 2, $v / 2);
         }
 
-        return (Gamma::gammaValue(($v + $u) / 2) /
-                (Gamma::gammaValue($u / 2) * Gamma::gammaValue($v / 2))) *
-            (($u / $v) ** ($u / 2)) *
-            (($value ** (($u - 2) / 2)) / ((1 + ($u / $v) * $value) ** (($u + $v) / 2)));
+        return (Gamma::gammaValue(($v + $u) / 2)
+                / (Gamma::gammaValue($u / 2) * Gamma::gammaValue($v / 2)))
+            * (($u / $v) ** ($u / 2))
+            * (($value ** (($u - 2) / 2)) / ((1 + ($u / $v) * $value) ** (($u + $v) / 2)));
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Fisher.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Fisher.php
index 923bf02d90..9ad10dbc74 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Fisher.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Fisher.php
@@ -2,11 +2,14 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class Fisher
 {
+    use ArrayEnabled;
+
     /**
      * FISHER.
      *
@@ -15,12 +18,16 @@ class Fisher
      *        testing on the correlation coefficient.
      *
      * @param mixed $value Float value for which we want the probability
+     *                      Or can be an array of values
      *
-     * @return float|string
+     * @return array|float|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function distribution($value)
+    public static function distribution(mixed $value): array|string|float
     {
-        $value = Functions::flattenSingleValue($value);
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
 
         try {
             DistributionValidations::validateFloat($value);
@@ -29,7 +36,7 @@ public static function distribution($value)
         }
 
         if (($value <= -1) || ($value >= 1)) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         return 0.5 * log((1 + $value) / (1 - $value));
@@ -43,12 +50,16 @@ public static function distribution($value)
      *        FISHERINV(y) = x.
      *
      * @param mixed $probability Float probability at which you want to evaluate the distribution
+     *                      Or can be an array of values
      *
-     * @return float|string
+     * @return array|float|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function inverse($probability)
+    public static function inverse(mixed $probability): array|string|float
     {
-        $probability = Functions::flattenSingleValue($probability);
+        if (is_array($probability)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $probability);
+        }
 
         try {
             DistributionValidations::validateFloat($probability);
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Gamma.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Gamma.php
index 2c6ed670a8..babe937d34 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Gamma.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Gamma.php
@@ -2,23 +2,31 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class Gamma extends GammaBase
 {
+    use ArrayEnabled;
+
     /**
      * GAMMA.
      *
      * Return the gamma function value.
      *
      * @param mixed $value Float value for which we want the probability
+     *                      Or can be an array of values
      *
-     * @return float|string The result, or a string containing an error
+     * @return array|float|string The result, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function gamma($value)
+    public static function gamma(mixed $value): array|string|float
     {
-        $value = Functions::flattenSingleValue($value);
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
 
         try {
             $value = DistributionValidations::validateFloat($value);
@@ -27,7 +35,7 @@ public static function gamma($value)
         }
 
         if ((((int) $value) == ((float) $value)) && $value <= 0.0) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         return self::gammaValue($value);
@@ -39,17 +47,22 @@ public static function gamma($value)
      * Returns the gamma distribution.
      *
      * @param mixed $value Float Value at which you want to evaluate the distribution
+     *                      Or can be an array of values
      * @param mixed $a Parameter to the distribution as a float
+     *                      Or can be an array of values
      * @param mixed $b Parameter to the distribution as a float
+     *                      Or can be an array of values
      * @param mixed $cumulative Boolean value indicating if we want the cdf (true) or the pdf (false)
+     *                      Or can be an array of values
      *
-     * @return float|string
+     * @return array|float|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function distribution($value, $a, $b, $cumulative)
+    public static function distribution(mixed $value, mixed $a, mixed $b, mixed $cumulative)
     {
-        $value = Functions::flattenSingleValue($value);
-        $a = Functions::flattenSingleValue($a);
-        $b = Functions::flattenSingleValue($b);
+        if (is_array($value) || is_array($a) || is_array($b) || is_array($cumulative)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $a, $b, $cumulative);
+        }
 
         try {
             $value = DistributionValidations::validateFloat($value);
@@ -61,7 +74,7 @@ public static function distribution($value, $a, $b, $cumulative)
         }
 
         if (($value < 0) || ($a <= 0) || ($b <= 0)) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         return self::calculateDistribution($value, $a, $b, $cumulative);
@@ -73,16 +86,20 @@ public static function distribution($value, $a, $b, $cumulative)
      * Returns the inverse of the Gamma distribution.
      *
      * @param mixed $probability Float probability at which you want to evaluate the distribution
+     *                      Or can be an array of values
      * @param mixed $alpha Parameter to the distribution as a float
+     *                      Or can be an array of values
      * @param mixed $beta Parameter to the distribution as a float
+     *                      Or can be an array of values
      *
-     * @return float|string
+     * @return array|float|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function inverse($probability, $alpha, $beta)
+    public static function inverse(mixed $probability, mixed $alpha, mixed $beta)
     {
-        $probability = Functions::flattenSingleValue($probability);
-        $alpha = Functions::flattenSingleValue($alpha);
-        $beta = Functions::flattenSingleValue($beta);
+        if (is_array($probability) || is_array($alpha) || is_array($beta)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $probability, $alpha, $beta);
+        }
 
         try {
             $probability = DistributionValidations::validateProbability($probability);
@@ -93,7 +110,7 @@ public static function inverse($probability, $alpha, $beta)
         }
 
         if (($alpha <= 0.0) || ($beta <= 0.0)) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         return self::calculateInverse($probability, $alpha, $beta);
@@ -105,12 +122,16 @@ public static function inverse($probability, $alpha, $beta)
      * Returns the natural logarithm of the gamma function.
      *
      * @param mixed $value Float Value at which you want to evaluate the distribution
+     *                      Or can be an array of values
      *
-     * @return float|string
+     * @return array|float|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function ln($value)
+    public static function ln(mixed $value): array|string|float
     {
-        $value = Functions::flattenSingleValue($value);
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
 
         try {
             $value = DistributionValidations::validateFloat($value);
@@ -119,7 +140,7 @@ public static function ln($value)
         }
 
         if ($value <= 0) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         return log(self::gammaValue($value));
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/GammaBase.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/GammaBase.php
index 89170f7cad..6ce99d8be6 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/GammaBase.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/GammaBase.php
@@ -3,6 +3,7 @@
 namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 abstract class GammaBase
 {
@@ -16,7 +17,7 @@ abstract class GammaBase
 
     private const MAX_ITERATIONS = 256;
 
-    protected static function calculateDistribution(float $value, float $a, float $b, bool $cumulative)
+    protected static function calculateDistribution(float $value, float $a, float $b, bool $cumulative): float
     {
         if ($cumulative) {
             return self::incompleteGamma($a, $value / $b) / self::gammaValue($a);
@@ -25,6 +26,7 @@ protected static function calculateDistribution(float $value, float $a, float $b
         return (1 / ($b ** $a * self::gammaValue($a))) * $value ** ($a - 1) * exp(0 - ($value / $b));
     }
 
+    /** @return float|string */
     protected static function calculateInverse(float $probability, float $alpha, float $beta)
     {
         $xLo = 0;
@@ -37,6 +39,9 @@ protected static function calculateInverse(float $probability, float $alpha, flo
         while ((abs($dx) > Functions::PRECISION) && (++$i <= self::MAX_ITERATIONS)) {
             // Apply Newton-Raphson step
             $result = self::calculateDistribution($x, $alpha, $beta, true);
+            if (!is_float($result)) {
+                return ExcelError::NA();
+            }
             $error = $result - $probability;
 
             if ($error == 0.0) {
@@ -49,6 +54,9 @@ protected static function calculateInverse(float $probability, float $alpha, flo
 
             $pdf = self::calculateDistribution($x, $alpha, $beta, false);
             // Avoid division by zero
+            if (!is_float($pdf)) {
+                return ExcelError::NA();
+            }
             if ($pdf !== 0.0) {
                 $dx = $error / $pdf;
                 $xNew = $x - $dx;
@@ -65,7 +73,7 @@ protected static function calculateInverse(float $probability, float $alpha, flo
         }
 
         if ($i === self::MAX_ITERATIONS) {
-            return Functions::NA();
+            return ExcelError::NA();
         }
 
         return $x;
@@ -120,53 +128,7 @@ public static function gammaValue(float $value): float
         return exp(0 - $tmp + log(self::SQRT2PI * $summer / $x));
     }
 
-    /**
-     * logGamma function.
-     *
-     * @version 1.1
-     *
-     * @author Jaco van Kooten
-     *
-     * Original author was Jaco van Kooten. Ported to PHP by Paul Meagher.
-     *
-     * The natural logarithm of the gamma function. <br />
-     * Based on public domain NETLIB (Fortran) code by W. J. Cody and L. Stoltz <br />
-     * Applied Mathematics Division <br />
-     * Argonne National Laboratory <br />
-     * Argonne, IL 60439 <br />
-     * <p>
-     * References:
-     * <ol>
-     * <li>W. J. Cody and K. E. Hillstrom, 'Chebyshev Approximations for the Natural
-     *     Logarithm of the Gamma Function,' Math. Comp. 21, 1967, pp. 198-203.</li>
-     * <li>K. E. Hillstrom, ANL/AMD Program ANLC366S, DGAMMA/DLGAMA, May, 1969.</li>
-     * <li>Hart, Et. Al., Computer Approximations, Wiley and sons, New York, 1968.</li>
-     * </ol>
-     * </p>
-     * <p>
-     * From the original documentation:
-     * </p>
-     * <p>
-     * This routine calculates the LOG(GAMMA) function for a positive real argument X.
-     * Computation is based on an algorithm outlined in references 1 and 2.
-     * The program uses rational functions that theoretically approximate LOG(GAMMA)
-     * to at least 18 significant decimal digits. The approximation for X > 12 is from
-     * reference 3, while approximations for X < 12.0 are similar to those in reference
-     * 1, but are unpublished. The accuracy achieved depends on the arithmetic system,
-     * the compiler, the intrinsic functions, and proper selection of the
-     * machine-dependent constants.
-     * </p>
-     * <p>
-     * Error returns: <br />
-     * The program returns the value XINF for X .LE. 0.0 or when overflow would occur.
-     * The computation is believed to be free of underflow and overflow.
-     * </p>
-     *
-     * @return float MAX_VALUE for x < 0.0 or when overflow would occur, i.e. x > 2.55E305
-     */
-
-    // Log Gamma related constants
-    private const  LG_D1 = -0.5772156649015328605195174;
+    private const LG_D1 = -0.5772156649015328605195174;
 
     private const LG_D2 = 0.4227843350984671393993777;
 
@@ -254,10 +216,55 @@ public static function gammaValue(float $value): float
     private const PNT68 = 0.6796875;
 
     // Function cache for logGamma
-    private static $logGammaCacheResult = 0.0;
 
-    private static $logGammaCacheX = 0.0;
+    private static float $logGammaCacheResult = 0.0;
+
+    private static float $logGammaCacheX = 0.0;
 
+    /**
+     * logGamma function.
+     *
+     * Original author was Jaco van Kooten. Ported to PHP by Paul Meagher.
+     *
+     * The natural logarithm of the gamma function. <br />
+     * Based on public domain NETLIB (Fortran) code by W. J. Cody and L. Stoltz <br />
+     * Applied Mathematics Division <br />
+     * Argonne National Laboratory <br />
+     * Argonne, IL 60439 <br />
+     * <p>
+     * References:
+     * <ol>
+     * <li>W. J. Cody and K. E. Hillstrom, 'Chebyshev Approximations for the Natural
+     *     Logarithm of the Gamma Function,' Math. Comp. 21, 1967, pp. 198-203.</li>
+     * <li>K. E. Hillstrom, ANL/AMD Program ANLC366S, DGAMMA/DLGAMA, May, 1969.</li>
+     * <li>Hart, Et. Al., Computer Approximations, Wiley and sons, New York, 1968.</li>
+     * </ol>
+     * </p>
+     * <p>
+     * From the original documentation:
+     * </p>
+     * <p>
+     * This routine calculates the LOG(GAMMA) function for a positive real argument X.
+     * Computation is based on an algorithm outlined in references 1 and 2.
+     * The program uses rational functions that theoretically approximate LOG(GAMMA)
+     * to at least 18 significant decimal digits. The approximation for X > 12 is from
+     * reference 3, while approximations for X < 12.0 are similar to those in reference
+     * 1, but are unpublished. The accuracy achieved depends on the arithmetic system,
+     * the compiler, the intrinsic functions, and proper selection of the
+     * machine-dependent constants.
+     * </p>
+     * <p>
+     * Error returns: <br />
+     * The program returns the value XINF for X .LE. 0.0 or when overflow would occur.
+     * The computation is believed to be free of underflow and overflow.
+     * </p>
+     *
+     * @version 1.1
+     *
+     * @author Jaco van Kooten
+     *
+     * @return float MAX_VALUE for x < 0.0 or when overflow would occur, i.e. x > 2.55E305
+     */
     public static function logGamma(float $x): float
     {
         if ($x == self::$logGammaCacheX) {
@@ -293,7 +300,7 @@ public static function logGamma(float $x): float
         return $res;
     }
 
-    private static function logGamma1(float $y)
+    private static function logGamma1(float $y): float
     {
         // ---------------------
         //    EPS .LT. X .LE. 1.5
@@ -326,7 +333,7 @@ private static function logGamma1(float $y)
         return $corr + $xm2 * (self::LG_D2 + $xm2 * ($xnum / $xden));
     }
 
-    private static function logGamma2(float $y)
+    private static function logGamma2(float $y): float
     {
         // ---------------------
         //    1.5 .LT. X .LE. 4.0
@@ -342,7 +349,7 @@ private static function logGamma2(float $y)
         return $xm2 * (self::LG_D2 + $xm2 * ($xnum / $xden));
     }
 
-    protected static function logGamma3(float $y)
+    protected static function logGamma3(float $y): float
     {
         // ----------------------
         //    4.0 .LT. X .LE. 12.0
@@ -358,7 +365,7 @@ protected static function logGamma3(float $y)
         return self::LG_D4 + $xm4 * ($xnum / $xden);
     }
 
-    protected static function logGamma4(float $y)
+    protected static function logGamma4(float $y): float
     {
         // ---------------------------------
         //    Evaluate for argument .GE. 12.0
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/HyperGeometric.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/HyperGeometric.php
index fe30c0879e..345ea81bff 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/HyperGeometric.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/HyperGeometric.php
@@ -2,12 +2,15 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Calculation\MathTrig\Combinations;
 
 class HyperGeometric
 {
+    use ArrayEnabled;
+
     /**
      * HYPGEOMDIST.
      *
@@ -15,18 +18,31 @@ class HyperGeometric
      * sample successes, given the sample size, population successes, and population size.
      *
      * @param mixed $sampleSuccesses Integer number of successes in the sample
+     *                      Or can be an array of values
      * @param mixed $sampleNumber Integer size of the sample
+     *                      Or can be an array of values
      * @param mixed $populationSuccesses Integer number of successes in the population
+     *                      Or can be an array of values
      * @param mixed $populationNumber Integer population size
+     *                      Or can be an array of values
      *
-     * @return float|string
+     * @return array|float|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function distribution($sampleSuccesses, $sampleNumber, $populationSuccesses, $populationNumber)
+    public static function distribution(mixed $sampleSuccesses, mixed $sampleNumber, mixed $populationSuccesses, mixed $populationNumber): array|string|float
     {
-        $sampleSuccesses = Functions::flattenSingleValue($sampleSuccesses);
-        $sampleNumber = Functions::flattenSingleValue($sampleNumber);
-        $populationSuccesses = Functions::flattenSingleValue($populationSuccesses);
-        $populationNumber = Functions::flattenSingleValue($populationNumber);
+        if (
+            is_array($sampleSuccesses) || is_array($sampleNumber)
+            || is_array($populationSuccesses) || is_array($populationNumber)
+        ) {
+            return self::evaluateArrayArguments(
+                [self::class, __FUNCTION__],
+                $sampleSuccesses,
+                $sampleNumber,
+                $populationSuccesses,
+                $populationNumber
+            );
+        }
 
         try {
             $sampleSuccesses = DistributionValidations::validateInt($sampleSuccesses);
@@ -38,13 +54,13 @@ public static function distribution($sampleSuccesses, $sampleNumber, $population
         }
 
         if (($sampleSuccesses < 0) || ($sampleSuccesses > $sampleNumber) || ($sampleSuccesses > $populationSuccesses)) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
         if (($sampleNumber <= 0) || ($sampleNumber > $populationNumber)) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
         if (($populationSuccesses <= 0) || ($populationSuccesses > $populationNumber)) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         $successesPopulationAndSample = (float) Combinations::withoutRepetition($populationSuccesses, $sampleSuccesses);
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/LogNormal.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/LogNormal.php
index e15237736c..50f02e4124 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/LogNormal.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/LogNormal.php
@@ -2,11 +2,14 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class LogNormal
 {
+    use ArrayEnabled;
+
     /**
      * LOGNORMDIST.
      *
@@ -14,16 +17,21 @@ class LogNormal
      * with parameters mean and standard_dev.
      *
      * @param mixed $value Float value for which we want the probability
+     *                      Or can be an array of values
      * @param mixed $mean Mean value as a float
+     *                      Or can be an array of values
      * @param mixed $stdDev Standard Deviation as a float
+     *                      Or can be an array of values
      *
-     * @return float|string The result, or a string containing an error
+     * @return array|float|string The result, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function cumulative($value, $mean, $stdDev)
+    public static function cumulative(mixed $value, mixed $mean, mixed $stdDev)
     {
-        $value = Functions::flattenSingleValue($value);
-        $mean = Functions::flattenSingleValue($mean);
-        $stdDev = Functions::flattenSingleValue($stdDev);
+        if (is_array($value) || is_array($mean) || is_array($stdDev)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $mean, $stdDev);
+        }
 
         try {
             $value = DistributionValidations::validateFloat($value);
@@ -34,7 +42,7 @@ public static function cumulative($value, $mean, $stdDev)
         }
 
         if (($value <= 0) || ($stdDev <= 0)) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         return StandardNormal::cumulative((log($value) - $mean) / $stdDev);
@@ -47,18 +55,23 @@ public static function cumulative($value, $mean, $stdDev)
      * with parameters mean and standard_dev.
      *
      * @param mixed $value Float value for which we want the probability
+     *                      Or can be an array of values
      * @param mixed $mean Mean value as a float
+     *                      Or can be an array of values
      * @param mixed $stdDev Standard Deviation as a float
+     *                      Or can be an array of values
      * @param mixed $cumulative Boolean value indicating if we want the cdf (true) or the pdf (false)
+     *                      Or can be an array of values
      *
-     * @return float|string The result, or a string containing an error
+     * @return array|float|string The result, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function distribution($value, $mean, $stdDev, $cumulative = false)
+    public static function distribution(mixed $value, mixed $mean, mixed $stdDev, mixed $cumulative = false)
     {
-        $value = Functions::flattenSingleValue($value);
-        $mean = Functions::flattenSingleValue($mean);
-        $stdDev = Functions::flattenSingleValue($stdDev);
-        $cumulative = Functions::flattenSingleValue($cumulative);
+        if (is_array($value) || is_array($mean) || is_array($stdDev) || is_array($cumulative)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $mean, $stdDev, $cumulative);
+        }
 
         try {
             $value = DistributionValidations::validateFloat($value);
@@ -70,15 +83,15 @@ public static function distribution($value, $mean, $stdDev, $cumulative = false)
         }
 
         if (($value <= 0) || ($stdDev <= 0)) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         if ($cumulative === true) {
             return StandardNormal::distribution((log($value) - $mean) / $stdDev, true);
         }
 
-        return (1 / (sqrt(2 * M_PI) * $stdDev * $value)) *
-            exp(0 - ((log($value) - $mean) ** 2 / (2 * $stdDev ** 2)));
+        return (1 / (sqrt(2 * M_PI) * $stdDev * $value))
+            * exp(0 - ((log($value) - $mean) ** 2 / (2 * $stdDev ** 2)));
     }
 
     /**
@@ -87,20 +100,25 @@ public static function distribution($value, $mean, $stdDev, $cumulative = false)
      * Returns the inverse of the lognormal cumulative distribution
      *
      * @param mixed $probability Float probability for which we want the value
+     *                      Or can be an array of values
      * @param mixed $mean Mean Value as a float
+     *                      Or can be an array of values
      * @param mixed $stdDev Standard Deviation as a float
+     *                      Or can be an array of values
      *
-     * @return float|string The result, or a string containing an error
+     * @return array|float|string The result, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      *
      * @TODO    Try implementing P J Acklam's refinement algorithm for greater
      *            accuracy if I can get my head round the mathematics
      *            (as described at) http://home.online.no/~pjacklam/notes/invnorm/
      */
-    public static function inverse($probability, $mean, $stdDev)
+    public static function inverse(mixed $probability, mixed $mean, mixed $stdDev): array|string|float
     {
-        $probability = Functions::flattenSingleValue($probability);
-        $mean = Functions::flattenSingleValue($mean);
-        $stdDev = Functions::flattenSingleValue($stdDev);
+        if (is_array($probability) || is_array($mean) || is_array($stdDev)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $probability, $mean, $stdDev);
+        }
 
         try {
             $probability = DistributionValidations::validateProbability($probability);
@@ -111,9 +129,11 @@ public static function inverse($probability, $mean, $stdDev)
         }
 
         if ($stdDev <= 0) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
+        /** @var float $inverse */
+        $inverse = StandardNormal::inverse($probability);
 
-        return exp($mean + $stdDev * StandardNormal::inverse($probability));
+        return exp($mean + $stdDev * $inverse);
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/NewtonRaphson.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/NewtonRaphson.php
index 2621167257..647c0c4659 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/NewtonRaphson.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/NewtonRaphson.php
@@ -3,11 +3,13 @@
 namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class NewtonRaphson
 {
     private const MAX_ITERATIONS = 256;
 
+    /** @var callable */
     protected $callback;
 
     public function __construct(callable $callback)
@@ -15,7 +17,7 @@ public function __construct(callable $callback)
         $this->callback = $callback;
     }
 
-    public function execute(float $probability)
+    public function execute(float $probability): string|int|float
     {
         $xLo = 100;
         $xHi = 0;
@@ -54,7 +56,7 @@ public function execute(float $probability)
         }
 
         if ($i == self::MAX_ITERATIONS) {
-            return Functions::NA();
+            return ExcelError::NA();
         }
 
         return $x;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Normal.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Normal.php
index 4d158b8c8f..8d08d57a2c 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Normal.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Normal.php
@@ -2,12 +2,15 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Engineering;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class Normal
 {
+    use ArrayEnabled;
+
     public const SQRT2PI = 2.5066282746310005024157652848110452530069867406099;
 
     /**
@@ -18,17 +21,23 @@ class Normal
      * testing.
      *
      * @param mixed $value Float value for which we want the probability
+     *                      Or can be an array of values
      * @param mixed $mean Mean value as a float
+     *                      Or can be an array of values
      * @param mixed $stdDev Standard Deviation as a float
+     *                      Or can be an array of values
      * @param mixed $cumulative Boolean value indicating if we want the cdf (true) or the pdf (false)
+     *                      Or can be an array of values
      *
-     * @return float|string The result, or a string containing an error
+     * @return array|float|string The result, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function distribution($value, $mean, $stdDev, $cumulative)
+    public static function distribution(mixed $value, mixed $mean, mixed $stdDev, mixed $cumulative): array|string|float
     {
-        $value = Functions::flattenSingleValue($value);
-        $mean = Functions::flattenSingleValue($mean);
-        $stdDev = Functions::flattenSingleValue($stdDev);
+        if (is_array($value) || is_array($mean) || is_array($stdDev) || is_array($cumulative)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $mean, $stdDev, $cumulative);
+        }
 
         try {
             $value = DistributionValidations::validateFloat($value);
@@ -40,7 +49,7 @@ public static function distribution($value, $mean, $stdDev, $cumulative)
         }
 
         if ($stdDev < 0) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         if ($cumulative) {
@@ -56,16 +65,21 @@ public static function distribution($value, $mean, $stdDev, $cumulative)
      * Returns the inverse of the normal cumulative distribution for the specified mean and standard deviation.
      *
      * @param mixed $probability Float probability for which we want the value
+     *                      Or can be an array of values
      * @param mixed $mean Mean Value as a float
+     *                      Or can be an array of values
      * @param mixed $stdDev Standard Deviation as a float
+     *                      Or can be an array of values
      *
-     * @return float|string The result, or a string containing an error
+     * @return array|float|string The result, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function inverse($probability, $mean, $stdDev)
+    public static function inverse(mixed $probability, mixed $mean, mixed $stdDev): array|string|float
     {
-        $probability = Functions::flattenSingleValue($probability);
-        $mean = Functions::flattenSingleValue($mean);
-        $stdDev = Functions::flattenSingleValue($stdDev);
+        if (is_array($probability) || is_array($mean) || is_array($stdDev)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $probability, $mean, $stdDev);
+        }
 
         try {
             $probability = DistributionValidations::validateProbability($probability);
@@ -76,7 +90,7 @@ public static function inverse($probability, $mean, $stdDev)
         }
 
         if ($stdDev < 0) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         return (self::inverseNcdf($probability) * $stdDev) + $mean;
@@ -90,7 +104,7 @@ public static function inverse($probability, $mean, $stdDev)
      *    email                : nickersonm@yahoo.com
      *
      */
-    private static function inverseNcdf($p)
+    private static function inverseNcdf(float $p): float
     {
         //    Inverse ncdf approximation by Peter J. Acklam, implementation adapted to
         //    PHP by Michael Nickerson, using Dr. Thomas Ziegler's C implementation as
@@ -146,21 +160,21 @@ private static function inverseNcdf($p)
             //    Rational approximation for lower region.
             $q = sqrt(-2 * log($p));
 
-            return ((((($c[1] * $q + $c[2]) * $q + $c[3]) * $q + $c[4]) * $q + $c[5]) * $q + $c[6]) /
-                (((($d[1] * $q + $d[2]) * $q + $d[3]) * $q + $d[4]) * $q + 1);
+            return ((((($c[1] * $q + $c[2]) * $q + $c[3]) * $q + $c[4]) * $q + $c[5]) * $q + $c[6])
+                / (((($d[1] * $q + $d[2]) * $q + $d[3]) * $q + $d[4]) * $q + 1);
         } elseif ($p_high < $p && $p < 1) {
             //    Rational approximation for upper region.
             $q = sqrt(-2 * log(1 - $p));
 
-            return -((((($c[1] * $q + $c[2]) * $q + $c[3]) * $q + $c[4]) * $q + $c[5]) * $q + $c[6]) /
-                (((($d[1] * $q + $d[2]) * $q + $d[3]) * $q + $d[4]) * $q + 1);
+            return -((((($c[1] * $q + $c[2]) * $q + $c[3]) * $q + $c[4]) * $q + $c[5]) * $q + $c[6])
+                / (((($d[1] * $q + $d[2]) * $q + $d[3]) * $q + $d[4]) * $q + 1);
         }
 
         //    Rational approximation for central region.
         $q = $p - 0.5;
         $r = $q * $q;
 
-        return ((((($a[1] * $r + $a[2]) * $r + $a[3]) * $r + $a[4]) * $r + $a[5]) * $r + $a[6]) * $q /
-                ((((($b[1] * $r + $b[2]) * $r + $b[3]) * $r + $b[4]) * $r + $b[5]) * $r + 1);
+        return ((((($a[1] * $r + $a[2]) * $r + $a[3]) * $r + $a[4]) * $r + $a[5]) * $r + $a[6]) * $q
+                / ((((($b[1] * $r + $b[2]) * $r + $b[3]) * $r + $b[4]) * $r + $b[5]) * $r + 1);
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Poisson.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Poisson.php
index e7252e0289..931568eef4 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Poisson.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Poisson.php
@@ -2,12 +2,15 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
 
 class Poisson
 {
+    use ArrayEnabled;
+
     /**
      * POISSON.
      *
@@ -16,15 +19,21 @@ class Poisson
      * cars arriving at a toll plaza in 1 minute.
      *
      * @param mixed $value Float value for which we want the probability
+     *                      Or can be an array of values
      * @param mixed $mean Mean value as a float
+     *                      Or can be an array of values
      * @param mixed $cumulative Boolean value indicating if we want the cdf (true) or the pdf (false)
+     *                      Or can be an array of values
      *
-     * @return float|string The result, or a string containing an error
+     * @return array|float|string The result, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function distribution($value, $mean, $cumulative)
+    public static function distribution(mixed $value, mixed $mean, mixed $cumulative): array|string|float
     {
-        $value = Functions::flattenSingleValue($value);
-        $mean = Functions::flattenSingleValue($mean);
+        if (is_array($value) || is_array($mean) || is_array($cumulative)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $mean, $cumulative);
+        }
 
         try {
             $value = DistributionValidations::validateFloat($value);
@@ -35,19 +44,23 @@ public static function distribution($value, $mean, $cumulative)
         }
 
         if (($value < 0) || ($mean < 0)) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         if ($cumulative) {
             $summer = 0;
             $floor = floor($value);
             for ($i = 0; $i <= $floor; ++$i) {
-                $summer += $mean ** $i / MathTrig\Factorial::fact($i);
+                /** @var float $fact */
+                $fact = MathTrig\Factorial::fact($i);
+                $summer += $mean ** $i / $fact;
             }
 
             return exp(0 - $mean) * $summer;
         }
+        /** @var float $fact */
+        $fact = MathTrig\Factorial::fact($value);
 
-        return (exp(0 - $mean) * $mean ** $value) / MathTrig\Factorial::fact($value);
+        return (exp(0 - $mean) * $mean ** $value) / $fact;
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/StandardNormal.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/StandardNormal.php
index d10f02a5f7..cb2c646f55 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/StandardNormal.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/StandardNormal.php
@@ -2,12 +2,16 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Calculation\Statistical\Averages;
 use PhpOffice\PhpSpreadsheet\Calculation\Statistical\StandardDeviations;
 
 class StandardNormal
 {
+    use ArrayEnabled;
+
     /**
      * NORMSDIST.
      *
@@ -15,11 +19,18 @@ class StandardNormal
      * a mean of 0 (zero) and a standard deviation of one. Use this function in place of a
      * table of standard normal curve areas.
      *
+     * NOTE: We don't need to check for arrays to array-enable this function, because that is already
+     *       handled by the logic in Normal::distribution()
+     *       All we need to do is pass the value through as scalar or as array.
+     *
      * @param mixed $value Float value for which we want the probability
+     *                      Or can be an array of values
      *
-     * @return float|string The result, or a string containing an error
+     * @return array|float|string The result, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function cumulative($value)
+    public static function cumulative(mixed $value)
     {
         return Normal::distribution($value, 0, 1, true);
     }
@@ -31,12 +42,20 @@ public static function cumulative($value)
      * a mean of 0 (zero) and a standard deviation of one. Use this function in place of a
      * table of standard normal curve areas.
      *
+     * NOTE: We don't need to check for arrays to array-enable this function, because that is already
+     *       handled by the logic in Normal::distribution()
+     *       All we need to do is pass the value and cumulative through as scalar or as array.
+     *
      * @param mixed $value Float value for which we want the probability
+     *                      Or can be an array of values
      * @param mixed $cumulative Boolean value indicating if we want the cdf (true) or the pdf (false)
+     *                      Or can be an array of values
      *
-     * @return float|string The result, or a string containing an error
+     * @return array|float|string The result, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function distribution($value, $cumulative)
+    public static function distribution(mixed $value, mixed $cumulative)
     {
         return Normal::distribution($value, 0, 1, $cumulative);
     }
@@ -46,11 +65,18 @@ public static function distribution($value, $cumulative)
      *
      * Returns the inverse of the standard normal cumulative distribution
      *
-     * @param mixed $value Float probability for which we want the value
+     * @param mixed $value float probability for which we want the value
+     *                      Or can be an array of values
      *
-     * @return float|string The result, or a string containing an error
+     * NOTE: We don't need to check for arrays to array-enable this function, because that is already
+     *       handled by the logic in Normal::inverse()
+     *       All we need to do is pass the value through as scalar or as array
+     *
+     * @return array|float|string The result, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function inverse($value)
+    public static function inverse(mixed $value)
     {
         return Normal::inverse($value, 0, 1);
     }
@@ -61,18 +87,25 @@ public static function inverse($value)
      * Calculates the probability that a member of a standard normal population will fall between
      *     the mean and z standard deviations from the mean.
      *
-     * @param mixed $value
+     * @param mixed $value Or can be an array of values
      *
-     * @return float|string The result, or a string containing an error
+     * @return array|float|string The result, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function gauss($value)
+    public static function gauss(mixed $value): array|string|float
     {
-        $value = Functions::flattenSingleValue($value);
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
+
         if (!is_numeric($value)) {
-            return Functions::VALUE();
+            return ExcelError::VALUE();
         }
+        /** @var float $dist */
+        $dist = self::distribution($value, true);
 
-        return self::distribution($value, true) - 0.5;
+        return $dist - 0.5;
     }
 
     /**
@@ -85,26 +118,41 @@ public static function gauss($value)
      *
      * @param mixed $dataSet The dataset should be an array of float values for the observations
      * @param mixed $m0 Alpha Parameter
+     *                      Or can be an array of values
      * @param mixed $sigma A null or float value for the Beta (Standard Deviation) Parameter;
      *                       if null, we use the standard deviation of the dataset
+     *                      Or can be an array of values
      *
-     * @return float|string (string if result is an error)
+     * @return array|float|string (string if result is an error)
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function zTest($dataSet, $m0, $sigma = null)
+    public static function zTest(mixed $dataSet, mixed $m0, mixed $sigma = null)
     {
+        if (is_array($m0) || is_array($sigma)) {
+            return self::evaluateArrayArgumentsSubsetFrom([self::class, __FUNCTION__], 1, $dataSet, $m0, $sigma);
+        }
+
         $dataSet = Functions::flattenArrayIndexed($dataSet);
-        $m0 = Functions::flattenSingleValue($m0);
-        $sigma = Functions::flattenSingleValue($sigma);
 
         if (!is_numeric($m0) || ($sigma !== null && !is_numeric($sigma))) {
-            return Functions::VALUE();
+            return ExcelError::VALUE();
         }
 
         if ($sigma === null) {
+            /** @var float $sigma */
             $sigma = StandardDeviations::STDEV($dataSet);
         }
         $n = count($dataSet);
 
-        return 1 - self::cumulative((Averages::average($dataSet) - $m0) / ($sigma / sqrt($n)));
+        $sub1 = Averages::average($dataSet);
+
+        if (!is_numeric($sub1)) {
+            return $sub1;
+        }
+
+        $temp = self::cumulative(($sub1 - $m0) / ($sigma / sqrt($n)));
+
+        return 1 - (is_numeric($temp) ? $temp : 0);
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/StudentT.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/StudentT.php
index 45d590dd68..5ec64895cb 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/StudentT.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/StudentT.php
@@ -2,12 +2,14 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class StudentT
 {
-    private const MAX_ITERATIONS = 256;
+    use ArrayEnabled;
 
     /**
      * TDIST.
@@ -15,16 +17,21 @@ class StudentT
      * Returns the probability of Student's T distribution.
      *
      * @param mixed $value Float value for the distribution
+     *                      Or can be an array of values
      * @param mixed $degrees Integer value for degrees of freedom
+     *                      Or can be an array of values
      * @param mixed $tails Integer value for the number of tails (1 or 2)
+     *                      Or can be an array of values
      *
-     * @return float|string The result, or a string containing an error
+     * @return array|float|string The result, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function distribution($value, $degrees, $tails)
+    public static function distribution(mixed $value, mixed $degrees, mixed $tails)
     {
-        $value = Functions::flattenSingleValue($value);
-        $degrees = Functions::flattenSingleValue($degrees);
-        $tails = Functions::flattenSingleValue($tails);
+        if (is_array($value) || is_array($degrees) || is_array($tails)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $degrees, $tails);
+        }
 
         try {
             $value = DistributionValidations::validateFloat($value);
@@ -35,7 +42,7 @@ public static function distribution($value, $degrees, $tails)
         }
 
         if (($value < 0) || ($degrees < 1) || ($tails < 1) || ($tails > 2)) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         return self::calculateDistribution($value, $degrees, $tails);
@@ -47,14 +54,19 @@ public static function distribution($value, $degrees, $tails)
      * Returns the one-tailed probability of the chi-squared distribution.
      *
      * @param mixed $probability Float probability for the function
+     *                      Or can be an array of values
      * @param mixed $degrees Integer value for degrees of freedom
+     *                      Or can be an array of values
      *
-     * @return float|string The result, or a string containing an error
+     * @return array|float|string The result, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function inverse($probability, $degrees)
+    public static function inverse(mixed $probability, mixed $degrees)
     {
-        $probability = Functions::flattenSingleValue($probability);
-        $degrees = Functions::flattenSingleValue($degrees);
+        if (is_array($probability) || is_array($degrees)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $probability, $degrees);
+        }
 
         try {
             $probability = DistributionValidations::validateProbability($probability);
@@ -64,22 +76,17 @@ public static function inverse($probability, $degrees)
         }
 
         if ($degrees <= 0) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
-        $callback = function ($value) use ($degrees) {
-            return self::distribution($value, $degrees, 2);
-        };
+        $callback = fn ($value) => self::distribution($value, $degrees, 2);
 
         $newtonRaphson = new NewtonRaphson($callback);
 
         return $newtonRaphson->execute($probability);
     }
 
-    /**
-     * @return float
-     */
-    private static function calculateDistribution(float $value, int $degrees, int $tails)
+    private static function calculateDistribution(float $value, int $degrees, int $tails): float
     {
         //    tdist, which finds the probability that corresponds to a given value
         //    of t with k degrees of freedom. This algorithm is translated from a
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Weibull.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Weibull.php
index ecec8a8564..2f20b624a9 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Weibull.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Distributions/Weibull.php
@@ -2,11 +2,14 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical\Distributions;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class Weibull
 {
+    use ArrayEnabled;
+
     /**
      * WEIBULL.
      *
@@ -14,18 +17,23 @@ class Weibull
      * analysis, such as calculating a device's mean time to failure.
      *
      * @param mixed $value Float value for the distribution
+     *                      Or can be an array of values
      * @param mixed $alpha Float alpha Parameter
+     *                      Or can be an array of values
      * @param mixed $beta Float beta Parameter
+     *                      Or can be an array of values
      * @param mixed $cumulative Boolean value indicating if we want the cdf (true) or the pdf (false)
+     *                      Or can be an array of values
      *
-     * @return float|string (string if result is an error)
+     * @return array|float|string (string if result is an error)
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function distribution($value, $alpha, $beta, $cumulative)
+    public static function distribution(mixed $value, mixed $alpha, mixed $beta, mixed $cumulative): array|string|float
     {
-        $value = Functions::flattenSingleValue($value);
-        $alpha = Functions::flattenSingleValue($alpha);
-        $beta = Functions::flattenSingleValue($beta);
-        $cumulative = Functions::flattenSingleValue($cumulative);
+        if (is_array($value) || is_array($alpha) || is_array($beta) || is_array($cumulative)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $alpha, $beta, $cumulative);
+        }
 
         try {
             $value = DistributionValidations::validateFloat($value);
@@ -37,7 +45,7 @@ public static function distribution($value, $alpha, $beta, $cumulative)
         }
 
         if (($value < 0) || ($alpha <= 0) || ($beta <= 0)) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         if ($cumulative) {
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/MaxMinBase.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/MaxMinBase.php
index bd17b06292..a722fbd9c8 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/MaxMinBase.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/MaxMinBase.php
@@ -4,7 +4,7 @@
 
 abstract class MaxMinBase
 {
-    protected static function datatypeAdjustmentAllowStrings($value)
+    protected static function datatypeAdjustmentAllowStrings(int|float|string|bool $value): int|float
     {
         if (is_bool($value)) {
             return (int) $value;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Maximum.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Maximum.php
index 3f8436ffdc..47a98e6c6f 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Maximum.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Maximum.php
@@ -3,6 +3,7 @@
 namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ErrorValue;
 
 class Maximum extends MaxMinBase
 {
@@ -16,16 +17,19 @@ class Maximum extends MaxMinBase
      *        MAX(value1[,value2[, ...]])
      *
      * @param mixed ...$args Data values
-     *
-     * @return float
      */
-    public static function max(...$args)
+    public static function max(mixed ...$args): float|int|string
     {
         $returnValue = null;
 
         // Loop through arguments
         $aArgs = Functions::flattenArray($args);
         foreach ($aArgs as $arg) {
+            if (ErrorValue::isError($arg)) {
+                $returnValue = $arg;
+
+                break;
+            }
             // Is it a numeric value?
             if ((is_numeric($arg)) && (!is_string($arg))) {
                 if (($returnValue === null) || ($arg > $returnValue)) {
@@ -50,16 +54,19 @@ public static function max(...$args)
      *        MAXA(value1[,value2[, ...]])
      *
      * @param mixed ...$args Data values
-     *
-     * @return float
      */
-    public static function maxA(...$args)
+    public static function maxA(mixed ...$args): float|int|string
     {
         $returnValue = null;
 
         // Loop through arguments
         $aArgs = Functions::flattenArray($args);
         foreach ($aArgs as $arg) {
+            if (ErrorValue::isError($arg)) {
+                $returnValue = $arg;
+
+                break;
+            }
             // Is it a numeric value?
             if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) && ($arg != '')))) {
                 $arg = self::datatypeAdjustmentAllowStrings($arg);
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Minimum.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Minimum.php
index 596aad78fd..fcb77c6337 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Minimum.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Minimum.php
@@ -3,6 +3,7 @@
 namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ErrorValue;
 
 class Minimum extends MaxMinBase
 {
@@ -16,16 +17,19 @@ class Minimum extends MaxMinBase
      *        MIN(value1[,value2[, ...]])
      *
      * @param mixed ...$args Data values
-     *
-     * @return float
      */
-    public static function min(...$args)
+    public static function min(mixed ...$args): float|int|string
     {
         $returnValue = null;
 
         // Loop through arguments
         $aArgs = Functions::flattenArray($args);
         foreach ($aArgs as $arg) {
+            if (ErrorValue::isError($arg)) {
+                $returnValue = $arg;
+
+                break;
+            }
             // Is it a numeric value?
             if ((is_numeric($arg)) && (!is_string($arg))) {
                 if (($returnValue === null) || ($arg < $returnValue)) {
@@ -50,16 +54,19 @@ public static function min(...$args)
      *        MINA(value1[,value2[, ...]])
      *
      * @param mixed ...$args Data values
-     *
-     * @return float
      */
-    public static function minA(...$args)
+    public static function minA(mixed ...$args): float|int|string
     {
         $returnValue = null;
 
         // Loop through arguments
         $aArgs = Functions::flattenArray($args);
         foreach ($aArgs as $arg) {
+            if (ErrorValue::isError($arg)) {
+                $returnValue = $arg;
+
+                break;
+            }
             // Is it a numeric value?
             if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) && ($arg != '')))) {
                 $arg = self::datatypeAdjustmentAllowStrings($arg);
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Percentiles.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Percentiles.php
index 16cb06e86e..e274f9c891 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Percentiles.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Percentiles.php
@@ -4,6 +4,7 @@
 
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class Percentiles
 {
@@ -23,7 +24,7 @@ class Percentiles
      *
      * @return float|string The result, or a string containing an error
      */
-    public static function PERCENTILE(...$args)
+    public static function PERCENTILE(mixed ...$args)
     {
         $aArgs = Functions::flattenArray($args);
 
@@ -37,7 +38,7 @@ public static function PERCENTILE(...$args)
         }
 
         if (($entry < 0) || ($entry > 1)) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         $mArgs = self::percentileFilterValues($aArgs);
@@ -56,7 +57,7 @@ public static function PERCENTILE(...$args)
             return $mArgs[$iBase] + (($mArgs[$iNext] - $mArgs[$iBase]) * $iProportion);
         }
 
-        return Functions::NAN();
+        return ExcelError::NAN();
     }
 
     /**
@@ -73,7 +74,7 @@ public static function PERCENTILE(...$args)
      *
      * @return float|string (string if result is an error)
      */
-    public static function PERCENTRANK($valueSet, $value, $significance = 3)
+    public static function PERCENTRANK(mixed $valueSet, mixed $value, mixed $significance = 3): string|float
     {
         $valueSet = Functions::flattenArray($valueSet);
         $value = Functions::flattenSingleValue($value);
@@ -89,13 +90,13 @@ public static function PERCENTRANK($valueSet, $value, $significance = 3)
         $valueSet = self::rankFilterValues($valueSet);
         $valueCount = count($valueSet);
         if ($valueCount == 0) {
-            return Functions::NA();
+            return ExcelError::NA();
         }
         sort($valueSet, SORT_NUMERIC);
 
         $valueAdjustor = $valueCount - 1;
         if (($value < $valueSet[0]) || ($value > $valueSet[$valueAdjustor])) {
-            return Functions::NA();
+            return ExcelError::NA();
         }
 
         $pos = array_search($value, $valueSet);
@@ -109,7 +110,7 @@ public static function PERCENTRANK($valueSet, $value, $significance = 3)
             $pos += (($value - $valueSet[$pos]) / ($testValue - $valueSet[$pos]));
         }
 
-        return round($pos / $valueAdjustor, $significance);
+        return round(((float) $pos) / $valueAdjustor, $significance);
     }
 
     /**
@@ -124,7 +125,7 @@ public static function PERCENTRANK($valueSet, $value, $significance = 3)
      *
      * @return float|string The result, or a string containing an error
      */
-    public static function QUARTILE(...$args)
+    public static function QUARTILE(mixed ...$args)
     {
         $aArgs = Functions::flattenArray($args);
         $entry = array_pop($aArgs);
@@ -138,7 +139,7 @@ public static function QUARTILE(...$args)
         $entry = floor($entry);
         $entry /= 4;
         if (($entry < 0) || ($entry > 1)) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         return self::PERCENTILE($aArgs, $entry);
@@ -155,7 +156,7 @@ public static function QUARTILE(...$args)
      *
      * @return float|string The result, or a string containing an error (0 = Descending, 1 = Ascending)
      */
-    public static function RANK($value, $valueSet, $order = self::RANK_SORT_DESCENDING)
+    public static function RANK(mixed $value, mixed $valueSet, mixed $order = self::RANK_SORT_DESCENDING)
     {
         $value = Functions::flattenSingleValue($value);
         $valueSet = Functions::flattenArray($valueSet);
@@ -177,29 +178,25 @@ public static function RANK($value, $valueSet, $order = self::RANK_SORT_DESCENDI
 
         $pos = array_search($value, $valueSet);
         if ($pos === false) {
-            return Functions::NA();
+            return ExcelError::NA();
         }
 
         return ++$pos;
     }
 
-    protected static function percentileFilterValues(array $dataSet)
+    protected static function percentileFilterValues(array $dataSet): array
     {
         return array_filter(
             $dataSet,
-            function ($value): bool {
-                return is_numeric($value) && !is_string($value);
-            }
+            fn ($value): bool => is_numeric($value) && !is_string($value)
         );
     }
 
-    protected static function rankFilterValues(array $dataSet)
+    protected static function rankFilterValues(array $dataSet): array
     {
         return array_filter(
             $dataSet,
-            function ($value): bool {
-                return is_numeric($value);
-            }
+            fn ($value): bool => is_numeric($value)
         );
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Permutations.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Permutations.php
index 272a8a53db..06e3b798dc 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Permutations.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Permutations.php
@@ -2,13 +2,16 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
 use PhpOffice\PhpSpreadsheet\Shared\IntOrFloat;
 
 class Permutations
 {
+    use ArrayEnabled;
+
     /**
      * PERMUT.
      *
@@ -19,14 +22,19 @@ class Permutations
      *        for lottery-style probability calculations.
      *
      * @param mixed $numObjs Integer number of different objects
+     *                      Or can be an array of values
      * @param mixed $numInSet Integer number of objects in each permutation
+     *                      Or can be an array of values
      *
-     * @return float|int|string Number of permutations, or a string containing an error
+     * @return array|float|int|string Number of permutations, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function PERMUT($numObjs, $numInSet)
+    public static function PERMUT(mixed $numObjs, mixed $numInSet)
     {
-        $numObjs = Functions::flattenSingleValue($numObjs);
-        $numInSet = Functions::flattenSingleValue($numInSet);
+        if (is_array($numObjs) || is_array($numInSet)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $numObjs, $numInSet);
+        }
 
         try {
             $numObjs = StatisticalValidations::validateInt($numObjs);
@@ -36,9 +44,19 @@ public static function PERMUT($numObjs, $numInSet)
         }
 
         if ($numObjs < $numInSet) {
-            return Functions::NAN();
+            return ExcelError::NAN();
+        }
+        /** @var float|int|string */
+        $result1 = MathTrig\Factorial::fact($numObjs);
+        if (is_string($result1)) {
+            return $result1;
         }
-        $result = round(MathTrig\Factorial::fact($numObjs) / MathTrig\Factorial::fact($numObjs - $numInSet));
+        /** @var float|int|string */
+        $result2 = MathTrig\Factorial::fact($numObjs - $numInSet);
+        if (is_string($result2)) {
+            return $result2;
+        }
+        $result = round($result1 / $result2);
 
         return IntOrFloat::evaluate($result);
     }
@@ -50,14 +68,19 @@ public static function PERMUT($numObjs, $numInSet)
      *     that can be selected from the total objects.
      *
      * @param mixed $numObjs Integer number of different objects
+     *                      Or can be an array of values
      * @param mixed $numInSet Integer number of objects in each permutation
+     *                      Or can be an array of values
      *
-     * @return float|int|string Number of permutations, or a string containing an error
+     * @return array|float|int|string Number of permutations, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function PERMUTATIONA($numObjs, $numInSet)
+    public static function PERMUTATIONA(mixed $numObjs, mixed $numInSet)
     {
-        $numObjs = Functions::flattenSingleValue($numObjs);
-        $numInSet = Functions::flattenSingleValue($numInSet);
+        if (is_array($numObjs) || is_array($numInSet)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $numObjs, $numInSet);
+        }
 
         try {
             $numObjs = StatisticalValidations::validateInt($numObjs);
@@ -67,7 +90,7 @@ public static function PERMUTATIONA($numObjs, $numInSet)
         }
 
         if ($numObjs < 0 || $numInSet < 0) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         $result = $numObjs ** $numInSet;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Size.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Size.php
index de4b6d6c3d..71594bdf93 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Size.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Size.php
@@ -3,6 +3,7 @@
 namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class Size
 {
@@ -19,7 +20,7 @@ class Size
      *
      * @return float|string The result, or a string containing an error
      */
-    public static function large(...$args)
+    public static function large(mixed ...$args)
     {
         $aArgs = Functions::flattenArray($args);
         $entry = array_pop($aArgs);
@@ -30,15 +31,15 @@ public static function large(...$args)
             $mArgs = self::filter($aArgs);
             $count = Counts::COUNT($mArgs);
             --$entry;
-            if (($entry < 0) || ($entry >= $count) || ($count == 0)) {
-                return Functions::NAN();
+            if ($count === 0 || $entry < 0 || $entry >= $count) {
+                return ExcelError::NAN();
             }
             rsort($mArgs);
 
             return $mArgs[$entry];
         }
 
-        return Functions::VALUE();
+        return ExcelError::VALUE();
     }
 
     /**
@@ -54,7 +55,7 @@ public static function large(...$args)
      *
      * @return float|string The result, or a string containing an error
      */
-    public static function small(...$args)
+    public static function small(mixed ...$args)
     {
         $aArgs = Functions::flattenArray($args);
 
@@ -66,15 +67,15 @@ public static function small(...$args)
             $mArgs = self::filter($aArgs);
             $count = Counts::COUNT($mArgs);
             --$entry;
-            if (($entry < 0) || ($entry >= $count) || ($count == 0)) {
-                return Functions::NAN();
+            if ($count === 0 || $entry < 0 || $entry >= $count) {
+                return ExcelError::NAN();
             }
             sort($mArgs);
 
             return $mArgs[$entry];
         }
 
-        return Functions::VALUE();
+        return ExcelError::VALUE();
     }
 
     /**
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/StandardDeviations.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/StandardDeviations.php
index af2712053f..3d4ea30523 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/StandardDeviations.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/StandardDeviations.php
@@ -17,7 +17,7 @@ class StandardDeviations
      *
      * @return float|string The result, or a string containing an error
      */
-    public static function STDEV(...$args)
+    public static function STDEV(mixed ...$args)
     {
         $result = Variances::VAR(...$args);
         if (!is_numeric($result)) {
@@ -36,10 +36,8 @@ public static function STDEV(...$args)
      *        STDEVA(value1[,value2[, ...]])
      *
      * @param mixed ...$args Data values
-     *
-     * @return float|string
      */
-    public static function STDEVA(...$args)
+    public static function STDEVA(mixed ...$args): float|string
     {
         $result = Variances::VARA(...$args);
         if (!is_numeric($result)) {
@@ -58,10 +56,8 @@ public static function STDEVA(...$args)
      *        STDEVP(value1[,value2[, ...]])
      *
      * @param mixed ...$args Data values
-     *
-     * @return float|string
      */
-    public static function STDEVP(...$args)
+    public static function STDEVP(mixed ...$args): float|string
     {
         $result = Variances::VARP(...$args);
         if (!is_numeric($result)) {
@@ -80,10 +76,8 @@ public static function STDEVP(...$args)
      *        STDEVPA(value1[,value2[, ...]])
      *
      * @param mixed ...$args Data values
-     *
-     * @return float|string
      */
-    public static function STDEVPA(...$args)
+    public static function STDEVPA(mixed ...$args): float|string
     {
         $result = Variances::VARPA(...$args);
         if (!is_numeric($result)) {
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Standardize.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Standardize.php
index 2f3c58e72e..b8e73505c6 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Standardize.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Standardize.php
@@ -2,27 +2,35 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class Standardize extends StatisticalValidations
 {
+    use ArrayEnabled;
+
     /**
      * STANDARDIZE.
      *
      * Returns a normalized value from a distribution characterized by mean and standard_dev.
      *
-     * @param float $value Value to normalize
-     * @param float $mean Mean Value
-     * @param float $stdDev Standard Deviation
+     * @param array|float $value Value to normalize
+     *                      Or can be an array of values
+     * @param array|float $mean Mean Value
+     *                      Or can be an array of values
+     * @param array|float $stdDev Standard Deviation
+     *                      Or can be an array of values
      *
-     * @return float|string Standardized value, or a string containing an error
+     * @return array|float|string Standardized value, or a string containing an error
+     *         If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function execute($value, $mean, $stdDev)
+    public static function execute($value, $mean, $stdDev): array|string|float
     {
-        $value = Functions::flattenSingleValue($value);
-        $mean = Functions::flattenSingleValue($mean);
-        $stdDev = Functions::flattenSingleValue($stdDev);
+        if (is_array($value) || is_array($mean) || is_array($stdDev)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $mean, $stdDev);
+        }
 
         try {
             $value = self::validateFloat($value);
@@ -33,7 +41,7 @@ public static function execute($value, $mean, $stdDev)
         }
 
         if ($stdDev <= 0) {
-            return Functions::NAN();
+            return ExcelError::NAN();
         }
 
         return ($value - $mean) / $stdDev;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/StatisticalValidations.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/StatisticalValidations.php
index 5b315da45c..59ad7eeff6 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/StatisticalValidations.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/StatisticalValidations.php
@@ -3,41 +3,32 @@
 namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class StatisticalValidations
 {
-    /**
-     * @param mixed $value
-     */
-    public static function validateFloat($value): float
+    public static function validateFloat(mixed $value): float
     {
         if (!is_numeric($value)) {
-            throw new Exception(Functions::VALUE());
+            throw new Exception(ExcelError::VALUE());
         }
 
         return (float) $value;
     }
 
-    /**
-     * @param mixed $value
-     */
-    public static function validateInt($value): int
+    public static function validateInt(mixed $value): int
     {
         if (!is_numeric($value)) {
-            throw new Exception(Functions::VALUE());
+            throw new Exception(ExcelError::VALUE());
         }
 
         return (int) floor((float) $value);
     }
 
-    /**
-     * @param mixed $value
-     */
-    public static function validateBool($value): bool
+    public static function validateBool(mixed $value): bool
     {
         if (!is_bool($value) && !is_numeric($value)) {
-            throw new Exception(Functions::VALUE());
+            throw new Exception(ExcelError::VALUE());
         }
 
         return (bool) $value;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Trends.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Trends.php
index 93724a8c1e..365001fd61 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Trends.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Trends.php
@@ -2,12 +2,16 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Shared\Trend\Trend;
 
 class Trends
 {
+    use ArrayEnabled;
+
     private static function filterTrendValues(array &$array1, array &$array2): void
     {
         foreach ($array1 as $key => $value) {
@@ -17,7 +21,11 @@ private static function filterTrendValues(array &$array1, array &$array2): void
         }
     }
 
-    private static function checkTrendArrays(&$array1, &$array2): void
+    /**
+     * @param mixed $array1 should be array, but scalar is made into one
+     * @param mixed $array2 should be array, but scalar is made into one
+     */
+    private static function checkTrendArrays(mixed &$array1, mixed &$array2): void
     {
         if (!is_array($array1)) {
             $array1 = [$array1];
@@ -43,9 +51,9 @@ protected static function validateTrendArrays(array $yValues, array $xValues): v
         $xValueCount = count($xValues);
 
         if (($yValueCount === 0) || ($yValueCount !== $xValueCount)) {
-            throw new Exception(Functions::NA());
+            throw new Exception(ExcelError::NA());
         } elseif ($yValueCount === 1) {
-            throw new Exception(Functions::DIV0());
+            throw new Exception(ExcelError::DIV0());
         }
     }
 
@@ -56,13 +64,11 @@ protected static function validateTrendArrays(array $yValues, array $xValues): v
      *
      * @param mixed $yValues array of mixed Data Series Y
      * @param null|mixed $xValues array of mixed Data Series X
-     *
-     * @return float|string
      */
-    public static function CORREL($yValues, $xValues = null)
+    public static function CORREL(mixed $yValues, $xValues = null): float|string
     {
         if (($xValues === null) || (!is_array($yValues)) || (!is_array($xValues))) {
-            return Functions::VALUE();
+            return ExcelError::VALUE();
         }
 
         try {
@@ -82,12 +88,10 @@ public static function CORREL($yValues, $xValues = null)
      *
      * Returns covariance, the average of the products of deviations for each data point pair.
      *
-     * @param mixed $yValues array of mixed Data Series Y
-     * @param mixed $xValues array of mixed Data Series X
-     *
-     * @return float|string
+     * @param mixed[] $yValues array of mixed Data Series Y
+     * @param mixed[] $xValues array of mixed Data Series X
      */
-    public static function COVAR($yValues, $xValues)
+    public static function COVAR(array $yValues, array $xValues): float|string
     {
         try {
             self::checkTrendArrays($yValues, $xValues);
@@ -108,14 +112,18 @@ public static function COVAR($yValues, $xValues)
      * The predicted value is a y-value for a given x-value.
      *
      * @param mixed $xValue Float value of X for which we want to find Y
-     * @param mixed $yValues array of mixed Data Series Y
-     * @param mixed $xValues of mixed Data Series X
+     *                      Or can be an array of values
+     * @param mixed[] $yValues array of mixed Data Series Y
+     * @param mixed[] $xValues array of mixed Data Series X
      *
-     * @return bool|float|string
+     * @return array|bool|float|string If an array of numbers is passed as an argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function FORECAST($xValue, $yValues, $xValues)
+    public static function FORECAST(mixed $xValue, array $yValues, array $xValues)
     {
-        $xValue = Functions::flattenSingleValue($xValue);
+        if (is_array($xValue)) {
+            return self::evaluateArrayArgumentsSubset([self::class, __FUNCTION__], 1, $xValue, $yValues, $xValues);
+        }
 
         try {
             $xValue = StatisticalValidations::validateFloat($xValue);
@@ -140,9 +148,9 @@ public static function FORECAST($xValue, $yValues, $xValues)
      * @param mixed[] $newValues Values of X for which we want to find Y
      * @param mixed $const A logical (boolean) value specifying whether to force the intersect to equal 0 or not
      *
-     * @return float[]
+     * @return array<int, array<int, array<int, float>>>
      */
-    public static function GROWTH($yValues, $xValues = [], $newValues = [], $const = true)
+    public static function GROWTH(array $yValues, array $xValues = [], array $newValues = [], mixed $const = true): array
     {
         $yValues = Functions::flattenArray($yValues);
         $xValues = Functions::flattenArray($xValues);
@@ -169,10 +177,8 @@ public static function GROWTH($yValues, $xValues = [], $newValues = [], $const =
      *
      * @param mixed[] $yValues Data Series Y
      * @param mixed[] $xValues Data Series X
-     *
-     * @return float|string
      */
-    public static function INTERCEPT($yValues, $xValues)
+    public static function INTERCEPT(array $yValues, array $xValues): float|string
     {
         try {
             self::checkTrendArrays($yValues, $xValues);
@@ -197,9 +203,9 @@ public static function INTERCEPT($yValues, $xValues)
      * @param mixed $const A logical (boolean) value specifying whether to force the intersect to equal 0 or not
      * @param mixed $stats A logical (boolean) value specifying whether to return additional regression statistics
      *
-     * @return array|int|string The result, or a string containing an error
+     * @return array|string The result, or a string containing an error
      */
-    public static function LINEST($yValues, $xValues = null, $const = true, $stats = false)
+    public static function LINEST(array $yValues, ?array $xValues = null, mixed $const = true, mixed $stats = false): string|array
     {
         $const = ($const === null) ? true : (bool) Functions::flattenSingleValue($const);
         $stats = ($stats === null) ? false : (bool) Functions::flattenSingleValue($stats);
@@ -224,7 +230,7 @@ public static function LINEST($yValues, $xValues = null, $const = true, $stats =
                 ],
                 [
                     $bestFitLinear->getSlopeSE(),
-                    ($const === false) ? Functions::NA() : $bestFitLinear->getIntersectSE(),
+                    ($const === false) ? ExcelError::NA() : $bestFitLinear->getIntersectSE(),
                 ],
                 [
                     $bestFitLinear->getGoodnessOfFit(),
@@ -258,9 +264,9 @@ public static function LINEST($yValues, $xValues = null, $const = true, $stats =
      * @param mixed $const A logical (boolean) value specifying whether to force the intersect to equal 0 or not
      * @param mixed $stats A logical (boolean) value specifying whether to return additional regression statistics
      *
-     * @return array|int|string The result, or a string containing an error
+     * @return array|string The result, or a string containing an error
      */
-    public static function LOGEST($yValues, $xValues = null, $const = true, $stats = false)
+    public static function LOGEST(array $yValues, ?array $xValues = null, mixed $const = true, mixed $stats = false): string|array
     {
         $const = ($const === null) ? true : (bool) Functions::flattenSingleValue($const);
         $stats = ($stats === null) ? false : (bool) Functions::flattenSingleValue($stats);
@@ -277,7 +283,7 @@ public static function LOGEST($yValues, $xValues = null, $const = true, $stats =
 
         foreach ($yValues as $value) {
             if ($value < 0.0) {
-                return Functions::NAN();
+                return ExcelError::NAN();
             }
         }
 
@@ -291,7 +297,7 @@ public static function LOGEST($yValues, $xValues = null, $const = true, $stats =
                 ],
                 [
                     $bestFitExponential->getSlopeSE(),
-                    ($const === false) ? Functions::NA() : $bestFitExponential->getIntersectSE(),
+                    ($const === false) ? ExcelError::NA() : $bestFitExponential->getIntersectSE(),
                 ],
                 [
                     $bestFitExponential->getGoodnessOfFit(),
@@ -325,7 +331,7 @@ public static function LOGEST($yValues, $xValues = null, $const = true, $stats =
      *
      * @return float|string The result, or a string containing an error
      */
-    public static function RSQ($yValues, $xValues)
+    public static function RSQ(array $yValues, array $xValues)
     {
         try {
             self::checkTrendArrays($yValues, $xValues);
@@ -349,7 +355,7 @@ public static function RSQ($yValues, $xValues)
      *
      * @return float|string The result, or a string containing an error
      */
-    public static function SLOPE($yValues, $xValues)
+    public static function SLOPE(array $yValues, array $xValues)
     {
         try {
             self::checkTrendArrays($yValues, $xValues);
@@ -370,10 +376,8 @@ public static function SLOPE($yValues, $xValues)
      *
      * @param mixed[] $yValues Data Series Y
      * @param mixed[] $xValues Data Series X
-     *
-     * @return float|string
      */
-    public static function STEYX($yValues, $xValues)
+    public static function STEYX(array $yValues, array $xValues): float|string
     {
         try {
             self::checkTrendArrays($yValues, $xValues);
@@ -397,9 +401,9 @@ public static function STEYX($yValues, $xValues)
      * @param mixed[] $newValues Values of X for which we want to find Y
      * @param mixed $const A logical (boolean) value specifying whether to force the intersect to equal 0 or not
      *
-     * @return float[]
+     * @return array<int, array<int, array<int, float>>>
      */
-    public static function TREND($yValues, $xValues = [], $newValues = [], $const = true)
+    public static function TREND(array $yValues, array $xValues = [], array $newValues = [], mixed $const = true): array
     {
         $yValues = Functions::flattenArray($yValues);
         $xValues = Functions::flattenArray($xValues);
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/VarianceBase.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/VarianceBase.php
index e53346719c..d5646cf9bc 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/VarianceBase.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/VarianceBase.php
@@ -6,7 +6,7 @@
 
 abstract class VarianceBase
 {
-    protected static function datatypeAdjustmentAllowStrings($value)
+    protected static function datatypeAdjustmentAllowStrings(int|float|string|bool $value): int|float
     {
         if (is_bool($value)) {
             return (int) $value;
@@ -17,7 +17,7 @@ protected static function datatypeAdjustmentAllowStrings($value)
         return $value;
     }
 
-    protected static function datatypeAdjustmentBooleans($value)
+    protected static function datatypeAdjustmentBooleans(mixed $value): mixed
     {
         if (is_bool($value) && (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE)) {
             return (int) $value;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Variances.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Variances.php
index ac9c33209e..3256e85af8 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Variances.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical/Variances.php
@@ -3,6 +3,7 @@
 namespace PhpOffice\PhpSpreadsheet\Calculation\Statistical;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class Variances extends VarianceBase
 {
@@ -18,9 +19,9 @@ class Variances extends VarianceBase
      *
      * @return float|string (string if result is an error)
      */
-    public static function VAR(...$args)
+    public static function VAR(mixed ...$args): float|string
     {
-        $returnValue = Functions::DIV0();
+        $returnValue = ExcelError::DIV0();
 
         $summerA = $summerB = 0.0;
 
@@ -60,9 +61,9 @@ public static function VAR(...$args)
      *
      * @return float|string (string if result is an error)
      */
-    public static function VARA(...$args)
+    public static function VARA(mixed ...$args): string|float
     {
-        $returnValue = Functions::DIV0();
+        $returnValue = ExcelError::DIV0();
 
         $summerA = $summerB = 0.0;
 
@@ -71,11 +72,11 @@ public static function VARA(...$args)
         $aCount = 0;
         foreach ($aArgs as $k => $arg) {
             if ((is_string($arg)) && (Functions::isValue($k))) {
-                return Functions::VALUE();
+                return ExcelError::VALUE();
             } elseif ((is_string($arg)) && (!Functions::isMatrixValue($k))) {
             } else {
                 // Is it a numeric value?
-                if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) & ($arg != '')))) {
+                if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) && ($arg != '')))) {
                     $arg = self::datatypeAdjustmentAllowStrings($arg);
                     $summerA += ($arg * $arg);
                     $summerB += $arg;
@@ -106,10 +107,10 @@ public static function VARA(...$args)
      *
      * @return float|string (string if result is an error)
      */
-    public static function VARP(...$args)
+    public static function VARP(mixed ...$args): float|string
     {
         // Return value
-        $returnValue = Functions::DIV0();
+        $returnValue = ExcelError::DIV0();
 
         $summerA = $summerB = 0.0;
 
@@ -149,9 +150,9 @@ public static function VARP(...$args)
      *
      * @return float|string (string if result is an error)
      */
-    public static function VARPA(...$args)
+    public static function VARPA(mixed ...$args): string|float
     {
-        $returnValue = Functions::DIV0();
+        $returnValue = ExcelError::DIV0();
 
         $summerA = $summerB = 0.0;
 
@@ -160,11 +161,11 @@ public static function VARPA(...$args)
         $aCount = 0;
         foreach ($aArgs as $k => $arg) {
             if ((is_string($arg)) && (Functions::isValue($k))) {
-                return Functions::VALUE();
+                return ExcelError::VALUE();
             } elseif ((is_string($arg)) && (!Functions::isMatrixValue($k))) {
             } else {
                 // Is it a numeric value?
-                if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) & ($arg != '')))) {
+                if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) && ($arg != '')))) {
                     $arg = self::datatypeAdjustmentAllowStrings($arg);
                     $summerA += ($arg * $arg);
                     $summerB += $arg;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData.php
deleted file mode 100644
index 0bde3b7fe4..0000000000
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData.php
+++ /dev/null
@@ -1,448 +0,0 @@
-<?php
-
-namespace PhpOffice\PhpSpreadsheet\Calculation;
-
-use DateTimeInterface;
-
-/**
- * @deprecated 1.18.0
- */
-class TextData
-{
-    /**
-     * CHARACTER.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the character() method in the TextData\CharacterConvert class instead
-     *
-     * @param string $character Value
-     *
-     * @return string
-     */
-    public static function CHARACTER($character)
-    {
-        return TextData\CharacterConvert::character($character);
-    }
-
-    /**
-     * TRIMNONPRINTABLE.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the nonPrintable() method in the TextData\Trim class instead
-     *
-     * @param mixed $stringValue Value to check
-     *
-     * @return string
-     */
-    public static function TRIMNONPRINTABLE($stringValue = '')
-    {
-        return TextData\Trim::nonPrintable($stringValue);
-    }
-
-    /**
-     * TRIMSPACES.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the spaces() method in the TextData\Trim class instead
-     *
-     * @param mixed $stringValue Value to check
-     *
-     * @return string
-     */
-    public static function TRIMSPACES($stringValue = '')
-    {
-        return TextData\Trim::spaces($stringValue);
-    }
-
-    /**
-     * ASCIICODE.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the code() method in the TextData\CharacterConvert class instead
-     *
-     * @param string $characters Value
-     *
-     * @return int|string A string if arguments are invalid
-     */
-    public static function ASCIICODE($characters)
-    {
-        return TextData\CharacterConvert::code($characters);
-    }
-
-    /**
-     * CONCATENATE.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the CONCATENATE() method in the TextData\Concatenate class instead
-     *
-     * @return string
-     */
-    public static function CONCATENATE(...$args)
-    {
-        return TextData\Concatenate::CONCATENATE(...$args);
-    }
-
-    /**
-     * DOLLAR.
-     *
-     * This function converts a number to text using currency format, with the decimals rounded to the specified place.
-     * The format used is $#,##0.00_);($#,##0.00)..
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the DOLLAR() method in the TextData\Format class instead
-     *
-     * @param float $value The value to format
-     * @param int $decimals The number of digits to display to the right of the decimal point.
-     *                                    If decimals is negative, number is rounded to the left of the decimal point.
-     *                                    If you omit decimals, it is assumed to be 2
-     *
-     * @return string
-     */
-    public static function DOLLAR($value = 0, $decimals = 2)
-    {
-        return TextData\Format::DOLLAR($value, $decimals);
-    }
-
-    /**
-     * SEARCHSENSITIVE.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the sensitive() method in the TextData\Search class instead
-     *
-     * @param string $needle The string to look for
-     * @param string $haystack The string in which to look
-     * @param int $offset Offset within $haystack
-     *
-     * @return string
-     */
-    public static function SEARCHSENSITIVE($needle, $haystack, $offset = 1)
-    {
-        return TextData\Search::sensitive($needle, $haystack, $offset);
-    }
-
-    /**
-     * SEARCHINSENSITIVE.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the insensitive() method in the TextData\Search class instead
-     *
-     * @param string $needle The string to look for
-     * @param string $haystack The string in which to look
-     * @param int $offset Offset within $haystack
-     *
-     * @return string
-     */
-    public static function SEARCHINSENSITIVE($needle, $haystack, $offset = 1)
-    {
-        return TextData\Search::insensitive($needle, $haystack, $offset);
-    }
-
-    /**
-     * FIXEDFORMAT.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the FIXEDFORMAT() method in the TextData\Format class instead
-     *
-     * @param mixed $value Value to check
-     * @param int $decimals
-     * @param bool $no_commas
-     *
-     * @return string
-     */
-    public static function FIXEDFORMAT($value, $decimals = 2, $no_commas = false)
-    {
-        return TextData\Format::FIXEDFORMAT($value, $decimals, $no_commas);
-    }
-
-    /**
-     * LEFT.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the left() method in the TextData\Extract class instead
-     *
-     * @param string $value Value
-     * @param int $chars Number of characters
-     *
-     * @return string
-     */
-    public static function LEFT($value = '', $chars = 1)
-    {
-        return TextData\Extract::left($value, $chars);
-    }
-
-    /**
-     * MID.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the mid() method in the TextData\Extract class instead
-     *
-     * @param string $value Value
-     * @param int $start Start character
-     * @param int $chars Number of characters
-     *
-     * @return string
-     */
-    public static function MID($value = '', $start = 1, $chars = null)
-    {
-        return TextData\Extract::mid($value, $start, $chars);
-    }
-
-    /**
-     * RIGHT.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the right() method in the TextData\Extract class instead
-     *
-     * @param string $value Value
-     * @param int $chars Number of characters
-     *
-     * @return string
-     */
-    public static function RIGHT($value = '', $chars = 1)
-    {
-        return TextData\Extract::right($value, $chars);
-    }
-
-    /**
-     * STRINGLENGTH.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the length() method in the TextData\Text class instead
-     *
-     * @param string $value Value
-     *
-     * @return int
-     */
-    public static function STRINGLENGTH($value = '')
-    {
-        return TextData\Text::length($value);
-    }
-
-    /**
-     * LOWERCASE.
-     *
-     * Converts a string value to upper case.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the lower() method in the TextData\CaseConvert class instead
-     *
-     * @param string $mixedCaseString
-     *
-     * @return string
-     */
-    public static function LOWERCASE($mixedCaseString)
-    {
-        return TextData\CaseConvert::lower($mixedCaseString);
-    }
-
-    /**
-     * UPPERCASE.
-     *
-     * Converts a string value to upper case.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the upper() method in the TextData\CaseConvert class instead
-     *
-     * @param string $mixedCaseString
-     *
-     * @return string
-     */
-    public static function UPPERCASE($mixedCaseString)
-    {
-        return TextData\CaseConvert::upper($mixedCaseString);
-    }
-
-    /**
-     * PROPERCASE.
-     *
-     * Converts a string value to upper case.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the proper() method in the TextData\CaseConvert class instead
-     *
-     * @param string $mixedCaseString
-     *
-     * @return string
-     */
-    public static function PROPERCASE($mixedCaseString)
-    {
-        return TextData\CaseConvert::proper($mixedCaseString);
-    }
-
-    /**
-     * REPLACE.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the replace() method in the TextData\Replace class instead
-     *
-     * @param string $oldText String to modify
-     * @param int $start Start character
-     * @param int $chars Number of characters
-     * @param string $newText String to replace in defined position
-     *
-     * @return string
-     */
-    public static function REPLACE($oldText, $start, $chars, $newText)
-    {
-        return TextData\Replace::replace($oldText, $start, $chars, $newText);
-    }
-
-    /**
-     * SUBSTITUTE.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the substitute() method in the TextData\Replace class instead
-     *
-     * @param string $text Value
-     * @param string $fromText From Value
-     * @param string $toText To Value
-     * @param int $instance Instance Number
-     *
-     * @return string
-     */
-    public static function SUBSTITUTE($text = '', $fromText = '', $toText = '', $instance = 0)
-    {
-        return TextData\Replace::substitute($text, $fromText, $toText, $instance);
-    }
-
-    /**
-     * RETURNSTRING.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the test() method in the TextData\Text class instead
-     *
-     * @param mixed $testValue Value to check
-     *
-     * @return null|string
-     */
-    public static function RETURNSTRING($testValue = '')
-    {
-        return TextData\Text::test($testValue);
-    }
-
-    /**
-     * TEXTFORMAT.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the TEXTFORMAT() method in the TextData\Format class instead
-     *
-     * @param mixed $value Value to check
-     * @param string $format Format mask to use
-     *
-     * @return string
-     */
-    public static function TEXTFORMAT($value, $format)
-    {
-        return TextData\Format::TEXTFORMAT($value, $format);
-    }
-
-    /**
-     * VALUE.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the VALUE() method in the TextData\Format class instead
-     *
-     * @param mixed $value Value to check
-     *
-     * @return DateTimeInterface|float|int|string A string if arguments are invalid
-     */
-    public static function VALUE($value = '')
-    {
-        return TextData\Format::VALUE($value);
-    }
-
-    /**
-     * NUMBERVALUE.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the NUMBERVALUE() method in the TextData\Format class instead
-     *
-     * @param mixed $value Value to check
-     * @param string $decimalSeparator decimal separator, defaults to locale defined value
-     * @param string $groupSeparator group/thosands separator, defaults to locale defined value
-     *
-     * @return float|string
-     */
-    public static function NUMBERVALUE($value = '', $decimalSeparator = null, $groupSeparator = null)
-    {
-        return TextData\Format::NUMBERVALUE($value, $decimalSeparator, $groupSeparator);
-    }
-
-    /**
-     * Compares two text strings and returns TRUE if they are exactly the same, FALSE otherwise.
-     * EXACT is case-sensitive but ignores formatting differences.
-     * Use EXACT to test text being entered into a document.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the exact() method in the TextData\Text class instead
-     *
-     * @param mixed $value1
-     * @param mixed $value2
-     *
-     * @return bool
-     */
-    public static function EXACT($value1, $value2)
-    {
-        return TextData\Text::exact($value1, $value2);
-    }
-
-    /**
-     * TEXTJOIN.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the TEXTJOIN() method in the TextData\Concatenate class instead
-     *
-     * @param mixed $delimiter
-     * @param mixed $ignoreEmpty
-     * @param mixed $args
-     *
-     * @return string
-     */
-    public static function TEXTJOIN($delimiter, $ignoreEmpty, ...$args)
-    {
-        return TextData\Concatenate::TEXTJOIN($delimiter, $ignoreEmpty, ...$args);
-    }
-
-    /**
-     * REPT.
-     *
-     * Returns the result of builtin function repeat after validating args.
-     *
-     * @Deprecated 1.18.0
-     *
-     * @see Use the builtinREPT() method in the TextData\Concatenate class instead
-     *
-     * @param string $str Should be numeric
-     * @param mixed $number Should be int
-     *
-     * @return string
-     */
-    public static function builtinREPT($str, $number)
-    {
-        return TextData\Concatenate::builtinREPT($str, $number);
-    }
-}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/CaseConvert.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/CaseConvert.php
index 36b5efbd6c..6667bac547 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/CaseConvert.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/CaseConvert.php
@@ -2,25 +2,35 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\TextData;
 
-use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception as CalcExp;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 
 class CaseConvert
 {
+    use ArrayEnabled;
+
     /**
      * LOWERCASE.
      *
      * Converts a string value to upper case.
      *
      * @param mixed $mixedCaseValue The string value to convert to lower case
+     *                              Or can be an array of values
+     *
+     * @return array|string If an array of values is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function lower($mixedCaseValue): string
+    public static function lower(mixed $mixedCaseValue): array|string
     {
-        $mixedCaseValue = Functions::flattenSingleValue($mixedCaseValue);
+        if (is_array($mixedCaseValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $mixedCaseValue);
+        }
 
-        if (is_bool($mixedCaseValue)) {
-            $mixedCaseValue = ($mixedCaseValue === true) ? Calculation::getTRUE() : Calculation::getFALSE();
+        try {
+            $mixedCaseValue = Helpers::extractString($mixedCaseValue, true);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
         }
 
         return StringHelper::strToLower($mixedCaseValue);
@@ -32,13 +42,21 @@ public static function lower($mixedCaseValue): string
      * Converts a string value to upper case.
      *
      * @param mixed $mixedCaseValue The string value to convert to upper case
+     *                              Or can be an array of values
+     *
+     * @return array|string If an array of values is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function upper($mixedCaseValue): string
+    public static function upper(mixed $mixedCaseValue): array|string
     {
-        $mixedCaseValue = Functions::flattenSingleValue($mixedCaseValue);
+        if (is_array($mixedCaseValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $mixedCaseValue);
+        }
 
-        if (is_bool($mixedCaseValue)) {
-            $mixedCaseValue = ($mixedCaseValue === true) ? Calculation::getTRUE() : Calculation::getFALSE();
+        try {
+            $mixedCaseValue = Helpers::extractString($mixedCaseValue, true);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
         }
 
         return StringHelper::strToUpper($mixedCaseValue);
@@ -50,13 +68,21 @@ public static function upper($mixedCaseValue): string
      * Converts a string value to proper or title case.
      *
      * @param mixed $mixedCaseValue The string value to convert to title case
+     *                              Or can be an array of values
+     *
+     * @return array|string If an array of values is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function proper($mixedCaseValue): string
+    public static function proper(mixed $mixedCaseValue): array|string
     {
-        $mixedCaseValue = Functions::flattenSingleValue($mixedCaseValue);
+        if (is_array($mixedCaseValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $mixedCaseValue);
+        }
 
-        if (is_bool($mixedCaseValue)) {
-            $mixedCaseValue = ($mixedCaseValue === true) ? Calculation::getTRUE() : Calculation::getFALSE();
+        try {
+            $mixedCaseValue = Helpers::extractString($mixedCaseValue, true);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
         }
 
         return StringHelper::strToTitle($mixedCaseValue);
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/CharacterConvert.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/CharacterConvert.php
index 4397b538b5..06d0f90097 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/CharacterConvert.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/CharacterConvert.php
@@ -2,47 +2,70 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\TextData;
 
-use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception as CalcExp;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 
 class CharacterConvert
 {
+    use ArrayEnabled;
+
     /**
-     * CHARACTER.
+     * CHAR.
      *
      * @param mixed $character Integer Value to convert to its character representation
+     *                              Or can be an array of values
+     *
+     * @return array|string The character string
+     *         If an array of values is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function character($character): string
+    public static function character(mixed $character): array|string
     {
-        $character = Functions::flattenSingleValue($character);
+        if (is_array($character)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $character);
+        }
 
-        if (!is_numeric($character)) {
-            return Functions::VALUE();
+        try {
+            $character = Helpers::validateInt($character, true);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
         }
 
-        $character = (int) $character;
-        if ($character < 1 || $character > 255) {
-            return Functions::VALUE();
+        $min = Functions::getCompatibilityMode() === Functions::COMPATIBILITY_OPENOFFICE ? 0 : 1;
+        if ($character < $min || $character > 255) {
+            return ExcelError::VALUE();
         }
+        $result = iconv('UCS-4LE', 'UTF-8', pack('V', $character));
 
-        return iconv('UCS-4LE', 'UTF-8', pack('V', $character));
+        return ($result === false) ? '' : $result;
     }
 
     /**
-     * ASCIICODE.
+     * CODE.
      *
      * @param mixed $characters String character to convert to its ASCII value
+     *                              Or can be an array of values
      *
-     * @return int|string A string if arguments are invalid
+     * @return array|int|string A string if arguments are invalid
+     *         If an array of values is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function code($characters)
+    public static function code(mixed $characters): array|string|int
     {
-        if (($characters === null) || ($characters === '')) {
-            return Functions::VALUE();
+        if (is_array($characters)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $characters);
         }
-        $characters = Functions::flattenSingleValue($characters);
-        if (is_bool($characters)) {
-            $characters = self::convertBooleanValue($characters);
+
+        try {
+            $characters = Helpers::extractString($characters, true);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
+        }
+
+        if ($characters === '') {
+            return ExcelError::VALUE();
         }
 
         $character = $characters;
@@ -53,17 +76,17 @@ public static function code($characters)
         return self::unicodeToOrd($character);
     }
 
-    private static function unicodeToOrd($character)
-    {
-        return unpack('V', iconv('UTF-8', 'UCS-4LE', $character))[1];
-    }
-
-    private static function convertBooleanValue($value)
+    private static function unicodeToOrd(string $character): int
     {
-        if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE) {
-            return (int) $value;
+        $retVal = 0;
+        $iconv = iconv('UTF-8', 'UCS-4LE', $character);
+        if ($iconv !== false) {
+            $result = unpack('V', $iconv);
+            if (is_array($result) && isset($result[1])) {
+                $retVal = $result[1];
+            }
         }
 
-        return ($value) ? Calculation::getTRUE() : Calculation::getFALSE();
+        return $retVal;
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Concatenate.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Concatenate.php
index 5780bb6e26..a48d05365c 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Concatenate.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Concatenate.php
@@ -2,13 +2,22 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\TextData;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ErrorValue;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Cell\DataType;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 
 class Concatenate
 {
+    use ArrayEnabled;
+
     /**
-     * CONCATENATE.
+     * This implements the CONCAT function, *not* CONCATENATE.
+     *
+     * @param array $args
      */
     public static function CONCATENATE(...$args): string
     {
@@ -16,36 +25,135 @@ public static function CONCATENATE(...$args): string
 
         // Loop through arguments
         $aArgs = Functions::flattenArray($args);
+
         foreach ($aArgs as $arg) {
-            if (is_bool($arg)) {
-                $arg = self::convertBooleanValue($arg);
+            $value = Helpers::extractString($arg);
+            if (ErrorValue::isError($value, true)) {
+                $returnValue = $value;
+
+                break;
+            }
+            $returnValue .= Helpers::extractString($arg);
+            if (StringHelper::countCharacters($returnValue) > DataType::MAX_STRING_LENGTH) {
+                $returnValue = ExcelError::CALC();
+
+                break;
             }
-            $returnValue .= $arg;
         }
 
         return $returnValue;
     }
 
+    /**
+     * This implements the CONCATENATE function.
+     *
+     * @param array $args data to be concatenated
+     */
+    public static function actualCONCATENATE(...$args): array|string
+    {
+        if (Functions::getCompatibilityMode() === Functions::COMPATIBILITY_GNUMERIC) {
+            return self::CONCATENATE(...$args);
+        }
+        $result = '';
+        foreach ($args as $operand2) {
+            $result = self::concatenate2Args($result, $operand2);
+            if (ErrorValue::isError($result, true) === true) {
+                break;
+            }
+        }
+
+        return $result;
+    }
+
+    private static function concatenate2Args(array|string $operand1, null|array|bool|float|int|string $operand2): array|string
+    {
+        if (is_array($operand1) || is_array($operand2)) {
+            $operand1 = Calculation::boolToString($operand1);
+            $operand2 = Calculation::boolToString($operand2);
+            [$rows, $columns] = Calculation::checkMatrixOperands($operand1, $operand2, 2);
+            $errorFound = false;
+            for ($row = 0; $row < $rows && !$errorFound; ++$row) {
+                for ($column = 0; $column < $columns; ++$column) {
+                    if (ErrorValue::isError($operand2[$row][$column])) {
+                        return $operand2[$row][$column];
+                    }
+                    $operand1[$row][$column]
+                        = Calculation::boolToString($operand1[$row][$column])
+                        . Calculation::boolToString($operand2[$row][$column]);
+                    if (mb_strlen($operand1[$row][$column]) > DataType::MAX_STRING_LENGTH) {
+                        $operand1 = ExcelError::CALC();
+                        $errorFound = true;
+
+                        break;
+                    }
+                }
+            }
+        } elseif (ErrorValue::isError($operand2, true) === true) {
+            $operand1 = (string) $operand2;
+        } else {
+            $operand1 .= (string) Calculation::boolToString($operand2);
+            if (mb_strlen($operand1) > DataType::MAX_STRING_LENGTH) {
+                $operand1 = ExcelError::CALC();
+            }
+        }
+
+        return $operand1;
+    }
+
     /**
      * TEXTJOIN.
      *
-     * @param mixed $delimiter
-     * @param mixed $ignoreEmpty
-     * @param mixed $args
+     * @param mixed $delimiter The delimter to use between the joined arguments
+     *                         Or can be an array of values
+     * @param mixed $ignoreEmpty true/false Flag indicating whether empty arguments should be skipped
+     *                         Or can be an array of values
+     * @param mixed $args The values to join
+     *
+     * @return array|string The joined string
+     *         If an array of values is passed for the $delimiter or $ignoreEmpty arguments, then the returned result
+     *            will also be an array with matching dimensions
      */
-    public static function TEXTJOIN($delimiter, $ignoreEmpty, ...$args): string
+    public static function TEXTJOIN(mixed $delimiter = '', mixed $ignoreEmpty = true, mixed ...$args): array|string
     {
-        // Loop through arguments
+        if (is_array($delimiter) || is_array($ignoreEmpty)) {
+            return self::evaluateArrayArgumentsSubset(
+                [self::class, __FUNCTION__],
+                2,
+                $delimiter,
+                $ignoreEmpty,
+                ...$args
+            );
+        }
+
+        $delimiter ??= '';
+        $ignoreEmpty ??= true;
         $aArgs = Functions::flattenArray($args);
+        $returnValue = self::evaluateTextJoinArray($ignoreEmpty, $aArgs);
+
+        $returnValue ??= implode($delimiter, $aArgs);
+        if (StringHelper::countCharacters($returnValue) > DataType::MAX_STRING_LENGTH) {
+            $returnValue = ExcelError::CALC();
+        }
+
+        return $returnValue;
+    }
+
+    private static function evaluateTextJoinArray(bool $ignoreEmpty, array &$aArgs): ?string
+    {
         foreach ($aArgs as $key => &$arg) {
-            if ($ignoreEmpty === true && is_string($arg) && trim($arg) === '') {
+            $value = Helpers::extractString($arg);
+            if (ErrorValue::isError($value, true)) {
+                return $value;
+            }
+
+            if ($ignoreEmpty === true && ((is_string($arg) && trim($arg) === '') || $arg === null)) {
                 unset($aArgs[$key]);
             } elseif (is_bool($arg)) {
-                $arg = self::convertBooleanValue($arg);
+                $arg = Helpers::convertBooleanValue($arg);
             }
         }
 
-        return implode($delimiter, $aArgs);
+        return null;
     }
 
     /**
@@ -54,29 +162,33 @@ public static function TEXTJOIN($delimiter, $ignoreEmpty, ...$args): string
      * Returns the result of builtin function round after validating args.
      *
      * @param mixed $stringValue The value to repeat
+     *                         Or can be an array of values
      * @param mixed $repeatCount The number of times the string value should be repeated
+     *                         Or can be an array of values
+     *
+     * @return array|string The repeated string
+     *         If an array of values is passed for the $stringValue or $repeatCount arguments, then the returned result
+     *            will also be an array with matching dimensions
      */
-    public static function builtinREPT($stringValue, $repeatCount): string
+    public static function builtinREPT(mixed $stringValue, mixed $repeatCount): array|string
     {
-        $repeatCount = Functions::flattenSingleValue($repeatCount);
-
-        if (!is_numeric($repeatCount) || $repeatCount < 0) {
-            return Functions::VALUE();
+        if (is_array($stringValue) || is_array($repeatCount)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $stringValue, $repeatCount);
         }
 
-        if (is_bool($stringValue)) {
-            $stringValue = self::convertBooleanValue($stringValue);
-        }
+        $stringValue = Helpers::extractString($stringValue);
 
-        return str_repeat($stringValue, (int) $repeatCount);
-    }
-
-    private static function convertBooleanValue($value)
-    {
-        if (Functions::getCompatibilityMode() === Functions::COMPATIBILITY_OPENOFFICE) {
-            return (int) $value;
+        if (!is_numeric($repeatCount) || $repeatCount < 0) {
+            $returnValue = ExcelError::VALUE();
+        } elseif (ErrorValue::isError($stringValue, true)) {
+            $returnValue = $stringValue;
+        } else {
+            $returnValue = str_repeat($stringValue, (int) $repeatCount);
+            if (StringHelper::countCharacters($returnValue) > DataType::MAX_STRING_LENGTH) {
+                $returnValue = ExcelError::VALUE(); // note VALUE not CALC
+            }
         }
 
-        return ($value) ? Calculation::getTRUE() : Calculation::getFALSE();
+        return $returnValue;
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Extract.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Extract.php
index 2f994858ec..1dfb724cde 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Extract.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Extract.php
@@ -2,28 +2,39 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\TextData;
 
-use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception as CalcExp;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 
 class Extract
 {
+    use ArrayEnabled;
+
     /**
      * LEFT.
      *
      * @param mixed $value String value from which to extract characters
+     *                         Or can be an array of values
      * @param mixed $chars The number of characters to extract (as an integer)
+     *                         Or can be an array of values
+     *
+     * @return array|string The joined string
+     *         If an array of values is passed for the $value or $chars arguments, then the returned result
+     *            will also be an array with matching dimensions
      */
-    public static function left($value = '', $chars = 1): string
+    public static function left(mixed $value, mixed $chars = 1): array|string
     {
-        $value = Functions::flattenSingleValue($value);
-        $chars = Functions::flattenSingleValue($chars);
-
-        if (!is_numeric($chars) || $chars < 0) {
-            return Functions::VALUE();
+        if (is_array($value) || is_array($chars)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $chars);
         }
 
-        if (is_bool($value)) {
-            $value = ($value) ? Calculation::getTRUE() : Calculation::getFALSE();
+        try {
+            $value = Helpers::extractString($value, true);
+            $chars = Helpers::extractInt($chars, 0, 1);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
         }
 
         return mb_substr($value, 0, $chars, 'UTF-8');
@@ -33,21 +44,28 @@ public static function left($value = '', $chars = 1): string
      * MID.
      *
      * @param mixed $value String value from which to extract characters
+     *                         Or can be an array of values
      * @param mixed $start Integer offset of the first character that we want to extract
+     *                         Or can be an array of values
      * @param mixed $chars The number of characters to extract (as an integer)
+     *                         Or can be an array of values
+     *
+     * @return array|string The joined string
+     *         If an array of values is passed for the $value, $start or $chars arguments, then the returned result
+     *            will also be an array with matching dimensions
      */
-    public static function mid($value = '', $start = 1, $chars = null): string
+    public static function mid(mixed $value, mixed $start, mixed $chars): array|string
     {
-        $value = Functions::flattenSingleValue($value);
-        $start = Functions::flattenSingleValue($start);
-        $chars = Functions::flattenSingleValue($chars);
-
-        if (!is_numeric($start) || $start < 1 || !is_numeric($chars) || $chars < 0) {
-            return Functions::VALUE();
+        if (is_array($value) || is_array($start) || is_array($chars)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $start, $chars);
         }
 
-        if (is_bool($value)) {
-            $value = ($value) ? Calculation::getTRUE() : Calculation::getFALSE();
+        try {
+            $value = Helpers::extractString($value, true);
+            $start = Helpers::extractInt($start, 1);
+            $chars = Helpers::extractInt($chars, 0);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
         }
 
         return mb_substr($value, --$start, $chars, 'UTF-8');
@@ -57,21 +75,208 @@ public static function mid($value = '', $start = 1, $chars = null): string
      * RIGHT.
      *
      * @param mixed $value String value from which to extract characters
+     *                         Or can be an array of values
      * @param mixed $chars The number of characters to extract (as an integer)
+     *                         Or can be an array of values
+     *
+     * @return array|string The joined string
+     *         If an array of values is passed for the $value or $chars arguments, then the returned result
+     *            will also be an array with matching dimensions
      */
-    public static function right($value = '', $chars = 1): string
+    public static function right(mixed $value, mixed $chars = 1): array|string
     {
-        $value = Functions::flattenSingleValue($value);
-        $chars = Functions::flattenSingleValue($chars);
-
-        if (!is_numeric($chars) || $chars < 0) {
-            return Functions::VALUE();
+        if (is_array($value) || is_array($chars)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $chars);
         }
 
-        if (is_bool($value)) {
-            $value = ($value) ? Calculation::getTRUE() : Calculation::getFALSE();
+        try {
+            $value = Helpers::extractString($value, true);
+            $chars = Helpers::extractInt($chars, 0, 1);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
         }
 
         return mb_substr($value, mb_strlen($value, 'UTF-8') - $chars, $chars, 'UTF-8');
     }
+
+    /**
+     * TEXTBEFORE.
+     *
+     * @param mixed $text the text that you're searching
+     *                    Or can be an array of values
+     * @param null|array|string $delimiter the text that marks the point before which you want to extract
+     *                                 Multiple delimiters can be passed as an array of string values
+     * @param mixed $instance The instance of the delimiter after which you want to extract the text.
+     *                            By default, this is the first instance (1).
+     *                            A negative value means start searching from the end of the text string.
+     *                        Or can be an array of values
+     * @param mixed $matchMode Determines whether the match is case-sensitive or not.
+     *                           0 - Case-sensitive
+     *                           1 - Case-insensitive
+     *                        Or can be an array of values
+     * @param mixed $matchEnd Treats the end of text as a delimiter.
+     *                          0 - Don't match the delimiter against the end of the text.
+     *                          1 - Match the delimiter against the end of the text.
+     *                        Or can be an array of values
+     * @param mixed $ifNotFound value to return if no match is found
+     *                             The default is a #N/A Error
+     *                          Or can be an array of values
+     *
+     * @return array|string the string extracted from text before the delimiter; or the $ifNotFound value
+     *         If an array of values is passed for any of the arguments, then the returned result
+     *            will also be an array with matching dimensions
+     */
+    public static function before(mixed $text, $delimiter, mixed $instance = 1, mixed $matchMode = 0, mixed $matchEnd = 0, mixed $ifNotFound = '#N/A'): array|string
+    {
+        if (is_array($text) || is_array($instance) || is_array($matchMode) || is_array($matchEnd) || is_array($ifNotFound)) {
+            return self::evaluateArrayArgumentsIgnore([self::class, __FUNCTION__], 1, $text, $delimiter, $instance, $matchMode, $matchEnd, $ifNotFound);
+        }
+
+        try {
+            $text = Helpers::extractString($text ?? '', true);
+            Helpers::extractString(Functions::flattenSingleValue($delimiter ?? ''), true);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
+        }
+
+        $instance = (int) $instance;
+        $matchMode = (int) $matchMode;
+        $matchEnd = (int) $matchEnd;
+
+        $split = self::validateTextBeforeAfter($text, $delimiter, $instance, $matchMode, $matchEnd, $ifNotFound);
+        if (is_string($split)) {
+            return $split;
+        }
+        if (Helpers::extractString(Functions::flattenSingleValue($delimiter ?? '')) === '') {
+            return ($instance > 0) ? '' : $text;
+        }
+
+        // Adjustment for a match as the first element of the split
+        $flags = self::matchFlags($matchMode);
+        $delimiter = self::buildDelimiter($delimiter);
+        $adjust = preg_match('/^' . $delimiter . "\$/{$flags}", $split[0]);
+        $oddReverseAdjustment = count($split) % 2;
+
+        $split = ($instance < 0)
+            ? array_slice($split, 0, max(count($split) - (abs($instance) * 2 - 1) - $adjust - $oddReverseAdjustment, 0))
+            : array_slice($split, 0, $instance * 2 - 1 - $adjust);
+
+        return implode('', $split);
+    }
+
+    /**
+     * TEXTAFTER.
+     *
+     * @param mixed $text the text that you're searching
+     * @param null|array|string $delimiter the text that marks the point before which you want to extract
+     *                                 Multiple delimiters can be passed as an array of string values
+     * @param mixed $instance The instance of the delimiter after which you want to extract the text.
+     *                          By default, this is the first instance (1).
+     *                          A negative value means start searching from the end of the text string.
+     *                        Or can be an array of values
+     * @param mixed $matchMode Determines whether the match is case-sensitive or not.
+     *                            0 - Case-sensitive
+     *                            1 - Case-insensitive
+     *                         Or can be an array of values
+     * @param mixed $matchEnd Treats the end of text as a delimiter.
+     *                          0 - Don't match the delimiter against the end of the text.
+     *                          1 - Match the delimiter against the end of the text.
+     *                        Or can be an array of values
+     * @param mixed $ifNotFound value to return if no match is found
+     *                             The default is a #N/A Error
+     *                          Or can be an array of values
+     *
+     * @return array|string the string extracted from text before the delimiter; or the $ifNotFound value
+     *         If an array of values is passed for any of the arguments, then the returned result
+     *            will also be an array with matching dimensions
+     */
+    public static function after(mixed $text, $delimiter, mixed $instance = 1, mixed $matchMode = 0, mixed $matchEnd = 0, mixed $ifNotFound = '#N/A'): array|string
+    {
+        if (is_array($text) || is_array($instance) || is_array($matchMode) || is_array($matchEnd) || is_array($ifNotFound)) {
+            return self::evaluateArrayArgumentsIgnore([self::class, __FUNCTION__], 1, $text, $delimiter, $instance, $matchMode, $matchEnd, $ifNotFound);
+        }
+
+        try {
+            $text = Helpers::extractString($text ?? '', true);
+            Helpers::extractString(Functions::flattenSingleValue($delimiter ?? ''), true);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
+        }
+
+        $instance = (int) $instance;
+        $matchMode = (int) $matchMode;
+        $matchEnd = (int) $matchEnd;
+
+        $split = self::validateTextBeforeAfter($text, $delimiter, $instance, $matchMode, $matchEnd, $ifNotFound);
+        if (is_string($split)) {
+            return $split;
+        }
+        if (Helpers::extractString(Functions::flattenSingleValue($delimiter ?? '')) === '') {
+            return ($instance < 0) ? '' : $text;
+        }
+
+        // Adjustment for a match as the first element of the split
+        $flags = self::matchFlags($matchMode);
+        $delimiter = self::buildDelimiter($delimiter);
+        $adjust = preg_match('/^' . $delimiter . "\$/{$flags}", $split[0]);
+        $oddReverseAdjustment = count($split) % 2;
+
+        $split = ($instance < 0)
+            ? array_slice($split, count($split) - ((int) abs($instance + 1) * 2) - $adjust - $oddReverseAdjustment)
+            : array_slice($split, $instance * 2 - $adjust);
+
+        return implode('', $split);
+    }
+
+    private static function validateTextBeforeAfter(string $text, null|array|string $delimiter, int $instance, int $matchMode, int $matchEnd, mixed $ifNotFound): array|string
+    {
+        $flags = self::matchFlags($matchMode);
+        $delimiter = self::buildDelimiter($delimiter);
+
+        if (preg_match('/' . $delimiter . "/{$flags}", $text) === 0 && $matchEnd === 0) {
+            return $ifNotFound;
+        }
+
+        $split = preg_split('/' . $delimiter . "/{$flags}", $text, 0, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
+        if ($split === false) {
+            return ExcelError::NA();
+        }
+
+        if ($instance === 0 || abs($instance) > StringHelper::countCharacters($text)) {
+            return ExcelError::VALUE();
+        }
+
+        if ($matchEnd === 0 && (abs($instance) > floor(count($split) / 2))) {
+            return ExcelError::NA();
+        } elseif ($matchEnd !== 0 && (abs($instance) - 1 > ceil(count($split) / 2))) {
+            return ExcelError::NA();
+        }
+
+        return $split;
+    }
+
+    /**
+     * @param null|array|string $delimiter the text that marks the point before which you want to extract
+     *                                 Multiple delimiters can be passed as an array of string values
+     */
+    private static function buildDelimiter($delimiter): string
+    {
+        if (is_array($delimiter)) {
+            $delimiter = Functions::flattenArray($delimiter);
+            $quotedDelimiters = array_map(
+                fn ($delimiter): string => preg_quote($delimiter ?? '', '/'),
+                $delimiter
+            );
+            $delimiters = implode('|', $quotedDelimiters);
+
+            return '(' . $delimiters . ')';
+        }
+
+        return '(' . preg_quote($delimiter ?? '', '/') . ')';
+    }
+
+    private static function matchFlags(int $matchMode): string
+    {
+        return ($matchMode === 0) ? 'mu' : 'miu';
+    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Format.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Format.php
index 6bad17441a..0560b376bc 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Format.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Format.php
@@ -3,15 +3,23 @@
 namespace PhpOffice\PhpSpreadsheet\Calculation\TextData;
 
 use DateTimeInterface;
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception as CalcExp;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ErrorValue;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+use PhpOffice\PhpSpreadsheet\RichText\RichText;
 use PhpOffice\PhpSpreadsheet\Shared\Date;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
 
 class Format
 {
+    use ArrayEnabled;
+
     /**
      * DOLLAR.
      *
@@ -19,20 +27,27 @@ class Format
      * The format used is $#,##0.00_);($#,##0.00)..
      *
      * @param mixed $value The value to format
+     *                         Or can be an array of values
      * @param mixed $decimals The number of digits to display to the right of the decimal point (as an integer).
      *                            If decimals is negative, number is rounded to the left of the decimal point.
      *                            If you omit decimals, it is assumed to be 2
+     *                         Or can be an array of values
+     *
+     * @return array|string If an array of values is passed for either of the arguments, then the returned result
+     *            will also be an array with matching dimensions
      */
-    public static function DOLLAR($value = 0, $decimals = 2): string
+    public static function DOLLAR(mixed $value = 0, mixed $decimals = 2)
     {
-        $value = Functions::flattenSingleValue($value);
-        $decimals = $decimals === null ? 2 : Functions::flattenSingleValue($decimals);
+        if (is_array($value) || is_array($decimals)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $decimals);
+        }
 
-        // Validate parameters
-        if (!is_numeric($value) || !is_numeric($decimals)) {
-            return Functions::VALUE();
+        try {
+            $value = Helpers::extractFloat($value);
+            $decimals = Helpers::extractInt($decimals, -100, 0, true);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
         }
-        $decimals = (int) $decimals;
 
         $mask = '$#,##0';
         if ($decimals > 0) {
@@ -42,6 +57,7 @@ public static function DOLLAR($value = 0, $decimals = 2): string
             if ($value < 0) {
                 $round = 0 - $round;
             }
+            /** @var float|int|string */
             $value = MathTrig\Round::multiple($value, $round);
         }
         $mask = "{$mask};-{$mask}";
@@ -50,25 +66,30 @@ public static function DOLLAR($value = 0, $decimals = 2): string
     }
 
     /**
-     * FIXEDFORMAT.
+     * FIXED.
      *
      * @param mixed $value The value to format
+     *                         Or can be an array of values
      * @param mixed $decimals Integer value for the number of decimal places that should be formatted
+     *                         Or can be an array of values
      * @param mixed $noCommas Boolean value indicating whether the value should have thousands separators or not
+     *                         Or can be an array of values
+     *
+     * @return array|string If an array of values is passed for either of the arguments, then the returned result
+     *            will also be an array with matching dimensions
      */
-    public static function FIXEDFORMAT($value, $decimals = 2, $noCommas = false): string
+    public static function FIXEDFORMAT(mixed $value, mixed $decimals = 2, mixed $noCommas = false): array|string
     {
-        $value = Functions::flattenSingleValue($value);
-        $decimals = $decimals === null ? 2 : Functions::flattenSingleValue($decimals);
-        $noCommas = Functions::flattenSingleValue($noCommas);
+        if (is_array($value) || is_array($decimals) || is_array($noCommas)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $decimals, $noCommas);
+        }
 
-        // Validate parameters
-        if (!is_numeric($value) || !is_numeric($decimals)) {
-            return Functions::VALUE();
+        try {
+            $value = Helpers::extractFloat($value);
+            $decimals = Helpers::extractInt($decimals, -100, 0, true);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
         }
-        $decimals = (float) $decimals;
-        $value = (float) $value;
-        $decimals = (int) floor($decimals);
 
         $valueResult = round($value, $decimals);
         if ($decimals < 0) {
@@ -87,40 +108,97 @@ public static function FIXEDFORMAT($value, $decimals = 2, $noCommas = false): st
     }
 
     /**
-     * TEXTFORMAT.
+     * TEXT.
      *
      * @param mixed $value The value to format
+     *                         Or can be an array of values
      * @param mixed $format A string with the Format mask that should be used
+     *                         Or can be an array of values
+     *
+     * @return array|string If an array of values is passed for either of the arguments, then the returned result
+     *            will also be an array with matching dimensions
      */
-    public static function TEXTFORMAT($value, $format): string
+    public static function TEXTFORMAT(mixed $value, mixed $format): array|string
     {
-        $value = Functions::flattenSingleValue($value);
-        $format = Functions::flattenSingleValue($format);
+        if (is_array($value) || is_array($format)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $format);
+        }
 
-        if ((is_string($value)) && (!is_numeric($value)) && Date::isDateTimeFormatCode($format)) {
-            $value = DateTimeExcel\DateValue::fromString($value);
+        try {
+            $value = Helpers::extractString($value, true);
+            $format = Helpers::extractString($format, true);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
+        }
+
+        $format = (string) NumberFormat::convertSystemFormats($format);
+
+        if (!is_numeric($value) && Date::isDateTimeFormatCode($format)) {
+            $value1 = DateTimeExcel\DateValue::fromString($value);
+            $value2 = DateTimeExcel\TimeValue::fromString($value);
+            /** @var float|int|string */
+            $value = (is_numeric($value1) && is_numeric($value2)) ? ($value1 + $value2) : (is_numeric($value1) ? $value2 : $value1);
         }
 
         return (string) NumberFormat::toFormattedString($value, $format);
     }
 
+    /**
+     * @param mixed $value Value to check
+     */
+    private static function convertValue(mixed $value, bool $spacesMeanZero = false): mixed
+    {
+        $value = $value ?? 0;
+        if (is_bool($value)) {
+            if (Functions::getCompatibilityMode() === Functions::COMPATIBILITY_OPENOFFICE) {
+                $value = (int) $value;
+            } else {
+                throw new CalcExp(ExcelError::VALUE());
+            }
+        }
+        if (is_string($value)) {
+            $value = trim($value);
+            if (ErrorValue::isError($value, true)) {
+                throw new CalcExp($value);
+            }
+            if ($spacesMeanZero && $value === '') {
+                $value = 0;
+            }
+        }
+
+        return $value;
+    }
+
     /**
      * VALUE.
      *
      * @param mixed $value Value to check
+     *                         Or can be an array of values
      *
-     * @return DateTimeInterface|float|int|string A string if arguments are invalid
+     * @return array|DateTimeInterface|float|int|string A string if arguments are invalid
+     *         If an array of values is passed for the argument, then the returned result
+     *            will also be an array with matching dimensions
      */
-    public static function VALUE($value = '')
+    public static function VALUE(mixed $value = '')
     {
-        $value = Functions::flattenSingleValue($value);
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
 
+        try {
+            $value = self::convertValue($value);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
+        }
         if (!is_numeric($value)) {
             $numberValue = str_replace(
                 StringHelper::getThousandsSeparator(),
                 '',
                 trim($value, " \t\n\r\0\x0B" . StringHelper::getCurrencyCode())
             );
+            if ($numberValue === '') {
+                return ExcelError::VALUE();
+            }
             if (is_numeric($numberValue)) {
                 return (float) $numberValue;
             }
@@ -128,54 +206,100 @@ public static function VALUE($value = '')
             $dateSetting = Functions::getReturnDateType();
             Functions::setReturnDateType(Functions::RETURNDATE_EXCEL);
 
-            if (strpos($value, ':') !== false) {
-                $timeValue = DateTimeExcel\TimeValue::fromString($value);
-                if ($timeValue !== Functions::VALUE()) {
+            if (str_contains($value, ':')) {
+                $timeValue = Functions::scalar(DateTimeExcel\TimeValue::fromString($value));
+                if ($timeValue !== ExcelError::VALUE()) {
                     Functions::setReturnDateType($dateSetting);
 
                     return $timeValue;
                 }
             }
-            $dateValue = DateTimeExcel\DateValue::fromString($value);
-            if ($dateValue !== Functions::VALUE()) {
+            $dateValue = Functions::scalar(DateTimeExcel\DateValue::fromString($value));
+            if ($dateValue !== ExcelError::VALUE()) {
                 Functions::setReturnDateType($dateSetting);
 
                 return $dateValue;
             }
             Functions::setReturnDateType($dateSetting);
 
-            return Functions::VALUE();
+            return ExcelError::VALUE();
         }
 
         return (float) $value;
     }
 
+    /**
+     * VALUETOTEXT.
+     *
+     * @param mixed $value The value to format
+     *                         Or can be an array of values
+     *
+     * @return array|string If an array of values is passed for either of the arguments, then the returned result
+     *            will also be an array with matching dimensions
+     */
+    public static function valueToText(mixed $value, mixed $format = false): array|string
+    {
+        if (is_array($value) || is_array($format)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $format);
+        }
+
+        $format = (bool) $format;
+
+        if (is_object($value) && $value instanceof RichText) {
+            $value = $value->getPlainText();
+        }
+        if (is_string($value)) {
+            $value = ($format === true) ? Calculation::wrapResult($value) : $value;
+            $value = str_replace("\n", '', $value);
+        } elseif (is_bool($value)) {
+            $value = Calculation::getLocaleBoolean($value ? 'TRUE' : 'FALSE');
+        }
+
+        return (string) $value;
+    }
+
+    private static function getDecimalSeparator(mixed $decimalSeparator): string
+    {
+        return empty($decimalSeparator) ? StringHelper::getDecimalSeparator() : (string) $decimalSeparator;
+    }
+
+    private static function getGroupSeparator(mixed $groupSeparator): string
+    {
+        return empty($groupSeparator) ? StringHelper::getThousandsSeparator() : (string) $groupSeparator;
+    }
+
     /**
      * NUMBERVALUE.
      *
      * @param mixed $value The value to format
+     *                         Or can be an array of values
      * @param mixed $decimalSeparator A string with the decimal separator to use, defaults to locale defined value
+     *                         Or can be an array of values
      * @param mixed $groupSeparator A string with the group/thousands separator to use, defaults to locale defined value
-     *
-     * @return float|string
+     *                         Or can be an array of values
      */
-    public static function NUMBERVALUE($value = '', $decimalSeparator = null, $groupSeparator = null)
+    public static function NUMBERVALUE(mixed $value = '', mixed $decimalSeparator = null, mixed $groupSeparator = null): array|string|float
     {
-        $value = Functions::flattenSingleValue($value);
-        $decimalSeparator = Functions::flattenSingleValue($decimalSeparator);
-        $groupSeparator = Functions::flattenSingleValue($groupSeparator);
+        if (is_array($value) || is_array($decimalSeparator) || is_array($groupSeparator)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $decimalSeparator, $groupSeparator);
+        }
 
-        if (!is_numeric($value)) {
-            $decimalSeparator = empty($decimalSeparator) ? StringHelper::getDecimalSeparator() : $decimalSeparator;
-            $groupSeparator = empty($groupSeparator) ? StringHelper::getThousandsSeparator() : $groupSeparator;
+        try {
+            $value = self::convertValue($value, true);
+            $decimalSeparator = self::getDecimalSeparator($decimalSeparator);
+            $groupSeparator = self::getGroupSeparator($groupSeparator);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
+        }
 
-            $decimalPositions = preg_match_all('/' . preg_quote($decimalSeparator) . '/', $value, $matches, PREG_OFFSET_CAPTURE);
+        if (!is_numeric($value)) {
+            $decimalPositions = preg_match_all('/' . preg_quote($decimalSeparator, '/') . '/', $value, $matches, PREG_OFFSET_CAPTURE);
             if ($decimalPositions > 1) {
-                return Functions::VALUE();
+                return ExcelError::VALUE();
             }
-            $decimalOffset = array_pop($matches[0])[1];
-            if (strpos($value, $groupSeparator, $decimalOffset) !== false) {
-                return Functions::VALUE();
+            $decimalOffset = array_pop($matches[0])[1] ?? null;
+            if ($decimalOffset === null || strpos($value, $groupSeparator, $decimalOffset) !== false) {
+                return ExcelError::VALUE();
             }
 
             $value = str_replace([$groupSeparator, $decimalSeparator], ['', '.'], $value);
@@ -183,7 +307,7 @@ public static function NUMBERVALUE($value = '', $decimalSeparator = null, $group
             // Handle the special case of trailing % signs
             $percentageString = rtrim($value, '%');
             if (!is_numeric($percentageString)) {
-                return Functions::VALUE();
+                return ExcelError::VALUE();
             }
 
             $percentageAdjustment = strlen($value) - strlen($percentageString);
@@ -193,6 +317,6 @@ public static function NUMBERVALUE($value = '', $decimalSeparator = null, $group
             }
         }
 
-        return (float) $value;
+        return is_array($value) ? ExcelError::VALUE() : (float) $value;
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Helpers.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Helpers.php
new file mode 100644
index 0000000000..719de04a81
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Helpers.php
@@ -0,0 +1,92 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation\TextData;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception as CalcExp;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ErrorValue;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+class Helpers
+{
+    public static function convertBooleanValue(bool $value): string
+    {
+        if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE) {
+            return $value ? '1' : '0';
+        }
+
+        return ($value) ? Calculation::getTRUE() : Calculation::getFALSE();
+    }
+
+    /**
+     * @param mixed $value String value from which to extract characters
+     */
+    public static function extractString(mixed $value, bool $throwIfError = false): string
+    {
+        if (is_bool($value)) {
+            return self::convertBooleanValue($value);
+        }
+        if ($throwIfError && is_string($value) && ErrorValue::isError($value, true)) {
+            throw new CalcExp($value);
+        }
+
+        return (string) $value;
+    }
+
+    public static function extractInt(mixed $value, int $minValue, int $gnumericNull = 0, bool $ooBoolOk = false): int
+    {
+        if ($value === null) {
+            // usually 0, but sometimes 1 for Gnumeric
+            $value = (Functions::getCompatibilityMode() === Functions::COMPATIBILITY_GNUMERIC) ? $gnumericNull : 0;
+        }
+        if (is_bool($value) && ($ooBoolOk || Functions::getCompatibilityMode() !== Functions::COMPATIBILITY_OPENOFFICE)) {
+            $value = (int) $value;
+        }
+        if (!is_numeric($value)) {
+            throw new CalcExp(ExcelError::VALUE());
+        }
+        $value = (int) $value;
+        if ($value < $minValue) {
+            throw new CalcExp(ExcelError::VALUE());
+        }
+
+        return (int) $value;
+    }
+
+    public static function extractFloat(mixed $value): float
+    {
+        if ($value === null) {
+            $value = 0.0;
+        }
+        if (is_bool($value)) {
+            $value = (float) $value;
+        }
+        if (!is_numeric($value)) {
+            if (is_string($value) && ErrorValue::isError($value, true)) {
+                throw new CalcExp($value);
+            }
+
+            throw new CalcExp(ExcelError::VALUE());
+        }
+
+        return (float) $value;
+    }
+
+    public static function validateInt(mixed $value, bool $throwIfError = false): int
+    {
+        if ($value === null) {
+            $value = 0;
+        } elseif (is_bool($value)) {
+            $value = (int) $value;
+        } elseif ($throwIfError && is_string($value) && !is_numeric($value)) {
+            if (!ErrorValue::isError($value, true)) {
+                $value = ExcelError::VALUE();
+            }
+
+            throw new CalcExp($value);
+        }
+
+        return (int) $value;
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Replace.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Replace.php
index 7ca710effa..8f6f196fe4 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Replace.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Replace.php
@@ -2,63 +2,115 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\TextData;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception as CalcExp;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Cell\DataType;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 
 class Replace
 {
+    use ArrayEnabled;
+
     /**
      * REPLACE.
      *
      * @param mixed $oldText The text string value to modify
+     *                         Or can be an array of values
      * @param mixed $start Integer offset for start character of the replacement
+     *                         Or can be an array of values
      * @param mixed $chars Integer number of characters to replace from the start offset
+     *                         Or can be an array of values
      * @param mixed $newText String to replace in the defined position
+     *                         Or can be an array of values
+     *
+     * @return array|string If an array of values is passed for either of the arguments, then the returned result
+     *            will also be an array with matching dimensions
      */
-    public static function replace($oldText, $start, $chars, $newText): string
+    public static function replace(mixed $oldText, mixed $start, mixed $chars, mixed $newText): array|string
     {
-        $oldText = Functions::flattenSingleValue($oldText);
-        $start = Functions::flattenSingleValue($start);
-        $chars = Functions::flattenSingleValue($chars);
-        $newText = Functions::flattenSingleValue($newText);
+        if (is_array($oldText) || is_array($start) || is_array($chars) || is_array($newText)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $oldText, $start, $chars, $newText);
+        }
+
+        try {
+            $start = Helpers::extractInt($start, 1, 0, true);
+            $chars = Helpers::extractInt($chars, 0, 0, true);
+            $oldText = Helpers::extractString($oldText, true);
+            $newText = Helpers::extractString($newText, true);
+            $left = StringHelper::substring($oldText, 0, $start - 1);
 
-        $left = Extract::left($oldText, $start - 1);
-        $right = Extract::right($oldText, Text::length($oldText) - ($start + $chars) + 1);
+            $right = StringHelper::substring($oldText, $start + $chars - 1, null);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
+        }
+        $returnValue = $left . $newText . $right;
+        if (StringHelper::countCharacters($returnValue) > DataType::MAX_STRING_LENGTH) {
+            $returnValue = ExcelError::VALUE();
+        }
 
-        return $left . $newText . $right;
+        return $returnValue;
     }
 
     /**
      * SUBSTITUTE.
      *
      * @param mixed $text The text string value to modify
+     *                         Or can be an array of values
      * @param mixed $fromText The string value that we want to replace in $text
+     *                         Or can be an array of values
      * @param mixed $toText The string value that we want to replace with in $text
+     *                         Or can be an array of values
      * @param mixed $instance Integer instance Number for the occurrence of frmText to change
+     *                         Or can be an array of values
+     *
+     * @return array|string If an array of values is passed for either of the arguments, then the returned result
+     *            will also be an array with matching dimensions
      */
-    public static function substitute($text = '', $fromText = '', $toText = '', $instance = 0): string
+    public static function substitute(mixed $text = '', mixed $fromText = '', mixed $toText = '', mixed $instance = null): array|string
     {
-        $text = Functions::flattenSingleValue($text);
-        $fromText = Functions::flattenSingleValue($fromText);
-        $toText = Functions::flattenSingleValue($toText);
-        $instance = floor(Functions::flattenSingleValue($instance));
+        if (is_array($text) || is_array($fromText) || is_array($toText) || is_array($instance)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $text, $fromText, $toText, $instance);
+        }
 
-        if ($instance == 0) {
-            return str_replace($fromText, $toText, $text);
+        try {
+            $text = Helpers::extractString($text, true);
+            $fromText = Helpers::extractString($fromText, true);
+            $toText = Helpers::extractString($toText, true);
+            if ($instance === null) {
+                $returnValue = str_replace($fromText, $toText, $text);
+            } else {
+                if (is_bool($instance)) {
+                    if ($instance === false || Functions::getCompatibilityMode() !== Functions::COMPATIBILITY_OPENOFFICE) {
+                        return ExcelError::Value();
+                    }
+                    $instance = 1;
+                }
+                $instance = Helpers::extractInt($instance, 1, 0, true);
+                $returnValue = self::executeSubstitution($text, $fromText, $toText, $instance);
+            }
+        } catch (CalcExp $e) {
+            return $e->getMessage();
+        }
+        if (StringHelper::countCharacters($returnValue) > DataType::MAX_STRING_LENGTH) {
+            $returnValue = ExcelError::VALUE();
         }
 
+        return $returnValue;
+    }
+
+    private static function executeSubstitution(string $text, string $fromText, string $toText, int $instance): string
+    {
         $pos = -1;
         while ($instance > 0) {
             $pos = mb_strpos($text, $fromText, $pos + 1, 'UTF-8');
             if ($pos === false) {
-                break;
+                return $text;
             }
             --$instance;
         }
 
-        if ($pos !== false) {
-            return self::REPLACE($text, ++$pos, mb_strlen($fromText, 'UTF-8'), $toText);
-        }
-
-        return $text;
+        return Functions::scalar(self::REPLACE($text, ++$pos, StringHelper::countCharacters($fromText), $toText));
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Search.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Search.php
index 2da688d884..663d49fc29 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Search.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Search.php
@@ -2,79 +2,96 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\TextData;
 
-use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception as CalcExp;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 
 class Search
 {
+    use ArrayEnabled;
+
     /**
-     * SEARCHSENSITIVE.
+     * FIND (case sensitive search).
      *
      * @param mixed $needle The string to look for
+     *                         Or can be an array of values
      * @param mixed $haystack The string in which to look
+     *                         Or can be an array of values
      * @param mixed $offset Integer offset within $haystack to start searching from
+     *                         Or can be an array of values
      *
-     * @return int|string
+     * @return array|int|string The offset where the first occurrence of needle was found in the haystack
+     *         If an array of values is passed for the $value or $chars arguments, then the returned result
+     *            will also be an array with matching dimensions
      */
-    public static function sensitive($needle, $haystack, $offset = 1)
+    public static function sensitive(mixed $needle, mixed $haystack, mixed $offset = 1): array|string|int
     {
-        $needle = Functions::flattenSingleValue($needle);
-        $haystack = Functions::flattenSingleValue($haystack);
-        $offset = Functions::flattenSingleValue($offset);
+        if (is_array($needle) || is_array($haystack) || is_array($offset)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $needle, $haystack, $offset);
+        }
 
-        if (!is_bool($needle)) {
-            if (is_bool($haystack)) {
-                $haystack = ($haystack) ? Calculation::getTRUE() : Calculation::getFALSE();
-            }
+        try {
+            $needle = Helpers::extractString($needle, true);
+            $haystack = Helpers::extractString($haystack, true);
+            $offset = Helpers::extractInt($offset, 1, 0, true);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
+        }
 
-            if (($offset > 0) && (StringHelper::countCharacters($haystack) > $offset)) {
-                if (StringHelper::countCharacters($needle) === 0) {
-                    return $offset;
-                }
+        if (StringHelper::countCharacters($haystack) >= $offset) {
+            if (StringHelper::countCharacters($needle) === 0) {
+                return $offset;
+            }
 
-                $pos = mb_strpos($haystack, $needle, --$offset, 'UTF-8');
-                if ($pos !== false) {
-                    return ++$pos;
-                }
+            $pos = mb_strpos($haystack, $needle, --$offset, 'UTF-8');
+            if ($pos !== false) {
+                return ++$pos;
             }
         }
 
-        return Functions::VALUE();
+        return ExcelError::VALUE();
     }
 
     /**
-     * SEARCHINSENSITIVE.
+     * SEARCH (case insensitive search).
      *
      * @param mixed $needle The string to look for
+     *                         Or can be an array of values
      * @param mixed $haystack The string in which to look
+     *                         Or can be an array of values
      * @param mixed $offset Integer offset within $haystack to start searching from
+     *                         Or can be an array of values
      *
-     * @return int|string
+     * @return array|int|string The offset where the first occurrence of needle was found in the haystack
+     *         If an array of values is passed for the $value or $chars arguments, then the returned result
+     *            will also be an array with matching dimensions
      */
-    public static function insensitive($needle, $haystack, $offset = 1)
+    public static function insensitive(mixed $needle, mixed $haystack, mixed $offset = 1): array|string|int
     {
-        $needle = Functions::flattenSingleValue($needle);
-        $haystack = Functions::flattenSingleValue($haystack);
-        $offset = Functions::flattenSingleValue($offset);
+        if (is_array($needle) || is_array($haystack) || is_array($offset)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $needle, $haystack, $offset);
+        }
 
-        if (!is_bool($needle)) {
-            if (is_bool($haystack)) {
-                $haystack = ($haystack) ? Calculation::getTRUE() : Calculation::getFALSE();
-            }
+        try {
+            $needle = Helpers::extractString($needle, true);
+            $haystack = Helpers::extractString($haystack, true);
+            $offset = Helpers::extractInt($offset, 1, 0, true);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
+        }
 
-            if (($offset > 0) && (StringHelper::countCharacters($haystack) > $offset)) {
-                if (StringHelper::countCharacters($needle) === 0) {
-                    return $offset;
-                }
+        if (StringHelper::countCharacters($haystack) >= $offset) {
+            if (StringHelper::countCharacters($needle) === 0) {
+                return $offset;
+            }
 
-                $pos = mb_stripos($haystack, $needle, --$offset, 'UTF-8');
-                if ($pos !== false) {
-                    return ++$pos;
-                }
+            $pos = mb_stripos($haystack, $needle, --$offset, 'UTF-8');
+            if ($pos !== false) {
+                return ++$pos;
             }
         }
 
-        return Functions::VALUE();
+        return ExcelError::VALUE();
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Text.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Text.php
index 6e408891a2..f988a6c199 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Text.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Text.php
@@ -2,22 +2,35 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\TextData;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception as CalcExp;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ErrorValue;
 
 class Text
 {
+    use ArrayEnabled;
+
     /**
-     * STRINGLENGTH.
+     * LEN.
      *
      * @param mixed $value String Value
+     *                         Or can be an array of values
+     *
+     * @return array|int|string If an array of values is passed for the argument, then the returned result
+     *            will also be an array with matching dimensions
      */
-    public static function length($value = ''): int
+    public static function length(mixed $value = ''): array|int|string
     {
-        $value = Functions::flattenSingleValue($value);
+        if (is_array($value)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $value);
+        }
 
-        if (is_bool($value)) {
-            $value = ($value) ? Calculation::getTRUE() : Calculation::getFALSE();
+        try {
+            $value = Helpers::extractString($value, true);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
         }
 
         return mb_strlen($value, 'UTF-8');
@@ -29,31 +42,204 @@ public static function length($value = ''): int
      * Use EXACT to test text being entered into a document.
      *
      * @param mixed $value1 String Value
+     *                         Or can be an array of values
      * @param mixed $value2 String Value
+     *                         Or can be an array of values
+     *
+     * @return array|bool|string If an array of values is passed for either of the arguments, then the returned result
+     *            will also be an array with matching dimensions
      */
-    public static function exact($value1, $value2): bool
+    public static function exact(mixed $value1, mixed $value2): array|bool|string
     {
-        $value1 = Functions::flattenSingleValue($value1);
-        $value2 = Functions::flattenSingleValue($value2);
+        if (is_array($value1) || is_array($value2)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value1, $value2);
+        }
+
+        try {
+            $value1 = Helpers::extractString($value1, true);
+            $value2 = Helpers::extractString($value2, true);
+        } catch (CalcExp $e) {
+            return $e->getMessage();
+        }
 
-        return ((string) $value2) === ((string) $value1);
+        return $value2 === $value1;
     }
 
     /**
-     * RETURNSTRING.
+     * T.
      *
      * @param mixed $testValue Value to check
+     *                         Or can be an array of values
      *
-     * @return null|string
+     * @return array|string If an array of values is passed for the argument, then the returned result
+     *            will also be an array with matching dimensions
      */
-    public static function test($testValue = '')
+    public static function test(mixed $testValue = ''): array|string
     {
-        $testValue = Functions::flattenSingleValue($testValue);
+        if (is_array($testValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $testValue);
+        }
 
         if (is_string($testValue)) {
             return $testValue;
         }
 
-        return null;
+        return '';
+    }
+
+    /**
+     * TEXTSPLIT.
+     *
+     * @param mixed $text the text that you're searching
+     * @param null|array|string $columnDelimiter The text that marks the point where to spill the text across columns.
+     *                          Multiple delimiters can be passed as an array of string values
+     * @param null|array|string $rowDelimiter The text that marks the point where to spill the text down rows.
+     *                          Multiple delimiters can be passed as an array of string values
+     * @param bool $ignoreEmpty Specify FALSE to create an empty cell when two delimiters are consecutive.
+     *                              true = create empty cells
+     *                              false = skip empty cells
+     *                              Defaults to TRUE, which creates an empty cell
+     * @param bool $matchMode Determines whether the match is case-sensitive or not.
+     *                              true = case-sensitive
+     *                              false = case-insensitive
+     *                         By default, a case-sensitive match is done.
+     * @param mixed $padding The value with which to pad the result.
+     *                              The default is #N/A.
+     *
+     * @return array|string the array built from the text, split by the row and column delimiters, or an error string
+     */
+    public static function split(mixed $text, $columnDelimiter = null, $rowDelimiter = null, bool $ignoreEmpty = false, bool $matchMode = true, mixed $padding = '#N/A'): array|string
+    {
+        $text = Functions::flattenSingleValue($text);
+        if (ErrorValue::isError($text, true)) {
+            return $text;
+        }
+
+        $flags = self::matchFlags($matchMode);
+
+        if ($rowDelimiter !== null) {
+            $delimiter = self::buildDelimiter($rowDelimiter);
+            $rows = ($delimiter === '()')
+                ? [$text]
+                : preg_split("/{$delimiter}/{$flags}", $text);
+        } else {
+            $rows = [$text];
+        }
+
+        /** @var array $rows */
+        if ($ignoreEmpty === true) {
+            $rows = array_values(array_filter(
+                $rows,
+                fn ($row): bool => $row !== ''
+            ));
+        }
+
+        if ($columnDelimiter !== null) {
+            $delimiter = self::buildDelimiter($columnDelimiter);
+            array_walk(
+                $rows,
+                function (&$row) use ($delimiter, $flags, $ignoreEmpty): void {
+                    $row = ($delimiter === '()')
+                        ? [$row]
+                        : preg_split("/{$delimiter}/{$flags}", $row);
+                    /** @var array $row */
+                    if ($ignoreEmpty === true) {
+                        $row = array_values(array_filter(
+                            $row,
+                            fn ($value): bool => $value !== ''
+                        ));
+                    }
+                }
+            );
+            if ($ignoreEmpty === true) {
+                $rows = array_values(array_filter(
+                    $rows,
+                    fn ($row): bool => $row !== [] && $row !== ['']
+                ));
+            }
+        }
+
+        return self::applyPadding($rows, $padding);
+    }
+
+    private static function applyPadding(array $rows, mixed $padding): array
+    {
+        $columnCount = array_reduce(
+            $rows,
+            fn (int $counter, array $row): int => max($counter, count($row)),
+            0
+        );
+
+        return array_map(
+            function (array $row) use ($columnCount, $padding): array {
+                return (count($row) < $columnCount)
+                    ? array_merge($row, array_fill(0, $columnCount - count($row), $padding))
+                    : $row;
+            },
+            $rows
+        );
+    }
+
+    /**
+     * @param null|array|string $delimiter the text that marks the point before which you want to split
+     *                                 Multiple delimiters can be passed as an array of string values
+     */
+    private static function buildDelimiter($delimiter): string
+    {
+        $valueSet = Functions::flattenArray($delimiter);
+
+        if (is_array($delimiter) && count($valueSet) > 1) {
+            $quotedDelimiters = array_map(
+                fn ($delimiter): string => preg_quote($delimiter ?? '', '/'),
+                $valueSet
+            );
+            $delimiters = implode('|', $quotedDelimiters);
+
+            return '(' . $delimiters . ')';
+        }
+
+        return '(' . preg_quote(Functions::flattenSingleValue($delimiter), '/') . ')';
+    }
+
+    private static function matchFlags(bool $matchMode): string
+    {
+        return ($matchMode === true) ? 'miu' : 'mu';
+    }
+
+    public static function fromArray(array $array, int $format = 0): string
+    {
+        $result = [];
+        foreach ($array as $row) {
+            $cells = [];
+            foreach ($row as $cellValue) {
+                $value = ($format === 1) ? self::formatValueMode1($cellValue) : self::formatValueMode0($cellValue);
+                $cells[] = $value;
+            }
+            $result[] = implode(($format === 1) ? ',' : ', ', $cells);
+        }
+
+        $result = implode(($format === 1) ? ';' : ', ', $result);
+
+        return ($format === 1) ? '{' . $result . '}' : $result;
+    }
+
+    private static function formatValueMode0(mixed $cellValue): string
+    {
+        if (is_bool($cellValue)) {
+            return Calculation::getLocaleBoolean($cellValue ? 'TRUE' : 'FALSE');
+        }
+
+        return (string) $cellValue;
+    }
+
+    private static function formatValueMode1(mixed $cellValue): string
+    {
+        if (is_string($cellValue) && ErrorValue::isError($cellValue) === false) {
+            return Calculation::FORMULA_STRING_QUOTE . $cellValue . Calculation::FORMULA_STRING_QUOTE;
+        } elseif (is_bool($cellValue)) {
+            return Calculation::getLocaleBoolean($cellValue ? 'TRUE' : 'FALSE');
+        }
+
+        return (string) $cellValue;
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Trim.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Trim.php
index b5d6645549..d8f170621f 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Trim.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData/Trim.php
@@ -2,57 +2,49 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\TextData;
 
-use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 
 class Trim
 {
-    private static $invalidChars;
+    use ArrayEnabled;
 
     /**
-     * TRIMNONPRINTABLE.
+     * CLEAN.
      *
      * @param mixed $stringValue String Value to check
+     *                              Or can be an array of values
      *
-     * @return null|string
+     * @return array|string If an array of values is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function nonPrintable($stringValue = '')
+    public static function nonPrintable(mixed $stringValue = '')
     {
-        $stringValue = Functions::flattenSingleValue($stringValue);
-
-        if (is_bool($stringValue)) {
-            return ($stringValue) ? Calculation::getTRUE() : Calculation::getFALSE();
+        if (is_array($stringValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $stringValue);
         }
 
-        if (self::$invalidChars === null) {
-            self::$invalidChars = range(chr(0), chr(31));
-        }
+        $stringValue = Helpers::extractString($stringValue);
 
-        if (is_string($stringValue) || is_numeric($stringValue)) {
-            return str_replace(self::$invalidChars, '', trim($stringValue, "\x00..\x1F"));
-        }
-
-        return null;
+        return (string) preg_replace('/[\\x00-\\x1f]/', '', "$stringValue");
     }
 
     /**
-     * TRIMSPACES.
+     * TRIM.
      *
      * @param mixed $stringValue String Value to check
+     *                              Or can be an array of values
      *
-     * @return null|string
+     * @return array|string If an array of values is passed as the argument, then the returned result will also be an array
+     *            with the same dimensions
      */
-    public static function spaces($stringValue = '')
+    public static function spaces(mixed $stringValue = ''): array|string
     {
-        $stringValue = Functions::flattenSingleValue($stringValue);
-        if (is_bool($stringValue)) {
-            return ($stringValue) ? Calculation::getTRUE() : Calculation::getFALSE();
+        if (is_array($stringValue)) {
+            return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $stringValue);
         }
 
-        if (is_string($stringValue) || is_numeric($stringValue)) {
-            return trim(preg_replace('/ +/', ' ', trim($stringValue, ' ')), ' ');
-        }
+        $stringValue = Helpers::extractString($stringValue);
 
-        return null;
+        return trim(preg_replace('/ +/', ' ', trim("$stringValue", ' ')) ?? '', ' ');
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Token/Stack.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Token/Stack.php
index 941e1ad764..13c6e5b1ac 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Token/Stack.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Token/Stack.php
@@ -3,58 +3,46 @@
 namespace PhpOffice\PhpSpreadsheet\Calculation\Token;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\Engine\BranchPruner;
 
 class Stack
 {
+    private BranchPruner $branchPruner;
+
     /**
      * The parser stack for formulae.
      *
      * @var mixed[]
      */
-    private $stack = [];
+    private array $stack = [];
 
     /**
      * Count of entries in the parser stack.
-     *
-     * @var int
      */
-    private $count = 0;
+    private int $count = 0;
+
+    public function __construct(BranchPruner $branchPruner)
+    {
+        $this->branchPruner = $branchPruner;
+    }
 
     /**
      * Return the number of entries on the stack.
-     *
-     * @return int
      */
-    public function count()
+    public function count(): int
     {
         return $this->count;
     }
 
     /**
      * Push a new entry onto the stack.
-     *
-     * @param mixed $type
-     * @param mixed $value
-     * @param mixed $reference
-     * @param null|string $storeKey will store the result under this alias
-     * @param null|string $onlyIf will only run computation if the matching
-     *      store key is true
-     * @param null|string $onlyIfNot will only run computation if the matching
-     *      store key is false
      */
-    public function push(
-        $type,
-        $value,
-        $reference = null,
-        $storeKey = null,
-        $onlyIf = null,
-        $onlyIfNot = null
-    ): void {
-        $stackItem = $this->getStackItem($type, $value, $reference, $storeKey, $onlyIf, $onlyIfNot);
-
+    public function push(string $type, mixed $value, ?string $reference = null): void
+    {
+        $stackItem = $this->getStackItem($type, $value, $reference);
         $this->stack[$this->count++] = $stackItem;
 
-        if ($type == 'Function') {
+        if ($type === 'Function') {
             $localeFunction = Calculation::localeFunc($value);
             if ($localeFunction != $value) {
                 $this->stack[($this->count - 1)]['localeValue'] = $localeFunction;
@@ -62,29 +50,34 @@ public function push(
         }
     }
 
-    public function getStackItem(
-        $type,
-        $value,
-        $reference = null,
-        $storeKey = null,
-        $onlyIf = null,
-        $onlyIfNot = null
-    ) {
+    public function pushStackItem(array $stackItem): void
+    {
+        $this->stack[$this->count++] = $stackItem;
+    }
+
+    public function getStackItem(string $type, mixed $value, ?string $reference = null): array
+    {
         $stackItem = [
             'type' => $type,
             'value' => $value,
             'reference' => $reference,
         ];
 
-        if (isset($storeKey)) {
+        // will store the result under this alias
+        $storeKey = $this->branchPruner->currentCondition();
+        if (isset($storeKey) || $reference === 'NULL') {
             $stackItem['storeKey'] = $storeKey;
         }
 
-        if (isset($onlyIf)) {
+        // will only run computation if the matching store key is true
+        $onlyIf = $this->branchPruner->currentOnlyIf();
+        if (isset($onlyIf) || $reference === 'NULL') {
             $stackItem['onlyIf'] = $onlyIf;
         }
 
-        if (isset($onlyIfNot)) {
+        // will only run computation if the matching store key is false
+        $onlyIfNot = $this->branchPruner->currentOnlyIfNot();
+        if (isset($onlyIfNot) || $reference === 'NULL') {
             $stackItem['onlyIfNot'] = $onlyIfNot;
         }
 
@@ -93,10 +86,8 @@ public function getStackItem(
 
     /**
      * Pop the last entry from the stack.
-     *
-     * @return mixed
      */
-    public function pop()
+    public function pop(): ?array
     {
         if ($this->count > 0) {
             return $this->stack[--$this->count];
@@ -107,12 +98,8 @@ public function pop()
 
     /**
      * Return an entry from the stack without removing it.
-     *
-     * @param int $n number indicating how far back in the stack we want to look
-     *
-     * @return mixed
      */
-    public function last($n = 1)
+    public function last(int $n = 1): ?array
     {
         if ($this->count - $n < 0) {
             return null;
@@ -129,21 +116,4 @@ public function clear(): void
         $this->stack = [];
         $this->count = 0;
     }
-
-    public function __toString()
-    {
-        $str = 'Stack: ';
-        foreach ($this->stack as $index => $item) {
-            if ($index > $this->count - 1) {
-                break;
-            }
-            $value = $item['value'] ?? 'no value';
-            while (is_array($value)) {
-                $value = array_pop($value);
-            }
-            $str .= $value . ' |> ';
-        }
-
-        return $str;
-    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Web.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Web.php
deleted file mode 100644
index 3f3d945de0..0000000000
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Web.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-namespace PhpOffice\PhpSpreadsheet\Calculation;
-
-/**
- * @deprecated 1.18.0
- */
-class Web
-{
-    /**
-     * WEBSERVICE.
-     *
-     * Returns data from a web service on the Internet or Intranet.
-     *
-     * Excel Function:
-     *        Webservice(url)
-     *
-     * @see Web\Service::webService()
-     *      Use the webService() method in the Web\Service class instead
-     *
-     * @return string the output resulting from a call to the webservice
-     */
-    public static function WEBSERVICE(string $url)
-    {
-        return Web\Service::webService($url);
-    }
-}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Web/Service.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Web/Service.php
index 05e04bf912..ad06d39499 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Web/Service.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Web/Service.php
@@ -2,7 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\Web;
 
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Settings;
 use Psr\Http\Client\ClientExceptionInterface;
 
@@ -18,35 +18,35 @@ class Service
      *
      * @return string the output resulting from a call to the webservice
      */
-    public static function webService(string $url)
+    public static function webService(string $url): string
     {
         $url = trim($url);
         if (strlen($url) > 2048) {
-            return Functions::VALUE(); // Invalid URL length
+            return ExcelError::VALUE(); // Invalid URL length
         }
 
         if (!preg_match('/^http[s]?:\/\//', $url)) {
-            return Functions::VALUE(); // Invalid protocol
+            return ExcelError::VALUE(); // Invalid protocol
         }
 
-        // Get results from the the webservice
+        // Get results from the webservice
         $client = Settings::getHttpClient();
         $requestFactory = Settings::getRequestFactory();
         $request = $requestFactory->createRequest('GET', $url);
 
         try {
             $response = $client->sendRequest($request);
-        } catch (ClientExceptionInterface $e) {
-            return Functions::VALUE(); // cURL error
+        } catch (ClientExceptionInterface) {
+            return ExcelError::VALUE(); // cURL error
         }
 
         if ($response->getStatusCode() != 200) {
-            return Functions::VALUE(); // cURL error
+            return ExcelError::VALUE(); // cURL error
         }
 
         $output = $response->getBody()->getContents();
         if (strlen($output) > 32767) {
-            return Functions::VALUE(); // Output not a string or too long
+            return ExcelError::VALUE(); // Output not a string or too long
         }
 
         return $output;
@@ -60,14 +60,12 @@ public static function webService(string $url)
      * Excel Function:
      *        urlEncode(text)
      *
-     * @param mixed $text
-     *
      * @return string the url encoded output
      */
-    public static function urlEncode($text)
+    public static function urlEncode(mixed $text): string
     {
         if (!is_string($text)) {
-            return Functions::VALUE();
+            return ExcelError::VALUE();
         }
 
         return str_replace('+', '%20', urlencode($text));
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/functionlist.txt b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/functionlist.txt
deleted file mode 100644
index 270715cd09..0000000000
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/functionlist.txt
+++ /dev/null
@@ -1,400 +0,0 @@
-ABS
-ACCRINT
-ACCRINTM
-ACOS
-ACOSH
-ACOT
-ACOTH
-ADDRESS
-AMORDEGRC
-AMORLINC
-AND
-ARABIC
-AREAS
-ASC
-ASIN
-ASINH
-ATAN
-ATAN2
-ATANH
-AVEDEV
-AVERAGE
-AVERAGEA
-AVERAGEIF
-AVERAGEIFS
-BAHTTEXT
-BASE
-BESSELI
-BESSELJ
-BESSELK
-BESSELY
-BETADIST
-BETAINV
-BIN2DEC
-BIN2HEX
-BIN2OCT
-BINOMDIST
-BITAND
-BITLSHIFT
-BITOR
-BITRSHIFT
-BITXOR
-CEILING
-CEILING.MATH
-CEILING.PRECISE
-CELL
-CHAR
-CHIDIST
-CHIINV
-CHITEST
-CHOOSE
-CLEAN
-CODE
-COLUMN
-COLUMNS
-COMBIN
-COMBINA
-COMPLEX
-CONCAT
-CONCATENATE
-CONFIDENCE
-CONVERT
-CORREL
-COS
-COSH
-COT
-COTH
-COUNT
-COUNTA
-COUNTBLANK
-COUNTIF
-COUNTIFS
-COUPDAYBS
-COUPDAYBS
-COUPDAYSNC
-COUPNCD
-COUPNUM
-COUPPCD
-COVAR
-CRITBINOM
-CSC
-CSCH
-CUBEKPIMEMBER
-CUBEMEMBER
-CUBEMEMBERPROPERTY
-CUBERANKEDMEMBER
-CUBESET
-CUBESETCOUNT
-CUBEVALUE
-CUMIPMT
-CUMPRINC
-DATE
-DATEDIF
-DATEVALUE
-DAVERAGE
-DAY
-DAYS
-DAYS360
-DB
-DCOUNT
-DCOUNTA
-DDB
-DEC2BIN
-DEC2HEX
-DEC2OCT
-DEGREES
-DELTA
-DEVSQ
-DGET
-DISC
-DMAX
-DMIN
-DOLLAR
-DOLLARDE
-DOLLARFR
-DPRODUCT
-DSTDEV
-DSTDEVP
-DSUM
-DURATION
-DVAR
-DVARP
-EDATE
-EFFECT
-EOMONTH
-ERF
-ERF.PRECISE
-ERFC
-ERFC.PRECISE
-ERROR.TYPE
-EVEN
-EXACT
-EXP
-EXPONDIST
-FACT
-FACTDOUBLE
-FALSE
-FDIST
-FIND
-FINDB
-FINV
-FISHER
-FISHERINV
-FIXED
-FLOOR
-FLOOR.MATH
-FLOOR.PRECISE
-FORECAST
-FREQUENCY
-FTEST
-FV
-FVSCHEDULE
-GAMAMDIST
-GAMMAINV
-GAMMALN
-GCD
-GEOMEAN
-GESTEP
-GETPIVOTDATA
-GROWTH
-HARMEAN
-HEX2BIN
-HEX2OCT
-HLOOKUP
-HOUR
-HYPERLINK
-HYPGEOMDIST
-IF
-IFERROR
-IFS
-IMABS
-IMAGINARY
-IMARGUMENT
-IMCONJUGATE
-IMCOS
-IMCOSH
-IMCOT
-IMCSC
-IMCSCH
-IMEXP
-IMLN
-IMLOG10
-IMLOG2
-IMPOWER
-IMPRODUCT
-IMREAL
-IMSEC
-IMSECH
-IMSIN
-IMSINH
-IMSQRT
-IMSUB
-IMSUM
-IMTAN
-INDEX
-INDIRECT
-INFO
-INT
-INTERCEPT
-INTRATE
-IPMT
-IRR
-ISBLANK
-ISERR
-ISERROR
-ISEVEN
-ISLOGICAL
-ISNA
-ISNONTEXT
-ISNUMBER
-ISODD
-ISOWEEKNUM
-ISPMT
-ISREF
-ISTEXT
-JIS
-KURT
-LARGE
-LCM
-LEFT
-LEFTB
-LEN
-LENB
-LINEST
-LN
-LOG
-LOG10
-LOGEST
-LOGINV
-LOGNORMDIST
-LOOKUP
-LOWER
-MATCH
-MAX
-MAXA
-MAXIFS
-MDETERM
-MDURATION
-MEDIAN
-MID
-MIDB
-MIN
-MINA
-MINIFS
-MINUTE
-MINVERSE
-MIRR
-MMULT
-MOD
-MODE
-MONTH
-MROUND
-MULTINOMIAL
-MUNIT
-N
-NA
-NEGBINOMDIST
-NETWORKDAYS
-NOMINAL
-NORMDIST
-NORMINV
-NORMSDIST
-NORMSINV
-NOT
-NOW
-NPER
-NPV
-NUMBERVALUE
-OCT2BIN
-OCT2DEC
-OCT2HEX
-ODD
-ODDFPRICE
-ODDFYIELD
-ODDLPRICE
-ODDLYIELD
-OFFSET
-OR
-PDURATION
-PEARSON
-PERCENTILE
-PERCENTRANK
-PERMUT
-PERMUTATIONA
-PHONETIC
-PI
-PMT
-POISSON
-POWER
-PPMT
-PRICE
-PRICEDISC
-PRICEMAT
-PROB
-PRODUCT
-PROPER
-PV
-QUARTILE
-QUOTIENT
-RADIANS
-RAND
-RANDBETWEEN
-RANK
-RATE
-RECEIVED
-REPLACE
-REPLACEB
-REPT
-RIGHT
-RIGHTB
-ROMAN
-ROUND
-ROUNDDOWN
-ROUNDUP
-ROW
-ROWS
-RRI
-RSQ
-RTD
-SEARCH
-SEARCHB
-SEC
-SECH
-SECOND
-SERIESSUM
-SHEET
-SHEETS
-SIGN
-SIN
-SINH
-SKEW
-SLN
-SLOPE
-SMALL
-SQRT
-SQRTPI
-STANDARDIZE
-STDEV
-STDEV.A
-STDEV.P
-STDEVA
-STDEVP
-STDEVPA
-STEYX
-SUBSTITUTE
-SUBTOTAL
-SUM
-SUMIF
-SUMIFS
-SUMPRODUCT
-SUMSQ
-SUMX2MY2
-SUMX2PY2
-SUMXMY2
-SWITCH
-SYD
-T
-TAN
-TANH
-TBILLEQ
-TBILLPRICE
-TBILLYIELD
-TDIST
-TEXT
-TEXTJOIN
-TIME
-TIMEVALUE
-TINV
-TODAY
-TRANSPOSE
-TREND
-TRIM
-TRIMMEAN
-TRUE
-TRUNC
-TTEST
-TYPE
-UNICHAR
-UNIORD
-UPPER
-USDOLLAR
-VALUE
-VAR
-VARA
-VARP
-VARPA
-VDB
-VLOOKUP
-WEEKDAY
-WEEKNUM
-WEIBULL
-WORKDAY
-XIRR
-XNPV
-XOR
-YEAR
-YEARFRAC
-YIELD
-YIELDDISC
-YIELDMAT
-ZTEST
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/Translations.xlsx b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/Translations.xlsx
index 518176ab9f..080d5e7a8e 100644
Binary files a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/Translations.xlsx and b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/Translations.xlsx differ
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/bg/config b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/bg/config
index 86f94d3621..689203c5b6 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/bg/config
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/bg/config
@@ -1,27 +1,24 @@
+############################################################
 ##
-## PhpSpreadsheet
+## PhpSpreadsheet - locale settings
 ##
+## български (Bulgarian)
 ##
-##
-
-
-ArgumentSeparator	= ;
-
+############################################################
 
+ArgumentSeparator = ;
 ##
-##	(For future use)
+##  (For future use)
 ##
-currencySymbol	= лв
-
+currencySymbol = лв
 
 ##
-##	Excel Error Codes	(For future use)
-
+## Error Codes
 ##
-NULL	= #ПРАЗНО!
-DIV0	= #ДЕЛ/0!
-VALUE	= #СТОЙНОСТ!
-REF	= #РЕФ!
-NAME	= #ИМЕ?
-NUM	= #ЧИСЛО!
-NA	= #Н/Д
+NULL = #ПРАЗНО!
+DIV0 = #ДЕЛ/0!
+VALUE = #СТОЙНОСТ!
+REF = #РЕФ!
+NAME = #ИМЕ?
+NUM = #ЧИСЛО!
+NA = #Н/Д
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/bg/functions b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/bg/functions
index 4bc1574ee2..ec56433c0e 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/bg/functions
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/bg/functions
@@ -1,417 +1,409 @@
+############################################################
 ##
-## PhpSpreadsheet
-##
-##
-## Data in this file derived from information provided by web-junior (http://www.web-junior.net/)
+## PhpSpreadsheet - function name translations
 ##
+## български (Bulgarian)
 ##
+############################################################
 
 
 ##
-##	Add-in and Automation functions				Функции надстроек и автоматизации
+## Функции Куб (Cube Functions)
 ##
-GETPIVOTDATA		= ПОЛУЧИТЬ.ДАННЫЕ.СВОДНОЙ.ТАБЛИЦЫ	##	Возвращает данные, хранящиеся в отчете сводной таблицы.
-
+CUBEKPIMEMBER = КУБЭЛЕМЕНТКИП
+CUBEMEMBER = КУБЭЛЕМЕНТ
+CUBEMEMBERPROPERTY = КУБСВОЙСТВОЭЛЕМЕНТА
+CUBERANKEDMEMBER = КУБПОРЭЛЕМЕНТ
+CUBESET = КУБМНОЖ
+CUBESETCOUNT = КУБЧИСЛОЭЛМНОЖ
+CUBEVALUE = КУБЗНАЧЕНИЕ
 
 ##
-##	Cube functions						Функции Куб
+## Функции для работы с базами данных (Database Functions)
 ##
-CUBEKPIMEMBER		= КУБЭЛЕМЕНТКИП				##	Возвращает свойство ключевого индикатора производительности «(КИП)» и отображает имя «КИП» в ячейке. «КИП» представляет собой количественную величину, такую как ежемесячная валовая прибыль или ежеквартальная текучесть кадров, используемой для контроля эффективности работы организации.
-CUBEMEMBER		= КУБЭЛЕМЕНТ				##	Возвращает элемент или кортеж из куба. Используется для проверки существования элемента или кортежа в кубе.
-CUBEMEMBERPROPERTY	= КУБСВОЙСТВОЭЛЕМЕНТА			##	Возвращает значение свойства элемента из куба. Используется для проверки существования имени элемента в кубе и возвращает указанное свойство для этого элемента.
-CUBERANKEDMEMBER	= КУБПОРЭЛЕМЕНТ				##	Возвращает n-ый или ранжированный элемент в множество. Используется для возвращения одного или нескольких элементов в множество, например, лучшего продавца или 10 лучших студентов.
-CUBESET			= КУБМНОЖ				##	Определяет вычислительное множество элементов или кортежей, отправляя на сервер выражение, которое создает множество, а затем возвращает его в Microsoft Office Excel.
-CUBESETCOUNT		= КУБЧИСЛОЭЛМНОЖ			##	Возвращает число элементов множества.
-CUBEVALUE		= КУБЗНАЧЕНИЕ				##	Возвращает обобщенное значение из куба.
-
+DAVERAGE = ДСРЗНАЧ
+DCOUNT = БСЧЁТ
+DCOUNTA = БСЧЁТА
+DGET = БИЗВЛЕЧЬ
+DMAX = ДМАКС
+DMIN = ДМИН
+DPRODUCT = БДПРОИЗВЕД
+DSTDEV = ДСТАНДОТКЛ
+DSTDEVP = ДСТАНДОТКЛП
+DSUM = БДСУММ
+DVAR = БДДИСП
+DVARP = БДДИСПП
 
 ##
-##	Database functions					Функции для работы с базами данных
+## Функции даты и времени (Date & Time Functions)
 ##
-DAVERAGE		= ДСРЗНАЧ				##	Возвращает среднее значение выбранных записей базы данных.
-DCOUNT			= БСЧЁТ					##	Подсчитывает количество числовых ячеек в базе данных.
-DCOUNTA			= БСЧЁТА				##	Подсчитывает количество непустых ячеек в базе данных.
-DGET			= БИЗВЛЕЧЬ				##	Извлекает из базы данных одну запись, удовлетворяющую заданному условию.
-DMAX			= ДМАКС					##	Возвращает максимальное значение среди выделенных записей базы данных.
-DMIN			= ДМИН					##	Возвращает минимальное значение среди выделенных записей базы данных.
-DPRODUCT		= БДПРОИЗВЕД				##	Перемножает значения определенного поля в записях базы данных, удовлетворяющих условию.
-DSTDEV			= ДСТАНДОТКЛ				##	Оценивает стандартное отклонение по выборке для выделенных записей базы данных.
-DSTDEVP			= ДСТАНДОТКЛП				##	Вычисляет стандартное отклонение по генеральной совокупности для выделенных записей базы данных
-DSUM			= БДСУММ				##	Суммирует числа в поле для записей базы данных, удовлетворяющих условию.
-DVAR			= БДДИСП				##	Оценивает дисперсию по выборке из выделенных записей базы данных
-DVARP			= БДДИСПП				##	Вычисляет дисперсию по генеральной совокупности для выделенных записей базы данных
-
+DATE = ДАТА
+DATEVALUE = ДАТАЗНАЧ
+DAY = ДЕНЬ
+DAYS360 = ДНЕЙ360
+EDATE = ДАТАМЕС
+EOMONTH = КОНМЕСЯЦА
+HOUR = ЧАС
+MINUTE = МИНУТЫ
+MONTH = МЕСЯЦ
+NETWORKDAYS = ЧИСТРАБДНИ
+NOW = ТДАТА
+SECOND = СЕКУНДЫ
+TIME = ВРЕМЯ
+TIMEVALUE = ВРЕМЗНАЧ
+TODAY = СЕГОДНЯ
+WEEKDAY = ДЕНЬНЕД
+WEEKNUM = НОМНЕДЕЛИ
+WORKDAY = РАБДЕНЬ
+YEAR = ГОД
+YEARFRAC = ДОЛЯГОДА
 
 ##
-##	Date and time functions					Функции даты и времени
+## Инженерные функции (Engineering Functions)
 ##
-DATE			= ДАТА					##	Возвращает заданную дату в числовом формате.
-DATEVALUE		= ДАТАЗНАЧ				##	Преобразует дату из текстового формата в числовой формат.
-DAY			= ДЕНЬ					##	Преобразует дату в числовом формате в день месяца.
-DAYS360			= ДНЕЙ360				##	Вычисляет количество дней между двумя датами на основе 360-дневного года.
-EDATE			= ДАТАМЕС				##	Возвращает дату в числовом формате, отстоящую на заданное число месяцев вперед или назад от начальной даты.
-EOMONTH			= КОНМЕСЯЦА				##	Возвращает дату в числовом формате для последнего дня месяца, отстоящего вперед или назад на заданное число месяцев.
-HOUR			= ЧАС					##	Преобразует дату в числовом формате в часы.
-MINUTE			= МИНУТЫ				##	Преобразует дату в числовом формате в минуты.
-MONTH			= МЕСЯЦ					##	Преобразует дату в числовом формате в месяцы.
-NETWORKDAYS		= ЧИСТРАБДНИ				##	Возвращает количество рабочих дней между двумя датами.
-NOW			= ТДАТА					##	Возвращает текущую дату и время в числовом формате.
-SECOND			= СЕКУНДЫ				##	Преобразует дату в числовом формате в секунды.
-TIME			= ВРЕМЯ					##	Возвращает заданное время в числовом формате.
-TIMEVALUE		= ВРЕМЗНАЧ				##	Преобразует время из текстового формата в числовой формат.
-TODAY			= СЕГОДНЯ				##	Возвращает текущую дату в числовом формате.
-WEEKDAY			= ДЕНЬНЕД				##	Преобразует дату в числовом формате в день недели.
-WEEKNUM			= НОМНЕДЕЛИ				##	Преобразует числовое представление в число, которое указывает, на какую неделю года приходится указанная дата.
-WORKDAY			= РАБДЕНЬ				##	Возвращает дату в числовом формате, отстоящую вперед или назад на заданное количество рабочих дней.
-YEAR			= ГОД					##	Преобразует дату в числовом формате в год.
-YEARFRAC		= ДОЛЯГОДА				##	Возвращает долю года, которую составляет количество дней между начальной и конечной датами.
-
+BESSELI = БЕССЕЛЬ.I
+BESSELJ = БЕССЕЛЬ.J
+BESSELK = БЕССЕЛЬ.K
+BESSELY = БЕССЕЛЬ.Y
+BIN2DEC = ДВ.В.ДЕС
+BIN2HEX = ДВ.В.ШЕСТН
+BIN2OCT = ДВ.В.ВОСЬМ
+COMPLEX = КОМПЛЕКСН
+CONVERT = ПРЕОБР
+DEC2BIN = ДЕС.В.ДВ
+DEC2HEX = ДЕС.В.ШЕСТН
+DEC2OCT = ДЕС.В.ВОСЬМ
+DELTA = ДЕЛЬТА
+ERF = ФОШ
+ERFC = ДФОШ
+GESTEP = ПОРОГ
+HEX2BIN = ШЕСТН.В.ДВ
+HEX2DEC = ШЕСТН.В.ДЕС
+HEX2OCT = ШЕСТН.В.ВОСЬМ
+IMABS = МНИМ.ABS
+IMAGINARY = МНИМ.ЧАСТЬ
+IMARGUMENT = МНИМ.АРГУМЕНТ
+IMCONJUGATE = МНИМ.СОПРЯЖ
+IMCOS = МНИМ.COS
+IMDIV = МНИМ.ДЕЛ
+IMEXP = МНИМ.EXP
+IMLN = МНИМ.LN
+IMLOG10 = МНИМ.LOG10
+IMLOG2 = МНИМ.LOG2
+IMPOWER = МНИМ.СТЕПЕНЬ
+IMPRODUCT = МНИМ.ПРОИЗВЕД
+IMREAL = МНИМ.ВЕЩ
+IMSIN = МНИМ.SIN
+IMSQRT = МНИМ.КОРЕНЬ
+IMSUB = МНИМ.РАЗН
+IMSUM = МНИМ.СУММ
+OCT2BIN = ВОСЬМ.В.ДВ
+OCT2DEC = ВОСЬМ.В.ДЕС
+OCT2HEX = ВОСЬМ.В.ШЕСТН
 
 ##
-##	Engineering functions					Инженерные функции
+## Финансовые функции (Financial Functions)
 ##
-BESSELI			= БЕССЕЛЬ.I	 			##	Возвращает модифицированную функцию Бесселя In(x).
-BESSELJ			= БЕССЕЛЬ.J				##	Возвращает функцию Бесселя Jn(x).
-BESSELK			= БЕССЕЛЬ.K				##	Возвращает модифицированную функцию Бесселя Kn(x).
-BESSELY			= БЕССЕЛЬ.Y				##	Возвращает функцию Бесселя Yn(x).
-BIN2DEC			= ДВ.В.ДЕС				##	Преобразует двоичное число в десятичное.
-BIN2HEX			= ДВ.В.ШЕСТН				##	Преобразует двоичное число в шестнадцатеричное.
-BIN2OCT			= ДВ.В.ВОСЬМ				##	Преобразует двоичное число в восьмеричное.
-COMPLEX			= КОМПЛЕКСН				##	Преобразует коэффициенты при вещественной и мнимой частях комплексного числа в комплексное число.
-CONVERT			= ПРЕОБР				##	Преобразует число из одной системы единиц измерения в другую.
-DEC2BIN			= ДЕС.В.ДВ				##	Преобразует десятичное число в двоичное.
-DEC2HEX			= ДЕС.В.ШЕСТН				##	Преобразует десятичное число в шестнадцатеричное.
-DEC2OCT			= ДЕС.В.ВОСЬМ				##	Преобразует десятичное число в восьмеричное.
-DELTA			= ДЕЛЬТА				##	Проверяет равенство двух значений.
-ERF			= ФОШ					##	Возвращает функцию ошибки.
-ERFC			= ДФОШ					##	Возвращает дополнительную функцию ошибки.
-GESTEP			= ПОРОГ					##	Проверяет, не превышает ли данное число порогового значения.
-HEX2BIN			= ШЕСТН.В.ДВ				##	Преобразует шестнадцатеричное число в двоичное.
-HEX2DEC			= ШЕСТН.В.ДЕС				##	Преобразует шестнадцатеричное число в десятичное.
-HEX2OCT			= ШЕСТН.В.ВОСЬМ				##	Преобразует шестнадцатеричное число в восьмеричное.
-IMABS			= МНИМ.ABS				##	Возвращает абсолютную величину (модуль) комплексного числа.
-IMAGINARY		= МНИМ.ЧАСТЬ				##	Возвращает коэффициент при мнимой части комплексного числа.
-IMARGUMENT		= МНИМ.АРГУМЕНТ				##	Возвращает значение аргумента комплексного числа (тета) — угол, выраженный в радианах.
-IMCONJUGATE		= МНИМ.СОПРЯЖ				##	Возвращает комплексно-сопряженное комплексное число.
-IMCOS			= МНИМ.COS				##	Возвращает косинус комплексного числа.
-IMDIV			= МНИМ.ДЕЛ				##	Возвращает частное от деления двух комплексных чисел.
-IMEXP			= МНИМ.EXP				##	Возвращает экспоненту комплексного числа.
-IMLN			= МНИМ.LN				##	Возвращает натуральный логарифм комплексного числа.
-IMLOG10			= МНИМ.LOG10				##	Возвращает обычный (десятичный) логарифм комплексного числа.
-IMLOG2			= МНИМ.LOG2				##	Возвращает двоичный логарифм комплексного числа.
-IMPOWER			= МНИМ.СТЕПЕНЬ				##	Возвращает комплексное число, возведенное в целую степень.
-IMPRODUCT		= МНИМ.ПРОИЗВЕД				##	Возвращает произведение от 2 до 29 комплексных чисел.
-IMREAL			= МНИМ.ВЕЩ				##	Возвращает коэффициент при вещественной части комплексного числа.
-IMSIN			= МНИМ.SIN				##	Возвращает синус комплексного числа.
-IMSQRT			= МНИМ.КОРЕНЬ				##	Возвращает значение квадратного корня из комплексного числа.
-IMSUB			= МНИМ.РАЗН				##	Возвращает разность двух комплексных чисел.
-IMSUM			= МНИМ.СУММ				##	Возвращает сумму комплексных чисел.
-OCT2BIN			= ВОСЬМ.В.ДВ				##	Преобразует восьмеричное число в двоичное.
-OCT2DEC			= ВОСЬМ.В.ДЕС				##	Преобразует восьмеричное число в десятичное.
-OCT2HEX			= ВОСЬМ.В.ШЕСТН				##	Преобразует восьмеричное число в шестнадцатеричное.
-
+ACCRINT = НАКОПДОХОД
+ACCRINTM = НАКОПДОХОДПОГАШ
+AMORDEGRC = АМОРУМ
+AMORLINC = АМОРУВ
+COUPDAYBS = ДНЕЙКУПОНДО
+COUPDAYS = ДНЕЙКУПОН
+COUPDAYSNC = ДНЕЙКУПОНПОСЛЕ
+COUPNCD = ДАТАКУПОНПОСЛЕ
+COUPNUM = ЧИСЛКУПОН
+COUPPCD = ДАТАКУПОНДО
+CUMIPMT = ОБЩПЛАТ
+CUMPRINC = ОБЩДОХОД
+DB = ФУО
+DDB = ДДОБ
+DISC = СКИДКА
+DOLLARDE = РУБЛЬ.ДЕС
+DOLLARFR = РУБЛЬ.ДРОБЬ
+DURATION = ДЛИТ
+EFFECT = ЭФФЕКТ
+FV = БС
+FVSCHEDULE = БЗРАСПИС
+INTRATE = ИНОРМА
+IPMT = ПРПЛТ
+IRR = ВСД
+ISPMT = ПРОЦПЛАТ
+MDURATION = МДЛИТ
+MIRR = МВСД
+NOMINAL = НОМИНАЛ
+NPER = КПЕР
+NPV = ЧПС
+ODDFPRICE = ЦЕНАПЕРВНЕРЕГ
+ODDFYIELD = ДОХОДПЕРВНЕРЕГ
+ODDLPRICE = ЦЕНАПОСЛНЕРЕГ
+ODDLYIELD = ДОХОДПОСЛНЕРЕГ
+PMT = ПЛТ
+PPMT = ОСПЛТ
+PRICE = ЦЕНА
+PRICEDISC = ЦЕНАСКИДКА
+PRICEMAT = ЦЕНАПОГАШ
+PV = ПС
+RATE = СТАВКА
+RECEIVED = ПОЛУЧЕНО
+SLN = АПЛ
+SYD = АСЧ
+TBILLEQ = РАВНОКЧЕК
+TBILLPRICE = ЦЕНАКЧЕК
+TBILLYIELD = ДОХОДКЧЕК
+VDB = ПУО
+XIRR = ЧИСТВНДОХ
+XNPV = ЧИСТНЗ
+YIELD = ДОХОД
+YIELDDISC = ДОХОДСКИДКА
+YIELDMAT = ДОХОДПОГАШ
 
 ##
-##	Financial functions					Финансовые функции
+## Информационные функции (Information Functions)
 ##
-ACCRINT			= НАКОПДОХОД				##	Возвращает накопленный процент по ценным бумагам с периодической выплатой процентов.
-ACCRINTM		= НАКОПДОХОДПОГАШ			##	Возвращает накопленный процент по ценным бумагам, проценты по которым выплачиваются в срок погашения.
-AMORDEGRC		= АМОРУМ				##	Возвращает величину амортизации для каждого периода, используя коэффициент амортизации.
-AMORLINC		= АМОРУВ				##	Возвращает величину амортизации для каждого периода.
-COUPDAYBS		= ДНЕЙКУПОНДО				##	Возвращает количество дней от начала действия купона до даты соглашения.
-COUPDAYS		= ДНЕЙКУПОН				##	Возвращает число дней в периоде купона, содержащем дату соглашения.
-COUPDAYSNC		= ДНЕЙКУПОНПОСЛЕ			##	Возвращает число дней от даты соглашения до срока следующего купона.
-COUPNCD			= ДАТАКУПОНПОСЛЕ			##	Возвращает следующую дату купона после даты соглашения.
-COUPNUM			= ЧИСЛКУПОН				##	Возвращает количество купонов, которые могут быть оплачены между датой соглашения и сроком вступления в силу.
-COUPPCD			= ДАТАКУПОНДО				##	Возвращает предыдущую дату купона перед датой соглашения.
-CUMIPMT			= ОБЩПЛАТ				##	Возвращает общую выплату, произведенную между двумя периодическими выплатами.
-CUMPRINC		= ОБЩДОХОД				##	Возвращает общую выплату по займу между двумя периодами.
-DB			= ФУО					##	Возвращает величину амортизации актива для заданного периода, рассчитанную методом фиксированного уменьшения остатка.
-DDB			= ДДОБ					##	Возвращает величину амортизации актива за данный период, используя метод двойного уменьшения остатка или иной явно указанный метод.
-DISC			= СКИДКА				##	Возвращает норму скидки для ценных бумаг.
-DOLLARDE		= РУБЛЬ.ДЕС				##	Преобразует цену в рублях, выраженную в виде дроби, в цену в рублях, выраженную десятичным числом.
-DOLLARFR		= РУБЛЬ.ДРОБЬ				##	Преобразует цену в рублях, выраженную десятичным числом, в цену в рублях, выраженную в виде дроби.
-DURATION		= ДЛИТ					##	Возвращает ежегодную продолжительность действия ценных бумаг с периодическими выплатами по процентам.
-EFFECT			= ЭФФЕКТ				##	Возвращает действующие ежегодные процентные ставки.
-FV			= БС					##	Возвращает будущую стоимость инвестиции.
-FVSCHEDULE		= БЗРАСПИС				##	Возвращает будущую стоимость первоначальной основной суммы после начисления ряда сложных процентов.
-INTRATE			= ИНОРМА				##	Возвращает процентную ставку для полностью инвестированных ценных бумаг.
-IPMT			= ПРПЛТ					##	Возвращает величину выплаты прибыли на вложения за данный период.
-IRR			= ВСД					##	Возвращает внутреннюю ставку доходности для ряда потоков денежных средств.
-ISPMT			= ПРОЦПЛАТ				##	Вычисляет выплаты за указанный период инвестиции.
-MDURATION		= МДЛИТ					##	Возвращает модифицированную длительность Маколея для ценных бумаг с предполагаемой номинальной стоимостью 100 рублей.
-MIRR			= МВСД					##	Возвращает внутреннюю ставку доходности, при которой положительные и отрицательные денежные потоки имеют разные значения ставки.
-NOMINAL			= НОМИНАЛ				##	Возвращает номинальную годовую процентную ставку.
-NPER			= КПЕР					##	Возвращает общее количество периодов выплаты для данного вклада.
-NPV			= ЧПС					##	Возвращает чистую приведенную стоимость инвестиции, основанной на серии периодических денежных потоков и ставке дисконтирования.
-ODDFPRICE		= ЦЕНАПЕРВНЕРЕГ				##	Возвращает цену за 100 рублей нарицательной стоимости ценных бумаг с нерегулярным первым периодом.
-ODDFYIELD		= ДОХОДПЕРВНЕРЕГ			##	Возвращает доход по ценным бумагам с нерегулярным первым периодом.
-ODDLPRICE		= ЦЕНАПОСЛНЕРЕГ				##	Возвращает цену за 100 рублей нарицательной стоимости ценных бумаг с нерегулярным последним периодом.
-ODDLYIELD		= ДОХОДПОСЛНЕРЕГ			##	Возвращает доход по ценным бумагам с нерегулярным последним периодом.
-PMT			= ПЛТ					##	Возвращает величину выплаты за один период аннуитета.
-PPMT			= ОСПЛТ					##	Возвращает величину выплат в погашение основной суммы по инвестиции за заданный период.
-PRICE			= ЦЕНА					##	Возвращает цену за 100 рублей нарицательной стоимости ценных бумаг, по которым производится периодическая выплата процентов.
-PRICEDISC		= ЦЕНАСКИДКА				##	Возвращает цену за 100 рублей номинальной стоимости ценных бумаг, на которые сделана скидка.
-PRICEMAT		= ЦЕНАПОГАШ				##	Возвращает цену за 100 рублей номинальной стоимости ценных бумаг, проценты по которым выплачиваются в срок погашения.
-PV			= ПС					##	Возвращает приведенную (к текущему моменту) стоимость инвестиции.
-RATE			= СТАВКА				##	Возвращает процентную ставку по аннуитету за один период.
-RECEIVED		= ПОЛУЧЕНО				##	Возвращает сумму, полученную к сроку погашения полностью обеспеченных ценных бумаг.
-SLN			= АПЛ					##	Возвращает величину линейной амортизации актива за один период.
-SYD			= АСЧ					##	Возвращает величину амортизации актива за данный период, рассчитанную методом суммы годовых чисел.
-TBILLEQ			= РАВНОКЧЕК				##	Возвращает эквивалентный облигации доход по казначейскому чеку.
-TBILLPRICE		= ЦЕНАКЧЕК				##	Возвращает цену за 100 рублей нарицательной стоимости для казначейского чека.
-TBILLYIELD		= ДОХОДКЧЕК				##	Возвращает доход по казначейскому чеку.
-VDB			= ПУО					##	Возвращает величину амортизации актива для указанного или частичного периода при использовании метода сокращающегося баланса.
-XIRR			= ЧИСТВНДОХ				##	Возвращает внутреннюю ставку доходности для графика денежных потоков, которые не обязательно носят периодический характер.
-XNPV			= ЧИСТНЗ				##	Возвращает чистую приведенную стоимость для денежных потоков, которые не обязательно являются периодическими.
-YIELD			= ДОХОД					##	Возвращает доход от ценных бумаг, по которым производятся периодические выплаты процентов.
-YIELDDISC		= ДОХОДСКИДКА				##	Возвращает годовой доход по ценным бумагам, на которые сделана скидка (пример — казначейские чеки).
-YIELDMAT		= ДОХОДПОГАШ				##	Возвращает годовой доход от ценных бумаг, проценты по которым выплачиваются в срок погашения.
-
+CELL = ЯЧЕЙКА
+ERROR.TYPE = ТИП.ОШИБКИ
+INFO = ИНФОРМ
+ISBLANK = ЕПУСТО
+ISERR = ЕОШ
+ISERROR = ЕОШИБКА
+ISEVEN = ЕЧЁТН
+ISLOGICAL = ЕЛОГИЧ
+ISNA = ЕНД
+ISNONTEXT = ЕНЕТЕКСТ
+ISNUMBER = ЕЧИСЛО
+ISODD = ЕНЕЧЁТ
+ISREF = ЕССЫЛКА
+ISTEXT = ЕТЕКСТ
+N = Ч
+NA = НД
+TYPE = ТИП
 
 ##
-##	Information functions					Информационные функции
+## Логические функции (Logical Functions)
 ##
-CELL			= ЯЧЕЙКА				##	Возвращает информацию о формате, расположении или содержимом ячейки.
-ERROR.TYPE		= ТИП.ОШИБКИ				##	Возвращает числовой код, соответствующий типу ошибки.
-INFO			= ИНФОРМ				##	Возвращает информацию о текущей операционной среде.
-ISBLANK			= ЕПУСТО				##	Возвращает значение ИСТИНА, если аргумент является ссылкой на пустую ячейку.
-ISERR			= ЕОШ					##	Возвращает значение ИСТИНА, если аргумент ссылается на любое значение ошибки, кроме #Н/Д.
-ISERROR			= ЕОШИБКА				##	Возвращает значение ИСТИНА, если аргумент ссылается на любое значение ошибки.
-ISEVEN			= ЕЧЁТН					##	Возвращает значение ИСТИНА, если значение аргумента является четным числом.
-ISLOGICAL		= ЕЛОГИЧ				##	Возвращает значение ИСТИНА, если аргумент ссылается на логическое значение.
-ISNA			= ЕНД					##	Возвращает значение ИСТИНА, если аргумент ссылается на значение ошибки #Н/Д.
-ISNONTEXT		= ЕНЕТЕКСТ				##	Возвращает значение ИСТИНА, если значение аргумента не является текстом.
-ISNUMBER		= ЕЧИСЛО				##	Возвращает значение ИСТИНА, если аргумент ссылается на число.
-ISODD			= ЕНЕЧЁТ				##	Возвращает значение ИСТИНА, если значение аргумента является нечетным числом.
-ISREF			= ЕССЫЛКА				##	Возвращает значение ИСТИНА, если значение аргумента является ссылкой.
-ISTEXT			= ЕТЕКСТ				##	Возвращает значение ИСТИНА, если значение аргумента является текстом.
-N			= Ч					##	Возвращает значение, преобразованное в число.
-NA			= НД					##	Возвращает значение ошибки #Н/Д.
-TYPE			= ТИП					##	Возвращает число, обозначающее тип данных значения.
-
+AND = И
+FALSE = ЛОЖЬ
+IF = ЕСЛИ
+IFERROR = ЕСЛИОШИБКА
+NOT = НЕ
+OR = ИЛИ
+TRUE = ИСТИНА
 
 ##
-##	Logical functions					Логические функции
+## Функции ссылки и поиска (Lookup & Reference Functions)
 ##
-AND			= И					##	Renvoie VRAI si tous ses arguments sont VRAI.
-FALSE			= ЛОЖЬ					##	Возвращает логическое значение ЛОЖЬ.
-IF			= ЕСЛИ					##	Выполняет проверку условия.
-IFERROR			= ЕСЛИОШИБКА				##	Возвращает введённое значение, если вычисление по формуле вызывает ошибку; в противном случае функция возвращает результат вычисления.
-NOT			= НЕ					##	Меняет логическое значение своего аргумента на противоположное.
-OR			= ИЛИ					##	Возвращает значение ИСТИНА, если хотя бы один аргумент имеет значение ИСТИНА.
-TRUE			= ИСТИНА				##	Возвращает логическое значение ИСТИНА.
-
+ADDRESS = АДРЕС
+AREAS = ОБЛАСТИ
+CHOOSE = ВЫБОР
+COLUMN = СТОЛБЕЦ
+COLUMNS = ЧИСЛСТОЛБ
+GETPIVOTDATA = ПОЛУЧИТЬ.ДАННЫЕ.СВОДНОЙ.ТАБЛИЦЫ
+HLOOKUP = ГПР
+HYPERLINK = ГИПЕРССЫЛКА
+INDEX = ИНДЕКС
+INDIRECT = ДВССЫЛ
+LOOKUP = ПРОСМОТР
+MATCH = ПОИСКПОЗ
+OFFSET = СМЕЩ
+ROW = СТРОКА
+ROWS = ЧСТРОК
+RTD = ДРВ
+TRANSPOSE = ТРАНСП
+VLOOKUP = ВПР
 
 ##
-##	Lookup and reference functions				Функции ссылки и поиска
+## Математические и тригонометрические функции (Math & Trig Functions)
 ##
-ADDRESS			= АДРЕС					##	Возвращает ссылку на отдельную ячейку листа в виде текста.
-AREAS			= ОБЛАСТИ				##	Возвращает количество областей в ссылке.
-CHOOSE			= ВЫБОР					##	Выбирает значение из списка значений по индексу.
-COLUMN			= СТОЛБЕЦ				##	Возвращает номер столбца, на который указывает ссылка.
-COLUMNS			= ЧИСЛСТОЛБ				##	Возвращает количество столбцов в ссылке.
-HLOOKUP			= ГПР					##	Ищет в первой строке массива и возвращает значение отмеченной ячейки
-HYPERLINK		= ГИПЕРССЫЛКА				##	Создает ссылку, открывающую документ, который находится на сервере сети, в интрасети или в Интернете.
-INDEX			= ИНДЕКС				##	Использует индекс для выбора значения из ссылки или массива.
-INDIRECT		= ДВССЫЛ				##	Возвращает ссылку, заданную текстовым значением.
-LOOKUP			= ПРОСМОТР				##	Ищет значения в векторе или массиве.
-MATCH			= ПОИСКПОЗ				##	Ищет значения в ссылке или массиве.
-OFFSET			= СМЕЩ					##	Возвращает смещение ссылки относительно заданной ссылки.
-ROW			= СТРОКА				##	Возвращает номер строки, определяемой ссылкой.
-ROWS			= ЧСТРОК				##	Возвращает количество строк в ссылке.
-RTD			= ДРВ					##	Извлекает данные реального времени из программ, поддерживающих автоматизацию COM (Программирование объектов. Стандартное средство для работы с объектами некоторого приложения из другого приложения или средства разработки. Программирование объектов (ранее называемое программированием OLE) является функцией модели COM (Component Object Model, модель компонентных объектов).).
-TRANSPOSE		= ТРАНСП				##	Возвращает транспонированный массив.
-VLOOKUP			= ВПР					##	Ищет значение в первом столбце массива и возвращает значение из ячейки в найденной строке и указанном столбце.
-
+ABS = ABS
+ACOS = ACOS
+ACOSH = ACOSH
+ASIN = ASIN
+ASINH = ASINH
+ATAN = ATAN
+ATAN2 = ATAN2
+ATANH = ATANH
+COMBIN = ЧИСЛКОМБ
+COS = COS
+COSH = COSH
+DEGREES = ГРАДУСЫ
+EVEN = ЧЁТН
+EXP = EXP
+FACT = ФАКТР
+FACTDOUBLE = ДВФАКТР
+GCD = НОД
+INT = ЦЕЛОЕ
+LCM = НОК
+LN = LN
+LOG = LOG
+LOG10 = LOG10
+MDETERM = МОПРЕД
+MINVERSE = МОБР
+MMULT = МУМНОЖ
+MOD = ОСТАТ
+MROUND = ОКРУГЛТ
+MULTINOMIAL = МУЛЬТИНОМ
+ODD = НЕЧЁТ
+PI = ПИ
+POWER = СТЕПЕНЬ
+PRODUCT = ПРОИЗВЕД
+QUOTIENT = ЧАСТНОЕ
+RADIANS = РАДИАНЫ
+RAND = СЛЧИС
+RANDBETWEEN = СЛУЧМЕЖДУ
+ROMAN = РИМСКОЕ
+ROUND = ОКРУГЛ
+ROUNDDOWN = ОКРУГЛВНИЗ
+ROUNDUP = ОКРУГЛВВЕРХ
+SERIESSUM = РЯД.СУММ
+SIGN = ЗНАК
+SIN = SIN
+SINH = SINH
+SQRT = КОРЕНЬ
+SQRTPI = КОРЕНЬПИ
+SUBTOTAL = ПРОМЕЖУТОЧНЫЕ.ИТОГИ
+SUM = СУММ
+SUMIF = СУММЕСЛИ
+SUMIFS = СУММЕСЛИМН
+SUMPRODUCT = СУММПРОИЗВ
+SUMSQ = СУММКВ
+SUMX2MY2 = СУММРАЗНКВ
+SUMX2PY2 = СУММСУММКВ
+SUMXMY2 = СУММКВРАЗН
+TAN = TAN
+TANH = TANH
+TRUNC = ОТБР
 
 ##
-##	Math and trigonometry functions				Математические и тригонометрические функции
+## Статистические функции (Statistical Functions)
 ##
-ABS			= ABS					##	Возвращает модуль (абсолютную величину) числа.
-ACOS			= ACOS					##	Возвращает арккосинус числа.
-ACOSH			= ACOSH					##	Возвращает гиперболический арккосинус числа.
-ASIN			= ASIN					##	Возвращает арксинус числа.
-ASINH			= ASINH					##	Возвращает гиперболический арксинус числа.
-ATAN			= ATAN					##	Возвращает арктангенс числа.
-ATAN2			= ATAN2					##	Возвращает арктангенс для заданных координат x и y.
-ATANH			= ATANH					##	Возвращает гиперболический арктангенс числа.
-CEILING			= ОКРВВЕРХ				##	Округляет число до ближайшего целого или до ближайшего кратного указанному значению.
-COMBIN			= ЧИСЛКОМБ				##	Возвращает количество комбинаций для заданного числа объектов.
-COS			= COS					##	Возвращает косинус числа.
-COSH			= COSH					##	Возвращает гиперболический косинус числа.
-DEGREES			= ГРАДУСЫ				##	Преобразует радианы в градусы.
-EVEN			= ЧЁТН					##	Округляет число до ближайшего четного целого.
-EXP			= EXP					##	Возвращает число e, возведенное в указанную степень.
-FACT			= ФАКТР					##	Возвращает факториал числа.
-FACTDOUBLE		= ДВФАКТР				##	Возвращает двойной факториал числа.
-FLOOR			= ОКРВНИЗ				##	Округляет число до ближайшего меньшего по модулю значения.
-GCD			= НОД					##	Возвращает наибольший общий делитель.
-INT			= ЦЕЛОЕ					##	Округляет число до ближайшего меньшего целого.
-LCM			= НОК					##	Возвращает наименьшее общее кратное.
-LN			= LN					##	Возвращает натуральный логарифм числа.
-LOG			= LOG					##	Возвращает логарифм числа по заданному основанию.
-LOG10			= LOG10					##	Возвращает десятичный логарифм числа.
-MDETERM			= МОПРЕД				##	Возвращает определитель матрицы массива.
-MINVERSE		= МОБР					##	Возвращает обратную матрицу массива.
-MMULT			= МУМНОЖ				##	Возвращает произведение матриц двух массивов.
-MOD			= ОСТАТ					##	Возвращает остаток от деления.
-MROUND			= ОКРУГЛТ				##	Возвращает число, округленное с требуемой точностью.
-MULTINOMIAL		= МУЛЬТИНОМ				##	Возвращает мультиномиальный коэффициент множества чисел.
-ODD			= НЕЧЁТ					##	Округляет число до ближайшего нечетного целого.
-PI			= ПИ					##	Возвращает число пи.
-POWER			= СТЕПЕНЬ				##	Возвращает результат возведения числа в степень.
-PRODUCT			= ПРОИЗВЕД				##	Возвращает произведение аргументов.
-QUOTIENT		= ЧАСТНОЕ				##	Возвращает целую часть частного при делении.
-RADIANS			= РАДИАНЫ				##	Преобразует градусы в радианы.
-RAND			= СЛЧИС					##	Возвращает случайное число в интервале от 0 до 1.
-RANDBETWEEN		= СЛУЧМЕЖДУ				##	Возвращает случайное число в интервале между двумя заданными числами.
-ROMAN			= РИМСКОЕ				##	Преобразует арабские цифры в римские в виде текста.
-ROUND			= ОКРУГЛ				##	Округляет число до указанного количества десятичных разрядов.
-ROUNDDOWN		= ОКРУГЛВНИЗ				##	Округляет число до ближайшего меньшего по модулю значения.
-ROUNDUP			= ОКРУГЛВВЕРХ				##	Округляет число до ближайшего большего по модулю значения.
-SERIESSUM		= РЯД.СУММ				##	Возвращает сумму степенного ряда, вычисленную по формуле.
-SIGN			= ЗНАК					##	Возвращает знак числа.
-SIN			= SIN					##	Возвращает синус заданного угла.
-SINH			= SINH					##	Возвращает гиперболический синус числа.
-SQRT			= КОРЕНЬ				##	Возвращает положительное значение квадратного корня.
-SQRTPI			= КОРЕНЬПИ				##	Возвращает квадратный корень из значения выражения (число * ПИ).
-SUBTOTAL		= ПРОМЕЖУТОЧНЫЕ.ИТОГИ			##	Возвращает промежуточный итог в списке или базе данных.
-SUM			= СУММ					##	Суммирует аргументы.
-SUMIF			= СУММЕСЛИ				##	Суммирует ячейки, удовлетворяющие заданному условию.
-SUMIFS			= СУММЕСЛИМН				##	Суммирует диапазон ячеек, удовлетворяющих нескольким условиям.
-SUMPRODUCT		= СУММПРОИЗВ				##	Возвращает сумму произведений соответствующих элементов массивов.
-SUMSQ			= СУММКВ				##	Возвращает сумму квадратов аргументов.
-SUMX2MY2		= СУММРАЗНКВ				##	Возвращает сумму разностей квадратов соответствующих значений в двух массивах.
-SUMX2PY2		= СУММСУММКВ				##	Возвращает сумму сумм квадратов соответствующих элементов двух массивов.
-SUMXMY2			= СУММКВРАЗН				##	Возвращает сумму квадратов разностей соответствующих значений в двух массивах.
-TAN			= TAN					##	Возвращает тангенс числа.
-TANH			= TANH					##	Возвращает гиперболический тангенс числа.
-TRUNC			= ОТБР					##	Отбрасывает дробную часть числа.
-
+AVEDEV = СРОТКЛ
+AVERAGE = СРЗНАЧ
+AVERAGEA = СРЗНАЧА
+AVERAGEIF = СРЗНАЧЕСЛИ
+AVERAGEIFS = СРЗНАЧЕСЛИМН
+CORREL = КОРРЕЛ
+COUNT = СЧЁТ
+COUNTA = СЧЁТЗ
+COUNTBLANK = СЧИТАТЬПУСТОТЫ
+COUNTIF = СЧЁТЕСЛИ
+COUNTIFS = СЧЁТЕСЛИМН
+DEVSQ = КВАДРОТКЛ
+FISHER = ФИШЕР
+FISHERINV = ФИШЕРОБР
+FREQUENCY = ЧАСТОТА
+GAMMALN = ГАММАНЛОГ
+GEOMEAN = СРГЕОМ
+GROWTH = РОСТ
+HARMEAN = СРГАРМ
+INTERCEPT = ОТРЕЗОК
+KURT = ЭКСЦЕСС
+LARGE = НАИБОЛЬШИЙ
+LINEST = ЛИНЕЙН
+LOGEST = ЛГРФПРИБЛ
+MAX = МАКС
+MAXA = МАКСА
+MEDIAN = МЕДИАНА
+MIN = МИН
+MINA = МИНА
+PEARSON = ПИРСОН
+PERMUT = ПЕРЕСТ
+PROB = ВЕРОЯТНОСТЬ
+RSQ = КВПИРСОН
+SKEW = СКОС
+SLOPE = НАКЛОН
+SMALL = НАИМЕНЬШИЙ
+STANDARDIZE = НОРМАЛИЗАЦИЯ
+STDEVA = СТАНДОТКЛОНА
+STDEVPA = СТАНДОТКЛОНПА
+STEYX = СТОШYX
+TREND = ТЕНДЕНЦИЯ
+TRIMMEAN = УРЕЗСРЕДНЕЕ
+VARA = ДИСПА
+VARPA = ДИСПРА
 
 ##
-##	Statistical functions					Статистические функции
+## Текстовые функции (Text Functions)
 ##
-AVEDEV			= СРОТКЛ				##	Возвращает среднее арифметическое абсолютных значений отклонений точек данных от среднего.
-AVERAGE			= СРЗНАЧ				##	Возвращает среднее арифметическое аргументов.
-AVERAGEA		= СРЗНАЧА				##	Возвращает среднее арифметическое аргументов, включая числа, текст и логические значения.
-AVERAGEIF		= СРЗНАЧЕСЛИ 				##	Возвращает среднее значение (среднее арифметическое) всех ячеек в диапазоне, которые удовлетворяют данному условию.
-AVERAGEIFS		= СРЗНАЧЕСЛИМН 				##	Возвращает среднее значение (среднее арифметическое) всех ячеек, которые удовлетворяют нескольким условиям.
-BETADIST		= БЕТАРАСП				##	Возвращает интегральную функцию бета-распределения.
-BETAINV			= БЕТАОБР				##	Возвращает обратную интегральную функцию указанного бета-распределения.
-BINOMDIST		= БИНОМРАСП				##	Возвращает отдельное значение биномиального распределения.
-CHIDIST			= ХИ2РАСП				##	Возвращает одностороннюю вероятность распределения хи-квадрат.
-CHIINV			= ХИ2ОБР				##	Возвращает обратное значение односторонней вероятности распределения хи-квадрат.
-CHITEST			= ХИ2ТЕСТ				##	Возвращает тест на независимость.
-CONFIDENCE		= ДОВЕРИТ				##	Возвращает доверительный интервал для среднего значения по генеральной совокупности.
-CORREL			= КОРРЕЛ				##	Возвращает коэффициент корреляции между двумя множествами данных.
-COUNT			= СЧЁТ					##	Подсчитывает количество чисел в списке аргументов.
-COUNTA			= СЧЁТЗ					##	Подсчитывает количество значений в списке аргументов.
-COUNTBLANK		= СЧИТАТЬПУСТОТЫ			##	Подсчитывает количество пустых ячеек в диапазоне
-COUNTIF			= СЧЁТЕСЛИ 				##	Подсчитывает количество ячеек в диапазоне, удовлетворяющих заданному условию
-COUNTIFS		= СЧЁТЕСЛИМН				##	Подсчитывает количество ячеек внутри диапазона, удовлетворяющих нескольким условиям.
-COVAR			= КОВАР					##	Возвращает ковариацию, среднее произведений парных отклонений
-CRITBINOM		= КРИТБИНОМ				##	Возвращает наименьшее значение, для которого интегральное биномиальное распределение меньше или равно заданному критерию.
-DEVSQ			= КВАДРОТКЛ				##	Возвращает сумму квадратов отклонений.
-EXPONDIST		= ЭКСПРАСП				##	Возвращает экспоненциальное распределение.
-FDIST			= FРАСП					##	Возвращает F-распределение вероятности.
-FINV			= FРАСПОБР				##	Возвращает обратное значение для F-распределения вероятности.
-FISHER			= ФИШЕР					##	Возвращает преобразование Фишера.
-FISHERINV		= ФИШЕРОБР				##	Возвращает обратное преобразование Фишера.
-FORECAST		= ПРЕДСКАЗ				##	Возвращает значение линейного тренда.
-FREQUENCY		= ЧАСТОТА				##	Возвращает распределение частот в виде вертикального массива.
-FTEST			= ФТЕСТ					##	Возвращает результат F-теста.
-GAMMADIST		= ГАММАРАСП				##	Возвращает гамма-распределение.
-GAMMAINV		= ГАММАОБР				##	Возвращает обратное гамма-распределение.
-GAMMALN			= ГАММАНЛОГ				##	Возвращает натуральный логарифм гамма функции, Γ(x).
-GEOMEAN			= СРГЕОМ				##	Возвращает среднее геометрическое.
-GROWTH			= РОСТ					##	Возвращает значения в соответствии с экспоненциальным трендом.
-HARMEAN			= СРГАРМ				##	Возвращает среднее гармоническое.
-HYPGEOMDIST		= ГИПЕРГЕОМЕТ				##	Возвращает гипергеометрическое распределение.
-INTERCEPT		= ОТРЕЗОК				##	Возвращает отрезок, отсекаемый на оси линией линейной регрессии.
-KURT			= ЭКСЦЕСС				##	Возвращает эксцесс множества данных.
-LARGE			= НАИБОЛЬШИЙ				##	Возвращает k-ое наибольшее значение в множестве данных.
-LINEST			= ЛИНЕЙН				##	Возвращает параметры линейного тренда.
-LOGEST			= ЛГРФПРИБЛ				##	Возвращает параметры экспоненциального тренда.
-LOGINV			= ЛОГНОРМОБР				##	Возвращает обратное логарифмическое нормальное распределение.
-LOGNORMDIST		= ЛОГНОРМРАСП				##	Возвращает интегральное логарифмическое нормальное распределение.
-MAX			= МАКС					##	Возвращает наибольшее значение в списке аргументов.
-MAXA			= МАКСА					##	Возвращает наибольшее значение в списке аргументов, включая числа, текст и логические значения.
-MEDIAN			= МЕДИАНА				##	Возвращает медиану заданных чисел.
-MIN			= МИН					##	Возвращает наименьшее значение в списке аргументов.
-MINA			= МИНА					##	Возвращает наименьшее значение в списке аргументов, включая числа, текст и логические значения.
-MODE			= МОДА					##	Возвращает значение моды множества данных.
-NEGBINOMDIST		= ОТРБИНОМРАСП				##	Возвращает отрицательное биномиальное распределение.
-NORMDIST		= НОРМРАСП				##	Возвращает нормальную функцию распределения.
-NORMINV			= НОРМОБР				##	Возвращает обратное нормальное распределение.
-NORMSDIST		= НОРМСТРАСП				##	Возвращает стандартное нормальное интегральное распределение.
-NORMSINV		= НОРМСТОБР				##	Возвращает обратное значение стандартного нормального распределения.
-PEARSON			= ПИРСОН				##	Возвращает коэффициент корреляции Пирсона.
-PERCENTILE		= ПЕРСЕНТИЛЬ				##	Возвращает k-ую персентиль для значений диапазона.
-PERCENTRANK		= ПРОЦЕНТРАНГ				##	Возвращает процентную норму значения в множестве данных.
-PERMUT			= ПЕРЕСТ				##	Возвращает количество перестановок для заданного числа объектов.
-POISSON			= ПУАССОН				##	Возвращает распределение Пуассона.
-PROB			= ВЕРОЯТНОСТЬ				##	Возвращает вероятность того, что значение из диапазона находится внутри заданных пределов.
-QUARTILE		= КВАРТИЛЬ				##	Возвращает квартиль множества данных.
-RANK			= РАНГ					##	Возвращает ранг числа в списке чисел.
-RSQ			= КВПИРСОН				##	Возвращает квадрат коэффициента корреляции Пирсона.
-SKEW			= СКОС					##	Возвращает асимметрию распределения.
-SLOPE			= НАКЛОН				##	Возвращает наклон линии линейной регрессии.
-SMALL			= НАИМЕНЬШИЙ				##	Возвращает k-ое наименьшее значение в множестве данных.
-STANDARDIZE		= НОРМАЛИЗАЦИЯ				##	Возвращает нормализованное значение.
-STDEV			= СТАНДОТКЛОН				##	Оценивает стандартное отклонение по выборке.
-STDEVA			= СТАНДОТКЛОНА				##	Оценивает стандартное отклонение по выборке, включая числа, текст и логические значения.
-STDEVP			= СТАНДОТКЛОНП				##	Вычисляет стандартное отклонение по генеральной совокупности.
-STDEVPA			= СТАНДОТКЛОНПА				##	Вычисляет стандартное отклонение по генеральной совокупности, включая числа, текст и логические значения.
-STEYX			= СТОШYX				##	Возвращает стандартную ошибку предсказанных значений y для каждого значения x в регрессии.
-TDIST			= СТЬЮДРАСП				##	Возвращает t-распределение Стьюдента.
-TINV			= СТЬЮДРАСПОБР				##	Возвращает обратное t-распределение Стьюдента.
-TREND			= ТЕНДЕНЦИЯ				##	Возвращает значения в соответствии с линейным трендом.
-TRIMMEAN		= УРЕЗСРЕДНЕЕ				##	Возвращает среднее внутренности множества данных.
-TTEST			= ТТЕСТ					##	Возвращает вероятность, соответствующую критерию Стьюдента.
-VAR			= ДИСП					##	Оценивает дисперсию по выборке.
-VARA			= ДИСПА					##	Оценивает дисперсию по выборке, включая числа, текст и логические значения.
-VARP			= ДИСПР					##	Вычисляет дисперсию для генеральной совокупности.
-VARPA			= ДИСПРА				##	Вычисляет дисперсию для генеральной совокупности, включая числа, текст и логические значения.
-WEIBULL			= ВЕЙБУЛЛ				##	Возвращает распределение Вейбулла.
-ZTEST			= ZТЕСТ					##	Возвращает двустороннее P-значение z-теста.
+ASC = ASC
+BAHTTEXT = БАТТЕКСТ
+CHAR = СИМВОЛ
+CLEAN = ПЕЧСИМВ
+CODE = КОДСИМВ
+DOLLAR = РУБЛЬ
+EXACT = СОВПАД
+FIND = НАЙТИ
+FINDB = НАЙТИБ
+FIXED = ФИКСИРОВАННЫЙ
+LEFT = ЛЕВСИМВ
+LEFTB = ЛЕВБ
+LEN = ДЛСТР
+LENB = ДЛИНБ
+LOWER = СТРОЧН
+MID = ПСТР
+MIDB = ПСТРБ
+PHONETIC = PHONETIC
+PROPER = ПРОПНАЧ
+REPLACE = ЗАМЕНИТЬ
+REPLACEB = ЗАМЕНИТЬБ
+REPT = ПОВТОР
+RIGHT = ПРАВСИМВ
+RIGHTB = ПРАВБ
+SEARCH = ПОИСК
+SEARCHB = ПОИСКБ
+SUBSTITUTE = ПОДСТАВИТЬ
+T = Т
+TEXT = ТЕКСТ
+TRIM = СЖПРОБЕЛЫ
+UPPER = ПРОПИСН
+VALUE = ЗНАЧЕН
 
+##
+##  (Web Functions)
+##
 
 ##
-##	Text functions						Текстовые функции
+##  (Compatibility Functions)
 ##
-ASC			= ASC					##	Для языков с двухбайтовыми наборами знаков (например, катакана) преобразует полноширинные (двухбайтовые) знаки в полуширинные (однобайтовые).
-BAHTTEXT		= БАТТЕКСТ				##	Преобразует число в текст, используя денежный формат ß (БАТ).
-CHAR			= СИМВОЛ				##	Возвращает знак с заданным кодом.
-CLEAN			= ПЕЧСИМВ				##	Удаляет все непечатаемые знаки из текста.
-CODE			= КОДСИМВ				##	Возвращает числовой код первого знака в текстовой строке.
-CONCATENATE		= СЦЕПИТЬ				##	Объединяет несколько текстовых элементов в один.
-DOLLAR			= РУБЛЬ					##	Преобразует число в текст, используя денежный формат.
-EXACT			= СОВПАД				##	Проверяет идентичность двух текстовых значений.
-FIND			= НАЙТИ					##	Ищет вхождения одного текстового значения в другом (с учетом регистра).
-FINDB			= НАЙТИБ				##	Ищет вхождения одного текстового значения в другом (с учетом регистра).
-FIXED			= ФИКСИРОВАННЫЙ				##	Форматирует число и преобразует его в текст с заданным числом десятичных знаков.
-JIS			= JIS					##	Для языков с двухбайтовыми наборами знаков (например, катакана) преобразует полуширинные (однобайтовые) знаки в текстовой строке в полноширинные (двухбайтовые).
-LEFT			= ЛЕВСИМВ				##	Возвращает крайние слева знаки текстового значения.
-LEFTB			= ЛЕВБ					##	Возвращает крайние слева знаки текстового значения.
-LEN			= ДЛСТР					##	Возвращает количество знаков в текстовой строке.
-LENB			= ДЛИНБ					##	Возвращает количество знаков в текстовой строке.
-LOWER			= СТРОЧН				##	Преобразует все буквы текста в строчные.
-MID			= ПСТР					##	Возвращает заданное число знаков из строки текста, начиная с указанной позиции.
-MIDB			= ПСТРБ					##	Возвращает заданное число знаков из строки текста, начиная с указанной позиции.
-PHONETIC		= PHONETIC				##	Извлекает фонетические (фуригана) знаки из текстовой строки.
-PROPER			= ПРОПНАЧ				##	Преобразует первую букву в каждом слове текста в прописную.
-REPLACE			= ЗАМЕНИТЬ				##	Заменяет знаки в тексте.
-REPLACEB		= ЗАМЕНИТЬБ				##	Заменяет знаки в тексте.
-REPT			= ПОВТОР				##	Повторяет текст заданное число раз.
-RIGHT			= ПРАВСИМВ				##	Возвращает крайние справа знаки текстовой строки.
-RIGHTB			= ПРАВБ					##	Возвращает крайние справа знаки текстовой строки.
-SEARCH			= ПОИСК					##	Ищет вхождения одного текстового значения в другом (без учета регистра).
-SEARCHB			= ПОИСКБ				##	Ищет вхождения одного текстового значения в другом (без учета регистра).
-SUBSTITUTE		= ПОДСТАВИТЬ				##	Заменяет в текстовой строке старый текст новым.
-T			= Т					##	Преобразует аргументы в текст.
-TEXT			= ТЕКСТ					##	Форматирует число и преобразует его в текст.
-TRIM			= СЖПРОБЕЛЫ				##	Удаляет из текста пробелы.
-UPPER			= ПРОПИСН				##	Преобразует все буквы текста в прописные.
-VALUE			= ЗНАЧЕН				##	Преобразует текстовый аргумент в число.
+BETADIST = БЕТАРАСП
+BETAINV = БЕТАОБР
+BINOMDIST = БИНОМРАСП
+CEILING = ОКРВВЕРХ
+CHIDIST = ХИ2РАСП
+CHIINV = ХИ2ОБР
+CHITEST = ХИ2ТЕСТ
+CONCATENATE = СЦЕПИТЬ
+CONFIDENCE = ДОВЕРИТ
+COVAR = КОВАР
+CRITBINOM = КРИТБИНОМ
+EXPONDIST = ЭКСПРАСП
+FDIST = FРАСП
+FINV = FРАСПОБР
+FLOOR = ОКРВНИЗ
+FORECAST = ПРЕДСКАЗ
+FTEST = ФТЕСТ
+GAMMADIST = ГАММАРАСП
+GAMMAINV = ГАММАОБР
+HYPGEOMDIST = ГИПЕРГЕОМЕТ
+LOGINV = ЛОГНОРМОБР
+LOGNORMDIST = ЛОГНОРМРАСП
+MODE = МОДА
+NEGBINOMDIST = ОТРБИНОМРАСП
+NORMDIST = НОРМРАСП
+NORMINV = НОРМОБР
+NORMSDIST = НОРМСТРАСП
+NORMSINV = НОРМСТОБР
+PERCENTILE = ПЕРСЕНТИЛЬ
+PERCENTRANK = ПРОЦЕНТРАНГ
+POISSON = ПУАССОН
+QUARTILE = КВАРТИЛЬ
+RANK = РАНГ
+STDEV = СТАНДОТКЛОН
+STDEVP = СТАНДОТКЛОНП
+TDIST = СТЬЮДРАСП
+TINV = СТЬЮДРАСПОБР
+TTEST = ТТЕСТ
+VAR = ДИСП
+VARP = ДИСПР
+WEIBULL = ВЕЙБУЛЛ
+ZTEST = ZТЕСТ
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/da/functions b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/da/functions
index 6260760bc7..03b68c9bd6 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/da/functions
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/da/functions
@@ -245,6 +245,7 @@ ROWS = RÆKKER
 RTD = RTD
 TRANSPOSE = TRANSPONER
 VLOOKUP = LOPSLAG
+*RC = RK
 
 ##
 ## Matematiske og trigonometriske funktioner (Math & Trig Functions)
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/de/functions b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/de/functions
index 331232f7e5..d49fc5f1b0 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/de/functions
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/de/functions
@@ -243,6 +243,7 @@ ROWS = ZEILEN
 RTD = RTD
 TRANSPOSE = MTRANS
 VLOOKUP = SVERWEIS
+*RC = ZS
 
 ##
 ## Mathematische und trigonometrische Funktionen (Math & Trig Functions)
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/en/uk/config b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/en/uk/config
index 859e4beed9..4e068ab0c8 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/en/uk/config
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/en/uk/config
@@ -1,8 +1,24 @@
+############################################################
 ##
-## PhpSpreadsheet
+## PhpSpreadsheet - locale settings
 ##
+## English-UK (English-UK)
+##
+############################################################
+
+ArgumentSeparator = ,
+##
+##  (For future use)
+##
+currencySymbol = £
 
 ##
-##	(For future use)
+## Error Codes
 ##
-currencySymbol	= £
+NULL
+DIV0
+VALUE
+REF
+NAME
+NUM
+NA
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/es/functions b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/es/functions
index 1f9f2891e6..88012aa128 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/es/functions
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/es/functions
@@ -245,6 +245,7 @@ ROWS = FILAS
 RTD = RDTR
 TRANSPOSE = TRANSPONER
 VLOOKUP = BUSCARV
+*RC = FC
 
 ##
 ## Funciones matemáticas y trigonométricas (Math & Trig Functions)
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/fi/functions b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/fi/functions
index 33068d93e9..18f7c8c8b4 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/fi/functions
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/fi/functions
@@ -245,6 +245,7 @@ ROWS = RIVIT
 RTD = RTD
 TRANSPOSE = TRANSPONOI
 VLOOKUP = PHAKU
+*RC = RS
 
 ##
 ## Matemaattiset ja trigonometriset funktiot (Math & Trig Functions)
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/fr/functions b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/fr/functions
index 78b603e9cf..621cb0db3b 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/fr/functions
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/fr/functions
@@ -240,6 +240,7 @@ ROWS = LIGNES
 RTD = RTD
 TRANSPOSE = TRANSPOSE
 VLOOKUP = RECHERCHEV
+*RC = LC
 
 ##
 ## Fonctions mathématiques et trigonométriques (Math & Trig Functions)
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/hu/functions b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/hu/functions
index 46b3012714..4a375ea2d0 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/hu/functions
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/hu/functions
@@ -245,6 +245,7 @@ ROWS = SOROK
 RTD = VIA
 TRANSPOSE = TRANSZPONÁLÁS
 VLOOKUP = FKERES
+*RC = SO
 
 ##
 ## Matematikai és trigonometrikus függvények (Math & Trig Functions)
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/nb/functions b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/nb/functions
index b0a0f9492a..d352e1f418 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/nb/functions
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/nb/functions
@@ -245,6 +245,7 @@ ROWS = RADER
 RTD = RTD
 TRANSPOSE = TRANSPONER
 VLOOKUP = FINN.RAD
+*RC = RK
 
 ##
 ## Matematikk- og trigonometrifunksjoner (Math & Trig Functions)
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/nl/functions b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/nl/functions
index 0e4f1597db..ce0b30cc8d 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/nl/functions
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/nl/functions
@@ -244,6 +244,7 @@ ROWS = RIJEN
 RTD = RTG
 TRANSPOSE = TRANSPONEREN
 VLOOKUP = VERT.ZOEKEN
+*RC = RK
 
 ##
 ## Wiskundige en trigonometrische functies (Math & Trig Functions)
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pt/br/functions b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pt/br/functions
index feba30d9a9..5781b0c705 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pt/br/functions
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pt/br/functions
@@ -242,6 +242,7 @@ ROWS = LINS
 RTD = RTD
 TRANSPOSE = TRANSPOR
 VLOOKUP = PROCV
+*RC = LC
 
 ##
 ## Funções matemáticas e trigonométricas (Math & Trig Functions)
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pt/functions b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pt/functions
index 8a94d82606..70a3bb0c7e 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pt/functions
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/pt/functions
@@ -245,6 +245,7 @@ ROWS = LINS
 RTD = RTD
 TRANSPOSE = TRANSPOR
 VLOOKUP = PROCV
+*RC = LC
 
 ##
 ## Funções matemáticas e trigonométricas (Math & Trig Functions)
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/ru/functions b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/ru/functions
index 7f9ce78328..9f05d5afa5 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/ru/functions
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/ru/functions
@@ -177,6 +177,7 @@ SYD = АСЧ
 TBILLEQ = РАВНОКЧЕК
 TBILLPRICE = ЦЕНАКЧЕК
 TBILLYIELD = ДОХОДКЧЕК
+USDOLLAR = ДОЛЛСША
 VDB = ПУО
 XIRR = ЧИСТВНДОХ
 XNPV = ЧИСТНЗ
@@ -231,6 +232,7 @@ AREAS = ОБЛАСТИ
 CHOOSE = ВЫБОР
 COLUMN = СТОЛБЕЦ
 COLUMNS = ЧИСЛСТОЛБ
+FILTER = ФИЛЬТР
 FORMULATEXT = Ф.ТЕКСТ
 GETPIVOTDATA = ПОЛУЧИТЬ.ДАННЫЕ.СВОДНОЙ.ТАБЛИЦЫ
 HLOOKUP = ГПР
@@ -243,8 +245,13 @@ OFFSET = СМЕЩ
 ROW = СТРОКА
 ROWS = ЧСТРОК
 RTD = ДРВ
+SORT = СОРТ
+SORTBY = СОРТПО
 TRANSPOSE = ТРАНСП
+UNIQUE = УНИК
 VLOOKUP = ВПР
+XLOOKUP = ПРОСМОТРX
+XMATCH = ПОИСКПОЗX
 
 ##
 ## Математические и тригонометрические функции (Math & Trig Functions)
@@ -302,6 +309,7 @@ PRODUCT = ПРОИЗВЕД
 QUOTIENT = ЧАСТНОЕ
 RADIANS = РАДИАНЫ
 RAND = СЛЧИС
+RANDARRAY = СЛУЧМАССИВ
 RANDBETWEEN = СЛУЧМЕЖДУ
 ROMAN = РИМСКОЕ
 ROUND = ОКРУГЛ
@@ -312,6 +320,7 @@ ROUNDUP = ОКРУГЛВВЕРХ
 SEC = SEC
 SECH = SECH
 SERIESSUM = РЯД.СУММ
+SEQUENCE = ПОСЛЕДОВ
 SIGN = ЗНАК
 SIN = SIN
 SINH = SINH
@@ -447,27 +456,36 @@ Z.TEST = Z.ТЕСТ
 ##
 ## Текстовые функции (Text Functions)
 ##
+ARRAYTOTEXT = МАССИВВТЕКСТ
 BAHTTEXT = БАТТЕКСТ
 CHAR = СИМВОЛ
 CLEAN = ПЕЧСИМВ
 CODE = КОДСИМВ
 CONCAT = СЦЕП
+DBCS = БДЦС
 DOLLAR = РУБЛЬ
 EXACT = СОВПАД
 FIND = НАЙТИ
+FINDB = НАЙТИБ
 FIXED = ФИКСИРОВАННЫЙ
-ISTHAIDIGIT = TAYRAKAMIYSA
+ISTHAIDIGIT = ЕТАЙЦИФРЫ
 LEFT = ЛЕВСИМВ
+LEFTB = ЛЕВБ
 LEN = ДЛСТР
+LENB = ДЛИНБ
 LOWER = СТРОЧН
 MID = ПСТР
+MIDB = ПСТРБ
 NUMBERSTRING = СТРОКАЧИСЕЛ
 NUMBERVALUE = ЧЗНАЧ
 PROPER = ПРОПНАЧ
 REPLACE = ЗАМЕНИТЬ
+REPLACEB = ЗАМЕНИТЬБ
 REPT = ПОВТОР
 RIGHT = ПРАВСИМВ
+RIGHTB = ПРАВБ
 SEARCH = ПОИСК
+SEARCHB = ПОИСКБ
 SUBSTITUTE = ПОДСТАВИТЬ
 T = Т
 TEXT = ТЕКСТ
@@ -481,6 +499,7 @@ UNICHAR = ЮНИСИМВ
 UNICODE = UNICODE
 UPPER = ПРОПИСН
 VALUE = ЗНАЧЕН
+VALUETOTEXT = ЗНАЧЕНИЕВТЕКСТ
 
 ##
 ## Веб-функции (Web Functions)
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/sv/functions b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/sv/functions
index 2531b4c1dc..491ecfb93a 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/sv/functions
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/locale/sv/functions
@@ -243,6 +243,7 @@ ROWS = RADER
 RTD = RTD
 TRANSPOSE = TRANSPONERA
 VLOOKUP = LETARAD
+*RC = RK
 
 ##
 ## Matematiska och trigonometriska funktioner (Math & Trig Functions)
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/AddressHelper.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/AddressHelper.php
index 499d248c28..923f9417a7 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/AddressHelper.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/AddressHelper.php
@@ -2,23 +2,44 @@
 
 namespace PhpOffice\PhpSpreadsheet\Cell;
 
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Exception;
 
 class AddressHelper
 {
     public const R1C1_COORDINATE_REGEX = '/(R((?:\[-?\d*\])|(?:\d*))?)(C((?:\[-?\d*\])|(?:\d*))?)/i';
 
+    /** @return string[] */
+    public static function getRowAndColumnChars(): array
+    {
+        $rowChar = 'R';
+        $colChar = 'C';
+        if (Functions::getCompatibilityMode() === Functions::COMPATIBILITY_EXCEL) {
+            $rowColChars = Calculation::localeFunc('*RC');
+            if (mb_strlen($rowColChars) === 2) {
+                $rowChar = mb_substr($rowColChars, 0, 1);
+                $colChar = mb_substr($rowColChars, 1, 1);
+            }
+        }
+
+        return [$rowChar, $colChar];
+    }
+
     /**
      * Converts an R1C1 format cell address to an A1 format cell address.
      */
     public static function convertToA1(
         string $address,
         int $currentRowNumber = 1,
-        int $currentColumnNumber = 1
+        int $currentColumnNumber = 1,
+        bool $useLocale = true
     ): string {
-        $validityCheck = preg_match('/^(R(\[?-?\d*\]?))(C(\[?-?\d*\]?))$/i', $address, $cellReference);
+        [$rowChar, $colChar] = $useLocale ? self::getRowAndColumnChars() : ['R', 'C'];
+        $regex = '/^(' . $rowChar . '(\[?[-+]?\d*\]?))(' . $colChar . '(\[?[-+]?\d*\]?))$/i';
+        $validityCheck = preg_match($regex, $address, $cellReference);
 
-        if ($validityCheck === 0) {
+        if (empty($validityCheck)) {
             throw new Exception('Invalid R1C1-format Cell Reference');
         }
 
@@ -40,6 +61,7 @@ public static function convertToA1(
         if (is_string($columnReference) && $columnReference[0] === '[') {
             $columnReference = $currentColumnNumber + (int) trim($columnReference, '[]');
         }
+        $columnReference = (int) $columnReference;
 
         if ($columnReference <= 0 || $rowReference <= 0) {
             throw new Exception('Invalid R1C1-format Cell Reference, Value out of range');
@@ -56,7 +78,8 @@ protected static function convertSpreadsheetMLFormula(string $formula): string
         $key = false;
         foreach ($temp as &$value) {
             //    Only replace in alternate array entries (i.e. non-quoted blocks)
-            if ($key = !$key) {
+            $key = $key === false;
+            if ($key) {
                 $value = str_replace(['[.', ':.', ']'], ['', ':', ''], $value);
             }
         }
@@ -73,7 +96,7 @@ public static function convertFormulaToA1(
         int $currentRowNumber = 1,
         int $currentColumnNumber = 1
     ): string {
-        if (substr($formula, 0, 3) == 'of:') {
+        if (str_starts_with($formula, 'of:')) {
             // We have an old-style SpreadsheetML Formula
             return self::convertSpreadsheetMLFormula($formula);
         }
@@ -83,7 +106,8 @@ public static function convertFormulaToA1(
         $key = false;
         foreach ($temp as &$value) {
             //    Only replace in alternate array entries (i.e. non-quoted blocks)
-            if ($key = !$key) {
+            $key = $key === false;
+            if ($key) {
                 preg_match_all(self::R1C1_COORDINATE_REGEX, $value, $cellReferences, PREG_SET_ORDER + PREG_OFFSET_CAPTURE);
                 //    Reverse the matches array, otherwise all our offsets will become incorrect if we modify our way
                 //        through the formula from left to right. Reversing means that we work right to left.through
@@ -92,7 +116,7 @@ public static function convertFormulaToA1(
                 //    Loop through each R1C1 style reference in turn, converting it to its A1 style equivalent,
                 //        then modify the formula to use that new reference
                 foreach ($cellReferences as $cellReference) {
-                    $A1CellReference = self::convertToA1($cellReference[0][0], $currentRowNumber, $currentColumnNumber);
+                    $A1CellReference = self::convertToA1($cellReference[0][0], $currentRowNumber, $currentColumnNumber, false);
                     $value = substr_replace($value, $A1CellReference, $cellReference[0][1], strlen($cellReference[0][0]));
                 }
             }
@@ -118,17 +142,17 @@ public static function convertToR1C1(
             throw new Exception('Invalid A1-format Cell Reference');
         }
 
-        $columnId = Coordinate::columnIndexFromString($cellReference['col_ref']);
-        if ($cellReference['absolute_col'] === '$') {
+        if ($cellReference['col'][0] === '$') {
             // Column must be absolute address
             $currentColumnNumber = null;
         }
+        $columnId = Coordinate::columnIndexFromString(ltrim($cellReference['col'], '$'));
 
-        $rowId = (int) $cellReference['row_ref'];
-        if ($cellReference['absolute_row'] === '$') {
+        if ($cellReference['row'][0] === '$') {
             // Row must be absolute address
             $currentRowNumber = null;
         }
+        $rowId = (int) ltrim($cellReference['row'], '$');
 
         if ($currentRowNumber !== null) {
             if ($rowId === $currentRowNumber) {
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/AddressRange.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/AddressRange.php
new file mode 100644
index 0000000000..22e9d11ecc
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/AddressRange.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Cell;
+
+/**
+ * @template T
+ */
+interface AddressRange
+{
+    public const MAX_ROW = 1048576;
+
+    public const MAX_COLUMN = 'XFD';
+
+    public const MAX_COLUMN_INT = 16384;
+
+    /**
+     * @return T
+     */
+    public function from(): mixed;
+
+    /**
+     * @return T
+     */
+    public function to(): mixed;
+
+    public function __toString(): string;
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/AdvancedValueBinder.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/AdvancedValueBinder.php
index 025a687bce..416864529e 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/AdvancedValueBinder.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/AdvancedValueBinder.php
@@ -3,7 +3,7 @@
 namespace PhpOffice\PhpSpreadsheet\Cell;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
-use PhpOffice\PhpSpreadsheet\RichText\RichText;
+use PhpOffice\PhpSpreadsheet\Calculation\Engine\FormattedNumber;
 use PhpOffice\PhpSpreadsheet\Shared\Date;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
@@ -15,10 +15,8 @@ class AdvancedValueBinder extends DefaultValueBinder implements IValueBinder
      *
      * @param Cell $cell Cell to bind value to
      * @param mixed $value Value to bind in cell
-     *
-     * @return bool
      */
-    public function bindValue(Cell $cell, $value = null)
+    public function bindValue(Cell $cell, mixed $value = null): bool
     {
         if ($value === null) {
             return parent::bindValue($cell, $value);
@@ -31,54 +29,44 @@ public function bindValue(Cell $cell, $value = null)
         $dataType = parent::dataTypeForValue($value);
 
         // Style logic - strings
-        if ($dataType === DataType::TYPE_STRING && !$value instanceof RichText) {
+        if ($dataType === DataType::TYPE_STRING && is_string($value)) {
             //    Test for booleans using locale-setting
-            if ($value == Calculation::getTRUE()) {
+            if (StringHelper::strToUpper($value) === Calculation::getTRUE()) {
                 $cell->setValueExplicit(true, DataType::TYPE_BOOL);
 
                 return true;
-            } elseif ($value == Calculation::getFALSE()) {
+            } elseif (StringHelper::strToUpper($value) === Calculation::getFALSE()) {
                 $cell->setValueExplicit(false, DataType::TYPE_BOOL);
 
                 return true;
             }
 
             // Check for fractions
-            if (preg_match('/^([+-]?)\s*(\d+)\s?\/\s*(\d+)$/', $value, $matches)) {
+            if (preg_match('~^([+-]?)\s*(\d+)\s*/\s*(\d+)$~', $value, $matches)) {
                 return $this->setProperFraction($matches, $cell);
-            } elseif (preg_match('/^([+-]?)(\d*) +(\d*)\s?\/\s*(\d*)$/', $value, $matches)) {
+            } elseif (preg_match('~^([+-]?)(\d+)\s+(\d+)\s*/\s*(\d+)$~', $value, $matches)) {
                 return $this->setImproperFraction($matches, $cell);
             }
 
+            $decimalSeparatorNoPreg = StringHelper::getDecimalSeparator();
+            $decimalSeparator = preg_quote($decimalSeparatorNoPreg, '/');
+            $thousandsSeparator = preg_quote(StringHelper::getThousandsSeparator(), '/');
+
             // Check for percentage
-            if (preg_match('/^\-?\d*\.?\d*\s?\%$/', $value)) {
-                return $this->setPercentage($value, $cell);
+            if (preg_match('/^\-?\d*' . $decimalSeparator . '?\d*\s?\%$/', (string) preg_replace('/(\d)' . $thousandsSeparator . '(\d)/u', '$1$2', $value))) {
+                return $this->setPercentage((string) preg_replace('/(\d)' . $thousandsSeparator . '(\d)/u', '$1$2', $value), $cell);
             }
 
             // Check for currency
-            $currencyCode = StringHelper::getCurrencyCode();
-            $decimalSeparator = StringHelper::getDecimalSeparator();
-            $thousandsSeparator = StringHelper::getThousandsSeparator();
-            if (preg_match('/^' . preg_quote($currencyCode, '/') . ' *(\d{1,3}(' . preg_quote($thousandsSeparator, '/') . '\d{3})*|(\d+))(' . preg_quote($decimalSeparator, '/') . '\d{2})?$/', $value)) {
+            if (preg_match(FormattedNumber::currencyMatcherRegexp(), (string) preg_replace('/(\d)' . $thousandsSeparator . '(\d)/u', '$1$2', $value), $matches, PREG_UNMATCHED_AS_NULL)) {
                 // Convert value to number
-                $value = (float) trim(str_replace([$currencyCode, $thousandsSeparator, $decimalSeparator], ['', '', '.'], $value));
-                $cell->setValueExplicit($value, DataType::TYPE_NUMERIC);
-                // Set style
-                $cell->getWorksheet()->getStyle($cell->getCoordinate())
-                    ->getNumberFormat()->setFormatCode(
-                        str_replace('$', $currencyCode, NumberFormat::FORMAT_CURRENCY_USD_SIMPLE)
-                    );
-
-                return true;
-            } elseif (preg_match('/^\$ *(\d{1,3}(\,\d{3})*|(\d+))(\.\d{2})?$/', $value)) {
-                // Convert value to number
-                $value = (float) trim(str_replace(['$', ','], '', $value));
-                $cell->setValueExplicit($value, DataType::TYPE_NUMERIC);
-                // Set style
-                $cell->getWorksheet()->getStyle($cell->getCoordinate())
-                    ->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_CURRENCY_USD_SIMPLE);
+                $sign = ($matches['PrefixedSign'] ?? $matches['PrefixedSign2'] ?? $matches['PostfixedSign']) ?? null;
+                $currencyCode = $matches['PrefixedCurrency'] ?? $matches['PostfixedCurrency'];
+                /** @var string */
+                $temp = str_replace([$decimalSeparatorNoPreg, $currencyCode, ' ', '-'], ['.', '', '', ''], (string) preg_replace('/(\d)' . $thousandsSeparator . '(\d)/u', '$1$2', $value));
+                $value = (float) ($sign . trim($temp));
 
-                return true;
+                return $this->setCurrency($value, $cell, $currencyCode ?? '');
             }
 
             // Check for time without seconds e.g. '9:45', '09:45'
@@ -96,7 +84,7 @@ public function bindValue(Cell $cell, $value = null)
                 // Convert value to number
                 $cell->setValueExplicit($d, DataType::TYPE_NUMERIC);
                 // Determine style. Either there is a time part or not. Look for ':'
-                if (strpos($value, ':') !== false) {
+                if (str_contains($value, ':')) {
                     $formatCode = 'yyyy-mm-dd h:mm';
                 } else {
                     $formatCode = 'yyyy-mm-dd';
@@ -108,7 +96,7 @@ public function bindValue(Cell $cell, $value = null)
             }
 
             // Check for newline character "\n"
-            if (strpos($value, "\n") !== false) {
+            if (str_contains($value, "\n")) {
                 $cell->setValueExplicit($value, DataType::TYPE_STRING);
                 // Set style
                 $cell->getWorksheet()->getStyle($cell->getCoordinate())
@@ -175,10 +163,24 @@ protected function setPercentage(string $value, Cell $cell): bool
         return true;
     }
 
+    protected function setCurrency(float $value, Cell $cell, string $currencyCode): bool
+    {
+        $cell->setValueExplicit($value, DataType::TYPE_NUMERIC);
+        // Set style
+        $cell->getWorksheet()->getStyle($cell->getCoordinate())
+            ->getNumberFormat()->setFormatCode(
+                str_replace('$', '[$' . $currencyCode . ']', NumberFormat::FORMAT_CURRENCY_USD)
+            );
+
+        return true;
+    }
+
     protected function setTimeHoursMinutes(string $value, Cell $cell): bool
     {
         // Convert value to number
         [$hours, $minutes] = explode(':', $value);
+        $hours = (int) $hours;
+        $minutes = (int) $minutes;
         $days = ($hours / 24) + ($minutes / 1440);
         $cell->setValueExplicit($days, DataType::TYPE_NUMERIC);
 
@@ -193,6 +195,9 @@ protected function setTimeHoursMinutesSeconds(string $value, Cell $cell): bool
     {
         // Convert value to number
         [$hours, $minutes, $seconds] = explode(':', $value);
+        $hours = (int) $hours;
+        $minutes = (int) $minutes;
+        $seconds = (int) $seconds;
         $days = ($hours / 24) + ($minutes / 1440) + ($seconds / 86400);
         $cell->setValueExplicit($days, DataType::TYPE_NUMERIC);
 
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/Cell.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/Cell.php
index 8ca2709735..e8e9afa716 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/Cell.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/Cell.php
@@ -3,28 +3,33 @@
 namespace PhpOffice\PhpSpreadsheet\Cell;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception as CalculationException;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Collection\Cells;
-use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Exception as SpreadsheetException;
 use PhpOffice\PhpSpreadsheet\RichText\RichText;
+use PhpOffice\PhpSpreadsheet\Shared\Date as SharedDate;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\CellStyleAssessor;
 use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+use PhpOffice\PhpSpreadsheet\Style\Protection;
 use PhpOffice\PhpSpreadsheet\Style\Style;
+use PhpOffice\PhpSpreadsheet\Worksheet\Table;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use Stringable;
 
-class Cell
+class Cell implements Stringable
 {
     /**
      * Value binder to use.
-     *
-     * @var IValueBinder
      */
-    private static $valueBinder;
+    private static ?IValueBinder $valueBinder = null;
 
     /**
      * Value of the cell.
-     *
-     * @var mixed
      */
-    private $value;
+    private mixed $value;
 
     /**
      *    Calculated value of the cell (used for caching)
@@ -40,45 +45,46 @@ class Cell
 
     /**
      * Type of the cell data.
-     *
-     * @var string
      */
-    private $dataType;
+    private string $dataType;
 
     /**
-     * Collection of cells.
-     *
-     * @var Cells
+     * The collection of cells that this cell belongs to (i.e. The Cell Collection for the parent Worksheet).
      */
-    private $parent;
+    private ?Cells $parent;
 
     /**
-     * Index to cellXf.
-     *
-     * @var int
+     * Index to the cellXf reference for the styling of this cell.
      */
-    private $xfIndex = 0;
+    private int $xfIndex = 0;
 
     /**
      * Attributes of the formula.
+     *
+     * @var null|array<string, string>
      */
-    private $formulaAttributes;
+    private mixed $formulaAttributes = null;
+
+    private IgnoredErrors $ignoredErrors;
 
     /**
      * Update the cell into the cell collection.
      *
-     * @return $this
+     * @throws SpreadsheetException
      */
-    public function updateInCollection()
+    public function updateInCollection(): self
     {
-        $this->parent->update($this);
+        $parent = $this->parent;
+        if ($parent === null) {
+            throw new SpreadsheetException('Cannot update when cell is not bound to a worksheet');
+        }
+        $parent->update($this);
 
         return $this;
     }
 
     public function detach(): void
     {
-        // @phpstan-ignore-next-line
         $this->parent = null;
     }
 
@@ -90,80 +96,128 @@ public function attach(Cells $parent): void
     /**
      * Create a new Cell.
      *
-     * @param mixed $pValue
-     * @param string $pDataType
+     * @throws SpreadsheetException
      */
-    public function __construct($pValue, $pDataType, Worksheet $pSheet)
+    public function __construct(mixed $value, ?string $dataType, Worksheet $worksheet)
     {
         // Initialise cell value
-        $this->value = $pValue;
+        $this->value = $value;
 
         // Set worksheet cache
-        $this->parent = $pSheet->getCellCollection();
+        $this->parent = $worksheet->getCellCollection();
 
         // Set datatype?
-        if ($pDataType !== null) {
-            if ($pDataType == DataType::TYPE_STRING2) {
-                $pDataType = DataType::TYPE_STRING;
+        if ($dataType !== null) {
+            if ($dataType == DataType::TYPE_STRING2) {
+                $dataType = DataType::TYPE_STRING;
             }
-            $this->dataType = $pDataType;
-        } elseif (!self::getValueBinder()->bindValue($this, $pValue)) {
-            throw new Exception('Value could not be bound to cell.');
+            $this->dataType = $dataType;
+        } elseif (self::getValueBinder()->bindValue($this, $value) === false) {
+            throw new SpreadsheetException('Value could not be bound to cell.');
         }
+        $this->ignoredErrors = new IgnoredErrors();
     }
 
     /**
      * Get cell coordinate column.
      *
-     * @return string
+     * @throws SpreadsheetException
      */
-    public function getColumn()
+    public function getColumn(): string
     {
-        return $this->parent->getCurrentColumn();
+        $parent = $this->parent;
+        if ($parent === null) {
+            throw new SpreadsheetException('Cannot get column when cell is not bound to a worksheet');
+        }
+
+        return $parent->getCurrentColumn();
     }
 
     /**
      * Get cell coordinate row.
      *
-     * @return int
+     * @throws SpreadsheetException
      */
-    public function getRow()
+    public function getRow(): int
     {
-        return $this->parent->getCurrentRow();
+        $parent = $this->parent;
+        if ($parent === null) {
+            throw new SpreadsheetException('Cannot get row when cell is not bound to a worksheet');
+        }
+
+        return $parent->getCurrentRow();
     }
 
     /**
      * Get cell coordinate.
      *
-     * @return string
+     * @throws SpreadsheetException
      */
-    public function getCoordinate()
+    public function getCoordinate(): string
     {
-        return $this->parent->getCurrentCoordinate();
+        $parent = $this->parent;
+        if ($parent !== null) {
+            $coordinate = $parent->getCurrentCoordinate();
+        } else {
+            $coordinate = null;
+        }
+        if ($coordinate === null) {
+            throw new SpreadsheetException('Coordinate no longer exists');
+        }
+
+        return $coordinate;
     }
 
     /**
      * Get cell value.
-     *
-     * @return mixed
      */
-    public function getValue()
+    public function getValue(): mixed
     {
         return $this->value;
     }
 
+    public function getValueString(): string
+    {
+        $value = $this->value;
+
+        return ($value === '' || is_scalar($value) || $value instanceof Stringable) ? "$value" : '';
+    }
+
     /**
      * Get cell value with formatting.
-     *
-     * @return string
      */
-    public function getFormattedValue()
+    public function getFormattedValue(): string
     {
-        return (string) NumberFormat::toFormattedString(
+        $currentCalendar = SharedDate::getExcelCalendar();
+        SharedDate::setExcelCalendar($this->getWorksheet()->getParent()?->getExcelCalendar());
+        $formattedValue = (string) NumberFormat::toFormattedString(
             $this->getCalculatedValue(),
-            $this->getStyle()
-                ->getNumberFormat()->getFormatCode()
+            (string) $this->getStyle()->getNumberFormat()->getFormatCode(true)
         );
+        SharedDate::setExcelCalendar($currentCalendar);
+
+        return $formattedValue;
+    }
+
+    protected static function updateIfCellIsTableHeader(?Worksheet $workSheet, self $cell, mixed $oldValue, mixed $newValue): void
+    {
+        $oldValue = (is_scalar($oldValue) || $oldValue instanceof Stringable) ? ((string) $oldValue) : null;
+        $newValue = (is_scalar($newValue) || $newValue instanceof Stringable) ? ((string) $newValue) : null;
+        if (StringHelper::strToLower($oldValue ?? '') === StringHelper::strToLower($newValue ?? '') || $workSheet === null) {
+            return;
+        }
+
+        foreach ($workSheet->getTableCollection() as $table) {
+            /** @var Table $table */
+            if ($cell->isInRange($table->getRange())) {
+                $rangeRowsColumns = Coordinate::getRangeBoundaries($table->getRange());
+                if ($cell->getRow() === (int) $rangeRowsColumns[0][1]) {
+                    Table\Column::updateStructuredReferences($workSheet, $oldValue, $newValue);
+                }
+
+                return;
+            }
+        }
     }
 
     /**
@@ -171,14 +225,16 @@ public function getFormattedValue()
      *
      *    Sets the value for a cell, automatically determining the datatype using the value binder
      *
-     * @param mixed $pValue Value
+     * @param mixed $value Value
+     * @param null|IValueBinder $binder Value Binder to override the currently set Value Binder
      *
-     * @return $this
+     * @throws SpreadsheetException
      */
-    public function setValue($pValue)
+    public function setValue(mixed $value, ?IValueBinder $binder = null): self
     {
-        if (!self::getValueBinder()->bindValue($this, $pValue)) {
-            throw new Exception('Value could not be bound to cell.');
+        $binder ??= self::getValueBinder();
+        if (!$binder->bindValue($this, $value)) {
+            throw new SpreadsheetException('Value could not be bound to cell.');
         }
 
         return $this;
@@ -187,58 +243,151 @@ public function setValue($pValue)
     /**
      * Set the value for a cell, with the explicit data type passed to the method (bypassing any use of the value binder).
      *
-     * @param mixed $pValue Value
-     * @param string $pDataType Explicit data type, see DataType::TYPE_*
+     * @param mixed $value Value
+     * @param string $dataType Explicit data type, see DataType::TYPE_*
+     *        Note that PhpSpreadsheet does not validate that the value and datatype are consistent, in using this
+     *             method, then it is your responsibility as an end-user developer to validate that the value and
+     *             the datatype match.
+     *       If you do mismatch value and datatype, then the value you enter may be changed to match the datatype
+     *          that you specify.
      *
-     * @return Cell
+     * @throws SpreadsheetException
      */
-    public function setValueExplicit($pValue, $pDataType)
+    public function setValueExplicit(mixed $value, string $dataType = DataType::TYPE_STRING): self
     {
+        $oldValue = $this->value;
+        $quotePrefix = false;
+
         // set the value according to data type
-        switch ($pDataType) {
+        switch ($dataType) {
             case DataType::TYPE_NULL:
-                $this->value = $pValue;
+                $this->value = null;
 
                 break;
             case DataType::TYPE_STRING2:
-                $pDataType = DataType::TYPE_STRING;
-            // no break
+                $dataType = DataType::TYPE_STRING;
+                // no break
             case DataType::TYPE_STRING:
                 // Synonym for string
+                if (is_string($value) && strlen($value) > 1 && $value[0] === '=') {
+                    $quotePrefix = true;
+                }
+                // no break
             case DataType::TYPE_INLINE:
                 // Rich text
-                $this->value = DataType::checkString($pValue);
+                if ($value !== null && !is_scalar($value) && !($value instanceof Stringable)) {
+                    throw new SpreadsheetException('Invalid unstringable value for datatype Inline/String/String2');
+                }
+                $this->value = DataType::checkString(($value instanceof RichText) ? $value : ((string) $value));
 
                 break;
             case DataType::TYPE_NUMERIC:
-                if (is_string($pValue) && !is_numeric($pValue)) {
-                    throw new Exception('Invalid numeric value for datatype Numeric');
+                if (is_string($value) && !is_numeric($value)) {
+                    throw new SpreadsheetException('Invalid numeric value for datatype Numeric');
                 }
-                $this->value = 0 + $pValue;
+                $this->value = 0 + $value;
 
                 break;
             case DataType::TYPE_FORMULA:
-                $this->value = (string) $pValue;
+                if ($value !== null && !is_scalar($value) && !($value instanceof Stringable)) {
+                    throw new SpreadsheetException('Invalid unstringable value for datatype Formula');
+                }
+                $this->value = (string) $value;
 
                 break;
             case DataType::TYPE_BOOL:
-                $this->value = (bool) $pValue;
+                $this->value = (bool) $value;
 
                 break;
-            case DataType::TYPE_ERROR:
-                $this->value = DataType::checkErrorCode($pValue);
+            case DataType::TYPE_ISO_DATE:
+                $this->value = SharedDate::convertIsoDate($value);
+                $dataType = DataType::TYPE_NUMERIC;
 
                 break;
-            default:
-                throw new Exception('Invalid datatype: ' . $pDataType);
+            case DataType::TYPE_ERROR:
+                $this->value = DataType::checkErrorCode($value);
 
                 break;
+            default:
+                throw new SpreadsheetException('Invalid datatype: ' . $dataType);
         }
 
         // set the datatype
-        $this->dataType = $pDataType;
+        $this->dataType = $dataType;
+
+        $this->updateInCollection();
+        $cellCoordinate = $this->getCoordinate();
+        self::updateIfCellIsTableHeader($this->getParent()?->getParent(), $this, $oldValue, $value);
+        $worksheet = $this->getWorksheet();
+        $spreadsheet = $worksheet->getParent();
+        if (isset($spreadsheet)) {
+            $originalSelected = $worksheet->getSelectedCells();
+            $activeSheetIndex = $spreadsheet->getActiveSheetIndex();
+            $style = $this->getStyle();
+            $oldQuotePrefix = $style->getQuotePrefix();
+            if ($oldQuotePrefix !== $quotePrefix) {
+                $style->setQuotePrefix($quotePrefix);
+            }
+            $worksheet->setSelectedCells($originalSelected);
+            if ($activeSheetIndex >= 0) {
+                $spreadsheet->setActiveSheetIndex($activeSheetIndex);
+            }
+        }
 
-        return $this->updateInCollection();
+        return $this->getParent()?->get($cellCoordinate) ?? $this;
+    }
+
+    public const CALCULATE_DATE_TIME_ASIS = 0;
+    public const CALCULATE_DATE_TIME_FLOAT = 1;
+    public const CALCULATE_TIME_FLOAT = 2;
+
+    private static int $calculateDateTimeType = self::CALCULATE_DATE_TIME_ASIS;
+
+    public static function getCalculateDateTimeType(): int
+    {
+        return self::$calculateDateTimeType;
+    }
+
+    /** @throws CalculationException */
+    public static function setCalculateDateTimeType(int $calculateDateTimeType): void
+    {
+        self::$calculateDateTimeType = match ($calculateDateTimeType) {
+            self::CALCULATE_DATE_TIME_ASIS, self::CALCULATE_DATE_TIME_FLOAT, self::CALCULATE_TIME_FLOAT => $calculateDateTimeType,
+            default => throw new CalculationException("Invalid value $calculateDateTimeType for calculated date time type"),
+        };
+    }
+
+    /**
+     * Convert date, time, or datetime from int to float if desired.
+     */
+    private function convertDateTimeInt(mixed $result): mixed
+    {
+        if (is_int($result)) {
+            if (self::$calculateDateTimeType === self::CALCULATE_TIME_FLOAT) {
+                if (SharedDate::isDateTime($this, $result, false)) {
+                    $result = (float) $result;
+                }
+            } elseif (self::$calculateDateTimeType === self::CALCULATE_DATE_TIME_FLOAT) {
+                if (SharedDate::isDateTime($this, $result, true)) {
+                    $result = (float) $result;
+                }
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Get calculated cell value converted to string.
+     */
+    public function getCalculatedValueString(): string
+    {
+        $value = $this->getCalculatedValue();
+        while (is_array($value)) {
+            $value = array_shift($value);
+        }
+
+        return ($value === '' || is_scalar($value) || $value instanceof Stringable) ? "$value" : '';
     }
 
     /**
@@ -246,38 +395,166 @@ public function setValueExplicit($pValue, $pDataType)
      *
      * @param bool $resetLog Whether the calculation engine logger should be reset or not
      *
-     * @return mixed
+     * @throws CalculationException
      */
-    public function getCalculatedValue($resetLog = true)
+    public function getCalculatedValue(bool $resetLog = true): mixed
     {
-        if ($this->dataType == DataType::TYPE_FORMULA) {
+        $title = 'unknown';
+        $oldAttributes = $this->formulaAttributes;
+        $oldAttributesT = $oldAttributes['t'] ?? '';
+        $coordinate = $this->getCoordinate();
+        $oldAttributesRef = $oldAttributes['ref'] ?? $coordinate;
+        if (!str_contains($oldAttributesRef, ':')) {
+            $oldAttributesRef .= ":$oldAttributesRef";
+        }
+        $originalValue = $this->value;
+        $originalDataType = $this->dataType;
+        $this->formulaAttributes = [];
+        $spill = false;
+
+        if ($this->dataType === DataType::TYPE_FORMULA) {
             try {
-                $index = $this->getWorksheet()->getParent()->getActiveSheetIndex();
-                $selected = $this->getWorksheet()->getSelectedCells();
-                $result = Calculation::getInstance(
-                    $this->getWorksheet()->getParent()
-                )->calculateCellValue($this, $resetLog);
-                $this->getWorksheet()->setSelectedCells($selected);
-                $this->getWorksheet()->getParent()->setActiveSheetIndex($index);
-                //    We don't yet handle array returns
-                if (is_array($result)) {
+                $currentCalendar = SharedDate::getExcelCalendar();
+                SharedDate::setExcelCalendar($this->getWorksheet()->getParent()?->getExcelCalendar());
+                $thisworksheet = $this->getWorksheet();
+                $index = $thisworksheet->getParentOrThrow()->getActiveSheetIndex();
+                $selected = $thisworksheet->getSelectedCells();
+                $title = $thisworksheet->getTitle();
+                $calculation = Calculation::getInstance($thisworksheet->getParent());
+                $result = $calculation->calculateCellValue($this, $resetLog);
+                $result = $this->convertDateTimeInt($result);
+                $thisworksheet->setSelectedCells($selected);
+                $thisworksheet->getParentOrThrow()->setActiveSheetIndex($index);
+                if (is_array($result) && $calculation->getInstanceArrayReturnType() !== Calculation::RETURN_ARRAY_AS_ARRAY) {
                     while (is_array($result)) {
                         $result = array_shift($result);
                     }
                 }
-            } catch (Exception $ex) {
+                // if return_as_array for formula like '=sheet!cell'
+                if (is_array($result) && count($result) === 1) {
+                    $resultKey = array_keys($result)[0];
+                    $resultValue = $result[$resultKey];
+                    if (is_int($resultKey) && is_array($resultValue) && count($resultValue) === 1) {
+                        $resultKey2 = array_keys($resultValue)[0];
+                        $resultValue2 = $resultValue[$resultKey2];
+                        if (is_string($resultKey2) && !is_array($resultValue2) && preg_match('/[a-zA-Z]{1,3}/', $resultKey2) === 1) {
+                            $result = $resultValue2;
+                        }
+                    }
+                }
+                $newColumn = $this->getColumn();
+                if (is_array($result)) {
+                    $this->formulaAttributes['t'] = 'array';
+                    $this->formulaAttributes['ref'] = $maxCoordinate = $coordinate;
+                    $newRow = $row = $this->getRow();
+                    $column = $this->getColumn();
+                    foreach ($result as $resultRow) {
+                        if (is_array($resultRow)) {
+                            $newColumn = $column;
+                            foreach ($resultRow as $resultValue) {
+                                if ($row !== $newRow || $column !== $newColumn) {
+                                    $maxCoordinate = $newColumn . $newRow;
+                                    if ($thisworksheet->getCell($newColumn . $newRow)->getValue() !== null) {
+                                        if (!Coordinate::coordinateIsInsideRange($oldAttributesRef, $newColumn . $newRow)) {
+                                            $spill = true;
+
+                                            break;
+                                        }
+                                    }
+                                }
+                                ++$newColumn;
+                            }
+                            ++$newRow;
+                        } else {
+                            if ($row !== $newRow || $column !== $newColumn) {
+                                $maxCoordinate = $newColumn . $newRow;
+                                if ($thisworksheet->getCell($newColumn . $newRow)->getValue() !== null) {
+                                    if (!Coordinate::coordinateIsInsideRange($oldAttributesRef, $newColumn . $newRow)) {
+                                        $spill = true;
+                                    }
+                                }
+                            }
+                            ++$newColumn;
+                        }
+                        if ($spill) {
+                            break;
+                        }
+                    }
+                    if (!$spill) {
+                        $this->formulaAttributes['ref'] .= ":$maxCoordinate";
+                    }
+                    $thisworksheet->getCell($column . $row);
+                }
+                if (is_array($result)) {
+                    if ($oldAttributes !== null && $calculation->getInstanceArrayReturnType() === Calculation::RETURN_ARRAY_AS_ARRAY) {
+                        if (($oldAttributesT) === 'array') {
+                            $thisworksheet = $this->getWorksheet();
+                            $coordinate = $this->getCoordinate();
+                            $ref = $oldAttributesRef;
+                            if (preg_match('/^([A-Z]{1,3})([0-9]{1,7})(:([A-Z]{1,3})([0-9]{1,7}))?$/', $ref, $matches) === 1) {
+                                if (isset($matches[3])) {
+                                    $minCol = $matches[1];
+                                    $minRow = (int) $matches[2];
+                                    $maxCol = $matches[4];
+                                    ++$maxCol;
+                                    $maxRow = (int) $matches[5];
+                                    for ($row = $minRow; $row <= $maxRow; ++$row) {
+                                        for ($col = $minCol; $col !== $maxCol; ++$col) {
+                                            if ("$col$row" !== $coordinate) {
+                                                $thisworksheet->getCell("$col$row")->setValue(null);
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                            $thisworksheet->getCell($coordinate);
+                        }
+                    }
+                }
+                if ($spill) {
+                    $result = ExcelError::SPILL();
+                }
+                if (is_array($result)) {
+                    $newRow = $row = $this->getRow();
+                    $newColumn = $column = $this->getColumn();
+                    foreach ($result as $resultRow) {
+                        if (is_array($resultRow)) {
+                            $newColumn = $column;
+                            foreach ($resultRow as $resultValue) {
+                                if ($row !== $newRow || $column !== $newColumn) {
+                                    $thisworksheet->getCell($newColumn . $newRow)->setValue($resultValue);
+                                }
+                                ++$newColumn;
+                            }
+                            ++$newRow;
+                        } else {
+                            if ($row !== $newRow || $column !== $newColumn) {
+                                $thisworksheet->getCell($newColumn . $newRow)->setValue($resultRow);
+                            }
+                            ++$newColumn;
+                        }
+                    }
+                    $thisworksheet->getCell($column . $row);
+                    $this->value = $originalValue;
+                    $this->dataType = $originalDataType;
+                }
+            } catch (SpreadsheetException $ex) {
+                SharedDate::setExcelCalendar($currentCalendar);
                 if (($ex->getMessage() === 'Unable to access External Workbook') && ($this->calculatedValue !== null)) {
                     return $this->calculatedValue; // Fallback for calculations referencing external files.
                 } elseif (preg_match('/[Uu]ndefined (name|offset: 2|array key 2)/', $ex->getMessage()) === 1) {
-                    return \PhpOffice\PhpSpreadsheet\Calculation\Functions::NAME();
+                    return ExcelError::NAME();
                 }
 
-                throw new \PhpOffice\PhpSpreadsheet\Calculation\Exception(
-                    $this->getWorksheet()->getTitle() . '!' . $this->getCoordinate() . ' -> ' . $ex->getMessage()
+                throw new CalculationException(
+                    $title . '!' . $this->getCoordinate() . ' -> ' . $ex->getMessage(),
+                    $ex->getCode(),
+                    $ex
                 );
             }
+            SharedDate::setExcelCalendar($currentCalendar);
 
-            if ($result === '#Not Yet Implemented') {
+            if ($result === Functions::NOT_YET_IMPLEMENTED) {
                 return $this->calculatedValue; // Fallback if calculation engine does not support the formula.
             }
 
@@ -286,20 +563,18 @@ public function getCalculatedValue($resetLog = true)
             return $this->value->getPlainText();
         }
 
-        return $this->value;
+        return $this->convertDateTimeInt($this->value);
     }
 
     /**
      * Set old calculated value (cached).
      *
-     * @param mixed $pValue Value
-     *
-     * @return Cell
+     * @param mixed $originalValue Value
      */
-    public function setCalculatedValue($pValue)
+    public function setCalculatedValue(mixed $originalValue, bool $tryNumeric = true): self
     {
-        if ($pValue !== null) {
-            $this->calculatedValue = (is_numeric($pValue)) ? (float) $pValue : $pValue;
+        if ($originalValue !== null) {
+            $this->calculatedValue = ($tryNumeric && is_numeric($originalValue)) ? (0 + $originalValue) : $originalValue;
         }
 
         return $this->updateInCollection();
@@ -312,20 +587,16 @@ public function setCalculatedValue($pValue)
      *    Note that this value is not guaranteed to reflect the actual calculated value because it is
      *        possible that auto-calculation was disabled in the original spreadsheet, and underlying data
      *        values used by the formula have changed since it was last calculated.
-     *
-     * @return mixed
      */
-    public function getOldCalculatedValue()
+    public function getOldCalculatedValue(): mixed
     {
         return $this->calculatedValue;
     }
 
     /**
      * Get cell data type.
-     *
-     * @return string
      */
-    public function getDataType()
+    public function getDataType(): string
     {
         return $this->dataType;
     }
@@ -333,39 +604,32 @@ public function getDataType()
     /**
      * Set cell data type.
      *
-     * @param string $pDataType see DataType::TYPE_*
-     *
-     * @return Cell
+     * @param string $dataType see DataType::TYPE_*
      */
-    public function setDataType($pDataType)
+    public function setDataType(string $dataType): self
     {
-        if ($pDataType == DataType::TYPE_STRING2) {
-            $pDataType = DataType::TYPE_STRING;
-        }
-        $this->dataType = $pDataType;
+        $this->setValueExplicit($this->value, $dataType);
 
-        return $this->updateInCollection();
+        return $this;
     }
 
     /**
      * Identify if the cell contains a formula.
-     *
-     * @return bool
      */
-    public function isFormula()
+    public function isFormula(): bool
     {
-        return $this->dataType == DataType::TYPE_FORMULA;
+        return $this->dataType === DataType::TYPE_FORMULA && $this->getStyle()->getQuotePrefix() === false;
     }
 
     /**
      *    Does this cell contain Data validation rules?
      *
-     * @return bool
+     * @throws SpreadsheetException
      */
-    public function hasDataValidation()
+    public function hasDataValidation(): bool
     {
         if (!isset($this->parent)) {
-            throw new Exception('Cannot check for data validation when cell is not bound to a worksheet');
+            throw new SpreadsheetException('Cannot check for data validation when cell is not bound to a worksheet');
         }
 
         return $this->getWorksheet()->dataValidationExists($this->getCoordinate());
@@ -374,12 +638,12 @@ public function hasDataValidation()
     /**
      * Get Data validation rules.
      *
-     * @return DataValidation
+     * @throws SpreadsheetException
      */
-    public function getDataValidation()
+    public function getDataValidation(): DataValidation
     {
         if (!isset($this->parent)) {
-            throw new Exception('Cannot get data validation for cell that is not bound to a worksheet');
+            throw new SpreadsheetException('Cannot get data validation for cell that is not bound to a worksheet');
         }
 
         return $this->getWorksheet()->getDataValidation($this->getCoordinate());
@@ -388,27 +652,23 @@ public function getDataValidation()
     /**
      * Set Data validation rules.
      *
-     * @param DataValidation $pDataValidation
-     *
-     * @return Cell
+     * @throws SpreadsheetException
      */
-    public function setDataValidation(?DataValidation $pDataValidation = null)
+    public function setDataValidation(?DataValidation $dataValidation = null): self
     {
         if (!isset($this->parent)) {
-            throw new Exception('Cannot set data validation for cell that is not bound to a worksheet');
+            throw new SpreadsheetException('Cannot set data validation for cell that is not bound to a worksheet');
         }
 
-        $this->getWorksheet()->setDataValidation($this->getCoordinate(), $pDataValidation);
+        $this->getWorksheet()->setDataValidation($this->getCoordinate(), $dataValidation);
 
         return $this->updateInCollection();
     }
 
     /**
      * Does this cell contain valid value?
-     *
-     * @return bool
      */
-    public function hasValidValue()
+    public function hasValidValue(): bool
     {
         $validator = new DataValidator();
 
@@ -418,12 +678,12 @@ public function hasValidValue()
     /**
      * Does this cell contain a Hyperlink?
      *
-     * @return bool
+     * @throws SpreadsheetException
      */
-    public function hasHyperlink()
+    public function hasHyperlink(): bool
     {
         if (!isset($this->parent)) {
-            throw new Exception('Cannot check for hyperlink when cell is not bound to a worksheet');
+            throw new SpreadsheetException('Cannot check for hyperlink when cell is not bound to a worksheet');
         }
 
         return $this->getWorksheet()->hyperlinkExists($this->getCoordinate());
@@ -432,12 +692,12 @@ public function hasHyperlink()
     /**
      * Get Hyperlink.
      *
-     * @return Hyperlink
+     * @throws SpreadsheetException
      */
-    public function getHyperlink()
+    public function getHyperlink(): Hyperlink
     {
         if (!isset($this->parent)) {
-            throw new Exception('Cannot get hyperlink for cell that is not bound to a worksheet');
+            throw new SpreadsheetException('Cannot get hyperlink for cell that is not bound to a worksheet');
         }
 
         return $this->getWorksheet()->getHyperlink($this->getCoordinate());
@@ -446,27 +706,23 @@ public function getHyperlink()
     /**
      * Set Hyperlink.
      *
-     * @param Hyperlink $pHyperlink
-     *
-     * @return Cell
+     * @throws SpreadsheetException
      */
-    public function setHyperlink(?Hyperlink $pHyperlink = null)
+    public function setHyperlink(?Hyperlink $hyperlink = null): self
     {
         if (!isset($this->parent)) {
-            throw new Exception('Cannot set hyperlink for cell that is not bound to a worksheet');
+            throw new SpreadsheetException('Cannot set hyperlink for cell that is not bound to a worksheet');
         }
 
-        $this->getWorksheet()->setHyperlink($this->getCoordinate(), $pHyperlink);
+        $this->getWorksheet()->setHyperlink($this->getCoordinate(), $hyperlink);
 
         return $this->updateInCollection();
     }
 
     /**
      * Get cell collection.
-     *
-     * @return Cells
      */
-    public function getParent()
+    public function getParent(): ?Cells
     {
         return $this->parent;
     }
@@ -474,36 +730,54 @@ public function getParent()
     /**
      * Get parent worksheet.
      *
-     * @return Worksheet
+     * @throws SpreadsheetException
      */
-    public function getWorksheet()
+    public function getWorksheet(): Worksheet
+    {
+        $parent = $this->parent;
+        if ($parent !== null) {
+            $worksheet = $parent->getParent();
+        } else {
+            $worksheet = null;
+        }
+
+        if ($worksheet === null) {
+            throw new SpreadsheetException('Worksheet no longer exists');
+        }
+
+        return $worksheet;
+    }
+
+    public function getWorksheetOrNull(): ?Worksheet
     {
-        return $this->parent->getParent();
+        $parent = $this->parent;
+        if ($parent !== null) {
+            $worksheet = $parent->getParent();
+        } else {
+            $worksheet = null;
+        }
+
+        return $worksheet;
     }
 
     /**
      * Is this cell in a merge range.
-     *
-     * @return bool
      */
-    public function isInMergeRange()
+    public function isInMergeRange(): bool
     {
         return (bool) $this->getMergeRange();
     }
 
     /**
      * Is this cell the master (top left cell) in a merge range (that holds the actual data value).
-     *
-     * @return bool
      */
-    public function isMergeRangeValueCell()
+    public function isMergeRangeValueCell(): bool
     {
         if ($mergeRange = $this->getMergeRange()) {
             $mergeRange = Coordinate::splitRange($mergeRange);
             [$startCell] = $mergeRange[0];
-            if ($this->getCoordinate() === $startCell) {
-                return true;
-            }
+
+            return $this->getCoordinate() === $startCell;
         }
 
         return false;
@@ -527,20 +801,34 @@ public function getMergeRange()
 
     /**
      * Get cell style.
-     *
-     * @return Style
      */
-    public function getStyle()
+    public function getStyle(): Style
     {
         return $this->getWorksheet()->getStyle($this->getCoordinate());
     }
 
+    /**
+     * Get cell style.
+     */
+    public function getAppliedStyle(): Style
+    {
+        if ($this->getWorksheet()->conditionalStylesExists($this->getCoordinate()) === false) {
+            return $this->getStyle();
+        }
+        $range = $this->getWorksheet()->getConditionalRange($this->getCoordinate());
+        if ($range === null) {
+            return $this->getStyle();
+        }
+
+        $matcher = new CellStyleAssessor($this, $range);
+
+        return $matcher->matchConditions($this->getWorksheet()->getConditionalStyles($this->getCoordinate()));
+    }
+
     /**
      * Re-bind parent.
-     *
-     * @return Cell
      */
-    public function rebindParent(Worksheet $parent)
+    public function rebindParent(Worksheet $parent): self
     {
         $this->parent = $parent->getCellCollection();
 
@@ -550,21 +838,19 @@ public function rebindParent(Worksheet $parent)
     /**
      *    Is cell in a specific range?
      *
-     * @param string $pRange Cell range (e.g. A1:A1)
-     *
-     * @return bool
+     * @param string $range Cell range (e.g. A1:A1)
      */
-    public function isInRange($pRange)
+    public function isInRange(string $range): bool
     {
-        [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($pRange);
+        [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($range);
 
         // Translate properties
         $myColumn = Coordinate::columnIndexFromString($this->getColumn());
         $myRow = $this->getRow();
 
         // Verify if cell is in range
-        return ($rangeStart[0] <= $myColumn) && ($rangeEnd[0] >= $myColumn) &&
-            ($rangeStart[1] <= $myRow) && ($rangeEnd[1] >= $myRow);
+        return ($rangeStart[0] <= $myColumn) && ($rangeEnd[0] >= $myColumn)
+            && ($rangeStart[1] <= $myRow) && ($rangeEnd[1] >= $myRow);
     }
 
     /**
@@ -575,7 +861,7 @@ public function isInRange($pRange)
      *
      * @return int Result of comparison (always -1 or 1, never zero!)
      */
-    public static function compareCells(self $a, self $b)
+    public static function compareCells(self $a, self $b): int
     {
         if ($a->getRow() < $b->getRow()) {
             return -1;
@@ -590,10 +876,8 @@ public static function compareCells(self $a, self $b)
 
     /**
      * Get value binder to use.
-     *
-     * @return IValueBinder
      */
-    public static function getValueBinder()
+    public static function getValueBinder(): IValueBinder
     {
         if (self::$valueBinder === null) {
             self::$valueBinder = new DefaultValueBinder();
@@ -616,35 +900,29 @@ public static function setValueBinder(IValueBinder $binder): void
     public function __clone()
     {
         $vars = get_object_vars($this);
-        foreach ($vars as $key => $value) {
-            if ((is_object($value)) && ($key != 'parent')) {
-                $this->$key = clone $value;
+        foreach ($vars as $propertyName => $propertyValue) {
+            if ((is_object($propertyValue)) && ($propertyName !== 'parent')) {
+                $this->$propertyName = clone $propertyValue;
             } else {
-                $this->$key = $value;
+                $this->$propertyName = $propertyValue;
             }
         }
     }
 
     /**
      * Get index to cellXf.
-     *
-     * @return int
      */
-    public function getXfIndex()
+    public function getXfIndex(): int
     {
         return $this->xfIndex;
     }
 
     /**
      * Set index to cellXf.
-     *
-     * @param int $pValue
-     *
-     * @return Cell
      */
-    public function setXfIndex($pValue)
+    public function setXfIndex(int $indexValue): self
     {
-        $this->xfIndex = $pValue;
+        $this->xfIndex = $indexValue;
 
         return $this->updateInCollection();
     }
@@ -652,32 +930,64 @@ public function setXfIndex($pValue)
     /**
      * Set the formula attributes.
      *
-     * @param mixed $pAttributes
+     * @param $attributes null|array<string, string>
      *
      * @return $this
      */
-    public function setFormulaAttributes($pAttributes)
+    public function setFormulaAttributes(mixed $attributes): self
     {
-        $this->formulaAttributes = $pAttributes;
+        $this->formulaAttributes = $attributes;
 
         return $this;
     }
 
     /**
      * Get the formula attributes.
+     *
+     * @return null|array<string, string>
      */
-    public function getFormulaAttributes()
+    public function getFormulaAttributes(): mixed
     {
         return $this->formulaAttributes;
     }
 
     /**
      * Convert to string.
-     *
-     * @return string
      */
-    public function __toString()
+    public function __toString(): string
+    {
+        $retVal = $this->value;
+
+        return ($retVal === null || is_scalar($retVal) || $retVal instanceof Stringable) ? ((string) $retVal) : '';
+    }
+
+    public function getIgnoredErrors(): IgnoredErrors
+    {
+        return $this->ignoredErrors;
+    }
+
+    public function isLocked(): bool
     {
-        return (string) $this->getValue();
+        $protected = $this->parent?->getParent()?->getProtection()?->getSheet();
+        if ($protected !== true) {
+            return false;
+        }
+        $locked = $this->getStyle()->getProtection()->getLocked();
+
+        return $locked !== Protection::PROTECTION_UNPROTECTED;
+    }
+
+    public function isHiddenOnFormulaBar(): bool
+    {
+        if ($this->getDataType() !== DataType::TYPE_FORMULA) {
+            return false;
+        }
+        $protected = $this->parent?->getParent()?->getProtection()?->getSheet();
+        if ($protected !== true) {
+            return false;
+        }
+        $hidden = $this->getStyle()->getProtection()->getHidden();
+
+        return $hidden !== Protection::PROTECTION_UNPROTECTED;
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/CellAddress.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/CellAddress.php
new file mode 100644
index 0000000000..ab6258e66c
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/CellAddress.php
@@ -0,0 +1,148 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Cell;
+
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use Stringable;
+
+class CellAddress implements Stringable
+{
+    protected ?Worksheet $worksheet;
+
+    protected string $cellAddress;
+
+    protected string $columnName = '';
+
+    protected int $columnId;
+
+    protected int $rowId;
+
+    public function __construct(string $cellAddress, ?Worksheet $worksheet = null)
+    {
+        $this->cellAddress = str_replace('$', '', $cellAddress);
+        [$this->columnId, $this->rowId, $this->columnName] = Coordinate::indexesFromString($this->cellAddress);
+        $this->worksheet = $worksheet;
+    }
+
+    public function __destruct()
+    {
+        unset($this->worksheet);
+    }
+
+    /**
+     * @phpstan-assert int|numeric-string $columnId
+     * @phpstan-assert int|numeric-string $rowId
+     */
+    private static function validateColumnAndRow(int|string $columnId, int|string $rowId): void
+    {
+        if (!is_numeric($columnId) || $columnId <= 0 || !is_numeric($rowId) || $rowId <= 0) {
+            throw new Exception('Row and Column Ids must be positive integer values');
+        }
+    }
+
+    public static function fromColumnAndRow(int|string $columnId, int|string $rowId, ?Worksheet $worksheet = null): self
+    {
+        self::validateColumnAndRow($columnId, $rowId);
+
+        return new self(Coordinate::stringFromColumnIndex($columnId) . $rowId, $worksheet);
+    }
+
+    public static function fromColumnRowArray(array $array, ?Worksheet $worksheet = null): self
+    {
+        [$columnId, $rowId] = $array;
+
+        return self::fromColumnAndRow($columnId, $rowId, $worksheet);
+    }
+
+    public static function fromCellAddress(string $cellAddress, ?Worksheet $worksheet = null): self
+    {
+        return new self($cellAddress, $worksheet);
+    }
+
+    /**
+     * The returned address string will contain the worksheet name as well, if available,
+     *     (ie. if a Worksheet was provided to the constructor).
+     *     e.g. "'Mark''s Worksheet'!C5".
+     */
+    public function fullCellAddress(): string
+    {
+        if ($this->worksheet !== null) {
+            $title = str_replace("'", "''", $this->worksheet->getTitle());
+
+            return "'{$title}'!{$this->cellAddress}";
+        }
+
+        return $this->cellAddress;
+    }
+
+    public function worksheet(): ?Worksheet
+    {
+        return $this->worksheet;
+    }
+
+    /**
+     * The returned address string will contain just the column/row address,
+     *     (even if a Worksheet was provided to the constructor).
+     *     e.g. "C5".
+     */
+    public function cellAddress(): string
+    {
+        return $this->cellAddress;
+    }
+
+    public function rowId(): int
+    {
+        return $this->rowId;
+    }
+
+    public function columnId(): int
+    {
+        return $this->columnId;
+    }
+
+    public function columnName(): string
+    {
+        return $this->columnName;
+    }
+
+    public function nextRow(int $offset = 1): self
+    {
+        $newRowId = $this->rowId + $offset;
+        if ($newRowId < 1) {
+            $newRowId = 1;
+        }
+
+        return self::fromColumnAndRow($this->columnId, $newRowId);
+    }
+
+    public function previousRow(int $offset = 1): self
+    {
+        return $this->nextRow(0 - $offset);
+    }
+
+    public function nextColumn(int $offset = 1): self
+    {
+        $newColumnId = $this->columnId + $offset;
+        if ($newColumnId < 1) {
+            $newColumnId = 1;
+        }
+
+        return self::fromColumnAndRow($newColumnId, $this->rowId);
+    }
+
+    public function previousColumn(int $offset = 1): self
+    {
+        return $this->nextColumn(0 - $offset);
+    }
+
+    /**
+     * The returned address string will contain the worksheet name as well, if available,
+     *     (ie. if a Worksheet was provided to the constructor).
+     *     e.g. "'Mark''s Worksheet'!C5".
+     */
+    public function __toString(): string
+    {
+        return $this->fullCellAddress();
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/CellRange.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/CellRange.php
new file mode 100644
index 0000000000..677009dbe2
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/CellRange.php
@@ -0,0 +1,134 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Cell;
+
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use Stringable;
+
+/**
+ * @implements AddressRange<CellAddress>
+ */
+class CellRange implements AddressRange, Stringable
+{
+    protected CellAddress $from;
+
+    protected CellAddress $to;
+
+    public function __construct(CellAddress $from, CellAddress $to)
+    {
+        $this->validateFromTo($from, $to);
+    }
+
+    private function validateFromTo(CellAddress $from, CellAddress $to): void
+    {
+        // Identify actual top-left and bottom-right values (in case we've been given top-right and bottom-left)
+        $firstColumn = min($from->columnId(), $to->columnId());
+        $firstRow = min($from->rowId(), $to->rowId());
+        $lastColumn = max($from->columnId(), $to->columnId());
+        $lastRow = max($from->rowId(), $to->rowId());
+
+        $fromWorksheet = $from->worksheet();
+        $toWorksheet = $to->worksheet();
+        $this->validateWorksheets($fromWorksheet, $toWorksheet);
+
+        $this->from = $this->cellAddressWrapper($firstColumn, $firstRow, $fromWorksheet);
+        $this->to = $this->cellAddressWrapper($lastColumn, $lastRow, $toWorksheet);
+    }
+
+    private function validateWorksheets(?Worksheet $fromWorksheet, ?Worksheet $toWorksheet): void
+    {
+        if ($fromWorksheet !== null && $toWorksheet !== null) {
+            // We could simply compare worksheets rather than worksheet titles; but at some point we may introduce
+            //    support for 3d ranges; and at that point we drop this check and let the validation fall through
+            //    to the check for same workbook; but unless we check on titles, this test will also detect if the
+            //    worksheets are in different spreadsheets, and the next check will never execute or throw its
+            //    own exception.
+            if ($fromWorksheet->getTitle() !== $toWorksheet->getTitle()) {
+                throw new Exception('3d Cell Ranges are not supported');
+            } elseif ($fromWorksheet->getParent() !== $toWorksheet->getParent()) {
+                throw new Exception('Worksheets must be in the same spreadsheet');
+            }
+        }
+    }
+
+    private function cellAddressWrapper(int $column, int $row, ?Worksheet $worksheet = null): CellAddress
+    {
+        $cellAddress = Coordinate::stringFromColumnIndex($column) . (string) $row;
+
+        return new class ($cellAddress, $worksheet) extends CellAddress {
+            public function nextRow(int $offset = 1): CellAddress
+            {
+                /** @var CellAddress $result */
+                $result = parent::nextRow($offset);
+                $this->rowId = $result->rowId;
+                $this->cellAddress = $result->cellAddress;
+
+                return $this;
+            }
+
+            public function previousRow(int $offset = 1): CellAddress
+            {
+                /** @var CellAddress $result */
+                $result = parent::previousRow($offset);
+                $this->rowId = $result->rowId;
+                $this->cellAddress = $result->cellAddress;
+
+                return $this;
+            }
+
+            public function nextColumn(int $offset = 1): CellAddress
+            {
+                /** @var CellAddress $result */
+                $result = parent::nextColumn($offset);
+                $this->columnId = $result->columnId;
+                $this->columnName = $result->columnName;
+                $this->cellAddress = $result->cellAddress;
+
+                return $this;
+            }
+
+            public function previousColumn(int $offset = 1): CellAddress
+            {
+                /** @var CellAddress $result */
+                $result = parent::previousColumn($offset);
+                $this->columnId = $result->columnId;
+                $this->columnName = $result->columnName;
+                $this->cellAddress = $result->cellAddress;
+
+                return $this;
+            }
+        };
+    }
+
+    public function from(): CellAddress
+    {
+        // Re-order from/to in case the cell addresses have been modified
+        $this->validateFromTo($this->from, $this->to);
+
+        return $this->from;
+    }
+
+    public function to(): CellAddress
+    {
+        // Re-order from/to in case the cell addresses have been modified
+        $this->validateFromTo($this->from, $this->to);
+
+        return $this->to;
+    }
+
+    public function __toString(): string
+    {
+        // Re-order from/to in case the cell addresses have been modified
+        $this->validateFromTo($this->from, $this->to);
+
+        if ($this->from->cellAddress() === $this->to->cellAddress()) {
+            return "{$this->from->fullCellAddress()}";
+        }
+
+        $fromAddress = $this->from->fullCellAddress();
+        $toAddress = $this->to->cellAddress();
+
+        return "{$fromAddress}:{$toAddress}";
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/ColumnRange.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/ColumnRange.php
new file mode 100644
index 0000000000..7f32a05c28
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/ColumnRange.php
@@ -0,0 +1,125 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Cell;
+
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use Stringable;
+
+/**
+ * @implements AddressRange<string>
+ */
+class ColumnRange implements AddressRange, Stringable
+{
+    protected ?Worksheet $worksheet;
+
+    protected int $from;
+
+    protected int $to;
+
+    public function __construct(string $from, ?string $to = null, ?Worksheet $worksheet = null)
+    {
+        $this->validateFromTo(
+            Coordinate::columnIndexFromString($from),
+            Coordinate::columnIndexFromString($to ?? $from)
+        );
+        $this->worksheet = $worksheet;
+    }
+
+    public function __destruct()
+    {
+        $this->worksheet = null;
+    }
+
+    public static function fromColumnIndexes(int $from, int $to, ?Worksheet $worksheet = null): self
+    {
+        return new self(Coordinate::stringFromColumnIndex($from), Coordinate::stringFromColumnIndex($to), $worksheet);
+    }
+
+    /**
+     * @param array<int|string> $array
+     */
+    public static function fromArray(array $array, ?Worksheet $worksheet = null): self
+    {
+        array_walk(
+            $array,
+            function (&$column): void {
+                $column = is_numeric($column) ? Coordinate::stringFromColumnIndex((int) $column) : $column;
+            }
+        );
+        /** @var string $from */
+        /** @var string $to */
+        [$from, $to] = $array;
+
+        return new self($from, $to, $worksheet);
+    }
+
+    private function validateFromTo(int $from, int $to): void
+    {
+        // Identify actual top and bottom values (in case we've been given bottom and top)
+        $this->from = min($from, $to);
+        $this->to = max($from, $to);
+    }
+
+    public function columnCount(): int
+    {
+        return $this->to - $this->from + 1;
+    }
+
+    public function shiftDown(int $offset = 1): self
+    {
+        $newFrom = $this->from + $offset;
+        $newFrom = ($newFrom < 1) ? 1 : $newFrom;
+
+        $newTo = $this->to + $offset;
+        $newTo = ($newTo < 1) ? 1 : $newTo;
+
+        return self::fromColumnIndexes($newFrom, $newTo, $this->worksheet);
+    }
+
+    public function shiftUp(int $offset = 1): self
+    {
+        return $this->shiftDown(0 - $offset);
+    }
+
+    public function from(): string
+    {
+        return Coordinate::stringFromColumnIndex($this->from);
+    }
+
+    public function to(): string
+    {
+        return Coordinate::stringFromColumnIndex($this->to);
+    }
+
+    public function fromIndex(): int
+    {
+        return $this->from;
+    }
+
+    public function toIndex(): int
+    {
+        return $this->to;
+    }
+
+    public function toCellRange(): CellRange
+    {
+        return new CellRange(
+            CellAddress::fromColumnAndRow($this->from, 1, $this->worksheet),
+            CellAddress::fromColumnAndRow($this->to, AddressRange::MAX_ROW)
+        );
+    }
+
+    public function __toString(): string
+    {
+        $from = $this->from();
+        $to = $this->to();
+
+        if ($this->worksheet !== null) {
+            $title = str_replace("'", "''", $this->worksheet->getTitle());
+
+            return "'{$title}'!{$from}:{$to}";
+        }
+
+        return "{$from}:{$to}";
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/Coordinate.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/Coordinate.php
index 58d2573e66..313cc3d9b1 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/Coordinate.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/Coordinate.php
@@ -13,7 +13,8 @@
  */
 abstract class Coordinate
 {
-    public const A1_COORDINATE_REGEX = '/^(?<absolute_col>\$?)(?<col_ref>[A-Z]{1,3})(?<absolute_row>\$?)(?<row_ref>\d{1,7})$/i';
+    public const A1_COORDINATE_REGEX = '/^(?<col>\$?[A-Z]{1,3})(?<row>\$?\d{1,7})$/i';
+    public const FULL_REFERENCE_REGEX = '/^(?:(?<worksheet>[^!]*)!)?(?<localReference>(?<firstCoordinate>[$]?[A-Z]{1,3}[$]?\d{1,7})(?:\:(?<secondCoordinate>[$]?[A-Z]{1,3}[$]?\d{1,7}))?)$/i';
 
     /**
      * Default range variable constant.
@@ -23,105 +24,109 @@ abstract class Coordinate
     const DEFAULT_RANGE = 'A1:A1';
 
     /**
-     * Coordinate from string.
+     * Convert string coordinate to [0 => int column index, 1 => int row index].
      *
-     * @param string $pCoordinateString eg: 'A1'
+     * @param string $cellAddress eg: 'A1'
      *
      * @return array{0: string, 1: string} Array containing column and row (indexes 0 and 1)
      */
-    public static function coordinateFromString($pCoordinateString)
+    public static function coordinateFromString(string $cellAddress): array
     {
-        if (preg_match(self::A1_COORDINATE_REGEX, $pCoordinateString, $matches)) {
-            return [$matches['absolute_col'] . $matches['col_ref'], $matches['absolute_row'] . $matches['row_ref']];
-        } elseif (self::coordinateIsRange($pCoordinateString)) {
+        if (preg_match(self::A1_COORDINATE_REGEX, $cellAddress, $matches)) {
+            return [$matches['col'], $matches['row']];
+        } elseif (self::coordinateIsRange($cellAddress)) {
             throw new Exception('Cell coordinate string can not be a range of cells');
-        } elseif ($pCoordinateString == '') {
+        } elseif ($cellAddress == '') {
             throw new Exception('Cell coordinate can not be zero-length string');
         }
 
-        throw new Exception('Invalid cell coordinate ' . $pCoordinateString);
+        throw new Exception('Invalid cell coordinate ' . $cellAddress);
     }
 
     /**
-     * Get indexes from a string coordinates.
+     * Convert string coordinate to [0 => int column index, 1 => int row index, 2 => string column string].
      *
      * @param string $coordinates eg: 'A1', '$B$12'
      *
-     * @return array{0: int, 1: int} Array containing column index and row index (indexes 0 and 1)
+     * @return array{0: int, 1: int, 2: string} Array containing column and row index, and column string
      */
     public static function indexesFromString(string $coordinates): array
     {
-        [$col, $row] = self::coordinateFromString($coordinates);
+        [$column, $row] = self::coordinateFromString($coordinates);
+        $column = ltrim($column, '$');
 
         return [
-            self::columnIndexFromString(ltrim($col, '$')),
+            self::columnIndexFromString($column),
             (int) ltrim($row, '$'),
+            $column,
         ];
     }
 
     /**
-     * Checks if a coordinate represents a range of cells.
+     * Checks if a Cell Address represents a range of cells.
      *
-     * @param string $coord eg: 'A1' or 'A1:A2' or 'A1:A2,C1:C2'
+     * @param string $cellAddress eg: 'A1' or 'A1:A2' or 'A1:A2,C1:C2'
      *
      * @return bool Whether the coordinate represents a range of cells
      */
-    public static function coordinateIsRange($coord)
+    public static function coordinateIsRange(string $cellAddress): bool
     {
-        return (strpos($coord, ':') !== false) || (strpos($coord, ',') !== false);
+        return str_contains($cellAddress, ':') || str_contains($cellAddress, ',');
     }
 
     /**
      * Make string row, column or cell coordinate absolute.
      *
-     * @param string $pCoordinateString e.g. 'A' or '1' or 'A1'
+     * @param int|string $cellAddress e.g. 'A' or '1' or 'A1'
      *                    Note that this value can be a row or column reference as well as a cell reference
      *
      * @return string Absolute coordinate        e.g. '$A' or '$1' or '$A$1'
      */
-    public static function absoluteReference($pCoordinateString)
+    public static function absoluteReference(int|string $cellAddress): string
     {
-        if (self::coordinateIsRange($pCoordinateString)) {
+        $cellAddress = (string) $cellAddress;
+        if (self::coordinateIsRange($cellAddress)) {
             throw new Exception('Cell coordinate string can not be a range of cells');
         }
 
         // Split out any worksheet name from the reference
-        [$worksheet, $pCoordinateString] = Worksheet::extractSheetTitle($pCoordinateString, true);
+        [$worksheet, $cellAddress] = Worksheet::extractSheetTitle($cellAddress, true);
         if ($worksheet > '') {
             $worksheet .= '!';
         }
 
         // Create absolute coordinate
-        if (ctype_digit($pCoordinateString)) {
-            return $worksheet . '$' . $pCoordinateString;
-        } elseif (ctype_alpha($pCoordinateString)) {
-            return $worksheet . '$' . strtoupper($pCoordinateString);
+        $cellAddress = "$cellAddress";
+        if (ctype_digit($cellAddress)) {
+            return $worksheet . '$' . $cellAddress;
+        } elseif (ctype_alpha($cellAddress)) {
+            return $worksheet . '$' . strtoupper($cellAddress);
         }
 
-        return $worksheet . self::absoluteCoordinate($pCoordinateString);
+        return $worksheet . self::absoluteCoordinate($cellAddress);
     }
 
     /**
      * Make string coordinate absolute.
      *
-     * @param string $pCoordinateString e.g. 'A1'
+     * @param string $cellAddress e.g. 'A1'
      *
      * @return string Absolute coordinate        e.g. '$A$1'
      */
-    public static function absoluteCoordinate($pCoordinateString)
+    public static function absoluteCoordinate(string $cellAddress): string
     {
-        if (self::coordinateIsRange($pCoordinateString)) {
+        if (self::coordinateIsRange($cellAddress)) {
             throw new Exception('Cell coordinate string can not be a range of cells');
         }
 
         // Split out any worksheet name from the coordinate
-        [$worksheet, $pCoordinateString] = Worksheet::extractSheetTitle($pCoordinateString, true);
+        [$worksheet, $cellAddress] = Worksheet::extractSheetTitle($cellAddress, true);
         if ($worksheet > '') {
             $worksheet .= '!';
         }
 
         // Create absolute coordinate
-        [$column, $row] = self::coordinateFromString($pCoordinateString);
+        [$column, $row] = self::coordinateFromString($cellAddress ?? 'A1');
         $column = ltrim($column, '$');
         $row = ltrim($row, '$');
 
@@ -131,74 +136,84 @@ public static function absoluteCoordinate($pCoordinateString)
     /**
      * Split range into coordinate strings.
      *
-     * @param string $pRange e.g. 'B4:D9' or 'B4:D9,H2:O11' or 'B4'
+     * @param string $range e.g. 'B4:D9' or 'B4:D9,H2:O11' or 'B4'
      *
      * @return array Array containing one or more arrays containing one or two coordinate strings
      *                                e.g. ['B4','D9'] or [['B4','D9'], ['H2','O11']]
      *                                        or ['B4']
      */
-    public static function splitRange($pRange)
+    public static function splitRange(string $range): array
     {
         // Ensure $pRange is a valid range
-        if (empty($pRange)) {
-            $pRange = self::DEFAULT_RANGE;
+        if (empty($range)) {
+            $range = self::DEFAULT_RANGE;
         }
 
-        $exploded = explode(',', $pRange);
-        $counter = count($exploded);
-        for ($i = 0; $i < $counter; ++$i) {
-            $exploded[$i] = explode(':', $exploded[$i]);
+        $exploded = explode(',', $range);
+        $outArray = [];
+        foreach ($exploded as $value) {
+            $outArray[] = explode(':', $value);
         }
 
-        return $exploded;
+        return $outArray;
     }
 
     /**
      * Build range from coordinate strings.
      *
-     * @param array $pRange Array containg one or more arrays containing one or two coordinate strings
+     * @param array $range Array containing one or more arrays containing one or two coordinate strings
      *
      * @return string String representation of $pRange
      */
-    public static function buildRange(array $pRange)
+    public static function buildRange(array $range): string
     {
         // Verify range
-        if (empty($pRange) || !is_array($pRange[0])) {
+        if (empty($range) || !is_array($range[0])) {
             throw new Exception('Range does not contain any information');
         }
 
         // Build range
-        $counter = count($pRange);
+        $counter = count($range);
         for ($i = 0; $i < $counter; ++$i) {
-            $pRange[$i] = implode(':', $pRange[$i]);
+            $range[$i] = implode(':', $range[$i]);
         }
 
-        return implode(',', $pRange);
+        return implode(',', $range);
     }
 
     /**
      * Calculate range boundaries.
      *
-     * @param string $pRange Cell range (e.g. A1:A1)
+     * @param string $range Cell range, Single Cell, Row/Column Range (e.g. A1:A1, B2, B:C, 2:3)
      *
      * @return array Range coordinates [Start Cell, End Cell]
      *                    where Start Cell and End Cell are arrays (Column Number, Row Number)
      */
-    public static function rangeBoundaries($pRange)
+    public static function rangeBoundaries(string $range): array
     {
         // Ensure $pRange is a valid range
-        if (empty($pRange)) {
-            $pRange = self::DEFAULT_RANGE;
+        if (empty($range)) {
+            $range = self::DEFAULT_RANGE;
         }
 
         // Uppercase coordinate
-        $pRange = strtoupper($pRange);
+        $range = strtoupper($range);
 
         // Extract range
-        if (strpos($pRange, ':') === false) {
-            $rangeA = $rangeB = $pRange;
+        if (!str_contains($range, ':')) {
+            $rangeA = $rangeB = $range;
         } else {
-            [$rangeA, $rangeB] = explode(':', $pRange);
+            [$rangeA, $rangeB] = explode(':', $range);
+        }
+
+        if (is_numeric($rangeA) && is_numeric($rangeB)) {
+            $rangeA = 'A' . $rangeA;
+            $rangeB = AddressRange::MAX_COLUMN . $rangeB;
+        }
+
+        if (ctype_alpha($rangeA) && ctype_alpha($rangeB)) {
+            $rangeA = $rangeA . '1';
+            $rangeB = $rangeB . AddressRange::MAX_ROW;
         }
 
         // Calculate range outer borders
@@ -215,14 +230,14 @@ public static function rangeBoundaries($pRange)
     /**
      * Calculate range dimension.
      *
-     * @param string $pRange Cell range (e.g. A1:A1)
+     * @param string $range Cell range, Single Cell, Row/Column Range (e.g. A1:A1, B2, B:C, 2:3)
      *
      * @return array Range dimension (width, height)
      */
-    public static function rangeDimension($pRange)
+    public static function rangeDimension(string $range): array
     {
         // Calculate range outer borders
-        [$rangeStart, $rangeEnd] = self::rangeBoundaries($pRange);
+        [$rangeStart, $rangeEnd] = self::rangeBoundaries($range);
 
         return [($rangeEnd[0] - $rangeStart[0] + 1), ($rangeEnd[1] - $rangeStart[1] + 1)];
     }
@@ -230,97 +245,179 @@ public static function rangeDimension($pRange)
     /**
      * Calculate range boundaries.
      *
-     * @param string $pRange Cell range (e.g. A1:A1)
+     * @param string $range Cell range, Single Cell, Row/Column Range (e.g. A1:A1, B2, B:C, 2:3)
      *
      * @return array Range coordinates [Start Cell, End Cell]
      *                    where Start Cell and End Cell are arrays [Column ID, Row Number]
      */
-    public static function getRangeBoundaries($pRange)
+    public static function getRangeBoundaries(string $range): array
     {
-        // Ensure $pRange is a valid range
-        if (empty($pRange)) {
-            $pRange = self::DEFAULT_RANGE;
-        }
+        [$rangeA, $rangeB] = self::rangeBoundaries($range);
 
-        // Uppercase coordinate
-        $pRange = strtoupper($pRange);
+        return [
+            [self::stringFromColumnIndex($rangeA[0]), $rangeA[1]],
+            [self::stringFromColumnIndex($rangeB[0]), $rangeB[1]],
+        ];
+    }
 
-        // Extract range
-        if (strpos($pRange, ':') === false) {
-            $rangeA = $rangeB = $pRange;
+    /**
+     * Check if cell or range reference is valid and return an array with type of reference (cell or range), worksheet (if it was given)
+     * and the coordinate or the first coordinate and second coordinate if it is a range.
+     *
+     * @param string $reference Coordinate or Range (e.g. A1:A1, B2, B:C, 2:3)
+     *
+     * @return array reference data
+     */
+    private static function validateReferenceAndGetData($reference): array
+    {
+        $data = [];
+        preg_match(self::FULL_REFERENCE_REGEX, $reference, $matches);
+        if (count($matches) === 0) {
+            return ['type' => 'invalid'];
+        }
+
+        if (isset($matches['secondCoordinate'])) {
+            $data['type'] = 'range';
+            $data['firstCoordinate'] = str_replace('$', '', $matches['firstCoordinate']);
+            $data['secondCoordinate'] = str_replace('$', '', $matches['secondCoordinate']);
         } else {
-            [$rangeA, $rangeB] = explode(':', $pRange);
+            $data['type'] = 'coordinate';
+            $data['coordinate'] = str_replace('$', '', $matches['firstCoordinate']);
+        }
+
+        $worksheet = $matches['worksheet'];
+        if ($worksheet !== '') {
+            if (substr($worksheet, 0, 1) === "'" && substr($worksheet, -1, 1) === "'") {
+                $worksheet = substr($worksheet, 1, -1);
+            }
+            $data['worksheet'] = strtolower($worksheet);
+        }
+        $data['localReference'] = str_replace('$', '', $matches['localReference']);
+
+        return $data;
+    }
+
+    /**
+     * Check if coordinate is inside a range.
+     *
+     * @param string $range Cell range, Single Cell, Row/Column Range (e.g. A1:A1, B2, B:C, 2:3)
+     * @param string $coordinate Cell coordinate (e.g. A1)
+     *
+     * @return bool true if coordinate is inside range
+     */
+    public static function coordinateIsInsideRange(string $range, string $coordinate): bool
+    {
+        $rangeData = self::validateReferenceAndGetData($range);
+        if ($rangeData['type'] === 'invalid') {
+            throw new Exception('First argument needs to be a range');
         }
 
-        return [self::coordinateFromString($rangeA), self::coordinateFromString($rangeB)];
+        $coordinateData = self::validateReferenceAndGetData($coordinate);
+        if ($coordinateData['type'] === 'invalid') {
+            throw new Exception('Second argument needs to be a single coordinate');
+        }
+
+        if (isset($coordinateData['worksheet']) && !isset($rangeData['worksheet'])) {
+            return false;
+        }
+        if (!isset($coordinateData['worksheet']) && isset($rangeData['worksheet'])) {
+            return false;
+        }
+
+        if (isset($coordinateData['worksheet'], $rangeData['worksheet'])) {
+            if ($coordinateData['worksheet'] !== $rangeData['worksheet']) {
+                return false;
+            }
+        }
+
+        $boundaries = self::rangeBoundaries($rangeData['localReference']);
+        $coordinates = self::indexesFromString($coordinateData['localReference']);
+
+        $columnIsInside = $boundaries[0][0] <= $coordinates[0] && $coordinates[0] <= $boundaries[1][0];
+        if (!$columnIsInside) {
+            return false;
+        }
+        $rowIsInside = $boundaries[0][1] <= $coordinates[1] && $coordinates[1] <= $boundaries[1][1];
+        if (!$rowIsInside) {
+            return false;
+        }
+
+        return true;
     }
 
     /**
      * Column index from string.
      *
-     * @param string $pString eg 'A'
+     * @param ?string $columnAddress eg 'A'
      *
      * @return int Column index (A = 1)
      */
-    public static function columnIndexFromString($pString)
+    public static function columnIndexFromString(?string $columnAddress): int
     {
         //    Using a lookup cache adds a slight memory overhead, but boosts speed
         //    caching using a static within the method is faster than a class static,
         //        though it's additional memory overhead
         static $indexCache = [];
+        $columnAddress = $columnAddress ?? '';
 
-        if (isset($indexCache[$pString])) {
-            return $indexCache[$pString];
+        if (isset($indexCache[$columnAddress])) {
+            return $indexCache[$columnAddress];
         }
-        //    It's surprising how costly the strtoupper() and ord() calls actually are, so we use a lookup array rather than use ord()
-        //        and make it case insensitive to get rid of the strtoupper() as well. Because it's a static, there's no significant
-        //        memory overhead either
+        //    It's surprising how costly the strtoupper() and ord() calls actually are, so we use a lookup array
+        //        rather than use ord() and make it case insensitive to get rid of the strtoupper() as well.
+        //        Because it's a static, there's no significant memory overhead either.
         static $columnLookup = [
-            'A' => 1, 'B' => 2, 'C' => 3, 'D' => 4, 'E' => 5, 'F' => 6, 'G' => 7, 'H' => 8, 'I' => 9, 'J' => 10, 'K' => 11, 'L' => 12, 'M' => 13,
-            'N' => 14, 'O' => 15, 'P' => 16, 'Q' => 17, 'R' => 18, 'S' => 19, 'T' => 20, 'U' => 21, 'V' => 22, 'W' => 23, 'X' => 24, 'Y' => 25, 'Z' => 26,
-            'a' => 1, 'b' => 2, 'c' => 3, 'd' => 4, 'e' => 5, 'f' => 6, 'g' => 7, 'h' => 8, 'i' => 9, 'j' => 10, 'k' => 11, 'l' => 12, 'm' => 13,
-            'n' => 14, 'o' => 15, 'p' => 16, 'q' => 17, 'r' => 18, 's' => 19, 't' => 20, 'u' => 21, 'v' => 22, 'w' => 23, 'x' => 24, 'y' => 25, 'z' => 26,
+            'A' => 1, 'B' => 2, 'C' => 3, 'D' => 4, 'E' => 5, 'F' => 6, 'G' => 7, 'H' => 8, 'I' => 9, 'J' => 10,
+            'K' => 11, 'L' => 12, 'M' => 13, 'N' => 14, 'O' => 15, 'P' => 16, 'Q' => 17, 'R' => 18, 'S' => 19,
+            'T' => 20, 'U' => 21, 'V' => 22, 'W' => 23, 'X' => 24, 'Y' => 25, 'Z' => 26,
+            'a' => 1, 'b' => 2, 'c' => 3, 'd' => 4, 'e' => 5, 'f' => 6, 'g' => 7, 'h' => 8, 'i' => 9, 'j' => 10,
+            'k' => 11, 'l' => 12, 'm' => 13, 'n' => 14, 'o' => 15, 'p' => 16, 'q' => 17, 'r' => 18, 's' => 19,
+            't' => 20, 'u' => 21, 'v' => 22, 'w' => 23, 'x' => 24, 'y' => 25, 'z' => 26,
         ];
 
-        //    We also use the language construct isset() rather than the more costly strlen() function to match the length of $pString
-        //        for improved performance
-        if (isset($pString[0])) {
-            if (!isset($pString[1])) {
-                $indexCache[$pString] = $columnLookup[$pString];
+        //    We also use the language construct isset() rather than the more costly strlen() function to match the
+        //       length of $columnAddress for improved performance
+        if (isset($columnAddress[0])) {
+            if (!isset($columnAddress[1])) {
+                $indexCache[$columnAddress] = $columnLookup[$columnAddress];
 
-                return $indexCache[$pString];
-            } elseif (!isset($pString[2])) {
-                $indexCache[$pString] = $columnLookup[$pString[0]] * 26 + $columnLookup[$pString[1]];
+                return $indexCache[$columnAddress];
+            } elseif (!isset($columnAddress[2])) {
+                $indexCache[$columnAddress] = $columnLookup[$columnAddress[0]] * 26
+                    + $columnLookup[$columnAddress[1]];
 
-                return $indexCache[$pString];
-            } elseif (!isset($pString[3])) {
-                $indexCache[$pString] = $columnLookup[$pString[0]] * 676 + $columnLookup[$pString[1]] * 26 + $columnLookup[$pString[2]];
+                return $indexCache[$columnAddress];
+            } elseif (!isset($columnAddress[3])) {
+                $indexCache[$columnAddress] = $columnLookup[$columnAddress[0]] * 676
+                    + $columnLookup[$columnAddress[1]] * 26
+                    + $columnLookup[$columnAddress[2]];
 
-                return $indexCache[$pString];
+                return $indexCache[$columnAddress];
             }
         }
 
-        throw new Exception('Column string index can not be ' . ((isset($pString[0])) ? 'longer than 3 characters' : 'empty'));
+        throw new Exception(
+            'Column string index can not be ' . ((isset($columnAddress[0])) ? 'longer than 3 characters' : 'empty')
+        );
     }
 
     /**
      * String from column index.
      *
-     * @param int $columnIndex Column index (A = 1)
-     *
-     * @return string
+     * @param int|numeric-string $columnIndex Column index (A = 1)
      */
-    public static function stringFromColumnIndex($columnIndex)
+    public static function stringFromColumnIndex(int|string $columnIndex): string
     {
         static $indexCache = [];
+        static $lookupCache = ' ABCDEFGHIJKLMNOPQRSTUVWXYZ';
 
         if (!isset($indexCache[$columnIndex])) {
             $indexValue = $columnIndex;
-            $base26 = null;
+            $base26 = '';
             do {
                 $characterValue = ($indexValue % 26) ?: 26;
                 $indexValue = ($indexValue - $characterValue) / 26;
-                $base26 = chr($characterValue + 64) . ($base26 ?: '');
+                $base26 = $lookupCache[$characterValue] . $base26;
             } while ($indexValue > 0);
             $indexCache[$columnIndex] = $base26;
         }
@@ -335,9 +432,22 @@ public static function stringFromColumnIndex($columnIndex)
      *
      * @return array Array containing single cell references
      */
-    public static function extractAllCellReferencesInRange($cellRange): array
+    public static function extractAllCellReferencesInRange(string $cellRange): array
     {
-        [$ranges, $operators] = self::getCellBlocksFromRangeString($cellRange);
+        if (substr_count($cellRange, '!') > 1) {
+            throw new Exception('3-D Range References are not supported');
+        }
+
+        [$worksheet, $cellRange] = Worksheet::extractSheetTitle($cellRange, true);
+        $quoted = '';
+        if ($worksheet) {
+            $quoted = Worksheet::nameRequiresQuotes($worksheet) ? "'" : '';
+            if (str_starts_with($worksheet, "'") && str_ends_with($worksheet, "'")) {
+                $worksheet = substr($worksheet, 1, -1);
+            }
+            $worksheet = str_replace("'", "''", $worksheet);
+        }
+        [$ranges, $operators] = self::getCellBlocksFromRangeString($cellRange ?? 'A1');
 
         $cells = [];
         foreach ($ranges as $range) {
@@ -351,9 +461,11 @@ public static function extractAllCellReferencesInRange($cellRange): array
         }
 
         $cellList = array_merge(...$cells);
-        $cellList = self::sortCellReferenceArray($cellList);
 
-        return $cellList;
+        return array_map(
+            fn ($cellAddress) => ($worksheet !== '') ? "{$quoted}{$worksheet}{$quoted}!{$cellAddress}" : $cellAddress,
+            self::sortCellReferenceArray($cellList)
+        );
     }
 
     private static function processRangeSetOperators(array $operators, array $cells): array
@@ -380,15 +492,56 @@ private static function sortCellReferenceArray(array $cellList): array
     {
         //    Sort the result by column and row
         $sortKeys = [];
-        foreach ($cellList as $coord) {
-            [$column, $row] = sscanf($coord, '%[A-Z]%d');
-            $sortKeys[sprintf('%3s%09d', $column, $row)] = $coord;
+        foreach ($cellList as $coordinate) {
+            $column = '';
+            $row = 0;
+            sscanf($coordinate, '%[A-Z]%d', $column, $row);
+            $key = (--$row * 16384) + self::columnIndexFromString((string) $column);
+            $sortKeys[$key] = $coordinate;
         }
         ksort($sortKeys);
 
         return array_values($sortKeys);
     }
 
+    /**
+     * Get all cell references applying union and intersection.
+     *
+     * @param string $cellBlock A cell range e.g. A1:B5,D1:E5 B2:C4
+     *
+     * @return string A string without intersection operator.
+     *   If there was no intersection to begin with, return original argument.
+     *   Otherwise, return cells and/or cell ranges in that range separated by comma.
+     */
+    public static function resolveUnionAndIntersection(string $cellBlock, string $implodeCharacter = ','): string
+    {
+        $cellBlock = preg_replace('/  +/', ' ', trim($cellBlock)) ?? $cellBlock;
+        $cellBlock = preg_replace('/ ,/', ',', $cellBlock) ?? $cellBlock;
+        $cellBlock = preg_replace('/, /', ',', $cellBlock) ?? $cellBlock;
+        $array1 = [];
+        $blocks = explode(',', $cellBlock);
+        foreach ($blocks as $block) {
+            $block0 = explode(' ', $block);
+            if (count($block0) === 1) {
+                $array1 = array_merge($array1, $block0);
+            } else {
+                $blockIdx = -1;
+                $array2 = [];
+                foreach ($block0 as $block00) {
+                    ++$blockIdx;
+                    if ($blockIdx === 0) {
+                        $array2 = self::getReferencesForCellBlock($block00);
+                    } else {
+                        $array2 = array_intersect($array2, self::getReferencesForCellBlock($block00));
+                    }
+                }
+                $array1 = array_merge($array1, $array2);
+            }
+        }
+
+        return implode($implodeCharacter, $array1);
+    }
+
     /**
      * Get all cell references for an individual cell block.
      *
@@ -396,7 +549,7 @@ private static function sortCellReferenceArray(array $cellList): array
      *
      * @return array All individual cells in that range
      */
-    private static function getReferencesForCellBlock($cellBlock)
+    private static function getReferencesForCellBlock(string $cellBlock): array
     {
         $returnValue = [];
 
@@ -427,7 +580,7 @@ private static function getReferencesForCellBlock($cellBlock)
             $currentColumnIndex = $startColumnIndex;
             $currentRow = $startRow;
 
-            self::validateRange($cellBlock, $startColumnIndex, $endColumnIndex, $currentRow, $endRow);
+            self::validateRange($cellBlock, $startColumnIndex, $endColumnIndex, (int) $currentRow, (int) $endRow);
 
             // Loop cells
             while ($currentColumnIndex < $endColumnIndex) {
@@ -456,16 +609,16 @@ private static function getReferencesForCellBlock($cellBlock)
      *
      *    [ 'A1:A3' => 'x', 'A4' => 'y' ]
      *
-     * @param array $pCoordCollection associative array mapping coordinates to values
+     * @param array $coordinateCollection associative array mapping coordinates to values
      *
      * @return array associative array mapping coordinate ranges to valuea
      */
-    public static function mergeRangesInCollection(array $pCoordCollection)
+    public static function mergeRangesInCollection(array $coordinateCollection): array
     {
         $hashedValues = [];
         $mergedCoordCollection = [];
 
-        foreach ($pCoordCollection as $coord => $value) {
+        foreach ($coordinateCollection as $coord => $value) {
             if (self::coordinateIsRange($coord)) {
                 $mergedCoordCollection[$coord] = $value;
 
@@ -474,7 +627,7 @@ public static function mergeRangesInCollection(array $pCoordCollection)
 
             [$column, $row] = self::coordinateFromString($coord);
             $row = (int) (ltrim($row, '$'));
-            $hashCode = $column . '-' . (is_object($value) ? $value->getHashCode() : $value);
+            $hashCode = $column . '-' . ((is_object($value) && method_exists($value, 'getHashCode')) ? $value->getHashCode() : $value);
 
             if (!isset($hashedValues[$hashCode])) {
                 $hashedValues[$hashCode] = (object) [
@@ -533,17 +686,14 @@ public static function mergeRangesInCollection(array $pCoordCollection)
      * Get the individual cell blocks from a range string, removing any $ characters.
      *      then splitting by operators and returning an array with ranges and operators.
      *
-     * @param string $rangeString
-     *
      * @return array[]
      */
-    private static function getCellBlocksFromRangeString($rangeString)
+    private static function getCellBlocksFromRangeString(string $rangeString): array
     {
         $rangeString = str_replace('$', '', strtoupper($rangeString));
 
         // split range sets on intersection (space) or union (,) operators
-        $tokens = preg_split('/([ ,])/', $rangeString, -1, PREG_SPLIT_DELIM_CAPTURE);
-        // separate the range sets and the operators into arrays
+        $tokens = preg_split('/([ ,])/', $rangeString, -1, PREG_SPLIT_DELIM_CAPTURE) ?: [];
         $split = array_chunk($tokens, 2);
         $ranges = array_column($split, 0);
         $operators = array_column($split, 1);
@@ -556,12 +706,8 @@ private static function getCellBlocksFromRangeString($rangeString)
      * row.
      *
      * @param string $cellBlock The original range, for displaying a meaningful error message
-     * @param int $startColumnIndex
-     * @param int $endColumnIndex
-     * @param int $currentRow
-     * @param int $endRow
      */
-    private static function validateRange($cellBlock, $startColumnIndex, $endColumnIndex, $currentRow, $endRow): void
+    private static function validateRange(string $cellBlock, int $startColumnIndex, int $endColumnIndex, int $currentRow, int $endRow): void
     {
         if ($startColumnIndex >= $endColumnIndex || $currentRow > $endRow) {
             throw new Exception('Invalid range: "' . $cellBlock . '"');
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DataType.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DataType.php
index ba03579178..a213725c0e 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DataType.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DataType.php
@@ -4,6 +4,7 @@
 
 use PhpOffice\PhpSpreadsheet\RichText\RichText;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+use Stringable;
 
 class DataType
 {
@@ -16,13 +17,14 @@ class DataType
     const TYPE_NULL = 'null';
     const TYPE_INLINE = 'inlineStr';
     const TYPE_ERROR = 'e';
+    const TYPE_ISO_DATE = 'd';
 
     /**
      * List of error codes.
      *
-     * @var array
+     * @var array<string, int>
      */
-    private static $errorCodes = [
+    private static array $errorCodes = [
         '#NULL!' => 0,
         '#DIV/0!' => 1,
         '#VALUE!' => 2,
@@ -30,14 +32,17 @@ class DataType
         '#NAME?' => 4,
         '#NUM!' => 5,
         '#N/A' => 6,
+        '#CALC!' => 7,
     ];
 
+    public const MAX_STRING_LENGTH = 32767;
+
     /**
      * Get list of error codes.
      *
-     * @return array
+     * @return array<string, int>
      */
-    public static function getErrorCodes()
+    public static function getErrorCodes(): array
     {
         return self::$errorCodes;
     }
@@ -45,41 +50,41 @@ public static function getErrorCodes()
     /**
      * Check a string that it satisfies Excel requirements.
      *
-     * @param null|RichText|string $pValue Value to sanitize to an Excel string
+     * @param null|RichText|string $textValue Value to sanitize to an Excel string
      *
-     * @return null|RichText|string Sanitized value
+     * @return RichText|string Sanitized value
      */
-    public static function checkString($pValue)
+    public static function checkString(null|RichText|string $textValue): RichText|string
     {
-        if ($pValue instanceof RichText) {
+        if ($textValue instanceof RichText) {
             // TODO: Sanitize Rich-Text string (max. character count is 32,767)
-            return $pValue;
+            return $textValue;
         }
 
         // string must never be longer than 32,767 characters, truncate if necessary
-        $pValue = StringHelper::substring($pValue, 0, 32767);
+        $textValue = StringHelper::substring((string) $textValue, 0, self::MAX_STRING_LENGTH);
 
         // we require that newline is represented as "\n" in core, not as "\r\n" or "\r"
-        $pValue = str_replace(["\r\n", "\r"], "\n", $pValue);
+        $textValue = str_replace(["\r\n", "\r"], "\n", $textValue);
 
-        return $pValue;
+        return $textValue;
     }
 
     /**
      * Check a value that it is a valid error code.
      *
-     * @param mixed $pValue Value to sanitize to an Excel error code
+     * @param mixed $value Value to sanitize to an Excel error code
      *
      * @return string Sanitized value
      */
-    public static function checkErrorCode($pValue)
+    public static function checkErrorCode(mixed $value): string
     {
-        $pValue = (string) $pValue;
+        $value = (is_scalar($value) || $value instanceof Stringable) ? ((string) $value) : '#NULL!';
 
-        if (!isset(self::$errorCodes[$pValue])) {
-            $pValue = '#NULL!';
+        if (!isset(self::$errorCodes[$value])) {
+            $value = '#NULL!';
         }
 
-        return $pValue;
+        return $value;
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DataValidation.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DataValidation.php
index dfeb024c92..9a5f44e346 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DataValidation.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DataValidation.php
@@ -28,97 +28,72 @@ class DataValidation
     const OPERATOR_LESSTHANOREQUAL = 'lessThanOrEqual';
     const OPERATOR_NOTBETWEEN = 'notBetween';
     const OPERATOR_NOTEQUAL = 'notEqual';
+    private const DEFAULT_OPERATOR = self::OPERATOR_BETWEEN;
 
     /**
      * Formula 1.
-     *
-     * @var string
      */
-    private $formula1 = '';
+    private string $formula1 = '';
 
     /**
      * Formula 2.
-     *
-     * @var string
      */
-    private $formula2 = '';
+    private string $formula2 = '';
 
     /**
      * Type.
-     *
-     * @var string
      */
-    private $type = self::TYPE_NONE;
+    private string $type = self::TYPE_NONE;
 
     /**
      * Error style.
-     *
-     * @var string
      */
-    private $errorStyle = self::STYLE_STOP;
+    private string $errorStyle = self::STYLE_STOP;
 
     /**
      * Operator.
-     *
-     * @var string
      */
-    private $operator = self::OPERATOR_BETWEEN;
+    private string $operator = self::DEFAULT_OPERATOR;
 
     /**
      * Allow Blank.
-     *
-     * @var bool
      */
-    private $allowBlank = false;
+    private bool $allowBlank = false;
 
     /**
      * Show DropDown.
-     *
-     * @var bool
      */
-    private $showDropDown = false;
+    private bool $showDropDown = false;
 
     /**
      * Show InputMessage.
-     *
-     * @var bool
      */
-    private $showInputMessage = false;
+    private bool $showInputMessage = false;
 
     /**
      * Show ErrorMessage.
-     *
-     * @var bool
      */
-    private $showErrorMessage = false;
+    private bool $showErrorMessage = false;
 
     /**
      * Error title.
-     *
-     * @var string
      */
-    private $errorTitle = '';
+    private string $errorTitle = '';
 
     /**
      * Error.
-     *
-     * @var string
      */
-    private $error = '';
+    private string $error = '';
 
     /**
      * Prompt title.
-     *
-     * @var string
      */
-    private $promptTitle = '';
+    private string $promptTitle = '';
 
     /**
      * Prompt.
-     *
-     * @var string
      */
-    private $prompt = '';
+    private string $prompt = '';
 
     /**
      * Create a new DataValidation.
@@ -129,10 +104,8 @@ public function __construct()
 
     /**
      * Get Formula 1.
-     *
-     * @return string
      */
-    public function getFormula1()
+    public function getFormula1(): string
     {
         return $this->formula1;
     }
@@ -140,23 +113,19 @@ public function getFormula1()
     /**
      * Set Formula 1.
      *
-     * @param string $value
-     *
      * @return $this
      */
-    public function setFormula1($value)
+    public function setFormula1(string $formula): static
     {
-        $this->formula1 = $value;
+        $this->formula1 = $formula;
 
         return $this;
     }
 
     /**
      * Get Formula 2.
-     *
-     * @return string
      */
-    public function getFormula2()
+    public function getFormula2(): string
     {
         return $this->formula2;
     }
@@ -164,23 +133,19 @@ public function getFormula2()
     /**
      * Set Formula 2.
      *
-     * @param string $value
-     *
      * @return $this
      */
-    public function setFormula2($value)
+    public function setFormula2(string $formula): static
     {
-        $this->formula2 = $value;
+        $this->formula2 = $formula;
 
         return $this;
     }
 
     /**
      * Get Type.
-     *
-     * @return string
      */
-    public function getType()
+    public function getType(): string
     {
         return $this->type;
     }
@@ -188,23 +153,19 @@ public function getType()
     /**
      * Set Type.
      *
-     * @param string $value
-     *
      * @return $this
      */
-    public function setType($value)
+    public function setType(string $type): static
     {
-        $this->type = $value;
+        $this->type = $type;
 
         return $this;
     }
 
     /**
      * Get Error style.
-     *
-     * @return string
      */
-    public function getErrorStyle()
+    public function getErrorStyle(): string
     {
         return $this->errorStyle;
     }
@@ -212,23 +173,21 @@ public function getErrorStyle()
     /**
      * Set Error style.
      *
-     * @param string $value see self::STYLE_*
+     * @param string $errorStyle see self::STYLE_*
      *
      * @return $this
      */
-    public function setErrorStyle($value)
+    public function setErrorStyle(string $errorStyle): static
     {
-        $this->errorStyle = $value;
+        $this->errorStyle = $errorStyle;
 
         return $this;
     }
 
     /**
      * Get Operator.
-     *
-     * @return string
      */
-    public function getOperator()
+    public function getOperator(): string
     {
         return $this->operator;
     }
@@ -236,23 +195,19 @@ public function getOperator()
     /**
      * Set Operator.
      *
-     * @param string $value
-     *
      * @return $this
      */
-    public function setOperator($value)
+    public function setOperator(string $operator): static
     {
-        $this->operator = $value;
+        $this->operator = ($operator === '') ? self::DEFAULT_OPERATOR : $operator;
 
         return $this;
     }
 
     /**
      * Get Allow Blank.
-     *
-     * @return bool
      */
-    public function getAllowBlank()
+    public function getAllowBlank(): bool
     {
         return $this->allowBlank;
     }
@@ -260,23 +215,19 @@ public function getAllowBlank()
     /**
      * Set Allow Blank.
      *
-     * @param bool $value
-     *
      * @return $this
      */
-    public function setAllowBlank($value)
+    public function setAllowBlank(bool $allowBlank): static
     {
-        $this->allowBlank = $value;
+        $this->allowBlank = $allowBlank;
 
         return $this;
     }
 
     /**
      * Get Show DropDown.
-     *
-     * @return bool
      */
-    public function getShowDropDown()
+    public function getShowDropDown(): bool
     {
         return $this->showDropDown;
     }
@@ -284,23 +235,19 @@ public function getShowDropDown()
     /**
      * Set Show DropDown.
      *
-     * @param bool $value
-     *
      * @return $this
      */
-    public function setShowDropDown($value)
+    public function setShowDropDown(bool $showDropDown): static
     {
-        $this->showDropDown = $value;
+        $this->showDropDown = $showDropDown;
 
         return $this;
     }
 
     /**
      * Get Show InputMessage.
-     *
-     * @return bool
      */
-    public function getShowInputMessage()
+    public function getShowInputMessage(): bool
     {
         return $this->showInputMessage;
     }
@@ -308,23 +255,19 @@ public function getShowInputMessage()
     /**
      * Set Show InputMessage.
      *
-     * @param bool $value
-     *
      * @return $this
      */
-    public function setShowInputMessage($value)
+    public function setShowInputMessage(bool $showInputMessage): static
     {
-        $this->showInputMessage = $value;
+        $this->showInputMessage = $showInputMessage;
 
         return $this;
     }
 
     /**
      * Get Show ErrorMessage.
-     *
-     * @return bool
      */
-    public function getShowErrorMessage()
+    public function getShowErrorMessage(): bool
     {
         return $this->showErrorMessage;
     }
@@ -332,23 +275,19 @@ public function getShowErrorMessage()
     /**
      * Set Show ErrorMessage.
      *
-     * @param bool $value
-     *
      * @return $this
      */
-    public function setShowErrorMessage($value)
+    public function setShowErrorMessage(bool $showErrorMessage): static
     {
-        $this->showErrorMessage = $value;
+        $this->showErrorMessage = $showErrorMessage;
 
         return $this;
     }
 
     /**
      * Get Error title.
-     *
-     * @return string
      */
-    public function getErrorTitle()
+    public function getErrorTitle(): string
     {
         return $this->errorTitle;
     }
@@ -356,23 +295,19 @@ public function getErrorTitle()
     /**
      * Set Error title.
      *
-     * @param string $value
-     *
      * @return $this
      */
-    public function setErrorTitle($value)
+    public function setErrorTitle(string $errorTitle): static
     {
-        $this->errorTitle = $value;
+        $this->errorTitle = $errorTitle;
 
         return $this;
     }
 
     /**
      * Get Error.
-     *
-     * @return string
      */
-    public function getError()
+    public function getError(): string
     {
         return $this->error;
     }
@@ -380,23 +315,19 @@ public function getError()
     /**
      * Set Error.
      *
-     * @param string $value
-     *
      * @return $this
      */
-    public function setError($value)
+    public function setError(string $error): static
     {
-        $this->error = $value;
+        $this->error = $error;
 
         return $this;
     }
 
     /**
      * Get Prompt title.
-     *
-     * @return string
      */
-    public function getPromptTitle()
+    public function getPromptTitle(): string
     {
         return $this->promptTitle;
     }
@@ -404,23 +335,19 @@ public function getPromptTitle()
     /**
      * Set Prompt title.
      *
-     * @param string $value
-     *
      * @return $this
      */
-    public function setPromptTitle($value)
+    public function setPromptTitle(string $promptTitle): static
     {
-        $this->promptTitle = $value;
+        $this->promptTitle = $promptTitle;
 
         return $this;
     }
 
     /**
      * Get Prompt.
-     *
-     * @return string
      */
-    public function getPrompt()
+    public function getPrompt(): string
     {
         return $this->prompt;
     }
@@ -428,13 +355,11 @@ public function getPrompt()
     /**
      * Set Prompt.
      *
-     * @param string $value
-     *
      * @return $this
      */
-    public function setPrompt($value)
+    public function setPrompt(string $prompt): static
     {
-        $this->prompt = $value;
+        $this->prompt = $prompt;
 
         return $this;
     }
@@ -444,23 +369,24 @@ public function setPrompt($value)
      *
      * @return string Hash code
      */
-    public function getHashCode()
+    public function getHashCode(): string
     {
         return md5(
-            $this->formula1 .
-            $this->formula2 .
-            $this->type .
-            $this->errorStyle .
-            $this->operator .
-            ($this->allowBlank ? 't' : 'f') .
-            ($this->showDropDown ? 't' : 'f') .
-            ($this->showInputMessage ? 't' : 'f') .
-            ($this->showErrorMessage ? 't' : 'f') .
-            $this->errorTitle .
-            $this->error .
-            $this->promptTitle .
-            $this->prompt .
-            __CLASS__
+            $this->formula1
+            . $this->formula2
+            . $this->type
+            . $this->errorStyle
+            . $this->operator
+            . ($this->allowBlank ? 't' : 'f')
+            . ($this->showDropDown ? 't' : 'f')
+            . ($this->showInputMessage ? 't' : 'f')
+            . ($this->showErrorMessage ? 't' : 'f')
+            . $this->errorTitle
+            . $this->error
+            . $this->promptTitle
+            . $this->prompt
+            . $this->sqref
+            . __CLASS__
         );
     }
 
@@ -478,4 +404,18 @@ public function __clone()
             }
         }
     }
+
+    private ?string $sqref = null;
+
+    public function getSqref(): ?string
+    {
+        return $this->sqref;
+    }
+
+    public function setSqref(?string $str): self
+    {
+        $this->sqref = $str;
+
+        return $this;
+    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DataValidator.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DataValidator.php
index 430d81b96e..63ef8999fb 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DataValidator.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DataValidator.php
@@ -3,7 +3,7 @@
 namespace PhpOffice\PhpSpreadsheet\Cell;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Exception;
 
 /**
@@ -15,12 +15,10 @@ class DataValidator
      * Does this cell contain valid value?
      *
      * @param Cell $cell Cell to check the value
-     *
-     * @return bool
      */
-    public function isValid(Cell $cell)
+    public function isValid(Cell $cell): bool
     {
-        if (!$cell->hasDataValidation()) {
+        if (!$cell->hasDataValidation() || $cell->getDataValidation()->getType() === DataValidation::TYPE_NONE) {
             return true;
         }
 
@@ -31,32 +29,71 @@ public function isValid(Cell $cell)
             return false;
         }
 
-        // TODO: write check on all cases
-        switch ($dataValidation->getType()) {
-            case DataValidation::TYPE_LIST:
-                return $this->isValueInList($cell);
+        $returnValue = false;
+        $type = $dataValidation->getType();
+        if ($type === DataValidation::TYPE_LIST) {
+            $returnValue = $this->isValueInList($cell);
+        } elseif ($type === DataValidation::TYPE_WHOLE) {
+            if (!is_numeric($cellValue) || fmod((float) $cellValue, 1) != 0) {
+                $returnValue = false;
+            } else {
+                $returnValue = $this->numericOperator($dataValidation, (int) $cellValue);
+            }
+        } elseif ($type === DataValidation::TYPE_DECIMAL || $type === DataValidation::TYPE_DATE || $type === DataValidation::TYPE_TIME) {
+            if (!is_numeric($cellValue)) {
+                $returnValue = false;
+            } else {
+                $returnValue = $this->numericOperator($dataValidation, (float) $cellValue);
+            }
+        } elseif ($type === DataValidation::TYPE_TEXTLENGTH) {
+            $returnValue = $this->numericOperator($dataValidation, mb_strlen($cell->getValueString()));
         }
 
-        return false;
+        return $returnValue;
+    }
+
+    private function numericOperator(DataValidation $dataValidation, int|float $cellValue): bool
+    {
+        $operator = $dataValidation->getOperator();
+        $formula1 = $dataValidation->getFormula1();
+        $formula2 = $dataValidation->getFormula2();
+        $returnValue = false;
+        if ($operator === DataValidation::OPERATOR_BETWEEN) {
+            $returnValue = $cellValue >= $formula1 && $cellValue <= $formula2;
+        } elseif ($operator === DataValidation::OPERATOR_NOTBETWEEN) {
+            $returnValue = $cellValue < $formula1 || $cellValue > $formula2;
+        } elseif ($operator === DataValidation::OPERATOR_EQUAL) {
+            $returnValue = $cellValue == $formula1;
+        } elseif ($operator === DataValidation::OPERATOR_NOTEQUAL) {
+            $returnValue = $cellValue != $formula1;
+        } elseif ($operator === DataValidation::OPERATOR_LESSTHAN) {
+            $returnValue = $cellValue < $formula1;
+        } elseif ($operator === DataValidation::OPERATOR_LESSTHANOREQUAL) {
+            $returnValue = $cellValue <= $formula1;
+        } elseif ($operator === DataValidation::OPERATOR_GREATERTHAN) {
+            $returnValue = $cellValue > $formula1;
+        } elseif ($operator === DataValidation::OPERATOR_GREATERTHANOREQUAL) {
+            $returnValue = $cellValue >= $formula1;
+        }
+
+        return $returnValue;
     }
 
     /**
      * Does this cell contain valid value, based on list?
      *
      * @param Cell $cell Cell to check the value
-     *
-     * @return bool
      */
-    private function isValueInList(Cell $cell)
+    private function isValueInList(Cell $cell): bool
     {
-        $cellValue = $cell->getValue();
+        $cellValueString = $cell->getValueString();
         $dataValidation = $cell->getDataValidation();
 
         $formula1 = $dataValidation->getFormula1();
         if (!empty($formula1)) {
             // inline values list
             if ($formula1[0] === '"') {
-                return in_array(strtolower($cellValue), explode(',', strtolower(trim($formula1, '"'))), true);
+                return in_array(strtolower($cellValueString), explode(',', strtolower(trim($formula1, '"'))), true);
             } elseif (strpos($formula1, ':') > 0) {
                 // values list cells
                 $matchFormula = '=MATCH(' . $cell->getCoordinate() . ', ' . $formula1 . ', 0)';
@@ -64,9 +101,12 @@ private function isValueInList(Cell $cell)
 
                 try {
                     $result = $calculation->calculateFormula($matchFormula, $cell->getCoordinate(), $cell);
+                    while (is_array($result)) {
+                        $result = array_pop($result);
+                    }
 
-                    return $result !== Functions::NA();
-                } catch (Exception $ex) {
+                    return $result !== ExcelError::NA();
+                } catch (Exception) {
                     return false;
                 }
             }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DefaultValueBinder.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DefaultValueBinder.php
index 6fae5e7656..f36934ed3f 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DefaultValueBinder.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DefaultValueBinder.php
@@ -3,8 +3,12 @@
 namespace PhpOffice\PhpSpreadsheet\Cell;
 
 use DateTimeInterface;
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception as CalculationException;
+use PhpOffice\PhpSpreadsheet\Exception as SpreadsheetException;
 use PhpOffice\PhpSpreadsheet\RichText\RichText;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+use Stringable;
 
 class DefaultValueBinder implements IValueBinder
 {
@@ -13,21 +17,20 @@ class DefaultValueBinder implements IValueBinder
      *
      * @param Cell $cell Cell to bind value to
      * @param mixed $value Value to bind in cell
-     *
-     * @return bool
      */
-    public function bindValue(Cell $cell, $value)
+    public function bindValue(Cell $cell, mixed $value): bool
     {
         // sanitize UTF-8 strings
         if (is_string($value)) {
             $value = StringHelper::sanitizeUTF8($value);
-        } elseif (is_object($value)) {
-            // Handle any objects that might be injected
-            if ($value instanceof DateTimeInterface) {
-                $value = $value->format('Y-m-d H:i:s');
-            } elseif (!($value instanceof RichText)) {
-                $value = (string) $value;
-            }
+        } elseif ($value === null || is_scalar($value) || $value instanceof RichText) {
+            // No need to do anything
+        } elseif ($value instanceof DateTimeInterface) {
+            $value = $value->format('Y-m-d H:i:s');
+        } elseif ($value instanceof Stringable) {
+            $value = (string) $value;
+        } else {
+            throw new SpreadsheetException('Unable to bind unstringable ' . gettype($value));
         }
 
         // Set value explicit
@@ -39,42 +42,68 @@ public function bindValue(Cell $cell, $value)
 
     /**
      * DataType for value.
-     *
-     * @param mixed $value
-     *
-     * @return string
      */
-    public static function dataTypeForValue($value)
+    public static function dataTypeForValue(mixed $value): string
     {
         // Match the value against a few data types
         if ($value === null) {
             return DataType::TYPE_NULL;
-        } elseif (is_float($value) || is_int($value)) {
+        }
+        if (is_float($value) || is_int($value)) {
             return DataType::TYPE_NUMERIC;
-        } elseif (is_bool($value)) {
+        }
+        if (is_bool($value)) {
             return DataType::TYPE_BOOL;
-        } elseif ($value === '') {
+        }
+        if ($value === '') {
             return DataType::TYPE_STRING;
-        } elseif ($value instanceof RichText) {
+        }
+        if ($value instanceof RichText) {
             return DataType::TYPE_INLINE;
-        } elseif (is_string($value) && $value[0] === '=' && strlen($value) > 1) {
+        }
+        if ($value instanceof Stringable) {
+            $value = (string) $value;
+        }
+        if (!is_string($value)) {
+            $gettype = is_object($value) ? get_class($value) : gettype($value);
+
+            throw new SpreadsheetException("unusable type $gettype");
+        }
+        if (strlen($value) > 1 && $value[0] === '=') {
+            $calculation = new Calculation();
+            $calculation->disableBranchPruning();
+
+            try {
+                if (empty($calculation->parseFormula($value))) {
+                    return DataType::TYPE_STRING;
+                }
+            } catch (CalculationException $e) {
+                $message = $e->getMessage();
+                if (
+                    $message === 'Formula Error: An unexpected error occurred'
+                    || str_contains($message, 'has no operands')
+                ) {
+                    return DataType::TYPE_STRING;
+                }
+            }
+
             return DataType::TYPE_FORMULA;
-        } elseif (preg_match('/^[\+\-]?(\d+\\.?\d*|\d*\\.?\d+)([Ee][\-\+]?[0-2]?\d{1,3})?$/', $value)) {
+        }
+        if (preg_match('/^[\+\-]?(\d+\\.?\d*|\d*\\.?\d+)([Ee][\-\+]?[0-2]?\d{1,3})?$/', $value)) {
             $tValue = ltrim($value, '+-');
-            if (is_string($value) && $tValue[0] === '0' && strlen($tValue) > 1 && $tValue[1] !== '.') {
+            if (strlen($tValue) > 1 && $tValue[0] === '0' && $tValue[1] !== '.') {
                 return DataType::TYPE_STRING;
-            } elseif ((strpos($value, '.') === false) && ($value > PHP_INT_MAX)) {
+            } elseif ((!str_contains($value, '.')) && ($value > PHP_INT_MAX)) {
                 return DataType::TYPE_STRING;
             } elseif (!is_numeric($value)) {
                 return DataType::TYPE_STRING;
             }
 
             return DataType::TYPE_NUMERIC;
-        } elseif (is_string($value)) {
-            $errorCodes = DataType::getErrorCodes();
-            if (isset($errorCodes[$value])) {
-                return DataType::TYPE_ERROR;
-            }
+        }
+        $errorCodes = DataType::getErrorCodes();
+        if (isset($errorCodes[$value])) {
+            return DataType::TYPE_ERROR;
         }
 
         return DataType::TYPE_STRING;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/Hyperlink.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/Hyperlink.php
index 003d51014d..3117a7d86d 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/Hyperlink.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/Hyperlink.php
@@ -6,37 +6,31 @@ class Hyperlink
 {
     /**
      * URL to link the cell to.
-     *
-     * @var string
      */
-    private $url;
+    private string $url;
 
     /**
      * Tooltip to display on the hyperlink.
-     *
-     * @var string
      */
-    private $tooltip;
+    private string $tooltip;
 
     /**
      * Create a new Hyperlink.
      *
-     * @param string $pUrl Url to link the cell to
-     * @param string $pTooltip Tooltip to display on the hyperlink
+     * @param string $url Url to link the cell to
+     * @param string $tooltip Tooltip to display on the hyperlink
      */
-    public function __construct($pUrl = '', $pTooltip = '')
+    public function __construct(string $url = '', string $tooltip = '')
     {
         // Initialise member variables
-        $this->url = $pUrl;
-        $this->tooltip = $pTooltip;
+        $this->url = $url;
+        $this->tooltip = $tooltip;
     }
 
     /**
      * Get URL.
-     *
-     * @return string
      */
-    public function getUrl()
+    public function getUrl(): string
     {
         return $this->url;
     }
@@ -44,23 +38,19 @@ public function getUrl()
     /**
      * Set URL.
      *
-     * @param string $value
-     *
      * @return $this
      */
-    public function setUrl($value)
+    public function setUrl(string $url): static
     {
-        $this->url = $value;
+        $this->url = $url;
 
         return $this;
     }
 
     /**
      * Get tooltip.
-     *
-     * @return string
      */
-    public function getTooltip()
+    public function getTooltip(): string
     {
         return $this->tooltip;
     }
@@ -68,31 +58,24 @@ public function getTooltip()
     /**
      * Set tooltip.
      *
-     * @param string $value
-     *
      * @return $this
      */
-    public function setTooltip($value)
+    public function setTooltip(string $tooltip): static
     {
-        $this->tooltip = $value;
+        $this->tooltip = $tooltip;
 
         return $this;
     }
 
     /**
      * Is this hyperlink internal? (to another worksheet).
-     *
-     * @return bool
      */
-    public function isInternal()
+    public function isInternal(): bool
     {
-        return strpos($this->url, 'sheet://') !== false;
+        return str_contains($this->url, 'sheet://');
     }
 
-    /**
-     * @return string
-     */
-    public function getTypeHyperlink()
+    public function getTypeHyperlink(): string
     {
         return $this->isInternal() ? '' : 'External';
     }
@@ -102,12 +85,12 @@ public function getTypeHyperlink()
      *
      * @return string Hash code
      */
-    public function getHashCode()
+    public function getHashCode(): string
     {
         return md5(
-            $this->url .
-            $this->tooltip .
-            __CLASS__
+            $this->url
+            . $this->tooltip
+            . __CLASS__
         );
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/IValueBinder.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/IValueBinder.php
index 5af9f5f60e..b2f7e91a35 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/IValueBinder.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/IValueBinder.php
@@ -9,8 +9,6 @@ interface IValueBinder
      *
      * @param Cell $cell Cell to bind value to
      * @param mixed $value Value to bind in cell
-     *
-     * @return bool
      */
-    public function bindValue(Cell $cell, $value);
+    public function bindValue(Cell $cell, mixed $value): bool;
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/IgnoredErrors.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/IgnoredErrors.php
new file mode 100644
index 0000000000..a7c4d19dd2
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/IgnoredErrors.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Cell;
+
+class IgnoredErrors
+{
+    private bool $numberStoredAsText = false;
+
+    private bool $formula = false;
+
+    private bool $twoDigitTextYear = false;
+
+    private bool $evalError = false;
+
+    public function setNumberStoredAsText(bool $value): self
+    {
+        $this->numberStoredAsText = $value;
+
+        return $this;
+    }
+
+    public function getNumberStoredAsText(): bool
+    {
+        return $this->numberStoredAsText;
+    }
+
+    public function setFormula(bool $value): self
+    {
+        $this->formula = $value;
+
+        return $this;
+    }
+
+    public function getFormula(): bool
+    {
+        return $this->formula;
+    }
+
+    public function setTwoDigitTextYear(bool $value): self
+    {
+        $this->twoDigitTextYear = $value;
+
+        return $this;
+    }
+
+    public function getTwoDigitTextYear(): bool
+    {
+        return $this->twoDigitTextYear;
+    }
+
+    public function setEvalError(bool $value): self
+    {
+        $this->evalError = $value;
+
+        return $this;
+    }
+
+    public function getEvalError(): bool
+    {
+        return $this->evalError;
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/RowRange.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/RowRange.php
new file mode 100644
index 0000000000..4ed232a931
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/RowRange.php
@@ -0,0 +1,93 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Cell;
+
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use Stringable;
+
+/**
+ * @implements AddressRange<int>
+ */
+class RowRange implements AddressRange, Stringable
+{
+    protected ?Worksheet $worksheet;
+
+    protected int $from;
+
+    protected int $to;
+
+    public function __construct(int $from, ?int $to = null, ?Worksheet $worksheet = null)
+    {
+        $this->validateFromTo($from, $to ?? $from);
+        $this->worksheet = $worksheet;
+    }
+
+    public function __destruct()
+    {
+        $this->worksheet = null;
+    }
+
+    public static function fromArray(array $array, ?Worksheet $worksheet = null): self
+    {
+        [$from, $to] = $array;
+
+        return new self($from, $to, $worksheet);
+    }
+
+    private function validateFromTo(int $from, int $to): void
+    {
+        // Identify actual top and bottom values (in case we've been given bottom and top)
+        $this->from = min($from, $to);
+        $this->to = max($from, $to);
+    }
+
+    public function from(): int
+    {
+        return $this->from;
+    }
+
+    public function to(): int
+    {
+        return $this->to;
+    }
+
+    public function rowCount(): int
+    {
+        return $this->to - $this->from + 1;
+    }
+
+    public function shiftRight(int $offset = 1): self
+    {
+        $newFrom = $this->from + $offset;
+        $newFrom = ($newFrom < 1) ? 1 : $newFrom;
+
+        $newTo = $this->to + $offset;
+        $newTo = ($newTo < 1) ? 1 : $newTo;
+
+        return new self($newFrom, $newTo, $this->worksheet);
+    }
+
+    public function shiftLeft(int $offset = 1): self
+    {
+        return $this->shiftRight(0 - $offset);
+    }
+
+    public function toCellRange(): CellRange
+    {
+        return new CellRange(
+            CellAddress::fromColumnAndRow(Coordinate::columnIndexFromString('A'), $this->from, $this->worksheet),
+            CellAddress::fromColumnAndRow(Coordinate::columnIndexFromString(AddressRange::MAX_COLUMN), $this->to)
+        );
+    }
+
+    public function __toString(): string
+    {
+        if ($this->worksheet !== null) {
+            $title = str_replace("'", "''", $this->worksheet->getTitle());
+
+            return "'{$title}'!{$this->from}:{$this->to}";
+        }
+
+        return "{$this->from}:{$this->to}";
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/StringValueBinder.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/StringValueBinder.php
index 346d025347..1509a9c7b6 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/StringValueBinder.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/StringValueBinder.php
@@ -2,28 +2,134 @@
 
 namespace PhpOffice\PhpSpreadsheet\Cell;
 
+use DateTimeInterface;
+use PhpOffice\PhpSpreadsheet\Exception as SpreadsheetException;
+use PhpOffice\PhpSpreadsheet\RichText\RichText;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+use Stringable;
 
-class StringValueBinder implements IValueBinder
+class StringValueBinder extends DefaultValueBinder implements IValueBinder
 {
+    protected bool $convertNull = true;
+
+    protected bool $convertBoolean = true;
+
+    protected bool $convertNumeric = true;
+
+    protected bool $convertFormula = true;
+
+    protected bool $setIgnoredErrors = false;
+
+    public function setSetIgnoredErrors(bool $setIgnoredErrors = false): self
+    {
+        $this->setIgnoredErrors = $setIgnoredErrors;
+
+        return $this;
+    }
+
+    public function setNullConversion(bool $suppressConversion = false): self
+    {
+        $this->convertNull = $suppressConversion;
+
+        return $this;
+    }
+
+    public function setBooleanConversion(bool $suppressConversion = false): self
+    {
+        $this->convertBoolean = $suppressConversion;
+
+        return $this;
+    }
+
+    public function getBooleanConversion(): bool
+    {
+        return $this->convertBoolean;
+    }
+
+    public function setNumericConversion(bool $suppressConversion = false): self
+    {
+        $this->convertNumeric = $suppressConversion;
+
+        return $this;
+    }
+
+    public function setFormulaConversion(bool $suppressConversion = false): self
+    {
+        $this->convertFormula = $suppressConversion;
+
+        return $this;
+    }
+
+    public function setConversionForAllValueTypes(bool $suppressConversion = false): self
+    {
+        $this->convertNull = $suppressConversion;
+        $this->convertBoolean = $suppressConversion;
+        $this->convertNumeric = $suppressConversion;
+        $this->convertFormula = $suppressConversion;
+
+        return $this;
+    }
+
     /**
      * Bind value to a cell.
      *
      * @param Cell $cell Cell to bind value to
      * @param mixed $value Value to bind in cell
-     *
-     * @return bool
      */
-    public function bindValue(Cell $cell, $value)
+    public function bindValue(Cell $cell, mixed $value): bool
     {
+        if (is_object($value)) {
+            return $this->bindObjectValue($cell, $value);
+        }
+        if ($value !== null && !is_scalar($value)) {
+            throw new SpreadsheetException('Unable to bind unstringable ' . gettype($value));
+        }
+
         // sanitize UTF-8 strings
         if (is_string($value)) {
             $value = StringHelper::sanitizeUTF8($value);
         }
 
-        $cell->setValueExplicit((string) $value, DataType::TYPE_STRING);
+        $ignoredErrors = false;
+        if ($value === null && $this->convertNull === false) {
+            $cell->setValueExplicit($value, DataType::TYPE_NULL);
+        } elseif (is_bool($value) && $this->convertBoolean === false) {
+            $cell->setValueExplicit($value, DataType::TYPE_BOOL);
+        } elseif ((is_int($value) || is_float($value)) && $this->convertNumeric === false) {
+            $cell->setValueExplicit($value, DataType::TYPE_NUMERIC);
+        } elseif (is_string($value) && strlen($value) > 1 && $value[0] === '=' && $this->convertFormula === false && parent::dataTypeForValue($value) === DataType::TYPE_FORMULA) {
+            $cell->setValueExplicit($value, DataType::TYPE_FORMULA);
+        } else {
+            $ignoredErrors = is_numeric($value);
+            $cell->setValueExplicit((string) $value, DataType::TYPE_STRING);
+        }
+        if ($this->setIgnoredErrors) {
+            $cell->getIgnoredErrors()->setNumberStoredAsText($ignoredErrors);
+        }
+
+        return true;
+    }
+
+    protected function bindObjectValue(Cell $cell, object $value): bool
+    {
+        // Handle any objects that might be injected
+        $ignoredErrors = false;
+        if ($value instanceof DateTimeInterface) {
+            $value = $value->format('Y-m-d H:i:s');
+            $cell->setValueExplicit($value, DataType::TYPE_STRING);
+        } elseif ($value instanceof RichText) {
+            $cell->setValueExplicit($value, DataType::TYPE_INLINE);
+            $ignoredErrors = is_numeric($value->getPlainText());
+        } elseif ($value instanceof Stringable) {
+            $cell->setValueExplicit((string) $value, DataType::TYPE_STRING);
+            $ignoredErrors = is_numeric((string) $value);
+        } else {
+            throw new SpreadsheetException('Unable to bind unstringable object of type ' . get_class($value));
+        }
+        if ($this->setIgnoredErrors) {
+            $cell->getIgnoredErrors()->setNumberStoredAsText($ignoredErrors);
+        }
 
-        // Done!
         return true;
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/CellReferenceHelper.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/CellReferenceHelper.php
new file mode 100644
index 0000000000..b2f18f6dda
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/CellReferenceHelper.php
@@ -0,0 +1,119 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet;
+
+use PhpOffice\PhpSpreadsheet\Cell\AddressRange;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+
+class CellReferenceHelper
+{
+    protected string $beforeCellAddress;
+
+    protected int $beforeColumn;
+
+    protected int $beforeRow;
+
+    protected int $numberOfColumns;
+
+    protected int $numberOfRows;
+
+    public function __construct(string $beforeCellAddress = 'A1', int $numberOfColumns = 0, int $numberOfRows = 0)
+    {
+        $this->beforeCellAddress = str_replace('$', '', $beforeCellAddress);
+        $this->numberOfColumns = $numberOfColumns;
+        $this->numberOfRows = $numberOfRows;
+
+        // Get coordinate of $beforeCellAddress
+        [$beforeColumn, $beforeRow] = Coordinate::coordinateFromString($beforeCellAddress);
+        $this->beforeColumn = Coordinate::columnIndexFromString($beforeColumn);
+        $this->beforeRow = (int) $beforeRow;
+    }
+
+    public function beforeCellAddress(): string
+    {
+        return $this->beforeCellAddress;
+    }
+
+    public function refreshRequired(string $beforeCellAddress, int $numberOfColumns, int $numberOfRows): bool
+    {
+        return $this->beforeCellAddress !== $beforeCellAddress
+            || $this->numberOfColumns !== $numberOfColumns
+            || $this->numberOfRows !== $numberOfRows;
+    }
+
+    public function updateCellReference(string $cellReference = 'A1', bool $includeAbsoluteReferences = false, bool $onlyAbsoluteReferences = false): string
+    {
+        if (Coordinate::coordinateIsRange($cellReference)) {
+            throw new Exception('Only single cell references may be passed to this method.');
+        }
+
+        // Get coordinate of $cellReference
+        [$newColumn, $newRow] = Coordinate::coordinateFromString($cellReference);
+        $newColumnIndex = Coordinate::columnIndexFromString(str_replace('$', '', $newColumn));
+        $newRowIndex = (int) str_replace('$', '', $newRow);
+
+        $absoluteColumn = $newColumn[0] === '$' ? '$' : '';
+        $absoluteRow = $newRow[0] === '$' ? '$' : '';
+        // Verify which parts should be updated
+        if ($onlyAbsoluteReferences === true) {
+            $updateColumn = (($absoluteColumn === '$') && $newColumnIndex >= $this->beforeColumn);
+            $updateRow = (($absoluteRow === '$') && $newRowIndex >= $this->beforeRow);
+        } elseif ($includeAbsoluteReferences === false) {
+            $updateColumn = (($absoluteColumn !== '$') && $newColumnIndex >= $this->beforeColumn);
+            $updateRow = (($absoluteRow !== '$') && $newRowIndex >= $this->beforeRow);
+        } else {
+            $updateColumn = ($newColumnIndex >= $this->beforeColumn);
+            $updateRow = ($newRowIndex >= $this->beforeRow);
+        }
+
+        // Create new column reference
+        if ($updateColumn) {
+            $newColumn = $this->updateColumnReference($newColumnIndex, $absoluteColumn);
+        }
+
+        // Create new row reference
+        if ($updateRow) {
+            $newRow = $this->updateRowReference($newRowIndex, $absoluteRow);
+        }
+
+        // Return new reference
+        return "{$newColumn}{$newRow}";
+    }
+
+    public function cellAddressInDeleteRange(string $cellAddress): bool
+    {
+        [$cellColumn, $cellRow] = Coordinate::coordinateFromString($cellAddress);
+        $cellColumnIndex = Coordinate::columnIndexFromString($cellColumn);
+        //    Is cell within the range of rows/columns if we're deleting
+        if (
+            $this->numberOfRows < 0
+            && ($cellRow >= ($this->beforeRow + $this->numberOfRows))
+            && ($cellRow < $this->beforeRow)
+        ) {
+            return true;
+        } elseif (
+            $this->numberOfColumns < 0
+            && ($cellColumnIndex >= ($this->beforeColumn + $this->numberOfColumns))
+            && ($cellColumnIndex < $this->beforeColumn)
+        ) {
+            return true;
+        }
+
+        return false;
+    }
+
+    protected function updateColumnReference(int $newColumnIndex, string $absoluteColumn): string
+    {
+        $newColumn = Coordinate::stringFromColumnIndex(min($newColumnIndex + $this->numberOfColumns, AddressRange::MAX_COLUMN_INT));
+
+        return "{$absoluteColumn}{$newColumn}";
+    }
+
+    protected function updateRowReference(int $newRowIndex, string $absoluteRow): string
+    {
+        $newRow = $newRowIndex + $this->numberOfRows;
+        $newRow = ($newRow > AddressRange::MAX_ROW) ? AddressRange::MAX_ROW : $newRow;
+
+        return "{$absoluteRow}{$newRow}";
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Axis.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Axis.php
index 27e6106061..dc1fca4fd4 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Axis.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Axis.php
@@ -10,22 +10,53 @@
  */
 class Axis extends Properties
 {
+    const AXIS_TYPE_CATEGORY = 'catAx';
+    const AXIS_TYPE_DATE = 'dateAx';
+    const AXIS_TYPE_VALUE = 'valAx';
+
+    const TIME_UNIT_DAYS = 'days';
+    const TIME_UNIT_MONTHS = 'months';
+    const TIME_UNIT_YEARS = 'years';
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->fillColor = new ChartColor();
+    }
+
+    /**
+     * Chart Major Gridlines as.
+     */
+    private ?GridLines $majorGridlines = null;
+
+    /**
+     * Chart Minor Gridlines as.
+     */
+    private ?GridLines $minorGridlines = null;
+
     /**
      * Axis Number.
      *
-     * @var mixed[]
+     * @var array{format: string, source_linked: int, numeric: ?bool}
      */
-    private $axisNumber = [
+    private array $axisNumber = [
         'format' => self::FORMAT_CODE_GENERAL,
         'source_linked' => 1,
+        'numeric' => null,
     ];
 
+    private string $axisType = '';
+
+    private ?AxisText $axisText = null;
+
+    private ?Title $dispUnitsTitle = null;
+
     /**
      * Axis Options.
      *
-     * @var mixed[]
+     * @var array<string, null|string>
      */
-    private $axisOptions = [
+    private array $axisOptions = [
         'minimum' => null,
         'maximum' => null,
         'major_unit' => null,
@@ -36,519 +67,278 @@ class Axis extends Properties
         'axis_labels' => self::AXIS_LABELS_NEXT_TO,
         'horizontal_crosses' => self::HORIZONTAL_CROSSES_AUTOZERO,
         'horizontal_crosses_value' => null,
+        'textRotation' => null,
+        'hidden' => null,
+        'majorTimeUnit' => self::TIME_UNIT_YEARS,
+        'minorTimeUnit' => self::TIME_UNIT_MONTHS,
+        'baseTimeUnit' => self::TIME_UNIT_DAYS,
+        'logBase' => null,
+        'dispUnitsBuiltIn' => null,
     ];
-
-    /**
-     * Fill Properties.
-     *
-     * @var mixed[]
-     */
-    private $fillProperties = [
-        'type' => self::EXCEL_COLOR_TYPE_ARGB,
-        'value' => null,
-        'alpha' => 0,
+    public const DISP_UNITS_HUNDREDS = 'hundreds';
+    public const DISP_UNITS_THOUSANDS = 'thousands';
+    public const DISP_UNITS_TEN_THOUSANDS = 'tenThousands';
+    public const DISP_UNITS_HUNDRED_THOUSANDS = 'hundredThousands';
+    public const DISP_UNITS_MILLIONS = 'millions';
+    public const DISP_UNITS_TEN_MILLIONS = 'tenMillions';
+    public const DISP_UNITS_HUNDRED_MILLIONS = 'hundredMillions';
+    public const DISP_UNITS_BILLIONS = 'billions';
+    public const DISP_UNITS_TRILLIONS = 'trillions';
+    public const TRILLION_INDEX = (PHP_INT_SIZE > 4) ? 1000000000000 : '1000000000000';
+    public const DISP_UNITS_BUILTIN_INT = [
+        100 => self::DISP_UNITS_HUNDREDS,
+        1000 => self::DISP_UNITS_THOUSANDS,
+        10000 => self::DISP_UNITS_TEN_THOUSANDS,
+        100000 => self::DISP_UNITS_HUNDRED_THOUSANDS,
+        1000000 => self::DISP_UNITS_MILLIONS,
+        10000000 => self::DISP_UNITS_TEN_MILLIONS,
+        100000000 => self::DISP_UNITS_HUNDRED_MILLIONS,
+        1000000000 => self::DISP_UNITS_BILLIONS,
+        self::TRILLION_INDEX => self::DISP_UNITS_TRILLIONS, // overflow for 32-bit
     ];
 
     /**
-     * Line Properties.
-     *
-     * @var mixed[]
-     */
-    private $lineProperties = [
-        'type' => self::EXCEL_COLOR_TYPE_ARGB,
-        'value' => null,
-        'alpha' => 0,
-    ];
-
-    /**
-     * Line Style Properties.
-     *
-     * @var mixed[]
+     * Fill Properties.
      */
-    private $lineStyleProperties = [
-        'width' => '9525',
-        'compound' => self::LINE_STYLE_COMPOUND_SIMPLE,
-        'dash' => self::LINE_STYLE_DASH_SOLID,
-        'cap' => self::LINE_STYLE_CAP_FLAT,
-        'join' => self::LINE_STYLE_JOIN_BEVEL,
-        'arrow' => [
-            'head' => [
-                'type' => self::LINE_STYLE_ARROW_TYPE_NOARROW,
-                'size' => self::LINE_STYLE_ARROW_SIZE_5,
-            ],
-            'end' => [
-                'type' => self::LINE_STYLE_ARROW_TYPE_NOARROW,
-                'size' => self::LINE_STYLE_ARROW_SIZE_8,
-            ],
-        ],
-    ];
+    private ChartColor $fillColor;
 
-    /**
-     * Shadow Properties.
-     *
-     * @var mixed[]
-     */
-    private $shadowProperties = [
-        'presets' => self::SHADOW_PRESETS_NOSHADOW,
-        'effect' => null,
-        'color' => [
-            'type' => self::EXCEL_COLOR_TYPE_STANDARD,
-            'value' => 'black',
-            'alpha' => 40,
-        ],
-        'size' => [
-            'sx' => null,
-            'sy' => null,
-            'kx' => null,
-        ],
-        'blur' => null,
-        'direction' => null,
-        'distance' => null,
-        'algn' => null,
-        'rotWithShape' => null,
+    private const NUMERIC_FORMAT = [
+        Properties::FORMAT_CODE_NUMBER,
+        Properties::FORMAT_CODE_DATE,
+        Properties::FORMAT_CODE_DATE_ISO8601,
     ];
 
-    /**
-     * Glow Properties.
-     *
-     * @var mixed[]
-     */
-    private $glowProperties = [
-        'size' => null,
-        'color' => [
-            'type' => self::EXCEL_COLOR_TYPE_STANDARD,
-            'value' => 'black',
-            'alpha' => 40,
-        ],
-    ];
-
-    /**
-     * Soft Edge Properties.
-     *
-     * @var mixed[]
-     */
-    private $softEdges = [
-        'size' => null,
-    ];
+    private bool $noFill = false;
 
     /**
      * Get Series Data Type.
-     *
-     * @param mixed $format_code
      */
-    public function setAxisNumberProperties($format_code): void
+    public function setAxisNumberProperties(string $format_code, ?bool $numeric = null, int $sourceLinked = 0): void
     {
-        $this->axisNumber['format'] = (string) $format_code;
-        $this->axisNumber['source_linked'] = 0;
+        $format = $format_code;
+        $this->axisNumber['format'] = $format;
+        $this->axisNumber['source_linked'] = $sourceLinked;
+        if (is_bool($numeric)) {
+            $this->axisNumber['numeric'] = $numeric;
+        } elseif (in_array($format, self::NUMERIC_FORMAT, true)) {
+            $this->axisNumber['numeric'] = true;
+        }
     }
 
     /**
      * Get Axis Number Format Data Type.
-     *
-     * @return string
      */
-    public function getAxisNumberFormat()
+    public function getAxisNumberFormat(): string
     {
         return $this->axisNumber['format'];
     }
 
     /**
      * Get Axis Number Source Linked.
-     *
-     * @return string
      */
-    public function getAxisNumberSourceLinked()
+    public function getAxisNumberSourceLinked(): string
     {
         return (string) $this->axisNumber['source_linked'];
     }
 
-    /**
-     * Set Axis Options Properties.
-     *
-     * @param string $axis_labels
-     * @param string $horizontal_crosses_value
-     * @param string $horizontal_crosses
-     * @param string $axis_orientation
-     * @param string $major_tmt
-     * @param string $minor_tmt
-     * @param string $minimum
-     * @param string $maximum
-     * @param string $major_unit
-     * @param string $minor_unit
-     */
-    public function setAxisOptionsProperties($axis_labels, $horizontal_crosses_value = null, $horizontal_crosses = null, $axis_orientation = null, $major_tmt = null, $minor_tmt = null, $minimum = null, $maximum = null, $major_unit = null, $minor_unit = null): void
+    public function getAxisIsNumericFormat(): bool
     {
-        $this->axisOptions['axis_labels'] = (string) $axis_labels;
-        ($horizontal_crosses_value !== null) ? $this->axisOptions['horizontal_crosses_value'] = (string) $horizontal_crosses_value : null;
-        ($horizontal_crosses !== null) ? $this->axisOptions['horizontal_crosses'] = (string) $horizontal_crosses : null;
-        ($axis_orientation !== null) ? $this->axisOptions['orientation'] = (string) $axis_orientation : null;
-        ($major_tmt !== null) ? $this->axisOptions['major_tick_mark'] = (string) $major_tmt : null;
-        ($minor_tmt !== null) ? $this->axisOptions['minor_tick_mark'] = (string) $minor_tmt : null;
-        ($minor_tmt !== null) ? $this->axisOptions['minor_tick_mark'] = (string) $minor_tmt : null;
-        ($minimum !== null) ? $this->axisOptions['minimum'] = (string) $minimum : null;
-        ($maximum !== null) ? $this->axisOptions['maximum'] = (string) $maximum : null;
-        ($major_unit !== null) ? $this->axisOptions['major_unit'] = (string) $major_unit : null;
-        ($minor_unit !== null) ? $this->axisOptions['minor_unit'] = (string) $minor_unit : null;
+        return $this->axisType === self::AXIS_TYPE_DATE || (bool) $this->axisNumber['numeric'];
     }
 
-    /**
-     * Get Axis Options Property.
-     *
-     * @param string $property
-     *
-     * @return string
-     */
-    public function getAxisOptionsProperty($property)
+    public function setAxisOption(string $key, null|float|int|string $value): void
     {
-        return $this->axisOptions[$property];
+        if ($value !== null && $value !== '') {
+            $this->axisOptions[$key] = (string) $value;
+        }
     }
 
     /**
-     * Set Axis Orientation Property.
-     *
-     * @param string $orientation
+     * Set Axis Options Properties.
      */
-    public function setAxisOrientation($orientation): void
-    {
-        $this->axisOptions['orientation'] = (string) $orientation;
+    public function setAxisOptionsProperties(
+        string $axisLabels,
+        ?string $horizontalCrossesValue = null,
+        ?string $horizontalCrosses = null,
+        ?string $axisOrientation = null,
+        ?string $majorTmt = null,
+        ?string $minorTmt = null,
+        null|float|int|string $minimum = null,
+        null|float|int|string $maximum = null,
+        null|float|int|string $majorUnit = null,
+        null|float|int|string $minorUnit = null,
+        null|float|int|string $textRotation = null,
+        ?string $hidden = null,
+        ?string $baseTimeUnit = null,
+        ?string $majorTimeUnit = null,
+        ?string $minorTimeUnit = null,
+        null|float|int|string $logBase = null,
+        ?string $dispUnitsBuiltIn = null
+    ): void {
+        $this->axisOptions['axis_labels'] = $axisLabels;
+        $this->setAxisOption('horizontal_crosses_value', $horizontalCrossesValue);
+        $this->setAxisOption('horizontal_crosses', $horizontalCrosses);
+        $this->setAxisOption('orientation', $axisOrientation);
+        $this->setAxisOption('major_tick_mark', $majorTmt);
+        $this->setAxisOption('minor_tick_mark', $minorTmt);
+        $this->setAxisOption('minimum', $minimum);
+        $this->setAxisOption('maximum', $maximum);
+        $this->setAxisOption('major_unit', $majorUnit);
+        $this->setAxisOption('minor_unit', $minorUnit);
+        $this->setAxisOption('textRotation', $textRotation);
+        $this->setAxisOption('hidden', $hidden);
+        $this->setAxisOption('baseTimeUnit', $baseTimeUnit);
+        $this->setAxisOption('majorTimeUnit', $majorTimeUnit);
+        $this->setAxisOption('minorTimeUnit', $minorTimeUnit);
+        $this->setAxisOption('logBase', $logBase);
+        $this->setAxisOption('dispUnitsBuiltIn', $dispUnitsBuiltIn);
     }
 
     /**
-     * Set Fill Property.
-     *
-     * @param string $color
-     * @param int $alpha
-     * @param string $type
+     * Get Axis Options Property.
      */
-    public function setFillParameters($color, $alpha = 0, $type = self::EXCEL_COLOR_TYPE_ARGB): void
+    public function getAxisOptionsProperty(string $property): ?string
     {
-        $this->fillProperties = $this->setColorProperties($color, $alpha, $type);
-    }
+        if ($property === 'textRotation') {
+            if ($this->axisText !== null) {
+                if ($this->axisText->getRotation() !== null) {
+                    return (string) $this->axisText->getRotation();
+                }
+            }
+        }
 
-    /**
-     * Set Line Property.
-     *
-     * @param string $color
-     * @param int $alpha
-     * @param string $type
-     */
-    public function setLineParameters($color, $alpha = 0, $type = self::EXCEL_COLOR_TYPE_ARGB): void
-    {
-        $this->lineProperties = $this->setColorProperties($color, $alpha, $type);
+        return $this->axisOptions[$property];
     }
 
     /**
-     * Get Fill Property.
-     *
-     * @param string $property
-     *
-     * @return string
+     * Set Axis Orientation Property.
      */
-    public function getFillProperty($property)
+    public function setAxisOrientation(string $orientation): void
     {
-        return $this->fillProperties[$property];
+        $this->axisOptions['orientation'] = (string) $orientation;
     }
 
-    /**
-     * Get Line Property.
-     *
-     * @param string $property
-     *
-     * @return string
-     */
-    public function getLineProperty($property)
+    public function getAxisType(): string
     {
-        return $this->lineProperties[$property];
+        return $this->axisType;
     }
 
-    /**
-     * Set Line Style Properties.
-     *
-     * @param float $line_width
-     * @param string $compound_type
-     * @param string $dash_type
-     * @param string $cap_type
-     * @param string $join_type
-     * @param string $head_arrow_type
-     * @param string $head_arrow_size
-     * @param string $end_arrow_type
-     * @param string $end_arrow_size
-     */
-    public function setLineStyleProperties($line_width = null, $compound_type = null, $dash_type = null, $cap_type = null, $join_type = null, $head_arrow_type = null, $head_arrow_size = null, $end_arrow_type = null, $end_arrow_size = null): void
+    public function setAxisType(string $type): self
     {
-        ($line_width !== null) ? $this->lineStyleProperties['width'] = $this->getExcelPointsWidth((float) $line_width) : null;
-        ($compound_type !== null) ? $this->lineStyleProperties['compound'] = (string) $compound_type : null;
-        ($dash_type !== null) ? $this->lineStyleProperties['dash'] = (string) $dash_type : null;
-        ($cap_type !== null) ? $this->lineStyleProperties['cap'] = (string) $cap_type : null;
-        ($join_type !== null) ? $this->lineStyleProperties['join'] = (string) $join_type : null;
-        ($head_arrow_type !== null) ? $this->lineStyleProperties['arrow']['head']['type'] = (string) $head_arrow_type : null;
-        ($head_arrow_size !== null) ? $this->lineStyleProperties['arrow']['head']['size'] = (string) $head_arrow_size : null;
-        ($end_arrow_type !== null) ? $this->lineStyleProperties['arrow']['end']['type'] = (string) $end_arrow_type : null;
-        ($end_arrow_size !== null) ? $this->lineStyleProperties['arrow']['end']['size'] = (string) $end_arrow_size : null;
-    }
+        if ($type === self::AXIS_TYPE_CATEGORY || $type === self::AXIS_TYPE_VALUE || $type === self::AXIS_TYPE_DATE) {
+            $this->axisType = $type;
+        } else {
+            $this->axisType = '';
+        }
 
-    /**
-     * Get Line Style Property.
-     *
-     * @param array|string $elements
-     *
-     * @return string
-     */
-    public function getLineStyleProperty($elements)
-    {
-        return $this->getArrayElementsValue($this->lineStyleProperties, $elements);
+        return $this;
     }
 
     /**
-     * Get Line Style Arrow Excel Width.
-     *
-     * @param string $arrow
-     *
-     * @return string
+     * Set Fill Property.
      */
-    public function getLineStyleArrowWidth($arrow)
+    public function setFillParameters(?string $color, ?int $alpha = null, ?string $AlphaType = ChartColor::EXCEL_COLOR_TYPE_RGB): void
     {
-        return $this->getLineStyleArrowSize($this->lineStyleProperties['arrow'][$arrow]['size'], 'w');
+        $this->fillColor->setColorProperties($color, $alpha, $AlphaType);
     }
 
     /**
-     * Get Line Style Arrow Excel Length.
-     *
-     * @param string $arrow
-     *
-     * @return string
+     * Get Fill Property.
      */
-    public function getLineStyleArrowLength($arrow)
+    public function getFillProperty(string $property): string
     {
-        return $this->getLineStyleArrowSize($this->lineStyleProperties['arrow'][$arrow]['size'], 'len');
+        return (string) $this->fillColor->getColorProperty($property);
     }
 
-    /**
-     * Set Shadow Properties.
-     *
-     * @param int $sh_presets
-     * @param string $sh_color_value
-     * @param string $sh_color_type
-     * @param string $sh_color_alpha
-     * @param float $sh_blur
-     * @param int $sh_angle
-     * @param float $sh_distance
-     */
-    public function setShadowProperties($sh_presets, $sh_color_value = null, $sh_color_type = null, $sh_color_alpha = null, $sh_blur = null, $sh_angle = null, $sh_distance = null): void
+    public function getFillColorObject(): ChartColor
     {
-        $this->setShadowPresetsProperties((int) $sh_presets)
-            ->setShadowColor(
-                $sh_color_value ?? $this->shadowProperties['color']['value'],
-                $sh_color_alpha ?? (int) $this->shadowProperties['color']['alpha'],
-                $sh_color_type ?? $this->shadowProperties['color']['type']
-            )
-            ->setShadowBlur($sh_blur)
-            ->setShadowAngle($sh_angle)
-            ->setShadowDistance($sh_distance);
+        return $this->fillColor;
     }
 
-    /**
-     * Set Shadow Color.
-     *
-     * @param int $shadow_presets
-     *
-     * @return $this
-     */
-    private function setShadowPresetsProperties($shadow_presets)
+    private string $crossBetween = ''; // 'between' or 'midCat' might be better
+
+    public function setCrossBetween(string $crossBetween): self
     {
-        $this->shadowProperties['presets'] = $shadow_presets;
-        $this->setShadowProperiesMapValues($this->getShadowPresetsMap($shadow_presets));
+        $this->crossBetween = $crossBetween;
 
         return $this;
     }
 
-    /**
-     * Set Shadow Properties from Mapped Values.
-     *
-     * @param mixed $reference
-     *
-     * @return $this
-     */
-    private function setShadowProperiesMapValues(array $properties_map, &$reference = null)
+    public function getCrossBetween(): string
     {
-        $base_reference = $reference;
-        foreach ($properties_map as $property_key => $property_val) {
-            if (is_array($property_val)) {
-                if ($reference === null) {
-                    $reference = &$this->shadowProperties[$property_key];
-                } else {
-                    $reference = &$reference[$property_key];
-                }
-                $this->setShadowProperiesMapValues($property_val, $reference);
-            } else {
-                if ($base_reference === null) {
-                    $this->shadowProperties[$property_key] = $property_val;
-                } else {
-                    $reference[$property_key] = $property_val;
-                }
-            }
-        }
-
-        return $this;
+        return $this->crossBetween;
     }
 
-    /**
-     * Set Shadow Color.
-     *
-     * @param string $color
-     * @param int $alpha
-     * @param string $type
-     *
-     * @return $this
-     */
-    private function setShadowColor($color, $alpha, $type)
+    public function getMajorGridlines(): ?GridLines
     {
-        $this->shadowProperties['color'] = $this->setColorProperties($color, $alpha, $type);
-
-        return $this;
+        return $this->majorGridlines;
     }
 
-    /**
-     * Set Shadow Blur.
-     *
-     * @param float $blur
-     *
-     * @return $this
-     */
-    private function setShadowBlur($blur)
+    public function getMinorGridlines(): ?GridLines
     {
-        if ($blur !== null) {
-            $this->shadowProperties['blur'] = (string) $this->getExcelPointsWidth($blur);
-        }
-
-        return $this;
+        return $this->minorGridlines;
     }
 
-    /**
-     * Set Shadow Angle.
-     *
-     * @param int $angle
-     *
-     * @return $this
-     */
-    private function setShadowAngle($angle)
+    public function setMajorGridlines(?GridLines $gridlines): self
     {
-        if ($angle !== null) {
-            $this->shadowProperties['direction'] = (string) $this->getExcelPointsAngle($angle);
-        }
+        $this->majorGridlines = $gridlines;
 
         return $this;
     }
 
-    /**
-     * Set Shadow Distance.
-     *
-     * @param float $distance
-     *
-     * @return $this
-     */
-    private function setShadowDistance($distance)
+    public function setMinorGridlines(?GridLines $gridlines): self
     {
-        if ($distance !== null) {
-            $this->shadowProperties['distance'] = (string) $this->getExcelPointsWidth($distance);
-        }
+        $this->minorGridlines = $gridlines;
 
         return $this;
     }
 
-    /**
-     * Get Shadow Property.
-     *
-     * @param string|string[] $elements
-     *
-     * @return null|array|int|string
-     */
-    public function getShadowProperty($elements)
+    public function getAxisText(): ?AxisText
     {
-        return $this->getArrayElementsValue($this->shadowProperties, $elements);
+        return $this->axisText;
     }
 
-    /**
-     * Set Glow Properties.
-     *
-     * @param float $size
-     * @param string $color_value
-     * @param int $color_alpha
-     * @param string $color_type
-     */
-    public function setGlowProperties($size, $color_value = null, $color_alpha = null, $color_type = null): void
+    public function setAxisText(?AxisText $axisText): self
     {
-        $this->setGlowSize($size)
-            ->setGlowColor(
-                $color_value ?? $this->glowProperties['color']['value'],
-                $color_alpha ?? (int) $this->glowProperties['color']['alpha'],
-                $color_type ?? $this->glowProperties['color']['type']
-            );
-    }
+        $this->axisText = $axisText;
 
-    /**
-     * Get Glow Property.
-     *
-     * @param array|string $property
-     *
-     * @return string
-     */
-    public function getGlowProperty($property)
-    {
-        return $this->getArrayElementsValue($this->glowProperties, $property);
+        return $this;
     }
 
-    /**
-     * Set Glow Color.
-     *
-     * @param float $size
-     *
-     * @return $this
-     */
-    private function setGlowSize($size)
+    public function setNoFill(bool $noFill): self
     {
-        if ($size !== null) {
-            $this->glowProperties['size'] = $this->getExcelPointsWidth($size);
-        }
+        $this->noFill = $noFill;
 
         return $this;
     }
 
-    /**
-     * Set Glow Color.
-     *
-     * @param string $color
-     * @param int $alpha
-     * @param string $type
-     *
-     * @return $this
-     */
-    private function setGlowColor($color, $alpha, $type)
+    public function getNoFill(): bool
+    {
+        return $this->noFill;
+    }
+
+    public function setDispUnitsTitle(?Title $dispUnitsTitle): self
     {
-        $this->glowProperties['color'] = $this->setColorProperties($color, $alpha, $type);
+        $this->dispUnitsTitle = $dispUnitsTitle;
 
         return $this;
     }
 
-    /**
-     * Set Soft Edges Size.
-     *
-     * @param float $size
-     */
-    public function setSoftEdges($size): void
+    public function getDispUnitsTitle(): ?Title
     {
-        if ($size !== null) {
-            $softEdges['size'] = (string) $this->getExcelPointsWidth($size);
-        }
+        return $this->dispUnitsTitle;
     }
 
     /**
-     * Get Soft Edges Size.
-     *
-     * @return string
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
      */
-    public function getSoftEdgesSize()
+    public function __clone()
     {
-        return $this->softEdges['size'];
+        parent::__clone();
+        $this->majorGridlines = ($this->majorGridlines === null) ? null : clone $this->majorGridlines;
+        $this->majorGridlines = ($this->minorGridlines === null) ? null : clone $this->minorGridlines;
+        $this->axisText = ($this->axisText === null) ? null : clone $this->axisText;
+        $this->dispUnitsTitle = ($this->dispUnitsTitle === null) ? null : clone $this->dispUnitsTitle;
+        $this->fillColor = clone $this->fillColor;
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/AxisText.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/AxisText.php
new file mode 100644
index 0000000000..09d6b2a5ee
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/AxisText.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Chart;
+
+use PhpOffice\PhpSpreadsheet\Style\Font;
+
+class AxisText extends Properties
+{
+    private ?int $rotation = null;
+
+    private Font $font;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->font = new Font();
+        $this->font->setSize(null, true);
+    }
+
+    public function setRotation(?int $rotation): self
+    {
+        $this->rotation = $rotation;
+
+        return $this;
+    }
+
+    public function getRotation(): ?int
+    {
+        return $this->rotation;
+    }
+
+    public function getFillColorObject(): ChartColor
+    {
+        $fillColor = $this->font->getChartColor();
+        if ($fillColor === null) {
+            $fillColor = new ChartColor();
+            $this->font->setChartColorFromObject($fillColor);
+        }
+
+        return $fillColor;
+    }
+
+    public function getFont(): Font
+    {
+        return $this->font;
+    }
+
+    public function setFont(Font $font): self
+    {
+        $this->font = $font;
+
+        return $this;
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        parent::__clone();
+        $this->font = clone $this->font;
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Chart.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Chart.php
index 4fdff6ffd9..dae43c95d0 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Chart.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Chart.php
@@ -9,145 +9,124 @@ class Chart
 {
     /**
      * Chart Name.
-     *
-     * @var string
      */
-    private $name = '';
+    private string $name;
 
     /**
      * Worksheet.
-     *
-     * @var Worksheet
      */
-    private $worksheet;
+    private ?Worksheet $worksheet = null;
 
     /**
      * Chart Title.
-     *
-     * @var Title
      */
-    private $title;
+    private ?Title $title;
 
     /**
      * Chart Legend.
-     *
-     * @var Legend
      */
-    private $legend;
+    private ?Legend $legend;
 
     /**
      * X-Axis Label.
-     *
-     * @var Title
      */
-    private $xAxisLabel;
+    private ?Title $xAxisLabel;
 
     /**
      * Y-Axis Label.
-     *
-     * @var Title
      */
-    private $yAxisLabel;
+    private ?Title $yAxisLabel;
 
     /**
      * Chart Plot Area.
-     *
-     * @var PlotArea
      */
-    private $plotArea;
+    private ?PlotArea $plotArea;
 
     /**
      * Plot Visible Only.
-     *
-     * @var bool
      */
-    private $plotVisibleOnly = true;
+    private bool $plotVisibleOnly;
 
     /**
      * Display Blanks as.
-     *
-     * @var string
      */
-    private $displayBlanksAs = DataSeries::EMPTY_AS_GAP;
+    private string $displayBlanksAs;
 
     /**
      * Chart Asix Y as.
-     *
-     * @var Axis
      */
-    private $yAxis;
+    private Axis $yAxis;
 
     /**
      * Chart Asix X as.
-     *
-     * @var Axis
-     */
-    private $xAxis;
-
-    /**
-     * Chart Major Gridlines as.
-     *
-     * @var GridLines
      */
-    private $majorGridlines;
-
-    /**
-     * Chart Minor Gridlines as.
-     *
-     * @var GridLines
-     */
-    private $minorGridlines;
+    private Axis $xAxis;
 
     /**
      * Top-Left Cell Position.
-     *
-     * @var string
      */
-    private $topLeftCellRef = 'A1';
+    private string $topLeftCellRef = 'A1';
 
     /**
      * Top-Left X-Offset.
-     *
-     * @var int
      */
-    private $topLeftXOffset = 0;
+    private int $topLeftXOffset = 0;
 
     /**
      * Top-Left Y-Offset.
-     *
-     * @var int
      */
-    private $topLeftYOffset = 0;
+    private int $topLeftYOffset = 0;
 
     /**
      * Bottom-Right Cell Position.
-     *
-     * @var string
      */
-    private $bottomRightCellRef = 'A1';
+    private string $bottomRightCellRef = '';
 
     /**
      * Bottom-Right X-Offset.
-     *
-     * @var int
      */
-    private $bottomRightXOffset = 10;
+    private int $bottomRightXOffset = 10;
 
     /**
      * Bottom-Right Y-Offset.
-     *
-     * @var int
      */
-    private $bottomRightYOffset = 10;
+    private int $bottomRightYOffset = 10;
+
+    private ?int $rotX = null;
+
+    private ?int $rotY = null;
+
+    private ?int $rAngAx = null;
+
+    private ?int $perspective = null;
+
+    private bool $oneCellAnchor = false;
+
+    private bool $autoTitleDeleted = false;
+
+    private bool $noFill = false;
+
+    private bool $roundedCorners = false;
+
+    private GridLines $borderLines;
+
+    private ChartColor $fillColor;
+
+    /**
+     * Rendered width in pixels.
+     */
+    private ?float $renderedWidth = null;
+
+    /**
+     * Rendered height in pixels.
+     */
+    private ?float $renderedHeight = null;
 
     /**
      * Create a new Chart.
-     *
-     * @param mixed $name
-     * @param mixed $plotVisibleOnly
-     * @param string $displayBlanksAs
+     * majorGridlines and minorGridlines are deprecated, moved to Axis.
      */
-    public function __construct($name, ?Title $title = null, ?Legend $legend = null, ?PlotArea $plotArea = null, $plotVisibleOnly = true, $displayBlanksAs = DataSeries::EMPTY_AS_GAP, ?Title $xAxisLabel = null, ?Title $yAxisLabel = null, ?Axis $xAxis = null, ?Axis $yAxis = null, ?GridLines $majorGridlines = null, ?GridLines $minorGridlines = null)
+    public function __construct(string $name, ?Title $title = null, ?Legend $legend = null, ?PlotArea $plotArea = null, bool $plotVisibleOnly = true, string $displayBlanksAs = DataSeries::EMPTY_AS_GAP, ?Title $xAxisLabel = null, ?Title $yAxisLabel = null, ?Axis $xAxis = null, ?Axis $yAxis = null, ?GridLines $majorGridlines = null, ?GridLines $minorGridlines = null)
     {
         $this->name = $name;
         $this->title = $title;
@@ -157,28 +136,42 @@ public function __construct($name, ?Title $title = null, ?Legend $legend = null,
         $this->plotArea = $plotArea;
         $this->plotVisibleOnly = $plotVisibleOnly;
         $this->displayBlanksAs = $displayBlanksAs;
-        $this->xAxis = $xAxis;
-        $this->yAxis = $yAxis;
-        $this->majorGridlines = $majorGridlines;
-        $this->minorGridlines = $minorGridlines;
+        $this->xAxis = $xAxis ?? new Axis();
+        $this->yAxis = $yAxis ?? new Axis();
+        if ($majorGridlines !== null) {
+            $this->yAxis->setMajorGridlines($majorGridlines);
+        }
+        if ($minorGridlines !== null) {
+            $this->yAxis->setMinorGridlines($minorGridlines);
+        }
+        $this->fillColor = new ChartColor();
+        $this->borderLines = new GridLines();
+    }
+
+    public function __destruct()
+    {
+        $this->worksheet = null;
     }
 
     /**
      * Get Name.
-     *
-     * @return string
      */
-    public function getName()
+    public function getName(): string
     {
         return $this->name;
     }
 
+    public function setName(string $name): self
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
     /**
      * Get Worksheet.
-     *
-     * @return Worksheet
      */
-    public function getWorksheet()
+    public function getWorksheet(): ?Worksheet
     {
         return $this->worksheet;
     }
@@ -186,23 +179,16 @@ public function getWorksheet()
     /**
      * Set Worksheet.
      *
-     * @param Worksheet $pValue
-     *
      * @return $this
      */
-    public function setWorksheet(?Worksheet $pValue = null)
+    public function setWorksheet(?Worksheet $worksheet = null): static
     {
-        $this->worksheet = $pValue;
+        $this->worksheet = $worksheet;
 
         return $this;
     }
 
-    /**
-     * Get Title.
-     *
-     * @return Title
-     */
-    public function getTitle()
+    public function getTitle(): ?Title
     {
         return $this->title;
     }
@@ -212,19 +198,14 @@ public function getTitle()
      *
      * @return $this
      */
-    public function setTitle(Title $title)
+    public function setTitle(Title $title): static
     {
         $this->title = $title;
 
         return $this;
     }
 
-    /**
-     * Get Legend.
-     *
-     * @return Legend
-     */
-    public function getLegend()
+    public function getLegend(): ?Legend
     {
         return $this->legend;
     }
@@ -234,19 +215,14 @@ public function getLegend()
      *
      * @return $this
      */
-    public function setLegend(Legend $legend)
+    public function setLegend(Legend $legend): static
     {
         $this->legend = $legend;
 
         return $this;
     }
 
-    /**
-     * Get X-Axis Label.
-     *
-     * @return Title
-     */
-    public function getXAxisLabel()
+    public function getXAxisLabel(): ?Title
     {
         return $this->xAxisLabel;
     }
@@ -256,19 +232,14 @@ public function getXAxisLabel()
      *
      * @return $this
      */
-    public function setXAxisLabel(Title $label)
+    public function setXAxisLabel(Title $label): static
     {
         $this->xAxisLabel = $label;
 
         return $this;
     }
 
-    /**
-     * Get Y-Axis Label.
-     *
-     * @return Title
-     */
-    public function getYAxisLabel()
+    public function getYAxisLabel(): ?Title
     {
         return $this->yAxisLabel;
     }
@@ -278,29 +249,42 @@ public function getYAxisLabel()
      *
      * @return $this
      */
-    public function setYAxisLabel(Title $label)
+    public function setYAxisLabel(Title $label): static
     {
         $this->yAxisLabel = $label;
 
         return $this;
     }
 
+    public function getPlotArea(): ?PlotArea
+    {
+        return $this->plotArea;
+    }
+
+    public function getPlotAreaOrThrow(): PlotArea
+    {
+        $plotArea = $this->getPlotArea();
+        if ($plotArea !== null) {
+            return $plotArea;
+        }
+
+        throw new Exception('Chart has no PlotArea');
+    }
+
     /**
-     * Get Plot Area.
-     *
-     * @return PlotArea
+     * Set Plot Area.
      */
-    public function getPlotArea()
+    public function setPlotArea(PlotArea $plotArea): self
     {
-        return $this->plotArea;
+        $this->plotArea = $plotArea;
+
+        return $this;
     }
 
     /**
      * Get Plot Visible Only.
-     *
-     * @return bool
      */
-    public function getPlotVisibleOnly()
+    public function getPlotVisibleOnly(): bool
     {
         return $this->plotVisibleOnly;
     }
@@ -308,11 +292,9 @@ public function getPlotVisibleOnly()
     /**
      * Set Plot Visible Only.
      *
-     * @param bool $plotVisibleOnly
-     *
      * @return $this
      */
-    public function setPlotVisibleOnly($plotVisibleOnly)
+    public function setPlotVisibleOnly(bool $plotVisibleOnly): static
     {
         $this->plotVisibleOnly = $plotVisibleOnly;
 
@@ -321,10 +303,8 @@ public function setPlotVisibleOnly($plotVisibleOnly)
 
     /**
      * Get Display Blanks as.
-     *
-     * @return string
      */
-    public function getDisplayBlanksAs()
+    public function getDisplayBlanksAs(): string
     {
         return $this->displayBlanksAs;
     }
@@ -332,85 +312,53 @@ public function getDisplayBlanksAs()
     /**
      * Set Display Blanks as.
      *
-     * @param string $displayBlanksAs
-     *
      * @return $this
      */
-    public function setDisplayBlanksAs($displayBlanksAs)
+    public function setDisplayBlanksAs(string $displayBlanksAs): static
     {
         $this->displayBlanksAs = $displayBlanksAs;
 
         return $this;
     }
 
-    /**
-     * Get yAxis.
-     *
-     * @return Axis
-     */
-    public function getChartAxisY()
+    public function getChartAxisY(): Axis
     {
-        if ($this->yAxis !== null) {
-            return $this->yAxis;
-        }
-
-        return new Axis();
+        return $this->yAxis;
     }
 
     /**
-     * Get xAxis.
-     *
-     * @return Axis
+     * Set yAxis.
      */
-    public function getChartAxisX()
+    public function setChartAxisY(?Axis $axis): self
     {
-        if ($this->xAxis !== null) {
-            return $this->xAxis;
-        }
+        $this->yAxis = $axis ?? new Axis();
 
-        return new Axis();
+        return $this;
     }
 
-    /**
-     * Get Major Gridlines.
-     *
-     * @return GridLines
-     */
-    public function getMajorGridlines()
+    public function getChartAxisX(): Axis
     {
-        if ($this->majorGridlines !== null) {
-            return $this->majorGridlines;
-        }
-
-        return new GridLines();
+        return $this->xAxis;
     }
 
     /**
-     * Get Minor Gridlines.
-     *
-     * @return GridLines
+     * Set xAxis.
      */
-    public function getMinorGridlines()
+    public function setChartAxisX(?Axis $axis): self
     {
-        if ($this->minorGridlines !== null) {
-            return $this->minorGridlines;
-        }
+        $this->xAxis = $axis ?? new Axis();
 
-        return new GridLines();
+        return $this;
     }
 
     /**
      * Set the Top Left position for the chart.
      *
-     * @param string $cell
-     * @param int $xOffset
-     * @param int $yOffset
-     *
      * @return $this
      */
-    public function setTopLeftPosition($cell, $xOffset = null, $yOffset = null)
+    public function setTopLeftPosition(string $cellAddress, ?int $xOffset = null, ?int $yOffset = null): static
     {
-        $this->topLeftCellRef = $cell;
+        $this->topLeftCellRef = $cellAddress;
         if ($xOffset !== null) {
             $this->setTopLeftXOffset($xOffset);
         }
@@ -424,9 +372,11 @@ public function setTopLeftPosition($cell, $xOffset = null, $yOffset = null)
     /**
      * Get the top left position of the chart.
      *
+     * Returns ['cell' => string cell address, 'xOffset' => int, 'yOffset' => int].
+     *
      * @return array{cell: string, xOffset: int, yOffset: int} an associative array containing the cell address, X-Offset and Y-Offset from the top left of that cell
      */
-    public function getTopLeftPosition()
+    public function getTopLeftPosition(): array
     {
         return [
             'cell' => $this->topLeftCellRef,
@@ -437,10 +387,8 @@ public function getTopLeftPosition()
 
     /**
      * Get the cell address where the top left of the chart is fixed.
-     *
-     * @return string
      */
-    public function getTopLeftCell()
+    public function getTopLeftCell(): string
     {
         return $this->topLeftCellRef;
     }
@@ -448,13 +396,11 @@ public function getTopLeftCell()
     /**
      * Set the Top Left cell position for the chart.
      *
-     * @param string $cell
-     *
      * @return $this
      */
-    public function setTopLeftCell($cell)
+    public function setTopLeftCell(string $cellAddress): static
     {
-        $this->topLeftCellRef = $cell;
+        $this->topLeftCellRef = $cellAddress;
 
         return $this;
     }
@@ -462,12 +408,9 @@ public function setTopLeftCell($cell)
     /**
      * Set the offset position within the Top Left cell for the chart.
      *
-     * @param int $xOffset
-     * @param int $yOffset
-     *
      * @return $this
      */
-    public function setTopLeftOffset($xOffset, $yOffset)
+    public function setTopLeftOffset(?int $xOffset, ?int $yOffset): static
     {
         if ($xOffset !== null) {
             $this->setTopLeftXOffset($xOffset);
@@ -485,7 +428,7 @@ public function setTopLeftOffset($xOffset, $yOffset)
      *
      * @return int[]
      */
-    public function getTopLeftOffset()
+    public function getTopLeftOffset(): array
     {
         return [
             'X' => $this->topLeftXOffset,
@@ -493,26 +436,32 @@ public function getTopLeftOffset()
         ];
     }
 
-    public function setTopLeftXOffset($xOffset)
+    /**
+     * @return $this
+     */
+    public function setTopLeftXOffset(int $xOffset): static
     {
         $this->topLeftXOffset = $xOffset;
 
         return $this;
     }
 
-    public function getTopLeftXOffset()
+    public function getTopLeftXOffset(): int
     {
         return $this->topLeftXOffset;
     }
 
-    public function setTopLeftYOffset($yOffset)
+    /**
+     * @return $this
+     */
+    public function setTopLeftYOffset(int $yOffset): static
     {
         $this->topLeftYOffset = $yOffset;
 
         return $this;
     }
 
-    public function getTopLeftYOffset()
+    public function getTopLeftYOffset(): int
     {
         return $this->topLeftYOffset;
     }
@@ -520,15 +469,11 @@ public function getTopLeftYOffset()
     /**
      * Set the Bottom Right position of the chart.
      *
-     * @param string $cell
-     * @param int $xOffset
-     * @param int $yOffset
-     *
      * @return $this
      */
-    public function setBottomRightPosition($cell, $xOffset = null, $yOffset = null)
+    public function setBottomRightPosition(string $cellAddress = '', ?int $xOffset = null, ?int $yOffset = null): static
     {
-        $this->bottomRightCellRef = $cell;
+        $this->bottomRightCellRef = $cellAddress;
         if ($xOffset !== null) {
             $this->setBottomRightXOffset($xOffset);
         }
@@ -544,7 +489,7 @@ public function setBottomRightPosition($cell, $xOffset = null, $yOffset = null)
      *
      * @return array an associative array containing the cell address, X-Offset and Y-Offset from the top left of that cell
      */
-    public function getBottomRightPosition()
+    public function getBottomRightPosition(): array
     {
         return [
             'cell' => $this->bottomRightCellRef,
@@ -553,19 +498,22 @@ public function getBottomRightPosition()
         ];
     }
 
-    public function setBottomRightCell($cell)
+    /**
+     * Set the Bottom Right cell for the chart.
+     *
+     * @return $this
+     */
+    public function setBottomRightCell(string $cellAddress = ''): static
     {
-        $this->bottomRightCellRef = $cell;
+        $this->bottomRightCellRef = $cellAddress;
 
         return $this;
     }
 
     /**
      * Get the cell address where the bottom right of the chart is fixed.
-     *
-     * @return string
      */
-    public function getBottomRightCell()
+    public function getBottomRightCell(): string
     {
         return $this->bottomRightCellRef;
     }
@@ -573,12 +521,9 @@ public function getBottomRightCell()
     /**
      * Set the offset position within the Bottom Right cell for the chart.
      *
-     * @param int $xOffset
-     * @param int $yOffset
-     *
      * @return $this
      */
-    public function setBottomRightOffset($xOffset, $yOffset)
+    public function setBottomRightOffset(?int $xOffset, ?int $yOffset): static
     {
         if ($xOffset !== null) {
             $this->setBottomRightXOffset($xOffset);
@@ -596,7 +541,7 @@ public function setBottomRightOffset($xOffset, $yOffset)
      *
      * @return int[]
      */
-    public function getBottomRightOffset()
+    public function getBottomRightOffset(): array
     {
         return [
             'X' => $this->bottomRightXOffset,
@@ -604,33 +549,39 @@ public function getBottomRightOffset()
         ];
     }
 
-    public function setBottomRightXOffset($xOffset)
+    /**
+     * @return $this
+     */
+    public function setBottomRightXOffset(int $xOffset): static
     {
         $this->bottomRightXOffset = $xOffset;
 
         return $this;
     }
 
-    public function getBottomRightXOffset()
+    public function getBottomRightXOffset(): int
     {
         return $this->bottomRightXOffset;
     }
 
-    public function setBottomRightYOffset($yOffset)
+    /**
+     * @return $this
+     */
+    public function setBottomRightYOffset(int $yOffset): static
     {
         $this->bottomRightYOffset = $yOffset;
 
         return $this;
     }
 
-    public function getBottomRightYOffset()
+    public function getBottomRightYOffset(): int
     {
         return $this->bottomRightYOffset;
     }
 
     public function refresh(): void
     {
-        if ($this->worksheet !== null) {
+        if ($this->worksheet !== null && $this->plotArea !== null) {
             $this->plotArea->refresh($this->worksheet);
         }
     }
@@ -638,11 +589,11 @@ public function refresh(): void
     /**
      * Render the chart to given file (or stream).
      *
-     * @param string $outputDestination Name of the file render to
+     * @param ?string $outputDestination Name of the file render to
      *
      * @return bool true on success
      */
-    public function render($outputDestination = null)
+    public function render(?string $outputDestination = null): bool
     {
         if ($outputDestination == 'php://output') {
             $outputDestination = null;
@@ -660,4 +611,160 @@ public function render($outputDestination = null)
 
         return $renderer->render($outputDestination);
     }
+
+    public function getRotX(): ?int
+    {
+        return $this->rotX;
+    }
+
+    public function setRotX(?int $rotX): self
+    {
+        $this->rotX = $rotX;
+
+        return $this;
+    }
+
+    public function getRotY(): ?int
+    {
+        return $this->rotY;
+    }
+
+    public function setRotY(?int $rotY): self
+    {
+        $this->rotY = $rotY;
+
+        return $this;
+    }
+
+    public function getRAngAx(): ?int
+    {
+        return $this->rAngAx;
+    }
+
+    public function setRAngAx(?int $rAngAx): self
+    {
+        $this->rAngAx = $rAngAx;
+
+        return $this;
+    }
+
+    public function getPerspective(): ?int
+    {
+        return $this->perspective;
+    }
+
+    public function setPerspective(?int $perspective): self
+    {
+        $this->perspective = $perspective;
+
+        return $this;
+    }
+
+    public function getOneCellAnchor(): bool
+    {
+        return $this->oneCellAnchor;
+    }
+
+    public function setOneCellAnchor(bool $oneCellAnchor): self
+    {
+        $this->oneCellAnchor = $oneCellAnchor;
+
+        return $this;
+    }
+
+    public function getAutoTitleDeleted(): bool
+    {
+        return $this->autoTitleDeleted;
+    }
+
+    public function setAutoTitleDeleted(bool $autoTitleDeleted): self
+    {
+        $this->autoTitleDeleted = $autoTitleDeleted;
+
+        return $this;
+    }
+
+    public function getNoFill(): bool
+    {
+        return $this->noFill;
+    }
+
+    public function setNoFill(bool $noFill): self
+    {
+        $this->noFill = $noFill;
+
+        return $this;
+    }
+
+    public function getRoundedCorners(): bool
+    {
+        return $this->roundedCorners;
+    }
+
+    public function setRoundedCorners(?bool $roundedCorners): self
+    {
+        if ($roundedCorners !== null) {
+            $this->roundedCorners = $roundedCorners;
+        }
+
+        return $this;
+    }
+
+    public function getBorderLines(): GridLines
+    {
+        return $this->borderLines;
+    }
+
+    public function setBorderLines(GridLines $borderLines): self
+    {
+        $this->borderLines = $borderLines;
+
+        return $this;
+    }
+
+    public function getFillColor(): ChartColor
+    {
+        return $this->fillColor;
+    }
+
+    public function setRenderedWidth(?float $width): self
+    {
+        $this->renderedWidth = $width;
+
+        return $this;
+    }
+
+    public function getRenderedWidth(): ?float
+    {
+        return $this->renderedWidth;
+    }
+
+    public function setRenderedHeight(?float $height): self
+    {
+        $this->renderedHeight = $height;
+
+        return $this;
+    }
+
+    public function getRenderedHeight(): ?float
+    {
+        return $this->renderedHeight;
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $this->worksheet = null;
+        $this->title = ($this->title === null) ? null : clone $this->title;
+        $this->legend = ($this->legend === null) ? null : clone $this->legend;
+        $this->xAxisLabel = ($this->xAxisLabel === null) ? null : clone $this->xAxisLabel;
+        $this->yAxisLabel = ($this->yAxisLabel === null) ? null : clone $this->yAxisLabel;
+        $this->plotArea = ($this->plotArea === null) ? null : clone $this->plotArea;
+        $this->xAxis = clone $this->xAxis;
+        $this->yAxis = clone $this->yAxis;
+        $this->borderLines = clone $this->borderLines;
+        $this->fillColor = clone $this->fillColor;
+    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/ChartColor.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/ChartColor.php
new file mode 100644
index 0000000000..d6306de6bf
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/ChartColor.php
@@ -0,0 +1,160 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Chart;
+
+class ChartColor
+{
+    const EXCEL_COLOR_TYPE_STANDARD = 'prstClr';
+    const EXCEL_COLOR_TYPE_SCHEME = 'schemeClr';
+    const EXCEL_COLOR_TYPE_RGB = 'srgbClr';
+    const EXCEL_COLOR_TYPES = [
+        self::EXCEL_COLOR_TYPE_RGB,
+        self::EXCEL_COLOR_TYPE_SCHEME,
+        self::EXCEL_COLOR_TYPE_STANDARD,
+    ];
+
+    private string $value = '';
+
+    private string $type = '';
+
+    private ?int $alpha = null;
+
+    private ?int $brightness = null;
+
+    /**
+     * @param string|string[] $value
+     */
+    public function __construct($value = '', ?int $alpha = null, ?string $type = null, ?int $brightness = null)
+    {
+        if (is_array($value)) {
+            $this->setColorPropertiesArray($value);
+        } else {
+            $this->setColorProperties($value, $alpha, $type, $brightness);
+        }
+    }
+
+    public function getValue(): string
+    {
+        return $this->value;
+    }
+
+    public function setValue(string $value): self
+    {
+        $this->value = $value;
+
+        return $this;
+    }
+
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
+    public function setType(string $type): self
+    {
+        $this->type = $type;
+
+        return $this;
+    }
+
+    public function getAlpha(): ?int
+    {
+        return $this->alpha;
+    }
+
+    public function setAlpha(?int $alpha): self
+    {
+        $this->alpha = $alpha;
+
+        return $this;
+    }
+
+    public function getBrightness(): ?int
+    {
+        return $this->brightness;
+    }
+
+    public function setBrightness(?int $brightness): self
+    {
+        $this->brightness = $brightness;
+
+        return $this;
+    }
+
+    public function setColorProperties(?string $color, null|float|int|string $alpha = null, ?string $type = null, null|float|int|string $brightness = null): self
+    {
+        if (empty($type) && !empty($color)) {
+            if (str_starts_with($color, '*')) {
+                $type = 'schemeClr';
+                $color = substr($color, 1);
+            } elseif (str_starts_with($color, '/')) {
+                $type = 'prstClr';
+                $color = substr($color, 1);
+            } elseif (preg_match('/^[0-9A-Fa-f]{6}$/', $color) === 1) {
+                $type = 'srgbClr';
+            }
+        }
+        if ($color !== null) {
+            $this->setValue("$color");
+        }
+        if ($type !== null) {
+            $this->setType($type);
+        }
+        if ($alpha === null) {
+            $this->setAlpha(null);
+        } elseif (is_numeric($alpha)) {
+            $this->setAlpha((int) $alpha);
+        }
+        if ($brightness === null) {
+            $this->setBrightness(null);
+        } elseif (is_numeric($brightness)) {
+            $this->setBrightness((int) $brightness);
+        }
+
+        return $this;
+    }
+
+    public function setColorPropertiesArray(array $color): self
+    {
+        return $this->setColorProperties(
+            $color['value'] ?? '',
+            $color['alpha'] ?? null,
+            $color['type'] ?? null,
+            $color['brightness'] ?? null
+        );
+    }
+
+    public function isUsable(): bool
+    {
+        return $this->type !== '' && $this->value !== '';
+    }
+
+    /**
+     * Get Color Property.
+     */
+    public function getColorProperty(string $propertyName): null|int|string
+    {
+        $retVal = null;
+        if ($propertyName === 'value') {
+            $retVal = $this->value;
+        } elseif ($propertyName === 'type') {
+            $retVal = $this->type;
+        } elseif ($propertyName === 'alpha') {
+            $retVal = $this->alpha;
+        } elseif ($propertyName === 'brightness') {
+            $retVal = $this->brightness;
+        }
+
+        return $retVal;
+    }
+
+    public static function alphaToXml(int $alpha): string
+    {
+        return (string) (100 - $alpha) . '000';
+    }
+
+    public static function alphaFromXml(float|int|string $alpha): int
+    {
+        return 100 - ((int) $alpha / 1000);
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/DataSeries.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/DataSeries.php
index 067d30e548..c7a92820b6 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/DataSeries.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/DataSeries.php
@@ -46,98 +46,99 @@ class DataSeries
 
     /**
      * Series Plot Type.
-     *
-     * @var string
      */
-    private $plotType;
+    private ?string $plotType;
 
     /**
      * Plot Grouping Type.
-     *
-     * @var string
      */
-    private $plotGrouping;
+    private ?string $plotGrouping;
 
     /**
      * Plot Direction.
-     *
-     * @var string
      */
-    private $plotDirection;
+    private string $plotDirection;
 
     /**
      * Plot Style.
-     *
-     * @var null|string
      */
-    private $plotStyle;
+    private ?string $plotStyle;
 
     /**
      * Order of plots in Series.
      *
      * @var int[]
      */
-    private $plotOrder = [];
+    private array $plotOrder;
 
     /**
      * Plot Label.
      *
      * @var DataSeriesValues[]
      */
-    private $plotLabel = [];
+    private array $plotLabel;
 
     /**
      * Plot Category.
      *
      * @var DataSeriesValues[]
      */
-    private $plotCategory = [];
+    private array $plotCategory;
 
     /**
-     * Smooth Line.
-     *
-     * @var bool
+     * Smooth Line. Must be specified for both DataSeries and DataSeriesValues.
      */
-    private $smoothLine;
+    private bool $smoothLine;
 
     /**
      * Plot Values.
      *
      * @var DataSeriesValues[]
      */
-    private $plotValues = [];
+    private array $plotValues;
+
+    /**
+     * Plot Bubble Sizes.
+     *
+     * @var DataSeriesValues[]
+     */
+    private array $plotBubbleSizes = [];
 
     /**
      * Create a new DataSeries.
      *
-     * @param null|mixed $plotType
-     * @param null|mixed $plotGrouping
      * @param int[] $plotOrder
      * @param DataSeriesValues[] $plotLabel
      * @param DataSeriesValues[] $plotCategory
      * @param DataSeriesValues[] $plotValues
-     * @param null|string $plotDirection
-     * @param bool $smoothLine
-     * @param null|string $plotStyle
      */
-    public function __construct($plotType = null, $plotGrouping = null, array $plotOrder = [], array $plotLabel = [], array $plotCategory = [], array $plotValues = [], $plotDirection = null, $smoothLine = false, $plotStyle = null)
-    {
+    public function __construct(
+        null|string $plotType = null,
+        null|string $plotGrouping = null,
+        array $plotOrder = [],
+        array $plotLabel = [],
+        array $plotCategory = [],
+        array $plotValues = [],
+        ?string $plotDirection = null,
+        bool $smoothLine = false,
+        ?string $plotStyle = null
+    ) {
         $this->plotType = $plotType;
         $this->plotGrouping = $plotGrouping;
         $this->plotOrder = $plotOrder;
         $keys = array_keys($plotValues);
         $this->plotValues = $plotValues;
-        if ((count($plotLabel) == 0) || ($plotLabel[$keys[0]] === null)) {
+        if (!isset($plotLabel[$keys[0]])) {
             $plotLabel[$keys[0]] = new DataSeriesValues();
         }
         $this->plotLabel = $plotLabel;
 
-        if ((count($plotCategory) == 0) || ($plotCategory[$keys[0]] === null)) {
+        if (!isset($plotCategory[$keys[0]])) {
             $plotCategory[$keys[0]] = new DataSeriesValues();
         }
         $this->plotCategory = $plotCategory;
 
-        $this->smoothLine = $smoothLine;
+        $this->smoothLine = (bool) $smoothLine;
         $this->plotStyle = $plotStyle;
 
         if ($plotDirection === null) {
@@ -148,10 +149,8 @@ public function __construct($plotType = null, $plotGrouping = null, array $plotO
 
     /**
      * Get Plot Type.
-     *
-     * @return string
      */
-    public function getPlotType()
+    public function getPlotType(): ?string
     {
         return $this->plotType;
     }
@@ -159,11 +158,9 @@ public function getPlotType()
     /**
      * Set Plot Type.
      *
-     * @param string $plotType
-     *
      * @return $this
      */
-    public function setPlotType($plotType)
+    public function setPlotType(string $plotType): static
     {
         $this->plotType = $plotType;
 
@@ -172,10 +169,8 @@ public function setPlotType($plotType)
 
     /**
      * Get Plot Grouping Type.
-     *
-     * @return string
      */
-    public function getPlotGrouping()
+    public function getPlotGrouping(): ?string
     {
         return $this->plotGrouping;
     }
@@ -183,11 +178,9 @@ public function getPlotGrouping()
     /**
      * Set Plot Grouping Type.
      *
-     * @param string $groupingType
-     *
      * @return $this
      */
-    public function setPlotGrouping($groupingType)
+    public function setPlotGrouping(string $groupingType): static
     {
         $this->plotGrouping = $groupingType;
 
@@ -196,10 +189,8 @@ public function setPlotGrouping($groupingType)
 
     /**
      * Get Plot Direction.
-     *
-     * @return string
      */
-    public function getPlotDirection()
+    public function getPlotDirection(): string
     {
         return $this->plotDirection;
     }
@@ -207,11 +198,9 @@ public function getPlotDirection()
     /**
      * Set Plot Direction.
      *
-     * @param string $plotDirection
-     *
      * @return $this
      */
-    public function setPlotDirection($plotDirection)
+    public function setPlotDirection(string $plotDirection): static
     {
         $this->plotDirection = $plotDirection;
 
@@ -223,7 +212,7 @@ public function setPlotDirection($plotDirection)
      *
      * @return int[]
      */
-    public function getPlotOrder()
+    public function getPlotOrder(): array
     {
         return $this->plotOrder;
     }
@@ -233,7 +222,7 @@ public function getPlotOrder()
      *
      * @return DataSeriesValues[]
      */
-    public function getPlotLabels()
+    public function getPlotLabels(): array
     {
         return $this->plotLabel;
     }
@@ -241,17 +230,13 @@ public function getPlotLabels()
     /**
      * Get Plot Label by Index.
      *
-     * @param mixed $index
-     *
      * @return DataSeriesValues|false
      */
-    public function getPlotLabelByIndex($index)
+    public function getPlotLabelByIndex(int $index): bool|DataSeriesValues
     {
         $keys = array_keys($this->plotLabel);
         if (in_array($index, $keys)) {
             return $this->plotLabel[$index];
-        } elseif (isset($keys[$index])) {
-            return $this->plotLabel[$keys[$index]];
         }
 
         return false;
@@ -262,7 +247,7 @@ public function getPlotLabelByIndex($index)
      *
      * @return DataSeriesValues[]
      */
-    public function getPlotCategories()
+    public function getPlotCategories(): array
     {
         return $this->plotCategory;
     }
@@ -270,11 +255,9 @@ public function getPlotCategories()
     /**
      * Get Plot Category by Index.
      *
-     * @param mixed $index
-     *
      * @return DataSeriesValues|false
      */
-    public function getPlotCategoryByIndex($index)
+    public function getPlotCategoryByIndex(int $index): bool|DataSeriesValues
     {
         $keys = array_keys($this->plotCategory);
         if (in_array($index, $keys)) {
@@ -288,10 +271,8 @@ public function getPlotCategoryByIndex($index)
 
     /**
      * Get Plot Style.
-     *
-     * @return null|string
      */
-    public function getPlotStyle()
+    public function getPlotStyle(): ?string
     {
         return $this->plotStyle;
     }
@@ -299,11 +280,9 @@ public function getPlotStyle()
     /**
      * Set Plot Style.
      *
-     * @param null|string $plotStyle
-     *
      * @return $this
      */
-    public function setPlotStyle($plotStyle)
+    public function setPlotStyle(?string $plotStyle): static
     {
         $this->plotStyle = $plotStyle;
 
@@ -315,7 +294,7 @@ public function setPlotStyle($plotStyle)
      *
      * @return DataSeriesValues[]
      */
-    public function getPlotValues()
+    public function getPlotValues(): array
     {
         return $this->plotValues;
     }
@@ -323,38 +302,52 @@ public function getPlotValues()
     /**
      * Get Plot Values by Index.
      *
-     * @param mixed $index
-     *
      * @return DataSeriesValues|false
      */
-    public function getPlotValuesByIndex($index)
+    public function getPlotValuesByIndex(int $index): bool|DataSeriesValues
     {
         $keys = array_keys($this->plotValues);
         if (in_array($index, $keys)) {
             return $this->plotValues[$index];
-        } elseif (isset($keys[$index])) {
-            return $this->plotValues[$keys[$index]];
         }
 
         return false;
     }
 
     /**
-     * Get Number of Plot Series.
+     * Get Plot Bubble Sizes.
      *
-     * @return int
+     * @return DataSeriesValues[]
+     */
+    public function getPlotBubbleSizes(): array
+    {
+        return $this->plotBubbleSizes;
+    }
+
+    /**
+     * Set Plot Bubble Sizes.
+     *
+     * @param DataSeriesValues[] $plotBubbleSizes
+     */
+    public function setPlotBubbleSizes(array $plotBubbleSizes): self
+    {
+        $this->plotBubbleSizes = $plotBubbleSizes;
+
+        return $this;
+    }
+
+    /**
+     * Get Number of Plot Series.
      */
-    public function getPlotSeriesCount()
+    public function getPlotSeriesCount(): int
     {
         return count($this->plotValues);
     }
 
     /**
      * Get Smooth Line.
-     *
-     * @return bool
      */
-    public function getSmoothLine()
+    public function getSmoothLine(): bool
     {
         return $this->smoothLine;
     }
@@ -362,11 +355,9 @@ public function getSmoothLine()
     /**
      * Set Smooth Line.
      *
-     * @param bool $smoothLine
-     *
      * @return $this
      */
-    public function setSmoothLine($smoothLine)
+    public function setSmoothLine(bool $smoothLine): static
     {
         $this->smoothLine = $smoothLine;
 
@@ -391,4 +382,31 @@ public function refresh(Worksheet $worksheet): void
             }
         }
     }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $plotLabels = $this->plotLabel;
+        $this->plotLabel = [];
+        foreach ($plotLabels as $plotLabel) {
+            $this->plotLabel[] = $plotLabel;
+        }
+        $plotCategories = $this->plotCategory;
+        $this->plotCategory = [];
+        foreach ($plotCategories as $plotCategory) {
+            $this->plotCategory[] = clone $plotCategory;
+        }
+        $plotValues = $this->plotValues;
+        $this->plotValues = [];
+        foreach ($plotValues as $plotValue) {
+            $this->plotValues[] = clone $plotValue;
+        }
+        $plotBubbleSizes = $this->plotBubbleSizes;
+        $this->plotBubbleSizes = [];
+        foreach ($plotBubbleSizes as $plotBubbleSize) {
+            $this->plotBubbleSizes[] = clone $plotBubbleSize;
+        }
+    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/DataSeriesValues.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/DataSeriesValues.php
index 88063336bf..70f90bf78c 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/DataSeriesValues.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/DataSeriesValues.php
@@ -7,100 +7,107 @@
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 
-class DataSeriesValues
+class DataSeriesValues extends Properties
 {
     const DATASERIES_TYPE_STRING = 'String';
     const DATASERIES_TYPE_NUMBER = 'Number';
 
-    private static $dataTypeValues = [
+    private const DATA_TYPE_VALUES = [
         self::DATASERIES_TYPE_STRING,
         self::DATASERIES_TYPE_NUMBER,
     ];
 
     /**
      * Series Data Type.
-     *
-     * @var string
      */
-    private $dataType;
+    private string $dataType;
 
     /**
      * Series Data Source.
-     *
-     * @var string
      */
-    private $dataSource;
+    private ?string $dataSource;
 
     /**
      * Format Code.
-     *
-     * @var string
      */
-    private $formatCode;
+    private ?string $formatCode;
 
     /**
      * Series Point Marker.
-     *
-     * @var string
      */
-    private $pointMarker;
+    private ?string $pointMarker;
+
+    private ChartColor $markerFillColor;
+
+    private ChartColor $markerBorderColor;
+
+    /**
+     * Series Point Size.
+     */
+    private int $pointSize = 3;
 
     /**
      * Point Count (The number of datapoints in the dataseries).
-     *
-     * @var int
      */
-    private $pointCount = 0;
+    private int $pointCount;
 
     /**
      * Data Values.
-     *
-     * @var mixed[]
      */
-    private $dataValues = [];
+    private ?array $dataValues;
 
     /**
      * Fill color (can be array with colors if dataseries have custom colors).
      *
-     * @var string|string[]
+     * @var null|ChartColor|ChartColor[]
      */
     private $fillColor;
 
-    /**
-     * Line Width.
-     *
-     * @var int
-     */
-    private $lineWidth = 12700;
+    private bool $scatterLines = true;
+
+    private bool $bubble3D = false;
+
+    private ?Layout $labelLayout = null;
+
+    /** @var TrendLine[] */
+    private array $trendLines = [];
 
     /**
      * Create a new DataSeriesValues object.
      *
-     * @param string $dataType
-     * @param string $dataSource
-     * @param null|mixed $formatCode
-     * @param int $pointCount
-     * @param mixed $dataValues
-     * @param null|mixed $marker
-     * @param null|string|string[] $fillColor
+     * @param null|ChartColor|ChartColor[]|string|string[] $fillColor
      */
-    public function __construct($dataType = self::DATASERIES_TYPE_NUMBER, $dataSource = null, $formatCode = null, $pointCount = 0, $dataValues = [], $marker = null, $fillColor = null)
-    {
+    public function __construct(
+        string $dataType = self::DATASERIES_TYPE_NUMBER,
+        ?string $dataSource = null,
+        ?string $formatCode = null,
+        int $pointCount = 0,
+        ?array $dataValues = [],
+        ?string $marker = null,
+        null|ChartColor|array|string $fillColor = null,
+        int|string $pointSize = 3
+    ) {
+        parent::__construct();
+        $this->markerFillColor = new ChartColor();
+        $this->markerBorderColor = new ChartColor();
         $this->setDataType($dataType);
         $this->dataSource = $dataSource;
         $this->formatCode = $formatCode;
         $this->pointCount = $pointCount;
         $this->dataValues = $dataValues;
         $this->pointMarker = $marker;
-        $this->fillColor = $fillColor;
+        if ($fillColor !== null) {
+            $this->setFillColor($fillColor);
+        }
+        if (is_numeric($pointSize)) {
+            $this->pointSize = (int) $pointSize;
+        }
     }
 
     /**
      * Get Series Data Type.
-     *
-     * @return string
      */
-    public function getDataType()
+    public function getDataType(): string
     {
         return $this->dataType;
     }
@@ -117,9 +124,9 @@ public function getDataType()
      *
      * @return $this
      */
-    public function setDataType($dataType)
+    public function setDataType(string $dataType): static
     {
-        if (!in_array($dataType, self::$dataTypeValues)) {
+        if (!in_array($dataType, self::DATA_TYPE_VALUES)) {
             throw new Exception('Invalid datatype for chart data series values');
         }
         $this->dataType = $dataType;
@@ -129,10 +136,8 @@ public function setDataType($dataType)
 
     /**
      * Get Series Data Source (formula).
-     *
-     * @return string
      */
-    public function getDataSource()
+    public function getDataSource(): ?string
     {
         return $this->dataSource;
     }
@@ -140,11 +145,9 @@ public function getDataSource()
     /**
      * Set Series Data Source (formula).
      *
-     * @param string $dataSource
-     *
      * @return $this
      */
-    public function setDataSource($dataSource)
+    public function setDataSource(?string $dataSource): static
     {
         $this->dataSource = $dataSource;
 
@@ -153,10 +156,8 @@ public function setDataSource($dataSource)
 
     /**
      * Get Point Marker.
-     *
-     * @return string
      */
-    public function getPointMarker()
+    public function getPointMarker(): ?string
     {
         return $this->pointMarker;
     }
@@ -164,23 +165,49 @@ public function getPointMarker()
     /**
      * Set Point Marker.
      *
-     * @param string $marker
-     *
      * @return $this
      */
-    public function setPointMarker($marker)
+    public function setPointMarker(string $marker): static
     {
         $this->pointMarker = $marker;
 
         return $this;
     }
 
+    public function getMarkerFillColor(): ChartColor
+    {
+        return $this->markerFillColor;
+    }
+
+    public function getMarkerBorderColor(): ChartColor
+    {
+        return $this->markerBorderColor;
+    }
+
     /**
-     * Get Series Format Code.
+     * Get Point Size.
+     */
+    public function getPointSize(): int
+    {
+        return $this->pointSize;
+    }
+
+    /**
+     * Set Point Size.
      *
-     * @return string
+     * @return $this
+     */
+    public function setPointSize(int $size = 3): static
+    {
+        $this->pointSize = $size;
+
+        return $this;
+    }
+
+    /**
+     * Get Series Format Code.
      */
-    public function getFormatCode()
+    public function getFormatCode(): ?string
     {
         return $this->formatCode;
     }
@@ -188,11 +215,9 @@ public function getFormatCode()
     /**
      * Set Series Format Code.
      *
-     * @param string $formatCode
-     *
      * @return $this
      */
-    public function setFormatCode($formatCode)
+    public function setFormatCode(string $formatCode): static
     {
         $this->formatCode = $formatCode;
 
@@ -201,41 +226,102 @@ public function setFormatCode($formatCode)
 
     /**
      * Get Series Point Count.
-     *
-     * @return int
      */
-    public function getPointCount()
+    public function getPointCount(): int
     {
         return $this->pointCount;
     }
 
+    /**
+     * Get fill color object.
+     *
+     * @return null|ChartColor|ChartColor[]
+     */
+    public function getFillColorObject()
+    {
+        return $this->fillColor;
+    }
+
+    private function stringToChartColor(string $fillString): ChartColor
+    {
+        $value = $type = '';
+        if (str_starts_with($fillString, '*')) {
+            $type = 'schemeClr';
+            $value = substr($fillString, 1);
+        } elseif (str_starts_with($fillString, '/')) {
+            $type = 'prstClr';
+            $value = substr($fillString, 1);
+        } elseif ($fillString !== '') {
+            $type = 'srgbClr';
+            $value = $fillString;
+            $this->validateColor($value);
+        }
+
+        return new ChartColor($value, null, $type);
+    }
+
+    private function chartColorToString(ChartColor $chartColor): string
+    {
+        $type = (string) $chartColor->getColorProperty('type');
+        $value = (string) $chartColor->getColorProperty('value');
+        if ($type === '' || $value === '') {
+            return '';
+        }
+        if ($type === 'schemeClr') {
+            return "*$value";
+        }
+        if ($type === 'prstClr') {
+            return "/$value";
+        }
+
+        return $value;
+    }
+
     /**
      * Get fill color.
      *
      * @return string|string[] HEX color or array with HEX colors
      */
-    public function getFillColor()
+    public function getFillColor(): string|array
     {
-        return $this->fillColor;
+        if ($this->fillColor === null) {
+            return '';
+        }
+        if (is_array($this->fillColor)) {
+            $array = [];
+            foreach ($this->fillColor as $chartColor) {
+                $array[] = $this->chartColorToString($chartColor);
+            }
+
+            return $array;
+        }
+
+        return $this->chartColorToString($this->fillColor);
     }
 
     /**
      * Set fill color for series.
      *
-     * @param string|string[] $color HEX color or array with HEX colors
+     * @param ChartColor|ChartColor[]|string|string[] $color HEX color or array with HEX colors
      *
-     * @return   DataSeriesValues
+     * @return   $this
      */
-    public function setFillColor($color)
+    public function setFillColor($color): static
     {
         if (is_array($color)) {
-            foreach ($color as $colorValue) {
-                $this->validateColor($colorValue);
+            $this->fillColor = [];
+            foreach ($color as $fillString) {
+                if ($fillString instanceof ChartColor) {
+                    $this->fillColor[] = $fillString;
+                } else {
+                    $this->fillColor[] = $this->stringToChartColor($fillString);
+                }
             }
+        } elseif ($color instanceof ChartColor) {
+            $this->fillColor = $color;
         } else {
-            $this->validateColor($color);
+            $this->fillColor = $this->stringToChartColor($color);
         }
-        $this->fillColor = $color;
 
         return $this;
     }
@@ -247,7 +333,7 @@ public function setFillColor($color)
      *
      * @return bool true if validation was successful
      */
-    private function validateColor($color)
+    private function validateColor(string $color): bool
     {
         if (!preg_match('/^[a-f0-9]{6}$/i', $color)) {
             throw new Exception(sprintf('Invalid hex color for chart series (color: "%s")', $color));
@@ -258,37 +344,30 @@ private function validateColor($color)
 
     /**
      * Get line width for series.
-     *
-     * @return int
      */
-    public function getLineWidth()
+    public function getLineWidth(): null|float|int
     {
-        return $this->lineWidth;
+        return $this->lineStyleProperties['width'];
     }
 
     /**
      * Set line width for the series.
      *
-     * @param int $width
-     *
      * @return $this
      */
-    public function setLineWidth($width)
+    public function setLineWidth(null|float|int $width): static
     {
-        $minWidth = 12700;
-        $this->lineWidth = max($minWidth, $width);
+        $this->lineStyleProperties['width'] = $width;
 
         return $this;
     }
 
     /**
      * Identify if the Data Series is a multi-level or a simple series.
-     *
-     * @return null|bool
      */
-    public function isMultiLevelSeries()
+    public function isMultiLevelSeries(): ?bool
     {
-        if (count($this->dataValues) > 0) {
+        if (!empty($this->dataValues)) {
             return is_array(array_values($this->dataValues)[0]);
         }
 
@@ -297,13 +376,11 @@ public function isMultiLevelSeries()
 
     /**
      * Return the level count of a multi-level Data Series.
-     *
-     * @return int
      */
-    public function multiLevelCount()
+    public function multiLevelCount(): int
     {
         $levelCount = 0;
-        foreach ($this->dataValues as $dataValueSet) {
+        foreach (($this->dataValues ?? []) as $dataValueSet) {
             $levelCount = max($levelCount, count($dataValueSet));
         }
 
@@ -312,21 +389,20 @@ public function multiLevelCount()
 
     /**
      * Get Series Data Values.
-     *
-     * @return mixed[]
      */
-    public function getDataValues()
+    public function getDataValues(): ?array
     {
         return $this->dataValues;
     }
 
     /**
      * Get the first Series Data value.
-     *
-     * @return mixed
      */
-    public function getDataValue()
+    public function getDataValue(): mixed
     {
+        if ($this->dataValues === null) {
+            return null;
+        }
         $count = count($this->dataValues);
         if ($count == 0) {
             return null;
@@ -340,11 +416,9 @@ public function getDataValue()
     /**
      * Set Series Data Values.
      *
-     * @param array $dataValues
-     *
      * @return $this
      */
-    public function setDataValues($dataValues)
+    public function setDataValues(array $dataValues): static
     {
         $this->dataValues = Functions::flattenArray($dataValues);
         $this->pointCount = count($dataValues);
@@ -352,7 +426,7 @@ public function setDataValues($dataValues)
         return $this;
     }
 
-    public function refresh(Worksheet $worksheet, $flatten = true): void
+    public function refresh(Worksheet $worksheet, bool $flatten = true): void
     {
         if ($this->dataSource !== null) {
             $calcEngine = Calculation::getInstance($worksheet->getParent());
@@ -373,16 +447,18 @@ public function refresh(Worksheet $worksheet, $flatten = true): void
                 unset($dataValue);
             } else {
                 [$worksheet, $cellRange] = Worksheet::extractSheetTitle($this->dataSource, true);
-                $dimensions = Coordinate::rangeDimension(str_replace('$', '', $cellRange));
+                $dimensions = Coordinate::rangeDimension(str_replace('$', '', $cellRange ?? ''));
                 if (($dimensions[0] == 1) || ($dimensions[1] == 1)) {
                     $this->dataValues = Functions::flattenArray($newDataValues);
                 } else {
-                    $newArray = array_values(array_shift($newDataValues));
+                    /** @var array<int, array> */
+                    $newDataValuesx = $newDataValues;
+                    $newArray = array_values(array_shift($newDataValuesx) ?? []);
                     foreach ($newArray as $i => $newDataSet) {
                         $newArray[$i] = [$newDataSet];
                     }
 
-                    foreach ($newDataValues as $newDataSet) {
+                    foreach ($newDataValuesx as $newDataSet) {
                         $i = 0;
                         foreach ($newDataSet as $newDataVal) {
                             array_unshift($newArray[$i++], $newDataVal);
@@ -394,4 +470,102 @@ public function refresh(Worksheet $worksheet, $flatten = true): void
             $this->pointCount = count($this->dataValues);
         }
     }
+
+    public function getScatterLines(): bool
+    {
+        return $this->scatterLines;
+    }
+
+    public function setScatterLines(bool $scatterLines): self
+    {
+        $this->scatterLines = $scatterLines;
+
+        return $this;
+    }
+
+    public function getBubble3D(): bool
+    {
+        return $this->bubble3D;
+    }
+
+    public function setBubble3D(bool $bubble3D): self
+    {
+        $this->bubble3D = $bubble3D;
+
+        return $this;
+    }
+
+    /**
+     * Smooth Line. Must be specified for both DataSeries and DataSeriesValues.
+     */
+    private bool $smoothLine = false;
+
+    /**
+     * Get Smooth Line.
+     */
+    public function getSmoothLine(): bool
+    {
+        return $this->smoothLine;
+    }
+
+    /**
+     * Set Smooth Line.
+     *
+     * @return $this
+     */
+    public function setSmoothLine(bool $smoothLine): static
+    {
+        $this->smoothLine = $smoothLine;
+
+        return $this;
+    }
+
+    public function getLabelLayout(): ?Layout
+    {
+        return $this->labelLayout;
+    }
+
+    public function setLabelLayout(?Layout $labelLayout): self
+    {
+        $this->labelLayout = $labelLayout;
+
+        return $this;
+    }
+
+    public function setTrendLines(array $trendLines): self
+    {
+        $this->trendLines = $trendLines;
+
+        return $this;
+    }
+
+    public function getTrendLines(): array
+    {
+        return $this->trendLines;
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        parent::__clone();
+        $this->markerFillColor = clone $this->markerFillColor;
+        $this->markerBorderColor = clone $this->markerBorderColor;
+        if (is_array($this->fillColor)) {
+            $fillColor = $this->fillColor;
+            $this->fillColor = [];
+            foreach ($fillColor as $color) {
+                $this->fillColor[] = clone $color;
+            }
+        } elseif ($this->fillColor instanceof ChartColor) {
+            $this->fillColor = clone $this->fillColor;
+        }
+        $this->labelLayout = ($this->labelLayout === null) ? null : clone $this->labelLayout;
+        $trendLines = $this->trendLines;
+        $this->trendLines = [];
+        foreach ($trendLines as $trendLine) {
+            $this->trendLines[] = clone $trendLine;
+        }
+    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/GridLines.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/GridLines.php
index c388f2c988..8b86ccbdee 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/GridLines.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/GridLines.php
@@ -10,445 +10,4 @@
  */
 class GridLines extends Properties
 {
-    /**
-     * Properties of Class:
-     * Object State (State for Minor Tick Mark) @var bool
-     * Line Properties @var  array of mixed
-     * Shadow Properties @var  array of mixed
-     * Glow Properties @var  array of mixed
-     * Soft Properties @var  array of mixed.
-     */
-    private $objectState = false;
-
-    private $lineProperties = [
-        'color' => [
-            'type' => self::EXCEL_COLOR_TYPE_STANDARD,
-            'value' => null,
-            'alpha' => 0,
-        ],
-        'style' => [
-            'width' => '9525',
-            'compound' => self::LINE_STYLE_COMPOUND_SIMPLE,
-            'dash' => self::LINE_STYLE_DASH_SOLID,
-            'cap' => self::LINE_STYLE_CAP_FLAT,
-            'join' => self::LINE_STYLE_JOIN_BEVEL,
-            'arrow' => [
-                'head' => [
-                    'type' => self::LINE_STYLE_ARROW_TYPE_NOARROW,
-                    'size' => self::LINE_STYLE_ARROW_SIZE_5,
-                ],
-                'end' => [
-                    'type' => self::LINE_STYLE_ARROW_TYPE_NOARROW,
-                    'size' => self::LINE_STYLE_ARROW_SIZE_8,
-                ],
-            ],
-        ],
-    ];
-
-    private $shadowProperties = [
-        'presets' => self::SHADOW_PRESETS_NOSHADOW,
-        'effect' => null,
-        'color' => [
-            'type' => self::EXCEL_COLOR_TYPE_STANDARD,
-            'value' => 'black',
-            'alpha' => 85,
-        ],
-        'size' => [
-            'sx' => null,
-            'sy' => null,
-            'kx' => null,
-        ],
-        'blur' => null,
-        'direction' => null,
-        'distance' => null,
-        'algn' => null,
-        'rotWithShape' => null,
-    ];
-
-    private $glowProperties = [
-        'size' => null,
-        'color' => [
-            'type' => self::EXCEL_COLOR_TYPE_STANDARD,
-            'value' => 'black',
-            'alpha' => 40,
-        ],
-    ];
-
-    private $softEdges = [
-        'size' => null,
-    ];
-
-    /**
-     * Get Object State.
-     *
-     * @return bool
-     */
-    public function getObjectState()
-    {
-        return $this->objectState;
-    }
-
-    /**
-     * Change Object State to True.
-     *
-     * @return $this
-     */
-    private function activateObject()
-    {
-        $this->objectState = true;
-
-        return $this;
-    }
-
-    /**
-     * Set Line Color Properties.
-     *
-     * @param string $value
-     * @param int $alpha
-     * @param string $type
-     */
-    public function setLineColorProperties($value, $alpha = 0, $type = self::EXCEL_COLOR_TYPE_STANDARD): void
-    {
-        $this->activateObject()
-            ->lineProperties['color'] = $this->setColorProperties(
-                $value,
-                $alpha,
-                $type
-            );
-    }
-
-    /**
-     * Set Line Color Properties.
-     *
-     * @param float $line_width
-     * @param string $compound_type
-     * @param string $dash_type
-     * @param string $cap_type
-     * @param string $join_type
-     * @param string $head_arrow_type
-     * @param string $head_arrow_size
-     * @param string $end_arrow_type
-     * @param string $end_arrow_size
-     */
-    public function setLineStyleProperties($line_width = null, $compound_type = null, $dash_type = null, $cap_type = null, $join_type = null, $head_arrow_type = null, $head_arrow_size = null, $end_arrow_type = null, $end_arrow_size = null): void
-    {
-        $this->activateObject();
-        ($line_width !== null)
-                ? $this->lineProperties['style']['width'] = $this->getExcelPointsWidth((float) $line_width)
-                : null;
-        ($compound_type !== null)
-                ? $this->lineProperties['style']['compound'] = (string) $compound_type
-                : null;
-        ($dash_type !== null)
-                ? $this->lineProperties['style']['dash'] = (string) $dash_type
-                : null;
-        ($cap_type !== null)
-                ? $this->lineProperties['style']['cap'] = (string) $cap_type
-                : null;
-        ($join_type !== null)
-                ? $this->lineProperties['style']['join'] = (string) $join_type
-                : null;
-        ($head_arrow_type !== null)
-                ? $this->lineProperties['style']['arrow']['head']['type'] = (string) $head_arrow_type
-                : null;
-        ($head_arrow_size !== null)
-                ? $this->lineProperties['style']['arrow']['head']['size'] = (string) $head_arrow_size
-                : null;
-        ($end_arrow_type !== null)
-                ? $this->lineProperties['style']['arrow']['end']['type'] = (string) $end_arrow_type
-                : null;
-        ($end_arrow_size !== null)
-                ? $this->lineProperties['style']['arrow']['end']['size'] = (string) $end_arrow_size
-                : null;
-    }
-
-    /**
-     * Get Line Color Property.
-     *
-     * @param string $parameter
-     *
-     * @return string
-     */
-    public function getLineColorProperty($parameter)
-    {
-        return $this->lineProperties['color'][$parameter];
-    }
-
-    /**
-     * Get Line Style Property.
-     *
-     * @param array|string $elements
-     *
-     * @return string
-     */
-    public function getLineStyleProperty($elements)
-    {
-        return $this->getArrayElementsValue($this->lineProperties['style'], $elements);
-    }
-
-    /**
-     * Set Glow Properties.
-     *
-     * @param float $size
-     * @param string $color_value
-     * @param int $color_alpha
-     * @param string $color_type
-     */
-    public function setGlowProperties($size, $color_value = null, $color_alpha = null, $color_type = null): void
-    {
-        $this
-            ->activateObject()
-            ->setGlowSize($size)
-            ->setGlowColor($color_value, $color_alpha, $color_type);
-    }
-
-    /**
-     * Get Glow Color Property.
-     *
-     * @param string $property
-     *
-     * @return string
-     */
-    public function getGlowColor($property)
-    {
-        return $this->glowProperties['color'][$property];
-    }
-
-    /**
-     * Get Glow Size.
-     *
-     * @return string
-     */
-    public function getGlowSize()
-    {
-        return $this->glowProperties['size'];
-    }
-
-    /**
-     * Set Glow Size.
-     *
-     * @param float $size
-     *
-     * @return $this
-     */
-    private function setGlowSize($size)
-    {
-        $this->glowProperties['size'] = $this->getExcelPointsWidth((float) $size);
-
-        return $this;
-    }
-
-    /**
-     * Set Glow Color.
-     *
-     * @param string $color
-     * @param int $alpha
-     * @param string $type
-     *
-     * @return $this
-     */
-    private function setGlowColor($color, $alpha, $type)
-    {
-        if ($color !== null) {
-            $this->glowProperties['color']['value'] = (string) $color;
-        }
-        if ($alpha !== null) {
-            $this->glowProperties['color']['alpha'] = $this->getTrueAlpha((int) $alpha);
-        }
-        if ($type !== null) {
-            $this->glowProperties['color']['type'] = (string) $type;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get Line Style Arrow Parameters.
-     *
-     * @param string $arrow_selector
-     * @param string $property_selector
-     *
-     * @return string
-     */
-    public function getLineStyleArrowParameters($arrow_selector, $property_selector)
-    {
-        return $this->getLineStyleArrowSize($this->lineProperties['style']['arrow'][$arrow_selector]['size'], $property_selector);
-    }
-
-    /**
-     * Set Shadow Properties.
-     *
-     * @param int $sh_presets
-     * @param string $sh_color_value
-     * @param string $sh_color_type
-     * @param int $sh_color_alpha
-     * @param string $sh_blur
-     * @param int $sh_angle
-     * @param float $sh_distance
-     */
-    public function setShadowProperties($sh_presets, $sh_color_value = null, $sh_color_type = null, $sh_color_alpha = null, $sh_blur = null, $sh_angle = null, $sh_distance = null): void
-    {
-        $this->activateObject()
-            ->setShadowPresetsProperties((int) $sh_presets)
-            ->setShadowColor(
-                $sh_color_value ?? $this->shadowProperties['color']['value'],
-                $sh_color_alpha === null ? (int) $this->shadowProperties['color']['alpha'] : $this->getTrueAlpha($sh_color_alpha),
-                $sh_color_type ?? $this->shadowProperties['color']['type']
-            )
-            ->setShadowBlur($sh_blur)
-            ->setShadowAngle($sh_angle)
-            ->setShadowDistance($sh_distance);
-    }
-
-    /**
-     * Set Shadow Presets Properties.
-     *
-     * @param int $shadow_presets
-     *
-     * @return $this
-     */
-    private function setShadowPresetsProperties($shadow_presets)
-    {
-        $this->shadowProperties['presets'] = $shadow_presets;
-        $this->setShadowProperiesMapValues($this->getShadowPresetsMap($shadow_presets));
-
-        return $this;
-    }
-
-    /**
-     * Set Shadow Properties Values.
-     *
-     * @param mixed $reference
-     *
-     * @return $this
-     */
-    private function setShadowProperiesMapValues(array $properties_map, &$reference = null)
-    {
-        $base_reference = $reference;
-        foreach ($properties_map as $property_key => $property_val) {
-            if (is_array($property_val)) {
-                if ($reference === null) {
-                    $reference = &$this->shadowProperties[$property_key];
-                } else {
-                    $reference = &$reference[$property_key];
-                }
-                $this->setShadowProperiesMapValues($property_val, $reference);
-            } else {
-                if ($base_reference === null) {
-                    $this->shadowProperties[$property_key] = $property_val;
-                } else {
-                    $reference[$property_key] = $property_val;
-                }
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set Shadow Color.
-     *
-     * @param string $color
-     * @param int $alpha
-     * @param string $type
-     *
-     * @return $this
-     */
-    private function setShadowColor($color, $alpha, $type)
-    {
-        if ($color !== null) {
-            $this->shadowProperties['color']['value'] = (string) $color;
-        }
-        if ($alpha !== null) {
-            $this->shadowProperties['color']['alpha'] = $this->getTrueAlpha((int) $alpha);
-        }
-        if ($type !== null) {
-            $this->shadowProperties['color']['type'] = (string) $type;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set Shadow Blur.
-     *
-     * @param float $blur
-     *
-     * @return $this
-     */
-    private function setShadowBlur($blur)
-    {
-        if ($blur !== null) {
-            $this->shadowProperties['blur'] = (string) $this->getExcelPointsWidth($blur);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set Shadow Angle.
-     *
-     * @param int $angle
-     *
-     * @return $this
-     */
-    private function setShadowAngle($angle)
-    {
-        if ($angle !== null) {
-            $this->shadowProperties['direction'] = (string) $this->getExcelPointsAngle($angle);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set Shadow Distance.
-     *
-     * @param float $distance
-     *
-     * @return $this
-     */
-    private function setShadowDistance($distance)
-    {
-        if ($distance !== null) {
-            $this->shadowProperties['distance'] = (string) $this->getExcelPointsWidth($distance);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get Shadow Property.
-     *
-     * @param string|string[] $elements
-     *
-     * @return string
-     */
-    public function getShadowProperty($elements)
-    {
-        return $this->getArrayElementsValue($this->shadowProperties, $elements);
-    }
-
-    /**
-     * Set Soft Edges Size.
-     *
-     * @param float $size
-     */
-    public function setSoftEdgesSize($size): void
-    {
-        if ($size !== null) {
-            $this->activateObject();
-            $this->softEdges['size'] = (string) $this->getExcelPointsWidth($size);
-        }
-    }
-
-    /**
-     * Get Soft Edges Size.
-     *
-     * @return string
-     */
-    public function getSoftEdgesSize()
-    {
-        return $this->softEdges['size'];
-    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Layout.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Layout.php
index 51c8995b06..570892ec15 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Layout.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Layout.php
@@ -2,111 +2,102 @@
 
 namespace PhpOffice\PhpSpreadsheet\Chart;
 
+use PhpOffice\PhpSpreadsheet\Style\Font;
+
 class Layout
 {
     /**
      * layoutTarget.
-     *
-     * @var string
      */
-    private $layoutTarget;
+    private ?string $layoutTarget = null;
 
     /**
      * X Mode.
-     *
-     * @var string
      */
-    private $xMode;
+    private ?string $xMode = null;
 
     /**
      * Y Mode.
-     *
-     * @var string
      */
-    private $yMode;
+    private ?string $yMode = null;
 
     /**
      * X-Position.
-     *
-     * @var float
      */
-    private $xPos;
+    private ?float $xPos = null;
 
     /**
      * Y-Position.
-     *
-     * @var float
      */
-    private $yPos;
+    private ?float $yPos = null;
 
     /**
      * width.
-     *
-     * @var float
      */
-    private $width;
+    private ?float $width = null;
 
     /**
      * height.
-     *
-     * @var float
      */
-    private $height;
+    private ?float $height = null;
+
+    /**
+     * Position - t=top.
+     */
+    private string $dLblPos = '';
+
+    private string $numFmtCode = '';
+
+    private bool $numFmtLinked = false;
 
     /**
      * show legend key
      * Specifies that legend keys should be shown in data labels.
-     *
-     * @var bool
      */
-    private $showLegendKey;
+    private ?bool $showLegendKey = null;
 
     /**
      * show value
      * Specifies that the value should be shown in a data label.
-     *
-     * @var bool
      */
-    private $showVal;
+    private ?bool $showVal = null;
 
     /**
      * show category name
      * Specifies that the category name should be shown in the data label.
-     *
-     * @var bool
      */
-    private $showCatName;
+    private ?bool $showCatName = null;
 
     /**
      * show data series name
      * Specifies that the series name should be shown in the data label.
-     *
-     * @var bool
      */
-    private $showSerName;
+    private ?bool $showSerName = null;
 
     /**
      * show percentage
      * Specifies that the percentage should be shown in the data label.
-     *
-     * @var bool
      */
-    private $showPercent;
+    private ?bool $showPercent = null;
 
     /**
      * show bubble size.
-     *
-     * @var bool
      */
-    private $showBubbleSize;
+    private ?bool $showBubbleSize = null;
 
     /**
      * show leader lines
      * Specifies that leader lines should be shown for the data label.
-     *
-     * @var bool
      */
-    private $showLeaderLines;
+    private ?bool $showLeaderLines = null;
+
+    private ?ChartColor $labelFillColor = null;
+
+    private ?ChartColor $labelBorderColor = null;
+
+    private ?Font $labelFont = null;
+
+    private ?Properties $labelEffects = null;
 
     /**
      * Create a new Layout.
@@ -134,14 +125,54 @@ public function __construct(array $layout = [])
         if (isset($layout['h'])) {
             $this->height = (float) $layout['h'];
         }
+        if (isset($layout['dLblPos'])) {
+            $this->dLblPos = (string) $layout['dLblPos'];
+        }
+        if (isset($layout['numFmtCode'])) {
+            $this->numFmtCode = (string) $layout['numFmtCode'];
+        }
+        $this->initBoolean($layout, 'showLegendKey');
+        $this->initBoolean($layout, 'showVal');
+        $this->initBoolean($layout, 'showCatName');
+        $this->initBoolean($layout, 'showSerName');
+        $this->initBoolean($layout, 'showPercent');
+        $this->initBoolean($layout, 'showBubbleSize');
+        $this->initBoolean($layout, 'showLeaderLines');
+        $this->initBoolean($layout, 'numFmtLinked');
+        $this->initColor($layout, 'labelFillColor');
+        $this->initColor($layout, 'labelBorderColor');
+        $labelFont = $layout['labelFont'] ?? null;
+        if ($labelFont instanceof Font) {
+            $this->labelFont = $labelFont;
+        }
+        $labelFontColor = $layout['labelFontColor'] ?? null;
+        if ($labelFontColor instanceof ChartColor) {
+            $this->setLabelFontColor($labelFontColor);
+        }
+        $labelEffects = $layout['labelEffects'] ?? null;
+        if ($labelEffects instanceof Properties) {
+            $this->labelEffects = $labelEffects;
+        }
+    }
+
+    private function initBoolean(array $layout, string $name): void
+    {
+        if (isset($layout[$name])) {
+            $this->$name = (bool) $layout[$name];
+        }
+    }
+
+    private function initColor(array $layout, string $name): void
+    {
+        if (isset($layout[$name]) && $layout[$name] instanceof ChartColor) {
+            $this->$name = $layout[$name];
+        }
     }
 
     /**
      * Get Layout Target.
-     *
-     * @return string
      */
-    public function getLayoutTarget()
+    public function getLayoutTarget(): ?string
     {
         return $this->layoutTarget;
     }
@@ -149,23 +180,19 @@ public function getLayoutTarget()
     /**
      * Set Layout Target.
      *
-     * @param string $value
-     *
      * @return $this
      */
-    public function setLayoutTarget($value)
+    public function setLayoutTarget(?string $target): static
     {
-        $this->layoutTarget = $value;
+        $this->layoutTarget = $target;
 
         return $this;
     }
 
     /**
      * Get X-Mode.
-     *
-     * @return string
      */
-    public function getXMode()
+    public function getXMode(): ?string
     {
         return $this->xMode;
     }
@@ -173,23 +200,19 @@ public function getXMode()
     /**
      * Set X-Mode.
      *
-     * @param string $value
-     *
      * @return $this
      */
-    public function setXMode($value)
+    public function setXMode(?string $mode): static
     {
-        $this->xMode = (string) $value;
+        $this->xMode = (string) $mode;
 
         return $this;
     }
 
     /**
      * Get Y-Mode.
-     *
-     * @return string
      */
-    public function getYMode()
+    public function getYMode(): ?string
     {
         return $this->yMode;
     }
@@ -197,23 +220,19 @@ public function getYMode()
     /**
      * Set Y-Mode.
      *
-     * @param string $value
-     *
      * @return $this
      */
-    public function setYMode($value)
+    public function setYMode(?string $mode): static
     {
-        $this->yMode = (string) $value;
+        $this->yMode = (string) $mode;
 
         return $this;
     }
 
     /**
      * Get X-Position.
-     *
-     * @return number
      */
-    public function getXPosition()
+    public function getXPosition(): null|float|int
     {
         return $this->xPos;
     }
@@ -221,23 +240,19 @@ public function getXPosition()
     /**
      * Set X-Position.
      *
-     * @param float $value
-     *
      * @return $this
      */
-    public function setXPosition($value)
+    public function setXPosition(float $position): static
     {
-        $this->xPos = (float) $value;
+        $this->xPos = $position;
 
         return $this;
     }
 
     /**
      * Get Y-Position.
-     *
-     * @return number
      */
-    public function getYPosition()
+    public function getYPosition(): ?float
     {
         return $this->yPos;
     }
@@ -245,23 +260,19 @@ public function getYPosition()
     /**
      * Set Y-Position.
      *
-     * @param float $value
-     *
      * @return $this
      */
-    public function setYPosition($value)
+    public function setYPosition(float $position): static
     {
-        $this->yPos = (float) $value;
+        $this->yPos = $position;
 
         return $this;
     }
 
     /**
      * Get Width.
-     *
-     * @return number
      */
-    public function getWidth()
+    public function getWidth(): ?float
     {
         return $this->width;
     }
@@ -269,23 +280,19 @@ public function getWidth()
     /**
      * Set Width.
      *
-     * @param float $value
-     *
      * @return $this
      */
-    public function setWidth($value)
+    public function setWidth(?float $width): static
     {
-        $this->width = $value;
+        $this->width = $width;
 
         return $this;
     }
 
     /**
      * Get Height.
-     *
-     * @return number
      */
-    public function getHeight()
+    public function getHeight(): ?float
     {
         return $this->height;
     }
@@ -293,23 +300,16 @@ public function getHeight()
     /**
      * Set Height.
      *
-     * @param float $value
-     *
      * @return $this
      */
-    public function setHeight($value)
+    public function setHeight(?float $height): static
     {
-        $this->height = $value;
+        $this->height = $height;
 
         return $this;
     }
 
-    /**
-     * Get show legend key.
-     *
-     * @return bool
-     */
-    public function getShowLegendKey()
+    public function getShowLegendKey(): ?bool
     {
         return $this->showLegendKey;
     }
@@ -317,24 +317,15 @@ public function getShowLegendKey()
     /**
      * Set show legend key
      * Specifies that legend keys should be shown in data labels.
-     *
-     * @param bool $value Show legend key
-     *
-     * @return $this
      */
-    public function setShowLegendKey($value)
+    public function setShowLegendKey(?bool $showLegendKey): self
     {
-        $this->showLegendKey = $value;
+        $this->showLegendKey = $showLegendKey;
 
         return $this;
     }
 
-    /**
-     * Get show value.
-     *
-     * @return bool
-     */
-    public function getShowVal()
+    public function getShowVal(): ?bool
     {
         return $this->showVal;
     }
@@ -342,24 +333,15 @@ public function getShowVal()
     /**
      * Set show val
      * Specifies that the value should be shown in data labels.
-     *
-     * @param bool $value Show val
-     *
-     * @return $this
      */
-    public function setShowVal($value)
+    public function setShowVal(?bool $showDataLabelValues): self
     {
-        $this->showVal = $value;
+        $this->showVal = $showDataLabelValues;
 
         return $this;
     }
 
-    /**
-     * Get show category name.
-     *
-     * @return bool
-     */
-    public function getShowCatName()
+    public function getShowCatName(): ?bool
     {
         return $this->showCatName;
     }
@@ -367,115 +349,176 @@ public function getShowCatName()
     /**
      * Set show cat name
      * Specifies that the category name should be shown in data labels.
-     *
-     * @param bool $value Show cat name
-     *
-     * @return $this
      */
-    public function setShowCatName($value)
+    public function setShowCatName(?bool $showCategoryName): self
     {
-        $this->showCatName = $value;
+        $this->showCatName = $showCategoryName;
 
         return $this;
     }
 
-    /**
-     * Get show data series name.
-     *
-     * @return bool
-     */
-    public function getShowSerName()
+    public function getShowSerName(): ?bool
     {
         return $this->showSerName;
     }
 
     /**
-     * Set show ser name
+     * Set show data series name.
      * Specifies that the series name should be shown in data labels.
-     *
-     * @param bool $value Show series name
-     *
-     * @return $this
      */
-    public function setShowSerName($value)
+    public function setShowSerName(?bool $showSeriesName): self
     {
-        $this->showSerName = $value;
+        $this->showSerName = $showSeriesName;
 
         return $this;
     }
 
-    /**
-     * Get show percentage.
-     *
-     * @return bool
-     */
-    public function getShowPercent()
+    public function getShowPercent(): ?bool
     {
         return $this->showPercent;
     }
 
     /**
-     * Set show percentage
+     * Set show percentage.
      * Specifies that the percentage should be shown in data labels.
-     *
-     * @param bool $value Show percentage
-     *
-     * @return $this
      */
-    public function setShowPercent($value)
+    public function setShowPercent(?bool $showPercentage): self
     {
-        $this->showPercent = $value;
+        $this->showPercent = $showPercentage;
 
         return $this;
     }
 
-    /**
-     * Get show bubble size.
-     *
-     * @return bool
-     */
-    public function getShowBubbleSize()
+    public function getShowBubbleSize(): ?bool
     {
         return $this->showBubbleSize;
     }
 
     /**
-     * Set show bubble size
+     * Set show bubble size.
      * Specifies that the bubble size should be shown in data labels.
-     *
-     * @param bool $value Show bubble size
-     *
-     * @return $this
      */
-    public function setShowBubbleSize($value)
+    public function setShowBubbleSize(?bool $showBubbleSize): self
     {
-        $this->showBubbleSize = $value;
+        $this->showBubbleSize = $showBubbleSize;
 
         return $this;
     }
 
-    /**
-     * Get show leader lines.
-     *
-     * @return bool
-     */
-    public function getShowLeaderLines()
+    public function getShowLeaderLines(): ?bool
     {
         return $this->showLeaderLines;
     }
 
     /**
-     * Set show leader lines
+     * Set show leader lines.
      * Specifies that leader lines should be shown in data labels.
-     *
-     * @param bool $value Show leader lines
-     *
-     * @return $this
      */
-    public function setShowLeaderLines($value)
+    public function setShowLeaderLines(?bool $showLeaderLines): self
     {
-        $this->showLeaderLines = $value;
+        $this->showLeaderLines = $showLeaderLines;
 
         return $this;
     }
+
+    public function getLabelFillColor(): ?ChartColor
+    {
+        return $this->labelFillColor;
+    }
+
+    public function setLabelFillColor(?ChartColor $chartColor): self
+    {
+        $this->labelFillColor = $chartColor;
+
+        return $this;
+    }
+
+    public function getLabelBorderColor(): ?ChartColor
+    {
+        return $this->labelBorderColor;
+    }
+
+    public function setLabelBorderColor(?ChartColor $chartColor): self
+    {
+        $this->labelBorderColor = $chartColor;
+
+        return $this;
+    }
+
+    public function getLabelFont(): ?Font
+    {
+        return $this->labelFont;
+    }
+
+    public function getLabelEffects(): ?Properties
+    {
+        return $this->labelEffects;
+    }
+
+    public function getLabelFontColor(): ?ChartColor
+    {
+        if ($this->labelFont === null) {
+            return null;
+        }
+
+        return $this->labelFont->getChartColor();
+    }
+
+    public function setLabelFontColor(?ChartColor $chartColor): self
+    {
+        if ($this->labelFont === null) {
+            $this->labelFont = new Font();
+            $this->labelFont->setSize(null, true);
+        }
+        $this->labelFont->setChartColorFromObject($chartColor);
+
+        return $this;
+    }
+
+    public function getDLblPos(): string
+    {
+        return $this->dLblPos;
+    }
+
+    public function setDLblPos(string $dLblPos): self
+    {
+        $this->dLblPos = $dLblPos;
+
+        return $this;
+    }
+
+    public function getNumFmtCode(): string
+    {
+        return $this->numFmtCode;
+    }
+
+    public function setNumFmtCode(string $numFmtCode): self
+    {
+        $this->numFmtCode = $numFmtCode;
+
+        return $this;
+    }
+
+    public function getNumFmtLinked(): bool
+    {
+        return $this->numFmtLinked;
+    }
+
+    public function setNumFmtLinked(bool $numFmtLinked): self
+    {
+        $this->numFmtLinked = $numFmtLinked;
+
+        return $this;
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $this->labelFillColor = ($this->labelFillColor === null) ? null : clone $this->labelFillColor;
+        $this->labelBorderColor = ($this->labelBorderColor === null) ? null : clone $this->labelBorderColor;
+        $this->labelFont = ($this->labelFont === null) ? null : clone $this->labelFont;
+        $this->labelEffects = ($this->labelEffects === null) ? null : clone $this->labelEffects;
+    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Legend.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Legend.php
index 2f003cd87b..7736fb7a35 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Legend.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Legend.php
@@ -18,7 +18,7 @@ class Legend
     const POSITION_TOP = 't';
     const POSITION_TOPRIGHT = 'tr';
 
-    private static $positionXLref = [
+    const POSITION_XLREF = [
         self::XL_LEGEND_POSITION_BOTTOM => self::POSITION_BOTTOM,
         self::XL_LEGEND_POSITION_CORNER => self::POSITION_TOPRIGHT,
         self::XL_LEGEND_POSITION_CUSTOM => '??',
@@ -29,44 +29,46 @@ class Legend
 
     /**
      * Legend position.
-     *
-     * @var string
      */
-    private $position = self::POSITION_RIGHT;
+    private string $position = self::POSITION_RIGHT;
 
     /**
      * Allow overlay of other elements?
-     *
-     * @var bool
      */
-    private $overlay = true;
+    private bool $overlay = true;
 
     /**
      * Legend Layout.
-     *
-     * @var Layout
      */
-    private $layout;
+    private ?Layout $layout;
+
+    private GridLines $borderLines;
+
+    private ChartColor $fillColor;
+
+    private ?AxisText $legendText = null;
 
     /**
      * Create a new Legend.
-     *
-     * @param string $position
-     * @param bool $overlay
      */
-    public function __construct($position = self::POSITION_RIGHT, ?Layout $layout = null, $overlay = false)
+    public function __construct(string $position = self::POSITION_RIGHT, ?Layout $layout = null, bool $overlay = false)
     {
         $this->setPosition($position);
         $this->layout = $layout;
         $this->setOverlay($overlay);
+        $this->borderLines = new GridLines();
+        $this->fillColor = new ChartColor();
+    }
+
+    public function getFillColor(): ChartColor
+    {
+        return $this->fillColor;
     }
 
     /**
      * Get legend position as an excel string value.
-     *
-     * @return string
      */
-    public function getPosition()
+    public function getPosition(): string
     {
         return $this->position;
     }
@@ -75,12 +77,10 @@ public function getPosition()
      * Get legend position using an excel string value.
      *
      * @param string $position see self::POSITION_*
-     *
-     * @return bool
      */
-    public function setPosition($position)
+    public function setPosition(string $position): bool
     {
-        if (!in_array($position, self::$positionXLref)) {
+        if (!in_array($position, self::POSITION_XLREF)) {
             return false;
         }
 
@@ -91,59 +91,84 @@ public function setPosition($position)
 
     /**
      * Get legend position as an Excel internal numeric value.
-     *
-     * @return int
      */
-    public function getPositionXL()
+    public function getPositionXL(): false|int
     {
-        return array_search($this->position, self::$positionXLref);
+        return array_search($this->position, self::POSITION_XLREF);
     }
 
     /**
      * Set legend position using an Excel internal numeric value.
      *
      * @param int $positionXL see self::XL_LEGEND_POSITION_*
-     *
-     * @return bool
      */
-    public function setPositionXL($positionXL)
+    public function setPositionXL(int $positionXL): bool
     {
-        if (!isset(self::$positionXLref[$positionXL])) {
+        if (!isset(self::POSITION_XLREF[$positionXL])) {
             return false;
         }
 
-        $this->position = self::$positionXLref[$positionXL];
+        $this->position = self::POSITION_XLREF[$positionXL];
 
         return true;
     }
 
     /**
      * Get allow overlay of other elements?
-     *
-     * @return bool
      */
-    public function getOverlay()
+    public function getOverlay(): bool
     {
         return $this->overlay;
     }
 
     /**
      * Set allow overlay of other elements?
-     *
-     * @param bool $overlay
      */
-    public function setOverlay($overlay): void
+    public function setOverlay(bool $overlay): void
     {
         $this->overlay = $overlay;
     }
 
     /**
      * Get Layout.
-     *
-     * @return Layout
      */
-    public function getLayout()
+    public function getLayout(): ?Layout
     {
         return $this->layout;
     }
+
+    public function getLegendText(): ?AxisText
+    {
+        return $this->legendText;
+    }
+
+    public function setLegendText(?AxisText $legendText): self
+    {
+        $this->legendText = $legendText;
+
+        return $this;
+    }
+
+    public function getBorderLines(): GridLines
+    {
+        return $this->borderLines;
+    }
+
+    public function setBorderLines(GridLines $borderLines): self
+    {
+        $this->borderLines = $borderLines;
+
+        return $this;
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $this->layout = ($this->layout === null) ? null : clone $this->layout;
+        $this->legendText = ($this->legendText === null) ? null : clone $this->legendText;
+        $this->borderLines = clone $this->borderLines;
+        $this->fillColor = clone $this->fillColor;
+    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/PlotArea.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/PlotArea.php
index ecb7b6c91e..228afad482 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/PlotArea.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/PlotArea.php
@@ -7,18 +7,36 @@
 class PlotArea
 {
     /**
-     * PlotArea Layout.
+     * No fill in plot area (show Excel gridlines through chart).
+     */
+    private bool $noFill = false;
+
+    /**
+     * PlotArea Gradient Stop list.
+     * Each entry is a 2-element array.
+     *     First is position in %.
+     *     Second is ChartColor.
      *
-     * @var Layout
+     * @var array[]
+     */
+    private array $gradientFillStops = [];
+
+    /**
+     * PlotArea Gradient Angle.
      */
-    private $layout;
+    private ?float $gradientFillAngle = null;
+
+    /**
+     * PlotArea Layout.
+     */
+    private ?Layout $layout;
 
     /**
      * Plot Series.
      *
      * @var DataSeries[]
      */
-    private $plotSeries = [];
+    private array $plotSeries;
 
     /**
      * Create a new PlotArea.
@@ -31,12 +49,7 @@ public function __construct(?Layout $layout = null, array $plotSeries = [])
         $this->plotSeries = $plotSeries;
     }
 
-    /**
-     * Get Layout.
-     *
-     * @return Layout
-     */
-    public function getLayout()
+    public function getLayout(): ?Layout
     {
         return $this->layout;
     }
@@ -51,10 +64,8 @@ public function getPlotGroupCount(): int
 
     /**
      * Get Number of Plot Series.
-     *
-     * @return int
      */
-    public function getPlotSeriesCount()
+    public function getPlotSeriesCount(): int|float
     {
         $seriesCount = 0;
         foreach ($this->plotSeries as $plot) {
@@ -69,19 +80,15 @@ public function getPlotSeriesCount()
      *
      * @return DataSeries[]
      */
-    public function getPlotGroup()
+    public function getPlotGroup(): array
     {
         return $this->plotSeries;
     }
 
     /**
      * Get Plot Series by Index.
-     *
-     * @param mixed $index
-     *
-     * @return DataSeries
      */
-    public function getPlotGroupByIndex($index)
+    public function getPlotGroupByIndex(int $index): DataSeries
     {
         return $this->plotSeries[$index];
     }
@@ -93,7 +100,7 @@ public function getPlotGroupByIndex($index)
      *
      * @return $this
      */
-    public function setPlotSeries(array $plotSeries)
+    public function setPlotSeries(array $plotSeries): static
     {
         $this->plotSeries = $plotSeries;
 
@@ -106,4 +113,95 @@ public function refresh(Worksheet $worksheet): void
             $plotSeries->refresh($worksheet);
         }
     }
+
+    public function setNoFill(bool $noFill): self
+    {
+        $this->noFill = $noFill;
+
+        return $this;
+    }
+
+    public function getNoFill(): bool
+    {
+        return $this->noFill;
+    }
+
+    public function setGradientFillProperties(array $gradientFillStops, ?float $gradientFillAngle): self
+    {
+        $this->gradientFillStops = $gradientFillStops;
+        $this->gradientFillAngle = $gradientFillAngle;
+
+        return $this;
+    }
+
+    /**
+     * Get gradientFillAngle.
+     */
+    public function getGradientFillAngle(): ?float
+    {
+        return $this->gradientFillAngle;
+    }
+
+    /**
+     * Get gradientFillStops.
+     */
+    public function getGradientFillStops(): array
+    {
+        return $this->gradientFillStops;
+    }
+
+    private ?int $gapWidth = null;
+
+    private bool $useUpBars = false;
+
+    private bool $useDownBars = false;
+
+    public function getGapWidth(): ?int
+    {
+        return $this->gapWidth;
+    }
+
+    public function setGapWidth(?int $gapWidth): self
+    {
+        $this->gapWidth = $gapWidth;
+
+        return $this;
+    }
+
+    public function getUseUpBars(): bool
+    {
+        return $this->useUpBars;
+    }
+
+    public function setUseUpBars(bool $useUpBars): self
+    {
+        $this->useUpBars = $useUpBars;
+
+        return $this;
+    }
+
+    public function getUseDownBars(): bool
+    {
+        return $this->useDownBars;
+    }
+
+    public function setUseDownBars(bool $useDownBars): self
+    {
+        $this->useDownBars = $useDownBars;
+
+        return $this;
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $this->layout = ($this->layout === null) ? null : clone $this->layout;
+        $plotSeries = $this->plotSeries;
+        $this->plotSeries = [];
+        foreach ($plotSeries as $series) {
+            $this->plotSeries[] = clone $series;
+        }
+    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Properties.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Properties.php
index 98095f0d13..3e02a964fc 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Properties.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Properties.php
@@ -10,33 +10,25 @@
  */
 abstract class Properties
 {
-    const
-        EXCEL_COLOR_TYPE_STANDARD = 'prstClr';
-    const EXCEL_COLOR_TYPE_SCHEME = 'schemeClr';
-    const EXCEL_COLOR_TYPE_ARGB = 'srgbClr';
-
-    const
-        AXIS_LABELS_LOW = 'low';
+    const AXIS_LABELS_LOW = 'low';
     const AXIS_LABELS_HIGH = 'high';
     const AXIS_LABELS_NEXT_TO = 'nextTo';
     const AXIS_LABELS_NONE = 'none';
 
-    const
-        TICK_MARK_NONE = 'none';
+    const TICK_MARK_NONE = 'none';
     const TICK_MARK_INSIDE = 'in';
     const TICK_MARK_OUTSIDE = 'out';
     const TICK_MARK_CROSS = 'cross';
 
-    const
-        HORIZONTAL_CROSSES_AUTOZERO = 'autoZero';
+    const HORIZONTAL_CROSSES_AUTOZERO = 'autoZero';
     const HORIZONTAL_CROSSES_MAXIMUM = 'max';
 
-    const
-        FORMAT_CODE_GENERAL = 'General';
+    const FORMAT_CODE_GENERAL = 'General';
     const FORMAT_CODE_NUMBER = '#,##0.00';
     const FORMAT_CODE_CURRENCY = '$#,##0.00';
     const FORMAT_CODE_ACCOUNTING = '_($* #,##0.00_);_($* (#,##0.00);_($* "-"??_);_(@_)';
     const FORMAT_CODE_DATE = 'm/d/yyyy';
+    const FORMAT_CODE_DATE_ISO8601 = 'yyyy-mm-dd';
     const FORMAT_CODE_TIME = '[$-F400]h:mm:ss AM/PM';
     const FORMAT_CODE_PERCENTAGE = '0.00%';
     const FORMAT_CODE_FRACTION = '# ?/?';
@@ -44,19 +36,17 @@ abstract class Properties
     const FORMAT_CODE_TEXT = '@';
     const FORMAT_CODE_SPECIAL = '00000';
 
-    const
-        ORIENTATION_NORMAL = 'minMax';
+    const ORIENTATION_NORMAL = 'minMax';
     const ORIENTATION_REVERSED = 'maxMin';
 
-    const
-        LINE_STYLE_COMPOUND_SIMPLE = 'sng';
+    const LINE_STYLE_COMPOUND_SIMPLE = 'sng';
     const LINE_STYLE_COMPOUND_DOUBLE = 'dbl';
     const LINE_STYLE_COMPOUND_THICKTHIN = 'thickThin';
     const LINE_STYLE_COMPOUND_THINTHICK = 'thinThick';
     const LINE_STYLE_COMPOUND_TRIPLE = 'tri';
     const LINE_STYLE_DASH_SOLID = 'solid';
     const LINE_STYLE_DASH_ROUND_DOT = 'sysDot';
-    const LINE_STYLE_DASH_SQUERE_DOT = 'sysDash';
+    const LINE_STYLE_DASH_SQUARE_DOT = 'sysDash';
     const LINE_STYPE_DASH_DASH = 'dash';
     const LINE_STYLE_DASH_DASH_DOT = 'dashDot';
     const LINE_STYLE_DASH_LONG_DASH = 'lgDash';
@@ -65,7 +55,7 @@ abstract class Properties
     const LINE_STYLE_CAP_SQUARE = 'sq';
     const LINE_STYLE_CAP_ROUND = 'rnd';
     const LINE_STYLE_CAP_FLAT = 'flat';
-    const LINE_STYLE_JOIN_ROUND = 'bevel';
+    const LINE_STYLE_JOIN_ROUND = 'round';
     const LINE_STYLE_JOIN_MITER = 'miter';
     const LINE_STYLE_JOIN_BEVEL = 'bevel';
     const LINE_STYLE_ARROW_TYPE_NOARROW = null;
@@ -84,8 +74,7 @@ abstract class Properties
     const LINE_STYLE_ARROW_SIZE_8 = 8;
     const LINE_STYLE_ARROW_SIZE_9 = 9;
 
-    const
-        SHADOW_PRESETS_NOSHADOW = null;
+    const SHADOW_PRESETS_NOSHADOW = null;
     const SHADOW_PRESETS_OUTER_BOTTTOM_RIGHT = 1;
     const SHADOW_PRESETS_OUTER_BOTTOM = 2;
     const SHADOW_PRESETS_OUTER_BOTTOM_LEFT = 3;
@@ -110,250 +99,310 @@ abstract class Properties
     const SHADOW_PRESETS_PERSPECTIVE_LOWER_RIGHT = 22;
     const SHADOW_PRESETS_PERSPECTIVE_LOWER_LEFT = 23;
 
+    const POINTS_WIDTH_MULTIPLIER = 12700;
+    const ANGLE_MULTIPLIER = 60000; // direction and size-kx size-ky
+    const PERCENTAGE_MULTIPLIER = 100000; // size sx and sy
+
+    protected bool $objectState = false; // used only for minor gridlines
+
+    protected ?float $glowSize = null;
+
+    protected ChartColor $glowColor;
+
+    protected array $softEdges = [
+        'size' => null,
+    ];
+
+    protected array $shadowProperties = self::PRESETS_OPTIONS[0];
+
+    protected ChartColor $shadowColor;
+
+    public function __construct()
+    {
+        $this->lineColor = new ChartColor();
+        $this->glowColor = new ChartColor();
+        $this->shadowColor = new ChartColor();
+        $this->shadowColor->setType(ChartColor::EXCEL_COLOR_TYPE_STANDARD);
+        $this->shadowColor->setValue('black');
+        $this->shadowColor->setAlpha(40);
+    }
+
     /**
-     * @param float $width
-     *
-     * @return float
+     * Get Object State.
      */
-    protected function getExcelPointsWidth($width)
+    public function getObjectState(): bool
     {
-        return $width * 12700;
+        return $this->objectState;
     }
 
     /**
-     * @param float $angle
+     * Change Object State to True.
      *
-     * @return float
+     * @return $this
      */
-    protected function getExcelPointsAngle($angle)
+    public function activateObject()
     {
-        return $angle * 60000;
+        $this->objectState = true;
+
+        return $this;
     }
 
-    protected function getTrueAlpha($alpha)
+    public static function pointsToXml(float $width): string
     {
-        return (string) 100 - $alpha . '000';
+        return (string) (int) ($width * self::POINTS_WIDTH_MULTIPLIER);
     }
 
-    protected function setColorProperties($color, $alpha, $type)
+    public static function xmlToPoints(string $width): float
     {
-        return [
-            'type' => (string) $type,
-            'value' => (string) $color,
-            'alpha' => (string) $this->getTrueAlpha($alpha),
-        ];
+        return ((float) $width) / self::POINTS_WIDTH_MULTIPLIER;
     }
 
-    protected function getLineStyleArrowSize($array_selector, $array_kay_selector)
+    public static function angleToXml(float $angle): string
     {
-        $sizes = [
-            1 => ['w' => 'sm', 'len' => 'sm'],
-            2 => ['w' => 'sm', 'len' => 'med'],
-            3 => ['w' => 'sm', 'len' => 'lg'],
-            4 => ['w' => 'med', 'len' => 'sm'],
-            5 => ['w' => 'med', 'len' => 'med'],
-            6 => ['w' => 'med', 'len' => 'lg'],
-            7 => ['w' => 'lg', 'len' => 'sm'],
-            8 => ['w' => 'lg', 'len' => 'med'],
-            9 => ['w' => 'lg', 'len' => 'lg'],
-        ];
+        return (string) (int) ($angle * self::ANGLE_MULTIPLIER);
+    }
 
-        return $sizes[$array_selector][$array_kay_selector];
+    public static function xmlToAngle(string $angle): float
+    {
+        return ((float) $angle) / self::ANGLE_MULTIPLIER;
     }
 
-    protected function getShadowPresetsMap($shadow_presets_option)
+    public static function tenthOfPercentToXml(float $value): string
     {
-        $presets_options = [
-            //OUTER
-            1 => [
-                'effect' => 'outerShdw',
-                'blur' => '50800',
-                'distance' => '38100',
-                'direction' => '2700000',
-                'algn' => 'tl',
-                'rotWithShape' => '0',
-            ],
-            2 => [
-                'effect' => 'outerShdw',
-                'blur' => '50800',
-                'distance' => '38100',
-                'direction' => '5400000',
-                'algn' => 't',
-                'rotWithShape' => '0',
-            ],
-            3 => [
-                'effect' => 'outerShdw',
-                'blur' => '50800',
-                'distance' => '38100',
-                'direction' => '8100000',
-                'algn' => 'tr',
-                'rotWithShape' => '0',
-            ],
-            4 => [
-                'effect' => 'outerShdw',
-                'blur' => '50800',
-                'distance' => '38100',
-                'algn' => 'l',
-                'rotWithShape' => '0',
-            ],
-            5 => [
-                'effect' => 'outerShdw',
-                'size' => [
-                    'sx' => '102000',
-                    'sy' => '102000',
-                ],
-                'blur' => '63500',
-                'distance' => '38100',
-                'algn' => 'ctr',
-                'rotWithShape' => '0',
-            ],
-            6 => [
-                'effect' => 'outerShdw',
-                'blur' => '50800',
-                'distance' => '38100',
-                'direction' => '10800000',
-                'algn' => 'r',
-                'rotWithShape' => '0',
-            ],
-            7 => [
-                'effect' => 'outerShdw',
-                'blur' => '50800',
-                'distance' => '38100',
-                'direction' => '18900000',
-                'algn' => 'bl',
-                'rotWithShape' => '0',
-            ],
-            8 => [
-                'effect' => 'outerShdw',
-                'blur' => '50800',
-                'distance' => '38100',
-                'direction' => '16200000',
-                'rotWithShape' => '0',
-            ],
-            9 => [
-                'effect' => 'outerShdw',
-                'blur' => '50800',
-                'distance' => '38100',
-                'direction' => '13500000',
-                'algn' => 'br',
-                'rotWithShape' => '0',
-            ],
-            //INNER
-            10 => [
-                'effect' => 'innerShdw',
-                'blur' => '63500',
-                'distance' => '50800',
-                'direction' => '2700000',
-            ],
-            11 => [
-                'effect' => 'innerShdw',
-                'blur' => '63500',
-                'distance' => '50800',
-                'direction' => '5400000',
-            ],
-            12 => [
-                'effect' => 'innerShdw',
-                'blur' => '63500',
-                'distance' => '50800',
-                'direction' => '8100000',
-            ],
-            13 => [
-                'effect' => 'innerShdw',
-                'blur' => '63500',
-                'distance' => '50800',
-            ],
-            14 => [
-                'effect' => 'innerShdw',
-                'blur' => '114300',
-            ],
-            15 => [
-                'effect' => 'innerShdw',
-                'blur' => '63500',
-                'distance' => '50800',
-                'direction' => '10800000',
-            ],
-            16 => [
-                'effect' => 'innerShdw',
-                'blur' => '63500',
-                'distance' => '50800',
-                'direction' => '18900000',
-            ],
-            17 => [
-                'effect' => 'innerShdw',
-                'blur' => '63500',
-                'distance' => '50800',
-                'direction' => '16200000',
+        return (string) (int) ($value * self::PERCENTAGE_MULTIPLIER);
+    }
+
+    public static function xmlToTenthOfPercent(string $value): float
+    {
+        return ((float) $value) / self::PERCENTAGE_MULTIPLIER;
+    }
+
+    protected function setColorProperties(?string $color, null|float|int|string $alpha, ?string $colorType): array
+    {
+        return [
+            'type' => $colorType,
+            'value' => $color,
+            'alpha' => ($alpha === null) ? null : (int) $alpha,
+        ];
+    }
+
+    protected const PRESETS_OPTIONS = [
+        //NONE
+        0 => [
+            'presets' => self::SHADOW_PRESETS_NOSHADOW,
+            'effect' => null,
+            //'color' => [
+            //    'type' => ChartColor::EXCEL_COLOR_TYPE_STANDARD,
+            //    'value' => 'black',
+            //    'alpha' => 40,
+            //],
+            'size' => [
+                'sx' => null,
+                'sy' => null,
+                'kx' => null,
+                'ky' => null,
             ],
-            18 => [
-                'effect' => 'innerShdw',
-                'blur' => '63500',
-                'distance' => '50800',
-                'direction' => '13500000',
+            'blur' => null,
+            'direction' => null,
+            'distance' => null,
+            'algn' => null,
+            'rotWithShape' => null,
+        ],
+        //OUTER
+        1 => [
+            'effect' => 'outerShdw',
+            'blur' => 50800 / self::POINTS_WIDTH_MULTIPLIER,
+            'distance' => 38100 / self::POINTS_WIDTH_MULTIPLIER,
+            'direction' => 2700000 / self::ANGLE_MULTIPLIER,
+            'algn' => 'tl',
+            'rotWithShape' => '0',
+        ],
+        2 => [
+            'effect' => 'outerShdw',
+            'blur' => 50800 / self::POINTS_WIDTH_MULTIPLIER,
+            'distance' => 38100 / self::POINTS_WIDTH_MULTIPLIER,
+            'direction' => 5400000 / self::ANGLE_MULTIPLIER,
+            'algn' => 't',
+            'rotWithShape' => '0',
+        ],
+        3 => [
+            'effect' => 'outerShdw',
+            'blur' => 50800 / self::POINTS_WIDTH_MULTIPLIER,
+            'distance' => 38100 / self::POINTS_WIDTH_MULTIPLIER,
+            'direction' => 8100000 / self::ANGLE_MULTIPLIER,
+            'algn' => 'tr',
+            'rotWithShape' => '0',
+        ],
+        4 => [
+            'effect' => 'outerShdw',
+            'blur' => 50800 / self::POINTS_WIDTH_MULTIPLIER,
+            'distance' => 38100 / self::POINTS_WIDTH_MULTIPLIER,
+            'algn' => 'l',
+            'rotWithShape' => '0',
+        ],
+        5 => [
+            'effect' => 'outerShdw',
+            'size' => [
+                'sx' => 102000 / self::PERCENTAGE_MULTIPLIER,
+                'sy' => 102000 / self::PERCENTAGE_MULTIPLIER,
             ],
-            //perspective
-            19 => [
-                'effect' => 'outerShdw',
-                'blur' => '152400',
-                'distance' => '317500',
-                'size' => [
-                    'sx' => '90000',
-                    'sy' => '-19000',
-                ],
-                'direction' => '5400000',
-                'rotWithShape' => '0',
+            'blur' => 63500 / self::POINTS_WIDTH_MULTIPLIER,
+            'distance' => 38100 / self::POINTS_WIDTH_MULTIPLIER,
+            'algn' => 'ctr',
+            'rotWithShape' => '0',
+        ],
+        6 => [
+            'effect' => 'outerShdw',
+            'blur' => 50800 / self::POINTS_WIDTH_MULTIPLIER,
+            'distance' => 38100 / self::POINTS_WIDTH_MULTIPLIER,
+            'direction' => 10800000 / self::ANGLE_MULTIPLIER,
+            'algn' => 'r',
+            'rotWithShape' => '0',
+        ],
+        7 => [
+            'effect' => 'outerShdw',
+            'blur' => 50800 / self::POINTS_WIDTH_MULTIPLIER,
+            'distance' => 38100 / self::POINTS_WIDTH_MULTIPLIER,
+            'direction' => 18900000 / self::ANGLE_MULTIPLIER,
+            'algn' => 'bl',
+            'rotWithShape' => '0',
+        ],
+        8 => [
+            'effect' => 'outerShdw',
+            'blur' => 50800 / self::POINTS_WIDTH_MULTIPLIER,
+            'distance' => 38100 / self::POINTS_WIDTH_MULTIPLIER,
+            'direction' => 16200000 / self::ANGLE_MULTIPLIER,
+            'rotWithShape' => '0',
+        ],
+        9 => [
+            'effect' => 'outerShdw',
+            'blur' => 50800 / self::POINTS_WIDTH_MULTIPLIER,
+            'distance' => 38100 / self::POINTS_WIDTH_MULTIPLIER,
+            'direction' => 13500000 / self::ANGLE_MULTIPLIER,
+            'algn' => 'br',
+            'rotWithShape' => '0',
+        ],
+        //INNER
+        10 => [
+            'effect' => 'innerShdw',
+            'blur' => 63500 / self::POINTS_WIDTH_MULTIPLIER,
+            'distance' => 50800 / self::POINTS_WIDTH_MULTIPLIER,
+            'direction' => 2700000 / self::ANGLE_MULTIPLIER,
+        ],
+        11 => [
+            'effect' => 'innerShdw',
+            'blur' => 63500 / self::POINTS_WIDTH_MULTIPLIER,
+            'distance' => 50800 / self::POINTS_WIDTH_MULTIPLIER,
+            'direction' => 5400000 / self::ANGLE_MULTIPLIER,
+        ],
+        12 => [
+            'effect' => 'innerShdw',
+            'blur' => 63500 / self::POINTS_WIDTH_MULTIPLIER,
+            'distance' => 50800 / self::POINTS_WIDTH_MULTIPLIER,
+            'direction' => 8100000 / self::ANGLE_MULTIPLIER,
+        ],
+        13 => [
+            'effect' => 'innerShdw',
+            'blur' => 63500 / self::POINTS_WIDTH_MULTIPLIER,
+            'distance' => 50800 / self::POINTS_WIDTH_MULTIPLIER,
+        ],
+        14 => [
+            'effect' => 'innerShdw',
+            'blur' => 114300 / self::POINTS_WIDTH_MULTIPLIER,
+        ],
+        15 => [
+            'effect' => 'innerShdw',
+            'blur' => 63500 / self::POINTS_WIDTH_MULTIPLIER,
+            'distance' => 50800 / self::POINTS_WIDTH_MULTIPLIER,
+            'direction' => 10800000 / self::ANGLE_MULTIPLIER,
+        ],
+        16 => [
+            'effect' => 'innerShdw',
+            'blur' => 63500 / self::POINTS_WIDTH_MULTIPLIER,
+            'distance' => 50800 / self::POINTS_WIDTH_MULTIPLIER,
+            'direction' => 18900000 / self::ANGLE_MULTIPLIER,
+        ],
+        17 => [
+            'effect' => 'innerShdw',
+            'blur' => 63500 / self::POINTS_WIDTH_MULTIPLIER,
+            'distance' => 50800 / self::POINTS_WIDTH_MULTIPLIER,
+            'direction' => 16200000 / self::ANGLE_MULTIPLIER,
+        ],
+        18 => [
+            'effect' => 'innerShdw',
+            'blur' => 63500 / self::POINTS_WIDTH_MULTIPLIER,
+            'distance' => 50800 / self::POINTS_WIDTH_MULTIPLIER,
+            'direction' => 13500000 / self::ANGLE_MULTIPLIER,
+        ],
+        //perspective
+        19 => [
+            'effect' => 'outerShdw',
+            'blur' => 152400 / self::POINTS_WIDTH_MULTIPLIER,
+            'distance' => 317500 / self::POINTS_WIDTH_MULTIPLIER,
+            'size' => [
+                'sx' => 90000 / self::PERCENTAGE_MULTIPLIER,
+                'sy' => -19000 / self::PERCENTAGE_MULTIPLIER,
             ],
-            20 => [
-                'effect' => 'outerShdw',
-                'blur' => '76200',
-                'direction' => '18900000',
-                'size' => [
-                    'sy' => '23000',
-                    'kx' => '-1200000',
-                ],
-                'algn' => 'bl',
-                'rotWithShape' => '0',
+            'direction' => 5400000 / self::ANGLE_MULTIPLIER,
+            'rotWithShape' => '0',
+        ],
+        20 => [
+            'effect' => 'outerShdw',
+            'blur' => 76200 / self::POINTS_WIDTH_MULTIPLIER,
+            'direction' => 18900000 / self::ANGLE_MULTIPLIER,
+            'size' => [
+                'sy' => 23000 / self::PERCENTAGE_MULTIPLIER,
+                'kx' => -1200000 / self::ANGLE_MULTIPLIER,
             ],
-            21 => [
-                'effect' => 'outerShdw',
-                'blur' => '76200',
-                'direction' => '13500000',
-                'size' => [
-                    'sy' => '23000',
-                    'kx' => '1200000',
-                ],
-                'algn' => 'br',
-                'rotWithShape' => '0',
+            'algn' => 'bl',
+            'rotWithShape' => '0',
+        ],
+        21 => [
+            'effect' => 'outerShdw',
+            'blur' => 76200 / self::POINTS_WIDTH_MULTIPLIER,
+            'direction' => 13500000 / self::ANGLE_MULTIPLIER,
+            'size' => [
+                'sy' => 23000 / self::PERCENTAGE_MULTIPLIER,
+                'kx' => 1200000 / self::ANGLE_MULTIPLIER,
             ],
-            22 => [
-                'effect' => 'outerShdw',
-                'blur' => '76200',
-                'distance' => '12700',
-                'direction' => '2700000',
-                'size' => [
-                    'sy' => '-23000',
-                    'kx' => '-800400',
-                ],
-                'algn' => 'bl',
-                'rotWithShape' => '0',
+            'algn' => 'br',
+            'rotWithShape' => '0',
+        ],
+        22 => [
+            'effect' => 'outerShdw',
+            'blur' => 76200 / self::POINTS_WIDTH_MULTIPLIER,
+            'distance' => 12700 / self::POINTS_WIDTH_MULTIPLIER,
+            'direction' => 2700000 / self::ANGLE_MULTIPLIER,
+            'size' => [
+                'sy' => -23000 / self::PERCENTAGE_MULTIPLIER,
+                'kx' => -800400 / self::ANGLE_MULTIPLIER,
             ],
-            23 => [
-                'effect' => 'outerShdw',
-                'blur' => '76200',
-                'distance' => '12700',
-                'direction' => '8100000',
-                'size' => [
-                    'sy' => '-23000',
-                    'kx' => '800400',
-                ],
-                'algn' => 'br',
-                'rotWithShape' => '0',
+            'algn' => 'bl',
+            'rotWithShape' => '0',
+        ],
+        23 => [
+            'effect' => 'outerShdw',
+            'blur' => 76200 / self::POINTS_WIDTH_MULTIPLIER,
+            'distance' => 12700 / self::POINTS_WIDTH_MULTIPLIER,
+            'direction' => 8100000 / self::ANGLE_MULTIPLIER,
+            'size' => [
+                'sy' => -23000 / self::PERCENTAGE_MULTIPLIER,
+                'kx' => 800400 / self::ANGLE_MULTIPLIER,
             ],
-        ];
+            'algn' => 'br',
+            'rotWithShape' => '0',
+        ],
+    ];
 
-        return $presets_options[$shadow_presets_option];
+    protected function getShadowPresetsMap(int $presetsOption): array
+    {
+        return self::PRESETS_OPTIONS[$presetsOption] ?? self::PRESETS_OPTIONS[0];
     }
 
-    protected function getArrayElementsValue($properties, $elements)
+    /**
+     * Get value of array element.
+     */
+    protected function getArrayElementsValue(array $properties, array|int|string $elements): mixed
     {
         $reference = &$properties;
         if (!is_array($elements)) {
@@ -366,4 +415,486 @@ protected function getArrayElementsValue($properties, $elements)
 
         return $reference;
     }
+
+    /**
+     * Set Glow Properties.
+     */
+    public function setGlowProperties(float $size, ?string $colorValue = null, ?int $colorAlpha = null, ?string $colorType = null): void
+    {
+        $this
+            ->activateObject()
+            ->setGlowSize($size);
+        $this->glowColor->setColorPropertiesArray(
+            [
+                'value' => $colorValue,
+                'type' => $colorType,
+                'alpha' => $colorAlpha,
+            ]
+        );
+    }
+
+    /**
+     * Get Glow Property.
+     */
+    public function getGlowProperty(array|string $property): null|array|float|int|string
+    {
+        $retVal = null;
+        if ($property === 'size') {
+            $retVal = $this->glowSize;
+        } elseif ($property === 'color') {
+            $retVal = [
+                'value' => $this->glowColor->getColorProperty('value'),
+                'type' => $this->glowColor->getColorProperty('type'),
+                'alpha' => $this->glowColor->getColorProperty('alpha'),
+            ];
+        } elseif (is_array($property) && count($property) >= 2 && $property[0] === 'color') {
+            $retVal = $this->glowColor->getColorProperty($property[1]);
+        }
+
+        return $retVal;
+    }
+
+    /**
+     * Get Glow Color Property.
+     */
+    public function getGlowColor(string $propertyName): null|int|string
+    {
+        return $this->glowColor->getColorProperty($propertyName);
+    }
+
+    public function getGlowColorObject(): ChartColor
+    {
+        return $this->glowColor;
+    }
+
+    /**
+     * Get Glow Size.
+     */
+    public function getGlowSize(): ?float
+    {
+        return $this->glowSize;
+    }
+
+    /**
+     * Set Glow Size.
+     *
+     * @return $this
+     */
+    protected function setGlowSize(?float $size)
+    {
+        $this->glowSize = $size;
+
+        return $this;
+    }
+
+    /**
+     * Set Soft Edges Size.
+     */
+    public function setSoftEdges(?float $size): void
+    {
+        if ($size !== null) {
+            $this->activateObject();
+            $this->softEdges['size'] = $size;
+        }
+    }
+
+    /**
+     * Get Soft Edges Size.
+     */
+    public function getSoftEdgesSize(): ?float
+    {
+        return $this->softEdges['size'];
+    }
+
+    public function setShadowProperty(string $propertyName, mixed $value): self
+    {
+        $this->activateObject();
+        if ($propertyName === 'color' && is_array($value)) {
+            $this->shadowColor->setColorPropertiesArray($value);
+        } else {
+            $this->shadowProperties[$propertyName] = $value;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set Shadow Properties.
+     */
+    public function setShadowProperties(int $presets, ?string $colorValue = null, ?string $colorType = null, null|float|int|string $colorAlpha = null, ?float $blur = null, ?int $angle = null, ?float $distance = null): void
+    {
+        $this->activateObject()->setShadowPresetsProperties((int) $presets);
+        if ($presets === 0) {
+            $this->shadowColor->setType(ChartColor::EXCEL_COLOR_TYPE_STANDARD);
+            $this->shadowColor->setValue('black');
+            $this->shadowColor->setAlpha(40);
+        }
+        if ($colorValue !== null) {
+            $this->shadowColor->setValue($colorValue);
+        }
+        if ($colorType !== null) {
+            $this->shadowColor->setType($colorType);
+        }
+        if (is_numeric($colorAlpha)) {
+            $this->shadowColor->setAlpha((int) $colorAlpha);
+        }
+        $this
+            ->setShadowBlur($blur)
+            ->setShadowAngle($angle)
+            ->setShadowDistance($distance);
+    }
+
+    /**
+     * Set Shadow Presets Properties.
+     *
+     * @return $this
+     */
+    protected function setShadowPresetsProperties(int $presets)
+    {
+        $this->shadowProperties['presets'] = $presets;
+        $this->setShadowPropertiesMapValues($this->getShadowPresetsMap($presets));
+
+        return $this;
+    }
+
+    protected const SHADOW_ARRAY_KEYS = ['size', 'color'];
+
+    /**
+     * Set Shadow Properties Values.
+     *
+     * @return $this
+     */
+    protected function setShadowPropertiesMapValues(array $propertiesMap, ?array &$reference = null)
+    {
+        $base_reference = $reference;
+        foreach ($propertiesMap as $property_key => $property_val) {
+            if (is_array($property_val)) {
+                if (in_array($property_key, self::SHADOW_ARRAY_KEYS, true)) {
+                    $reference = &$this->shadowProperties[$property_key];
+                    $this->setShadowPropertiesMapValues($property_val, $reference);
+                }
+            } else {
+                if ($base_reference === null) {
+                    $this->shadowProperties[$property_key] = $property_val;
+                } else {
+                    $reference[$property_key] = $property_val;
+                }
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set Shadow Blur.
+     *
+     * @return $this
+     */
+    protected function setShadowBlur(?float $blur)
+    {
+        if ($blur !== null) {
+            $this->shadowProperties['blur'] = $blur;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set Shadow Angle.
+     *
+     * @return $this
+     */
+    protected function setShadowAngle(null|float|int|string $angle)
+    {
+        if (is_numeric($angle)) {
+            $this->shadowProperties['direction'] = $angle;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set Shadow Distance.
+     *
+     * @return $this
+     */
+    protected function setShadowDistance(?float $distance)
+    {
+        if ($distance !== null) {
+            $this->shadowProperties['distance'] = $distance;
+        }
+
+        return $this;
+    }
+
+    public function getShadowColorObject(): ChartColor
+    {
+        return $this->shadowColor;
+    }
+
+    /**
+     * Get Shadow Property.
+     *
+     * @param string|string[] $elements
+     */
+    public function getShadowProperty($elements): array|string|null
+    {
+        if ($elements === 'color') {
+            return [
+                'value' => $this->shadowColor->getValue(),
+                'type' => $this->shadowColor->getType(),
+                'alpha' => $this->shadowColor->getAlpha(),
+            ];
+        }
+        $retVal = $this->getArrayElementsValue($this->shadowProperties, $elements);
+        if (is_scalar($retVal)) {
+            $retVal = (string) $retVal;
+        } elseif ($retVal !== null && !is_array($retVal)) {
+            // @codeCoverageIgnoreStart
+            throw new Exception('Unexpected value for shadowProperty');
+            // @codeCoverageIgnoreEnd
+        }
+
+        return $retVal;
+    }
+
+    public function getShadowArray(): array
+    {
+        $array = $this->shadowProperties;
+        if ($this->getShadowColorObject()->isUsable()) {
+            $array['color'] = $this->getShadowProperty('color');
+        }
+
+        return $array;
+    }
+
+    protected ChartColor $lineColor;
+
+    protected array $lineStyleProperties = [
+        'width' => null, //'9525',
+        'compound' => '', //self::LINE_STYLE_COMPOUND_SIMPLE,
+        'dash' => '', //self::LINE_STYLE_DASH_SOLID,
+        'cap' => '', //self::LINE_STYLE_CAP_FLAT,
+        'join' => '', //self::LINE_STYLE_JOIN_BEVEL,
+        'arrow' => [
+            'head' => [
+                'type' => '', //self::LINE_STYLE_ARROW_TYPE_NOARROW,
+                'size' => '', //self::LINE_STYLE_ARROW_SIZE_5,
+                'w' => '',
+                'len' => '',
+            ],
+            'end' => [
+                'type' => '', //self::LINE_STYLE_ARROW_TYPE_NOARROW,
+                'size' => '', //self::LINE_STYLE_ARROW_SIZE_8,
+                'w' => '',
+                'len' => '',
+            ],
+        ],
+    ];
+
+    public function copyLineStyles(self $otherProperties): void
+    {
+        $this->lineStyleProperties = $otherProperties->lineStyleProperties;
+        $this->lineColor = $otherProperties->lineColor;
+        $this->glowSize = $otherProperties->glowSize;
+        $this->glowColor = $otherProperties->glowColor;
+        $this->softEdges = $otherProperties->softEdges;
+        $this->shadowProperties = $otherProperties->shadowProperties;
+    }
+
+    public function getLineColor(): ChartColor
+    {
+        return $this->lineColor;
+    }
+
+    /**
+     * Set Line Color Properties.
+     */
+    public function setLineColorProperties(?string $value, ?int $alpha = null, ?string $colorType = null): void
+    {
+        $this->activateObject();
+        $this->lineColor->setColorPropertiesArray(
+            $this->setColorProperties(
+                $value,
+                $alpha,
+                $colorType
+            )
+        );
+    }
+
+    /**
+     * Get Line Color Property.
+     */
+    public function getLineColorProperty(string $propertyName): null|int|string
+    {
+        return $this->lineColor->getColorProperty($propertyName);
+    }
+
+    /**
+     * Set Line Style Properties.
+     */
+    public function setLineStyleProperties(
+        null|float|int|string $lineWidth = null,
+        ?string $compoundType = '',
+        ?string $dashType = '',
+        ?string $capType = '',
+        ?string $joinType = '',
+        ?string $headArrowType = '',
+        int $headArrowSize = 0,
+        ?string $endArrowType = '',
+        int $endArrowSize = 0,
+        ?string $headArrowWidth = '',
+        ?string $headArrowLength = '',
+        ?string $endArrowWidth = '',
+        ?string $endArrowLength = ''
+    ): void {
+        $this->activateObject();
+        if (is_numeric($lineWidth)) {
+            $this->lineStyleProperties['width'] = $lineWidth;
+        }
+        if ($compoundType !== '') {
+            $this->lineStyleProperties['compound'] = $compoundType;
+        }
+        if ($dashType !== '') {
+            $this->lineStyleProperties['dash'] = $dashType;
+        }
+        if ($capType !== '') {
+            $this->lineStyleProperties['cap'] = $capType;
+        }
+        if ($joinType !== '') {
+            $this->lineStyleProperties['join'] = $joinType;
+        }
+        if ($headArrowType !== '') {
+            $this->lineStyleProperties['arrow']['head']['type'] = $headArrowType;
+        }
+        if (isset(self::ARROW_SIZES[$headArrowSize])) {
+            $this->lineStyleProperties['arrow']['head']['size'] = $headArrowSize;
+            $this->lineStyleProperties['arrow']['head']['w'] = self::ARROW_SIZES[$headArrowSize]['w'];
+            $this->lineStyleProperties['arrow']['head']['len'] = self::ARROW_SIZES[$headArrowSize]['len'];
+        }
+        if ($endArrowType !== '') {
+            $this->lineStyleProperties['arrow']['end']['type'] = $endArrowType;
+        }
+        if (isset(self::ARROW_SIZES[$endArrowSize])) {
+            $this->lineStyleProperties['arrow']['end']['size'] = $endArrowSize;
+            $this->lineStyleProperties['arrow']['end']['w'] = self::ARROW_SIZES[$endArrowSize]['w'];
+            $this->lineStyleProperties['arrow']['end']['len'] = self::ARROW_SIZES[$endArrowSize]['len'];
+        }
+        if ($headArrowWidth !== '') {
+            $this->lineStyleProperties['arrow']['head']['w'] = $headArrowWidth;
+        }
+        if ($headArrowLength !== '') {
+            $this->lineStyleProperties['arrow']['head']['len'] = $headArrowLength;
+        }
+        if ($endArrowWidth !== '') {
+            $this->lineStyleProperties['arrow']['end']['w'] = $endArrowWidth;
+        }
+        if ($endArrowLength !== '') {
+            $this->lineStyleProperties['arrow']['end']['len'] = $endArrowLength;
+        }
+    }
+
+    public function getLineStyleArray(): array
+    {
+        return $this->lineStyleProperties;
+    }
+
+    public function setLineStyleArray(array $lineStyleProperties = []): self
+    {
+        $this->activateObject();
+        $this->lineStyleProperties['width'] = $lineStyleProperties['width'] ?? null;
+        $this->lineStyleProperties['compound'] = $lineStyleProperties['compound'] ?? '';
+        $this->lineStyleProperties['dash'] = $lineStyleProperties['dash'] ?? '';
+        $this->lineStyleProperties['cap'] = $lineStyleProperties['cap'] ?? '';
+        $this->lineStyleProperties['join'] = $lineStyleProperties['join'] ?? '';
+        $this->lineStyleProperties['arrow']['head']['type'] = $lineStyleProperties['arrow']['head']['type'] ?? '';
+        $this->lineStyleProperties['arrow']['head']['size'] = $lineStyleProperties['arrow']['head']['size'] ?? '';
+        $this->lineStyleProperties['arrow']['head']['w'] = $lineStyleProperties['arrow']['head']['w'] ?? '';
+        $this->lineStyleProperties['arrow']['head']['len'] = $lineStyleProperties['arrow']['head']['len'] ?? '';
+        $this->lineStyleProperties['arrow']['end']['type'] = $lineStyleProperties['arrow']['end']['type'] ?? '';
+        $this->lineStyleProperties['arrow']['end']['size'] = $lineStyleProperties['arrow']['end']['size'] ?? '';
+        $this->lineStyleProperties['arrow']['end']['w'] = $lineStyleProperties['arrow']['end']['w'] ?? '';
+        $this->lineStyleProperties['arrow']['end']['len'] = $lineStyleProperties['arrow']['end']['len'] ?? '';
+
+        return $this;
+    }
+
+    public function setLineStyleProperty(string $propertyName, mixed $value): self
+    {
+        $this->activateObject();
+        $this->lineStyleProperties[$propertyName] = $value;
+
+        return $this;
+    }
+
+    /**
+     * Get Line Style Property.
+     */
+    public function getLineStyleProperty(array|string $elements): ?string
+    {
+        $retVal = $this->getArrayElementsValue($this->lineStyleProperties, $elements);
+        if (is_scalar($retVal)) {
+            $retVal = (string) $retVal;
+        } elseif ($retVal !== null) {
+            // @codeCoverageIgnoreStart
+            throw new Exception('Unexpected value for lineStyleProperty');
+            // @codeCoverageIgnoreEnd
+        }
+
+        return $retVal;
+    }
+
+    protected const ARROW_SIZES = [
+        1 => ['w' => 'sm', 'len' => 'sm'],
+        2 => ['w' => 'sm', 'len' => 'med'],
+        3 => ['w' => 'sm', 'len' => 'lg'],
+        4 => ['w' => 'med', 'len' => 'sm'],
+        5 => ['w' => 'med', 'len' => 'med'],
+        6 => ['w' => 'med', 'len' => 'lg'],
+        7 => ['w' => 'lg', 'len' => 'sm'],
+        8 => ['w' => 'lg', 'len' => 'med'],
+        9 => ['w' => 'lg', 'len' => 'lg'],
+    ];
+
+    /**
+     * Get Line Style Arrow Size.
+     */
+    protected function getLineStyleArrowSize(int $arraySelector, string $arrayKaySelector): string
+    {
+        return self::ARROW_SIZES[$arraySelector][$arrayKaySelector] ?? '';
+    }
+
+    /**
+     * Get Line Style Arrow Parameters.
+     */
+    public function getLineStyleArrowParameters(string $arrowSelector, string $propertySelector): string
+    {
+        return $this->getLineStyleArrowSize($this->lineStyleProperties['arrow'][$arrowSelector]['size'], $propertySelector);
+    }
+
+    /**
+     * Get Line Style Arrow Width.
+     */
+    public function getLineStyleArrowWidth(string $arrow): ?string
+    {
+        return $this->getLineStyleProperty(['arrow', $arrow, 'w']);
+    }
+
+    /**
+     * Get Line Style Arrow Excel Length.
+     */
+    public function getLineStyleArrowLength(string $arrow): ?string
+    {
+        return $this->getLineStyleProperty(['arrow', $arrow, 'len']);
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $this->lineColor = clone $this->lineColor;
+        $this->glowColor = clone $this->glowColor;
+        $this->shadowColor = clone $this->shadowColor;
+    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/IRenderer.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/IRenderer.php
index 3032f6ba25..ae28ff4fc9 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/IRenderer.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/IRenderer.php
@@ -14,9 +14,9 @@ public function __construct(Chart $chart);
     /**
      * Render the chart to given file (or stream).
      *
-     * @param string $filename Name of the file render to
+     * @param ?string $filename Name of the file render to
      *
      * @return bool true on success
      */
-    public function render($filename);
+    public function render(?string $filename): bool;
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/JpGraph.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
index 0ab70870a7..faadd9a302 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
@@ -2,66 +2,28 @@
 
 namespace PhpOffice\PhpSpreadsheet\Chart\Renderer;
 
-use AccBarPlot;
-use AccLinePlot;
-use BarPlot;
-use ContourPlot;
-use Graph;
-use GroupBarPlot;
-use LinePlot;
-use PhpOffice\PhpSpreadsheet\Chart\Chart;
-use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
-use PieGraph;
-use PiePlot;
-use PiePlot3D;
-use PiePlotC;
-use RadarGraph;
-use RadarPlot;
-use ScatterPlot;
-use Spline;
-use StockPlot;
-
-class JpGraph implements IRenderer
+/**
+ * Jpgraph is not oficially maintained in Composer, so the version there
+ * could be out of date. For that reason, all unit test requiring Jpgraph
+ * are skipped. So, do not measure code coverage for this class till that
+ * is fixed.
+ *
+ * This implementation uses abandoned package
+ * https://packagist.org/packages/jpgraph/jpgraph
+ *
+ * @codeCoverageIgnore
+ */
+class JpGraph extends JpGraphRendererBase
 {
-    private static $width = 640;
-
-    private static $height = 480;
-
-    private static $colourSet = [
-        'mediumpurple1', 'palegreen3', 'gold1', 'cadetblue1',
-        'darkmagenta', 'coral', 'dodgerblue3', 'eggplant',
-        'mediumblue', 'magenta', 'sandybrown', 'cyan',
-        'firebrick1', 'forestgreen', 'deeppink4', 'darkolivegreen',
-        'goldenrod2',
-    ];
-
-    private static $markSet;
-
-    private $chart;
-
-    private $graph;
-
-    private static $plotColour = 0;
-
-    private static $plotMark = 0;
-
-    /**
-     * Create a new jpgraph.
-     */
-    public function __construct(Chart $chart)
-    {
-        self::init();
-        $this->graph = null;
-        $this->chart = $chart;
-    }
-
-    private static function init(): void
+    protected static function init(): void
     {
         static $loaded = false;
         if ($loaded) {
             return;
         }
 
+        // JpGraph is no longer included with distribution, but user may install it.
+        // So Scrutinizer's complaint that it can't find it is reasonable, but unfixable.
         \JpGraph\JpGraph::load();
         \JpGraph\JpGraph::module('bar');
         \JpGraph\JpGraph::module('contour');
@@ -73,802 +35,6 @@ private static function init(): void
         \JpGraph\JpGraph::module('scatter');
         \JpGraph\JpGraph::module('stock');
 
-        self::$markSet = [
-            'diamond' => MARK_DIAMOND,
-            'square' => MARK_SQUARE,
-            'triangle' => MARK_UTRIANGLE,
-            'x' => MARK_X,
-            'star' => MARK_STAR,
-            'dot' => MARK_FILLEDCIRCLE,
-            'dash' => MARK_DTRIANGLE,
-            'circle' => MARK_CIRCLE,
-            'plus' => MARK_CROSS,
-        ];
-
         $loaded = true;
     }
-
-    private function formatPointMarker($seriesPlot, $markerID)
-    {
-        $plotMarkKeys = array_keys(self::$markSet);
-        if ($markerID === null) {
-            //    Use default plot marker (next marker in the series)
-            self::$plotMark %= count(self::$markSet);
-            $seriesPlot->mark->SetType(self::$markSet[$plotMarkKeys[self::$plotMark++]]);
-        } elseif ($markerID !== 'none') {
-            //    Use specified plot marker (if it exists)
-            if (isset(self::$markSet[$markerID])) {
-                $seriesPlot->mark->SetType(self::$markSet[$markerID]);
-            } else {
-                //    If the specified plot marker doesn't exist, use default plot marker (next marker in the series)
-                self::$plotMark %= count(self::$markSet);
-                $seriesPlot->mark->SetType(self::$markSet[$plotMarkKeys[self::$plotMark++]]);
-            }
-        } else {
-            //    Hide plot marker
-            $seriesPlot->mark->Hide();
-        }
-        $seriesPlot->mark->SetColor(self::$colourSet[self::$plotColour]);
-        $seriesPlot->mark->SetFillColor(self::$colourSet[self::$plotColour]);
-        $seriesPlot->SetColor(self::$colourSet[self::$plotColour++]);
-
-        return $seriesPlot;
-    }
-
-    private function formatDataSetLabels($groupID, $datasetLabels, $labelCount, $rotation = '')
-    {
-        $datasetLabelFormatCode = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getFormatCode();
-        if ($datasetLabelFormatCode !== null) {
-            //    Retrieve any label formatting code
-            $datasetLabelFormatCode = stripslashes($datasetLabelFormatCode);
-        }
-
-        $testCurrentIndex = 0;
-        foreach ($datasetLabels as $i => $datasetLabel) {
-            if (is_array($datasetLabel)) {
-                if ($rotation == 'bar') {
-                    $datasetLabels[$i] = implode(' ', $datasetLabel);
-                } else {
-                    $datasetLabel = array_reverse($datasetLabel);
-                    $datasetLabels[$i] = implode("\n", $datasetLabel);
-                }
-            } else {
-                //    Format labels according to any formatting code
-                if ($datasetLabelFormatCode !== null) {
-                    $datasetLabels[$i] = NumberFormat::toFormattedString($datasetLabel, $datasetLabelFormatCode);
-                }
-            }
-            ++$testCurrentIndex;
-        }
-
-        return $datasetLabels;
-    }
-
-    private function percentageSumCalculation($groupID, $seriesCount)
-    {
-        $sumValues = [];
-        //    Adjust our values to a percentage value across all series in the group
-        for ($i = 0; $i < $seriesCount; ++$i) {
-            if ($i == 0) {
-                $sumValues = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
-            } else {
-                $nextValues = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
-                foreach ($nextValues as $k => $value) {
-                    if (isset($sumValues[$k])) {
-                        $sumValues[$k] += $value;
-                    } else {
-                        $sumValues[$k] = $value;
-                    }
-                }
-            }
-        }
-
-        return $sumValues;
-    }
-
-    private function percentageAdjustValues($dataValues, $sumValues)
-    {
-        foreach ($dataValues as $k => $dataValue) {
-            $dataValues[$k] = $dataValue / $sumValues[$k] * 100;
-        }
-
-        return $dataValues;
-    }
-
-    private function getCaption($captionElement)
-    {
-        //    Read any caption
-        $caption = ($captionElement !== null) ? $captionElement->getCaption() : null;
-        //    Test if we have a title caption to display
-        if ($caption !== null) {
-            //    If we do, it could be a plain string or an array
-            if (is_array($caption)) {
-                //    Implode an array to a plain string
-                $caption = implode('', $caption);
-            }
-        }
-
-        return $caption;
-    }
-
-    private function renderTitle(): void
-    {
-        $title = $this->getCaption($this->chart->getTitle());
-        if ($title !== null) {
-            $this->graph->title->Set($title);
-        }
-    }
-
-    private function renderLegend(): void
-    {
-        $legend = $this->chart->getLegend();
-        if ($legend !== null) {
-            $legendPosition = $legend->getPosition();
-            switch ($legendPosition) {
-                case 'r':
-                    $this->graph->legend->SetPos(0.01, 0.5, 'right', 'center'); //    right
-                    $this->graph->legend->SetColumns(1);
-
-                    break;
-                case 'l':
-                    $this->graph->legend->SetPos(0.01, 0.5, 'left', 'center'); //    left
-                    $this->graph->legend->SetColumns(1);
-
-                    break;
-                case 't':
-                    $this->graph->legend->SetPos(0.5, 0.01, 'center', 'top'); //    top
-
-                    break;
-                case 'b':
-                    $this->graph->legend->SetPos(0.5, 0.99, 'center', 'bottom'); //    bottom
-
-                    break;
-                default:
-                    $this->graph->legend->SetPos(0.01, 0.01, 'right', 'top'); //    top-right
-                    $this->graph->legend->SetColumns(1);
-
-                    break;
-            }
-        } else {
-            $this->graph->legend->Hide();
-        }
-    }
-
-    private function renderCartesianPlotArea($type = 'textlin'): void
-    {
-        $this->graph = new Graph(self::$width, self::$height);
-        $this->graph->SetScale($type);
-
-        $this->renderTitle();
-
-        //    Rotate for bar rather than column chart
-        $rotation = $this->chart->getPlotArea()->getPlotGroupByIndex(0)->getPlotDirection();
-        $reverse = $rotation == 'bar';
-
-        $xAxisLabel = $this->chart->getXAxisLabel();
-        if ($xAxisLabel !== null) {
-            $title = $this->getCaption($xAxisLabel);
-            if ($title !== null) {
-                $this->graph->xaxis->SetTitle($title, 'center');
-                $this->graph->xaxis->title->SetMargin(35);
-                if ($reverse) {
-                    $this->graph->xaxis->title->SetAngle(90);
-                    $this->graph->xaxis->title->SetMargin(90);
-                }
-            }
-        }
-
-        $yAxisLabel = $this->chart->getYAxisLabel();
-        if ($yAxisLabel !== null) {
-            $title = $this->getCaption($yAxisLabel);
-            if ($title !== null) {
-                $this->graph->yaxis->SetTitle($title, 'center');
-                if ($reverse) {
-                    $this->graph->yaxis->title->SetAngle(0);
-                    $this->graph->yaxis->title->SetMargin(-55);
-                }
-            }
-        }
-    }
-
-    private function renderPiePlotArea(): void
-    {
-        $this->graph = new PieGraph(self::$width, self::$height);
-
-        $this->renderTitle();
-    }
-
-    private function renderRadarPlotArea(): void
-    {
-        $this->graph = new RadarGraph(self::$width, self::$height);
-        $this->graph->SetScale('lin');
-
-        $this->renderTitle();
-    }
-
-    private function renderPlotLine($groupID, $filled = false, $combination = false, $dimensions = '2d'): void
-    {
-        $grouping = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
-
-        $labelCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex(0)->getPointCount();
-        if ($labelCount > 0) {
-            $datasetLabels = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
-            $datasetLabels = $this->formatDataSetLabels($groupID, $datasetLabels, $labelCount);
-            $this->graph->xaxis->SetTickLabels($datasetLabels);
-        }
-
-        $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
-        $seriesPlots = [];
-        if ($grouping == 'percentStacked') {
-            $sumValues = $this->percentageSumCalculation($groupID, $seriesCount);
-        } else {
-            $sumValues = [];
-        }
-
-        //    Loop through each data series in turn
-        for ($i = 0; $i < $seriesCount; ++$i) {
-            $dataValues = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
-            $marker = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getPointMarker();
-
-            if ($grouping == 'percentStacked') {
-                $dataValues = $this->percentageAdjustValues($dataValues, $sumValues);
-            }
-
-            //    Fill in any missing values in the $dataValues array
-            $testCurrentIndex = 0;
-            foreach ($dataValues as $k => $dataValue) {
-                while ($k != $testCurrentIndex) {
-                    $dataValues[$testCurrentIndex] = null;
-                    ++$testCurrentIndex;
-                }
-                ++$testCurrentIndex;
-            }
-
-            $seriesPlot = new LinePlot($dataValues);
-            if ($combination) {
-                $seriesPlot->SetBarCenter();
-            }
-
-            if ($filled) {
-                $seriesPlot->SetFilled(true);
-                $seriesPlot->SetColor('black');
-                $seriesPlot->SetFillColor(self::$colourSet[self::$plotColour++]);
-            } else {
-                //    Set the appropriate plot marker
-                $this->formatPointMarker($seriesPlot, $marker);
-            }
-            $dataLabel = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($i)->getDataValue();
-            $seriesPlot->SetLegend($dataLabel);
-
-            $seriesPlots[] = $seriesPlot;
-        }
-
-        if ($grouping == 'standard') {
-            $groupPlot = $seriesPlots;
-        } else {
-            $groupPlot = new AccLinePlot($seriesPlots);
-        }
-        $this->graph->Add($groupPlot);
-    }
-
-    private function renderPlotBar($groupID, $dimensions = '2d'): void
-    {
-        $rotation = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotDirection();
-        //    Rotate for bar rather than column chart
-        if (($groupID == 0) && ($rotation == 'bar')) {
-            $this->graph->Set90AndMargin();
-        }
-        $grouping = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
-
-        $labelCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex(0)->getPointCount();
-        if ($labelCount > 0) {
-            $datasetLabels = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
-            $datasetLabels = $this->formatDataSetLabels($groupID, $datasetLabels, $labelCount, $rotation);
-            //    Rotate for bar rather than column chart
-            if ($rotation == 'bar') {
-                $datasetLabels = array_reverse($datasetLabels);
-                $this->graph->yaxis->SetPos('max');
-                $this->graph->yaxis->SetLabelAlign('center', 'top');
-                $this->graph->yaxis->SetLabelSide(SIDE_RIGHT);
-            }
-            $this->graph->xaxis->SetTickLabels($datasetLabels);
-        }
-
-        $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
-        $seriesPlots = [];
-        if ($grouping == 'percentStacked') {
-            $sumValues = $this->percentageSumCalculation($groupID, $seriesCount);
-        } else {
-            $sumValues = [];
-        }
-
-        //    Loop through each data series in turn
-        for ($j = 0; $j < $seriesCount; ++$j) {
-            $dataValues = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($j)->getDataValues();
-            if ($grouping == 'percentStacked') {
-                $dataValues = $this->percentageAdjustValues($dataValues, $sumValues);
-            }
-
-            //    Fill in any missing values in the $dataValues array
-            $testCurrentIndex = 0;
-            foreach ($dataValues as $k => $dataValue) {
-                while ($k != $testCurrentIndex) {
-                    $dataValues[$testCurrentIndex] = null;
-                    ++$testCurrentIndex;
-                }
-                ++$testCurrentIndex;
-            }
-
-            //    Reverse the $dataValues order for bar rather than column chart
-            if ($rotation == 'bar') {
-                $dataValues = array_reverse($dataValues);
-            }
-            $seriesPlot = new BarPlot($dataValues);
-            $seriesPlot->SetColor('black');
-            $seriesPlot->SetFillColor(self::$colourSet[self::$plotColour++]);
-            if ($dimensions == '3d') {
-                $seriesPlot->SetShadow();
-            }
-            if (!$this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($j)) {
-                $dataLabel = '';
-            } else {
-                $dataLabel = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($j)->getDataValue();
-            }
-            $seriesPlot->SetLegend($dataLabel);
-
-            $seriesPlots[] = $seriesPlot;
-        }
-        //    Reverse the plot order for bar rather than column chart
-        if (($rotation == 'bar') && ($grouping != 'percentStacked')) {
-            $seriesPlots = array_reverse($seriesPlots);
-        }
-
-        if ($grouping == 'clustered') {
-            $groupPlot = new GroupBarPlot($seriesPlots);
-        } elseif ($grouping == 'standard') {
-            $groupPlot = new GroupBarPlot($seriesPlots);
-        } else {
-            $groupPlot = new AccBarPlot($seriesPlots);
-            if ($dimensions == '3d') {
-                $groupPlot->SetShadow();
-            }
-        }
-
-        $this->graph->Add($groupPlot);
-    }
-
-    private function renderPlotScatter($groupID, $bubble): void
-    {
-        $grouping = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
-        $scatterStyle = $bubbleSize = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
-
-        $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
-        $seriesPlots = [];
-
-        //    Loop through each data series in turn
-        for ($i = 0; $i < $seriesCount; ++$i) {
-            $dataValuesY = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex($i)->getDataValues();
-            $dataValuesX = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
-
-            foreach ($dataValuesY as $k => $dataValueY) {
-                $dataValuesY[$k] = $k;
-            }
-
-            $seriesPlot = new ScatterPlot($dataValuesX, $dataValuesY);
-            if ($scatterStyle == 'lineMarker') {
-                $seriesPlot->SetLinkPoints();
-                $seriesPlot->link->SetColor(self::$colourSet[self::$plotColour]);
-            } elseif ($scatterStyle == 'smoothMarker') {
-                $spline = new Spline($dataValuesY, $dataValuesX);
-                [$splineDataY, $splineDataX] = $spline->Get(count($dataValuesX) * self::$width / 20);
-                $lplot = new LinePlot($splineDataX, $splineDataY);
-                $lplot->SetColor(self::$colourSet[self::$plotColour]);
-
-                $this->graph->Add($lplot);
-            }
-
-            if ($bubble) {
-                $this->formatPointMarker($seriesPlot, 'dot');
-                $seriesPlot->mark->SetColor('black');
-                $seriesPlot->mark->SetSize($bubbleSize);
-            } else {
-                $marker = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getPointMarker();
-                $this->formatPointMarker($seriesPlot, $marker);
-            }
-            $dataLabel = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($i)->getDataValue();
-            $seriesPlot->SetLegend($dataLabel);
-
-            $this->graph->Add($seriesPlot);
-        }
-    }
-
-    private function renderPlotRadar($groupID): void
-    {
-        $radarStyle = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
-
-        $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
-        $seriesPlots = [];
-
-        //    Loop through each data series in turn
-        for ($i = 0; $i < $seriesCount; ++$i) {
-            $dataValuesY = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex($i)->getDataValues();
-            $dataValuesX = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
-            $marker = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getPointMarker();
-
-            $dataValues = [];
-            foreach ($dataValuesY as $k => $dataValueY) {
-                $dataValues[$k] = implode(' ', array_reverse($dataValueY));
-            }
-            $tmp = array_shift($dataValues);
-            $dataValues[] = $tmp;
-            $tmp = array_shift($dataValuesX);
-            $dataValuesX[] = $tmp;
-
-            $this->graph->SetTitles(array_reverse($dataValues));
-
-            $seriesPlot = new RadarPlot(array_reverse($dataValuesX));
-
-            $dataLabel = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($i)->getDataValue();
-            $seriesPlot->SetColor(self::$colourSet[self::$plotColour++]);
-            if ($radarStyle == 'filled') {
-                $seriesPlot->SetFillColor(self::$colourSet[self::$plotColour]);
-            }
-            $this->formatPointMarker($seriesPlot, $marker);
-            $seriesPlot->SetLegend($dataLabel);
-
-            $this->graph->Add($seriesPlot);
-        }
-    }
-
-    private function renderPlotContour($groupID): void
-    {
-        $contourStyle = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
-
-        $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
-        $seriesPlots = [];
-
-        $dataValues = [];
-        //    Loop through each data series in turn
-        for ($i = 0; $i < $seriesCount; ++$i) {
-            $dataValuesY = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex($i)->getDataValues();
-            $dataValuesX = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
-
-            $dataValues[$i] = $dataValuesX;
-        }
-        $seriesPlot = new ContourPlot($dataValues);
-
-        $this->graph->Add($seriesPlot);
-    }
-
-    private function renderPlotStock($groupID): void
-    {
-        $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
-        $plotOrder = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotOrder();
-
-        $dataValues = [];
-        //    Loop through each data series in turn and build the plot arrays
-        foreach ($plotOrder as $i => $v) {
-            $dataValuesX = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($v)->getDataValues();
-            foreach ($dataValuesX as $j => $dataValueX) {
-                $dataValues[$plotOrder[$i]][$j] = $dataValueX;
-            }
-        }
-        if (empty($dataValues)) {
-            return;
-        }
-
-        $dataValuesPlot = [];
-        // Flatten the plot arrays to a single dimensional array to work with jpgraph
-        $jMax = count($dataValues[0]);
-        for ($j = 0; $j < $jMax; ++$j) {
-            for ($i = 0; $i < $seriesCount; ++$i) {
-                $dataValuesPlot[] = $dataValues[$i][$j];
-            }
-        }
-
-        // Set the x-axis labels
-        $labelCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex(0)->getPointCount();
-        if ($labelCount > 0) {
-            $datasetLabels = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
-            $datasetLabels = $this->formatDataSetLabels($groupID, $datasetLabels, $labelCount);
-            $this->graph->xaxis->SetTickLabels($datasetLabels);
-        }
-
-        $seriesPlot = new StockPlot($dataValuesPlot);
-        $seriesPlot->SetWidth(20);
-
-        $this->graph->Add($seriesPlot);
-    }
-
-    private function renderAreaChart($groupCount, $dimensions = '2d'): void
-    {
-        $this->renderCartesianPlotArea();
-
-        for ($i = 0; $i < $groupCount; ++$i) {
-            $this->renderPlotLine($i, true, false, $dimensions);
-        }
-    }
-
-    private function renderLineChart($groupCount, $dimensions = '2d'): void
-    {
-        $this->renderCartesianPlotArea();
-
-        for ($i = 0; $i < $groupCount; ++$i) {
-            $this->renderPlotLine($i, false, false, $dimensions);
-        }
-    }
-
-    private function renderBarChart($groupCount, $dimensions = '2d'): void
-    {
-        $this->renderCartesianPlotArea();
-
-        for ($i = 0; $i < $groupCount; ++$i) {
-            $this->renderPlotBar($i, $dimensions);
-        }
-    }
-
-    private function renderScatterChart($groupCount): void
-    {
-        $this->renderCartesianPlotArea('linlin');
-
-        for ($i = 0; $i < $groupCount; ++$i) {
-            $this->renderPlotScatter($i, false);
-        }
-    }
-
-    private function renderBubbleChart($groupCount): void
-    {
-        $this->renderCartesianPlotArea('linlin');
-
-        for ($i = 0; $i < $groupCount; ++$i) {
-            $this->renderPlotScatter($i, true);
-        }
-    }
-
-    private function renderPieChart($groupCount, $dimensions = '2d', $doughnut = false, $multiplePlots = false): void
-    {
-        $this->renderPiePlotArea();
-
-        $iLimit = ($multiplePlots) ? $groupCount : 1;
-        for ($groupID = 0; $groupID < $iLimit; ++$groupID) {
-            $grouping = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
-            $exploded = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
-            $datasetLabels = [];
-            if ($groupID == 0) {
-                $labelCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex(0)->getPointCount();
-                if ($labelCount > 0) {
-                    $datasetLabels = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
-                    $datasetLabels = $this->formatDataSetLabels($groupID, $datasetLabels, $labelCount);
-                }
-            }
-
-            $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
-            $seriesPlots = [];
-            //    For pie charts, we only display the first series: doughnut charts generally display all series
-            $jLimit = ($multiplePlots) ? $seriesCount : 1;
-            //    Loop through each data series in turn
-            for ($j = 0; $j < $jLimit; ++$j) {
-                $dataValues = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($j)->getDataValues();
-
-                //    Fill in any missing values in the $dataValues array
-                $testCurrentIndex = 0;
-                foreach ($dataValues as $k => $dataValue) {
-                    while ($k != $testCurrentIndex) {
-                        $dataValues[$testCurrentIndex] = null;
-                        ++$testCurrentIndex;
-                    }
-                    ++$testCurrentIndex;
-                }
-
-                if ($dimensions == '3d') {
-                    $seriesPlot = new PiePlot3D($dataValues);
-                } else {
-                    if ($doughnut) {
-                        $seriesPlot = new PiePlotC($dataValues);
-                    } else {
-                        $seriesPlot = new PiePlot($dataValues);
-                    }
-                }
-
-                if ($multiplePlots) {
-                    $seriesPlot->SetSize(($jLimit - $j) / ($jLimit * 4));
-                }
-
-                if ($doughnut) {
-                    $seriesPlot->SetMidColor('white');
-                }
-
-                $seriesPlot->SetColor(self::$colourSet[self::$plotColour++]);
-                if (count($datasetLabels) > 0) {
-                    $seriesPlot->SetLabels(array_fill(0, count($datasetLabels), ''));
-                }
-                if ($dimensions != '3d') {
-                    $seriesPlot->SetGuideLines(false);
-                }
-                if ($j == 0) {
-                    if ($exploded) {
-                        $seriesPlot->ExplodeAll();
-                    }
-                    $seriesPlot->SetLegends($datasetLabels);
-                }
-
-                $this->graph->Add($seriesPlot);
-            }
-        }
-    }
-
-    private function renderRadarChart($groupCount): void
-    {
-        $this->renderRadarPlotArea();
-
-        for ($groupID = 0; $groupID < $groupCount; ++$groupID) {
-            $this->renderPlotRadar($groupID);
-        }
-    }
-
-    private function renderStockChart($groupCount): void
-    {
-        $this->renderCartesianPlotArea('intint');
-
-        for ($groupID = 0; $groupID < $groupCount; ++$groupID) {
-            $this->renderPlotStock($groupID);
-        }
-    }
-
-    private function renderContourChart($groupCount, $dimensions): void
-    {
-        $this->renderCartesianPlotArea('intint');
-
-        for ($i = 0; $i < $groupCount; ++$i) {
-            $this->renderPlotContour($i);
-        }
-    }
-
-    private function renderCombinationChart($groupCount, $dimensions, $outputDestination)
-    {
-        $this->renderCartesianPlotArea();
-
-        for ($i = 0; $i < $groupCount; ++$i) {
-            $dimensions = null;
-            $chartType = $this->chart->getPlotArea()->getPlotGroupByIndex($i)->getPlotType();
-            switch ($chartType) {
-                case 'area3DChart':
-                    $dimensions = '3d';
-                // no break
-                case 'areaChart':
-                    $this->renderPlotLine($i, true, true, $dimensions);
-
-                    break;
-                case 'bar3DChart':
-                    $dimensions = '3d';
-                // no break
-                case 'barChart':
-                    $this->renderPlotBar($i, $dimensions);
-
-                    break;
-                case 'line3DChart':
-                    $dimensions = '3d';
-                // no break
-                case 'lineChart':
-                    $this->renderPlotLine($i, false, true, $dimensions);
-
-                    break;
-                case 'scatterChart':
-                    $this->renderPlotScatter($i, false);
-
-                    break;
-                case 'bubbleChart':
-                    $this->renderPlotScatter($i, true);
-
-                    break;
-                default:
-                    $this->graph = null;
-
-                    return false;
-            }
-        }
-
-        $this->renderLegend();
-
-        $this->graph->Stroke($outputDestination);
-
-        return true;
-    }
-
-    public function render($outputDestination)
-    {
-        self::$plotColour = 0;
-
-        $groupCount = $this->chart->getPlotArea()->getPlotGroupCount();
-
-        $dimensions = null;
-        if ($groupCount == 1) {
-            $chartType = $this->chart->getPlotArea()->getPlotGroupByIndex(0)->getPlotType();
-        } else {
-            $chartTypes = [];
-            for ($i = 0; $i < $groupCount; ++$i) {
-                $chartTypes[] = $this->chart->getPlotArea()->getPlotGroupByIndex($i)->getPlotType();
-            }
-            $chartTypes = array_unique($chartTypes);
-            if (count($chartTypes) == 1) {
-                $chartType = array_pop($chartTypes);
-            } elseif (count($chartTypes) == 0) {
-                echo 'Chart is not yet implemented<br />';
-
-                return false;
-            } else {
-                return $this->renderCombinationChart($groupCount, $dimensions, $outputDestination);
-            }
-        }
-
-        switch ($chartType) {
-            case 'area3DChart':
-                $dimensions = '3d';
-            // no break
-            case 'areaChart':
-                $this->renderAreaChart($groupCount, $dimensions);
-
-                break;
-            case 'bar3DChart':
-                $dimensions = '3d';
-            // no break
-            case 'barChart':
-                $this->renderBarChart($groupCount, $dimensions);
-
-                break;
-            case 'line3DChart':
-                $dimensions = '3d';
-            // no break
-            case 'lineChart':
-                $this->renderLineChart($groupCount, $dimensions);
-
-                break;
-            case 'pie3DChart':
-                $dimensions = '3d';
-            // no break
-            case 'pieChart':
-                $this->renderPieChart($groupCount, $dimensions, false, false);
-
-                break;
-            case 'doughnut3DChart':
-                $dimensions = '3d';
-            // no break
-            case 'doughnutChart':
-                $this->renderPieChart($groupCount, $dimensions, true, true);
-
-                break;
-            case 'scatterChart':
-                $this->renderScatterChart($groupCount);
-
-                break;
-            case 'bubbleChart':
-                $this->renderBubbleChart($groupCount);
-
-                break;
-            case 'radarChart':
-                $this->renderRadarChart($groupCount);
-
-                break;
-            case 'surface3DChart':
-                $dimensions = '3d';
-            // no break
-            case 'surfaceChart':
-                $this->renderContourChart($groupCount, $dimensions);
-
-                break;
-            case 'stockChart':
-                $this->renderStockChart($groupCount);
-
-                break;
-            default:
-                echo $chartType . ' is not yet implemented<br />';
-
-                return false;
-        }
-        $this->renderLegend();
-
-        $this->graph->Stroke($outputDestination);
-
-        return true;
-    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/JpGraphRendererBase.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/JpGraphRendererBase.php
new file mode 100644
index 0000000000..151d5b58c7
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/JpGraphRendererBase.php
@@ -0,0 +1,886 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Chart\Renderer;
+
+use AccBarPlot;
+use AccLinePlot;
+use BarPlot;
+use ContourPlot;
+use Graph;
+use GroupBarPlot;
+use LinePlot;
+use PhpOffice\PhpSpreadsheet\Chart\Chart;
+use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+use PieGraph;
+use PiePlot;
+use PiePlot3D;
+use PiePlotC;
+use RadarGraph;
+use RadarPlot;
+use ScatterPlot;
+use Spline;
+use StockPlot;
+
+/**
+ * Base class for different Jpgraph implementations as charts renderer.
+ */
+abstract class JpGraphRendererBase implements IRenderer
+{
+    private const DEFAULT_WIDTH = 640.0;
+
+    private const DEFAULT_HEIGHT = 480.0;
+
+    private static $colourSet = [
+        'mediumpurple1', 'palegreen3', 'gold1', 'cadetblue1',
+        'darkmagenta', 'coral', 'dodgerblue3', 'eggplant',
+        'mediumblue', 'magenta', 'sandybrown', 'cyan',
+        'firebrick1', 'forestgreen', 'deeppink4', 'darkolivegreen',
+        'goldenrod2',
+    ];
+
+    private static array $markSet;
+
+    private Chart $chart;
+
+    private $graph;
+
+    private static $plotColour = 0;
+
+    private static $plotMark = 0;
+
+    /**
+     * Create a new jpgraph.
+     */
+    public function __construct(Chart $chart)
+    {
+        static::init();
+        $this->graph = null;
+        $this->chart = $chart;
+
+        self::$markSet = [
+            'diamond' => MARK_DIAMOND,
+            'square' => MARK_SQUARE,
+            'triangle' => MARK_UTRIANGLE,
+            'x' => MARK_X,
+            'star' => MARK_STAR,
+            'dot' => MARK_FILLEDCIRCLE,
+            'dash' => MARK_DTRIANGLE,
+            'circle' => MARK_CIRCLE,
+            'plus' => MARK_CROSS,
+        ];
+    }
+
+    private function getGraphWidth(): float
+    {
+        return $this->chart->getRenderedWidth() ?? self::DEFAULT_WIDTH;
+    }
+
+    private function getGraphHeight(): float
+    {
+        return $this->chart->getRenderedHeight() ?? self::DEFAULT_HEIGHT;
+    }
+
+    /**
+     * This method should be overriden in descendants to do real JpGraph library initialization.
+     */
+    abstract protected static function init(): void;
+
+    private function formatPointMarker($seriesPlot, $markerID)
+    {
+        $plotMarkKeys = array_keys(self::$markSet);
+        if ($markerID === null) {
+            //    Use default plot marker (next marker in the series)
+            self::$plotMark %= count(self::$markSet);
+            $seriesPlot->mark->SetType(self::$markSet[$plotMarkKeys[self::$plotMark++]]);
+        } elseif ($markerID !== 'none') {
+            //    Use specified plot marker (if it exists)
+            if (isset(self::$markSet[$markerID])) {
+                $seriesPlot->mark->SetType(self::$markSet[$markerID]);
+            } else {
+                //    If the specified plot marker doesn't exist, use default plot marker (next marker in the series)
+                self::$plotMark %= count(self::$markSet);
+                $seriesPlot->mark->SetType(self::$markSet[$plotMarkKeys[self::$plotMark++]]);
+            }
+        } else {
+            //    Hide plot marker
+            $seriesPlot->mark->Hide();
+        }
+        $seriesPlot->mark->SetColor(self::$colourSet[self::$plotColour]);
+        $seriesPlot->mark->SetFillColor(self::$colourSet[self::$plotColour]);
+        $seriesPlot->SetColor(self::$colourSet[self::$plotColour++]);
+
+        return $seriesPlot;
+    }
+
+    private function formatDataSetLabels(int $groupID, array $datasetLabels, $rotation = '')
+    {
+        $datasetLabelFormatCode = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getFormatCode() ?? '';
+        //    Retrieve any label formatting code
+        $datasetLabelFormatCode = stripslashes($datasetLabelFormatCode);
+
+        $testCurrentIndex = 0;
+        foreach ($datasetLabels as $i => $datasetLabel) {
+            if (is_array($datasetLabel)) {
+                if ($rotation == 'bar') {
+                    $datasetLabels[$i] = implode(' ', $datasetLabel);
+                } else {
+                    $datasetLabel = array_reverse($datasetLabel);
+                    $datasetLabels[$i] = implode("\n", $datasetLabel);
+                }
+            } else {
+                //    Format labels according to any formatting code
+                if ($datasetLabelFormatCode !== null) {
+                    $datasetLabels[$i] = NumberFormat::toFormattedString($datasetLabel, $datasetLabelFormatCode);
+                }
+            }
+            ++$testCurrentIndex;
+        }
+
+        return $datasetLabels;
+    }
+
+    private function percentageSumCalculation(int $groupID, $seriesCount)
+    {
+        $sumValues = [];
+        //    Adjust our values to a percentage value across all series in the group
+        for ($i = 0; $i < $seriesCount; ++$i) {
+            if ($i == 0) {
+                $sumValues = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
+            } else {
+                $nextValues = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
+                foreach ($nextValues as $k => $value) {
+                    if (isset($sumValues[$k])) {
+                        $sumValues[$k] += $value;
+                    } else {
+                        $sumValues[$k] = $value;
+                    }
+                }
+            }
+        }
+
+        return $sumValues;
+    }
+
+    private function percentageAdjustValues(array $dataValues, array $sumValues)
+    {
+        foreach ($dataValues as $k => $dataValue) {
+            $dataValues[$k] = $dataValue / $sumValues[$k] * 100;
+        }
+
+        return $dataValues;
+    }
+
+    private function getCaption($captionElement)
+    {
+        //    Read any caption
+        $caption = ($captionElement !== null) ? $captionElement->getCaption() : null;
+        //    Test if we have a title caption to display
+        if ($caption !== null) {
+            //    If we do, it could be a plain string or an array
+            if (is_array($caption)) {
+                //    Implode an array to a plain string
+                $caption = implode('', $caption);
+            }
+        }
+
+        return $caption;
+    }
+
+    private function renderTitle(): void
+    {
+        $title = $this->getCaption($this->chart->getTitle());
+        if ($title !== null) {
+            $this->graph->title->Set($title);
+        }
+    }
+
+    private function renderLegend(): void
+    {
+        $legend = $this->chart->getLegend();
+        if ($legend !== null) {
+            $legendPosition = $legend->getPosition();
+            switch ($legendPosition) {
+                case 'r':
+                    $this->graph->legend->SetPos(0.01, 0.5, 'right', 'center'); //    right
+                    $this->graph->legend->SetColumns(1);
+
+                    break;
+                case 'l':
+                    $this->graph->legend->SetPos(0.01, 0.5, 'left', 'center'); //    left
+                    $this->graph->legend->SetColumns(1);
+
+                    break;
+                case 't':
+                    $this->graph->legend->SetPos(0.5, 0.01, 'center', 'top'); //    top
+
+                    break;
+                case 'b':
+                    $this->graph->legend->SetPos(0.5, 0.99, 'center', 'bottom'); //    bottom
+
+                    break;
+                default:
+                    $this->graph->legend->SetPos(0.01, 0.01, 'right', 'top'); //    top-right
+                    $this->graph->legend->SetColumns(1);
+
+                    break;
+            }
+        } else {
+            $this->graph->legend->Hide();
+        }
+    }
+
+    private function renderCartesianPlotArea(string $type = 'textlin'): void
+    {
+        $this->graph = new Graph($this->getGraphWidth(), $this->getGraphHeight());
+        $this->graph->SetScale($type);
+
+        $this->renderTitle();
+
+        //    Rotate for bar rather than column chart
+        $rotation = $this->chart->getPlotArea()->getPlotGroupByIndex(0)->getPlotDirection();
+        $reverse = $rotation == 'bar';
+
+        $xAxisLabel = $this->chart->getXAxisLabel();
+        if ($xAxisLabel !== null) {
+            $title = $this->getCaption($xAxisLabel);
+            if ($title !== null) {
+                $this->graph->xaxis->SetTitle($title, 'center');
+                $this->graph->xaxis->title->SetMargin(35);
+                if ($reverse) {
+                    $this->graph->xaxis->title->SetAngle(90);
+                    $this->graph->xaxis->title->SetMargin(90);
+                }
+            }
+        }
+
+        $yAxisLabel = $this->chart->getYAxisLabel();
+        if ($yAxisLabel !== null) {
+            $title = $this->getCaption($yAxisLabel);
+            if ($title !== null) {
+                $this->graph->yaxis->SetTitle($title, 'center');
+                if ($reverse) {
+                    $this->graph->yaxis->title->SetAngle(0);
+                    $this->graph->yaxis->title->SetMargin(-55);
+                }
+            }
+        }
+    }
+
+    private function renderPiePlotArea(): void
+    {
+        $this->graph = new PieGraph($this->getGraphWidth(), $this->getGraphHeight());
+
+        $this->renderTitle();
+    }
+
+    private function renderRadarPlotArea(): void
+    {
+        $this->graph = new RadarGraph($this->getGraphWidth(), $this->getGraphHeight());
+        $this->graph->SetScale('lin');
+
+        $this->renderTitle();
+    }
+
+    private function getDataLabel(int $groupId, int $index): mixed
+    {
+        $plotLabel = $this->chart->getPlotArea()->getPlotGroupByIndex($groupId)->getPlotLabelByIndex($index);
+        if (!$plotLabel) {
+            return '';
+        }
+
+        return $plotLabel->getDataValue();
+    }
+
+    private function renderPlotLine(int $groupID, bool $filled = false, bool $combination = false): void
+    {
+        $grouping = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
+
+        $index = array_keys($this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotOrder())[0];
+        $labelCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($index)->getPointCount();
+        if ($labelCount > 0) {
+            $datasetLabels = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
+            $datasetLabels = $this->formatDataSetLabels($groupID, $datasetLabels);
+            $this->graph->xaxis->SetTickLabels($datasetLabels);
+        }
+
+        $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
+        $seriesPlots = [];
+        if ($grouping == 'percentStacked') {
+            $sumValues = $this->percentageSumCalculation($groupID, $seriesCount);
+        } else {
+            $sumValues = [];
+        }
+
+        //    Loop through each data series in turn
+        for ($i = 0; $i < $seriesCount; ++$i) {
+            $index = array_keys($this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotOrder())[$i];
+            $dataValues = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($index)->getDataValues();
+            $marker = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($index)->getPointMarker();
+
+            if ($grouping == 'percentStacked') {
+                $dataValues = $this->percentageAdjustValues($dataValues, $sumValues);
+            }
+
+            //    Fill in any missing values in the $dataValues array
+            $testCurrentIndex = 0;
+            foreach ($dataValues as $k => $dataValue) {
+                while ($k != $testCurrentIndex) {
+                    $dataValues[$testCurrentIndex] = null;
+                    ++$testCurrentIndex;
+                }
+                ++$testCurrentIndex;
+            }
+
+            $seriesPlot = new LinePlot($dataValues);
+            if ($combination) {
+                $seriesPlot->SetBarCenter();
+            }
+
+            if ($filled) {
+                $seriesPlot->SetFilled(true);
+                $seriesPlot->SetColor('black');
+                $seriesPlot->SetFillColor(self::$colourSet[self::$plotColour++]);
+            } else {
+                //    Set the appropriate plot marker
+                $this->formatPointMarker($seriesPlot, $marker);
+            }
+
+            $seriesPlot->SetLegend($this->getDataLabel($groupID, $index));
+
+            $seriesPlots[] = $seriesPlot;
+        }
+
+        if ($grouping == 'standard') {
+            $groupPlot = $seriesPlots;
+        } else {
+            $groupPlot = new AccLinePlot($seriesPlots);
+        }
+        $this->graph->Add($groupPlot);
+    }
+
+    private function renderPlotBar(int $groupID, ?string $dimensions = '2d'): void
+    {
+        $rotation = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotDirection();
+        //    Rotate for bar rather than column chart
+        if (($groupID == 0) && ($rotation == 'bar')) {
+            $this->graph->Set90AndMargin();
+        }
+        $grouping = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
+
+        $index = array_keys($this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotOrder())[0];
+        $labelCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($index)->getPointCount();
+        if ($labelCount > 0) {
+            $datasetLabels = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
+            $datasetLabels = $this->formatDataSetLabels($groupID, $datasetLabels, $rotation);
+            //    Rotate for bar rather than column chart
+            if ($rotation == 'bar') {
+                $datasetLabels = array_reverse($datasetLabels);
+                $this->graph->yaxis->SetPos('max');
+                $this->graph->yaxis->SetLabelAlign('center', 'top');
+                $this->graph->yaxis->SetLabelSide(SIDE_RIGHT);
+            }
+            $this->graph->xaxis->SetTickLabels($datasetLabels);
+        }
+
+        $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
+        $seriesPlots = [];
+        if ($grouping == 'percentStacked') {
+            $sumValues = $this->percentageSumCalculation($groupID, $seriesCount);
+        } else {
+            $sumValues = [];
+        }
+
+        //    Loop through each data series in turn
+        for ($j = 0; $j < $seriesCount; ++$j) {
+            $index = array_keys($this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotOrder())[$j];
+            $dataValues = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($index)->getDataValues();
+            if ($grouping == 'percentStacked') {
+                $dataValues = $this->percentageAdjustValues($dataValues, $sumValues);
+            }
+
+            //    Fill in any missing values in the $dataValues array
+            $testCurrentIndex = 0;
+            foreach ($dataValues as $k => $dataValue) {
+                while ($k != $testCurrentIndex) {
+                    $dataValues[$testCurrentIndex] = null;
+                    ++$testCurrentIndex;
+                }
+                ++$testCurrentIndex;
+            }
+
+            //    Reverse the $dataValues order for bar rather than column chart
+            if ($rotation == 'bar') {
+                $dataValues = array_reverse($dataValues);
+            }
+            $seriesPlot = new BarPlot($dataValues);
+            $seriesPlot->SetColor('black');
+            $seriesPlot->SetFillColor(self::$colourSet[self::$plotColour++]);
+            if ($dimensions == '3d') {
+                $seriesPlot->SetShadow();
+            }
+
+            $seriesPlot->SetLegend($this->getDataLabel($groupID, $j));
+
+            $seriesPlots[] = $seriesPlot;
+        }
+        //    Reverse the plot order for bar rather than column chart
+        if (($rotation == 'bar') && ($grouping != 'percentStacked')) {
+            $seriesPlots = array_reverse($seriesPlots);
+        }
+
+        if ($grouping == 'clustered') {
+            $groupPlot = new GroupBarPlot($seriesPlots);
+        } elseif ($grouping == 'standard') {
+            $groupPlot = new GroupBarPlot($seriesPlots);
+        } else {
+            $groupPlot = new AccBarPlot($seriesPlots);
+            if ($dimensions == '3d') {
+                $groupPlot->SetShadow();
+            }
+        }
+
+        $this->graph->Add($groupPlot);
+    }
+
+    private function renderPlotScatter(int $groupID, bool $bubble): void
+    {
+        $scatterStyle = $bubbleSize = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
+
+        $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
+
+        //    Loop through each data series in turn
+        for ($i = 0; $i < $seriesCount; ++$i) {
+            $plotCategoryByIndex = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex($i);
+            if ($plotCategoryByIndex === false) {
+                $plotCategoryByIndex = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0);
+            }
+            $dataValuesY = $plotCategoryByIndex->getDataValues();
+            $dataValuesX = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
+
+            $redoDataValuesY = true;
+            if ($bubble) {
+                if (!$bubbleSize) {
+                    $bubbleSize = '10';
+                }
+                $redoDataValuesY = false;
+                foreach ($dataValuesY as $dataValueY) {
+                    if (!is_int($dataValueY) && !is_float($dataValueY)) {
+                        $redoDataValuesY = true;
+
+                        break;
+                    }
+                }
+            }
+            if ($redoDataValuesY) {
+                foreach ($dataValuesY as $k => $dataValueY) {
+                    $dataValuesY[$k] = $k;
+                }
+            }
+
+            $seriesPlot = new ScatterPlot($dataValuesX, $dataValuesY);
+            if ($scatterStyle == 'lineMarker') {
+                $seriesPlot->SetLinkPoints();
+                $seriesPlot->link->SetColor(self::$colourSet[self::$plotColour]);
+            } elseif ($scatterStyle == 'smoothMarker') {
+                $spline = new Spline($dataValuesY, $dataValuesX);
+                [$splineDataY, $splineDataX] = $spline->Get(count($dataValuesX) * $this->getGraphWidth() / 20);
+                $lplot = new LinePlot($splineDataX, $splineDataY);
+                $lplot->SetColor(self::$colourSet[self::$plotColour]);
+
+                $this->graph->Add($lplot);
+            }
+
+            if ($bubble) {
+                $this->formatPointMarker($seriesPlot, 'dot');
+                $seriesPlot->mark->SetColor('black');
+                $seriesPlot->mark->SetSize($bubbleSize);
+            } else {
+                $marker = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getPointMarker();
+                $this->formatPointMarker($seriesPlot, $marker);
+            }
+            $seriesPlot->SetLegend($this->getDataLabel($groupID, $i));
+
+            $this->graph->Add($seriesPlot);
+        }
+    }
+
+    private function renderPlotRadar(int $groupID): void
+    {
+        $radarStyle = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
+
+        $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
+
+        //    Loop through each data series in turn
+        for ($i = 0; $i < $seriesCount; ++$i) {
+            $dataValuesY = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex($i)->getDataValues();
+            $dataValuesX = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
+            $marker = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getPointMarker();
+
+            $dataValues = [];
+            foreach ($dataValuesY as $k => $dataValueY) {
+                $dataValues[$k] = is_array($dataValueY) ? implode(' ', array_reverse($dataValueY)) : $dataValueY;
+            }
+            $tmp = array_shift($dataValues);
+            $dataValues[] = $tmp;
+            $tmp = array_shift($dataValuesX);
+            $dataValuesX[] = $tmp;
+
+            $this->graph->SetTitles(array_reverse($dataValues));
+
+            $seriesPlot = new RadarPlot(array_reverse($dataValuesX));
+
+            $seriesPlot->SetColor(self::$colourSet[self::$plotColour++]);
+            if ($radarStyle == 'filled') {
+                $seriesPlot->SetFillColor(self::$colourSet[self::$plotColour]);
+            }
+            $this->formatPointMarker($seriesPlot, $marker);
+            $seriesPlot->SetLegend($this->getDataLabel($groupID, $i));
+
+            $this->graph->Add($seriesPlot);
+        }
+    }
+
+    private function renderPlotContour(int $groupID): void
+    {
+        $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
+
+        $dataValues = [];
+        //    Loop through each data series in turn
+        for ($i = 0; $i < $seriesCount; ++$i) {
+            $dataValuesX = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
+
+            $dataValues[$i] = $dataValuesX;
+        }
+        $seriesPlot = new ContourPlot($dataValues);
+
+        $this->graph->Add($seriesPlot);
+    }
+
+    private function renderPlotStock(int $groupID): void
+    {
+        $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
+        $plotOrder = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotOrder();
+
+        $dataValues = [];
+        //    Loop through each data series in turn and build the plot arrays
+        foreach ($plotOrder as $i => $v) {
+            $dataValuesX = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($v);
+            if ($dataValuesX === false) {
+                continue;
+            }
+            $dataValuesX = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($v)->getDataValues();
+            foreach ($dataValuesX as $j => $dataValueX) {
+                $dataValues[$plotOrder[$i]][$j] = $dataValueX;
+            }
+        }
+        if (empty($dataValues)) {
+            return;
+        }
+
+        $dataValuesPlot = [];
+        // Flatten the plot arrays to a single dimensional array to work with jpgraph
+        $jMax = count($dataValues[0]);
+        for ($j = 0; $j < $jMax; ++$j) {
+            for ($i = 0; $i < $seriesCount; ++$i) {
+                $dataValuesPlot[] = $dataValues[$i][$j] ?? null;
+            }
+        }
+
+        // Set the x-axis labels
+        $labelCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex(0)->getPointCount();
+        if ($labelCount > 0) {
+            $datasetLabels = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
+            $datasetLabels = $this->formatDataSetLabels($groupID, $datasetLabels);
+            $this->graph->xaxis->SetTickLabels($datasetLabels);
+        }
+
+        $seriesPlot = new StockPlot($dataValuesPlot);
+        $seriesPlot->SetWidth(20);
+
+        $this->graph->Add($seriesPlot);
+    }
+
+    private function renderAreaChart($groupCount): void
+    {
+        $this->renderCartesianPlotArea();
+
+        for ($i = 0; $i < $groupCount; ++$i) {
+            $this->renderPlotLine($i, true, false);
+        }
+    }
+
+    private function renderLineChart($groupCount): void
+    {
+        $this->renderCartesianPlotArea();
+
+        for ($i = 0; $i < $groupCount; ++$i) {
+            $this->renderPlotLine($i, false, false);
+        }
+    }
+
+    private function renderBarChart($groupCount, ?string $dimensions = '2d'): void
+    {
+        $this->renderCartesianPlotArea();
+
+        for ($i = 0; $i < $groupCount; ++$i) {
+            $this->renderPlotBar($i, $dimensions);
+        }
+    }
+
+    private function renderScatterChart($groupCount): void
+    {
+        $this->renderCartesianPlotArea('linlin');
+
+        for ($i = 0; $i < $groupCount; ++$i) {
+            $this->renderPlotScatter($i, false);
+        }
+    }
+
+    private function renderBubbleChart($groupCount): void
+    {
+        $this->renderCartesianPlotArea('linlin');
+
+        for ($i = 0; $i < $groupCount; ++$i) {
+            $this->renderPlotScatter($i, true);
+        }
+    }
+
+    private function renderPieChart($groupCount, ?string $dimensions = '2d', bool $doughnut = false, bool $multiplePlots = false): void
+    {
+        $this->renderPiePlotArea();
+
+        $iLimit = ($multiplePlots) ? $groupCount : 1;
+        for ($groupID = 0; $groupID < $iLimit; ++$groupID) {
+            $exploded = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
+            $datasetLabels = [];
+            if ($groupID == 0) {
+                $labelCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex(0)->getPointCount();
+                if ($labelCount > 0) {
+                    $datasetLabels = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
+                    $datasetLabels = $this->formatDataSetLabels($groupID, $datasetLabels);
+                }
+            }
+
+            $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
+            //    For pie charts, we only display the first series: doughnut charts generally display all series
+            $jLimit = ($multiplePlots) ? $seriesCount : 1;
+            //    Loop through each data series in turn
+            for ($j = 0; $j < $jLimit; ++$j) {
+                $dataValues = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($j)->getDataValues();
+
+                //    Fill in any missing values in the $dataValues array
+                $testCurrentIndex = 0;
+                foreach ($dataValues as $k => $dataValue) {
+                    while ($k != $testCurrentIndex) {
+                        $dataValues[$testCurrentIndex] = null;
+                        ++$testCurrentIndex;
+                    }
+                    ++$testCurrentIndex;
+                }
+
+                if ($dimensions == '3d') {
+                    $seriesPlot = new PiePlot3D($dataValues);
+                } else {
+                    if ($doughnut) {
+                        $seriesPlot = new PiePlotC($dataValues);
+                    } else {
+                        $seriesPlot = new PiePlot($dataValues);
+                    }
+                }
+
+                if ($multiplePlots) {
+                    $seriesPlot->SetSize(($jLimit - $j) / ($jLimit * 4));
+                }
+
+                if ($doughnut && method_exists($seriesPlot, 'SetMidColor')) {
+                    $seriesPlot->SetMidColor('white');
+                }
+
+                $seriesPlot->SetColor(self::$colourSet[self::$plotColour++]);
+                if (count($datasetLabels) > 0) {
+                    $seriesPlot->SetLabels(array_fill(0, count($datasetLabels), ''));
+                }
+                if ($dimensions != '3d') {
+                    $seriesPlot->SetGuideLines(false);
+                }
+                if ($j == 0) {
+                    if ($exploded) {
+                        $seriesPlot->ExplodeAll();
+                    }
+                    $seriesPlot->SetLegends($datasetLabels);
+                }
+
+                $this->graph->Add($seriesPlot);
+            }
+        }
+    }
+
+    private function renderRadarChart($groupCount): void
+    {
+        $this->renderRadarPlotArea();
+
+        for ($groupID = 0; $groupID < $groupCount; ++$groupID) {
+            $this->renderPlotRadar($groupID);
+        }
+    }
+
+    private function renderStockChart($groupCount): void
+    {
+        $this->renderCartesianPlotArea('intint');
+
+        for ($groupID = 0; $groupID < $groupCount; ++$groupID) {
+            $this->renderPlotStock($groupID);
+        }
+    }
+
+    private function renderContourChart($groupCount): void
+    {
+        $this->renderCartesianPlotArea('intint');
+
+        for ($i = 0; $i < $groupCount; ++$i) {
+            $this->renderPlotContour($i);
+        }
+    }
+
+    private function renderCombinationChart($groupCount, $outputDestination): bool
+    {
+        $this->renderCartesianPlotArea();
+
+        for ($i = 0; $i < $groupCount; ++$i) {
+            $dimensions = null;
+            $chartType = $this->chart->getPlotArea()->getPlotGroupByIndex($i)->getPlotType();
+            switch ($chartType) {
+                case 'area3DChart':
+                case 'areaChart':
+                    $this->renderPlotLine($i, true, true);
+
+                    break;
+                case 'bar3DChart':
+                    $dimensions = '3d';
+                    // no break
+                case 'barChart':
+                    $this->renderPlotBar($i, $dimensions);
+
+                    break;
+                case 'line3DChart':
+                case 'lineChart':
+                    $this->renderPlotLine($i, false, true);
+
+                    break;
+                case 'scatterChart':
+                    $this->renderPlotScatter($i, false);
+
+                    break;
+                case 'bubbleChart':
+                    $this->renderPlotScatter($i, true);
+
+                    break;
+                default:
+                    $this->graph = null;
+
+                    return false;
+            }
+        }
+
+        $this->renderLegend();
+
+        $this->graph->Stroke($outputDestination);
+
+        return true;
+    }
+
+    public function render(?string $outputDestination): bool
+    {
+        self::$plotColour = 0;
+
+        $groupCount = $this->chart->getPlotArea()->getPlotGroupCount();
+
+        $dimensions = null;
+        if ($groupCount == 1) {
+            $chartType = $this->chart->getPlotArea()->getPlotGroupByIndex(0)->getPlotType();
+        } else {
+            $chartTypes = [];
+            for ($i = 0; $i < $groupCount; ++$i) {
+                $chartTypes[] = $this->chart->getPlotArea()->getPlotGroupByIndex($i)->getPlotType();
+            }
+            $chartTypes = array_unique($chartTypes);
+            if (count($chartTypes) == 1) {
+                $chartType = array_pop($chartTypes);
+            } elseif (count($chartTypes) == 0) {
+                echo 'Chart is not yet implemented<br />';
+
+                return false;
+            } else {
+                return $this->renderCombinationChart($groupCount, $outputDestination);
+            }
+        }
+
+        switch ($chartType) {
+            case 'area3DChart':
+                $dimensions = '3d';
+                // no break
+            case 'areaChart':
+                $this->renderAreaChart($groupCount);
+
+                break;
+            case 'bar3DChart':
+                $dimensions = '3d';
+                // no break
+            case 'barChart':
+                $this->renderBarChart($groupCount, $dimensions);
+
+                break;
+            case 'line3DChart':
+                $dimensions = '3d';
+                // no break
+            case 'lineChart':
+                $this->renderLineChart($groupCount);
+
+                break;
+            case 'pie3DChart':
+                $dimensions = '3d';
+                // no break
+            case 'pieChart':
+                $this->renderPieChart($groupCount, $dimensions, false, false);
+
+                break;
+            case 'doughnut3DChart':
+                $dimensions = '3d';
+                // no break
+            case 'doughnutChart':
+                $this->renderPieChart($groupCount, $dimensions, true, true);
+
+                break;
+            case 'scatterChart':
+                $this->renderScatterChart($groupCount);
+
+                break;
+            case 'bubbleChart':
+                $this->renderBubbleChart($groupCount);
+
+                break;
+            case 'radarChart':
+                $this->renderRadarChart($groupCount);
+
+                break;
+            case 'surface3DChart':
+            case 'surfaceChart':
+                $this->renderContourChart($groupCount);
+
+                break;
+            case 'stockChart':
+                $this->renderStockChart($groupCount);
+
+                break;
+            default:
+                echo $chartType . ' is not yet implemented<br />';
+
+                return false;
+        }
+        $this->renderLegend();
+
+        $this->graph->Stroke($outputDestination);
+
+        return true;
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/MtJpGraphRenderer.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/MtJpGraphRenderer.php
new file mode 100644
index 0000000000..9697920328
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/MtJpGraphRenderer.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Chart\Renderer;
+
+use mitoteam\jpgraph\MtJpGraph;
+
+/**
+ * Jpgraph is not officially maintained by Composer at packagist.org.
+ *
+ * This renderer implementation uses package
+ * https://packagist.org/packages/mitoteam/jpgraph
+ *
+ * This package is up to date for June 2023 and has PHP 8.2 support.
+ */
+class MtJpGraphRenderer extends JpGraphRendererBase
+{
+    protected static function init(): void
+    {
+        static $loaded = false;
+        if ($loaded) {
+            return;
+        }
+
+        MtJpGraph::load([
+            'bar',
+            'contour',
+            'line',
+            'pie',
+            'pie3d',
+            'radar',
+            'regstat',
+            'scatter',
+            'stock',
+        ], true); // enable Extended mode
+
+        $loaded = true;
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/PHP Charting Libraries.txt b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/PHP Charting Libraries.txt
index 4abab7a257..bc940600f5 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/PHP Charting Libraries.txt	
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/PHP Charting Libraries.txt	
@@ -5,7 +5,10 @@ GraPHPite
 	http://graphpite.sourceforge.net/
 
 JpGraph
-	http://www.aditus.nu/jpgraph/
+	https://jpgraph.net/
+	Used composer packages:
+        https://packagist.org/packages/jpgraph/jpgraph (\PhpOffice\PhpSpreadsheet\Chart\Renderer\JpGraph)
+        https://packagist.org/packages/mitoteam/jpgraph (\PhpOffice\PhpSpreadsheet\Chart\Renderer\MtJpGraphRenderer)
 
 LibChart
 	https://naku.dohcrew.com/libchart/pages/introduction/
@@ -17,4 +20,4 @@ TeeChart
 	https://www.steema.com/
 
 PHPGraphLib
-    http://www.ebrueggeman.com/phpgraphlib
\ No newline at end of file
+    http://www.ebrueggeman.com/phpgraphlib
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Title.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Title.php
index af9fa088bc..29ba17b6d5 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Title.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Title.php
@@ -2,51 +2,91 @@
 
 namespace PhpOffice\PhpSpreadsheet\Chart;
 
+use PhpOffice\PhpSpreadsheet\RichText\RichText;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Style\Font;
+
 class Title
 {
+    public const TITLE_CELL_REFERENCE
+        = '/^(.*)!' // beginning of string, everything up to ! is match[1]
+        . '[$]([A-Z]{1,3})' // absolute column string match[2]
+        . '[$](\d{1,7})$/i'; // absolute row string match[3]
+
     /**
      * Title Caption.
      *
-     * @var string
+     * @var array<RichText|string>|RichText|string
      */
-    private $caption;
+    private array|RichText|string $caption;
+
+    /**
+     * Allow overlay of other elements?
+     */
+    private bool $overlay = true;
 
     /**
      * Title Layout.
-     *
-     * @var Layout
      */
-    private $layout;
+    private ?Layout $layout;
+
+    private string $cellReference = '';
+
+    private ?Font $font = null;
 
     /**
      * Create a new Title.
-     *
-     * @param null|mixed $caption
      */
-    public function __construct($caption = null, ?Layout $layout = null)
+    public function __construct(array|RichText|string $caption = '', ?Layout $layout = null, bool $overlay = false)
     {
         $this->caption = $caption;
         $this->layout = $layout;
+        $this->setOverlay($overlay);
     }
 
     /**
      * Get caption.
-     *
-     * @return string
      */
-    public function getCaption()
+    public function getCaption(): array|RichText|string
     {
         return $this->caption;
     }
 
+    public function getCaptionText(?Spreadsheet $spreadsheet = null): string
+    {
+        if ($spreadsheet !== null) {
+            $caption = $this->getCalculatedTitle($spreadsheet);
+            if ($caption !== null) {
+                return $caption;
+            }
+        }
+        $caption = $this->caption;
+        if (is_string($caption)) {
+            return $caption;
+        }
+        if ($caption instanceof RichText) {
+            return $caption->getPlainText();
+        }
+        $retVal = '';
+        foreach ($caption as $textx) {
+            /** @var RichText|string $text */
+            $text = $textx;
+            if ($text instanceof RichText) {
+                $retVal .= $text->getPlainText();
+            } else {
+                $retVal .= $text;
+            }
+        }
+
+        return $retVal;
+    }
+
     /**
      * Set caption.
      *
-     * @param string $caption
-     *
      * @return $this
      */
-    public function setCaption($caption)
+    public function setCaption(array|RichText|string $caption): static
     {
         $this->caption = $caption;
 
@@ -54,12 +94,78 @@ public function setCaption($caption)
     }
 
     /**
-     * Get Layout.
-     *
-     * @return Layout
+     * Get allow overlay of other elements?
      */
-    public function getLayout()
+    public function getOverlay(): bool
+    {
+        return $this->overlay;
+    }
+
+    /**
+     * Set allow overlay of other elements?
+     */
+    public function setOverlay(bool $overlay): self
+    {
+        $this->overlay = $overlay;
+
+        return $this;
+    }
+
+    public function getLayout(): ?Layout
     {
         return $this->layout;
     }
+
+    public function setCellReference(string $cellReference): self
+    {
+        $this->cellReference = $cellReference;
+
+        return $this;
+    }
+
+    public function getCellReference(): string
+    {
+        return $this->cellReference;
+    }
+
+    public function getCalculatedTitle(?Spreadsheet $spreadsheet): ?string
+    {
+        preg_match(self::TITLE_CELL_REFERENCE, $this->cellReference, $matches);
+        if (count($matches) === 0 || $spreadsheet === null) {
+            return null;
+        }
+        $sheetName = preg_replace("/^'(.*)'$/", '$1', $matches[1]) ?? '';
+
+        return $spreadsheet->getSheetByName($sheetName)?->getCell($matches[2] . $matches[3])?->getFormattedValue();
+    }
+
+    public function getFont(): ?Font
+    {
+        return $this->font;
+    }
+
+    public function setFont(?Font $font): self
+    {
+        $this->font = $font;
+
+        return $this;
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $this->layout = ($this->layout === null) ? null : clone $this->layout;
+        $this->font = ($this->font === null) ? null : clone $this->font;
+        if (is_array($this->caption)) {
+            $captions = $this->caption;
+            $this->caption = [];
+            foreach ($captions as $caption) {
+                $this->caption[] = is_object($caption) ? (clone $caption) : $caption;
+            }
+        } else {
+            $this->caption = is_object($this->caption) ? (clone $this->caption) : $this->caption;
+        }
+    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/TrendLine.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/TrendLine.php
new file mode 100644
index 0000000000..5814fea470
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/TrendLine.php
@@ -0,0 +1,217 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Chart;
+
+class TrendLine extends Properties
+{
+    const TRENDLINE_EXPONENTIAL = 'exp';
+    const TRENDLINE_LINEAR = 'linear';
+    const TRENDLINE_LOGARITHMIC = 'log';
+    const TRENDLINE_POLYNOMIAL = 'poly'; // + 'order'
+    const TRENDLINE_POWER = 'power';
+    const TRENDLINE_MOVING_AVG = 'movingAvg'; // + 'period'
+    const TRENDLINE_TYPES = [
+        self::TRENDLINE_EXPONENTIAL,
+        self::TRENDLINE_LINEAR,
+        self::TRENDLINE_LOGARITHMIC,
+        self::TRENDLINE_POLYNOMIAL,
+        self::TRENDLINE_POWER,
+        self::TRENDLINE_MOVING_AVG,
+    ];
+
+    private string $trendLineType = 'linear'; // TRENDLINE_LINEAR
+
+    private int $order = 2;
+
+    private int $period = 3;
+
+    private bool $dispRSqr = false;
+
+    private bool $dispEq = false;
+
+    private string $name = '';
+
+    private float $backward = 0.0;
+
+    private float $forward = 0.0;
+
+    private float $intercept = 0.0;
+
+    /**
+     * Create a new TrendLine object.
+     */
+    public function __construct(
+        string $trendLineType = '',
+        ?int $order = null,
+        ?int $period = null,
+        bool $dispRSqr = false,
+        bool $dispEq = false,
+        ?float $backward = null,
+        ?float $forward = null,
+        ?float $intercept = null,
+        ?string $name = null
+    ) {
+        parent::__construct();
+        $this->setTrendLineProperties(
+            $trendLineType,
+            $order,
+            $period,
+            $dispRSqr,
+            $dispEq,
+            $backward,
+            $forward,
+            $intercept,
+            $name
+        );
+    }
+
+    public function getTrendLineType(): string
+    {
+        return $this->trendLineType;
+    }
+
+    public function setTrendLineType(string $trendLineType): self
+    {
+        $this->trendLineType = $trendLineType;
+
+        return $this;
+    }
+
+    public function getOrder(): int
+    {
+        return $this->order;
+    }
+
+    public function setOrder(int $order): self
+    {
+        $this->order = $order;
+
+        return $this;
+    }
+
+    public function getPeriod(): int
+    {
+        return $this->period;
+    }
+
+    public function setPeriod(int $period): self
+    {
+        $this->period = $period;
+
+        return $this;
+    }
+
+    public function getDispRSqr(): bool
+    {
+        return $this->dispRSqr;
+    }
+
+    public function setDispRSqr(bool $dispRSqr): self
+    {
+        $this->dispRSqr = $dispRSqr;
+
+        return $this;
+    }
+
+    public function getDispEq(): bool
+    {
+        return $this->dispEq;
+    }
+
+    public function setDispEq(bool $dispEq): self
+    {
+        $this->dispEq = $dispEq;
+
+        return $this;
+    }
+
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    public function setName(string $name): self
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    public function getBackward(): float
+    {
+        return $this->backward;
+    }
+
+    public function setBackward(float $backward): self
+    {
+        $this->backward = $backward;
+
+        return $this;
+    }
+
+    public function getForward(): float
+    {
+        return $this->forward;
+    }
+
+    public function setForward(float $forward): self
+    {
+        $this->forward = $forward;
+
+        return $this;
+    }
+
+    public function getIntercept(): float
+    {
+        return $this->intercept;
+    }
+
+    public function setIntercept(float $intercept): self
+    {
+        $this->intercept = $intercept;
+
+        return $this;
+    }
+
+    public function setTrendLineProperties(
+        ?string $trendLineType = null,
+        ?int $order = 0,
+        ?int $period = 0,
+        ?bool $dispRSqr = false,
+        ?bool $dispEq = false,
+        ?float $backward = null,
+        ?float $forward = null,
+        ?float $intercept = null,
+        ?string $name = null
+    ): self {
+        if (!empty($trendLineType)) {
+            $this->setTrendLineType($trendLineType);
+        }
+        if ($order !== null) {
+            $this->setOrder($order);
+        }
+        if ($period !== null) {
+            $this->setPeriod($period);
+        }
+        if ($dispRSqr !== null) {
+            $this->setDispRSqr($dispRSqr);
+        }
+        if ($dispEq !== null) {
+            $this->setDispEq($dispEq);
+        }
+        if ($backward !== null) {
+            $this->setBackward($backward);
+        }
+        if ($forward !== null) {
+            $this->setForward($forward);
+        }
+        if ($intercept !== null) {
+            $this->setIntercept($intercept);
+        }
+        if ($name !== null) {
+            $this->setName($name);
+        }
+
+        return $this;
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Cells.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Cells.php
index c524709008..c11745320b 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Cells.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Cells.php
@@ -2,61 +2,51 @@
 
 namespace PhpOffice\PhpSpreadsheet\Collection;
 
-use Generator;
 use PhpOffice\PhpSpreadsheet\Cell\Cell;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
+use PhpOffice\PhpSpreadsheet\Settings;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 use Psr\SimpleCache\CacheInterface;
 
 class Cells
 {
-    /**
-     * @var CacheInterface
-     */
-    private $cache;
+    protected const MAX_COLUMN_ID = 16384;
+
+    private CacheInterface $cache;
 
     /**
      * Parent worksheet.
-     *
-     * @var null|Worksheet
      */
-    private $parent;
+    private ?Worksheet $parent;
 
     /**
      * The currently active Cell.
-     *
-     * @var null|Cell
      */
-    private $currentCell;
+    private ?Cell $currentCell = null;
 
     /**
      * Coordinate of the currently active Cell.
-     *
-     * @var null|string
      */
-    private $currentCoordinate;
+    private ?string $currentCoordinate = null;
 
     /**
      * Flag indicating whether the currently active Cell requires saving.
-     *
-     * @var bool
      */
-    private $currentCellIsDirty = false;
+    private bool $currentCellIsDirty = false;
 
     /**
-     * An index of existing cells. Booleans indexed by their coordinate.
+     * An index of existing cells. int pointer to the coordinate (0-base-indexed row * 16,384 + 1-base indexed column)
+     *    indexed by their coordinate.
      *
-     * @var bool[]
+     * @var int[]
      */
-    private $index = [];
+    private array $index = [];
 
     /**
      * Prefix used to uniquely identify cache data for this worksheet.
-     *
-     * @var string
      */
-    private $cachePrefix;
+    private string $cachePrefix;
 
     /**
      * Initialise this new cell collection.
@@ -75,10 +65,8 @@ public function __construct(Worksheet $parent, CacheInterface $cache)
 
     /**
      * Return the parent worksheet for this cell collection.
-     *
-     * @return Worksheet
      */
-    public function getParent()
+    public function getParent(): ?Worksheet
     {
         return $this->parent;
     }
@@ -86,28 +74,19 @@ public function getParent()
     /**
      * Whether the collection holds a cell for the given coordinate.
      *
-     * @param string $pCoord Coordinate of the cell to check
-     *
-     * @return bool
+     * @param string $cellCoordinate Coordinate of the cell to check
      */
-    public function has($pCoord)
+    public function has(string $cellCoordinate): bool
     {
-        if ($pCoord === $this->currentCoordinate) {
-            return true;
-        }
-
-        // Check if the requested entry exists in the index
-        return isset($this->index[$pCoord]);
+        return ($cellCoordinate === $this->currentCoordinate) || isset($this->index[$cellCoordinate]);
     }
 
     /**
      * Add or update a cell in the collection.
      *
      * @param Cell $cell Cell to update
-     *
-     * @return Cell
      */
-    public function update(Cell $cell)
+    public function update(Cell $cell): Cell
     {
         return $this->add($cell->getCoordinate(), $cell);
     }
@@ -115,21 +94,21 @@ public function update(Cell $cell)
     /**
      * Delete a cell in cache identified by coordinate.
      *
-     * @param string $pCoord Coordinate of the cell to delete
+     * @param string $cellCoordinate Coordinate of the cell to delete
      */
-    public function delete($pCoord): void
+    public function delete(string $cellCoordinate): void
     {
-        if ($pCoord === $this->currentCoordinate && $this->currentCell !== null) {
+        if ($cellCoordinate === $this->currentCoordinate && $this->currentCell !== null) {
             $this->currentCell->detach();
             $this->currentCoordinate = null;
             $this->currentCell = null;
             $this->currentCellIsDirty = false;
         }
 
-        unset($this->index[$pCoord]);
+        unset($this->index[$cellCoordinate]);
 
         // Delete the entry from cache
-        $this->cache->delete($this->cachePrefix . $pCoord);
+        $this->cache->delete($this->cachePrefix . $cellCoordinate);
     }
 
     /**
@@ -137,7 +116,7 @@ public function delete($pCoord): void
      *
      * @return string[]
      */
-    public function getCoordinates()
+    public function getCoordinates(): array
     {
         return array_keys($this->index);
     }
@@ -147,148 +126,137 @@ public function getCoordinates()
      *
      * @return string[]
      */
-    public function getSortedCoordinates()
+    public function getSortedCoordinates(): array
     {
-        $sortKeys = [];
-        foreach ($this->getCoordinates() as $coord) {
-            $column = '';
-            $row = 0;
-            sscanf($coord, '%[A-Z]%d', $column, $row);
-            $sortKeys[sprintf('%09d%3s', $row, $column)] = $coord;
-        }
-        ksort($sortKeys);
+        asort($this->index);
 
-        return array_values($sortKeys);
+        return array_keys($this->index);
     }
 
     /**
-     * Get highest worksheet column and highest row that have cell records.
+     * Get a sorted list of all cell coordinates currently held in the collection by index (16384*row+column).
      *
-     * @return array Highest column name and highest row number
+     * @return int[]
      */
-    public function getHighestRowAndColumn()
+    public function getSortedCoordinatesInt(): array
     {
-        // Lookup highest column and highest row
-        $col = ['A' => '1A'];
-        $row = [1];
-        foreach ($this->getCoordinates() as $coord) {
-            $c = '';
-            $r = 0;
-            sscanf($coord, '%[A-Z]%d', $c, $r);
-            $row[$r] = $r;
-            $col[$c] = strlen($c) . $c;
-        }
-
-        // Determine highest column and row
-        $highestRow = max($row);
-        $highestColumn = substr(max($col), 1);
+        asort($this->index);
 
-        return [
-            'row' => $highestRow,
-            'column' => $highestColumn,
-        ];
+        return array_values($this->index);
     }
 
     /**
      * Return the cell coordinate of the currently active cell object.
-     *
-     * @return string
      */
-    public function getCurrentCoordinate()
+    public function getCurrentCoordinate(): ?string
     {
         return $this->currentCoordinate;
     }
 
     /**
      * Return the column coordinate of the currently active cell object.
-     *
-     * @return string
      */
-    public function getCurrentColumn()
+    public function getCurrentColumn(): string
     {
-        $column = '';
-        $row = 0;
-
-        sscanf($this->currentCoordinate, '%[A-Z]%d', $column, $row);
+        $column = 0;
+        $row = '';
+        sscanf($this->currentCoordinate ?? '', '%[A-Z]%d', $column, $row);
 
-        return $column;
+        return (string) $column;
     }
 
     /**
      * Return the row coordinate of the currently active cell object.
-     *
-     * @return int
      */
-    public function getCurrentRow()
+    public function getCurrentRow(): int
     {
-        $column = '';
-        $row = 0;
-
-        sscanf($this->currentCoordinate, '%[A-Z]%d', $column, $row);
+        $column = 0;
+        $row = '';
+        sscanf($this->currentCoordinate ?? '', '%[A-Z]%d', $column, $row);
 
         return (int) $row;
     }
 
+    /**
+     * Get highest worksheet column and highest row that have cell records.
+     *
+     * @return array Highest column name and highest row number
+     */
+    public function getHighestRowAndColumn(): array
+    {
+        // Lookup highest column and highest row
+        $maxRow = $maxColumn = 1;
+        foreach ($this->index as $coordinate) {
+            $row = (int) floor(($coordinate - 1) / self::MAX_COLUMN_ID) + 1;
+            $maxRow = ($maxRow > $row) ? $maxRow : $row;
+            $column = ($coordinate % self::MAX_COLUMN_ID) ?: self::MAX_COLUMN_ID;
+            $maxColumn = ($maxColumn > $column) ? $maxColumn : $column;
+        }
+
+        return [
+            'row' => $maxRow,
+            'column' => Coordinate::stringFromColumnIndex($maxColumn),
+        ];
+    }
+
     /**
      * Get highest worksheet column.
      *
-     * @param string $row Return the highest column for the specified row,
+     * @param null|int|string $row Return the highest column for the specified row,
      *                    or the highest column of any row if no row number is passed
      *
      * @return string Highest column name
      */
-    public function getHighestColumn($row = null)
+    public function getHighestColumn($row = null): string
     {
         if ($row === null) {
-            $colRow = $this->getHighestRowAndColumn();
-
-            return $colRow['column'];
+            return $this->getHighestRowAndColumn()['column'];
         }
 
-        $columnList = [1];
-        foreach ($this->getCoordinates() as $coord) {
-            $c = '';
-            $r = 0;
+        $row = (int) $row;
+        if ($row <= 0) {
+            throw new PhpSpreadsheetException('Row number must be a positive integer');
+        }
 
-            sscanf($coord, '%[A-Z]%d', $c, $r);
-            if ($r != $row) {
+        $maxColumn = 1;
+        $toRow = $row * self::MAX_COLUMN_ID;
+        $fromRow = --$row * self::MAX_COLUMN_ID;
+        foreach ($this->index as $coordinate) {
+            if ($coordinate < $fromRow || $coordinate >= $toRow) {
                 continue;
             }
-            $columnList[] = Coordinate::columnIndexFromString($c);
+            $column = ($coordinate % self::MAX_COLUMN_ID) ?: self::MAX_COLUMN_ID;
+            $maxColumn = $maxColumn > $column ? $maxColumn : $column;
         }
 
-        return Coordinate::stringFromColumnIndex(max($columnList));
+        return Coordinate::stringFromColumnIndex($maxColumn);
     }
 
     /**
      * Get highest worksheet row.
      *
-     * @param string $column Return the highest row for the specified column,
+     * @param null|string $column Return the highest row for the specified column,
      *                       or the highest row of any column if no column letter is passed
      *
      * @return int Highest row number
      */
-    public function getHighestRow($column = null)
+    public function getHighestRow(?string $column = null): int
     {
         if ($column === null) {
-            $colRow = $this->getHighestRowAndColumn();
-
-            return $colRow['row'];
+            return $this->getHighestRowAndColumn()['row'];
         }
 
-        $rowList = [0];
-        foreach ($this->getCoordinates() as $coord) {
-            $c = '';
-            $r = 0;
-
-            sscanf($coord, '%[A-Z]%d', $c, $r);
-            if ($c != $column) {
+        $maxRow = 1;
+        $columnIndex = Coordinate::columnIndexFromString($column);
+        foreach ($this->index as $coordinate) {
+            if ($coordinate % self::MAX_COLUMN_ID !== $columnIndex) {
                 continue;
             }
-            $rowList[] = $r;
+            $row = (int) floor($coordinate / self::MAX_COLUMN_ID) + 1;
+            $maxRow = ($maxRow > $row) ? $maxRow : $row;
         }
 
-        return max($rowList);
+        return $maxRow;
     }
 
     /**
@@ -296,46 +264,35 @@ public function getHighestRow($column = null)
      *
      * @return string Unique Reference
      */
-    private function getUniqueID()
+    private function getUniqueID(): string
     {
-        return uniqid('phpspreadsheet.', true) . '.';
+        $cacheType = Settings::getCache();
+
+        return ($cacheType instanceof Memory\SimpleCache1 || $cacheType instanceof Memory\SimpleCache3)
+            ? random_bytes(7) . ':'
+            : uniqid('phpspreadsheet.', true) . '.';
     }
 
     /**
      * Clone the cell collection.
-     *
-     * @param Worksheet $parent The new worksheet that we're copying to
-     *
-     * @return self
      */
-    public function cloneCellCollection(Worksheet $parent)
+    public function cloneCellCollection(Worksheet $worksheet): static
     {
         $this->storeCurrentCell();
         $newCollection = clone $this;
 
-        $newCollection->parent = $parent;
-        if (($newCollection->currentCell !== null) && (is_object($newCollection->currentCell))) {
-            $newCollection->currentCell->attach($this);
-        }
-
-        // Get old values
-        $oldKeys = $newCollection->getAllCacheKeys();
-        $oldValues = $newCollection->cache->getMultiple($oldKeys);
-        $newValues = [];
-        $oldCachePrefix = $newCollection->cachePrefix;
-
-        // Change prefix
+        $newCollection->parent = $worksheet;
         $newCollection->cachePrefix = $newCollection->getUniqueID();
-        foreach ($oldValues as $oldKey => $value) {
-            $newValues[str_replace($oldCachePrefix, $newCollection->cachePrefix, $oldKey)] = clone $value;
-        }
 
-        // Store new values
-        $stored = $newCollection->cache->setMultiple($newValues);
-        if (!$stored) {
-            $newCollection->__destruct();
-
-            throw new PhpSpreadsheetException('Failed to copy cells in cache');
+        foreach ($this->index as $key => $value) {
+            $newCollection->index[$key] = $value;
+            $stored = $newCollection->cache->set(
+                $newCollection->cachePrefix . $key,
+                clone $this->getCache($key)
+            );
+            if ($stored === false) {
+                $this->destructIfNeeded($newCollection, 'Failed to copy cells in cache');
+            }
         }
 
         return $newCollection;
@@ -344,17 +301,23 @@ public function cloneCellCollection(Worksheet $parent)
     /**
      * Remove a row, deleting all cells in that row.
      *
-     * @param string $row Row number to remove
+     * @param int|string $row Row number to remove
      */
     public function removeRow($row): void
     {
-        foreach ($this->getCoordinates() as $coord) {
-            $c = '';
-            $r = 0;
+        $this->storeCurrentCell();
+        $row = (int) $row;
+        if ($row <= 0) {
+            throw new PhpSpreadsheetException('Row number must be a positive integer');
+        }
 
-            sscanf($coord, '%[A-Z]%d', $c, $r);
-            if ($r == $row) {
-                $this->delete($coord);
+        $toRow = $row * self::MAX_COLUMN_ID;
+        $fromRow = --$row * self::MAX_COLUMN_ID;
+        foreach ($this->index as $coordinate) {
+            if ($coordinate >= $fromRow && $coordinate < $toRow) {
+                $row = (int) floor($coordinate / self::MAX_COLUMN_ID) + 1;
+                $column = Coordinate::stringFromColumnIndex($coordinate % self::MAX_COLUMN_ID);
+                $this->delete("{$column}{$row}");
             }
         }
     }
@@ -364,15 +327,16 @@ public function removeRow($row): void
      *
      * @param string $column Column ID to remove
      */
-    public function removeColumn($column): void
+    public function removeColumn(string $column): void
     {
-        foreach ($this->getCoordinates() as $coord) {
-            $c = '';
-            $r = 0;
+        $this->storeCurrentCell();
 
-            sscanf($coord, '%[A-Z]%d', $c, $r);
-            if ($c == $column) {
-                $this->delete($coord);
+        $columnIndex = Coordinate::columnIndexFromString($column);
+        foreach ($this->index as $coordinate) {
+            if ($coordinate % self::MAX_COLUMN_ID === $columnIndex) {
+                $row = (int) floor($coordinate / self::MAX_COLUMN_ID) + 1;
+                $column = Coordinate::stringFromColumnIndex($coordinate % self::MAX_COLUMN_ID);
+                $this->delete("{$column}{$row}");
             }
         }
     }
@@ -383,14 +347,12 @@ public function removeColumn($column): void
      */
     private function storeCurrentCell(): void
     {
-        if ($this->currentCellIsDirty && !empty($this->currentCoordinate)) {
+        if ($this->currentCellIsDirty && isset($this->currentCoordinate, $this->currentCell)) {
             $this->currentCell->detach();
 
             $stored = $this->cache->set($this->cachePrefix . $this->currentCoordinate, $this->currentCell);
-            if (!$stored) {
-                $this->__destruct();
-
-                throw new PhpSpreadsheetException("Failed to store cell {$this->currentCoordinate} in cache");
+            if ($stored === false) {
+                $this->destructIfNeeded($this, "Failed to store cell {$this->currentCoordinate} in cache");
             }
             $this->currentCellIsDirty = false;
         }
@@ -399,22 +361,30 @@ private function storeCurrentCell(): void
         $this->currentCell = null;
     }
 
+    private function destructIfNeeded(self $cells, string $message): void
+    {
+        $cells->__destruct();
+
+        throw new PhpSpreadsheetException($message);
+    }
+
     /**
      * Add or update a cell identified by its coordinate into the collection.
      *
-     * @param string $pCoord Coordinate of the cell to update
+     * @param string $cellCoordinate Coordinate of the cell to update
      * @param Cell $cell Cell to update
-     *
-     * @return Cell
      */
-    public function add($pCoord, Cell $cell)
+    public function add(string $cellCoordinate, Cell $cell): Cell
     {
-        if ($pCoord !== $this->currentCoordinate) {
+        if ($cellCoordinate !== $this->currentCoordinate) {
             $this->storeCurrentCell();
         }
-        $this->index[$pCoord] = true;
+        $column = 0;
+        $row = '';
+        sscanf($cellCoordinate, '%[A-Z]%d', $column, $row);
+        $this->index[$cellCoordinate] = (--$row * self::MAX_COLUMN_ID) + Coordinate::columnIndexFromString((string) $column);
 
-        $this->currentCoordinate = $pCoord;
+        $this->currentCoordinate = $cellCoordinate;
         $this->currentCell = $cell;
         $this->currentCellIsDirty = true;
 
@@ -424,30 +394,26 @@ public function add($pCoord, Cell $cell)
     /**
      * Get cell at a specific coordinate.
      *
-     * @param string $pCoord Coordinate of the cell
+     * @param string $cellCoordinate Coordinate of the cell
      *
      * @return null|Cell Cell that was found, or null if not found
      */
-    public function get($pCoord)
+    public function get(string $cellCoordinate): ?Cell
     {
-        if ($pCoord === $this->currentCoordinate) {
+        if ($cellCoordinate === $this->currentCoordinate) {
             return $this->currentCell;
         }
         $this->storeCurrentCell();
 
         // Return null if requested entry doesn't exist in collection
-        if (!$this->has($pCoord)) {
+        if ($this->has($cellCoordinate) === false) {
             return null;
         }
 
-        // Check if the entry that has been requested actually exists
-        $cell = $this->cache->get($this->cachePrefix . $pCoord);
-        if ($cell === null) {
-            throw new PhpSpreadsheetException("Cell entry {$pCoord} no longer exists in cache. This probably means that the cache was cleared by someone else.");
-        }
+        $cell = $this->getcache($cellCoordinate);
 
         // Set current entry to the requested entry
-        $this->currentCoordinate = $pCoord;
+        $this->currentCoordinate = $cellCoordinate;
         $this->currentCell = $cell;
         // Re-attach this as the cell's parent
         $this->currentCell->attach($this);
@@ -482,17 +448,28 @@ public function unsetWorksheetCells(): void
     public function __destruct()
     {
         $this->cache->deleteMultiple($this->getAllCacheKeys());
+        $this->parent = null;
     }
 
     /**
      * Returns all known cache keys.
      *
-     * @return Generator|string[]
+     * @return iterable<string>
      */
-    private function getAllCacheKeys()
+    private function getAllCacheKeys(): iterable
     {
-        foreach ($this->getCoordinates() as $coordinate) {
+        foreach ($this->index as $coordinate => $value) {
             yield $this->cachePrefix . $coordinate;
         }
     }
+
+    private function getCache(string $cellCoordinate): Cell
+    {
+        $cell = $this->cache->get($this->cachePrefix . $cellCoordinate);
+        if (!($cell instanceof Cell)) {
+            throw new PhpSpreadsheetException("Cell entry {$cellCoordinate} no longer exists in cache. This probably means that the cache was cleared by someone else.");
+        }
+
+        return $cell;
+    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/CellsFactory.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/CellsFactory.php
index 7f34c2315c..b3833bd8bc 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/CellsFactory.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/CellsFactory.php
@@ -10,12 +10,11 @@ abstract class CellsFactory
     /**
      * Initialise the cache storage.
      *
-     * @param Worksheet $parent Enable cell caching for this worksheet
+     * @param Worksheet $worksheet Enable cell caching for this worksheet
      *
-     * @return Cells
      * */
-    public static function getInstance(Worksheet $parent)
+    public static function getInstance(Worksheet $worksheet): Cells
     {
-        return new Cells($parent, Settings::getCache());
+        return new Cells($worksheet, Settings::getCache());
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Memory.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Memory/SimpleCache1.php
similarity index 59%
rename from vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Memory.php
rename to vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Memory/SimpleCache1.php
index a32551b0e5..b8918c9153 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Memory.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Memory/SimpleCache1.php
@@ -1,34 +1,37 @@
 <?php
 
-namespace PhpOffice\PhpSpreadsheet\Collection;
+namespace PhpOffice\PhpSpreadsheet\Collection\Memory;
 
 use Psr\SimpleCache\CacheInterface;
 
 /**
  * This is the default implementation for in-memory cell collection.
  *
- * Alternatives implementation should leverage off-memory, non-volatile storage
+ * Alternative implementation should leverage off-memory, non-volatile storage
  * to reduce overall memory usage.
  */
-class Memory implements CacheInterface
+class SimpleCache1 implements CacheInterface
 {
-    private $cache = [];
+    /**
+     * @var array Cell Cache
+     */
+    private array $cache = [];
 
-    public function clear()
+    public function clear(): bool
     {
         $this->cache = [];
 
         return true;
     }
 
-    public function delete($key)
+    public function delete($key): bool
     {
         unset($this->cache[$key]);
 
         return true;
     }
 
-    public function deleteMultiple($keys)
+    public function deleteMultiple($keys): bool
     {
         foreach ($keys as $key) {
             $this->delete($key);
@@ -37,7 +40,7 @@ public function deleteMultiple($keys)
         return true;
     }
 
-    public function get($key, $default = null)
+    public function get($key, $default = null): mixed
     {
         if ($this->has($key)) {
             return $this->cache[$key];
@@ -46,7 +49,7 @@ public function get($key, $default = null)
         return $default;
     }
 
-    public function getMultiple($keys, $default = null)
+    public function getMultiple($keys, $default = null): iterable
     {
         $results = [];
         foreach ($keys as $key) {
@@ -56,19 +59,19 @@ public function getMultiple($keys, $default = null)
         return $results;
     }
 
-    public function has($key)
+    public function has($key): bool
     {
         return array_key_exists($key, $this->cache);
     }
 
-    public function set($key, $value, $ttl = null)
+    public function set($key, $value, $ttl = null): bool
     {
         $this->cache[$key] = $value;
 
         return true;
     }
 
-    public function setMultiple($values, $ttl = null)
+    public function setMultiple($values, $ttl = null): bool
     {
         foreach ($values as $key => $value) {
             $this->set($key, $value);
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Memory/SimpleCache3.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Memory/SimpleCache3.php
new file mode 100644
index 0000000000..7b6c460b94
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Memory/SimpleCache3.php
@@ -0,0 +1,80 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Collection\Memory;
+
+use DateInterval;
+use Psr\SimpleCache\CacheInterface;
+
+/**
+ * This is the default implementation for in-memory cell collection.
+ *
+ * Alternative implementation should leverage off-memory, non-volatile storage
+ * to reduce overall memory usage.
+ */
+class SimpleCache3 implements CacheInterface
+{
+    private array $cache = [];
+
+    public function clear(): bool
+    {
+        $this->cache = [];
+
+        return true;
+    }
+
+    public function delete(string $key): bool
+    {
+        unset($this->cache[$key]);
+
+        return true;
+    }
+
+    public function deleteMultiple(iterable $keys): bool
+    {
+        foreach ($keys as $key) {
+            $this->delete($key);
+        }
+
+        return true;
+    }
+
+    public function get(string $key, mixed $default = null): mixed
+    {
+        if ($this->has($key)) {
+            return $this->cache[$key];
+        }
+
+        return $default;
+    }
+
+    public function getMultiple(iterable $keys, mixed $default = null): iterable
+    {
+        $results = [];
+        foreach ($keys as $key) {
+            $results[$key] = $this->get($key, $default);
+        }
+
+        return $results;
+    }
+
+    public function has(string $key): bool
+    {
+        return array_key_exists($key, $this->cache);
+    }
+
+    public function set(string $key, mixed $value, null|int|DateInterval $ttl = null): bool
+    {
+        $this->cache[$key] = $value;
+
+        return true;
+    }
+
+    public function setMultiple(iterable $values, null|int|DateInterval $ttl = null): bool
+    {
+        foreach ($values as $key => $value) {
+            $this->set($key, $value);
+        }
+
+        return true;
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Comment.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Comment.php
index 31f7664053..2e18270c1f 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Comment.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Comment.php
@@ -2,72 +2,74 @@
 
 namespace PhpOffice\PhpSpreadsheet;
 
+use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
+use PhpOffice\PhpSpreadsheet\Helper\Size;
 use PhpOffice\PhpSpreadsheet\RichText\RichText;
+use PhpOffice\PhpSpreadsheet\Shared\Drawing as SharedDrawing;
+use PhpOffice\PhpSpreadsheet\Style\Alignment;
+use PhpOffice\PhpSpreadsheet\Style\Color;
+use PhpOffice\PhpSpreadsheet\Worksheet\Drawing;
+use Stringable;
 
-class Comment implements IComparable
+class Comment implements IComparable, Stringable
 {
     /**
      * Author.
-     *
-     * @var string
      */
-    private $author;
+    private string $author;
 
     /**
      * Rich text comment.
-     *
-     * @var RichText
      */
-    private $text;
+    private RichText $text;
 
     /**
      * Comment width (CSS style, i.e. XXpx or YYpt).
-     *
-     * @var string
      */
-    private $width = '96pt';
+    private string $width = '96pt';
 
     /**
      * Left margin (CSS style, i.e. XXpx or YYpt).
-     *
-     * @var string
      */
-    private $marginLeft = '59.25pt';
+    private string $marginLeft = '59.25pt';
 
     /**
      * Top margin (CSS style, i.e. XXpx or YYpt).
-     *
-     * @var string
      */
-    private $marginTop = '1.5pt';
+    private string $marginTop = '1.5pt';
 
     /**
      * Visible.
-     *
-     * @var bool
      */
-    private $visible = false;
+    private bool $visible = false;
 
     /**
      * Comment height (CSS style, i.e. XXpx or YYpt).
-     *
-     * @var string
      */
-    private $height = '55.5pt';
+    private string $height = '55.5pt';
 
     /**
      * Comment fill color.
-     *
-     * @var Style\Color
      */
-    private $fillColor;
+    private Color $fillColor;
 
     /**
      * Alignment.
-     *
-     * @var string
      */
-    private $alignment;
+    private string $alignment;
+
+    /**
+     * Background image in comment.
+     */
+    private Drawing $backgroundImage;
+
+    public const TEXTBOX_DIRECTION_RTL = 'rtl';
+    public const TEXTBOX_DIRECTION_LTR = 'ltr';
+    // MS uses 'auto' in xml but 'context' in UI
+    public const TEXTBOX_DIRECTION_AUTO = 'auto';
+    public const TEXTBOX_DIRECTION_CONTEXT = 'auto';
+
+    private string $textboxDirection = '';
 
     /**
      * Create a new Comment.
@@ -77,28 +79,23 @@ public function __construct()
         // Initialise variables
         $this->author = 'Author';
         $this->text = new RichText();
-        $this->fillColor = new Style\Color('FFFFFFE1');
-        $this->alignment = Style\Alignment::HORIZONTAL_GENERAL;
+        $this->fillColor = new Color('FFFFFFE1');
+        $this->alignment = Alignment::HORIZONTAL_GENERAL;
+        $this->backgroundImage = new Drawing();
     }
 
     /**
      * Get Author.
-     *
-     * @return string
      */
-    public function getAuthor()
+    public function getAuthor(): string
     {
         return $this->author;
     }
 
     /**
      * Set Author.
-     *
-     * @param string $author
-     *
-     * @return $this
      */
-    public function setAuthor($author)
+    public function setAuthor(string $author): self
     {
         $this->author = $author;
 
@@ -107,198 +104,184 @@ public function setAuthor($author)
 
     /**
      * Get Rich text comment.
-     *
-     * @return RichText
      */
-    public function getText()
+    public function getText(): RichText
     {
         return $this->text;
     }
 
     /**
      * Set Rich text comment.
-     *
-     * @return $this
      */
-    public function setText(RichText $pValue)
+    public function setText(RichText $text): self
     {
-        $this->text = $pValue;
+        $this->text = $text;
 
         return $this;
     }
 
     /**
      * Get comment width (CSS style, i.e. XXpx or YYpt).
-     *
-     * @return string
      */
-    public function getWidth()
+    public function getWidth(): string
     {
         return $this->width;
     }
 
     /**
-     * Set comment width (CSS style, i.e. XXpx or YYpt).
-     *
-     * @param string $width
-     *
-     * @return $this
+     * Set comment width (CSS style, i.e. XXpx or YYpt). Default unit is pt.
      */
-    public function setWidth($width)
+    public function setWidth(string $width): self
     {
-        $this->width = $width;
+        $width = new Size($width);
+        if ($width->valid()) {
+            $this->width = (string) $width;
+        }
 
         return $this;
     }
 
     /**
      * Get comment height (CSS style, i.e. XXpx or YYpt).
-     *
-     * @return string
      */
-    public function getHeight()
+    public function getHeight(): string
     {
         return $this->height;
     }
 
     /**
-     * Set comment height (CSS style, i.e. XXpx or YYpt).
-     *
-     * @param string $value
-     *
-     * @return $this
+     * Set comment height (CSS style, i.e. XXpx or YYpt). Default unit is pt.
      */
-    public function setHeight($value)
+    public function setHeight(string $height): self
     {
-        $this->height = $value;
+        $height = new Size($height);
+        if ($height->valid()) {
+            $this->height = (string) $height;
+        }
 
         return $this;
     }
 
     /**
      * Get left margin (CSS style, i.e. XXpx or YYpt).
-     *
-     * @return string
      */
-    public function getMarginLeft()
+    public function getMarginLeft(): string
     {
         return $this->marginLeft;
     }
 
     /**
-     * Set left margin (CSS style, i.e. XXpx or YYpt).
-     *
-     * @param string $value
-     *
-     * @return $this
+     * Set left margin (CSS style, i.e. XXpx or YYpt). Default unit is pt.
      */
-    public function setMarginLeft($value)
+    public function setMarginLeft(string $margin): self
     {
-        $this->marginLeft = $value;
+        $margin = new Size($margin);
+        if ($margin->valid()) {
+            $this->marginLeft = (string) $margin;
+        }
 
         return $this;
     }
 
     /**
      * Get top margin (CSS style, i.e. XXpx or YYpt).
-     *
-     * @return string
      */
-    public function getMarginTop()
+    public function getMarginTop(): string
     {
         return $this->marginTop;
     }
 
     /**
-     * Set top margin (CSS style, i.e. XXpx or YYpt).
-     *
-     * @param string $value
-     *
-     * @return $this
+     * Set top margin (CSS style, i.e. XXpx or YYpt). Default unit is pt.
      */
-    public function setMarginTop($value)
+    public function setMarginTop(string $margin): self
     {
-        $this->marginTop = $value;
+        $margin = new Size($margin);
+        if ($margin->valid()) {
+            $this->marginTop = (string) $margin;
+        }
 
         return $this;
     }
 
     /**
      * Is the comment visible by default?
-     *
-     * @return bool
      */
-    public function getVisible()
+    public function getVisible(): bool
     {
         return $this->visible;
     }
 
     /**
      * Set comment default visibility.
-     *
-     * @param bool $value
-     *
-     * @return $this
      */
-    public function setVisible($value)
+    public function setVisible(bool $visibility): self
     {
-        $this->visible = $value;
+        $this->visible = $visibility;
 
         return $this;
     }
 
     /**
-     * Get fill color.
-     *
-     * @return Style\Color
+     * Set fill color.
      */
-    public function getFillColor()
+    public function setFillColor(Color $color): self
     {
-        return $this->fillColor;
+        $this->fillColor = $color;
+
+        return $this;
     }
 
     /**
-     * Set Alignment.
-     *
-     * @param string $alignment see Style\Alignment::HORIZONTAL_*
-     *
-     * @return $this
+     * Get fill color.
      */
-    public function setAlignment($alignment)
+    public function getFillColor(): Color
+    {
+        return $this->fillColor;
+    }
+
+    public function setAlignment(string $alignment): self
     {
         $this->alignment = $alignment;
 
         return $this;
     }
 
-    /**
-     * Get Alignment.
-     *
-     * @return string
-     */
-    public function getAlignment()
+    public function getAlignment(): string
     {
         return $this->alignment;
     }
 
+    public function setTextboxDirection(string $textboxDirection): self
+    {
+        $this->textboxDirection = $textboxDirection;
+
+        return $this;
+    }
+
+    public function getTextboxDirection(): string
+    {
+        return $this->textboxDirection;
+    }
+
     /**
      * Get hash code.
-     *
-     * @return string Hash code
      */
-    public function getHashCode()
+    public function getHashCode(): string
     {
         return md5(
-            $this->author .
-            $this->text->getHashCode() .
-            $this->width .
-            $this->height .
-            $this->marginLeft .
-            $this->marginTop .
-            ($this->visible ? 1 : 0) .
-            $this->fillColor->getHashCode() .
-            $this->alignment .
-            __CLASS__
+            $this->author
+            . $this->text->getHashCode()
+            . $this->width
+            . $this->height
+            . $this->marginLeft
+            . $this->marginTop
+            . ($this->visible ? 1 : 0)
+            . $this->fillColor->getHashCode()
+            . $this->alignment
+            . $this->textboxDirection
+            . ($this->hasBackgroundImage() ? $this->backgroundImage->getHashCode() : '')
+            . __CLASS__
         );
     }
 
@@ -319,11 +302,57 @@ public function __clone()
 
     /**
      * Convert to string.
-     *
-     * @return string
      */
-    public function __toString()
+    public function __toString(): string
     {
         return $this->text->getPlainText();
     }
+
+    /**
+     * Check is background image exists.
+     */
+    public function hasBackgroundImage(): bool
+    {
+        $path = $this->backgroundImage->getPath();
+
+        if (empty($path)) {
+            return false;
+        }
+
+        return getimagesize($path) !== false;
+    }
+
+    /**
+     * Returns background image.
+     */
+    public function getBackgroundImage(): Drawing
+    {
+        return $this->backgroundImage;
+    }
+
+    /**
+     * Sets background image.
+     */
+    public function setBackgroundImage(Drawing $objDrawing): self
+    {
+        if (!array_key_exists($objDrawing->getType(), Drawing::IMAGE_TYPES_CONVERTION_MAP)) {
+            throw new PhpSpreadsheetException('Unsupported image type in comment background. Supported types: PNG, JPEG, BMP, GIF.');
+        }
+        $this->backgroundImage = $objDrawing;
+
+        return $this;
+    }
+
+    /**
+     * Sets size of comment as size of background image.
+     */
+    public function setSizeAsBackgroundImage(): self
+    {
+        if ($this->hasBackgroundImage()) {
+            $this->setWidth(SharedDrawing::pixelsToPoints($this->backgroundImage->getWidth()) . 'pt');
+            $this->setHeight(SharedDrawing::pixelsToPoints($this->backgroundImage->getHeight()) . 'pt');
+        }
+
+        return $this;
+    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/DefinedName.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/DefinedName.php
index 89ee01bec0..686e56e1ea 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/DefinedName.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/DefinedName.php
@@ -10,45 +10,33 @@ abstract class DefinedName
 
     /**
      * Name.
-     *
-     * @var string
      */
-    protected $name;
+    protected string $name;
 
     /**
      * Worksheet on which the defined name can be resolved.
-     *
-     * @var Worksheet
      */
-    protected $worksheet;
+    protected ?Worksheet $worksheet;
 
     /**
      * Value of the named object.
-     *
-     * @var string
      */
-    protected $value;
+    protected string $value;
 
     /**
      * Is the defined named local? (i.e. can only be used on $this->worksheet).
-     *
-     * @var bool
      */
-    protected $localOnly;
+    protected bool $localOnly;
 
     /**
      * Scope.
-     *
-     * @var Worksheet
      */
-    protected $scope;
+    protected ?Worksheet $scope;
 
     /**
      * Whether this is a named range or a named formula.
-     *
-     * @var bool
      */
-    protected $isFormula;
+    protected bool $isFormula;
 
     /**
      * Create a new Defined Name.
@@ -78,6 +66,12 @@ public function __construct(
         $this->isFormula = self::testIfFormula($this->value);
     }
 
+    public function __destruct()
+    {
+        $this->worksheet = null;
+        $this->scope = null;
+    }
+
     /**
      * Create a new defined name, either a range or a formula.
      */
@@ -99,7 +93,7 @@ public static function createInstance(
 
     public static function testIfFormula(string $value): bool
     {
-        if (substr($value, 0, 1) === '=') {
+        if (str_starts_with($value, '=')) {
             $value = substr($value, 1);
         }
 
@@ -110,9 +104,10 @@ public static function testIfFormula(string $value): bool
         $segMatcher = false;
         foreach (explode("'", $value) as $subVal) {
             //    Only test in alternate array entries (the non-quoted blocks)
+            $segMatcher = $segMatcher === false;
             if (
-                ($segMatcher = !$segMatcher) &&
-                (preg_match('/' . self::REGEXP_IDENTIFY_FORMULA . '/miu', $subVal))
+                $segMatcher
+                && (preg_match('/' . self::REGEXP_IDENTIFY_FORMULA . '/miu', $subVal))
             ) {
                 return true;
             }
@@ -140,17 +135,19 @@ public function setName(string $name): self
 
             // Re-attach
             if ($this->worksheet !== null) {
-                $this->worksheet->getParent()->removeNamedRange($this->name, $this->worksheet);
+                $this->worksheet->getParentOrThrow()->removeNamedRange($this->name, $this->worksheet);
             }
             $this->name = $name;
 
             if ($this->worksheet !== null) {
-                $this->worksheet->getParent()->addNamedRange($this);
+                $this->worksheet->getParentOrThrow()->addDefinedName($this);
             }
 
-            // New title
-            $newTitle = $this->name;
-            ReferenceHelper::getInstance()->updateNamedFormulas($this->worksheet->getParent(), $oldTitle, $newTitle);
+            if ($this->worksheet !== null) {
+                // New title
+                $newTitle = $this->name;
+                ReferenceHelper::getInstance()->updateNamedFormulae($this->worksheet->getParentOrThrow(), $oldTitle, $newTitle);
+            }
         }
 
         return $this;
@@ -167,9 +164,9 @@ public function getWorksheet(): ?Worksheet
     /**
      * Set worksheet.
      */
-    public function setWorksheet(?Worksheet $value): self
+    public function setWorksheet(?Worksheet $worksheet): self
     {
-        $this->worksheet = $value;
+        $this->worksheet = $worksheet;
 
         return $this;
     }
@@ -203,10 +200,10 @@ public function getLocalOnly(): bool
     /**
      * Set localOnly.
      */
-    public function setLocalOnly(bool $value): self
+    public function setLocalOnly(bool $localScope): self
     {
-        $this->localOnly = $value;
-        $this->scope = $value ? $this->worksheet : null;
+        $this->localOnly = $localScope;
+        $this->scope = $localScope ? $this->worksheet : null;
 
         return $this;
     }
@@ -222,10 +219,10 @@ public function getScope(): ?Worksheet
     /**
      * Set scope.
      */
-    public function setScope(?Worksheet $value): self
+    public function setScope(?Worksheet $worksheet): self
     {
-        $this->scope = $value;
-        $this->localOnly = $value !== null;
+        $this->scope = $worksheet;
+        $this->localOnly = $worksheet !== null;
 
         return $this;
     }
@@ -241,18 +238,18 @@ public function isFormula(): bool
     /**
      * Resolve a named range to a regular cell range or formula.
      */
-    public static function resolveName(string $pDefinedName, Worksheet $pSheet, string $sheetName = ''): ?self
+    public static function resolveName(string $definedName, Worksheet $worksheet, string $sheetName = ''): ?self
     {
         if ($sheetName === '') {
-            $pSheet2 = $pSheet;
+            $worksheet2 = $worksheet;
         } else {
-            $pSheet2 = $pSheet->getParent()->getSheetByName($sheetName);
-            if ($pSheet2 === null) {
+            $worksheet2 = $worksheet->getParentOrThrow()->getSheetByName($sheetName);
+            if ($worksheet2 === null) {
                 return null;
             }
         }
 
-        return $pSheet->getParent()->getDefinedName($pDefinedName, $pSheet2);
+        return $worksheet->getParentOrThrow()->getDefinedName($definedName, $worksheet2);
     }
 
     /**
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Document/Properties.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Document/Properties.php
index 1030d98cc9..5762169184 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Document/Properties.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Document/Properties.php
@@ -25,87 +25,69 @@ class Properties
 
     /**
      * Creator.
-     *
-     * @var string
      */
-    private $creator = 'Unknown Creator';
+    private string $creator = 'Unknown Creator';
 
     /**
      * LastModifiedBy.
-     *
-     * @var string
      */
-    private $lastModifiedBy;
+    private string $lastModifiedBy;
 
     /**
      * Created.
-     *
-     * @var float|int
      */
-    private $created;
+    private float|int $created;
 
     /**
      * Modified.
-     *
-     * @var float|int
      */
-    private $modified;
+    private float|int $modified;
 
     /**
      * Title.
-     *
-     * @var string
      */
-    private $title = 'Untitled Spreadsheet';
+    private string $title = 'Untitled Spreadsheet';
 
     /**
      * Description.
-     *
-     * @var string
      */
-    private $description = '';
+    private string $description = '';
 
     /**
      * Subject.
-     *
-     * @var string
      */
-    private $subject = '';
+    private string $subject = '';
 
     /**
      * Keywords.
-     *
-     * @var string
      */
-    private $keywords = '';
+    private string $keywords = '';
 
     /**
      * Category.
-     *
-     * @var string
      */
-    private $category = '';
+    private string $category = '';
 
     /**
      * Manager.
-     *
-     * @var string
      */
-    private $manager = '';
+    private string $manager = '';
 
     /**
      * Company.
-     *
-     * @var string
      */
-    private $company = '';
+    private string $company = '';
 
     /**
      * Custom Properties.
      *
-     * @var array{value: mixed, type: string}[]
+     * @var array{value: null|bool|float|int|string, type: string}[]
      */
-    private $customProperties = [];
+    private array $customProperties = [];
+
+    private string $hyperlinkBase = '';
+
+    private string $viewport = '';
 
     /**
      * Create a new Document Properties instance.
@@ -115,7 +97,7 @@ public function __construct()
         // Initialise values
         $this->lastModifiedBy = $this->creator;
         $this->created = self::intOrFloatTimestamp(null);
-        $this->modified = self::intOrFloatTimestamp(null);
+        $this->modified = $this->created;
     }
 
     /**
@@ -151,27 +133,24 @@ public function getLastModifiedBy(): string
      *
      * @return $this
      */
-    public function setLastModifiedBy(string $modifier): self
+    public function setLastModifiedBy(string $modifiedBy): self
     {
-        $this->lastModifiedBy = $modifier;
+        $this->lastModifiedBy = $modifiedBy;
 
         return $this;
     }
 
-    /**
-     * @param null|float|int|string $timestamp
-     *
-     * @return float|int
-     */
-    private static function intOrFloatTimestamp($timestamp)
+    private static function intOrFloatTimestamp(null|bool|float|int|string $timestamp): float|int
     {
-        if ($timestamp === null) {
+        if ($timestamp === null || is_bool($timestamp)) {
             $timestamp = (float) (new DateTime())->format('U');
         } elseif (is_string($timestamp)) {
             if (is_numeric($timestamp)) {
                 $timestamp = (float) $timestamp;
             } else {
-                $timestamp = preg_replace('/[.][0-9]*$/', '', $timestamp) ?? '';
+                $timestamp = (string) preg_replace('/[.][0-9]*$/', '', $timestamp);
+                $timestamp = (string) preg_replace('/^(\\d{4})- (\\d)/', '$1-0$2', $timestamp);
+                $timestamp = (string) preg_replace('/^(\\d{4}-\\d{2})- (\\d)/', '$1-0$2', $timestamp);
                 $timestamp = (float) (new DateTime($timestamp))->format('U');
             }
         }
@@ -181,10 +160,8 @@ private static function intOrFloatTimestamp($timestamp)
 
     /**
      * Get Created.
-     *
-     * @return float|int
      */
-    public function getCreated()
+    public function getCreated(): float|int
     {
         return $this->created;
     }
@@ -192,11 +169,9 @@ public function getCreated()
     /**
      * Set Created.
      *
-     * @param null|float|int|string $timestamp
-     *
      * @return $this
      */
-    public function setCreated($timestamp): self
+    public function setCreated(null|float|int|string $timestamp): self
     {
         $this->created = self::intOrFloatTimestamp($timestamp);
 
@@ -205,10 +180,8 @@ public function setCreated($timestamp): self
 
     /**
      * Get Modified.
-     *
-     * @return float|int
      */
-    public function getModified()
+    public function getModified(): float|int
     {
         return $this->modified;
     }
@@ -216,11 +189,9 @@ public function getModified()
     /**
      * Set Modified.
      *
-     * @param null|float|int|string $timestamp
-     *
      * @return $this
      */
-    public function setModified($timestamp): self
+    public function setModified(null|float|int|string $timestamp): self
     {
         $this->modified = self::intOrFloatTimestamp($timestamp);
 
@@ -387,10 +358,8 @@ public function isCustomPropertySet(string $propertyName): bool
 
     /**
      * Get a Custom Property Value.
-     *
-     * @return mixed
      */
-    public function getCustomPropertyValue(string $propertyName)
+    public function getCustomPropertyValue(string $propertyName): bool|int|float|string|null
     {
         if (isset($this->customProperties[$propertyName])) {
             return $this->customProperties[$propertyName]['value'];
@@ -401,18 +370,13 @@ public function getCustomPropertyValue(string $propertyName)
 
     /**
      * Get a Custom Property Type.
-     *
-     * @return null|string
      */
-    public function getCustomPropertyType(string $propertyName)
+    public function getCustomPropertyType(string $propertyName): ?string
     {
         return $this->customProperties[$propertyName]['type'] ?? null;
     }
 
-    /**
-     * @param mixed $propertyValue
-     */
-    private function identifyPropertyType($propertyValue): string
+    private function identifyPropertyType(bool|int|float|string|null $propertyValue): string
     {
         if (is_float($propertyValue)) {
             return self::PROPERTY_TYPE_FLOAT;
@@ -430,28 +394,20 @@ private function identifyPropertyType($propertyValue): string
     /**
      * Set a Custom Property.
      *
-     * @param mixed $propertyValue
-     * @param string $propertyType
-     *   'i' : Integer
-     *   'f' : Floating Point
-     *   's' : String
-     *   'd' : Date/Time
-     *   'b' : Boolean
+     * @param ?string $propertyType see `self::VALID_PROPERTY_TYPE_LIST`
      *
      * @return $this
      */
-    public function setCustomProperty(string $propertyName, $propertyValue = '', $propertyType = null): self
+    public function setCustomProperty(string $propertyName, bool|int|float|string|null $propertyValue = '', ?string $propertyType = null): self
     {
         if (($propertyType === null) || (!in_array($propertyType, self::VALID_PROPERTY_TYPE_LIST))) {
             $propertyType = $this->identifyPropertyType($propertyValue);
         }
 
-        if (!is_object($propertyValue)) {
-            $this->customProperties[$propertyName] = [
-                'value' => self::convertProperty($propertyValue, $propertyType),
-                'type' => $propertyType,
-            ];
-        }
+        $this->customProperties[$propertyName] = [
+            'value' => self::convertProperty($propertyValue, $propertyType),
+            'type' => $propertyType,
+        ];
 
         return $this;
     }
@@ -492,24 +448,16 @@ public function setCustomProperty(string $propertyName, $propertyValue = '', $pr
 
     /**
      * Convert property to form desired by Excel.
-     *
-     * @param mixed $propertyValue
-     *
-     * @return mixed
      */
-    public static function convertProperty($propertyValue, string $propertyType)
+    public static function convertProperty(bool|int|float|string|null $propertyValue, string $propertyType): bool|int|float|string|null
     {
         return self::SPECIAL_TYPES[$propertyType] ?? self::convertProperty2($propertyValue, $propertyType);
     }
 
     /**
      * Convert property to form desired by Excel.
-     *
-     * @param mixed $propertyValue
-     *
-     * @return mixed
      */
-    private static function convertProperty2($propertyValue, string $type)
+    private static function convertProperty2(bool|int|float|string|null $propertyValue, string $type): bool|int|float|string|null
     {
         $propertyType = self::convertPropertyType($type);
         switch ($propertyType) {
@@ -532,4 +480,30 @@ public static function convertPropertyType(string $propertyType): string
     {
         return self::PROPERTY_TYPE_ARRAY[$propertyType] ?? self::PROPERTY_TYPE_UNKNOWN;
     }
+
+    public function getHyperlinkBase(): string
+    {
+        return $this->hyperlinkBase;
+    }
+
+    public function setHyperlinkBase(string $hyperlinkBase): self
+    {
+        $this->hyperlinkBase = $hyperlinkBase;
+
+        return $this;
+    }
+
+    public function getViewport(): string
+    {
+        return $this->viewport;
+    }
+
+    public const SUGGESTED_VIEWPORT = 'width=device-width, initial-scale=1';
+
+    public function setViewport(string $viewport): self
+    {
+        $this->viewport = $viewport;
+
+        return $this;
+    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Document/Security.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Document/Security.php
index bdcc239373..31a32beb42 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Document/Security.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Document/Security.php
@@ -8,38 +8,28 @@ class Security
 {
     /**
      * LockRevision.
-     *
-     * @var bool
      */
-    private $lockRevision = false;
+    private bool $lockRevision = false;
 
     /**
      * LockStructure.
-     *
-     * @var bool
      */
-    private $lockStructure = false;
+    private bool $lockStructure = false;
 
     /**
      * LockWindows.
-     *
-     * @var bool
      */
-    private $lockWindows = false;
+    private bool $lockWindows = false;
 
     /**
      * RevisionsPassword.
-     *
-     * @var string
      */
-    private $revisionsPassword = '';
+    private string $revisionsPassword = '';
 
     /**
      * WorkbookPassword.
-     *
-     * @var string
      */
-    private $workbookPassword = '';
+    private string $workbookPassword = '';
 
     /**
      * Create a new Document Security instance.
@@ -53,9 +43,9 @@ public function __construct()
      */
     public function isSecurityEnabled(): bool
     {
-        return  $this->lockRevision ||
-                $this->lockStructure ||
-                $this->lockWindows;
+        return $this->lockRevision
+                || $this->lockStructure
+                || $this->lockWindows;
     }
 
     public function getLockRevision(): bool
@@ -63,10 +53,10 @@ public function getLockRevision(): bool
         return $this->lockRevision;
     }
 
-    public function setLockRevision(?bool $pValue): self
+    public function setLockRevision(?bool $locked): self
     {
-        if ($pValue !== null) {
-            $this->lockRevision = $pValue;
+        if ($locked !== null) {
+            $this->lockRevision = $locked;
         }
 
         return $this;
@@ -77,10 +67,10 @@ public function getLockStructure(): bool
         return $this->lockStructure;
     }
 
-    public function setLockStructure(?bool $pValue): self
+    public function setLockStructure(?bool $locked): self
     {
-        if ($pValue !== null) {
-            $this->lockStructure = $pValue;
+        if ($locked !== null) {
+            $this->lockStructure = $locked;
         }
 
         return $this;
@@ -91,10 +81,10 @@ public function getLockWindows(): bool
         return $this->lockWindows;
     }
 
-    public function setLockWindows(?bool $pValue): self
+    public function setLockWindows(?bool $locked): self
     {
-        if ($pValue !== null) {
-            $this->lockWindows = $pValue;
+        if ($locked !== null) {
+            $this->lockWindows = $locked;
         }
 
         return $this;
@@ -105,13 +95,20 @@ public function getRevisionsPassword(): string
         return $this->revisionsPassword;
     }
 
-    public function setRevisionsPassword(?string $pValue, bool $pAlreadyHashed = false): self
+    /**
+     * Set RevisionsPassword.
+     *
+     * @param bool $alreadyHashed If the password has already been hashed, set this to true
+     *
+     * @return $this
+     */
+    public function setRevisionsPassword(?string $password, bool $alreadyHashed = false): static
     {
-        if ($pValue !== null) {
-            if (!$pAlreadyHashed) {
-                $pValue = PasswordHasher::hashPassword($pValue);
+        if ($password !== null) {
+            if (!$alreadyHashed) {
+                $password = PasswordHasher::hashPassword($password);
             }
-            $this->revisionsPassword = $pValue;
+            $this->revisionsPassword = $password;
         }
 
         return $this;
@@ -122,13 +119,20 @@ public function getWorkbookPassword(): string
         return $this->workbookPassword;
     }
 
-    public function setWorkbookPassword(?string $pValue, bool $pAlreadyHashed = false): self
+    /**
+     * Set WorkbookPassword.
+     *
+     * @param bool $alreadyHashed If the password has already been hashed, set this to true
+     *
+     * @return $this
+     */
+    public function setWorkbookPassword(?string $password, bool $alreadyHashed = false): static
     {
-        if ($pValue !== null) {
-            if (!$pAlreadyHashed) {
-                $pValue = PasswordHasher::hashPassword($pValue);
+        if ($password !== null) {
+            if (!$alreadyHashed) {
+                $password = PasswordHasher::hashPassword($password);
             }
-            $this->workbookPassword = $pValue;
+            $this->workbookPassword = $password;
         }
 
         return $this;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Exception.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Exception.php
index 9c5ab30ee0..349158078a 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Exception.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Exception.php
@@ -2,6 +2,8 @@
 
 namespace PhpOffice\PhpSpreadsheet;
 
-class Exception extends \Exception
+use RuntimeException;
+
+class Exception extends RuntimeException
 {
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/HashTable.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/HashTable.php
index 8cf8281e0f..94c4836bc3 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/HashTable.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/HashTable.php
@@ -10,43 +10,43 @@ class HashTable
     /**
      * HashTable elements.
      *
-     * @var T[]
+     * @var array<string, T>
      */
-    protected $items = [];
+    protected array $items = [];
 
     /**
      * HashTable key map.
      *
-     * @var string[]
+     * @var array<int, string>
      */
-    protected $keyMap = [];
+    protected array $keyMap = [];
 
     /**
-     * Create a new \PhpOffice\PhpSpreadsheet\HashTable.
+     * Create a new HashTable.
      *
-     * @param T[] $pSource Optional source array to create HashTable from
+     * @param T[] $source Optional source array to create HashTable from
      */
-    public function __construct($pSource = null)
+    public function __construct(?array $source = [])
     {
-        if ($pSource !== null) {
+        if ($source !== null) {
             // Create HashTable
-            $this->addFromSource($pSource);
+            $this->addFromSource($source);
         }
     }
 
     /**
      * Add HashTable items from source.
      *
-     * @param T[] $pSource Source array to create HashTable from
+     * @param T[] $source Source array to create HashTable from
      */
-    public function addFromSource(?array $pSource = null): void
+    public function addFromSource(?array $source = null): void
     {
         // Check if an array was passed
-        if ($pSource == null) {
+        if ($source === null) {
             return;
         }
 
-        foreach ($pSource as $item) {
+        foreach ($source as $item) {
             $this->add($item);
         }
     }
@@ -54,13 +54,13 @@ public function addFromSource(?array $pSource = null): void
     /**
      * Add HashTable item.
      *
-     * @param T $pSource Item to add
+     * @param T $source Item to add
      */
-    public function add(IComparable $pSource): void
+    public function add(IComparable $source): void
     {
-        $hash = $pSource->getHashCode();
+        $hash = $source->getHashCode();
         if (!isset($this->items[$hash])) {
-            $this->items[$hash] = $pSource;
+            $this->items[$hash] = $source;
             $this->keyMap[count($this->items) - 1] = $hash;
         }
     }
@@ -68,11 +68,11 @@ public function add(IComparable $pSource): void
     /**
      * Remove HashTable item.
      *
-     * @param T $pSource Item to remove
+     * @param T $source Item to remove
      */
-    public function remove(IComparable $pSource): void
+    public function remove(IComparable $source): void
     {
-        $hash = $pSource->getHashCode();
+        $hash = $source->getHashCode();
         if (isset($this->items[$hash])) {
             unset($this->items[$hash]);
 
@@ -101,37 +101,29 @@ public function clear(): void
 
     /**
      * Count.
-     *
-     * @return int
      */
-    public function count()
+    public function count(): int
     {
         return count($this->items);
     }
 
     /**
      * Get index for hash code.
-     *
-     * @param string $pHashCode
-     *
-     * @return int Index
      */
-    public function getIndexForHashCode($pHashCode)
+    public function getIndexForHashCode(string $hashCode): false|int
     {
-        return array_search($pHashCode, $this->keyMap);
+        return array_search($hashCode, $this->keyMap, true);
     }
 
     /**
      * Get by index.
      *
-     * @param int $pIndex
-     *
      * @return null|T
      */
-    public function getByIndex($pIndex)
+    public function getByIndex(int $index): ?IComparable
     {
-        if (isset($this->keyMap[$pIndex])) {
-            return $this->getByHashCode($this->keyMap[$pIndex]);
+        if (isset($this->keyMap[$index])) {
+            return $this->getByHashCode($this->keyMap[$index]);
         }
 
         return null;
@@ -140,14 +132,12 @@ public function getByIndex($pIndex)
     /**
      * Get by hashcode.
      *
-     * @param string $pHashCode
-     *
      * @return null|T
      */
-    public function getByHashCode($pHashCode)
+    public function getByHashCode(string $hashCode): ?IComparable
     {
-        if (isset($this->items[$pHashCode])) {
-            return $this->items[$pHashCode];
+        if (isset($this->items[$hashCode])) {
+            return $this->items[$hashCode];
         }
 
         return null;
@@ -158,7 +148,7 @@ public function getByHashCode($pHashCode)
      *
      * @return T[]
      */
-    public function toArray()
+    public function toArray(): array
     {
         return $this->items;
     }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Dimension.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Dimension.php
new file mode 100644
index 0000000000..a729dfdf5d
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Dimension.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Helper;
+
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Shared\Drawing;
+use PhpOffice\PhpSpreadsheet\Style\Font;
+
+class Dimension
+{
+    public const UOM_CENTIMETERS = 'cm';
+    public const UOM_MILLIMETERS = 'mm';
+    public const UOM_INCHES = 'in';
+    public const UOM_PIXELS = 'px';
+    public const UOM_POINTS = 'pt';
+    public const UOM_PICA = 'pc';
+
+    /**
+     * Based on 96 dpi.
+     */
+    const ABSOLUTE_UNITS = [
+        self::UOM_CENTIMETERS => 96.0 / 2.54,
+        self::UOM_MILLIMETERS => 96.0 / 25.4,
+        self::UOM_INCHES => 96.0,
+        self::UOM_PIXELS => 1.0,
+        self::UOM_POINTS => 96.0 / 72,
+        self::UOM_PICA => 96.0 * 12 / 72,
+    ];
+
+    /**
+     * Based on a standard column width of 8.54 units in MS Excel.
+     */
+    const RELATIVE_UNITS = [
+        'em' => 10.0 / 8.54,
+        'ex' => 10.0 / 8.54,
+        'ch' => 10.0 / 8.54,
+        'rem' => 10.0 / 8.54,
+        'vw' => 8.54,
+        'vh' => 8.54,
+        'vmin' => 8.54,
+        'vmax' => 8.54,
+        '%' => 8.54 / 100,
+    ];
+
+    /**
+     * @var float|int If this is a width, then size is measured in pixels (if is set)
+     *                   or in Excel's default column width units if $unit is null.
+     *                If this is a height, then size is measured in pixels ()
+     *                   or in points () if $unit is null.
+     */
+    protected float|int $size;
+
+    protected ?string $unit = null;
+
+    /**
+     * Phpstan bug has been fixed; this function allows us to
+     * pass Phpstan whether fixed or not.
+     */
+    private static function stanBugFixed(array|int|null $value): array
+    {
+        return is_array($value) ? $value : [null, null];
+    }
+
+    public function __construct(string $dimension)
+    {
+        [$size, $unit] = self::stanBugFixed(sscanf($dimension, '%[1234567890.]%s'));
+        $unit = strtolower(trim($unit ?? ''));
+        $size = (float) $size;
+
+        // If a UoM is specified, then convert the size to pixels for internal storage
+        if (isset(self::ABSOLUTE_UNITS[$unit])) {
+            $size *= self::ABSOLUTE_UNITS[$unit];
+            $this->unit = self::UOM_PIXELS;
+        } elseif (isset(self::RELATIVE_UNITS[$unit])) {
+            $size *= self::RELATIVE_UNITS[$unit];
+            $size = round($size, 4);
+        }
+
+        $this->size = $size;
+    }
+
+    public function width(): float
+    {
+        return (float) ($this->unit === null)
+            ? $this->size
+            : round(Drawing::pixelsToCellDimension((int) $this->size, new Font(false)), 4);
+    }
+
+    public function height(): float
+    {
+        return (float) ($this->unit === null)
+            ? $this->size
+            : $this->toUnit(self::UOM_POINTS);
+    }
+
+    public function toUnit(string $unitOfMeasure): float
+    {
+        $unitOfMeasure = strtolower($unitOfMeasure);
+        if (!array_key_exists($unitOfMeasure, self::ABSOLUTE_UNITS)) {
+            throw new Exception("{$unitOfMeasure} is not a vaid unit of measure");
+        }
+
+        $size = $this->size;
+        if ($this->unit === null) {
+            $size = Drawing::cellDimensionToPixels($size, new Font(false));
+        }
+
+        return $size / self::ABSOLUTE_UNITS[$unitOfMeasure];
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Downloader.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Downloader.php
new file mode 100644
index 0000000000..4e98c7925c
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Downloader.php
@@ -0,0 +1,101 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Helper;
+
+use PhpOffice\PhpSpreadsheet\Exception;
+
+/**
+ * Assist downloading files when samples are run in browser.
+ * Never run as part of unit tests, which are command line.
+ *
+ * @codeCoverageIgnore
+ */
+class Downloader
+{
+    protected string $filepath;
+
+    protected string $filename;
+
+    protected string $filetype;
+
+    protected const CONTENT_TYPES = [
+        'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+        'xls' => 'application/vnd.ms-excel',
+        'ods' => 'application/vnd.oasis.opendocument.spreadsheet',
+        'csv' => 'text/csv',
+        'html' => 'text/html',
+        'pdf' => 'application/pdf',
+    ];
+
+    public function __construct(string $folder, string $filename, ?string $filetype = null)
+    {
+        if ((is_dir($folder) === false) || (is_readable($folder) === false)) {
+            throw new Exception("Folder {$folder} is not accessable");
+        }
+        $filepath = "{$folder}/{$filename}";
+        $this->filepath = (string) realpath($filepath);
+        $this->filename = basename($filepath);
+        if ((file_exists($this->filepath) === false) || (is_readable($this->filepath) === false)) {
+            throw new Exception("{$this->filename} not found, or cannot be read");
+        }
+
+        $filetype ??= pathinfo($filename, PATHINFO_EXTENSION);
+        if (array_key_exists(strtolower($filetype), self::CONTENT_TYPES) === false) {
+            throw new Exception("Invalid filetype: {$filetype} cannot be downloaded");
+        }
+        $this->filetype = strtolower($filetype);
+    }
+
+    public function download(): void
+    {
+        $this->headers();
+
+        readfile($this->filepath);
+    }
+
+    public function headers(): void
+    {
+        // I cannot tell what this ob_clean is paired with.
+        // I have never seen a problem with it, but someone has - issue 3739.
+        // Perhaps it should be removed altogether,
+        // but making it conditional seems harmless, and safer.
+        if ((int) ob_get_length() > 0) {
+            ob_clean();
+        }
+
+        $this->contentType();
+        $this->contentDisposition();
+        $this->cacheHeaders();
+        $this->fileSize();
+
+        flush();
+    }
+
+    protected function contentType(): void
+    {
+        header('Content-Type: ' . self::CONTENT_TYPES[$this->filetype]);
+    }
+
+    protected function contentDisposition(): void
+    {
+        header('Content-Disposition: attachment;filename="' . $this->filename . '"');
+    }
+
+    protected function cacheHeaders(): void
+    {
+        header('Cache-Control: max-age=0');
+        // If you're serving to IE 9, then the following may be needed
+        header('Cache-Control: max-age=1');
+
+        // If you're serving to IE over SSL, then the following may be needed
+        header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); // Date in the past
+        header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); // always modified
+        header('Cache-Control: cache, must-revalidate'); // HTTP/1.1
+        header('Pragma: public'); // HTTP/1.0
+    }
+
+    protected function fileSize(): void
+    {
+        header('Content-Length: ' . filesize($this->filepath));
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Handler.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Handler.php
new file mode 100644
index 0000000000..fb1b9a04d5
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Handler.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Helper;
+
+class Handler
+{
+    private static string $invalidHex = 'Y';
+
+    // A bunch of methods to show that we continue
+    // to capture messages even using PhpUnit 10.
+    public static function suppressed(): bool
+    {
+        return @trigger_error('hello');
+    }
+
+    public static function deprecated(): string
+    {
+        return (string) hexdec(self::$invalidHex);
+    }
+
+    public static function notice(string $value): void
+    {
+        date_default_timezone_set($value);
+    }
+
+    public static function warning(): bool
+    {
+        return file_get_contents(__FILE__ . 'noexist') !== false;
+    }
+
+    public static function userDeprecated(): bool
+    {
+        return trigger_error('hello', E_USER_DEPRECATED);
+    }
+
+    public static function userNotice(): bool
+    {
+        return trigger_error('userNotice', E_USER_NOTICE);
+    }
+
+    public static function userWarning(): bool
+    {
+        return trigger_error('userWarning', E_USER_WARNING);
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Html.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Html.php
index f07bc961c5..e690ae6525 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Html.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Html.php
@@ -2,6 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheet\Helper;
 
+use DOMAttr;
 use DOMDocument;
 use DOMElement;
 use DOMNode;
@@ -12,7 +13,7 @@
 
 class Html
 {
-    protected static $colourMap = [
+    private const COLOUR_MAP = [
         'aliceblue' => 'f0f8ff',
         'antiquewhite' => 'faebd7',
         'antiquewhite1' => 'ffefdb',
@@ -532,68 +533,69 @@ class Html
         'yellowgreen' => '9acd32',
     ];
 
-    protected $face;
+    private ?string $face = null;
 
-    protected $size;
+    private ?string $size = null;
 
-    protected $color;
+    private ?string $color = null;
 
-    protected $bold = false;
+    private bool $bold = false;
 
-    protected $italic = false;
+    private bool $italic = false;
 
-    protected $underline = false;
+    private bool $underline = false;
 
-    protected $superscript = false;
+    private bool $superscript = false;
 
-    protected $subscript = false;
+    private bool $subscript = false;
 
-    protected $strikethrough = false;
+    private bool $strikethrough = false;
 
-    protected $startTagCallbacks = [
-        'font' => 'startFontTag',
-        'b' => 'startBoldTag',
-        'strong' => 'startBoldTag',
-        'i' => 'startItalicTag',
-        'em' => 'startItalicTag',
-        'u' => 'startUnderlineTag',
-        'ins' => 'startUnderlineTag',
-        'del' => 'startStrikethruTag',
-        'sup' => 'startSuperscriptTag',
-        'sub' => 'startSubscriptTag',
+    /** @var callable[] */
+    private array $startTagCallbacks = [
+        'font' => [self::class, 'startFontTag'],
+        'b' => [self::class, 'startBoldTag'],
+        'strong' => [self::class, 'startBoldTag'],
+        'i' => [self::class, 'startItalicTag'],
+        'em' => [self::class, 'startItalicTag'],
+        'u' => [self::class, 'startUnderlineTag'],
+        'ins' => [self::class, 'startUnderlineTag'],
+        'del' => [self::class, 'startStrikethruTag'],
+        'sup' => [self::class, 'startSuperscriptTag'],
+        'sub' => [self::class, 'startSubscriptTag'],
     ];
 
-    protected $endTagCallbacks = [
-        'font' => 'endFontTag',
-        'b' => 'endBoldTag',
-        'strong' => 'endBoldTag',
-        'i' => 'endItalicTag',
-        'em' => 'endItalicTag',
-        'u' => 'endUnderlineTag',
-        'ins' => 'endUnderlineTag',
-        'del' => 'endStrikethruTag',
-        'sup' => 'endSuperscriptTag',
-        'sub' => 'endSubscriptTag',
-        'br' => 'breakTag',
-        'p' => 'breakTag',
-        'h1' => 'breakTag',
-        'h2' => 'breakTag',
-        'h3' => 'breakTag',
-        'h4' => 'breakTag',
-        'h5' => 'breakTag',
-        'h6' => 'breakTag',
+    /** @var callable[] */
+    private array $endTagCallbacks = [
+        'font' => [self::class, 'endFontTag'],
+        'b' => [self::class, 'endBoldTag'],
+        'strong' => [self::class, 'endBoldTag'],
+        'i' => [self::class, 'endItalicTag'],
+        'em' => [self::class, 'endItalicTag'],
+        'u' => [self::class, 'endUnderlineTag'],
+        'ins' => [self::class, 'endUnderlineTag'],
+        'del' => [self::class, 'endStrikethruTag'],
+        'sup' => [self::class, 'endSuperscriptTag'],
+        'sub' => [self::class, 'endSubscriptTag'],
+        'br' => [self::class, 'breakTag'],
+        'p' => [self::class, 'breakTag'],
+        'h1' => [self::class, 'breakTag'],
+        'h2' => [self::class, 'breakTag'],
+        'h3' => [self::class, 'breakTag'],
+        'h4' => [self::class, 'breakTag'],
+        'h5' => [self::class, 'breakTag'],
+        'h6' => [self::class, 'breakTag'],
     ];
 
-    protected $stack = [];
+    private array $stack = [];
 
-    protected $stringData = '';
+    public string $stringData = '';
 
-    /**
-     * @var RichText
-     */
-    protected $richTextObject;
+    private RichText $richTextObject;
 
-    protected function initialise(): void
+    private bool $preserveWhiteSpace = false;
+
+    private function initialise(): void
     {
         $this->face = $this->size = $this->color = null;
         $this->bold = $this->italic = $this->underline = $this->superscript = $this->subscript = $this->strikethrough = false;
@@ -605,12 +607,8 @@ protected function initialise(): void
 
     /**
      * Parse HTML formatting and return the resulting RichText.
-     *
-     * @param string $html
-     *
-     * @return RichText
      */
-    public function toRichTextObject($html)
+    public function toRichTextObject(string $html, bool $preserveWhiteSpace = false): RichText
     {
         $this->initialise();
 
@@ -624,7 +622,9 @@ public function toRichTextObject($html)
         $dom->preserveWhiteSpace = false;
 
         $this->richTextObject = new RichText();
+        $this->preserveWhiteSpace = $preserveWhiteSpace;
         $this->parseElements($dom);
+        $this->preserveWhiteSpace = false;
 
         // Clean any further spurious whitespace
         $this->cleanWhitespace();
@@ -632,7 +632,7 @@ public function toRichTextObject($html)
         return $this->richTextObject;
     }
 
-    protected function cleanWhitespace(): void
+    private function cleanWhitespace(): void
     {
         foreach ($this->richTextObject->getRichTextElements() as $key => $element) {
             $text = $element->getText();
@@ -641,12 +641,12 @@ protected function cleanWhitespace(): void
                 $text = ltrim($text);
             }
             // Trim any spaces immediately after a line break
-            $text = preg_replace('/\n */mu', "\n", $text);
+            $text = (string) preg_replace('/\n */mu', "\n", $text);
             $element->setText($text);
         }
     }
 
-    protected function buildTextRun(): void
+    private function buildTextRun(): void
     {
         $text = $this->stringData;
         if (trim($text) === '') {
@@ -654,67 +654,75 @@ protected function buildTextRun(): void
         }
 
         $richtextRun = $this->richTextObject->createTextRun($this->stringData);
-        if ($this->face) {
-            $richtextRun->getFont()->setName($this->face);
-        }
-        if ($this->size) {
-            $richtextRun->getFont()->setSize($this->size);
-        }
-        if ($this->color) {
-            $richtextRun->getFont()->setColor(new Color('ff' . $this->color));
-        }
-        if ($this->bold) {
-            $richtextRun->getFont()->setBold(true);
-        }
-        if ($this->italic) {
-            $richtextRun->getFont()->setItalic(true);
-        }
-        if ($this->underline) {
-            $richtextRun->getFont()->setUnderline(Font::UNDERLINE_SINGLE);
-        }
-        if ($this->superscript) {
-            $richtextRun->getFont()->setSuperscript(true);
-        }
-        if ($this->subscript) {
-            $richtextRun->getFont()->setSubscript(true);
-        }
-        if ($this->strikethrough) {
-            $richtextRun->getFont()->setStrikethrough(true);
+        $font = $richtextRun->getFont();
+        if ($font !== null) {
+            if ($this->face) {
+                $font->setName($this->face);
+            }
+            if ($this->size) {
+                $font->setSize($this->size);
+            }
+            if ($this->color) {
+                $font->setColor(new Color('ff' . $this->color));
+            }
+            if ($this->bold) {
+                $font->setBold(true);
+            }
+            if ($this->italic) {
+                $font->setItalic(true);
+            }
+            if ($this->underline) {
+                $font->setUnderline(Font::UNDERLINE_SINGLE);
+            }
+            if ($this->superscript) {
+                $font->setSuperscript(true);
+            }
+            if ($this->subscript) {
+                $font->setSubscript(true);
+            }
+            if ($this->strikethrough) {
+                $font->setStrikethrough(true);
+            }
         }
         $this->stringData = '';
     }
 
-    protected function rgbToColour($rgb)
+    private function rgbToColour(string $rgbValue): string
     {
-        preg_match_all('/\d+/', $rgb, $values);
+        preg_match_all('/\d+/', $rgbValue, $values);
         foreach ($values[0] as &$value) {
-            $value = str_pad(dechex($value), 2, '0', STR_PAD_LEFT);
+            $value = str_pad(dechex((int) $value), 2, '0', STR_PAD_LEFT);
         }
 
         return implode('', $values[0]);
     }
 
-    public static function colourNameLookup(string $rgb): string
+    public static function colourNameLookup(string $colorName): string
     {
-        return self::$colourMap[$rgb] ?? '';
+        return self::COLOUR_MAP[$colorName] ?? '';
     }
 
-    protected function startFontTag($tag): void
+    protected function startFontTag(DOMElement $tag): void
     {
-        foreach ($tag->attributes as $attribute) {
-            $attributeName = strtolower($attribute->name);
-            $attributeValue = $attribute->value;
-
-            if ($attributeName == 'color') {
-                if (preg_match('/rgb\s*\(/', $attributeValue)) {
-                    $this->$attributeName = $this->rgbToColour($attributeValue);
-                } elseif (strpos(trim($attributeValue), '#') === 0) {
-                    $this->$attributeName = ltrim($attributeValue, '#');
+        $attrs = $tag->attributes;
+        if ($attrs !== null) {
+            /** @var DOMAttr $attribute */
+            foreach ($attrs as $attribute) {
+                $attributeName = strtolower($attribute->name);
+                $attributeName = preg_replace('/^html:/', '', $attributeName) ?? $attributeName; // in case from Xml spreadsheet
+                $attributeValue = $attribute->value;
+
+                if ($attributeName == 'color') {
+                    if (preg_match('/rgb\s*\(/', $attributeValue)) {
+                        $this->$attributeName = $this->rgbToColour($attributeValue);
+                    } elseif (str_starts_with(trim($attributeValue), '#')) {
+                        $this->$attributeName = ltrim($attributeValue, '#');
+                    } else {
+                        $this->$attributeName = static::colourNameLookup($attributeValue);
+                    }
                 } else {
-                    $this->$attributeName = static::colourNameLookup($attributeValue);
+                    $this->$attributeName = $attributeValue;
                 }
-            } else {
-                $this->$attributeName = $attributeValue;
             }
         }
     }
@@ -784,36 +792,48 @@ protected function endStrikethruTag(): void
         $this->strikethrough = false;
     }
 
-    protected function breakTag(): void
+    public function breakTag(): void
     {
         $this->stringData .= "\n";
     }
 
-    protected function parseTextNode(DOMText $textNode): void
+    private function parseTextNode(DOMText $textNode): void
     {
-        $domText = preg_replace(
-            '/\s+/u',
-            ' ',
-            str_replace(["\r", "\n"], ' ', $textNode->nodeValue)
-        );
+        if ($this->preserveWhiteSpace) {
+            $domText = $textNode->nodeValue ?? '';
+        } else {
+            $domText = (string) preg_replace(
+                '/\s+/u',
+                ' ',
+                str_replace(["\r", "\n"], ' ', $textNode->nodeValue ?? '')
+            );
+        }
         $this->stringData .= $domText;
         $this->buildTextRun();
     }
 
-    /**
-     * @param string $callbackTag
-     */
-    protected function handleCallback(DOMElement $element, $callbackTag, array $callbacks): void
+    public function addStartTagCallback(string $tag, callable $callback): void
+    {
+        $this->startTagCallbacks[$tag] = $callback;
+    }
+
+    public function addEndTagCallback(string $tag, callable $callback): void
+    {
+        $this->endTagCallbacks[$tag] = $callback;
+    }
+
+    /** @param callable[] $callbacks */
+    private function handleCallback(DOMElement $element, string $callbackTag, array $callbacks): void
     {
         if (isset($callbacks[$callbackTag])) {
             $elementHandler = $callbacks[$callbackTag];
-            if (method_exists($this, $elementHandler)) {
-                call_user_func([$this, $elementHandler], $element);
+            if (is_callable($elementHandler)) {
+                call_user_func($elementHandler, $element, $this);
             }
         }
     }
 
-    protected function parseElementNode(DOMElement $element): void
+    private function parseElementNode(DOMElement $element): void
     {
         $callbackTag = strtolower($element->nodeName);
         $this->stack[] = $callbackTag;
@@ -826,7 +846,7 @@ protected function parseElementNode(DOMElement $element): void
         $this->handleCallback($element, $callbackTag, $this->endTagCallbacks);
     }
 
-    protected function parseElements(DOMNode $element): void
+    private function parseElements(DOMNode $element): void
     {
         foreach ($element->childNodes as $child) {
             if ($child instanceof DOMText) {
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Sample.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Sample.php
index 257a02a827..3e2ed75695 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Sample.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Sample.php
@@ -2,15 +2,21 @@
 
 namespace PhpOffice\PhpSpreadsheet\Helper;
 
+use PhpOffice\PhpSpreadsheet\Chart\Chart;
+use PhpOffice\PhpSpreadsheet\Chart\Renderer\MtJpGraphRenderer;
 use PhpOffice\PhpSpreadsheet\IOFactory;
+use PhpOffice\PhpSpreadsheet\Settings;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 use PhpOffice\PhpSpreadsheet\Writer\IWriter;
+use PhpOffice\PhpSpreadsheet\Writer\Pdf\Dompdf;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
 use RecursiveRegexIterator;
 use ReflectionClass;
 use RegexIterator;
 use RuntimeException;
+use Throwable;
 
 /**
  * Helper class to be used in sample code.
@@ -19,50 +25,40 @@ class Sample
 {
     /**
      * Returns whether we run on CLI or browser.
-     *
-     * @return bool
      */
-    public function isCli()
+    public function isCli(): bool
     {
         return PHP_SAPI === 'cli';
     }
 
     /**
      * Return the filename currently being executed.
-     *
-     * @return string
      */
-    public function getScriptFilename()
+    public function getScriptFilename(): string
     {
         return basename($_SERVER['SCRIPT_FILENAME'], '.php');
     }
 
     /**
      * Whether we are executing the index page.
-     *
-     * @return bool
      */
-    public function isIndex()
+    public function isIndex(): bool
     {
         return $this->getScriptFilename() === 'index';
     }
 
     /**
      * Return the page title.
-     *
-     * @return string
      */
-    public function getPageTitle()
+    public function getPageTitle(): string
     {
         return $this->isIndex() ? 'PHPSpreadsheet' : $this->getScriptFilename();
     }
 
     /**
      * Return the page heading.
-     *
-     * @return string
      */
-    public function getPageHeading()
+    public function getPageHeading(): string
     {
         return $this->isIndex() ? '' : '<h1>' . str_replace('_', ' ', $this->getScriptFilename()) . '</h1>';
     }
@@ -72,21 +68,27 @@ public function getPageHeading()
      *
      * @return string[][] [$name => $path]
      */
-    public function getSamples()
+    public function getSamples(): array
     {
         // Populate samples
         $baseDir = realpath(__DIR__ . '/../../../samples');
+        if ($baseDir === false) {
+            // @codeCoverageIgnoreStart
+            throw new RuntimeException('realpath returned false');
+            // @codeCoverageIgnoreEnd
+        }
         $directory = new RecursiveDirectoryIterator($baseDir);
         $iterator = new RecursiveIteratorIterator($directory);
         $regex = new RegexIterator($iterator, '/^.+\.php$/', RecursiveRegexIterator::GET_MATCH);
 
         $files = [];
+        /** @var string[] $file */
         foreach ($regex as $file) {
             $file = str_replace(str_replace('\\', '/', $baseDir) . '/', '', str_replace('\\', '/', $file[0]));
             $info = pathinfo($file);
-            $category = str_replace('_', ' ', $info['dirname']);
-            $name = str_replace('_', ' ', preg_replace('/(|\.php)/', '', $info['filename']));
-            if (!in_array($category, ['.', 'boostrap', 'templates'])) {
+            $category = str_replace('_', ' ', $info['dirname'] ?? '');
+            $name = str_replace('_', ' ', (string) preg_replace('/(|\.php)/', '', $info['filename']));
+            if (!in_array($category, ['.', 'bootstrap', 'templates']) && $name !== 'Header') {
                 if (!isset($files[$category])) {
                     $files[$category] = [];
                 }
@@ -106,21 +108,35 @@ public function getSamples()
     /**
      * Write documents.
      *
-     * @param string $filename
      * @param string[] $writers
      */
-    public function write(Spreadsheet $spreadsheet, $filename, array $writers = ['Xlsx', 'Xls']): void
+    public function write(Spreadsheet $spreadsheet, string $filename, array $writers = ['Xlsx', 'Xls'], bool $withCharts = false, ?callable $writerCallback = null, bool $resetActiveSheet = true): void
     {
         // Set active sheet index to the first sheet, so Excel opens this as the first sheet
-        $spreadsheet->setActiveSheetIndex(0);
+        if ($resetActiveSheet) {
+            $spreadsheet->setActiveSheetIndex(0);
+        }
 
         // Write documents
         foreach ($writers as $writerType) {
             $path = $this->getFilename($filename, mb_strtolower($writerType));
             $writer = IOFactory::createWriter($spreadsheet, $writerType);
+            $writer->setIncludeCharts($withCharts);
+            if ($writerCallback !== null) {
+                $writerCallback($writer);
+            }
             $callStartTime = microtime(true);
-            $writer->save($path);
+            if (PHP_VERSION_ID >= 80400 && $writer instanceof Dompdf) {
+                @$writer->save($path);
+            } else {
+                $writer->save($path);
+            }
             $this->logWrite($writer, $path, $callStartTime);
+            if ($this->isCli() === false) {
+                // @codeCoverageIgnoreStart
+                echo '<a href="/download.php?type=' . pathinfo($path, PATHINFO_EXTENSION) . '&name=' . basename($path) . '">Download ' . basename($path) . '</a><br />';
+                // @codeCoverageIgnoreEnd
+            }
         }
 
         $this->logEndingNotes();
@@ -133,10 +149,8 @@ protected function isDirOrMkdir(string $folder): bool
 
     /**
      * Returns the temporary directory and make sure it exists.
-     *
-     * @return string
      */
-    private function getTemporaryFolder()
+    public function getTemporaryFolder(): string
     {
         $tempFolder = sys_get_temp_dir() . '/phpspreadsheet';
         if (!$this->isDirOrMkdir($tempFolder)) {
@@ -148,13 +162,8 @@ private function getTemporaryFolder()
 
     /**
      * Returns the filename that should be used for sample output.
-     *
-     * @param string $filename
-     * @param string $extension
-     *
-     * @return string
      */
-    public function getFilename($filename, $extension = 'xlsx')
+    public function getFilename(string $filename, string $extension = 'xlsx'): string
     {
         $originalExtension = pathinfo($filename, PATHINFO_EXTENSION);
 
@@ -163,23 +172,93 @@ public function getFilename($filename, $extension = 'xlsx')
 
     /**
      * Return a random temporary file name.
-     *
-     * @param string $extension
-     *
-     * @return string
      */
-    public function getTemporaryFilename($extension = 'xlsx')
+    public function getTemporaryFilename(string $extension = 'xlsx'): string
     {
         $temporaryFilename = tempnam($this->getTemporaryFolder(), 'phpspreadsheet-');
+        if ($temporaryFilename === false) {
+            // @codeCoverageIgnoreStart
+            throw new RuntimeException('tempnam returned false');
+            // @codeCoverageIgnoreEnd
+        }
         unlink($temporaryFilename);
 
         return $temporaryFilename . '.' . $extension;
     }
 
-    public function log($message): void
+    public function log(string $message): void
     {
         $eol = $this->isCli() ? PHP_EOL : '<br />';
-        echo date('H:i:s ') . $message . $eol;
+        echo ($this->isCli() ? date('H:i:s ') : '') . $message . $eol;
+    }
+
+    /**
+     * Render chart as part of running chart samples in browser.
+     * Charts are not rendered in unit tests, which are command line.
+     *
+     * @codeCoverageIgnore
+     */
+    public function renderChart(Chart $chart, string $fileName, ?Spreadsheet $spreadsheet = null): void
+    {
+        if ($this->isCli() === true) {
+            return;
+        }
+        Settings::setChartRenderer(MtJpGraphRenderer::class);
+
+        $fileName = $this->getFilename($fileName, 'png');
+        $title = $chart->getTitle();
+        $caption = null;
+        if ($title !== null) {
+            $calculatedTitle = $title->getCalculatedTitle($spreadsheet);
+            if ($calculatedTitle !== null) {
+                $caption = $title->getCaption();
+                $title->setCaption($calculatedTitle);
+            }
+        }
+
+        try {
+            $chart->render($fileName);
+            $this->log('Rendered image: ' . $fileName);
+            $imageData = @file_get_contents($fileName);
+            if ($imageData !== false) {
+                echo '<div><img src="data:image/gif;base64,' . base64_encode($imageData) . '" /></div>';
+            } else {
+                $this->log('Unable to open chart' . PHP_EOL);
+            }
+        } catch (Throwable $e) {
+            $this->log('Error rendering chart: ' . $e->getMessage() . PHP_EOL);
+        }
+        if (isset($title, $caption)) {
+            $title->setCaption($caption);
+        }
+        Settings::unsetChartRenderer();
+    }
+
+    public function titles(string $category, string $functionName, ?string $description = null): void
+    {
+        $this->log(sprintf('%s Functions:', $category));
+        $description === null
+            ? $this->log(sprintf('Function: %s()', rtrim($functionName, '()')))
+            : $this->log(sprintf('Function: %s() - %s.', rtrim($functionName, '()'), rtrim($description, '.')));
+    }
+
+    public function displayGrid(array $matrix): void
+    {
+        $renderer = new TextGrid($matrix, $this->isCli());
+        echo $renderer->render();
+    }
+
+    public function logCalculationResult(
+        Worksheet $worksheet,
+        string $functionName,
+        string $formulaCell,
+        ?string $descriptionCell = null
+    ): void {
+        if ($descriptionCell !== null) {
+            $this->log($worksheet->getCell($descriptionCell)->getValueString());
+        }
+        $this->log($worksheet->getCell($formulaCell)->getValueString());
+        $this->log(sprintf('%s() Result is ', $functionName) . $worksheet->getCell($formulaCell)->getCalculatedValueString());
     }
 
     /**
@@ -193,29 +272,24 @@ public function logEndingNotes(): void
 
     /**
      * Log a line about the write operation.
-     *
-     * @param string $path
-     * @param float $callStartTime
      */
-    public function logWrite(IWriter $writer, $path, $callStartTime): void
+    public function logWrite(IWriter $writer, string $path, float $callStartTime): void
     {
         $callEndTime = microtime(true);
         $callTime = $callEndTime - $callStartTime;
         $reflection = new ReflectionClass($writer);
         $format = $reflection->getShortName();
-        $message = "Write {$format} format to <code>{$path}</code>  in " . sprintf('%.4f', $callTime) . ' seconds';
+
+        $codePath = $this->isCli() ? $path : "<code>$path</code>";
+        $message = "Write {$format} format to {$codePath}  in " . sprintf('%.4f', $callTime) . ' seconds';
 
         $this->log($message);
     }
 
     /**
      * Log a line about the read operation.
-     *
-     * @param string $format
-     * @param string $path
-     * @param float $callStartTime
      */
-    public function logRead($format, $path, $callStartTime): void
+    public function logRead(string $format, string $path, float $callStartTime): void
     {
         $callEndTime = microtime(true);
         $callTime = $callEndTime - $callStartTime;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Size.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Size.php
new file mode 100644
index 0000000000..575ed890b6
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Size.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Helper;
+
+use Stringable;
+
+class Size implements Stringable
+{
+    const REGEXP_SIZE_VALIDATION = '/^(?P<size>\d*\.?\d+)(?P<unit>pt|px|em)?$/i';
+
+    protected bool $valid;
+
+    protected string $size = '';
+
+    protected string $unit = '';
+
+    public function __construct(string $size)
+    {
+        $this->valid = (bool) preg_match(self::REGEXP_SIZE_VALIDATION, $size, $matches);
+        if ($this->valid) {
+            $this->size = $matches['size'];
+            $this->unit = $matches['unit'] ?? 'pt';
+        }
+    }
+
+    public function valid(): bool
+    {
+        return $this->valid;
+    }
+
+    public function size(): string
+    {
+        return $this->size;
+    }
+
+    public function unit(): string
+    {
+        return $this->unit;
+    }
+
+    public function __toString(): string
+    {
+        return $this->size . $this->unit;
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/TextGrid.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/TextGrid.php
new file mode 100644
index 0000000000..f706b58fbe
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/TextGrid.php
@@ -0,0 +1,124 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Helper;
+
+class TextGrid
+{
+    private bool $isCli;
+
+    protected array $matrix;
+
+    protected array $rows;
+
+    protected array $columns;
+
+    private string $gridDisplay;
+
+    public function __construct(array $matrix, bool $isCli = true)
+    {
+        $this->rows = array_keys($matrix);
+        $this->columns = array_keys($matrix[$this->rows[0]]);
+
+        $matrix = array_values($matrix);
+        array_walk(
+            $matrix,
+            function (&$row): void {
+                $row = array_values($row);
+            }
+        );
+
+        $this->matrix = $matrix;
+        $this->isCli = $isCli;
+    }
+
+    public function render(): string
+    {
+        $this->gridDisplay = $this->isCli ? '' : '<pre>';
+
+        $maxRow = max($this->rows);
+        $maxRowLength = mb_strlen((string) $maxRow) + 1;
+        $columnWidths = $this->getColumnWidths();
+
+        $this->renderColumnHeader($maxRowLength, $columnWidths);
+        $this->renderRows($maxRowLength, $columnWidths);
+        $this->renderFooter($maxRowLength, $columnWidths);
+
+        $this->gridDisplay .= $this->isCli ? '' : '</pre>';
+
+        return $this->gridDisplay;
+    }
+
+    private function renderRows(int $maxRowLength, array $columnWidths): void
+    {
+        foreach ($this->matrix as $row => $rowData) {
+            $this->gridDisplay .= '|' . str_pad((string) $this->rows[$row], $maxRowLength, ' ', STR_PAD_LEFT) . ' ';
+            $this->renderCells($rowData, $columnWidths);
+            $this->gridDisplay .= '|' . PHP_EOL;
+        }
+    }
+
+    private function renderCells(array $rowData, array $columnWidths): void
+    {
+        foreach ($rowData as $column => $cell) {
+            $displayCell = ($this->isCli) ? (string) $cell : htmlentities((string) $cell);
+            $this->gridDisplay .= '| ';
+            $this->gridDisplay .= $displayCell . str_repeat(' ', $columnWidths[$column] - mb_strlen($cell ?? '') + 1);
+        }
+    }
+
+    private function renderColumnHeader(int $maxRowLength, array $columnWidths): void
+    {
+        $this->gridDisplay .= str_repeat(' ', $maxRowLength + 2);
+        foreach ($this->columns as $column => $reference) {
+            $this->gridDisplay .= '+-' . str_repeat('-', $columnWidths[$column] + 1);
+        }
+        $this->gridDisplay .= '+' . PHP_EOL;
+
+        $this->gridDisplay .= str_repeat(' ', $maxRowLength + 2);
+        foreach ($this->columns as $column => $reference) {
+            $this->gridDisplay .= '| ' . str_pad((string) $reference, $columnWidths[$column] + 1, ' ');
+        }
+        $this->gridDisplay .= '|' . PHP_EOL;
+
+        $this->renderFooter($maxRowLength, $columnWidths);
+    }
+
+    private function renderFooter(int $maxRowLength, array $columnWidths): void
+    {
+        $this->gridDisplay .= '+' . str_repeat('-', $maxRowLength + 1);
+        foreach ($this->columns as $column => $reference) {
+            $this->gridDisplay .= '+-';
+            $this->gridDisplay .= str_pad((string) '', $columnWidths[$column] + 1, '-');
+        }
+        $this->gridDisplay .= '+' . PHP_EOL;
+    }
+
+    private function getColumnWidths(): array
+    {
+        $columnCount = count($this->matrix, COUNT_RECURSIVE) / count($this->matrix);
+        $columnWidths = [];
+        for ($column = 0; $column < $columnCount; ++$column) {
+            $columnWidths[] = $this->getColumnWidth(array_column($this->matrix, $column));
+        }
+
+        return $columnWidths;
+    }
+
+    private function getColumnWidth(array $columnData): int
+    {
+        $columnWidth = 0;
+        $columnData = array_values($columnData);
+
+        foreach ($columnData as $columnValue) {
+            if (is_string($columnValue)) {
+                $columnWidth = max($columnWidth, mb_strlen($columnValue));
+            } elseif (is_bool($columnValue)) {
+                $columnWidth = max($columnWidth, mb_strlen($columnValue ? 'TRUE' : 'FALSE'));
+            }
+
+            $columnWidth = max($columnWidth, mb_strlen((string) $columnWidth));
+        }
+
+        return $columnWidth;
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/IComparable.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/IComparable.php
index c215847b31..64b451ede2 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/IComparable.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/IComparable.php
@@ -9,5 +9,5 @@ interface IComparable
      *
      * @return string Hash code
      */
-    public function getHashCode();
+    public function getHashCode(): string;
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/IOFactory.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/IOFactory.php
index 06006edc2e..db8776db61 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/IOFactory.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/IOFactory.php
@@ -2,7 +2,9 @@
 
 namespace PhpOffice\PhpSpreadsheet;
 
+use PhpOffice\PhpSpreadsheet\Reader\IReader;
 use PhpOffice\PhpSpreadsheet\Shared\File;
+use PhpOffice\PhpSpreadsheet\Writer\IWriter;
 
 /**
  * Factory to create readers and writers easily.
@@ -12,23 +14,41 @@
  */
 abstract class IOFactory
 {
-    private static $readers = [
-        'Xlsx' => Reader\Xlsx::class,
-        'Xls' => Reader\Xls::class,
-        'Xml' => Reader\Xml::class,
-        'Ods' => Reader\Ods::class,
-        'Slk' => Reader\Slk::class,
-        'Gnumeric' => Reader\Gnumeric::class,
-        'Html' => Reader\Html::class,
-        'Csv' => Reader\Csv::class,
+    public const READER_XLSX = 'Xlsx';
+    public const READER_XLS = 'Xls';
+    public const READER_XML = 'Xml';
+    public const READER_ODS = 'Ods';
+    public const READER_SYLK = 'Slk';
+    public const READER_SLK = 'Slk';
+    public const READER_GNUMERIC = 'Gnumeric';
+    public const READER_HTML = 'Html';
+    public const READER_CSV = 'Csv';
+
+    public const WRITER_XLSX = 'Xlsx';
+    public const WRITER_XLS = 'Xls';
+    public const WRITER_ODS = 'Ods';
+    public const WRITER_CSV = 'Csv';
+    public const WRITER_HTML = 'Html';
+
+    /** @var array<string, class-string<IReader>> */
+    private static array $readers = [
+        self::READER_XLSX => Reader\Xlsx::class,
+        self::READER_XLS => Reader\Xls::class,
+        self::READER_XML => Reader\Xml::class,
+        self::READER_ODS => Reader\Ods::class,
+        self::READER_SLK => Reader\Slk::class,
+        self::READER_GNUMERIC => Reader\Gnumeric::class,
+        self::READER_HTML => Reader\Html::class,
+        self::READER_CSV => Reader\Csv::class,
     ];
 
-    private static $writers = [
-        'Xls' => Writer\Xls::class,
-        'Xlsx' => Writer\Xlsx::class,
-        'Ods' => Writer\Ods::class,
-        'Csv' => Writer\Csv::class,
-        'Html' => Writer\Html::class,
+    /** @var array<string, class-string<IWriter>> */
+    private static array $writers = [
+        self::WRITER_XLS => Writer\Xls::class,
+        self::WRITER_XLSX => Writer\Xlsx::class,
+        self::WRITER_ODS => Writer\Ods::class,
+        self::WRITER_CSV => Writer\Csv::class,
+        self::WRITER_HTML => Writer\Html::class,
         'Tcpdf' => Writer\Pdf\Tcpdf::class,
         'Dompdf' => Writer\Pdf\Dompdf::class,
         'Mpdf' => Writer\Pdf\Mpdf::class,
@@ -36,12 +56,8 @@ abstract class IOFactory
 
     /**
      * Create Writer\IWriter.
-     *
-     * @param string $writerType Example: Xlsx
-     *
-     * @return Writer\IWriter
      */
-    public static function createWriter(Spreadsheet $spreadsheet, $writerType)
+    public static function createWriter(Spreadsheet $spreadsheet, string $writerType): IWriter
     {
         if (!isset(self::$writers[$writerType])) {
             throw new Writer\Exception("No writer found for type $writerType");
@@ -54,13 +70,9 @@ public static function createWriter(Spreadsheet $spreadsheet, $writerType)
     }
 
     /**
-     * Create Reader\IReader.
-     *
-     * @param string $readerType Example: Xlsx
-     *
-     * @return Reader\IReader
+     * Create IReader.
      */
-    public static function createReader($readerType)
+    public static function createReader(string $readerType): IReader
     {
         if (!isset(self::$readers[$readerType])) {
             throw new Reader\Exception("No reader found for type $readerType");
@@ -75,28 +87,32 @@ public static function createReader($readerType)
     /**
      * Loads Spreadsheet from file using automatic Reader\IReader resolution.
      *
-     * @param string $pFilename The name of the spreadsheet file
-     *
-     * @return Spreadsheet
+     * @param string $filename The name of the spreadsheet file
+     * @param int $flags the optional second parameter flags may be used to identify specific elements
+     *                       that should be loaded, but which won't be loaded by default, using these values:
+     *                            IReader::LOAD_WITH_CHARTS - Include any charts that are defined in the loaded file.
+     *                            IReader::READ_DATA_ONLY - Read cell values only, not formatting or merge structure.
+     *                            IReader::IGNORE_EMPTY_CELLS - Don't load empty cells into the model.
+     * @param string[] $readers An array of Readers to use to identify the file type. By default, load() will try
+     *                             all possible Readers until it finds a match; but this allows you to pass in a
+     *                             list of Readers so it will only try the subset that you specify here.
+     *                          Values in this list can be any of the constant values defined in the set
+     *                                 IOFactory::READER_*.
      */
-    public static function load($pFilename)
+    public static function load(string $filename, int $flags = 0, ?array $readers = null): Spreadsheet
     {
-        $reader = self::createReaderForFile($pFilename);
+        $reader = self::createReaderForFile($filename, $readers);
 
-        return $reader->load($pFilename);
+        return $reader->load($filename, $flags);
     }
 
     /**
-     * Identify file type using automatic Reader\IReader resolution.
-     *
-     * @param string $pFilename The name of the spreadsheet file to identify
-     *
-     * @return string
+     * Identify file type using automatic IReader resolution.
      */
-    public static function identify($pFilename)
+    public static function identify(string $filename, ?array $readers = null): string
     {
-        $reader = self::createReaderForFile($pFilename);
-        $className = get_class($reader);
+        $reader = self::createReaderForFile($filename, $readers);
+        $className = $reader::class;
         $classType = explode('\\', $className);
         unset($reader);
 
@@ -104,19 +120,31 @@ public static function identify($pFilename)
     }
 
     /**
-     * Create Reader\IReader for file using automatic Reader\IReader resolution.
+     * Create Reader\IReader for file using automatic IReader resolution.
      *
-     * @param string $filename The name of the spreadsheet file
-     *
-     * @return Reader\IReader
+     * @param string[] $readers An array of Readers to use to identify the file type. By default, load() will try
+     *                             all possible Readers until it finds a match; but this allows you to pass in a
+     *                             list of Readers so it will only try the subset that you specify here.
+     *                          Values in this list can be any of the constant values defined in the set
+     *                                 IOFactory::READER_*.
      */
-    public static function createReaderForFile($filename)
+    public static function createReaderForFile(string $filename, ?array $readers = null): IReader
     {
         File::assertFile($filename);
 
+        $testReaders = self::$readers;
+        if ($readers !== null) {
+            $readers = array_map('strtoupper', $readers);
+            $testReaders = array_filter(
+                self::$readers,
+                fn (string $readerType): bool => in_array(strtoupper($readerType), $readers, true),
+                ARRAY_FILTER_USE_KEY
+            );
+        }
+
         // First, lucky guess by inspecting file extension
         $guessedReader = self::getReaderTypeFromExtension($filename);
-        if ($guessedReader !== null) {
+        if (($guessedReader !== null) && array_key_exists($guessedReader, $testReaders)) {
             $reader = self::createReader($guessedReader);
 
             // Let's see if we are lucky
@@ -126,11 +154,11 @@ public static function createReaderForFile($filename)
         }
 
         // If we reach here then "lucky guess" didn't give any result
-        // Try walking through all the options in self::$autoResolveClasses
-        foreach (self::$readers as $type => $class) {
+        // Try walking through all the options in self::$readers (or the selected subset)
+        foreach ($testReaders as $readerType => $class) {
             //    Ignore our original guess, we know that won't work
-            if ($type !== $guessedReader) {
-                $reader = self::createReader($type);
+            if ($readerType !== $guessedReader) {
+                $reader = self::createReader($readerType);
                 if ($reader->canRead($filename)) {
                     return $reader;
                 }
@@ -142,59 +170,53 @@ public static function createReaderForFile($filename)
 
     /**
      * Guess a reader type from the file extension, if any.
-     *
-     * @param string $filename
-     *
-     * @return null|string
      */
-    private static function getReaderTypeFromExtension($filename)
+    private static function getReaderTypeFromExtension(string $filename): ?string
     {
         $pathinfo = pathinfo($filename);
         if (!isset($pathinfo['extension'])) {
             return null;
         }
 
-        switch (strtolower($pathinfo['extension'])) {
-            case 'xlsx': // Excel (OfficeOpenXML) Spreadsheet
-            case 'xlsm': // Excel (OfficeOpenXML) Macro Spreadsheet (macros will be discarded)
-            case 'xltx': // Excel (OfficeOpenXML) Template
-            case 'xltm': // Excel (OfficeOpenXML) Macro Template (macros will be discarded)
-                return 'Xlsx';
-            case 'xls': // Excel (BIFF) Spreadsheet
-            case 'xlt': // Excel (BIFF) Template
-                return 'Xls';
-            case 'ods': // Open/Libre Offic Calc
-            case 'ots': // Open/Libre Offic Calc Template
-                return 'Ods';
-            case 'slk':
-                return 'Slk';
-            case 'xml': // Excel 2003 SpreadSheetML
-                return 'Xml';
-            case 'gnumeric':
-                return 'Gnumeric';
-            case 'htm':
-            case 'html':
-                return 'Html';
-            case 'csv':
-                // Do nothing
-                // We must not try to use CSV reader since it loads
-                // all files including Excel files etc.
-                return null;
-            default:
-                return null;
-        }
+        return match (strtolower($pathinfo['extension'])) {
+            // Excel (OfficeOpenXML) Spreadsheet
+            'xlsx',
+            // Excel (OfficeOpenXML) Macro Spreadsheet (macros will be discarded)
+            'xlsm',
+            // Excel (OfficeOpenXML) Template
+            'xltx',
+            // Excel (OfficeOpenXML) Macro Template (macros will be discarded)
+            'xltm' => 'Xlsx',
+            // Excel (BIFF) Spreadsheet
+            'xls',
+            // Excel (BIFF) Template
+            'xlt' => 'Xls',
+            // Open/Libre Offic Calc
+            'ods',
+            // Open/Libre Offic Calc Template
+            'ots' => 'Ods',
+            'slk' => 'Slk',
+            // Excel 2003 SpreadSheetML
+            'xml' => 'Xml',
+            'gnumeric' => 'Gnumeric',
+            'htm', 'html' => 'Html',
+            // Do nothing
+            // We must not try to use CSV reader since it loads
+            // all files including Excel files etc.
+            'csv' => null,
+            default => null,
+        };
     }
 
     /**
      * Register a writer with its type and class name.
      *
-     * @param string $writerType
-     * @param string $writerClass
+     * @param class-string<IWriter> $writerClass
      */
-    public static function registerWriter($writerType, $writerClass): void
+    public static function registerWriter(string $writerType, string $writerClass): void
     {
-        if (!is_a($writerClass, Writer\IWriter::class, true)) {
-            throw new Writer\Exception('Registered writers must implement ' . Writer\IWriter::class);
+        if (!is_a($writerClass, IWriter::class, true)) {
+            throw new Writer\Exception('Registered writers must implement ' . IWriter::class);
         }
 
         self::$writers[$writerType] = $writerClass;
@@ -202,14 +224,11 @@ public static function registerWriter($writerType, $writerClass): void
 
     /**
      * Register a reader with its type and class name.
-     *
-     * @param string $readerType
-     * @param string $readerClass
      */
-    public static function registerReader($readerType, $readerClass): void
+    public static function registerReader(string $readerType, string $readerClass): void
     {
-        if (!is_a($readerClass, Reader\IReader::class, true)) {
-            throw new Reader\Exception('Registered readers must implement ' . Reader\IReader::class);
+        if (!is_a($readerClass, IReader::class, true)) {
+            throw new Reader\Exception('Registered readers must implement ' . IReader::class);
         }
 
         self::$readers[$readerType] = $readerClass;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/NamedRange.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/NamedRange.php
index db9c5f1217..819ddeac6c 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/NamedRange.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/NamedRange.php
@@ -46,7 +46,7 @@ public function setRange(string $range): self
     public function getCellsInRange(): array
     {
         $range = $this->value;
-        if (substr($range, 0, 1) === '=') {
+        if (str_starts_with($range, '=')) {
             $range = substr($range, 1);
         }
 
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/BaseReader.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/BaseReader.php
index 8034813239..1408f7bf0d 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/BaseReader.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/BaseReader.php
@@ -2,9 +2,11 @@
 
 namespace PhpOffice\PhpSpreadsheet\Reader;
 
+use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
 use PhpOffice\PhpSpreadsheet\Reader\Exception as ReaderException;
 use PhpOffice\PhpSpreadsheet\Reader\Security\XmlScanner;
 use PhpOffice\PhpSpreadsheet\Shared\File;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
 
 abstract class BaseReader implements IReader
 {
@@ -12,150 +14,232 @@ abstract class BaseReader implements IReader
      * Read data only?
      * Identifies whether the Reader should only read data values for cells, and ignore any formatting information;
      *        or whether it should read both data and formatting.
-     *
-     * @var bool
      */
-    protected $readDataOnly = false;
+    protected bool $readDataOnly = false;
 
     /**
      * Read empty cells?
      * Identifies whether the Reader should read data values for cells all cells, or should ignore cells containing
      *         null value or empty string.
-     *
-     * @var bool
      */
-    protected $readEmptyCells = true;
+    protected bool $readEmptyCells = true;
 
     /**
      * Read charts that are defined in the workbook?
      * Identifies whether the Reader should read the definitions for any charts that exist in the workbook;.
-     *
-     * @var bool
      */
-    protected $includeCharts = false;
+    protected bool $includeCharts = false;
 
     /**
      * Restrict which sheets should be loaded?
      * This property holds an array of worksheet names to be loaded. If null, then all worksheets will be loaded.
+     * This property is ignored for Csv, Html, and Slk.
      *
      * @var null|string[]
      */
-    protected $loadSheetsOnly;
+    protected ?array $loadSheetsOnly = null;
+
+    /**
+     * Ignore rows with no cells?
+     * Identifies whether the Reader should ignore rows with no cells.
+     *        Currently implemented only for Xlsx.
+     */
+    protected bool $ignoreRowsWithNoCells = false;
 
     /**
      * IReadFilter instance.
-     *
-     * @var IReadFilter
      */
-    protected $readFilter;
+    protected IReadFilter $readFilter;
 
+    /** @var resource */
     protected $fileHandle;
 
-    /**
-     * @var XmlScanner
-     */
-    protected $securityScanner;
+    protected ?XmlScanner $securityScanner = null;
 
     public function __construct()
     {
         $this->readFilter = new DefaultReadFilter();
     }
 
-    public function getReadDataOnly()
+    public function getReadDataOnly(): bool
     {
         return $this->readDataOnly;
     }
 
-    public function setReadDataOnly($pValue)
+    public function setReadDataOnly(bool $readCellValuesOnly): self
     {
-        $this->readDataOnly = (bool) $pValue;
+        $this->readDataOnly = $readCellValuesOnly;
 
         return $this;
     }
 
-    public function getReadEmptyCells()
+    public function getReadEmptyCells(): bool
     {
         return $this->readEmptyCells;
     }
 
-    public function setReadEmptyCells($pValue)
+    public function setReadEmptyCells(bool $readEmptyCells): self
+    {
+        $this->readEmptyCells = $readEmptyCells;
+
+        return $this;
+    }
+
+    public function getIgnoreRowsWithNoCells(): bool
     {
-        $this->readEmptyCells = (bool) $pValue;
+        return $this->ignoreRowsWithNoCells;
+    }
+
+    public function setIgnoreRowsWithNoCells(bool $ignoreRowsWithNoCells): self
+    {
+        $this->ignoreRowsWithNoCells = $ignoreRowsWithNoCells;
 
         return $this;
     }
 
-    public function getIncludeCharts()
+    public function getIncludeCharts(): bool
     {
         return $this->includeCharts;
     }
 
-    public function setIncludeCharts($pValue)
+    public function setIncludeCharts(bool $includeCharts): self
     {
-        $this->includeCharts = (bool) $pValue;
+        $this->includeCharts = $includeCharts;
 
         return $this;
     }
 
-    public function getLoadSheetsOnly()
+    public function getLoadSheetsOnly(): ?array
     {
         return $this->loadSheetsOnly;
     }
 
-    public function setLoadSheetsOnly($value)
+    public function setLoadSheetsOnly(string|array|null $sheetList): self
     {
-        if ($value === null) {
+        if ($sheetList === null) {
             return $this->setLoadAllSheets();
         }
 
-        $this->loadSheetsOnly = is_array($value) ? $value : [$value];
+        $this->loadSheetsOnly = is_array($sheetList) ? $sheetList : [$sheetList];
 
         return $this;
     }
 
-    public function setLoadAllSheets()
+    public function setLoadAllSheets(): self
     {
         $this->loadSheetsOnly = null;
 
         return $this;
     }
 
-    public function getReadFilter()
+    public function getReadFilter(): IReadFilter
     {
         return $this->readFilter;
     }
 
-    public function setReadFilter(IReadFilter $pValue)
+    public function setReadFilter(IReadFilter $readFilter): self
     {
-        $this->readFilter = $pValue;
+        $this->readFilter = $readFilter;
 
         return $this;
     }
 
-    public function getSecurityScanner()
+    public function getSecurityScanner(): ?XmlScanner
+    {
+        return $this->securityScanner;
+    }
+
+    public function getSecurityScannerOrThrow(): XmlScanner
     {
+        if ($this->securityScanner === null) {
+            throw new ReaderException('Security scanner is unexpectedly null');
+        }
+
         return $this->securityScanner;
     }
 
+    protected function processFlags(int $flags): void
+    {
+        if (((bool) ($flags & self::LOAD_WITH_CHARTS)) === true) {
+            $this->setIncludeCharts(true);
+        }
+        if (((bool) ($flags & self::READ_DATA_ONLY)) === true) {
+            $this->setReadDataOnly(true);
+        }
+        if (((bool) ($flags & self::SKIP_EMPTY_CELLS) || (bool) ($flags & self::IGNORE_EMPTY_CELLS)) === true) {
+            $this->setReadEmptyCells(false);
+        }
+        if (((bool) ($flags & self::IGNORE_ROWS_WITH_NO_CELLS)) === true) {
+            $this->setIgnoreRowsWithNoCells(true);
+        }
+    }
+
+    protected function loadSpreadsheetFromFile(string $filename): Spreadsheet
+    {
+        throw new PhpSpreadsheetException('Reader classes must implement their own loadSpreadsheetFromFile() method');
+    }
+
     /**
-     * Open file for reading.
+     * Loads Spreadsheet from file.
      *
-     * @param string $pFilename
+     * @param int $flags the optional second parameter flags may be used to identify specific elements
+     *                       that should be loaded, but which won't be loaded by default, using these values:
+     *                            IReader::LOAD_WITH_CHARTS - Include any charts that are defined in the loaded file
+     */
+    public function load(string $filename, int $flags = 0): Spreadsheet
+    {
+        $this->processFlags($flags);
+
+        try {
+            return $this->loadSpreadsheetFromFile($filename);
+        } catch (ReaderException $e) {
+            throw $e;
+        }
+    }
+
+    /**
+     * Open file for reading.
      */
-    protected function openFile($pFilename): void
+    protected function openFile(string $filename): void
     {
-        if ($pFilename) {
-            File::assertFile($pFilename);
+        $fileHandle = false;
+        if ($filename) {
+            File::assertFile($filename);
 
             // Open file
-            $fileHandle = fopen($pFilename, 'rb');
-        } else {
-            $fileHandle = false;
+            $fileHandle = fopen($filename, 'rb');
         }
-        if ($fileHandle !== false) {
-            $this->fileHandle = $fileHandle;
-        } else {
-            throw new ReaderException('Could not open file ' . $pFilename . ' for reading.');
+        if ($fileHandle === false) {
+            throw new ReaderException('Could not open file ' . $filename . ' for reading.');
         }
+
+        $this->fileHandle = $fileHandle;
+    }
+
+    /**
+     * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns).
+     */
+    public function listWorksheetInfo(string $filename): array
+    {
+        throw new PhpSpreadsheetException('Reader classes must implement their own listWorksheetInfo() method');
+    }
+
+    /**
+     * Returns names of the worksheets from a file,
+     * possibly without parsing the whole file to a Spreadsheet object.
+     * Readers will often have a more efficient method with which
+     * they can override this method.
+     */
+    public function listWorksheetNames(string $filename): array
+    {
+        $returnArray = [];
+        $info = $this->listWorksheetInfo($filename);
+        foreach ($info as $infoArray) {
+            if (isset($infoArray['worksheetName'])) {
+                $returnArray[] = $infoArray['worksheetName'];
+            }
+        }
+
+        return $returnArray;
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Csv.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Csv.php
index b7bc0d49b4..762ec31910 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Csv.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Csv.php
@@ -2,11 +2,14 @@
 
 namespace PhpOffice\PhpSpreadsheet\Reader;
 
-use InvalidArgumentException;
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Reader\Csv\Delimiter;
+use PhpOffice\PhpSpreadsheet\Reader\Exception as ReaderException;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 
 class Csv extends BaseReader
 {
@@ -29,52 +32,49 @@ class Csv extends BaseReader
 
     /**
      * Input encoding.
-     *
-     * @var string
      */
-    private $inputEncoding = 'UTF-8';
+    private string $inputEncoding = 'UTF-8';
 
     /**
-     * Fallback encoding if 'guess' strikes out.
-     *
-     * @var string
+     * Fallback encoding if guess strikes out.
      */
-    private $fallbackEncoding = self::DEFAULT_FALLBACK_ENCODING;
+    private string $fallbackEncoding = self::DEFAULT_FALLBACK_ENCODING;
 
     /**
      * Delimiter.
-     *
-     * @var ?string
      */
-    private $delimiter;
+    private ?string $delimiter = null;
 
     /**
      * Enclosure.
-     *
-     * @var string
      */
-    private $enclosure = '"';
+    private string $enclosure = '"';
 
     /**
      * Sheet index to read.
-     *
-     * @var int
      */
-    private $sheetIndex = 0;
+    private int $sheetIndex = 0;
 
     /**
      * Load rows contiguously.
-     *
-     * @var bool
      */
-    private $contiguous = false;
+    private bool $contiguous = false;
 
     /**
      * The character that can escape the enclosure.
-     *
-     * @var string
+     * This will probably become unsupported in Php 9.
+     * Not yet ready to mark deprecated in order to give users
+     * a migration path.
      */
-    private $escapeCharacter = '\\';
+    private ?string $escapeCharacter = null;
+
+    /**
+     * The character that will be supplied to fgetcsv
+     * when escapeCharacter is null.
+     * It is anticipated that it will conditionally be set
+     * to null-string for Php9 and above.
+     */
+    private static string $defaultEscapeCharacter = '\\';
 
     /**
      * Callback for setting defaults in construction.
@@ -83,6 +83,27 @@ class Csv extends BaseReader
      */
     private static $constructorCallback;
 
+    /**
+     * Attempt autodetect line endings (deprecated after PHP8.1)?
+     */
+    private bool $testAutodetect = true;
+
+    protected bool $castFormattedNumberToNumeric = false;
+
+    protected bool $preserveNumericFormatting = false;
+
+    private bool $preserveNullString = false;
+
+    private bool $sheetNameIsFileName = false;
+
+    private string $getTrue = 'true';
+
+    private string $getFalse = 'false';
+
+    private string $thousandsSeparator = ',';
+
+    private string $decimalSeparator = '.';
+
     /**
      * Create a new CSV Reader instance.
      */
@@ -111,9 +132,9 @@ public static function getConstructorCallback(): ?callable
         return self::$constructorCallback;
     }
 
-    public function setInputEncoding(string $pValue): self
+    public function setInputEncoding(string $encoding): self
     {
-        $this->inputEncoding = $pValue;
+        $this->inputEncoding = $encoding;
 
         return $this;
     }
@@ -123,9 +144,9 @@ public function getInputEncoding(): string
         return $this->inputEncoding;
     }
 
-    public function setFallbackEncoding(string $pValue): self
+    public function setFallbackEncoding(string $fallbackEncoding): self
     {
-        $this->fallbackEncoding = $pValue;
+        $this->fallbackEncoding = $fallbackEncoding;
 
         return $this;
     }
@@ -175,7 +196,7 @@ protected function inferSeparator(): void
             return;
         }
 
-        $inferenceEngine = new Delimiter($this->fileHandle, $this->escapeCharacter, $this->enclosure);
+        $inferenceEngine = new Delimiter($this->fileHandle, $this->escapeCharacter ?? self::$defaultEscapeCharacter, $this->enclosure);
 
         // If number of lines is 0, nothing to infer : fall back to the default
         if ($inferenceEngine->linesCounted() === 0) {
@@ -198,10 +219,10 @@ protected function inferSeparator(): void
     /**
      * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns).
      */
-    public function listWorksheetInfo(string $pFilename): array
+    public function listWorksheetInfo(string $filename): array
     {
         // Open file
-        $this->openFileOrMemory($pFilename);
+        $this->openFileOrMemory($filename);
         $fileHandle = $this->fileHandle;
 
         // Skip BOM, if any
@@ -215,13 +236,14 @@ public function listWorksheetInfo(string $pFilename): array
         $worksheetInfo[0]['lastColumnIndex'] = 0;
         $worksheetInfo[0]['totalRows'] = 0;
         $worksheetInfo[0]['totalColumns'] = 0;
+        $delimiter = $this->delimiter ?? '';
 
         // Loop through each line of the file in turn
-        $rowData = fgetcsv($fileHandle, 0, $this->delimiter ?? '', $this->enclosure, $this->escapeCharacter);
+        $rowData = self::getCsv($fileHandle, 0, $delimiter, $this->enclosure, $this->escapeCharacter);
         while (is_array($rowData)) {
             ++$worksheetInfo[0]['totalRows'];
             $worksheetInfo[0]['lastColumnIndex'] = max($worksheetInfo[0]['lastColumnIndex'], count($rowData) - 1);
-            $rowData = fgetcsv($fileHandle, 0, $this->delimiter ?? '', $this->enclosure, $this->escapeCharacter);
+            $rowData = self::getCsv($fileHandle, 0, $delimiter, $this->enclosure, $this->escapeCharacter);
         }
 
         $worksheetInfo[0]['lastColumnLetter'] = Coordinate::stringFromColumnIndex($worksheetInfo[0]['lastColumnIndex'] + 1);
@@ -235,36 +257,45 @@ public function listWorksheetInfo(string $pFilename): array
 
     /**
      * Loads Spreadsheet from file.
-     *
-     * @param string $pFilename
-     *
-     * @return Spreadsheet
      */
-    public function load($pFilename)
+    protected function loadSpreadsheetFromFile(string $filename): Spreadsheet
+    {
+        // Create new Spreadsheet
+        $spreadsheet = new Spreadsheet();
+
+        // Load into this instance
+        return $this->loadIntoExisting($filename, $spreadsheet);
+    }
+
+    /**
+     * Loads Spreadsheet from string.
+     */
+    public function loadSpreadsheetFromString(string $contents): Spreadsheet
     {
         // Create new Spreadsheet
         $spreadsheet = new Spreadsheet();
 
         // Load into this instance
-        return $this->loadIntoExisting($pFilename, $spreadsheet);
+        return $this->loadStringOrFile('data://text/plain,' . urlencode($contents), $spreadsheet, true);
     }
 
-    private function openFileOrMemory(string $pFilename): void
+    private function openFileOrMemory(string $filename): void
     {
         // Open file
-        $fhandle = $this->canRead($pFilename);
+        $fhandle = $this->canRead($filename);
         if (!$fhandle) {
-            throw new Exception($pFilename . ' is an Invalid Spreadsheet file.');
+            throw new ReaderException($filename . ' is an Invalid Spreadsheet file.');
         }
         if ($this->inputEncoding === self::GUESS_ENCODING) {
-            $this->inputEncoding = self::guessEncoding($pFilename, $this->fallbackEncoding);
+            $this->inputEncoding = self::guessEncoding($filename, $this->fallbackEncoding);
         }
-        $this->openFile($pFilename);
+        $this->openFile($filename);
         if ($this->inputEncoding !== 'UTF-8') {
             fclose($this->fileHandle);
-            $entireFile = file_get_contents($pFilename);
-            $this->fileHandle = fopen('php://memory', 'r+b');
-            if ($this->fileHandle !== false && $entireFile !== false) {
+            $entireFile = file_get_contents($filename);
+            $fileHandle = fopen('php://memory', 'r+b');
+            if ($fileHandle !== false && $entireFile !== false) {
+                $this->fileHandle = $fileHandle;
                 $data = StringHelper::convertEncoding($entireFile, 'UTF-8', $this->inputEncoding);
                 fwrite($this->fileHandle, $data);
                 $this->skipBOM();
@@ -272,16 +303,71 @@ private function openFileOrMemory(string $pFilename): void
         }
     }
 
+    public function setTestAutoDetect(bool $value): self
+    {
+        $this->testAutodetect = $value;
+
+        return $this;
+    }
+
+    private function setAutoDetect(?string $value): ?string
+    {
+        $retVal = null;
+        if ($value !== null && $this->testAutodetect) {
+            $retVal2 = @ini_set('auto_detect_line_endings', $value);
+            if (is_string($retVal2)) {
+                $retVal = $retVal2;
+            }
+        }
+
+        return $retVal;
+    }
+
+    public function castFormattedNumberToNumeric(
+        bool $castFormattedNumberToNumeric,
+        bool $preserveNumericFormatting = false
+    ): void {
+        $this->castFormattedNumberToNumeric = $castFormattedNumberToNumeric;
+        $this->preserveNumericFormatting = $preserveNumericFormatting;
+    }
+
+    /**
+     * Open data uri for reading.
+     */
+    private function openDataUri(string $filename): void
+    {
+        $fileHandle = fopen($filename, 'rb');
+        if ($fileHandle === false) {
+            // @codeCoverageIgnoreStart
+            throw new ReaderException('Could not open file ' . $filename . ' for reading.');
+            // @codeCoverageIgnoreEnd
+        }
+
+        $this->fileHandle = $fileHandle;
+    }
+
     /**
      * Loads PhpSpreadsheet from file into PhpSpreadsheet instance.
      */
-    public function loadIntoExisting(string $pFilename, Spreadsheet $spreadsheet): Spreadsheet
+    public function loadIntoExisting(string $filename, Spreadsheet $spreadsheet): Spreadsheet
     {
-        $lineEnding = ini_get('auto_detect_line_endings') ?: '0';
-        ini_set('auto_detect_line_endings', '1');
+        return $this->loadStringOrFile($filename, $spreadsheet, false);
+    }
+
+    /**
+     * Loads PhpSpreadsheet from file into PhpSpreadsheet instance.
+     */
+    private function loadStringOrFile(string $filename, Spreadsheet $spreadsheet, bool $dataUri): Spreadsheet
+    {
+        // Deprecated in Php8.1
+        $iniset = $this->setAutoDetect('1');
 
         // Open file
-        $this->openFileOrMemory($pFilename);
+        if ($dataUri) {
+            $this->openDataUri($filename);
+        } else {
+            $this->openFileOrMemory($filename);
+        }
         $fileHandle = $this->fileHandle;
 
         // Skip BOM, if any
@@ -294,18 +380,34 @@ public function loadIntoExisting(string $pFilename, Spreadsheet $spreadsheet): S
             $spreadsheet->createSheet();
         }
         $sheet = $spreadsheet->setActiveSheetIndex($this->sheetIndex);
+        if ($this->sheetNameIsFileName) {
+            $sheet->setTitle(substr(basename($filename, '.csv'), 0, Worksheet::SHEET_TITLE_MAXIMUM_LENGTH));
+        }
 
         // Set our starting row based on whether we're in contiguous mode or not
         $currentRow = 1;
         $outRow = 0;
 
         // Loop through each line of the file in turn
-        $rowData = fgetcsv($fileHandle, 0, $this->delimiter ?? '', $this->enclosure, $this->escapeCharacter);
+        $delimiter = $this->delimiter ?? '';
+        $rowData = self::getCsv($fileHandle, 0, $delimiter, $this->enclosure, $this->escapeCharacter);
+        $valueBinder = Cell::getValueBinder();
+        $preserveBooleanString = method_exists($valueBinder, 'getBooleanConversion') && $valueBinder->getBooleanConversion();
+        $this->getTrue = Calculation::getTRUE();
+        $this->getFalse = Calculation::getFALSE();
+        $this->thousandsSeparator = StringHelper::getThousandsSeparator();
+        $this->decimalSeparator = StringHelper::getDecimalSeparator();
         while (is_array($rowData)) {
             $noOutputYet = true;
             $columnLetter = 'A';
             foreach ($rowData as $rowDatum) {
-                if ($rowDatum != '' && $this->readFilter->readCell($columnLetter, $currentRow)) {
+                if ($preserveBooleanString) {
+                    $rowDatum = $rowDatum ?? '';
+                } else {
+                    $this->convertBoolean($rowDatum);
+                }
+                $numberFormatMask = $this->castFormattedNumberToNumeric ? $this->convertFormattedNumber($rowDatum) : '';
+                if (($rowDatum !== '' || $this->preserveNullString) && $this->readFilter->readCell($columnLetter, $currentRow)) {
                     if ($this->contiguous) {
                         if ($noOutputYet) {
                             $noOutputYet = false;
@@ -314,30 +416,83 @@ public function loadIntoExisting(string $pFilename, Spreadsheet $spreadsheet): S
                     } else {
                         $outRow = $currentRow;
                     }
+                    // Set basic styling for the value (Note that this could be overloaded by styling in a value binder)
+                    if ($numberFormatMask !== '') {
+                        $sheet->getStyle($columnLetter . $outRow)
+                            ->getNumberFormat()
+                            ->setFormatCode($numberFormatMask);
+                    }
                     // Set cell value
                     $sheet->getCell($columnLetter . $outRow)->setValue($rowDatum);
                 }
                 ++$columnLetter;
             }
-            $rowData = fgetcsv($fileHandle, 0, $this->delimiter ?? '', $this->enclosure, $this->escapeCharacter);
+            $rowData = self::getCsv($fileHandle, 0, $delimiter, $this->enclosure, $this->escapeCharacter);
             ++$currentRow;
         }
 
         // Close file
         fclose($fileHandle);
 
-        ini_set('auto_detect_line_endings', $lineEnding);
+        $this->setAutoDetect($iniset);
 
         // Return
         return $spreadsheet;
     }
 
+    /**
+     * Convert string true/false to boolean, and null to null-string.
+     */
+    private function convertBoolean(mixed &$rowDatum): void
+    {
+        if (is_string($rowDatum)) {
+            if (strcasecmp($this->getTrue, $rowDatum) === 0 || strcasecmp('true', $rowDatum) === 0) {
+                $rowDatum = true;
+            } elseif (strcasecmp($this->getFalse, $rowDatum) === 0 || strcasecmp('false', $rowDatum) === 0) {
+                $rowDatum = false;
+            }
+        } else {
+            $rowDatum = $rowDatum ?? '';
+        }
+    }
+
+    /**
+     * Convert numeric strings to int or float values.
+     */
+    private function convertFormattedNumber(mixed &$rowDatum): string
+    {
+        $numberFormatMask = '';
+        if ($this->castFormattedNumberToNumeric === true && is_string($rowDatum)) {
+            $numeric = str_replace(
+                [$this->thousandsSeparator, $this->decimalSeparator],
+                ['', '.'],
+                $rowDatum
+            );
+
+            if (is_numeric($numeric)) {
+                $decimalPos = strpos($rowDatum, $this->decimalSeparator);
+                if ($this->preserveNumericFormatting === true) {
+                    $numberFormatMask = (str_contains($rowDatum, $this->thousandsSeparator))
+                        ? '#,##0' : '0';
+                    if ($decimalPos !== false) {
+                        $decimals = strlen($rowDatum) - $decimalPos - 1;
+                        $numberFormatMask .= '.' . str_repeat('0', min($decimals, 6));
+                    }
+                }
+
+                $rowDatum = ($decimalPos !== false) ? (float) $numeric : (int) $numeric;
+            }
+        }
+
+        return $numberFormatMask;
+    }
+
     public function getDelimiter(): ?string
     {
         return $this->delimiter;
     }
 
-    public function setDelimiter(string $delimiter): self
+    public function setDelimiter(?string $delimiter): self
     {
         $this->delimiter = $delimiter;
 
@@ -364,16 +519,16 @@ public function getSheetIndex(): int
         return $this->sheetIndex;
     }
 
-    public function setSheetIndex(int $pValue): self
+    public function setSheetIndex(int $indexValue): self
     {
-        $this->sheetIndex = $pValue;
+        $this->sheetIndex = $indexValue;
 
         return $this;
     }
 
     public function setContiguous(bool $contiguous): self
     {
-        $this->contiguous = (bool) $contiguous;
+        $this->contiguous = $contiguous;
 
         return $this;
     }
@@ -383,6 +538,11 @@ public function getContiguous(): bool
         return $this->contiguous;
     }
 
+    /**
+     * Php9 intends to drop support for this parameter in fgetcsv.
+     * Not yet ready to mark deprecated in order to give users
+     * a migration path.
+     */
     public function setEscapeCharacter(string $escapeCharacter): self
     {
         $this->escapeCharacter = $escapeCharacter;
@@ -392,53 +552,37 @@ public function setEscapeCharacter(string $escapeCharacter): self
 
     public function getEscapeCharacter(): string
     {
-        return $this->escapeCharacter;
-    }
-
-    /**
-     * Scrutinizer believes, incorrectly, that the specific pathinfo
-     * call in canRead can return something other than an array.
-     * Phpstan knows better.
-     * This function satisfies both.
-     *
-     * @param mixed $extension
-     */
-    private static function extractStringLower($extension): string
-    {
-        return is_string($extension) ? strtolower($extension) : '';
+        return $this->escapeCharacter ?? self::$defaultEscapeCharacter;
     }
 
     /**
      * Can the current IReader read the file?
-     *
-     * @param string $pFilename
-     *
-     * @return bool
      */
-    public function canRead($pFilename)
+    public function canRead(string $filename): bool
     {
         // Check if file exists
         try {
-            $this->openFile($pFilename);
-        } catch (InvalidArgumentException $e) {
+            $this->openFile($filename);
+        } catch (ReaderException) {
             return false;
         }
 
         fclose($this->fileHandle);
 
         // Trust file extension if any
-        $extension = self::extractStringLower(pathinfo($pFilename, PATHINFO_EXTENSION));
+        $extension = strtolower(pathinfo($filename, PATHINFO_EXTENSION));
         if (in_array($extension, ['csv', 'tsv'])) {
             return true;
         }
 
         // Attempt to guess mimetype
-        $type = mime_content_type($pFilename);
+        $type = mime_content_type($filename);
         $supportedTypes = [
             'application/csv',
             'text/csv',
             'text/plain',
             'inode/x-empty',
+            'text/html',
         ];
 
         return in_array($type, $supportedTypes, true);
@@ -472,7 +616,7 @@ private static function guessEncodingNoBom(string $filename): string
     private static function guessEncodingTestBom(string &$encoding, string $first4, string $compare, string $setEncoding): void
     {
         if ($encoding === '') {
-            if ($compare === substr($first4, 0, strlen($compare))) {
+            if (str_starts_with($first4, $compare)) {
                 $encoding = $setEncoding;
             }
         }
@@ -502,4 +646,47 @@ public static function guessEncoding(string $filename, string $dflt = self::DEFA
 
         return ($encoding === '') ? $dflt : $encoding;
     }
+
+    public function setPreserveNullString(bool $value): self
+    {
+        $this->preserveNullString = $value;
+
+        return $this;
+    }
+
+    public function getPreserveNullString(): bool
+    {
+        return $this->preserveNullString;
+    }
+
+    public function setSheetNameIsFileName(bool $sheetNameIsFileName): self
+    {
+        $this->sheetNameIsFileName = $sheetNameIsFileName;
+
+        return $this;
+    }
+
+    /**
+     * Php8.4 deprecates use of anything other than null string
+     * as escape Character.
+     *
+     * @param resource $stream
+     * @param null|int<0, max> $length
+     *
+     * @return array<int,?string>|false
+     */
+    private static function getCsv(
+        $stream,
+        ?int $length = null,
+        string $separator = ',',
+        string $enclosure = '"',
+        ?string $escape = null
+    ): array|false {
+        $escape = $escape ?? self::$defaultEscapeCharacter;
+        if (PHP_VERSION_ID >= 80400 && $escape !== '') {
+            return @fgetcsv($stream, $length, $separator, $enclosure, $escape);
+        }
+
+        return fgetcsv($stream, $length, $separator, $enclosure, $escape);
+    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Csv/Delimiter.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Csv/Delimiter.php
index fc298957b8..92ec0b5d3b 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Csv/Delimiter.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Csv/Delimiter.php
@@ -9,20 +9,15 @@ class Delimiter
     /** @var resource */
     protected $fileHandle;
 
-    /** @var string */
-    protected $escapeCharacter;
+    protected string $escapeCharacter;
 
-    /** @var string */
-    protected $enclosure;
+    protected string $enclosure;
 
-    /** @var array */
-    protected $counts = [];
+    protected array $counts = [];
 
-    /** @var int */
-    protected $numberLines = 0;
+    protected int $numberLines = 0;
 
-    /** @var ?string */
-    protected $delimiter;
+    protected ?string $delimiter = null;
 
     /**
      * @param resource $fileHandle
@@ -92,9 +87,7 @@ public function infer(): ?string
 
             $meanSquareDeviations[$delimiter] = array_reduce(
                 $series,
-                function ($sum, $value) use ($median) {
-                    return $sum + ($value - $median) ** 2;
-                }
+                fn ($sum, $value): int|float => $sum + ($value - $median) ** 2
             ) / count($series);
         }
 
@@ -140,12 +133,12 @@ public function getNextLine()
             $line = $line . $newLine;
 
             // Drop everything that is enclosed to avoid counting false positives in enclosures
-            $line = preg_replace('/(' . $enclosure . '.*' . $enclosure . ')/Us', '', $line);
+            $line = (string) preg_replace('/(' . $enclosure . '.*' . $enclosure . ')/Us', '', $line);
 
             // See if we have any enclosures left in the line
             // if we still have an enclosure then we need to read the next line as well
-        } while (preg_match('/(' . $enclosure . ')/', $line ?? '') > 0);
+        } while (preg_match('/(' . $enclosure . ')/', $line) > 0);
 
-        return $line ?? false;
+        return ($line !== '') ? $line : false;
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/DefaultReadFilter.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/DefaultReadFilter.php
index e104186abb..0c4b87b61a 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/DefaultReadFilter.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/DefaultReadFilter.php
@@ -7,13 +7,11 @@ class DefaultReadFilter implements IReadFilter
     /**
      * Should this cell be read?
      *
-     * @param string $column Column address (as a string value like "A", or "IV")
+     * @param string $columnAddress Column address (as a string value like "A", or "IV")
      * @param int $row Row number
      * @param string $worksheetName Optional worksheet name
-     *
-     * @return bool
      */
-    public function readCell($column, $row, $worksheetName = '')
+    public function readCell(string $columnAddress, int $row, string $worksheetName = ''): bool
     {
         return true;
     }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric.php
index 85bae6f8c8..898e32db5c 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric.php
@@ -36,23 +36,17 @@ class Gnumeric extends BaseReader
 
     /**
      * Shared Expressions.
-     *
-     * @var array
      */
-    private $expressions = [];
+    private array $expressions = [];
 
     /**
      * Spreadsheet shared across all functions.
-     *
-     * @var Spreadsheet
      */
-    private $spreadsheet;
+    private Spreadsheet $spreadsheet;
 
-    /** @var ReferenceHelper */
-    private $referenceHelper;
+    private ReferenceHelper $referenceHelper;
 
-    /** @var array */
-    public static $mappings = [
+    public static array $mappings = [
         'dataType' => [
             '10' => DataType::TYPE_NULL,
             '20' => DataType::TYPE_BOOL,
@@ -77,27 +71,18 @@ public function __construct()
 
     /**
      * Can the current IReader read the file?
-     *
-     * @param string $pFilename
-     *
-     * @return bool
      */
-    public function canRead($pFilename)
+    public function canRead(string $filename): bool
     {
-        File::assertFile($pFilename);
-
-        // Check if gzlib functions are available
-        $data = '';
-        if (function_exists('gzread')) {
-            // Read signature data (first 3 bytes)
-            $fh = fopen($pFilename, 'rb');
-            if ($fh !== false) {
-                $data = fread($fh, 2);
-                fclose($fh);
+        $data = null;
+        if (File::testFileNoThrow($filename)) {
+            $data = $this->gzfileGetContents($filename);
+            if (!str_contains($data, self::NAMESPACE_GNM)) {
+                $data = '';
             }
         }
 
-        return $data === chr(0x1F) . chr(0x8B);
+        return !empty($data);
     }
 
     private static function matchXml(XMLReader $xml, string $expectedLocalName): bool
@@ -109,17 +94,17 @@ private static function matchXml(XMLReader $xml, string $expectedLocalName): boo
 
     /**
      * Reads names of the worksheets from a file, without parsing the whole file to a Spreadsheet object.
-     *
-     * @param string $pFilename
-     *
-     * @return array
      */
-    public function listWorksheetNames($pFilename)
+    public function listWorksheetNames(string $filename): array
     {
-        File::assertFile($pFilename);
+        File::assertFile($filename);
+        if (!$this->canRead($filename)) {
+            throw new Exception($filename . ' is an invalid Gnumeric file.');
+        }
 
         $xml = new XMLReader();
-        $xml->xml($this->securityScanner->scanFile('compress.zlib://' . realpath($pFilename)), null, Settings::getLibXmlLoaderOptions());
+        $contents = $this->gzfileGetContents($filename);
+        $xml->xml($contents, null, Settings::getLibXmlLoaderOptions());
         $xml->setParserProperty(2, true);
 
         $worksheetNames = [];
@@ -138,17 +123,17 @@ public function listWorksheetNames($pFilename)
 
     /**
      * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns).
-     *
-     * @param string $pFilename
-     *
-     * @return array
      */
-    public function listWorksheetInfo($pFilename)
+    public function listWorksheetInfo(string $filename): array
     {
-        File::assertFile($pFilename);
+        File::assertFile($filename);
+        if (!$this->canRead($filename)) {
+            throw new Exception($filename . ' is an invalid Gnumeric file.');
+        }
 
         $xml = new XMLReader();
-        $xml->xml($this->securityScanner->scanFile('compress.zlib://' . realpath($pFilename)), null, Settings::getLibXmlLoaderOptions());
+        $contents = $this->gzfileGetContents($filename);
+        $xml->xml($contents, null, Settings::getLibXmlLoaderOptions());
         $xml->setParserProperty(2, true);
 
         $worksheetInfo = [];
@@ -185,20 +170,25 @@ public function listWorksheetInfo($pFilename)
         return $worksheetInfo;
     }
 
-    /**
-     * @param string $filename
-     *
-     * @return string
-     */
-    private function gzfileGetContents($filename)
+    private function gzfileGetContents(string $filename): string
     {
-        $file = @gzopen($filename, 'rb');
         $data = '';
-        if ($file !== false) {
-            while (!gzeof($file)) {
-                $data .= gzread($file, 1024);
+        $contents = @file_get_contents($filename);
+        if ($contents !== false) {
+            if (str_starts_with($contents, "\x1f\x8b")) {
+                // Check if gzlib functions are available
+                if (function_exists('gzdecode')) {
+                    $contents = @gzdecode($contents);
+                    if ($contents !== false) {
+                        $data = $contents;
+                    }
+                }
+            } else {
+                $data = $contents;
             }
-            gzclose($file);
+        }
+        if ($data !== '') {
+            $data = $this->getSecurityScannerOrThrow()->scan($data);
         }
 
         return $data;
@@ -215,7 +205,7 @@ private function processComments(SimpleXMLElement $sheet): void
             foreach ($sheet->Objects->children(self::NAMESPACE_GNM) as $key => $comment) {
                 $commentAttributes = $comment->attributes();
                 //    Only comment objects are handled at the moment
-                if ($commentAttributes->Text) {
+                if ($commentAttributes && $commentAttributes->Text) {
                     $this->spreadsheet->getActiveSheet()->getComment((string) $commentAttributes->ObjectBound)
                         ->setAuthor((string) $commentAttributes->Author)
                         ->setText($this->parseRichText((string) $commentAttributes->Text));
@@ -224,51 +214,50 @@ private function processComments(SimpleXMLElement $sheet): void
         }
     }
 
-    /**
-     * @param mixed $value
-     */
-    private static function testSimpleXml($value): SimpleXMLElement
+    private static function testSimpleXml(mixed $value): SimpleXMLElement
     {
         return ($value instanceof SimpleXMLElement) ? $value : new SimpleXMLElement('<?xml version="1.0" encoding="UTF-8"?><root></root>');
     }
 
     /**
      * Loads Spreadsheet from file.
-     *
-     * @param string $pFilename
-     *
-     * @return Spreadsheet
      */
-    public function load($pFilename)
+    protected function loadSpreadsheetFromFile(string $filename): Spreadsheet
     {
         // Create new Spreadsheet
         $spreadsheet = new Spreadsheet();
         $spreadsheet->removeSheetByIndex(0);
 
         // Load into this instance
-        return $this->loadIntoExisting($pFilename, $spreadsheet);
+        return $this->loadIntoExisting($filename, $spreadsheet);
     }
 
     /**
      * Loads from file into Spreadsheet instance.
      */
-    public function loadIntoExisting(string $pFilename, Spreadsheet $spreadsheet): Spreadsheet
+    public function loadIntoExisting(string $filename, Spreadsheet $spreadsheet): Spreadsheet
     {
         $this->spreadsheet = $spreadsheet;
-        File::assertFile($pFilename);
+        File::assertFile($filename);
+        if (!$this->canRead($filename)) {
+            throw new Exception($filename . ' is an invalid Gnumeric file.');
+        }
 
-        $gFileData = $this->gzfileGetContents($pFilename);
+        $gFileData = $this->gzfileGetContents($filename);
 
-        $xml2 = simplexml_load_string($this->securityScanner->scan($gFileData), 'SimpleXMLElement', Settings::getLibXmlLoaderOptions());
+        /** @var XmlScanner */
+        $securityScanner = $this->securityScanner;
+        $xml2 = simplexml_load_string($securityScanner->scan($gFileData), 'SimpleXMLElement', Settings::getLibXmlLoaderOptions());
         $xml = self::testSimpleXml($xml2);
 
         $gnmXML = $xml->children(self::NAMESPACE_GNM);
         (new Properties($this->spreadsheet))->readProperties($xml, $gnmXML);
 
         $worksheetID = 0;
-        foreach ($gnmXML->Sheets->Sheet as $sheet) {
+        foreach ($gnmXML->Sheets->Sheet as $sheetOrNull) {
+            $sheet = self::testSimpleXml($sheetOrNull);
             $worksheetName = (string) $sheet->Name;
-            if ((isset($this->loadSheetsOnly)) && (!in_array($worksheetName, $this->loadSheetsOnly))) {
+            if (is_array($this->loadSheetsOnly) && !in_array($worksheetName, $this->loadSheetsOnly, true)) {
                 continue;
             }
 
@@ -282,23 +271,25 @@ public function loadIntoExisting(string $pFilename, Spreadsheet $spreadsheet): S
             //        name in line with the formula, not the reverse
             $this->spreadsheet->getActiveSheet()->setTitle($worksheetName, false, false);
 
+            $visibility = $sheet->attributes()['Visibility'] ?? 'GNM_SHEET_VISIBILITY_VISIBLE';
+            if ((string) $visibility !== 'GNM_SHEET_VISIBILITY_VISIBLE') {
+                $this->spreadsheet->getActiveSheet()->setSheetState(Worksheet::SHEETSTATE_HIDDEN);
+            }
+
             if (!$this->readDataOnly) {
                 (new PageSetup($this->spreadsheet))
                     ->printInformation($sheet)
                     ->sheetMargins($sheet);
             }
 
-            foreach ($sheet->Cells->Cell as $cell) {
-                $cellAttributes = $cell->attributes();
+            foreach ($sheet->Cells->Cell as $cellOrNull) {
+                $cell = self::testSimpleXml($cellOrNull);
+                $cellAttributes = self::testSimpleXml($cell->attributes());
                 $row = (int) $cellAttributes->Row + 1;
                 $column = (int) $cellAttributes->Col;
 
-                if ($row > $maxRow) {
-                    $maxRow = $row;
-                }
-                if ($column > $maxCol) {
-                    $maxCol = $column;
-                }
+                $maxRow = max($maxRow, $row);
+                $maxCol = max($maxCol, $column);
 
                 $column = Coordinate::stringFromColumnIndex($column + 1);
 
@@ -309,38 +300,7 @@ public function loadIntoExisting(string $pFilename, Spreadsheet $spreadsheet): S
                     }
                 }
 
-                $ValueType = $cellAttributes->ValueType;
-                $ExprID = (string) $cellAttributes->ExprID;
-                $type = DataType::TYPE_FORMULA;
-                if ($ExprID > '') {
-                    if (((string) $cell) > '') {
-                        $this->expressions[$ExprID] = [
-                            'column' => $cellAttributes->Col,
-                            'row' => $cellAttributes->Row,
-                            'formula' => (string) $cell,
-                        ];
-                    } else {
-                        $expression = $this->expressions[$ExprID];
-
-                        $cell = $this->referenceHelper->updateFormulaReferences(
-                            $expression['formula'],
-                            'A1',
-                            $cellAttributes->Col - $expression['column'],
-                            $cellAttributes->Row - $expression['row'],
-                            $worksheetName
-                        );
-                    }
-                    $type = DataType::TYPE_FORMULA;
-                } else {
-                    $vtype = (string) $ValueType;
-                    if (array_key_exists($vtype, self::$mappings['dataType'])) {
-                        $type = self::$mappings['dataType'][$vtype];
-                    }
-                    if ($vtype === '20') {        //    Boolean
-                        $cell = $cell == 'TRUE';
-                    }
-                }
-                $this->spreadsheet->getActiveSheet()->getCell($column . $row)->setValueExplicit((string) $cell, $type);
+                $this->loadCell($cell, $worksheetName, $cellAttributes, $column, $row);
             }
 
             if ($sheet->Styles !== null) {
@@ -353,22 +313,56 @@ public function loadIntoExisting(string $pFilename, Spreadsheet $spreadsheet): S
             $this->processMergedCells($sheet);
             $this->processAutofilter($sheet);
 
+            $this->setSelectedCells($sheet);
             ++$worksheetID;
         }
 
         $this->processDefinedNames($gnmXML);
 
+        $this->setSelectedSheet($gnmXML);
+
         // Return
         return $this->spreadsheet;
     }
 
+    private function setSelectedSheet(SimpleXMLElement $gnmXML): void
+    {
+        if (isset($gnmXML->UIData)) {
+            $attributes = self::testSimpleXml($gnmXML->UIData->attributes());
+            $selectedSheet = (int) $attributes['SelectedTab'];
+            $this->spreadsheet->setActiveSheetIndex($selectedSheet);
+        }
+    }
+
+    private function setSelectedCells(?SimpleXMLElement $sheet): void
+    {
+        if ($sheet !== null && isset($sheet->Selections)) {
+            foreach ($sheet->Selections as $selection) {
+                $startCol = (int) ($selection->StartCol ?? 0);
+                $startRow = (int) ($selection->StartRow ?? 0) + 1;
+                $endCol = (int) ($selection->EndCol ?? $startCol);
+                $endRow = (int) ($selection->endRow ?? 0) + 1;
+
+                $startColumn = Coordinate::stringFromColumnIndex($startCol + 1);
+                $endColumn = Coordinate::stringFromColumnIndex($endCol + 1);
+
+                $startCell = "{$startColumn}{$startRow}";
+                $endCell = "{$endColumn}{$endRow}";
+                $selectedRange = $startCell . (($endCell !== $startCell) ? ':' . $endCell : '');
+                $this->spreadsheet->getActiveSheet()->setSelectedCell($selectedRange);
+
+                break;
+            }
+        }
+    }
+
     private function processMergedCells(?SimpleXMLElement $sheet): void
     {
         //    Handle Merged Cells in this worksheet
         if ($sheet !== null && isset($sheet->MergedRegions)) {
             foreach ($sheet->MergedRegions->Merge as $mergeCells) {
-                if (strpos($mergeCells, ':') !== false) {
-                    $this->spreadsheet->getActiveSheet()->mergeCells($mergeCells);
+                if (str_contains((string) $mergeCells, ':')) {
+                    $this->spreadsheet->getActiveSheet()->mergeCells($mergeCells, Worksheet::MERGE_CELL_CONTENT_HIDE);
                 }
             }
         }
@@ -390,7 +384,8 @@ private function processAutofilter(?SimpleXMLElement $sheet): void
 
     private function setColumnWidth(int $whichColumn, float $defaultWidth): void
     {
-        $columnDimension = $this->spreadsheet->getActiveSheet()->getColumnDimension(Coordinate::stringFromColumnIndex($whichColumn + 1));
+        $columnDimension = $this->spreadsheet->getActiveSheet()
+            ->getColumnDimension(Coordinate::stringFromColumnIndex($whichColumn + 1));
         if ($columnDimension !== null) {
             $columnDimension->setWidth($defaultWidth);
         }
@@ -398,14 +393,16 @@ private function setColumnWidth(int $whichColumn, float $defaultWidth): void
 
     private function setColumnInvisible(int $whichColumn): void
     {
-        $columnDimension = $this->spreadsheet->getActiveSheet()->getColumnDimension(Coordinate::stringFromColumnIndex($whichColumn + 1));
+        $columnDimension = $this->spreadsheet->getActiveSheet()
+            ->getColumnDimension(Coordinate::stringFromColumnIndex($whichColumn + 1));
         if ($columnDimension !== null) {
             $columnDimension->setVisible(false);
         }
     }
 
-    private function processColumnLoop(int $whichColumn, int $maxCol, SimpleXMLElement $columnOverride, float $defaultWidth): int
+    private function processColumnLoop(int $whichColumn, int $maxCol, ?SimpleXMLElement $columnOverride, float $defaultWidth): int
     {
+        $columnOverride = self::testSimpleXml($columnOverride);
         $columnAttributes = self::testSimpleXml($columnOverride->attributes());
         $column = $columnAttributes['No'];
         $columnWidth = ((float) $columnAttributes['Unit']) / 5.4;
@@ -462,8 +459,9 @@ private function setRowInvisible(int $whichRow): void
         }
     }
 
-    private function processRowLoop(int $whichRow, int $maxRow, SimpleXMLElement $rowOverride, float $defaultHeight): int
+    private function processRowLoop(int $whichRow, int $maxRow, ?SimpleXMLElement $rowOverride, float $defaultHeight): int
     {
+        $rowOverride = self::testSimpleXml($rowOverride);
         $rowAttributes = self::testSimpleXml($rowOverride->attributes());
         $row = $rowAttributes['No'];
         $rowHeight = (float) $rowAttributes['Unit'];
@@ -515,7 +513,7 @@ private function processDefinedNames(?SimpleXMLElement $gnmXML): void
             foreach ($gnmXML->Names->Name as $definedName) {
                 $name = (string) $definedName->name;
                 $value = (string) $definedName->value;
-                if (stripos($value, '#REF!') !== false) {
+                if (stripos($value, '#REF!') !== false || empty($value)) {
                     continue;
                 }
 
@@ -537,4 +535,75 @@ private function parseRichText(string $is): RichText
 
         return $value;
     }
+
+    private function loadCell(
+        SimpleXMLElement $cell,
+        string $worksheetName,
+        SimpleXMLElement $cellAttributes,
+        string $column,
+        int $row
+    ): void {
+        $ValueType = $cellAttributes->ValueType;
+        $ExprID = (string) $cellAttributes->ExprID;
+        $rows = (int) ($cellAttributes->Rows ?? 0);
+        $cols = (int) ($cellAttributes->Cols ?? 0);
+        $type = DataType::TYPE_FORMULA;
+        $isArrayFormula = ($rows > 0 && $cols > 0);
+        $arrayFormulaRange = $isArrayFormula ? $this->getArrayFormulaRange($column, $row, $cols, $rows) : null;
+        if ($ExprID > '') {
+            if (((string) $cell) > '') {
+                // Formula
+                $this->expressions[$ExprID] = [
+                    'column' => $cellAttributes->Col,
+                    'row' => $cellAttributes->Row,
+                    'formula' => (string) $cell,
+                ];
+            } else {
+                // Shared Formula
+                $expression = $this->expressions[$ExprID];
+
+                $cell = $this->referenceHelper->updateFormulaReferences(
+                    $expression['formula'],
+                    'A1',
+                    $cellAttributes->Col - $expression['column'],
+                    $cellAttributes->Row - $expression['row'],
+                    $worksheetName
+                );
+            }
+            $type = DataType::TYPE_FORMULA;
+        } elseif ($isArrayFormula === false) {
+            $vtype = (string) $ValueType;
+            if (array_key_exists($vtype, self::$mappings['dataType'])) {
+                $type = self::$mappings['dataType'][$vtype];
+            }
+            if ($vtype === '20') { //    Boolean
+                $cell = $cell == 'TRUE';
+            }
+        }
+
+        $this->spreadsheet->getActiveSheet()->getCell($column . $row)->setValueExplicit((string) $cell, $type);
+        if ($arrayFormulaRange === null) {
+            $this->spreadsheet->getActiveSheet()->getCell($column . $row)->setFormulaAttributes(null);
+        } else {
+            $this->spreadsheet->getActiveSheet()->getCell($column . $row)->setFormulaAttributes(['t' => 'array', 'ref' => $arrayFormulaRange]);
+        }
+        if (isset($cellAttributes->ValueFormat)) {
+            $this->spreadsheet->getActiveSheet()->getCell($column . $row)
+                ->getStyle()->getNumberFormat()
+                ->setFormatCode((string) $cellAttributes->ValueFormat);
+        }
+    }
+
+    private function getArrayFormulaRange(string $column, int $row, int $cols, int $rows): string
+    {
+        $arrayFormulaRange = $column . $row;
+        $arrayFormulaRange .= ':'
+            . Coordinate::stringFromColumnIndex(
+                Coordinate::columnIndexFromString($column)
+                + $cols - 1
+            )
+            . (string) ($row + $rows - 1);
+
+        return $arrayFormulaRange;
+    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric/PageSetup.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric/PageSetup.php
index accc27160f..f12b742f35 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric/PageSetup.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric/PageSetup.php
@@ -10,10 +10,7 @@
 
 class PageSetup
 {
-    /**
-     * @var Spreadsheet
-     */
-    private $spreadsheet;
+    private Spreadsheet $spreadsheet;
 
     public function __construct(Spreadsheet $spreadsheet)
     {
@@ -22,20 +19,32 @@ public function __construct(Spreadsheet $spreadsheet)
 
     public function printInformation(SimpleXMLElement $sheet): self
     {
-        if (isset($sheet->PrintInformation)) {
+        if (isset($sheet->PrintInformation, $sheet->PrintInformation[0])) {
             $printInformation = $sheet->PrintInformation[0];
-            $scale = (string) $printInformation->Scale->attributes()['percentage'];
+            $setup = $this->spreadsheet->getActiveSheet()->getPageSetup();
+
+            $attributes = $printInformation->Scale->attributes();
+            if (isset($attributes['percentage'])) {
+                $setup->setScale((int) $attributes['percentage']);
+            }
             $pageOrder = (string) $printInformation->order;
+            if ($pageOrder === 'r_then_d') {
+                $setup->setPageOrder(WorksheetPageSetup::PAGEORDER_OVER_THEN_DOWN);
+            } elseif ($pageOrder === 'd_then_r') {
+                $setup->setPageOrder(WorksheetPageSetup::PAGEORDER_DOWN_THEN_OVER);
+            }
             $orientation = (string) $printInformation->orientation;
-            $horizontalCentered = (string) $printInformation->hcenter->attributes()['value'];
-            $verticalCentered = (string) $printInformation->vcenter->attributes()['value'];
-
-            $this->spreadsheet->getActiveSheet()->getPageSetup()
-                ->setPageOrder($pageOrder === 'r_then_d' ? WorksheetPageSetup::PAGEORDER_OVER_THEN_DOWN : WorksheetPageSetup::PAGEORDER_DOWN_THEN_OVER)
-                ->setScale((int) $scale)
-                ->setOrientation($orientation ?? WorksheetPageSetup::ORIENTATION_DEFAULT)
-                ->setHorizontalCentered((bool) $horizontalCentered)
-                ->setVerticalCentered((bool) $verticalCentered);
+            if ($orientation !== '') {
+                $setup->setOrientation($orientation);
+            }
+            $attributes = $printInformation->hcenter->attributes();
+            if (isset($attributes['value'])) {
+                $setup->setHorizontalCentered((bool) (string) $attributes['value']);
+            }
+            $attributes = $printInformation->vcenter->attributes();
+            if (isset($attributes['value'])) {
+                $setup->setVerticalCentered((bool) (string) $attributes['value']);
+            }
         }
 
         return $this;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric/Properties.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric/Properties.php
index ddcf77f1fc..a60b453482 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric/Properties.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric/Properties.php
@@ -8,10 +8,7 @@
 
 class Properties
 {
-    /**
-     * @var Spreadsheet
-     */
-    protected $spreadsheet;
+    protected Spreadsheet $spreadsheet;
 
     public function __construct(Spreadsheet $spreadsheet)
     {
@@ -113,8 +110,10 @@ private function docPropertiesMeta(SimpleXMLElement $officePropertyMeta): void
 
                         break;
                     case 'user-defined':
-                        [, $attrName] = explode(':', $attributes['name']);
-                        $this->userDefinedProperties($attrName, $propertyValue);
+                        if ($attributes) {
+                            [, $attrName] = explode(':', (string) $attributes['name']);
+                            $this->userDefinedProperties($attrName, $propertyValue);
+                        }
 
                         break;
                 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric/Styles.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric/Styles.php
index 9998448e2f..f901c4a9bb 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric/Styles.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric/Styles.php
@@ -14,18 +14,11 @@
 
 class Styles
 {
-    /**
-     * @var Spreadsheet
-     */
-    private $spreadsheet;
-
-    /**
-     * @var bool
-     */
-    protected $readDataOnly = false;
-
-    /** @var array */
-    public static $mappings = [
+    private Spreadsheet $spreadsheet;
+
+    protected bool $readDataOnly;
+
+    public static array $mappings = [
         'borderStyle' => [
             '0' => Border::BORDER_NONE,
             '1' => Border::BORDER_THIN,
@@ -101,10 +94,6 @@ public function read(SimpleXMLElement $sheet, int $maxRow, int $maxCol): void
     private function readStyles(SimpleXMLElement $styleRegion, int $maxRow, int $maxCol): void
     {
         foreach ($styleRegion as $style) {
-            if ($style === null) {
-                continue;
-            }
-
             $styleAttributes = $style->attributes();
             if ($styleAttributes !== null && ($styleAttributes['startRow'] <= $maxRow) && ($styleAttributes['startCol'] <= $maxCol)) {
                 $cellRange = $this->readStyleRange($styleAttributes, $maxCol, $maxRow);
@@ -114,8 +103,8 @@ private function readStyles(SimpleXMLElement $styleRegion, int $maxRow, int $max
                 $styleArray = [];
                 // We still set the number format mask for date/time values, even if readDataOnly is true
                 //    so that we can identify whether a float is a float or a date value
-                $formatCode = (string) $styleAttributes['Format'];
-                if (Date::isDateTimeFormatCode($formatCode)) {
+                $formatCode = $styleAttributes ? (string) $styleAttributes['Format'] : null;
+                if ($formatCode && Date::isDateTimeFormatCode($formatCode)) {
                     $styleArray['numberFormat']['formatCode'] = $formatCode;
                 }
                 if ($this->readDataOnly === false && $styleAttributes !== null) {
@@ -183,7 +172,7 @@ private static function parseBorderAttributes(?SimpleXMLElement $borderAttribute
                 $styleArray['color']['rgb'] = self::parseGnumericColour($borderAttributes['Color']);
             }
 
-            self::addStyle($styleArray, 'borderStyle', $borderAttributes['Style']);
+            self::addStyle($styleArray, 'borderStyle', (string) $borderAttributes['Style']);
         }
 
         return $styleArray;
@@ -201,12 +190,12 @@ private static function parseGnumericColour(string $gnmColour): string
 
     private function addColors(array &$styleArray, SimpleXMLElement $styleAttributes): void
     {
-        $RGB = self::parseGnumericColour($styleAttributes['Fore']);
+        $RGB = self::parseGnumericColour((string) $styleAttributes['Fore']);
         $styleArray['font']['color']['rgb'] = $RGB;
-        $RGB = self::parseGnumericColour($styleAttributes['Back']);
+        $RGB = self::parseGnumericColour((string) $styleAttributes['Back']);
         $shade = (string) $styleAttributes['Shade'];
         if (($RGB !== '000000') || ($shade !== '0')) {
-            $RGB2 = self::parseGnumericColour($styleAttributes['PatternColor']);
+            $RGB2 = self::parseGnumericColour((string) $styleAttributes['PatternColor']);
             if ($shade === '1') {
                 $styleArray['fill']['startColor']['rgb'] = $RGB;
                 $styleArray['fill']['endColor']['rgb'] = $RGB2;
@@ -234,8 +223,8 @@ private function readStyleRange(SimpleXMLElement $styleAttributes, int $maxCol,
 
     private function readStyle(array $styleArray, SimpleXMLElement $styleAttributes, SimpleXMLElement $style): array
     {
-        self::addStyle2($styleArray, 'alignment', 'horizontal', $styleAttributes['HAlign']);
-        self::addStyle2($styleArray, 'alignment', 'vertical', $styleAttributes['VAlign']);
+        self::addStyle2($styleArray, 'alignment', 'horizontal', (string) $styleAttributes['HAlign']);
+        self::addStyle2($styleArray, 'alignment', 'vertical', (string) $styleAttributes['VAlign']);
         $styleArray['alignment']['wrapText'] = $styleAttributes['WrapText'] == '1';
         $styleArray['alignment']['textRotation'] = $this->calcRotation($styleAttributes);
         $styleArray['alignment']['shrinkToFit'] = $styleAttributes['ShrinkToFit'] == '1';
@@ -250,7 +239,7 @@ private function readStyle(array $styleArray, SimpleXMLElement $styleAttributes,
             $styleArray['font']['bold'] = $fontAttributes['Bold'] == '1';
             $styleArray['font']['italic'] = $fontAttributes['Italic'] == '1';
             $styleArray['font']['strikethrough'] = $fontAttributes['StrikeThrough'] == '1';
-            self::addStyle2($styleArray, 'font', 'underline', $fontAttributes['Underline']);
+            self::addStyle2($styleArray, 'font', 'underline', (string) $fontAttributes['Underline']);
 
             switch ($fontAttributes['Script']) {
                 case '1':
@@ -272,10 +261,12 @@ private function readStyle(array $styleArray, SimpleXMLElement $styleAttributes,
             $this->addBorderStyle($srssb, $styleArray, 'right');
             $this->addBorderDiagonal($srssb, $styleArray);
         }
+        //    TO DO
+        /*
         if (isset($style->Style->HyperLink)) {
-            //    TO DO
             $hyperlink = $style->Style->HyperLink->attributes();
         }
+        */
 
         return $styleArray;
     }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Html.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Html.php
index b7faac878c..2a2ffc410c 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Html.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Html.php
@@ -2,11 +2,18 @@
 
 namespace PhpOffice\PhpSpreadsheet\Reader;
 
+use DOMAttr;
 use DOMDocument;
 use DOMElement;
 use DOMNode;
 use DOMText;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Cell\DataType;
+use PhpOffice\PhpSpreadsheet\Comment;
+use PhpOffice\PhpSpreadsheet\Document\Properties;
+use PhpOffice\PhpSpreadsheet\Exception as SpreadsheetException;
+use PhpOffice\PhpSpreadsheet\Helper\Dimension as CssDimension;
+use PhpOffice\PhpSpreadsheet\Helper\Html as HelperHtml;
 use PhpOffice\PhpSpreadsheet\Reader\Security\XmlScanner;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Style\Border;
@@ -18,7 +25,6 @@
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 use Throwable;
 
-/** PhpSpreadsheet root directory */
 class Html extends BaseReader
 {
     /**
@@ -26,26 +32,24 @@ class Html extends BaseReader
      */
     const TEST_SAMPLE_SIZE = 2048;
 
+    private const STARTS_WITH_BOM = '/^(?:\xfe\xff|\xff\xfe|\xEF\xBB\xBF)/';
+
+    private const DECLARES_CHARSET = '/ charset=/i';
+
     /**
      * Input encoding.
-     *
-     * @var string
      */
-    protected $inputEncoding = 'ANSI';
+    protected string $inputEncoding = 'ANSI';
 
     /**
      * Sheet index to read.
-     *
-     * @var int
      */
-    protected $sheetIndex = 0;
+    protected int $sheetIndex = 0;
 
     /**
      * Formats.
-     *
-     * @var array
      */
-    protected $formats = [
+    protected array $formats = [
         'h1' => [
             'font' => [
                 'bold' => true,
@@ -122,7 +126,7 @@ class Html extends BaseReader
         ], //    Italic
     ];
 
-    protected $rowspan = [];
+    protected array $rowspan = [];
 
     /**
      * Create a new HTML Reader instance.
@@ -135,21 +139,18 @@ public function __construct()
 
     /**
      * Validate that the current file is an HTML file.
-     *
-     * @param string $pFilename
-     *
-     * @return bool
      */
-    public function canRead($pFilename)
+    public function canRead(string $filename): bool
     {
         // Check if file exists
         try {
-            $this->openFile($pFilename);
-        } catch (Exception $e) {
+            $this->openFile($filename);
+        } catch (Exception) {
             return false;
         }
 
-        $beginning = $this->readBeginning();
+        $beginning = preg_replace(self::STARTS_WITH_BOM, '', $this->readBeginning()) ?? '';
+
         $startWithTag = self::startsWithTag($beginning);
         $containsTags = self::containsTags($beginning);
         $endsWithTag = self::endsWithTag($this->readEnding());
@@ -159,19 +160,20 @@ public function canRead($pFilename)
         return $startWithTag && $containsTags && $endsWithTag;
     }
 
-    private function readBeginning()
+    private function readBeginning(): string
     {
         fseek($this->fileHandle, 0);
 
-        return fread($this->fileHandle, self::TEST_SAMPLE_SIZE);
+        return (string) fread($this->fileHandle, self::TEST_SAMPLE_SIZE);
     }
 
-    private function readEnding()
+    private function readEnding(): string
     {
         $meta = stream_get_meta_data($this->fileHandle);
-        $filename = $meta['uri'];
+        // Phpstan incorrectly flags following line for Php8.2-, corrected in 8.3
+        $filename = $meta['uri']; //@phpstan-ignore-line
 
-        $size = filesize($filename);
+        $size = (int) filesize($filename);
         if ($size === 0) {
             return '';
         }
@@ -183,80 +185,45 @@ private function readEnding()
 
         fseek($this->fileHandle, $size - $blockSize);
 
-        return fread($this->fileHandle, $blockSize);
+        return (string) fread($this->fileHandle, $blockSize);
     }
 
-    private static function startsWithTag($data)
+    private static function startsWithTag(string $data): bool
     {
-        return '<' === substr(trim($data), 0, 1);
+        return str_starts_with(trim($data), '<');
     }
 
-    private static function endsWithTag($data)
+    private static function endsWithTag(string $data): bool
     {
-        return '>' === substr(trim($data), -1, 1);
+        return str_ends_with(trim($data), '>');
     }
 
-    private static function containsTags($data)
+    private static function containsTags(string $data): bool
     {
         return strlen($data) !== strlen(strip_tags($data));
     }
 
     /**
      * Loads Spreadsheet from file.
-     *
-     * @param string $pFilename
-     *
-     * @return Spreadsheet
      */
-    public function load($pFilename)
+    public function loadSpreadsheetFromFile(string $filename): Spreadsheet
     {
         // Create new Spreadsheet
         $spreadsheet = new Spreadsheet();
 
         // Load into this instance
-        return $this->loadIntoExisting($pFilename, $spreadsheet);
-    }
-
-    /**
-     * Set input encoding.
-     *
-     * @param string $pValue Input encoding, eg: 'ANSI'
-     *
-     * @return $this
-     *
-     * @codeCoverageIgnore
-     *
-     * @deprecated no use is made of this property
-     */
-    public function setInputEncoding($pValue)
-    {
-        $this->inputEncoding = $pValue;
-
-        return $this;
-    }
-
-    /**
-     * Get input encoding.
-     *
-     * @return string
-     *
-     * @codeCoverageIgnore
-     *
-     * @deprecated no use is made of this property
-     */
-    public function getInputEncoding()
-    {
-        return $this->inputEncoding;
+        return $this->loadIntoExisting($filename, $spreadsheet);
     }
 
     //    Data Array used for testing only, should write to Spreadsheet object on completion of tests
-    protected $dataArray = [];
 
-    protected $tableLevel = 0;
+    protected array $dataArray = [];
+
+    protected int $tableLevel = 0;
 
-    protected $nestedColumn = ['A'];
+    protected array $nestedColumn = ['A'];
 
-    protected function setTableStartColumn($column)
+    protected function setTableStartColumn(string $column): string
     {
         if ($this->tableLevel == 0) {
             $column = 'A';
@@ -267,27 +234,51 @@ protected function setTableStartColumn($column)
         return $this->nestedColumn[$this->tableLevel];
     }
 
-    protected function getTableStartColumn()
+    protected function getTableStartColumn(): string
     {
         return $this->nestedColumn[$this->tableLevel];
     }
 
-    protected function releaseTableStartColumn()
+    protected function releaseTableStartColumn(): string
     {
         --$this->tableLevel;
 
         return array_pop($this->nestedColumn);
     }
 
-    protected function flushCell(Worksheet $sheet, $column, $row, &$cellContent): void
+    /**
+     * Flush cell.
+     */
+    protected function flushCell(Worksheet $sheet, string $column, int|string $row, mixed &$cellContent, array $attributeArray): void
     {
         if (is_string($cellContent)) {
             //    Simple String content
             if (trim($cellContent) > '') {
                 //    Only actually write it if there's content in the string
                 //    Write to worksheet to be done here...
-                //    ... we return the cell so we can mess about with styles more easily
-                $sheet->setCellValue($column . $row, $cellContent);
+                //    ... we return the cell, so we can mess about with styles more easily
+
+                // Set cell value explicitly if there is data-type attribute
+                if (isset($attributeArray['data-type'])) {
+                    $datatype = $attributeArray['data-type'];
+                    if (in_array($datatype, [DataType::TYPE_STRING, DataType::TYPE_STRING2, DataType::TYPE_INLINE])) {
+                        //Prevent to Excel treat string with beginning equal sign or convert big numbers to scientific number
+                        if (str_starts_with($cellContent, '=')) {
+                            $sheet->getCell($column . $row)
+                                ->getStyle()
+                                ->setQuotePrefix(true);
+                        }
+                    }
+
+                    //catching the Exception and ignoring the invalid data types
+                    try {
+                        $sheet->setCellValueExplicit($column . $row, $cellContent, $attributeArray['data-type']);
+                    } catch (SpreadsheetException) {
+                        $sheet->setCellValue($column . $row, $cellContent);
+                    }
+                } else {
+                    $sheet->setCellValue($column . $row, $cellContent);
+                }
                 $this->dataArray[$row][$column] = $cellContent;
             }
         } else {
@@ -301,6 +292,7 @@ protected function flushCell(Worksheet $sheet, $column, $row, &$cellContent): vo
     private function processDomElementBody(Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child): void
     {
         $attributeArray = [];
+        /** @var DOMAttr $attribute */
         foreach ($child->attributes as $attribute) {
             $attributeArray[$attribute->name] = $attribute->value;
         }
@@ -320,24 +312,39 @@ private function processDomElementTitle(Worksheet $sheet, int &$row, string &$co
     {
         if ($child->nodeName === 'title') {
             $this->processDomElement($child, $sheet, $row, $column, $cellContent);
-            $sheet->setTitle($cellContent, true, true);
+
+            try {
+                $sheet->setTitle($cellContent, true, true);
+            } catch (SpreadsheetException) {
+                // leave default title if too long or illegal chars
+            }
             $cellContent = '';
         } else {
             $this->processDomElementSpanEtc($sheet, $row, $column, $cellContent, $child, $attributeArray);
         }
     }
 
-    private static $spanEtc = ['span', 'div', 'font', 'i', 'em', 'strong', 'b'];
+    private const SPAN_ETC = ['span', 'div', 'font', 'i', 'em', 'strong', 'b'];
 
     private function processDomElementSpanEtc(Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
     {
-        if (in_array($child->nodeName, self::$spanEtc)) {
+        if (in_array((string) $child->nodeName, self::SPAN_ETC, true)) {
             if (isset($attributeArray['class']) && $attributeArray['class'] === 'comment') {
                 $sheet->getComment($column . $row)
                     ->getText()
                     ->createTextRun($child->textContent);
+                if (isset($attributeArray['dir']) && $attributeArray['dir'] === 'rtl') {
+                    $sheet->getComment($column . $row)->setTextboxDirection(Comment::TEXTBOX_DIRECTION_RTL);
+                }
+                if (isset($attributeArray['style'])) {
+                    $alignStyle = $attributeArray['style'];
+                    if (preg_match('/\\btext-align:\\s*(left|right|center|justify)\\b/', $alignStyle, $matches) === 1) {
+                        $sheet->getComment($column . $row)->setAlignment($matches[1]);
+                    }
+                }
+            } else {
+                $this->processDomElement($child, $sheet, $row, $column, $cellContent);
             }
-            $this->processDomElement($child, $sheet, $row, $column, $cellContent);
 
             if (isset($this->formats[$child->nodeName])) {
                 $sheet->getStyle($column . $row)->applyFromArray($this->formats[$child->nodeName]);
@@ -350,7 +357,7 @@ private function processDomElementSpanEtc(Worksheet $sheet, int &$row, string &$
     private function processDomElementHr(Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
     {
         if ($child->nodeName === 'hr') {
-            $this->flushCell($sheet, $column, $row, $cellContent);
+            $this->flushCell($sheet, $column, $row, $cellContent, $attributeArray);
             ++$row;
             if (isset($this->formats[$child->nodeName])) {
                 $sheet->getStyle($column . $row)->applyFromArray($this->formats[$child->nodeName]);
@@ -365,12 +372,12 @@ private function processDomElementBr(Worksheet $sheet, int &$row, string &$colum
     {
         if ($child->nodeName === 'br' || $child->nodeName === 'hr') {
             if ($this->tableLevel > 0) {
-                //    If we're inside a table, replace with a \n and set the cell to wrap
+                //    If we're inside a table, replace with a newline and set the cell to wrap
                 $cellContent .= "\n";
                 $sheet->getStyle($column . $row)->getAlignment()->setWrapText(true);
             } else {
                 //    Otherwise flush our existing content and move the row cursor on
-                $this->flushCell($sheet, $column, $row, $cellContent);
+                $this->flushCell($sheet, $column, $row, $cellContent, $attributeArray);
                 ++$row;
             }
         } else {
@@ -404,23 +411,23 @@ private function processDomElementA(Worksheet $sheet, int &$row, string &$column
         }
     }
 
-    private static $h1Etc = ['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'ol', 'ul', 'p'];
+    private const H1_ETC = ['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'ol', 'ul', 'p'];
 
     private function processDomElementH1Etc(Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
     {
-        if (in_array($child->nodeName, self::$h1Etc)) {
+        if (in_array((string) $child->nodeName, self::H1_ETC, true)) {
             if ($this->tableLevel > 0) {
-                //    If we're inside a table, replace with a \n
+                //    If we're inside a table, replace with a newline
                 $cellContent .= $cellContent ? "\n" : '';
                 $sheet->getStyle($column . $row)->getAlignment()->setWrapText(true);
                 $this->processDomElement($child, $sheet, $row, $column, $cellContent);
             } else {
                 if ($cellContent > '') {
-                    $this->flushCell($sheet, $column, $row, $cellContent);
+                    $this->flushCell($sheet, $column, $row, $cellContent, $attributeArray);
                     ++$row;
                 }
                 $this->processDomElement($child, $sheet, $row, $column, $cellContent);
-                $this->flushCell($sheet, $column, $row, $cellContent);
+                $this->flushCell($sheet, $column, $row, $cellContent, $attributeArray);
 
                 if (isset($this->formats[$child->nodeName])) {
                     $sheet->getStyle($column . $row)->applyFromArray($this->formats[$child->nodeName]);
@@ -438,16 +445,16 @@ private function processDomElementLi(Worksheet $sheet, int &$row, string &$colum
     {
         if ($child->nodeName === 'li') {
             if ($this->tableLevel > 0) {
-                //    If we're inside a table, replace with a \n
+                //    If we're inside a table, replace with a newline
                 $cellContent .= $cellContent ? "\n" : '';
                 $this->processDomElement($child, $sheet, $row, $column, $cellContent);
             } else {
                 if ($cellContent > '') {
-                    $this->flushCell($sheet, $column, $row, $cellContent);
+                    $this->flushCell($sheet, $column, $row, $cellContent, $attributeArray);
                 }
                 ++$row;
                 $this->processDomElement($child, $sheet, $row, $column, $cellContent);
-                $this->flushCell($sheet, $column, $row, $cellContent);
+                $this->flushCell($sheet, $column, $row, $cellContent, $attributeArray);
                 $column = 'A';
             }
         } else {
@@ -464,10 +471,13 @@ private function processDomElementImg(Worksheet $sheet, int &$row, string &$colu
         }
     }
 
+    private string $currentColumn = 'A';
+
     private function processDomElementTable(Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
     {
         if ($child->nodeName === 'table') {
-            $this->flushCell($sheet, $column, $row, $cellContent);
+            $this->currentColumn = 'A';
+            $this->flushCell($sheet, $column, $row, $cellContent, $attributeArray);
             $column = $this->setTableStartColumn($column);
             if ($this->tableLevel > 1 && $row > 1) {
                 --$row;
@@ -486,7 +496,10 @@ private function processDomElementTable(Worksheet $sheet, int &$row, string &$co
 
     private function processDomElementTr(Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
     {
-        if ($child->nodeName === 'tr') {
+        if ($child->nodeName === 'col') {
+            $this->applyInlineStyle($sheet, -1, $this->currentColumn, $attributeArray);
+            ++$this->currentColumn;
+        } elseif ($child->nodeName === 'tr') {
             $column = $this->getTableStartColumn();
             $cellContent = '';
             $this->processDomElement($child, $sheet, $row, $column, $cellContent);
@@ -527,14 +540,14 @@ private function processDomElementBgcolor(Worksheet $sheet, int $row, string $co
     private function processDomElementWidth(Worksheet $sheet, string $column, array $attributeArray): void
     {
         if (isset($attributeArray['width'])) {
-            $sheet->getColumnDimension($column)->setWidth($attributeArray['width']);
+            $sheet->getColumnDimension($column)->setWidth((new CssDimension($attributeArray['width']))->width());
         }
     }
 
     private function processDomElementHeight(Worksheet $sheet, int $row, array $attributeArray): void
     {
         if (isset($attributeArray['height'])) {
-            $sheet->getRowDimension($row)->setRowHeight($attributeArray['height']);
+            $sheet->getRowDimension($row)->setRowHeight((new CssDimension($attributeArray['height']))->height());
         }
     }
 
@@ -569,7 +582,7 @@ private function processDomElementThTd(Worksheet $sheet, int &$row, string &$col
         // apply inline style
         $this->applyInlineStyle($sheet, $row, $column, $attributeArray);
 
-        $this->flushCell($sheet, $column, $row, $cellContent);
+        $this->flushCell($sheet, $column, $row, $cellContent, $attributeArray);
 
         $this->processDomElementBgcolor($sheet, $row, $column, $attributeArray);
         $this->processDomElementWidth($sheet, $column, $attributeArray);
@@ -614,7 +627,10 @@ protected function processDomElement(DOMNode $element, Worksheet $sheet, int &$r
     {
         foreach ($element->childNodes as $child) {
             if ($child instanceof DOMText) {
-                $domText = preg_replace('/\s+/u', ' ', trim($child->nodeValue));
+                $domText = (string) preg_replace('/\s+/', ' ', trim($child->nodeValue ?? ''));
+                if ($domText === "\u{a0}") {
+                    $domText = '';
+                }
                 if (is_string($cellContent)) {
                     //    simply append the text if the cell content is a plain text string
                     $cellContent .= $domText;
@@ -629,53 +645,150 @@ protected function processDomElement(DOMNode $element, Worksheet $sheet, int &$r
 
     /**
      * Loads PhpSpreadsheet from file into PhpSpreadsheet instance.
-     *
-     * @param string $pFilename
-     *
-     * @return Spreadsheet
      */
-    public function loadIntoExisting($pFilename, Spreadsheet $spreadsheet)
+    public function loadIntoExisting(string $filename, Spreadsheet $spreadsheet): Spreadsheet
     {
         // Validate
-        if (!$this->canRead($pFilename)) {
-            throw new Exception($pFilename . ' is an Invalid HTML file.');
+        if (!$this->canRead($filename)) {
+            throw new Exception($filename . ' is an Invalid HTML file.');
         }
 
         // Create a new DOM object
         $dom = new DOMDocument();
+
         // Reload the HTML file into the DOM object
         try {
-            $loaded = $dom->loadHTML(mb_convert_encoding($this->securityScanner->scanFile($pFilename), 'HTML-ENTITIES', 'UTF-8'));
+            $convert = $this->getSecurityScannerOrThrow()->scanFile($filename);
+            $convert = self::replaceNonAsciiIfNeeded($convert);
+            $loaded = ($convert === null) ? false : $dom->loadHTML($convert);
         } catch (Throwable $e) {
             $loaded = false;
         }
         if ($loaded === false) {
-            throw new Exception('Failed to load ' . $pFilename . ' as a DOM Document', 0, $e ?? null);
+            throw new Exception('Failed to load ' . $filename . ' as a DOM Document', 0, $e ?? null);
         }
+        self::loadProperties($dom, $spreadsheet);
 
         return $this->loadDocument($dom, $spreadsheet);
     }
 
+    private static function loadProperties(DOMDocument $dom, Spreadsheet $spreadsheet): void
+    {
+        $properties = $spreadsheet->getProperties();
+        foreach ($dom->getElementsByTagName('meta') as $meta) {
+            $metaContent = (string) $meta->getAttribute('content');
+            if ($metaContent !== '') {
+                $metaName = (string) $meta->getAttribute('name');
+                switch ($metaName) {
+                    case 'author':
+                        $properties->setCreator($metaContent);
+
+                        break;
+                    case 'category':
+                        $properties->setCategory($metaContent);
+
+                        break;
+                    case 'company':
+                        $properties->setCompany($metaContent);
+
+                        break;
+                    case 'created':
+                        $properties->setCreated($metaContent);
+
+                        break;
+                    case 'description':
+                        $properties->setDescription($metaContent);
+
+                        break;
+                    case 'keywords':
+                        $properties->setKeywords($metaContent);
+
+                        break;
+                    case 'lastModifiedBy':
+                        $properties->setLastModifiedBy($metaContent);
+
+                        break;
+                    case 'manager':
+                        $properties->setManager($metaContent);
+
+                        break;
+                    case 'modified':
+                        $properties->setModified($metaContent);
+
+                        break;
+                    case 'subject':
+                        $properties->setSubject($metaContent);
+
+                        break;
+                    case 'title':
+                        $properties->setTitle($metaContent);
+
+                        break;
+                    case 'viewport':
+                        $properties->setViewport($metaContent);
+
+                        break;
+                    default:
+                        if (preg_match('/^custom[.](bool|date|float|int|string)[.](.+)$/', $metaName, $matches) === 1) {
+                            match ($matches[1]) {
+                                'bool' => $properties->setCustomProperty($matches[2], (bool) $metaContent, Properties::PROPERTY_TYPE_BOOLEAN),
+                                'float' => $properties->setCustomProperty($matches[2], (float) $metaContent, Properties::PROPERTY_TYPE_FLOAT),
+                                'int' => $properties->setCustomProperty($matches[2], (int) $metaContent, Properties::PROPERTY_TYPE_INTEGER),
+                                'date' => $properties->setCustomProperty($matches[2], $metaContent, Properties::PROPERTY_TYPE_DATE),
+                                // string
+                                default => $properties->setCustomProperty($matches[2], $metaContent, Properties::PROPERTY_TYPE_STRING),
+                            };
+                        }
+                }
+            }
+        }
+        if (!empty($dom->baseURI)) {
+            $properties->setHyperlinkBase($dom->baseURI);
+        }
+    }
+
+    private static function replaceNonAscii(array $matches): string
+    {
+        return '&#' . mb_ord($matches[0], 'UTF-8') . ';';
+    }
+
+    private static function replaceNonAsciiIfNeeded(string $convert): ?string
+    {
+        if (preg_match(self::STARTS_WITH_BOM, $convert) !== 1 && preg_match(self::DECLARES_CHARSET, $convert) !== 1) {
+            $lowend = "\u{80}";
+            $highend = "\u{10ffff}";
+            $regexp = "/[$lowend-$highend]/u";
+            /** @var callable $callback */
+            $callback = [self::class, 'replaceNonAscii'];
+            $convert = preg_replace_callback($regexp, $callback, $convert);
+        }
+
+        return $convert;
+    }
+
     /**
      * Spreadsheet from content.
-     *
-     * @param string $content
      */
-    public function loadFromString($content, ?Spreadsheet $spreadsheet = null): Spreadsheet
+    public function loadFromString(string $content, ?Spreadsheet $spreadsheet = null): Spreadsheet
     {
         //    Create a new DOM object
         $dom = new DOMDocument();
+
         //    Reload the HTML file into the DOM object
         try {
-            $loaded = $dom->loadHTML(mb_convert_encoding($this->securityScanner->scan($content), 'HTML-ENTITIES', 'UTF-8'));
+            $convert = $this->getSecurityScannerOrThrow()->scan($content);
+            $convert = self::replaceNonAsciiIfNeeded($convert);
+            $loaded = ($convert === null) ? false : $dom->loadHTML($convert);
         } catch (Throwable $e) {
             $loaded = false;
         }
         if ($loaded === false) {
             throw new Exception('Failed to load content as a DOM Document', 0, $e ?? null);
         }
+        $spreadsheet = $spreadsheet ?? new Spreadsheet();
+        self::loadProperties($dom, $spreadsheet);
 
-        return $this->loadDocument($dom, $spreadsheet ?? new Spreadsheet());
+        return $this->loadDocument($dom, $spreadsheet);
     }
 
     /**
@@ -703,10 +816,8 @@ private function loadDocument(DOMDocument $document, Spreadsheet $spreadsheet):
 
     /**
      * Get sheet index.
-     *
-     * @return int
      */
-    public function getSheetIndex()
+    public function getSheetIndex(): int
     {
         return $this->sheetIndex;
     }
@@ -714,13 +825,13 @@ public function getSheetIndex()
     /**
      * Set sheet index.
      *
-     * @param int $pValue Sheet index
+     * @param int $sheetIndex Sheet index
      *
      * @return $this
      */
-    public function setSheetIndex($pValue)
+    public function setSheetIndex(int $sheetIndex): static
     {
-        $this->sheetIndex = $pValue;
+        $this->sheetIndex = $sheetIndex;
 
         return $this;
     }
@@ -734,19 +845,16 @@ public function setSheetIndex($pValue)
      *
      * TODO :
      * - Implement to other propertie, such as border
-     *
-     * @param Worksheet $sheet
-     * @param int $row
-     * @param string $column
-     * @param array $attributeArray
      */
-    private function applyInlineStyle(&$sheet, $row, $column, $attributeArray): void
+    private function applyInlineStyle(Worksheet &$sheet, int $row, string $column, array $attributeArray): void
     {
         if (!isset($attributeArray['style'])) {
             return;
         }
 
-        if (isset($attributeArray['rowspan'], $attributeArray['colspan'])) {
+        if ($row <= 0 || $column === '') {
+            $cellStyle = new Style();
+        } elseif (isset($attributeArray['rowspan'], $attributeArray['colspan'])) {
             $columnTo = $column;
             for ($i = 0; $i < (int) $attributeArray['colspan'] - 1; ++$i) {
                 ++$columnTo;
@@ -773,6 +881,7 @@ private function applyInlineStyle(&$sheet, $row, $column, $attributeArray): void
             $value = explode(':', $st);
             $styleName = isset($value[0]) ? trim($value[0]) : null;
             $styleValue = isset($value[1]) ? trim($value[1]) : null;
+            $styleValueString = (string) $styleValue;
 
             if (!$styleName) {
                 continue;
@@ -781,7 +890,7 @@ private function applyInlineStyle(&$sheet, $row, $column, $attributeArray): void
             switch ($styleName) {
                 case 'background':
                 case 'background-color':
-                    $styleColor = $this->getStyleColor($styleValue);
+                    $styleColor = $this->getStyleColor($styleValueString);
 
                     if (!$styleColor) {
                         continue 2;
@@ -791,7 +900,7 @@ private function applyInlineStyle(&$sheet, $row, $column, $attributeArray): void
 
                     break;
                 case 'color':
-                    $styleColor = $this->getStyleColor($styleValue);
+                    $styleColor = $this->getStyleColor($styleValueString);
 
                     if (!$styleColor) {
                         continue 2;
@@ -802,27 +911,27 @@ private function applyInlineStyle(&$sheet, $row, $column, $attributeArray): void
                     break;
 
                 case 'border':
-                    $this->setBorderStyle($cellStyle, $styleValue, 'allBorders');
+                    $this->setBorderStyle($cellStyle, $styleValueString, 'allBorders');
 
                     break;
 
                 case 'border-top':
-                    $this->setBorderStyle($cellStyle, $styleValue, 'top');
+                    $this->setBorderStyle($cellStyle, $styleValueString, 'top');
 
                     break;
 
                 case 'border-bottom':
-                    $this->setBorderStyle($cellStyle, $styleValue, 'bottom');
+                    $this->setBorderStyle($cellStyle, $styleValueString, 'bottom');
 
                     break;
 
                 case 'border-left':
-                    $this->setBorderStyle($cellStyle, $styleValue, 'left');
+                    $this->setBorderStyle($cellStyle, $styleValueString, 'left');
 
                     break;
 
                 case 'border-right':
-                    $this->setBorderStyle($cellStyle, $styleValue, 'right');
+                    $this->setBorderStyle($cellStyle, $styleValueString, 'right');
 
                     break;
 
@@ -848,7 +957,7 @@ private function applyInlineStyle(&$sheet, $row, $column, $attributeArray): void
                     break;
 
                 case 'font-family':
-                    $cellStyle->getFont()->setName(str_replace('\'', '', $styleValue));
+                    $cellStyle->getFont()->setName(str_replace('\'', '', $styleValueString));
 
                     break;
 
@@ -867,26 +976,30 @@ private function applyInlineStyle(&$sheet, $row, $column, $attributeArray): void
                     break;
 
                 case 'text-align':
-                    $cellStyle->getAlignment()->setHorizontal($styleValue);
+                    $cellStyle->getAlignment()->setHorizontal($styleValueString);
 
                     break;
 
                 case 'vertical-align':
-                    $cellStyle->getAlignment()->setVertical($styleValue);
+                    $cellStyle->getAlignment()->setVertical($styleValueString);
 
                     break;
 
                 case 'width':
-                    $sheet->getColumnDimension($column)->setWidth(
-                        (float) str_replace(['px', 'pt'], '', $styleValue)
-                    );
+                    if ($column !== '') {
+                        $sheet->getColumnDimension($column)->setWidth(
+                            (new CssDimension($styleValue ?? ''))->width()
+                        );
+                    }
 
                     break;
 
                 case 'height':
-                    $sheet->getRowDimension($row)->setRowHeight(
-                        (float) str_replace(['px', 'pt'], '', $styleValue)
-                    );
+                    if ($row > 0) {
+                        $sheet->getRowDimension($row)->setRowHeight(
+                            (new CssDimension($styleValue ?? ''))->height()
+                        );
+                    }
 
                     break;
 
@@ -899,7 +1012,7 @@ private function applyInlineStyle(&$sheet, $row, $column, $attributeArray): void
 
                 case 'text-indent':
                     $cellStyle->getAlignment()->setIndent(
-                        (int) str_replace(['px'], '', $styleValue)
+                        (int) str_replace(['px'], '', $styleValueString)
                     );
 
                     break;
@@ -909,23 +1022,18 @@ private function applyInlineStyle(&$sheet, $row, $column, $attributeArray): void
 
     /**
      * Check if has #, so we can get clean hex.
-     *
-     * @return null|string
      */
-    public function getStyleColor($value)
+    public function getStyleColor(?string $value): string
     {
-        if (strpos($value, '#') === 0) {
+        $value = (string) $value;
+        if (str_starts_with($value, '#')) {
             return substr($value, 1);
         }
 
-        return \PhpOffice\PhpSpreadsheet\Helper\Html::colourNameLookup((string) $value);
+        return HelperHtml::colourNameLookup($value);
     }
 
-    /**
-     * @param string $column
-     * @param int $row
-     */
-    private function insertImage(Worksheet $sheet, $column, $row, array $attributes): void
+    private function insertImage(Worksheet $sheet, string $column, int $row, array $attributes): void
     {
         if (!isset($attributes['src'])) {
             return;
@@ -965,7 +1073,7 @@ private function insertImage(Worksheet $sheet, $column, $row, array $attributes)
         );
     }
 
-    private static $borderMappings = [
+    private const BORDER_MAPPINGS = [
         'dash-dot' => Border::BORDER_DASHDOT,
         'dash-dot-dot' => Border::BORDER_DASHDOTDOT,
         'dashed' => Border::BORDER_DASHED,
@@ -984,26 +1092,18 @@ private function insertImage(Worksheet $sheet, $column, $row, array $attributes)
 
     public static function getBorderMappings(): array
     {
-        return self::$borderMappings;
+        return self::BORDER_MAPPINGS;
     }
 
     /**
      * Map html border style to PhpSpreadsheet border style.
-     *
-     * @param string $style
-     *
-     * @return null|string
      */
-    public function getBorderStyle($style)
+    public function getBorderStyle(string $style): ?string
     {
-        return (array_key_exists($style, self::$borderMappings)) ? self::$borderMappings[$style] : null;
+        return self::BORDER_MAPPINGS[$style] ?? null;
     }
 
-    /**
-     * @param string $styleValue
-     * @param string $type
-     */
-    private function setBorderStyle(Style $cellStyle, $styleValue, $type): void
+    private function setBorderStyle(Style $cellStyle, string $styleValue, string $type): void
     {
         if (trim($styleValue) === Border::BORDER_NONE) {
             $borderStyle = Border::BORDER_NONE;
@@ -1029,4 +1129,25 @@ private function setBorderStyle(Style $cellStyle, $styleValue, $type): void
             ],
         ]);
     }
+
+    /**
+     * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns).
+     */
+    public function listWorksheetInfo(string $filename): array
+    {
+        $info = [];
+        $spreadsheet = new Spreadsheet();
+        $this->loadIntoExisting($filename, $spreadsheet);
+        foreach ($spreadsheet->getAllSheets() as $sheet) {
+            $newEntry = ['worksheetName' => $sheet->getTitle()];
+            $newEntry['lastColumnLetter'] = $sheet->getHighestDataColumn();
+            $newEntry['lastColumnIndex'] = Coordinate::columnIndexFromString($sheet->getHighestDataColumn()) - 1;
+            $newEntry['totalRows'] = $sheet->getHighestDataRow();
+            $newEntry['totalColumns'] = $newEntry['lastColumnIndex'] + 1;
+            $info[] = $newEntry;
+        }
+        $spreadsheet->disconnectWorksheets();
+
+        return $info;
+    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/IReadFilter.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/IReadFilter.php
index ccfe05ada6..1fd12e56f7 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/IReadFilter.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/IReadFilter.php
@@ -7,11 +7,9 @@ interface IReadFilter
     /**
      * Should this cell be read?
      *
-     * @param string $column Column address (as a string value like "A", or "IV")
+     * @param string $columnAddress Column address (as a string value like "A", or "IV")
      * @param int $row Row number
      * @param string $worksheetName Optional worksheet name
-     *
-     * @return bool
      */
-    public function readCell($column, $row, $worksheetName = '');
+    public function readCell(string $columnAddress, int $row, string $worksheetName = ''): bool;
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/IReader.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/IReader.php
index a8bd360659..62c2103ab8 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/IReader.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/IReader.php
@@ -2,132 +2,125 @@
 
 namespace PhpOffice\PhpSpreadsheet\Reader;
 
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
 interface IReader
 {
-    /**
-     * IReader constructor.
-     */
+    public const LOAD_WITH_CHARTS = 1;
+
+    public const READ_DATA_ONLY = 2;
+
+    public const SKIP_EMPTY_CELLS = 4;
+    public const IGNORE_EMPTY_CELLS = 4;
+
+    public const IGNORE_ROWS_WITH_NO_CELLS = 8;
+
     public function __construct();
 
     /**
      * Can the current IReader read the file?
-     *
-     * @param string $pFilename
-     *
-     * @return bool
      */
-    public function canRead($pFilename);
+    public function canRead(string $filename): bool;
 
     /**
      * Read data only?
-     *        If this is true, then the Reader will only read data values for cells, it will not read any formatting information.
+     *        If this is true, then the Reader will only read data values for cells, it will not read any formatting
+     *           or structural information (like merges).
      *        If false (the default) it will read data and formatting.
-     *
-     * @return bool
      */
-    public function getReadDataOnly();
+    public function getReadDataOnly(): bool;
 
     /**
      * Set read data only
-     *        Set to true, to advise the Reader only to read data values for cells, and to ignore any formatting information.
+     *        Set to true, to advise the Reader only to read data values for cells, and to ignore any formatting
+     *            or structural information (like merges).
      *        Set to false (the default) to advise the Reader to read both data and formatting for cells.
      *
-     * @param bool $pValue
-     *
-     * @return IReader
+     * @return $this
      */
-    public function setReadDataOnly($pValue);
+    public function setReadDataOnly(bool $readDataOnly): self;
 
     /**
      * Read empty cells?
      *        If this is true (the default), then the Reader will read data values for all cells, irrespective of value.
      *        If false it will not read data for cells containing a null value or an empty string.
-     *
-     * @return bool
      */
-    public function getReadEmptyCells();
+    public function getReadEmptyCells(): bool;
 
     /**
      * Set read empty cells
      *        Set to true (the default) to advise the Reader read data values for all cells, irrespective of value.
      *        Set to false to advise the Reader to ignore cells containing a null value or an empty string.
      *
-     * @param bool $pValue
-     *
-     * @return IReader
+     * @return $this
      */
-    public function setReadEmptyCells($pValue);
+    public function setReadEmptyCells(bool $readEmptyCells): self;
 
     /**
      * Read charts in workbook?
-     *        If this is true, then the Reader will include any charts that exist in the workbook.
-     *      Note that a ReadDataOnly value of false overrides, and charts won't be read regardless of the IncludeCharts value.
-     *        If false (the default) it will ignore any charts defined in the workbook file.
-     *
-     * @return bool
+     *      If this is true, then the Reader will include any charts that exist in the workbook.
+     *         Note that a ReadDataOnly value of false overrides, and charts won't be read regardless of the IncludeCharts value.
+     *      If false (the default) it will ignore any charts defined in the workbook file.
      */
-    public function getIncludeCharts();
+    public function getIncludeCharts(): bool;
 
     /**
      * Set read charts in workbook
-     *        Set to true, to advise the Reader to include any charts that exist in the workbook.
-     *      Note that a ReadDataOnly value of false overrides, and charts won't be read regardless of the IncludeCharts value.
-     *        Set to false (the default) to discard charts.
+     *     Set to true, to advise the Reader to include any charts that exist in the workbook.
+     *         Note that a ReadDataOnly value of false overrides, and charts won't be read regardless of the IncludeCharts value.
+     *     Set to false (the default) to discard charts.
      *
-     * @param bool $pValue
-     *
-     * @return IReader
+     * @return $this
      */
-    public function setIncludeCharts($pValue);
+    public function setIncludeCharts(bool $includeCharts): self;
 
     /**
      * Get which sheets to load
      * Returns either an array of worksheet names (the list of worksheets that should be loaded), or a null
      *        indicating that all worksheets in the workbook should be loaded.
-     *
-     * @return mixed
      */
-    public function getLoadSheetsOnly();
+    public function getLoadSheetsOnly(): ?array;
 
     /**
      * Set which sheets to load.
      *
-     * @param mixed $value
-     *        This should be either an array of worksheet names to be loaded, or a string containing a single worksheet name.
-     *        If NULL, then it tells the Reader to read all worksheets in the workbook
+     * @param null|array|string $value This should be either an array of worksheet names to be loaded,
+     *          or a string containing a single worksheet name. If NULL, then it tells the Reader to
+     *          read all worksheets in the workbook
      *
-     * @return IReader
+     * @return $this
      */
-    public function setLoadSheetsOnly($value);
+    public function setLoadSheetsOnly(string|array|null $value): self;
 
     /**
      * Set all sheets to load
      *        Tells the Reader to load all worksheets from the workbook.
      *
-     * @return IReader
+     * @return $this
      */
-    public function setLoadAllSheets();
+    public function setLoadAllSheets(): self;
 
     /**
      * Read filter.
-     *
-     * @return IReadFilter
      */
-    public function getReadFilter();
+    public function getReadFilter(): IReadFilter;
 
     /**
      * Set read filter.
      *
-     * @return IReader
+     * @return $this
      */
-    public function setReadFilter(IReadFilter $pValue);
+    public function setReadFilter(IReadFilter $readFilter): self;
 
     /**
      * Loads PhpSpreadsheet from file.
      *
-     * @param string $pFilename
-     *
-     * @return \PhpOffice\PhpSpreadsheet\Spreadsheet
+     * @param string $filename The name of the file to load
+     * @param int $flags Flags that can change the behaviour of the Writer:
+     *            self::LOAD_WITH_CHARTS    Load any charts that are defined (if the Reader supports Charts)
+     *            self::READ_DATA_ONLY      Read only data, not style or structure information, from the file
+     *            self::SKIP_EMPTY_CELLS    Don't read empty cells (cells that contain a null value,
+     *                                      empty string, or a string containing only whitespace characters)
      */
-    public function load($pFilename);
+    public function load(string $filename, int $flags = 0): Spreadsheet;
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods.php
index 760aa10d08..da7b85cee6 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods.php
@@ -2,17 +2,17 @@
 
 namespace PhpOffice\PhpSpreadsheet\Reader;
 
-use DateTime;
 use DOMAttr;
 use DOMDocument;
 use DOMElement;
 use DOMNode;
-use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use DOMText;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Cell\DataType;
-use PhpOffice\PhpSpreadsheet\Reader\Exception as ReaderException;
+use PhpOffice\PhpSpreadsheet\Helper\Dimension as HelperDimension;
 use PhpOffice\PhpSpreadsheet\Reader\Ods\AutoFilter;
 use PhpOffice\PhpSpreadsheet\Reader\Ods\DefinedNames;
+use PhpOffice\PhpSpreadsheet\Reader\Ods\FormulaTranslator;
 use PhpOffice\PhpSpreadsheet\Reader\Ods\PageSettings;
 use PhpOffice\PhpSpreadsheet\Reader\Ods\Properties as DocumentProperties;
 use PhpOffice\PhpSpreadsheet\Reader\Security\XmlScanner;
@@ -22,12 +22,15 @@
 use PhpOffice\PhpSpreadsheet\Shared\File;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 use Throwable;
 use XMLReader;
 use ZipArchive;
 
 class Ods extends BaseReader
 {
+    const INITIAL_FILE = 'content.xml';
+
     /**
      * Create a new Ods Reader instance.
      */
@@ -39,46 +42,44 @@ public function __construct()
 
     /**
      * Can the current IReader read the file?
-     *
-     * @param string $pFilename
-     *
-     * @return bool
      */
-    public function canRead($pFilename)
+    public function canRead(string $filename): bool
     {
-        File::assertFile($pFilename);
-
         $mimeType = 'UNKNOWN';
 
         // Load file
 
-        $zip = new ZipArchive();
-        if ($zip->open($pFilename) === true) {
-            // check if it is an OOXML archive
-            $stat = $zip->statName('mimetype');
-            if ($stat && ($stat['size'] <= 255)) {
-                $mimeType = $zip->getFromName($stat['name']);
-            } elseif ($zip->statName('META-INF/manifest.xml')) {
-                $xml = simplexml_load_string(
-                    $this->securityScanner->scan($zip->getFromName('META-INF/manifest.xml')),
-                    'SimpleXMLElement',
-                    Settings::getLibXmlLoaderOptions()
-                );
-                $namespacesContent = $xml->getNamespaces(true);
-                if (isset($namespacesContent['manifest'])) {
-                    $manifest = $xml->children($namespacesContent['manifest']);
-                    foreach ($manifest as $manifestDataSet) {
-                        $manifestAttributes = $manifestDataSet->attributes($namespacesContent['manifest']);
-                        if ($manifestAttributes->{'full-path'} == '/') {
-                            $mimeType = (string) $manifestAttributes->{'media-type'};
-
-                            break;
+        if (File::testFileNoThrow($filename, '')) {
+            $zip = new ZipArchive();
+            if ($zip->open($filename) === true) {
+                // check if it is an OOXML archive
+                $stat = $zip->statName('mimetype');
+                if (!empty($stat) && ($stat['size'] <= 255)) {
+                    $mimeType = $zip->getFromName($stat['name']);
+                } elseif ($zip->statName('META-INF/manifest.xml')) {
+                    $xml = simplexml_load_string(
+                        $this->getSecurityScannerOrThrow()->scan($zip->getFromName('META-INF/manifest.xml')),
+                        'SimpleXMLElement',
+                        Settings::getLibXmlLoaderOptions()
+                    );
+                    if ($xml !== false) {
+                        $namespacesContent = $xml->getNamespaces(true);
+                        if (isset($namespacesContent['manifest'])) {
+                            $manifest = $xml->children($namespacesContent['manifest']);
+                            foreach ($manifest as $manifestDataSet) {
+                                $manifestAttributes = $manifestDataSet->attributes($namespacesContent['manifest']);
+                                if ($manifestAttributes && $manifestAttributes->{'full-path'} == '/') {
+                                    $mimeType = (string) $manifestAttributes->{'media-type'};
+
+                                    break;
+                                }
+                            }
                         }
                     }
                 }
-            }
 
-            $zip->close();
+                $zip->close();
+            }
         }
 
         return $mimeType === 'application/vnd.oasis.opendocument.spreadsheet';
@@ -87,24 +88,17 @@ public function canRead($pFilename)
     /**
      * Reads names of the worksheets from a file, without parsing the whole file to a PhpSpreadsheet object.
      *
-     * @param string $pFilename
-     *
      * @return string[]
      */
-    public function listWorksheetNames($pFilename)
+    public function listWorksheetNames(string $filename): array
     {
-        File::assertFile($pFilename);
-
-        $zip = new ZipArchive();
-        if ($zip->open($pFilename) !== true) {
-            throw new ReaderException('Could not open ' . $pFilename . ' for reading! Error opening file.');
-        }
+        File::assertFile($filename, self::INITIAL_FILE);
 
         $worksheetNames = [];
 
         $xml = new XMLReader();
         $xml->xml(
-            $this->securityScanner->scanFile('zip://' . realpath($pFilename) . '#content.xml'),
+            $this->getSecurityScannerOrThrow()->scanFile('zip://' . realpath($filename) . '#' . self::INITIAL_FILE),
             null,
             Settings::getLibXmlLoaderOptions()
         );
@@ -114,7 +108,7 @@ public function listWorksheetNames($pFilename)
         $xml->read();
         while ($xml->read()) {
             // Quickly jump through to the office:body node
-            while ($xml->name !== 'office:body') {
+            while (self::getXmlName($xml) !== 'office:body') {
                 if ($xml->isEmptyElement) {
                     $xml->read();
                 } else {
@@ -123,12 +117,16 @@ public function listWorksheetNames($pFilename)
             }
             // Now read each node until we find our first table:table node
             while ($xml->read()) {
-                if ($xml->name == 'table:table' && $xml->nodeType == XMLReader::ELEMENT) {
+                $xmlName = self::getXmlName($xml);
+                if ($xmlName == 'table:table' && $xml->nodeType == XMLReader::ELEMENT) {
                     // Loop through each table:table node reading the table:name attribute for each worksheet name
                     do {
-                        $worksheetNames[] = $xml->getAttribute('table:name');
+                        $worksheetName = $xml->getAttribute('table:name');
+                        if (!empty($worksheetName)) {
+                            $worksheetNames[] = $worksheetName;
+                        }
                         $xml->next();
-                    } while ($xml->name == 'table:table' && $xml->nodeType == XMLReader::ELEMENT);
+                    } while (self::getXmlName($xml) == 'table:table' && $xml->nodeType == XMLReader::ELEMENT);
                 }
             }
         }
@@ -138,25 +136,16 @@ public function listWorksheetNames($pFilename)
 
     /**
      * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns).
-     *
-     * @param string $pFilename
-     *
-     * @return array
      */
-    public function listWorksheetInfo($pFilename)
+    public function listWorksheetInfo(string $filename): array
     {
-        File::assertFile($pFilename);
+        File::assertFile($filename, self::INITIAL_FILE);
 
         $worksheetInfo = [];
 
-        $zip = new ZipArchive();
-        if ($zip->open($pFilename) !== true) {
-            throw new ReaderException('Could not open ' . $pFilename . ' for reading! Error opening file.');
-        }
-
         $xml = new XMLReader();
         $xml->xml(
-            $this->securityScanner->scanFile('zip://' . realpath($pFilename) . '#content.xml'),
+            $this->getSecurityScannerOrThrow()->scanFile('zip://' . realpath($filename) . '#' . self::INITIAL_FILE),
             null,
             Settings::getLibXmlLoaderOptions()
         );
@@ -166,7 +155,7 @@ public function listWorksheetInfo($pFilename)
         $xml->read();
         while ($xml->read()) {
             // Quickly jump through to the office:body node
-            while ($xml->name !== 'office:body') {
+            while (self::getXmlName($xml) !== 'office:body') {
                 if ($xml->isEmptyElement) {
                     $xml->read();
                 } else {
@@ -175,7 +164,7 @@ public function listWorksheetInfo($pFilename)
             }
             // Now read each node until we find our first table:table node
             while ($xml->read()) {
-                if ($xml->name == 'table:table' && $xml->nodeType == XMLReader::ELEMENT) {
+                if (self::getXmlName($xml) == 'table:table' && $xml->nodeType == XMLReader::ELEMENT) {
                     $worksheetNames[] = $xml->getAttribute('table:name');
 
                     $tmpInfo = [
@@ -190,7 +179,7 @@ public function listWorksheetInfo($pFilename)
                     $currCells = 0;
                     do {
                         $xml->read();
-                        if ($xml->name == 'table:table-row' && $xml->nodeType == XMLReader::ELEMENT) {
+                        if (self::getXmlName($xml) == 'table:table-row' && $xml->nodeType == XMLReader::ELEMENT) {
                             $rowspan = $xml->getAttribute('table:number-rows-repeated');
                             $rowspan = empty($rowspan) ? 1 : $rowspan;
                             $tmpInfo['totalRows'] += $rowspan;
@@ -200,22 +189,22 @@ public function listWorksheetInfo($pFilename)
                             $xml->read();
                             do {
                                 $doread = true;
-                                if ($xml->name == 'table:table-cell' && $xml->nodeType == XMLReader::ELEMENT) {
+                                if (self::getXmlName($xml) == 'table:table-cell' && $xml->nodeType == XMLReader::ELEMENT) {
                                     if (!$xml->isEmptyElement) {
                                         ++$currCells;
                                         $xml->next();
                                         $doread = false;
                                     }
-                                } elseif ($xml->name == 'table:covered-table-cell' && $xml->nodeType == XMLReader::ELEMENT) {
+                                } elseif (self::getXmlName($xml) == 'table:covered-table-cell' && $xml->nodeType == XMLReader::ELEMENT) {
                                     $mergeSize = $xml->getAttribute('table:number-columns-repeated');
                                     $currCells += (int) $mergeSize;
                                 }
                                 if ($doread) {
                                     $xml->read();
                                 }
-                            } while ($xml->name != 'table:table-row');
+                            } while (self::getXmlName($xml) != 'table:table-row');
                         }
-                    } while ($xml->name != 'table:table');
+                    } while (self::getXmlName($xml) != 'table:table');
 
                     $tmpInfo['totalColumns'] = max($tmpInfo['totalColumns'], $currCells);
                     $tmpInfo['lastColumnIndex'] = $tmpInfo['totalColumns'] - 1;
@@ -229,41 +218,42 @@ public function listWorksheetInfo($pFilename)
     }
 
     /**
-     * Loads PhpSpreadsheet from file.
+     * Counteract Phpstan caching.
      *
-     * @param string $pFilename
-     *
-     * @return Spreadsheet
+     * @phpstan-impure
      */
-    public function load($pFilename)
+    private static function getXmlName(XMLReader $xml): string
+    {
+        return $xml->name;
+    }
+
+    /**
+     * Loads PhpSpreadsheet from file.
+     */
+    protected function loadSpreadsheetFromFile(string $filename): Spreadsheet
     {
         // Create new Spreadsheet
         $spreadsheet = new Spreadsheet();
+        $spreadsheet->removeSheetByIndex(0);
 
         // Load into this instance
-        return $this->loadIntoExisting($pFilename, $spreadsheet);
+        return $this->loadIntoExisting($filename, $spreadsheet);
     }
 
     /**
      * Loads PhpSpreadsheet from file into PhpSpreadsheet instance.
-     *
-     * @param string $pFilename
-     *
-     * @return Spreadsheet
      */
-    public function loadIntoExisting($pFilename, Spreadsheet $spreadsheet)
+    public function loadIntoExisting(string $filename, Spreadsheet $spreadsheet): Spreadsheet
     {
-        File::assertFile($pFilename);
+        File::assertFile($filename, self::INITIAL_FILE);
 
         $zip = new ZipArchive();
-        if ($zip->open($pFilename) !== true) {
-            throw new Exception("Could not open {$pFilename} for reading! Error opening file.");
-        }
+        $zip->open($filename);
 
         // Meta
 
         $xml = @simplexml_load_string(
-            $this->securityScanner->scan($zip->getFromName('meta.xml')),
+            $this->getSecurityScannerOrThrow()->scan($zip->getFromName('meta.xml')),
             'SimpleXMLElement',
             Settings::getLibXmlLoaderOptions()
         );
@@ -279,7 +269,7 @@ public function loadIntoExisting($pFilename, Spreadsheet $spreadsheet)
 
         $dom = new DOMDocument('1.01', 'UTF-8');
         $dom->loadXML(
-            $this->securityScanner->scan($zip->getFromName('styles.xml')),
+            $this->getSecurityScannerOrThrow()->scan($zip->getFromName('styles.xml')),
             Settings::getLibXmlLoaderOptions()
         );
 
@@ -289,24 +279,41 @@ public function loadIntoExisting($pFilename, Spreadsheet $spreadsheet)
 
         $dom = new DOMDocument('1.01', 'UTF-8');
         $dom->loadXML(
-            $this->securityScanner->scan($zip->getFromName('content.xml')),
+            $this->getSecurityScannerOrThrow()->scan($zip->getFromName(self::INITIAL_FILE)),
             Settings::getLibXmlLoaderOptions()
         );
 
-        $officeNs = $dom->lookupNamespaceUri('office');
-        $tableNs = $dom->lookupNamespaceUri('table');
-        $textNs = $dom->lookupNamespaceUri('text');
-        $xlinkNs = $dom->lookupNamespaceUri('xlink');
+        $officeNs = (string) $dom->lookupNamespaceUri('office');
+        $tableNs = (string) $dom->lookupNamespaceUri('table');
+        $textNs = (string) $dom->lookupNamespaceUri('text');
+        $xlinkNs = (string) $dom->lookupNamespaceUri('xlink');
+        $styleNs = (string) $dom->lookupNamespaceUri('style');
 
         $pageSettings->readStyleCrossReferences($dom);
 
         $autoFilterReader = new AutoFilter($spreadsheet, $tableNs);
         $definedNameReader = new DefinedNames($spreadsheet, $tableNs);
+        $columnWidths = [];
+        $automaticStyle0 = $dom->getElementsByTagNameNS($officeNs, 'automatic-styles')->item(0);
+        $automaticStyles = ($automaticStyle0 === null) ? [] : $automaticStyle0->getElementsByTagNameNS($styleNs, 'style');
+        foreach ($automaticStyles as $automaticStyle) {
+            $styleName = $automaticStyle->getAttributeNS($styleNs, 'name');
+            $styleFamily = $automaticStyle->getAttributeNS($styleNs, 'family');
+            if ($styleFamily === 'table-column') {
+                $tcprops = $automaticStyle->getElementsByTagNameNS($styleNs, 'table-column-properties');
+                if ($tcprops !== null) {
+                    $tcprop = $tcprops->item(0);
+                    if ($tcprop !== null) {
+                        $columnWidth = $tcprop->getAttributeNs($styleNs, 'column-width');
+                        $columnWidths[$styleName] = $columnWidth;
+                    }
+                }
+            }
+        }
 
         // Content
-        $spreadsheets = $dom->getElementsByTagNameNS($officeNs, 'body')
-            ->item(0)
-            ->getElementsByTagNameNS($officeNs, 'spreadsheet');
+        $item0 = $dom->getElementsByTagNameNS($officeNs, 'body')->item(0);
+        $spreadsheets = ($item0 === null) ? [] : $item0->getElementsByTagNameNS($officeNs, 'spreadsheet');
 
         foreach ($spreadsheets as $workbookData) {
             /** @var DOMElement $workbookData */
@@ -319,7 +326,7 @@ public function loadIntoExisting($pFilename, Spreadsheet $spreadsheet)
 
                 // Check loadSheetsOnly
                 if (
-                    isset($this->loadSheetsOnly)
+                    $this->loadSheetsOnly !== null
                     && $worksheetName
                     && !in_array($worksheetName, $this->loadSheetsOnly)
                 ) {
@@ -329,12 +336,10 @@ public function loadIntoExisting($pFilename, Spreadsheet $spreadsheet)
                 $worksheetStyleName = $worksheetDataSet->getAttributeNS($tableNs, 'style-name');
 
                 // Create sheet
-                if ($worksheetID > 0) {
-                    $spreadsheet->createSheet(); // First sheet is added by default
-                }
+                $spreadsheet->createSheet();
                 $spreadsheet->setActiveSheetIndex($worksheetID);
 
-                if ($worksheetName) {
+                if ($worksheetName || is_numeric($worksheetName)) {
                     // Use false for $updateFormulaCellReferences to prevent adjustment of worksheet references in
                     // formula cells... during the load, all formulae should be correct, and we're simply
                     // bringing the worksheet name in line with the formula, not the reverse
@@ -343,6 +348,7 @@ public function loadIntoExisting($pFilename, Spreadsheet $spreadsheet)
 
                 // Go through every child of table element
                 $rowID = 1;
+                $tableColumnIndex = 1;
                 foreach ($worksheetDataSet->childNodes as $childNode) {
                     /** @var DOMElement $childNode */
 
@@ -354,7 +360,7 @@ public function loadIntoExisting($pFilename, Spreadsheet $spreadsheet)
                     $key = $childNode->nodeName;
 
                     // Remove ns from node name
-                    if (strpos($key, ':') !== false) {
+                    if (str_contains($key, ':')) {
                         $keyChunks = explode(':', $key);
                         $key = array_pop($keyChunks);
                     }
@@ -369,20 +375,51 @@ public function loadIntoExisting($pFilename, Spreadsheet $spreadsheet)
 //                                $rowData = $cellData;
 //                                break;
 //                            }
+                            break;
+                        case 'table-column':
+                            if ($childNode->hasAttributeNS($tableNs, 'number-columns-repeated')) {
+                                $rowRepeats = (int) $childNode->getAttributeNS($tableNs, 'number-columns-repeated');
+                            } else {
+                                $rowRepeats = 1;
+                            }
+                            $tableStyleName = $childNode->getAttributeNS($tableNs, 'style-name');
+                            if (isset($columnWidths[$tableStyleName])) {
+                                $columnWidth = new HelperDimension($columnWidths[$tableStyleName]);
+                                $tableColumnString = Coordinate::stringFromColumnIndex($tableColumnIndex);
+                                for ($rowRepeats2 = $rowRepeats; $rowRepeats2 > 0; --$rowRepeats2) {
+                                    $spreadsheet->getActiveSheet()
+                                        ->getColumnDimension($tableColumnString)
+                                        ->setWidth($columnWidth->toUnit('cm'), 'cm');
+                                    ++$tableColumnString;
+                                }
+                            }
+                            $tableColumnIndex += $rowRepeats;
+
                             break;
                         case 'table-row':
                             if ($childNode->hasAttributeNS($tableNs, 'number-rows-repeated')) {
-                                $rowRepeats = $childNode->getAttributeNS($tableNs, 'number-rows-repeated');
+                                $rowRepeats = (int) $childNode->getAttributeNS($tableNs, 'number-rows-repeated');
                             } else {
                                 $rowRepeats = 1;
                             }
 
                             $columnID = 'A';
-                            /** @var DOMElement $cellData */
+                            /** @var DOMElement|DOMText $cellData */
                             foreach ($childNode->childNodes as $cellData) {
+                                if ($cellData instanceof DOMText) {
+                                    continue; // should just be whitespace
+                                }
                                 if ($this->getReadFilter() !== null) {
                                     if (!$this->getReadFilter()->readCell($columnID, $rowID, $worksheetName)) {
-                                        ++$columnID;
+                                        if ($cellData->hasAttributeNS($tableNs, 'number-columns-repeated')) {
+                                            $colRepeats = (int) $cellData->getAttributeNS($tableNs, 'number-columns-repeated');
+                                        } else {
+                                            $colRepeats = 1;
+                                        }
+
+                                        for ($i = 0; $i < $colRepeats; ++$i) {
+                                            ++$columnID;
+                                        }
 
                                         continue;
                                     }
@@ -392,25 +429,52 @@ public function loadIntoExisting($pFilename, Spreadsheet $spreadsheet)
                                 $formatting = $hyperlink = null;
                                 $hasCalculatedValue = false;
                                 $cellDataFormula = '';
+                                $cellDataType = '';
+                                $cellDataRef = '';
 
                                 if ($cellData->hasAttributeNS($tableNs, 'formula')) {
                                     $cellDataFormula = $cellData->getAttributeNS($tableNs, 'formula');
                                     $hasCalculatedValue = true;
                                 }
+                                if ($cellData->hasAttributeNS($tableNs, 'number-matrix-columns-spanned')) {
+                                    if ($cellData->hasAttributeNS($tableNs, 'number-matrix-rows-spanned')) {
+                                        $cellDataType = 'array';
+                                        $arrayRow = (int) $cellData->getAttributeNS($tableNs, 'number-matrix-rows-spanned');
+                                        $arrayCol = (int) $cellData->getAttributeNS($tableNs, 'number-matrix-columns-spanned');
+                                        $lastRow = $rowID + $arrayRow - 1;
+                                        $lastCol = $columnID;
+                                        while ($arrayCol > 1) {
+                                            ++$lastCol;
+                                            --$arrayCol;
+                                        }
+                                        $cellDataRef = "$columnID$rowID:$lastCol$lastRow";
+                                    }
+                                }
 
                                 // Annotations
                                 $annotation = $cellData->getElementsByTagNameNS($officeNs, 'annotation');
 
-                                if ($annotation->length > 0) {
+                                if ($annotation->length > 0 && $annotation->item(0) !== null) {
                                     $textNode = $annotation->item(0)->getElementsByTagNameNS($textNs, 'p');
+                                    $textNodeLength = $textNode->length;
+                                    $newLineOwed = false;
+                                    for ($textNodeIndex = 0; $textNodeIndex < $textNodeLength; ++$textNodeIndex) {
+                                        $textNodeItem = $textNode->item($textNodeIndex);
+                                        if ($textNodeItem !== null) {
+                                            $text = $this->scanElementForText($textNodeItem);
+                                            if ($newLineOwed) {
+                                                $spreadsheet->getActiveSheet()
+                                                    ->getComment($columnID . $rowID)
+                                                    ->getText()
+                                                    ->createText("\n");
+                                            }
+                                            $newLineOwed = true;
 
-                                    if ($textNode->length > 0) {
-                                        $text = $this->scanElementForText($textNode->item(0));
-
-                                        $spreadsheet->getActiveSheet()
-                                            ->getComment($columnID . $rowID)
-                                            ->setText($this->parseRichText($text));
-//                                                                    ->setAuthor( $author )
+                                            $spreadsheet->getActiveSheet()
+                                                ->getComment($columnID . $rowID)
+                                                ->getText()
+                                                ->createText($this->parseRichText($text));
+                                        }
                                     }
                                 }
 
@@ -451,7 +515,7 @@ public function loadIntoExisting($pFilename, Spreadsheet $spreadsheet)
 
                                             foreach ($paragraphs as $paragraph) {
                                                 $link = $paragraph->getElementsByTagNameNS($textNs, 'a');
-                                                if ($link->length > 0) {
+                                                if ($link->length > 0 && $link->item(0) !== null) {
                                                     $hyperlink = $link->item(0)->getAttributeNS($xlinkNs, 'href');
                                                 }
                                             }
@@ -459,7 +523,7 @@ public function loadIntoExisting($pFilename, Spreadsheet $spreadsheet)
                                             break;
                                         case 'boolean':
                                             $type = DataType::TYPE_BOOL;
-                                            $dataValue = ($allCellDataText == 'TRUE') ? true : false;
+                                            $dataValue = ($cellData->getAttributeNS($officeNs, 'boolean-value') === 'true') ? true : false;
 
                                             break;
                                         case 'percentage':
@@ -480,7 +544,7 @@ public function loadIntoExisting($pFilename, Spreadsheet $spreadsheet)
                                             if (floor($dataValue) == $dataValue) {
                                                 $dataValue = (int) $dataValue;
                                             }
-                                            $formatting = NumberFormat::FORMAT_CURRENCY_USD_SIMPLE;
+                                            $formatting = NumberFormat::FORMAT_CURRENCY_USD_INTEGER;
 
                                             break;
                                         case 'float':
@@ -497,21 +561,7 @@ public function loadIntoExisting($pFilename, Spreadsheet $spreadsheet)
                                         case 'date':
                                             $type = DataType::TYPE_NUMERIC;
                                             $value = $cellData->getAttributeNS($officeNs, 'date-value');
-
-                                            $dateObj = new DateTime($value);
-                                            [$year, $month, $day, $hour, $minute, $second] = explode(
-                                                ' ',
-                                                $dateObj->format('Y m d H i s')
-                                            );
-
-                                            $dataValue = Date::formattedPHPToExcel(
-                                                (int) $year,
-                                                (int) $month,
-                                                (int) $day,
-                                                (int) $hour,
-                                                (int) $minute,
-                                                (int) $second
-                                            );
+                                            $dataValue = Date::convertIsoDate($value);
 
                                             if ($dataValue != floor($dataValue)) {
                                                 $formatting = NumberFormat::FORMAT_DATE_XLSX15
@@ -529,7 +579,7 @@ public function loadIntoExisting($pFilename, Spreadsheet $spreadsheet)
 
                                             $dataValue = Date::PHPToExcel(
                                                 strtotime(
-                                                    '01-01-1970 ' . implode(':', sscanf($timeValue, 'PT%dH%dM%dS'))
+                                                    '01-01-1970 ' . implode(':', sscanf($timeValue, 'PT%dH%dM%dS') ?? [])
                                                 )
                                             );
                                             $formatting = NumberFormat::FORMAT_DATE_TIME4;
@@ -546,7 +596,7 @@ public function loadIntoExisting($pFilename, Spreadsheet $spreadsheet)
                                 if ($hasCalculatedValue) {
                                     $type = DataType::TYPE_FORMULA;
                                     $cellDataFormula = substr($cellDataFormula, strpos($cellDataFormula, ':=') + 1);
-                                    $cellDataFormula = $this->convertToExcelFormulaValue($cellDataFormula);
+                                    $cellDataFormula = FormulaTranslator::convertToExcelFormulaValue($cellDataFormula);
                                 }
 
                                 if ($cellData->hasAttributeNS($tableNs, 'number-columns-repeated')) {
@@ -571,12 +621,15 @@ public function loadIntoExisting($pFilename, Spreadsheet $spreadsheet)
                                                 // Set value
                                                 if ($hasCalculatedValue) {
                                                     $cell->setValueExplicit($cellDataFormula, $type);
+                                                    if ($cellDataType === 'array') {
+                                                        $cell->setFormulaAttributes(['t' => 'array', 'ref' => $cellDataRef]);
+                                                    }
                                                 } else {
                                                     $cell->setValueExplicit($dataValue, $type);
                                                 }
 
                                                 if ($hasCalculatedValue) {
-                                                    $cell->setCalculatedValue($dataValue);
+                                                    $cell->setCalculatedValue($dataValue, $type === DataType::TYPE_NUMERIC);
                                                 }
 
                                                 // Set other properties
@@ -593,6 +646,9 @@ public function loadIntoExisting($pFilename, Spreadsheet $spreadsheet)
                                                 }
 
                                                 if ($hyperlink !== null) {
+                                                    if ($hyperlink[0] === '#') {
+                                                        $hyperlink = 'sheet://' . substr($hyperlink, 1);
+                                                    }
                                                     $cell->getHyperlink()
                                                         ->setUrl($hyperlink);
                                                 }
@@ -602,31 +658,7 @@ public function loadIntoExisting($pFilename, Spreadsheet $spreadsheet)
                                 }
 
                                 // Merged cells
-                                if (
-                                    $cellData->hasAttributeNS($tableNs, 'number-columns-spanned')
-                                    || $cellData->hasAttributeNS($tableNs, 'number-rows-spanned')
-                                ) {
-                                    if (($type !== DataType::TYPE_NULL) || (!$this->readDataOnly)) {
-                                        $columnTo = $columnID;
-
-                                        if ($cellData->hasAttributeNS($tableNs, 'number-columns-spanned')) {
-                                            $columnIndex = Coordinate::columnIndexFromString($columnID);
-                                            $columnIndex += (int) $cellData->getAttributeNS($tableNs, 'number-columns-spanned');
-                                            $columnIndex -= 2;
-
-                                            $columnTo = Coordinate::stringFromColumnIndex($columnIndex + 1);
-                                        }
-
-                                        $rowTo = $rowID;
-
-                                        if ($cellData->hasAttributeNS($tableNs, 'number-rows-spanned')) {
-                                            $rowTo = $rowTo + (int) $cellData->getAttributeNS($tableNs, 'number-rows-spanned') - 1;
-                                        }
-
-                                        $cellRange = $columnID . $rowID . ':' . $columnTo . $rowTo;
-                                        $spreadsheet->getActiveSheet()->mergeCells($cellRange);
-                                    }
-                                }
+                                $this->processMergedCells($cellData, $tableNs, $type, $columnID, $rowID, $spreadsheet);
 
                                 ++$columnID;
                             }
@@ -635,6 +667,7 @@ public function loadIntoExisting($pFilename, Spreadsheet $spreadsheet)
                             break;
                     }
                 }
+                $pageSettings->setVisibilityForWorksheet($spreadsheet->getActiveSheet(), $worksheetStyleName);
                 $pageSettings->setPrintSettingsForWorksheet($spreadsheet->getActiveSheet(), $worksheetStyleName);
                 ++$worksheetID;
             }
@@ -647,6 +680,7 @@ public function loadIntoExisting($pFilename, Spreadsheet $spreadsheet)
         if ($zip->locateName('settings.xml') !== false) {
             $this->processSettings($zip, $spreadsheet);
         }
+
         // Return
         return $spreadsheet;
     }
@@ -655,17 +689,19 @@ private function processSettings(ZipArchive $zip, Spreadsheet $spreadsheet): voi
     {
         $dom = new DOMDocument('1.01', 'UTF-8');
         $dom->loadXML(
-            $this->securityScanner->scan($zip->getFromName('settings.xml')),
+            $this->getSecurityScannerOrThrow()->scan($zip->getFromName('settings.xml')),
             Settings::getLibXmlLoaderOptions()
         );
         //$xlinkNs = $dom->lookupNamespaceUri('xlink');
-        $configNs = $dom->lookupNamespaceUri('config');
+        $configNs = (string) $dom->lookupNamespaceUri('config');
         //$oooNs = $dom->lookupNamespaceUri('ooo');
-        $officeNs = $dom->lookupNamespaceUri('office');
+        $officeNs = (string) $dom->lookupNamespaceUri('office');
         $settings = $dom->getElementsByTagNameNS($officeNs, 'settings')
             ->item(0);
-        $this->lookForActiveSheet($settings, $spreadsheet, $configNs);
-        $this->lookForSelectedCells($settings, $spreadsheet, $configNs);
+        if ($settings !== null) {
+            $this->lookForActiveSheet($settings, $spreadsheet, $configNs);
+            $this->lookForSelectedCells($settings, $spreadsheet, $configNs);
+        }
     }
 
     private function lookForActiveSheet(DOMElement $settings, Spreadsheet $spreadsheet, string $configNs): void
@@ -674,8 +710,8 @@ private function lookForActiveSheet(DOMElement $settings, Spreadsheet $spreadshe
         foreach ($settings->getElementsByTagNameNS($configNs, 'config-item') as $t) {
             if ($t->getAttributeNs($configNs, 'name') === 'ActiveTable') {
                 try {
-                    $spreadsheet->setActiveSheetIndexByName($t->nodeValue);
-                } catch (Throwable $e) {
+                    $spreadsheet->setActiveSheetIndexByName($t->nodeValue ?? '');
+                } catch (Throwable) {
                     // do nothing
                 }
 
@@ -701,7 +737,7 @@ private function lookForSelectedCells(DOMElement $settings, Spreadsheet $spreads
                             $setRow = $configItem->nodeValue;
                         }
                     }
-                    $this->setSelected($spreadsheet, $wsname, $setCol, $setRow);
+                    $this->setSelected($spreadsheet, $wsname, "$setCol", "$setRow");
                 }
 
                 break;
@@ -712,38 +748,33 @@ private function lookForSelectedCells(DOMElement $settings, Spreadsheet $spreads
     private function setSelected(Spreadsheet $spreadsheet, string $wsname, string $setCol, string $setRow): void
     {
         if (is_numeric($setCol) && is_numeric($setRow)) {
-            try {
-                $spreadsheet->getSheetByName($wsname)->setSelectedCellByColumnAndRow($setCol + 1, $setRow + 1);
-            } catch (Throwable $e) {
-                // do nothing
+            $sheet = $spreadsheet->getSheetByName($wsname);
+            if ($sheet !== null) {
+                $sheet->setSelectedCells([(int) $setCol + 1, (int) $setRow + 1]);
             }
         }
     }
 
     /**
      * Recursively scan element.
-     *
-     * @return string
      */
-    protected function scanElementForText(DOMNode $element)
+    protected function scanElementForText(DOMNode $element): string
     {
         $str = '';
         foreach ($element->childNodes as $child) {
             /** @var DOMNode $child */
             if ($child->nodeType == XML_TEXT_NODE) {
                 $str .= $child->nodeValue;
+            } elseif ($child->nodeType == XML_ELEMENT_NODE && $child->nodeName == 'text:line-break') {
+                $str .= "\n";
             } elseif ($child->nodeType == XML_ELEMENT_NODE && $child->nodeName == 'text:s') {
                 // It's a space
 
                 // Multiple spaces?
-                /** @var DOMAttr $cAttr */
-                $cAttr = $child->attributes->getNamedItem('c');
-                if ($cAttr) {
-                    $multiplier = (int) $cAttr->nodeValue;
-                } else {
-                    $multiplier = 1;
-                }
-
+                $attributes = $child->attributes;
+                /** @var ?DOMAttr $cAttr */
+                $cAttr = ($attributes === null) ? null : $attributes->getNamedItem('c');
+                $multiplier = self::getMultiplier($cAttr);
                 $str .= str_repeat(' ', $multiplier);
             }
 
@@ -755,12 +786,18 @@ protected function scanElementForText(DOMNode $element)
         return $str;
     }
 
-    /**
-     * @param string $is
-     *
-     * @return RichText
-     */
-    private function parseRichText($is)
+    private static function getMultiplier(?DOMAttr $cAttr): int
+    {
+        if ($cAttr) {
+            $multiplier = (int) $cAttr->nodeValue;
+        } else {
+            $multiplier = 1;
+        }
+
+        return $multiplier;
+    }
+
+    private function parseRichText(string $is): RichText
     {
         $value = new RichText();
         $value->createText($is);
@@ -768,31 +805,38 @@ private function parseRichText($is)
         return $value;
     }
 
-    private function convertToExcelFormulaValue(string $openOfficeFormula): string
-    {
-        $temp = explode('"', $openOfficeFormula);
-        $tKey = false;
-        foreach ($temp as &$value) {
-            // Only replace in alternate array entries (i.e. non-quoted blocks)
-            if ($tKey = !$tKey) {
-                // Cell range reference in another sheet
-                $value = preg_replace('/\[\$?([^\.]+)\.([^\.]+):\.([^\.]+)\]/miu', '$1!$2:$3', $value);
-                // Cell reference in another sheet
-                $value = preg_replace('/\[\$?([^\.]+)\.([^\.]+)\]/miu', '$1!$2', $value ?? '');
-                // Cell range reference
-                $value = preg_replace('/\[\.([^\.]+):\.([^\.]+)\]/miu', '$1:$2', $value ?? '');
-                // Simple cell reference
-                $value = preg_replace('/\[\.([^\.]+)\]/miu', '$1', $value ?? '');
-                // Convert references to defined names/formulae
-                $value = str_replace('$$', '', $value ?? '');
-
-                $value = Calculation::translateSeparator(';', ',', $value, $inBraces);
-            }
-        }
+    private function processMergedCells(
+        DOMElement $cellData,
+        string $tableNs,
+        string $type,
+        string $columnID,
+        int $rowID,
+        Spreadsheet $spreadsheet
+    ): void {
+        if (
+            $cellData->hasAttributeNS($tableNs, 'number-columns-spanned')
+            || $cellData->hasAttributeNS($tableNs, 'number-rows-spanned')
+        ) {
+            if (($type !== DataType::TYPE_NULL) || ($this->readDataOnly === false)) {
+                $columnTo = $columnID;
+
+                if ($cellData->hasAttributeNS($tableNs, 'number-columns-spanned')) {
+                    $columnIndex = Coordinate::columnIndexFromString($columnID);
+                    $columnIndex += (int) $cellData->getAttributeNS($tableNs, 'number-columns-spanned');
+                    $columnIndex -= 2;
+
+                    $columnTo = Coordinate::stringFromColumnIndex($columnIndex + 1);
+                }
+
+                $rowTo = $rowID;
 
-        // Then rebuild the formula string
-        $excelFormula = implode('"', $temp);
+                if ($cellData->hasAttributeNS($tableNs, 'number-rows-spanned')) {
+                    $rowTo = $rowTo + (int) $cellData->getAttributeNS($tableNs, 'number-rows-spanned') - 1;
+                }
 
-        return $excelFormula;
+                $cellRange = $columnID . $rowID . ':' . $columnTo . $rowTo;
+                $spreadsheet->getActiveSheet()->mergeCells($cellRange, Worksheet::MERGE_CELL_CONTENT_HIDE);
+            }
+        }
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/AutoFilter.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/AutoFilter.php
index bdc8b3ffc3..1f5f975dec 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/AutoFilter.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/AutoFilter.php
@@ -5,7 +5,7 @@
 use DOMElement;
 use DOMNode;
 
-class AutoFilter extends BaseReader
+class AutoFilter extends BaseLoader
 {
     public function read(DOMElement $workbookData): void
     {
@@ -20,7 +20,7 @@ protected function readAutoFilters(DOMElement $workbookData): void
             foreach ($autofilters->childNodes as $autofilter) {
                 $autofilterRange = $this->getAttributeValue($autofilter, 'target-range-address');
                 if ($autofilterRange !== null) {
-                    $baseAddress = $this->convertToExcelAddressValue($autofilterRange);
+                    $baseAddress = FormulaTranslator::convertToExcelAddressValue($autofilterRange);
                     $this->spreadsheet->getActiveSheet()->setAutoFilter($baseAddress);
                 }
             }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/BaseLoader.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/BaseLoader.php
new file mode 100644
index 0000000000..c280c4ec56
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/BaseLoader.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Ods;
+
+use DOMElement;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+abstract class BaseLoader
+{
+    protected Spreadsheet $spreadsheet;
+
+    protected string $tableNs;
+
+    public function __construct(Spreadsheet $spreadsheet, string $tableNs)
+    {
+        $this->spreadsheet = $spreadsheet;
+        $this->tableNs = $tableNs;
+    }
+
+    abstract public function read(DOMElement $workbookData): void;
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/BaseReader.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/BaseReader.php
deleted file mode 100644
index 17e2d4d573..0000000000
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/BaseReader.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-namespace PhpOffice\PhpSpreadsheet\Reader\Ods;
-
-use DOMElement;
-use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
-use PhpOffice\PhpSpreadsheet\Spreadsheet;
-
-abstract class BaseReader
-{
-    /**
-     * @var Spreadsheet
-     */
-    protected $spreadsheet;
-
-    /**
-     * @var string
-     */
-    protected $tableNs;
-
-    public function __construct(Spreadsheet $spreadsheet, string $tableNs)
-    {
-        $this->spreadsheet = $spreadsheet;
-        $this->tableNs = $tableNs;
-    }
-
-    abstract public function read(DOMElement $workbookData): void;
-
-    protected function convertToExcelAddressValue(string $openOfficeAddress): string
-    {
-        $excelAddress = $openOfficeAddress;
-
-        // 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
-        $excelAddress = preg_replace('/\$?([^\.]+)\.([^\.]+):\$?([^\.]+)\.([^\.]+)/miu', '$1!$2:$4', $excelAddress);
-        // Cell range reference in another sheet
-        $excelAddress = preg_replace('/\$?([^\.]+)\.([^\.]+):\.([^\.]+)/miu', '$1!$2:$3', $excelAddress ?? '');
-        // Cell reference in another sheet
-        $excelAddress = preg_replace('/\$?([^\.]+)\.([^\.]+)/miu', '$1!$2', $excelAddress ?? '');
-        // Cell range reference
-        $excelAddress = preg_replace('/\.([^\.]+):\.([^\.]+)/miu', '$1:$2', $excelAddress ?? '');
-        // Simple cell reference
-        $excelAddress = preg_replace('/\.([^\.]+)/miu', '$1', $excelAddress ?? '');
-
-        return $excelAddress ?? '';
-    }
-
-    protected function convertToExcelFormulaValue(string $openOfficeFormula): string
-    {
-        $temp = explode('"', $openOfficeFormula);
-        $tKey = false;
-        foreach ($temp as &$value) {
-            // @var string $value
-            // Only replace in alternate array entries (i.e. non-quoted blocks)
-            if ($tKey = !$tKey) {
-                // Cell range reference in another sheet
-                $value = preg_replace('/\[\$?([^\.]+)\.([^\.]+):\.([^\.]+)\]/miu', '$1!$2:$3', $value);
-                // Cell reference in another sheet
-                $value = preg_replace('/\[\$?([^\.]+)\.([^\.]+)\]/miu', '$1!$2', $value ?? '');
-                // Cell range reference
-                $value = preg_replace('/\[\.([^\.]+):\.([^\.]+)\]/miu', '$1:$2', $value ?? '');
-                // Simple cell reference
-                $value = preg_replace('/\[\.([^\.]+)\]/miu', '$1', $value ?? '');
-                // Convert references to defined names/formulae
-                $value = str_replace('$$', '', $value ?? '');
-
-                $value = Calculation::translateSeparator(';', ',', $value, $inBraces);
-            }
-        }
-
-        // Then rebuild the formula string
-        $excelFormula = implode('"', $temp);
-
-        return $excelFormula;
-    }
-}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/DefinedNames.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/DefinedNames.php
index 6810a3c726..a99e3ea743 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/DefinedNames.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/DefinedNames.php
@@ -6,7 +6,7 @@
 use PhpOffice\PhpSpreadsheet\DefinedName;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 
-class DefinedNames extends BaseReader
+class DefinedNames extends BaseLoader
 {
     public function read(DOMElement $workbookData): void
     {
@@ -25,8 +25,9 @@ protected function readDefinedRanges(DOMElement $workbookData): void
             $baseAddress = $definedNameElement->getAttributeNS($this->tableNs, 'base-cell-address');
             $range = $definedNameElement->getAttributeNS($this->tableNs, 'cell-range-address');
 
-            $baseAddress = $this->convertToExcelAddressValue($baseAddress);
-            $range = $this->convertToExcelAddressValue($range);
+            /** @var non-empty-string $baseAddress */
+            $baseAddress = FormulaTranslator::convertToExcelAddressValue($baseAddress);
+            $range = FormulaTranslator::convertToExcelAddressValue($range);
 
             $this->addDefinedName($baseAddress, $definedName, $range);
         }
@@ -43,9 +44,10 @@ protected function readDefinedExpressions(DOMElement $workbookData): void
             $baseAddress = $definedNameElement->getAttributeNS($this->tableNs, 'base-cell-address');
             $expression = $definedNameElement->getAttributeNS($this->tableNs, 'expression');
 
-            $baseAddress = $this->convertToExcelAddressValue($baseAddress);
+            /** @var non-empty-string $baseAddress */
+            $baseAddress = FormulaTranslator::convertToExcelAddressValue($baseAddress);
             $expression = substr($expression, strpos($expression, ':=') + 1);
-            $expression = $this->convertToExcelFormulaValue($expression);
+            $expression = FormulaTranslator::convertToExcelFormulaValue($expression);
 
             $this->addDefinedName($baseAddress, $definedName, $expression);
         }
@@ -53,6 +55,8 @@ protected function readDefinedExpressions(DOMElement $workbookData): void
 
     /**
      * Assess scope and store the Defined Name.
+     *
+     * @param non-empty-string $baseAddress
      */
     private function addDefinedName(string $baseAddress, string $definedName, string $value): void
     {
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/FormulaTranslator.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/FormulaTranslator.php
new file mode 100644
index 0000000000..27862d7a5a
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/FormulaTranslator.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Ods;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+
+class FormulaTranslator
+{
+    public static function convertToExcelAddressValue(string $openOfficeAddress): string
+    {
+        $excelAddress = $openOfficeAddress;
+
+        // 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
+        $excelAddress = (string) preg_replace(
+            [
+                '/\$?([^\.]+)\.([^\.]+):\$?([^\.]+)\.([^\.]+)/miu',
+                '/\$?([^\.]+)\.([^\.]+):\.([^\.]+)/miu', // Cell range reference in another sheet
+                '/\$?([^\.]+)\.([^\.]+)/miu', // Cell reference in another sheet
+                '/\.([^\.]+):\.([^\.]+)/miu', // Cell range reference
+                '/\.([^\.]+)/miu', // Simple cell reference
+            ],
+            [
+                '$1!$2:$4',
+                '$1!$2:$3',
+                '$1!$2',
+                '$1:$2',
+                '$1',
+            ],
+            $excelAddress
+        );
+
+        return $excelAddress;
+    }
+
+    public static function convertToExcelFormulaValue(string $openOfficeFormula): string
+    {
+        $temp = explode(Calculation::FORMULA_STRING_QUOTE, $openOfficeFormula);
+        $tKey = false;
+        $inMatrixBracesLevel = 0;
+        $inFunctionBracesLevel = 0;
+        foreach ($temp as &$value) {
+            // @var string $value
+            // Only replace in alternate array entries (i.e. non-quoted blocks)
+            //      so that conversion isn't done in string values
+            $tKey = $tKey === false;
+            if ($tKey) {
+                $value = (string) preg_replace(
+                    [
+                        '/\[\$?([^\.]+)\.([^\.]+):\.([^\.]+)\]/miu', // Cell range reference in another sheet
+                        '/\[\$?([^\.]+)\.([^\.]+)\]/miu', // Cell reference in another sheet
+                        '/\[\.([^\.]+):\.([^\.]+)\]/miu', // Cell range reference
+                        '/\[\.([^\.]+)\]/miu', // Simple cell reference
+                    ],
+                    [
+                        '$1!$2:$3',
+                        '$1!$2',
+                        '$1:$2',
+                        '$1',
+                    ],
+                    $value
+                );
+                // Convert references to defined names/formulae
+                $value = str_replace('$$', '', $value);
+
+                // Convert ODS function argument separators to Excel function argument separators
+                $value = Calculation::translateSeparator(';', ',', $value, $inFunctionBracesLevel);
+
+                // Convert ODS matrix separators to Excel matrix separators
+                $value = Calculation::translateSeparator(
+                    ';',
+                    ',',
+                    $value,
+                    $inMatrixBracesLevel,
+                    Calculation::FORMULA_OPEN_MATRIX_BRACE,
+                    Calculation::FORMULA_CLOSE_MATRIX_BRACE
+                );
+                $value = Calculation::translateSeparator(
+                    '|',
+                    ';',
+                    $value,
+                    $inMatrixBracesLevel,
+                    Calculation::FORMULA_OPEN_MATRIX_BRACE,
+                    Calculation::FORMULA_CLOSE_MATRIX_BRACE
+                );
+
+                $value = (string) preg_replace('/COM\.MICROSOFT\./ui', '', $value);
+            }
+        }
+
+        // Then rebuild the formula string
+        $excelFormula = implode('"', $temp);
+
+        return $excelFormula;
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/PageSettings.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/PageSettings.php
index 8d24fd0c24..fd35de5b90 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/PageSettings.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/PageSettings.php
@@ -8,17 +8,30 @@
 
 class PageSettings
 {
-    private $officeNs;
+    private string $officeNs = '';
 
-    private $stylesNs;
+    private string $stylesNs = '';
 
-    private $stylesFo;
+    private string $stylesFo = '';
 
-    private $pageLayoutStyles = [];
+    private string $tableNs = '';
 
-    private $masterStylesCrossReference = [];
+    /**
+     * @var string[]
+     */
+    private array $tableStylesCrossReference = [];
 
-    private $masterPrintStylesCrossReference = [];
+    private array $pageLayoutStyles = [];
+
+    /**
+     * @var string[]
+     */
+    private array $masterStylesCrossReference = [];
+
+    /**
+     * @var string[]
+     */
+    private array $masterPrintStylesCrossReference = [];
 
     public function __construct(DOMDocument $styleDom)
     {
@@ -29,35 +42,35 @@ public function __construct(DOMDocument $styleDom)
 
     private function setDomNameSpaces(DOMDocument $styleDom): void
     {
-        $this->officeNs = $styleDom->lookupNamespaceUri('office');
-        $this->stylesNs = $styleDom->lookupNamespaceUri('style');
-        $this->stylesFo = $styleDom->lookupNamespaceUri('fo');
+        $this->officeNs = (string) $styleDom->lookupNamespaceUri('office');
+        $this->stylesNs = (string) $styleDom->lookupNamespaceUri('style');
+        $this->stylesFo = (string) $styleDom->lookupNamespaceUri('fo');
+        $this->tableNs = (string) $styleDom->lookupNamespaceUri('table');
     }
 
     private function readPageSettingStyles(DOMDocument $styleDom): void
     {
-        $styles = $styleDom->getElementsByTagNameNS($this->officeNs, 'automatic-styles')
-            ->item(0)
-            ->getElementsByTagNameNS($this->stylesNs, 'page-layout');
+        $item0 = $styleDom->getElementsByTagNameNS($this->officeNs, 'automatic-styles')->item(0);
+        $styles = ($item0 === null) ? [] : $item0->getElementsByTagNameNS($this->stylesNs, 'page-layout');
 
         foreach ($styles as $styleSet) {
             $styleName = $styleSet->getAttributeNS($this->stylesNs, 'name');
-            $pageLayoutProperties = $styleSet->getElementsByTagNameNS($this->stylesNs, 'page-layout-properties')[0];
-            $styleOrientation = $pageLayoutProperties->getAttributeNS($this->stylesNs, 'print-orientation');
-            $styleScale = $pageLayoutProperties->getAttributeNS($this->stylesNs, 'scale-to');
-            $stylePrintOrder = $pageLayoutProperties->getAttributeNS($this->stylesNs, 'print-page-order');
-            $centered = $pageLayoutProperties->getAttributeNS($this->stylesNs, 'table-centering');
-
-            $marginLeft = $pageLayoutProperties->getAttributeNS($this->stylesFo, 'margin-left');
-            $marginRight = $pageLayoutProperties->getAttributeNS($this->stylesFo, 'margin-right');
-            $marginTop = $pageLayoutProperties->getAttributeNS($this->stylesFo, 'margin-top');
-            $marginBottom = $pageLayoutProperties->getAttributeNS($this->stylesFo, 'margin-bottom');
-            $header = $styleSet->getElementsByTagNameNS($this->stylesNs, 'header-style')[0];
-            $headerProperties = $header->getElementsByTagNameNS($this->stylesNs, 'header-footer-properties')[0];
-            $marginHeader = isset($headerProperties) ? $headerProperties->getAttributeNS($this->stylesFo, 'min-height') : null;
-            $footer = $styleSet->getElementsByTagNameNS($this->stylesNs, 'footer-style')[0];
-            $footerProperties = $footer->getElementsByTagNameNS($this->stylesNs, 'header-footer-properties')[0];
-            $marginFooter = isset($footerProperties) ? $footerProperties->getAttributeNS($this->stylesFo, 'min-height') : null;
+            $pageLayoutProperties = $styleSet->getElementsByTagNameNS($this->stylesNs, 'page-layout-properties')->item(0);
+            $styleOrientation = $pageLayoutProperties?->getAttributeNS($this->stylesNs, 'print-orientation');
+            $styleScale = $pageLayoutProperties?->getAttributeNS($this->stylesNs, 'scale-to');
+            $stylePrintOrder = $pageLayoutProperties?->getAttributeNS($this->stylesNs, 'print-page-order');
+            $centered = $pageLayoutProperties?->getAttributeNS($this->stylesNs, 'table-centering');
+
+            $marginLeft = $pageLayoutProperties?->getAttributeNS($this->stylesFo, 'margin-left');
+            $marginRight = $pageLayoutProperties?->getAttributeNS($this->stylesFo, 'margin-right');
+            $marginTop = $pageLayoutProperties?->getAttributeNS($this->stylesFo, 'margin-top');
+            $marginBottom = $pageLayoutProperties?->getAttributeNS($this->stylesFo, 'margin-bottom');
+            $header = $styleSet->getElementsByTagNameNS($this->stylesNs, 'header-style')->item(0);
+            $headerProperties = $header?->getElementsByTagNameNS($this->stylesNs, 'header-footer-properties')?->item(0);
+            $marginHeader = $headerProperties?->getAttributeNS($this->stylesFo, 'min-height');
+            $footer = $styleSet->getElementsByTagNameNS($this->stylesNs, 'footer-style')->item(0);
+            $footerProperties = $footer?->getElementsByTagNameNS($this->stylesNs, 'header-footer-properties')?->item(0);
+            $marginFooter = $footerProperties?->getAttributeNS($this->stylesFo, 'min-height');
 
             $this->pageLayoutStyles[$styleName] = (object) [
                 'orientation' => $styleOrientation ?: PageSetup::ORIENTATION_DEFAULT,
@@ -66,21 +79,20 @@ private function readPageSettingStyles(DOMDocument $styleDom): void
                 'horizontalCentered' => $centered === 'horizontal' || $centered === 'both',
                 'verticalCentered' => $centered === 'vertical' || $centered === 'both',
                 // margin size is already stored in inches, so no UOM conversion is required
-                'marginLeft' => (float) $marginLeft ?? 0.7,
-                'marginRight' => (float) $marginRight ?? 0.7,
-                'marginTop' => (float) $marginTop ?? 0.3,
-                'marginBottom' => (float) $marginBottom ?? 0.3,
-                'marginHeader' => (float) $marginHeader ?? 0.45,
-                'marginFooter' => (float) $marginFooter ?? 0.45,
+                'marginLeft' => (float) ($marginLeft ?? 0.7),
+                'marginRight' => (float) ($marginRight ?? 0.7),
+                'marginTop' => (float) ($marginTop ?? 0.3),
+                'marginBottom' => (float) ($marginBottom ?? 0.3),
+                'marginHeader' => (float) ($marginHeader ?? 0.45),
+                'marginFooter' => (float) ($marginFooter ?? 0.45),
             ];
         }
     }
 
     private function readStyleMasterLookup(DOMDocument $styleDom): void
     {
-        $styleMasterLookup = $styleDom->getElementsByTagNameNS($this->officeNs, 'master-styles')
-            ->item(0)
-            ->getElementsByTagNameNS($this->stylesNs, 'master-page');
+        $item0 = $styleDom->getElementsByTagNameNS($this->officeNs, 'master-styles')->item(0);
+        $styleMasterLookup = ($item0 === null) ? [] : $item0->getElementsByTagNameNS($this->stylesNs, 'master-page');
 
         foreach ($styleMasterLookup as $styleMasterSet) {
             $styleMasterName = $styleMasterSet->getAttributeNS($this->stylesNs, 'name');
@@ -91,19 +103,39 @@ private function readStyleMasterLookup(DOMDocument $styleDom): void
 
     public function readStyleCrossReferences(DOMDocument $contentDom): void
     {
-        $styleXReferences = $contentDom->getElementsByTagNameNS($this->officeNs, 'automatic-styles')
-            ->item(0)
-            ->getElementsByTagNameNS($this->stylesNs, 'style');
+        $item0 = $contentDom->getElementsByTagNameNS($this->officeNs, 'automatic-styles')->item(0);
+        $styleXReferences = ($item0 === null) ? [] : $item0->getElementsByTagNameNS($this->stylesNs, 'style');
 
         foreach ($styleXReferences as $styleXreferenceSet) {
             $styleXRefName = $styleXreferenceSet->getAttributeNS($this->stylesNs, 'name');
             $stylePageLayoutName = $styleXreferenceSet->getAttributeNS($this->stylesNs, 'master-page-name');
+            $styleFamilyName = $styleXreferenceSet->getAttributeNS($this->stylesNs, 'family');
+            if (!empty($styleFamilyName) && $styleFamilyName === 'table') {
+                $styleVisibility = 'true';
+                foreach ($styleXreferenceSet->getElementsByTagNameNS($this->stylesNs, 'table-properties') as $tableProperties) {
+                    $styleVisibility = $tableProperties->getAttributeNS($this->tableNs, 'display');
+                }
+                $this->tableStylesCrossReference[$styleXRefName] = $styleVisibility;
+            }
             if (!empty($stylePageLayoutName)) {
                 $this->masterStylesCrossReference[$styleXRefName] = $stylePageLayoutName;
             }
         }
     }
 
+    public function setVisibilityForWorksheet(Worksheet $worksheet, string $styleName): void
+    {
+        if (!array_key_exists($styleName, $this->tableStylesCrossReference)) {
+            return;
+        }
+
+        $worksheet->setSheetState(
+            $this->tableStylesCrossReference[$styleName] === 'false'
+                ? Worksheet::SHEETSTATE_HIDDEN
+                : Worksheet::SHEETSTATE_VISIBLE
+        );
+    }
+
     public function setPrintSettingsForWorksheet(Worksheet $worksheet, string $styleName): void
     {
         if (!array_key_exists($styleName, $this->masterStylesCrossReference)) {
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/Properties.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/Properties.php
index b94d1ef681..a5f0c79f45 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/Properties.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods/Properties.php
@@ -8,28 +8,28 @@
 
 class Properties
 {
-    private $spreadsheet;
+    private Spreadsheet $spreadsheet;
 
     public function __construct(Spreadsheet $spreadsheet)
     {
         $this->spreadsheet = $spreadsheet;
     }
 
-    public function load(SimpleXMLElement $xml, $namespacesMeta): void
+    public function load(SimpleXMLElement $xml, array $namespacesMeta): void
     {
         $docProps = $this->spreadsheet->getProperties();
         $officeProperty = $xml->children($namespacesMeta['office']);
         foreach ($officeProperty as $officePropertyData) {
-            // @var \SimpleXMLElement $officePropertyData
             if (isset($namespacesMeta['dc'])) {
                 $officePropertiesDC = $officePropertyData->children($namespacesMeta['dc']);
                 $this->setCoreProperties($docProps, $officePropertiesDC);
             }
 
-            $officePropertyMeta = (object) [];
+            $officePropertyMeta = null;
             if (isset($namespacesMeta['dc'])) {
                 $officePropertyMeta = $officePropertyData->children($namespacesMeta['meta']);
             }
+            $officePropertyMeta = $officePropertyMeta ?? [];
             foreach ($officePropertyMeta as $propertyName => $propertyValue) {
                 $this->setMetaProperties($namespacesMeta, $propertyValue, $propertyName, $docProps);
             }
@@ -67,9 +67,9 @@ private function setCoreProperties(DocumentProperties $docProps, SimpleXMLElemen
     }
 
     private function setMetaProperties(
-        $namespacesMeta,
+        array $namespacesMeta,
         SimpleXMLElement $propertyValue,
-        $propertyName,
+        string $propertyName,
         DocumentProperties $docProps
     ): void {
         $propertyValueAttributes = $propertyValue->attributes($namespacesMeta['meta']);
@@ -88,13 +88,20 @@ private function setMetaProperties(
 
                 break;
             case 'user-defined':
-                $this->setUserDefinedProperty($propertyValueAttributes, $propertyValue, $docProps);
+                $name2 = (string) ($propertyValueAttributes['name'] ?? '');
+                if ($name2 === 'Company') {
+                    $docProps->setCompany($propertyValue);
+                } elseif ($name2 === 'category') {
+                    $docProps->setCategory($propertyValue);
+                } else {
+                    $this->setUserDefinedProperty($propertyValueAttributes, $propertyValue, $docProps);
+                }
 
                 break;
         }
     }
 
-    private function setUserDefinedProperty($propertyValueAttributes, $propertyValue, DocumentProperties $docProps): void
+    private function setUserDefinedProperty(iterable $propertyValueAttributes, string $propertyValue, DocumentProperties $docProps): void
     {
         $propertyValueName = '';
         $propertyValueType = DocumentProperties::PROPERTY_TYPE_STRING;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Security/XmlScanner.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Security/XmlScanner.php
index c9c3ecc09f..362a70c127 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Security/XmlScanner.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Security/XmlScanner.php
@@ -3,94 +3,24 @@
 namespace PhpOffice\PhpSpreadsheet\Reader\Security;
 
 use PhpOffice\PhpSpreadsheet\Reader;
-use PhpOffice\PhpSpreadsheet\Settings;
 
 class XmlScanner
 {
-    /**
-     * String used to identify risky xml elements.
-     *
-     * @var string
-     */
-    private $pattern;
+    private string $pattern;
 
+    /** @var ?callable */
     private $callback;
 
-    private static $libxmlDisableEntityLoaderValue;
-
-    /**
-     * @var bool
-     */
-    private static $shutdownRegistered = false;
-
-    public function __construct($pattern = '<!DOCTYPE')
+    public function __construct(string $pattern = '<!DOCTYPE')
     {
         $this->pattern = $pattern;
-
-        $this->disableEntityLoaderCheck();
-
-        // A fatal error will bypass the destructor, so we register a shutdown here
-        if (!self::$shutdownRegistered) {
-            self::$shutdownRegistered = true;
-            register_shutdown_function([__CLASS__, 'shutdown']);
-        }
     }
 
-    public static function getInstance(Reader\IReader $reader)
+    public static function getInstance(Reader\IReader $reader): self
     {
-        switch (true) {
-            case $reader instanceof Reader\Html:
-                return new self('<!ENTITY');
-            case $reader instanceof Reader\Xlsx:
-            case $reader instanceof Reader\Xml:
-            case $reader instanceof Reader\Ods:
-            case $reader instanceof Reader\Gnumeric:
-                return new self('<!DOCTYPE');
-            default:
-                return new self('<!DOCTYPE');
-        }
-    }
-
-    public static function threadSafeLibxmlDisableEntityLoaderAvailability()
-    {
-        if (PHP_MAJOR_VERSION == 7) {
-            switch (PHP_MINOR_VERSION) {
-                case 2:
-                    return PHP_RELEASE_VERSION >= 1;
-                case 1:
-                    return PHP_RELEASE_VERSION >= 13;
-                case 0:
-                    return PHP_RELEASE_VERSION >= 27;
-            }
-
-            return true;
-        }
+        $pattern = ($reader instanceof Reader\Html) ? '<!ENTITY' : '<!DOCTYPE';
 
-        return false;
-    }
-
-    private function disableEntityLoaderCheck(): void
-    {
-        if (Settings::getLibXmlDisableEntityLoader() && \PHP_VERSION_ID < 80000) {
-            $libxmlDisableEntityLoaderValue = libxml_disable_entity_loader(true);
-
-            if (self::$libxmlDisableEntityLoaderValue === null) {
-                self::$libxmlDisableEntityLoaderValue = $libxmlDisableEntityLoaderValue;
-            }
-        }
-    }
-
-    public static function shutdown(): void
-    {
-        if (self::$libxmlDisableEntityLoaderValue !== null && \PHP_VERSION_ID < 80000) {
-            libxml_disable_entity_loader(self::$libxmlDisableEntityLoaderValue);
-            self::$libxmlDisableEntityLoaderValue = null;
-        }
-    }
-
-    public function __destruct()
-    {
-        self::shutdown();
+        return new self($pattern);
     }
 
     public function setAdditionalCallback(callable $callback): void
@@ -98,17 +28,18 @@ public function setAdditionalCallback(callable $callback): void
         $this->callback = $callback;
     }
 
-    private function toUtf8($xml)
+    private static function forceString(mixed $arg): string
     {
-        $pattern = '/encoding="(.*?)"/';
-        $result = preg_match($pattern, $xml, $matches);
-        $charset = strtoupper($result ? $matches[1] : 'UTF-8');
+        return is_string($arg) ? $arg : '';
+    }
 
+    private function toUtf8(string $xml): string
+    {
+        $charset = $this->findCharSet($xml);
         if ($charset !== 'UTF-8') {
-            $xml = mb_convert_encoding($xml, 'UTF-8', $charset);
+            $xml = self::forceString(mb_convert_encoding($xml, 'UTF-8', $charset));
 
-            $result = preg_match($pattern, $xml, $matches);
-            $charset = strtoupper($result ? $matches[1] : 'UTF-8');
+            $charset = $this->findCharSet($xml);
             if ($charset !== 'UTF-8') {
                 throw new Reader\Exception('Suspicious Double-encoded XML, spreadsheet file load() aborted to prevent XXE/XEE attacks');
             }
@@ -117,16 +48,30 @@ private function toUtf8($xml)
         return $xml;
     }
 
+    private function findCharSet(string $xml): string
+    {
+        $patterns = [
+            '/encoding\\s*=\\s*"([^"]*]?)"/',
+            "/encoding\\s*=\\s*'([^']*?)'/",
+        ];
+
+        foreach ($patterns as $pattern) {
+            if (preg_match($pattern, $xml, $matches)) {
+                return strtoupper($matches[1]);
+            }
+        }
+
+        return 'UTF-8';
+    }
+
     /**
      * Scan the XML for use of <!ENTITY to prevent XXE/XEE attacks.
      *
-     * @param mixed $xml
-     *
-     * @return string
+     * @param false|string $xml
      */
-    public function scan($xml)
+    public function scan($xml): string
     {
-        $this->disableEntityLoaderCheck();
+        $xml = "$xml";
 
         $xml = $this->toUtf8($xml);
 
@@ -137,7 +82,7 @@ public function scan($xml)
             throw new Reader\Exception('Detected use of ENTITY in XML, spreadsheet file load() aborted to prevent XXE/XEE attacks');
         }
 
-        if ($this->callback !== null && is_callable($this->callback)) {
+        if ($this->callback !== null) {
             $xml = call_user_func($this->callback, $xml);
         }
 
@@ -146,12 +91,8 @@ public function scan($xml)
 
     /**
      * Scan theXML for use of <!ENTITY to prevent XXE/XEE attacks.
-     *
-     * @param string $filestream
-     *
-     * @return string
      */
-    public function scanFile($filestream)
+    public function scanFile(string $filestream): string
     {
         return $this->scan(file_get_contents($filestream));
     }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Slk.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Slk.php
index c7b6fc82d0..2a0b2fcd92 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Slk.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Slk.php
@@ -2,58 +2,42 @@
 
 namespace PhpOffice\PhpSpreadsheet\Reader;
 
-use InvalidArgumentException;
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Reader\Exception as ReaderException;
+use PhpOffice\PhpSpreadsheet\ReferenceHelper;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Style\Border;
+use PhpOffice\PhpSpreadsheet\Style\Fill;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 
 class Slk extends BaseReader
 {
-    /**
-     * Input encoding.
-     *
-     * @var string
-     */
-    private $inputEncoding = 'ANSI';
-
     /**
      * Sheet index to read.
-     *
-     * @var int
      */
-    private $sheetIndex = 0;
+    private int $sheetIndex = 0;
 
     /**
      * Formats.
-     *
-     * @var array
      */
-    private $formats = [];
+    private array $formats = [];
 
     /**
      * Format Count.
-     *
-     * @var int
      */
-    private $format = 0;
+    private int $format = 0;
 
     /**
      * Fonts.
-     *
-     * @var array
      */
-    private $fonts = [];
+    private array $fonts = [];
 
     /**
      * Font Count.
-     *
-     * @var int
      */
-    private $fontcount = 0;
+    private int $fontcount = 0;
 
     /**
      * Create a new SYLK Reader instance.
@@ -65,21 +49,17 @@ public function __construct()
 
     /**
      * Validate that the current file is a SYLK file.
-     *
-     * @param string $pFilename
-     *
-     * @return bool
      */
-    public function canRead($pFilename)
+    public function canRead(string $filename): bool
     {
         try {
-            $this->openFile($pFilename);
-        } catch (InvalidArgumentException $e) {
+            $this->openFile($filename);
+        } catch (ReaderException) {
             return false;
         }
 
         // Read sample data (first 2 KB will do)
-        $data = fread($this->fileHandle, 2048);
+        $data = (string) fread($this->fileHandle, 2048);
 
         // Count delimiters in file
         $delimiterCount = substr_count($data, ';');
@@ -87,69 +67,33 @@ public function canRead($pFilename)
 
         // Analyze first line looking for ID; signature
         $lines = explode("\n", $data);
-        $hasId = substr($lines[0], 0, 4) === 'ID;P';
+        $hasId = str_starts_with($lines[0], 'ID;P');
 
         fclose($this->fileHandle);
 
         return $hasDelimiter && $hasId;
     }
 
-    private function canReadOrBust(string $pFilename): void
+    private function canReadOrBust(string $filename): void
     {
-        if (!$this->canRead($pFilename)) {
-            throw new ReaderException($pFilename . ' is an Invalid SYLK file.');
+        if (!$this->canRead($filename)) {
+            throw new ReaderException($filename . ' is an Invalid SYLK file.');
         }
-        $this->openFile($pFilename);
-    }
-
-    /**
-     * Set input encoding.
-     *
-     * @deprecated no use is made of this property
-     *
-     * @param string $pValue Input encoding, eg: 'ANSI'
-     *
-     * @return $this
-     *
-     * @codeCoverageIgnore
-     */
-    public function setInputEncoding($pValue)
-    {
-        $this->inputEncoding = $pValue;
-
-        return $this;
-    }
-
-    /**
-     * Get input encoding.
-     *
-     * @deprecated no use is made of this property
-     *
-     * @return string
-     *
-     * @codeCoverageIgnore
-     */
-    public function getInputEncoding()
-    {
-        return $this->inputEncoding;
+        $this->openFile($filename);
     }
 
     /**
      * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns).
-     *
-     * @param string $pFilename
-     *
-     * @return array
      */
-    public function listWorksheetInfo($pFilename)
+    public function listWorksheetInfo(string $filename): array
     {
         // Open file
-        $this->canReadOrBust($pFilename);
+        $this->canReadOrBust($filename);
         $fileHandle = $this->fileHandle;
         rewind($fileHandle);
 
         $worksheetInfo = [];
-        $worksheetInfo[0]['worksheetName'] = basename($pFilename, '.slk');
+        $worksheetInfo[0]['worksheetName'] = basename($filename, '.slk');
 
         // loop through one row (line) at a time in the file
         $rowIndex = 0;
@@ -173,7 +117,7 @@ public function listWorksheetInfo($pFilename)
 
                             break;
                         case 'Y':
-                            $rowIndex = substr($rowDatum, 1);
+                            $rowIndex = (int) substr($rowDatum, 1);
 
                             break;
                     }
@@ -196,21 +140,17 @@ public function listWorksheetInfo($pFilename)
 
     /**
      * Loads PhpSpreadsheet from file.
-     *
-     * @param string $pFilename
-     *
-     * @return Spreadsheet
      */
-    public function load($pFilename)
+    protected function loadSpreadsheetFromFile(string $filename): Spreadsheet
     {
         // Create new Spreadsheet
         $spreadsheet = new Spreadsheet();
 
         // Load into this instance
-        return $this->loadIntoExisting($pFilename, $spreadsheet);
+        return $this->loadIntoExisting($filename, $spreadsheet);
     }
 
-    private $colorArray = [
+    private const COLOR_ARRAY = [
         'FF00FFFF', // 0 - cyan
         'FF000000', // 1 - black
         'FFFFFFFF', // 2 - white
@@ -221,7 +161,7 @@ public function load($pFilename)
         'FFFF00FF', // 7 - magenta
     ];
 
-    private $fontStyleMappings = [
+    private const FONT_STYLE_MAPPINGS = [
         'B' => 'bold',
         'I' => 'italic',
         'U' => 'underline',
@@ -235,7 +175,8 @@ private function processFormula(string $rowDatum, bool &$hasCalculatedValue, str
         $key = false;
         foreach ($temp as &$value) {
             //    Only count/replace in alternate array entries
-            if ($key = !$key) {
+            $key = $key === false;
+            if ($key) {
                 preg_match_all('/(R(\[?-?\d*\]?))(C(\[?-?\d*\]?))/', $value, $cellReferences, PREG_SET_ORDER + PREG_OFFSET_CAPTURE);
                 //    Reverse the matches array, otherwise all our offsets will become incorrect if we modify our way
                 //        through the formula from left to right. Reversing means that we work right to left.through
@@ -262,7 +203,7 @@ private function processFormula(string $rowDatum, bool &$hasCalculatedValue, str
                     if ($columnReference[0] == '[') {
                         $columnReference = (int) $column + (int) trim($columnReference, '[]');
                     }
-                    $A1CellReference = Coordinate::stringFromColumnIndex($columnReference) . $rowReference;
+                    $A1CellReference = Coordinate::stringFromColumnIndex((int) $columnReference) . $rowReference;
 
                     $value = substr_replace($value, $A1CellReference, $cellReference[0][1], strlen($cellReference[0][0]));
                 }
@@ -278,43 +219,83 @@ private function processCRecord(array $rowData, Spreadsheet &$spreadsheet, strin
     {
         //    Read cell value data
         $hasCalculatedValue = false;
+        $tryNumeric = false;
         $cellDataFormula = $cellData = '';
+        $sharedColumn = $sharedRow = -1;
+        $sharedFormula = false;
         foreach ($rowData as $rowDatum) {
             switch ($rowDatum[0]) {
-                case 'C':
                 case 'X':
                     $column = substr($rowDatum, 1);
 
                     break;
-                case 'R':
                 case 'Y':
                     $row = substr($rowDatum, 1);
 
                     break;
                 case 'K':
                     $cellData = substr($rowDatum, 1);
+                    $tryNumeric = is_numeric($cellData);
 
                     break;
                 case 'E':
                     $this->processFormula($rowDatum, $hasCalculatedValue, $cellDataFormula, $row, $column);
 
+                    break;
+                case 'A':
+                    $comment = substr($rowDatum, 1);
+                    $columnLetter = Coordinate::stringFromColumnIndex((int) $column);
+                    $spreadsheet->getActiveSheet()
+                        ->getComment("$columnLetter$row")
+                        ->getText()
+                        ->createText($comment);
+
+                    break;
+                case 'C':
+                    $sharedColumn = (int) substr($rowDatum, 1);
+
+                    break;
+                case 'R':
+                    $sharedRow = (int) substr($rowDatum, 1);
+
+                    break;
+                case 'S':
+                    $sharedFormula = true;
+
                     break;
             }
         }
+        if ($sharedFormula === true && $sharedRow >= 0 && $sharedColumn >= 0) {
+            $thisCoordinate = Coordinate::stringFromColumnIndex((int) $column) . $row;
+            $sharedCoordinate = Coordinate::stringFromColumnIndex($sharedColumn) . $sharedRow;
+            /** @var string */
+            $formula = $spreadsheet->getActiveSheet()->getCell($sharedCoordinate)->getValue();
+            $spreadsheet->getActiveSheet()->getCell($thisCoordinate)->setValue($formula);
+            $referenceHelper = ReferenceHelper::getInstance();
+            $newFormula = $referenceHelper->updateFormulaReferences($formula, 'A1', (int) $column - $sharedColumn, (int) $row - $sharedRow, '', true, false);
+            $spreadsheet->getActiveSheet()->getCell($thisCoordinate)->setValue($newFormula);
+            //$calc = $spreadsheet->getActiveSheet()->getCell($thisCoordinate)->getCalculatedValue();
+            //$spreadsheet->getActiveSheet()->getCell($thisCoordinate)->setCalculatedValue($calc);
+            $cellData = Calculation::unwrapResult($cellData);
+            $spreadsheet->getActiveSheet()->getCell($thisCoordinate)->setCalculatedValue($cellData, $tryNumeric);
+
+            return;
+        }
         $columnLetter = Coordinate::stringFromColumnIndex((int) $column);
+        /** @var string */
         $cellData = Calculation::unwrapResult($cellData);
 
         // Set cell value
-        $this->processCFinal($spreadsheet, $hasCalculatedValue, $cellDataFormula, $cellData, "$columnLetter$row");
+        $this->processCFinal($spreadsheet, $hasCalculatedValue, $cellDataFormula, $cellData, "$columnLetter$row", $tryNumeric);
     }
 
-    private function processCFinal(Spreadsheet &$spreadsheet, bool $hasCalculatedValue, string $cellDataFormula, string $cellData, string $coordinate): void
+    private function processCFinal(Spreadsheet &$spreadsheet, bool $hasCalculatedValue, string $cellDataFormula, string $cellData, string $coordinate, bool $tryNumeric): void
     {
         // Set cell value
         $spreadsheet->getActiveSheet()->getCell($coordinate)->setValue(($hasCalculatedValue) ? $cellDataFormula : $cellData);
         if ($hasCalculatedValue) {
             $cellData = Calculation::unwrapResult($cellData);
-            $spreadsheet->getActiveSheet()->getCell($coordinate)->setCalculatedValue($cellData);
+            $spreadsheet->getActiveSheet()->getCell($coordinate)->setCalculatedValue($cellData, $tryNumeric);
         }
     }
 
@@ -357,9 +338,9 @@ private function processFRecord(array $rowData, Spreadsheet &$spreadsheet, strin
         $this->addWidth($spreadsheet, $columnWidth, $startCol, $endCol);
     }
 
-    private $styleSettingsFont = ['D' => 'bold', 'I' => 'italic'];
+    private const STYLE_SETTINGS_FONT = ['D' => 'bold', 'I' => 'italic'];
 
-    private $styleSettingsBorder = [
+    private const STYLE_SETTINGS_BORDER = [
         'B' => 'bottom',
         'L' => 'left',
         'R' => 'right',
@@ -372,12 +353,12 @@ private function styleSettings(string $rowDatum, array &$styleData, string &$fon
         $iMax = strlen($styleSettings);
         for ($i = 0; $i < $iMax; ++$i) {
             $char = $styleSettings[$i];
-            if (array_key_exists($char, $this->styleSettingsFont)) {
-                $styleData['font'][$this->styleSettingsFont[$char]] = true;
-            } elseif (array_key_exists($char, $this->styleSettingsBorder)) {
-                $styleData['borders'][$this->styleSettingsBorder[$char]]['borderStyle'] = Border::BORDER_THIN;
+            if (array_key_exists($char, self::STYLE_SETTINGS_FONT)) {
+                $styleData['font'][self::STYLE_SETTINGS_FONT[$char]] = true;
+            } elseif (array_key_exists($char, self::STYLE_SETTINGS_BORDER)) {
+                $styleData['borders'][self::STYLE_SETTINGS_BORDER[$char]]['borderStyle'] = Border::BORDER_THIN;
             } elseif ($char == 'S') {
-                $styleData['fill']['fillType'] = \PhpOffice\PhpSpreadsheet\Style\Fill::FILL_PATTERN_GRAY125;
+                $styleData['fill']['fillType'] = Fill::FILL_PATTERN_GRAY125;
             } elseif ($char == 'M') {
                 if (preg_match('/M([1-9]\\d*)/', $styleSettings, $matches)) {
                     $fontStyle = $matches[1];
@@ -409,7 +390,7 @@ private function addFonts(Spreadsheet &$spreadsheet, string $fontStyle, string $
     private function addStyle(Spreadsheet &$spreadsheet, array $styleData, string $row, string $column): void
     {
         if ((!empty($styleData)) && $column > '' && $row > '') {
-            $columnLetter = Coordinate::stringFromColumnIndex($column);
+            $columnLetter = Coordinate::stringFromColumnIndex((int) $column);
             $spreadsheet->getActiveSheet()->getStyle($columnLetter . $row)->applyFromArray($styleData);
         }
     }
@@ -421,11 +402,11 @@ private function addWidth(Spreadsheet $spreadsheet, string $columnWidth, string
                 $startCol = Coordinate::stringFromColumnIndex((int) $startCol);
                 $spreadsheet->getActiveSheet()->getColumnDimension($startCol)->setWidth((float) $columnWidth);
             } else {
-                $startCol = Coordinate::stringFromColumnIndex($startCol);
-                $endCol = Coordinate::stringFromColumnIndex($endCol);
+                $startCol = Coordinate::stringFromColumnIndex((int) $startCol);
+                $endCol = Coordinate::stringFromColumnIndex((int) $endCol);
                 $spreadsheet->getActiveSheet()->getColumnDimension($startCol)->setWidth((float) $columnWidth);
                 do {
-                    $spreadsheet->getActiveSheet()->getColumnDimension(++$startCol)->setWidth((float) $columnWidth);
+                    $spreadsheet->getActiveSheet()->getColumnDimension((string) ++$startCol)->setWidth((float) $columnWidth);
                 } while ($startCol !== $endCol);
             }
         }
@@ -449,7 +430,7 @@ private function processPRecord(array $rowData, Spreadsheet &$spreadsheet): void
 
                     break;
                 case 'M':
-                    $formatArray['font']['size'] = substr($rowDatum, 1) / 20;
+                    $formatArray['font']['size'] = ((float) substr($rowDatum, 1)) / 20;
 
                     break;
                 case 'L':
@@ -468,8 +449,8 @@ private function processPRecord(array $rowData, Spreadsheet &$spreadsheet): void
     private function processPColors(string $rowDatum, array &$formatArray): void
     {
         if (preg_match('/L([1-9]\\d*)/', $rowDatum, $matches)) {
-            $fontColor = $matches[1] % 8;
-            $formatArray['font']['color']['argb'] = $this->colorArray[$fontColor];
+            $fontColor = ((int) $matches[1]) % 8;
+            $formatArray['font']['color']['argb'] = self::COLOR_ARRAY[$fontColor];
         }
     }
 
@@ -478,8 +459,8 @@ private function processPFontStyles(string $rowDatum, array &$formatArray): void
         $styleSettings = substr($rowDatum, 1);
         $iMax = strlen($styleSettings);
         for ($i = 0; $i < $iMax; ++$i) {
-            if (array_key_exists($styleSettings[$i], $this->fontStyleMappings)) {
-                $formatArray['font'][$this->fontStyleMappings[$styleSettings[$i]]] = true;
+            if (array_key_exists($styleSettings[$i], self::FONT_STYLE_MAPPINGS)) {
+                $formatArray['font'][self::FONT_STYLE_MAPPINGS[$styleSettings[$i]]] = true;
             }
         }
     }
@@ -500,15 +481,11 @@ private function processPFinal(Spreadsheet &$spreadsheet, array $formatArray): v
 
     /**
      * Loads PhpSpreadsheet from file into PhpSpreadsheet instance.
-     *
-     * @param string $pFilename
-     *
-     * @return Spreadsheet
      */
-    public function loadIntoExisting($pFilename, Spreadsheet $spreadsheet)
+    public function loadIntoExisting(string $filename, Spreadsheet $spreadsheet): Spreadsheet
     {
         // Open file
-        $this->canReadOrBust($pFilename);
+        $this->canReadOrBust($filename);
         $fileHandle = $this->fileHandle;
         rewind($fileHandle);
 
@@ -517,7 +494,7 @@ public function loadIntoExisting($pFilename, Spreadsheet $spreadsheet)
             $spreadsheet->createSheet();
         }
         $spreadsheet->setActiveSheetIndex($this->sheetIndex);
-        $spreadsheet->getActiveSheet()->setTitle(substr(basename($pFilename, '.slk'), 0, Worksheet::SHEET_TITLE_MAXIMUM_LENGTH));
+        $spreadsheet->getActiveSheet()->setTitle(substr(basename($filename, '.slk'), 0, Worksheet::SHEET_TITLE_MAXIMUM_LENGTH));
 
         // Loop through file
         $column = $row = '';
@@ -567,10 +544,8 @@ private function columnRowFromRowData(array $rowData, string &$column, string &$
 
     /**
      * Get sheet index.
-     *
-     * @return int
      */
-    public function getSheetIndex()
+    public function getSheetIndex(): int
     {
         return $this->sheetIndex;
     }
@@ -578,13 +553,13 @@ public function getSheetIndex()
     /**
      * Set sheet index.
      *
-     * @param int $pValue Sheet index
+     * @param int $sheetIndex Sheet index
      *
      * @return $this
      */
-    public function setSheetIndex($pValue)
+    public function setSheetIndex(int $sheetIndex): static
     {
-        $this->sheetIndex = $pValue;
+        $this->sheetIndex = $sheetIndex;
 
         return $this;
     }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls.php
index bfdd558304..833b2550f3 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls.php
@@ -7,19 +7,26 @@
 use PhpOffice\PhpSpreadsheet\Cell\DataValidation;
 use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
 use PhpOffice\PhpSpreadsheet\NamedRange;
+use PhpOffice\PhpSpreadsheet\Reader\Xls\ConditionalFormatting;
 use PhpOffice\PhpSpreadsheet\Reader\Xls\Style\CellFont;
+use PhpOffice\PhpSpreadsheet\Reader\Xls\Style\FillPattern;
 use PhpOffice\PhpSpreadsheet\RichText\RichText;
 use PhpOffice\PhpSpreadsheet\Shared\CodePage;
 use PhpOffice\PhpSpreadsheet\Shared\Date;
 use PhpOffice\PhpSpreadsheet\Shared\Escher;
+use PhpOffice\PhpSpreadsheet\Shared\Escher\DgContainer\SpgrContainer\SpContainer;
 use PhpOffice\PhpSpreadsheet\Shared\Escher\DggContainer\BstoreContainer\BSE;
 use PhpOffice\PhpSpreadsheet\Shared\File;
 use PhpOffice\PhpSpreadsheet\Shared\OLE;
 use PhpOffice\PhpSpreadsheet\Shared\OLERead;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+use PhpOffice\PhpSpreadsheet\Shared\Xls as SharedXls;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Style\Alignment;
+use PhpOffice\PhpSpreadsheet\Style\Border;
 use PhpOffice\PhpSpreadsheet\Style\Borders;
+use PhpOffice\PhpSpreadsheet\Style\Conditional;
+use PhpOffice\PhpSpreadsheet\Style\Fill;
 use PhpOffice\PhpSpreadsheet\Style\Font;
 use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
 use PhpOffice\PhpSpreadsheet\Style\Protection;
@@ -61,6 +68,10 @@
 //         external sheet reference structure
 class Xls extends BaseReader
 {
+    private const HIGH_ORDER_BIT = 0x80 << 24;
+    private const FC000000 = 0xFC << 24;
+    private const FE000000 = 0xFE << 24;
+
     // ParseXL definitions
     const XLS_BIFF8 = 0x0600;
     const XLS_BIFF7 = 0x0500;
@@ -69,57 +80,57 @@ class Xls extends BaseReader
 
     // record identifiers
     const XLS_TYPE_FORMULA = 0x0006;
-    const XLS_TYPE_EOF = 0x000a;
+    const XLS_TYPE_EOF = 0x000A;
     const XLS_TYPE_PROTECT = 0x0012;
     const XLS_TYPE_OBJECTPROTECT = 0x0063;
-    const XLS_TYPE_SCENPROTECT = 0x00dd;
+    const XLS_TYPE_SCENPROTECT = 0x00DD;
     const XLS_TYPE_PASSWORD = 0x0013;
     const XLS_TYPE_HEADER = 0x0014;
     const XLS_TYPE_FOOTER = 0x0015;
     const XLS_TYPE_EXTERNSHEET = 0x0017;
     const XLS_TYPE_DEFINEDNAME = 0x0018;
-    const XLS_TYPE_VERTICALPAGEBREAKS = 0x001a;
-    const XLS_TYPE_HORIZONTALPAGEBREAKS = 0x001b;
-    const XLS_TYPE_NOTE = 0x001c;
-    const XLS_TYPE_SELECTION = 0x001d;
+    const XLS_TYPE_VERTICALPAGEBREAKS = 0x001A;
+    const XLS_TYPE_HORIZONTALPAGEBREAKS = 0x001B;
+    const XLS_TYPE_NOTE = 0x001C;
+    const XLS_TYPE_SELECTION = 0x001D;
     const XLS_TYPE_DATEMODE = 0x0022;
     const XLS_TYPE_EXTERNNAME = 0x0023;
     const XLS_TYPE_LEFTMARGIN = 0x0026;
     const XLS_TYPE_RIGHTMARGIN = 0x0027;
     const XLS_TYPE_TOPMARGIN = 0x0028;
     const XLS_TYPE_BOTTOMMARGIN = 0x0029;
-    const XLS_TYPE_PRINTGRIDLINES = 0x002b;
-    const XLS_TYPE_FILEPASS = 0x002f;
+    const XLS_TYPE_PRINTGRIDLINES = 0x002B;
+    const XLS_TYPE_FILEPASS = 0x002F;
     const XLS_TYPE_FONT = 0x0031;
-    const XLS_TYPE_CONTINUE = 0x003c;
+    const XLS_TYPE_CONTINUE = 0x003C;
     const XLS_TYPE_PANE = 0x0041;
     const XLS_TYPE_CODEPAGE = 0x0042;
     const XLS_TYPE_DEFCOLWIDTH = 0x0055;
-    const XLS_TYPE_OBJ = 0x005d;
-    const XLS_TYPE_COLINFO = 0x007d;
-    const XLS_TYPE_IMDATA = 0x007f;
+    const XLS_TYPE_OBJ = 0x005D;
+    const XLS_TYPE_COLINFO = 0x007D;
+    const XLS_TYPE_IMDATA = 0x007F;
     const XLS_TYPE_SHEETPR = 0x0081;
     const XLS_TYPE_HCENTER = 0x0083;
     const XLS_TYPE_VCENTER = 0x0084;
     const XLS_TYPE_SHEET = 0x0085;
     const XLS_TYPE_PALETTE = 0x0092;
-    const XLS_TYPE_SCL = 0x00a0;
-    const XLS_TYPE_PAGESETUP = 0x00a1;
-    const XLS_TYPE_MULRK = 0x00bd;
-    const XLS_TYPE_MULBLANK = 0x00be;
-    const XLS_TYPE_DBCELL = 0x00d7;
-    const XLS_TYPE_XF = 0x00e0;
-    const XLS_TYPE_MERGEDCELLS = 0x00e5;
-    const XLS_TYPE_MSODRAWINGGROUP = 0x00eb;
-    const XLS_TYPE_MSODRAWING = 0x00ec;
-    const XLS_TYPE_SST = 0x00fc;
-    const XLS_TYPE_LABELSST = 0x00fd;
-    const XLS_TYPE_EXTSST = 0x00ff;
-    const XLS_TYPE_EXTERNALBOOK = 0x01ae;
-    const XLS_TYPE_DATAVALIDATIONS = 0x01b2;
-    const XLS_TYPE_TXO = 0x01b6;
-    const XLS_TYPE_HYPERLINK = 0x01b8;
-    const XLS_TYPE_DATAVALIDATION = 0x01be;
+    const XLS_TYPE_SCL = 0x00A0;
+    const XLS_TYPE_PAGESETUP = 0x00A1;
+    const XLS_TYPE_MULRK = 0x00BD;
+    const XLS_TYPE_MULBLANK = 0x00BE;
+    const XLS_TYPE_DBCELL = 0x00D7;
+    const XLS_TYPE_XF = 0x00E0;
+    const XLS_TYPE_MERGEDCELLS = 0x00E5;
+    const XLS_TYPE_MSODRAWINGGROUP = 0x00EB;
+    const XLS_TYPE_MSODRAWING = 0x00EC;
+    const XLS_TYPE_SST = 0x00FC;
+    const XLS_TYPE_LABELSST = 0x00FD;
+    const XLS_TYPE_EXTSST = 0x00FF;
+    const XLS_TYPE_EXTERNALBOOK = 0x01AE;
+    const XLS_TYPE_DATAVALIDATIONS = 0x01B2;
+    const XLS_TYPE_TXO = 0x01B6;
+    const XLS_TYPE_HYPERLINK = 0x01B8;
+    const XLS_TYPE_DATAVALIDATION = 0x01BE;
     const XLS_TYPE_DIMENSION = 0x0200;
     const XLS_TYPE_BLANK = 0x0201;
     const XLS_TYPE_NUMBER = 0x0203;
@@ -127,21 +138,23 @@ class Xls extends BaseReader
     const XLS_TYPE_BOOLERR = 0x0205;
     const XLS_TYPE_STRING = 0x0207;
     const XLS_TYPE_ROW = 0x0208;
-    const XLS_TYPE_INDEX = 0x020b;
+    const XLS_TYPE_INDEX = 0x020B;
     const XLS_TYPE_ARRAY = 0x0221;
     const XLS_TYPE_DEFAULTROWHEIGHT = 0x0225;
-    const XLS_TYPE_WINDOW2 = 0x023e;
-    const XLS_TYPE_RK = 0x027e;
+    const XLS_TYPE_WINDOW2 = 0x023E;
+    const XLS_TYPE_RK = 0x027E;
     const XLS_TYPE_STYLE = 0x0293;
-    const XLS_TYPE_FORMAT = 0x041e;
-    const XLS_TYPE_SHAREDFMLA = 0x04bc;
+    const XLS_TYPE_FORMAT = 0x041E;
+    const XLS_TYPE_SHAREDFMLA = 0x04BC;
     const XLS_TYPE_BOF = 0x0809;
     const XLS_TYPE_SHEETPROTECTION = 0x0867;
     const XLS_TYPE_RANGEPROTECTION = 0x0868;
     const XLS_TYPE_SHEETLAYOUT = 0x0862;
-    const XLS_TYPE_XFEXT = 0x087d;
-    const XLS_TYPE_PAGELAYOUTVIEW = 0x088b;
-    const XLS_TYPE_UNKNOWN = 0xffff;
+    const XLS_TYPE_XFEXT = 0x087D;
+    const XLS_TYPE_PAGELAYOUTVIEW = 0x088B;
+    const XLS_TYPE_CFHEADER = 0x01B0;
+    const XLS_TYPE_CFRULE = 0x01B1;
+    const XLS_TYPE_UNKNOWN = 0xFFFF;
 
     // Encryption type
     const MS_BIFF_CRYPTO_NONE = 0;
@@ -151,262 +164,211 @@ class Xls extends BaseReader
     // Size of stream blocks when using RC4 encryption
     const REKEY_BLOCK = 0x400;
 
+    // should be consistent with Writer\Xls\Style\CellBorder
+    const BORDER_STYLE_MAP = [
+        Border::BORDER_NONE, // => 0x00,
+        Border::BORDER_THIN,  // => 0x01,
+        Border::BORDER_MEDIUM, // => 0x02,
+        Border::BORDER_DASHED, // => 0x03,
+        Border::BORDER_DOTTED,  // => 0x04,
+        Border::BORDER_THICK, // => 0x05,
+        Border::BORDER_DOUBLE, // => 0x06,
+        Border::BORDER_HAIR, // => 0x07,
+        Border::BORDER_MEDIUMDASHED, // => 0x08,
+        Border::BORDER_DASHDOT, // => 0x09,
+        Border::BORDER_MEDIUMDASHDOT, // => 0x0A,
+        Border::BORDER_DASHDOTDOT, // => 0x0B,
+        Border::BORDER_MEDIUMDASHDOTDOT, // => 0x0C,
+        Border::BORDER_SLANTDASHDOT, // => 0x0D,
+        Border::BORDER_OMIT, // => 0x0E,
+        Border::BORDER_OMIT, // => 0x0F,
+    ];
+
     /**
      * Summary Information stream data.
-     *
-     * @var string
      */
-    private $summaryInformation;
+    private ?string $summaryInformation = null;
 
     /**
      * Extended Summary Information stream data.
-     *
-     * @var string
      */
-    private $documentSummaryInformation;
+    private ?string $documentSummaryInformation = null;
 
     /**
      * Workbook stream data. (Includes workbook globals substream as well as sheet substreams).
-     *
-     * @var string
      */
-    private $data;
+    private string $data;
 
     /**
      * Size in bytes of $this->data.
-     *
-     * @var int
      */
-    private $dataSize;
+    private int $dataSize;
 
     /**
      * Current position in stream.
-     *
-     * @var int
      */
-    private $pos;
+    private int $pos;
 
     /**
      * Workbook to be returned by the reader.
-     *
-     * @var Spreadsheet
      */
-    private $spreadsheet;
+    private Spreadsheet $spreadsheet;
 
     /**
      * Worksheet that is currently being built by the reader.
-     *
-     * @var Worksheet
      */
-    private $phpSheet;
+    private Worksheet $phpSheet;
 
     /**
      * BIFF version.
-     *
-     * @var int
      */
-    private $version;
+    private int $version = 0;
 
     /**
      * Codepage set in the Excel file being read. Only important for BIFF5 (Excel 5.0 - Excel 95)
      * For BIFF8 (Excel 97 - Excel 2003) this will always have the value 'UTF-16LE'.
-     *
-     * @var string
      */
-    private $codepage;
+    private string $codepage = '';
 
     /**
      * Shared formats.
-     *
-     * @var array
      */
-    private $formats;
+    private array $formats;
 
     /**
      * Shared fonts.
      *
      * @var Font[]
      */
-    private $objFonts;
+    private array $objFonts;
 
     /**
      * Color palette.
-     *
-     * @var array
      */
-    private $palette;
+    private array $palette;
 
     /**
      * Worksheets.
-     *
-     * @var array
      */
-    private $sheets;
+    private array $sheets;
 
     /**
      * External books.
-     *
-     * @var array
      */
-    private $externalBooks;
+    private array $externalBooks;
 
     /**
      * REF structures. Only applies to BIFF8.
-     *
-     * @var array
      */
-    private $ref;
+    private array $ref;
 
     /**
      * External names.
-     *
-     * @var array
      */
-    private $externalNames;
+    private array $externalNames;
 
     /**
      * Defined names.
-     *
-     * @var array
      */
-    private $definedname;
+    private array $definedname;
 
     /**
      * Shared strings. Only applies to BIFF8.
-     *
-     * @var array
      */
-    private $sst;
+    private array $sst;
 
     /**
      * Panes are frozen? (in sheet currently being read). See WINDOW2 record.
-     *
-     * @var bool
      */
-    private $frozen;
+    private bool $frozen;
 
     /**
      * Fit printout to number of pages? (in sheet currently being read). See SHEETPR record.
-     *
-     * @var bool
      */
-    private $isFitToPages;
+    private bool $isFitToPages;
 
     /**
      * Objects. One OBJ record contributes with one entry.
-     *
-     * @var array
      */
-    private $objs;
+    private array $objs;
 
     /**
      * Text Objects. One TXO record corresponds with one entry.
-     *
-     * @var array
      */
-    private $textObjects;
+    private array $textObjects;
 
     /**
      * Cell Annotations (BIFF8).
-     *
-     * @var array
      */
-    private $cellNotes;
+    private array $cellNotes;
 
     /**
      * The combined MSODRAWINGGROUP data.
-     *
-     * @var string
      */
-    private $drawingGroupData;
+    private string $drawingGroupData;
 
     /**
      * The combined MSODRAWING data (per sheet).
-     *
-     * @var string
      */
-    private $drawingData;
+    private string $drawingData;
 
     /**
      * Keep track of XF index.
-     *
-     * @var int
      */
-    private $xfIndex;
+    private int $xfIndex;
 
     /**
      * Mapping of XF index (that is a cell XF) to final index in cellXf collection.
-     *
-     * @var array
      */
-    private $mapCellXfIndex;
+    private array $mapCellXfIndex;
 
     /**
      * Mapping of XF index (that is a style XF) to final index in cellStyleXf collection.
-     *
-     * @var array
      */
-    private $mapCellStyleXfIndex;
+    private array $mapCellStyleXfIndex;
 
     /**
      * The shared formulas in a sheet. One SHAREDFMLA record contributes with one value.
-     *
-     * @var array
      */
-    private $sharedFormulas;
+    private array $sharedFormulas;
 
     /**
      * The shared formula parts in a sheet. One FORMULA record contributes with one value if it
      * refers to a shared formula.
-     *
-     * @var array
      */
-    private $sharedFormulaParts;
+    private array $sharedFormulaParts;
 
     /**
      * The type of encryption in use.
-     *
-     * @var int
      */
-    private $encryption = 0;
+    private int $encryption = 0;
 
     /**
      * The position in the stream after which contents are encrypted.
-     *
-     * @var int
      */
-    private $encryptionStartPos = 0;
+    private int $encryptionStartPos = 0;
 
     /**
      * The current RC4 decryption object.
-     *
-     * @var Xls\RC4
      */
-    private $rc4Key;
+    private ?Xls\RC4 $rc4Key = null;
 
     /**
      * The position in the stream that the RC4 decryption object was left at.
-     *
-     * @var int
      */
-    private $rc4Pos = 0;
+    private int $rc4Pos = 0;
 
     /**
      * The current MD5 context state.
-     *
-     * @var string
+     * It is never set in the program, so code which uses it is suspect.
      */
-    private $md5Ctxt;
+    private string $md5Ctxt; // @phpstan-ignore-line
 
-    /**
-     * @var int
-     */
-    private $textObjRef;
+    private int $textObjRef;
 
-    /**
-     * @var string
-     */
-    private $baseCell;
+    private string $baseCell;
+
+    private bool $activeSheetSet = false;
 
     /**
      * Create a new Xls Reader instance.
@@ -418,52 +380,54 @@ public function __construct()
 
     /**
      * Can the current IReader read the file?
-     *
-     * @param string $pFilename
-     *
-     * @return bool
      */
-    public function canRead($pFilename)
+    public function canRead(string $filename): bool
     {
-        File::assertFile($pFilename);
+        if (File::testFileNoThrow($filename) === false) {
+            return false;
+        }
 
         try {
             // Use ParseXL for the hard work.
             $ole = new OLERead();
 
             // get excel data
-            $ole->read($pFilename);
+            $ole->read($filename);
+            if ($ole->wrkbook === null) {
+                throw new Exception('The filename ' . $filename . ' is not recognised as a Spreadsheet file');
+            }
 
             return true;
-        } catch (PhpSpreadsheetException $e) {
+        } catch (PhpSpreadsheetException) {
             return false;
         }
     }
 
     public function setCodepage(string $codepage): void
     {
-        if (!CodePage::validate($codepage)) {
+        if (CodePage::validate($codepage) === false) {
             throw new PhpSpreadsheetException('Unknown codepage: ' . $codepage);
         }
 
         $this->codepage = $codepage;
     }
 
+    public function getCodepage(): string
+    {
+        return $this->codepage;
+    }
+
     /**
      * Reads names of the worksheets from a file, without parsing the whole file to a PhpSpreadsheet object.
-     *
-     * @param string $pFilename
-     *
-     * @return array
      */
-    public function listWorksheetNames($pFilename)
+    public function listWorksheetNames(string $filename): array
     {
-        File::assertFile($pFilename);
+        File::assertFile($filename);
 
         $worksheetNames = [];
 
         // Read the OLE file
-        $this->loadOLE($pFilename);
+        $this->loadOLE($filename);
 
         // total byte size of Excel data (workbook global substream + sheet substreams)
         $this->dataSize = strlen($this->data);
@@ -475,23 +439,16 @@ public function listWorksheetNames($pFilename)
         while ($this->pos < $this->dataSize) {
             $code = self::getUInt2d($this->data, $this->pos);
 
-            switch ($code) {
-                case self::XLS_TYPE_BOF:
-                    $this->readBof();
-
-                    break;
-                case self::XLS_TYPE_SHEET:
-                    $this->readSheet();
-
-                    break;
-                case self::XLS_TYPE_EOF:
-                    $this->readDefault();
-
-                    break 2;
-                default:
-                    $this->readDefault();
+            match ($code) {
+                self::XLS_TYPE_BOF => $this->readBof(),
+                self::XLS_TYPE_SHEET => $this->readSheet(),
+                self::XLS_TYPE_EOF => $this->readDefault(),
+                self::XLS_TYPE_CODEPAGE => $this->readCodepage(),
+                default => $this->readDefault(),
+            };
 
-                    break;
+            if ($code === self::XLS_TYPE_EOF) {
+                break;
             }
         }
 
@@ -509,19 +466,15 @@ public function listWorksheetNames($pFilename)
 
     /**
      * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns).
-     *
-     * @param string $pFilename
-     *
-     * @return array
      */
-    public function listWorksheetInfo($pFilename)
+    public function listWorksheetInfo(string $filename): array
     {
-        File::assertFile($pFilename);
+        File::assertFile($filename);
 
         $worksheetInfo = [];
 
         // Read the OLE file
-        $this->loadOLE($pFilename);
+        $this->loadOLE($filename);
 
         // total byte size of Excel data (workbook global substream + sheet substreams)
         $this->dataSize = strlen($this->data);
@@ -534,23 +487,16 @@ public function listWorksheetInfo($pFilename)
         while ($this->pos < $this->dataSize) {
             $code = self::getUInt2d($this->data, $this->pos);
 
-            switch ($code) {
-                case self::XLS_TYPE_BOF:
-                    $this->readBof();
+            match ($code) {
+                self::XLS_TYPE_BOF => $this->readBof(),
+                self::XLS_TYPE_SHEET => $this->readSheet(),
+                self::XLS_TYPE_EOF => $this->readDefault(),
+                self::XLS_TYPE_CODEPAGE => $this->readCodepage(),
+                default => $this->readDefault(),
+            };
 
-                    break;
-                case self::XLS_TYPE_SHEET:
-                    $this->readSheet();
-
-                    break;
-                case self::XLS_TYPE_EOF:
-                    $this->readDefault();
-
-                    break 2;
-                default:
-                    $this->readDefault();
-
-                    break;
+            if ($code === self::XLS_TYPE_EOF) {
+                break;
             }
         }
 
@@ -621,15 +567,11 @@ public function listWorksheetInfo($pFilename)
 
     /**
      * Loads PhpSpreadsheet from file.
-     *
-     * @param string $pFilename
-     *
-     * @return Spreadsheet
      */
-    public function load($pFilename)
+    protected function loadSpreadsheetFromFile(string $filename): Spreadsheet
     {
         // Read the OLE file
-        $this->loadOLE($pFilename);
+        $this->loadOLE($filename);
 
         // Initialisations
         $this->spreadsheet = new Spreadsheet();
@@ -668,83 +610,30 @@ public function load($pFilename)
         while ($this->pos < $this->dataSize) {
             $code = self::getUInt2d($this->data, $this->pos);
 
-            switch ($code) {
-                case self::XLS_TYPE_BOF:
-                    $this->readBof();
-
-                    break;
-                case self::XLS_TYPE_FILEPASS:
-                    $this->readFilepass();
-
-                    break;
-                case self::XLS_TYPE_CODEPAGE:
-                    $this->readCodepage();
-
-                    break;
-                case self::XLS_TYPE_DATEMODE:
-                    $this->readDateMode();
-
-                    break;
-                case self::XLS_TYPE_FONT:
-                    $this->readFont();
-
-                    break;
-                case self::XLS_TYPE_FORMAT:
-                    $this->readFormat();
-
-                    break;
-                case self::XLS_TYPE_XF:
-                    $this->readXf();
-
-                    break;
-                case self::XLS_TYPE_XFEXT:
-                    $this->readXfExt();
-
-                    break;
-                case self::XLS_TYPE_STYLE:
-                    $this->readStyle();
-
-                    break;
-                case self::XLS_TYPE_PALETTE:
-                    $this->readPalette();
-
-                    break;
-                case self::XLS_TYPE_SHEET:
-                    $this->readSheet();
-
-                    break;
-                case self::XLS_TYPE_EXTERNALBOOK:
-                    $this->readExternalBook();
-
-                    break;
-                case self::XLS_TYPE_EXTERNNAME:
-                    $this->readExternName();
-
-                    break;
-                case self::XLS_TYPE_EXTERNSHEET:
-                    $this->readExternSheet();
-
-                    break;
-                case self::XLS_TYPE_DEFINEDNAME:
-                    $this->readDefinedName();
-
-                    break;
-                case self::XLS_TYPE_MSODRAWINGGROUP:
-                    $this->readMsoDrawingGroup();
-
-                    break;
-                case self::XLS_TYPE_SST:
-                    $this->readSst();
-
-                    break;
-                case self::XLS_TYPE_EOF:
-                    $this->readDefault();
-
-                    break 2;
-                default:
-                    $this->readDefault();
-
-                    break;
+            match ($code) {
+                self::XLS_TYPE_BOF => $this->readBof(),
+                self::XLS_TYPE_FILEPASS => $this->readFilepass(),
+                self::XLS_TYPE_CODEPAGE => $this->readCodepage(),
+                self::XLS_TYPE_DATEMODE => $this->readDateMode(),
+                self::XLS_TYPE_FONT => $this->readFont(),
+                self::XLS_TYPE_FORMAT => $this->readFormat(),
+                self::XLS_TYPE_XF => $this->readXf(),
+                self::XLS_TYPE_XFEXT => $this->readXfExt(),
+                self::XLS_TYPE_STYLE => $this->readStyle(),
+                self::XLS_TYPE_PALETTE => $this->readPalette(),
+                self::XLS_TYPE_SHEET => $this->readSheet(),
+                self::XLS_TYPE_EXTERNALBOOK => $this->readExternalBook(),
+                self::XLS_TYPE_EXTERNNAME => $this->readExternName(),
+                self::XLS_TYPE_EXTERNSHEET => $this->readExternSheet(),
+                self::XLS_TYPE_DEFINEDNAME => $this->readDefinedName(),
+                self::XLS_TYPE_MSODRAWINGGROUP => $this->readMsoDrawingGroup(),
+                self::XLS_TYPE_SST => $this->readSst(),
+                self::XLS_TYPE_EOF => $this->readDefault(),
+                default => $this->readDefault(),
+            };
+
+            if ($code === self::XLS_TYPE_EOF) {
+                break;
             }
         }
 
@@ -810,7 +699,9 @@ public function load($pFilename)
         }
 
         // Parse the individual sheets
+        $this->activeSheetSet = false;
         foreach ($this->sheets as $sheet) {
+            $selectedCells = '';
             if ($sheet['sheetType'] != 0x00) {
                 // 0x00: Worksheet, 0x02: Chart, 0x06: Visual Basic module
                 continue;
@@ -1018,7 +909,7 @@ public function load($pFilename)
 
                         break;
                     case self::XLS_TYPE_SELECTION:
-                        $this->readSelection();
+                        $selectedCells = $this->readSelection();
 
                         break;
                     case self::XLS_TYPE_MERGEDCELLS:
@@ -1036,6 +927,14 @@ public function load($pFilename)
                     case self::XLS_TYPE_DATAVALIDATION:
                         $this->readDataValidation();
 
+                        break;
+                    case self::XLS_TYPE_CFHEADER:
+                        $cellRangeAddresses = $this->readCFHeader();
+
+                        break;
+                    case self::XLS_TYPE_CFRULE:
+                        $this->readCFRule($cellRangeAddresses ?? []);
+
                         break;
                     case self::XLS_TYPE_SHEETLAYOUT:
                         $this->readSheetLayout();
@@ -1079,13 +978,14 @@ public function load($pFilename)
                 $escherWorksheet = $reader->load($this->drawingData);
 
                 // get all spContainers in one long array, so they can be mapped to OBJ records
-                $allSpContainers = $escherWorksheet->getDgContainer()->getSpgrContainer()->getAllSpContainers();
+                /** @var SpContainer[] $allSpContainers */
+                $allSpContainers = method_exists($escherWorksheet, 'getDgContainer') ? $escherWorksheet->getDgContainer()->getSpgrContainer()->getAllSpContainers() : [];
             }
 
             // treat OBJ records
             foreach ($this->objs as $n => $obj) {
                 // the first shape container never has a corresponding OBJ record, hence $n + 1
-                if (isset($allSpContainers[$n + 1]) && is_object($allSpContainers[$n + 1])) {
+                if (isset($allSpContainers[$n + 1])) {
                     $spContainer = $allSpContainers[$n + 1];
 
                     // we skip all spContainers that are a part of a group shape since we cannot yet handle those
@@ -1094,7 +994,9 @@ public function load($pFilename)
                     }
 
                     // calculate the width and height of the shape
+                    /** @var int $startRow */
                     [$startColumn, $startRow] = Coordinate::coordinateFromString($spContainer->getStartCoordinates());
+                    /** @var int $endRow */
                     [$endColumn, $endRow] = Coordinate::coordinateFromString($spContainer->getEndCoordinates());
 
                     $startOffsetX = $spContainer->getStartOffsetX();
@@ -1102,18 +1004,18 @@ public function load($pFilename)
                     $endOffsetX = $spContainer->getEndOffsetX();
                     $endOffsetY = $spContainer->getEndOffsetY();
 
-                    $width = \PhpOffice\PhpSpreadsheet\Shared\Xls::getDistanceX($this->phpSheet, $startColumn, $startOffsetX, $endColumn, $endOffsetX);
-                    $height = \PhpOffice\PhpSpreadsheet\Shared\Xls::getDistanceY($this->phpSheet, $startRow, $startOffsetY, $endRow, $endOffsetY);
+                    $width = SharedXls::getDistanceX($this->phpSheet, $startColumn, $startOffsetX, $endColumn, $endOffsetX);
+                    $height = SharedXls::getDistanceY($this->phpSheet, $startRow, $startOffsetY, $endRow, $endOffsetY);
 
                     // calculate offsetX and offsetY of the shape
-                    $offsetX = $startOffsetX * \PhpOffice\PhpSpreadsheet\Shared\Xls::sizeCol($this->phpSheet, $startColumn) / 1024;
-                    $offsetY = $startOffsetY * \PhpOffice\PhpSpreadsheet\Shared\Xls::sizeRow($this->phpSheet, $startRow) / 256;
+                    $offsetX = (int) ($startOffsetX * SharedXls::sizeCol($this->phpSheet, $startColumn) / 1024);
+                    $offsetY = (int) ($startOffsetY * SharedXls::sizeRow($this->phpSheet, $startRow) / 256);
 
                     switch ($obj['otObjType']) {
                         case 0x19:
                             // Note
                             if (isset($this->cellNotes[$obj['idObjID']])) {
-                                $cellNote = $this->cellNotes[$obj['idObjID']];
+                                //$cellNote = $this->cellNotes[$obj['idObjID']];
 
                                 if (isset($this->textObjects[$obj['idObjID']])) {
                                     $textObject = $this->textObjects[$obj['idObjID']];
@@ -1136,38 +1038,42 @@ public function load($pFilename)
                             }
 
                             if ($escherWorkbook) {
-                                $BSECollection = $escherWorkbook->getDggContainer()->getBstoreContainer()->getBSECollection();
+                                $BSECollection = method_exists($escherWorkbook, 'getDggContainer') ? $escherWorkbook->getDggContainer()->getBstoreContainer()->getBSECollection() : [];
                                 $BSE = $BSECollection[$BSEindex - 1];
                                 $blipType = $BSE->getBlipType();
 
                                 // need check because some blip types are not supported by Escher reader such as EMF
                                 if ($blip = $BSE->getBlip()) {
                                     $ih = imagecreatefromstring($blip->getData());
-                                    $drawing = new MemoryDrawing();
-                                    $drawing->setImageResource($ih);
-
-                                    // width, height, offsetX, offsetY
-                                    $drawing->setResizeProportional(false);
-                                    $drawing->setWidth($width);
-                                    $drawing->setHeight($height);
-                                    $drawing->setOffsetX($offsetX);
-                                    $drawing->setOffsetY($offsetY);
-
-                                    switch ($blipType) {
-                                        case BSE::BLIPTYPE_JPEG:
-                                            $drawing->setRenderingFunction(MemoryDrawing::RENDERING_JPEG);
-                                            $drawing->setMimeType(MemoryDrawing::MIMETYPE_JPEG);
-
-                                            break;
-                                        case BSE::BLIPTYPE_PNG:
-                                            $drawing->setRenderingFunction(MemoryDrawing::RENDERING_PNG);
-                                            $drawing->setMimeType(MemoryDrawing::MIMETYPE_PNG);
-
-                                            break;
-                                    }
+                                    if ($ih !== false) {
+                                        $drawing = new MemoryDrawing();
+                                        $drawing->setImageResource($ih);
+
+                                        // width, height, offsetX, offsetY
+                                        $drawing->setResizeProportional(false);
+                                        $drawing->setWidth($width);
+                                        $drawing->setHeight($height);
+                                        $drawing->setOffsetX($offsetX);
+                                        $drawing->setOffsetY($offsetY);
+
+                                        switch ($blipType) {
+                                            case BSE::BLIPTYPE_JPEG:
+                                                $drawing->setRenderingFunction(MemoryDrawing::RENDERING_JPEG);
+                                                $drawing->setMimeType(MemoryDrawing::MIMETYPE_JPEG);
+
+                                                break;
+                                            case BSE::BLIPTYPE_PNG:
+                                                imagealphablending($ih, false);
+                                                imagesavealpha($ih, true);
+                                                $drawing->setRenderingFunction(MemoryDrawing::RENDERING_PNG);
+                                                $drawing->setMimeType(MemoryDrawing::MIMETYPE_PNG);
+
+                                                break;
+                                        }
 
-                                    $drawing->setWorksheet($this->phpSheet);
-                                    $drawing->setCoordinates($spContainer->getStartCoordinates());
+                                        $drawing->setWorksheet($this->phpSheet);
+                                        $drawing->setCoordinates($spContainer->getStartCoordinates());
+                                    }
                                 }
                             }
 
@@ -1182,6 +1088,7 @@ public function load($pFilename)
             // treat SHAREDFMLA records
             if ($this->version == self::XLS_BIFF8) {
                 foreach ($this->sharedFormulaParts as $cell => $baseCell) {
+                    /** @var int $row */
                     [$column, $row] = Coordinate::coordinateFromString($cell);
                     if (($this->getReadFilter() !== null) && $this->getReadFilter()->readCell($column, $row, $this->phpSheet->getTitle())) {
                         $formula = $this->getFormulaFromStructure($this->sharedFormulas[$baseCell], $cell);
@@ -1204,6 +1111,12 @@ public function load($pFilename)
                     $this->phpSheet->getComment($cellAddress)->setAuthor($noteDetails['author'])->setText($this->parseRichText($noteDetails['objTextData']['text']));
                 }
             }
+            if ($selectedCells !== '') {
+                $this->phpSheet->setSelectedCells($selectedCells);
+            }
+        }
+        if ($this->activeSheetSet === false) {
+            $this->spreadsheet->setActiveSheetIndex(0);
         }
 
         // add the named ranges (defined names)
@@ -1216,18 +1129,18 @@ public function load($pFilename)
                         $ranges = explode(',', $definedName['formula']); // FIXME: what if sheetname contains comma?
 
                         $extractedRanges = [];
+                        $sheetName = '';
+                        /** @var non-empty-string $range */
                         foreach ($ranges as $range) {
                             // $range should look like one of these
                             //        Foo!$C$7:$J$66
                             //        Bar!$A$1:$IV$2
                             $explodes = Worksheet::extractSheetTitle($range, true);
                             $sheetName = trim($explodes[0], "'");
-                            if (count($explodes) == 2) {
-                                if (strpos($explodes[1], ':') === false) {
-                                    $explodes[1] = $explodes[1] . ':' . $explodes[1];
-                                }
-                                $extractedRanges[] = str_replace('$', '', $explodes[1]); // C7:J66
+                            if (!str_contains($explodes[1], ':')) {
+                                $explodes[1] = $explodes[1] . ':' . $explodes[1];
                             }
+                            $extractedRanges[] = str_replace('$', '', $explodes[1]); // C7:J66
                         }
                         if ($docSheet = $this->spreadsheet->getSheetByName($sheetName)) {
                             $docSheet->getPageSetup()->setPrintArea(implode(',', $extractedRanges)); // C7:J66,A1:IV2
@@ -1250,7 +1163,7 @@ public function load($pFilename)
                             // $range should look like this one of these
                             //        Sheet!$A$1:$B$65536
                             //        Sheet!$A$1:$IV$2
-                            if (strpos($range, '!') !== false) {
+                            if (str_contains($range, '!')) {
                                 $explodes = Worksheet::extractSheetTitle($range, true);
                                 if ($docSheet = $this->spreadsheet->getSheetByName($explodes[0])) {
                                     $extractedRange = $explodes[1];
@@ -1277,18 +1190,19 @@ public function load($pFilename)
                 }
             } else {
                 // Extract range
-                if (strpos($definedName['formula'], '!') !== false) {
-                    $explodes = Worksheet::extractSheetTitle($definedName['formula'], true);
+                /** @var non-empty-string $formula */
+                $formula = $definedName['formula'];
+                if (str_contains($formula, '!')) {
+                    $explodes = Worksheet::extractSheetTitle($formula, true);
                     if (
-                        ($docSheet = $this->spreadsheet->getSheetByName($explodes[0])) ||
-                        ($docSheet = $this->spreadsheet->getSheetByName(trim($explodes[0], "'")))
+                        ($docSheet = $this->spreadsheet->getSheetByName($explodes[0]))
+                        || ($docSheet = $this->spreadsheet->getSheetByName(trim($explodes[0], "'")))
                     ) {
                         $extractedRange = $explodes[1];
-                        $extractedRange = str_replace('$', '', $extractedRange);
 
-                        $localOnly = ($definedName['scope'] == 0) ? false : true;
+                        $localOnly = ($definedName['scope'] === 0) ? false : true;
 
-                        $scope = ($definedName['scope'] == 0) ? null : $this->spreadsheet->getSheetByName($this->sheets[$definedName['scope'] - 1]['name']);
+                        $scope = ($definedName['scope'] === 0) ? null : $this->spreadsheet->getSheetByName($this->sheets[$definedName['scope'] - 1]['name']);
 
                         $this->spreadsheet->addNamedRange(new NamedRange((string) $definedName['name'], $docSheet, $extractedRange, $localOnly, $scope));
                     }
@@ -1311,7 +1225,7 @@ public function load($pFilename)
      *
      * @return string Record data
      */
-    private function readRecordData($data, $pos, $len)
+    private function readRecordData(string $data, int $pos, int $len): string
     {
         $data = substr($data, $pos, $len);
 
@@ -1323,8 +1237,8 @@ private function readRecordData($data, $pos, $len)
         $recordData = '';
         if ($this->encryption == self::MS_BIFF_CRYPTO_RC4) {
             $oldBlock = floor($this->rc4Pos / self::REKEY_BLOCK);
-            $block = floor($pos / self::REKEY_BLOCK);
-            $endBlock = floor(($pos + $len) / self::REKEY_BLOCK);
+            $block = (int) floor($pos / self::REKEY_BLOCK);
+            $endBlock = (int) floor(($pos + $len) / self::REKEY_BLOCK);
 
             // Spin an RC4 decryptor to the right spot. If we have a decryptor sitting
             // at a point earlier in the current block, re-use it as we can save some time.
@@ -1360,17 +1274,15 @@ private function readRecordData($data, $pos, $len)
 
     /**
      * Use OLE reader to extract the relevant data streams from the OLE file.
-     *
-     * @param string $pFilename
      */
-    private function loadOLE($pFilename): void
+    private function loadOLE(string $filename): void
     {
         // OLE reader
         $ole = new OLERead();
         // get excel data,
-        $ole->read($pFilename);
+        $ole->read($filename);
         // Get workbook data: workbook stream + sheet streams
-        $this->data = $ole->getStream($ole->wrkbook);
+        $this->data = $ole->getStream($ole->wrkbook); // @phpstan-ignore-line
         // Get summary information data
         $this->summaryInformation = $ole->getStream($ole->summaryInformation);
         // Get additional document summary information data
@@ -1392,7 +1304,7 @@ private function readSummaryInformation(): void
         // offset: 6; size: 2; OS indicator
         // offset: 8; size: 16
         // offset: 24; size: 4; section count
-        $secCount = self::getInt4d($this->summaryInformation, 24);
+        //$secCount = self::getInt4d($this->summaryInformation, 24);
 
         // offset: 28; size: 16; first section's class id: e0 85 9f f2 f9 4f 68 10 ab 91 08 00 2b 27 b3 d9
         // offset: 44; size: 4
@@ -1400,7 +1312,7 @@ private function readSummaryInformation(): void
 
         // section header
         // offset: $secOffset; size: 4; section length
-        $secLength = self::getInt4d($this->summaryInformation, $secOffset);
+        //$secLength = self::getInt4d($this->summaryInformation, $secOffset);
 
         // offset: $secOffset+4; size: 4; property count
         $countProperties = self::getInt4d($this->summaryInformation, $secOffset + 4);
@@ -1539,7 +1451,7 @@ private function readDocumentSummaryInformation(): void
         //    offset: 6;    size: 2;    OS indicator
         //    offset: 8;    size: 16
         //    offset: 24;    size: 4;    section count
-        $secCount = self::getInt4d($this->documentSummaryInformation, 24);
+        //$secCount = self::getInt4d($this->documentSummaryInformation, 24);
 
         // offset: 28;    size: 16;    first section's class id: 02 d5 cd d5 9c 2e 1b 10 93 97 08 00 2b 2c f9 ae
         // offset: 44;    size: 4;    first section offset
@@ -1547,7 +1459,7 @@ private function readDocumentSummaryInformation(): void
 
         //    section header
         //    offset: $secOffset;    size: 4;    section length
-        $secLength = self::getInt4d($this->documentSummaryInformation, $secOffset);
+        //$secLength = self::getInt4d($this->documentSummaryInformation, $secOffset);
 
         //    offset: $secOffset+4;    size: 4;    property count
         $countProperties = self::getInt4d($this->documentSummaryInformation, $secOffset + 4);
@@ -1705,14 +1617,14 @@ private function readNote(): void
                 //    If the address row is -1 and the column is 0, (which translates as $B$65536) then this is a continuation
                 //        note from the previous cell annotation. We're not yet handling this, so annotations longer than the
                 //        max 2048 bytes will probably throw a wobbly.
-                $row = self::getUInt2d($recordData, 0);
+                //$row = self::getUInt2d($recordData, 0);
                 $extension = true;
                 $arrayKeys = array_keys($this->phpSheet->getComments());
                 $cellAddress = array_pop($arrayKeys);
             }
 
-            $cellAddress = str_replace('$', '', $cellAddress);
-            $noteLength = self::getUInt2d($recordData, 4);
+            $cellAddress = str_replace('$', '', (string) $cellAddress);
+            //$noteLength = self::getUInt2d($recordData, 4);
             $noteText = trim(substr($recordData, 6));
 
             if ($extension) {
@@ -1751,7 +1663,7 @@ private function readTextObject(): void
         // followed by the continuation records containing the actual text and formatting
         $grbitOpts = self::getUInt2d($recordData, 0);
         $rot = self::getUInt2d($recordData, 2);
-        $cchText = self::getUInt2d($recordData, 10);
+        //$cchText = self::getUInt2d($recordData, 10);
         $cbRuns = self::getUInt2d($recordData, 12);
         $text = $this->getSplicedRecordData();
 
@@ -1857,10 +1769,8 @@ private function readFilepass(): void
      *
      * @param int $block Block for which to create decrypto
      * @param string $valContext MD5 context state
-     *
-     * @return Xls\RC4
      */
-    private function makeKey($block, $valContext)
+    private function makeKey(int $block, string $valContext): Xls\RC4
     {
         $pwarray = str_repeat("\0", 64);
 
@@ -1868,10 +1778,10 @@ private function makeKey($block, $valContext)
             $pwarray[$i] = $valContext[$i];
         }
 
-        $pwarray[5] = chr($block & 0xff);
-        $pwarray[6] = chr(($block >> 8) & 0xff);
-        $pwarray[7] = chr(($block >> 16) & 0xff);
-        $pwarray[8] = chr(($block >> 24) & 0xff);
+        $pwarray[5] = chr($block & 0xFF);
+        $pwarray[6] = chr(($block >> 8) & 0xFF);
+        $pwarray[7] = chr(($block >> 16) & 0xFF);
+        $pwarray[8] = chr(($block >> 24) & 0xFF);
 
         $pwarray[9] = "\x80";
         $pwarray[56] = "\x48";
@@ -1895,18 +1805,18 @@ private function makeKey($block, $valContext)
      *
      * @return bool Success
      */
-    private function verifyPassword($password, $docid, $salt_data, $hashedsalt_data, &$valContext)
+    private function verifyPassword(string $password, string $docid, string $salt_data, string $hashedsalt_data, string &$valContext): bool
     {
         $pwarray = str_repeat("\0", 64);
 
         $iMax = strlen($password);
         for ($i = 0; $i < $iMax; ++$i) {
             $o = ord(substr($password, $i, 1));
-            $pwarray[2 * $i] = chr($o & 0xff);
-            $pwarray[2 * $i + 1] = chr(($o >> 8) & 0xff);
+            $pwarray[2 * $i] = chr($o & 0xFF);
+            $pwarray[2 * $i + 1] = chr(($o >> 8) & 0xFF);
         }
         $pwarray[2 * $i] = chr(0x80);
-        $pwarray[56] = chr(($i << 4) & 0xff);
+        $pwarray[56] = chr(($i << 4) & 0xFF);
 
         $md5 = new Xls\MD5();
         $md5->add($pwarray);
@@ -2015,8 +1925,10 @@ private function readDateMode(): void
 
         // offset: 0; size: 2; 0 = base 1900, 1 = base 1904
         Date::setExcelCalendar(Date::CALENDAR_WINDOWS_1900);
+        $this->spreadsheet->setExcelCalendar(Date::CALENDAR_WINDOWS_1900);
         if (ord($recordData[0]) == 1) {
             Date::setExcelCalendar(Date::CALENDAR_MAC_1904);
+            $this->spreadsheet->setExcelCalendar(Date::CALENDAR_MAC_1904);
         }
     }
 
@@ -2058,12 +1970,9 @@ private function readFont(): void
             $objFont->colorIndex = $colorIndex;
 
             // offset: 6; size: 2; font weight
-            $weight = self::getUInt2d($recordData, 6);
-            switch ($weight) {
-                case 0x02BC:
-                    $objFont->setBold(true);
-
-                    break;
+            $weight = self::getUInt2d($recordData, 6); // regular=400 bold=700
+            if ($weight >= 550) {
+                $objFont->setBold(true);
             }
 
             // offset: 8; size: 2; escapement type
@@ -2122,6 +2031,10 @@ private function readFormat(): void
             }
 
             $formatString = $string['value'];
+            // Apache Open Office sets wrong case writing to xls - issue 2239
+            if ($formatString === 'GENERAL') {
+                $formatString = NumberFormat::FORMAT_GENERAL;
+            }
             $this->formats[$indexCode] = $formatString;
         }
     }
@@ -2159,7 +2072,9 @@ private function readXf(): void
                 // check the OpenOffice documentation of the FONT record
                 $fontIndex = self::getUInt2d($recordData, 0) - 1;
             }
-            $objStyle->setFont($this->objFonts[$fontIndex]);
+            if (isset($this->objFonts[$fontIndex])) {
+                $objStyle->setFont($this->objFonts[$fontIndex]);
+            }
 
             // offset:  2; size: 2; Index to FORMAT record
             $numberFormatIndex = self::getUInt2d($recordData, 2);
@@ -2171,7 +2086,7 @@ private function readXf(): void
                 $numberFormat = ['formatCode' => $code];
             } else {
                 // we set the general format code
-                $numberFormat = ['formatCode' => 'General'];
+                $numberFormat = ['formatCode' => NumberFormat::FORMAT_GENERAL];
             }
             $objStyle->getNumberFormat()->setFormatCode($numberFormat['formatCode']);
 
@@ -2261,16 +2176,18 @@ private function readXf(): void
                 // bit: 30; mask: 0x40000000; 1 = diagonal line from top left to right bottom
                 $diagonalDown = (0x40000000 & self::getInt4d($recordData, 10)) >> 30 ? true : false;
 
-                // bit: 31; mask: 0x80000000; 1 = diagonal line from bottom left to top right
-                $diagonalUp = (0x80000000 & self::getInt4d($recordData, 10)) >> 31 ? true : false;
+                // bit: 31; mask: 0x800000; 1 = diagonal line from bottom left to top right
+                $diagonalUp = (self::HIGH_ORDER_BIT & self::getInt4d($recordData, 10)) >> 31 ? true : false;
 
-                if ($diagonalUp == false && $diagonalDown == false) {
-                    $objStyle->getBorders()->setDiagonalDirection(Borders::DIAGONAL_NONE);
-                } elseif ($diagonalUp == true && $diagonalDown == false) {
+                if ($diagonalUp === false) {
+                    if ($diagonalDown === false) {
+                        $objStyle->getBorders()->setDiagonalDirection(Borders::DIAGONAL_NONE);
+                    } else {
+                        $objStyle->getBorders()->setDiagonalDirection(Borders::DIAGONAL_DOWN);
+                    }
+                } elseif ($diagonalDown === false) {
                     $objStyle->getBorders()->setDiagonalDirection(Borders::DIAGONAL_UP);
-                } elseif ($diagonalUp == false && $diagonalDown == true) {
-                    $objStyle->getBorders()->setDiagonalDirection(Borders::DIAGONAL_DOWN);
-                } elseif ($diagonalUp == true && $diagonalDown == true) {
+                } else {
                     $objStyle->getBorders()->setDiagonalDirection(Borders::DIAGONAL_BOTH);
                 }
 
@@ -2290,7 +2207,7 @@ private function readXf(): void
                 }
 
                 // bit: 31-26; mask: 0xFC000000 fill pattern
-                if ($fillType = Xls\Style\FillPattern::lookup((0xFC000000 & self::getInt4d($recordData, 14)) >> 26)) {
+                if ($fillType = FillPattern::lookup((self::FC000000 & self::getInt4d($recordData, 14)) >> 26)) {
                     $objStyle->getFill()->setFillType($fillType);
                 }
                 // offset: 18; size: 2; pattern and background colour
@@ -2336,13 +2253,13 @@ private function readXf(): void
                 $objStyle->getFill()->endcolorIndex = (0x00003F80 & $borderAndBackground) >> 7;
 
                 // bit: 21-16; mask: 0x003F0000; fill pattern
-                $objStyle->getFill()->setFillType(Xls\Style\FillPattern::lookup((0x003F0000 & $borderAndBackground) >> 16));
+                $objStyle->getFill()->setFillType(FillPattern::lookup((0x003F0000 & $borderAndBackground) >> 16));
 
                 // bit: 24-22; mask: 0x01C00000; bottom line style
                 $objStyle->getBorders()->getBottom()->setBorderStyle(Xls\Style\Border::lookup((0x01C00000 & $borderAndBackground) >> 22));
 
                 // bit: 31-25; mask: 0xFE000000; bottom line color
-                $objStyle->getBorders()->getBottom()->colorIndex = (0xFE000000 & $borderAndBackground) >> 25;
+                $objStyle->getBorders()->getBottom()->colorIndex = (self::FE000000 & $borderAndBackground) >> 25;
 
                 // offset: 12; size: 4; cell border lines
                 $borderLines = self::getInt4d($recordData, 12);
@@ -2407,7 +2324,7 @@ private function readXfExt(): void
             // offset: 16; size: 2; not used
 
             // offset: 18; size: 2; number of extension properties that follow
-            $cexts = self::getUInt2d($recordData, 18);
+            //$cexts = self::getUInt2d($recordData, 18);
 
             // start reading the actual extension data
             $offset = 20;
@@ -2573,7 +2490,7 @@ private function readStyle(): void
             $ixfe = self::getUInt2d($recordData, 0);
 
             // bit: 11-0; mask 0x0FFF; index to XF record
-            $xfIndex = (0x0FFF & $ixfe) >> 0;
+            //$xfIndex = (0x0FFF & $ixfe) >> 0;
 
             // bit: 15; mask 0x8000; 0 = user-defined style, 1 = built-in style
             $isBuiltIn = (bool) ((0x8000 & $ixfe) >> 15);
@@ -2642,24 +2559,12 @@ private function readSheet(): void
         $this->pos += 4 + $length;
 
         // offset: 4; size: 1; sheet state
-        switch (ord($recordData[4])) {
-            case 0x00:
-                $sheetState = Worksheet::SHEETSTATE_VISIBLE;
-
-                break;
-            case 0x01:
-                $sheetState = Worksheet::SHEETSTATE_HIDDEN;
-
-                break;
-            case 0x02:
-                $sheetState = Worksheet::SHEETSTATE_VERYHIDDEN;
-
-                break;
-            default:
-                $sheetState = Worksheet::SHEETSTATE_VISIBLE;
-
-                break;
-        }
+        $sheetState = match (ord($recordData[4])) {
+            0x00 => Worksheet::SHEETSTATE_VISIBLE,
+            0x01 => Worksheet::SHEETSTATE_HIDDEN,
+            0x02 => Worksheet::SHEETSTATE_VERYHIDDEN,
+            default => Worksheet::SHEETSTATE_VISIBLE,
+        };
 
         // offset: 5; size: 1; sheet type
         $sheetType = ord($recordData[5]);
@@ -2758,7 +2663,7 @@ private function readExternName(): void
         // external sheet references provided for named cells
         if ($this->version == self::XLS_BIFF8) {
             // offset: 0; size: 2; options
-            $options = self::getUInt2d($recordData, 0);
+            //$options = self::getUInt2d($recordData, 0);
 
             // offset: 2; size: 2;
 
@@ -2855,8 +2760,9 @@ private function readDefinedName(): void
 
             try {
                 $formula = $this->getFormulaFromStructure($formulaStructure);
-            } catch (PhpSpreadsheetException $e) {
+            } catch (PhpSpreadsheetException) {
                 $formula = '';
+                $isBuiltInName = 0;
             }
 
             $this->definedname[] = [
@@ -2873,7 +2779,7 @@ private function readDefinedName(): void
      */
     private function readMsoDrawingGroup(): void
     {
-        $length = self::getUInt2d($this->data, $this->pos + 2);
+        //$length = self::getUInt2d($this->data, $this->pos + 2);
 
         // get spliced record data
         $splicedRecordData = $this->getSplicedRecordData();
@@ -3136,11 +3042,11 @@ private function readSheetPr(): void
 
         // bit: 6; mask: 0x0040; 0 = outline buttons above outline group
         $isSummaryBelow = (0x0040 & self::getUInt2d($recordData, 0)) >> 6;
-        $this->phpSheet->setShowSummaryBelow($isSummaryBelow);
+        $this->phpSheet->setShowSummaryBelow((bool) $isSummaryBelow);
 
         // bit: 7; mask: 0x0080; 0 = outline buttons left of outline group
         $isSummaryRight = (0x0080 & self::getUInt2d($recordData, 0)) >> 7;
-        $this->phpSheet->setShowSummaryRight($isSummaryRight);
+        $this->phpSheet->setShowSummaryRight((bool) $isSummaryRight);
 
         // bit: 8; mask: 0x100; 0 = scale printout in percent, 1 = fit printout to number of pages
         // this corresponds to radio button setting in page setup dialog in Excel
@@ -3166,10 +3072,10 @@ private function readHorizontalPageBreaks(): void
             for ($i = 0; $i < $nm; ++$i) {
                 $r = self::getUInt2d($recordData, 2 + 6 * $i);
                 $cf = self::getUInt2d($recordData, 2 + 6 * $i + 2);
-                $cl = self::getUInt2d($recordData, 2 + 6 * $i + 4);
+                //$cl = self::getUInt2d($recordData, 2 + 6 * $i + 4);
 
                 // not sure why two column indexes are necessary?
-                $this->phpSheet->setBreakByColumnAndRow($cf + 1, $r, Worksheet::BREAK_ROW);
+                $this->phpSheet->setBreak([$cf + 1, $r], Worksheet::BREAK_ROW);
             }
         }
     }
@@ -3193,10 +3099,10 @@ private function readVerticalPageBreaks(): void
             for ($i = 0; $i < $nm; ++$i) {
                 $c = self::getUInt2d($recordData, 2 + 6 * $i);
                 $rf = self::getUInt2d($recordData, 2 + 6 * $i + 2);
-                $rl = self::getUInt2d($recordData, 2 + 6 * $i + 4);
+                //$rl = self::getUInt2d($recordData, 2 + 6 * $i + 4);
 
                 // not sure why two row indexes are necessary?
-                $this->phpSheet->setBreakByColumnAndRow($c + 1, $rf, Worksheet::BREAK_COLUMN);
+                $this->phpSheet->setBreak([$c + 1, ($rf > 0) ? $rf : 1], Worksheet::BREAK_COLUMN);
             }
         }
     }
@@ -3713,7 +3619,7 @@ private function readLabelSst(): void
         $column = self::getUInt2d($recordData, 2);
         $columnString = Coordinate::stringFromColumnIndex($column + 1);
 
-        $emptyCell = true;
+        $cell = null;
         // Read cell?
         if (($this->getReadFilter() !== null) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->phpSheet->getTitle())) {
             // offset: 4; size: 2; index to XF record
@@ -3745,10 +3651,13 @@ private function readLabelSst(): void
                                 if ($fmtRuns[$i - 1]['fontIndex'] < 4) {
                                     $fontIndex = $fmtRuns[$i - 1]['fontIndex'];
                                 } else {
-                                    // this has to do with that index 4 is omitted in all BIFF versions for some strange reason
+                                    // this has to do with that index 4 is omitted in all BIFF versions for some stra          nge reason
                                     // check the OpenOffice documentation of the FONT record
                                     $fontIndex = $fmtRuns[$i - 1]['fontIndex'] - 1;
                                 }
+                                if (array_key_exists($fontIndex, $this->objFonts) === false) {
+                                    $fontIndex = count($this->objFonts) - 1;
+                                }
                                 $textRun->setFont(clone $this->objFonts[$fontIndex]);
                             }
                         }
@@ -3757,17 +3666,15 @@ private function readLabelSst(): void
                 if ($this->readEmptyCells || trim($richText->getPlainText()) !== '') {
                     $cell = $this->phpSheet->getCell($columnString . ($row + 1));
                     $cell->setValueExplicit($richText, DataType::TYPE_STRING);
-                    $emptyCell = false;
                 }
             } else {
                 if ($this->readEmptyCells || trim($this->sst[$index]['value']) !== '') {
                     $cell = $this->phpSheet->getCell($columnString . ($row + 1));
                     $cell->setValueExplicit($this->sst[$index]['value'], DataType::TYPE_STRING);
-                    $emptyCell = false;
                 }
             }
 
-            if (!$this->readDataOnly && !$emptyCell && isset($this->mapCellXfIndex[$xfIndex])) {
+            if (!$this->readDataOnly && $cell !== null && isset($this->mapCellXfIndex[$xfIndex])) {
                 // add style information
                 $cell->setXfIndex($this->mapCellXfIndex[$xfIndex]);
             }
@@ -3987,7 +3894,7 @@ private function readFormula(): void
                     }
                     $formula = $this->getFormulaFromStructure($formulaStructure); // get formula in human language
                     $cell->setValueExplicit('=' . $formula, DataType::TYPE_FORMULA);
-                } catch (PhpSpreadsheetException $e) {
+                } catch (PhpSpreadsheetException) {
                     $cell->setValueExplicit($value, $dataType);
                 }
             } else {
@@ -3999,7 +3906,7 @@ private function readFormula(): void
             }
 
             // store the cached calculated value
-            $cell->setCalculatedValue($value);
+            $cell->setCalculatedValue($value, $dataType === DataType::TYPE_NUMERIC);
         }
     }
 
@@ -4017,13 +3924,13 @@ private function readSharedFmla(): void
         $this->pos += 4 + $length;
 
         // offset: 0, size: 6; cell range address of the area used by the shared formula, not used for anything
-        $cellRange = substr($recordData, 0, 6);
-        $cellRange = $this->readBIFF5CellRangeAddressFixed($cellRange); // note: even BIFF8 uses BIFF5 syntax
+        //$cellRange = substr($recordData, 0, 6);
+        //$cellRange = $this->readBIFF5CellRangeAddressFixed($cellRange); // note: even BIFF8 uses BIFF5 syntax
 
         // offset: 6, size: 1; not used
 
         // offset: 7, size: 1; number of existing FORMULA records for this shared formula
-        $no = ord($recordData[7]);
+        //$no = ord($recordData[7]);
 
         // offset: 8, size: var; Binary token array of the shared formula
         $formula = substr($recordData, 8);
@@ -4039,7 +3946,7 @@ private function readSharedFmla(): void
      *
      * @return string The string contents as UTF-8
      */
-    private function readString()
+    private function readString(): string
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -4244,7 +4151,7 @@ private function readBlank(): void
      */
     private function readMsoDrawing(): void
     {
-        $length = self::getUInt2d($this->data, $this->pos + 2);
+        //$length = self::getUInt2d($this->data, $this->pos + 2);
 
         // get spliced record data
         $splicedRecordData = $this->getSplicedRecordData();
@@ -4308,10 +4215,10 @@ private function readWindow2(): void
         $options = self::getUInt2d($recordData, 0);
 
         // offset: 2; size: 2; index to first visible row
-        $firstVisibleRow = self::getUInt2d($recordData, 2);
+        //$firstVisibleRow = self::getUInt2d($recordData, 2);
 
         // offset: 4; size: 2; index to first visible colum
-        $firstVisibleColumn = self::getUInt2d($recordData, 4);
+        //$firstVisibleColumn = self::getUInt2d($recordData, 4);
         $zoomscaleInPageBreakPreview = 0;
         $zoomscaleInNormalView = 0;
         if ($this->version === self::XLS_BIFF8) {
@@ -4358,6 +4265,7 @@ private function readWindow2(): void
         $isActive = (bool) ((0x0400 & $options) >> 10);
         if ($isActive) {
             $this->spreadsheet->setActiveSheetIndex($this->spreadsheet->getIndex($this->phpSheet));
+            $this->activeSheetSet = true;
         }
 
         // bit: 11; mask: 0x0800; 0 = normal view, 1 = page break view
@@ -4390,10 +4298,10 @@ private function readPageLayoutView(): void
 
         // offset: 0; size: 2; rt
         //->ignore
-        $rt = self::getUInt2d($recordData, 0);
+        //$rt = self::getUInt2d($recordData, 0);
         // offset: 2; size: 2; grbitfr
         //->ignore
-        $grbitFrt = self::getUInt2d($recordData, 2);
+        //$grbitFrt = self::getUInt2d($recordData, 2);
         // offset: 4; size: 8; reserved
         //->ignore
 
@@ -4404,8 +4312,8 @@ private function readPageLayoutView(): void
 
         // decomprise grbit
         $fPageLayoutView = $grbit & 0x01;
-        $fRulerVisible = ($grbit >> 1) & 0x01; //no support
-        $fWhitespaceHidden = ($grbit >> 3) & 0x01; //no support
+        //$fRulerVisible = ($grbit >> 1) & 0x01; //no support
+        //$fWhitespaceHidden = ($grbit >> 3) & 0x01; //no support
 
         if ($fPageLayoutView === 1) {
             $this->phpSheet->getSheetView()->setView(SheetView::SHEETVIEW_PAGE_LAYOUT);
@@ -4472,27 +4380,28 @@ private function readPane(): void
     /**
      * Read SELECTION record. There is one such record for each pane in the sheet.
      */
-    private function readSelection(): void
+    private function readSelection(): string
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
         $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+        $selectedCells = '';
 
         // move stream pointer to next record
         $this->pos += 4 + $length;
 
         if (!$this->readDataOnly) {
             // offset: 0; size: 1; pane identifier
-            $paneId = ord($recordData[0]);
+            //$paneId = ord($recordData[0]);
 
             // offset: 1; size: 2; index to row of the active cell
-            $r = self::getUInt2d($recordData, 1);
+            //$r = self::getUInt2d($recordData, 1);
 
             // offset: 3; size: 2; index to column of the active cell
-            $c = self::getUInt2d($recordData, 3);
+            //$c = self::getUInt2d($recordData, 3);
 
             // offset: 5; size: 2; index into the following cell range list to the
             //  entry that contains the active cell
-            $index = self::getUInt2d($recordData, 5);
+            //$index = self::getUInt2d($recordData, 5);
 
             // offset: 7; size: var; cell range address list containing all selected cell ranges
             $data = substr($recordData, 7);
@@ -4502,24 +4411,26 @@ private function readSelection(): void
 
             // first row '1' + last row '16384' indicates that full column is selected (apparently also in BIFF8!)
             if (preg_match('/^([A-Z]+1\:[A-Z]+)16384$/', $selectedCells)) {
-                $selectedCells = preg_replace('/^([A-Z]+1\:[A-Z]+)16384$/', '${1}1048576', $selectedCells);
+                $selectedCells = (string) preg_replace('/^([A-Z]+1\:[A-Z]+)16384$/', '${1}1048576', $selectedCells);
             }
 
             // first row '1' + last row '65536' indicates that full column is selected
             if (preg_match('/^([A-Z]+1\:[A-Z]+)65536$/', $selectedCells)) {
-                $selectedCells = preg_replace('/^([A-Z]+1\:[A-Z]+)65536$/', '${1}1048576', $selectedCells);
+                $selectedCells = (string) preg_replace('/^([A-Z]+1\:[A-Z]+)65536$/', '${1}1048576', $selectedCells);
             }
 
             // first column 'A' + last column 'IV' indicates that full row is selected
             if (preg_match('/^(A\d+\:)IV(\d+)$/', $selectedCells)) {
-                $selectedCells = preg_replace('/^(A\d+\:)IV(\d+)$/', '${1}XFD${2}', $selectedCells);
+                $selectedCells = (string) preg_replace('/^(A\d+\:)IV(\d+)$/', '${1}XFD${2}', $selectedCells);
             }
 
             $this->phpSheet->setSelectedCells($selectedCells);
         }
+
+        return $selectedCells;
     }
 
-    private function includeCellRangeFiltered($cellRangeAddress)
+    private function includeCellRangeFiltered(string $cellRangeAddress): bool
     {
         $includeCellRange = true;
         if ($this->getReadFilter() !== null) {
@@ -4561,10 +4472,10 @@ private function readMergedCells(): void
             $cellRangeAddressList = $this->readBIFF8CellRangeAddressList($recordData);
             foreach ($cellRangeAddressList['cellRangeAddresses'] as $cellRangeAddress) {
                 if (
-                    (strpos($cellRangeAddress, ':') !== false) &&
-                    ($this->includeCellRangeFiltered($cellRangeAddress))
+                    (str_contains($cellRangeAddress, ':'))
+                    && ($this->includeCellRangeFiltered($cellRangeAddress))
                 ) {
-                    $this->phpSheet->mergeCells($cellRangeAddress);
+                    $this->phpSheet->mergeCells($cellRangeAddress, Worksheet::MERGE_CELL_CONTENT_HIDE);
                 }
             }
         }
@@ -4585,7 +4496,7 @@ private function readHyperLink(): void
             // offset: 0; size: 8; cell range address of all cells containing this hyperlink
             try {
                 $cellRange = $this->readBIFF8CellRangeAddressFixed($recordData);
-            } catch (PhpSpreadsheetException $e) {
+            } catch (PhpSpreadsheetException) {
                 return;
             }
 
@@ -4598,7 +4509,7 @@ private function readHyperLink(): void
             $isFileLinkOrUrl = (0x00000001 & self::getUInt2d($recordData, 28)) >> 0;
 
             // bit: 1; mask: 0x00000002; 0 = relative path, 1 = absolute path or URL
-            $isAbsPathOrUrl = (0x00000001 & self::getUInt2d($recordData, 28)) >> 1;
+            //$isAbsPathOrUrl = (0x00000001 & self::getUInt2d($recordData, 28)) >> 1;
 
             // bit: 2 (and 4); mask: 0x00000014; 0 = no description
             $hasDesc = (0x00000014 & self::getUInt2d($recordData, 28)) >> 2;
@@ -4619,7 +4530,7 @@ private function readHyperLink(): void
                 // offset: 32; size: var; character count of description text
                 $dl = self::getInt4d($recordData, 32);
                 // offset: 36; size: var; character array of description text, no Unicode string header, always 16-bit characters, zero terminated
-                $desc = self::encodeUTF16(substr($recordData, 36, 2 * ($dl - 1)), false);
+                //$desc = self::encodeUTF16(substr($recordData, 36, 2 * ($dl - 1)), false);
                 $offset += 4 + 2 * $dl;
             }
             if ($hasFrame) {
@@ -4692,6 +4603,7 @@ private function readHyperLink(): void
                     $sz = self::getInt4d($recordData, $offset);
                     $offset += 4;
 
+                    $extendedFilePath = '';
                     // only present if $sz > 0
                     if ($sz > 0) {
                         // offset: var; size: 4; size of the character array of the extended file path and name
@@ -4749,7 +4661,7 @@ private function readHyperLink(): void
     private function readDataValidations(): void
     {
         $length = self::getUInt2d($this->data, $this->pos + 2);
-        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+        //$recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
 
         // move stream pointer forward to next record
         $this->pos += 4 + $length;
@@ -4775,61 +4687,15 @@ private function readDataValidation(): void
 
         // bit: 0-3; mask: 0x0000000F; type
         $type = (0x0000000F & $options) >> 0;
-        switch ($type) {
-            case 0x00:
-                $type = DataValidation::TYPE_NONE;
-
-                break;
-            case 0x01:
-                $type = DataValidation::TYPE_WHOLE;
-
-                break;
-            case 0x02:
-                $type = DataValidation::TYPE_DECIMAL;
-
-                break;
-            case 0x03:
-                $type = DataValidation::TYPE_LIST;
-
-                break;
-            case 0x04:
-                $type = DataValidation::TYPE_DATE;
-
-                break;
-            case 0x05:
-                $type = DataValidation::TYPE_TIME;
-
-                break;
-            case 0x06:
-                $type = DataValidation::TYPE_TEXTLENGTH;
-
-                break;
-            case 0x07:
-                $type = DataValidation::TYPE_CUSTOM;
-
-                break;
-        }
+        $type = Xls\DataValidationHelper::type($type);
 
         // bit: 4-6; mask: 0x00000070; error type
         $errorStyle = (0x00000070 & $options) >> 4;
-        switch ($errorStyle) {
-            case 0x00:
-                $errorStyle = DataValidation::STYLE_STOP;
-
-                break;
-            case 0x01:
-                $errorStyle = DataValidation::STYLE_WARNING;
-
-                break;
-            case 0x02:
-                $errorStyle = DataValidation::STYLE_INFORMATION;
-
-                break;
-        }
+        $errorStyle = Xls\DataValidationHelper::errorStyle($errorStyle);
 
         // bit: 7; mask: 0x00000080; 1= formula is explicit (only applies to list)
         // I have only seen cases where this is 1
-        $explicitFormula = (0x00000080 & $options) >> 7;
+        //$explicitFormula = (0x00000080 & $options) >> 7;
 
         // bit: 8; mask: 0x00000100; 1= empty cells allowed
         $allowBlank = (0x00000100 & $options) >> 8;
@@ -4845,39 +4711,10 @@ private function readDataValidation(): void
 
         // bit: 20-23; mask: 0x00F00000; condition operator
         $operator = (0x00F00000 & $options) >> 20;
-        switch ($operator) {
-            case 0x00:
-                $operator = DataValidation::OPERATOR_BETWEEN;
-
-                break;
-            case 0x01:
-                $operator = DataValidation::OPERATOR_NOTBETWEEN;
-
-                break;
-            case 0x02:
-                $operator = DataValidation::OPERATOR_EQUAL;
-
-                break;
-            case 0x03:
-                $operator = DataValidation::OPERATOR_NOTEQUAL;
-
-                break;
-            case 0x04:
-                $operator = DataValidation::OPERATOR_GREATERTHAN;
-
-                break;
-            case 0x05:
-                $operator = DataValidation::OPERATOR_LESSTHAN;
-
-                break;
-            case 0x06:
-                $operator = DataValidation::OPERATOR_GREATERTHANOREQUAL;
+        $operator = Xls\DataValidationHelper::operator($operator);
 
-                break;
-            case 0x07:
-                $operator = DataValidation::OPERATOR_LESSTHANOREQUAL;
-
-                break;
+        if ($type === null || $errorStyle === null || $operator === null) {
+            return;
         }
 
         // offset: 4; size: var; title of the prompt box
@@ -4937,7 +4774,7 @@ private function readDataValidation(): void
 
         try {
             $formula2 = $this->getFormulaFromStructure($formula2);
-        } catch (PhpSpreadsheetException $e) {
+        } catch (PhpSpreadsheetException) {
             return;
         }
         $offset += $sz2;
@@ -4978,9 +4815,6 @@ private function readSheetLayout(): void
         // move stream pointer to next record
         $this->pos += 4 + $length;
 
-        // local pointer in record data
-        $offset = 0;
-
         if (!$this->readDataOnly) {
             // offset: 0; size: 2; repeated record identifier 0x0862
 
@@ -5001,8 +4835,6 @@ private function readSheetLayout(): void
                 case 0x28:
                     // TODO: Investigate structure for .xls SHEETLAYOUT record as saved by MS Office Excel 2007
                     return;
-
-                    break;
             }
         }
     }
@@ -5043,12 +4875,14 @@ private function readSheetProtection(): void
         $options = self::getUInt2d($recordData, 19);
 
         // bit: 0; mask 0x0001; 1 = user may edit objects, 0 = users must not edit objects
+        // Note - do not negate $bool
         $bool = (0x0001 & $options) >> 0;
-        $this->phpSheet->getProtection()->setObjects(!$bool);
+        $this->phpSheet->getProtection()->setObjects((bool) $bool);
 
         // bit: 1; mask 0x0002; edit scenarios
+        // Note - do not negate $bool
         $bool = (0x0002 & $options) >> 1;
-        $this->phpSheet->getProtection()->setScenarios(!$bool);
+        $this->phpSheet->getProtection()->setScenarios((bool) $bool);
 
         // bit: 2; mask 0x0004; format cells
         $bool = (0x0004 & $options) >> 2;
@@ -5083,8 +4917,9 @@ private function readSheetProtection(): void
         $this->phpSheet->getProtection()->setDeleteRows(!$bool);
 
         // bit: 10; mask 0x0400; select locked cells
+        // Note that this is opposite of most of above.
         $bool = (0x0400 & $options) >> 10;
-        $this->phpSheet->getProtection()->setSelectLockedCells(!$bool);
+        $this->phpSheet->getProtection()->setSelectLockedCells((bool) $bool);
 
         // bit: 11; mask 0x0800; sort cell range
         $bool = (0x0800 & $options) >> 11;
@@ -5099,8 +4934,9 @@ private function readSheetProtection(): void
         $this->phpSheet->getProtection()->setPivotTables(!$bool);
 
         // bit: 14; mask 0x4000; select unlocked cells
+        // Note that this is opposite of most of above.
         $bool = (0x4000 & $options) >> 14;
-        $this->phpSheet->getProtection()->setSelectUnlockedCells(!$bool);
+        $this->phpSheet->getProtection()->setSelectUnlockedCells((bool) $bool);
 
         // offset: 21; size: 2; not used
     }
@@ -5145,7 +4981,7 @@ private function readRangeProtection(): void
             for ($i = 0; $i < $cref; ++$i) {
                 try {
                     $cellRange = $this->readBIFF8CellRangeAddressFixed(substr($recordData, 27 + 8 * $i, 8));
-                } catch (PhpSpreadsheetException $e) {
+                } catch (PhpSpreadsheetException) {
                     return;
                 }
                 $cellRanges[] = $cellRange;
@@ -5153,7 +4989,7 @@ private function readRangeProtection(): void
             }
 
             // offset: var; size: var; variable length of feature specific data
-            $rgbFeat = substr($recordData, $offset);
+            //$rgbFeat = substr($recordData, $offset);
             $offset += 4;
 
             // offset: var; size: 4; the encrypted password (only 16-bit although field is 32-bit)
@@ -5162,7 +4998,7 @@ private function readRangeProtection(): void
 
             // Apply range protection to sheet
             if ($cellRanges) {
-                $this->phpSheet->protectCells(implode(' ', $cellRanges), strtoupper(dechex($wPassword)), true);
+                $this->phpSheet->protectCells(implode(' ', $cellRanges), ($wPassword === 0) ? '' : strtoupper(dechex($wPassword)), true);
             }
         }
     }
@@ -5220,10 +5056,8 @@ private function readContinue(): void
      * records are found. Splices the record data pieces and returns the combined string as if record data
      * is in one piece.
      * Moves to next current position in data stream to start of next record different from a CONtINUE record.
-     *
-     * @return array
      */
-    private function getSplicedRecordData()
+    private function getSplicedRecordData(): array
     {
         $data = '';
         $spliceOffsets = [];
@@ -5235,7 +5069,7 @@ private function getSplicedRecordData()
             ++$i;
 
             // offset: 0; size: 2; identifier
-            $identifier = self::getUInt2d($this->data, $this->pos);
+            //$identifier = self::getUInt2d($this->data, $this->pos);
             // offset: 2; size: 2; length
             $length = self::getUInt2d($this->data, $this->pos + 2);
             $data .= $this->readRecordData($this->data, $this->pos + 4, $length);
@@ -5260,7 +5094,7 @@ private function getSplicedRecordData()
      *
      * @return string Human readable formula
      */
-    private function getFormulaFromStructure($formulaStructure, $baseCell = 'A1')
+    private function getFormulaFromStructure(string $formulaStructure, string $baseCell = 'A1'): string
     {
         // offset: 0; size: 2; size of the following formula data
         $sz = self::getUInt2d($formulaStructure, 0);
@@ -5287,12 +5121,12 @@ private function getFormulaFromStructure($formulaStructure, $baseCell = 'A1')
      *
      * @return string Human readable formula
      */
-    private function getFormulaFromData($formulaData, $additionalData = '', $baseCell = 'A1')
+    private function getFormulaFromData(string $formulaData, string $additionalData = '', string $baseCell = 'A1'): string
     {
         // start parsing the formula data
         $tokens = [];
 
-        while (strlen($formulaData) > 0 && $token = $this->getNextToken($formulaData, $baseCell)) {
+        while ($formulaData !== '' && $token = $this->getNextToken($formulaData, $baseCell)) {
             $tokens[] = $token;
             $formulaData = substr($formulaData, $token['size']);
         }
@@ -5305,12 +5139,11 @@ private function getFormulaFromData($formulaData, $additionalData = '', $baseCel
     /**
      * Take array of tokens together with additional data for formula and return human readable formula.
      *
-     * @param array $tokens
      * @param string $additionalData Additional binary data going with the formula
      *
      * @return string Human readable formula
      */
-    private function createFormulaFromTokens($tokens, $additionalData)
+    private function createFormulaFromTokens(array $tokens, string $additionalData): string
     {
         // empty formula?
         if (empty($tokens)) {
@@ -5482,10 +5315,8 @@ private function createFormulaFromTokens($tokens, $additionalData)
      *
      * @param string $formulaData Formula data
      * @param string $baseCell Base cell, only needed when formula contains tRefN tokens, e.g. with shared formulas
-     *
-     * @return array
      */
-    private function getNextToken($formulaData, $baseCell = 'A1')
+    private function getNextToken(string $formulaData, string $baseCell = 'A1'): array
     {
         // offset: 0; size: 1; token id
         $id = ord($formulaData[0]); // token id
@@ -5662,36 +5493,15 @@ private function getNextToken($formulaData, $baseCell = 'A1')
                         $name = 'tAttrSpace';
                         $size = 4;
                         // offset: 2; size: 2; space type and position
-                        switch (ord($formulaData[2])) {
-                            case 0x00:
-                                $spacetype = 'type0';
-
-                                break;
-                            case 0x01:
-                                $spacetype = 'type1';
-
-                                break;
-                            case 0x02:
-                                $spacetype = 'type2';
-
-                                break;
-                            case 0x03:
-                                $spacetype = 'type3';
-
-                                break;
-                            case 0x04:
-                                $spacetype = 'type4';
-
-                                break;
-                            case 0x05:
-                                $spacetype = 'type5';
-
-                                break;
-                            default:
-                                throw new Exception('Unrecognized space type in tAttrSpace token');
-
-                                break;
-                        }
+                        $spacetype = match (ord($formulaData[2])) {
+                            0x00 => 'type0',
+                            0x01 => 'type1',
+                            0x02 => 'type2',
+                            0x03 => 'type3',
+                            0x04 => 'type4',
+                            0x05 => 'type5',
+                            default => throw new Exception('Unrecognized space type in tAttrSpace token'),
+                        };
                         // offset: 3; size: 1; number of inserted spaces/carriage returns
                         $spacecount = ord($formulaData[3]);
 
@@ -5700,8 +5510,6 @@ private function getNextToken($formulaData, $baseCell = 'A1')
                         break;
                     default:
                         throw new Exception('Unrecognized attribute flag in tAttr token');
-
-                        break;
                 }
 
                 break;
@@ -6552,8 +6360,6 @@ private function getNextToken($formulaData, $baseCell = 'A1')
                         break;
                     default:
                         throw new Exception('Unrecognized function in formula');
-
-                        break;
                 }
                 $data = ['function' => $function, 'args' => $args];
 
@@ -6567,392 +6373,125 @@ private function getNextToken($formulaData, $baseCell = 'A1')
                 $args = ord($formulaData[1]);
                 // offset: 2: size: 2; index to built-in sheet function
                 $index = self::getUInt2d($formulaData, 2);
-                switch ($index) {
-                    case 0:
-                        $function = 'COUNT';
-
-                        break;
-                    case 1:
-                        $function = 'IF';
-
-                        break;
-                    case 4:
-                        $function = 'SUM';
+                $function = match ($index) {
+                    0 => 'COUNT',
+                    1 => 'IF',
+                    4 => 'SUM',
+                    5 => 'AVERAGE',
+                    6 => 'MIN',
+                    7 => 'MAX',
+                    8 => 'ROW',
+                    9 => 'COLUMN',
+                    11 => 'NPV',
+                    12 => 'STDEV',
+                    13 => 'DOLLAR',
+                    14 => 'FIXED',
+                    28 => 'LOOKUP',
+                    29 => 'INDEX',
+                    36 => 'AND',
+                    37 => 'OR',
+                    46 => 'VAR',
+                    49 => 'LINEST',
+                    50 => 'TREND',
+                    51 => 'LOGEST',
+                    52 => 'GROWTH',
+                    56 => 'PV',
+                    57 => 'FV',
+                    58 => 'NPER',
+                    59 => 'PMT',
+                    60 => 'RATE',
+                    62 => 'IRR',
+                    64 => 'MATCH',
+                    70 => 'WEEKDAY',
+                    78 => 'OFFSET',
+                    82 => 'SEARCH',
+                    100 => 'CHOOSE',
+                    101 => 'HLOOKUP',
+                    102 => 'VLOOKUP',
+                    109 => 'LOG',
+                    115 => 'LEFT',
+                    116 => 'RIGHT',
+                    120 => 'SUBSTITUTE',
+                    124 => 'FIND',
+                    125 => 'CELL',
+                    144 => 'DDB',
+                    148 => 'INDIRECT',
+                    167 => 'IPMT',
+                    168 => 'PPMT',
+                    169 => 'COUNTA',
+                    183 => 'PRODUCT',
+                    193 => 'STDEVP',
+                    194 => 'VARP',
+                    197 => 'TRUNC',
+                    204 => 'USDOLLAR',
+                    205 => 'FINDB',
+                    206 => 'SEARCHB',
+                    208 => 'LEFTB',
+                    209 => 'RIGHTB',
+                    216 => 'RANK',
+                    219 => 'ADDRESS',
+                    220 => 'DAYS360',
+                    222 => 'VDB',
+                    227 => 'MEDIAN',
+                    228 => 'SUMPRODUCT',
+                    247 => 'DB',
+                    255 => '',
+                    269 => 'AVEDEV',
+                    270 => 'BETADIST',
+                    272 => 'BETAINV',
+                    317 => 'PROB',
+                    318 => 'DEVSQ',
+                    319 => 'GEOMEAN',
+                    320 => 'HARMEAN',
+                    321 => 'SUMSQ',
+                    322 => 'KURT',
+                    323 => 'SKEW',
+                    324 => 'ZTEST',
+                    329 => 'PERCENTRANK',
+                    330 => 'MODE',
+                    336 => 'CONCATENATE',
+                    344 => 'SUBTOTAL',
+                    345 => 'SUMIF',
+                    354 => 'ROMAN',
+                    358 => 'GETPIVOTDATA',
+                    359 => 'HYPERLINK',
+                    361 => 'AVERAGEA',
+                    362 => 'MAXA',
+                    363 => 'MINA',
+                    364 => 'STDEVPA',
+                    365 => 'VARPA',
+                    366 => 'STDEVA',
+                    367 => 'VARA',
+                    default => throw new Exception('Unrecognized function in formula'),
+                };
+                $data = ['function' => $function, 'args' => $args];
 
-                        break;
-                    case 5:
-                        $function = 'AVERAGE';
+                break;
+            case 0x23:    //    index to defined name
+            case 0x43:
+            case 0x63:
+                $name = 'tName';
+                $size = 5;
+                // offset: 1; size: 2; one-based index to definedname record
+                $definedNameIndex = self::getUInt2d($formulaData, 1) - 1;
+                // offset: 2; size: 2; not used
+                $data = $this->definedname[$definedNameIndex]['name'] ?? '';
 
-                        break;
-                    case 6:
-                        $function = 'MIN';
+                break;
+            case 0x24:    //    single cell reference e.g. A5
+            case 0x44:
+            case 0x64:
+                $name = 'tRef';
+                $size = 5;
+                $data = $this->readBIFF8CellAddress(substr($formulaData, 1, 4));
 
-                        break;
-                    case 7:
-                        $function = 'MAX';
-
-                        break;
-                    case 8:
-                        $function = 'ROW';
-
-                        break;
-                    case 9:
-                        $function = 'COLUMN';
-
-                        break;
-                    case 11:
-                        $function = 'NPV';
-
-                        break;
-                    case 12:
-                        $function = 'STDEV';
-
-                        break;
-                    case 13:
-                        $function = 'DOLLAR';
-
-                        break;
-                    case 14:
-                        $function = 'FIXED';
-
-                        break;
-                    case 28:
-                        $function = 'LOOKUP';
-
-                        break;
-                    case 29:
-                        $function = 'INDEX';
-
-                        break;
-                    case 36:
-                        $function = 'AND';
-
-                        break;
-                    case 37:
-                        $function = 'OR';
-
-                        break;
-                    case 46:
-                        $function = 'VAR';
-
-                        break;
-                    case 49:
-                        $function = 'LINEST';
-
-                        break;
-                    case 50:
-                        $function = 'TREND';
-
-                        break;
-                    case 51:
-                        $function = 'LOGEST';
-
-                        break;
-                    case 52:
-                        $function = 'GROWTH';
-
-                        break;
-                    case 56:
-                        $function = 'PV';
-
-                        break;
-                    case 57:
-                        $function = 'FV';
-
-                        break;
-                    case 58:
-                        $function = 'NPER';
-
-                        break;
-                    case 59:
-                        $function = 'PMT';
-
-                        break;
-                    case 60:
-                        $function = 'RATE';
-
-                        break;
-                    case 62:
-                        $function = 'IRR';
-
-                        break;
-                    case 64:
-                        $function = 'MATCH';
-
-                        break;
-                    case 70:
-                        $function = 'WEEKDAY';
-
-                        break;
-                    case 78:
-                        $function = 'OFFSET';
-
-                        break;
-                    case 82:
-                        $function = 'SEARCH';
-
-                        break;
-                    case 100:
-                        $function = 'CHOOSE';
-
-                        break;
-                    case 101:
-                        $function = 'HLOOKUP';
-
-                        break;
-                    case 102:
-                        $function = 'VLOOKUP';
-
-                        break;
-                    case 109:
-                        $function = 'LOG';
-
-                        break;
-                    case 115:
-                        $function = 'LEFT';
-
-                        break;
-                    case 116:
-                        $function = 'RIGHT';
-
-                        break;
-                    case 120:
-                        $function = 'SUBSTITUTE';
-
-                        break;
-                    case 124:
-                        $function = 'FIND';
-
-                        break;
-                    case 125:
-                        $function = 'CELL';
-
-                        break;
-                    case 144:
-                        $function = 'DDB';
-
-                        break;
-                    case 148:
-                        $function = 'INDIRECT';
-
-                        break;
-                    case 167:
-                        $function = 'IPMT';
-
-                        break;
-                    case 168:
-                        $function = 'PPMT';
-
-                        break;
-                    case 169:
-                        $function = 'COUNTA';
-
-                        break;
-                    case 183:
-                        $function = 'PRODUCT';
-
-                        break;
-                    case 193:
-                        $function = 'STDEVP';
-
-                        break;
-                    case 194:
-                        $function = 'VARP';
-
-                        break;
-                    case 197:
-                        $function = 'TRUNC';
-
-                        break;
-                    case 204:
-                        $function = 'USDOLLAR';
-
-                        break;
-                    case 205:
-                        $function = 'FINDB';
-
-                        break;
-                    case 206:
-                        $function = 'SEARCHB';
-
-                        break;
-                    case 208:
-                        $function = 'LEFTB';
-
-                        break;
-                    case 209:
-                        $function = 'RIGHTB';
-
-                        break;
-                    case 216:
-                        $function = 'RANK';
-
-                        break;
-                    case 219:
-                        $function = 'ADDRESS';
-
-                        break;
-                    case 220:
-                        $function = 'DAYS360';
-
-                        break;
-                    case 222:
-                        $function = 'VDB';
-
-                        break;
-                    case 227:
-                        $function = 'MEDIAN';
-
-                        break;
-                    case 228:
-                        $function = 'SUMPRODUCT';
-
-                        break;
-                    case 247:
-                        $function = 'DB';
-
-                        break;
-                    case 255:
-                        $function = '';
-
-                        break;
-                    case 269:
-                        $function = 'AVEDEV';
-
-                        break;
-                    case 270:
-                        $function = 'BETADIST';
-
-                        break;
-                    case 272:
-                        $function = 'BETAINV';
-
-                        break;
-                    case 317:
-                        $function = 'PROB';
-
-                        break;
-                    case 318:
-                        $function = 'DEVSQ';
-
-                        break;
-                    case 319:
-                        $function = 'GEOMEAN';
-
-                        break;
-                    case 320:
-                        $function = 'HARMEAN';
-
-                        break;
-                    case 321:
-                        $function = 'SUMSQ';
-
-                        break;
-                    case 322:
-                        $function = 'KURT';
-
-                        break;
-                    case 323:
-                        $function = 'SKEW';
-
-                        break;
-                    case 324:
-                        $function = 'ZTEST';
-
-                        break;
-                    case 329:
-                        $function = 'PERCENTRANK';
-
-                        break;
-                    case 330:
-                        $function = 'MODE';
-
-                        break;
-                    case 336:
-                        $function = 'CONCATENATE';
-
-                        break;
-                    case 344:
-                        $function = 'SUBTOTAL';
-
-                        break;
-                    case 345:
-                        $function = 'SUMIF';
-
-                        break;
-                    case 354:
-                        $function = 'ROMAN';
-
-                        break;
-                    case 358:
-                        $function = 'GETPIVOTDATA';
-
-                        break;
-                    case 359:
-                        $function = 'HYPERLINK';
-
-                        break;
-                    case 361:
-                        $function = 'AVERAGEA';
-
-                        break;
-                    case 362:
-                        $function = 'MAXA';
-
-                        break;
-                    case 363:
-                        $function = 'MINA';
-
-                        break;
-                    case 364:
-                        $function = 'STDEVPA';
-
-                        break;
-                    case 365:
-                        $function = 'VARPA';
-
-                        break;
-                    case 366:
-                        $function = 'STDEVA';
-
-                        break;
-                    case 367:
-                        $function = 'VARA';
-
-                        break;
-                    default:
-                        throw new Exception('Unrecognized function in formula');
-
-                        break;
-                }
-                $data = ['function' => $function, 'args' => $args];
-
-                break;
-            case 0x23:    //    index to defined name
-            case 0x43:
-            case 0x63:
-                $name = 'tName';
-                $size = 5;
-                // offset: 1; size: 2; one-based index to definedname record
-                $definedNameIndex = self::getUInt2d($formulaData, 1) - 1;
-                // offset: 2; size: 2; not used
-                $data = $this->definedname[$definedNameIndex]['name'];
-
-                break;
-            case 0x24:    //    single cell reference e.g. A5
-            case 0x44:
-            case 0x64:
-                $name = 'tRef';
-                $size = 5;
-                $data = $this->readBIFF8CellAddress(substr($formulaData, 1, 4));
-
-                break;
-            case 0x25:    //    cell range reference to cells in the same sheet (2d)
-            case 0x45:
-            case 0x65:
-                $name = 'tArea';
-                $size = 9;
-                $data = $this->readBIFF8CellRangeAddress(substr($formulaData, 1, 8));
+                break;
+            case 0x25:    //    cell range reference to cells in the same sheet (2d)
+            case 0x45:
+            case 0x65:
+                $name = 'tArea';
+                $size = 9;
+                $data = $this->readBIFF8CellRangeAddress(substr($formulaData, 1, 8));
 
                 break;
             case 0x26:    //    Constant reference sub-expression
@@ -7012,7 +6551,8 @@ private function getNextToken($formulaData, $baseCell = 'A1')
                 // offset: 3; size: 2; one-based index to DEFINEDNAME or EXTERNNAME record
                 $index = self::getUInt2d($formulaData, 3);
                 // assume index is to EXTERNNAME record
-                $data = $this->externalNames[$index - 1]['name'];
+                $data = $this->externalNames[$index - 1]['name'] ?? '';
+
                 // offset: 5; size: 2; not used
                 break;
             case 0x3A:    //    3d reference to cell
@@ -7028,7 +6568,7 @@ private function getNextToken($formulaData, $baseCell = 'A1')
                     $cellAddress = $this->readBIFF8CellAddress(substr($formulaData, 3, 4));
 
                     $data = "$sheetRange!$cellAddress";
-                } catch (PhpSpreadsheetException $e) {
+                } catch (PhpSpreadsheetException) {
                     // deleted sheet reference
                     $data = '#REF!';
                 }
@@ -7047,17 +6587,15 @@ private function getNextToken($formulaData, $baseCell = 'A1')
                     $cellRangeAddress = $this->readBIFF8CellRangeAddress(substr($formulaData, 3, 8));
 
                     $data = "$sheetRange!$cellRangeAddress";
-                } catch (PhpSpreadsheetException $e) {
+                } catch (PhpSpreadsheetException) {
                     // deleted sheet reference
                     $data = '#REF!';
                 }
 
                 break;
-            // Unknown cases    // don't know how to deal with
+                // Unknown cases    // don't know how to deal with
             default:
                 throw new Exception('Unrecognized token ' . sprintf('%02X', $id) . ' in formula');
-
-                break;
         }
 
         return [
@@ -7071,12 +6609,8 @@ private function getNextToken($formulaData, $baseCell = 'A1')
     /**
      * Reads a cell address in BIFF8 e.g. 'A2' or '$A$2'
      * section 3.3.4.
-     *
-     * @param string $cellAddressStructure
-     *
-     * @return string
      */
-    private function readBIFF8CellAddress($cellAddressStructure)
+    private function readBIFF8CellAddress(string $cellAddressStructure): string
     {
         // offset: 0; size: 2; index to row (0... 65535) (or offset (-32768... 32767))
         $row = self::getUInt2d($cellAddressStructure, 0) + 1;
@@ -7102,12 +6636,9 @@ private function readBIFF8CellAddress($cellAddressStructure)
      * to indicate offsets from a base cell
      * section 3.3.4.
      *
-     * @param string $cellAddressStructure
      * @param string $baseCell Base cell, only needed when formula contains tRefN tokens, e.g. with shared formulas
-     *
-     * @return string
      */
-    private function readBIFF8CellAddressB($cellAddressStructure, $baseCell = 'A1')
+    private function readBIFF8CellAddressB(string $cellAddressStructure, string $baseCell = 'A1'): string
     {
         [$baseCol, $baseRow] = Coordinate::coordinateFromString($baseCell);
         $baseCol = Coordinate::columnIndexFromString($baseCol) - 1;
@@ -7150,12 +6681,8 @@ private function readBIFF8CellAddressB($cellAddressStructure, $baseCell = 'A1')
      * Reads a cell range address in BIFF5 e.g. 'A2:B6' or 'A1'
      * always fixed range
      * section 2.5.14.
-     *
-     * @param string $subData
-     *
-     * @return string
      */
-    private function readBIFF5CellRangeAddressFixed($subData)
+    private function readBIFF5CellRangeAddressFixed(string $subData): string
     {
         // offset: 0; size: 2; index to first row
         $fr = self::getUInt2d($subData, 0) + 1;
@@ -7189,12 +6716,8 @@ private function readBIFF5CellRangeAddressFixed($subData)
      * Reads a cell range address in BIFF8 e.g. 'A2:B6' or 'A1'
      * always fixed range
      * section 2.5.14.
-     *
-     * @param string $subData
-     *
-     * @return string
      */
-    private function readBIFF8CellRangeAddressFixed($subData)
+    private function readBIFF8CellRangeAddressFixed(string $subData): string
     {
         // offset: 0; size: 2; index to first row
         $fr = self::getUInt2d($subData, 0) + 1;
@@ -7228,12 +6751,8 @@ private function readBIFF8CellRangeAddressFixed($subData)
      * Reads a cell range address in BIFF8 e.g. 'A2:B6' or '$A$2:$B$6'
      * there are flags indicating whether column/row index is relative
      * section 3.3.4.
-     *
-     * @param string $subData
-     *
-     * @return string
      */
-    private function readBIFF8CellRangeAddress($subData)
+    private function readBIFF8CellRangeAddress(string $subData): string
     {
         // todo: if cell range is just a single cell, should this funciton
         // not just return e.g. 'A1' and not 'A1:A1' ?
@@ -7282,12 +6801,11 @@ private function readBIFF8CellRangeAddress($subData)
      * to indicate offsets from a base cell
      * section 3.3.4.
      *
-     * @param string $subData
      * @param string $baseCell Base cell
      *
      * @return string Cell range address
      */
-    private function readBIFF8CellRangeAddressB($subData, $baseCell = 'A1')
+    private function readBIFF8CellRangeAddressB(string $subData, string $baseCell = 'A1'): string
     {
         [$baseCol, $baseRow] = Coordinate::indexesFromString($baseCell);
         $baseCol = $baseCol - 1;
@@ -7341,9 +6859,9 @@ private function readBIFF8CellRangeAddressB($subData, $baseCell = 'A1')
             $lc = '$' . $lc;
         } else {
             // column offset
-            // offset: 4; size: 2; first column with relative/absolute flags
+            // offset: 6; size: 2; last column with relative/absolute flags
             // bit: 7-0; mask 0x00FF; column index
-            $relativeLcIndex = 0x00FF & self::getInt2d($subData, 4);
+            $relativeLcIndex = 0x00FF & self::getInt2d($subData, 6);
             $lcIndex = $baseCol + $relativeLcIndex;
             $lcIndex = ($lcIndex < 256) ? $lcIndex : $lcIndex - 256;
             $lcIndex = ($lcIndex >= 0) ? $lcIndex : $lcIndex + 256;
@@ -7367,12 +6885,8 @@ private function readBIFF8CellRangeAddressB($subData, $baseCell = 'A1')
     /**
      * Read BIFF8 cell range address list
      * section 2.5.15.
-     *
-     * @param string $subData
-     *
-     * @return array
      */
-    private function readBIFF8CellRangeAddressList($subData)
+    private function readBIFF8CellRangeAddressList(string $subData): array
     {
         $cellRangeAddresses = [];
 
@@ -7395,12 +6909,8 @@ private function readBIFF8CellRangeAddressList($subData)
     /**
      * Read BIFF5 cell range address list
      * section 2.5.15.
-     *
-     * @param string $subData
-     *
-     * @return array
      */
-    private function readBIFF5CellRangeAddressList($subData)
+    private function readBIFF5CellRangeAddressList(string $subData): array
     {
         $cellRangeAddresses = [];
 
@@ -7425,12 +6935,8 @@ private function readBIFF5CellRangeAddressList($subData)
      * Note: If there is only one sheet in the range, one gets e.g Sheet1
      * It can also happen that the REF structure uses the -1 (FFFF) code to indicate deleted sheets,
      * in which case an Exception is thrown.
-     *
-     * @param int $index
-     *
-     * @return false|string
      */
-    private function readSheetRangeByRefIndex($index)
+    private function readSheetRangeByRefIndex(int $index): string|false
     {
         if (isset($this->ref[$index])) {
             $type = $this->externalBooks[$this->ref[$index]['externalBookIndex']]['type'];
@@ -7465,13 +6971,9 @@ private function readSheetRangeByRefIndex($index)
                     }
 
                     return $sheetRange;
-
-                    break;
                 default:
                     // TODO: external sheet support
                     throw new Exception('Xls reader only supports internal sheets in formulas');
-
-                    break;
             }
         }
 
@@ -7482,12 +6984,8 @@ private function readSheetRangeByRefIndex($index)
      * read BIFF8 constant value array from array data
      * returns e.g. ['value' => '{1,2;3,4}', 'size' => 40]
      * section 2.5.8.
-     *
-     * @param string $arrayData
-     *
-     * @return array
      */
-    private static function readBIFF8ConstantArray($arrayData)
+    private static function readBIFF8ConstantArray(string $arrayData): array
     {
         // offset: 0; size: 1; number of columns decreased by 1
         $nc = ord($arrayData[0]);
@@ -7521,12 +7019,8 @@ private static function readBIFF8ConstantArray($arrayData)
      * read BIFF8 constant value which may be 'Empty Value', 'Number', 'String Value', 'Boolean Value', 'Error Value'
      * section 2.5.7
      * returns e.g. ['value' => '5', 'size' => 9].
-     *
-     * @param string $valueData
-     *
-     * @return array
      */
-    private static function readBIFF8Constant($valueData)
+    private static function readBIFF8Constant(string $valueData): array
     {
         // offset: 0; size: 1; identifier for type of constant
         $identifier = ord($valueData[0]);
@@ -7581,10 +7075,8 @@ private static function readBIFF8Constant($valueData)
      * OpenOffice.org's Documentation of the Microsoft Excel File Format, section 2.5.4.
      *
      * @param string $rgb Encoded RGB value (4 bytes)
-     *
-     * @return array
      */
-    private static function readRGB($rgb)
+    private static function readRGB(string $rgb): array
     {
         // offset: 0; size 1; Red component
         $r = ord($rgb[0]);
@@ -7604,12 +7096,8 @@ private static function readRGB($rgb)
     /**
      * Read byte string (8-bit string length)
      * OpenOffice documentation: 2.5.2.
-     *
-     * @param string $subData
-     *
-     * @return array
      */
-    private function readByteStringShort($subData)
+    private function readByteStringShort(string $subData): array
     {
         // offset: 0; size: 1; length of the string (character count)
         $ln = ord($subData[0]);
@@ -7626,12 +7114,8 @@ private function readByteStringShort($subData)
     /**
      * Read byte string (16-bit string length)
      * OpenOffice documentation: 2.5.2.
-     *
-     * @param string $subData
-     *
-     * @return array
      */
-    private function readByteStringLong($subData)
+    private function readByteStringLong(string $subData): array
     {
         // offset: 0; size: 2; length of the string (character count)
         $ln = self::getUInt2d($subData, 0);
@@ -7650,15 +7134,9 @@ private function readByteStringLong($subData)
      * Extracts an Excel Unicode short string (8-bit string length)
      * OpenOffice documentation: 2.5.3
      * function will automatically find out where the Unicode string ends.
-     *
-     * @param string $subData
-     *
-     * @return array
      */
-    private static function readUnicodeStringShort($subData)
+    private static function readUnicodeStringShort(string $subData): array
     {
-        $value = '';
-
         // offset: 0: size: 1; length of the string (character count)
         $characterCount = ord($subData[0]);
 
@@ -7674,15 +7152,9 @@ private static function readUnicodeStringShort($subData)
      * Extracts an Excel Unicode long string (16-bit string length)
      * OpenOffice documentation: 2.5.3
      * this function is under construction, needs to support rich text, and Asian phonetic settings.
-     *
-     * @param string $subData
-     *
-     * @return array
      */
-    private static function readUnicodeStringLong($subData)
+    private static function readUnicodeStringLong(string $subData): array
     {
-        $value = '';
-
         // offset: 0: size: 2; length of the string (character count)
         $characterCount = self::getUInt2d($subData, 0);
 
@@ -7698,25 +7170,18 @@ private static function readUnicodeStringLong($subData)
      * Read Unicode string with no string length field, but with known character count
      * this function is under construction, needs to support rich text, and Asian phonetic settings
      * OpenOffice.org's Documentation of the Microsoft Excel File Format, section 2.5.3.
-     *
-     * @param string $subData
-     * @param int $characterCount
-     *
-     * @return array
      */
-    private static function readUnicodeString($subData, $characterCount)
+    private static function readUnicodeString(string $subData, int $characterCount): array
     {
-        $value = '';
-
         // offset: 0: size: 1; option flags
         // bit: 0; mask: 0x01; character compression (0 = compressed 8-bit, 1 = uncompressed 16-bit)
         $isCompressed = !((0x01 & ord($subData[0])) >> 0);
 
         // bit: 2; mask: 0x04; Asian phonetic settings
-        $hasAsian = (0x04) & ord($subData[0]) >> 2;
+        //$hasAsian = (0x04) & ord($subData[0]) >> 2;
 
         // bit: 3; mask: 0x08; Rich-Text settings
-        $hasRichText = (0x08) & ord($subData[0]) >> 3;
+        //$hasRichText = (0x08) & ord($subData[0]) >> 3;
 
         // offset: 1: size: var; character array
         // this offset assumes richtext and Asian phonetic settings are off which is generally wrong
@@ -7734,10 +7199,8 @@ private static function readUnicodeString($subData, $characterCount)
      * Example:  hello"world  -->  "hello""world".
      *
      * @param string $value UTF-8 encoded string
-     *
-     * @return string
      */
-    private static function UTF8toExcelDoubleQuoted($value)
+    private static function UTF8toExcelDoubleQuoted(string $value): string
     {
         return '"' . str_replace('"', '""', $value) . '"';
     }
@@ -7746,25 +7209,25 @@ private static function UTF8toExcelDoubleQuoted($value)
      * Reads first 8 bytes of a string and return IEEE 754 float.
      *
      * @param string $data Binary string that is at least 8 bytes long
-     *
-     * @return float
      */
-    private static function extractNumber($data)
+    private static function extractNumber(string $data): int|float
     {
         $rknumhigh = self::getInt4d($data, 4);
         $rknumlow = self::getInt4d($data, 0);
-        $sign = ($rknumhigh & 0x80000000) >> 31;
-        $exp = (($rknumhigh & 0x7ff00000) >> 20) - 1023;
-        $mantissa = (0x100000 | ($rknumhigh & 0x000fffff));
-        $mantissalow1 = ($rknumlow & 0x80000000) >> 31;
-        $mantissalow2 = ($rknumlow & 0x7fffffff);
+        $sign = ($rknumhigh & self::HIGH_ORDER_BIT) >> 31;
+        $exp = (($rknumhigh & 0x7FF00000) >> 20) - 1023;
+        $mantissa = (0x100000 | ($rknumhigh & 0x000FFFFF));
+        $mantissalow1 = ($rknumlow & self::HIGH_ORDER_BIT) >> 31;
+        $mantissalow2 = ($rknumlow & 0x7FFFFFFF);
         $value = $mantissa / 2 ** (20 - $exp);
 
         if ($mantissalow1 != 0) {
             $value += 1 / 2 ** (21 - $exp);
         }
 
-        $value += $mantissalow2 / 2 ** (52 - $exp);
+        if ($mantissalow2 != 0) {
+            $value += $mantissalow2 / 2 ** (52 - $exp);
+        }
         if ($sign) {
             $value *= -1;
         }
@@ -7772,12 +7235,7 @@ private static function extractNumber($data)
         return $value;
     }
 
-    /**
-     * @param int $rknum
-     *
-     * @return float
-     */
-    private static function getIEEE754($rknum)
+    private static function getIEEE754(int $rknum): float|int
     {
         if (($rknum & 0x02) != 0) {
             $value = $rknum >> 2;
@@ -7787,9 +7245,9 @@ private static function getIEEE754($rknum)
             // The RK format calls for using only the most significant 30 bits
             // of the 64 bit floating point value. The other 34 bits are assumed
             // to be 0 so we use the upper 30 bits of $rknum as follows...
-            $sign = ($rknum & 0x80000000) >> 31;
-            $exp = ($rknum & 0x7ff00000) >> 20;
-            $mantissa = (0x100000 | ($rknum & 0x000ffffc));
+            $sign = ($rknum & self::HIGH_ORDER_BIT) >> 31;
+            $exp = ($rknum & 0x7FF00000) >> 20;
+            $mantissa = (0x100000 | ($rknum & 0x000FFFFC));
             $value = $mantissa / 2 ** (20 - ($exp - 1023));
             if ($sign) {
                 $value = -1 * $value;
@@ -7805,13 +7263,8 @@ private static function getIEEE754($rknum)
 
     /**
      * Get UTF-8 string from (compressed or uncompressed) UTF-16 string.
-     *
-     * @param string $string
-     * @param bool $compressed
-     *
-     * @return string
      */
-    private static function encodeUTF16($string, $compressed = false)
+    private static function encodeUTF16(string $string, bool $compressed = false): string
     {
         if ($compressed) {
             $string = self::uncompressByteString($string);
@@ -7822,12 +7275,8 @@ private static function encodeUTF16($string, $compressed = false)
 
     /**
      * Convert UTF-16 string in compressed notation to uncompressed form. Only used for BIFF8.
-     *
-     * @param string $string
-     *
-     * @return string
      */
-    private static function uncompressByteString($string)
+    private static function uncompressByteString(string $string): string
     {
         $uncompressedString = '';
         $strLen = strlen($string);
@@ -7840,51 +7289,32 @@ private static function uncompressByteString($string)
 
     /**
      * Convert string to UTF-8. Only used for BIFF5.
-     *
-     * @param string $string
-     *
-     * @return string
      */
-    private function decodeCodepage($string)
+    private function decodeCodepage(string $string): string
     {
         return StringHelper::convertEncoding($string, 'UTF-8', $this->codepage);
     }
 
     /**
      * Read 16-bit unsigned integer.
-     *
-     * @param string $data
-     * @param int $pos
-     *
-     * @return int
      */
-    public static function getUInt2d($data, $pos)
+    public static function getUInt2d(string $data, int $pos): int
     {
         return ord($data[$pos]) | (ord($data[$pos + 1]) << 8);
     }
 
     /**
      * Read 16-bit signed integer.
-     *
-     * @param string $data
-     * @param int $pos
-     *
-     * @return int
      */
-    public static function getInt2d($data, $pos)
+    public static function getInt2d(string $data, int $pos): int
     {
-        return unpack('s', $data[$pos] . $data[$pos + 1])[1];
+        return unpack('s', $data[$pos] . $data[$pos + 1])[1]; // @phpstan-ignore-line
     }
 
     /**
      * Read 32-bit signed integer.
-     *
-     * @param string $data
-     * @param int $pos
-     *
-     * @return int
      */
-    public static function getInt4d($data, $pos)
+    public static function getInt4d(string $data, int $pos): int
     {
         // FIX: represent numbers correctly on 64-bit system
         // http://sourceforge.net/tracker/index.php?func=detail&aid=1487372&group_id=99160&atid=623334
@@ -7900,11 +7330,316 @@ public static function getInt4d($data, $pos)
         return ord($data[$pos]) | (ord($data[$pos + 1]) << 8) | (ord($data[$pos + 2]) << 16) | $_ord_24;
     }
 
-    private function parseRichText($is)
+    private function parseRichText(string $is): RichText
     {
         $value = new RichText();
         $value->createText($is);
 
         return $value;
     }
+
+    /**
+     * Phpstan 1.4.4 complains that this property is never read.
+     * So, we might be able to get rid of it altogether.
+     * For now, however, this function makes it readable,
+     * which satisfies Phpstan.
+     *
+     * @codeCoverageIgnore
+     */
+    public function getMapCellStyleXfIndex(): array
+    {
+        return $this->mapCellStyleXfIndex;
+    }
+
+    /**
+     * Parse conditional formatting blocks.
+     *
+     * @see https://www.openoffice.org/sc/excelfileformat.pdf Search for CFHEADER followed by CFRULE
+     */
+    private function readCFHeader(): array
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer forward to next record
+        $this->pos += 4 + $length;
+
+        if ($this->readDataOnly) {
+            return [];
+        }
+
+        // offset: 0; size: 2; Rule Count
+//        $ruleCount = self::getUInt2d($recordData, 0);
+
+        // offset: var; size: var; cell range address list with
+        $cellRangeAddressList = ($this->version == self::XLS_BIFF8)
+            ? $this->readBIFF8CellRangeAddressList(substr($recordData, 12))
+            : $this->readBIFF5CellRangeAddressList(substr($recordData, 12));
+        $cellRangeAddresses = $cellRangeAddressList['cellRangeAddresses'];
+
+        return $cellRangeAddresses;
+    }
+
+    private function readCFRule(array $cellRangeAddresses): void
+    {
+        $length = self::getUInt2d($this->data, $this->pos + 2);
+        $recordData = $this->readRecordData($this->data, $this->pos + 4, $length);
+
+        // move stream pointer forward to next record
+        $this->pos += 4 + $length;
+
+        if ($this->readDataOnly) {
+            return;
+        }
+
+        // offset: 0; size: 2; Options
+        $cfRule = self::getUInt2d($recordData, 0);
+
+        // bit: 8-15; mask: 0x00FF; type
+        $type = (0x00FF & $cfRule) >> 0;
+        $type = ConditionalFormatting::type($type);
+
+        // bit: 0-7; mask: 0xFF00; type
+        $operator = (0xFF00 & $cfRule) >> 8;
+        $operator = ConditionalFormatting::operator($operator);
+
+        if ($type === null || $operator === null) {
+            return;
+        }
+
+        // offset: 2; size: 2; Size1
+        $size1 = self::getUInt2d($recordData, 2);
+
+        // offset: 4; size: 2; Size2
+        $size2 = self::getUInt2d($recordData, 4);
+
+        // offset: 6; size: 4; Options
+        $options = self::getInt4d($recordData, 6);
+
+        $style = new Style(false, true); // non-supervisor, conditional
+        $noFormatSet = true;
+        //$this->getCFStyleOptions($options, $style);
+
+        $hasFontRecord = (bool) ((0x04000000 & $options) >> 26);
+        $hasAlignmentRecord = (bool) ((0x08000000 & $options) >> 27);
+        $hasBorderRecord = (bool) ((0x10000000 & $options) >> 28);
+        $hasFillRecord = (bool) ((0x20000000 & $options) >> 29);
+        $hasProtectionRecord = (bool) ((0x40000000 & $options) >> 30);
+        // note unexpected values for following 4
+        $hasBorderLeft = !(bool) (0x00000400 & $options);
+        $hasBorderRight = !(bool) (0x00000800 & $options);
+        $hasBorderTop = !(bool) (0x00001000 & $options);
+        $hasBorderBottom = !(bool) (0x00002000 & $options);
+
+        $offset = 12;
+
+        if ($hasFontRecord === true) {
+            $fontStyle = substr($recordData, $offset, 118);
+            $this->getCFFontStyle($fontStyle, $style);
+            $offset += 118;
+            $noFormatSet = false;
+        }
+
+        if ($hasAlignmentRecord === true) {
+            //$alignmentStyle = substr($recordData, $offset, 8);
+            //$this->getCFAlignmentStyle($alignmentStyle, $style);
+            $offset += 8;
+        }
+
+        if ($hasBorderRecord === true) {
+            $borderStyle = substr($recordData, $offset, 8);
+            $this->getCFBorderStyle($borderStyle, $style, $hasBorderLeft, $hasBorderRight, $hasBorderTop, $hasBorderBottom);
+            $offset += 8;
+            $noFormatSet = false;
+        }
+
+        if ($hasFillRecord === true) {
+            $fillStyle = substr($recordData, $offset, 4);
+            $this->getCFFillStyle($fillStyle, $style);
+            $offset += 4;
+            $noFormatSet = false;
+        }
+
+        if ($hasProtectionRecord === true) {
+            //$protectionStyle = substr($recordData, $offset, 4);
+            //$this->getCFProtectionStyle($protectionStyle, $style);
+            $offset += 2;
+        }
+
+        $formula1 = $formula2 = null;
+        if ($size1 > 0) {
+            $formula1 = $this->readCFFormula($recordData, $offset, $size1);
+            if ($formula1 === null) {
+                return;
+            }
+
+            $offset += $size1;
+        }
+
+        if ($size2 > 0) {
+            $formula2 = $this->readCFFormula($recordData, $offset, $size2);
+            if ($formula2 === null) {
+                return;
+            }
+
+            $offset += $size2;
+        }
+
+        $this->setCFRules($cellRangeAddresses, $type, $operator, $formula1, $formula2, $style, $noFormatSet);
+    }
+
+    /*private function getCFStyleOptions(int $options, Style $style): void
+    {
+    }*/
+
+    private function getCFFontStyle(string $options, Style $style): void
+    {
+        $fontSize = self::getInt4d($options, 64);
+        if ($fontSize !== -1) {
+            $style->getFont()->setSize($fontSize / 20); // Convert twips to points
+        }
+        $options68 = self::getInt4d($options, 68);
+        $options88 = self::getInt4d($options, 88);
+
+        if (($options88 & 2) === 0) {
+            $bold = self::getUInt2d($options, 72); // 400 = normal, 700 = bold
+            if ($bold !== 0) {
+                $style->getFont()->setBold($bold >= 550);
+            }
+            if (($options68 & 2) !== 0) {
+                $style->getFont()->setItalic(true);
+            }
+        }
+        if (($options88 & 0x80) === 0) {
+            if (($options68 & 0x80) !== 0) {
+                $style->getFont()->setStrikethrough(true);
+            }
+        }
+
+        $color = self::getInt4d($options, 80);
+
+        if ($color !== -1) {
+            $style->getFont()->getColor()->setRGB(Xls\Color::map($color, $this->palette, $this->version)['rgb']);
+        }
+    }
+
+    /*private function getCFAlignmentStyle(string $options, Style $style): void
+    {
+    }*/
+
+    private function getCFBorderStyle(string $options, Style $style, bool $hasBorderLeft, bool $hasBorderRight, bool $hasBorderTop, bool $hasBorderBottom): void
+    {
+        $valueArray = unpack('V', $options);
+        $value = is_array($valueArray) ? $valueArray[1] : 0;
+        $left = $value & 15;
+        $right = ($value >> 4) & 15;
+        $top = ($value >> 8) & 15;
+        $bottom = ($value >> 12) & 15;
+        $leftc = ($value >> 16) & 0x7F;
+        $rightc = ($value >> 23) & 0x7F;
+        $valueArray = unpack('V', substr($options, 4));
+        $value = is_array($valueArray) ? $valueArray[1] : 0;
+        $topc = $value & 0x7F;
+        $bottomc = ($value & 0x3F80) >> 7;
+        if ($hasBorderLeft) {
+            $style->getBorders()->getLeft()
+                ->setBorderStyle(self::BORDER_STYLE_MAP[$left]);
+            $style->getBorders()->getLeft()->getColor()
+                ->setRGB(Xls\Color::map($leftc, $this->palette, $this->version)['rgb']);
+        }
+        if ($hasBorderRight) {
+            $style->getBorders()->getRight()
+                ->setBorderStyle(self::BORDER_STYLE_MAP[$right]);
+            $style->getBorders()->getRight()->getColor()
+                ->setRGB(Xls\Color::map($rightc, $this->palette, $this->version)['rgb']);
+        }
+        if ($hasBorderTop) {
+            $style->getBorders()->getTop()
+                ->setBorderStyle(self::BORDER_STYLE_MAP[$top]);
+            $style->getBorders()->getTop()->getColor()
+                ->setRGB(Xls\Color::map($topc, $this->palette, $this->version)['rgb']);
+        }
+        if ($hasBorderBottom) {
+            $style->getBorders()->getBottom()
+                ->setBorderStyle(self::BORDER_STYLE_MAP[$bottom]);
+            $style->getBorders()->getBottom()->getColor()
+                ->setRGB(Xls\Color::map($bottomc, $this->palette, $this->version)['rgb']);
+        }
+    }
+
+    private function getCFFillStyle(string $options, Style $style): void
+    {
+        $fillPattern = self::getUInt2d($options, 0);
+        // bit: 10-15; mask: 0xFC00; type
+        $fillPattern = (0xFC00 & $fillPattern) >> 10;
+        $fillPattern = FillPattern::lookup($fillPattern);
+        $fillPattern = $fillPattern === Fill::FILL_NONE ? Fill::FILL_SOLID : $fillPattern;
+
+        if ($fillPattern !== Fill::FILL_NONE) {
+            $style->getFill()->setFillType($fillPattern);
+
+            $fillColors = self::getUInt2d($options, 2);
+
+            // bit: 0-6; mask: 0x007F; type
+            $color1 = (0x007F & $fillColors) >> 0;
+
+            // bit: 7-13; mask: 0x3F80; type
+            $color2 = (0x3F80 & $fillColors) >> 7;
+            if ($fillPattern === Fill::FILL_SOLID) {
+                $style->getFill()->getStartColor()->setRGB(Xls\Color::map($color2, $this->palette, $this->version)['rgb']);
+            } else {
+                $style->getFill()->getStartColor()->setRGB(Xls\Color::map($color1, $this->palette, $this->version)['rgb']);
+                $style->getFill()->getEndColor()->setRGB(Xls\Color::map($color2, $this->palette, $this->version)['rgb']);
+            }
+        }
+    }
+
+    /*private function getCFProtectionStyle(string $options, Style $style): void
+    {
+    }*/
+
+    private function readCFFormula(string $recordData, int $offset, int $size): float|int|string|null
+    {
+        try {
+            $formula = substr($recordData, $offset, $size);
+            $formula = pack('v', $size) . $formula; // prepend the length
+
+            $formula = $this->getFormulaFromStructure($formula);
+            if (is_numeric($formula)) {
+                return (str_contains($formula, '.')) ? (float) $formula : (int) $formula;
+            }
+
+            return $formula;
+        } catch (PhpSpreadsheetException) {
+            return null;
+        }
+    }
+
+    private function setCFRules(array $cellRanges, string $type, string $operator, null|float|int|string $formula1, null|float|int|string $formula2, Style $style, bool $noFormatSet): void
+    {
+        foreach ($cellRanges as $cellRange) {
+            $conditional = new Conditional();
+            $conditional->setNoFormatSet($noFormatSet);
+            $conditional->setConditionType($type);
+            $conditional->setOperatorType($operator);
+            $conditional->setStopIfTrue(true);
+            if ($formula1 !== null) {
+                $conditional->addCondition($formula1);
+            }
+            if ($formula2 !== null) {
+                $conditional->addCondition($formula2);
+            }
+            $conditional->setStyle($style);
+
+            $conditionalStyles = $this->phpSheet->getStyle($cellRange)->getConditionalStyles();
+            $conditionalStyles[] = $conditional;
+
+            $this->phpSheet->getStyle($cellRange)->setConditionalStyles($conditionalStyles);
+        }
+    }
+
+    public function getVersion(): int
+    {
+        return $this->version;
+    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color.php
index 06c2d0b90e..6fd346bfa9 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color.php
@@ -11,11 +11,10 @@ class Color
      *
      * @param int $color Indexed color
      * @param array $palette Color palette
-     * @param int $version
      *
      * @return array RGB color value, example: ['rgb' => 'FF0000']
      */
-    public static function map($color, $palette, $version)
+    public static function map(int $color, array $palette, int $version): array
     {
         if ($color <= 0x07 || $color >= 0x40) {
             // special built-in color
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color/BIFF5.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color/BIFF5.php
index 743d938773..2c0790c9ce 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color/BIFF5.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color/BIFF5.php
@@ -4,7 +4,7 @@
 
 class BIFF5
 {
-    protected static $map = [
+    private const BIFF5_COLOR_MAP = [
         0x08 => '000000',
         0x09 => 'FFFFFF',
         0x0A => 'FF0000',
@@ -65,17 +65,9 @@ class BIFF5
 
     /**
      * Map color array from BIFF5 built-in color index.
-     *
-     * @param int $color
-     *
-     * @return array
      */
-    public static function lookup($color)
+    public static function lookup(int $color): array
     {
-        if (isset(self::$map[$color])) {
-            return ['rgb' => self::$map[$color]];
-        }
-
-        return ['rgb' => '000000'];
+        return ['rgb' => self::BIFF5_COLOR_MAP[$color] ?? '000000'];
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color/BIFF8.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color/BIFF8.php
index 5d8b5ab87a..914034df26 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color/BIFF8.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color/BIFF8.php
@@ -4,78 +4,70 @@
 
 class BIFF8
 {
-    protected static $map = [
-        '000000' => 0x08,
-        'FFFFFF' => 0x09,
-        'FF0000' => 0x0A,
-        '00FF00' => 0x0B,
-        '0000FF' => 0x0C,
-        'FFFF00' => 0x0D,
-        'FF00FF' => 0x0E,
-        '00FFFF' => 0x0F,
-        '800000' => 0x10,
-        '008000' => 0x11,
-        '000080' => 0x12,
-        '808000' => 0x13,
-        '800080' => 0x14,
-        '008080' => 0x15,
-        'C0C0C0' => 0x16,
-        '808080' => 0x17,
-        '9999FF' => 0x18,
-        '993366' => 0x19,
-        'FFFFCC' => 0x1A,
-        'CCFFFF' => 0x1B,
-        '660066' => 0x1C,
-        'FF8080' => 0x1D,
-        '0066CC' => 0x1E,
-        'CCCCFF' => 0x1F,
-        //        '000080' => 0x20,
-        //        'FF00FF' => 0x21,
-        //        'FFFF00' => 0x22,
-        //        '00FFFF' => 0x23,
-        //        '800080' => 0x24,
-        //        '800000' => 0x25,
-        //        '008080' => 0x26,
-        //        '0000FF' => 0x27,
-        '00CCFF' => 0x28,
-        //        'CCFFFF' => 0x29,
-        'CCFFCC' => 0x2A,
-        'FFFF99' => 0x2B,
-        '99CCFF' => 0x2C,
-        'FF99CC' => 0x2D,
-        'CC99FF' => 0x2E,
-        'FFCC99' => 0x2F,
-        '3366FF' => 0x30,
-        '33CCCC' => 0x31,
-        '99CC00' => 0x32,
-        'FFCC00' => 0x33,
-        'FF9900' => 0x34,
-        'FF6600' => 0x35,
-        '666699' => 0x36,
-        '969696' => 0x37,
-        '003366' => 0x38,
-        '339966' => 0x39,
-        '003300' => 0x3A,
-        '333300' => 0x3B,
-        '993300' => 0x3C,
-        //        '993366' => 0x3D,
-        '333399' => 0x3E,
-        '333333' => 0x3F,
+    private const BIFF8_COLOR_MAP = [
+        0x08 => '000000',
+        0x09 => 'FFFFFF',
+        0x0A => 'FF0000',
+        0x0B => '00FF00',
+        0x0C => '0000FF',
+        0x0D => 'FFFF00',
+        0x0E => 'FF00FF',
+        0x0F => '00FFFF',
+        0x10 => '800000',
+        0x11 => '008000',
+        0x12 => '000080',
+        0x13 => '808000',
+        0x14 => '800080',
+        0x15 => '008080',
+        0x16 => 'C0C0C0',
+        0x17 => '808080',
+        0x18 => '9999FF',
+        0x19 => '993366',
+        0x1A => 'FFFFCC',
+        0x1B => 'CCFFFF',
+        0x1C => '660066',
+        0x1D => 'FF8080',
+        0x1E => '0066CC',
+        0x1F => 'CCCCFF',
+        0x20 => '000080',
+        0x21 => 'FF00FF',
+        0x22 => 'FFFF00',
+        0x23 => '00FFFF',
+        0x24 => '800080',
+        0x25 => '800000',
+        0x26 => '008080',
+        0x27 => '0000FF',
+        0x28 => '00CCFF',
+        0x29 => 'CCFFFF',
+        0x2A => 'CCFFCC',
+        0x2B => 'FFFF99',
+        0x2C => '99CCFF',
+        0x2D => 'FF99CC',
+        0x2E => 'CC99FF',
+        0x2F => 'FFCC99',
+        0x30 => '3366FF',
+        0x31 => '33CCCC',
+        0x32 => '99CC00',
+        0x33 => 'FFCC00',
+        0x34 => 'FF9900',
+        0x35 => 'FF6600',
+        0x36 => '666699',
+        0x37 => '969696',
+        0x38 => '003366',
+        0x39 => '339966',
+        0x3A => '003300',
+        0x3B => '333300',
+        0x3C => '993300',
+        0x3D => '993366',
+        0x3E => '333399',
+        0x3F => '333333',
     ];
 
     /**
      * Map color array from BIFF8 built-in color index.
-     *
-     * @param int $color
-     *
-     * @return array
      */
-    public static function lookup($color)
+    public static function lookup(int $color): array
     {
-        if (isset(self::$map[$color])) {
-            return ['rgb' => self::$map[$color]];
-        }
-
-        return ['rgb' => '000000'];
+        return ['rgb' => self::BIFF8_COLOR_MAP[$color] ?? '000000'];
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color/BuiltIn.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color/BuiltIn.php
index 90d50e336b..a715b110b9 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color/BuiltIn.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Color/BuiltIn.php
@@ -4,7 +4,7 @@
 
 class BuiltIn
 {
-    protected static $map = [
+    private const BUILTIN_COLOR_MAP = [
         0x00 => '000000',
         0x01 => 'FFFFFF',
         0x02 => 'FF0000',
@@ -21,15 +21,9 @@ class BuiltIn
      * Map built-in color to RGB value.
      *
      * @param int $color Indexed color
-     *
-     * @return array
      */
-    public static function lookup($color)
+    public static function lookup(int $color): array
     {
-        if (isset(self::$map[$color])) {
-            return ['rgb' => self::$map[$color]];
-        }
-
-        return ['rgb' => '000000'];
+        return ['rgb' => self::BUILTIN_COLOR_MAP[$color] ?? '000000'];
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/ConditionalFormatting.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/ConditionalFormatting.php
new file mode 100644
index 0000000000..fbd31d565e
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/ConditionalFormatting.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xls;
+
+use PhpOffice\PhpSpreadsheet\Style\Conditional;
+
+class ConditionalFormatting
+{
+    /**
+     * @var array<int, string>
+     */
+    private static array $types = [
+        0x01 => Conditional::CONDITION_CELLIS,
+        0x02 => Conditional::CONDITION_EXPRESSION,
+    ];
+
+    /**
+     * @var array<int, string>
+     */
+    private static array $operators = [
+        0x00 => Conditional::OPERATOR_NONE,
+        0x01 => Conditional::OPERATOR_BETWEEN,
+        0x02 => Conditional::OPERATOR_NOTBETWEEN,
+        0x03 => Conditional::OPERATOR_EQUAL,
+        0x04 => Conditional::OPERATOR_NOTEQUAL,
+        0x05 => Conditional::OPERATOR_GREATERTHAN,
+        0x06 => Conditional::OPERATOR_LESSTHAN,
+        0x07 => Conditional::OPERATOR_GREATERTHANOREQUAL,
+        0x08 => Conditional::OPERATOR_LESSTHANOREQUAL,
+    ];
+
+    public static function type(int $type): ?string
+    {
+        if (isset(self::$types[$type])) {
+            return self::$types[$type];
+        }
+
+        return null;
+    }
+
+    public static function operator(int $operator): ?string
+    {
+        if (isset(self::$operators[$operator])) {
+            return self::$operators[$operator];
+        }
+
+        return null;
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/DataValidationHelper.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/DataValidationHelper.php
new file mode 100644
index 0000000000..874e6994fd
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/DataValidationHelper.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xls;
+
+use PhpOffice\PhpSpreadsheet\Cell\DataValidation;
+
+class DataValidationHelper
+{
+    /**
+     * @var array<int, string>
+     */
+    private static array $types = [
+        0x00 => DataValidation::TYPE_NONE,
+        0x01 => DataValidation::TYPE_WHOLE,
+        0x02 => DataValidation::TYPE_DECIMAL,
+        0x03 => DataValidation::TYPE_LIST,
+        0x04 => DataValidation::TYPE_DATE,
+        0x05 => DataValidation::TYPE_TIME,
+        0x06 => DataValidation::TYPE_TEXTLENGTH,
+        0x07 => DataValidation::TYPE_CUSTOM,
+    ];
+
+    /**
+     * @var array<int, string>
+     */
+    private static array $errorStyles = [
+        0x00 => DataValidation::STYLE_STOP,
+        0x01 => DataValidation::STYLE_WARNING,
+        0x02 => DataValidation::STYLE_INFORMATION,
+    ];
+
+    /**
+     * @var array<int, string>
+     */
+    private static array $operators = [
+        0x00 => DataValidation::OPERATOR_BETWEEN,
+        0x01 => DataValidation::OPERATOR_NOTBETWEEN,
+        0x02 => DataValidation::OPERATOR_EQUAL,
+        0x03 => DataValidation::OPERATOR_NOTEQUAL,
+        0x04 => DataValidation::OPERATOR_GREATERTHAN,
+        0x05 => DataValidation::OPERATOR_LESSTHAN,
+        0x06 => DataValidation::OPERATOR_GREATERTHANOREQUAL,
+        0x07 => DataValidation::OPERATOR_LESSTHANOREQUAL,
+    ];
+
+    public static function type(int $type): ?string
+    {
+        if (isset(self::$types[$type])) {
+            return self::$types[$type];
+        }
+
+        return null;
+    }
+
+    public static function errorStyle(int $errorStyle): ?string
+    {
+        if (isset(self::$errorStyles[$errorStyle])) {
+            return self::$errorStyles[$errorStyle];
+        }
+
+        return null;
+    }
+
+    public static function operator(int $operator): ?string
+    {
+        if (isset(self::$operators[$operator])) {
+            return self::$operators[$operator];
+        }
+
+        return null;
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/ErrorCode.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/ErrorCode.php
index 7daf7230ff..fa8f8cd5d8 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/ErrorCode.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/ErrorCode.php
@@ -4,7 +4,7 @@
 
 class ErrorCode
 {
-    protected static $map = [
+    private const ERROR_CODE_MAP = [
         0x00 => '#NULL!',
         0x07 => '#DIV/0!',
         0x0F => '#VALUE!',
@@ -16,17 +16,9 @@ class ErrorCode
 
     /**
      * Map error code, e.g. '#N/A'.
-     *
-     * @param int $code
-     *
-     * @return bool|string
      */
-    public static function lookup($code)
+    public static function lookup(int $code): string|bool
     {
-        if (isset(self::$map[$code])) {
-            return self::$map[$code];
-        }
-
-        return false;
+        return self::ERROR_CODE_MAP[$code] ?? false;
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Escher.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Escher.php
index 306fc8f1f7..094c19e877 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Escher.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Escher.php
@@ -35,50 +35,57 @@ class Escher
 
     /**
      * Escher stream data (binary).
-     *
-     * @var string
      */
-    private $data;
+    private string $data;
 
     /**
      * Size in bytes of the Escher stream data.
-     *
-     * @var int
      */
-    private $dataSize;
+    private int $dataSize;
 
     /**
      * Current position of stream pointer in Escher stream data.
-     *
-     * @var int
      */
-    private $pos;
+    private int $pos;
 
     /**
      * The object to be returned by the reader. Modified during load.
-     *
-     * @var BSE|BstoreContainer|DgContainer|DggContainer|\PhpOffice\PhpSpreadsheet\Shared\Escher|SpContainer|SpgrContainer
      */
-    private $object;
+    private BSE|BstoreContainer|DgContainer|DggContainer|\PhpOffice\PhpSpreadsheet\Shared\Escher|SpContainer|SpgrContainer $object;
 
     /**
      * Create a new Escher instance.
-     *
-     * @param mixed $object
      */
-    public function __construct($object)
+    public function __construct(BSE|BstoreContainer|DgContainer|DggContainer|\PhpOffice\PhpSpreadsheet\Shared\Escher|SpContainer|SpgrContainer $object)
     {
         $this->object = $object;
     }
 
+    private const WHICH_ROUTINE = [
+        self::DGGCONTAINER => 'readDggContainer',
+        self::DGG => 'readDgg',
+        self::BSTORECONTAINER => 'readBstoreContainer',
+        self::BSE => 'readBSE',
+        self::BLIPJPEG => 'readBlipJPEG',
+        self::BLIPPNG => 'readBlipPNG',
+        self::OPT => 'readOPT',
+        self::TERTIARYOPT => 'readTertiaryOPT',
+        self::SPLITMENUCOLORS => 'readSplitMenuColors',
+        self::DGCONTAINER => 'readDgContainer',
+        self::DG => 'readDg',
+        self::SPGRCONTAINER => 'readSpgrContainer',
+        self::SPCONTAINER => 'readSpContainer',
+        self::SPGR => 'readSpgr',
+        self::SP => 'readSp',
+        self::CLIENTTEXTBOX => 'readClientTextbox',
+        self::CLIENTANCHOR => 'readClientAnchor',
+        self::CLIENTDATA => 'readClientData',
+    ];
+
     /**
      * Load Escher stream data. May be a partial Escher stream.
-     *
-     * @param string $data
-     *
-     * @return BSE|BstoreContainer|DgContainer|DggContainer|\PhpOffice\PhpSpreadsheet\Shared\Escher|SpContainer|SpgrContainer
      */
-    public function load($data)
+    public function load(string $data): BSE|BstoreContainer|DgContainer|DggContainer|\PhpOffice\PhpSpreadsheet\Shared\Escher|SpContainer|SpgrContainer
     {
         $this->data = $data;
 
@@ -91,84 +98,9 @@ public function load($data)
         while ($this->pos < $this->dataSize) {
             // offset: 2; size: 2: Record Type
             $fbt = Xls::getUInt2d($this->data, $this->pos + 2);
-
-            switch ($fbt) {
-                case self::DGGCONTAINER:
-                    $this->readDggContainer();
-
-                    break;
-                case self::DGG:
-                    $this->readDgg();
-
-                    break;
-                case self::BSTORECONTAINER:
-                    $this->readBstoreContainer();
-
-                    break;
-                case self::BSE:
-                    $this->readBSE();
-
-                    break;
-                case self::BLIPJPEG:
-                    $this->readBlipJPEG();
-
-                    break;
-                case self::BLIPPNG:
-                    $this->readBlipPNG();
-
-                    break;
-                case self::OPT:
-                    $this->readOPT();
-
-                    break;
-                case self::TERTIARYOPT:
-                    $this->readTertiaryOPT();
-
-                    break;
-                case self::SPLITMENUCOLORS:
-                    $this->readSplitMenuColors();
-
-                    break;
-                case self::DGCONTAINER:
-                    $this->readDgContainer();
-
-                    break;
-                case self::DG:
-                    $this->readDg();
-
-                    break;
-                case self::SPGRCONTAINER:
-                    $this->readSpgrContainer();
-
-                    break;
-                case self::SPCONTAINER:
-                    $this->readSpContainer();
-
-                    break;
-                case self::SPGR:
-                    $this->readSpgr();
-
-                    break;
-                case self::SP:
-                    $this->readSp();
-
-                    break;
-                case self::CLIENTTEXTBOX:
-                    $this->readClientTextbox();
-
-                    break;
-                case self::CLIENTANCHOR:
-                    $this->readClientAnchor();
-
-                    break;
-                case self::CLIENTDATA:
-                    $this->readClientData();
-
-                    break;
-                default:
-                    $this->readDefault();
-
-                    break;
+            $routine = self::WHICH_ROUTINE[$fbt] ?? 'readDefault';
+            if (method_exists($this, $routine)) {
+                $this->$routine();
             }
         }
 
@@ -181,16 +113,16 @@ public function load($data)
     private function readDefault(): void
     {
         // offset 0; size: 2; recVer and recInstance
-        $verInstance = Xls::getUInt2d($this->data, $this->pos);
+        //$verInstance = Xls::getUInt2d($this->data, $this->pos);
 
         // offset: 2; size: 2: Record Type
-        $fbt = Xls::getUInt2d($this->data, $this->pos + 2);
+        //$fbt = Xls::getUInt2d($this->data, $this->pos + 2);
 
         // bit: 0-3; mask: 0x000F; recVer
-        $recVer = (0x000F & $verInstance) >> 0;
+        //$recVer = (0x000F & $verInstance) >> 0;
 
         $length = Xls::getInt4d($this->data, $this->pos + 4);
-        $recordData = substr($this->data, $this->pos + 8, $length);
+        //$recordData = substr($this->data, $this->pos + 8, $length);
 
         // move stream pointer to next record
         $this->pos += 8 + $length;
@@ -209,7 +141,7 @@ private function readDggContainer(): void
 
         // record is a container, read contents
         $dggContainer = new DggContainer();
-        $this->object->setDggContainer($dggContainer);
+        $this->applyAttribute('setDggContainer', $dggContainer);
         $reader = new self($dggContainer);
         $reader->load($recordData);
     }
@@ -220,7 +152,7 @@ private function readDggContainer(): void
     private function readDgg(): void
     {
         $length = Xls::getInt4d($this->data, $this->pos + 4);
-        $recordData = substr($this->data, $this->pos + 8, $length);
+        //$recordData = substr($this->data, $this->pos + 8, $length);
 
         // move stream pointer to next record
         $this->pos += 8 + $length;
@@ -239,7 +171,7 @@ private function readBstoreContainer(): void
 
         // record is a container, read contents
         $bstoreContainer = new BstoreContainer();
-        $this->object->setBstoreContainer($bstoreContainer);
+        $this->applyAttribute('setBstoreContainer', $bstoreContainer);
         $reader = new self($bstoreContainer);
         $reader->load($recordData);
     }
@@ -262,45 +194,45 @@ private function readBSE(): void
 
         // add BSE to BstoreContainer
         $BSE = new BSE();
-        $this->object->addBSE($BSE);
+        $this->applyAttribute('addBSE', $BSE);
 
         $BSE->setBLIPType($recInstance);
 
         // offset: 0; size: 1; btWin32 (MSOBLIPTYPE)
-        $btWin32 = ord($recordData[0]);
+        //$btWin32 = ord($recordData[0]);
 
         // offset: 1; size: 1; btWin32 (MSOBLIPTYPE)
-        $btMacOS = ord($recordData[1]);
+        //$btMacOS = ord($recordData[1]);
 
         // offset: 2; size: 16; MD4 digest
-        $rgbUid = substr($recordData, 2, 16);
+        //$rgbUid = substr($recordData, 2, 16);
 
         // offset: 18; size: 2; tag
-        $tag = Xls::getUInt2d($recordData, 18);
+        //$tag = Xls::getUInt2d($recordData, 18);
 
         // offset: 20; size: 4; size of BLIP in bytes
-        $size = Xls::getInt4d($recordData, 20);
+        //$size = Xls::getInt4d($recordData, 20);
 
         // offset: 24; size: 4; number of references to this BLIP
-        $cRef = Xls::getInt4d($recordData, 24);
+        //$cRef = Xls::getInt4d($recordData, 24);
 
         // offset: 28; size: 4; MSOFO file offset
-        $foDelay = Xls::getInt4d($recordData, 28);
+        //$foDelay = Xls::getInt4d($recordData, 28);
 
         // offset: 32; size: 1; unused1
-        $unused1 = ord($recordData[32]);
+        //$unused1 = ord($recordData[32]);
 
         // offset: 33; size: 1; size of nameData in bytes (including null terminator)
         $cbName = ord($recordData[33]);
 
         // offset: 34; size: 1; unused2
-        $unused2 = ord($recordData[34]);
+        //$unused2 = ord($recordData[34]);
 
         // offset: 35; size: 1; unused3
-        $unused3 = ord($recordData[35]);
+        //$unused3 = ord($recordData[35]);
 
         // offset: 36; size: $cbName; nameData
-        $nameData = substr($recordData, 36, $cbName);
+        //$nameData = substr($recordData, 36, $cbName);
 
         // offset: 36 + $cbName, size: var; the BLIP data
         $blipData = substr($recordData, 36 + $cbName);
@@ -329,17 +261,17 @@ private function readBlipJPEG(): void
         $pos = 0;
 
         // offset: 0; size: 16; rgbUid1 (MD4 digest of)
-        $rgbUid1 = substr($recordData, 0, 16);
+        //$rgbUid1 = substr($recordData, 0, 16);
         $pos += 16;
 
         // offset: 16; size: 16; rgbUid2 (MD4 digest), only if $recInstance = 0x46B or 0x6E3
         if (in_array($recInstance, [0x046B, 0x06E3])) {
-            $rgbUid2 = substr($recordData, 16, 16);
+            //$rgbUid2 = substr($recordData, 16, 16);
             $pos += 16;
         }
 
         // offset: var; size: 1; tag
-        $tag = ord($recordData[$pos]);
+        //$tag = ord($recordData[$pos]);
         ++$pos;
 
         // offset: var; size: var; the raw image data
@@ -348,7 +280,7 @@ private function readBlipJPEG(): void
         $blip = new Blip();
         $blip->setData($data);
 
-        $this->object->setBlip($blip);
+        $this->applyAttribute('setBlip', $blip);
     }
 
     /**
@@ -370,17 +302,17 @@ private function readBlipPNG(): void
         $pos = 0;
 
         // offset: 0; size: 16; rgbUid1 (MD4 digest of)
-        $rgbUid1 = substr($recordData, 0, 16);
+        //$rgbUid1 = substr($recordData, 0, 16);
         $pos += 16;
 
         // offset: 16; size: 16; rgbUid2 (MD4 digest), only if $recInstance = 0x46B or 0x6E3
         if ($recInstance == 0x06E1) {
-            $rgbUid2 = substr($recordData, 16, 16);
+            //$rgbUid2 = substr($recordData, 16, 16);
             $pos += 16;
         }
 
         // offset: var; size: 1; tag
-        $tag = ord($recordData[$pos]);
+        //$tag = ord($recordData[$pos]);
         ++$pos;
 
         // offset: var; size: var; the raw image data
@@ -389,7 +321,7 @@ private function readBlipPNG(): void
         $blip = new Blip();
         $blip->setData($data);
 
-        $this->object->setBlip($blip);
+        $this->applyAttribute('setBlip', $blip);
     }
 
     /**
@@ -419,10 +351,10 @@ private function readTertiaryOPT(): void
         // offset: 0; size: 2; recVer and recInstance
 
         // bit: 4-15; mask: 0xFFF0; recInstance
-        $recInstance = (0xFFF0 & Xls::getUInt2d($this->data, $this->pos)) >> 4;
+        //$recInstance = (0xFFF0 & Xls::getUInt2d($this->data, $this->pos)) >> 4;
 
         $length = Xls::getInt4d($this->data, $this->pos + 4);
-        $recordData = substr($this->data, $this->pos + 8, $length);
+        //$recordData = substr($this->data, $this->pos + 8, $length);
 
         // move stream pointer to next record
         $this->pos += 8 + $length;
@@ -434,7 +366,7 @@ private function readTertiaryOPT(): void
     private function readSplitMenuColors(): void
     {
         $length = Xls::getInt4d($this->data, $this->pos + 4);
-        $recordData = substr($this->data, $this->pos + 8, $length);
+        //$recordData = substr($this->data, $this->pos + 8, $length);
 
         // move stream pointer to next record
         $this->pos += 8 + $length;
@@ -453,9 +385,9 @@ private function readDgContainer(): void
 
         // record is a container, read contents
         $dgContainer = new DgContainer();
-        $this->object->setDgContainer($dgContainer);
+        $this->applyAttribute('setDgContainer', $dgContainer);
         $reader = new self($dgContainer);
-        $escher = $reader->load($recordData);
+        $reader->load($recordData);
     }
 
     /**
@@ -464,7 +396,7 @@ private function readDgContainer(): void
     private function readDg(): void
     {
         $length = Xls::getInt4d($this->data, $this->pos + 4);
-        $recordData = substr($this->data, $this->pos + 8, $length);
+        //$recordData = substr($this->data, $this->pos + 8, $length);
 
         // move stream pointer to next record
         $this->pos += 8 + $length;
@@ -489,13 +421,13 @@ private function readSpgrContainer(): void
         if ($this->object instanceof DgContainer) {
             // DgContainer
             $this->object->setSpgrContainer($spgrContainer);
-        } else {
+        } elseif ($this->object instanceof SpgrContainer) {
             // SpgrContainer
             $this->object->addChild($spgrContainer);
         }
 
         $reader = new self($spgrContainer);
-        $escher = $reader->load($recordData);
+        $reader->load($recordData);
     }
 
     /**
@@ -508,14 +440,14 @@ private function readSpContainer(): void
 
         // add spContainer to spgrContainer
         $spContainer = new SpContainer();
-        $this->object->addChild($spContainer);
+        $this->applyAttribute('addChild', $spContainer);
 
         // move stream pointer to next record
         $this->pos += 8 + $length;
 
         // record is a container, read contents
         $reader = new self($spContainer);
-        $escher = $reader->load($recordData);
+        $reader->load($recordData);
     }
 
     /**
@@ -524,7 +456,7 @@ private function readSpContainer(): void
     private function readSpgr(): void
     {
         $length = Xls::getInt4d($this->data, $this->pos + 4);
-        $recordData = substr($this->data, $this->pos + 8, $length);
+        //$recordData = substr($this->data, $this->pos + 8, $length);
 
         // move stream pointer to next record
         $this->pos += 8 + $length;
@@ -538,10 +470,10 @@ private function readSp(): void
         // offset: 0; size: 2; recVer and recInstance
 
         // bit: 4-15; mask: 0xFFF0; recInstance
-        $recInstance = (0xFFF0 & Xls::getUInt2d($this->data, $this->pos)) >> 4;
+        //$recInstance = (0xFFF0 & Xls::getUInt2d($this->data, $this->pos)) >> 4;
 
         $length = Xls::getInt4d($this->data, $this->pos + 4);
-        $recordData = substr($this->data, $this->pos + 8, $length);
+        //$recordData = substr($this->data, $this->pos + 8, $length);
 
         // move stream pointer to next record
         $this->pos += 8 + $length;
@@ -555,10 +487,10 @@ private function readClientTextbox(): void
         // offset: 0; size: 2; recVer and recInstance
 
         // bit: 4-15; mask: 0xFFF0; recInstance
-        $recInstance = (0xFFF0 & Xls::getUInt2d($this->data, $this->pos)) >> 4;
+        //$recInstance = (0xFFF0 & Xls::getUInt2d($this->data, $this->pos)) >> 4;
 
         $length = Xls::getInt4d($this->data, $this->pos + 4);
-        $recordData = substr($this->data, $this->pos + 8, $length);
+        //$recordData = substr($this->data, $this->pos + 8, $length);
 
         // move stream pointer to next record
         $this->pos += 8 + $length;
@@ -599,23 +531,19 @@ private function readClientAnchor(): void
         // offset: 16; size: 2; bottom-right corner vertical offset in 1/256 of row height
         $endOffsetY = Xls::getUInt2d($recordData, 16);
 
-        // set the start coordinates
-        $this->object->setStartCoordinates(Coordinate::stringFromColumnIndex($c1 + 1) . ($r1 + 1));
-
-        // set the start offsetX
-        $this->object->setStartOffsetX($startOffsetX);
-
-        // set the start offsetY
-        $this->object->setStartOffsetY($startOffsetY);
-
-        // set the end coordinates
-        $this->object->setEndCoordinates(Coordinate::stringFromColumnIndex($c2 + 1) . ($r2 + 1));
-
-        // set the end offsetX
-        $this->object->setEndOffsetX($endOffsetX);
+        $this->applyAttribute('setStartCoordinates', Coordinate::stringFromColumnIndex($c1 + 1) . ($r1 + 1));
+        $this->applyAttribute('setStartOffsetX', $startOffsetX);
+        $this->applyAttribute('setStartOffsetY', $startOffsetY);
+        $this->applyAttribute('setEndCoordinates', Coordinate::stringFromColumnIndex($c2 + 1) . ($r2 + 1));
+        $this->applyAttribute('setEndOffsetX', $endOffsetX);
+        $this->applyAttribute('setEndOffsetY', $endOffsetY);
+    }
 
-        // set the end offsetY
-        $this->object->setEndOffsetY($endOffsetY);
+    private function applyAttribute(string $name, mixed $value): void
+    {
+        if (method_exists($this->object, $name)) {
+            $this->object->$name($value);
+        }
     }
 
     /**
@@ -624,7 +552,7 @@ private function readClientAnchor(): void
     private function readClientData(): void
     {
         $length = Xls::getInt4d($this->data, $this->pos + 4);
-        $recordData = substr($this->data, $this->pos + 8, $length);
+        //$recordData = substr($this->data, $this->pos + 8, $length);
 
         // move stream pointer to next record
         $this->pos += 8 + $length;
@@ -636,7 +564,7 @@ private function readClientData(): void
      * @param string $data Binary data
      * @param int $n Number of properties
      */
-    private function readOfficeArtRGFOPTE($data, $n): void
+    private function readOfficeArtRGFOPTE(string $data, int $n): void
     {
         $splicedComplexData = substr($data, 6 * $n);
 
@@ -652,7 +580,7 @@ private function readOfficeArtRGFOPTE($data, $n): void
             $opidOpid = (0x3FFF & $opid) >> 0;
 
             // bit: 14; mask 0x4000; 1 = value in op field is BLIP identifier
-            $opidFBid = (0x4000 & $opid) >> 14;
+            //$opidFBid = (0x4000 & $opid) >> 14;
 
             // bit: 15; mask 0x8000; 1 = this is a complex property, op field specifies size of complex data
             $opidFComplex = (0x8000 & $opid) >> 15;
@@ -671,7 +599,9 @@ private function readOfficeArtRGFOPTE($data, $n): void
                 $value = $op;
             }
 
-            $this->object->setOPT($opidOpid, $value);
+            if (method_exists($this->object, 'setOPT')) {
+                $this->object->setOPT($opidOpid, $value);
+            }
         }
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/MD5.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/MD5.php
index 3e15f64133..7da2eeee5f 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/MD5.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/MD5.php
@@ -4,33 +4,22 @@
 
 class MD5
 {
-    // Context
+    private int $a;
 
-    /**
-     * @var int
-     */
-    private $a;
+    private int $b;
 
-    /**
-     * @var int
-     */
-    private $b;
+    private int $c;
 
-    /**
-     * @var int
-     */
-    private $c;
+    private int $d;
 
-    /**
-     * @var int
-     */
-    private $d;
+    private static int $allOneBits;
 
     /**
      * MD5 stream constructor.
      */
     public function __construct()
     {
+        self::$allOneBits = self::signedInt(0xFFFFFFFF);
         $this->reset();
     }
 
@@ -40,25 +29,23 @@ public function __construct()
     public function reset(): void
     {
         $this->a = 0x67452301;
-        $this->b = 0xEFCDAB89;
-        $this->c = 0x98BADCFE;
+        $this->b = self::signedInt(0xEFCDAB89);
+        $this->c = self::signedInt(0x98BADCFE);
         $this->d = 0x10325476;
     }
 
     /**
      * Get MD5 stream context.
-     *
-     * @return string
      */
-    public function getContext()
+    public function getContext(): string
     {
         $s = '';
         foreach (['a', 'b', 'c', 'd'] as $i) {
             $v = $this->{$i};
-            $s .= chr($v & 0xff);
-            $s .= chr(($v >> 8) & 0xff);
-            $s .= chr(($v >> 16) & 0xff);
-            $s .= chr(($v >> 24) & 0xff);
+            $s .= chr($v & 0xFF);
+            $s .= chr(($v >> 8) & 0xFF);
+            $s .= chr(($v >> 16) & 0xFF);
+            $s .= chr(($v >> 24) & 0xFF);
         }
 
         return $s;
@@ -71,6 +58,7 @@ public function getContext()
      */
     public function add(string $data): void
     {
+        // @phpstan-ignore-next-line
         $words = array_values(unpack('V16', $data));
 
         $A = $this->a;
@@ -78,120 +66,128 @@ public function add(string $data): void
         $C = $this->c;
         $D = $this->d;
 
-        $F = ['self', 'f'];
-        $G = ['self', 'g'];
-        $H = ['self', 'h'];
-        $I = ['self', 'i'];
+        $F = [self::class, 'f'];
+        $G = [self::class, 'g'];
+        $H = [self::class, 'h'];
+        $I = [self::class, 'i'];
 
         // ROUND 1
-        self::step($F, $A, $B, $C, $D, $words[0], 7, 0xd76aa478);
-        self::step($F, $D, $A, $B, $C, $words[1], 12, 0xe8c7b756);
-        self::step($F, $C, $D, $A, $B, $words[2], 17, 0x242070db);
-        self::step($F, $B, $C, $D, $A, $words[3], 22, 0xc1bdceee);
-        self::step($F, $A, $B, $C, $D, $words[4], 7, 0xf57c0faf);
-        self::step($F, $D, $A, $B, $C, $words[5], 12, 0x4787c62a);
-        self::step($F, $C, $D, $A, $B, $words[6], 17, 0xa8304613);
-        self::step($F, $B, $C, $D, $A, $words[7], 22, 0xfd469501);
-        self::step($F, $A, $B, $C, $D, $words[8], 7, 0x698098d8);
-        self::step($F, $D, $A, $B, $C, $words[9], 12, 0x8b44f7af);
-        self::step($F, $C, $D, $A, $B, $words[10], 17, 0xffff5bb1);
-        self::step($F, $B, $C, $D, $A, $words[11], 22, 0x895cd7be);
-        self::step($F, $A, $B, $C, $D, $words[12], 7, 0x6b901122);
-        self::step($F, $D, $A, $B, $C, $words[13], 12, 0xfd987193);
-        self::step($F, $C, $D, $A, $B, $words[14], 17, 0xa679438e);
-        self::step($F, $B, $C, $D, $A, $words[15], 22, 0x49b40821);
+        self::step($F, $A, $B, $C, $D, $words[0], 7, 0xD76AA478);
+        self::step($F, $D, $A, $B, $C, $words[1], 12, 0xE8C7B756);
+        self::step($F, $C, $D, $A, $B, $words[2], 17, 0x242070DB);
+        self::step($F, $B, $C, $D, $A, $words[3], 22, 0xC1BDCEEE);
+        self::step($F, $A, $B, $C, $D, $words[4], 7, 0xF57C0FAF);
+        self::step($F, $D, $A, $B, $C, $words[5], 12, 0x4787C62A);
+        self::step($F, $C, $D, $A, $B, $words[6], 17, 0xA8304613);
+        self::step($F, $B, $C, $D, $A, $words[7], 22, 0xFD469501);
+        self::step($F, $A, $B, $C, $D, $words[8], 7, 0x698098D8);
+        self::step($F, $D, $A, $B, $C, $words[9], 12, 0x8B44F7AF);
+        self::step($F, $C, $D, $A, $B, $words[10], 17, 0xFFFF5BB1);
+        self::step($F, $B, $C, $D, $A, $words[11], 22, 0x895CD7BE);
+        self::step($F, $A, $B, $C, $D, $words[12], 7, 0x6B901122);
+        self::step($F, $D, $A, $B, $C, $words[13], 12, 0xFD987193);
+        self::step($F, $C, $D, $A, $B, $words[14], 17, 0xA679438E);
+        self::step($F, $B, $C, $D, $A, $words[15], 22, 0x49B40821);
 
         // ROUND 2
-        self::step($G, $A, $B, $C, $D, $words[1], 5, 0xf61e2562);
-        self::step($G, $D, $A, $B, $C, $words[6], 9, 0xc040b340);
-        self::step($G, $C, $D, $A, $B, $words[11], 14, 0x265e5a51);
-        self::step($G, $B, $C, $D, $A, $words[0], 20, 0xe9b6c7aa);
-        self::step($G, $A, $B, $C, $D, $words[5], 5, 0xd62f105d);
+        self::step($G, $A, $B, $C, $D, $words[1], 5, 0xF61E2562);
+        self::step($G, $D, $A, $B, $C, $words[6], 9, 0xC040B340);
+        self::step($G, $C, $D, $A, $B, $words[11], 14, 0x265E5A51);
+        self::step($G, $B, $C, $D, $A, $words[0], 20, 0xE9B6C7AA);
+        self::step($G, $A, $B, $C, $D, $words[5], 5, 0xD62F105D);
         self::step($G, $D, $A, $B, $C, $words[10], 9, 0x02441453);
-        self::step($G, $C, $D, $A, $B, $words[15], 14, 0xd8a1e681);
-        self::step($G, $B, $C, $D, $A, $words[4], 20, 0xe7d3fbc8);
-        self::step($G, $A, $B, $C, $D, $words[9], 5, 0x21e1cde6);
-        self::step($G, $D, $A, $B, $C, $words[14], 9, 0xc33707d6);
-        self::step($G, $C, $D, $A, $B, $words[3], 14, 0xf4d50d87);
-        self::step($G, $B, $C, $D, $A, $words[8], 20, 0x455a14ed);
-        self::step($G, $A, $B, $C, $D, $words[13], 5, 0xa9e3e905);
-        self::step($G, $D, $A, $B, $C, $words[2], 9, 0xfcefa3f8);
-        self::step($G, $C, $D, $A, $B, $words[7], 14, 0x676f02d9);
-        self::step($G, $B, $C, $D, $A, $words[12], 20, 0x8d2a4c8a);
+        self::step($G, $C, $D, $A, $B, $words[15], 14, 0xD8A1E681);
+        self::step($G, $B, $C, $D, $A, $words[4], 20, 0xE7D3FBC8);
+        self::step($G, $A, $B, $C, $D, $words[9], 5, 0x21E1CDE6);
+        self::step($G, $D, $A, $B, $C, $words[14], 9, 0xC33707D6);
+        self::step($G, $C, $D, $A, $B, $words[3], 14, 0xF4D50D87);
+        self::step($G, $B, $C, $D, $A, $words[8], 20, 0x455A14ED);
+        self::step($G, $A, $B, $C, $D, $words[13], 5, 0xA9E3E905);
+        self::step($G, $D, $A, $B, $C, $words[2], 9, 0xFCEFA3F8);
+        self::step($G, $C, $D, $A, $B, $words[7], 14, 0x676F02D9);
+        self::step($G, $B, $C, $D, $A, $words[12], 20, 0x8D2A4C8A);
 
         // ROUND 3
-        self::step($H, $A, $B, $C, $D, $words[5], 4, 0xfffa3942);
-        self::step($H, $D, $A, $B, $C, $words[8], 11, 0x8771f681);
-        self::step($H, $C, $D, $A, $B, $words[11], 16, 0x6d9d6122);
-        self::step($H, $B, $C, $D, $A, $words[14], 23, 0xfde5380c);
-        self::step($H, $A, $B, $C, $D, $words[1], 4, 0xa4beea44);
-        self::step($H, $D, $A, $B, $C, $words[4], 11, 0x4bdecfa9);
-        self::step($H, $C, $D, $A, $B, $words[7], 16, 0xf6bb4b60);
-        self::step($H, $B, $C, $D, $A, $words[10], 23, 0xbebfbc70);
-        self::step($H, $A, $B, $C, $D, $words[13], 4, 0x289b7ec6);
-        self::step($H, $D, $A, $B, $C, $words[0], 11, 0xeaa127fa);
-        self::step($H, $C, $D, $A, $B, $words[3], 16, 0xd4ef3085);
-        self::step($H, $B, $C, $D, $A, $words[6], 23, 0x04881d05);
-        self::step($H, $A, $B, $C, $D, $words[9], 4, 0xd9d4d039);
-        self::step($H, $D, $A, $B, $C, $words[12], 11, 0xe6db99e5);
-        self::step($H, $C, $D, $A, $B, $words[15], 16, 0x1fa27cf8);
-        self::step($H, $B, $C, $D, $A, $words[2], 23, 0xc4ac5665);
+        self::step($H, $A, $B, $C, $D, $words[5], 4, 0xFFFA3942);
+        self::step($H, $D, $A, $B, $C, $words[8], 11, 0x8771F681);
+        self::step($H, $C, $D, $A, $B, $words[11], 16, 0x6D9D6122);
+        self::step($H, $B, $C, $D, $A, $words[14], 23, 0xFDE5380C);
+        self::step($H, $A, $B, $C, $D, $words[1], 4, 0xA4BEEA44);
+        self::step($H, $D, $A, $B, $C, $words[4], 11, 0x4BDECFA9);
+        self::step($H, $C, $D, $A, $B, $words[7], 16, 0xF6BB4B60);
+        self::step($H, $B, $C, $D, $A, $words[10], 23, 0xBEBFBC70);
+        self::step($H, $A, $B, $C, $D, $words[13], 4, 0x289B7EC6);
+        self::step($H, $D, $A, $B, $C, $words[0], 11, 0xEAA127FA);
+        self::step($H, $C, $D, $A, $B, $words[3], 16, 0xD4EF3085);
+        self::step($H, $B, $C, $D, $A, $words[6], 23, 0x04881D05);
+        self::step($H, $A, $B, $C, $D, $words[9], 4, 0xD9D4D039);
+        self::step($H, $D, $A, $B, $C, $words[12], 11, 0xE6DB99E5);
+        self::step($H, $C, $D, $A, $B, $words[15], 16, 0x1FA27CF8);
+        self::step($H, $B, $C, $D, $A, $words[2], 23, 0xC4AC5665);
 
         // ROUND 4
-        self::step($I, $A, $B, $C, $D, $words[0], 6, 0xf4292244);
-        self::step($I, $D, $A, $B, $C, $words[7], 10, 0x432aff97);
-        self::step($I, $C, $D, $A, $B, $words[14], 15, 0xab9423a7);
-        self::step($I, $B, $C, $D, $A, $words[5], 21, 0xfc93a039);
-        self::step($I, $A, $B, $C, $D, $words[12], 6, 0x655b59c3);
-        self::step($I, $D, $A, $B, $C, $words[3], 10, 0x8f0ccc92);
-        self::step($I, $C, $D, $A, $B, $words[10], 15, 0xffeff47d);
-        self::step($I, $B, $C, $D, $A, $words[1], 21, 0x85845dd1);
-        self::step($I, $A, $B, $C, $D, $words[8], 6, 0x6fa87e4f);
-        self::step($I, $D, $A, $B, $C, $words[15], 10, 0xfe2ce6e0);
-        self::step($I, $C, $D, $A, $B, $words[6], 15, 0xa3014314);
-        self::step($I, $B, $C, $D, $A, $words[13], 21, 0x4e0811a1);
-        self::step($I, $A, $B, $C, $D, $words[4], 6, 0xf7537e82);
-        self::step($I, $D, $A, $B, $C, $words[11], 10, 0xbd3af235);
-        self::step($I, $C, $D, $A, $B, $words[2], 15, 0x2ad7d2bb);
-        self::step($I, $B, $C, $D, $A, $words[9], 21, 0xeb86d391);
-
-        $this->a = ($this->a + $A) & 0xffffffff;
-        $this->b = ($this->b + $B) & 0xffffffff;
-        $this->c = ($this->c + $C) & 0xffffffff;
-        $this->d = ($this->d + $D) & 0xffffffff;
+        self::step($I, $A, $B, $C, $D, $words[0], 6, 0xF4292244);
+        self::step($I, $D, $A, $B, $C, $words[7], 10, 0x432AFF97);
+        self::step($I, $C, $D, $A, $B, $words[14], 15, 0xAB9423A7);
+        self::step($I, $B, $C, $D, $A, $words[5], 21, 0xFC93A039);
+        self::step($I, $A, $B, $C, $D, $words[12], 6, 0x655B59C3);
+        self::step($I, $D, $A, $B, $C, $words[3], 10, 0x8F0CCC92);
+        self::step($I, $C, $D, $A, $B, $words[10], 15, 0xFFEFF47D);
+        self::step($I, $B, $C, $D, $A, $words[1], 21, 0x85845DD1);
+        self::step($I, $A, $B, $C, $D, $words[8], 6, 0x6FA87E4F);
+        self::step($I, $D, $A, $B, $C, $words[15], 10, 0xFE2CE6E0);
+        self::step($I, $C, $D, $A, $B, $words[6], 15, 0xA3014314);
+        self::step($I, $B, $C, $D, $A, $words[13], 21, 0x4E0811A1);
+        self::step($I, $A, $B, $C, $D, $words[4], 6, 0xF7537E82);
+        self::step($I, $D, $A, $B, $C, $words[11], 10, 0xBD3AF235);
+        self::step($I, $C, $D, $A, $B, $words[2], 15, 0x2AD7D2BB);
+        self::step($I, $B, $C, $D, $A, $words[9], 21, 0xEB86D391);
+
+        $this->a = ($this->a + $A) & self::$allOneBits;
+        $this->b = ($this->b + $B) & self::$allOneBits;
+        $this->c = ($this->c + $C) & self::$allOneBits;
+        $this->d = ($this->d + $D) & self::$allOneBits;
     }
 
-    private static function f(int $X, int $Y, int $Z)
+    private static function f(int $X, int $Y, int $Z): int
     {
         return ($X & $Y) | ((~$X) & $Z); // X AND Y OR NOT X AND Z
     }
 
-    private static function g(int $X, int $Y, int $Z)
+    private static function g(int $X, int $Y, int $Z): int
     {
         return ($X & $Z) | ($Y & (~$Z)); // X AND Z OR Y AND NOT Z
     }
 
-    private static function h(int $X, int $Y, int $Z)
+    private static function h(int $X, int $Y, int $Z): int
     {
         return $X ^ $Y ^ $Z; // X XOR Y XOR Z
     }
 
-    private static function i(int $X, int $Y, int $Z)
+    private static function i(int $X, int $Y, int $Z): int
     {
         return $Y ^ ($X | (~$Z)); // Y XOR (X OR NOT Z)
     }
 
-    private static function step($func, int &$A, int $B, int $C, int $D, int $M, int $s, int $t): void
+    /** @param float|int $t may be float on 32-bit system */
+    private static function step(callable $func, int &$A, int $B, int $C, int $D, int $M, int $s, $t): void
     {
-        $A = ($A + call_user_func($func, $B, $C, $D) + $M + $t) & 0xffffffff;
+        $t = self::signedInt($t);
+        $A = (int) ($A + call_user_func($func, $B, $C, $D) + $M + $t) & self::$allOneBits;
         $A = self::rotate($A, $s);
-        $A = ($B + $A) & 0xffffffff;
+        $A = (int) ($B + $A) & self::$allOneBits;
+    }
+
+    /** @param float|int $result may be float on 32-bit system */
+    private static function signedInt($result): int
+    {
+        return is_int($result) ? $result : (int) (PHP_INT_MIN + $result - 1 - PHP_INT_MAX);
     }
 
-    private static function rotate(int $decimal, int $bits)
+    private static function rotate(int $decimal, int $bits): int
     {
         $binary = str_pad(decbin($decimal), 32, '0', STR_PAD_LEFT);
 
-        return bindec(substr($binary, $bits) . substr($binary, 0, $bits));
+        return self::signedInt(bindec(substr($binary, $bits) . substr($binary, 0, $bits)));
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/RC4.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/RC4.php
index 691aca7c39..663f36723a 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/RC4.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/RC4.php
@@ -4,19 +4,19 @@
 
 class RC4
 {
-    // Context
-    protected $s = [];
+    /** @var int[] */
+    protected array $s = []; // Context
 
-    protected $i = 0;
+    protected int $i = 0;
 
-    protected $j = 0;
+    protected int $j = 0;
 
     /**
      * RC4 stream decryption/encryption constrcutor.
      *
      * @param string $key Encryption key/passphrase
      */
-    public function __construct($key)
+    public function __construct(string $key)
     {
         $len = strlen($key);
 
@@ -38,10 +38,8 @@ public function __construct($key)
      * Symmetric decryption/encryption function.
      *
      * @param string $data Data to encrypt/decrypt
-     *
-     * @return string
      */
-    public function RC4($data)
+    public function RC4(string $data): string
     {
         $len = strlen($data);
         for ($c = 0; $c < $len; ++$c) {
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/Border.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/Border.php
index d832eb020f..97cebbd44e 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/Border.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/Border.php
@@ -9,7 +9,7 @@ class Border
     /**
      * @var array<int, string>
      */
-    protected static $borderStyleMap = [
+    protected static array $borderStyleMap = [
         0x00 => StyleBorder::BORDER_NONE,
         0x01 => StyleBorder::BORDER_THIN,
         0x02 => StyleBorder::BORDER_MEDIUM,
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/CellAlignment.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/CellAlignment.php
index f03d47fae6..6b89d27e0a 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/CellAlignment.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/CellAlignment.php
@@ -9,7 +9,7 @@ class CellAlignment
     /**
      * @var array<int, string>
      */
-    protected static $horizontalAlignmentMap = [
+    protected static array $horizontalAlignmentMap = [
         0 => Alignment::HORIZONTAL_GENERAL,
         1 => Alignment::HORIZONTAL_LEFT,
         2 => Alignment::HORIZONTAL_CENTER,
@@ -22,7 +22,7 @@ class CellAlignment
     /**
      * @var array<int, string>
      */
-    protected static $verticalAlignmentMap = [
+    protected static array $verticalAlignmentMap = [
         0 => Alignment::VERTICAL_TOP,
         1 => Alignment::VERTICAL_CENTER,
         2 => Alignment::VERTICAL_BOTTOM,
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/CellFont.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/CellFont.php
index e975be4dce..2c6d2f7f9e 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/CellFont.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/CellFont.php
@@ -23,7 +23,7 @@ public static function escapement(Font $font, int $escapement): void
     /**
      * @var array<int, string>
      */
-    protected static $underlineMap = [
+    protected static array $underlineMap = [
         0x01 => Font::UNDERLINE_SINGLE,
         0x02 => Font::UNDERLINE_DOUBLE,
         0x21 => Font::UNDERLINE_SINGLEACCOUNTING,
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/FillPattern.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/FillPattern.php
index 32ab5c859b..4e379509e5 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/FillPattern.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls/Style/FillPattern.php
@@ -9,7 +9,7 @@ class FillPattern
     /**
      * @var array<int, string>
      */
-    protected static $fillPatternMap = [
+    protected static array $fillPatternMap = [
         0x00 => Fill::FILL_NONE,
         0x01 => Fill::FILL_SOLID,
         0x02 => Fill::FILL_PATTERN_MEDIUMGRAY,
@@ -34,12 +34,8 @@ class FillPattern
     /**
      * Get fill pattern from index
      * OpenOffice documentation: 2.5.12.
-     *
-     * @param int $index
-     *
-     * @return string
      */
-    public static function lookup($index)
+    public static function lookup(int $index): string
     {
         if (isset(self::$fillPatternMap[$index])) {
             return self::$fillPatternMap[$index];
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx.php
index 82e4e82d02..53cc1b53da 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx.php
@@ -2,9 +2,11 @@
 
 namespace PhpOffice\PhpSpreadsheet\Reader;
 
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Cell\DataType;
 use PhpOffice\PhpSpreadsheet\Cell\Hyperlink;
+use PhpOffice\PhpSpreadsheet\Comment;
 use PhpOffice\PhpSpreadsheet\DefinedName;
 use PhpOffice\PhpSpreadsheet\Reader\Security\XmlScanner;
 use PhpOffice\PhpSpreadsheet\Reader\Xlsx\AutoFilter;
@@ -13,11 +15,16 @@
 use PhpOffice\PhpSpreadsheet\Reader\Xlsx\ConditionalStyles;
 use PhpOffice\PhpSpreadsheet\Reader\Xlsx\DataValidations;
 use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Hyperlinks;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Namespaces;
 use PhpOffice\PhpSpreadsheet\Reader\Xlsx\PageSetup;
 use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Properties as PropertyReader;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\SharedFormula;
 use PhpOffice\PhpSpreadsheet\Reader\Xlsx\SheetViewOptions;
 use PhpOffice\PhpSpreadsheet\Reader\Xlsx\SheetViews;
 use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Styles;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\TableReader;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Theme;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\WorkbookView;
 use PhpOffice\PhpSpreadsheet\ReferenceHelper;
 use PhpOffice\PhpSpreadsheet\RichText\RichText;
 use PhpOffice\PhpSpreadsheet\Settings;
@@ -28,31 +35,30 @@
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Style\Color;
+use PhpOffice\PhpSpreadsheet\Style\Font as StyleFont;
 use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
 use PhpOffice\PhpSpreadsheet\Style\Style;
 use PhpOffice\PhpSpreadsheet\Worksheet\HeaderFooterDrawing;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 use SimpleXMLElement;
-use stdClass;
 use Throwable;
 use XMLReader;
 use ZipArchive;
 
 class Xlsx extends BaseReader
 {
+    const INITIAL_FILE = '_rels/.rels';
+
     /**
      * ReferenceHelper instance.
-     *
-     * @var ReferenceHelper
      */
-    private $referenceHelper;
+    private ReferenceHelper $referenceHelper;
 
-    /**
-     * Xlsx\Theme instance.
-     *
-     * @var Xlsx\Theme
-     */
-    private static $theme = null;
+    private ZipArchive $zip;
+
+    private Styles $styleReader;
+
+    private array $sharedFormulae = [];
 
     /**
      * Create a new Xlsx Reader instance.
@@ -66,20 +72,18 @@ public function __construct()
 
     /**
      * Can the current IReader read the file?
-     *
-     * @param string $pFilename
-     *
-     * @return bool
      */
-    public function canRead($pFilename)
+    public function canRead(string $filename): bool
     {
-        File::assertFile($pFilename);
+        if (!File::testFileNoThrow($filename, self::INITIAL_FILE)) {
+            return false;
+        }
 
         $result = false;
-        $zip = new ZipArchive();
+        $this->zip = $zip = new ZipArchive();
 
-        if ($zip->open($pFilename) === true) {
-            $workbookBasename = $this->getWorkbookBaseName($zip);
+        if ($zip->open($filename) === true) {
+            [$workbookBasename] = $this->getWorkbookBaseName();
             $result = !empty($workbookBasename);
 
             $zip->close();
@@ -88,41 +92,98 @@ public function canRead($pFilename)
         return $result;
     }
 
+    public static function testSimpleXml(mixed $value): SimpleXMLElement
+    {
+        return ($value instanceof SimpleXMLElement) ? $value : new SimpleXMLElement('<?xml version="1.0" encoding="UTF-8"?><root></root>');
+    }
+
+    public static function getAttributes(?SimpleXMLElement $value, string $ns = ''): SimpleXMLElement
+    {
+        return self::testSimpleXml($value === null ? $value : $value->attributes($ns));
+    }
+
+    // Phpstan thinks, correctly, that xpath can return false.
+    private static function xpathNoFalse(SimpleXMLElement $sxml, string $path): array
+    {
+        return self::falseToArray($sxml->xpath($path));
+    }
+
+    public static function falseToArray(mixed $value): array
+    {
+        return is_array($value) ? $value : [];
+    }
+
+    private function loadZip(string $filename, string $ns = '', bool $replaceUnclosedBr = false): SimpleXMLElement
+    {
+        $contents = $this->getFromZipArchive($this->zip, $filename);
+        if ($replaceUnclosedBr) {
+            $contents = str_replace('<br>', '<br/>', $contents);
+        }
+        $rels = @simplexml_load_string(
+            $this->getSecurityScannerOrThrow()->scan($contents),
+            'SimpleXMLElement',
+            Settings::getLibXmlLoaderOptions(),
+            $ns
+        );
+
+        return self::testSimpleXml($rels);
+    }
+
+    // This function is just to identify cases where I'm not sure
+    // why empty namespace is required.
+    private function loadZipNonamespace(string $filename, string $ns): SimpleXMLElement
+    {
+        $contents = $this->getFromZipArchive($this->zip, $filename);
+        $rels = simplexml_load_string(
+            $this->getSecurityScannerOrThrow()->scan($contents),
+            'SimpleXMLElement',
+            Settings::getLibXmlLoaderOptions(),
+            ($ns === '' ? $ns : '')
+        );
+
+        return self::testSimpleXml($rels);
+    }
+
+    private const REL_TO_MAIN = [
+        Namespaces::PURL_OFFICE_DOCUMENT => Namespaces::PURL_MAIN,
+        Namespaces::THUMBNAIL => '',
+    ];
+
+    private const REL_TO_DRAWING = [
+        Namespaces::PURL_RELATIONSHIPS => Namespaces::PURL_DRAWING,
+    ];
+
+    private const REL_TO_CHART = [
+        Namespaces::PURL_RELATIONSHIPS => Namespaces::PURL_CHART,
+    ];
+
     /**
      * Reads names of the worksheets from a file, without parsing the whole file to a Spreadsheet object.
-     *
-     * @param string $pFilename
-     *
-     * @return array
      */
-    public function listWorksheetNames($pFilename)
+    public function listWorksheetNames(string $filename): array
     {
-        File::assertFile($pFilename);
+        File::assertFile($filename, self::INITIAL_FILE);
 
         $worksheetNames = [];
 
-        $zip = new ZipArchive();
-        $zip->open($pFilename);
+        $this->zip = $zip = new ZipArchive();
+        $zip->open($filename);
 
         //    The files we're looking at here are small enough that simpleXML is more efficient than XMLReader
-        //~ http://schemas.openxmlformats.org/package/2006/relationships");
-        $rels = simplexml_load_string(
-            $this->securityScanner->scan($this->getFromZipArchive($zip, '_rels/.rels'))
-        );
-        foreach ($rels->Relationship as $rel) {
-            switch ($rel['Type']) {
-                case 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument':
-                    //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main"
-                    $xmlWorkbook = simplexml_load_string(
-                        $this->securityScanner->scan($this->getFromZipArchive($zip, "{$rel['Target']}"))
-                    );
-
-                    if ($xmlWorkbook->sheets) {
-                        foreach ($xmlWorkbook->sheets->sheet as $eleSheet) {
-                            // Check if sheet should be skipped
-                            $worksheetNames[] = (string) $eleSheet['name'];
-                        }
+        $rels = $this->loadZip(self::INITIAL_FILE, Namespaces::RELATIONSHIPS);
+        foreach ($rels->Relationship as $relx) {
+            $rel = self::getAttributes($relx);
+            $relType = (string) $rel['Type'];
+            $mainNS = self::REL_TO_MAIN[$relType] ?? Namespaces::MAIN;
+            if ($mainNS !== '') {
+                $xmlWorkbook = $this->loadZip((string) $rel['Target'], $mainNS);
+
+                if ($xmlWorkbook->sheets) {
+                    foreach ($xmlWorkbook->sheets->sheet as $eleSheet) {
+                        // Check if sheet should be skipped
+                        $worksheetNames[] = (string) self::getAttributes($eleSheet)['name'];
                     }
+                }
             }
         }
 
@@ -133,74 +194,59 @@ public function listWorksheetNames($pFilename)
 
     /**
      * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns).
-     *
-     * @param string $pFilename
-     *
-     * @return array
      */
-    public function listWorksheetInfo($pFilename)
+    public function listWorksheetInfo(string $filename): array
     {
-        File::assertFile($pFilename);
+        File::assertFile($filename, self::INITIAL_FILE);
 
         $worksheetInfo = [];
 
-        $zip = new ZipArchive();
-        $zip->open($pFilename);
+        $this->zip = $zip = new ZipArchive();
+        $zip->open($filename);
 
-        //~ http://schemas.openxmlformats.org/package/2006/relationships"
-        $rels = simplexml_load_string(
-            $this->securityScanner->scan($this->getFromZipArchive($zip, '_rels/.rels')),
-            'SimpleXMLElement',
-            Settings::getLibXmlLoaderOptions()
-        );
-        foreach ($rels->Relationship as $rel) {
-            if ($rel['Type'] == 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument') {
-                $dir = dirname($rel['Target']);
-
-                //~ http://schemas.openxmlformats.org/package/2006/relationships"
-                $relsWorkbook = simplexml_load_string(
-                    $this->securityScanner->scan(
-                        $this->getFromZipArchive($zip, "$dir/_rels/" . basename($rel['Target']) . '.rels')
-                    ),
-                    'SimpleXMLElement',
-                    Settings::getLibXmlLoaderOptions()
-                );
-                $relsWorkbook->registerXPathNamespace('rel', 'http://schemas.openxmlformats.org/package/2006/relationships');
+        $rels = $this->loadZip(self::INITIAL_FILE, Namespaces::RELATIONSHIPS);
+        foreach ($rels->Relationship as $relx) {
+            $rel = self::getAttributes($relx);
+            $relType = (string) $rel['Type'];
+            $mainNS = self::REL_TO_MAIN[$relType] ?? Namespaces::MAIN;
+            if ($mainNS !== '') {
+                $relTarget = (string) $rel['Target'];
+                $dir = dirname($relTarget);
+                $namespace = dirname($relType);
+                $relsWorkbook = $this->loadZip("$dir/_rels/" . basename($relTarget) . '.rels', Namespaces::RELATIONSHIPS);
 
                 $worksheets = [];
-                foreach ($relsWorkbook->Relationship as $ele) {
-                    if ($ele['Type'] == 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet') {
+                foreach ($relsWorkbook->Relationship as $elex) {
+                    $ele = self::getAttributes($elex);
+                    if (
+                        ((string) $ele['Type'] === "$namespace/worksheet")
+                        || ((string) $ele['Type'] === "$namespace/chartsheet")
+                    ) {
                         $worksheets[(string) $ele['Id']] = $ele['Target'];
                     }
                 }
 
-                //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main"
-                $xmlWorkbook = simplexml_load_string(
-                    $this->securityScanner->scan(
-                        $this->getFromZipArchive($zip, "{$rel['Target']}")
-                    ),
-                    'SimpleXMLElement',
-                    Settings::getLibXmlLoaderOptions()
-                );
+                $xmlWorkbook = $this->loadZip($relTarget, $mainNS);
                 if ($xmlWorkbook->sheets) {
-                    $dir = dirname($rel['Target']);
+                    $dir = dirname($relTarget);
+
                     /** @var SimpleXMLElement $eleSheet */
                     foreach ($xmlWorkbook->sheets->sheet as $eleSheet) {
                         $tmpInfo = [
-                            'worksheetName' => (string) $eleSheet['name'],
+                            'worksheetName' => (string) self::getAttributes($eleSheet)['name'],
                             'lastColumnLetter' => 'A',
                             'lastColumnIndex' => 0,
                             'totalRows' => 0,
                             'totalColumns' => 0,
                         ];
 
-                        $fileWorksheet = $worksheets[(string) self::getArrayItem($eleSheet->attributes('http://schemas.openxmlformats.org/officeDocument/2006/relationships'), 'id')];
-                        $fileWorksheetPath = strpos($fileWorksheet, '/') === 0 ? substr($fileWorksheet, 1) : "$dir/$fileWorksheet";
+                        $fileWorksheet = (string) $worksheets[(string) self::getArrayItem(self::getAttributes($eleSheet, $namespace), 'id')];
+                        $fileWorksheetPath = str_starts_with($fileWorksheet, '/') ? substr($fileWorksheet, 1) : "$dir/$fileWorksheet";
 
                         $xml = new XMLReader();
                         $xml->xml(
-                            $this->securityScanner->scanFile(
-                                'zip://' . File::realpath($pFilename) . '#' . $fileWorksheetPath
+                            $this->getSecurityScannerOrThrow()->scan(
+                                $this->getFromZipArchive($this->zip, $fileWorksheetPath)
                             ),
                             null,
                             Settings::getLibXmlLoaderOptions()
@@ -209,13 +255,14 @@ public function listWorksheetInfo($pFilename)
 
                         $currCells = 0;
                         while ($xml->read()) {
-                            if ($xml->name == 'row' && $xml->nodeType == XMLReader::ELEMENT) {
+                            if ($xml->localName == 'row' && $xml->nodeType == XMLReader::ELEMENT && $xml->namespaceURI === $mainNS) {
                                 $row = $xml->getAttribute('r');
                                 $tmpInfo['totalRows'] = $row;
                                 $tmpInfo['totalColumns'] = max($tmpInfo['totalColumns'], $currCells);
                                 $currCells = 0;
-                            } elseif ($xml->name == 'c' && $xml->nodeType == XMLReader::ELEMENT) {
-                                ++$currCells;
+                            } elseif ($xml->localName == 'c' && $xml->nodeType == XMLReader::ELEMENT && $xml->namespaceURI === $mainNS) {
+                                $cell = $xml->getAttribute('r');
+                                $currCells = $cell ? max($currCells, Coordinate::indexesFromString($cell)[0]) : ($currCells + 1);
                             }
                         }
                         $tmpInfo['totalColumns'] = max($tmpInfo['totalColumns'], $currCells);
@@ -235,7 +282,7 @@ public function listWorksheetInfo($pFilename)
         return $worksheetInfo;
     }
 
-    private static function castToBoolean($c)
+    private static function castToBoolean(SimpleXMLElement $c): bool
     {
         $value = isset($c->v) ? (string) $c->v : null;
         if ($value == '0') {
@@ -247,50 +294,53 @@ private static function castToBoolean($c)
         return (bool) $c->v;
     }
 
-    private static function castToError($c)
+    private static function castToError(?SimpleXMLElement $c): ?string
     {
-        return isset($c->v) ? (string) $c->v : null;
+        return isset($c, $c->v) ? (string) $c->v : null;
     }
 
-    private static function castToString($c)
+    private static function castToString(?SimpleXMLElement $c): ?string
     {
-        return isset($c->v) ? (string) $c->v : null;
+        return isset($c, $c->v) ? (string) $c->v : null;
     }
 
-    private function castToFormula($c, $r, &$cellDataType, &$value, &$calculatedValue, &$sharedFormulas, $castBaseType): void
+    private function castToFormula(?SimpleXMLElement $c, string $r, string &$cellDataType, mixed &$value, mixed &$calculatedValue, string $castBaseType, bool $updateSharedCells = true): void
     {
-        $cellDataType = 'f';
-        $value = "={$c->f}";
+        if ($c === null) {
+            return;
+        }
+        $attr = $c->f->attributes();
+        $cellDataType = DataType::TYPE_FORMULA;
+        $formula = (string) $c->f;
+        $formula = str_replace(['_xlfn.', '_xlws.'], '', $formula);
+        $value = "=$formula";
         $calculatedValue = self::$castBaseType($c);
 
         // Shared formula?
-        if (isset($c->f['t']) && strtolower((string) $c->f['t']) == 'shared') {
-            $instance = (string) $c->f['si'];
-
-            if (!isset($sharedFormulas[(string) $c->f['si']])) {
-                $sharedFormulas[$instance] = ['master' => $r, 'formula' => $value];
-            } else {
-                $master = Coordinate::indexesFromString($sharedFormulas[$instance]['master']);
+        if (isset($attr['t']) && strtolower((string) $attr['t']) == 'shared') {
+            $instance = (string) $attr['si'];
+
+            if (!isset($this->sharedFormulae[(string) $attr['si']])) {
+                $this->sharedFormulae[$instance] = new SharedFormula($r, $value);
+            } elseif ($updateSharedCells === true) {
+                // It's only worth the overhead of adjusting the shared formula for this cell if we're actually loading
+                //     the cell, which may not be the case if we're using a read filter.
+                $master = Coordinate::indexesFromString($this->sharedFormulae[$instance]->master());
                 $current = Coordinate::indexesFromString($r);
 
                 $difference = [0, 0];
                 $difference[0] = $current[0] - $master[0];
                 $difference[1] = $current[1] - $master[1];
 
-                $value = $this->referenceHelper->updateFormulaReferences($sharedFormulas[$instance]['formula'], 'A1', $difference[0], $difference[1]);
+                $value = $this->referenceHelper->updateFormulaReferences($this->sharedFormulae[$instance]->formula(), 'A1', $difference[0], $difference[1]);
             }
         }
     }
 
-    /**
-     * @param string $fileName
-     *
-     * @return string
-     */
-    private function getFromZipArchive(ZipArchive $archive, $fileName = '')
+    private function fileExistsInArchive(ZipArchive $archive, string $fileName = ''): bool
     {
         // Root-relative paths
-        if (strpos($fileName, '//') !== false) {
+        if (str_contains($fileName, '//')) {
             $fileName = substr($fileName, strpos($fileName, '//') + 1);
         }
         $fileName = File::realpath($fileName);
@@ -299,156 +349,204 @@ private function getFromZipArchive(ZipArchive $archive, $fileName = '')
         //    so we need to load case-insensitively from the zip file
 
         // Apache POI fixes
+        $contents = $archive->locateName($fileName, ZipArchive::FL_NOCASE);
+        if ($contents === false) {
+            $contents = $archive->locateName(substr($fileName, 1), ZipArchive::FL_NOCASE);
+        }
+
+        return $contents !== false;
+    }
+
+    private function getFromZipArchive(ZipArchive $archive, string $fileName = ''): string
+    {
+        // Root-relative paths
+        if (str_contains($fileName, '//')) {
+            $fileName = substr($fileName, strpos($fileName, '//') + 1);
+        }
+        // Relative paths generated by dirname($filename) when $filename
+        // has no path (i.e.files in root of the zip archive)
+        $fileName = (string) preg_replace('/^\.\//', '', $fileName);
+        $fileName = File::realpath($fileName);
+
+        // Sadly, some 3rd party xlsx generators don't use consistent case for filenaming
+        //    so we need to load case-insensitively from the zip file
+
         $contents = $archive->getFromName($fileName, 0, ZipArchive::FL_NOCASE);
+
+        // Apache POI fixes
         if ($contents === false) {
             $contents = $archive->getFromName(substr($fileName, 1), 0, ZipArchive::FL_NOCASE);
         }
 
-        return $contents;
+        // Has the file been saved with Windoze directory separators rather than unix?
+        if ($contents === false) {
+            $contents = $archive->getFromName(str_replace('/', '\\', $fileName), 0, ZipArchive::FL_NOCASE);
+        }
+
+        return ($contents === false) ? '' : $contents;
     }
 
     /**
      * Loads Spreadsheet from file.
-     *
-     * @param string $pFilename
-     *
-     * @return Spreadsheet
      */
-    public function load($pFilename)
+    protected function loadSpreadsheetFromFile(string $filename): Spreadsheet
     {
-        File::assertFile($pFilename);
+        File::assertFile($filename, self::INITIAL_FILE);
 
         // Initialisations
         $excel = new Spreadsheet();
         $excel->removeSheetByIndex(0);
-        if (!$this->readDataOnly) {
-            $excel->removeCellStyleXfByIndex(0); // remove the default style
-            $excel->removeCellXfByIndex(0); // remove the default style
-        }
+        $addingFirstCellStyleXf = true;
+        $addingFirstCellXf = true;
+
         $unparsedLoadedData = [];
 
-        $zip = new ZipArchive();
-        $zip->open($pFilename);
+        $this->zip = $zip = new ZipArchive();
+        $zip->open($filename);
 
         //    Read the theme first, because we need the colour scheme when reading the styles
-        //~ http://schemas.openxmlformats.org/package/2006/relationships"
-        $workbookBasename = $this->getWorkbookBaseName($zip);
-        $wbRels = simplexml_load_string(
-            $this->securityScanner->scan($this->getFromZipArchive($zip, "xl/_rels/${workbookBasename}.rels")),
-            'SimpleXMLElement',
-            Settings::getLibXmlLoaderOptions()
-        );
-        foreach ($wbRels->Relationship as $rel) {
+        [$workbookBasename, $xmlNamespaceBase] = $this->getWorkbookBaseName();
+        $drawingNS = self::REL_TO_DRAWING[$xmlNamespaceBase] ?? Namespaces::DRAWINGML;
+        $chartNS = self::REL_TO_CHART[$xmlNamespaceBase] ?? Namespaces::CHART;
+        $wbRels = $this->loadZip("xl/_rels/{$workbookBasename}.rels", Namespaces::RELATIONSHIPS);
+        $theme = null;
+        $this->styleReader = new Styles();
+        foreach ($wbRels->Relationship as $relx) {
+            $rel = self::getAttributes($relx);
+            $relTarget = (string) $rel['Target'];
+            if (str_starts_with($relTarget, '/xl/')) {
+                $relTarget = substr($relTarget, 4);
+            }
             switch ($rel['Type']) {
-                case 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme':
+                case "$xmlNamespaceBase/theme":
+                    if (!$this->fileExistsInArchive($zip, "xl/{$relTarget}")) {
+                        break; // issue3770
+                    }
                     $themeOrderArray = ['lt1', 'dk1', 'lt2', 'dk2'];
                     $themeOrderAdditional = count($themeOrderArray);
 
-                    $xmlTheme = simplexml_load_string(
-                        $this->securityScanner->scan($this->getFromZipArchive($zip, "xl/{$rel['Target']}")),
-                        'SimpleXMLElement',
-                        Settings::getLibXmlLoaderOptions()
-                    );
-                    if (is_object($xmlTheme)) {
-                        $xmlThemeName = $xmlTheme->attributes();
-                        $xmlTheme = $xmlTheme->children('http://schemas.openxmlformats.org/drawingml/2006/main');
-                        $themeName = (string) $xmlThemeName['name'];
-
-                        $colourScheme = $xmlTheme->themeElements->clrScheme->attributes();
-                        $colourSchemeName = (string) $colourScheme['name'];
-                        $colourScheme = $xmlTheme->themeElements->clrScheme->children('http://schemas.openxmlformats.org/drawingml/2006/main');
-
-                        $themeColours = [];
-                        foreach ($colourScheme as $k => $xmlColour) {
-                            $themePos = array_search($k, $themeOrderArray);
-                            if ($themePos === false) {
-                                $themePos = $themeOrderAdditional++;
-                            }
-                            if (isset($xmlColour->sysClr)) {
-                                $xmlColourData = $xmlColour->sysClr->attributes();
-                                $themeColours[$themePos] = $xmlColourData['lastClr'];
-                            } elseif (isset($xmlColour->srgbClr)) {
-                                $xmlColourData = $xmlColour->srgbClr->attributes();
-                                $themeColours[$themePos] = $xmlColourData['val'];
-                            }
+                    $xmlTheme = $this->loadZip("xl/{$relTarget}", $drawingNS);
+                    $xmlThemeName = self::getAttributes($xmlTheme);
+                    $xmlTheme = $xmlTheme->children($drawingNS);
+                    $themeName = (string) $xmlThemeName['name'];
+
+                    $colourScheme = self::getAttributes($xmlTheme->themeElements->clrScheme);
+                    $colourSchemeName = (string) $colourScheme['name'];
+                    $excel->getTheme()->setThemeColorName($colourSchemeName);
+                    $colourScheme = $xmlTheme->themeElements->clrScheme->children($drawingNS);
+
+                    $themeColours = [];
+                    foreach ($colourScheme as $k => $xmlColour) {
+                        $themePos = array_search($k, $themeOrderArray);
+                        if ($themePos === false) {
+                            $themePos = $themeOrderAdditional++;
+                        }
+                        if (isset($xmlColour->sysClr)) {
+                            $xmlColourData = self::getAttributes($xmlColour->sysClr);
+                            $themeColours[$themePos] = (string) $xmlColourData['lastClr'];
+                            $excel->getTheme()->setThemeColor($k, (string) $xmlColourData['lastClr']);
+                        } elseif (isset($xmlColour->srgbClr)) {
+                            $xmlColourData = self::getAttributes($xmlColour->srgbClr);
+                            $themeColours[$themePos] = (string) $xmlColourData['val'];
+                            $excel->getTheme()->setThemeColor($k, (string) $xmlColourData['val']);
+                        }
+                    }
+                    $theme = new Theme($themeName, $colourSchemeName, $themeColours);
+                    $this->styleReader->setTheme($theme);
+
+                    $fontScheme = self::getAttributes($xmlTheme->themeElements->fontScheme);
+                    $fontSchemeName = (string) $fontScheme['name'];
+                    $excel->getTheme()->setThemeFontName($fontSchemeName);
+                    $majorFonts = [];
+                    $minorFonts = [];
+                    $fontScheme = $xmlTheme->themeElements->fontScheme->children($drawingNS);
+                    $majorLatin = self::getAttributes($fontScheme->majorFont->latin)['typeface'] ?? '';
+                    $majorEastAsian = self::getAttributes($fontScheme->majorFont->ea)['typeface'] ?? '';
+                    $majorComplexScript = self::getAttributes($fontScheme->majorFont->cs)['typeface'] ?? '';
+                    $minorLatin = self::getAttributes($fontScheme->minorFont->latin)['typeface'] ?? '';
+                    $minorEastAsian = self::getAttributes($fontScheme->minorFont->ea)['typeface'] ?? '';
+                    $minorComplexScript = self::getAttributes($fontScheme->minorFont->cs)['typeface'] ?? '';
+
+                    foreach ($fontScheme->majorFont->font as $xmlFont) {
+                        $fontAttributes = self::getAttributes($xmlFont);
+                        $script = (string) ($fontAttributes['script'] ?? '');
+                        if (!empty($script)) {
+                            $majorFonts[$script] = (string) ($fontAttributes['typeface'] ?? '');
                         }
-                        self::$theme = new Xlsx\Theme($themeName, $colourSchemeName, $themeColours);
                     }
+                    foreach ($fontScheme->minorFont->font as $xmlFont) {
+                        $fontAttributes = self::getAttributes($xmlFont);
+                        $script = (string) ($fontAttributes['script'] ?? '');
+                        if (!empty($script)) {
+                            $minorFonts[$script] = (string) ($fontAttributes['typeface'] ?? '');
+                        }
+                    }
+                    $excel->getTheme()->setMajorFontValues($majorLatin, $majorEastAsian, $majorComplexScript, $majorFonts);
+                    $excel->getTheme()->setMinorFontValues($minorLatin, $minorEastAsian, $minorComplexScript, $minorFonts);
 
                     break;
             }
         }
 
-        //~ http://schemas.openxmlformats.org/package/2006/relationships"
-        $rels = simplexml_load_string(
-            $this->securityScanner->scan($this->getFromZipArchive($zip, '_rels/.rels')),
-            'SimpleXMLElement',
-            Settings::getLibXmlLoaderOptions()
-        );
+        $rels = $this->loadZip(self::INITIAL_FILE, Namespaces::RELATIONSHIPS);
 
-        $propertyReader = new PropertyReader($this->securityScanner, $excel->getProperties());
-        foreach ($rels->Relationship as $rel) {
-            switch ($rel['Type']) {
-                case 'http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties':
-                    $propertyReader->readCoreProperties($this->getFromZipArchive($zip, "{$rel['Target']}"));
+        $propertyReader = new PropertyReader($this->getSecurityScannerOrThrow(), $excel->getProperties());
+        $charts = $chartDetails = [];
+        foreach ($rels->Relationship as $relx) {
+            $rel = self::getAttributes($relx);
+            $relTarget = (string) $rel['Target'];
+            // issue 3553
+            if ($relTarget[0] === '/') {
+                $relTarget = substr($relTarget, 1);
+            }
+            $relType = (string) $rel['Type'];
+            $mainNS = self::REL_TO_MAIN[$relType] ?? Namespaces::MAIN;
+            switch ($relType) {
+                case Namespaces::CORE_PROPERTIES:
+                    $propertyReader->readCoreProperties($this->getFromZipArchive($zip, $relTarget));
 
                     break;
-                case 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties':
-                    $propertyReader->readExtendedProperties($this->getFromZipArchive($zip, "{$rel['Target']}"));
+                case "$xmlNamespaceBase/extended-properties":
+                    $propertyReader->readExtendedProperties($this->getFromZipArchive($zip, $relTarget));
 
                     break;
-                case 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/custom-properties':
-                    $propertyReader->readCustomProperties($this->getFromZipArchive($zip, "{$rel['Target']}"));
+                case "$xmlNamespaceBase/custom-properties":
+                    $propertyReader->readCustomProperties($this->getFromZipArchive($zip, $relTarget));
 
                     break;
-                //Ribbon
-                case 'http://schemas.microsoft.com/office/2006/relationships/ui/extensibility':
-                    $customUI = $rel['Target'];
-                    if ($customUI !== null) {
+                    //Ribbon
+                case Namespaces::EXTENSIBILITY:
+                    $customUI = $relTarget;
+                    if ($customUI) {
                         $this->readRibbon($excel, $customUI, $zip);
                     }
 
                     break;
-                case 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument':
-                    $dir = dirname($rel['Target']);
-                    //~ http://schemas.openxmlformats.org/package/2006/relationships"
-                    $relsWorkbook = simplexml_load_string(
-                        $this->securityScanner->scan($this->getFromZipArchive($zip, "$dir/_rels/" . basename($rel['Target']) . '.rels')),
-                        'SimpleXMLElement',
-                        Settings::getLibXmlLoaderOptions()
-                    );
-                    $relsWorkbook->registerXPathNamespace('rel', 'http://schemas.openxmlformats.org/package/2006/relationships');
+                case "$xmlNamespaceBase/officeDocument":
+                    $dir = dirname($relTarget);
 
-                    $sharedStrings = [];
-                    $xpath = self::getArrayItem($relsWorkbook->xpath("rel:Relationship[@Type='http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings']"));
-                    if ($xpath) {
-                        //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main"
-                        $xmlStrings = simplexml_load_string(
-                            $this->securityScanner->scan($this->getFromZipArchive($zip, "$dir/$xpath[Target]")),
-                            'SimpleXMLElement',
-                            Settings::getLibXmlLoaderOptions()
-                        );
-                        if (isset($xmlStrings->si)) {
-                            foreach ($xmlStrings->si as $val) {
-                                if (isset($val->t)) {
-                                    $sharedStrings[] = StringHelper::controlCharacterOOXML2PHP((string) $val->t);
-                                } elseif (isset($val->r)) {
-                                    $sharedStrings[] = $this->parseRichText($val);
-                                }
-                            }
-                        }
-                    }
+                    // Do not specify namespace in next stmt - do it in Xpath
+                    $relsWorkbook = $this->loadZip("$dir/_rels/" . basename($relTarget) . '.rels', Namespaces::RELATIONSHIPS);
+                    $relsWorkbook->registerXPathNamespace('rel', Namespaces::RELATIONSHIPS);
 
                     $worksheets = [];
                     $macros = $customUI = null;
-                    foreach ($relsWorkbook->Relationship as $ele) {
+                    foreach ($relsWorkbook->Relationship as $elex) {
+                        $ele = self::getAttributes($elex);
                         switch ($ele['Type']) {
-                            case 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet':
+                            case Namespaces::WORKSHEET:
+                            case Namespaces::PURL_WORKSHEET:
                                 $worksheets[(string) $ele['Id']] = $ele['Target'];
 
                                 break;
-                            // a vbaProject ? (: some macros)
-                            case 'http://schemas.microsoft.com/office/2006/relationships/vbaProject':
+                            case Namespaces::CHARTSHEET:
+                                if ($this->includeCharts === true) {
+                                    $worksheets[(string) $ele['Id']] = $ele['Target'];
+                                }
+
+                                break;
+                                // a vbaProject ? (: some macros)
+                            case Namespaces::VBA:
                                 $macros = $ele['Target'];
 
                                 break;
@@ -468,25 +566,40 @@ public function load($pFilename)
                         }
                     }
 
-                    $xpath = self::getArrayItem($relsWorkbook->xpath("rel:Relationship[@Type='http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles']"));
-                    //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main"
-                    $xmlStyles = simplexml_load_string(
-                        $this->securityScanner->scan($this->getFromZipArchive($zip, "$dir/$xpath[Target]")),
-                        'SimpleXMLElement',
-                        Settings::getLibXmlLoaderOptions()
-                    );
+                    $relType = "rel:Relationship[@Type='"
+                        . "$xmlNamespaceBase/styles"
+                        . "']";
+                    $xpath = self::getArrayItem(self::xpathNoFalse($relsWorkbook, $relType));
+
+                    if ($xpath === null) {
+                        $xmlStyles = self::testSimpleXml(null);
+                    } else {
+                        $stylesTarget = (string) $xpath['Target'];
+                        $stylesTarget = str_starts_with($stylesTarget, '/') ? substr($stylesTarget, 1) : "$dir/$stylesTarget";
+                        $xmlStyles = $this->loadZip($stylesTarget, $mainNS);
+                    }
+
+                    $palette = self::extractPalette($xmlStyles);
+                    $this->styleReader->setWorkbookPalette($palette);
+                    $fills = self::extractStyles($xmlStyles, 'fills', 'fill');
+                    $fonts = self::extractStyles($xmlStyles, 'fonts', 'font');
+                    $borders = self::extractStyles($xmlStyles, 'borders', 'border');
+                    $xfTags = self::extractStyles($xmlStyles, 'cellXfs', 'xf');
+                    $cellXfTags = self::extractStyles($xmlStyles, 'cellStyleXfs', 'xf');
 
                     $styles = [];
                     $cellStyles = [];
                     $numFmts = null;
-                    if ($xmlStyles && $xmlStyles->numFmts[0]) {
+                    if (/*$xmlStyles && */ $xmlStyles->numFmts[0]) {
                         $numFmts = $xmlStyles->numFmts[0];
                     }
                     if (isset($numFmts) && ($numFmts !== null)) {
-                        $numFmts->registerXPathNamespace('sml', 'http://schemas.openxmlformats.org/spreadsheetml/2006/main');
+                        $numFmts->registerXPathNamespace('sml', $mainNS);
                     }
-                    if (!$this->readDataOnly && $xmlStyles) {
-                        foreach ($xmlStyles->cellXfs->xf as $xf) {
+                    $this->styleReader->setNamespace($mainNS);
+                    if (!$this->readDataOnly/* && $xmlStyles*/) {
+                        foreach ($xfTags as $xfTag) {
+                            $xf = self::getAttributes($xfTag);
                             $numFmt = null;
 
                             if ($xf['numFmtId']) {
@@ -502,33 +615,38 @@ public function load($pFilename)
                                 //  But there's a lot of naughty homebrew xlsx writers that do use "reserved" id values that aren't actually used
                                 //  So we make allowance for them rather than lose formatting masks
                                 if (
-                                    $numFmt === null &&
-                                    (int) $xf['numFmtId'] < 164 &&
-                                    NumberFormat::builtInFormatCode((int) $xf['numFmtId']) !== ''
+                                    $numFmt === null
+                                    && (int) $xf['numFmtId'] < 164
+                                    && NumberFormat::builtInFormatCode((int) $xf['numFmtId']) !== ''
                                 ) {
                                     $numFmt = NumberFormat::builtInFormatCode((int) $xf['numFmtId']);
                                 }
                             }
-                            $quotePrefix = (bool) ($xf['quotePrefix'] ?? false);
+                            $quotePrefix = (bool) (string) ($xf['quotePrefix'] ?? '');
 
                             $style = (object) [
                                 'numFmt' => $numFmt ?? NumberFormat::FORMAT_GENERAL,
-                                'font' => $xmlStyles->fonts->font[(int) ($xf['fontId'])],
-                                'fill' => $xmlStyles->fills->fill[(int) ($xf['fillId'])],
-                                'border' => $xmlStyles->borders->border[(int) ($xf['borderId'])],
-                                'alignment' => $xf->alignment,
-                                'protection' => $xf->protection,
+                                'font' => $fonts[(int) ($xf['fontId'])],
+                                'fill' => $fills[(int) ($xf['fillId'])],
+                                'border' => $borders[(int) ($xf['borderId'])],
+                                'alignment' => $xfTag->alignment,
+                                'protection' => $xfTag->protection,
                                 'quotePrefix' => $quotePrefix,
                             ];
                             $styles[] = $style;
 
                             // add style to cellXf collection
                             $objStyle = new Style();
-                            self::readStyle($objStyle, $style);
+                            $this->styleReader->readStyle($objStyle, $style);
+                            if ($addingFirstCellXf) {
+                                $excel->removeCellXfByIndex(0); // remove the default style
+                                $addingFirstCellXf = false;
+                            }
                             $excel->addCellXf($objStyle);
                         }
 
-                        foreach ($xmlStyles->cellStyleXfs->xf ?? [] as $xf) {
+                        foreach ($cellXfTags as $xfTag) {
+                            $xf = self::getAttributes($xfTag);
                             $numFmt = NumberFormat::FORMAT_GENERAL;
                             if ($numFmts && $xf['numFmtId']) {
                                 $tmpNumFmt = self::getArrayItem($numFmts->xpath("sml:numFmt[@numFmtId=$xf[numFmtId]]"));
@@ -539,44 +657,72 @@ public function load($pFilename)
                                 }
                             }
 
-                            $quotePrefix = (bool) ($xf['quotePrefix'] ?? false);
+                            $quotePrefix = (bool) (string) ($xf['quotePrefix'] ?? '');
 
                             $cellStyle = (object) [
                                 'numFmt' => $numFmt,
-                                'font' => $xmlStyles->fonts->font[(int) ($xf['fontId'])],
-                                'fill' => $xmlStyles->fills->fill[(int) ($xf['fillId'])],
-                                'border' => $xmlStyles->borders->border[(int) ($xf['borderId'])],
-                                'alignment' => $xf->alignment,
-                                'protection' => $xf->protection,
+                                'font' => $fonts[(int) ($xf['fontId'])],
+                                'fill' => $fills[((int) $xf['fillId'])],
+                                'border' => $borders[(int) ($xf['borderId'])],
+                                'alignment' => $xfTag->alignment,
+                                'protection' => $xfTag->protection,
                                 'quotePrefix' => $quotePrefix,
                             ];
                             $cellStyles[] = $cellStyle;
 
                             // add style to cellStyleXf collection
                             $objStyle = new Style();
-                            self::readStyle($objStyle, $cellStyle);
+                            $this->styleReader->readStyle($objStyle, $cellStyle);
+                            if ($addingFirstCellStyleXf) {
+                                $excel->removeCellStyleXfByIndex(0); // remove the default style
+                                $addingFirstCellStyleXf = false;
+                            }
                             $excel->addCellStyleXf($objStyle);
                         }
                     }
+                    $this->styleReader->setStyleXml($xmlStyles);
+                    $this->styleReader->setNamespace($mainNS);
+                    $this->styleReader->setStyleBaseData($theme, $styles, $cellStyles);
+                    $dxfs = $this->styleReader->dxfs($this->readDataOnly);
+                    $styles = $this->styleReader->styles();
 
-                    $styleReader = new Styles($xmlStyles);
-                    $styleReader->setStyleBaseData(self::$theme, $styles, $cellStyles);
-                    $dxfs = $styleReader->dxfs($this->readDataOnly);
-                    $styles = $styleReader->styles();
+                    // Read content after setting the styles
+                    $sharedStrings = [];
+                    $relType = "rel:Relationship[@Type='"
+                        //. Namespaces::SHARED_STRINGS
+                        . "$xmlNamespaceBase/sharedStrings"
+                        . "']";
+                    $xpath = self::getArrayItem($relsWorkbook->xpath($relType));
 
-                    //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main"
-                    $xmlWorkbook = simplexml_load_string(
-                        $this->securityScanner->scan($this->getFromZipArchive($zip, "{$rel['Target']}")),
-                        'SimpleXMLElement',
-                        Settings::getLibXmlLoaderOptions()
-                    );
+                    if ($xpath) {
+                        $sharedStringsTarget = (string) $xpath['Target'];
+                        $sharedStringsTarget = str_starts_with($sharedStringsTarget, '/') ? substr($sharedStringsTarget, 1) : "$dir/$sharedStringsTarget";
+                        $xmlStrings = $this->loadZip($sharedStringsTarget, $mainNS);
+                        if (isset($xmlStrings->si)) {
+                            foreach ($xmlStrings->si as $val) {
+                                if (isset($val->t)) {
+                                    $sharedStrings[] = StringHelper::controlCharacterOOXML2PHP((string) $val->t);
+                                } elseif (isset($val->r)) {
+                                    $sharedStrings[] = $this->parseRichText($val);
+                                } else {
+                                    $sharedStrings[] = '';
+                                }
+                            }
+                        }
+                    }
+
+                    $xmlWorkbook = $this->loadZipNoNamespace($relTarget, $mainNS);
+                    $xmlWorkbookNS = $this->loadZip($relTarget, $mainNS);
 
                     // Set base date
-                    if ($xmlWorkbook->workbookPr) {
+                    $excel->setExcelCalendar(Date::CALENDAR_WINDOWS_1900);
+                    if ($xmlWorkbookNS->workbookPr) {
                         Date::setExcelCalendar(Date::CALENDAR_WINDOWS_1900);
-                        if (isset($xmlWorkbook->workbookPr['date1904'])) {
-                            if (self::boolean((string) $xmlWorkbook->workbookPr['date1904'])) {
+                        $attrs1904 = self::getAttributes($xmlWorkbookNS->workbookPr);
+                        if (isset($attrs1904['date1904'])) {
+                            if (self::boolean((string) $attrs1904['date1904'])) {
                                 Date::setExcelCalendar(Date::CALENDAR_MAC_1904);
+                                $excel->setExcelCalendar(Date::CALENDAR_MAC_1904);
                             }
                         }
                     }
@@ -591,19 +737,27 @@ public function load($pFilename)
 
                     $charts = $chartDetails = [];
 
-                    if ($xmlWorkbook->sheets) {
+                    if ($xmlWorkbookNS->sheets) {
                         /** @var SimpleXMLElement $eleSheet */
-                        foreach ($xmlWorkbook->sheets->sheet as $eleSheet) {
+                        foreach ($xmlWorkbookNS->sheets->sheet as $eleSheet) {
+                            $eleSheetAttr = self::getAttributes($eleSheet);
                             ++$oldSheetId;
 
                             // Check if sheet should be skipped
-                            if (isset($this->loadSheetsOnly) && !in_array((string) $eleSheet['name'], $this->loadSheetsOnly)) {
+                            if (is_array($this->loadSheetsOnly) && !in_array((string) $eleSheetAttr['name'], $this->loadSheetsOnly)) {
                                 ++$countSkippedSheets;
                                 $mapSheetId[$oldSheetId] = null;
 
                                 continue;
                             }
 
+                            $sheetReferenceId = (string) self::getArrayItem(self::getAttributes($eleSheet, $xmlNamespaceBase), 'id');
+                            if (isset($worksheets[$sheetReferenceId]) === false) {
+                                ++$countSkippedSheets;
+                                $mapSheetId[$oldSheetId] = null;
+
+                                continue;
+                            }
                             // Map old sheet id in original workbook to new sheet id.
                             // They will differ if loadSheetsOnly() is being used
                             $mapSheetId[$oldSheetId] = $oldSheetId - $countSkippedSheets;
@@ -614,50 +768,61 @@ public function load($pFilename)
                             //        references in formula cells... during the load, all formulae should be correct,
                             //        and we're simply bringing the worksheet name in line with the formula, not the
                             //        reverse
-                            $docSheet->setTitle((string) $eleSheet['name'], false, false);
-                            $fileWorksheet = $worksheets[(string) self::getArrayItem($eleSheet->attributes('http://schemas.openxmlformats.org/officeDocument/2006/relationships'), 'id')];
-                            //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main"
-                            $xmlSheet = simplexml_load_string(
-                                $this->securityScanner->scan($this->getFromZipArchive($zip, "$dir/$fileWorksheet")),
-                                'SimpleXMLElement',
-                                Settings::getLibXmlLoaderOptions()
-                            );
-
-                            $sharedFormulas = [];
-
-                            if (isset($eleSheet['state']) && (string) $eleSheet['state'] != '') {
-                                $docSheet->setSheetState((string) $eleSheet['state']);
+                            $docSheet->setTitle((string) $eleSheetAttr['name'], false, false);
+
+                            $fileWorksheet = (string) $worksheets[$sheetReferenceId];
+                            // issue 3665 adds test for /.
+                            // This broke XlsxRootZipFilesTest,
+                            //  but Excel reports an error with that file.
+                            //  Testing dir for . avoids this problem.
+                            //  It might be better just to drop the test.
+                            if ($fileWorksheet[0] == '/' && $dir !== '.') {
+                                $fileWorksheet = substr($fileWorksheet, strlen($dir) + 2);
                             }
+                            $xmlSheet = $this->loadZipNoNamespace("$dir/$fileWorksheet", $mainNS);
+                            $xmlSheetNS = $this->loadZip("$dir/$fileWorksheet", $mainNS);
 
-                            if ($xmlSheet) {
+                            // Shared Formula table is unique to each Worksheet, so we need to reset it here
+                            $this->sharedFormulae = [];
+
+                            if (isset($eleSheetAttr['state']) && (string) $eleSheetAttr['state'] != '') {
+                                $docSheet->setSheetState((string) $eleSheetAttr['state']);
+                            }
+                            if ($xmlSheetNS) {
+                                $xmlSheetMain = $xmlSheetNS->children($mainNS);
                                 // Setting Conditional Styles adjusts selected cells, so we need to execute this
                                 //    before reading the sheet view data to get the actual selected cells
-                                if (!$this->readDataOnly && $xmlSheet->conditionalFormatting) {
-                                    (new ConditionalStyles($docSheet, $xmlSheet, $dxfs))->load();
+                                if (!$this->readDataOnly && ($xmlSheet->conditionalFormatting)) {
+                                    (new ConditionalStyles($docSheet, $xmlSheet, $dxfs, $this->styleReader))->load();
                                 }
-
-                                if (isset($xmlSheet->sheetViews, $xmlSheet->sheetViews->sheetView)) {
-                                    $sheetViews = new SheetViews($xmlSheet->sheetViews->sheetView, $docSheet);
+                                if (!$this->readDataOnly && $xmlSheet->extLst) {
+                                    (new ConditionalStyles($docSheet, $xmlSheet, $dxfs, $this->styleReader))->loadFromExt();
+                                }
+                                if (isset($xmlSheetMain->sheetViews, $xmlSheetMain->sheetViews->sheetView)) {
+                                    $sheetViews = new SheetViews($xmlSheetMain->sheetViews->sheetView, $docSheet);
                                     $sheetViews->load();
                                 }
 
-                                $sheetViewOptions = new SheetViewOptions($docSheet, $xmlSheet);
-                                $sheetViewOptions->load($this->getReadDataOnly());
+                                $sheetViewOptions = new SheetViewOptions($docSheet, $xmlSheetNS);
+                                $sheetViewOptions->load($this->readDataOnly, $this->styleReader);
 
-                                (new ColumnAndRowAttributes($docSheet, $xmlSheet))
-                                    ->load($this->getReadFilter(), $this->getReadDataOnly());
+                                (new ColumnAndRowAttributes($docSheet, $xmlSheetNS))
+                                    ->load($this->getReadFilter(), $this->readDataOnly, $this->ignoreRowsWithNoCells);
                             }
 
-                            if ($xmlSheet && $xmlSheet->sheetData && $xmlSheet->sheetData->row) {
+                            $holdSelectedCells = $docSheet->getSelectedCells();
+                            if ($xmlSheetNS && $xmlSheetNS->sheetData && $xmlSheetNS->sheetData->row) {
                                 $cIndex = 1; // Cell Start from 1
-                                foreach ($xmlSheet->sheetData->row as $row) {
+                                foreach ($xmlSheetNS->sheetData->row as $row) {
                                     $rowIndex = 1;
                                     foreach ($row->c as $c) {
-                                        $r = (string) $c['r'];
+                                        $cAttr = self::getAttributes($c);
+                                        $r = (string) $cAttr['r'];
                                         if ($r == '') {
                                             $r = Coordinate::stringFromColumnIndex($rowIndex) . $cIndex;
                                         }
-                                        $cellDataType = (string) $c['t'];
+                                        $cellDataType = (string) $cAttr['t'];
+                                        $originalCellDataTypeNumeric = $cellDataType === '';
                                         $value = null;
                                         $calculatedValue = null;
 
@@ -666,8 +831,12 @@ public function load($pFilename)
                                             $coordinates = Coordinate::coordinateFromString($r);
 
                                             if (!$this->getReadFilter()->readCell($coordinates[0], (int) $coordinates[1], $docSheet->getTitle())) {
-                                                if (isset($c->f)) {
-                                                    $this->castToFormula($c, $r, $cellDataType, $value, $calculatedValue, $sharedFormulas, 'castToError');
+                                                // Normally, just testing for the f attribute should identify this cell as containing a formula
+                                                // that we need to read, even though it is outside of the filter range, in case it is a shared formula.
+                                                // But in some cases, this attribute isn't set; so we need to delve a level deeper and look at
+                                                // whether or not the cell has a child formula element that is shared.
+                                                if (isset($cAttr->f) || (isset($c->f, $c->f->attributes()['t']) && strtolower((string) $c->f->attributes()['t']) === 'shared')) {
+                                                    $this->castToFormula($c, $r, $cellDataType, $value, $calculatedValue, 'castToError', false);
                                                 }
                                                 ++$rowIndex;
 
@@ -677,7 +846,7 @@ public function load($pFilename)
 
                                         // Read cell!
                                         switch ($cellDataType) {
-                                            case 's':
+                                            case DataType::TYPE_STRING:
                                                 if ((string) $c->v != '') {
                                                     $value = $sharedStrings[(int) ($c->v)];
 
@@ -689,46 +858,67 @@ public function load($pFilename)
                                                 }
 
                                                 break;
-                                            case 'b':
-                                                if (!isset($c->f)) {
-                                                    $value = self::castToBoolean($c);
+                                            case DataType::TYPE_BOOL:
+                                                if (!isset($c->f) || ((string) $c->f) === '') {
+                                                    if (isset($c->v)) {
+                                                        $value = self::castToBoolean($c);
+                                                    } else {
+                                                        $value = null;
+                                                        $cellDataType = DataType::TYPE_NULL;
+                                                    }
                                                 } else {
                                                     // Formula
-                                                    $this->castToFormula($c, $r, $cellDataType, $value, $calculatedValue, $sharedFormulas, 'castToBoolean');
-                                                    if (isset($c->f['t'])) {
-                                                        $att = $c->f;
-                                                        $docSheet->getCell($r)->setFormulaAttributes($att);
-                                                    }
+                                                    $this->castToFormula($c, $r, $cellDataType, $value, $calculatedValue, 'castToBoolean');
+                                                    self::storeFormulaAttributes($c->f, $docSheet, $r);
                                                 }
 
                                                 break;
-                                            case 'inlineStr':
+                                            case DataType::TYPE_STRING2:
                                                 if (isset($c->f)) {
-                                                    $this->castToFormula($c, $r, $cellDataType, $value, $calculatedValue, $sharedFormulas, 'castToError');
+                                                    $this->castToFormula($c, $r, $cellDataType, $value, $calculatedValue, 'castToString');
+                                                    self::storeFormulaAttributes($c->f, $docSheet, $r);
+                                                } else {
+                                                     $value = self::castToString($c);
+                                                }
+
+                                                break;
+                                            case DataType::TYPE_INLINE:
+                                                if (isset($c->f)) {
+                                                    $this->castToFormula($c, $r, $cellDataType, $value, $calculatedValue, 'castToError');
+                                                    self::storeFormulaAttributes($c->f, $docSheet, $r);
                                                 } else {
                                                     $value = $this->parseRichText($c->is);
                                                 }
 
                                                 break;
-                                            case 'e':
+                                            case DataType::TYPE_ERROR:
                                                 if (!isset($c->f)) {
                                                     $value = self::castToError($c);
                                                 } else {
                                                     // Formula
-                                                    $this->castToFormula($c, $r, $cellDataType, $value, $calculatedValue, $sharedFormulas, 'castToError');
+                                                    $this->castToFormula($c, $r, $cellDataType, $value, $calculatedValue, 'castToError');
+                                                    $eattr = $c->attributes();
+                                                    if (isset($eattr['vm'])) {
+                                                        if ($calculatedValue === ExcelError::VALUE()) {
+                                                            $calculatedValue = ExcelError::SPILL();
+                                                        }
+                                                    }
                                                 }
 
                                                 break;
                                             default:
                                                 if (!isset($c->f)) {
                                                     $value = self::castToString($c);
+                                                    if (is_numeric($value)) {
+                                                        $value += 0;
+                                                    }
                                                 } else {
                                                     // Formula
-                                                    $this->castToFormula($c, $r, $cellDataType, $value, $calculatedValue, $sharedFormulas, 'castToString');
-                                                    if (isset($c->f['t'])) {
-                                                        $attributes = $c->f['t'];
-                                                        $docSheet->getCell($r)->setFormulaAttributes(['t' => (string) $attributes]);
+                                                    $this->castToFormula($c, $r, $cellDataType, $value, $calculatedValue, 'castToString');
+                                                    if (is_numeric($calculatedValue)) {
+                                                        $calculatedValue += 0;
                                                     }
+                                                    self::storeFormulaAttributes($c->f, $docSheet, $r);
                                                 }
 
                                                 break;
@@ -745,22 +935,31 @@ public function load($pFilename)
                                             // Assign value
                                             if ($cellDataType != '') {
                                                 // it is possible, that datatype is numeric but with an empty string, which result in an error
-                                                if ($cellDataType === DataType::TYPE_NUMERIC && $value === '') {
-                                                    $cellDataType = DataType::TYPE_STRING;
+                                                if ($cellDataType === DataType::TYPE_NUMERIC && ($value === '' || $value === null)) {
+                                                    $cellDataType = DataType::TYPE_NULL;
+                                                }
+                                                if ($cellDataType !== DataType::TYPE_NULL) {
+                                                    $cell->setValueExplicit($value, $cellDataType);
                                                 }
-                                                $cell->setValueExplicit($value, $cellDataType);
                                             } else {
                                                 $cell->setValue($value);
                                             }
                                             if ($calculatedValue !== null) {
-                                                $cell->setCalculatedValue($calculatedValue);
+                                                $cell->setCalculatedValue($calculatedValue, $originalCellDataTypeNumeric);
                                             }
 
                                             // Style information?
-                                            if ($c['s'] && !$this->readDataOnly) {
+                                            if (!$this->readDataOnly) {
+                                                $cAttrS = (int) ($cAttr['s'] ?? 0);
                                                 // no style index means 0, it seems
-                                                $cell->setXfIndex(isset($styles[(int) ($c['s'])]) ?
-                                                    (int) ($c['s']) : 0);
+                                                $cAttrS = isset($styles[$cAttrS]) ? $cAttrS : 0;
+                                                $cell->setXfIndex($cAttrS);
+                                                // issue 3495
+                                                if ($cellDataType === DataType::TYPE_FORMULA && $styles[$cAttrS]->quotePrefix === true) {
+                                                    $holdSelected = $docSheet->getSelectedCells();
+                                                    $cell->getStyle()->setQuotePrefix(false);
+                                                    $docSheet->setSelectedCells($holdSelected);
+                                                }
                                             }
                                         }
                                         ++$rowIndex;
@@ -768,12 +967,19 @@ public function load($pFilename)
                                     ++$cIndex;
                                 }
                             }
+                            $docSheet->setSelectedCells($holdSelectedCells);
+                            if ($xmlSheetNS && $xmlSheetNS->ignoredErrors) {
+                                foreach ($xmlSheetNS->ignoredErrors->ignoredError as $ignoredErrorx) {
+                                    $ignoredError = self::testSimpleXml($ignoredErrorx);
+                                    $this->processIgnoredErrors($ignoredError, $docSheet);
+                                }
+                            }
 
-                            $aKeys = ['sheet', 'objects', 'scenarios', 'formatCells', 'formatColumns', 'formatRows', 'insertColumns', 'insertRows', 'insertHyperlinks', 'deleteColumns', 'deleteRows', 'selectLockedCells', 'sort', 'autoFilter', 'pivotTables', 'selectUnlockedCells'];
-                            if (!$this->readDataOnly && $xmlSheet && $xmlSheet->sheetProtection) {
-                                foreach ($aKeys as $key) {
+                            if (!$this->readDataOnly && $xmlSheetNS && $xmlSheetNS->sheetProtection) {
+                                $protAttr = $xmlSheetNS->sheetProtection->attributes() ?? [];
+                                foreach ($protAttr as $key => $value) {
                                     $method = 'set' . ucfirst($key);
-                                    $docSheet->getProtection()->$method(self::boolean((string) $xmlSheet->sheetProtection[$key]));
+                                    $docSheet->getProtection()->$method(self::boolean((string) $value));
                                 }
                             }
 
@@ -781,15 +987,19 @@ public function load($pFilename)
                                 $this->readSheetProtection($docSheet, $xmlSheet);
                             }
 
-                            if ($xmlSheet && $xmlSheet->autoFilter && !$this->readDataOnly) {
-                                (new AutoFilter($docSheet, $xmlSheet))->load();
+                            if ($this->readDataOnly === false) {
+                                $this->readAutoFilter($xmlSheetNS, $docSheet);
+                                $this->readBackgroundImage($xmlSheetNS, $docSheet, dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels');
                             }
 
-                            if ($xmlSheet && $xmlSheet->mergeCells && $xmlSheet->mergeCells->mergeCell && !$this->readDataOnly) {
-                                foreach ($xmlSheet->mergeCells->mergeCell as $mergeCell) {
-                                    $mergeRef = (string) $mergeCell['ref'];
-                                    if (strpos($mergeRef, ':') !== false) {
-                                        $docSheet->mergeCells((string) $mergeCell['ref']);
+                            $this->readTables($xmlSheetNS, $docSheet, $dir, $fileWorksheet, $zip, $mainNS);
+
+                            if ($xmlSheetNS && $xmlSheetNS->mergeCells && $xmlSheetNS->mergeCells->mergeCell && !$this->readDataOnly) {
+                                foreach ($xmlSheetNS->mergeCells->mergeCell as $mergeCellx) {
+                                    $mergeCell = $mergeCellx->attributes();
+                                    $mergeRef = (string) ($mergeCell['ref'] ?? '');
+                                    if (str_contains($mergeRef, ':')) {
+                                        $docSheet->mergeCells($mergeRef, Worksheet::MERGE_CELL_CONTENT_HIDE);
                                     }
                                 }
                             }
@@ -798,15 +1008,46 @@ public function load($pFilename)
                                 $unparsedLoadedData = (new PageSetup($docSheet, $xmlSheet))->load($unparsedLoadedData);
                             }
 
+                            if ($xmlSheet !== false && isset($xmlSheet->extLst->ext)) {
+                                foreach ($xmlSheet->extLst->ext as $extlst) {
+                                    $extAttrs = $extlst->attributes() ?? [];
+                                    $extUri = (string) ($extAttrs['uri'] ?? '');
+                                    if ($extUri !== '{CCE6A557-97BC-4b89-ADB6-D9C93CAAB3DF}') {
+                                        continue;
+                                    }
+                                    // Create dataValidations node if does not exists, maybe is better inside the foreach ?
+                                    if (!$xmlSheet->dataValidations) {
+                                        $xmlSheet->addChild('dataValidations');
+                                    }
+
+                                    foreach ($extlst->children(Namespaces::DATA_VALIDATIONS1)->dataValidations->dataValidation as $item) {
+                                        $item = self::testSimpleXml($item);
+                                        $node = self::testSimpleXml($xmlSheet->dataValidations)->addChild('dataValidation');
+                                        foreach ($item->attributes() ?? [] as $attr) {
+                                            $node->addAttribute($attr->getName(), $attr);
+                                        }
+                                        $node->addAttribute('sqref', $item->children(Namespaces::DATA_VALIDATIONS2)->sqref);
+                                        if (isset($item->formula1)) {
+                                            $childNode = $node->addChild('formula1');
+                                            if ($childNode !== null) { // null should never happen
+                                                // see https://github.com/phpstan/phpstan/issues/8236
+                                                $childNode[0] = (string) $item->formula1->children(Namespaces::DATA_VALIDATIONS2)->f; // @phpstan-ignore-line
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+
                             if ($xmlSheet && $xmlSheet->dataValidations && !$this->readDataOnly) {
                                 (new DataValidations($docSheet, $xmlSheet))->load();
                             }
 
                             // unparsed sheet AlternateContent
                             if ($xmlSheet && !$this->readDataOnly) {
-                                $mc = $xmlSheet->children('http://schemas.openxmlformats.org/markup-compatibility/2006');
+                                $mc = $xmlSheet->children(Namespaces::COMPATIBILITY);
                                 if ($mc->AlternateContent) {
                                     foreach ($mc->AlternateContent as $alternateContent) {
+                                        $alternateContent = self::testSimpleXml($alternateContent);
                                         $unparsedLoadedData['sheets'][$docSheet->getCodeName()]['AlternateContents'][] = $alternateContent->asXML();
                                     }
                                 }
@@ -817,21 +1058,14 @@ public function load($pFilename)
                                 $hyperlinkReader = new Hyperlinks($docSheet);
                                 // Locate hyperlink relations
                                 $relationsFileName = dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels';
-                                if ($zip->locateName($relationsFileName)) {
-                                    //~ http://schemas.openxmlformats.org/package/2006/relationships"
-                                    $relsWorksheet = simplexml_load_string(
-                                        $this->securityScanner->scan(
-                                            $this->getFromZipArchive($zip, $relationsFileName)
-                                        ),
-                                        'SimpleXMLElement',
-                                        Settings::getLibXmlLoaderOptions()
-                                    );
+                                if ($zip->locateName($relationsFileName) !== false) {
+                                    $relsWorksheet = $this->loadZip($relationsFileName, Namespaces::RELATIONSHIPS);
                                     $hyperlinkReader->readHyperlinks($relsWorksheet);
                                 }
 
                                 // Loop through hyperlinks
-                                if ($xmlSheet && $xmlSheet->hyperlinks) {
-                                    $hyperlinkReader->setHyperlinks($xmlSheet->hyperlinks);
+                                if ($xmlSheetNS && $xmlSheetNS->children($mainNS)->hyperlinks) {
+                                    $hyperlinkReader->setHyperlinks($xmlSheetNS->children($mainNS)->hyperlinks);
                                 }
                             }
 
@@ -840,20 +1074,15 @@ public function load($pFilename)
                             $vmlComments = [];
                             if (!$this->readDataOnly) {
                                 // Locate comment relations
-                                if ($zip->locateName(dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels')) {
-                                    //~ http://schemas.openxmlformats.org/package/2006/relationships"
-                                    $relsWorksheet = simplexml_load_string(
-                                        $this->securityScanner->scan(
-                                            $this->getFromZipArchive($zip, dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels')
-                                        ),
-                                        'SimpleXMLElement',
-                                        Settings::getLibXmlLoaderOptions()
-                                    );
-                                    foreach ($relsWorksheet->Relationship as $ele) {
-                                        if ($ele['Type'] == 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments') {
+                                $commentRelations = dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels';
+                                if ($zip->locateName($commentRelations) !== false) {
+                                    $relsWorksheet = $this->loadZip($commentRelations, Namespaces::RELATIONSHIPS);
+                                    foreach ($relsWorksheet->Relationship as $elex) {
+                                        $ele = self::getAttributes($elex);
+                                        if ($ele['Type'] == Namespaces::COMMENTS) {
                                             $comments[(string) $ele['Id']] = (string) $ele['Target'];
                                         }
-                                        if ($ele['Type'] == 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing') {
+                                        if ($ele['Type'] == Namespaces::VML) {
                                             $vmlComments[(string) $ele['Id']] = (string) $ele['Target'];
                                         }
                                     }
@@ -863,32 +1092,32 @@ public function load($pFilename)
                                 foreach ($comments as $relName => $relPath) {
                                     // Load comments file
                                     $relPath = File::realpath(dirname("$dir/$fileWorksheet") . '/' . $relPath);
-                                    $commentsFile = simplexml_load_string(
-                                        $this->securityScanner->scan($this->getFromZipArchive($zip, $relPath)),
-                                        'SimpleXMLElement',
-                                        Settings::getLibXmlLoaderOptions()
-                                    );
+                                    // okay to ignore namespace - using xpath
+                                    $commentsFile = $this->loadZip($relPath, '');
 
                                     // Utility variables
                                     $authors = [];
-
-                                    // Loop through authors
-                                    foreach ($commentsFile->authors->author as $author) {
+                                    $commentsFile->registerXpathNamespace('com', $mainNS);
+                                    $authorPath = self::xpathNoFalse($commentsFile, 'com:authors/com:author');
+                                    foreach ($authorPath as $author) {
                                         $authors[] = (string) $author;
                                     }
 
                                     // Loop through contents
-                                    foreach ($commentsFile->commentList->comment as $comment) {
-                                        $commentModel = $docSheet->getComment((string) $comment['ref']);
-                                        if (!empty($comment['authorId'])) {
-                                            $commentModel->setAuthor($authors[$comment['authorId']]);
+                                    $contentPath = self::xpathNoFalse($commentsFile, 'com:commentList/com:comment');
+                                    foreach ($contentPath as $comment) {
+                                        $commentx = $comment->attributes();
+                                        $commentModel = $docSheet->getComment((string) $commentx['ref']);
+                                        if (isset($commentx['authorId'])) {
+                                            $commentModel->setAuthor($authors[(int) $commentx['authorId']]);
                                         }
-                                        $commentModel->setText($this->parseRichText($comment->text));
+                                        $commentModel->setText($this->parseRichText($comment->children($mainNS)->text));
                                     }
                                 }
 
                                 // later we will remove from it real vmlComments
                                 $unparsedVmlDrawings = $vmlComments;
+                                $vmlDrawingContents = [];
 
                                 // Loop through VML comments
                                 foreach ($vmlComments as $relName => $relPath) {
@@ -896,28 +1125,50 @@ public function load($pFilename)
                                     $relPath = File::realpath(dirname("$dir/$fileWorksheet") . '/' . $relPath);
 
                                     try {
-                                        $vmlCommentsFile = simplexml_load_string(
-                                            $this->securityScanner->scan($this->getFromZipArchive($zip, $relPath)),
-                                            'SimpleXMLElement',
-                                            Settings::getLibXmlLoaderOptions()
-                                        );
-                                        $vmlCommentsFile->registerXPathNamespace('v', 'urn:schemas-microsoft-com:vml');
-                                    } catch (Throwable $ex) {
+                                        // no namespace okay - processed with Xpath
+                                        $vmlCommentsFile = $this->loadZip($relPath, '', true);
+                                        $vmlCommentsFile->registerXPathNamespace('v', Namespaces::URN_VML);
+                                    } catch (Throwable) {
                                         //Ignore unparsable vmlDrawings. Later they will be moved from $unparsedVmlDrawings to $unparsedLoadedData
                                         continue;
                                     }
 
-                                    $shapes = $vmlCommentsFile->xpath('//v:shape');
+                                    // Locate VML drawings image relations
+                                    $drowingImages = [];
+                                    $VMLDrawingsRelations = dirname($relPath) . '/_rels/' . basename($relPath) . '.rels';
+                                    $vmlDrawingContents[$relName] = $this->getSecurityScannerOrThrow()->scan($this->getFromZipArchive($zip, $relPath));
+                                    if ($zip->locateName($VMLDrawingsRelations) !== false) {
+                                        $relsVMLDrawing = $this->loadZip($VMLDrawingsRelations, Namespaces::RELATIONSHIPS);
+                                        foreach ($relsVMLDrawing->Relationship as $elex) {
+                                            $ele = self::getAttributes($elex);
+                                            if ($ele['Type'] == Namespaces::IMAGE) {
+                                                $drowingImages[(string) $ele['Id']] = (string) $ele['Target'];
+                                            }
+                                        }
+                                    }
+
+                                    $shapes = self::xpathNoFalse($vmlCommentsFile, '//v:shape');
                                     foreach ($shapes as $shape) {
-                                        $shape->registerXPathNamespace('v', 'urn:schemas-microsoft-com:vml');
+                                        $shape->registerXPathNamespace('v', Namespaces::URN_VML);
 
                                         if (isset($shape['style'])) {
                                             $style = (string) $shape['style'];
                                             $fillColor = strtoupper(substr((string) $shape['fillcolor'], 1));
                                             $column = null;
                                             $row = null;
+                                            $textHAlign = null;
+                                            $fillImageRelId = null;
+                                            $fillImageTitle = '';
 
                                             $clientData = $shape->xpath('.//x:ClientData');
+                                            $textboxDirection = '';
+                                            $textboxPath = $shape->xpath('.//v:textbox');
+                                            $textbox = (string) ($textboxPath[0]['style'] ?? '');
+                                            if (preg_match('/rtl/i', $textbox) === 1) {
+                                                $textboxDirection = Comment::TEXTBOX_DIRECTION_RTL;
+                                            } elseif (preg_match('/ltr/i', $textbox) === 1) {
+                                                $textboxDirection = Comment::TEXTBOX_DIRECTION_LTR;
+                                            }
                                             if (is_array($clientData) && !empty($clientData)) {
                                                 $clientData = $clientData[0];
 
@@ -931,13 +1182,54 @@ public function load($pFilename)
                                                     if (is_array($temp)) {
                                                         $column = $temp[0];
                                                     }
+                                                    $temp = $clientData->xpath('.//x:TextHAlign');
+                                                    if (!empty($temp)) {
+                                                        $textHAlign = strtolower($temp[0]);
+                                                    }
+                                                }
+                                            }
+                                            $rowx = (string) $row;
+                                            $colx = (string) $column;
+                                            if (is_numeric($rowx) && is_numeric($colx) && $textHAlign !== null) {
+                                                $docSheet->getComment([1 + (int) $colx, 1 + (int) $rowx], false)->setAlignment((string) $textHAlign);
+                                            }
+                                            if (is_numeric($rowx) && is_numeric($colx) && $textboxDirection !== '') {
+                                                $docSheet->getComment([1 + (int) $colx, 1 + (int) $rowx], false)->setTextboxDirection($textboxDirection);
+                                            }
+
+                                            $fillImageRelNode = $shape->xpath('.//v:fill/@o:relid');
+                                            if (is_array($fillImageRelNode) && !empty($fillImageRelNode)) {
+                                                $fillImageRelNode = $fillImageRelNode[0];
+
+                                                if (isset($fillImageRelNode['relid'])) {
+                                                    $fillImageRelId = (string) $fillImageRelNode['relid'];
+                                                }
+                                            }
+
+                                            $fillImageTitleNode = $shape->xpath('.//v:fill/@o:title');
+                                            if (is_array($fillImageTitleNode) && !empty($fillImageTitleNode)) {
+                                                $fillImageTitleNode = $fillImageTitleNode[0];
+
+                                                if (isset($fillImageTitleNode['title'])) {
+                                                    $fillImageTitle = (string) $fillImageTitleNode['title'];
                                                 }
                                             }
 
                                             if (($column !== null) && ($row !== null)) {
                                                 // Set comment properties
-                                                $comment = $docSheet->getCommentByColumnAndRow($column + 1, $row + 1);
+                                                $comment = $docSheet->getComment([$column + 1, $row + 1]);
                                                 $comment->getFillColor()->setRGB($fillColor);
+                                                if (isset($drowingImages[$fillImageRelId])) {
+                                                    $objDrawing = new \PhpOffice\PhpSpreadsheet\Worksheet\Drawing();
+                                                    $objDrawing->setName($fillImageTitle);
+                                                    $imagePath = str_replace(['../', '/xl/'], 'xl/', $drowingImages[$fillImageRelId]);
+                                                    $objDrawing->setPath(
+                                                        'zip://' . File::realpath($filename) . '#' . $imagePath,
+                                                        true,
+                                                        $zip
+                                                    );
+                                                    $comment->setBackgroundImage($objDrawing);
+                                                }
 
                                                 // Parse style
                                                 $styleArray = explode(';', str_replace(' ', '', $style));
@@ -975,86 +1267,78 @@ public function load($pFilename)
                                         $unparsedVmlDrawing[$rId] = [];
                                         $unparsedVmlDrawing[$rId]['filePath'] = self::dirAdd("$dir/$fileWorksheet", $relPath);
                                         $unparsedVmlDrawing[$rId]['relFilePath'] = $relPath;
-                                        $unparsedVmlDrawing[$rId]['content'] = $this->securityScanner->scan($this->getFromZipArchive($zip, $unparsedVmlDrawing[$rId]['filePath']));
+                                        $unparsedVmlDrawing[$rId]['content'] = $this->getSecurityScannerOrThrow()->scan($this->getFromZipArchive($zip, $unparsedVmlDrawing[$rId]['filePath']));
                                         unset($unparsedVmlDrawing);
                                     }
                                 }
 
                                 // Header/footer images
-                                if ($xmlSheet && $xmlSheet->legacyDrawingHF && !$this->readDataOnly) {
-                                    if ($zip->locateName(dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels')) {
-                                        //~ http://schemas.openxmlformats.org/package/2006/relationships"
-                                        $relsWorksheet = simplexml_load_string(
-                                            $this->securityScanner->scan(
-                                                $this->getFromZipArchive($zip, dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels')
-                                            ),
-                                            'SimpleXMLElement',
-                                            Settings::getLibXmlLoaderOptions()
-                                        );
+                                if ($xmlSheetNS && $xmlSheetNS->legacyDrawingHF) {
+                                    $vmlHfRid = '';
+                                    $vmlHfRidAttr = $xmlSheetNS->legacyDrawingHF->attributes(Namespaces::SCHEMA_OFFICE_DOCUMENT);
+                                    if ($vmlHfRidAttr !== null && isset($vmlHfRidAttr['id'])) {
+                                        $vmlHfRid = (string) $vmlHfRidAttr['id'][0];
+                                    }
+                                    if ($zip->locateName(dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels') !== false) {
+                                        $relsWorksheet = $this->loadZipNoNamespace(dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels', Namespaces::RELATIONSHIPS);
                                         $vmlRelationship = '';
 
                                         foreach ($relsWorksheet->Relationship as $ele) {
-                                            if ($ele['Type'] == 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing') {
+                                            if ((string) $ele['Type'] == Namespaces::VML && (string) $ele['Id'] === $vmlHfRid) {
                                                 $vmlRelationship = self::dirAdd("$dir/$fileWorksheet", $ele['Target']);
+
+                                                break;
                                             }
                                         }
 
                                         if ($vmlRelationship != '') {
                                             // Fetch linked images
-                                            //~ http://schemas.openxmlformats.org/package/2006/relationships"
-                                            $relsVML = simplexml_load_string(
-                                                $this->securityScanner->scan(
-                                                    $this->getFromZipArchive($zip, dirname($vmlRelationship) . '/_rels/' . basename($vmlRelationship) . '.rels')
-                                                ),
-                                                'SimpleXMLElement',
-                                                Settings::getLibXmlLoaderOptions()
-                                            );
+                                            $relsVML = $this->loadZipNoNamespace(dirname($vmlRelationship) . '/_rels/' . basename($vmlRelationship) . '.rels', Namespaces::RELATIONSHIPS);
                                             $drawings = [];
                                             if (isset($relsVML->Relationship)) {
                                                 foreach ($relsVML->Relationship as $ele) {
-                                                    if ($ele['Type'] == 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image') {
+                                                    if ($ele['Type'] == Namespaces::IMAGE) {
                                                         $drawings[(string) $ele['Id']] = self::dirAdd($vmlRelationship, $ele['Target']);
                                                     }
                                                 }
                                             }
                                             // Fetch VML document
-                                            $vmlDrawing = simplexml_load_string(
-                                                $this->securityScanner->scan($this->getFromZipArchive($zip, $vmlRelationship)),
-                                                'SimpleXMLElement',
-                                                Settings::getLibXmlLoaderOptions()
-                                            );
-                                            $vmlDrawing->registerXPathNamespace('v', 'urn:schemas-microsoft-com:vml');
+                                            $vmlDrawing = $this->loadZipNoNamespace($vmlRelationship, '');
+                                            $vmlDrawing->registerXPathNamespace('v', Namespaces::URN_VML);
 
                                             $hfImages = [];
 
-                                            $shapes = $vmlDrawing->xpath('//v:shape');
+                                            $shapes = self::xpathNoFalse($vmlDrawing, '//v:shape');
                                             foreach ($shapes as $idx => $shape) {
-                                                $shape->registerXPathNamespace('v', 'urn:schemas-microsoft-com:vml');
+                                                $shape->registerXPathNamespace('v', Namespaces::URN_VML);
                                                 $imageData = $shape->xpath('//v:imagedata');
 
-                                                if (!$imageData) {
+                                                if (empty($imageData)) {
                                                     continue;
                                                 }
 
                                                 $imageData = $imageData[$idx];
 
-                                                $imageData = $imageData->attributes('urn:schemas-microsoft-com:office:office');
+                                                $imageData = self::getAttributes($imageData, Namespaces::URN_MSOFFICE);
                                                 $style = self::toCSSArray((string) $shape['style']);
 
-                                                $hfImages[(string) $shape['id']] = new HeaderFooterDrawing();
-                                                if (isset($imageData['title'])) {
-                                                    $hfImages[(string) $shape['id']]->setName((string) $imageData['title']);
-                                                }
+                                                if (array_key_exists((string) $imageData['relid'], $drawings)) {
+                                                    $shapeId = (string) $shape['id'];
+                                                    $hfImages[$shapeId] = new HeaderFooterDrawing();
+                                                    if (isset($imageData['title'])) {
+                                                        $hfImages[$shapeId]->setName((string) $imageData['title']);
+                                                    }
 
-                                                $hfImages[(string) $shape['id']]->setPath('zip://' . File::realpath($pFilename) . '#' . $drawings[(string) $imageData['relid']], false);
-                                                $hfImages[(string) $shape['id']]->setResizeProportional(false);
-                                                $hfImages[(string) $shape['id']]->setWidth($style['width']);
-                                                $hfImages[(string) $shape['id']]->setHeight($style['height']);
-                                                if (isset($style['margin-left'])) {
-                                                    $hfImages[(string) $shape['id']]->setOffsetX($style['margin-left']);
+                                                    $hfImages[$shapeId]->setPath('zip://' . File::realpath($filename) . '#' . $drawings[(string) $imageData['relid']], false, $zip);
+                                                    $hfImages[$shapeId]->setResizeProportional(false);
+                                                    $hfImages[$shapeId]->setWidth($style['width']);
+                                                    $hfImages[$shapeId]->setHeight($style['height']);
+                                                    if (isset($style['margin-left'])) {
+                                                        $hfImages[$shapeId]->setOffsetX($style['margin-left']);
+                                                    }
+                                                    $hfImages[$shapeId]->setOffsetY($style['margin-top']);
+                                                    $hfImages[$shapeId]->setResizeProportional(true);
                                                 }
-                                                $hfImages[(string) $shape['id']]->setOffsetY($style['margin-top']);
-                                                $hfImages[(string) $shape['id']]->setResizeProportional(true);
                                             }
 
                                             $docSheet->getHeaderFooter()->setImages($hfImages);
@@ -1064,47 +1348,66 @@ public function load($pFilename)
                             }
 
                             // TODO: Autoshapes from twoCellAnchors!
-                            if ($zip->locateName(dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels')) {
-                                //~ http://schemas.openxmlformats.org/package/2006/relationships"
-                                $relsWorksheet = simplexml_load_string(
-                                    $this->securityScanner->scan(
-                                        $this->getFromZipArchive($zip, dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels')
-                                    ),
-                                    'SimpleXMLElement',
-                                    Settings::getLibXmlLoaderOptions()
-                                );
+                            $drawingFilename = dirname("$dir/$fileWorksheet")
+                                . '/_rels/'
+                                . basename($fileWorksheet)
+                                . '.rels';
+                            if (str_starts_with($drawingFilename, 'xl//xl/')) {
+                                $drawingFilename = substr($drawingFilename, 4);
+                            }
+                            if (str_starts_with($drawingFilename, '/xl//xl/')) {
+                                $drawingFilename = substr($drawingFilename, 5);
+                            }
+                            if ($zip->locateName($drawingFilename) !== false) {
+                                $relsWorksheet = $this->loadZip($drawingFilename, Namespaces::RELATIONSHIPS);
                                 $drawings = [];
-                                foreach ($relsWorksheet->Relationship as $ele) {
-                                    if ($ele['Type'] == 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing') {
-                                        $drawings[(string) $ele['Id']] = self::dirAdd("$dir/$fileWorksheet", $ele['Target']);
+                                foreach ($relsWorksheet->Relationship as $elex) {
+                                    $ele = self::getAttributes($elex);
+                                    if ((string) $ele['Type'] === "$xmlNamespaceBase/drawing") {
+                                        $eleTarget = (string) $ele['Target'];
+                                        if (str_starts_with($eleTarget, '/xl/')) {
+                                            $drawings[(string) $ele['Id']] = substr($eleTarget, 1);
+                                        } else {
+                                            $drawings[(string) $ele['Id']] = self::dirAdd("$dir/$fileWorksheet", $ele['Target']);
+                                        }
                                     }
                                 }
-                                if ($xmlSheet->drawing && !$this->readDataOnly) {
+
+                                if ($xmlSheetNS->drawing && !$this->readDataOnly) {
                                     $unparsedDrawings = [];
                                     $fileDrawing = null;
-                                    foreach ($xmlSheet->drawing as $drawing) {
-                                        $drawingRelId = (string) self::getArrayItem($drawing->attributes('http://schemas.openxmlformats.org/officeDocument/2006/relationships'), 'id');
+                                    foreach ($xmlSheetNS->drawing as $drawing) {
+                                        $drawingRelId = (string) self::getArrayItem(self::getAttributes($drawing, $xmlNamespaceBase), 'id');
                                         $fileDrawing = $drawings[$drawingRelId];
-                                        //~ http://schemas.openxmlformats.org/package/2006/relationships"
-                                        $relsDrawing = simplexml_load_string(
-                                            $this->securityScanner->scan(
-                                                $this->getFromZipArchive($zip, dirname($fileDrawing) . '/_rels/' . basename($fileDrawing) . '.rels')
-                                            ),
-                                            'SimpleXMLElement',
-                                            Settings::getLibXmlLoaderOptions()
-                                        );
+                                        $drawingFilename = dirname($fileDrawing) . '/_rels/' . basename($fileDrawing) . '.rels';
+                                        $relsDrawing = $this->loadZip($drawingFilename, Namespaces::RELATIONSHIPS);
+
                                         $images = [];
                                         $hyperlinks = [];
                                         if ($relsDrawing && $relsDrawing->Relationship) {
-                                            foreach ($relsDrawing->Relationship as $ele) {
-                                                if ($ele['Type'] == 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink') {
+                                            foreach ($relsDrawing->Relationship as $elex) {
+                                                $ele = self::getAttributes($elex);
+                                                $eleType = (string) $ele['Type'];
+                                                if ($eleType === Namespaces::HYPERLINK) {
                                                     $hyperlinks[(string) $ele['Id']] = (string) $ele['Target'];
                                                 }
-                                                if ($ele['Type'] == 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image') {
-                                                    $images[(string) $ele['Id']] = self::dirAdd($fileDrawing, $ele['Target']);
-                                                } elseif ($ele['Type'] == 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart') {
+                                                if ($eleType === "$xmlNamespaceBase/image") {
+                                                    $eleTarget = (string) $ele['Target'];
+                                                    if (str_starts_with($eleTarget, '/xl/')) {
+                                                        $eleTarget = substr($eleTarget, 1);
+                                                        $images[(string) $ele['Id']] = $eleTarget;
+                                                    } else {
+                                                        $images[(string) $ele['Id']] = self::dirAdd($fileDrawing, $eleTarget);
+                                                    }
+                                                } elseif ($eleType === "$xmlNamespaceBase/chart") {
                                                     if ($this->includeCharts) {
-                                                        $charts[self::dirAdd($fileDrawing, $ele['Target'])] = [
+                                                        $eleTarget = (string) $ele['Target'];
+                                                        if (str_starts_with($eleTarget, '/xl/')) {
+                                                            $index = substr($eleTarget, 1);
+                                                        } else {
+                                                            $index = self::dirAdd($fileDrawing, $eleTarget);
+                                                        }
+                                                        $charts[$index] = [
                                                             'id' => (string) $ele['Id'],
                                                             'sheet' => $docSheet->getTitle(),
                                                         ];
@@ -1112,60 +1415,70 @@ public function load($pFilename)
                                                 }
                                             }
                                         }
-                                        $xmlDrawing = simplexml_load_string(
-                                            $this->securityScanner->scan($this->getFromZipArchive($zip, $fileDrawing)),
-                                            'SimpleXMLElement',
-                                            Settings::getLibXmlLoaderOptions()
-                                        );
-                                        $xmlDrawingChildren = $xmlDrawing->children('http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing');
+
+                                        $xmlDrawing = $this->loadZipNoNamespace($fileDrawing, '');
+                                        $xmlDrawingChildren = $xmlDrawing->children(Namespaces::SPREADSHEET_DRAWING);
 
                                         if ($xmlDrawingChildren->oneCellAnchor) {
                                             foreach ($xmlDrawingChildren->oneCellAnchor as $oneCellAnchor) {
+                                                $oneCellAnchor = self::testSimpleXml($oneCellAnchor);
                                                 if ($oneCellAnchor->pic->blipFill) {
                                                     /** @var SimpleXMLElement $blip */
-                                                    $blip = $oneCellAnchor->pic->blipFill->children('http://schemas.openxmlformats.org/drawingml/2006/main')->blip;
+                                                    $blip = $oneCellAnchor->pic->blipFill->children(Namespaces::DRAWINGML)->blip;
                                                     /** @var SimpleXMLElement $xfrm */
-                                                    $xfrm = $oneCellAnchor->pic->spPr->children('http://schemas.openxmlformats.org/drawingml/2006/main')->xfrm;
+                                                    $xfrm = $oneCellAnchor->pic->spPr->children(Namespaces::DRAWINGML)->xfrm;
                                                     /** @var SimpleXMLElement $outerShdw */
-                                                    $outerShdw = $oneCellAnchor->pic->spPr->children('http://schemas.openxmlformats.org/drawingml/2006/main')->effectLst->outerShdw;
-                                                    /** @var SimpleXMLElement $hlinkClick */
-                                                    $hlinkClick = $oneCellAnchor->pic->nvPicPr->cNvPr->children('http://schemas.openxmlformats.org/drawingml/2006/main')->hlinkClick;
+                                                    $outerShdw = $oneCellAnchor->pic->spPr->children(Namespaces::DRAWINGML)->effectLst->outerShdw;
 
                                                     $objDrawing = new \PhpOffice\PhpSpreadsheet\Worksheet\Drawing();
-                                                    $objDrawing->setName((string) self::getArrayItem($oneCellAnchor->pic->nvPicPr->cNvPr->attributes(), 'name'));
-                                                    $objDrawing->setDescription((string) self::getArrayItem($oneCellAnchor->pic->nvPicPr->cNvPr->attributes(), 'descr'));
-                                                    $imageKey = (string) self::getArrayItem(
-                                                        $blip->attributes('http://schemas.openxmlformats.org/officeDocument/2006/relationships'),
+                                                    $objDrawing->setName((string) self::getArrayItem(self::getAttributes($oneCellAnchor->pic->nvPicPr->cNvPr), 'name'));
+                                                    $objDrawing->setDescription((string) self::getArrayItem(self::getAttributes($oneCellAnchor->pic->nvPicPr->cNvPr), 'descr'));
+                                                    $embedImageKey = (string) self::getArrayItem(
+                                                        self::getAttributes($blip, $xmlNamespaceBase),
                                                         'embed'
                                                     );
-
-                                                    if (isset($images[$imageKey])) {
+                                                    if (isset($images[$embedImageKey])) {
                                                         $objDrawing->setPath(
-                                                            'zip://' . File::realpath($pFilename) . '#' .
-                                                            $images[$imageKey],
-                                                            false
+                                                            'zip://' . File::realpath($filename) . '#'
+                                                            . $images[$embedImageKey],
+                                                            false,
+                                                            $zip
+                                                        );
+                                                    } else {
+                                                        $linkImageKey = (string) self::getArrayItem(
+                                                            $blip->attributes('http://schemas.openxmlformats.org/officeDocument/2006/relationships'),
+                                                            'link'
                                                         );
+                                                        if (isset($images[$linkImageKey])) {
+                                                            $url = str_replace('xl/drawings/', '', $images[$linkImageKey]);
+                                                            $objDrawing->setPath($url, false);
+                                                        }
+                                                        if ($objDrawing->getPath() === '') {
+                                                            continue;
+                                                        }
                                                     }
                                                     $objDrawing->setCoordinates(Coordinate::stringFromColumnIndex(((int) $oneCellAnchor->from->col) + 1) . ($oneCellAnchor->from->row + 1));
 
-                                                    $objDrawing->setOffsetX(Drawing::EMUToPixels($oneCellAnchor->from->colOff));
+                                                    $objDrawing->setOffsetX((int) Drawing::EMUToPixels($oneCellAnchor->from->colOff));
                                                     $objDrawing->setOffsetY(Drawing::EMUToPixels($oneCellAnchor->from->rowOff));
                                                     $objDrawing->setResizeProportional(false);
-                                                    $objDrawing->setWidth(Drawing::EMUToPixels(self::getArrayItem($oneCellAnchor->ext->attributes(), 'cx')));
-                                                    $objDrawing->setHeight(Drawing::EMUToPixels(self::getArrayItem($oneCellAnchor->ext->attributes(), 'cy')));
+                                                    $objDrawing->setWidth(Drawing::EMUToPixels(self::getArrayItem(self::getAttributes($oneCellAnchor->ext), 'cx')));
+                                                    $objDrawing->setHeight(Drawing::EMUToPixels(self::getArrayItem(self::getAttributes($oneCellAnchor->ext), 'cy')));
                                                     if ($xfrm) {
-                                                        $objDrawing->setRotation(Drawing::angleToDegrees(self::getArrayItem($xfrm->attributes(), 'rot')));
+                                                        $objDrawing->setRotation((int) Drawing::angleToDegrees(self::getArrayItem(self::getAttributes($xfrm), 'rot')));
+                                                        $objDrawing->setFlipVertical((bool) self::getArrayItem(self::getAttributes($xfrm), 'flipV'));
+                                                        $objDrawing->setFlipHorizontal((bool) self::getArrayItem(self::getAttributes($xfrm), 'flipH'));
                                                     }
                                                     if ($outerShdw) {
                                                         $shadow = $objDrawing->getShadow();
                                                         $shadow->setVisible(true);
-                                                        $shadow->setBlurRadius(Drawing::EMUToPixels(self::getArrayItem($outerShdw->attributes(), 'blurRad')));
-                                                        $shadow->setDistance(Drawing::EMUToPixels(self::getArrayItem($outerShdw->attributes(), 'dist')));
-                                                        $shadow->setDirection(Drawing::angleToDegrees(self::getArrayItem($outerShdw->attributes(), 'dir')));
-                                                        $shadow->setAlignment((string) self::getArrayItem($outerShdw->attributes(), 'algn'));
+                                                        $shadow->setBlurRadius(Drawing::EMUToPixels(self::getArrayItem(self::getAttributes($outerShdw), 'blurRad')));
+                                                        $shadow->setDistance(Drawing::EMUToPixels(self::getArrayItem(self::getAttributes($outerShdw), 'dist')));
+                                                        $shadow->setDirection(Drawing::angleToDegrees(self::getArrayItem(self::getAttributes($outerShdw), 'dir')));
+                                                        $shadow->setAlignment((string) self::getArrayItem(self::getAttributes($outerShdw), 'algn'));
                                                         $clr = $outerShdw->srgbClr ?? $outerShdw->prstClr;
-                                                        $shadow->getColor()->setRGB(self::getArrayItem($clr->attributes(), 'val'));
-                                                        $shadow->setAlpha(self::getArrayItem($clr->alpha->attributes(), 'val') / 1000);
+                                                        $shadow->getColor()->setRGB(self::getArrayItem(self::getAttributes($clr), 'val'));
+                                                        $shadow->setAlpha(self::getArrayItem(self::getAttributes($clr->alpha), 'val') / 1000);
                                                     }
 
                                                     $this->readHyperLinkDrawing($objDrawing, $oneCellAnchor, $hyperlinks);
@@ -1176,13 +1489,13 @@ public function load($pFilename)
                                                     $coordinates = Coordinate::stringFromColumnIndex(((int) $oneCellAnchor->from->col) + 1) . ($oneCellAnchor->from->row + 1);
                                                     $offsetX = Drawing::EMUToPixels($oneCellAnchor->from->colOff);
                                                     $offsetY = Drawing::EMUToPixels($oneCellAnchor->from->rowOff);
-                                                    $width = Drawing::EMUToPixels(self::getArrayItem($oneCellAnchor->ext->attributes(), 'cx'));
-                                                    $height = Drawing::EMUToPixels(self::getArrayItem($oneCellAnchor->ext->attributes(), 'cy'));
+                                                    $width = Drawing::EMUToPixels(self::getArrayItem(self::getAttributes($oneCellAnchor->ext), 'cx'));
+                                                    $height = Drawing::EMUToPixels(self::getArrayItem(self::getAttributes($oneCellAnchor->ext), 'cy'));
 
-                                                    $graphic = $oneCellAnchor->graphicFrame->children('http://schemas.openxmlformats.org/drawingml/2006/main')->graphic;
+                                                    $graphic = $oneCellAnchor->graphicFrame->children(Namespaces::DRAWINGML)->graphic;
                                                     /** @var SimpleXMLElement $chartRef */
-                                                    $chartRef = $graphic->graphicData->children('http://schemas.openxmlformats.org/drawingml/2006/chart')->chart;
-                                                    $thisChart = (string) $chartRef->attributes('http://schemas.openxmlformats.org/officeDocument/2006/relationships');
+                                                    $chartRef = $graphic->graphicData->children(Namespaces::CHART)->chart;
+                                                    $thisChart = (string) self::getAttributes($chartRef, $xmlNamespaceBase);
 
                                                     $chartDetails[$docSheet->getTitle() . '!' . $thisChart] = [
                                                         'fromCoordinate' => $coordinates,
@@ -1191,52 +1504,81 @@ public function load($pFilename)
                                                         'width' => $width,
                                                         'height' => $height,
                                                         'worksheetTitle' => $docSheet->getTitle(),
+                                                        'oneCellAnchor' => true,
                                                     ];
                                                 }
                                             }
                                         }
                                         if ($xmlDrawingChildren->twoCellAnchor) {
                                             foreach ($xmlDrawingChildren->twoCellAnchor as $twoCellAnchor) {
+                                                $twoCellAnchor = self::testSimpleXml($twoCellAnchor);
                                                 if ($twoCellAnchor->pic->blipFill) {
-                                                    $blip = $twoCellAnchor->pic->blipFill->children('http://schemas.openxmlformats.org/drawingml/2006/main')->blip;
-                                                    $xfrm = $twoCellAnchor->pic->spPr->children('http://schemas.openxmlformats.org/drawingml/2006/main')->xfrm;
-                                                    $outerShdw = $twoCellAnchor->pic->spPr->children('http://schemas.openxmlformats.org/drawingml/2006/main')->effectLst->outerShdw;
-                                                    $hlinkClick = $twoCellAnchor->pic->nvPicPr->cNvPr->children('http://schemas.openxmlformats.org/drawingml/2006/main')->hlinkClick;
                                                     $objDrawing = new \PhpOffice\PhpSpreadsheet\Worksheet\Drawing();
-                                                    $objDrawing->setName((string) self::getArrayItem($twoCellAnchor->pic->nvPicPr->cNvPr->attributes(), 'name'));
-                                                    $objDrawing->setDescription((string) self::getArrayItem($twoCellAnchor->pic->nvPicPr->cNvPr->attributes(), 'descr'));
-                                                    $imageKey = (string) self::getArrayItem(
-                                                        $blip->attributes('http://schemas.openxmlformats.org/officeDocument/2006/relationships'),
+                                                    $blip = $twoCellAnchor->pic->blipFill->children(Namespaces::DRAWINGML)->blip;
+                                                    if (isset($twoCellAnchor->pic->blipFill->children(Namespaces::DRAWINGML)->srcRect)) {
+                                                        $objDrawing->setSrcRect($twoCellAnchor->pic->blipFill->children(Namespaces::DRAWINGML)->srcRect->attributes());
+                                                    }
+                                                    $xfrm = $twoCellAnchor->pic->spPr->children(Namespaces::DRAWINGML)->xfrm;
+                                                    $outerShdw = $twoCellAnchor->pic->spPr->children(Namespaces::DRAWINGML)->effectLst->outerShdw;
+                                                    $editAs = $twoCellAnchor->attributes();
+                                                    if (isset($editAs, $editAs['editAs'])) {
+                                                        $objDrawing->setEditAs($editAs['editAs']);
+                                                    }
+                                                    $objDrawing->setName((string) self::getArrayItem(self::getAttributes($twoCellAnchor->pic->nvPicPr->cNvPr), 'name'));
+                                                    $objDrawing->setDescription((string) self::getArrayItem(self::getAttributes($twoCellAnchor->pic->nvPicPr->cNvPr), 'descr'));
+                                                    $embedImageKey = (string) self::getArrayItem(
+                                                        self::getAttributes($blip, $xmlNamespaceBase),
                                                         'embed'
                                                     );
-                                                    if (isset($images[$imageKey])) {
+                                                    if (isset($images[$embedImageKey])) {
                                                         $objDrawing->setPath(
-                                                            'zip://' . File::realpath($pFilename) . '#' .
-                                                            $images[$imageKey],
-                                                            false
+                                                            'zip://' . File::realpath($filename) . '#'
+                                                            . $images[$embedImageKey],
+                                                            false,
+                                                            $zip
+                                                        );
+                                                    } else {
+                                                        $linkImageKey = (string) self::getArrayItem(
+                                                            $blip->attributes('http://schemas.openxmlformats.org/officeDocument/2006/relationships'),
+                                                            'link'
                                                         );
+                                                        if (isset($images[$linkImageKey])) {
+                                                            $url = str_replace('xl/drawings/', '', $images[$linkImageKey]);
+                                                            $objDrawing->setPath($url, false);
+                                                        }
+                                                        if ($objDrawing->getPath() === '') {
+                                                            continue;
+                                                        }
                                                     }
                                                     $objDrawing->setCoordinates(Coordinate::stringFromColumnIndex(((int) $twoCellAnchor->from->col) + 1) . ($twoCellAnchor->from->row + 1));
 
                                                     $objDrawing->setOffsetX(Drawing::EMUToPixels($twoCellAnchor->from->colOff));
                                                     $objDrawing->setOffsetY(Drawing::EMUToPixels($twoCellAnchor->from->rowOff));
+
+                                                    $objDrawing->setCoordinates2(Coordinate::stringFromColumnIndex(((int) $twoCellAnchor->to->col) + 1) . ($twoCellAnchor->to->row + 1));
+
+                                                    $objDrawing->setOffsetX2(Drawing::EMUToPixels($twoCellAnchor->to->colOff));
+                                                    $objDrawing->setOffsetY2(Drawing::EMUToPixels($twoCellAnchor->to->rowOff));
+
                                                     $objDrawing->setResizeProportional(false);
 
                                                     if ($xfrm) {
-                                                        $objDrawing->setWidth(Drawing::EMUToPixels(self::getArrayItem($xfrm->ext->attributes(), 'cx')));
-                                                        $objDrawing->setHeight(Drawing::EMUToPixels(self::getArrayItem($xfrm->ext->attributes(), 'cy')));
-                                                        $objDrawing->setRotation(Drawing::angleToDegrees(self::getArrayItem($xfrm->attributes(), 'rot')));
+                                                        $objDrawing->setWidth(Drawing::EMUToPixels(self::getArrayItem(self::getAttributes($xfrm->ext), 'cx')));
+                                                        $objDrawing->setHeight(Drawing::EMUToPixels(self::getArrayItem(self::getAttributes($xfrm->ext), 'cy')));
+                                                        $objDrawing->setRotation(Drawing::angleToDegrees(self::getArrayItem(self::getAttributes($xfrm), 'rot')));
+                                                        $objDrawing->setFlipVertical((bool) self::getArrayItem(self::getAttributes($xfrm), 'flipV'));
+                                                        $objDrawing->setFlipHorizontal((bool) self::getArrayItem(self::getAttributes($xfrm), 'flipH'));
                                                     }
                                                     if ($outerShdw) {
                                                         $shadow = $objDrawing->getShadow();
                                                         $shadow->setVisible(true);
-                                                        $shadow->setBlurRadius(Drawing::EMUToPixels(self::getArrayItem($outerShdw->attributes(), 'blurRad')));
-                                                        $shadow->setDistance(Drawing::EMUToPixels(self::getArrayItem($outerShdw->attributes(), 'dist')));
-                                                        $shadow->setDirection(Drawing::angleToDegrees(self::getArrayItem($outerShdw->attributes(), 'dir')));
-                                                        $shadow->setAlignment((string) self::getArrayItem($outerShdw->attributes(), 'algn'));
+                                                        $shadow->setBlurRadius(Drawing::EMUToPixels(self::getArrayItem(self::getAttributes($outerShdw), 'blurRad')));
+                                                        $shadow->setDistance(Drawing::EMUToPixels(self::getArrayItem(self::getAttributes($outerShdw), 'dist')));
+                                                        $shadow->setDirection(Drawing::angleToDegrees(self::getArrayItem(self::getAttributes($outerShdw), 'dir')));
+                                                        $shadow->setAlignment((string) self::getArrayItem(self::getAttributes($outerShdw), 'algn'));
                                                         $clr = $outerShdw->srgbClr ?? $outerShdw->prstClr;
-                                                        $shadow->getColor()->setRGB(self::getArrayItem($clr->attributes(), 'val'));
-                                                        $shadow->setAlpha(self::getArrayItem($clr->alpha->attributes(), 'val') / 1000);
+                                                        $shadow->getColor()->setRGB(self::getArrayItem(self::getAttributes($clr), 'val'));
+                                                        $shadow->setAlpha(self::getArrayItem(self::getAttributes($clr->alpha), 'val') / 1000);
                                                     }
 
                                                     $this->readHyperLinkDrawing($objDrawing, $twoCellAnchor, $hyperlinks);
@@ -1249,10 +1591,10 @@ public function load($pFilename)
                                                     $toCoordinate = Coordinate::stringFromColumnIndex(((int) $twoCellAnchor->to->col) + 1) . ($twoCellAnchor->to->row + 1);
                                                     $toOffsetX = Drawing::EMUToPixels($twoCellAnchor->to->colOff);
                                                     $toOffsetY = Drawing::EMUToPixels($twoCellAnchor->to->rowOff);
-                                                    $graphic = $twoCellAnchor->graphicFrame->children('http://schemas.openxmlformats.org/drawingml/2006/main')->graphic;
+                                                    $graphic = $twoCellAnchor->graphicFrame->children(Namespaces::DRAWINGML)->graphic;
                                                     /** @var SimpleXMLElement $chartRef */
-                                                    $chartRef = $graphic->graphicData->children('http://schemas.openxmlformats.org/drawingml/2006/chart')->chart;
-                                                    $thisChart = (string) $chartRef->attributes('http://schemas.openxmlformats.org/officeDocument/2006/relationships');
+                                                    $chartRef = $graphic->graphicData->children(Namespaces::CHART)->chart;
+                                                    $thisChart = (string) self::getAttributes($chartRef, $xmlNamespaceBase);
 
                                                     $chartDetails[$docSheet->getTitle() . '!' . $thisChart] = [
                                                         'fromCoordinate' => $fromCoordinate,
@@ -1266,7 +1608,28 @@ public function load($pFilename)
                                                 }
                                             }
                                         }
-                                        if ($relsDrawing === false && $xmlDrawing->count() == 0) {
+                                        if ($xmlDrawingChildren->absoluteAnchor) {
+                                            foreach ($xmlDrawingChildren->absoluteAnchor as $absoluteAnchor) {
+                                                if (($this->includeCharts) && ($absoluteAnchor->graphicFrame)) {
+                                                    $graphic = $absoluteAnchor->graphicFrame->children(Namespaces::DRAWINGML)->graphic;
+                                                    /** @var SimpleXMLElement $chartRef */
+                                                    $chartRef = $graphic->graphicData->children(Namespaces::CHART)->chart;
+                                                    $thisChart = (string) self::getAttributes($chartRef, $xmlNamespaceBase);
+                                                    $width = Drawing::EMUToPixels((int) self::getArrayItem(self::getAttributes($absoluteAnchor->ext), 'cx')[0]);
+                                                    $height = Drawing::EMUToPixels((int) self::getArrayItem(self::getAttributes($absoluteAnchor->ext), 'cy')[0]);
+
+                                                    $chartDetails[$docSheet->getTitle() . '!' . $thisChart] = [
+                                                        'fromCoordinate' => 'A1',
+                                                        'fromOffsetX' => 0,
+                                                        'fromOffsetY' => 0,
+                                                        'width' => $width,
+                                                        'height' => $height,
+                                                        'worksheetTitle' => $docSheet->getTitle(),
+                                                    ];
+                                                }
+                                            }
+                                        }
+                                        if (empty($relsDrawing) && $xmlDrawing->count() == 0) {
                                             // Save Drawing without rels and children as unparsed
                                             $unparsedDrawings[$drawingRelId] = $xmlDrawing->asXML();
                                         }
@@ -1274,8 +1637,9 @@ public function load($pFilename)
 
                                     // store original rId of drawing files
                                     $unparsedLoadedData['sheets'][$docSheet->getCodeName()]['drawingOriginalIds'] = [];
-                                    foreach ($relsWorksheet->Relationship as $ele) {
-                                        if ($ele['Type'] == 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing') {
+                                    foreach ($relsWorksheet->Relationship as $elex) {
+                                        $ele = self::getAttributes($elex);
+                                        if ((string) $ele['Type'] === "$xmlNamespaceBase/drawing") {
                                             $drawingRelId = (string) $ele['Id'];
                                             $unparsedLoadedData['sheets'][$docSheet->getCodeName()]['drawingOriginalIds'][(string) $ele['Target']] = $drawingRelId;
                                             if (isset($unparsedDrawings[$drawingRelId])) {
@@ -1283,24 +1647,31 @@ public function load($pFilename)
                                             }
                                         }
                                     }
+                                    if ($xmlSheet->legacyDrawing && !$this->readDataOnly) {
+                                        foreach ($xmlSheet->legacyDrawing as $drawing) {
+                                            $drawingRelId = (string) self::getArrayItem(self::getAttributes($drawing, $xmlNamespaceBase), 'id');
+                                            if (isset($vmlDrawingContents[$drawingRelId])) {
+                                                if (self::onlyNoteVml($vmlDrawingContents[$drawingRelId]) === false) {
+                                                    $unparsedLoadedData['sheets'][$docSheet->getCodeName()]['legacyDrawing'] = $vmlDrawingContents[$drawingRelId];
+                                                }
+                                            }
+                                        }
+                                    }
 
                                     // unparsed drawing AlternateContent
-                                    $xmlAltDrawing = simplexml_load_string(
-                                        $this->securityScanner->scan($this->getFromZipArchive($zip, $fileDrawing)),
-                                        'SimpleXMLElement',
-                                        Settings::getLibXmlLoaderOptions()
-                                    )->children('http://schemas.openxmlformats.org/markup-compatibility/2006');
+                                    $xmlAltDrawing = $this->loadZip((string) $fileDrawing, Namespaces::COMPATIBILITY);
 
                                     if ($xmlAltDrawing->AlternateContent) {
                                         foreach ($xmlAltDrawing->AlternateContent as $alternateContent) {
+                                            $alternateContent = self::testSimpleXml($alternateContent);
                                             $unparsedLoadedData['sheets'][$docSheet->getCodeName()]['drawingAlternateContents'][] = $alternateContent->asXML();
                                         }
                                     }
                                 }
                             }
 
-                            $this->readFormControlProperties($excel, $zip, $dir, $fileWorksheet, $docSheet, $unparsedLoadedData);
-                            $this->readPrinterSettings($excel, $zip, $dir, $fileWorksheet, $docSheet, $unparsedLoadedData);
+                            $this->readFormControlProperties($excel, $dir, $fileWorksheet, $docSheet, $unparsedLoadedData);
+                            $this->readPrinterSettings($excel, $dir, $fileWorksheet, $docSheet, $unparsedLoadedData);
 
                             // Loop through definedNames
                             if ($xmlWorkbook->definedNames) {
@@ -1327,7 +1698,7 @@ public function load($pFilename)
                                                     $extractedRange = explode(',', $extractedRange);
                                                     foreach ($extractedRange as $range) {
                                                         $autoFilterRange = $range;
-                                                        if (strpos($autoFilterRange, ':') !== false) {
+                                                        if (str_contains($autoFilterRange, ':')) {
                                                             $docSheet->getAutoFilter()->setRange($autoFilterRange);
                                                         }
                                                     }
@@ -1354,16 +1725,21 @@ public function load($pFilename)
 
                                                 break;
                                             case '_xlnm.Print_Area':
-                                                $rangeSets = preg_split("/('?(?:.*?)'?(?:![A-Z0-9]+:[A-Z0-9]+)),?/", $extractedRange, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
+                                                $rangeSets = preg_split("/('?(?:.*?)'?(?:![A-Z0-9]+:[A-Z0-9]+)),?/", $extractedRange, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE) ?: [];
                                                 $newRangeSets = [];
                                                 foreach ($rangeSets as $rangeSet) {
-                                                    [$sheetName, $rangeSet] = Worksheet::extractSheetTitle($rangeSet, true);
-                                                    if (strpos($rangeSet, ':') === false) {
+                                                    [, $rangeSet] = Worksheet::extractSheetTitle($rangeSet, true);
+                                                    if (empty($rangeSet)) {
+                                                        continue;
+                                                    }
+                                                    if (!str_contains($rangeSet, ':')) {
                                                         $rangeSet = $rangeSet . ':' . $rangeSet;
                                                     }
                                                     $newRangeSets[] = str_replace('$', '', $rangeSet);
                                                 }
-                                                $docSheet->getPageSetup()->setPrintArea(implode(',', $newRangeSets));
+                                                if (count($newRangeSets) > 0) {
+                                                    $docSheet->getPageSetup()->setPrintArea(implode(',', $newRangeSets));
+                                                }
 
                                                 break;
                                             default:
@@ -1399,9 +1775,9 @@ public function load($pFilename)
                                             break;
                                         default:
                                             if ($mapSheetId[(int) $definedName['localSheetId']] !== null) {
-                                                $range = Worksheet::extractSheetTitle((string) $definedName, true);
+                                                $range = Worksheet::extractSheetTitle($extractedRange, true);
                                                 $scope = $excel->getSheet($mapSheetId[(int) $definedName['localSheetId']]);
-                                                if (strpos((string) $definedName, '!') !== false) {
+                                                if (str_contains((string) $definedName, '!')) {
                                                     $range[0] = str_replace("''", "'", $range[0]);
                                                     $range[0] = str_replace("'", '', $range[0]);
                                                     if ($worksheet = $excel->getSheetByName($range[0])) {
@@ -1417,99 +1793,39 @@ public function load($pFilename)
                                             break;
                                     }
                                 } elseif (!isset($definedName['localSheetId'])) {
-                                    $definedRange = (string) $definedName;
                                     // "Global" definedNames
                                     $locatedSheet = null;
-                                    if (strpos((string) $definedName, '!') !== false) {
+                                    if (str_contains((string) $definedName, '!')) {
                                         // Modify range, and extract the first worksheet reference
                                         // Need to split on a comma or a space if not in quotes, and extract the first part.
-                                        $definedNameValueParts = preg_split("/[ ,](?=([^']*'[^']*')*[^']*$)/miuU", $definedRange);
-                                        // Extract sheet name
-                                        [$extractedSheetName] = Worksheet::extractSheetTitle((string) $definedNameValueParts[0], true);
-                                        $extractedSheetName = trim($extractedSheetName, "'");
-
-                                        // Locate sheet
-                                        $locatedSheet = $excel->getSheetByName($extractedSheetName);
+                                        $definedNameValueParts = preg_split("/[ ,](?=([^']*'[^']*')*[^']*$)/miuU", $extractedRange);
+                                        if (is_array($definedNameValueParts)) {
+                                            // Extract sheet name
+                                            [$extractedSheetName] = Worksheet::extractSheetTitle((string) $definedNameValueParts[0], true);
+                                            $extractedSheetName = trim((string) $extractedSheetName, "'");
+
+                                            // Locate sheet
+                                            $locatedSheet = $excel->getSheetByName($extractedSheetName);
+                                        }
                                     }
 
-                                    if ($locatedSheet === null && !DefinedName::testIfFormula($definedRange)) {
-                                        $definedRange = '#REF!';
+                                    if ($locatedSheet === null && !DefinedName::testIfFormula($extractedRange)) {
+                                        $extractedRange = '#REF!';
                                     }
-                                    $excel->addDefinedName(DefinedName::createInstance((string) $definedName['name'], $locatedSheet, $definedRange, false));
+                                    $excel->addDefinedName(DefinedName::createInstance((string) $definedName['name'], $locatedSheet, $extractedRange, false));
                                 }
                             }
                         }
                     }
 
-                    if ((!$this->readDataOnly || !empty($this->loadSheetsOnly)) && isset($xmlWorkbook->bookViews->workbookView)) {
-                        $workbookView = $xmlWorkbook->bookViews->workbookView;
-
-                        // active sheet index
-                        $activeTab = (int) ($workbookView['activeTab']); // refers to old sheet index
-
-                        // keep active sheet index if sheet is still loaded, else first sheet is set as the active
-                        if (isset($mapSheetId[$activeTab]) && $mapSheetId[$activeTab] !== null) {
-                            $excel->setActiveSheetIndex($mapSheetId[$activeTab]);
-                        } else {
-                            if ($excel->getSheetCount() == 0) {
-                                $excel->createSheet();
-                            }
-                            $excel->setActiveSheetIndex(0);
-                        }
-
-                        if (isset($workbookView['showHorizontalScroll'])) {
-                            $showHorizontalScroll = (string) $workbookView['showHorizontalScroll'];
-                            $excel->setShowHorizontalScroll($this->castXsdBooleanToBool($showHorizontalScroll));
-                        }
-
-                        if (isset($workbookView['showVerticalScroll'])) {
-                            $showVerticalScroll = (string) $workbookView['showVerticalScroll'];
-                            $excel->setShowVerticalScroll($this->castXsdBooleanToBool($showVerticalScroll));
-                        }
-
-                        if (isset($workbookView['showSheetTabs'])) {
-                            $showSheetTabs = (string) $workbookView['showSheetTabs'];
-                            $excel->setShowSheetTabs($this->castXsdBooleanToBool($showSheetTabs));
-                        }
-
-                        if (isset($workbookView['minimized'])) {
-                            $minimized = (string) $workbookView['minimized'];
-                            $excel->setMinimized($this->castXsdBooleanToBool($minimized));
-                        }
-
-                        if (isset($workbookView['autoFilterDateGrouping'])) {
-                            $autoFilterDateGrouping = (string) $workbookView['autoFilterDateGrouping'];
-                            $excel->setAutoFilterDateGrouping($this->castXsdBooleanToBool($autoFilterDateGrouping));
-                        }
-
-                        if (isset($workbookView['firstSheet'])) {
-                            $firstSheet = (string) $workbookView['firstSheet'];
-                            $excel->setFirstSheetIndex((int) $firstSheet);
-                        }
-
-                        if (isset($workbookView['visibility'])) {
-                            $visibility = (string) $workbookView['visibility'];
-                            $excel->setVisibility($visibility);
-                        }
-
-                        if (isset($workbookView['tabRatio'])) {
-                            $tabRatio = (string) $workbookView['tabRatio'];
-                            $excel->setTabRatio((int) $tabRatio);
-                        }
-                    }
+                    (new WorkbookView($excel))->viewSettings($xmlWorkbook, $mainNS, $mapSheetId, $this->readDataOnly);
 
                     break;
             }
         }
 
         if (!$this->readDataOnly) {
-            $contentTypes = simplexml_load_string(
-                $this->securityScanner->scan(
-                    $this->getFromZipArchive($zip, '[Content_Types].xml')
-                ),
-                'SimpleXMLElement',
-                Settings::getLibXmlLoaderOptions()
-            );
+            $contentTypes = $this->loadZip('[Content_Types].xml');
 
             // Default content types
             foreach ($contentTypes->Default as $contentType) {
@@ -1526,25 +1842,28 @@ public function load($pFilename)
                 switch ($contentType['ContentType']) {
                     case 'application/vnd.openxmlformats-officedocument.drawingml.chart+xml':
                         if ($this->includeCharts) {
-                            $chartEntryRef = ltrim($contentType['PartName'], '/');
-                            $chartElements = simplexml_load_string(
-                                $this->securityScanner->scan(
-                                    $this->getFromZipArchive($zip, $chartEntryRef)
-                                ),
-                                'SimpleXMLElement',
-                                Settings::getLibXmlLoaderOptions()
-                            );
-                            $objChart = Chart::readChart($chartElements, basename($chartEntryRef, '.xml'));
-
+                            $chartEntryRef = ltrim((string) $contentType['PartName'], '/');
+                            $chartElements = $this->loadZip($chartEntryRef);
+                            $chartReader = new Chart($chartNS, $drawingNS);
+                            $objChart = $chartReader->readChart($chartElements, basename($chartEntryRef, '.xml'));
                             if (isset($charts[$chartEntryRef])) {
                                 $chartPositionRef = $charts[$chartEntryRef]['sheet'] . '!' . $charts[$chartEntryRef]['id'];
-                                if (isset($chartDetails[$chartPositionRef])) {
+                                if (isset($chartDetails[$chartPositionRef]) && $excel->getSheetByName($charts[$chartEntryRef]['sheet']) !== null) {
                                     $excel->getSheetByName($charts[$chartEntryRef]['sheet'])->addChart($objChart);
                                     $objChart->setWorksheet($excel->getSheetByName($charts[$chartEntryRef]['sheet']));
-                                    $objChart->setTopLeftPosition($chartDetails[$chartPositionRef]['fromCoordinate'], $chartDetails[$chartPositionRef]['fromOffsetX'], $chartDetails[$chartPositionRef]['fromOffsetY']);
+                                    // For oneCellAnchor or absoluteAnchor positioned charts,
+                                    //     toCoordinate is not in the data. Does it need to be calculated?
                                     if (array_key_exists('toCoordinate', $chartDetails[$chartPositionRef])) {
-                                        // For oneCellAnchor positioned charts, toCoordinate is not in the data. Does it need to be calculated?
+                                        // twoCellAnchor
+                                        $objChart->setTopLeftPosition($chartDetails[$chartPositionRef]['fromCoordinate'], $chartDetails[$chartPositionRef]['fromOffsetX'], $chartDetails[$chartPositionRef]['fromOffsetY']);
                                         $objChart->setBottomRightPosition($chartDetails[$chartPositionRef]['toCoordinate'], $chartDetails[$chartPositionRef]['toOffsetX'], $chartDetails[$chartPositionRef]['toOffsetY']);
+                                    } else {
+                                        // oneCellAnchor or absoluteAnchor (e.g. Chart sheet)
+                                        $objChart->setTopLeftPosition($chartDetails[$chartPositionRef]['fromCoordinate'], $chartDetails[$chartPositionRef]['fromOffsetX'], $chartDetails[$chartPositionRef]['fromOffsetY']);
+                                        $objChart->setBottomRightPosition('', $chartDetails[$chartPositionRef]['width'], $chartDetails[$chartPositionRef]['height']);
+                                        if (array_key_exists('oneCellAnchor', $chartDetails[$chartPositionRef])) {
+                                            $objChart->setOneCellAnchor($chartDetails[$chartPositionRef]['oneCellAnchor']);
+                                        }
                                     }
                                 }
                             }
@@ -1552,7 +1871,7 @@ public function load($pFilename)
 
                         break;
 
-                    // unparsed
+                        // unparsed
                     case 'application/vnd.ms-excel.controlproperties+xml':
                         $unparsedLoadedData['override_content_types'][(string) $contentType['PartName']] = (string) $contentType['ContentType'];
 
@@ -1568,106 +1887,83 @@ public function load($pFilename)
         return $excel;
     }
 
-    /**
-     * @param SimpleXMLElement|stdClass $style
-     */
-    private static function readStyle(Style $docStyle, $style): void
-    {
-        $docStyle->getNumberFormat()->setFormatCode($style->numFmt);
-
-        // font
-        if (isset($style->font)) {
-            Styles::readFontStyle($docStyle->getFont(), $style->font);
-        }
-
-        // fill
-        if (isset($style->fill)) {
-            Styles::readFillStyle($docStyle->getFill(), $style->fill);
-        }
-
-        // border
-        if (isset($style->border)) {
-            Styles::readBorderStyle($docStyle->getBorders(), $style->border);
-        }
-
-        // alignment
-        if (isset($style->alignment)) {
-            Styles::readAlignmentStyle($docStyle->getAlignment(), $style->alignment);
-        }
-
-        // protection
-        if (isset($style->protection)) {
-            Styles::readProtectionLocked($docStyle, $style->protection);
-            Styles::readProtectionHidden($docStyle, $style->protection);
-        }
-
-        // top-level style settings
-        if (isset($style->quotePrefix)) {
-            $docStyle->setQuotePrefix((bool) $style->quotePrefix);
-        }
-    }
-
-    /**
-     * @param SimpleXMLElement | null $is
-     *
-     * @return RichText
-     */
-    private function parseRichText(?SimpleXMLElement $is)
+    private function parseRichText(?SimpleXMLElement $is): RichText
     {
         $value = new RichText();
 
         if (isset($is->t)) {
             $value->createText(StringHelper::controlCharacterOOXML2PHP((string) $is->t));
-        } else {
+        } elseif ($is !== null) {
             if (is_object($is->r)) {
-
                 /** @var SimpleXMLElement $run */
                 foreach ($is->r as $run) {
                     if (!isset($run->rPr)) {
                         $value->createText(StringHelper::controlCharacterOOXML2PHP((string) $run->t));
                     } else {
                         $objText = $value->createTextRun(StringHelper::controlCharacterOOXML2PHP((string) $run->t));
+                        $objFont = $objText->getFont() ?? new StyleFont();
 
-                        if (isset($run->rPr->rFont['val'])) {
-                            $objText->getFont()->setName((string) $run->rPr->rFont['val']);
+                        if (isset($run->rPr->rFont)) {
+                            $attr = $run->rPr->rFont->attributes();
+                            if (isset($attr['val'])) {
+                                $objFont->setName((string) $attr['val']);
+                            }
                         }
-                        if (isset($run->rPr->sz['val'])) {
-                            $objText->getFont()->setSize((float) $run->rPr->sz['val']);
+                        if (isset($run->rPr->sz)) {
+                            $attr = $run->rPr->sz->attributes();
+                            if (isset($attr['val'])) {
+                                $objFont->setSize((float) $attr['val']);
+                            }
                         }
                         if (isset($run->rPr->color)) {
-                            $objText->getFont()->setColor(new Color(Styles::readColor($run->rPr->color)));
-                        }
-                        if (
-                            (isset($run->rPr->b['val']) && self::boolean((string) $run->rPr->b['val'])) ||
-                            (isset($run->rPr->b) && !isset($run->rPr->b['val']))
-                        ) {
-                            $objText->getFont()->setBold(true);
+                            $objFont->setColor(new Color($this->styleReader->readColor($run->rPr->color)));
                         }
-                        if (
-                            (isset($run->rPr->i['val']) && self::boolean((string) $run->rPr->i['val'])) ||
-                            (isset($run->rPr->i) && !isset($run->rPr->i['val']))
-                        ) {
-                            $objText->getFont()->setItalic(true);
+                        if (isset($run->rPr->b)) {
+                            $attr = $run->rPr->b->attributes();
+                            if (
+                                (isset($attr['val']) && self::boolean((string) $attr['val']))
+                                || (!isset($attr['val']))
+                            ) {
+                                $objFont->setBold(true);
+                            }
                         }
-                        if (isset($run->rPr->vertAlign, $run->rPr->vertAlign['val'])) {
-                            $vertAlign = strtolower((string) $run->rPr->vertAlign['val']);
-                            if ($vertAlign == 'superscript') {
-                                $objText->getFont()->setSuperscript(true);
+                        if (isset($run->rPr->i)) {
+                            $attr = $run->rPr->i->attributes();
+                            if (
+                                (isset($attr['val']) && self::boolean((string) $attr['val']))
+                                || (!isset($attr['val']))
+                            ) {
+                                $objFont->setItalic(true);
                             }
-                            if ($vertAlign == 'subscript') {
-                                $objText->getFont()->setSubscript(true);
+                        }
+                        if (isset($run->rPr->vertAlign)) {
+                            $attr = $run->rPr->vertAlign->attributes();
+                            if (isset($attr['val'])) {
+                                $vertAlign = strtolower((string) $attr['val']);
+                                if ($vertAlign == 'superscript') {
+                                    $objFont->setSuperscript(true);
+                                }
+                                if ($vertAlign == 'subscript') {
+                                    $objFont->setSubscript(true);
+                                }
                             }
                         }
-                        if (isset($run->rPr->u) && !isset($run->rPr->u['val'])) {
-                            $objText->getFont()->setUnderline(\PhpOffice\PhpSpreadsheet\Style\Font::UNDERLINE_SINGLE);
-                        } elseif (isset($run->rPr->u, $run->rPr->u['val'])) {
-                            $objText->getFont()->setUnderline((string) $run->rPr->u['val']);
+                        if (isset($run->rPr->u)) {
+                            $attr = $run->rPr->u->attributes();
+                            if (!isset($attr['val'])) {
+                                $objFont->setUnderline(StyleFont::UNDERLINE_SINGLE);
+                            } else {
+                                $objFont->setUnderline((string) $attr['val']);
+                            }
                         }
-                        if (
-                            (isset($run->rPr->strike['val']) && self::boolean((string) $run->rPr->strike['val'])) ||
-                            (isset($run->rPr->strike) && !isset($run->rPr->strike['val']))
-                        ) {
-                            $objText->getFont()->setStrikethrough(true);
+                        if (isset($run->rPr->strike)) {
+                            $attr = $run->rPr->strike->attributes();
+                            if (
+                                (isset($attr['val']) && self::boolean((string) $attr['val']))
+                                || (!isset($attr['val']))
+                            ) {
+                                $objFont->setStrikethrough(true);
+                            }
                         }
                     }
                 }
@@ -1677,11 +1973,7 @@ private function parseRichText(?SimpleXMLElement $is)
         return $value;
     }
 
-    /**
-     * @param mixed $customUITarget
-     * @param mixed $zip
-     */
-    private function readRibbon(Spreadsheet $excel, $customUITarget, $zip): void
+    private function readRibbon(Spreadsheet $excel, string $customUITarget, ZipArchive $zip): void
     {
         $baseDir = dirname($customUITarget);
         $nameCustomUI = basename($customUITarget);
@@ -1695,14 +1987,14 @@ private function readRibbon(Spreadsheet $excel, $customUITarget, $zip): void
         if ($dataRels) {
             // exists and not empty if the ribbon have some pictures (other than internal MSO)
             $UIRels = simplexml_load_string(
-                $this->securityScanner->scan($dataRels),
+                $this->getSecurityScannerOrThrow()->scan($dataRels),
                 'SimpleXMLElement',
                 Settings::getLibXmlLoaderOptions()
             );
             if (false !== $UIRels) {
                 // we need to save id and target to avoid parsing customUI.xml and "guess" if it's a pseudo callback who load the image
                 foreach ($UIRels->Relationship as $ele) {
-                    if ($ele['Type'] == 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image') {
+                    if ((string) $ele['Type'] === Namespaces::SCHEMA_OFFICE_DOCUMENT . '/image') {
                         // an image ?
                         $customUIImagesNames[(string) $ele['Id']] = (string) $ele['Target'];
                         $customUIImagesBinaries[(string) $ele['Target']] = $this->getFromZipArchive($zip, $baseDir . '/' . (string) $ele['Target']);
@@ -1723,17 +2015,20 @@ private function readRibbon(Spreadsheet $excel, $customUITarget, $zip): void
         }
     }
 
-    private static function getArrayItem($array, $key = 0)
+    private static function getArrayItem(null|array|bool|SimpleXMLElement $array, int|string $key = 0): mixed
     {
-        return $array[$key] ?? null;
+        return ($array === null || is_bool($array)) ? null : ($array[$key] ?? null);
     }
 
-    private static function dirAdd($base, $add)
+    private static function dirAdd(null|SimpleXMLElement|string $base, null|SimpleXMLElement|string $add): string
     {
-        return preg_replace('~[^/]+/\.\./~', '', dirname($base) . "/$add");
+        $base = (string) $base;
+        $add = (string) $add;
+
+        return (string) preg_replace('~[^/]+/\.\./~', '', dirname($base) . "/$add");
     }
 
-    private static function toCSSArray($style)
+    private static function toCSSArray(string $style): array
     {
         $style = self::stripWhiteSpaceFromStyleString($style);
 
@@ -1742,20 +2037,20 @@ private static function toCSSArray($style)
         foreach ($temp as $item) {
             $item = explode(':', $item);
 
-            if (strpos($item[1], 'px') !== false) {
+            if (str_contains($item[1], 'px')) {
                 $item[1] = str_replace('px', '', $item[1]);
             }
-            if (strpos($item[1], 'pt') !== false) {
+            if (str_contains($item[1], 'pt')) {
                 $item[1] = str_replace('pt', '', $item[1]);
-                $item[1] = Font::fontSizeToPixels($item[1]);
+                $item[1] = (string) Font::fontSizeToPixels((int) $item[1]);
             }
-            if (strpos($item[1], 'in') !== false) {
+            if (str_contains($item[1], 'in')) {
                 $item[1] = str_replace('in', '', $item[1]);
-                $item[1] = Font::inchSizeToPixels($item[1]);
+                $item[1] = (string) Font::inchSizeToPixels((int) $item[1]);
             }
-            if (strpos($item[1], 'cm') !== false) {
+            if (str_contains($item[1], 'cm')) {
                 $item[1] = str_replace('cm', '', $item[1]);
-                $item[1] = Font::centimeterSizeToPixels($item[1]);
+                $item[1] = (string) Font::centimeterSizeToPixels((int) $item[1]);
             }
 
             $style[$item[0]] = $item[1];
@@ -1764,16 +2059,13 @@ private static function toCSSArray($style)
         return $style;
     }
 
-    public static function stripWhiteSpaceFromStyleString($string)
+    public static function stripWhiteSpaceFromStyleString(string $string): string
     {
         return trim(str_replace(["\r", "\n", ' '], '', $string), ';');
     }
 
-    private static function boolean($value)
+    private static function boolean(string $value): bool
     {
-        if (is_object($value)) {
-            $value = (string) $value;
-        }
         if (is_numeric($value)) {
             return (bool) $value;
         }
@@ -1781,23 +2073,18 @@ private static function boolean($value)
         return $value === 'true' || $value === 'TRUE';
     }
 
-    /**
-     * @param \PhpOffice\PhpSpreadsheet\Worksheet\Drawing $objDrawing
-     * @param SimpleXMLElement $cellAnchor
-     * @param array $hyperlinks
-     */
-    private function readHyperLinkDrawing($objDrawing, $cellAnchor, $hyperlinks): void
+    private function readHyperLinkDrawing(\PhpOffice\PhpSpreadsheet\Worksheet\Drawing $objDrawing, SimpleXMLElement $cellAnchor, array $hyperlinks): void
     {
-        $hlinkClick = $cellAnchor->pic->nvPicPr->cNvPr->children('http://schemas.openxmlformats.org/drawingml/2006/main')->hlinkClick;
+        $hlinkClick = $cellAnchor->pic->nvPicPr->cNvPr->children(Namespaces::DRAWINGML)->hlinkClick;
 
         if ($hlinkClick->count() === 0) {
             return;
         }
 
-        $hlinkId = (string) $hlinkClick->attributes('http://schemas.openxmlformats.org/officeDocument/2006/relationships')['id'];
+        $hlinkId = (string) self::getAttributes($hlinkClick, Namespaces::SCHEMA_OFFICE_DOCUMENT)['id'];
         $hyperlink = new Hyperlink(
             $hyperlinks[$hlinkId],
-            (string) self::getArrayItem($cellAnchor->pic->nvPicPr->cNvPr->attributes(), 'name')
+            (string) self::getArrayItem(self::getAttributes($cellAnchor->pic->nvPicPr->cNvPr), 'name')
         );
         $objDrawing->setHyperlink($hyperlink);
     }
@@ -1827,7 +2114,7 @@ private function readProtection(Spreadsheet $excel, SimpleXMLElement $xmlWorkboo
         }
     }
 
-    private static function getLockValue(SimpleXmlElement $protection, string $key): ?bool
+    private static function getLockValue(SimpleXMLElement $protection, string $key): ?bool
     {
         $returnValue = null;
         $protectKey = $protection[$key];
@@ -1839,23 +2126,18 @@ private static function getLockValue(SimpleXmlElement $protection, string $key):
         return $returnValue;
     }
 
-    private function readFormControlProperties(Spreadsheet $excel, ZipArchive $zip, $dir, $fileWorksheet, $docSheet, array &$unparsedLoadedData): void
+    private function readFormControlProperties(Spreadsheet $excel, string $dir, string $fileWorksheet, Worksheet $docSheet, array &$unparsedLoadedData): void
     {
-        if (!$zip->locateName(dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels')) {
+        $zip = $this->zip;
+        if ($zip->locateName(dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels') === false) {
             return;
         }
 
-        //~ http://schemas.openxmlformats.org/package/2006/relationships"
-        $relsWorksheet = simplexml_load_string(
-            $this->securityScanner->scan(
-                $this->getFromZipArchive($zip, dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels')
-            ),
-            'SimpleXMLElement',
-            Settings::getLibXmlLoaderOptions()
-        );
+        $filename = dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels';
+        $relsWorksheet = $this->loadZipNoNamespace($filename, Namespaces::RELATIONSHIPS);
         $ctrlProps = [];
         foreach ($relsWorksheet->Relationship as $ele) {
-            if ($ele['Type'] == 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/ctrlProp') {
+            if ((string) $ele['Type'] === Namespaces::SCHEMA_OFFICE_DOCUMENT . '/ctrlProp') {
                 $ctrlProps[(string) $ele['Id']] = $ele;
             }
         }
@@ -1866,98 +2148,66 @@ private function readFormControlProperties(Spreadsheet $excel, ZipArchive $zip,
             $unparsedCtrlProps[$rId] = [];
             $unparsedCtrlProps[$rId]['filePath'] = self::dirAdd("$dir/$fileWorksheet", $ctrlProp['Target']);
             $unparsedCtrlProps[$rId]['relFilePath'] = (string) $ctrlProp['Target'];
-            $unparsedCtrlProps[$rId]['content'] = $this->securityScanner->scan($this->getFromZipArchive($zip, $unparsedCtrlProps[$rId]['filePath']));
+            $unparsedCtrlProps[$rId]['content'] = $this->getSecurityScannerOrThrow()->scan($this->getFromZipArchive($zip, $unparsedCtrlProps[$rId]['filePath']));
         }
         unset($unparsedCtrlProps);
     }
 
-    private function readPrinterSettings(Spreadsheet $excel, ZipArchive $zip, $dir, $fileWorksheet, $docSheet, array &$unparsedLoadedData): void
+    private function readPrinterSettings(Spreadsheet $excel, string $dir, string $fileWorksheet, Worksheet $docSheet, array &$unparsedLoadedData): void
     {
-        if (!$zip->locateName(dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels')) {
+        $zip = $this->zip;
+        if ($zip->locateName(dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels') === false) {
             return;
         }
 
-        //~ http://schemas.openxmlformats.org/package/2006/relationships"
-        $relsWorksheet = simplexml_load_string(
-            $this->securityScanner->scan(
-                $this->getFromZipArchive($zip, dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels')
-            ),
-            'SimpleXMLElement',
-            Settings::getLibXmlLoaderOptions()
-        );
+        $filename = dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels';
+        $relsWorksheet = $this->loadZipNoNamespace($filename, Namespaces::RELATIONSHIPS);
         $sheetPrinterSettings = [];
         foreach ($relsWorksheet->Relationship as $ele) {
-            if ($ele['Type'] == 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/printerSettings') {
+            if ((string) $ele['Type'] === Namespaces::SCHEMA_OFFICE_DOCUMENT . '/printerSettings') {
                 $sheetPrinterSettings[(string) $ele['Id']] = $ele;
             }
         }
 
         $unparsedPrinterSettings = &$unparsedLoadedData['sheets'][$docSheet->getCodeName()]['printerSettings'];
         foreach ($sheetPrinterSettings as $rId => $printerSettings) {
-            $rId = substr($rId, 3) . 'ps'; // rIdXXX, add 'ps' suffix to avoid identical resource identifier collision with unparsed vmlDrawing
+            $rId = substr($rId, 3); // rIdXXX
+            if (!str_ends_with($rId, 'ps')) {
+                $rId = $rId . 'ps'; // rIdXXX, add 'ps' suffix to avoid identical resource identifier collision with unparsed vmlDrawing
+            }
             $unparsedPrinterSettings[$rId] = [];
-            $unparsedPrinterSettings[$rId]['filePath'] = self::dirAdd("$dir/$fileWorksheet", $printerSettings['Target']);
-            $unparsedPrinterSettings[$rId]['relFilePath'] = (string) $printerSettings['Target'];
-            $unparsedPrinterSettings[$rId]['content'] = $this->securityScanner->scan($this->getFromZipArchive($zip, $unparsedPrinterSettings[$rId]['filePath']));
+            $target = (string) str_replace('/xl/', '../', (string) $printerSettings['Target']);
+            $unparsedPrinterSettings[$rId]['filePath'] = self::dirAdd("$dir/$fileWorksheet", $target);
+            $unparsedPrinterSettings[$rId]['relFilePath'] = $target;
+            $unparsedPrinterSettings[$rId]['content'] = $this->getSecurityScannerOrThrow()->scan($this->getFromZipArchive($zip, $unparsedPrinterSettings[$rId]['filePath']));
         }
         unset($unparsedPrinterSettings);
     }
 
-    /**
-     * Convert an 'xsd:boolean' XML value to a PHP boolean value.
-     * A valid 'xsd:boolean' XML value can be one of the following
-     * four values: 'true', 'false', '1', '0'.  It is case sensitive.
-     *
-     * Note that just doing '(bool) $xsdBoolean' is not safe,
-     * since '(bool) "false"' returns true.
-     *
-     * @see https://www.w3.org/TR/xmlschema11-2/#boolean
-     *
-     * @param string $xsdBoolean An XML string value of type 'xsd:boolean'
-     *
-     * @return bool  Boolean value
-     */
-    private function castXsdBooleanToBool($xsdBoolean)
-    {
-        if ($xsdBoolean === 'false') {
-            return false;
-        }
-
-        return (bool) $xsdBoolean;
-    }
-
-    /**
-     * @param ZipArchive $zip Opened zip archive
-     *
-     * @return string basename of the used excel workbook
-     */
-    private function getWorkbookBaseName(ZipArchive $zip)
+    private function getWorkbookBaseName(): array
     {
         $workbookBasename = '';
+        $xmlNamespaceBase = '';
 
         // check if it is an OOXML archive
-        $rels = simplexml_load_string(
-            $this->securityScanner->scan(
-                $this->getFromZipArchive($zip, '_rels/.rels')
-            ),
-            'SimpleXMLElement',
-            Settings::getLibXmlLoaderOptions()
-        );
-        if ($rels !== false) {
-            foreach ($rels->Relationship as $rel) {
-                switch ($rel['Type']) {
-                    case 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument':
-                        $basename = basename($rel['Target']);
-                        if (preg_match('/workbook.*\.xml/', $basename)) {
-                            $workbookBasename = $basename;
-                        }
+        $rels = $this->loadZip(self::INITIAL_FILE);
+        foreach ($rels->children(Namespaces::RELATIONSHIPS)->Relationship as $rel) {
+            $rel = self::getAttributes($rel);
+            $type = (string) $rel['Type'];
+            switch ($type) {
+                case Namespaces::OFFICE_DOCUMENT:
+                case Namespaces::PURL_OFFICE_DOCUMENT:
+                    $basename = basename((string) $rel['Target']);
+                    $xmlNamespaceBase = dirname($type);
+                    if (preg_match('/workbook.*\.xml/', $basename)) {
+                        $workbookBasename = $basename;
+                    }
 
-                        break;
-                }
+                    break;
             }
         }
 
-        return $workbookBasename;
+        return [$workbookBasename, $xmlNamespaceBase];
     }
 
     private function readSheetProtection(Worksheet $docSheet, SimpleXMLElement $xmlSheet): void
@@ -1980,8 +2230,207 @@ private function readSheetProtection(Worksheet $docSheet, SimpleXMLElement $xmlS
 
         if ($xmlSheet->protectedRanges->protectedRange) {
             foreach ($xmlSheet->protectedRanges->protectedRange as $protectedRange) {
-                $docSheet->protectCells((string) $protectedRange['sqref'], (string) $protectedRange['password'], true);
+                $docSheet->protectCells((string) $protectedRange['sqref'], (string) $protectedRange['password'], true, (string) $protectedRange['name'], (string) $protectedRange['securityDescriptor']);
+            }
+        }
+    }
+
+    private function readAutoFilter(
+        SimpleXMLElement $xmlSheet,
+        Worksheet $docSheet
+    ): void {
+        if ($xmlSheet && $xmlSheet->autoFilter) {
+            (new AutoFilter($docSheet, $xmlSheet))->load();
+        }
+    }
+
+    private function readBackgroundImage(
+        SimpleXMLElement $xmlSheet,
+        Worksheet $docSheet,
+        string $relsName
+    ): void {
+        if ($xmlSheet && $xmlSheet->picture) {
+            $id = (string) self::getArrayItem(self::getAttributes($xmlSheet->picture, Namespaces::SCHEMA_OFFICE_DOCUMENT), 'id');
+            $rels = $this->loadZip($relsName);
+            foreach ($rels->Relationship as $rel) {
+                $attrs = $rel->attributes() ?? [];
+                $rid = (string) ($attrs['Id'] ?? '');
+                $target = (string) ($attrs['Target'] ?? '');
+                if ($rid === $id && substr($target, 0, 2) === '..') {
+                    $target = 'xl' . substr($target, 2);
+                    $content = $this->getFromZipArchive($this->zip, $target);
+                    $docSheet->setBackgroundImage($content);
+                }
+            }
+        }
+    }
+
+    private function readTables(
+        SimpleXMLElement $xmlSheet,
+        Worksheet $docSheet,
+        string $dir,
+        string $fileWorksheet,
+        ZipArchive $zip,
+        string $namespaceTable
+    ): void {
+        if ($xmlSheet && $xmlSheet->tableParts) {
+            $attributes = $xmlSheet->tableParts->attributes() ?? ['count' => 0];
+            if (((int) $attributes['count']) > 0) {
+                $this->readTablesInTablesFile($xmlSheet, $dir, $fileWorksheet, $zip, $docSheet, $namespaceTable);
             }
         }
     }
+
+    private function readTablesInTablesFile(
+        SimpleXMLElement $xmlSheet,
+        string $dir,
+        string $fileWorksheet,
+        ZipArchive $zip,
+        Worksheet $docSheet,
+        string $namespaceTable
+    ): void {
+        foreach ($xmlSheet->tableParts->tablePart as $tablePart) {
+            $relation = self::getAttributes($tablePart, Namespaces::SCHEMA_OFFICE_DOCUMENT);
+            $tablePartRel = (string) $relation['id'];
+            $relationsFileName = dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels';
+
+            if ($zip->locateName($relationsFileName) !== false) {
+                $relsTableReferences = $this->loadZip($relationsFileName, Namespaces::RELATIONSHIPS);
+                foreach ($relsTableReferences->Relationship as $relationship) {
+                    $relationshipAttributes = self::getAttributes($relationship, '');
+
+                    if ((string) $relationshipAttributes['Id'] === $tablePartRel) {
+                        $relationshipFileName = (string) $relationshipAttributes['Target'];
+                        $relationshipFilePath = dirname("$dir/$fileWorksheet") . '/' . $relationshipFileName;
+                        $relationshipFilePath = File::realpath($relationshipFilePath);
+
+                        if ($this->fileExistsInArchive($this->zip, $relationshipFilePath)) {
+                            $tableXml = $this->loadZip($relationshipFilePath, $namespaceTable);
+                            (new TableReader($docSheet, $tableXml))->load();
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private static function extractStyles(?SimpleXMLElement $sxml, string $node1, string $node2): array
+    {
+        $array = [];
+        if ($sxml && $sxml->{$node1}->{$node2}) {
+            foreach ($sxml->{$node1}->{$node2} as $node) {
+                $array[] = $node;
+            }
+        }
+
+        return $array;
+    }
+
+    private static function extractPalette(?SimpleXMLElement $sxml): array
+    {
+        $array = [];
+        if ($sxml && $sxml->colors->indexedColors) {
+            foreach ($sxml->colors->indexedColors->rgbColor as $node) {
+                if ($node !== null) {
+                    $attr = $node->attributes();
+                    if (isset($attr['rgb'])) {
+                        $array[] = (string) $attr['rgb'];
+                    }
+                }
+            }
+        }
+
+        return $array;
+    }
+
+    private function processIgnoredErrors(SimpleXMLElement $xml, Worksheet $sheet): void
+    {
+        $attributes = self::getAttributes($xml);
+        $sqref = (string) ($attributes['sqref'] ?? '');
+        $numberStoredAsText = (string) ($attributes['numberStoredAsText'] ?? '');
+        $formula = (string) ($attributes['formula'] ?? '');
+        $twoDigitTextYear = (string) ($attributes['twoDigitTextYear'] ?? '');
+        $evalError = (string) ($attributes['evalError'] ?? '');
+        if (!empty($sqref)) {
+            $explodedSqref = explode(' ', $sqref);
+            $pattern1 = '/^([A-Z]{1,3})([0-9]{1,7})(:([A-Z]{1,3})([0-9]{1,7}))?$/';
+            foreach ($explodedSqref as $sqref1) {
+                if (preg_match($pattern1, $sqref1, $matches) === 1) {
+                    $firstRow = $matches[2];
+                    $firstCol = $matches[1];
+                    if (array_key_exists(3, $matches)) {
+                        $lastCol = $matches[4];
+                        $lastRow = $matches[5];
+                    } else {
+                        $lastCol = $firstCol;
+                        $lastRow = $firstRow;
+                    }
+                    ++$lastCol;
+                    for ($row = $firstRow; $row <= $lastRow; ++$row) {
+                        for ($col = $firstCol; $col !== $lastCol; ++$col) {
+                            if ($numberStoredAsText === '1') {
+                                $sheet->getCell("$col$row")->getIgnoredErrors()->setNumberStoredAsText(true);
+                            }
+                            if ($formula === '1') {
+                                $sheet->getCell("$col$row")->getIgnoredErrors()->setFormula(true);
+                            }
+                            if ($twoDigitTextYear === '1') {
+                                $sheet->getCell("$col$row")->getIgnoredErrors()->setTwoDigitTextYear(true);
+                            }
+                            if ($evalError === '1') {
+                                $sheet->getCell("$col$row")->getIgnoredErrors()->setEvalError(true);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private static function storeFormulaAttributes(SimpleXMLElement $f, Worksheet $docSheet, string $r): void
+    {
+        $formulaAttributes = [];
+        $attributes = $f->attributes();
+        if (isset($attributes['t'])) {
+            $formulaAttributes['t'] = (string) $attributes['t'];
+        }
+        if (isset($attributes['ref'])) {
+            $formulaAttributes['ref'] = (string) $attributes['ref'];
+        }
+        if (!empty($formulaAttributes)) {
+            $docSheet->getCell($r)->setFormulaAttributes($formulaAttributes);
+        }
+    }
+
+    private static function onlyNoteVml(string $data): bool
+    {
+        $data = str_replace('<br>', '<br/>', $data);
+
+        try {
+            $sxml = @simplexml_load_string($data);
+        } catch (Throwable) {
+            $sxml = false;
+        }
+
+        if ($sxml === false) {
+            return false;
+        }
+        $shapes = $sxml->children(Namespaces::URN_VML);
+        foreach ($shapes->shape as $shape) {
+            $clientData = $shape->children(Namespaces::URN_EXCEL);
+            if (!isset($clientData->ClientData)) {
+                return false;
+            }
+            $attrs = $clientData->ClientData->attributes();
+            if (!isset($attrs['ObjectType'])) {
+                return false;
+            }
+            $objectType = (string) $attrs['ObjectType'];
+            if ($objectType !== 'Note') {
+                return false;
+            }
+        }
+
+        return true;
+    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/AutoFilter.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/AutoFilter.php
index f52bfd41a8..49fe3609d8 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/AutoFilter.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/AutoFilter.php
@@ -2,56 +2,61 @@
 
 namespace PhpOffice\PhpSpreadsheet\Reader\Xlsx;
 
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
 use PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter\Column;
 use PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter\Column\Rule;
+use PhpOffice\PhpSpreadsheet\Worksheet\Table;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 use SimpleXMLElement;
 
 class AutoFilter
 {
-    private $worksheet;
+    private Table|Worksheet $parent;
 
-    private $worksheetXml;
+    private SimpleXMLElement $worksheetXml;
 
-    public function __construct(Worksheet $workSheet, SimpleXMLElement $worksheetXml)
+    public function __construct(Table|Worksheet $parent, SimpleXMLElement $worksheetXml)
     {
-        $this->worksheet = $workSheet;
+        $this->parent = $parent;
         $this->worksheetXml = $worksheetXml;
     }
 
     public function load(): void
     {
         // Remove all "$" in the auto filter range
-        $autoFilterRange = preg_replace('/\$/', '', $this->worksheetXml->autoFilter['ref']);
-        if (strpos($autoFilterRange, ':') !== false) {
-            $this->readAutoFilter($autoFilterRange, $this->worksheetXml);
+        $attrs = $this->worksheetXml->autoFilter->attributes() ?? [];
+        $autoFilterRange = (string) preg_replace('/\$/', '', $attrs['ref'] ?? '');
+        if (str_contains($autoFilterRange, ':')) {
+            $this->readAutoFilter($autoFilterRange);
         }
     }
 
-    private function readAutoFilter($autoFilterRange, $xmlSheet): void
+    private function readAutoFilter(string $autoFilterRange): void
     {
-        $autoFilter = $this->worksheet->getAutoFilter();
+        $autoFilter = $this->parent->getAutoFilter();
         $autoFilter->setRange($autoFilterRange);
 
-        foreach ($xmlSheet->autoFilter->filterColumn as $filterColumn) {
-            $column = $autoFilter->getColumnByOffset((int) $filterColumn['colId']);
+        foreach ($this->worksheetXml->autoFilter->filterColumn as $filterColumn) {
+            $attributes = $filterColumn->attributes() ?? [];
+            $column = $autoFilter->getColumnByOffset((int) ($attributes['colId'] ?? 0));
             //    Check for standard filters
             if ($filterColumn->filters) {
                 $column->setFilterType(Column::AUTOFILTER_FILTERTYPE_FILTER);
-                $filters = $filterColumn->filters;
-                if ((isset($filters['blank'])) && ($filters['blank'] == 1)) {
+                $filters = Xlsx::testSimpleXml($filterColumn->filters->attributes());
+                if ((isset($filters['blank'])) && ((int) $filters['blank'] == 1)) {
                     //    Operator is undefined, but always treated as EQUAL
-                    $column->createRule()->setRule(null, '')->setRuleType(Rule::AUTOFILTER_RULETYPE_FILTER);
+                    $column->createRule()->setRule('', '')->setRuleType(Rule::AUTOFILTER_RULETYPE_FILTER);
                 }
                 //    Standard filters are always an OR join, so no join rule needs to be set
                 //    Entries can be either filter elements
-                foreach ($filters->filter as $filterRule) {
+                foreach ($filterColumn->filters->filter as $filterRule) {
                     //    Operator is undefined, but always treated as EQUAL
-                    $column->createRule()->setRule(null, (string) $filterRule['val'])->setRuleType(Rule::AUTOFILTER_RULETYPE_FILTER);
+                    $attr2 = $filterRule->attributes() ?? ['val' => ''];
+                    $column->createRule()->setRule('', (string) $attr2['val'])->setRuleType(Rule::AUTOFILTER_RULETYPE_FILTER);
                 }
 
                 //    Or Date Group elements
-                $this->readDateRangeAutoFilter($filters, $column);
+                $this->readDateRangeAutoFilter($filterColumn->filters, $column);
             }
 
             //    Check for custom filters
@@ -61,81 +66,91 @@ private function readAutoFilter($autoFilterRange, $xmlSheet): void
             //    Check for dynamic filters
             $this->readTopTenAutoFilter($filterColumn, $column);
         }
+        $autoFilter->setEvaluated(true);
     }
 
     private function readDateRangeAutoFilter(SimpleXMLElement $filters, Column $column): void
     {
-        foreach ($filters->dateGroupItem as $dateGroupItem) {
+        foreach ($filters->dateGroupItem as $dateGroupItemx) {
             //    Operator is undefined, but always treated as EQUAL
-            $column->createRule()->setRule(
-                null,
-                [
-                    'year' => (string) $dateGroupItem['year'],
-                    'month' => (string) $dateGroupItem['month'],
-                    'day' => (string) $dateGroupItem['day'],
-                    'hour' => (string) $dateGroupItem['hour'],
-                    'minute' => (string) $dateGroupItem['minute'],
-                    'second' => (string) $dateGroupItem['second'],
-                ],
-                (string) $dateGroupItem['dateTimeGrouping']
-            )->setRuleType(Rule::AUTOFILTER_RULETYPE_DATEGROUP);
+            $dateGroupItem = $dateGroupItemx->attributes();
+            if ($dateGroupItem !== null) {
+                $column->createRule()->setRule(
+                    '',
+                    [
+                        'year' => (string) $dateGroupItem['year'],
+                        'month' => (string) $dateGroupItem['month'],
+                        'day' => (string) $dateGroupItem['day'],
+                        'hour' => (string) $dateGroupItem['hour'],
+                        'minute' => (string) $dateGroupItem['minute'],
+                        'second' => (string) $dateGroupItem['second'],
+                    ],
+                    (string) $dateGroupItem['dateTimeGrouping']
+                )->setRuleType(Rule::AUTOFILTER_RULETYPE_DATEGROUP);
+            }
         }
     }
 
-    private function readCustomAutoFilter(SimpleXMLElement $filterColumn, Column $column): void
+    private function readCustomAutoFilter(?SimpleXMLElement $filterColumn, Column $column): void
     {
-        if ($filterColumn->customFilters) {
+        if (isset($filterColumn, $filterColumn->customFilters)) {
             $column->setFilterType(Column::AUTOFILTER_FILTERTYPE_CUSTOMFILTER);
             $customFilters = $filterColumn->customFilters;
+            $attributes = $customFilters->attributes();
             //    Custom filters can an AND or an OR join;
             //        and there should only ever be one or two entries
-            if ((isset($customFilters['and'])) && ($customFilters['and'] == 1)) {
+            if ((isset($attributes['and'])) && ((string) $attributes['and'] === '1')) {
                 $column->setJoin(Column::AUTOFILTER_COLUMN_JOIN_AND);
             }
             foreach ($customFilters->customFilter as $filterRule) {
+                $attr2 = $filterRule->attributes() ?? ['operator' => '', 'val' => ''];
                 $column->createRule()->setRule(
-                    (string) $filterRule['operator'],
-                    (string) $filterRule['val']
+                    (string) $attr2['operator'],
+                    (string) $attr2['val']
                 )->setRuleType(Rule::AUTOFILTER_RULETYPE_CUSTOMFILTER);
             }
         }
     }
 
-    private function readDynamicAutoFilter(SimpleXMLElement $filterColumn, Column $column): void
+    private function readDynamicAutoFilter(?SimpleXMLElement $filterColumn, Column $column): void
     {
-        if ($filterColumn->dynamicFilter) {
+        if (isset($filterColumn, $filterColumn->dynamicFilter)) {
             $column->setFilterType(Column::AUTOFILTER_FILTERTYPE_DYNAMICFILTER);
             //    We should only ever have one dynamic filter
             foreach ($filterColumn->dynamicFilter as $filterRule) {
                 //    Operator is undefined, but always treated as EQUAL
+                $attr2 = $filterRule->attributes() ?? [];
                 $column->createRule()->setRule(
-                    null,
-                    (string) $filterRule['val'],
-                    (string) $filterRule['type']
+                    '',
+                    (string) ($attr2['val'] ?? ''),
+                    (string) ($attr2['type'] ?? '')
                 )->setRuleType(Rule::AUTOFILTER_RULETYPE_DYNAMICFILTER);
-                if (isset($filterRule['val'])) {
-                    $column->setAttribute('val', (string) $filterRule['val']);
+                if (isset($attr2['val'])) {
+                    $column->setAttribute('val', (string) $attr2['val']);
                 }
-                if (isset($filterRule['maxVal'])) {
-                    $column->setAttribute('maxVal', (string) $filterRule['maxVal']);
+                if (isset($attr2['maxVal'])) {
+                    $column->setAttribute('maxVal', (string) $attr2['maxVal']);
                 }
             }
         }
     }
 
-    private function readTopTenAutoFilter(SimpleXMLElement $filterColumn, Column $column): void
+    private function readTopTenAutoFilter(?SimpleXMLElement $filterColumn, Column $column): void
     {
-        if ($filterColumn->top10) {
+        if (isset($filterColumn, $filterColumn->top10)) {
             $column->setFilterType(Column::AUTOFILTER_FILTERTYPE_TOPTENFILTER);
             //    We should only ever have one top10 filter
             foreach ($filterColumn->top10 as $filterRule) {
+                $attr2 = $filterRule->attributes() ?? [];
                 $column->createRule()->setRule(
-                    (((isset($filterRule['percent'])) && ($filterRule['percent'] == 1))
+                    (
+                        ((isset($attr2['percent'])) && ((string) $attr2['percent'] === '1'))
                         ? Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_PERCENT
                         : Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_BY_VALUE
                     ),
-                    (string) $filterRule['val'],
-                    (((isset($filterRule['top'])) && ($filterRule['top'] == 1))
+                    (string) ($attr2['val'] ?? ''),
+                    (
+                        ((isset($attr2['top'])) && ((string) $attr2['top'] === '1'))
                         ? Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP
                         : Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_BOTTOM
                     )
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/BaseParserClass.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/BaseParserClass.php
index 1679f01f9f..beea6bb596 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/BaseParserClass.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/BaseParserClass.php
@@ -2,18 +2,20 @@
 
 namespace PhpOffice\PhpSpreadsheet\Reader\Xlsx;
 
+use Stringable;
+
 class BaseParserClass
 {
-    protected static function boolean($value)
+    protected static function boolean(mixed $value): bool
     {
         if (is_object($value)) {
-            $value = (string) $value;
+            $value = ($value instanceof Stringable) ? ((string) $value) : 'true';
         }
 
         if (is_numeric($value)) {
             return (bool) $value;
         }
 
-        return $value === strtolower('true');
+        return $value === 'true' || $value === 'TRUE';
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Chart.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Chart.php
index c9fc2f66be..94d9c6af50 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Chart.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Chart.php
@@ -2,97 +2,235 @@
 
 namespace PhpOffice\PhpSpreadsheet\Reader\Xlsx;
 
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Chart\Axis;
+use PhpOffice\PhpSpreadsheet\Chart\AxisText;
+use PhpOffice\PhpSpreadsheet\Chart\ChartColor;
 use PhpOffice\PhpSpreadsheet\Chart\DataSeries;
 use PhpOffice\PhpSpreadsheet\Chart\DataSeriesValues;
+use PhpOffice\PhpSpreadsheet\Chart\GridLines;
 use PhpOffice\PhpSpreadsheet\Chart\Layout;
 use PhpOffice\PhpSpreadsheet\Chart\Legend;
 use PhpOffice\PhpSpreadsheet\Chart\PlotArea;
+use PhpOffice\PhpSpreadsheet\Chart\Properties as ChartProperties;
 use PhpOffice\PhpSpreadsheet\Chart\Title;
+use PhpOffice\PhpSpreadsheet\Chart\TrendLine;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
 use PhpOffice\PhpSpreadsheet\RichText\RichText;
-use PhpOffice\PhpSpreadsheet\Style\Color;
 use PhpOffice\PhpSpreadsheet\Style\Font;
 use SimpleXMLElement;
 
 class Chart
 {
-    /**
-     * @param string $name
-     * @param string $format
-     *
-     * @return null|bool|float|int|string
-     */
-    private static function getAttribute(SimpleXMLElement $component, $name, $format)
+    private string $cNamespace;
+
+    private string $aNamespace;
+
+    public function __construct(string $cNamespace = Namespaces::CHART, string $aNamespace = Namespaces::DRAWINGML)
+    {
+        $this->cNamespace = $cNamespace;
+        $this->aNamespace = $aNamespace;
+    }
+
+    private static function getAttributeString(SimpleXMLElement $component, string $name): string|null
     {
         $attributes = $component->attributes();
-        if (isset($attributes[$name])) {
-            if ($format == 'string') {
-                return (string) $attributes[$name];
-            } elseif ($format == 'integer') {
-                return (int) $attributes[$name];
-            } elseif ($format == 'boolean') {
-                return (bool) ($attributes[$name] === '0' || $attributes[$name] !== 'true') ? false : true;
-            }
+        if (@isset($attributes[$name])) {
+            return (string) $attributes[$name];
+        }
 
-            return (float) $attributes[$name];
+        return null;
+    }
+
+    private static function getAttributeInteger(SimpleXMLElement $component, string $name): int|null
+    {
+        $attributes = $component->attributes();
+        if (@isset($attributes[$name])) {
+            return (int) $attributes[$name];
         }
 
         return null;
     }
 
-    private static function readColor($color, $background = false)
+    private static function getAttributeBoolean(SimpleXMLElement $component, string $name): bool|null
     {
-        if (isset($color['rgb'])) {
-            return (string) $color['rgb'];
-        } elseif (isset($color['indexed'])) {
-            return Color::indexedColor($color['indexed'] - 7, $background)->getARGB();
+        $attributes = $component->attributes();
+        if (@isset($attributes[$name])) {
+            $value = (string) $attributes[$name];
+
+            return $value === 'true' || $value === '1';
         }
+
+        return null;
     }
 
-    /**
-     * @param string $chartName
-     *
-     * @return \PhpOffice\PhpSpreadsheet\Chart\Chart
-     */
-    public static function readChart(SimpleXMLElement $chartElements, $chartName)
+    private static function getAttributeFloat(SimpleXMLElement $component, string $name): float|null
     {
-        $namespacesChartMeta = $chartElements->getNamespaces(true);
-        $chartElementsC = $chartElements->children($namespacesChartMeta['c']);
+        $attributes = $component->attributes();
+        if (@isset($attributes[$name])) {
+            return (float) $attributes[$name];
+        }
+
+        return null;
+    }
+
+    public function readChart(SimpleXMLElement $chartElements, string $chartName): \PhpOffice\PhpSpreadsheet\Chart\Chart
+    {
+        $chartElementsC = $chartElements->children($this->cNamespace);
 
         $XaxisLabel = $YaxisLabel = $legend = $title = null;
-        $dispBlanksAs = $plotVisOnly = null;
+        $dispBlanksAs = null;
+        $plotVisOnly = false;
         $plotArea = null;
+        $rotX = $rotY = $rAngAx = $perspective = null;
+        $xAxis = new Axis();
+        $yAxis = new Axis();
+        $autoTitleDeleted = null;
+        $chartNoFill = false;
+        $chartBorderLines = null;
+        $chartFillColor = null;
+        $gradientArray = [];
+        $gradientLin = null;
+        $roundedCorners = false;
+        $gapWidth = null;
+        $useUpBars = null;
+        $useDownBars = null;
         foreach ($chartElementsC as $chartElementKey => $chartElement) {
             switch ($chartElementKey) {
+                case 'spPr':
+                    $children = $chartElementsC->spPr->children($this->aNamespace);
+                    if (isset($children->noFill)) {
+                        $chartNoFill = true;
+                    }
+                    if (isset($children->solidFill)) {
+                        $chartFillColor = $this->readColor($children->solidFill);
+                    }
+                    if (isset($children->ln)) {
+                        $chartBorderLines = new GridLines();
+                        $this->readLineStyle($chartElementsC, $chartBorderLines);
+                    }
+
+                    break;
+                case 'roundedCorners':
+                    /** @var bool $roundedCorners */
+                    $roundedCorners = self::getAttributeBoolean($chartElementsC->roundedCorners, 'val');
+
+                    break;
                 case 'chart':
                     foreach ($chartElement as $chartDetailsKey => $chartDetails) {
-                        $chartDetailsC = $chartDetails->children($namespacesChartMeta['c']);
+                        $chartDetails = Xlsx::testSimpleXml($chartDetails);
                         switch ($chartDetailsKey) {
+                            case 'autoTitleDeleted':
+                                /** @var bool $autoTitleDeleted */
+                                $autoTitleDeleted = self::getAttributeBoolean($chartElementsC->chart->autoTitleDeleted, 'val');
+
+                                break;
+                            case 'view3D':
+                                $rotX = self::getAttributeInteger($chartDetails->rotX, 'val');
+                                $rotY = self::getAttributeInteger($chartDetails->rotY, 'val');
+                                $rAngAx = self::getAttributeInteger($chartDetails->rAngAx, 'val');
+                                $perspective = self::getAttributeInteger($chartDetails->perspective, 'val');
+
+                                break;
                             case 'plotArea':
-                                $plotAreaLayout = $XaxisLable = $YaxisLable = null;
+                                $plotAreaLayout = $XaxisLabel = $YaxisLabel = null;
                                 $plotSeries = $plotAttributes = [];
+                                $catAxRead = false;
+                                $plotNoFill = false;
                                 foreach ($chartDetails as $chartDetailKey => $chartDetail) {
+                                    $chartDetail = Xlsx::testSimpleXml($chartDetail);
                                     switch ($chartDetailKey) {
+                                        case 'spPr':
+                                            $possibleNoFill = $chartDetails->spPr->children($this->aNamespace);
+                                            if (isset($possibleNoFill->noFill)) {
+                                                $plotNoFill = true;
+                                            }
+                                            if (isset($possibleNoFill->gradFill->gsLst)) {
+                                                foreach ($possibleNoFill->gradFill->gsLst->gs as $gradient) {
+                                                    $gradient = Xlsx::testSimpleXml($gradient);
+                                                    /** @var float $pos */
+                                                    $pos = self::getAttributeFloat($gradient, 'pos');
+                                                    $gradientArray[] = [
+                                                        $pos / ChartProperties::PERCENTAGE_MULTIPLIER,
+                                                        new ChartColor($this->readColor($gradient)),
+                                                    ];
+                                                }
+                                            }
+                                            if (isset($possibleNoFill->gradFill->lin)) {
+                                                $gradientLin = ChartProperties::XmlToAngle((string) self::getAttributeString($possibleNoFill->gradFill->lin, 'ang'));
+                                            }
+
+                                            break;
                                         case 'layout':
-                                            $plotAreaLayout = self::chartLayoutDetails($chartDetail, $namespacesChartMeta);
+                                            $plotAreaLayout = $this->chartLayoutDetails($chartDetail);
 
                                             break;
-                                        case 'catAx':
+                                        case Axis::AXIS_TYPE_CATEGORY:
+                                        case Axis::AXIS_TYPE_DATE:
+                                            $catAxRead = true;
                                             if (isset($chartDetail->title)) {
-                                                $XaxisLabel = self::chartTitle($chartDetail->title->children($namespacesChartMeta['c']), $namespacesChartMeta);
+                                                $XaxisLabel = $this->chartTitle($chartDetail->title->children($this->cNamespace));
+                                            }
+                                            $xAxis->setAxisType($chartDetailKey);
+                                            $this->readEffects($chartDetail, $xAxis);
+                                            $this->readLineStyle($chartDetail, $xAxis);
+                                            if (isset($chartDetail->spPr)) {
+                                                $sppr = $chartDetail->spPr->children($this->aNamespace);
+                                                if (isset($sppr->solidFill)) {
+                                                    $axisColorArray = $this->readColor($sppr->solidFill);
+                                                    $xAxis->setFillParameters($axisColorArray['value'], $axisColorArray['alpha'], $axisColorArray['type']);
+                                                }
+                                                if (isset($chartDetail->spPr->ln->noFill)) {
+                                                    $xAxis->setNoFill(true);
+                                                }
+                                            }
+                                            if (isset($chartDetail->majorGridlines)) {
+                                                $majorGridlines = new GridLines();
+                                                if (isset($chartDetail->majorGridlines->spPr)) {
+                                                    $this->readEffects($chartDetail->majorGridlines, $majorGridlines);
+                                                    $this->readLineStyle($chartDetail->majorGridlines, $majorGridlines);
+                                                }
+                                                $xAxis->setMajorGridlines($majorGridlines);
                                             }
+                                            if (isset($chartDetail->minorGridlines)) {
+                                                $minorGridlines = new GridLines();
+                                                $minorGridlines->activateObject();
+                                                if (isset($chartDetail->minorGridlines->spPr)) {
+                                                    $this->readEffects($chartDetail->minorGridlines, $minorGridlines);
+                                                    $this->readLineStyle($chartDetail->minorGridlines, $minorGridlines);
+                                                }
+                                                $xAxis->setMinorGridlines($minorGridlines);
+                                            }
+                                            $this->setAxisProperties($chartDetail, $xAxis);
 
                                             break;
-                                        case 'dateAx':
-                                            if (isset($chartDetail->title)) {
-                                                $XaxisLabel = self::chartTitle($chartDetail->title->children($namespacesChartMeta['c']), $namespacesChartMeta);
+                                        case Axis::AXIS_TYPE_VALUE:
+                                            $whichAxis = null;
+                                            $axPos = null;
+                                            if (isset($chartDetail->axPos)) {
+                                                $axPos = self::getAttributeString($chartDetail->axPos, 'val');
                                             }
+                                            if ($catAxRead) {
+                                                $whichAxis = $yAxis;
+                                                $yAxis->setAxisType($chartDetailKey);
+                                            } elseif (!empty($axPos)) {
+                                                switch ($axPos) {
+                                                    case 't':
+                                                    case 'b':
+                                                        $whichAxis = $xAxis;
+                                                        $xAxis->setAxisType($chartDetailKey);
 
-                                            break;
-                                        case 'valAx':
-                                            if (isset($chartDetail->title, $chartDetail->axPos)) {
-                                                $axisLabel = self::chartTitle($chartDetail->title->children($namespacesChartMeta['c']), $namespacesChartMeta);
-                                                $axPos = self::getAttribute($chartDetail->axPos, 'val', 'string');
+                                                        break;
+                                                    case 'r':
+                                                    case 'l':
+                                                        $whichAxis = $yAxis;
+                                                        $yAxis->setAxisType($chartDetailKey);
+
+                                                        break;
+                                                }
+                                            }
+                                            if (isset($chartDetail->title)) {
+                                                $axisLabel = $this->chartTitle($chartDetail->title->children($this->cNamespace));
 
                                                 switch ($axPos) {
                                                     case 't':
@@ -107,75 +245,116 @@ public static function readChart(SimpleXMLElement $chartElements, $chartName)
                                                         break;
                                                 }
                                             }
+                                            $this->readEffects($chartDetail, $whichAxis);
+                                            $this->readLineStyle($chartDetail, $whichAxis);
+                                            if ($whichAxis !== null && isset($chartDetail->spPr)) {
+                                                $sppr = $chartDetail->spPr->children($this->aNamespace);
+                                                if (isset($sppr->solidFill)) {
+                                                    $axisColorArray = $this->readColor($sppr->solidFill);
+                                                    $whichAxis->setFillParameters($axisColorArray['value'], $axisColorArray['alpha'], $axisColorArray['type']);
+                                                }
+                                                if (isset($sppr->ln->noFill)) {
+                                                    $whichAxis->setNoFill(true);
+                                                }
+                                            }
+                                            if ($whichAxis !== null && isset($chartDetail->majorGridlines)) {
+                                                $majorGridlines = new GridLines();
+                                                if (isset($chartDetail->majorGridlines->spPr)) {
+                                                    $this->readEffects($chartDetail->majorGridlines, $majorGridlines);
+                                                    $this->readLineStyle($chartDetail->majorGridlines, $majorGridlines);
+                                                }
+                                                $whichAxis->setMajorGridlines($majorGridlines);
+                                            }
+                                            if ($whichAxis !== null && isset($chartDetail->minorGridlines)) {
+                                                $minorGridlines = new GridLines();
+                                                $minorGridlines->activateObject();
+                                                if (isset($chartDetail->minorGridlines->spPr)) {
+                                                    $this->readEffects($chartDetail->minorGridlines, $minorGridlines);
+                                                    $this->readLineStyle($chartDetail->minorGridlines, $minorGridlines);
+                                                }
+                                                $whichAxis->setMinorGridlines($minorGridlines);
+                                            }
+                                            $this->setAxisProperties($chartDetail, $whichAxis);
 
                                             break;
                                         case 'barChart':
                                         case 'bar3DChart':
-                                            $barDirection = self::getAttribute($chartDetail->barDir, 'val', 'string');
-                                            $plotSer = self::chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
-                                            $plotSer->setPlotDirection($barDirection);
+                                            $barDirection = self::getAttributeString($chartDetail->barDir, 'val');
+                                            $plotSer = $this->chartDataSeries($chartDetail, $chartDetailKey);
+                                            $plotSer->setPlotDirection("$barDirection");
                                             $plotSeries[] = $plotSer;
-                                            $plotAttributes = self::readChartAttributes($chartDetail);
+                                            $plotAttributes = $this->readChartAttributes($chartDetail);
 
                                             break;
                                         case 'lineChart':
                                         case 'line3DChart':
-                                            $plotSeries[] = self::chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
-                                            $plotAttributes = self::readChartAttributes($chartDetail);
+                                            $plotSeries[] = $this->chartDataSeries($chartDetail, $chartDetailKey);
+                                            $plotAttributes = $this->readChartAttributes($chartDetail);
 
                                             break;
                                         case 'areaChart':
                                         case 'area3DChart':
-                                            $plotSeries[] = self::chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
-                                            $plotAttributes = self::readChartAttributes($chartDetail);
+                                            $plotSeries[] = $this->chartDataSeries($chartDetail, $chartDetailKey);
+                                            $plotAttributes = $this->readChartAttributes($chartDetail);
 
                                             break;
                                         case 'doughnutChart':
                                         case 'pieChart':
                                         case 'pie3DChart':
-                                            $explosion = isset($chartDetail->ser->explosion);
-                                            $plotSer = self::chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
-                                            $plotSer->setPlotStyle($explosion);
+                                            $explosion = self::getAttributeString($chartDetail->ser->explosion, 'val');
+                                            $plotSer = $this->chartDataSeries($chartDetail, $chartDetailKey);
+                                            $plotSer->setPlotStyle("$explosion");
                                             $plotSeries[] = $plotSer;
-                                            $plotAttributes = self::readChartAttributes($chartDetail);
+                                            $plotAttributes = $this->readChartAttributes($chartDetail);
 
                                             break;
                                         case 'scatterChart':
-                                            $scatterStyle = self::getAttribute($chartDetail->scatterStyle, 'val', 'string');
-                                            $plotSer = self::chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
+                                            /** @var string $scatterStyle */
+                                            $scatterStyle = self::getAttributeString($chartDetail->scatterStyle, 'val');
+                                            $plotSer = $this->chartDataSeries($chartDetail, $chartDetailKey);
                                             $plotSer->setPlotStyle($scatterStyle);
                                             $plotSeries[] = $plotSer;
-                                            $plotAttributes = self::readChartAttributes($chartDetail);
+                                            $plotAttributes = $this->readChartAttributes($chartDetail);
 
                                             break;
                                         case 'bubbleChart':
-                                            $bubbleScale = self::getAttribute($chartDetail->bubbleScale, 'val', 'integer');
-                                            $plotSer = self::chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
-                                            $plotSer->setPlotStyle($bubbleScale);
+                                            $bubbleScale = self::getAttributeInteger($chartDetail->bubbleScale, 'val');
+                                            $plotSer = $this->chartDataSeries($chartDetail, $chartDetailKey);
+                                            $plotSer->setPlotStyle("$bubbleScale");
                                             $plotSeries[] = $plotSer;
-                                            $plotAttributes = self::readChartAttributes($chartDetail);
+                                            $plotAttributes = $this->readChartAttributes($chartDetail);
 
                                             break;
                                         case 'radarChart':
-                                            $radarStyle = self::getAttribute($chartDetail->radarStyle, 'val', 'string');
-                                            $plotSer = self::chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
+                                            /** @var string $radarStyle */
+                                            $radarStyle = self::getAttributeString($chartDetail->radarStyle, 'val');
+                                            $plotSer = $this->chartDataSeries($chartDetail, $chartDetailKey);
                                             $plotSer->setPlotStyle($radarStyle);
                                             $plotSeries[] = $plotSer;
-                                            $plotAttributes = self::readChartAttributes($chartDetail);
+                                            $plotAttributes = $this->readChartAttributes($chartDetail);
 
                                             break;
                                         case 'surfaceChart':
                                         case 'surface3DChart':
-                                            $wireFrame = self::getAttribute($chartDetail->wireframe, 'val', 'boolean');
-                                            $plotSer = self::chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
-                                            $plotSer->setPlotStyle($wireFrame);
+                                            $wireFrame = self::getAttributeBoolean($chartDetail->wireframe, 'val');
+                                            $plotSer = $this->chartDataSeries($chartDetail, $chartDetailKey);
+                                            $plotSer->setPlotStyle("$wireFrame");
                                             $plotSeries[] = $plotSer;
-                                            $plotAttributes = self::readChartAttributes($chartDetail);
+                                            $plotAttributes = $this->readChartAttributes($chartDetail);
 
                                             break;
                                         case 'stockChart':
-                                            $plotSeries[] = self::chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
-                                            $plotAttributes = self::readChartAttributes($plotAreaLayout);
+                                            $plotSeries[] = $this->chartDataSeries($chartDetail, $chartDetailKey);
+                                            if (isset($chartDetail->upDownBars->gapWidth)) {
+                                                $gapWidth = self::getAttributeInteger($chartDetail->upDownBars->gapWidth, 'val');
+                                            }
+                                            if (isset($chartDetail->upDownBars->upBars)) {
+                                                $useUpBars = true;
+                                            }
+                                            if (isset($chartDetail->upDownBars->downBars)) {
+                                                $useDownBars = true;
+                                            }
+                                            $plotAttributes = $this->readChartAttributes($chartDetail);
 
                                             break;
                                     }
@@ -184,168 +363,497 @@ public static function readChart(SimpleXMLElement $chartElements, $chartName)
                                     $plotAreaLayout = new Layout();
                                 }
                                 $plotArea = new PlotArea($plotAreaLayout, $plotSeries);
-                                self::setChartAttributes($plotAreaLayout, $plotAttributes);
+                                $this->setChartAttributes($plotAreaLayout, $plotAttributes);
+                                if ($plotNoFill) {
+                                    $plotArea->setNoFill(true);
+                                }
+                                if (!empty($gradientArray)) {
+                                    $plotArea->setGradientFillProperties($gradientArray, $gradientLin);
+                                }
+                                if (is_int($gapWidth)) {
+                                    $plotArea->setGapWidth($gapWidth);
+                                }
+                                if ($useUpBars === true) {
+                                    $plotArea->setUseUpBars(true);
+                                }
+                                if ($useDownBars === true) {
+                                    $plotArea->setUseDownBars(true);
+                                }
 
                                 break;
                             case 'plotVisOnly':
-                                $plotVisOnly = self::getAttribute($chartDetails, 'val', 'string');
+                                $plotVisOnly = (bool) self::getAttributeString($chartDetails, 'val');
 
                                 break;
                             case 'dispBlanksAs':
-                                $dispBlanksAs = self::getAttribute($chartDetails, 'val', 'string');
+                                $dispBlanksAs = self::getAttributeString($chartDetails, 'val');
 
                                 break;
                             case 'title':
-                                $title = self::chartTitle($chartDetails, $namespacesChartMeta);
+                                $title = $this->chartTitle($chartDetails);
 
                                 break;
                             case 'legend':
                                 $legendPos = 'r';
                                 $legendLayout = null;
                                 $legendOverlay = false;
+                                $legendBorderLines = null;
+                                $legendFillColor = null;
+                                $legendText = null;
+                                $addLegendText = false;
                                 foreach ($chartDetails as $chartDetailKey => $chartDetail) {
+                                    $chartDetail = Xlsx::testSimpleXml($chartDetail);
                                     switch ($chartDetailKey) {
                                         case 'legendPos':
-                                            $legendPos = self::getAttribute($chartDetail, 'val', 'string');
+                                            $legendPos = self::getAttributeString($chartDetail, 'val');
 
                                             break;
                                         case 'overlay':
-                                            $legendOverlay = self::getAttribute($chartDetail, 'val', 'boolean');
+                                            $legendOverlay = self::getAttributeBoolean($chartDetail, 'val');
 
                                             break;
                                         case 'layout':
-                                            $legendLayout = self::chartLayoutDetails($chartDetail, $namespacesChartMeta);
+                                            $legendLayout = $this->chartLayoutDetails($chartDetail);
+
+                                            break;
+                                        case 'spPr':
+                                            $children = $chartDetails->spPr->children($this->aNamespace);
+                                            if (isset($children->solidFill)) {
+                                                $legendFillColor = $this->readColor($children->solidFill);
+                                            }
+                                            if (isset($children->ln)) {
+                                                $legendBorderLines = new GridLines();
+                                                $this->readLineStyle($chartDetails, $legendBorderLines);
+                                            }
+
+                                            break;
+                                        case 'txPr':
+                                            $children = $chartDetails->txPr->children($this->aNamespace);
+                                            $addLegendText = false;
+                                            $legendText = new AxisText();
+                                            if (isset($children->p->pPr->defRPr->solidFill)) {
+                                                $colorArray = $this->readColor($children->p->pPr->defRPr->solidFill);
+                                                $legendText->getFillColorObject()->setColorPropertiesArray($colorArray);
+                                                $addLegendText = true;
+                                            }
+                                            if (isset($children->p->pPr->defRPr->effectLst)) {
+                                                $this->readEffects($children->p->pPr->defRPr, $legendText, false);
+                                                $addLegendText = true;
+                                            }
 
                                             break;
                                     }
                                 }
-                                $legend = new Legend($legendPos, $legendLayout, $legendOverlay);
+                                $legend = new Legend("$legendPos", $legendLayout, (bool) $legendOverlay);
+                                if ($legendFillColor !== null) {
+                                    $legend->getFillColor()->setColorPropertiesArray($legendFillColor);
+                                }
+                                if ($legendBorderLines !== null) {
+                                    $legend->setBorderLines($legendBorderLines);
+                                }
+                                if ($addLegendText) {
+                                    $legend->setLegendText($legendText);
+                                }
 
                                 break;
                         }
                     }
             }
         }
-        $chart = new \PhpOffice\PhpSpreadsheet\Chart\Chart($chartName, $title, $legend, $plotArea, $plotVisOnly, $dispBlanksAs, $XaxisLabel, $YaxisLabel);
+        $chart = new \PhpOffice\PhpSpreadsheet\Chart\Chart($chartName, $title, $legend, $plotArea, $plotVisOnly, (string) $dispBlanksAs, $XaxisLabel, $YaxisLabel, $xAxis, $yAxis);
+        if ($chartNoFill) {
+            $chart->setNoFill(true);
+        }
+        if ($chartFillColor !== null) {
+            $chart->getFillColor()->setColorPropertiesArray($chartFillColor);
+        }
+        if ($chartBorderLines !== null) {
+            $chart->setBorderLines($chartBorderLines);
+        }
+        $chart->setRoundedCorners($roundedCorners);
+        if (is_bool($autoTitleDeleted)) {
+            $chart->setAutoTitleDeleted($autoTitleDeleted);
+        }
+        if (is_int($rotX)) {
+            $chart->setRotX($rotX);
+        }
+        if (is_int($rotY)) {
+            $chart->setRotY($rotY);
+        }
+        if (is_int($rAngAx)) {
+            $chart->setRAngAx($rAngAx);
+        }
+        if (is_int($perspective)) {
+            $chart->setPerspective($perspective);
+        }
 
         return $chart;
     }
 
-    private static function chartTitle(SimpleXMLElement $titleDetails, array $namespacesChartMeta)
+    private function chartTitle(SimpleXMLElement $titleDetails): Title
     {
-        $caption = [];
+        $caption = '';
         $titleLayout = null;
+        $titleOverlay = false;
+        $titleFormula = null;
+        $titleFont = null;
         foreach ($titleDetails as $titleDetailKey => $chartDetail) {
+            $chartDetail = Xlsx::testSimpleXml($chartDetail);
             switch ($titleDetailKey) {
                 case 'tx':
-                    $titleDetails = $chartDetail->rich->children($namespacesChartMeta['a']);
-                    foreach ($titleDetails as $titleKey => $titleDetail) {
-                        switch ($titleKey) {
-                            case 'p':
-                                $titleDetailPart = $titleDetail->children($namespacesChartMeta['a']);
-                                $caption[] = self::parseRichText($titleDetailPart);
+                    $caption = [];
+                    if (isset($chartDetail->rich)) {
+                        $titleDetails = $chartDetail->rich->children($this->aNamespace);
+                        foreach ($titleDetails as $titleKey => $titleDetail) {
+                            $titleDetail = Xlsx::testSimpleXml($titleDetail);
+                            switch ($titleKey) {
+                                case 'p':
+                                    $titleDetailPart = $titleDetail->children($this->aNamespace);
+                                    $caption[] = $this->parseRichText($titleDetailPart);
+                            }
+                        }
+                    } elseif (isset($chartDetail->strRef->strCache)) {
+                        foreach ($chartDetail->strRef->strCache->pt as $pt) {
+                            if (isset($pt->v)) {
+                                $caption[] = (string) $pt->v;
+                            }
+                        }
+                        if (isset($chartDetail->strRef->f)) {
+                            $titleFormula = (string) $chartDetail->strRef->f;
                         }
                     }
 
+                    break;
+                case 'overlay':
+                    $titleOverlay = self::getAttributeBoolean($chartDetail, 'val');
+
                     break;
                 case 'layout':
-                    $titleLayout = self::chartLayoutDetails($chartDetail, $namespacesChartMeta);
+                    $titleLayout = $this->chartLayoutDetails($chartDetail);
+
+                    break;
+                case 'txPr':
+                    if (isset($chartDetail->children($this->aNamespace)->p)) {
+                        $titleFont = $this->parseFont($chartDetail->children($this->aNamespace)->p);
+                    }
 
                     break;
             }
         }
+        $title = new Title($caption, $titleLayout, (bool) $titleOverlay);
+        if (!empty($titleFormula)) {
+            $title->setCellReference($titleFormula);
+        }
+        if ($titleFont !== null) {
+            $title->setFont($titleFont);
+        }
 
-        return new Title($caption, $titleLayout);
+        return $title;
     }
 
-    private static function chartLayoutDetails($chartDetail, $namespacesChartMeta)
+    private function chartLayoutDetails(SimpleXMLElement $chartDetail): ?Layout
     {
         if (!isset($chartDetail->manualLayout)) {
             return null;
         }
-        $details = $chartDetail->manualLayout->children($namespacesChartMeta['c']);
+        $details = $chartDetail->manualLayout->children($this->cNamespace);
         if ($details === null) {
             return null;
         }
         $layout = [];
         foreach ($details as $detailKey => $detail) {
-            $layout[$detailKey] = self::getAttribute($detail, 'val', 'string');
+            $detail = Xlsx::testSimpleXml($detail);
+            $layout[$detailKey] = self::getAttributeString($detail, 'val');
         }
 
         return new Layout($layout);
     }
 
-    private static function chartDataSeries($chartDetail, $namespacesChartMeta, $plotType)
+    private function chartDataSeries(SimpleXMLElement $chartDetail, string $plotType): DataSeries
     {
         $multiSeriesType = null;
         $smoothLine = false;
-        $seriesLabel = $seriesCategory = $seriesValues = $plotOrder = [];
+        $seriesLabel = $seriesCategory = $seriesValues = $plotOrder = $seriesBubbles = [];
+        $plotDirection = null;
 
-        $seriesDetailSet = $chartDetail->children($namespacesChartMeta['c']);
+        $seriesDetailSet = $chartDetail->children($this->cNamespace);
         foreach ($seriesDetailSet as $seriesDetailKey => $seriesDetails) {
             switch ($seriesDetailKey) {
                 case 'grouping':
-                    $multiSeriesType = self::getAttribute($chartDetail->grouping, 'val', 'string');
+                    $multiSeriesType = self::getAttributeString($chartDetail->grouping, 'val');
 
                     break;
                 case 'ser':
                     $marker = null;
                     $seriesIndex = '';
+                    $fillColor = null;
+                    $pointSize = null;
+                    $noFill = false;
+                    $bubble3D = false;
+                    $dptColors = [];
+                    $markerFillColor = null;
+                    $markerBorderColor = null;
+                    $lineStyle = null;
+                    $labelLayout = null;
+                    $trendLines = [];
                     foreach ($seriesDetails as $seriesKey => $seriesDetail) {
+                        $seriesDetail = Xlsx::testSimpleXml($seriesDetail);
                         switch ($seriesKey) {
                             case 'idx':
-                                $seriesIndex = self::getAttribute($seriesDetail, 'val', 'integer');
+                                $seriesIndex = self::getAttributeInteger($seriesDetail, 'val');
 
                                 break;
                             case 'order':
-                                $seriesOrder = self::getAttribute($seriesDetail, 'val', 'integer');
-                                $plotOrder[$seriesIndex] = $seriesOrder;
+                                $seriesOrder = self::getAttributeInteger($seriesDetail, 'val');
+                                if ($seriesOrder !== null) {
+                                    $plotOrder[$seriesIndex] = $seriesOrder;
+                                }
 
                                 break;
                             case 'tx':
-                                $seriesLabel[$seriesIndex] = self::chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta);
+                                $temp = $this->chartDataSeriesValueSet($seriesDetail);
+                                if ($temp !== null) {
+                                    $seriesLabel[$seriesIndex] = $temp;
+                                }
+
+                                break;
+                            case 'spPr':
+                                $children = $seriesDetail->children($this->aNamespace);
+                                if (isset($children->ln)) {
+                                    $ln = $children->ln;
+                                    if (is_countable($ln->noFill) && count($ln->noFill) === 1) {
+                                        $noFill = true;
+                                    }
+                                    $lineStyle = new GridLines();
+                                    $this->readLineStyle($seriesDetails, $lineStyle);
+                                }
+                                if (isset($children->effectLst)) {
+                                    if ($lineStyle === null) {
+                                        $lineStyle = new GridLines();
+                                    }
+                                    $this->readEffects($seriesDetails, $lineStyle);
+                                }
+                                if (isset($children->solidFill)) {
+                                    $fillColor = new ChartColor($this->readColor($children->solidFill));
+                                }
+
+                                break;
+                            case 'dPt':
+                                $dptIdx = (int) self::getAttributeString($seriesDetail->idx, 'val');
+                                if (isset($seriesDetail->spPr)) {
+                                    $children = $seriesDetail->spPr->children($this->aNamespace);
+                                    if (isset($children->solidFill)) {
+                                        $arrayColors = $this->readColor($children->solidFill);
+                                        $dptColors[$dptIdx] = new ChartColor($arrayColors);
+                                    }
+                                }
+
+                                break;
+                            case 'trendline':
+                                $trendLine = new TrendLine();
+                                $this->readLineStyle($seriesDetail, $trendLine);
+                                $trendLineType = self::getAttributeString($seriesDetail->trendlineType, 'val');
+                                $dispRSqr = self::getAttributeBoolean($seriesDetail->dispRSqr, 'val');
+                                $dispEq = self::getAttributeBoolean($seriesDetail->dispEq, 'val');
+                                $order = self::getAttributeInteger($seriesDetail->order, 'val');
+                                $period = self::getAttributeInteger($seriesDetail->period, 'val');
+                                $forward = self::getAttributeFloat($seriesDetail->forward, 'val');
+                                $backward = self::getAttributeFloat($seriesDetail->backward, 'val');
+                                $intercept = self::getAttributeFloat($seriesDetail->intercept, 'val');
+                                $name = (string) $seriesDetail->name;
+                                $trendLine->setTrendLineProperties(
+                                    $trendLineType,
+                                    $order,
+                                    $period,
+                                    $dispRSqr,
+                                    $dispEq,
+                                    $backward,
+                                    $forward,
+                                    $intercept,
+                                    $name
+                                );
+                                $trendLines[] = $trendLine;
 
                                 break;
                             case 'marker':
-                                $marker = self::getAttribute($seriesDetail->symbol, 'val', 'string');
+                                $marker = self::getAttributeString($seriesDetail->symbol, 'val');
+                                $pointSize = self::getAttributeString($seriesDetail->size, 'val');
+                                $pointSize = is_numeric($pointSize) ? ((int) $pointSize) : null;
+                                if (isset($seriesDetail->spPr)) {
+                                    $children = $seriesDetail->spPr->children($this->aNamespace);
+                                    if (isset($children->solidFill)) {
+                                        $markerFillColor = $this->readColor($children->solidFill);
+                                    }
+                                    if (isset($children->ln->solidFill)) {
+                                        $markerBorderColor = $this->readColor($children->ln->solidFill);
+                                    }
+                                }
 
                                 break;
                             case 'smooth':
-                                $smoothLine = self::getAttribute($seriesDetail, 'val', 'boolean');
+                                $smoothLine = self::getAttributeBoolean($seriesDetail, 'val') ?? false;
 
                                 break;
                             case 'cat':
-                                $seriesCategory[$seriesIndex] = self::chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta);
+                                $temp = $this->chartDataSeriesValueSet($seriesDetail);
+                                if ($temp !== null) {
+                                    $seriesCategory[$seriesIndex] = $temp;
+                                }
 
                                 break;
                             case 'val':
-                                $seriesValues[$seriesIndex] = self::chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta, $marker);
+                                $temp = $this->chartDataSeriesValueSet($seriesDetail, "$marker", $fillColor, "$pointSize");
+                                if ($temp !== null) {
+                                    $seriesValues[$seriesIndex] = $temp;
+                                }
 
                                 break;
                             case 'xVal':
-                                $seriesCategory[$seriesIndex] = self::chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta, $marker);
+                                $temp = $this->chartDataSeriesValueSet($seriesDetail, "$marker", $fillColor, "$pointSize");
+                                if ($temp !== null) {
+                                    $seriesCategory[$seriesIndex] = $temp;
+                                }
 
                                 break;
                             case 'yVal':
-                                $seriesValues[$seriesIndex] = self::chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta, $marker);
+                                $temp = $this->chartDataSeriesValueSet($seriesDetail, "$marker", $fillColor, "$pointSize");
+                                if ($temp !== null) {
+                                    $seriesValues[$seriesIndex] = $temp;
+                                }
+
+                                break;
+                            case 'bubbleSize':
+                                $seriesBubble = $this->chartDataSeriesValueSet($seriesDetail, "$marker", $fillColor, "$pointSize");
+                                if ($seriesBubble !== null) {
+                                    $seriesBubbles[$seriesIndex] = $seriesBubble;
+                                }
 
                                 break;
+                            case 'bubble3D':
+                                $bubble3D = self::getAttributeBoolean($seriesDetail, 'val');
+
+                                break;
+                            case 'dLbls':
+                                $labelLayout = new Layout($this->readChartAttributes($seriesDetails));
+
+                                break;
+                        }
+                    }
+                    if ($labelLayout) {
+                        if (isset($seriesLabel[$seriesIndex])) {
+                            $seriesLabel[$seriesIndex]->setLabelLayout($labelLayout);
+                        }
+                        if (isset($seriesCategory[$seriesIndex])) {
+                            $seriesCategory[$seriesIndex]->setLabelLayout($labelLayout);
+                        }
+                        if (isset($seriesValues[$seriesIndex])) {
+                            $seriesValues[$seriesIndex]->setLabelLayout($labelLayout);
+                        }
+                    }
+                    if ($noFill) {
+                        if (isset($seriesLabel[$seriesIndex])) {
+                            $seriesLabel[$seriesIndex]->setScatterLines(false);
+                        }
+                        if (isset($seriesCategory[$seriesIndex])) {
+                            $seriesCategory[$seriesIndex]->setScatterLines(false);
+                        }
+                        if (isset($seriesValues[$seriesIndex])) {
+                            $seriesValues[$seriesIndex]->setScatterLines(false);
+                        }
+                    }
+                    if ($lineStyle !== null) {
+                        if (isset($seriesLabel[$seriesIndex])) {
+                            $seriesLabel[$seriesIndex]->copyLineStyles($lineStyle);
+                        }
+                        if (isset($seriesCategory[$seriesIndex])) {
+                            $seriesCategory[$seriesIndex]->copyLineStyles($lineStyle);
+                        }
+                        if (isset($seriesValues[$seriesIndex])) {
+                            $seriesValues[$seriesIndex]->copyLineStyles($lineStyle);
+                        }
+                    }
+                    if ($bubble3D) {
+                        if (isset($seriesLabel[$seriesIndex])) {
+                            $seriesLabel[$seriesIndex]->setBubble3D($bubble3D);
+                        }
+                        if (isset($seriesCategory[$seriesIndex])) {
+                            $seriesCategory[$seriesIndex]->setBubble3D($bubble3D);
+                        }
+                        if (isset($seriesValues[$seriesIndex])) {
+                            $seriesValues[$seriesIndex]->setBubble3D($bubble3D);
+                        }
+                    }
+                    if (!empty($dptColors)) {
+                        if (isset($seriesLabel[$seriesIndex])) {
+                            $seriesLabel[$seriesIndex]->setFillColor($dptColors);
+                        }
+                        if (isset($seriesCategory[$seriesIndex])) {
+                            $seriesCategory[$seriesIndex]->setFillColor($dptColors);
+                        }
+                        if (isset($seriesValues[$seriesIndex])) {
+                            $seriesValues[$seriesIndex]->setFillColor($dptColors);
+                        }
+                    }
+                    if ($markerFillColor !== null) {
+                        if (isset($seriesLabel[$seriesIndex])) {
+                            $seriesLabel[$seriesIndex]->getMarkerFillColor()->setColorPropertiesArray($markerFillColor);
+                        }
+                        if (isset($seriesCategory[$seriesIndex])) {
+                            $seriesCategory[$seriesIndex]->getMarkerFillColor()->setColorPropertiesArray($markerFillColor);
+                        }
+                        if (isset($seriesValues[$seriesIndex])) {
+                            $seriesValues[$seriesIndex]->getMarkerFillColor()->setColorPropertiesArray($markerFillColor);
+                        }
+                    }
+                    if ($markerBorderColor !== null) {
+                        if (isset($seriesLabel[$seriesIndex])) {
+                            $seriesLabel[$seriesIndex]->getMarkerBorderColor()->setColorPropertiesArray($markerBorderColor);
+                        }
+                        if (isset($seriesCategory[$seriesIndex])) {
+                            $seriesCategory[$seriesIndex]->getMarkerBorderColor()->setColorPropertiesArray($markerBorderColor);
+                        }
+                        if (isset($seriesValues[$seriesIndex])) {
+                            $seriesValues[$seriesIndex]->getMarkerBorderColor()->setColorPropertiesArray($markerBorderColor);
+                        }
+                    }
+                    if ($smoothLine) {
+                        if (isset($seriesLabel[$seriesIndex])) {
+                            $seriesLabel[$seriesIndex]->setSmoothLine(true);
+                        }
+                        if (isset($seriesCategory[$seriesIndex])) {
+                            $seriesCategory[$seriesIndex]->setSmoothLine(true);
+                        }
+                        if (isset($seriesValues[$seriesIndex])) {
+                            $seriesValues[$seriesIndex]->setSmoothLine(true);
+                        }
+                    }
+                    if (!empty($trendLines)) {
+                        if (isset($seriesLabel[$seriesIndex])) {
+                            $seriesLabel[$seriesIndex]->setTrendLines($trendLines);
+                        }
+                        if (isset($seriesCategory[$seriesIndex])) {
+                            $seriesCategory[$seriesIndex]->setTrendLines($trendLines);
+                        }
+                        if (isset($seriesValues[$seriesIndex])) {
+                            $seriesValues[$seriesIndex]->setTrendLines($trendLines);
                         }
                     }
             }
         }
+        $series = new DataSeries($plotType, $multiSeriesType, $plotOrder, $seriesLabel, $seriesCategory, $seriesValues, $plotDirection, $smoothLine);
+        $series->setPlotBubbleSizes($seriesBubbles);
 
-        return new DataSeries($plotType, $multiSeriesType, $plotOrder, $seriesLabel, $seriesCategory, $seriesValues, $smoothLine);
+        return $series;
     }
 
-    private static function chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta, $marker = null)
+    private function chartDataSeriesValueSet(SimpleXMLElement $seriesDetail, ?string $marker = null, ?ChartColor $fillColor = null, ?string $pointSize = null): ?DataSeriesValues
     {
         if (isset($seriesDetail->strRef)) {
             $seriesSource = (string) $seriesDetail->strRef->f;
-            $seriesValues = new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_STRING, $seriesSource, null, null, null, $marker);
+            $seriesValues = new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_STRING, $seriesSource, null, 0, null, $marker, $fillColor, "$pointSize");
 
             if (isset($seriesDetail->strRef->strCache)) {
-                $seriesData = self::chartDataSeriesValues($seriesDetail->strRef->strCache->children($namespacesChartMeta['c']), 's');
+                $seriesData = $this->chartDataSeriesValues($seriesDetail->strRef->strCache->children($this->cNamespace), 's');
                 $seriesValues
                     ->setFormatCode($seriesData['formatCode'])
                     ->setDataValues($seriesData['dataValues']);
@@ -354,9 +862,9 @@ private static function chartDataSeriesValueSet($seriesDetail, $namespacesChartM
             return $seriesValues;
         } elseif (isset($seriesDetail->numRef)) {
             $seriesSource = (string) $seriesDetail->numRef->f;
-            $seriesValues = new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_NUMBER, $seriesSource, null, null, null, $marker);
+            $seriesValues = new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_NUMBER, $seriesSource, null, 0, null, $marker, $fillColor, "$pointSize");
             if (isset($seriesDetail->numRef->numCache)) {
-                $seriesData = self::chartDataSeriesValues($seriesDetail->numRef->numCache->children($namespacesChartMeta['c']));
+                $seriesData = $this->chartDataSeriesValues($seriesDetail->numRef->numCache->children($this->cNamespace));
                 $seriesValues
                     ->setFormatCode($seriesData['formatCode'])
                     ->setDataValues($seriesData['dataValues']);
@@ -365,10 +873,10 @@ private static function chartDataSeriesValueSet($seriesDetail, $namespacesChartM
             return $seriesValues;
         } elseif (isset($seriesDetail->multiLvlStrRef)) {
             $seriesSource = (string) $seriesDetail->multiLvlStrRef->f;
-            $seriesValues = new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_STRING, $seriesSource, null, null, null, $marker);
+            $seriesValues = new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_STRING, $seriesSource, null, 0, null, $marker, $fillColor, "$pointSize");
 
             if (isset($seriesDetail->multiLvlStrRef->multiLvlStrCache)) {
-                $seriesData = self::chartDataSeriesValuesMultiLevel($seriesDetail->multiLvlStrRef->multiLvlStrCache->children($namespacesChartMeta['c']), 's');
+                $seriesData = $this->chartDataSeriesValuesMultiLevel($seriesDetail->multiLvlStrRef->multiLvlStrCache->children($this->cNamespace), 's');
                 $seriesValues
                     ->setFormatCode($seriesData['formatCode'])
                     ->setDataValues($seriesData['dataValues']);
@@ -377,10 +885,10 @@ private static function chartDataSeriesValueSet($seriesDetail, $namespacesChartM
             return $seriesValues;
         } elseif (isset($seriesDetail->multiLvlNumRef)) {
             $seriesSource = (string) $seriesDetail->multiLvlNumRef->f;
-            $seriesValues = new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_STRING, $seriesSource, null, null, null, $marker);
+            $seriesValues = new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_STRING, $seriesSource, null, 0, null, $marker, $fillColor, "$pointSize");
 
             if (isset($seriesDetail->multiLvlNumRef->multiLvlNumCache)) {
-                $seriesData = self::chartDataSeriesValuesMultiLevel($seriesDetail->multiLvlNumRef->multiLvlNumCache->children($namespacesChartMeta['c']), 's');
+                $seriesData = $this->chartDataSeriesValuesMultiLevel($seriesDetail->multiLvlNumRef->multiLvlNumCache->children($this->cNamespace), 's');
                 $seriesValues
                     ->setFormatCode($seriesData['formatCode'])
                     ->setDataValues($seriesData['dataValues']);
@@ -389,19 +897,30 @@ private static function chartDataSeriesValueSet($seriesDetail, $namespacesChartM
             return $seriesValues;
         }
 
+        if (isset($seriesDetail->v)) {
+            return new DataSeriesValues(
+                DataSeriesValues::DATASERIES_TYPE_STRING,
+                null,
+                null,
+                1,
+                [(string) $seriesDetail->v]
+            );
+        }
+
         return null;
     }
 
-    private static function chartDataSeriesValues($seriesValueSet, $dataType = 'n')
+    private function chartDataSeriesValues(SimpleXMLElement $seriesValueSet, string $dataType = 'n'): array
     {
         $seriesVal = [];
         $formatCode = '';
         $pointCount = 0;
 
         foreach ($seriesValueSet as $seriesValueIdx => $seriesValue) {
+            $seriesValue = Xlsx::testSimpleXml($seriesValue);
             switch ($seriesValueIdx) {
                 case 'ptCount':
-                    $pointCount = self::getAttribute($seriesValue, 'val', 'integer');
+                    $pointCount = self::getAttributeInteger($seriesValue, 'val');
 
                     break;
                 case 'formatCode':
@@ -409,10 +928,10 @@ private static function chartDataSeriesValues($seriesValueSet, $dataType = 'n')
 
                     break;
                 case 'pt':
-                    $pointVal = self::getAttribute($seriesValue, 'idx', 'integer');
+                    $pointVal = self::getAttributeInteger($seriesValue, 'idx');
                     if ($dataType == 's') {
                         $seriesVal[$pointVal] = (string) $seriesValue->v;
-                    } elseif ($seriesValue->v === Functions::NA()) {
+                    } elseif ((string) $seriesValue->v === ExcelError::NA()) {
                         $seriesVal[$pointVal] = null;
                     } else {
                         $seriesVal[$pointVal] = (float) $seriesValue->v;
@@ -429,7 +948,7 @@ private static function chartDataSeriesValues($seriesValueSet, $dataType = 'n')
         ];
     }
 
-    private static function chartDataSeriesValuesMultiLevel($seriesValueSet, $dataType = 'n')
+    private function chartDataSeriesValuesMultiLevel(SimpleXMLElement $seriesValueSet, string $dataType = 'n'): array
     {
         $seriesVal = [];
         $formatCode = '';
@@ -437,9 +956,10 @@ private static function chartDataSeriesValuesMultiLevel($seriesValueSet, $dataTy
 
         foreach ($seriesValueSet->lvl as $seriesLevelIdx => $seriesLevel) {
             foreach ($seriesLevel as $seriesValueIdx => $seriesValue) {
+                $seriesValue = Xlsx::testSimpleXml($seriesValue);
                 switch ($seriesValueIdx) {
                     case 'ptCount':
-                        $pointCount = self::getAttribute($seriesValue, 'val', 'integer');
+                        $pointCount = self::getAttributeInteger($seriesValue, 'val');
 
                         break;
                     case 'formatCode':
@@ -447,10 +967,10 @@ private static function chartDataSeriesValuesMultiLevel($seriesValueSet, $dataTy
 
                         break;
                     case 'pt':
-                        $pointVal = self::getAttribute($seriesValue, 'idx', 'integer');
+                        $pointVal = self::getAttributeInteger($seriesValue, 'idx');
                         if ($dataType == 's') {
                             $seriesVal[$pointVal][] = (string) $seriesValue->v;
-                        } elseif ($seriesValue->v === Functions::NA()) {
+                        } elseif ((string) $seriesValue->v === ExcelError::NA()) {
                             $seriesVal[$pointVal] = null;
                         } else {
                             $seriesVal[$pointVal][] = (float) $seriesValue->v;
@@ -468,107 +988,288 @@ private static function chartDataSeriesValuesMultiLevel($seriesValueSet, $dataTy
         ];
     }
 
-    private static function parseRichText(SimpleXMLElement $titleDetailPart)
+    private function parseRichText(SimpleXMLElement $titleDetailPart): RichText
     {
         $value = new RichText();
-        $objText = null;
+        $defaultFontSize = null;
+        $defaultBold = null;
+        $defaultItalic = null;
+        $defaultUnderscore = null;
+        $defaultStrikethrough = null;
+        $defaultBaseline = null;
+        $defaultFontName = null;
+        $defaultLatin = null;
+        $defaultEastAsian = null;
+        $defaultComplexScript = null;
+        $defaultFontColor = null;
+        if (isset($titleDetailPart->pPr->defRPr)) {
+            $defaultFontSize = self::getAttributeInteger($titleDetailPart->pPr->defRPr, 'sz');
+            $defaultBold = self::getAttributeBoolean($titleDetailPart->pPr->defRPr, 'b');
+            $defaultItalic = self::getAttributeBoolean($titleDetailPart->pPr->defRPr, 'i');
+            $defaultUnderscore = self::getAttributeString($titleDetailPart->pPr->defRPr, 'u');
+            $defaultStrikethrough = self::getAttributeString($titleDetailPart->pPr->defRPr, 'strike');
+            $defaultBaseline = self::getAttributeInteger($titleDetailPart->pPr->defRPr, 'baseline');
+            if (isset($titleDetailPart->defRPr->rFont['val'])) {
+                $defaultFontName = (string) $titleDetailPart->defRPr->rFont['val'];
+            }
+            if (isset($titleDetailPart->pPr->defRPr->latin)) {
+                $defaultLatin = self::getAttributeString($titleDetailPart->pPr->defRPr->latin, 'typeface');
+            }
+            if (isset($titleDetailPart->pPr->defRPr->ea)) {
+                $defaultEastAsian = self::getAttributeString($titleDetailPart->pPr->defRPr->ea, 'typeface');
+            }
+            if (isset($titleDetailPart->pPr->defRPr->cs)) {
+                $defaultComplexScript = self::getAttributeString($titleDetailPart->pPr->defRPr->cs, 'typeface');
+            }
+            if (isset($titleDetailPart->pPr->defRPr->solidFill)) {
+                $defaultFontColor = $this->readColor($titleDetailPart->pPr->defRPr->solidFill);
+            }
+        }
         foreach ($titleDetailPart as $titleDetailElementKey => $titleDetailElement) {
-            if (isset($titleDetailElement->t)) {
-                $objText = $value->createTextRun((string) $titleDetailElement->t);
+            if (
+                (string) $titleDetailElementKey !== 'r'
+                || !isset($titleDetailElement->t)
+            ) {
+                continue;
+            }
+            $objText = $value->createTextRun((string) $titleDetailElement->t);
+            if ($objText->getFont() === null) {
+                // @codeCoverageIgnoreStart
+                continue;
+                // @codeCoverageIgnoreEnd
             }
+            $fontSize = null;
+            $bold = null;
+            $italic = null;
+            $underscore = null;
+            $strikethrough = null;
+            $baseline = null;
+            $fontName = null;
+            $latinName = null;
+            $eastAsian = null;
+            $complexScript = null;
+            $fontColor = null;
+            $underlineColor = null;
             if (isset($titleDetailElement->rPr)) {
+                // not used now, not sure it ever was, grandfathering
                 if (isset($titleDetailElement->rPr->rFont['val'])) {
-                    $objText->getFont()->setName((string) $titleDetailElement->rPr->rFont['val']);
+                    // @codeCoverageIgnoreStart
+                    $fontName = (string) $titleDetailElement->rPr->rFont['val'];
+                    // @codeCoverageIgnoreEnd
                 }
-
-                $fontSize = (self::getAttribute($titleDetailElement->rPr, 'sz', 'integer'));
-                if ($fontSize !== null) {
-                    $objText->getFont()->setSize(floor($fontSize / 100));
+                if (isset($titleDetailElement->rPr->latin)) {
+                    $latinName = self::getAttributeString($titleDetailElement->rPr->latin, 'typeface');
                 }
-
-                $fontColor = (self::getAttribute($titleDetailElement->rPr, 'color', 'string'));
-                if ($fontColor !== null) {
-                    $objText->getFont()->setColor(new Color(self::readColor($fontColor)));
+                if (isset($titleDetailElement->rPr->ea)) {
+                    $eastAsian = self::getAttributeString($titleDetailElement->rPr->ea, 'typeface');
                 }
+                if (isset($titleDetailElement->rPr->cs)) {
+                    $complexScript = self::getAttributeString($titleDetailElement->rPr->cs, 'typeface');
+                }
+                $fontSize = self::getAttributeInteger($titleDetailElement->rPr, 'sz');
 
-                $bold = self::getAttribute($titleDetailElement->rPr, 'b', 'boolean');
-                if ($bold !== null) {
-                    $objText->getFont()->setBold($bold);
+                // not used now, not sure it ever was, grandfathering
+                if (isset($titleDetailElement->rPr->solidFill)) {
+                    $fontColor = $this->readColor($titleDetailElement->rPr->solidFill);
                 }
 
-                $italic = self::getAttribute($titleDetailElement->rPr, 'i', 'boolean');
-                if ($italic !== null) {
-                    $objText->getFont()->setItalic($italic);
+                $bold = self::getAttributeBoolean($titleDetailElement->rPr, 'b');
+                $italic = self::getAttributeBoolean($titleDetailElement->rPr, 'i');
+                $baseline = self::getAttributeInteger($titleDetailElement->rPr, 'baseline');
+                $underscore = self::getAttributeString($titleDetailElement->rPr, 'u');
+                if (isset($titleDetailElement->rPr->uFill->solidFill)) {
+                    $underlineColor = $this->readColor($titleDetailElement->rPr->uFill->solidFill);
                 }
 
-                $baseline = self::getAttribute($titleDetailElement->rPr, 'baseline', 'integer');
-                if ($baseline !== null) {
-                    if ($baseline > 0) {
-                        $objText->getFont()->setSuperscript(true);
-                    } elseif ($baseline < 0) {
-                        $objText->getFont()->setSubscript(true);
-                    }
+                $strikethrough = self::getAttributeString($titleDetailElement->rPr, 'strike');
+            }
+
+            $fontFound = false;
+            $latinName = $latinName ?? $defaultLatin;
+            if ($latinName !== null) {
+                $objText->getFont()->setLatin($latinName);
+                $fontFound = true;
+            }
+            $eastAsian = $eastAsian ?? $defaultEastAsian;
+            if ($eastAsian !== null) {
+                $objText->getFont()->setEastAsian($eastAsian);
+                $fontFound = true;
+            }
+            $complexScript = $complexScript ?? $defaultComplexScript;
+            if ($complexScript !== null) {
+                $objText->getFont()->setComplexScript($complexScript);
+                $fontFound = true;
+            }
+            $fontName = $fontName ?? $defaultFontName;
+            if ($fontName !== null) {
+                // @codeCoverageIgnoreStart
+                $objText->getFont()->setName($fontName);
+                $fontFound = true;
+                // @codeCoverageIgnoreEnd
+            }
+
+            $fontSize = $fontSize ?? $defaultFontSize;
+            if (is_int($fontSize)) {
+                $objText->getFont()->setSize(floor($fontSize / 100));
+                $fontFound = true;
+            } else {
+                $objText->getFont()->setSize(null, true);
+            }
+
+            $fontColor = $fontColor ?? $defaultFontColor;
+            if (!empty($fontColor)) {
+                $objText->getFont()->setChartColor($fontColor);
+                $fontFound = true;
+            }
+
+            $bold = $bold ?? $defaultBold;
+            if ($bold !== null) {
+                $objText->getFont()->setBold($bold);
+                $fontFound = true;
+            }
+
+            $italic = $italic ?? $defaultItalic;
+            if ($italic !== null) {
+                $objText->getFont()->setItalic($italic);
+                $fontFound = true;
+            }
+
+            $baseline = $baseline ?? $defaultBaseline;
+            if ($baseline !== null) {
+                $objText->getFont()->setBaseLine($baseline);
+                if ($baseline > 0) {
+                    $objText->getFont()->setSuperscript(true);
+                } elseif ($baseline < 0) {
+                    $objText->getFont()->setSubscript(true);
                 }
+                $fontFound = true;
+            }
 
-                $underscore = (self::getAttribute($titleDetailElement->rPr, 'u', 'string'));
-                if ($underscore !== null) {
-                    if ($underscore == 'sng') {
-                        $objText->getFont()->setUnderline(Font::UNDERLINE_SINGLE);
-                    } elseif ($underscore == 'dbl') {
-                        $objText->getFont()->setUnderline(Font::UNDERLINE_DOUBLE);
-                    } else {
-                        $objText->getFont()->setUnderline(Font::UNDERLINE_NONE);
-                    }
+            $underscore = $underscore ?? $defaultUnderscore;
+            if ($underscore !== null) {
+                if ($underscore == 'sng') {
+                    $objText->getFont()->setUnderline(Font::UNDERLINE_SINGLE);
+                } elseif ($underscore == 'dbl') {
+                    $objText->getFont()->setUnderline(Font::UNDERLINE_DOUBLE);
+                } elseif ($underscore !== '') {
+                    $objText->getFont()->setUnderline($underscore);
+                } else {
+                    $objText->getFont()->setUnderline(Font::UNDERLINE_NONE);
+                }
+                $fontFound = true;
+                if ($underlineColor) {
+                    $objText->getFont()->setUnderlineColor($underlineColor);
                 }
+            }
 
-                $strikethrough = (self::getAttribute($titleDetailElement->rPr, 's', 'string'));
-                if ($strikethrough !== null) {
-                    if ($strikethrough == 'noStrike') {
-                        $objText->getFont()->setStrikethrough(false);
-                    } else {
-                        $objText->getFont()->setStrikethrough(true);
-                    }
+            $strikethrough = $strikethrough ?? $defaultStrikethrough;
+            if ($strikethrough !== null) {
+                $objText->getFont()->setStrikeType($strikethrough);
+                if ($strikethrough == 'noStrike') {
+                    $objText->getFont()->setStrikethrough(false);
+                } else {
+                    $objText->getFont()->setStrikethrough(true);
                 }
+                $fontFound = true;
+            }
+            if ($fontFound === false) {
+                $objText->setFont(null);
             }
         }
 
         return $value;
     }
 
-    private static function readChartAttributes($chartDetail)
+    private function parseFont(SimpleXMLElement $titleDetailPart): ?Font
+    {
+        if (!isset($titleDetailPart->pPr->defRPr)) {
+            return null;
+        }
+        $fontArray = [];
+        $fontArray['size'] = self::getAttributeInteger($titleDetailPart->pPr->defRPr, 'sz');
+        $fontArray['bold'] = self::getAttributeBoolean($titleDetailPart->pPr->defRPr, 'b');
+        $fontArray['italic'] = self::getAttributeBoolean($titleDetailPart->pPr->defRPr, 'i');
+        $fontArray['underscore'] = self::getAttributeString($titleDetailPart->pPr->defRPr, 'u');
+        $fontArray['strikethrough'] = self::getAttributeString($titleDetailPart->pPr->defRPr, 'strike');
+        $fontArray['cap'] = self::getAttributeString($titleDetailPart->pPr->defRPr, 'cap');
+
+        if (isset($titleDetailPart->pPr->defRPr->latin)) {
+            $fontArray['latin'] = self::getAttributeString($titleDetailPart->pPr->defRPr->latin, 'typeface');
+        }
+        if (isset($titleDetailPart->pPr->defRPr->ea)) {
+            $fontArray['eastAsian'] = self::getAttributeString($titleDetailPart->pPr->defRPr->ea, 'typeface');
+        }
+        if (isset($titleDetailPart->pPr->defRPr->cs)) {
+            $fontArray['complexScript'] = self::getAttributeString($titleDetailPart->pPr->defRPr->cs, 'typeface');
+        }
+        if (isset($titleDetailPart->pPr->defRPr->solidFill)) {
+            $fontArray['chartColor'] = new ChartColor($this->readColor($titleDetailPart->pPr->defRPr->solidFill));
+        }
+        $font = new Font();
+        $font->setSize(null, true);
+        $font->applyFromArray($fontArray);
+
+        return $font;
+    }
+
+    private function readChartAttributes(?SimpleXMLElement $chartDetail): array
     {
         $plotAttributes = [];
         if (isset($chartDetail->dLbls)) {
+            if (isset($chartDetail->dLbls->dLblPos)) {
+                $plotAttributes['dLblPos'] = self::getAttributeString($chartDetail->dLbls->dLblPos, 'val');
+            }
+            if (isset($chartDetail->dLbls->numFmt)) {
+                $plotAttributes['numFmtCode'] = self::getAttributeString($chartDetail->dLbls->numFmt, 'formatCode');
+                $plotAttributes['numFmtLinked'] = self::getAttributeBoolean($chartDetail->dLbls->numFmt, 'sourceLinked');
+            }
             if (isset($chartDetail->dLbls->showLegendKey)) {
-                $plotAttributes['showLegendKey'] = self::getAttribute($chartDetail->dLbls->showLegendKey, 'val', 'string');
+                $plotAttributes['showLegendKey'] = self::getAttributeString($chartDetail->dLbls->showLegendKey, 'val');
             }
             if (isset($chartDetail->dLbls->showVal)) {
-                $plotAttributes['showVal'] = self::getAttribute($chartDetail->dLbls->showVal, 'val', 'string');
+                $plotAttributes['showVal'] = self::getAttributeString($chartDetail->dLbls->showVal, 'val');
             }
             if (isset($chartDetail->dLbls->showCatName)) {
-                $plotAttributes['showCatName'] = self::getAttribute($chartDetail->dLbls->showCatName, 'val', 'string');
+                $plotAttributes['showCatName'] = self::getAttributeString($chartDetail->dLbls->showCatName, 'val');
             }
             if (isset($chartDetail->dLbls->showSerName)) {
-                $plotAttributes['showSerName'] = self::getAttribute($chartDetail->dLbls->showSerName, 'val', 'string');
+                $plotAttributes['showSerName'] = self::getAttributeString($chartDetail->dLbls->showSerName, 'val');
             }
             if (isset($chartDetail->dLbls->showPercent)) {
-                $plotAttributes['showPercent'] = self::getAttribute($chartDetail->dLbls->showPercent, 'val', 'string');
+                $plotAttributes['showPercent'] = self::getAttributeString($chartDetail->dLbls->showPercent, 'val');
             }
             if (isset($chartDetail->dLbls->showBubbleSize)) {
-                $plotAttributes['showBubbleSize'] = self::getAttribute($chartDetail->dLbls->showBubbleSize, 'val', 'string');
+                $plotAttributes['showBubbleSize'] = self::getAttributeString($chartDetail->dLbls->showBubbleSize, 'val');
             }
             if (isset($chartDetail->dLbls->showLeaderLines)) {
-                $plotAttributes['showLeaderLines'] = self::getAttribute($chartDetail->dLbls->showLeaderLines, 'val', 'string');
+                $plotAttributes['showLeaderLines'] = self::getAttributeString($chartDetail->dLbls->showLeaderLines, 'val');
+            }
+            if (isset($chartDetail->dLbls->spPr)) {
+                $sppr = $chartDetail->dLbls->spPr->children($this->aNamespace);
+                if (isset($sppr->solidFill)) {
+                    $plotAttributes['labelFillColor'] = new ChartColor($this->readColor($sppr->solidFill));
+                }
+                if (isset($sppr->ln->solidFill)) {
+                    $plotAttributes['labelBorderColor'] = new ChartColor($this->readColor($sppr->ln->solidFill));
+                }
+            }
+            if (isset($chartDetail->dLbls->txPr)) {
+                $txpr = $chartDetail->dLbls->txPr->children($this->aNamespace);
+                if (isset($txpr->p)) {
+                    $plotAttributes['labelFont'] = $this->parseFont($txpr->p);
+                    if (isset($txpr->p->pPr->defRPr->effectLst)) {
+                        $labelEffects = new GridLines();
+                        $this->readEffects($txpr->p->pPr->defRPr, $labelEffects, false);
+                        $plotAttributes['labelEffects'] = $labelEffects;
+                    }
+                }
             }
         }
 
         return $plotAttributes;
     }
 
-    /**
-     * @param mixed $plotAttributes
-     */
-    private static function setChartAttributes(Layout $plotArea, $plotAttributes): void
+    private function setChartAttributes(Layout $plotArea, array $plotAttributes): void
     {
         foreach ($plotAttributes as $plotAttributeKey => $plotAttributeValue) {
             switch ($plotAttributeKey) {
@@ -603,4 +1304,269 @@ private static function setChartAttributes(Layout $plotArea, $plotAttributes): v
             }
         }
     }
+
+    private function readEffects(SimpleXMLElement $chartDetail, ?ChartProperties $chartObject, bool $getSppr = true): void
+    {
+        if (!isset($chartObject)) {
+            return;
+        }
+        if ($getSppr) {
+            if (!isset($chartDetail->spPr)) {
+                return;
+            }
+            $sppr = $chartDetail->spPr->children($this->aNamespace);
+        } else {
+            $sppr = $chartDetail;
+        }
+        if (isset($sppr->effectLst->glow)) {
+            $axisGlowSize = (float) self::getAttributeInteger($sppr->effectLst->glow, 'rad') / ChartProperties::POINTS_WIDTH_MULTIPLIER;
+            if ($axisGlowSize != 0.0) {
+                $colorArray = $this->readColor($sppr->effectLst->glow);
+                $chartObject->setGlowProperties($axisGlowSize, $colorArray['value'], $colorArray['alpha'], $colorArray['type']);
+            }
+        }
+
+        if (isset($sppr->effectLst->softEdge)) {
+            $softEdgeSize = self::getAttributeString($sppr->effectLst->softEdge, 'rad');
+            if (is_numeric($softEdgeSize)) {
+                $chartObject->setSoftEdges((float) ChartProperties::xmlToPoints($softEdgeSize));
+            }
+        }
+
+        $type = '';
+        foreach (self::SHADOW_TYPES as $shadowType) {
+            if (isset($sppr->effectLst->$shadowType)) {
+                $type = $shadowType;
+
+                break;
+            }
+        }
+        if ($type !== '') {
+            $blur = self::getAttributeString($sppr->effectLst->$type, 'blurRad');
+            $blur = is_numeric($blur) ? ChartProperties::xmlToPoints($blur) : null;
+            $dist = self::getAttributeString($sppr->effectLst->$type, 'dist');
+            $dist = is_numeric($dist) ? ChartProperties::xmlToPoints($dist) : null;
+            $direction = self::getAttributeString($sppr->effectLst->$type, 'dir');
+            $direction = is_numeric($direction) ? ChartProperties::xmlToAngle($direction) : null;
+            $algn = self::getAttributeString($sppr->effectLst->$type, 'algn');
+            $rot = self::getAttributeString($sppr->effectLst->$type, 'rotWithShape');
+            $size = [];
+            foreach (['sx', 'sy'] as $sizeType) {
+                $sizeValue = self::getAttributeString($sppr->effectLst->$type, $sizeType);
+                if (is_numeric($sizeValue)) {
+                    $size[$sizeType] = ChartProperties::xmlToTenthOfPercent((string) $sizeValue);
+                } else {
+                    $size[$sizeType] = null;
+                }
+            }
+            foreach (['kx', 'ky'] as $sizeType) {
+                $sizeValue = self::getAttributeString($sppr->effectLst->$type, $sizeType);
+                if (is_numeric($sizeValue)) {
+                    $size[$sizeType] = ChartProperties::xmlToAngle((string) $sizeValue);
+                } else {
+                    $size[$sizeType] = null;
+                }
+            }
+            $colorArray = $this->readColor($sppr->effectLst->$type);
+            $chartObject
+                ->setShadowProperty('effect', $type)
+                ->setShadowProperty('blur', $blur)
+                ->setShadowProperty('direction', $direction)
+                ->setShadowProperty('distance', $dist)
+                ->setShadowProperty('algn', $algn)
+                ->setShadowProperty('rotWithShape', $rot)
+                ->setShadowProperty('size', $size)
+                ->setShadowProperty('color', $colorArray);
+        }
+    }
+
+    private const SHADOW_TYPES = [
+        'outerShdw',
+        'innerShdw',
+    ];
+
+    private function readColor(SimpleXMLElement $colorXml): array
+    {
+        $result = [
+            'type' => null,
+            'value' => null,
+            'alpha' => null,
+            'brightness' => null,
+        ];
+        foreach (ChartColor::EXCEL_COLOR_TYPES as $type) {
+            if (isset($colorXml->$type)) {
+                $result['type'] = $type;
+                $result['value'] = self::getAttributeString($colorXml->$type, 'val');
+                if (isset($colorXml->$type->alpha)) {
+                    $alpha = self::getAttributeString($colorXml->$type->alpha, 'val');
+                    if (is_numeric($alpha)) {
+                        $result['alpha'] = ChartColor::alphaFromXml($alpha);
+                    }
+                }
+                if (isset($colorXml->$type->lumMod)) {
+                    $brightness = self::getAttributeString($colorXml->$type->lumMod, 'val');
+                    if (is_numeric($brightness)) {
+                        $result['brightness'] = ChartColor::alphaFromXml($brightness);
+                    }
+                }
+
+                break;
+            }
+        }
+
+        return $result;
+    }
+
+    private function readLineStyle(SimpleXMLElement $chartDetail, ?ChartProperties $chartObject): void
+    {
+        if (!isset($chartObject, $chartDetail->spPr)) {
+            return;
+        }
+        $sppr = $chartDetail->spPr->children($this->aNamespace);
+
+        if (!isset($sppr->ln)) {
+            return;
+        }
+        $lineWidth = null;
+        $lineWidthTemp = self::getAttributeString($sppr->ln, 'w');
+        if (is_numeric($lineWidthTemp)) {
+            $lineWidth = ChartProperties::xmlToPoints($lineWidthTemp);
+        }
+        /** @var string $compoundType */
+        $compoundType = self::getAttributeString($sppr->ln, 'cmpd');
+        /** @var string $dashType */
+        $dashType = self::getAttributeString($sppr->ln->prstDash, 'val');
+        /** @var string $capType */
+        $capType = self::getAttributeString($sppr->ln, 'cap');
+        if (isset($sppr->ln->miter)) {
+            $joinType = ChartProperties::LINE_STYLE_JOIN_MITER;
+        } elseif (isset($sppr->ln->bevel)) {
+            $joinType = ChartProperties::LINE_STYLE_JOIN_BEVEL;
+        } else {
+            $joinType = '';
+        }
+        $headArrowSize = 0;
+        $endArrowSize = 0;
+        $headArrowType = self::getAttributeString($sppr->ln->headEnd, 'type');
+        $headArrowWidth = self::getAttributeString($sppr->ln->headEnd, 'w');
+        $headArrowLength = self::getAttributeString($sppr->ln->headEnd, 'len');
+        $endArrowType = self::getAttributeString($sppr->ln->tailEnd, 'type');
+        $endArrowWidth = self::getAttributeString($sppr->ln->tailEnd, 'w');
+        $endArrowLength = self::getAttributeString($sppr->ln->tailEnd, 'len');
+        $chartObject->setLineStyleProperties(
+            $lineWidth,
+            $compoundType,
+            $dashType,
+            $capType,
+            $joinType,
+            $headArrowType,
+            $headArrowSize,
+            $endArrowType,
+            $endArrowSize,
+            $headArrowWidth,
+            $headArrowLength,
+            $endArrowWidth,
+            $endArrowLength
+        );
+        $colorArray = $this->readColor($sppr->ln->solidFill);
+        $chartObject->getLineColor()->setColorPropertiesArray($colorArray);
+    }
+
+    private function setAxisProperties(SimpleXMLElement $chartDetail, ?Axis $whichAxis): void
+    {
+        if (!isset($whichAxis)) {
+            return;
+        }
+        if (isset($chartDetail->delete)) {
+            $whichAxis->setAxisOption('hidden', (string) self::getAttributeString($chartDetail->delete, 'val'));
+        }
+        if (isset($chartDetail->numFmt)) {
+            $whichAxis->setAxisNumberProperties(
+                (string) self::getAttributeString($chartDetail->numFmt, 'formatCode'),
+                null,
+                (int) self::getAttributeInteger($chartDetail->numFmt, 'sourceLinked')
+            );
+        }
+        if (isset($chartDetail->crossBetween)) {
+            $whichAxis->setCrossBetween((string) self::getAttributeString($chartDetail->crossBetween, 'val'));
+        }
+        if (isset($chartDetail->dispUnits, $chartDetail->dispUnits->builtInUnit)) {
+            $whichAxis->setAxisOption('dispUnitsBuiltIn', (string) self::getAttributeString($chartDetail->dispUnits->builtInUnit, 'val'));
+            if (isset($chartDetail->dispUnits->dispUnitsLbl)) {
+                $whichAxis->setDispUnitsTitle(new Title());
+                // TODO parse title elements
+            }
+        }
+        if (isset($chartDetail->majorTickMark)) {
+            $whichAxis->setAxisOption('major_tick_mark', (string) self::getAttributeString($chartDetail->majorTickMark, 'val'));
+        }
+        if (isset($chartDetail->minorTickMark)) {
+            $whichAxis->setAxisOption('minor_tick_mark', (string) self::getAttributeString($chartDetail->minorTickMark, 'val'));
+        }
+        if (isset($chartDetail->tickLblPos)) {
+            $whichAxis->setAxisOption('axis_labels', (string) self::getAttributeString($chartDetail->tickLblPos, 'val'));
+        }
+        if (isset($chartDetail->crosses)) {
+            $whichAxis->setAxisOption('horizontal_crosses', (string) self::getAttributeString($chartDetail->crosses, 'val'));
+        }
+        if (isset($chartDetail->crossesAt)) {
+            $whichAxis->setAxisOption('horizontal_crosses_value', (string) self::getAttributeString($chartDetail->crossesAt, 'val'));
+        }
+        if (isset($chartDetail->scaling->logBase)) {
+            $whichAxis->setAxisOption('logBase', (string) self::getAttributeString($chartDetail->scaling->logBase, 'val'));
+        }
+        if (isset($chartDetail->scaling->orientation)) {
+            $whichAxis->setAxisOption('orientation', (string) self::getAttributeString($chartDetail->scaling->orientation, 'val'));
+        }
+        if (isset($chartDetail->scaling->max)) {
+            $whichAxis->setAxisOption('maximum', (string) self::getAttributeString($chartDetail->scaling->max, 'val'));
+        }
+        if (isset($chartDetail->scaling->min)) {
+            $whichAxis->setAxisOption('minimum', (string) self::getAttributeString($chartDetail->scaling->min, 'val'));
+        }
+        if (isset($chartDetail->scaling->min)) {
+            $whichAxis->setAxisOption('minimum', (string) self::getAttributeString($chartDetail->scaling->min, 'val'));
+        }
+        if (isset($chartDetail->majorUnit)) {
+            $whichAxis->setAxisOption('major_unit', (string) self::getAttributeString($chartDetail->majorUnit, 'val'));
+        }
+        if (isset($chartDetail->minorUnit)) {
+            $whichAxis->setAxisOption('minor_unit', (string) self::getAttributeString($chartDetail->minorUnit, 'val'));
+        }
+        if (isset($chartDetail->baseTimeUnit)) {
+            $whichAxis->setAxisOption('baseTimeUnit', (string) self::getAttributeString($chartDetail->baseTimeUnit, 'val'));
+        }
+        if (isset($chartDetail->majorTimeUnit)) {
+            $whichAxis->setAxisOption('majorTimeUnit', (string) self::getAttributeString($chartDetail->majorTimeUnit, 'val'));
+        }
+        if (isset($chartDetail->minorTimeUnit)) {
+            $whichAxis->setAxisOption('minorTimeUnit', (string) self::getAttributeString($chartDetail->minorTimeUnit, 'val'));
+        }
+        if (isset($chartDetail->txPr)) {
+            $children = $chartDetail->txPr->children($this->aNamespace);
+            $addAxisText = false;
+            $axisText = new AxisText();
+            if (isset($children->bodyPr)) {
+                $textRotation = self::getAttributeString($children->bodyPr, 'rot');
+                if (is_numeric($textRotation)) {
+                    $axisText->setRotation((int) ChartProperties::xmlToAngle($textRotation));
+                    $addAxisText = true;
+                }
+            }
+            if (isset($children->p->pPr->defRPr)) {
+                $font = $this->parseFont($children->p);
+                if ($font !== null) {
+                    $axisText->setFont($font);
+                    $addAxisText = true;
+                }
+            }
+            if (isset($children->p->pPr->defRPr->effectLst)) {
+                $this->readEffects($children->p->pPr->defRPr, $axisText, false);
+                $addAxisText = true;
+            }
+            if ($addAxisText) {
+                $whichAxis->setAxisText($axisText);
+            }
+        }
+    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php
index 4134b2f184..cf9046ce57 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php
@@ -3,15 +3,16 @@
 namespace PhpOffice\PhpSpreadsheet\Reader\Xlsx;
 
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Reader\DefaultReadFilter;
 use PhpOffice\PhpSpreadsheet\Reader\IReadFilter;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 use SimpleXMLElement;
 
 class ColumnAndRowAttributes extends BaseParserClass
 {
-    private $worksheet;
+    private Worksheet $worksheet;
 
-    private $worksheetXml;
+    private ?SimpleXMLElement $worksheetXml;
 
     public function __construct(Worksheet $workSheet, ?SimpleXMLElement $worksheetXml = null)
     {
@@ -26,7 +27,7 @@ public function __construct(Worksheet $workSheet, ?SimpleXMLElement $worksheetXm
      * @param array $columnAttributes array of attributes (indexes are attribute name, values are value)
      *                               'xfIndex', 'visible', 'collapsed', 'outlineLevel', 'width', ... ?
      */
-    private function setColumnAttributes($columnAddress, array $columnAttributes): void
+    private function setColumnAttributes(string $columnAddress, array $columnAttributes): void
     {
         if (isset($columnAttributes['xfIndex'])) {
             $this->worksheet->getColumnDimension($columnAddress)->setXfIndex($columnAttributes['xfIndex']);
@@ -52,7 +53,7 @@ private function setColumnAttributes($columnAddress, array $columnAttributes): v
      * @param array $rowAttributes array of attributes (indexes are attribute name, values are value)
      *                               'xfIndex', 'visible', 'collapsed', 'outlineLevel', 'rowHeight', ... ?
      */
-    private function setRowAttributes($rowNumber, array $rowAttributes): void
+    private function setRowAttributes(int $rowNumber, array $rowAttributes): void
     {
         if (isset($rowAttributes['xfIndex'])) {
             $this->worksheet->getRowDimension($rowNumber)->setXfIndex($rowAttributes['xfIndex']);
@@ -71,11 +72,7 @@ private function setRowAttributes($rowNumber, array $rowAttributes): void
         }
     }
 
-    /**
-     * @param IReadFilter $readFilter
-     * @param bool $readDataOnly
-     */
-    public function load(?IReadFilter $readFilter = null, $readDataOnly = false): void
+    public function load(?IReadFilter $readFilter = null, bool $readDataOnly = false, bool $ignoreRowsWithNoCells = false): void
     {
         if ($this->worksheetXml === null) {
             return;
@@ -88,15 +85,19 @@ public function load(?IReadFilter $readFilter = null, $readDataOnly = false): vo
         }
 
         if ($this->worksheetXml->sheetData && $this->worksheetXml->sheetData->row) {
-            $rowsAttributes = $this->readRowAttributes($this->worksheetXml->sheetData->row, $readDataOnly);
+            $rowsAttributes = $this->readRowAttributes($this->worksheetXml->sheetData->row, $readDataOnly, $ignoreRowsWithNoCells);
+        }
+
+        if ($readFilter !== null && $readFilter::class === DefaultReadFilter::class) {
+            $readFilter = null;
         }
 
         // set columns/rows attributes
         $columnsAttributesAreSet = [];
         foreach ($columnsAttributes as $columnCoordinate => $columnAttributes) {
             if (
-                $readFilter === null ||
-                !$this->isFilteredColumn($readFilter, $columnCoordinate, $rowsAttributes)
+                $readFilter === null
+                || !$this->isFilteredColumn($readFilter, $columnCoordinate, $rowsAttributes)
             ) {
                 if (!isset($columnsAttributesAreSet[$columnCoordinate])) {
                     $this->setColumnAttributes($columnCoordinate, $columnAttributes);
@@ -108,8 +109,8 @@ public function load(?IReadFilter $readFilter = null, $readDataOnly = false): vo
         $rowsAttributesAreSet = [];
         foreach ($rowsAttributes as $rowCoordinate => $rowAttributes) {
             if (
-                $readFilter === null ||
-                !$this->isFilteredRow($readFilter, $rowCoordinate, $columnsAttributes)
+                $readFilter === null
+                || !$this->isFilteredRow($readFilter, $rowCoordinate, $columnsAttributes)
             ) {
                 if (!isset($rowsAttributesAreSet[$rowCoordinate])) {
                     $this->setRowAttributes($rowCoordinate, $rowAttributes);
@@ -119,7 +120,7 @@ public function load(?IReadFilter $readFilter = null, $readDataOnly = false): vo
         }
     }
 
-    private function isFilteredColumn(IReadFilter $readFilter, $columnCoordinate, array $rowsAttributes)
+    private function isFilteredColumn(IReadFilter $readFilter, string $columnCoordinate, array $rowsAttributes): bool
     {
         foreach ($rowsAttributes as $rowCoordinate => $rowAttributes) {
             if (!$readFilter->readCell($columnCoordinate, $rowCoordinate, $this->worksheet->getTitle())) {
@@ -130,19 +131,22 @@ private function isFilteredColumn(IReadFilter $readFilter, $columnCoordinate, ar
         return false;
     }
 
-    private function readColumnAttributes(SimpleXMLElement $worksheetCols, $readDataOnly)
+    private function readColumnAttributes(SimpleXMLElement $worksheetCols, bool $readDataOnly): array
     {
         $columnAttributes = [];
 
-        foreach ($worksheetCols->col as $column) {
-            $startColumn = Coordinate::stringFromColumnIndex((int) $column['min']);
-            $endColumn = Coordinate::stringFromColumnIndex((int) $column['max']);
-            ++$endColumn;
-            for ($columnAddress = $startColumn; $columnAddress !== $endColumn; ++$columnAddress) {
-                $columnAttributes[$columnAddress] = $this->readColumnRangeAttributes($column, $readDataOnly);
-
-                if ((int) ($column['max']) == 16384) {
-                    break;
+        foreach ($worksheetCols->col as $columnx) {
+            $column = $columnx->attributes();
+            if ($column !== null) {
+                $startColumn = Coordinate::stringFromColumnIndex((int) $column['min']);
+                $endColumn = Coordinate::stringFromColumnIndex((int) $column['max']);
+                ++$endColumn;
+                for ($columnAddress = $startColumn; $columnAddress !== $endColumn; ++$columnAddress) {
+                    $columnAttributes[$columnAddress] = $this->readColumnRangeAttributes($column, $readDataOnly);
+
+                    if ((int) ($column['max']) == 16384) {
+                        break;
+                    }
                 }
             }
         }
@@ -150,28 +154,31 @@ private function readColumnAttributes(SimpleXMLElement $worksheetCols, $readData
         return $columnAttributes;
     }
 
-    private function readColumnRangeAttributes(SimpleXMLElement $column, $readDataOnly)
+    private function readColumnRangeAttributes(?SimpleXMLElement $column, bool $readDataOnly): array
     {
         $columnAttributes = [];
-
-        if ($column['style'] && !$readDataOnly) {
-            $columnAttributes['xfIndex'] = (int) $column['style'];
-        }
-        if (self::boolean($column['hidden'])) {
-            $columnAttributes['visible'] = false;
-        }
-        if (self::boolean($column['collapsed'])) {
-            $columnAttributes['collapsed'] = true;
-        }
-        if (((int) $column['outlineLevel']) > 0) {
-            $columnAttributes['outlineLevel'] = (int) $column['outlineLevel'];
+        if ($column !== null) {
+            if (isset($column['style']) && !$readDataOnly) {
+                $columnAttributes['xfIndex'] = (int) $column['style'];
+            }
+            if (isset($column['hidden']) && self::boolean($column['hidden'])) {
+                $columnAttributes['visible'] = false;
+            }
+            if (isset($column['collapsed']) && self::boolean($column['collapsed'])) {
+                $columnAttributes['collapsed'] = true;
+            }
+            if (isset($column['outlineLevel']) && ((int) $column['outlineLevel']) > 0) {
+                $columnAttributes['outlineLevel'] = (int) $column['outlineLevel'];
+            }
+            if (isset($column['width'])) {
+                $columnAttributes['width'] = (float) $column['width'];
+            }
         }
-        $columnAttributes['width'] = (float) $column['width'];
 
         return $columnAttributes;
     }
 
-    private function isFilteredRow(IReadFilter $readFilter, $rowCoordinate, array $columnsAttributes)
+    private function isFilteredRow(IReadFilter $readFilter, int $rowCoordinate, array $columnsAttributes): bool
     {
         foreach ($columnsAttributes as $columnCoordinate => $columnAttributes) {
             if (!$readFilter->readCell($columnCoordinate, $rowCoordinate, $this->worksheet->getTitle())) {
@@ -182,25 +189,28 @@ private function isFilteredRow(IReadFilter $readFilter, $rowCoordinate, array $c
         return false;
     }
 
-    private function readRowAttributes(SimpleXMLElement $worksheetRow, $readDataOnly)
+    private function readRowAttributes(SimpleXMLElement $worksheetRow, bool $readDataOnly, bool $ignoreRowsWithNoCells): array
     {
         $rowAttributes = [];
 
-        foreach ($worksheetRow as $row) {
-            if ($row['ht'] && !$readDataOnly) {
-                $rowAttributes[(int) $row['r']]['rowHeight'] = (float) $row['ht'];
-            }
-            if (self::boolean($row['hidden'])) {
-                $rowAttributes[(int) $row['r']]['visible'] = false;
-            }
-            if (self::boolean($row['collapsed'])) {
-                $rowAttributes[(int) $row['r']]['collapsed'] = true;
-            }
-            if ((int) $row['outlineLevel'] > 0) {
-                $rowAttributes[(int) $row['r']]['outlineLevel'] = (int) $row['outlineLevel'];
-            }
-            if ($row['s'] && !$readDataOnly) {
-                $rowAttributes[(int) $row['r']]['xfIndex'] = (int) $row['s'];
+        foreach ($worksheetRow as $rowx) {
+            $row = $rowx->attributes();
+            if ($row !== null && (!$ignoreRowsWithNoCells || isset($rowx->c))) {
+                if (isset($row['ht']) && !$readDataOnly) {
+                    $rowAttributes[(int) $row['r']]['rowHeight'] = (float) $row['ht'];
+                }
+                if (isset($row['hidden']) && self::boolean($row['hidden'])) {
+                    $rowAttributes[(int) $row['r']]['visible'] = false;
+                }
+                if (isset($row['collapsed']) && self::boolean($row['collapsed'])) {
+                    $rowAttributes[(int) $row['r']]['collapsed'] = true;
+                }
+                if (isset($row['outlineLevel']) && (int) $row['outlineLevel'] > 0) {
+                    $rowAttributes[(int) $row['r']]['outlineLevel'] = (int) $row['outlineLevel'];
+                }
+                if (isset($row['s']) && !$readDataOnly) {
+                    $rowAttributes[(int) $row['r']]['xfIndex'] = (int) $row['s'];
+                }
             }
         }
 
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
index dcd7ad12cb..8731d642e5 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
@@ -2,43 +2,175 @@
 
 namespace PhpOffice\PhpSpreadsheet\Reader\Xlsx;
 
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Styles as StyleReader;
+use PhpOffice\PhpSpreadsheet\Style\Color;
 use PhpOffice\PhpSpreadsheet\Style\Conditional;
+use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\ConditionalColorScale;
 use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\ConditionalDataBar;
 use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\ConditionalFormattingRuleExtension;
 use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\ConditionalFormatValueObject;
+use PhpOffice\PhpSpreadsheet\Style\Style as Style;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 use SimpleXMLElement;
+use stdClass;
 
 class ConditionalStyles
 {
-    private $worksheet;
+    private Worksheet $worksheet;
 
-    private $worksheetXml;
+    private SimpleXMLElement $worksheetXml;
 
-    private $dxfs;
+    private array $ns;
 
-    public function __construct(Worksheet $workSheet, SimpleXMLElement $worksheetXml, array $dxfs = [])
+    private array $dxfs;
+
+    private StyleReader $styleReader;
+
+    public function __construct(Worksheet $workSheet, SimpleXMLElement $worksheetXml, array $dxfs, StyleReader $styleReader)
     {
         $this->worksheet = $workSheet;
         $this->worksheetXml = $worksheetXml;
         $this->dxfs = $dxfs;
+        $this->styleReader = $styleReader;
     }
 
     public function load(): void
     {
+        $selectedCells = $this->worksheet->getSelectedCells();
+
         $this->setConditionalStyles(
             $this->worksheet,
             $this->readConditionalStyles($this->worksheetXml),
             $this->worksheetXml->extLst
         );
+
+        $this->worksheet->setSelectedCells($selectedCells);
     }
 
-    private function readConditionalStyles($xmlSheet)
+    public function loadFromExt(): void
+    {
+        $selectedCells = $this->worksheet->getSelectedCells();
+
+        $this->ns = $this->worksheetXml->getNamespaces(true);
+        $this->setConditionalsFromExt(
+            $this->readConditionalsFromExt($this->worksheetXml->extLst)
+        );
+
+        $this->worksheet->setSelectedCells($selectedCells);
+    }
+
+    private function setConditionalsFromExt(array $conditionals): void
+    {
+        foreach ($conditionals as $conditionalRange => $cfRules) {
+            ksort($cfRules);
+            // Priority is used as the key for sorting; but may not start at 0,
+            // so we use array_values to reset the index after sorting.
+            $this->worksheet->getStyle($conditionalRange)
+                ->setConditionalStyles(array_values($cfRules));
+        }
+    }
+
+    private function readConditionalsFromExt(SimpleXMLElement $extLst): array
+    {
+        $conditionals = [];
+        if (!isset($extLst->ext)) {
+            return $conditionals;
+        }
+
+        foreach ($extLst->ext as $extlstcond) {
+            $extAttrs = $extlstcond->attributes() ?? [];
+            $extUri = (string) ($extAttrs['uri'] ?? '');
+            if ($extUri !== '{78C0D931-6437-407d-A8EE-F0AAD7539E65}') {
+                continue;
+            }
+            $conditionalFormattingRuleXml = $extlstcond->children($this->ns['x14']);
+            if (!$conditionalFormattingRuleXml->conditionalFormattings) {
+                return [];
+            }
+
+            foreach ($conditionalFormattingRuleXml->children($this->ns['x14']) as $extFormattingXml) {
+                $extFormattingRangeXml = $extFormattingXml->children($this->ns['xm']);
+                if (!$extFormattingRangeXml->sqref) {
+                    continue;
+                }
+
+                $sqref = (string) $extFormattingRangeXml->sqref;
+                $extCfRuleXml = $extFormattingXml->cfRule;
+
+                $attributes = $extCfRuleXml->attributes();
+                if (!$attributes) {
+                    continue;
+                }
+                $conditionType = (string) $attributes->type;
+                if (
+                    !Conditional::isValidConditionType($conditionType)
+                    || $conditionType === Conditional::CONDITION_DATABAR
+                ) {
+                    continue;
+                }
+
+                $priority = (int) $attributes->priority;
+
+                $conditional = $this->readConditionalRuleFromExt($extCfRuleXml, $attributes);
+                $cfStyle = $this->readStyleFromExt($extCfRuleXml);
+                $conditional->setStyle($cfStyle);
+                $conditionals[$sqref][$priority] = $conditional;
+            }
+        }
+
+        return $conditionals;
+    }
+
+    private function readConditionalRuleFromExt(SimpleXMLElement $cfRuleXml, SimpleXMLElement $attributes): Conditional
+    {
+        $conditionType = (string) $attributes->type;
+        $operatorType = (string) $attributes->operator;
+
+        $operands = [];
+        foreach ($cfRuleXml->children($this->ns['xm']) as $cfRuleOperandsXml) {
+            $operands[] = (string) $cfRuleOperandsXml;
+        }
+
+        $conditional = new Conditional();
+        $conditional->setConditionType($conditionType);
+        $conditional->setOperatorType($operatorType);
+        if (
+            $conditionType === Conditional::CONDITION_CONTAINSTEXT
+            || $conditionType === Conditional::CONDITION_NOTCONTAINSTEXT
+            || $conditionType === Conditional::CONDITION_BEGINSWITH
+            || $conditionType === Conditional::CONDITION_ENDSWITH
+            || $conditionType === Conditional::CONDITION_TIMEPERIOD
+        ) {
+            $conditional->setText(array_pop($operands) ?? '');
+        }
+        $conditional->setConditions($operands);
+
+        return $conditional;
+    }
+
+    private function readStyleFromExt(SimpleXMLElement $extCfRuleXml): Style
+    {
+        $cfStyle = new Style(false, true);
+        if ($extCfRuleXml->dxf) {
+            $styleXML = $extCfRuleXml->dxf->children();
+
+            if ($styleXML->borders) {
+                $this->styleReader->readBorderStyle($cfStyle->getBorders(), $styleXML->borders);
+            }
+            if ($styleXML->fill) {
+                $this->styleReader->readFillStyle($cfStyle->getFill(), $styleXML->fill);
+            }
+        }
+
+        return $cfStyle;
+    }
+
+    private function readConditionalStyles(SimpleXMLElement $xmlSheet): array
     {
         $conditionals = [];
         foreach ($xmlSheet->conditionalFormatting as $conditional) {
             foreach ($conditional->cfRule as $cfRule) {
-                if (Conditional::isValidConditionType((string) $cfRule['type']) && isset($this->dxfs[(int) ($cfRule['dxfId'])])) {
+                if (Conditional::isValidConditionType((string) $cfRule['type']) && (!isset($cfRule['dxfId']) || isset($this->dxfs[(int) ($cfRule['dxfId'])]))) {
                     $conditionals[(string) $conditional['sqref']][(int) ($cfRule['priority'])] = $cfRule;
                 } elseif ((string) $cfRule['type'] == Conditional::CONDITION_DATABAR) {
                     $conditionals[(string) $conditional['sqref']][(int) ($cfRule['priority'])] = $cfRule;
@@ -49,50 +181,67 @@ private function readConditionalStyles($xmlSheet)
         return $conditionals;
     }
 
-    private function setConditionalStyles(Worksheet $worksheet, array $conditionals, $xmlExtLst): void
+    private function setConditionalStyles(Worksheet $worksheet, array $conditionals, SimpleXMLElement $xmlExtLst): void
     {
-        foreach ($conditionals as $ref => $cfRules) {
+        foreach ($conditionals as $cellRangeReference => $cfRules) {
             ksort($cfRules);
             $conditionalStyles = $this->readStyleRules($cfRules, $xmlExtLst);
 
-            // Extract all cell references in $ref
-            $cellBlocks = explode(' ', str_replace('$', '', strtoupper($ref)));
-            foreach ($cellBlocks as $cellBlock) {
-                $worksheet->getStyle($cellBlock)->setConditionalStyles($conditionalStyles);
-            }
+            // Extract all cell references in $cellRangeReference
+            // N.B. In Excel UI, intersection is space and union is comma.
+            // But in Xml, intersection is comma and union is space.
+            $cellRangeReference = str_replace(['$', ' ', ',', '^'], ['', '^', ' ', ','], strtoupper($cellRangeReference));
+            $worksheet->getStyle($cellRangeReference)->setConditionalStyles($conditionalStyles);
         }
     }
 
-    private function readStyleRules($cfRules, $extLst)
+    private function readStyleRules(array $cfRules, SimpleXMLElement $extLst): array
     {
         $conditionalFormattingRuleExtensions = ConditionalFormattingRuleExtension::parseExtLstXml($extLst);
         $conditionalStyles = [];
+
+        /** @var SimpleXMLElement $cfRule */
         foreach ($cfRules as $cfRule) {
             $objConditional = new Conditional();
             $objConditional->setConditionType((string) $cfRule['type']);
             $objConditional->setOperatorType((string) $cfRule['operator']);
+            $objConditional->setNoFormatSet(!isset($cfRule['dxfId']));
 
             if ((string) $cfRule['text'] != '') {
                 $objConditional->setText((string) $cfRule['text']);
+            } elseif ((string) $cfRule['timePeriod'] != '') {
+                $objConditional->setText((string) $cfRule['timePeriod']);
             }
 
             if (isset($cfRule['stopIfTrue']) && (int) $cfRule['stopIfTrue'] === 1) {
                 $objConditional->setStopIfTrue(true);
             }
 
-            if (count($cfRule->formula) > 1) {
-                foreach ($cfRule->formula as $formula) {
-                    $objConditional->addCondition((string) $formula);
+            if (count($cfRule->formula) >= 1) {
+                foreach ($cfRule->formula as $formulax) {
+                    $formula = (string) $formulax;
+                    $formula = str_replace(['_xlfn.', '_xlws.'], '', $formula);
+                    if ($formula === 'TRUE') {
+                        $objConditional->addCondition(true);
+                    } elseif ($formula === 'FALSE') {
+                        $objConditional->addCondition(false);
+                    } else {
+                        $objConditional->addCondition($formula);
+                    }
                 }
             } else {
-                $objConditional->addCondition((string) $cfRule->formula);
+                $objConditional->addCondition('');
             }
 
             if (isset($cfRule->dataBar)) {
                 $objConditional->setDataBar(
                     $this->readDataBarOfConditionalRule($cfRule, $conditionalFormattingRuleExtensions)
                 );
-            } else {
+            } elseif (isset($cfRule->colorScale)) {
+                $objConditional->setColorScale(
+                    $this->readColorScale($cfRule)
+                );
+            } elseif (isset($cfRule['dxfId'])) {
                 $objConditional->setStyle(clone $this->dxfs[(int) ($cfRule['dxfId'])]);
             }
 
@@ -102,7 +251,7 @@ private function readStyleRules($cfRules, $extLst)
         return $conditionalStyles;
     }
 
-    private function readDataBarOfConditionalRule($cfRule, $conditionalFormattingRuleExtensions): ConditionalDataBar
+    private function readDataBarOfConditionalRule(SimpleXMLElement $cfRule, array $conditionalFormattingRuleExtensions): ConditionalDataBar
     {
         $dataBar = new ConditionalDataBar();
         //dataBar attribute
@@ -114,7 +263,7 @@ private function readDataBarOfConditionalRule($cfRule, $conditionalFormattingRul
         //conditionalFormatValueObjects
         $cfvoXml = $cfRule->dataBar->cfvo;
         $cfvoIndex = 0;
-        foreach ((count($cfvoXml) > 1 ? $cfvoXml : [$cfvoXml]) as $cfvo) {
+        foreach ((count($cfvoXml) > 1 ? $cfvoXml : [$cfvoXml]) as $cfvo) { //* @phpstan-ignore-line
             if ($cfvoIndex === 0) {
                 $dataBar->setMinimumConditionalFormatValueObject(new ConditionalFormatValueObject((string) $cfvo['type'], (string) $cfvo['val']));
             }
@@ -126,7 +275,7 @@ private function readDataBarOfConditionalRule($cfRule, $conditionalFormattingRul
 
         //color
         if (isset($cfRule->dataBar->color)) {
-            $dataBar->setColor((string) $cfRule->dataBar->color['rgb']);
+            $dataBar->setColor($this->styleReader->readColor($cfRule->dataBar->color));
         }
         //extLst
         $this->readDataBarExtLstOfConditionalRule($dataBar, $cfRule, $conditionalFormattingRuleExtensions);
@@ -134,11 +283,50 @@ private function readDataBarOfConditionalRule($cfRule, $conditionalFormattingRul
         return $dataBar;
     }
 
-    private function readDataBarExtLstOfConditionalRule(ConditionalDataBar $dataBar, $cfRule, $conditionalFormattingRuleExtensions): void
+    private function readColorScale(SimpleXMLElement|stdClass $cfRule): ConditionalColorScale
+    {
+        $colorScale = new ConditionalColorScale();
+        $count = count($cfRule->colorScale->cfvo);
+        $idx = 0;
+        foreach ($cfRule->colorScale->cfvo as $cfvoXml) {
+            $attr = $cfvoXml->attributes() ?? [];
+            $type = (string) ($attr['type'] ?? '');
+            $val = $attr['val'] ?? null;
+            if ($idx === 0) {
+                $method = 'setMinimumConditionalFormatValueObject';
+            } elseif ($idx === 1 && $count === 3) {
+                $method = 'setMidpointConditionalFormatValueObject';
+            } else {
+                $method = 'setMaximumConditionalFormatValueObject';
+            }
+            if ($type !== 'formula') {
+                $colorScale->$method(new ConditionalFormatValueObject($type, $val));
+            } else {
+                $colorScale->$method(new ConditionalFormatValueObject($type, null, $val));
+            }
+            ++$idx;
+        }
+        $idx = 0;
+        foreach ($cfRule->colorScale->color as $color) {
+            $rgb = $this->styleReader->readColor($color);
+            if ($idx === 0) {
+                $colorScale->setMinimumColor(new Color($rgb));
+            } elseif ($idx === 1 && $count === 3) {
+                $colorScale->setMidpointColor(new Color($rgb));
+            } else {
+                $colorScale->setMaximumColor(new Color($rgb));
+            }
+            ++$idx;
+        }
+
+        return $colorScale;
+    }
+
+    private function readDataBarExtLstOfConditionalRule(ConditionalDataBar $dataBar, SimpleXMLElement $cfRule, array $conditionalFormattingRuleExtensions): void
     {
         if (isset($cfRule->extLst)) {
             $ns = $cfRule->extLst->getNamespaces(true);
-            foreach ((count($cfRule->extLst) > 0 ? $cfRule->extLst->ext : [$cfRule->extLst->ext]) as $ext) {
+            foreach ((count($cfRule->extLst) > 0 ? $cfRule->extLst->ext : [$cfRule->extLst->ext]) as $ext) { //* @phpstan-ignore-line
                 $extId = (string) $ext->children($ns['x14'])->id;
                 if (isset($conditionalFormattingRuleExtensions[$extId]) && (string) $ext['uri'] === '{B025F937-C7B1-47D3-B67F-A62EFF666E3E}') {
                     $dataBar->setConditionalFormattingRuleExt($conditionalFormattingRuleExtensions[$extId]);
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/DataValidations.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/DataValidations.php
index 41a8c9fb57..d494dc9dad 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/DataValidations.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/DataValidations.php
@@ -8,9 +8,9 @@
 
 class DataValidations
 {
-    private $worksheet;
+    private Worksheet $worksheet;
 
-    private $worksheetXml;
+    private SimpleXMLElement $worksheetXml;
 
     public function __construct(Worksheet $workSheet, SimpleXMLElement $worksheetXml)
     {
@@ -22,7 +22,19 @@ public function load(): void
     {
         foreach ($this->worksheetXml->dataValidations->dataValidation as $dataValidation) {
             // Uppercase coordinate
-            $range = strtoupper($dataValidation['sqref']);
+            $range = strtoupper((string) $dataValidation['sqref']);
+            $rangeSet = explode(' ', $range);
+            foreach ($rangeSet as $range) {
+                if (preg_match('/^[A-Z]{1,3}\\d{1,7}/', $range, $matches) === 1) {
+                    // Ensure left/top row of range exists, thereby
+                    // adjusting high row/column.
+                    $this->worksheet->getCell($matches[0]);
+                }
+            }
+        }
+        foreach ($this->worksheetXml->dataValidations->dataValidation as $dataValidation) {
+            // Uppercase coordinate
+            $range = strtoupper((string) $dataValidation['sqref']);
             $rangeSet = explode(' ', $range);
             foreach ($rangeSet as $range) {
                 $stRange = $this->worksheet->shrinkRangeToFit($range);
@@ -34,16 +46,18 @@ public function load(): void
                     $docValidation->setType((string) $dataValidation['type']);
                     $docValidation->setErrorStyle((string) $dataValidation['errorStyle']);
                     $docValidation->setOperator((string) $dataValidation['operator']);
-                    $docValidation->setAllowBlank($dataValidation['allowBlank'] != 0);
-                    $docValidation->setShowDropDown($dataValidation['showDropDown'] == 0);
-                    $docValidation->setShowInputMessage($dataValidation['showInputMessage'] != 0);
-                    $docValidation->setShowErrorMessage($dataValidation['showErrorMessage'] != 0);
+                    $docValidation->setAllowBlank(filter_var($dataValidation['allowBlank'], FILTER_VALIDATE_BOOLEAN));
+                    // showDropDown is inverted (works as hideDropDown if true)
+                    $docValidation->setShowDropDown(!filter_var($dataValidation['showDropDown'], FILTER_VALIDATE_BOOLEAN));
+                    $docValidation->setShowInputMessage(filter_var($dataValidation['showInputMessage'], FILTER_VALIDATE_BOOLEAN));
+                    $docValidation->setShowErrorMessage(filter_var($dataValidation['showErrorMessage'], FILTER_VALIDATE_BOOLEAN));
                     $docValidation->setErrorTitle((string) $dataValidation['errorTitle']);
                     $docValidation->setError((string) $dataValidation['error']);
                     $docValidation->setPromptTitle((string) $dataValidation['promptTitle']);
                     $docValidation->setPrompt((string) $dataValidation['prompt']);
                     $docValidation->setFormula1((string) $dataValidation->formula1);
                     $docValidation->setFormula2((string) $dataValidation->formula2);
+                    $docValidation->setSqref($range);
                 }
             }
         }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Hyperlinks.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Hyperlinks.php
index a9afce38cf..0c5b9a1ba0 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Hyperlinks.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Hyperlinks.php
@@ -3,14 +3,15 @@
 namespace PhpOffice\PhpSpreadsheet\Reader\Xlsx;
 
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 use SimpleXMLElement;
 
 class Hyperlinks
 {
-    private $worksheet;
+    private Worksheet $worksheet;
 
-    private $hyperlinks = [];
+    private array $hyperlinks = [];
 
     public function __construct(Worksheet $workSheet)
     {
@@ -19,16 +20,17 @@ public function __construct(Worksheet $workSheet)
 
     public function readHyperlinks(SimpleXMLElement $relsWorksheet): void
     {
-        foreach ($relsWorksheet->Relationship as $element) {
-            if ($element['Type'] == 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink') {
-                $this->hyperlinks[(string) $element['Id']] = (string) $element['Target'];
+        foreach ($relsWorksheet->children(Namespaces::RELATIONSHIPS)->Relationship as $elementx) {
+            $element = Xlsx::getAttributes($elementx);
+            if ($element->Type == Namespaces::HYPERLINK) {
+                $this->hyperlinks[(string) $element->Id] = (string) $element->Target;
             }
         }
     }
 
     public function setHyperlinks(SimpleXMLElement $worksheetXml): void
     {
-        foreach ($worksheetXml->hyperlink as $hyperlink) {
+        foreach ($worksheetXml->children(Namespaces::MAIN)->hyperlink as $hyperlink) {
             if ($hyperlink !== null) {
                 $this->setHyperlink($hyperlink, $this->worksheet);
             }
@@ -38,23 +40,24 @@ public function setHyperlinks(SimpleXMLElement $worksheetXml): void
     private function setHyperlink(SimpleXMLElement $hyperlink, Worksheet $worksheet): void
     {
         // Link url
-        $linkRel = $hyperlink->attributes('http://schemas.openxmlformats.org/officeDocument/2006/relationships');
+        $linkRel = Xlsx::getAttributes($hyperlink, Namespaces::SCHEMA_OFFICE_DOCUMENT);
 
-        foreach (Coordinate::extractAllCellReferencesInRange($hyperlink['ref']) as $cellReference) {
+        $attributes = Xlsx::getAttributes($hyperlink);
+        foreach (Coordinate::extractAllCellReferencesInRange($attributes->ref) as $cellReference) {
             $cell = $worksheet->getCell($cellReference);
             if (isset($linkRel['id'])) {
                 $hyperlinkUrl = $this->hyperlinks[(string) $linkRel['id']] ?? null;
-                if (isset($hyperlink['location'])) {
-                    $hyperlinkUrl .= '#' . (string) $hyperlink['location'];
+                if (isset($attributes['location'])) {
+                    $hyperlinkUrl .= '#' . (string) $attributes['location'];
                 }
                 $cell->getHyperlink()->setUrl($hyperlinkUrl);
-            } elseif (isset($hyperlink['location'])) {
-                $cell->getHyperlink()->setUrl('sheet://' . (string) $hyperlink['location']);
+            } elseif (isset($attributes['location'])) {
+                $cell->getHyperlink()->setUrl('sheet://' . (string) $attributes['location']);
             }
 
             // Tooltip
-            if (isset($hyperlink['tooltip'])) {
-                $cell->getHyperlink()->setTooltip((string) $hyperlink['tooltip']);
+            if (isset($attributes['tooltip'])) {
+                $cell->getHyperlink()->setTooltip((string) $attributes['tooltip']);
             }
         }
     }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Namespaces.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Namespaces.php
new file mode 100644
index 0000000000..7356cd8829
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Namespaces.php
@@ -0,0 +1,124 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+
+class Namespaces
+{
+    const SCHEMAS = 'http://schemas.openxmlformats.org';
+
+    const RELATIONSHIPS = 'http://schemas.openxmlformats.org/package/2006/relationships';
+
+    // This one used in Reader\Xlsx
+    const CORE_PROPERTIES = 'http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties';
+
+    // This one used in Reader\Xlsx\Properties
+    const CORE_PROPERTIES2 = 'http://schemas.openxmlformats.org/package/2006/metadata/core-properties';
+
+    const THUMBNAIL = 'http://schemas.openxmlformats.org/package/2006/relationships/metadata/thumbnail';
+
+    const THEME = 'http://schemas.openxmlformats.org/package/2006/relationships/theme';
+
+    const THEME2 = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme';
+
+    const COMPATIBILITY = 'http://schemas.openxmlformats.org/markup-compatibility/2006';
+
+    const MAIN = 'http://schemas.openxmlformats.org/spreadsheetml/2006/main';
+
+    const RELATIONSHIPS_DRAWING = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing';
+
+    const DRAWINGML = 'http://schemas.openxmlformats.org/drawingml/2006/main';
+
+    const CHART = 'http://schemas.openxmlformats.org/drawingml/2006/chart';
+
+    const CHART_ALTERNATE = 'http://schemas.microsoft.com/office/drawing/2007/8/2/chart';
+
+    const RELATIONSHIPS_CHART = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart';
+
+    const SPREADSHEET_DRAWING = 'http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing';
+
+    const SCHEMA_OFFICE_DOCUMENT = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships';
+
+    const COMMENTS = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments';
+
+    const RELATIONSHIPS_CUSTOM_PROPERTIES = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/custom-properties';
+
+    const RELATIONSHIPS_EXTENDED_PROPERTIES = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties';
+
+    const RELATIONSHIPS_CTRLPROP = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/ctrlProp';
+
+    const CUSTOM_PROPERTIES = 'http://schemas.openxmlformats.org/officeDocument/2006/custom-properties';
+
+    const EXTENDED_PROPERTIES = 'http://schemas.openxmlformats.org/officeDocument/2006/extended-properties';
+
+    const PROPERTIES_VTYPES = 'http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes';
+
+    const HYPERLINK = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink';
+
+    const OFFICE_DOCUMENT = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument';
+
+    const SHARED_STRINGS = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings';
+
+    const STYLES = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles';
+
+    const IMAGE = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image';
+
+    const VML = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing';
+
+    const WORKSHEET = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet';
+
+    const CHARTSHEET = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/chartsheet';
+
+    const SCHEMA_MICROSOFT = 'http://schemas.microsoft.com/office/2006/relationships';
+
+    const EXTENSIBILITY = 'http://schemas.microsoft.com/office/2006/relationships/ui/extensibility';
+
+    const VBA = 'http://schemas.microsoft.com/office/2006/relationships/vbaProject';
+
+    const VBA_SIGNATURE = 'http://schemas.microsoft.com/office/2006/relationships/vbaProject';
+
+    const DATA_VALIDATIONS1 = 'http://schemas.microsoft.com/office/spreadsheetml/2009/9/main';
+
+    const DATA_VALIDATIONS2 = 'http://schemas.microsoft.com/office/excel/2006/main';
+
+    const CONTENT_TYPES = 'http://schemas.openxmlformats.org/package/2006/content-types';
+
+    const RELATIONSHIPS_METADATA = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/sheetMetadata';
+
+    const RELATIONSHIPS_PRINTER_SETTINGS = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/printerSettings';
+
+    const RELATIONSHIPS_TABLE = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/table';
+
+    const SPREADSHEETML_AC = 'http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac';
+
+    const DC_ELEMENTS = 'http://purl.org/dc/elements/1.1/';
+
+    const DC_TERMS = 'http://purl.org/dc/terms/';
+
+    const DC_DCMITYPE = 'http://purl.org/dc/dcmitype/';
+
+    const SCHEMA_INSTANCE = 'http://www.w3.org/2001/XMLSchema-instance';
+
+    const URN_EXCEL = 'urn:schemas-microsoft-com:office:excel';
+
+    const URN_MSOFFICE = 'urn:schemas-microsoft-com:office:office';
+
+    const URN_VML = 'urn:schemas-microsoft-com:vml';
+
+    const SCHEMA_PURL = 'http://purl.oclc.org/ooxml';
+
+    const PURL_OFFICE_DOCUMENT = 'http://purl.oclc.org/ooxml/officeDocument/relationships/officeDocument';
+
+    const PURL_RELATIONSHIPS = 'http://purl.oclc.org/ooxml/officeDocument/relationships';
+
+    const PURL_MAIN = 'http://purl.oclc.org/ooxml/spreadsheetml/main';
+
+    const PURL_DRAWING = 'http://purl.oclc.org/ooxml/drawingml/main';
+
+    const PURL_CHART = 'http://purl.oclc.org/ooxml/drawingml/chart';
+
+    const PURL_WORKSHEET = 'http://purl.oclc.org/ooxml/officeDocument/relationships/worksheet';
+
+    const DYNAMIC_ARRAY = 'http://schemas.microsoft.com/office/spreadsheetml/2017/dynamicarray';
+
+    const DYNAMIC_ARRAY_RICHDATA = 'http://schemas.microsoft.com/office/spreadsheetml/2017/richdata';
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/PageSetup.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/PageSetup.php
index 536c8948d8..5e6cc88bbf 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/PageSetup.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/PageSetup.php
@@ -8,9 +8,9 @@
 
 class PageSetup extends BaseParserClass
 {
-    private $worksheet;
+    private Worksheet $worksheet;
 
-    private $worksheetXml;
+    private ?SimpleXMLElement $worksheetXml;
 
     public function __construct(Worksheet $workSheet, ?SimpleXMLElement $worksheetXml = null)
     {
@@ -18,16 +18,17 @@ public function __construct(Worksheet $workSheet, ?SimpleXMLElement $worksheetXm
         $this->worksheetXml = $worksheetXml;
     }
 
-    public function load(array $unparsedLoadedData)
+    public function load(array $unparsedLoadedData): array
     {
-        if (!$this->worksheetXml) {
+        $worksheetXml = $this->worksheetXml;
+        if ($worksheetXml === null) {
             return $unparsedLoadedData;
         }
 
-        $this->margins($this->worksheetXml, $this->worksheet);
-        $unparsedLoadedData = $this->pageSetup($this->worksheetXml, $this->worksheet, $unparsedLoadedData);
-        $this->headerFooter($this->worksheetXml, $this->worksheet);
-        $this->pageBreaks($this->worksheetXml, $this->worksheet);
+        $this->margins($worksheetXml, $this->worksheet);
+        $unparsedLoadedData = $this->pageSetup($worksheetXml, $this->worksheet, $unparsedLoadedData);
+        $this->headerFooter($worksheetXml, $this->worksheet);
+        $this->pageBreaks($worksheetXml, $this->worksheet);
 
         return $unparsedLoadedData;
     }
@@ -45,7 +46,7 @@ private function margins(SimpleXMLElement $xmlSheet, Worksheet $worksheet): void
         }
     }
 
-    private function pageSetup(SimpleXMLElement $xmlSheet, Worksheet $worksheet, array $unparsedLoadedData)
+    private function pageSetup(SimpleXMLElement $xmlSheet, Worksheet $worksheet, array $unparsedLoadedData): array
     {
         if ($xmlSheet->pageSetup) {
             $docPageSetup = $worksheet->getPageSetup();
@@ -66,8 +67,8 @@ private function pageSetup(SimpleXMLElement $xmlSheet, Worksheet $worksheet, arr
                 $docPageSetup->setFitToWidth((int) ($xmlSheet->pageSetup['fitToWidth']), false);
             }
             if (
-                isset($xmlSheet->pageSetup['firstPageNumber'], $xmlSheet->pageSetup['useFirstPageNumber']) &&
-                self::boolean((string) $xmlSheet->pageSetup['useFirstPageNumber'])
+                isset($xmlSheet->pageSetup['firstPageNumber'], $xmlSheet->pageSetup['useFirstPageNumber'])
+                && self::boolean((string) $xmlSheet->pageSetup['useFirstPageNumber'])
             ) {
                 $docPageSetup->setFirstPageNumber((int) ($xmlSheet->pageSetup['firstPageNumber']));
             }
@@ -75,9 +76,13 @@ private function pageSetup(SimpleXMLElement $xmlSheet, Worksheet $worksheet, arr
                 $docPageSetup->setPageOrder((string) $xmlSheet->pageSetup['pageOrder']);
             }
 
-            $relAttributes = $xmlSheet->pageSetup->attributes('http://schemas.openxmlformats.org/officeDocument/2006/relationships');
+            $relAttributes = $xmlSheet->pageSetup->attributes(Namespaces::SCHEMA_OFFICE_DOCUMENT);
             if (isset($relAttributes['id'])) {
-                $unparsedLoadedData['sheets'][$worksheet->getCodeName()]['pageSetupRelId'] = (string) $relAttributes['id'];
+                $relid = (string) $relAttributes['id'];
+                if (!str_ends_with($relid, 'ps')) {
+                    $relid .= 'ps';
+                }
+                $unparsedLoadedData['sheets'][$worksheet->getCodeName()]['pageSetupRelId'] = $relid;
             }
         }
 
@@ -90,32 +95,32 @@ private function headerFooter(SimpleXMLElement $xmlSheet, Worksheet $worksheet):
             $docHeaderFooter = $worksheet->getHeaderFooter();
 
             if (
-                isset($xmlSheet->headerFooter['differentOddEven']) &&
-                self::boolean((string) $xmlSheet->headerFooter['differentOddEven'])
+                isset($xmlSheet->headerFooter['differentOddEven'])
+                && self::boolean((string) $xmlSheet->headerFooter['differentOddEven'])
             ) {
                 $docHeaderFooter->setDifferentOddEven(true);
             } else {
                 $docHeaderFooter->setDifferentOddEven(false);
             }
             if (
-                isset($xmlSheet->headerFooter['differentFirst']) &&
-                self::boolean((string) $xmlSheet->headerFooter['differentFirst'])
+                isset($xmlSheet->headerFooter['differentFirst'])
+                && self::boolean((string) $xmlSheet->headerFooter['differentFirst'])
             ) {
                 $docHeaderFooter->setDifferentFirst(true);
             } else {
                 $docHeaderFooter->setDifferentFirst(false);
             }
             if (
-                isset($xmlSheet->headerFooter['scaleWithDoc']) &&
-                !self::boolean((string) $xmlSheet->headerFooter['scaleWithDoc'])
+                isset($xmlSheet->headerFooter['scaleWithDoc'])
+                && !self::boolean((string) $xmlSheet->headerFooter['scaleWithDoc'])
             ) {
                 $docHeaderFooter->setScaleWithDocument(false);
             } else {
                 $docHeaderFooter->setScaleWithDocument(true);
             }
             if (
-                isset($xmlSheet->headerFooter['alignWithMargins']) &&
-                !self::boolean((string) $xmlSheet->headerFooter['alignWithMargins'])
+                isset($xmlSheet->headerFooter['alignWithMargins'])
+                && !self::boolean((string) $xmlSheet->headerFooter['alignWithMargins'])
             ) {
                 $docHeaderFooter->setAlignWithMargins(false);
             } else {
@@ -144,8 +149,9 @@ private function pageBreaks(SimpleXMLElement $xmlSheet, Worksheet $worksheet): v
     private function rowBreaks(SimpleXMLElement $xmlSheet, Worksheet $worksheet): void
     {
         foreach ($xmlSheet->rowBreaks->brk as $brk) {
+            $rowBreakMax = isset($brk['max']) ? ((int) $brk['max']) : -1;
             if ($brk['man']) {
-                $worksheet->setBreak("A{$brk['id']}", Worksheet::BREAK_ROW);
+                $worksheet->setBreak("A{$brk['id']}", Worksheet::BREAK_ROW, $rowBreakMax);
             }
         }
     }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Properties.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Properties.php
index ffc7ec452c..fb501e84ec 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Properties.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Properties.php
@@ -9,9 +9,9 @@
 
 class Properties
 {
-    private $securityScanner;
+    private XmlScanner $securityScanner;
 
-    private $docProps;
+    private DocumentProperties $docProps;
 
     public function __construct(XmlScanner $securityScanner, DocumentProperties $docProps)
     {
@@ -19,39 +19,40 @@ public function __construct(XmlScanner $securityScanner, DocumentProperties $doc
         $this->docProps = $docProps;
     }
 
-    private function extractPropertyData($propertyData)
+    private function extractPropertyData(string $propertyData): ?SimpleXMLElement
     {
-        return simplexml_load_string(
+        // okay to omit namespace because everything will be processed by xpath
+        $obj = simplexml_load_string(
             $this->securityScanner->scan($propertyData),
             'SimpleXMLElement',
             Settings::getLibXmlLoaderOptions()
         );
+
+        return $obj === false ? null : $obj;
     }
 
-    public function readCoreProperties($propertyData): void
+    public function readCoreProperties(string $propertyData): void
     {
         $xmlCore = $this->extractPropertyData($propertyData);
 
         if (is_object($xmlCore)) {
-            $xmlCore->registerXPathNamespace('dc', 'http://purl.org/dc/elements/1.1/');
-            $xmlCore->registerXPathNamespace('dcterms', 'http://purl.org/dc/terms/');
-            $xmlCore->registerXPathNamespace('cp', 'http://schemas.openxmlformats.org/package/2006/metadata/core-properties');
-
-            $this->docProps->setCreator((string) self::getArrayItem($xmlCore->xpath('dc:creator')));
-            $this->docProps->setLastModifiedBy((string) self::getArrayItem($xmlCore->xpath('cp:lastModifiedBy')));
-            $created = (string) self::getArrayItem($xmlCore->xpath('dcterms:created')); //! respect xsi:type
-            $this->docProps->setCreated($created);
-            $modified = (string) self::getArrayItem($xmlCore->xpath('dcterms:modified')); //! respect xsi:type
-            $this->docProps->setModified($modified); //! respect xsi:type
-            $this->docProps->setTitle((string) self::getArrayItem($xmlCore->xpath('dc:title')));
-            $this->docProps->setDescription((string) self::getArrayItem($xmlCore->xpath('dc:description')));
-            $this->docProps->setSubject((string) self::getArrayItem($xmlCore->xpath('dc:subject')));
-            $this->docProps->setKeywords((string) self::getArrayItem($xmlCore->xpath('cp:keywords')));
-            $this->docProps->setCategory((string) self::getArrayItem($xmlCore->xpath('cp:category')));
+            $xmlCore->registerXPathNamespace('dc', Namespaces::DC_ELEMENTS);
+            $xmlCore->registerXPathNamespace('dcterms', Namespaces::DC_TERMS);
+            $xmlCore->registerXPathNamespace('cp', Namespaces::CORE_PROPERTIES2);
+
+            $this->docProps->setCreator($this->getArrayItem($xmlCore->xpath('dc:creator')));
+            $this->docProps->setLastModifiedBy($this->getArrayItem($xmlCore->xpath('cp:lastModifiedBy')));
+            $this->docProps->setCreated($this->getArrayItem($xmlCore->xpath('dcterms:created'))); //! respect xsi:type
+            $this->docProps->setModified($this->getArrayItem($xmlCore->xpath('dcterms:modified'))); //! respect xsi:type
+            $this->docProps->setTitle($this->getArrayItem($xmlCore->xpath('dc:title')));
+            $this->docProps->setDescription($this->getArrayItem($xmlCore->xpath('dc:description')));
+            $this->docProps->setSubject($this->getArrayItem($xmlCore->xpath('dc:subject')));
+            $this->docProps->setKeywords($this->getArrayItem($xmlCore->xpath('cp:keywords')));
+            $this->docProps->setCategory($this->getArrayItem($xmlCore->xpath('cp:category')));
         }
     }
 
-    public function readExtendedProperties($propertyData): void
+    public function readExtendedProperties(string $propertyData): void
     {
         $xmlCore = $this->extractPropertyData($propertyData);
 
@@ -62,10 +63,13 @@ public function readExtendedProperties($propertyData): void
             if (isset($xmlCore->Manager)) {
                 $this->docProps->setManager((string) $xmlCore->Manager);
             }
+            if (isset($xmlCore->HyperlinkBase)) {
+                $this->docProps->setHyperlinkBase((string) $xmlCore->HyperlinkBase);
+            }
         }
     }
 
-    public function readCustomProperties($propertyData): void
+    public function readCustomProperties(string $propertyData): void
     {
         $xmlCore = $this->extractPropertyData($propertyData);
 
@@ -87,8 +91,8 @@ public function readCustomProperties($propertyData): void
         }
     }
 
-    private static function getArrayItem(array $array, $key = 0)
+    private function getArrayItem(null|array|false $array): string
     {
-        return $array[$key] ?? null;
+        return is_array($array) ? (string) ($array[0] ?? '') : '';
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/SharedFormula.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/SharedFormula.php
new file mode 100644
index 0000000000..fb7a39320f
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/SharedFormula.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+
+class SharedFormula
+{
+    private string $master;
+
+    private string $formula;
+
+    public function __construct(string $master, string $formula)
+    {
+        $this->master = $master;
+        $this->formula = $formula;
+    }
+
+    public function master(): string
+    {
+        return $this->master;
+    }
+
+    public function formula(): string
+    {
+        return $this->formula;
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/SheetViewOptions.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/SheetViewOptions.php
index 123588182b..9d71443f4e 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/SheetViewOptions.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/SheetViewOptions.php
@@ -7,9 +7,9 @@
 
 class SheetViewOptions extends BaseParserClass
 {
-    private $worksheet;
+    private Worksheet $worksheet;
 
-    private $worksheetXml;
+    private ?SimpleXMLElement $worksheetXml;
 
     public function __construct(Worksheet $workSheet, ?SimpleXMLElement $worksheetXml = null)
     {
@@ -17,20 +17,18 @@ public function __construct(Worksheet $workSheet, ?SimpleXMLElement $worksheetXm
         $this->worksheetXml = $worksheetXml;
     }
 
-    /**
-     * @param bool $readDataOnly
-     */
-    public function load($readDataOnly = false): void
+    public function load(bool $readDataOnly, Styles $styleReader): void
     {
         if ($this->worksheetXml === null) {
             return;
         }
 
         if (isset($this->worksheetXml->sheetPr)) {
-            $this->tabColor($this->worksheetXml->sheetPr);
-            $this->codeName($this->worksheetXml->sheetPr);
-            $this->outlines($this->worksheetXml->sheetPr);
-            $this->pageSetup($this->worksheetXml->sheetPr);
+            $sheetPr = $this->worksheetXml->sheetPr;
+            $this->tabColor($sheetPr, $styleReader);
+            $this->codeName($sheetPr);
+            $this->outlines($sheetPr);
+            $this->pageSetup($sheetPr);
         }
 
         if (isset($this->worksheetXml->sheetFormatPr)) {
@@ -42,15 +40,16 @@ public function load($readDataOnly = false): void
         }
     }
 
-    private function tabColor(SimpleXMLElement $sheetPr): void
+    private function tabColor(SimpleXMLElement $sheetPr, Styles $styleReader): void
     {
-        if (isset($sheetPr->tabColor, $sheetPr->tabColor['rgb'])) {
-            $this->worksheet->getTabColor()->setARGB((string) $sheetPr->tabColor['rgb']);
+        if (isset($sheetPr->tabColor)) {
+            $this->worksheet->getTabColor()->setARGB($styleReader->readColor($sheetPr->tabColor));
         }
     }
 
-    private function codeName(SimpleXMLElement $sheetPr): void
+    private function codeName(SimpleXMLElement $sheetPrx): void
     {
+        $sheetPr = $sheetPrx->attributes() ?? [];
         if (isset($sheetPr['codeName'])) {
             $this->worksheet->setCodeName((string) $sheetPr['codeName'], false);
         }
@@ -59,9 +58,10 @@ private function codeName(SimpleXMLElement $sheetPr): void
     private function outlines(SimpleXMLElement $sheetPr): void
     {
         if (isset($sheetPr->outlinePr)) {
+            $attr = $sheetPr->outlinePr->attributes() ?? [];
             if (
-                isset($sheetPr->outlinePr['summaryRight']) &&
-                !self::boolean((string) $sheetPr->outlinePr['summaryRight'])
+                isset($attr['summaryRight'])
+                && !self::boolean((string) $attr['summaryRight'])
             ) {
                 $this->worksheet->setShowSummaryRight(false);
             } else {
@@ -69,8 +69,8 @@ private function outlines(SimpleXMLElement $sheetPr): void
             }
 
             if (
-                isset($sheetPr->outlinePr['summaryBelow']) &&
-                !self::boolean((string) $sheetPr->outlinePr['summaryBelow'])
+                isset($attr['summaryBelow'])
+                && !self::boolean((string) $attr['summaryBelow'])
             ) {
                 $this->worksheet->setShowSummaryBelow(false);
             } else {
@@ -82,9 +82,10 @@ private function outlines(SimpleXMLElement $sheetPr): void
     private function pageSetup(SimpleXMLElement $sheetPr): void
     {
         if (isset($sheetPr->pageSetUpPr)) {
+            $attr = $sheetPr->pageSetUpPr->attributes() ?? [];
             if (
-                isset($sheetPr->pageSetUpPr['fitToPage']) &&
-                !self::boolean((string) $sheetPr->pageSetUpPr['fitToPage'])
+                isset($attr['fitToPage'])
+                && !self::boolean((string) $attr['fitToPage'])
             ) {
                 $this->worksheet->getPageSetup()->setFitToPage(false);
             } else {
@@ -93,12 +94,13 @@ private function pageSetup(SimpleXMLElement $sheetPr): void
         }
     }
 
-    private function sheetFormat(SimpleXMLElement $sheetFormatPr): void
+    private function sheetFormat(SimpleXMLElement $sheetFormatPrx): void
     {
+        $sheetFormatPr = $sheetFormatPrx->attributes() ?? [];
         if (
-            isset($sheetFormatPr['customHeight']) &&
-            self::boolean((string) $sheetFormatPr['customHeight']) &&
-            isset($sheetFormatPr['defaultRowHeight'])
+            isset($sheetFormatPr['customHeight'])
+            && self::boolean((string) $sheetFormatPr['customHeight'])
+            && isset($sheetFormatPr['defaultRowHeight'])
         ) {
             $this->worksheet->getDefaultRowDimension()
                 ->setRowHeight((float) $sheetFormatPr['defaultRowHeight']);
@@ -110,25 +112,27 @@ private function sheetFormat(SimpleXMLElement $sheetFormatPr): void
         }
 
         if (
-            isset($sheetFormatPr['zeroHeight']) &&
-            ((string) $sheetFormatPr['zeroHeight'] === '1')
+            isset($sheetFormatPr['zeroHeight'])
+            && ((string) $sheetFormatPr['zeroHeight'] === '1')
         ) {
             $this->worksheet->getDefaultRowDimension()->setZeroHeight(true);
         }
     }
 
-    private function printOptions(SimpleXMLElement $printOptions): void
+    private function printOptions(SimpleXMLElement $printOptionsx): void
     {
-        if (self::boolean((string) $printOptions['gridLinesSet'])) {
-            $this->worksheet->setShowGridlines(true);
-        }
-        if (self::boolean((string) $printOptions['gridLines'])) {
-            $this->worksheet->setPrintGridlines(true);
+        $printOptions = $printOptionsx->attributes() ?? [];
+        // Spec is weird. gridLines (default false)
+        // and gridLinesSet (default true) must both be true.
+        if (isset($printOptions['gridLines']) && self::boolean((string) $printOptions['gridLines'])) {
+            if (!isset($printOptions['gridLinesSet']) || self::boolean((string) $printOptions['gridLinesSet'])) {
+                $this->worksheet->setPrintGridlines(true);
+            }
         }
-        if (self::boolean((string) $printOptions['horizontalCentered'])) {
+        if (isset($printOptions['horizontalCentered']) && self::boolean((string) $printOptions['horizontalCentered'])) {
             $this->worksheet->getPageSetup()->setHorizontalCentered(true);
         }
-        if (self::boolean((string) $printOptions['verticalCentered'])) {
+        if (isset($printOptions['verticalCentered']) && self::boolean((string) $printOptions['verticalCentered'])) {
             $this->worksheet->getPageSetup()->setVerticalCentered(true);
         }
     }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/SheetViews.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/SheetViews.php
index f6c4792906..7c4b8b288a 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/SheetViews.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/SheetViews.php
@@ -3,23 +3,31 @@
 namespace PhpOffice\PhpSpreadsheet\Reader\Xlsx;
 
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+use PhpOffice\PhpSpreadsheet\Worksheet\Pane;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 use SimpleXMLElement;
 
 class SheetViews extends BaseParserClass
 {
-    private $sheetViewXml;
+    private SimpleXMLElement $sheetViewXml;
 
-    private $worksheet;
+    private SimpleXMLElement $sheetViewAttributes;
+
+    private Worksheet $worksheet;
+
+    private string $activePane = '';
 
     public function __construct(SimpleXMLElement $sheetViewXml, Worksheet $workSheet)
     {
         $this->sheetViewXml = $sheetViewXml;
+        $this->sheetViewAttributes = Xlsx::testSimpleXml($sheetViewXml->attributes());
         $this->worksheet = $workSheet;
     }
 
     public function load(): void
     {
+        $this->topLeft();
         $this->zoomScale();
         $this->view();
         $this->gridLines();
@@ -27,18 +35,22 @@ public function load(): void
         $this->direction();
         $this->showZeros();
 
+        $usesPanes = false;
         if (isset($this->sheetViewXml->pane)) {
             $this->pane();
+            $usesPanes = true;
         }
-        if (isset($this->sheetViewXml->selection, $this->sheetViewXml->selection['sqref'])) {
-            $this->selection();
+        if (isset($this->sheetViewXml->selection)) {
+            foreach ($this->sheetViewXml->selection as $selection) {
+                $this->selection($selection, $usesPanes);
+            }
         }
     }
 
     private function zoomScale(): void
     {
-        if (isset($this->sheetViewXml['zoomScale'])) {
-            $zoomScale = (int) ($this->sheetViewXml['zoomScale']);
+        if (isset($this->sheetViewAttributes->zoomScale)) {
+            $zoomScale = (int) ($this->sheetViewAttributes->zoomScale);
             if ($zoomScale <= 0) {
                 // setZoomScale will throw an Exception if the scale is less than or equals 0
                 // that is OK when manually creating documents, but we should be able to read all documents
@@ -48,8 +60,8 @@ private function zoomScale(): void
             $this->worksheet->getSheetView()->setZoomScale($zoomScale);
         }
 
-        if (isset($this->sheetViewXml['zoomScaleNormal'])) {
-            $zoomScaleNormal = (int) ($this->sheetViewXml['zoomScaleNormal']);
+        if (isset($this->sheetViewAttributes->zoomScaleNormal)) {
+            $zoomScaleNormal = (int) ($this->sheetViewAttributes->zoomScaleNormal);
             if ($zoomScaleNormal <= 0) {
                 // setZoomScaleNormal will throw an Exception if the scale is less than or equals 0
                 // that is OK when manually creating documents, but we should be able to read all documents
@@ -58,47 +70,68 @@ private function zoomScale(): void
 
             $this->worksheet->getSheetView()->setZoomScaleNormal($zoomScaleNormal);
         }
+
+        if (isset($this->sheetViewAttributes->zoomScalePageLayoutView)) {
+            $zoomScaleNormal = (int) ($this->sheetViewAttributes->zoomScalePageLayoutView);
+            if ($zoomScaleNormal > 0) {
+                $this->worksheet->getSheetView()->setZoomScalePageLayoutView($zoomScaleNormal);
+            }
+        }
+
+        if (isset($this->sheetViewAttributes->zoomScaleSheetLayoutView)) {
+            $zoomScaleNormal = (int) ($this->sheetViewAttributes->zoomScaleSheetLayoutView);
+            if ($zoomScaleNormal > 0) {
+                $this->worksheet->getSheetView()->setZoomScaleSheetLayoutView($zoomScaleNormal);
+            }
+        }
     }
 
     private function view(): void
     {
-        if (isset($this->sheetViewXml['view'])) {
-            $this->worksheet->getSheetView()->setView((string) $this->sheetViewXml['view']);
+        if (isset($this->sheetViewAttributes->view)) {
+            $this->worksheet->getSheetView()->setView((string) $this->sheetViewAttributes->view);
+        }
+    }
+
+    private function topLeft(): void
+    {
+        if (isset($this->sheetViewAttributes->topLeftCell)) {
+            $this->worksheet->setTopLeftCell($this->sheetViewAttributes->topLeftCell);
         }
     }
 
     private function gridLines(): void
     {
-        if (isset($this->sheetViewXml['showGridLines'])) {
+        if (isset($this->sheetViewAttributes->showGridLines)) {
             $this->worksheet->setShowGridLines(
-                self::boolean((string) $this->sheetViewXml['showGridLines'])
+                self::boolean((string) $this->sheetViewAttributes->showGridLines)
             );
         }
     }
 
     private function headers(): void
     {
-        if (isset($this->sheetViewXml['showRowColHeaders'])) {
+        if (isset($this->sheetViewAttributes->showRowColHeaders)) {
             $this->worksheet->setShowRowColHeaders(
-                self::boolean((string) $this->sheetViewXml['showRowColHeaders'])
+                self::boolean((string) $this->sheetViewAttributes->showRowColHeaders)
             );
         }
     }
 
     private function direction(): void
     {
-        if (isset($this->sheetViewXml['rightToLeft'])) {
+        if (isset($this->sheetViewAttributes->rightToLeft)) {
             $this->worksheet->setRightToLeft(
-                self::boolean((string) $this->sheetViewXml['rightToLeft'])
+                self::boolean((string) $this->sheetViewAttributes->rightToLeft)
             );
         }
     }
 
     private function showZeros(): void
     {
-        if (isset($this->sheetViewXml['showZeros'])) {
+        if (isset($this->sheetViewAttributes->showZeros)) {
             $this->worksheet->getSheetView()->setShowZeros(
-                self::boolean((string) $this->sheetViewXml['showZeros'])
+                self::boolean((string) $this->sheetViewAttributes->showZeros)
             );
         }
     }
@@ -108,31 +141,59 @@ private function pane(): void
         $xSplit = 0;
         $ySplit = 0;
         $topLeftCell = null;
+        $paneAttributes = $this->sheetViewXml->pane->attributes();
 
-        if (isset($this->sheetViewXml->pane['xSplit'])) {
-            $xSplit = (int) ($this->sheetViewXml->pane['xSplit']);
+        if (isset($paneAttributes->xSplit)) {
+            $xSplit = (int) ($paneAttributes->xSplit);
+            $this->worksheet->setXSplit($xSplit);
         }
 
-        if (isset($this->sheetViewXml->pane['ySplit'])) {
-            $ySplit = (int) ($this->sheetViewXml->pane['ySplit']);
+        if (isset($paneAttributes->ySplit)) {
+            $ySplit = (int) ($paneAttributes->ySplit);
+            $this->worksheet->setYSplit($ySplit);
         }
-
-        if (isset($this->sheetViewXml->pane['topLeftCell'])) {
-            $topLeftCell = (string) $this->sheetViewXml->pane['topLeftCell'];
+        $paneState = isset($paneAttributes->state) ? ((string) $paneAttributes->state) : '';
+        $this->worksheet->setPaneState($paneState);
+        if (isset($paneAttributes->topLeftCell)) {
+            $topLeftCell = (string) $paneAttributes->topLeftCell;
+            $this->worksheet->setPaneTopLeftCell($topLeftCell);
+            if ($paneState === Worksheet::PANE_FROZEN) {
+                $this->worksheet->setTopLeftCell($topLeftCell);
+            }
+        }
+        $activePane = isset($paneAttributes->activePane) ? ((string) $paneAttributes->activePane) : 'topLeft';
+        $this->worksheet->setActivePane($activePane);
+        $this->activePane = $activePane;
+        if ($paneState === Worksheet::PANE_FROZEN || $paneState === Worksheet::PANE_FROZENSPLIT) {
+            $this->worksheet->freezePane(
+                Coordinate::stringFromColumnIndex($xSplit + 1) . ($ySplit + 1),
+                $topLeftCell,
+                $paneState === Worksheet::PANE_FROZENSPLIT
+            );
         }
-
-        $this->worksheet->freezePane(
-            Coordinate::stringFromColumnIndex($xSplit + 1) . ($ySplit + 1),
-            $topLeftCell
-        );
     }
 
-    private function selection(): void
+    private function selection(?SimpleXMLElement $selection, bool $usesPanes): void
     {
-        $sqref = (string) $this->sheetViewXml->selection['sqref'];
-        $sqref = explode(' ', $sqref);
-        $sqref = $sqref[0];
-
-        $this->worksheet->setSelectedCells($sqref);
+        $attributes = ($selection === null) ? null : $selection->attributes();
+        if ($attributes !== null) {
+            $position = (string) $attributes->pane;
+            if ($usesPanes && $position === '') {
+                $position = 'topLeft';
+            }
+            $activeCell = (string) $attributes->activeCell;
+            $sqref = (string) $attributes->sqref;
+            $sqref = explode(' ', $sqref);
+            $sqref = $sqref[0];
+            if ($position === '') {
+                $this->worksheet->setSelectedCells($sqref);
+            } else {
+                $pane = new Pane($position, $sqref, $activeCell);
+                $this->worksheet->setPane($position, $pane);
+                if ($position === $this->activePane && $sqref !== '') {
+                    $this->worksheet->setSelectedCells($sqref);
+                }
+            }
+        }
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Styles.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Styles.php
index 80c320655b..0672854ad7 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Styles.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Styles.php
@@ -2,6 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheet\Reader\Xlsx;
 
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
 use PhpOffice\PhpSpreadsheet\Style\Alignment;
 use PhpOffice\PhpSpreadsheet\Style\Border;
 use PhpOffice\PhpSpreadsheet\Style\Borders;
@@ -12,211 +13,319 @@
 use PhpOffice\PhpSpreadsheet\Style\Protection;
 use PhpOffice\PhpSpreadsheet\Style\Style;
 use SimpleXMLElement;
+use stdClass;
 
 class Styles extends BaseParserClass
 {
     /**
      * Theme instance.
-     *
-     * @var Theme
      */
-    private static $theme = null;
+    private ?Theme $theme = null;
+
+    private array $workbookPalette = [];
+
+    private array $styles = [];
+
+    private array $cellStyles = [];
+
+    private SimpleXMLElement $styleXml;
+
+    private string $namespace = '';
+
+    public function setNamespace(string $namespace): void
+    {
+        $this->namespace = $namespace;
+    }
 
-    private $styles = [];
+    public function setWorkbookPalette(array $palette): void
+    {
+        $this->workbookPalette = $palette;
+    }
 
-    private $cellStyles = [];
+    private function getStyleAttributes(SimpleXMLElement $value): SimpleXMLElement
+    {
+        $attr = $value->attributes('');
+        if ($attr === null || count($attr) === 0) {
+            $attr = $value->attributes($this->namespace);
+        }
 
-    private $styleXml;
+        return Xlsx::testSimpleXml($attr);
+    }
 
-    public function __construct(SimpleXMLElement $styleXml)
+    public function setStyleXml(SimpleXMLElement $styleXml): void
     {
         $this->styleXml = $styleXml;
     }
 
-    public function setStyleBaseData(?Theme $theme = null, $styles = [], $cellStyles = []): void
+    public function setTheme(Theme $theme): void
     {
-        self::$theme = $theme;
+        $this->theme = $theme;
+    }
+
+    public function setStyleBaseData(?Theme $theme = null, array $styles = [], array $cellStyles = []): void
+    {
+        $this->theme = $theme;
         $this->styles = $styles;
         $this->cellStyles = $cellStyles;
     }
 
-    public static function readFontStyle(Font $fontStyle, SimpleXMLElement $fontStyleXml): void
+    public function readFontStyle(Font $fontStyle, SimpleXMLElement $fontStyleXml): void
     {
-        if (isset($fontStyleXml->name, $fontStyleXml->name['val'])) {
-            $fontStyle->setName((string) $fontStyleXml->name['val']);
+        if (isset($fontStyleXml->name)) {
+            $attr = $this->getStyleAttributes($fontStyleXml->name);
+            if (isset($attr['val'])) {
+                $fontStyle->setName((string) $attr['val']);
+            }
         }
-        if (isset($fontStyleXml->sz, $fontStyleXml->sz['val'])) {
-            $fontStyle->setSize((float) $fontStyleXml->sz['val']);
+        if (isset($fontStyleXml->sz)) {
+            $attr = $this->getStyleAttributes($fontStyleXml->sz);
+            if (isset($attr['val'])) {
+                $fontStyle->setSize((float) $attr['val']);
+            }
         }
         if (isset($fontStyleXml->b)) {
-            $fontStyle->setBold(!isset($fontStyleXml->b['val']) || self::boolean((string) $fontStyleXml->b['val']));
+            $attr = $this->getStyleAttributes($fontStyleXml->b);
+            $fontStyle->setBold(!isset($attr['val']) || self::boolean((string) $attr['val']));
         }
         if (isset($fontStyleXml->i)) {
-            $fontStyle->setItalic(!isset($fontStyleXml->i['val']) || self::boolean((string) $fontStyleXml->i['val']));
+            $attr = $this->getStyleAttributes($fontStyleXml->i);
+            $fontStyle->setItalic(!isset($attr['val']) || self::boolean((string) $attr['val']));
         }
         if (isset($fontStyleXml->strike)) {
-            $fontStyle->setStrikethrough(
-                !isset($fontStyleXml->strike['val']) || self::boolean((string) $fontStyleXml->strike['val'])
-            );
+            $attr = $this->getStyleAttributes($fontStyleXml->strike);
+            $fontStyle->setStrikethrough(!isset($attr['val']) || self::boolean((string) $attr['val']));
         }
-        $fontStyle->getColor()->setARGB(self::readColor($fontStyleXml->color));
+        $fontStyle->getColor()->setARGB($this->readColor($fontStyleXml->color));
 
-        if (isset($fontStyleXml->u) && !isset($fontStyleXml->u['val'])) {
-            $fontStyle->setUnderline(Font::UNDERLINE_SINGLE);
-        } elseif (isset($fontStyleXml->u, $fontStyleXml->u['val'])) {
-            $fontStyle->setUnderline((string) $fontStyleXml->u['val']);
+        if (isset($fontStyleXml->u)) {
+            $attr = $this->getStyleAttributes($fontStyleXml->u);
+            if (!isset($attr['val'])) {
+                $fontStyle->setUnderline(Font::UNDERLINE_SINGLE);
+            } else {
+                $fontStyle->setUnderline((string) $attr['val']);
+            }
         }
-
-        if (isset($fontStyleXml->vertAlign, $fontStyleXml->vertAlign['val'])) {
-            $verticalAlign = strtolower((string) $fontStyleXml->vertAlign['val']);
-            if ($verticalAlign === 'superscript') {
-                $fontStyle->setSuperscript(true);
-            } elseif ($verticalAlign === 'subscript') {
-                $fontStyle->setSubscript(true);
+        if (isset($fontStyleXml->vertAlign)) {
+            $attr = $this->getStyleAttributes($fontStyleXml->vertAlign);
+            if (isset($attr['val'])) {
+                $verticalAlign = strtolower((string) $attr['val']);
+                if ($verticalAlign === 'superscript') {
+                    $fontStyle->setSuperscript(true);
+                } elseif ($verticalAlign === 'subscript') {
+                    $fontStyle->setSubscript(true);
+                }
             }
         }
+        if (isset($fontStyleXml->scheme)) {
+            $attr = $this->getStyleAttributes($fontStyleXml->scheme);
+            $fontStyle->setScheme((string) $attr['val']);
+        }
     }
 
-    private static function readNumberFormat(NumberFormat $numfmtStyle, SimpleXMLElement $numfmtStyleXml): void
+    private function readNumberFormat(NumberFormat $numfmtStyle, SimpleXMLElement $numfmtStyleXml): void
     {
-        if ($numfmtStyleXml->count() === 0) {
+        if ((string) $numfmtStyleXml['formatCode'] !== '') {
+            $numfmtStyle->setFormatCode(self::formatGeneral((string) $numfmtStyleXml['formatCode']));
+
             return;
         }
-        $numfmt = $numfmtStyleXml->attributes();
-        if ($numfmt->count() > 0 && isset($numfmt['formatCode'])) {
-            $numfmtStyle->setFormatCode((string) $numfmt['formatCode']);
+        $numfmt = $this->getStyleAttributes($numfmtStyleXml);
+        if (isset($numfmt['formatCode'])) {
+            $numfmtStyle->setFormatCode(self::formatGeneral((string) $numfmt['formatCode']));
         }
     }
 
-    public static function readFillStyle(Fill $fillStyle, SimpleXMLElement $fillStyleXml): void
+    public function readFillStyle(Fill $fillStyle, SimpleXMLElement $fillStyleXml): void
     {
         if ($fillStyleXml->gradientFill) {
             /** @var SimpleXMLElement $gradientFill */
             $gradientFill = $fillStyleXml->gradientFill[0];
-            if (!empty($gradientFill['type'])) {
-                $fillStyle->setFillType((string) $gradientFill['type']);
+            $attr = $this->getStyleAttributes($gradientFill);
+            if (!empty($attr['type'])) {
+                $fillStyle->setFillType((string) $attr['type']);
             }
-            $fillStyle->setRotation((float) ($gradientFill['degree']));
-            $gradientFill->registerXPathNamespace('sml', 'http://schemas.openxmlformats.org/spreadsheetml/2006/main');
-            $fillStyle->getStartColor()->setARGB(
-                self::readColor(self::getArrayItem($gradientFill->xpath('sml:stop[@position=0]'))->color)
-            );
-            $fillStyle->getEndColor()->setARGB(
-                self::readColor(self::getArrayItem($gradientFill->xpath('sml:stop[@position=1]'))->color)
-            );
+            $fillStyle->setRotation((float) ($attr['degree']));
+            $gradientFill->registerXPathNamespace('sml', Namespaces::MAIN);
+            $fillStyle->getStartColor()->setARGB($this->readColor(self::getArrayItem($gradientFill->xpath('sml:stop[@position=0]'))->color)); //* @phpstan-ignore-line
+            $fillStyle->getEndColor()->setARGB($this->readColor(self::getArrayItem($gradientFill->xpath('sml:stop[@position=1]'))->color)); //* @phpstan-ignore-line
         } elseif ($fillStyleXml->patternFill) {
             $defaultFillStyle = Fill::FILL_NONE;
             if ($fillStyleXml->patternFill->fgColor) {
-                $fillStyle->getStartColor()->setARGB(self::readColor($fillStyleXml->patternFill->fgColor, true));
+                $fillStyle->getStartColor()->setARGB($this->readColor($fillStyleXml->patternFill->fgColor, true));
                 $defaultFillStyle = Fill::FILL_SOLID;
             }
             if ($fillStyleXml->patternFill->bgColor) {
-                $fillStyle->getEndColor()->setARGB(self::readColor($fillStyleXml->patternFill->bgColor, true));
+                $fillStyle->getEndColor()->setARGB($this->readColor($fillStyleXml->patternFill->bgColor, true));
                 $defaultFillStyle = Fill::FILL_SOLID;
             }
 
-            $patternType = (string) $fillStyleXml->patternFill['patternType'] != ''
-                ? (string) $fillStyleXml->patternFill['patternType']
-                : $defaultFillStyle;
+            $type = '';
+            if ((string) $fillStyleXml->patternFill['patternType'] !== '') {
+                $type = (string) $fillStyleXml->patternFill['patternType'];
+            } else {
+                $attr = $this->getStyleAttributes($fillStyleXml->patternFill);
+                $type = (string) $attr['patternType'];
+            }
+            $patternType = ($type === '') ? $defaultFillStyle : $type;
 
             $fillStyle->setFillType($patternType);
         }
     }
 
-    public static function readBorderStyle(Borders $borderStyle, SimpleXMLElement $borderStyleXml): void
+    public function readBorderStyle(Borders $borderStyle, SimpleXMLElement $borderStyleXml): void
     {
-        $diagonalUp = self::boolean((string) $borderStyleXml['diagonalUp']);
-        $diagonalDown = self::boolean((string) $borderStyleXml['diagonalDown']);
-        if (!$diagonalUp && !$diagonalDown) {
-            $borderStyle->setDiagonalDirection(Borders::DIAGONAL_NONE);
-        } elseif ($diagonalUp && !$diagonalDown) {
+        $diagonalUp = $this->getAttribute($borderStyleXml, 'diagonalUp');
+        $diagonalUp = self::boolean($diagonalUp);
+        $diagonalDown = $this->getAttribute($borderStyleXml, 'diagonalDown');
+        $diagonalDown = self::boolean($diagonalDown);
+        if ($diagonalUp === false) {
+            if ($diagonalDown === false) {
+                $borderStyle->setDiagonalDirection(Borders::DIAGONAL_NONE);
+            } else {
+                $borderStyle->setDiagonalDirection(Borders::DIAGONAL_DOWN);
+            }
+        } elseif ($diagonalDown === false) {
             $borderStyle->setDiagonalDirection(Borders::DIAGONAL_UP);
-        } elseif (!$diagonalUp && $diagonalDown) {
-            $borderStyle->setDiagonalDirection(Borders::DIAGONAL_DOWN);
         } else {
             $borderStyle->setDiagonalDirection(Borders::DIAGONAL_BOTH);
         }
 
-        self::readBorder($borderStyle->getLeft(), $borderStyleXml->left);
-        self::readBorder($borderStyle->getRight(), $borderStyleXml->right);
-        self::readBorder($borderStyle->getTop(), $borderStyleXml->top);
-        self::readBorder($borderStyle->getBottom(), $borderStyleXml->bottom);
-        self::readBorder($borderStyle->getDiagonal(), $borderStyleXml->diagonal);
+        if (isset($borderStyleXml->left)) {
+            $this->readBorder($borderStyle->getLeft(), $borderStyleXml->left);
+        }
+        if (isset($borderStyleXml->right)) {
+            $this->readBorder($borderStyle->getRight(), $borderStyleXml->right);
+        }
+        if (isset($borderStyleXml->top)) {
+            $this->readBorder($borderStyle->getTop(), $borderStyleXml->top);
+        }
+        if (isset($borderStyleXml->bottom)) {
+            $this->readBorder($borderStyle->getBottom(), $borderStyleXml->bottom);
+        }
+        if (isset($borderStyleXml->diagonal)) {
+            $this->readBorder($borderStyle->getDiagonal(), $borderStyleXml->diagonal);
+        }
+    }
+
+    private function getAttribute(SimpleXMLElement $xml, string $attribute): string
+    {
+        $style = '';
+        if ((string) $xml[$attribute] !== '') {
+            $style = (string) $xml[$attribute];
+        } else {
+            $attr = $this->getStyleAttributes($xml);
+            if (isset($attr[$attribute])) {
+                $style = (string) $attr[$attribute];
+            }
+        }
+
+        return $style;
     }
 
-    private static function readBorder(Border $border, SimpleXMLElement $borderXml): void
+    private function readBorder(Border $border, SimpleXMLElement $borderXml): void
     {
-        if (isset($borderXml['style'])) {
-            $border->setBorderStyle((string) $borderXml['style']);
+        $style = $this->getAttribute($borderXml, 'style');
+        if ($style !== '') {
+            $border->setBorderStyle((string) $style);
+        } else {
+            $border->setBorderStyle(Border::BORDER_NONE);
         }
         if (isset($borderXml->color)) {
-            $border->getColor()->setARGB(self::readColor($borderXml->color));
+            $border->getColor()->setARGB($this->readColor($borderXml->color));
+        }
+    }
+
+    public function readAlignmentStyle(Alignment $alignment, SimpleXMLElement $alignmentXml): void
+    {
+        $horizontal = (string) $this->getAttribute($alignmentXml, 'horizontal');
+        if ($horizontal !== '') {
+            $alignment->setHorizontal($horizontal);
+        }
+        $vertical = (string) $this->getAttribute($alignmentXml, 'vertical');
+        if ($vertical !== '') {
+            $alignment->setVertical($vertical);
+        }
+
+        $textRotation = (int) $this->getAttribute($alignmentXml, 'textRotation');
+        if ($textRotation > 90) {
+            $textRotation = 90 - $textRotation;
         }
+        $alignment->setTextRotation($textRotation);
+
+        $wrapText = $this->getAttribute($alignmentXml, 'wrapText');
+        $alignment->setWrapText(self::boolean((string) $wrapText));
+        $shrinkToFit = $this->getAttribute($alignmentXml, 'shrinkToFit');
+        $alignment->setShrinkToFit(self::boolean((string) $shrinkToFit));
+        $indent = (int) $this->getAttribute($alignmentXml, 'indent');
+        $alignment->setIndent(max($indent, 0));
+        $readingOrder = (int) $this->getAttribute($alignmentXml, 'readingOrder');
+        $alignment->setReadOrder(max($readingOrder, 0));
     }
 
-    public static function readAlignmentStyle(Alignment $alignment, SimpleXMLElement $alignmentXml): void
+    private static function formatGeneral(string $formatString): string
     {
-        $alignment->setHorizontal((string) $alignmentXml['horizontal']);
-        $alignment->setVertical((string) $alignmentXml['vertical']);
-
-        $textRotation = 0;
-        if ((int) $alignmentXml['textRotation'] <= 90) {
-            $textRotation = (int) $alignmentXml['textRotation'];
-        } elseif ((int) $alignmentXml['textRotation'] > 90) {
-            $textRotation = 90 - (int) $alignmentXml['textRotation'];
-        }
-
-        $alignment->setTextRotation((int) $textRotation);
-        $alignment->setWrapText(self::boolean((string) $alignmentXml['wrapText']));
-        $alignment->setShrinkToFit(self::boolean((string) $alignmentXml['shrinkToFit']));
-        $alignment->setIndent(
-            (int) ((string) $alignmentXml['indent']) > 0 ? (int) ((string) $alignmentXml['indent']) : 0
-        );
-        $alignment->setReadOrder(
-            (int) ((string) $alignmentXml['readingOrder']) > 0 ? (int) ((string) $alignmentXml['readingOrder']) : 0
-        );
+        if ($formatString === 'GENERAL') {
+            $formatString = NumberFormat::FORMAT_GENERAL;
+        }
+
+        return $formatString;
     }
 
-    private function readStyle(Style $docStyle, $style): void
+    /**
+     * Read style.
+     */
+    public function readStyle(Style $docStyle, SimpleXMLElement|stdClass $style): void
     {
-        if ($style->numFmt instanceof SimpleXMLElement) {
-            self::readNumberFormat($docStyle->getNumberFormat(), $style->numFmt);
+        if ($style instanceof SimpleXMLElement) {
+            $this->readNumberFormat($docStyle->getNumberFormat(), $style->numFmt);
         } else {
-            $docStyle->getNumberFormat()->setFormatCode($style->numFmt);
+            $docStyle->getNumberFormat()->setFormatCode(self::formatGeneral((string) $style->numFmt));
         }
 
         if (isset($style->font)) {
-            self::readFontStyle($docStyle->getFont(), $style->font);
+            $this->readFontStyle($docStyle->getFont(), $style->font);
         }
 
         if (isset($style->fill)) {
-            self::readFillStyle($docStyle->getFill(), $style->fill);
+            $this->readFillStyle($docStyle->getFill(), $style->fill);
         }
 
         if (isset($style->border)) {
-            self::readBorderStyle($docStyle->getBorders(), $style->border);
+            $this->readBorderStyle($docStyle->getBorders(), $style->border);
         }
 
-        if (isset($style->alignment->alignment)) {
-            self::readAlignmentStyle($docStyle->getAlignment(), $style->alignment);
+        if (isset($style->alignment)) {
+            $this->readAlignmentStyle($docStyle->getAlignment(), $style->alignment);
         }
 
         // protection
         if (isset($style->protection)) {
-            self::readProtectionLocked($docStyle, $style);
-            self::readProtectionHidden($docStyle, $style);
+            $this->readProtectionLocked($docStyle, $style->protection);
+            $this->readProtectionHidden($docStyle, $style->protection);
         }
 
         // top-level style settings
         if (isset($style->quotePrefix)) {
-            $docStyle->setQuotePrefix(true);
+            $docStyle->setQuotePrefix((bool) $style->quotePrefix);
         }
     }
 
-    public static function readProtectionLocked(Style $docStyle, $style): void
+    /**
+     * Read protection locked attribute.
+     */
+    public function readProtectionLocked(Style $docStyle, SimpleXMLElement $style): void
     {
-        if (isset($style->protection['locked'])) {
-            if (self::boolean((string) $style->protection['locked'])) {
+        $locked = '';
+        if ((string) $style['locked'] !== '') {
+            $locked = (string) $style['locked'];
+        } else {
+            $attr = $this->getStyleAttributes($style);
+            if (isset($attr['locked'])) {
+                $locked = (string) $attr['locked'];
+            }
+        }
+        if ($locked !== '') {
+            if (self::boolean($locked)) {
                 $docStyle->getProtection()->setLocked(Protection::PROTECTION_PROTECTED);
             } else {
                 $docStyle->getProtection()->setLocked(Protection::PROTECTION_UNPROTECTED);
@@ -224,10 +333,22 @@ public static function readProtectionLocked(Style $docStyle, $style): void
         }
     }
 
-    public static function readProtectionHidden(Style $docStyle, $style): void
+    /**
+     * Read protection hidden attribute.
+     */
+    public function readProtectionHidden(Style $docStyle, SimpleXMLElement $style): void
     {
-        if (isset($style->protection['hidden'])) {
-            if (self::boolean((string) $style->protection['hidden'])) {
+        $hidden = '';
+        if ((string) $style['hidden'] !== '') {
+            $hidden = (string) $style['hidden'];
+        } else {
+            $attr = $this->getStyleAttributes($style);
+            if (isset($attr['hidden'])) {
+                $hidden = (string) $attr['hidden'];
+            }
+        }
+        if ($hidden !== '') {
+            if (self::boolean((string) $hidden)) {
                 $docStyle->getProtection()->setHidden(Protection::PROTECTION_PROTECTED);
             } else {
                 $docStyle->getProtection()->setHidden(Protection::PROTECTION_UNPROTECTED);
@@ -235,18 +356,26 @@ public static function readProtectionHidden(Style $docStyle, $style): void
         }
     }
 
-    public static function readColor($color, $background = false)
+    public function readColor(SimpleXMLElement $color, bool $background = false): string
     {
-        if (isset($color['rgb'])) {
-            return (string) $color['rgb'];
-        } elseif (isset($color['indexed'])) {
-            return Color::indexedColor($color['indexed'] - 7, $background)->getARGB();
-        } elseif (isset($color['theme'])) {
-            if (self::$theme !== null) {
-                $returnColour = self::$theme->getColourByIndex((int) $color['theme']);
-                if (isset($color['tint'])) {
-                    $tintAdjust = (float) $color['tint'];
-                    $returnColour = Color::changeBrightness($returnColour, $tintAdjust);
+        $attr = $this->getStyleAttributes($color);
+        if (isset($attr['rgb'])) {
+            return (string) $attr['rgb'];
+        }
+        if (isset($attr['indexed'])) {
+            $indexedColor = (int) $attr['indexed'];
+            if ($indexedColor >= count($this->workbookPalette)) {
+                return Color::indexedColor($indexedColor - 7, $background)->getARGB() ?? '';
+            }
+
+            return Color::indexedColor($indexedColor, $background, $this->workbookPalette)->getARGB() ?? '';
+        }
+        if (isset($attr['theme'])) {
+            if ($this->theme !== null) {
+                $returnColour = $this->theme->getColourByIndex((int) $attr['theme']);
+                if (isset($attr['tint'])) {
+                    $tintAdjust = (float) $attr['tint'];
+                    $returnColour = Color::changeBrightness($returnColour ?? '', $tintAdjust);
                 }
 
                 return 'FF' . $returnColour;
@@ -256,7 +385,7 @@ public static function readColor($color, $background = false)
         return ($background) ? 'FFFFFFFF' : 'FF000000';
     }
 
-    public function dxfs($readDataOnly = false)
+    public function dxfs(bool $readDataOnly = false): array
     {
         $dxfs = [];
         if (!$readDataOnly && $this->styleXml) {
@@ -270,7 +399,8 @@ public function dxfs($readDataOnly = false)
             }
             //    Cell Styles
             if ($this->styleXml->cellStyles) {
-                foreach ($this->styleXml->cellStyles->cellStyle as $cellStyle) {
+                foreach ($this->styleXml->cellStyles->cellStyle as $cellStylex) {
+                    $cellStyle = Xlsx::getAttributes($cellStylex);
                     if ((int) ($cellStyle['builtinId']) == 0) {
                         if (isset($this->cellStyles[(int) ($cellStyle['xfId'])])) {
                             // Set default style
@@ -287,13 +417,18 @@ public function dxfs($readDataOnly = false)
         return $dxfs;
     }
 
-    public function styles()
+    public function styles(): array
     {
         return $this->styles;
     }
 
-    private static function getArrayItem($array, $key = 0)
+    /**
+     * Get array item.
+     *
+     * @param mixed $array (usually array, in theory can be false)
+     */
+    private static function getArrayItem(mixed $array): ?SimpleXMLElement
     {
-        return $array[$key] ?? null;
+        return is_array($array) ? ($array[0] ?? null) : null;
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/TableReader.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/TableReader.php
new file mode 100644
index 0000000000..a63c817d4f
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/TableReader.php
@@ -0,0 +1,116 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Worksheet\Table;
+use PhpOffice\PhpSpreadsheet\Worksheet\Table\TableStyle;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use SimpleXMLElement;
+
+class TableReader
+{
+    private Worksheet $worksheet;
+
+    private SimpleXMLElement $tableXml;
+
+    /** @var array|SimpleXMLElement */
+    private $tableAttributes;
+
+    public function __construct(Worksheet $workSheet, SimpleXMLElement $tableXml)
+    {
+        $this->worksheet = $workSheet;
+        $this->tableXml = $tableXml;
+    }
+
+    /**
+     * Loads Table into the Worksheet.
+     */
+    public function load(): void
+    {
+        $this->tableAttributes = $this->tableXml->attributes() ?? [];
+        // Remove all "$" in the table range
+        $tableRange = (string) preg_replace('/\$/', '', $this->tableAttributes['ref'] ?? '');
+        if (str_contains($tableRange, ':')) {
+            $this->readTable($tableRange);
+        }
+    }
+
+    /**
+     * Read Table from xml.
+     */
+    private function readTable(string $tableRange): void
+    {
+        $table = new Table($tableRange);
+        $table->setName((string) ($this->tableAttributes['displayName'] ?? ''));
+        $table->setShowHeaderRow(((string) ($this->tableAttributes['headerRowCount'] ?? '')) !== '0');
+        $table->setShowTotalsRow(((string) ($this->tableAttributes['totalsRowCount'] ?? '')) === '1');
+
+        $this->readTableAutoFilter($table, $this->tableXml->autoFilter);
+        $this->readTableColumns($table, $this->tableXml->tableColumns);
+        $this->readTableStyle($table, $this->tableXml->tableStyleInfo);
+
+        (new AutoFilter($table, $this->tableXml))->load();
+        $this->worksheet->addTable($table);
+    }
+
+    /**
+     * Reads TableAutoFilter from xml.
+     */
+    private function readTableAutoFilter(Table $table, SimpleXMLElement $autoFilterXml): void
+    {
+        if ($autoFilterXml->filterColumn === null) {
+            $table->setAllowFilter(false);
+
+            return;
+        }
+
+        foreach ($autoFilterXml->filterColumn as $filterColumn) {
+            $attributes = $filterColumn->attributes() ?? ['colId' => 0, 'hiddenButton' => 0];
+            $column = $table->getColumnByOffset((int) $attributes['colId']);
+            $column->setShowFilterButton(((string) $attributes['hiddenButton']) !== '1');
+        }
+    }
+
+    /**
+     * Reads TableColumns from xml.
+     */
+    private function readTableColumns(Table $table, SimpleXMLElement $tableColumnsXml): void
+    {
+        $offset = 0;
+        foreach ($tableColumnsXml->tableColumn as $tableColumn) {
+            $attributes = $tableColumn->attributes() ?? ['totalsRowLabel' => 0, 'totalsRowFunction' => 0];
+            $column = $table->getColumnByOffset($offset++);
+
+            if ($table->getShowTotalsRow()) {
+                if ($attributes['totalsRowLabel']) {
+                    $column->setTotalsRowLabel((string) $attributes['totalsRowLabel']);
+                }
+
+                if ($attributes['totalsRowFunction']) {
+                    $column->setTotalsRowFunction((string) $attributes['totalsRowFunction']);
+                }
+            }
+
+            if ($tableColumn->calculatedColumnFormula) {
+                $column->setColumnFormula((string) $tableColumn->calculatedColumnFormula);
+            }
+        }
+    }
+
+    /**
+     * Reads TableStyle from xml.
+     */
+    private function readTableStyle(Table $table, SimpleXMLElement $tableStyleInfoXml): void
+    {
+        $tableStyle = new TableStyle();
+        $attributes = $tableStyleInfoXml->attributes();
+        if ($attributes !== null) {
+            $tableStyle->setTheme((string) $attributes['name']);
+            $tableStyle->setShowRowStripes((string) $attributes['showRowStripes'] === '1');
+            $tableStyle->setShowColumnStripes((string) $attributes['showColumnStripes'] === '1');
+            $tableStyle->setShowFirstColumn((string) $attributes['showFirstColumn'] === '1');
+            $tableStyle->setShowLastColumn((string) $attributes['showLastColumn'] === '1');
+        }
+        $table->setStyle($tableStyle);
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Theme.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Theme.php
index 1f2b863c78..4a31c3e18b 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Theme.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Theme.php
@@ -6,33 +6,27 @@ class Theme
 {
     /**
      * Theme Name.
-     *
-     * @var string
      */
-    private $themeName;
+    private string $themeName;
 
     /**
      * Colour Scheme Name.
-     *
-     * @var string
      */
-    private $colourSchemeName;
+    private string $colourSchemeName;
 
     /**
      * Colour Map.
      *
      * @var string[]
      */
-    private $colourMap;
+    private array $colourMap;
 
     /**
      * Create a new Theme.
      *
-     * @param string $themeName
-     * @param string $colourSchemeName
      * @param string[] $colourMap
      */
-    public function __construct($themeName, $colourSchemeName, $colourMap)
+    public function __construct(string $themeName, string $colourSchemeName, array $colourMap)
     {
         // Initialise values
         $this->themeName = $themeName;
@@ -41,53 +35,30 @@ public function __construct($themeName, $colourSchemeName, $colourMap)
     }
 
     /**
-     * Get Theme Name.
+     * Not called by Reader, never accessible any other time.
      *
-     * @return string
+     * @codeCoverageIgnore
      */
-    public function getThemeName()
+    public function getThemeName(): string
     {
         return $this->themeName;
     }
 
     /**
-     * Get colour Scheme Name.
+     * Not called by Reader, never accessible any other time.
      *
-     * @return string
+     * @codeCoverageIgnore
      */
-    public function getColourSchemeName()
+    public function getColourSchemeName(): string
     {
         return $this->colourSchemeName;
     }
 
     /**
      * Get colour Map Value by Position.
-     *
-     * @param int $index
-     *
-     * @return null|string
-     */
-    public function getColourByIndex($index)
-    {
-        if (isset($this->colourMap[$index])) {
-            return $this->colourMap[$index];
-        }
-
-        return null;
-    }
-
-    /**
-     * Implement PHP __clone to create a deep clone, not just a shallow copy.
      */
-    public function __clone()
+    public function getColourByIndex(int $index): ?string
     {
-        $vars = get_object_vars($this);
-        foreach ($vars as $key => $value) {
-            if ((is_object($value)) && ($key != '_parent')) {
-                $this->$key = clone $value;
-            } else {
-                $this->$key = $value;
-            }
-        }
+        return $this->colourMap[$index] ?? null;
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/WorkbookView.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/WorkbookView.php
new file mode 100644
index 0000000000..70146ed4fb
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/WorkbookView.php
@@ -0,0 +1,141 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use SimpleXMLElement;
+
+class WorkbookView
+{
+    private Spreadsheet $spreadsheet;
+
+    public function __construct(Spreadsheet $spreadsheet)
+    {
+        $this->spreadsheet = $spreadsheet;
+    }
+
+    public function viewSettings(SimpleXMLElement $xmlWorkbook, string $mainNS, array $mapSheetId, bool $readDataOnly): void
+    {
+        // Default active sheet index to the first loaded worksheet from the file
+        $this->spreadsheet->setActiveSheetIndex(0);
+
+        $workbookView = $xmlWorkbook->children($mainNS)->bookViews->workbookView;
+        if ($readDataOnly !== true && !empty($workbookView)) {
+            $workbookViewAttributes = self::testSimpleXml(self::getAttributes($workbookView));
+            // active sheet index
+            $activeTab = (int) $workbookViewAttributes->activeTab; // refers to old sheet index
+            // keep active sheet index if sheet is still loaded, else first sheet is set as the active worksheet
+            if (isset($mapSheetId[$activeTab]) && $mapSheetId[$activeTab] !== null) {
+                $this->spreadsheet->setActiveSheetIndex($mapSheetId[$activeTab]);
+            }
+
+            $this->horizontalScroll($workbookViewAttributes);
+            $this->verticalScroll($workbookViewAttributes);
+            $this->sheetTabs($workbookViewAttributes);
+            $this->minimized($workbookViewAttributes);
+            $this->autoFilterDateGrouping($workbookViewAttributes);
+            $this->firstSheet($workbookViewAttributes);
+            $this->visibility($workbookViewAttributes);
+            $this->tabRatio($workbookViewAttributes);
+        }
+    }
+
+    public static function testSimpleXml(mixed $value): SimpleXMLElement
+    {
+        return ($value instanceof SimpleXMLElement)
+            ? $value
+            : new SimpleXMLElement('<?xml version="1.0" encoding="UTF-8"?><root></root>');
+    }
+
+    public static function getAttributes(?SimpleXMLElement $value, string $ns = ''): SimpleXMLElement
+    {
+        return self::testSimpleXml($value === null ? $value : $value->attributes($ns));
+    }
+
+    /**
+     * Convert an 'xsd:boolean' XML value to a PHP boolean value.
+     * A valid 'xsd:boolean' XML value can be one of the following
+     * four values: 'true', 'false', '1', '0'.  It is case sensitive.
+     *
+     * Note that just doing '(bool) $xsdBoolean' is not safe,
+     * since '(bool) "false"' returns true.
+     *
+     * @see https://www.w3.org/TR/xmlschema11-2/#boolean
+     *
+     * @param string $xsdBoolean An XML string value of type 'xsd:boolean'
+     *
+     * @return bool  Boolean value
+     */
+    private function castXsdBooleanToBool(string $xsdBoolean): bool
+    {
+        if ($xsdBoolean === 'false') {
+            return false;
+        }
+
+        return (bool) $xsdBoolean;
+    }
+
+    private function horizontalScroll(SimpleXMLElement $workbookViewAttributes): void
+    {
+        if (isset($workbookViewAttributes->showHorizontalScroll)) {
+            $showHorizontalScroll = (string) $workbookViewAttributes->showHorizontalScroll;
+            $this->spreadsheet->setShowHorizontalScroll($this->castXsdBooleanToBool($showHorizontalScroll));
+        }
+    }
+
+    private function verticalScroll(SimpleXMLElement $workbookViewAttributes): void
+    {
+        if (isset($workbookViewAttributes->showVerticalScroll)) {
+            $showVerticalScroll = (string) $workbookViewAttributes->showVerticalScroll;
+            $this->spreadsheet->setShowVerticalScroll($this->castXsdBooleanToBool($showVerticalScroll));
+        }
+    }
+
+    private function sheetTabs(SimpleXMLElement $workbookViewAttributes): void
+    {
+        if (isset($workbookViewAttributes->showSheetTabs)) {
+            $showSheetTabs = (string) $workbookViewAttributes->showSheetTabs;
+            $this->spreadsheet->setShowSheetTabs($this->castXsdBooleanToBool($showSheetTabs));
+        }
+    }
+
+    private function minimized(SimpleXMLElement $workbookViewAttributes): void
+    {
+        if (isset($workbookViewAttributes->minimized)) {
+            $minimized = (string) $workbookViewAttributes->minimized;
+            $this->spreadsheet->setMinimized($this->castXsdBooleanToBool($minimized));
+        }
+    }
+
+    private function autoFilterDateGrouping(SimpleXMLElement $workbookViewAttributes): void
+    {
+        if (isset($workbookViewAttributes->autoFilterDateGrouping)) {
+            $autoFilterDateGrouping = (string) $workbookViewAttributes->autoFilterDateGrouping;
+            $this->spreadsheet->setAutoFilterDateGrouping($this->castXsdBooleanToBool($autoFilterDateGrouping));
+        }
+    }
+
+    private function firstSheet(SimpleXMLElement $workbookViewAttributes): void
+    {
+        if (isset($workbookViewAttributes->firstSheet)) {
+            $firstSheet = (string) $workbookViewAttributes->firstSheet;
+            $this->spreadsheet->setFirstSheetIndex((int) $firstSheet);
+        }
+    }
+
+    private function visibility(SimpleXMLElement $workbookViewAttributes): void
+    {
+        if (isset($workbookViewAttributes->visibility)) {
+            $visibility = (string) $workbookViewAttributes->visibility;
+            $this->spreadsheet->setVisibility($visibility);
+        }
+    }
+
+    private function tabRatio(SimpleXMLElement $workbookViewAttributes): void
+    {
+        if (isset($workbookViewAttributes->tabRatio)) {
+            $tabRatio = (string) $workbookViewAttributes->tabRatio;
+            $this->spreadsheet->setTabRatio((int) $tabRatio);
+        }
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml.php
index 4ef4efe7b5..e0f2187476 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml.php
@@ -8,7 +8,9 @@
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Cell\DataType;
 use PhpOffice\PhpSpreadsheet\DefinedName;
+use PhpOffice\PhpSpreadsheet\Helper\Html as HelperHtml;
 use PhpOffice\PhpSpreadsheet\Reader\Security\XmlScanner;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Namespaces;
 use PhpOffice\PhpSpreadsheet\Reader\Xml\PageSettings;
 use PhpOffice\PhpSpreadsheet\Reader\Xml\Properties;
 use PhpOffice\PhpSpreadsheet\Reader\Xml\Style;
@@ -18,19 +20,22 @@
 use PhpOffice\PhpSpreadsheet\Shared\File;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\SheetView;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 use SimpleXMLElement;
+use Throwable;
 
 /**
  * Reader for SpreadsheetML, the XML schema for Microsoft Office Excel 2003.
  */
 class Xml extends BaseReader
 {
+    public const NAMESPACES_SS = 'urn:schemas-microsoft-com:office:spreadsheet';
+
     /**
      * Formats.
-     *
-     * @var array
      */
-    protected $styles = [];
+    protected array $styles = [];
 
     /**
      * Create a new Excel2003XML Reader instance.
@@ -41,7 +46,9 @@ public function __construct()
         $this->securityScanner = XmlScanner::getInstance($this);
     }
 
-    private $fileContents = '';
+    private string $fileContents = '';
+
+    private string $xmlFailMessage = '';
 
     public static function xmlMappings(): array
     {
@@ -53,12 +60,8 @@ public static function xmlMappings(): array
 
     /**
      * Can the current IReader read the file?
-     *
-     * @param string $pFilename
-     *
-     * @return bool
      */
-    public function canRead($pFilename)
+    public function canRead(string $filename): bool
     {
         //    Office                    xmlns:o="urn:schemas-microsoft-com:office:office"
         //    Excel                    xmlns:x="urn:schemas-microsoft-com:office:excel"
@@ -76,7 +79,7 @@ public function canRead($pFilename)
         ];
 
         // Open file
-        $data = file_get_contents($pFilename);
+        $data = file_get_contents($filename) ?: '';
 
         // Why?
         //$data = str_replace("'", '"', $data); // fix headers with single quote
@@ -84,7 +87,7 @@ public function canRead($pFilename)
         $valid = true;
         foreach ($signature as $match) {
             // every part of the signature must be present
-            if (strpos($data, $match) === false) {
+            if (!str_contains($data, $match)) {
                 $valid = false;
 
                 break;
@@ -94,9 +97,9 @@ public function canRead($pFilename)
         //    Retrieve charset encoding
         if (preg_match('/<?xml.*encoding=[\'"](.*?)[\'"].*?>/m', $data, $matches)) {
             $charSet = strtoupper($matches[1]);
-            if (1 == preg_match('/^ISO-8859-\d[\dL]?$/i', $charSet)) {
+            if (preg_match('/^ISO-8859-\d[\dL]?$/i', $charSet) === 1) {
                 $data = StringHelper::convertEncoding($data, 'UTF-8', $charSet);
-                $data = preg_replace('/(<?xml.*encoding=[\'"]).*?([\'"].*?>)/um', '$1' . 'UTF-8' . '$2', $data, 1);
+                $data = (string) preg_replace('/(<?xml.*encoding=[\'"]).*?([\'"].*?>)/um', '$1' . 'UTF-8' . '$2', $data, 1);
             }
         }
         $this->fileContents = $data;
@@ -104,23 +107,34 @@ public function canRead($pFilename)
         return $valid;
     }
 
-    /**
-     * Check if the file is a valid SimpleXML.
-     *
-     * @param string $pFilename
-     *
-     * @return false|SimpleXMLElement
-     */
-    public function trySimpleXMLLoadString($pFilename)
+    /** @return false|SimpleXMLElement */
+    private function trySimpleXMLLoadStringPrivate(string $filename, string $fileOrString = 'file'): SimpleXMLElement|bool
     {
+        $this->xmlFailMessage = "Cannot load invalid XML $fileOrString: " . $filename;
+        $xml = false;
+
         try {
-            $xml = simplexml_load_string(
-                $this->securityScanner->scan($this->fileContents ?: file_get_contents($pFilename)),
-                'SimpleXMLElement',
-                Settings::getLibXmlLoaderOptions()
-            );
-        } catch (\Exception $e) {
-            throw new Exception('Cannot load invalid XML file: ' . $pFilename, 0, $e);
+            $data = $this->fileContents;
+            $continue = true;
+            if ($data === '' && $fileOrString === 'file') {
+                if ($filename === '') {
+                    $this->xmlFailMessage = 'Cannot load empty path';
+                    $continue = false;
+                } else {
+                    $datax = @file_get_contents($filename);
+                    $data = $datax ?: '';
+                    $continue = $datax !== false;
+                }
+            }
+            if ($continue) {
+                $xml = @simplexml_load_string(
+                    $this->getSecurityScannerOrThrow()->scan($data),
+                    'SimpleXMLElement',
+                    Settings::getLibXmlLoaderOptions()
+                );
+            }
+        } catch (Throwable $e) {
+            throw new Exception($this->xmlFailMessage, 0, $e);
         }
         $this->fileContents = '';
 
@@ -129,12 +143,8 @@ public function trySimpleXMLLoadString($pFilename)
 
     /**
      * Reads names of the worksheets from a file, without parsing the whole file to a Spreadsheet object.
-     *
-     * @param string $filename
-     *
-     * @return array
      */
-    public function listWorksheetNames($filename)
+    public function listWorksheetNames(string $filename): array
     {
         File::assertFile($filename);
         if (!$this->canRead($filename)) {
@@ -143,16 +153,14 @@ public function listWorksheetNames($filename)
 
         $worksheetNames = [];
 
-        $xml = $this->trySimpleXMLLoadString($filename);
+        $xml = $this->trySimpleXMLLoadStringPrivate($filename);
         if ($xml === false) {
             throw new Exception("Problem reading {$filename}");
         }
 
-        $namespaces = $xml->getNamespaces(true);
-
-        $xml_ss = $xml->children($namespaces['ss']);
+        $xml_ss = $xml->children(self::NAMESPACES_SS);
         foreach ($xml_ss->Worksheet as $worksheet) {
-            $worksheet_ss = self::getAttributes($worksheet, $namespaces['ss']);
+            $worksheet_ss = self::getAttributes($worksheet, self::NAMESPACES_SS);
             $worksheetNames[] = (string) $worksheet_ss['Name'];
         }
 
@@ -161,12 +169,8 @@ public function listWorksheetNames($filename)
 
     /**
      * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns).
-     *
-     * @param string $filename
-     *
-     * @return array
      */
-    public function listWorksheetInfo($filename)
+    public function listWorksheetInfo(string $filename): array
     {
         File::assertFile($filename);
         if (!$this->canRead($filename)) {
@@ -175,17 +179,15 @@ public function listWorksheetInfo($filename)
 
         $worksheetInfo = [];
 
-        $xml = $this->trySimpleXMLLoadString($filename);
+        $xml = $this->trySimpleXMLLoadStringPrivate($filename);
         if ($xml === false) {
             throw new Exception("Problem reading {$filename}");
         }
 
-        $namespaces = $xml->getNamespaces(true);
-
         $worksheetID = 1;
-        $xml_ss = $xml->children($namespaces['ss']);
+        $xml_ss = $xml->children(self::NAMESPACES_SS);
         foreach ($xml_ss->Worksheet as $worksheet) {
-            $worksheet_ss = self::getAttributes($worksheet, $namespaces['ss']);
+            $worksheet_ss = self::getAttributes($worksheet, self::NAMESPACES_SS);
 
             $tmpInfo = [];
             $tmpInfo['worksheetName'] = '';
@@ -233,14 +235,23 @@ public function listWorksheetInfo($filename)
         return $worksheetInfo;
     }
 
+    /**
+     * Loads Spreadsheet from string.
+     */
+    public function loadSpreadsheetFromString(string $contents): Spreadsheet
+    {
+        // Create new Spreadsheet
+        $spreadsheet = new Spreadsheet();
+        $spreadsheet->removeSheetByIndex(0);
+
+        // Load into this instance
+        return $this->loadIntoExisting($contents, $spreadsheet, true);
+    }
+
     /**
      * Loads Spreadsheet from file.
-     *
-     * @param string $filename
-     *
-     * @return Spreadsheet
      */
-    public function load($filename)
+    protected function loadSpreadsheetFromFile(string $filename): Spreadsheet
     {
         // Create new Spreadsheet
         $spreadsheet = new Spreadsheet();
@@ -251,22 +262,26 @@ public function load($filename)
     }
 
     /**
-     * Loads from file into Spreadsheet instance.
-     *
-     * @param string $filename
+     * Loads from file or contents into Spreadsheet instance.
      *
-     * @return Spreadsheet
+     * @param string $filename file name if useContents is false else file contents
      */
-    public function loadIntoExisting($filename, Spreadsheet $spreadsheet)
+    public function loadIntoExisting(string $filename, Spreadsheet $spreadsheet, bool $useContents = false): Spreadsheet
     {
-        File::assertFile($filename);
-        if (!$this->canRead($filename)) {
-            throw new Exception($filename . ' is an Invalid Spreadsheet file.');
+        if ($useContents) {
+            $this->fileContents = $filename;
+            $fileOrString = 'string';
+        } else {
+            File::assertFile($filename);
+            if (!$this->canRead($filename)) {
+                throw new Exception($filename . ' is an Invalid Spreadsheet file.');
+            }
+            $fileOrString = 'file';
         }
 
-        $xml = $this->trySimpleXMLLoadString($filename);
+        $xml = $this->trySimpleXMLLoadStringPrivate($filename, $fileOrString);
         if ($xml === false) {
-            throw new Exception("Problem reading {$filename}");
+            throw new Exception($this->xmlFailMessage);
         }
 
         $namespaces = $xml->getNamespaces(true);
@@ -274,18 +289,21 @@ public function loadIntoExisting($filename, Spreadsheet $spreadsheet)
         (new Properties($spreadsheet))->readProperties($xml, $namespaces);
 
         $this->styles = (new Style())->parseStyles($xml, $namespaces);
+        if (isset($this->styles['Default'])) {
+            $spreadsheet->getCellXfCollection()[0]->applyFromArray($this->styles['Default']);
+        }
 
         $worksheetID = 0;
-        $xml_ss = $xml->children($namespaces['ss']);
+        $xml_ss = $xml->children(self::NAMESPACES_SS);
 
         /** @var null|SimpleXMLElement $worksheetx */
         foreach ($xml_ss->Worksheet as $worksheetx) {
             $worksheet = $worksheetx ?? new SimpleXMLElement('<xml></xml>');
-            $worksheet_ss = self::getAttributes($worksheet, $namespaces['ss']);
+            $worksheet_ss = self::getAttributes($worksheet, self::NAMESPACES_SS);
 
             if (
-                isset($this->loadSheetsOnly, $worksheet_ss['Name']) &&
-                (!in_array($worksheet_ss['Name'], $this->loadSheetsOnly))
+                isset($this->loadSheetsOnly, $worksheet_ss['Name'])
+                && (!in_array($worksheet_ss['Name'], $this->loadSheetsOnly))
             ) {
                 continue;
             }
@@ -301,11 +319,15 @@ public function loadIntoExisting($filename, Spreadsheet $spreadsheet)
                 //        the worksheet name in line with the formula, not the reverse
                 $spreadsheet->getActiveSheet()->setTitle($worksheetName, false, false);
             }
+            if (isset($worksheet_ss['Protected'])) {
+                $protection = (string) $worksheet_ss['Protected'] === '1';
+                $spreadsheet->getActiveSheet()->getProtection()->setSheet($protection);
+            }
 
             // locally scoped defined names
             if (isset($worksheet->Names[0])) {
                 foreach ($worksheet->Names[0] as $definedName) {
-                    $definedName_ss = self::getAttributes($definedName, $namespaces['ss']);
+                    $definedName_ss = self::getAttributes($definedName, self::NAMESPACES_SS);
                     $name = (string) $definedName_ss['Name'];
                     $definedValue = (string) $definedName_ss['RefersTo'];
                     $convertedValue = AddressHelper::convertFormulaToA1($definedValue);
@@ -319,15 +341,35 @@ public function loadIntoExisting($filename, Spreadsheet $spreadsheet)
             $columnID = 'A';
             if (isset($worksheet->Table->Column)) {
                 foreach ($worksheet->Table->Column as $columnData) {
-                    $columnData_ss = self::getAttributes($columnData, $namespaces['ss']);
+                    $columnData_ss = self::getAttributes($columnData, self::NAMESPACES_SS);
+                    $colspan = 0;
+                    if (isset($columnData_ss['Span'])) {
+                        $spanAttr = (string) $columnData_ss['Span'];
+                        if (is_numeric($spanAttr)) {
+                            $colspan = max(0, (int) $spanAttr);
+                        }
+                    }
                     if (isset($columnData_ss['Index'])) {
                         $columnID = Coordinate::stringFromColumnIndex((int) $columnData_ss['Index']);
                     }
+                    $columnWidth = null;
                     if (isset($columnData_ss['Width'])) {
                         $columnWidth = $columnData_ss['Width'];
-                        $spreadsheet->getActiveSheet()->getColumnDimension($columnID)->setWidth($columnWidth / 5.4);
                     }
-                    ++$columnID;
+                    $columnVisible = null;
+                    if (isset($columnData_ss['Hidden'])) {
+                        $columnVisible = ((string) $columnData_ss['Hidden']) !== '1';
+                    }
+                    while ($colspan >= 0) {
+                        if (isset($columnWidth)) {
+                            $spreadsheet->getActiveSheet()->getColumnDimension($columnID)->setWidth($columnWidth / 5.4);
+                        }
+                        if (isset($columnVisible)) {
+                            $spreadsheet->getActiveSheet()->getColumnDimension($columnID)->setVisible($columnVisible);
+                        }
+                        ++$columnID;
+                        --$colspan;
+                    }
                 }
             }
 
@@ -336,18 +378,27 @@ public function loadIntoExisting($filename, Spreadsheet $spreadsheet)
                 $additionalMergedCells = 0;
                 foreach ($worksheet->Table->Row as $rowData) {
                     $rowHasData = false;
-                    $row_ss = self::getAttributes($rowData, $namespaces['ss']);
+                    $row_ss = self::getAttributes($rowData, self::NAMESPACES_SS);
                     if (isset($row_ss['Index'])) {
                         $rowID = (int) $row_ss['Index'];
                     }
+                    if (isset($row_ss['Hidden'])) {
+                        $rowVisible = ((string) $row_ss['Hidden']) !== '1';
+                        $spreadsheet->getActiveSheet()->getRowDimension($rowID)->setVisible($rowVisible);
+                    }
 
                     $columnID = 'A';
                     foreach ($rowData->Cell as $cell) {
-                        $cell_ss = self::getAttributes($cell, $namespaces['ss']);
+                        $arrayRef = '';
+                        $cell_ss = self::getAttributes($cell, self::NAMESPACES_SS);
                         if (isset($cell_ss['Index'])) {
                             $columnID = Coordinate::stringFromColumnIndex((int) $cell_ss['Index']);
                         }
                         $cellRange = $columnID . $rowID;
+                        if (isset($cell_ss['ArrayRange'])) {
+                            $arrayRange = (string) $cell_ss['ArrayRange'];
+                            $arrayRef = AddressHelper::convertFormulaToA1($arrayRange, $rowID, Coordinate::columnIndexFromString($columnID));
+                        }
 
                         if ($this->getReadFilter() !== null) {
                             if (!$this->getReadFilter()->readCell($columnID, $rowID, $worksheetName)) {
@@ -365,14 +416,14 @@ public function loadIntoExisting($filename, Spreadsheet $spreadsheet)
                             $columnTo = $columnID;
                             if (isset($cell_ss['MergeAcross'])) {
                                 $additionalMergedCells += (int) $cell_ss['MergeAcross'];
-                                $columnTo = Coordinate::stringFromColumnIndex(Coordinate::columnIndexFromString($columnID) + $cell_ss['MergeAcross']);
+                                $columnTo = Coordinate::stringFromColumnIndex((int) (Coordinate::columnIndexFromString($columnID) + $cell_ss['MergeAcross']));
                             }
                             $rowTo = $rowID;
                             if (isset($cell_ss['MergeDown'])) {
                                 $rowTo = $rowTo + $cell_ss['MergeDown'];
                             }
                             $cellRange .= ':' . $columnTo . $rowTo;
-                            $spreadsheet->getActiveSheet()->mergeCells($cellRange);
+                            $spreadsheet->getActiveSheet()->mergeCells($cellRange, Worksheet::MERGE_CELL_CONTENT_HIDE);
                         }
 
                         $hasCalculatedValue = false;
@@ -380,12 +431,15 @@ public function loadIntoExisting($filename, Spreadsheet $spreadsheet)
                         if (isset($cell_ss['Formula'])) {
                             $cellDataFormula = $cell_ss['Formula'];
                             $hasCalculatedValue = true;
+                            if ($arrayRef !== '') {
+                                $spreadsheet->getActiveSheet()->getCell($columnID . $rowID)->setFormulaAttributes(['t' => 'array', 'ref' => $arrayRef]);
+                            }
                         }
                         if (isset($cell->Data)) {
                             $cellData = $cell->Data;
                             $cellValue = (string) $cellData;
                             $type = DataType::TYPE_NULL;
-                            $cellData_ss = self::getAttributes($cellData, $namespaces['ss']);
+                            $cellData_ss = self::getAttributes($cellData, self::NAMESPACES_SS);
                             if (isset($cellData_ss['Type'])) {
                                 $cellDataType = $cellData_ss['Type'];
                                 switch ($cellDataType) {
@@ -400,6 +454,14 @@ public function loadIntoExisting($filename, Spreadsheet $spreadsheet)
                                     */
                                     case 'String':
                                         $type = DataType::TYPE_STRING;
+                                        $rich = $cellData->children('http://www.w3.org/TR/REC-html40');
+                                        if ($rich) {
+                                            // in case of HTML content we extract the payload
+                                            // and convert it into a rich text object
+                                            $content = $cellData->asXML() ?: '';
+                                            $html = new HelperHtml();
+                                            $cellValue = $html->toRichTextObject($content, true);
+                                        }
 
                                         break;
                                     case 'Number':
@@ -429,6 +491,7 @@ public function loadIntoExisting($filename, Spreadsheet $spreadsheet)
                                 }
                             }
 
+                            $originalType = $type;
                             if ($hasCalculatedValue) {
                                 $type = DataType::TYPE_FORMULA;
                                 $columnNumber = Coordinate::columnIndexFromString($columnID);
@@ -437,13 +500,13 @@ public function loadIntoExisting($filename, Spreadsheet $spreadsheet)
 
                             $spreadsheet->getActiveSheet()->getCell($columnID . $rowID)->setValueExplicit((($hasCalculatedValue) ? $cellDataFormula : $cellValue), $type);
                             if ($hasCalculatedValue) {
-                                $spreadsheet->getActiveSheet()->getCell($columnID . $rowID)->setCalculatedValue($cellValue);
+                                $spreadsheet->getActiveSheet()->getCell($columnID . $rowID)->setCalculatedValue($cellValue, $originalType === DataType::TYPE_NUMERIC);
                             }
                             $rowHasData = true;
                         }
 
                         if (isset($cell->Comment)) {
-                            $this->parseCellComment($cell->Comment, $namespaces, $spreadsheet, $columnID, $rowID);
+                            $this->parseCellComment($cell->Comment, $spreadsheet, $columnID, $rowID);
                         }
 
                         if (isset($cell_ss['StyleID'])) {
@@ -472,11 +535,127 @@ public function loadIntoExisting($filename, Spreadsheet $spreadsheet)
 
                     ++$rowID;
                 }
+            }
 
-                if (isset($namespaces['x'])) {
-                    $xmlX = $worksheet->children($namespaces['x']);
-                    if (isset($xmlX->WorksheetOptions)) {
-                        (new PageSettings($xmlX, $namespaces))->loadPageSettings($spreadsheet);
+            $dataValidations = new Xml\DataValidations();
+            $dataValidations->loadDataValidations($worksheet, $spreadsheet);
+            $xmlX = $worksheet->children(Namespaces::URN_EXCEL);
+            if (isset($xmlX->WorksheetOptions)) {
+                if (isset($xmlX->WorksheetOptions->ShowPageBreakZoom)) {
+                    $spreadsheet->getActiveSheet()->getSheetView()->setView(SheetView::SHEETVIEW_PAGE_BREAK_PREVIEW);
+                }
+                if (isset($xmlX->WorksheetOptions->Zoom)) {
+                    $zoomScaleNormal = (int) $xmlX->WorksheetOptions->Zoom;
+                    if ($zoomScaleNormal > 0) {
+                        $spreadsheet->getActiveSheet()->getSheetView()->setZoomScaleNormal($zoomScaleNormal);
+                        $spreadsheet->getActiveSheet()->getSheetView()->setZoomScale($zoomScaleNormal);
+                    }
+                }
+                if (isset($xmlX->WorksheetOptions->PageBreakZoom)) {
+                    $zoomScaleNormal = (int) $xmlX->WorksheetOptions->PageBreakZoom;
+                    if ($zoomScaleNormal > 0) {
+                        $spreadsheet->getActiveSheet()->getSheetView()->setZoomScaleSheetLayoutView($zoomScaleNormal);
+                    }
+                }
+                if (isset($xmlX->WorksheetOptions->ShowPageBreakZoom)) {
+                    $spreadsheet->getActiveSheet()->getSheetView()->setView(SheetView::SHEETVIEW_PAGE_BREAK_PREVIEW);
+                }
+                if (isset($xmlX->WorksheetOptions->FreezePanes)) {
+                    $freezeRow = $freezeColumn = 1;
+                    if (isset($xmlX->WorksheetOptions->SplitHorizontal)) {
+                        $freezeRow = (int) $xmlX->WorksheetOptions->SplitHorizontal + 1;
+                    }
+                    if (isset($xmlX->WorksheetOptions->SplitVertical)) {
+                        $freezeColumn = (int) $xmlX->WorksheetOptions->SplitVertical + 1;
+                    }
+                    $leftTopRow = (string) $xmlX->WorksheetOptions->TopRowBottomPane;
+                    $leftTopColumn = (string) $xmlX->WorksheetOptions->LeftColumnRightPane;
+                    if (is_numeric($leftTopRow) && is_numeric($leftTopColumn)) {
+                        $leftTopCoordinate = Coordinate::stringFromColumnIndex((int) $leftTopColumn + 1) . (string) ($leftTopRow + 1);
+                        $spreadsheet->getActiveSheet()->freezePane(Coordinate::stringFromColumnIndex($freezeColumn) . (string) $freezeRow, $leftTopCoordinate, !isset($xmlX->WorksheetOptions->FrozenNoSplit));
+                    } else {
+                        $spreadsheet->getActiveSheet()->freezePane(Coordinate::stringFromColumnIndex($freezeColumn) . (string) $freezeRow, null, !isset($xmlX->WorksheetOptions->FrozenNoSplit));
+                    }
+                } elseif (isset($xmlX->WorksheetOptions->SplitVertical) || isset($xmlX->WorksheetOptions->SplitHorizontal)) {
+                    if (isset($xmlX->WorksheetOptions->SplitHorizontal)) {
+                        $ySplit = (int) $xmlX->WorksheetOptions->SplitHorizontal;
+                        $spreadsheet->getActiveSheet()->setYSplit($ySplit);
+                    }
+                    if (isset($xmlX->WorksheetOptions->SplitVertical)) {
+                        $xSplit = (int) $xmlX->WorksheetOptions->SplitVertical;
+                        $spreadsheet->getActiveSheet()->setXSplit($xSplit);
+                    }
+                    if (isset($xmlX->WorksheetOptions->LeftColumnVisible) || isset($xmlX->WorksheetOptions->TopRowVisible)) {
+                        $leftTopColumn = $leftTopRow = 1;
+                        if (isset($xmlX->WorksheetOptions->LeftColumnVisible)) {
+                            $leftTopColumn = 1 + (int) $xmlX->WorksheetOptions->LeftColumnVisible;
+                        }
+                        if (isset($xmlX->WorksheetOptions->TopRowVisible)) {
+                            $leftTopRow = 1 + (int) $xmlX->WorksheetOptions->TopRowVisible;
+                        }
+                        $leftTopCoordinate = Coordinate::stringFromColumnIndex($leftTopColumn) . "$leftTopRow";
+                        $spreadsheet->getActiveSheet()->setTopLeftCell($leftTopCoordinate);
+                    }
+
+                    $leftTopColumn = $leftTopRow = 1;
+                    if (isset($xmlX->WorksheetOptions->LeftColumnRightPane)) {
+                        $leftTopColumn = 1 + (int) $xmlX->WorksheetOptions->LeftColumnRightPane;
+                    }
+                    if (isset($xmlX->WorksheetOptions->TopRowBottomPane)) {
+                        $leftTopRow = 1 + (int) $xmlX->WorksheetOptions->TopRowBottomPane;
+                    }
+                    $leftTopCoordinate = Coordinate::stringFromColumnIndex($leftTopColumn) . "$leftTopRow";
+                    $spreadsheet->getActiveSheet()->setPaneTopLeftCell($leftTopCoordinate);
+                }
+                (new PageSettings($xmlX))->loadPageSettings($spreadsheet);
+                if (isset($xmlX->WorksheetOptions->TopRowVisible, $xmlX->WorksheetOptions->LeftColumnVisible)) {
+                    $leftTopRow = (string) $xmlX->WorksheetOptions->TopRowVisible;
+                    $leftTopColumn = (string) $xmlX->WorksheetOptions->LeftColumnVisible;
+                    if (is_numeric($leftTopRow) && is_numeric($leftTopColumn)) {
+                        $leftTopCoordinate = Coordinate::stringFromColumnIndex((int) $leftTopColumn + 1) . (string) ($leftTopRow + 1);
+                        $spreadsheet->getActiveSheet()->setTopLeftCell($leftTopCoordinate);
+                    }
+                }
+                $rangeCalculated = false;
+                if (isset($xmlX->WorksheetOptions->Panes->Pane->RangeSelection)) {
+                    if (1 === preg_match('/^R(\d+)C(\d+):R(\d+)C(\d+)$/', (string) $xmlX->WorksheetOptions->Panes->Pane->RangeSelection, $selectionMatches)) {
+                        $selectedCell = Coordinate::stringFromColumnIndex((int) $selectionMatches[2])
+                            . $selectionMatches[1]
+                            . ':'
+                            . Coordinate::stringFromColumnIndex((int) $selectionMatches[4])
+                            . $selectionMatches[3];
+                        $spreadsheet->getActiveSheet()->setSelectedCells($selectedCell);
+                        $rangeCalculated = true;
+                    }
+                }
+                if (!$rangeCalculated) {
+                    if (isset($xmlX->WorksheetOptions->Panes->Pane->ActiveRow)) {
+                        $activeRow = (string) $xmlX->WorksheetOptions->Panes->Pane->ActiveRow;
+                    } else {
+                        $activeRow = 0;
+                    }
+                    if (isset($xmlX->WorksheetOptions->Panes->Pane->ActiveCol)) {
+                        $activeColumn = (string) $xmlX->WorksheetOptions->Panes->Pane->ActiveCol;
+                    } else {
+                        $activeColumn = 0;
+                    }
+                    if (is_numeric($activeRow) && is_numeric($activeColumn)) {
+                        $selectedCell = Coordinate::stringFromColumnIndex((int) $activeColumn + 1) . (string) ($activeRow + 1);
+                        $spreadsheet->getActiveSheet()->setSelectedCells($selectedCell);
+                    }
+                }
+            }
+            if (isset($xmlX->PageBreaks)) {
+                if (isset($xmlX->PageBreaks->ColBreaks)) {
+                    foreach ($xmlX->PageBreaks->ColBreaks->ColBreak as $colBreak) {
+                        $colBreak = (string) $colBreak->Column;
+                        $spreadsheet->getActiveSheet()->setBreak([1 + (int) $colBreak, 1], Worksheet::BREAK_COLUMN);
+                    }
+                }
+                if (isset($xmlX->PageBreaks->RowBreaks)) {
+                    foreach ($xmlX->PageBreaks->RowBreaks->RowBreak as $rowBreak) {
+                        $rowBreak = (string) $rowBreak->Row;
+                        $spreadsheet->getActiveSheet()->setBreak([1, (int) $rowBreak], Worksheet::BREAK_ROW);
                     }
                 }
             }
@@ -484,10 +663,14 @@ public function loadIntoExisting($filename, Spreadsheet $spreadsheet)
         }
 
         // Globally scoped defined names
-        $activeWorksheet = $spreadsheet->setActiveSheetIndex(0);
+        $activeSheetIndex = 0;
+        if (isset($xml->ExcelWorkbook->ActiveSheet)) {
+            $activeSheetIndex = (int) (string) $xml->ExcelWorkbook->ActiveSheet;
+        }
+        $activeWorksheet = $spreadsheet->setActiveSheetIndex($activeSheetIndex);
         if (isset($xml->Names[0])) {
             foreach ($xml->Names[0] as $definedName) {
-                $definedName_ss = self::getAttributes($definedName, $namespaces['ss']);
+                $definedName_ss = self::getAttributes($definedName, self::NAMESPACES_SS);
                 $name = (string) $definedName_ss['Name'];
                 $definedValue = (string) $definedName_ss['RefersTo'];
                 $convertedValue = AddressHelper::convertFormulaToA1($definedValue);
@@ -504,12 +687,11 @@ public function loadIntoExisting($filename, Spreadsheet $spreadsheet)
 
     protected function parseCellComment(
         SimpleXMLElement $comment,
-        array $namespaces,
         Spreadsheet $spreadsheet,
         string $columnID,
         int $rowID
     ): void {
-        $commentAttributes = $comment->attributes($namespaces['ss']);
+        $commentAttributes = $comment->attributes(self::NAMESPACES_SS);
         $author = 'unknown';
         if (isset($commentAttributes->Author)) {
             $author = (string) $commentAttributes->Author;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/DataValidations.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/DataValidations.php
new file mode 100644
index 0000000000..531f8c35f9
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/DataValidations.php
@@ -0,0 +1,177 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xml;
+
+use PhpOffice\PhpSpreadsheet\Cell\AddressHelper;
+use PhpOffice\PhpSpreadsheet\Cell\AddressRange;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Cell\DataValidation;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Namespaces;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use SimpleXMLElement;
+
+class DataValidations
+{
+    private const OPERATOR_MAPPINGS = [
+        'between' => DataValidation::OPERATOR_BETWEEN,
+        'equal' => DataValidation::OPERATOR_EQUAL,
+        'greater' => DataValidation::OPERATOR_GREATERTHAN,
+        'greaterorequal' => DataValidation::OPERATOR_GREATERTHANOREQUAL,
+        'less' => DataValidation::OPERATOR_LESSTHAN,
+        'lessorequal' => DataValidation::OPERATOR_LESSTHANOREQUAL,
+        'notbetween' => DataValidation::OPERATOR_NOTBETWEEN,
+        'notequal' => DataValidation::OPERATOR_NOTEQUAL,
+    ];
+
+    private const TYPE_MAPPINGS = [
+        'textlength' => DataValidation::TYPE_TEXTLENGTH,
+    ];
+
+    private int $thisRow = 0;
+
+    private int $thisColumn = 0;
+
+    private function replaceR1C1(array $matches): string
+    {
+        return AddressHelper::convertToA1($matches[0], $this->thisRow, $this->thisColumn, false);
+    }
+
+    public function loadDataValidations(SimpleXMLElement $worksheet, Spreadsheet $spreadsheet): void
+    {
+        $xmlX = $worksheet->children(Namespaces::URN_EXCEL);
+        $sheet = $spreadsheet->getActiveSheet();
+        /** @var callable $pregCallback */
+        $pregCallback = [$this, 'replaceR1C1'];
+        foreach ($xmlX->DataValidation as $dataValidation) {
+            $cells = [];
+            $validation = new DataValidation();
+
+            // set defaults
+            $validation->setShowDropDown(true);
+            $validation->setShowInputMessage(true);
+            $validation->setShowErrorMessage(true);
+            $validation->setShowDropDown(true);
+            $this->thisRow = 1;
+            $this->thisColumn = 1;
+
+            foreach ($dataValidation as $tagName => $tagValue) {
+                $tagValue = (string) $tagValue;
+                $tagValueLower = strtolower($tagValue);
+                switch ($tagName) {
+                    case 'Range':
+                        foreach (explode(',', $tagValue) as $range) {
+                            $cell = '';
+                            if (preg_match('/^R(\d+)C(\d+):R(\d+)C(\d+)$/', (string) $range, $selectionMatches) === 1) {
+                                // range
+                                $firstCell = Coordinate::stringFromColumnIndex((int) $selectionMatches[2])
+                                    . $selectionMatches[1];
+                                $cell = $firstCell
+                                    . ':'
+                                    . Coordinate::stringFromColumnIndex((int) $selectionMatches[4])
+                                    . $selectionMatches[3];
+                                $this->thisRow = (int) $selectionMatches[1];
+                                $this->thisColumn = (int) $selectionMatches[2];
+                                $sheet->getCell($firstCell);
+                            } elseif (preg_match('/^R(\d+)C(\d+)$/', (string) $range, $selectionMatches) === 1) {
+                                // cell
+                                $cell = Coordinate::stringFromColumnIndex((int) $selectionMatches[2])
+                                    . $selectionMatches[1];
+                                $sheet->getCell($cell);
+                                $this->thisRow = (int) $selectionMatches[1];
+                                $this->thisColumn = (int) $selectionMatches[2];
+                            } elseif (preg_match('/^C(\d+)$/', (string) $range, $selectionMatches) === 1) {
+                                // column
+                                $firstCell = Coordinate::stringFromColumnIndex((int) $selectionMatches[1])
+                                    . '1';
+                                $cell = $firstCell
+                                    . ':'
+                                    . Coordinate::stringFromColumnIndex((int) $selectionMatches[1])
+                                    . ((string) AddressRange::MAX_ROW);
+                                $this->thisColumn = (int) $selectionMatches[1];
+                                $sheet->getCell($firstCell);
+                            } elseif (preg_match('/^R(\d+)$/', (string) $range, $selectionMatches)) {
+                                // row
+                                $firstCell = 'A'
+                                    . $selectionMatches[1];
+                                $cell = $firstCell
+                                    . ':'
+                                    . AddressRange::MAX_COLUMN
+                                    . $selectionMatches[1];
+                                $this->thisRow = (int) $selectionMatches[1];
+                                $sheet->getCell($firstCell);
+                            }
+
+                            $validation->setSqref($cell);
+                            $stRange = $sheet->shrinkRangeToFit($cell);
+                            $cells = array_merge($cells, Coordinate::extractAllCellReferencesInRange($stRange));
+                        }
+
+                        break;
+                    case 'Type':
+                        $validation->setType(self::TYPE_MAPPINGS[$tagValueLower] ?? $tagValueLower);
+
+                        break;
+                    case 'Qualifier':
+                        $validation->setOperator(self::OPERATOR_MAPPINGS[$tagValueLower] ?? $tagValueLower);
+
+                        break;
+                    case 'InputTitle':
+                        $validation->setPromptTitle($tagValue);
+
+                        break;
+                    case 'InputMessage':
+                        $validation->setPrompt($tagValue);
+
+                        break;
+                    case 'InputHide':
+                        $validation->setShowInputMessage(false);
+
+                        break;
+                    case 'ErrorStyle':
+                        $validation->setErrorStyle($tagValueLower);
+
+                        break;
+                    case 'ErrorTitle':
+                        $validation->setErrorTitle($tagValue);
+
+                        break;
+                    case 'ErrorMessage':
+                        $validation->setError($tagValue);
+
+                        break;
+                    case 'ErrorHide':
+                        $validation->setShowErrorMessage(false);
+
+                        break;
+                    case 'ComboHide':
+                        $validation->setShowDropDown(false);
+
+                        break;
+                    case 'UseBlank':
+                        $validation->setAllowBlank(true);
+
+                        break;
+                    case 'CellRangeList':
+                        // FIXME missing FIXME
+
+                        break;
+                    case 'Min':
+                    case 'Value':
+                        $tagValue = (string) preg_replace_callback(AddressHelper::R1C1_COORDINATE_REGEX, $pregCallback, $tagValue);
+                        $validation->setFormula1($tagValue);
+
+                        break;
+                    case 'Max':
+                        $tagValue = (string) preg_replace_callback(AddressHelper::R1C1_COORDINATE_REGEX, $pregCallback, $tagValue);
+                        $validation->setFormula2($tagValue);
+
+                        break;
+                }
+            }
+
+            foreach ($cells as $cell) {
+                $sheet->getCell($cell)->setDataValidation(clone $validation);
+            }
+        }
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/PageSettings.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/PageSettings.php
index e56ac331f3..8f9d4645d0 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/PageSettings.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/PageSettings.php
@@ -2,6 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheet\Reader\Xml;
 
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Namespaces;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
 use SimpleXMLElement;
@@ -9,14 +10,11 @@
 
 class PageSettings
 {
-    /**
-     * @var stdClass
-     */
-    private $printSettings;
+    private stdClass $printSettings;
 
-    public function __construct(SimpleXMLElement $xmlX, array $namespaces)
+    public function __construct(SimpleXMLElement $xmlX)
     {
-        $printSettings = $this->pageSetup($xmlX, $namespaces, $this->getPrintDefaults());
+        $printSettings = $this->pageSetup($xmlX, $this->getPrintDefaults());
         $this->printSettings = $this->printSetup($xmlX, $printSettings);
     }
 
@@ -56,29 +54,31 @@ private function getPrintDefaults(): stdClass
         ];
     }
 
-    private function pageSetup(SimpleXMLElement $xmlX, array $namespaces, stdClass $printDefaults): stdClass
+    private function pageSetup(SimpleXMLElement $xmlX, stdClass $printDefaults): stdClass
     {
         if (isset($xmlX->WorksheetOptions->PageSetup)) {
             foreach ($xmlX->WorksheetOptions->PageSetup as $pageSetupData) {
                 foreach ($pageSetupData as $pageSetupKey => $pageSetupValue) {
-                    $pageSetupAttributes = $pageSetupValue->attributes($namespaces['x']);
-                    switch ($pageSetupKey) {
-                        case 'Layout':
-                            $this->setLayout($printDefaults, $pageSetupAttributes);
-
-                            break;
-                        case 'Header':
-                            $printDefaults->headerMargin = (float) $pageSetupAttributes->Margin ?: 1.0;
-
-                            break;
-                        case 'Footer':
-                            $printDefaults->footerMargin = (float) $pageSetupAttributes->Margin ?: 1.0;
-
-                            break;
-                        case 'PageMargins':
-                            $this->setMargins($printDefaults, $pageSetupAttributes);
-
-                            break;
+                    $pageSetupAttributes = $pageSetupValue->attributes(Namespaces::URN_EXCEL);
+                    if ($pageSetupAttributes !== null) {
+                        switch ($pageSetupKey) {
+                            case 'Layout':
+                                $this->setLayout($printDefaults, $pageSetupAttributes);
+
+                                break;
+                            case 'Header':
+                                $printDefaults->headerMargin = (float) $pageSetupAttributes->Margin ?: 1.0;
+
+                                break;
+                            case 'Footer':
+                                $printDefaults->footerMargin = (float) $pageSetupAttributes->Margin ?: 1.0;
+
+                                break;
+                            case 'PageMargins':
+                                $this->setMargins($printDefaults, $pageSetupAttributes);
+
+                                break;
+                        }
                     }
                 }
             }
@@ -115,7 +115,7 @@ private function printSetup(SimpleXMLElement $xmlX, stdClass $printDefaults): st
 
     private function setLayout(stdClass $printDefaults, SimpleXMLElement $pageSetupAttributes): void
     {
-        $printDefaults->orientation = (string) strtolower($pageSetupAttributes->Orientation) ?: PageSetup::ORIENTATION_PORTRAIT;
+        $printDefaults->orientation = (string) strtolower($pageSetupAttributes->Orientation ?? '') ?: PageSetup::ORIENTATION_PORTRAIT;
         $printDefaults->horizontalCentered = (bool) $pageSetupAttributes->CenterHorizontal ?: false;
         $printDefaults->verticalCentered = (bool) $pageSetupAttributes->CenterVertical ?: false;
     }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Properties.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Properties.php
index 1c3e421ae7..17e1121306 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Properties.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Properties.php
@@ -8,10 +8,7 @@
 
 class Properties
 {
-    /**
-     * @var Spreadsheet
-     */
-    protected $spreadsheet;
+    protected Spreadsheet $spreadsheet;
 
     public function __construct(Spreadsheet $spreadsheet)
     {
@@ -39,12 +36,12 @@ protected function readStandardProperties(SimpleXMLElement $xml): void
 
     protected function readCustomProperties(SimpleXMLElement $xml, array $namespaces): void
     {
-        if (isset($xml->CustomDocumentProperties)) {
+        if (isset($xml->CustomDocumentProperties) && is_iterable($xml->CustomDocumentProperties[0])) {
             $docProps = $this->spreadsheet->getProperties();
 
             foreach ($xml->CustomDocumentProperties[0] as $propertyName => $propertyValue) {
                 $propertyAttributes = self::getAttributes($propertyValue, $namespaces['dt']);
-                $propertyName = preg_replace_callback('/_x([0-9a-f]{4})_/i', [$this, 'hex2str'], $propertyName);
+                $propertyName = (string) preg_replace_callback('/_x([0-9a-f]{4})_/i', [$this, 'hex2str'], $propertyName);
 
                 $this->processCustomProperty($docProps, $propertyName, $propertyValue, $propertyAttributes);
             }
@@ -92,6 +89,10 @@ protected function processStandardProperty(
             case 'Manager':
                 $docProps->setManager($stringValue);
 
+                break;
+            case 'HyperlinkBase':
+                $docProps->setHyperlinkBase($stringValue);
+
                 break;
             case 'Keywords':
                 $docProps->setKeywords($stringValue);
@@ -110,17 +111,10 @@ protected function processCustomProperty(
         ?SimpleXMLElement $propertyValue,
         SimpleXMLElement $propertyAttributes
     ): void {
-        $propertyType = DocumentProperties::PROPERTY_TYPE_UNKNOWN;
-
         switch ((string) $propertyAttributes) {
-            case 'string':
-                $propertyType = DocumentProperties::PROPERTY_TYPE_STRING;
-                $propertyValue = trim((string) $propertyValue);
-
-                break;
             case 'boolean':
                 $propertyType = DocumentProperties::PROPERTY_TYPE_BOOLEAN;
-                $propertyValue = (bool) $propertyValue;
+                $propertyValue = (bool) (string) $propertyValue;
 
                 break;
             case 'integer':
@@ -134,9 +128,15 @@ protected function processCustomProperty(
 
                 break;
             case 'dateTime.tz':
+            case 'dateTime.iso8601tz':
                 $propertyType = DocumentProperties::PROPERTY_TYPE_DATE;
                 $propertyValue = trim((string) $propertyValue);
 
+                break;
+            default:
+                $propertyType = DocumentProperties::PROPERTY_TYPE_STRING;
+                $propertyValue = trim((string) $propertyValue);
+
                 break;
         }
 
@@ -150,8 +150,6 @@ protected function hex2str(array $hex): string
 
     private static function getAttributes(?SimpleXMLElement $simple, string $node): SimpleXMLElement
     {
-        return ($simple === null)
-            ? new SimpleXMLElement('<xml></xml>')
-            : ($simple->attributes($node) ?? new SimpleXMLElement('<xml></xml>'));
+        return ($simple === null) ? new SimpleXMLElement('<xml></xml>') : ($simple->attributes($node) ?? new SimpleXMLElement('<xml></xml>'));
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style.php
index 05b7c89de1..c6b5149449 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style.php
@@ -2,20 +2,21 @@
 
 namespace PhpOffice\PhpSpreadsheet\Reader\Xml;
 
+use PhpOffice\PhpSpreadsheet\Style\Protection;
 use SimpleXMLElement;
 
 class Style
 {
     /**
      * Formats.
-     *
-     * @var array
      */
-    protected $styles = [];
+    protected array $styles = [];
 
     public function parseStyles(SimpleXMLElement $xml, array $namespaces): array
     {
-        if (!isset($xml->Styles)) {
+        $children = $xml->children('urn:schemas-microsoft-com:office:spreadsheet');
+        $stylesXml = $children->Styles[0];
+        if (!isset($stylesXml) || !is_iterable($stylesXml)) {
             return [];
         }
 
@@ -25,19 +26,22 @@ public function parseStyles(SimpleXMLElement $xml, array $namespaces): array
         $fillStyleParser = new Style\Fill();
         $numberFormatStyleParser = new Style\NumberFormat();
 
-        foreach ($xml->Styles[0] as $style) {
+        foreach ($stylesXml as $style) {
             $style_ss = self::getAttributes($style, $namespaces['ss']);
             $styleID = (string) $style_ss['ID'];
             $this->styles[$styleID] = $this->styles['Default'] ?? [];
 
-            $alignment = $border = $font = $fill = $numberFormat = [];
+            $alignment = $border = $font = $fill = $numberFormat = $protection = [];
 
             foreach ($style as $styleType => $styleDatax) {
-                $styleData = $styleDatax ?? new SimpleXMLElement('<xml></xml>');
+                $styleData = self::getSxml($styleDatax);
                 $styleAttributes = $styleData->attributes($namespaces['ss']);
+
                 switch ($styleType) {
                     case 'Alignment':
-                        $alignment = $alignmentStyleParser->parseStyle($styleAttributes);
+                        if ($styleAttributes) {
+                            $alignment = $alignmentStyleParser->parseStyle($styleAttributes);
+                        }
 
                         break;
                     case 'Borders':
@@ -45,30 +49,59 @@ public function parseStyles(SimpleXMLElement $xml, array $namespaces): array
 
                         break;
                     case 'Font':
-                        $font = $fontStyleParser->parseStyle($styleAttributes);
+                        if ($styleAttributes) {
+                            $font = $fontStyleParser->parseStyle($styleAttributes);
+                        }
 
                         break;
                     case 'Interior':
-                        $fill = $fillStyleParser->parseStyle($styleAttributes);
+                        if ($styleAttributes) {
+                            $fill = $fillStyleParser->parseStyle($styleAttributes);
+                        }
 
                         break;
                     case 'NumberFormat':
-                        $numberFormat = $numberFormatStyleParser->parseStyle($styleAttributes);
+                        if ($styleAttributes) {
+                            $numberFormat = $numberFormatStyleParser->parseStyle($styleAttributes);
+                        }
+
+                        break;
+                    case 'Protection':
+                        $locked = $hidden = null;
+                        $styleAttributesP = $styleData->attributes($namespaces['x']);
+                        if (isset($styleAttributes['Protected'])) {
+                            $locked = ((bool) (string) $styleAttributes['Protected']) ? Protection::PROTECTION_PROTECTED : Protection::PROTECTION_UNPROTECTED;
+                        }
+                        if (isset($styleAttributesP['HideFormula'])) {
+                            $hidden = ((bool) (string) $styleAttributesP['HideFormula']) ? Protection::PROTECTION_PROTECTED : Protection::PROTECTION_UNPROTECTED;
+                        }
+                        if ($locked !== null || $hidden !== null) {
+                            $protection['protection'] = [];
+                            if ($locked !== null) {
+                                $protection['protection']['locked'] = $locked;
+                            }
+                            if ($hidden !== null) {
+                                $protection['protection']['hidden'] = $hidden;
+                            }
+                        }
 
                         break;
                 }
             }
 
-            $this->styles[$styleID] = array_merge($alignment, $border, $font, $fill, $numberFormat);
+            $this->styles[$styleID] = array_merge($alignment, $border, $font, $fill, $numberFormat, $protection);
         }
 
         return $this->styles;
     }
 
-    protected static function getAttributes(?SimpleXMLElement $simple, string $node): SimpleXMLElement
+    private static function getAttributes(?SimpleXMLElement $simple, string $node): SimpleXMLElement
+    {
+        return ($simple === null) ? new SimpleXMLElement('<xml></xml>') : ($simple->attributes($node) ?? new SimpleXMLElement('<xml></xml>'));
+    }
+
+    private static function getSxml(?SimpleXMLElement $simple): SimpleXMLElement
     {
-        return ($simple === null)
-            ? new SimpleXMLElement('<xml></xml>')
-            : ($simple->attributes($node) ?? new SimpleXMLElement('<xml></xml>'));
+        return ($simple !== null) ? $simple : new SimpleXMLElement('<xml></xml>');
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/Border.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/Border.php
index 8aefd9c9e9..dfde17ae38 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/Border.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/Border.php
@@ -20,6 +20,18 @@ class Border extends StyleBase
      */
     public const BORDER_MAPPINGS = [
         'borderStyle' => [
+            'continuous' => BorderStyle::BORDER_HAIR,
+            'dash' => BorderStyle::BORDER_DASHED,
+            'dashdot' => BorderStyle::BORDER_DASHDOT,
+            'dashdotdot' => BorderStyle::BORDER_DASHDOTDOT,
+            'dot' => BorderStyle::BORDER_DOTTED,
+            'double' => BorderStyle::BORDER_DOUBLE,
+            '0continuous' => BorderStyle::BORDER_HAIR,
+            '0dash' => BorderStyle::BORDER_DASHED,
+            '0dashdot' => BorderStyle::BORDER_DASHDOT,
+            '0dashdotdot' => BorderStyle::BORDER_DASHDOTDOT,
+            '0dot' => BorderStyle::BORDER_DOTTED,
+            '0double' => BorderStyle::BORDER_DOUBLE,
             '1continuous' => BorderStyle::BORDER_THIN,
             '1dash' => BorderStyle::BORDER_DASHED,
             '1dashdot' => BorderStyle::BORDER_DASHDOT,
@@ -58,8 +70,8 @@ public function parseStyle(SimpleXMLElement $styleData, array $namespaces): arra
                 $borderStyleValue = (string) $borderStyleValuex;
                 switch ($borderStyleKey) {
                     case 'Position':
-                        [$borderPosition, $diagonalDirection] =
-                            $this->parsePosition($borderStyleValue, $diagonalDirection);
+                        [$borderPosition, $diagonalDirection]
+                            = $this->parsePosition($borderStyleValue, $diagonalDirection);
 
                         break;
                     case 'Color':
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/Font.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/Font.php
index 16ab44d80d..5f824889a5 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/Font.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/Font.php
@@ -56,11 +56,11 @@ public function parseStyle(SimpleXMLElement $styleAttributes): array
 
                     break;
                 case 'Bold':
-                    $style['font']['bold'] = true;
+                    $style['font']['bold'] = $styleAttributeValue === '1';
 
                     break;
                 case 'Italic':
-                    $style['font']['italic'] = true;
+                    $style['font']['italic'] = $styleAttributeValue === '1';
 
                     break;
                 case 'Underline':
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/StyleBase.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/StyleBase.php
index fc9ace825c..8103a71cbb 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/StyleBase.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/Style/StyleBase.php
@@ -25,8 +25,6 @@ protected static function identifyFixedStyleValue(array $styleList, string &$sty
 
     protected static function getAttributes(?SimpleXMLElement $simple, string $node): SimpleXMLElement
     {
-        return ($simple === null)
-            ? new SimpleXMLElement('<xml></xml>')
-            : ($simple->attributes($node) ?? new SimpleXMLElement('<xml></xml>'));
+        return ($simple === null) ? new SimpleXMLElement('<xml></xml>') : ($simple->attributes($node) ?? new SimpleXMLElement('<xml></xml>'));
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/ReferenceHelper.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/ReferenceHelper.php
index d4fced37f2..cdbe37861c 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/ReferenceHelper.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/ReferenceHelper.php
@@ -3,34 +3,38 @@
 namespace PhpOffice\PhpSpreadsheet;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Cell\AddressRange;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Cell\DataType;
+use PhpOffice\PhpSpreadsheet\Style\Conditional;
+use PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter;
+use PhpOffice\PhpSpreadsheet\Worksheet\Table;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 
 class ReferenceHelper
 {
     /**    Constants                */
     /**    Regular Expressions      */
-    const REFHELPER_REGEXP_CELLREF = '((\w*|\'[^!]*\')!)?(?<![:a-z\$])(\$?[a-z]{1,3}\$?\d+)(?=[^:!\d\'])';
-    const REFHELPER_REGEXP_CELLRANGE = '((\w*|\'[^!]*\')!)?(\$?[a-z]{1,3}\$?\d+):(\$?[a-z]{1,3}\$?\d+)';
-    const REFHELPER_REGEXP_ROWRANGE = '((\w*|\'[^!]*\')!)?(\$?\d+):(\$?\d+)';
-    const REFHELPER_REGEXP_COLRANGE = '((\w*|\'[^!]*\')!)?(\$?[a-z]{1,3}):(\$?[a-z]{1,3})';
+    private const SHEETNAME_PART = '((\w*|\'[^!]*\')!)';
+    private const SHEETNAME_PART_WITH_SLASHES = '/' . self::SHEETNAME_PART . '/';
+    const REFHELPER_REGEXP_CELLREF = self::SHEETNAME_PART . '?(?<![:a-z1-9_\.\$])(\$?[a-z]{1,3}\$?\d+)(?=[^:!\d\'])';
+    const REFHELPER_REGEXP_CELLRANGE = self::SHEETNAME_PART . '?(\$?[a-z]{1,3}\$?\d+):(\$?[a-z]{1,3}\$?\d+)';
+    const REFHELPER_REGEXP_ROWRANGE = self::SHEETNAME_PART . '?(\$?\d+):(\$?\d+)';
+    const REFHELPER_REGEXP_COLRANGE = self::SHEETNAME_PART . '?(\$?[a-z]{1,3}):(\$?[a-z]{1,3})';
 
     /**
      * Instance of this class.
-     *
-     * @var ReferenceHelper
      */
-    private static $instance;
+    private static ?ReferenceHelper $instance = null;
+
+    private ?CellReferenceHelper $cellReferenceHelper = null;
 
     /**
      * Get an instance of this class.
-     *
-     * @return ReferenceHelper
      */
-    public static function getInstance()
+    public static function getInstance(): self
     {
-        if (!isset(self::$instance) || (self::$instance === null)) {
+        if (self::$instance === null) {
             self::$instance = new self();
         }
 
@@ -50,10 +54,8 @@ protected function __construct()
      *
      * @param string $a First column to test (e.g. 'AA')
      * @param string $b Second column to test (e.g. 'Z')
-     *
-     * @return int
      */
-    public static function columnSort($a, $b)
+    public static function columnSort(string $a, string $b): int
     {
         return strcasecmp(strlen($a) . $a, strlen($b) . $b);
     }
@@ -64,10 +66,8 @@ public static function columnSort($a, $b)
      *
      * @param string $a First column to test (e.g. 'AA')
      * @param string $b Second column to test (e.g. 'Z')
-     *
-     * @return int
      */
-    public static function columnReverseSort($a, $b)
+    public static function columnReverseSort(string $a, string $b): int
     {
         return -strcasecmp(strlen($a) . $a, strlen($b) . $b);
     }
@@ -78,14 +78,15 @@ public static function columnReverseSort($a, $b)
      *
      * @param string $a First cell to test (e.g. 'AA1')
      * @param string $b Second cell to test (e.g. 'Z1')
-     *
-     * @return int
      */
-    public static function cellSort($a, $b)
+    public static function cellSort(string $a, string $b): int
     {
-        [$ac, $ar] = sscanf($a, '%[A-Z]%d');
-        [$bc, $br] = sscanf($b, '%[A-Z]%d');
-
+        sscanf($a, '%[A-Z]%d', $ac, $ar);
+        /** @var int $ar */
+        /** @var string $ac */
+        sscanf($b, '%[A-Z]%d', $bc, $br);
+        /** @var int $br */
+        /** @var string $bc */
         if ($ar === $br) {
             return strcasecmp(strlen($ac) . $ac, strlen($bc) . $bc);
         }
@@ -99,14 +100,15 @@ public static function cellSort($a, $b)
      *
      * @param string $a First cell to test (e.g. 'AA1')
      * @param string $b Second cell to test (e.g. 'Z1')
-     *
-     * @return int
      */
-    public static function cellReverseSort($a, $b)
+    public static function cellReverseSort(string $a, string $b): int
     {
-        [$ac, $ar] = sscanf($a, '%[A-Z]%d');
-        [$bc, $br] = sscanf($b, '%[A-Z]%d');
-
+        sscanf($a, '%[A-Z]%d', $ac, $ar);
+        /** @var int $ar */
+        /** @var string $ac */
+        sscanf($b, '%[A-Z]%d', $bc, $br);
+        /** @var int $br */
+        /** @var string $bc */
         if ($ar === $br) {
             return -strcasecmp(strlen($ac) . $ac, strlen($bc) . $bc);
         }
@@ -114,67 +116,34 @@ public static function cellReverseSort($a, $b)
         return ($ar < $br) ? 1 : -1;
     }
 
-    /**
-     * Test whether a cell address falls within a defined range of cells.
-     *
-     * @param string $cellAddress Address of the cell we're testing
-     * @param int $beforeRow Number of the row we're inserting/deleting before
-     * @param int $pNumRows Number of rows to insert/delete (negative values indicate deletion)
-     * @param int $beforeColumnIndex Index number of the column we're inserting/deleting before
-     * @param int $pNumCols Number of columns to insert/delete (negative values indicate deletion)
-     *
-     * @return bool
-     */
-    private static function cellAddressInDeleteRange($cellAddress, $beforeRow, $pNumRows, $beforeColumnIndex, $pNumCols)
-    {
-        [$cellColumn, $cellRow] = Coordinate::coordinateFromString($cellAddress);
-        $cellColumnIndex = Coordinate::columnIndexFromString($cellColumn);
-        //    Is cell within the range of rows/columns if we're deleting
-        if (
-            $pNumRows < 0 &&
-            ($cellRow >= ($beforeRow + $pNumRows)) &&
-            ($cellRow < $beforeRow)
-        ) {
-            return true;
-        } elseif (
-            $pNumCols < 0 &&
-            ($cellColumnIndex >= ($beforeColumnIndex + $pNumCols)) &&
-            ($cellColumnIndex < $beforeColumnIndex)
-        ) {
-            return true;
-        }
-
-        return false;
-    }
-
     /**
      * Update page breaks when inserting/deleting rows/columns.
      *
-     * @param Worksheet $pSheet The worksheet that we're editing
-     * @param string $pBefore Insert/Delete before this cell address (e.g. 'A1')
-     * @param int $beforeColumnIndex Index number of the column we're inserting/deleting before
-     * @param int $pNumCols Number of columns to insert/delete (negative values indicate deletion)
-     * @param int $beforeRow Number of the row we're inserting/deleting before
-     * @param int $pNumRows Number of rows to insert/delete (negative values indicate deletion)
+     * @param Worksheet $worksheet The worksheet that we're editing
+     * @param int $numberOfColumns Number of columns to insert/delete (negative values indicate deletion)
+     * @param int $numberOfRows Number of rows to insert/delete (negative values indicate deletion)
      */
-    protected function adjustPageBreaks(Worksheet $pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows): void
+    protected function adjustPageBreaks(Worksheet $worksheet, int $numberOfColumns, int $numberOfRows): void
     {
-        $aBreaks = $pSheet->getBreaks();
-        ($pNumCols > 0 || $pNumRows > 0) ?
-            uksort($aBreaks, ['self', 'cellReverseSort']) : uksort($aBreaks, ['self', 'cellSort']);
-
-        foreach ($aBreaks as $key => $value) {
-            if (self::cellAddressInDeleteRange($key, $beforeRow, $pNumRows, $beforeColumnIndex, $pNumCols)) {
+        $aBreaks = $worksheet->getBreaks();
+        ($numberOfColumns > 0 || $numberOfRows > 0)
+            ? uksort($aBreaks, [self::class, 'cellReverseSort'])
+            : uksort($aBreaks, [self::class, 'cellSort']);
+
+        foreach ($aBreaks as $cellAddress => $value) {
+            /** @var CellReferenceHelper */
+            $cellReferenceHelper = $this->cellReferenceHelper;
+            if ($cellReferenceHelper->cellAddressInDeleteRange($cellAddress) === true) {
                 //    If we're deleting, then clear any defined breaks that are within the range
                 //        of rows/columns that we're deleting
-                $pSheet->setBreak($key, Worksheet::BREAK_NONE);
+                $worksheet->setBreak($cellAddress, Worksheet::BREAK_NONE);
             } else {
                 //    Otherwise update any affected breaks by inserting a new break at the appropriate point
                 //        and removing the old affected break
-                $newReference = $this->updateCellReference($key, $pBefore, $pNumCols, $pNumRows);
-                if ($key != $newReference) {
-                    $pSheet->setBreak($newReference, $value)
-                        ->setBreak($key, Worksheet::BREAK_NONE);
+                $newReference = $this->updateCellReference($cellAddress);
+                if ($cellAddress !== $newReference) {
+                    $worksheet->setBreak($newReference, $value)
+                        ->setBreak($cellAddress, Worksheet::BREAK_NONE);
                 }
             }
         }
@@ -183,76 +152,115 @@ protected function adjustPageBreaks(Worksheet $pSheet, $pBefore, $beforeColumnIn
     /**
      * Update cell comments when inserting/deleting rows/columns.
      *
-     * @param Worksheet $pSheet The worksheet that we're editing
-     * @param string $pBefore Insert/Delete before this cell address (e.g. 'A1')
-     * @param int $beforeColumnIndex Index number of the column we're inserting/deleting before
-     * @param int $pNumCols Number of columns to insert/delete (negative values indicate deletion)
-     * @param int $beforeRow Number of the row we're inserting/deleting before
-     * @param int $pNumRows Number of rows to insert/delete (negative values indicate deletion)
+     * @param Worksheet $worksheet The worksheet that we're editing
      */
-    protected function adjustComments($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows): void
+    protected function adjustComments(Worksheet $worksheet): void
     {
-        $aComments = $pSheet->getComments();
+        $aComments = $worksheet->getComments();
         $aNewComments = []; // the new array of all comments
 
-        foreach ($aComments as $key => &$value) {
+        foreach ($aComments as $cellAddress => &$value) {
             // Any comments inside a deleted range will be ignored
-            if (!self::cellAddressInDeleteRange($key, $beforeRow, $pNumRows, $beforeColumnIndex, $pNumCols)) {
+            /** @var CellReferenceHelper */
+            $cellReferenceHelper = $this->cellReferenceHelper;
+            if ($cellReferenceHelper->cellAddressInDeleteRange($cellAddress) === false) {
                 // Otherwise build a new array of comments indexed by the adjusted cell reference
-                $newReference = $this->updateCellReference($key, $pBefore, $pNumCols, $pNumRows);
+                $newReference = $this->updateCellReference($cellAddress);
                 $aNewComments[$newReference] = $value;
             }
         }
         //    Replace the comments array with the new set of comments
-        $pSheet->setComments($aNewComments);
+        $worksheet->setComments($aNewComments);
     }
 
     /**
      * Update hyperlinks when inserting/deleting rows/columns.
      *
-     * @param Worksheet $pSheet The worksheet that we're editing
-     * @param string $pBefore Insert/Delete before this cell address (e.g. 'A1')
-     * @param int $beforeColumnIndex Index number of the column we're inserting/deleting before
-     * @param int $pNumCols Number of columns to insert/delete (negative values indicate deletion)
-     * @param int $beforeRow Number of the row we're inserting/deleting before
-     * @param int $pNumRows Number of rows to insert/delete (negative values indicate deletion)
+     * @param Worksheet $worksheet The worksheet that we're editing
+     * @param int $numberOfColumns Number of columns to insert/delete (negative values indicate deletion)
+     * @param int $numberOfRows Number of rows to insert/delete (negative values indicate deletion)
      */
-    protected function adjustHyperlinks($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows): void
+    protected function adjustHyperlinks(Worksheet $worksheet, int $numberOfColumns, int $numberOfRows): void
     {
-        $aHyperlinkCollection = $pSheet->getHyperlinkCollection();
-        ($pNumCols > 0 || $pNumRows > 0) ?
-            uksort($aHyperlinkCollection, ['self', 'cellReverseSort']) : uksort($aHyperlinkCollection, ['self', 'cellSort']);
-
-        foreach ($aHyperlinkCollection as $key => $value) {
-            $newReference = $this->updateCellReference($key, $pBefore, $pNumCols, $pNumRows);
-            if ($key != $newReference) {
-                $pSheet->setHyperlink($newReference, $value);
-                $pSheet->setHyperlink($key, null);
+        $aHyperlinkCollection = $worksheet->getHyperlinkCollection();
+        ($numberOfColumns > 0 || $numberOfRows > 0)
+            ? uksort($aHyperlinkCollection, [self::class, 'cellReverseSort'])
+            : uksort($aHyperlinkCollection, [self::class, 'cellSort']);
+
+        foreach ($aHyperlinkCollection as $cellAddress => $value) {
+            $newReference = $this->updateCellReference($cellAddress);
+            /** @var CellReferenceHelper */
+            $cellReferenceHelper = $this->cellReferenceHelper;
+            if ($cellReferenceHelper->cellAddressInDeleteRange($cellAddress) === true) {
+                $worksheet->setHyperlink($cellAddress, null);
+            } elseif ($cellAddress !== $newReference) {
+                $worksheet->setHyperlink($newReference, $value);
+                $worksheet->setHyperlink($cellAddress, null);
             }
         }
     }
 
+    /**
+     * Update conditional formatting styles when inserting/deleting rows/columns.
+     *
+     * @param Worksheet $worksheet The worksheet that we're editing
+     * @param int $numberOfColumns Number of columns to insert/delete (negative values indicate deletion)
+     * @param int $numberOfRows Number of rows to insert/delete (negative values indicate deletion)
+     */
+    protected function adjustConditionalFormatting(Worksheet $worksheet, int $numberOfColumns, int $numberOfRows): void
+    {
+        $aStyles = $worksheet->getConditionalStylesCollection();
+        ($numberOfColumns > 0 || $numberOfRows > 0)
+            ? uksort($aStyles, [self::class, 'cellReverseSort'])
+            : uksort($aStyles, [self::class, 'cellSort']);
+
+        foreach ($aStyles as $cellAddress => $cfRules) {
+            $worksheet->removeConditionalStyles($cellAddress);
+            $newReference = $this->updateCellReference($cellAddress);
+
+            foreach ($cfRules as &$cfRule) {
+                /** @var Conditional $cfRule */
+                $conditions = $cfRule->getConditions();
+                foreach ($conditions as &$condition) {
+                    if (is_string($condition)) {
+                        /** @var CellReferenceHelper */
+                        $cellReferenceHelper = $this->cellReferenceHelper;
+                        $condition = $this->updateFormulaReferences(
+                            $condition,
+                            $cellReferenceHelper->beforeCellAddress(),
+                            $numberOfColumns,
+                            $numberOfRows,
+                            $worksheet->getTitle(),
+                            true
+                        );
+                    }
+                }
+                $cfRule->setConditions($conditions);
+            }
+            $worksheet->setConditionalStyles($newReference, $cfRules);
+        }
+    }
+
     /**
      * Update data validations when inserting/deleting rows/columns.
      *
-     * @param Worksheet $pSheet The worksheet that we're editing
-     * @param string $pBefore Insert/Delete before this cell address (e.g. 'A1')
-     * @param int $beforeColumnIndex Index number of the column we're inserting/deleting before
-     * @param int $pNumCols Number of columns to insert/delete (negative values indicate deletion)
-     * @param int $beforeRow Number of the row we're inserting/deleting before
-     * @param int $pNumRows Number of rows to insert/delete (negative values indicate deletion)
+     * @param Worksheet $worksheet The worksheet that we're editing
+     * @param int $numberOfColumns Number of columns to insert/delete (negative values indicate deletion)
+     * @param int $numberOfRows Number of rows to insert/delete (negative values indicate deletion)
      */
-    protected function adjustDataValidations($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows): void
+    protected function adjustDataValidations(Worksheet $worksheet, int $numberOfColumns, int $numberOfRows): void
     {
-        $aDataValidationCollection = $pSheet->getDataValidationCollection();
-        ($pNumCols > 0 || $pNumRows > 0) ?
-            uksort($aDataValidationCollection, ['self', 'cellReverseSort']) : uksort($aDataValidationCollection, ['self', 'cellSort']);
-
-        foreach ($aDataValidationCollection as $key => $value) {
-            $newReference = $this->updateCellReference($key, $pBefore, $pNumCols, $pNumRows);
-            if ($key != $newReference) {
-                $pSheet->setDataValidation($newReference, $value);
-                $pSheet->setDataValidation($key, null);
+        $aDataValidationCollection = $worksheet->getDataValidationCollection();
+        ($numberOfColumns > 0 || $numberOfRows > 0)
+            ? uksort($aDataValidationCollection, [self::class, 'cellReverseSort'])
+            : uksort($aDataValidationCollection, [self::class, 'cellSort']);
+
+        foreach ($aDataValidationCollection as $cellAddress => $dataValidation) {
+            $newReference = $this->updateCellReference($cellAddress);
+            if ($cellAddress !== $newReference) {
+                $dataValidation->setSqref($newReference);
+                $worksheet->setDataValidation($newReference, $dataValidation);
+                $worksheet->setDataValidation($cellAddress, null);
             }
         }
     }
@@ -260,44 +268,37 @@ protected function adjustDataValidations($pSheet, $pBefore, $beforeColumnIndex,
     /**
      * Update merged cells when inserting/deleting rows/columns.
      *
-     * @param Worksheet $pSheet The worksheet that we're editing
-     * @param string $pBefore Insert/Delete before this cell address (e.g. 'A1')
-     * @param int $beforeColumnIndex Index number of the column we're inserting/deleting before
-     * @param int $pNumCols Number of columns to insert/delete (negative values indicate deletion)
-     * @param int $beforeRow Number of the row we're inserting/deleting before
-     * @param int $pNumRows Number of rows to insert/delete (negative values indicate deletion)
+     * @param Worksheet $worksheet The worksheet that we're editing
      */
-    protected function adjustMergeCells($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows): void
+    protected function adjustMergeCells(Worksheet $worksheet): void
     {
-        $aMergeCells = $pSheet->getMergeCells();
+        $aMergeCells = $worksheet->getMergeCells();
         $aNewMergeCells = []; // the new array of all merge cells
-        foreach ($aMergeCells as $key => &$value) {
-            $newReference = $this->updateCellReference($key, $pBefore, $pNumCols, $pNumRows);
+        foreach ($aMergeCells as $cellAddress => &$value) {
+            $newReference = $this->updateCellReference($cellAddress);
             $aNewMergeCells[$newReference] = $newReference;
         }
-        $pSheet->setMergeCells($aNewMergeCells); // replace the merge cells array
+        $worksheet->setMergeCells($aNewMergeCells); // replace the merge cells array
     }
 
     /**
      * Update protected cells when inserting/deleting rows/columns.
      *
-     * @param Worksheet $pSheet The worksheet that we're editing
-     * @param string $pBefore Insert/Delete before this cell address (e.g. 'A1')
-     * @param int $beforeColumnIndex Index number of the column we're inserting/deleting before
-     * @param int $pNumCols Number of columns to insert/delete (negative values indicate deletion)
-     * @param int $beforeRow Number of the row we're inserting/deleting before
-     * @param int $pNumRows Number of rows to insert/delete (negative values indicate deletion)
+     * @param Worksheet $worksheet The worksheet that we're editing
+     * @param int $numberOfColumns Number of columns to insert/delete (negative values indicate deletion)
+     * @param int $numberOfRows Number of rows to insert/delete (negative values indicate deletion)
      */
-    protected function adjustProtectedCells($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows): void
+    protected function adjustProtectedCells(Worksheet $worksheet, int $numberOfColumns, int $numberOfRows): void
     {
-        $aProtectedCells = $pSheet->getProtectedCells();
-        ($pNumCols > 0 || $pNumRows > 0) ?
-            uksort($aProtectedCells, ['self', 'cellReverseSort']) : uksort($aProtectedCells, ['self', 'cellSort']);
-        foreach ($aProtectedCells as $key => $value) {
-            $newReference = $this->updateCellReference($key, $pBefore, $pNumCols, $pNumRows);
-            if ($key != $newReference) {
-                $pSheet->protectCells($newReference, $value, true);
-                $pSheet->unprotectCells($key);
+        $aProtectedCells = $worksheet->getProtectedCells();
+        ($numberOfColumns > 0 || $numberOfRows > 0)
+            ? uksort($aProtectedCells, [self::class, 'cellReverseSort'])
+            : uksort($aProtectedCells, [self::class, 'cellSort']);
+        foreach ($aProtectedCells as $cellAddress => $value) {
+            $newReference = $this->updateCellReference($cellAddress);
+            if ($cellAddress !== $newReference) {
+                $worksheet->protectCells($newReference, $value, true);
+                $worksheet->unprotectCells($cellAddress);
             }
         }
     }
@@ -305,54 +306,49 @@ protected function adjustProtectedCells($pSheet, $pBefore, $beforeColumnIndex, $
     /**
      * Update column dimensions when inserting/deleting rows/columns.
      *
-     * @param Worksheet $pSheet The worksheet that we're editing
-     * @param string $pBefore Insert/Delete before this cell address (e.g. 'A1')
-     * @param int $beforeColumnIndex Index number of the column we're inserting/deleting before
-     * @param int $pNumCols Number of columns to insert/delete (negative values indicate deletion)
-     * @param int $beforeRow Number of the row we're inserting/deleting before
-     * @param int $pNumRows Number of rows to insert/delete (negative values indicate deletion)
+     * @param Worksheet $worksheet The worksheet that we're editing
      */
-    protected function adjustColumnDimensions($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows): void
+    protected function adjustColumnDimensions(Worksheet $worksheet): void
     {
-        $aColumnDimensions = array_reverse($pSheet->getColumnDimensions(), true);
+        $aColumnDimensions = array_reverse($worksheet->getColumnDimensions(), true);
         if (!empty($aColumnDimensions)) {
             foreach ($aColumnDimensions as $objColumnDimension) {
-                $newReference = $this->updateCellReference($objColumnDimension->getColumnIndex() . '1', $pBefore, $pNumCols, $pNumRows);
+                $newReference = $this->updateCellReference($objColumnDimension->getColumnIndex() . '1');
                 [$newReference] = Coordinate::coordinateFromString($newReference);
-                if ($objColumnDimension->getColumnIndex() != $newReference) {
+                if ($objColumnDimension->getColumnIndex() !== $newReference) {
                     $objColumnDimension->setColumnIndex($newReference);
                 }
             }
-            $pSheet->refreshColumnDimensions();
+
+            $worksheet->refreshColumnDimensions();
         }
     }
 
     /**
      * Update row dimensions when inserting/deleting rows/columns.
      *
-     * @param Worksheet $pSheet The worksheet that we're editing
-     * @param string $pBefore Insert/Delete before this cell address (e.g. 'A1')
-     * @param int $beforeColumnIndex Index number of the column we're inserting/deleting before
-     * @param int $pNumCols Number of columns to insert/delete (negative values indicate deletion)
+     * @param Worksheet $worksheet The worksheet that we're editing
      * @param int $beforeRow Number of the row we're inserting/deleting before
-     * @param int $pNumRows Number of rows to insert/delete (negative values indicate deletion)
+     * @param int $numberOfRows Number of rows to insert/delete (negative values indicate deletion)
      */
-    protected function adjustRowDimensions($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows): void
+    protected function adjustRowDimensions(Worksheet $worksheet, int $beforeRow, int $numberOfRows): void
     {
-        $aRowDimensions = array_reverse($pSheet->getRowDimensions(), true);
+        $aRowDimensions = array_reverse($worksheet->getRowDimensions(), true);
         if (!empty($aRowDimensions)) {
             foreach ($aRowDimensions as $objRowDimension) {
-                $newReference = $this->updateCellReference('A' . $objRowDimension->getRowIndex(), $pBefore, $pNumCols, $pNumRows);
+                $newReference = $this->updateCellReference('A' . $objRowDimension->getRowIndex());
                 [, $newReference] = Coordinate::coordinateFromString($newReference);
-                if ($objRowDimension->getRowIndex() != $newReference) {
-                    $objRowDimension->setRowIndex($newReference);
+                $newRoweference = (int) $newReference;
+                if ($objRowDimension->getRowIndex() !== $newRoweference) {
+                    $objRowDimension->setRowIndex($newRoweference);
                 }
             }
-            $pSheet->refreshRowDimensions();
 
-            $copyDimension = $pSheet->getRowDimension($beforeRow - 1);
-            for ($i = $beforeRow; $i <= $beforeRow - 1 + $pNumRows; ++$i) {
-                $newDimension = $pSheet->getRowDimension($i);
+            $worksheet->refreshRowDimensions();
+
+            $copyDimension = $worksheet->getRowDimension($beforeRow - 1);
+            for ($i = $beforeRow; $i <= $beforeRow - 1 + $numberOfRows; ++$i) {
+                $newDimension = $worksheet->getRowDimension($i);
                 $newDimension->setRowHeight($copyDimension->getRowHeight());
                 $newDimension->setVisible($copyDimension->getVisible());
                 $newDimension->setOutlineLevel($copyDimension->getOutlineLevel());
@@ -364,297 +360,258 @@ protected function adjustRowDimensions($pSheet, $pBefore, $beforeColumnIndex, $p
     /**
      * Insert a new column or row, updating all possible related data.
      *
-     * @param string $pBefore Insert before this cell address (e.g. 'A1')
-     * @param int $pNumCols Number of columns to insert/delete (negative values indicate deletion)
-     * @param int $pNumRows Number of rows to insert/delete (negative values indicate deletion)
-     * @param Worksheet $pSheet The worksheet that we're editing
+     * @param string $beforeCellAddress Insert before this cell address (e.g. 'A1')
+     * @param int $numberOfColumns Number of columns to insert/delete (negative values indicate deletion)
+     * @param int $numberOfRows Number of rows to insert/delete (negative values indicate deletion)
+     * @param Worksheet $worksheet The worksheet that we're editing
      */
-    public function insertNewBefore($pBefore, $pNumCols, $pNumRows, Worksheet $pSheet): void
-    {
-        $remove = ($pNumCols < 0 || $pNumRows < 0);
-        $allCoordinates = $pSheet->getCoordinates();
+    public function insertNewBefore(
+        string $beforeCellAddress,
+        int $numberOfColumns,
+        int $numberOfRows,
+        Worksheet $worksheet
+    ): void {
+        $remove = ($numberOfColumns < 0 || $numberOfRows < 0);
+
+        if (
+            $this->cellReferenceHelper === null
+            || $this->cellReferenceHelper->refreshRequired($beforeCellAddress, $numberOfColumns, $numberOfRows)
+        ) {
+            $this->cellReferenceHelper = new CellReferenceHelper($beforeCellAddress, $numberOfColumns, $numberOfRows);
+        }
 
-        // Get coordinate of $pBefore
-        [$beforeColumn, $beforeRow] = Coordinate::indexesFromString($pBefore);
+        // Get coordinate of $beforeCellAddress
+        [$beforeColumn, $beforeRow, $beforeColumnString] = Coordinate::indexesFromString($beforeCellAddress);
 
         // Clear cells if we are removing columns or rows
-        $highestColumn = $pSheet->getHighestColumn();
-        $highestRow = $pSheet->getHighestRow();
+        $highestColumn = $worksheet->getHighestColumn();
+        $highestDataColumn = $worksheet->getHighestDataColumn();
+        $highestRow = $worksheet->getHighestRow();
+        $highestDataRow = $worksheet->getHighestDataRow();
 
         // 1. Clear column strips if we are removing columns
-        if ($pNumCols < 0 && $beforeColumn - 2 + $pNumCols > 0) {
-            for ($i = 1; $i <= $highestRow - 1; ++$i) {
-                for ($j = $beforeColumn - 1 + $pNumCols; $j <= $beforeColumn - 2; ++$j) {
-                    $coordinate = Coordinate::stringFromColumnIndex($j + 1) . $i;
-                    $pSheet->removeConditionalStyles($coordinate);
-                    if ($pSheet->cellExists($coordinate)) {
-                        $pSheet->getCell($coordinate)->setValueExplicit('', DataType::TYPE_NULL);
-                        $pSheet->getCell($coordinate)->setXfIndex(0);
-                    }
-                }
-            }
+        if ($numberOfColumns < 0 && $beforeColumn - 2 + $numberOfColumns > 0) {
+            $this->clearColumnStrips($highestRow, $beforeColumn, $numberOfColumns, $worksheet);
         }
 
         // 2. Clear row strips if we are removing rows
-        if ($pNumRows < 0 && $beforeRow - 1 + $pNumRows > 0) {
-            for ($i = $beforeColumn - 1; $i <= Coordinate::columnIndexFromString($highestColumn) - 1; ++$i) {
-                for ($j = $beforeRow + $pNumRows; $j <= $beforeRow - 1; ++$j) {
-                    $coordinate = Coordinate::stringFromColumnIndex($i + 1) . $j;
-                    $pSheet->removeConditionalStyles($coordinate);
-                    if ($pSheet->cellExists($coordinate)) {
-                        $pSheet->getCell($coordinate)->setValueExplicit('', DataType::TYPE_NULL);
-                        $pSheet->getCell($coordinate)->setXfIndex(0);
-                    }
-                }
+        if ($numberOfRows < 0 && $beforeRow - 1 + $numberOfRows > 0) {
+            $this->clearRowStrips($highestColumn, $beforeColumn, $beforeRow, $numberOfRows, $worksheet);
+        }
+
+        // Find missing coordinates. This is important when inserting or deleting column before the last column
+        $startRow = $startCol = 1;
+        $startColString = 'A';
+        if ($numberOfRows === 0) {
+            $startCol = $beforeColumn;
+            $startColString = $beforeColumnString;
+        } elseif ($numberOfColumns === 0) {
+            $startRow = $beforeRow;
+        }
+        $highColumn = Coordinate::columnIndexFromString($highestDataColumn);
+        for ($row = $startRow; $row <= $highestDataRow; ++$row) {
+            for ($col = $startCol, $colString = $startColString; $col <= $highColumn; ++$col, ++$colString) {
+                $worksheet->getCell("$colString$row"); // create cell if it doesn't exist
             }
         }
 
-        // Loop through cells, bottom-up, and change cell coordinate
+        $allCoordinates = $worksheet->getCoordinates();
         if ($remove) {
             // It's faster to reverse and pop than to use unshift, especially with large cell collections
             $allCoordinates = array_reverse($allCoordinates);
         }
+
+        // Loop through cells, bottom-up, and change cell coordinate
         while ($coordinate = array_pop($allCoordinates)) {
-            $cell = $pSheet->getCell($coordinate);
+            $cell = $worksheet->getCell($coordinate);
             $cellIndex = Coordinate::columnIndexFromString($cell->getColumn());
 
-            if ($cellIndex - 1 + $pNumCols < 0) {
+            if ($cellIndex - 1 + $numberOfColumns < 0) {
                 continue;
             }
 
             // New coordinate
-            $newCoordinate = Coordinate::stringFromColumnIndex($cellIndex + $pNumCols) . ($cell->getRow() + $pNumRows);
+            $newCoordinate = Coordinate::stringFromColumnIndex($cellIndex + $numberOfColumns) . ($cell->getRow() + $numberOfRows);
 
             // Should the cell be updated? Move value and cellXf index from one cell to another.
             if (($cellIndex >= $beforeColumn) && ($cell->getRow() >= $beforeRow)) {
                 // Update cell styles
-                $pSheet->getCell($newCoordinate)->setXfIndex($cell->getXfIndex());
+                $worksheet->getCell($newCoordinate)->setXfIndex($cell->getXfIndex());
 
                 // Insert this cell at its new location
-                if ($cell->getDataType() == DataType::TYPE_FORMULA) {
+                if ($cell->getDataType() === DataType::TYPE_FORMULA) {
                     // Formula should be adjusted
-                    $pSheet->getCell($newCoordinate)
-                        ->setValue($this->updateFormulaReferences($cell->getValue(), $pBefore, $pNumCols, $pNumRows, $pSheet->getTitle()));
+                    $worksheet->getCell($newCoordinate)
+                        ->setValue($this->updateFormulaReferences($cell->getValueString(), $beforeCellAddress, $numberOfColumns, $numberOfRows, $worksheet->getTitle(), true));
                 } else {
-                    // Formula should not be adjusted
-                    $pSheet->getCell($newCoordinate)->setValue($cell->getValue());
+                    // Cell value should not be adjusted
+                    $worksheet->getCell($newCoordinate)->setValueExplicit($cell->getValue(), $cell->getDataType());
                 }
 
                 // Clear the original cell
-                $pSheet->getCellCollection()->delete($coordinate);
+                $worksheet->getCellCollection()->delete($coordinate);
             } else {
                 /*    We don't need to update styles for rows/columns before our insertion position,
-                        but we do still need to adjust any formulae    in those cells                    */
-                if ($cell->getDataType() == DataType::TYPE_FORMULA) {
+                        but we do still need to adjust any formulae in those cells                    */
+                if ($cell->getDataType() === DataType::TYPE_FORMULA) {
                     // Formula should be adjusted
-                    $cell->setValue($this->updateFormulaReferences($cell->getValue(), $pBefore, $pNumCols, $pNumRows, $pSheet->getTitle()));
+                    $cell->setValue($this->updateFormulaReferences($cell->getValueString(), $beforeCellAddress, $numberOfColumns, $numberOfRows, $worksheet->getTitle(), true));
                 }
             }
         }
 
         // Duplicate styles for the newly inserted cells
-        $highestColumn = $pSheet->getHighestColumn();
-        $highestRow = $pSheet->getHighestRow();
-
-        if ($pNumCols > 0 && $beforeColumn - 2 > 0) {
-            for ($i = $beforeRow; $i <= $highestRow - 1; ++$i) {
-                // Style
-                $coordinate = Coordinate::stringFromColumnIndex($beforeColumn - 1) . $i;
-                if ($pSheet->cellExists($coordinate)) {
-                    $xfIndex = $pSheet->getCell($coordinate)->getXfIndex();
-                    $conditionalStyles = $pSheet->conditionalStylesExists($coordinate) ?
-                        $pSheet->getConditionalStyles($coordinate) : false;
-                    for ($j = $beforeColumn; $j <= $beforeColumn - 1 + $pNumCols; ++$j) {
-                        $pSheet->getCellByColumnAndRow($j, $i)->setXfIndex($xfIndex);
-                        if ($conditionalStyles) {
-                            $cloned = [];
-                            foreach ($conditionalStyles as $conditionalStyle) {
-                                $cloned[] = clone $conditionalStyle;
-                            }
-                            $pSheet->setConditionalStyles(Coordinate::stringFromColumnIndex($j) . $i, $cloned);
-                        }
-                    }
-                }
-            }
+        $highestColumn = $worksheet->getHighestColumn();
+        $highestRow = $worksheet->getHighestRow();
+
+        if ($numberOfColumns > 0 && $beforeColumn - 2 > 0) {
+            $this->duplicateStylesByColumn($worksheet, $beforeColumn, $beforeRow, $highestRow, $numberOfColumns);
         }
 
-        if ($pNumRows > 0 && $beforeRow - 1 > 0) {
-            for ($i = $beforeColumn; $i <= Coordinate::columnIndexFromString($highestColumn); ++$i) {
-                // Style
-                $coordinate = Coordinate::stringFromColumnIndex($i) . ($beforeRow - 1);
-                if ($pSheet->cellExists($coordinate)) {
-                    $xfIndex = $pSheet->getCell($coordinate)->getXfIndex();
-                    $conditionalStyles = $pSheet->conditionalStylesExists($coordinate) ?
-                        $pSheet->getConditionalStyles($coordinate) : false;
-                    for ($j = $beforeRow; $j <= $beforeRow - 1 + $pNumRows; ++$j) {
-                        $pSheet->getCell(Coordinate::stringFromColumnIndex($i) . $j)->setXfIndex($xfIndex);
-                        if ($conditionalStyles) {
-                            $cloned = [];
-                            foreach ($conditionalStyles as $conditionalStyle) {
-                                $cloned[] = clone $conditionalStyle;
-                            }
-                            $pSheet->setConditionalStyles(Coordinate::stringFromColumnIndex($i) . $j, $cloned);
-                        }
-                    }
-                }
-            }
+        if ($numberOfRows > 0 && $beforeRow - 1 > 0) {
+            $this->duplicateStylesByRow($worksheet, $beforeColumn, $beforeRow, $highestColumn, $numberOfRows);
         }
 
         // Update worksheet: column dimensions
-        $this->adjustColumnDimensions($pSheet, $pBefore, $beforeColumn, $pNumCols, $beforeRow, $pNumRows);
+        $this->adjustColumnDimensions($worksheet);
 
         // Update worksheet: row dimensions
-        $this->adjustRowDimensions($pSheet, $pBefore, $beforeColumn, $pNumCols, $beforeRow, $pNumRows);
+        $this->adjustRowDimensions($worksheet, $beforeRow, $numberOfRows);
 
         //    Update worksheet: page breaks
-        $this->adjustPageBreaks($pSheet, $pBefore, $beforeColumn, $pNumCols, $beforeRow, $pNumRows);
+        $this->adjustPageBreaks($worksheet, $numberOfColumns, $numberOfRows);
 
         //    Update worksheet: comments
-        $this->adjustComments($pSheet, $pBefore, $beforeColumn, $pNumCols, $beforeRow, $pNumRows);
+        $this->adjustComments($worksheet);
 
         // Update worksheet: hyperlinks
-        $this->adjustHyperlinks($pSheet, $pBefore, $beforeColumn, $pNumCols, $beforeRow, $pNumRows);
+        $this->adjustHyperlinks($worksheet, $numberOfColumns, $numberOfRows);
+
+        // Update worksheet: conditional formatting styles
+        $this->adjustConditionalFormatting($worksheet, $numberOfColumns, $numberOfRows);
 
         // Update worksheet: data validations
-        $this->adjustDataValidations($pSheet, $pBefore, $beforeColumn, $pNumCols, $beforeRow, $pNumRows);
+        $this->adjustDataValidations($worksheet, $numberOfColumns, $numberOfRows);
 
         // Update worksheet: merge cells
-        $this->adjustMergeCells($pSheet, $pBefore, $beforeColumn, $pNumCols, $beforeRow, $pNumRows);
+        $this->adjustMergeCells($worksheet);
 
         // Update worksheet: protected cells
-        $this->adjustProtectedCells($pSheet, $pBefore, $beforeColumn, $pNumCols, $beforeRow, $pNumRows);
+        $this->adjustProtectedCells($worksheet, $numberOfColumns, $numberOfRows);
 
         // Update worksheet: autofilter
-        $autoFilter = $pSheet->getAutoFilter();
-        $autoFilterRange = $autoFilter->getRange();
-        if (!empty($autoFilterRange)) {
-            if ($pNumCols != 0) {
-                $autoFilterColumns = $autoFilter->getColumns();
-                if (count($autoFilterColumns) > 0) {
-                    $column = '';
-                    $row = 0;
-                    sscanf($pBefore, '%[A-Z]%d', $column, $row);
-                    $columnIndex = Coordinate::columnIndexFromString($column);
-                    [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($autoFilterRange);
-                    if ($columnIndex <= $rangeEnd[0]) {
-                        if ($pNumCols < 0) {
-                            //    If we're actually deleting any columns that fall within the autofilter range,
-                            //        then we delete any rules for those columns
-                            $deleteColumn = $columnIndex + $pNumCols - 1;
-                            $deleteCount = abs($pNumCols);
-                            for ($i = 1; $i <= $deleteCount; ++$i) {
-                                if (isset($autoFilterColumns[Coordinate::stringFromColumnIndex($deleteColumn + 1)])) {
-                                    $autoFilter->clearColumn(Coordinate::stringFromColumnIndex($deleteColumn + 1));
-                                }
-                                ++$deleteColumn;
-                            }
-                        }
-                        $startCol = ($columnIndex > $rangeStart[0]) ? $columnIndex : $rangeStart[0];
+        $this->adjustAutoFilter($worksheet, $beforeCellAddress, $numberOfColumns);
 
-                        //    Shuffle columns in autofilter range
-                        if ($pNumCols > 0) {
-                            $startColRef = $startCol;
-                            $endColRef = $rangeEnd[0];
-                            $toColRef = $rangeEnd[0] + $pNumCols;
-
-                            do {
-                                $autoFilter->shiftColumn(Coordinate::stringFromColumnIndex($endColRef), Coordinate::stringFromColumnIndex($toColRef));
-                                --$endColRef;
-                                --$toColRef;
-                            } while ($startColRef <= $endColRef);
-                        } else {
-                            //    For delete, we shuffle from beginning to end to avoid overwriting
-                            $startColID = Coordinate::stringFromColumnIndex($startCol);
-                            $toColID = Coordinate::stringFromColumnIndex($startCol + $pNumCols);
-                            $endColID = Coordinate::stringFromColumnIndex($rangeEnd[0] + 1);
-                            do {
-                                $autoFilter->shiftColumn($startColID, $toColID);
-                                ++$startColID;
-                                ++$toColID;
-                            } while ($startColID != $endColID);
-                        }
-                    }
-                }
-            }
-            $pSheet->setAutoFilter($this->updateCellReference($autoFilterRange, $pBefore, $pNumCols, $pNumRows));
-        }
+        // Update worksheet: table
+        $this->adjustTable($worksheet, $beforeCellAddress, $numberOfColumns);
 
         // Update worksheet: freeze pane
-        if ($pSheet->getFreezePane()) {
-            $splitCell = $pSheet->getFreezePane();
-            $topLeftCell = $pSheet->getTopLeftCell();
+        if ($worksheet->getFreezePane()) {
+            $splitCell = $worksheet->getFreezePane();
+            $topLeftCell = $worksheet->getTopLeftCell() ?? '';
 
-            $splitCell = $this->updateCellReference($splitCell, $pBefore, $pNumCols, $pNumRows);
-            $topLeftCell = $this->updateCellReference($topLeftCell, $pBefore, $pNumCols, $pNumRows);
+            $splitCell = $this->updateCellReference($splitCell);
+            $topLeftCell = $this->updateCellReference($topLeftCell);
 
-            $pSheet->freezePane($splitCell, $topLeftCell);
+            $worksheet->freezePane($splitCell, $topLeftCell);
         }
 
         // Page setup
-        if ($pSheet->getPageSetup()->isPrintAreaSet()) {
-            $pSheet->getPageSetup()->setPrintArea($this->updateCellReference($pSheet->getPageSetup()->getPrintArea(), $pBefore, $pNumCols, $pNumRows));
+        if ($worksheet->getPageSetup()->isPrintAreaSet()) {
+            $worksheet->getPageSetup()->setPrintArea(
+                $this->updateCellReference($worksheet->getPageSetup()->getPrintArea())
+            );
         }
 
         // Update worksheet: drawings
-        $aDrawings = $pSheet->getDrawingCollection();
+        $aDrawings = $worksheet->getDrawingCollection();
         foreach ($aDrawings as $objDrawing) {
-            $newReference = $this->updateCellReference($objDrawing->getCoordinates(), $pBefore, $pNumCols, $pNumRows);
+            $newReference = $this->updateCellReference($objDrawing->getCoordinates());
             if ($objDrawing->getCoordinates() != $newReference) {
                 $objDrawing->setCoordinates($newReference);
             }
+            if ($objDrawing->getCoordinates2() !== '') {
+                $newReference = $this->updateCellReference($objDrawing->getCoordinates2());
+                if ($objDrawing->getCoordinates2() != $newReference) {
+                    $objDrawing->setCoordinates2($newReference);
+                }
+            }
         }
 
         // Update workbook: define names
-        if (count($pSheet->getParent()->getDefinedNames()) > 0) {
-            foreach ($pSheet->getParent()->getDefinedNames() as $definedName) {
-                if ($definedName->getWorksheet() !== null && $definedName->getWorksheet()->getHashCode() === $pSheet->getHashCode()) {
-                    $definedName->setValue($this->updateCellReference($definedName->getValue(), $pBefore, $pNumCols, $pNumRows));
-                }
-            }
+        if (count($worksheet->getParentOrThrow()->getDefinedNames()) > 0) {
+            $this->updateDefinedNames($worksheet, $beforeCellAddress, $numberOfColumns, $numberOfRows);
         }
 
         // Garbage collect
-        $pSheet->garbageCollect();
+        $worksheet->garbageCollect();
+    }
+
+    private static function matchSheetName(?string $match, string $worksheetName): bool
+    {
+        return $match === null || $match === '' || $match === "'\u{fffc}'" || $match === "'\u{fffb}'" || strcasecmp(trim($match, "'"), $worksheetName) === 0;
+    }
+
+    private static function sheetnameBeforeCells(string $match, string $worksheetName, string $cells): string
+    {
+        $toString = ($match > '') ? "$match!" : '';
+
+        return str_replace(["\u{fffc}", "'\u{fffb}'"], $worksheetName, $toString) . $cells;
     }
 
     /**
      * Update references within formulas.
      *
-     * @param string $pFormula Formula to update
-     * @param string $pBefore Insert before this one
-     * @param int $pNumCols Number of columns to insert
-     * @param int $pNumRows Number of rows to insert
-     * @param string $sheetName Worksheet name/title
+     * @param string $formula Formula to update
+     * @param string $beforeCellAddress Insert before this one
+     * @param int $numberOfColumns Number of columns to insert
+     * @param int $numberOfRows Number of rows to insert
+     * @param string $worksheetName Worksheet name/title
      *
      * @return string Updated formula
      */
-    public function updateFormulaReferences($pFormula = '', $pBefore = 'A1', $pNumCols = 0, $pNumRows = 0, $sheetName = '')
-    {
+    public function updateFormulaReferences(
+        string $formula = '',
+        string $beforeCellAddress = 'A1',
+        int $numberOfColumns = 0,
+        int $numberOfRows = 0,
+        string $worksheetName = '',
+        bool $includeAbsoluteReferences = false,
+        bool $onlyAbsoluteReferences = false
+    ): string {
+        $callback = fn (array $matches): string => (strcasecmp(trim($matches[2], "'"), $worksheetName) === 0) ? (($matches[2][0] === "'") ? "'\u{fffc}'!" : "'\u{fffb}'!") : "'\u{fffd}'!";
+        if (
+            $this->cellReferenceHelper === null
+            || $this->cellReferenceHelper->refreshRequired($beforeCellAddress, $numberOfColumns, $numberOfRows)
+        ) {
+            $this->cellReferenceHelper = new CellReferenceHelper($beforeCellAddress, $numberOfColumns, $numberOfRows);
+        }
+
         //    Update cell references in the formula
-        $formulaBlocks = explode('"', $pFormula);
+        $formulaBlocks = explode('"', $formula);
         $i = false;
         foreach ($formulaBlocks as &$formulaBlock) {
             //    Ignore blocks that were enclosed in quotes (alternating entries in the $formulaBlocks array after the explode)
-            if ($i = !$i) {
+            $i = $i === false;
+            if ($i) {
                 $adjustCount = 0;
                 $newCellTokens = $cellTokens = [];
                 //    Search for row ranges (e.g. 'Sheet1'!3:5 or 3:5) with or without $ absolutes (e.g. $3:5)
-                $matchCount = preg_match_all('/' . self::REFHELPER_REGEXP_ROWRANGE . '/i', ' ' . $formulaBlock . ' ', $matches, PREG_SET_ORDER);
+                $formulaBlockx = ' ' . (preg_replace_callback(self::SHEETNAME_PART_WITH_SLASHES, $callback, $formulaBlock) ?? $formulaBlock) . ' ';
+                $matchCount = preg_match_all('/' . self::REFHELPER_REGEXP_ROWRANGE . '/mui', $formulaBlockx, $matches, PREG_SET_ORDER);
                 if ($matchCount > 0) {
                     foreach ($matches as $match) {
-                        $fromString = ($match[2] > '') ? $match[2] . '!' : '';
-                        $fromString .= $match[3] . ':' . $match[4];
-                        $modified3 = substr($this->updateCellReference('$A' . $match[3], $pBefore, $pNumCols, $pNumRows), 2);
-                        $modified4 = substr($this->updateCellReference('$A' . $match[4], $pBefore, $pNumCols, $pNumRows), 2);
+                        $fromString = self::sheetnameBeforeCells($match[2], $worksheetName, "{$match[3]}:{$match[4]}");
+                        $modified3 = substr($this->updateCellReference('$A' . $match[3], $includeAbsoluteReferences, $onlyAbsoluteReferences), 2);
+                        $modified4 = substr($this->updateCellReference('$A' . $match[4], $includeAbsoluteReferences, $onlyAbsoluteReferences), 2);
 
                         if ($match[3] . ':' . $match[4] !== $modified3 . ':' . $modified4) {
-                            if (($match[2] == '') || (trim($match[2], "'") == $sheetName)) {
-                                $toString = ($match[2] > '') ? $match[2] . '!' : '';
-                                $toString .= $modified3 . ':' . $modified4;
+                            if (self::matchSheetName($match[2], $worksheetName)) {
+                                $toString = self::sheetnameBeforeCells($match[2], $worksheetName, "$modified3:$modified4");
                                 //    Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more
                                 $column = 100000;
                                 $row = 10000000 + (int) trim($match[3], '$');
-                                $cellIndex = $column . $row;
+                                $cellIndex = "{$column}{$row}";
 
                                 $newCellTokens[$cellIndex] = preg_quote($toString, '/');
                                 $cellTokens[$cellIndex] = '/(?<!\d\$\!)' . preg_quote($fromString, '/') . '(?!\d)/i';
@@ -664,22 +621,21 @@ public function updateFormulaReferences($pFormula = '', $pBefore = 'A1', $pNumCo
                     }
                 }
                 //    Search for column ranges (e.g. 'Sheet1'!C:E or C:E) with or without $ absolutes (e.g. $C:E)
-                $matchCount = preg_match_all('/' . self::REFHELPER_REGEXP_COLRANGE . '/i', ' ' . $formulaBlock . ' ', $matches, PREG_SET_ORDER);
+                $formulaBlockx = ' ' . (preg_replace_callback(self::SHEETNAME_PART_WITH_SLASHES, $callback, $formulaBlock) ?? $formulaBlock) . ' ';
+                $matchCount = preg_match_all('/' . self::REFHELPER_REGEXP_COLRANGE . '/mui', $formulaBlockx, $matches, PREG_SET_ORDER);
                 if ($matchCount > 0) {
                     foreach ($matches as $match) {
-                        $fromString = ($match[2] > '') ? $match[2] . '!' : '';
-                        $fromString .= $match[3] . ':' . $match[4];
-                        $modified3 = substr($this->updateCellReference($match[3] . '$1', $pBefore, $pNumCols, $pNumRows), 0, -2);
-                        $modified4 = substr($this->updateCellReference($match[4] . '$1', $pBefore, $pNumCols, $pNumRows), 0, -2);
+                        $fromString = self::sheetnameBeforeCells($match[2], $worksheetName, "{$match[3]}:{$match[4]}");
+                        $modified3 = substr($this->updateCellReference($match[3] . '$1', $includeAbsoluteReferences, $onlyAbsoluteReferences), 0, -2);
+                        $modified4 = substr($this->updateCellReference($match[4] . '$1', $includeAbsoluteReferences, $onlyAbsoluteReferences), 0, -2);
 
                         if ($match[3] . ':' . $match[4] !== $modified3 . ':' . $modified4) {
-                            if (($match[2] == '') || (trim($match[2], "'") == $sheetName)) {
-                                $toString = ($match[2] > '') ? $match[2] . '!' : '';
-                                $toString .= $modified3 . ':' . $modified4;
+                            if (self::matchSheetName($match[2], $worksheetName)) {
+                                $toString = self::sheetnameBeforeCells($match[2], $worksheetName, "$modified3:$modified4");
                                 //    Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more
                                 $column = Coordinate::columnIndexFromString(trim($match[3], '$')) + 100000;
                                 $row = 10000000;
-                                $cellIndex = $column . $row;
+                                $cellIndex = "{$column}{$row}";
 
                                 $newCellTokens[$cellIndex] = preg_quote($toString, '/');
                                 $cellTokens[$cellIndex] = '/(?<![A-Z\$\!])' . preg_quote($fromString, '/') . '(?![A-Z])/i';
@@ -689,23 +645,22 @@ public function updateFormulaReferences($pFormula = '', $pBefore = 'A1', $pNumCo
                     }
                 }
                 //    Search for cell ranges (e.g. 'Sheet1'!A3:C5 or A3:C5) with or without $ absolutes (e.g. $A1:C$5)
-                $matchCount = preg_match_all('/' . self::REFHELPER_REGEXP_CELLRANGE . '/i', ' ' . $formulaBlock . ' ', $matches, PREG_SET_ORDER);
+                $formulaBlockx = ' ' . (preg_replace_callback(self::SHEETNAME_PART_WITH_SLASHES, $callback, "$formulaBlock") ?? "$formulaBlock") . ' ';
+                $matchCount = preg_match_all('/' . self::REFHELPER_REGEXP_CELLRANGE . '/mui', $formulaBlockx, $matches, PREG_SET_ORDER);
                 if ($matchCount > 0) {
                     foreach ($matches as $match) {
-                        $fromString = ($match[2] > '') ? $match[2] . '!' : '';
-                        $fromString .= $match[3] . ':' . $match[4];
-                        $modified3 = $this->updateCellReference($match[3], $pBefore, $pNumCols, $pNumRows);
-                        $modified4 = $this->updateCellReference($match[4], $pBefore, $pNumCols, $pNumRows);
+                        $fromString = self::sheetnameBeforeCells($match[2], $worksheetName, "{$match[3]}:{$match[4]}");
+                        $modified3 = $this->updateCellReference($match[3], $includeAbsoluteReferences, $onlyAbsoluteReferences);
+                        $modified4 = $this->updateCellReference($match[4], $includeAbsoluteReferences, $onlyAbsoluteReferences);
 
                         if ($match[3] . $match[4] !== $modified3 . $modified4) {
-                            if (($match[2] == '') || (trim($match[2], "'") == $sheetName)) {
-                                $toString = ($match[2] > '') ? $match[2] . '!' : '';
-                                $toString .= $modified3 . ':' . $modified4;
+                            if (self::matchSheetName($match[2], $worksheetName)) {
+                                $toString = self::sheetnameBeforeCells($match[2], $worksheetName, "$modified3:$modified4");
                                 [$column, $row] = Coordinate::coordinateFromString($match[3]);
                                 //    Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more
                                 $column = Coordinate::columnIndexFromString(trim($column, '$')) + 100000;
                                 $row = (int) trim($row, '$') + 10000000;
-                                $cellIndex = $column . $row;
+                                $cellIndex = "{$column}{$row}";
 
                                 $newCellTokens[$cellIndex] = preg_quote($toString, '/');
                                 $cellTokens[$cellIndex] = '/(?<![A-Z]\$\!)' . preg_quote($fromString, '/') . '(?!\d)/i';
@@ -715,23 +670,25 @@ public function updateFormulaReferences($pFormula = '', $pBefore = 'A1', $pNumCo
                     }
                 }
                 //    Search for cell references (e.g. 'Sheet1'!A3 or C5) with or without $ absolutes (e.g. $A1 or C$5)
-                $matchCount = preg_match_all('/' . self::REFHELPER_REGEXP_CELLREF . '/i', ' ' . $formulaBlock . ' ', $matches, PREG_SET_ORDER);
+
+                $formulaBlockx = ' ' . (preg_replace_callback(self::SHEETNAME_PART_WITH_SLASHES, $callback, $formulaBlock) ?? $formulaBlock) . ' ';
+                $matchCount = preg_match_all('/' . self::REFHELPER_REGEXP_CELLREF . '/mui', $formulaBlockx, $matches, PREG_SET_ORDER);
 
                 if ($matchCount > 0) {
                     foreach ($matches as $match) {
-                        $fromString = ($match[2] > '') ? $match[2] . '!' : '';
-                        $fromString .= $match[3];
+                        $fromString = self::sheetnameBeforeCells($match[2], $worksheetName, "{$match[3]}");
 
-                        $modified3 = $this->updateCellReference($match[3], $pBefore, $pNumCols, $pNumRows);
+                        $modified3 = $this->updateCellReference($match[3], $includeAbsoluteReferences, $onlyAbsoluteReferences);
                         if ($match[3] !== $modified3) {
-                            if (($match[2] == '') || (trim($match[2], "'") == $sheetName)) {
-                                $toString = ($match[2] > '') ? $match[2] . '!' : '';
-                                $toString .= $modified3;
+                            if (self::matchSheetName($match[2], $worksheetName)) {
+                                $toString = self::sheetnameBeforeCells($match[2], $worksheetName, "$modified3");
                                 [$column, $row] = Coordinate::coordinateFromString($match[3]);
+                                $columnAdditionalIndex = $column[0] === '$' ? 1 : 0;
+                                $rowAdditionalIndex = $row[0] === '$' ? 1 : 0;
                                 //    Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more
                                 $column = Coordinate::columnIndexFromString(trim($column, '$')) + 100000;
                                 $row = (int) trim($row, '$') + 10000000;
-                                $cellIndex = $row . $column;
+                                $cellIndex = $row . $rowAdditionalIndex . $column . $columnAdditionalIndex;
 
                                 $newCellTokens[$cellIndex] = preg_quote($toString, '/');
                                 $cellTokens[$cellIndex] = '/(?<![A-Z\$\!])' . preg_quote($fromString, '/') . '(?!\d)/i';
@@ -741,14 +698,14 @@ public function updateFormulaReferences($pFormula = '', $pBefore = 'A1', $pNumCo
                     }
                 }
                 if ($adjustCount > 0) {
-                    if ($pNumCols > 0 || $pNumRows > 0) {
+                    if ($numberOfColumns > 0 || $numberOfRows > 0) {
                         krsort($cellTokens);
                         krsort($newCellTokens);
                     } else {
                         ksort($cellTokens);
                         ksort($newCellTokens);
                     }   //  Update cell references in the formula
-                    $formulaBlock = str_replace('\\', '', preg_replace($cellTokens, $newCellTokens, $formulaBlock));
+                    $formulaBlock = str_replace('\\', '', (string) preg_replace($cellTokens, $newCellTokens, $formulaBlock));
                 }
             }
         }
@@ -761,22 +718,22 @@ public function updateFormulaReferences($pFormula = '', $pBefore = 'A1', $pNumCo
     /**
      * Update all cell references within a formula, irrespective of worksheet.
      */
-    public function updateFormulaReferencesAnyWorksheet(string $formula = '', int $insertColumns = 0, int $insertRows = 0): string
+    public function updateFormulaReferencesAnyWorksheet(string $formula = '', int $numberOfColumns = 0, int $numberOfRows = 0): string
     {
-        $formula = $this->updateCellReferencesAllWorksheets($formula, $insertColumns, $insertRows);
+        $formula = $this->updateCellReferencesAllWorksheets($formula, $numberOfColumns, $numberOfRows);
 
-        if ($insertColumns !== 0) {
-            $formula = $this->updateColumnRangesAllWorksheets($formula, $insertColumns);
+        if ($numberOfColumns !== 0) {
+            $formula = $this->updateColumnRangesAllWorksheets($formula, $numberOfColumns);
         }
 
-        if ($insertRows !== 0) {
-            $formula = $this->updateRowRangesAllWorksheets($formula, $insertRows);
+        if ($numberOfRows !== 0) {
+            $formula = $this->updateRowRangesAllWorksheets($formula, $numberOfRows);
         }
 
         return $formula;
     }
 
-    private function updateCellReferencesAllWorksheets(string $formula, int $insertColumns, int $insertRows): string
+    private function updateCellReferencesAllWorksheets(string $formula, int $numberOfColumns, int $numberOfRows): string
     {
         $splitCount = preg_match_all(
             '/' . Calculation::CALCULATION_REGEXP_CELLREF_RELATIVE . '/mui',
@@ -803,11 +760,13 @@ private function updateCellReferencesAllWorksheets(string $formula, int $insertC
             $row = $rows[$splitCount][0];
 
             if (!empty($column) && $column[0] !== '$') {
-                $column = Coordinate::stringFromColumnIndex(Coordinate::columnIndexFromString($column) + $insertColumns);
+                $column = ((Coordinate::columnIndexFromString($column) + $numberOfColumns) % AddressRange::MAX_COLUMN_INT) ?: AddressRange::MAX_COLUMN_INT;
+                $column = Coordinate::stringFromColumnIndex($column);
+                $rowOffset -= ($columnLength - strlen($column));
                 $formula = substr($formula, 0, $columnOffset) . $column . substr($formula, $columnOffset + $columnLength);
             }
             if (!empty($row) && $row[0] !== '$') {
-                $row += $insertRows;
+                $row = (((int) $row + $numberOfRows) % AddressRange::MAX_ROW) ?: AddressRange::MAX_ROW;
                 $formula = substr($formula, 0, $rowOffset) . $row . substr($formula, $rowOffset + $rowLength);
             }
         }
@@ -815,7 +774,7 @@ private function updateCellReferencesAllWorksheets(string $formula, int $insertC
         return $formula;
     }
 
-    private function updateColumnRangesAllWorksheets(string $formula, int $insertColumns): string
+    private function updateColumnRangesAllWorksheets(string $formula, int $numberOfColumns): string
     {
         $splitCount = preg_match_all(
             '/' . Calculation::CALCULATION_REGEXP_COLUMNRANGE_RELATIVE . '/mui',
@@ -842,11 +801,11 @@ private function updateColumnRangesAllWorksheets(string $formula, int $insertCol
             $toColumn = $toColumns[$splitCount][0];
 
             if (!empty($fromColumn) && $fromColumn[0] !== '$') {
-                $fromColumn = Coordinate::stringFromColumnIndex(Coordinate::columnIndexFromString($fromColumn) + $insertColumns);
+                $fromColumn = Coordinate::stringFromColumnIndex(Coordinate::columnIndexFromString($fromColumn) + $numberOfColumns);
                 $formula = substr($formula, 0, $fromColumnOffset) . $fromColumn . substr($formula, $fromColumnOffset + $fromColumnLength);
             }
             if (!empty($toColumn) && $toColumn[0] !== '$') {
-                $toColumn = Coordinate::stringFromColumnIndex(Coordinate::columnIndexFromString($toColumn) + $insertColumns);
+                $toColumn = Coordinate::stringFromColumnIndex(Coordinate::columnIndexFromString($toColumn) + $numberOfColumns);
                 $formula = substr($formula, 0, $toColumnOffset) . $toColumn . substr($formula, $toColumnOffset + $toColumnLength);
             }
         }
@@ -854,7 +813,7 @@ private function updateColumnRangesAllWorksheets(string $formula, int $insertCol
         return $formula;
     }
 
-    private function updateRowRangesAllWorksheets(string $formula, int $insertRows): string
+    private function updateRowRangesAllWorksheets(string $formula, int $numberOfRows): string
     {
         $splitCount = preg_match_all(
             '/' . Calculation::CALCULATION_REGEXP_ROWRANGE_RELATIVE . '/mui',
@@ -881,11 +840,11 @@ private function updateRowRangesAllWorksheets(string $formula, int $insertRows):
             $toRow = $toRows[$splitCount][0];
 
             if (!empty($fromRow) && $fromRow[0] !== '$') {
-                $fromRow += $insertRows;
+                $fromRow = (int) $fromRow + $numberOfRows;
                 $formula = substr($formula, 0, $fromRowOffset) . $fromRow . substr($formula, $fromRowOffset + $fromRowLength);
             }
             if (!empty($toRow) && $toRow[0] !== '$') {
-                $toRow += $insertRows;
+                $toRow = (int) $toRow + $numberOfRows;
                 $formula = substr($formula, 0, $toRowOffset) . $toRow . substr($formula, $toRowOffset + $toRowLength);
             }
         }
@@ -896,39 +855,37 @@ private function updateRowRangesAllWorksheets(string $formula, int $insertRows):
     /**
      * Update cell reference.
      *
-     * @param string $pCellRange Cell range
-     * @param string $pBefore Insert before this one
-     * @param int $pNumCols Number of columns to increment
-     * @param int $pNumRows Number of rows to increment
+     * @param string $cellReference Cell address or range of addresses
      *
      * @return string Updated cell range
      */
-    public function updateCellReference($pCellRange = 'A1', $pBefore = 'A1', $pNumCols = 0, $pNumRows = 0)
+    private function updateCellReference(string $cellReference = 'A1', bool $includeAbsoluteReferences = false, bool $onlyAbsoluteReferences = false): string
     {
         // Is it in another worksheet? Will not have to update anything.
-        if (strpos($pCellRange, '!') !== false) {
-            return $pCellRange;
+        if (str_contains($cellReference, '!')) {
+            return $cellReference;
+        }
         // Is it a range or a single cell?
-        } elseif (!Coordinate::coordinateIsRange($pCellRange)) {
+        if (!Coordinate::coordinateIsRange($cellReference)) {
             // Single cell
-            return $this->updateSingleCellReference($pCellRange, $pBefore, $pNumCols, $pNumRows);
-        } elseif (Coordinate::coordinateIsRange($pCellRange)) {
-            // Range
-            return $this->updateCellRange($pCellRange, $pBefore, $pNumCols, $pNumRows);
+            /** @var CellReferenceHelper */
+            $cellReferenceHelper = $this->cellReferenceHelper;
+
+            return $cellReferenceHelper->updateCellReference($cellReference, $includeAbsoluteReferences, $onlyAbsoluteReferences);
         }
 
-        // Return original
-        return $pCellRange;
+        // Range
+        return $this->updateCellRange($cellReference, $includeAbsoluteReferences, $onlyAbsoluteReferences);
     }
 
     /**
-     * Update named formulas (i.e. containing worksheet references / named ranges).
+     * Update named formulae (i.e. containing worksheet references / named ranges).
      *
      * @param Spreadsheet $spreadsheet Object to update
      * @param string $oldName Old name (name to replace)
      * @param string $newName New name
      */
-    public function updateNamedFormulas(Spreadsheet $spreadsheet, $oldName = '', $newName = ''): void
+    public function updateNamedFormulae(Spreadsheet $spreadsheet, string $oldName = '', string $newName = ''): void
     {
         if ($oldName == '') {
             return;
@@ -937,9 +894,9 @@ public function updateNamedFormulas(Spreadsheet $spreadsheet, $oldName = '', $ne
         foreach ($spreadsheet->getWorksheetIterator() as $sheet) {
             foreach ($sheet->getCoordinates(false) as $coordinate) {
                 $cell = $sheet->getCell($coordinate);
-                if (($cell !== null) && ($cell->getDataType() == DataType::TYPE_FORMULA)) {
-                    $formula = $cell->getValue();
-                    if (strpos($formula, $oldName) !== false) {
+                if ($cell->getDataType() === DataType::TYPE_FORMULA) {
+                    $formula = $cell->getValueString();
+                    if (str_contains($formula, $oldName)) {
                         $formula = str_replace("'" . $oldName . "'!", "'" . $newName . "'!", $formula);
                         $formula = str_replace($oldName . '!', $newName . '!', $formula);
                         $cell->setValueExplicit($formula, DataType::TYPE_FORMULA);
@@ -949,36 +906,85 @@ public function updateNamedFormulas(Spreadsheet $spreadsheet, $oldName = '', $ne
         }
     }
 
+    private function updateDefinedNames(Worksheet $worksheet, string $beforeCellAddress, int $numberOfColumns, int $numberOfRows): void
+    {
+        foreach ($worksheet->getParentOrThrow()->getDefinedNames() as $definedName) {
+            if ($definedName->isFormula() === false) {
+                $this->updateNamedRange($definedName, $worksheet, $beforeCellAddress, $numberOfColumns, $numberOfRows);
+            } else {
+                $this->updateNamedFormula($definedName, $worksheet, $beforeCellAddress, $numberOfColumns, $numberOfRows);
+            }
+        }
+    }
+
+    private function updateNamedRange(DefinedName $definedName, Worksheet $worksheet, string $beforeCellAddress, int $numberOfColumns, int $numberOfRows): void
+    {
+        $cellAddress = $definedName->getValue();
+        $asFormula = ($cellAddress[0] === '=');
+        if ($definedName->getWorksheet() !== null && $definedName->getWorksheet()->getHashCode() === $worksheet->getHashCode()) {
+            /**
+             * If we delete the entire range that is referenced by a Named Range, MS Excel sets the value to #REF!
+             * PhpSpreadsheet still only does a basic adjustment, so the Named Range will still reference Cells.
+             * Note that this applies only when deleting columns/rows; subsequent insertion won't fix the #REF!
+             * TODO Can we work out a method to identify Named Ranges that cease to be valid, so that we can replace
+             *      them with a #REF!
+             */
+            if ($asFormula === true) {
+                $formula = $this->updateFormulaReferences($cellAddress, $beforeCellAddress, $numberOfColumns, $numberOfRows, $worksheet->getTitle(), true, true);
+                $definedName->setValue($formula);
+            } else {
+                $definedName->setValue($this->updateCellReference(ltrim($cellAddress, '='), true));
+            }
+        }
+    }
+
+    private function updateNamedFormula(DefinedName $definedName, Worksheet $worksheet, string $beforeCellAddress, int $numberOfColumns, int $numberOfRows): void
+    {
+        if ($definedName->getWorksheet() !== null && $definedName->getWorksheet()->getHashCode() === $worksheet->getHashCode()) {
+            /**
+             * If we delete the entire range that is referenced by a Named Formula, MS Excel sets the value to #REF!
+             * PhpSpreadsheet still only does a basic adjustment, so the Named Formula will still reference Cells.
+             * Note that this applies only when deleting columns/rows; subsequent insertion won't fix the #REF!
+             * TODO Can we work out a method to identify Named Ranges that cease to be valid, so that we can replace
+             *      them with a #REF!
+             */
+            $formula = $definedName->getValue();
+            $formula = $this->updateFormulaReferences($formula, $beforeCellAddress, $numberOfColumns, $numberOfRows, $worksheet->getTitle(), true);
+            $definedName->setValue($formula);
+        }
+    }
+
     /**
      * Update cell range.
      *
-     * @param string $pCellRange Cell range    (e.g. 'B2:D4', 'B:C' or '2:3')
-     * @param string $pBefore Insert before this one
-     * @param int $pNumCols Number of columns to increment
-     * @param int $pNumRows Number of rows to increment
+     * @param string $cellRange Cell range    (e.g. 'B2:D4', 'B:C' or '2:3')
      *
      * @return string Updated cell range
      */
-    private function updateCellRange($pCellRange = 'A1:A1', $pBefore = 'A1', $pNumCols = 0, $pNumRows = 0)
+    private function updateCellRange(string $cellRange = 'A1:A1', bool $includeAbsoluteReferences = false, bool $onlyAbsoluteReferences = false): string
     {
-        if (!Coordinate::coordinateIsRange($pCellRange)) {
+        if (!Coordinate::coordinateIsRange($cellRange)) {
             throw new Exception('Only cell ranges may be passed to this method.');
         }
 
         // Update range
-        $range = Coordinate::splitRange($pCellRange);
+        $range = Coordinate::splitRange($cellRange);
         $ic = count($range);
         for ($i = 0; $i < $ic; ++$i) {
             $jc = count($range[$i]);
             for ($j = 0; $j < $jc; ++$j) {
+                /** @var CellReferenceHelper */
+                $cellReferenceHelper = $this->cellReferenceHelper;
                 if (ctype_alpha($range[$i][$j])) {
-                    $r = Coordinate::coordinateFromString($this->updateSingleCellReference($range[$i][$j] . '1', $pBefore, $pNumCols, $pNumRows));
-                    $range[$i][$j] = $r[0];
+                    $range[$i][$j] = Coordinate::coordinateFromString(
+                        $cellReferenceHelper->updateCellReference($range[$i][$j] . '1', $includeAbsoluteReferences, $onlyAbsoluteReferences)
+                    )[0];
                 } elseif (ctype_digit($range[$i][$j])) {
-                    $r = Coordinate::coordinateFromString($this->updateSingleCellReference('A' . $range[$i][$j], $pBefore, $pNumCols, $pNumRows));
-                    $range[$i][$j] = $r[1];
+                    $range[$i][$j] = Coordinate::coordinateFromString(
+                        $cellReferenceHelper->updateCellReference('A' . $range[$i][$j], $includeAbsoluteReferences, $onlyAbsoluteReferences)
+                    )[1];
                 } else {
-                    $range[$i][$j] = $this->updateSingleCellReference($range[$i][$j], $pBefore, $pNumCols, $pNumRows);
+                    $range[$i][$j] = $cellReferenceHelper->updateCellReference($range[$i][$j], $includeAbsoluteReferences, $onlyAbsoluteReferences);
                 }
             }
         }
@@ -987,44 +993,234 @@ private function updateCellRange($pCellRange = 'A1:A1', $pBefore = 'A1', $pNumCo
         return Coordinate::buildRange($range);
     }
 
-    /**
-     * Update single cell reference.
-     *
-     * @param string $pCellReference Single cell reference
-     * @param string $pBefore Insert before this one
-     * @param int $pNumCols Number of columns to increment
-     * @param int $pNumRows Number of rows to increment
-     *
-     * @return string Updated cell reference
-     */
-    private function updateSingleCellReference($pCellReference = 'A1', $pBefore = 'A1', $pNumCols = 0, $pNumRows = 0)
+    private function clearColumnStrips(int $highestRow, int $beforeColumn, int $numberOfColumns, Worksheet $worksheet): void
+    {
+        $startColumnId = Coordinate::stringFromColumnIndex($beforeColumn + $numberOfColumns);
+        $endColumnId = Coordinate::stringFromColumnIndex($beforeColumn);
+
+        for ($row = 1; $row <= $highestRow - 1; ++$row) {
+            for ($column = $startColumnId; $column !== $endColumnId; ++$column) {
+                $coordinate = $column . $row;
+                $this->clearStripCell($worksheet, $coordinate);
+            }
+        }
+    }
+
+    private function clearRowStrips(string $highestColumn, int $beforeColumn, int $beforeRow, int $numberOfRows, Worksheet $worksheet): void
+    {
+        $startColumnId = Coordinate::stringFromColumnIndex($beforeColumn);
+        ++$highestColumn;
+
+        for ($column = $startColumnId; $column !== $highestColumn; ++$column) {
+            for ($row = $beforeRow + $numberOfRows; $row <= $beforeRow - 1; ++$row) {
+                $coordinate = $column . $row;
+                $this->clearStripCell($worksheet, $coordinate);
+            }
+        }
+    }
+
+    private function clearStripCell(Worksheet $worksheet, string $coordinate): void
+    {
+        $worksheet->removeConditionalStyles($coordinate);
+        $worksheet->setHyperlink($coordinate);
+        $worksheet->setDataValidation($coordinate);
+        $worksheet->removeComment($coordinate);
+
+        if ($worksheet->cellExists($coordinate)) {
+            $worksheet->getCell($coordinate)->setValueExplicit(null, DataType::TYPE_NULL);
+            $worksheet->getCell($coordinate)->setXfIndex(0);
+        }
+    }
+
+    private function adjustAutoFilter(Worksheet $worksheet, string $beforeCellAddress, int $numberOfColumns): void
+    {
+        $autoFilter = $worksheet->getAutoFilter();
+        $autoFilterRange = $autoFilter->getRange();
+        if (!empty($autoFilterRange)) {
+            if ($numberOfColumns !== 0) {
+                $autoFilterColumns = $autoFilter->getColumns();
+                if (count($autoFilterColumns) > 0) {
+                    $column = '';
+                    $row = 0;
+                    sscanf($beforeCellAddress, '%[A-Z]%d', $column, $row);
+                    $columnIndex = Coordinate::columnIndexFromString((string) $column);
+                    [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($autoFilterRange);
+                    if ($columnIndex <= $rangeEnd[0]) {
+                        if ($numberOfColumns < 0) {
+                            $this->adjustAutoFilterDeleteRules($columnIndex, $numberOfColumns, $autoFilterColumns, $autoFilter);
+                        }
+                        $startCol = ($columnIndex > $rangeStart[0]) ? $columnIndex : $rangeStart[0];
+
+                        //    Shuffle columns in autofilter range
+                        if ($numberOfColumns > 0) {
+                            $this->adjustAutoFilterInsert($startCol, $numberOfColumns, $rangeEnd[0], $autoFilter);
+                        } else {
+                            $this->adjustAutoFilterDelete($startCol, $numberOfColumns, $rangeEnd[0], $autoFilter);
+                        }
+                    }
+                }
+            }
+
+            $worksheet->setAutoFilter(
+                $this->updateCellReference($autoFilterRange)
+            );
+        }
+    }
+
+    private function adjustAutoFilterDeleteRules(int $columnIndex, int $numberOfColumns, array $autoFilterColumns, AutoFilter $autoFilter): void
     {
-        if (Coordinate::coordinateIsRange($pCellReference)) {
-            throw new Exception('Only single cell references may be passed to this method.');
+        // If we're actually deleting any columns that fall within the autofilter range,
+        //    then we delete any rules for those columns
+        $deleteColumn = $columnIndex + $numberOfColumns - 1;
+        $deleteCount = abs($numberOfColumns);
+
+        for ($i = 1; $i <= $deleteCount; ++$i) {
+            $columnName = Coordinate::stringFromColumnIndex($deleteColumn + 1);
+            if (isset($autoFilterColumns[$columnName])) {
+                $autoFilter->clearColumn($columnName);
+            }
+            ++$deleteColumn;
         }
+    }
+
+    private function adjustAutoFilterInsert(int $startCol, int $numberOfColumns, int $rangeEnd, AutoFilter $autoFilter): void
+    {
+        $startColRef = $startCol;
+        $endColRef = $rangeEnd;
+        $toColRef = $rangeEnd + $numberOfColumns;
+
+        do {
+            $autoFilter->shiftColumn(Coordinate::stringFromColumnIndex($endColRef), Coordinate::stringFromColumnIndex($toColRef));
+            --$endColRef;
+            --$toColRef;
+        } while ($startColRef <= $endColRef);
+    }
 
-        // Get coordinate of $pBefore
-        [$beforeColumn, $beforeRow] = Coordinate::coordinateFromString($pBefore);
+    private function adjustAutoFilterDelete(int $startCol, int $numberOfColumns, int $rangeEnd, AutoFilter $autoFilter): void
+    {
+        // For delete, we shuffle from beginning to end to avoid overwriting
+        $startColID = Coordinate::stringFromColumnIndex($startCol);
+        $toColID = Coordinate::stringFromColumnIndex($startCol + $numberOfColumns);
+        $endColID = Coordinate::stringFromColumnIndex($rangeEnd + 1);
+
+        do {
+            $autoFilter->shiftColumn($startColID, $toColID);
+            ++$startColID;
+            ++$toColID;
+        } while ($startColID !== $endColID);
+    }
+
+    private function adjustTable(Worksheet $worksheet, string $beforeCellAddress, int $numberOfColumns): void
+    {
+        $tableCollection = $worksheet->getTableCollection();
+
+        foreach ($tableCollection as $table) {
+            $tableRange = $table->getRange();
+            if (!empty($tableRange)) {
+                if ($numberOfColumns !== 0) {
+                    $tableColumns = $table->getColumns();
+                    if (count($tableColumns) > 0) {
+                        $column = '';
+                        $row = 0;
+                        sscanf($beforeCellAddress, '%[A-Z]%d', $column, $row);
+                        $columnIndex = Coordinate::columnIndexFromString((string) $column);
+                        [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($tableRange);
+                        if ($columnIndex <= $rangeEnd[0]) {
+                            if ($numberOfColumns < 0) {
+                                $this->adjustTableDeleteRules($columnIndex, $numberOfColumns, $tableColumns, $table);
+                            }
+                            $startCol = ($columnIndex > $rangeStart[0]) ? $columnIndex : $rangeStart[0];
 
-        // Get coordinate of $pCellReference
-        [$newColumn, $newRow] = Coordinate::coordinateFromString($pCellReference);
+                            //    Shuffle columns in table range
+                            if ($numberOfColumns > 0) {
+                                $this->adjustTableInsert($startCol, $numberOfColumns, $rangeEnd[0], $table);
+                            } else {
+                                $this->adjustTableDelete($startCol, $numberOfColumns, $rangeEnd[0], $table);
+                            }
+                        }
+                    }
+                }
 
-        // Verify which parts should be updated
-        $updateColumn = (($newColumn[0] != '$') && ($beforeColumn[0] != '$') && (Coordinate::columnIndexFromString($newColumn) >= Coordinate::columnIndexFromString($beforeColumn)));
-        $updateRow = (($newRow[0] != '$') && ($beforeRow[0] != '$') && $newRow >= $beforeRow);
+                $table->setRange($this->updateCellReference($tableRange));
+            }
+        }
+    }
 
-        // Create new column reference
-        if ($updateColumn) {
-            $newColumn = Coordinate::stringFromColumnIndex(Coordinate::columnIndexFromString($newColumn) + $pNumCols);
+    private function adjustTableDeleteRules(int $columnIndex, int $numberOfColumns, array $tableColumns, Table $table): void
+    {
+        // If we're actually deleting any columns that fall within the table range,
+        //    then we delete any rules for those columns
+        $deleteColumn = $columnIndex + $numberOfColumns - 1;
+        $deleteCount = abs($numberOfColumns);
+
+        for ($i = 1; $i <= $deleteCount; ++$i) {
+            $columnName = Coordinate::stringFromColumnIndex($deleteColumn + 1);
+            if (isset($tableColumns[$columnName])) {
+                $table->clearColumn($columnName);
+            }
+            ++$deleteColumn;
         }
+    }
+
+    private function adjustTableInsert(int $startCol, int $numberOfColumns, int $rangeEnd, Table $table): void
+    {
+        $startColRef = $startCol;
+        $endColRef = $rangeEnd;
+        $toColRef = $rangeEnd + $numberOfColumns;
+
+        do {
+            $table->shiftColumn(Coordinate::stringFromColumnIndex($endColRef), Coordinate::stringFromColumnIndex($toColRef));
+            --$endColRef;
+            --$toColRef;
+        } while ($startColRef <= $endColRef);
+    }
 
-        // Create new row reference
-        if ($updateRow) {
-            $newRow = (int) $newRow + $pNumRows;
+    private function adjustTableDelete(int $startCol, int $numberOfColumns, int $rangeEnd, Table $table): void
+    {
+        // For delete, we shuffle from beginning to end to avoid overwriting
+        $startColID = Coordinate::stringFromColumnIndex($startCol);
+        $toColID = Coordinate::stringFromColumnIndex($startCol + $numberOfColumns);
+        $endColID = Coordinate::stringFromColumnIndex($rangeEnd + 1);
+
+        do {
+            $table->shiftColumn($startColID, $toColID);
+            ++$startColID;
+            ++$toColID;
+        } while ($startColID !== $endColID);
+    }
+
+    private function duplicateStylesByColumn(Worksheet $worksheet, int $beforeColumn, int $beforeRow, int $highestRow, int $numberOfColumns): void
+    {
+        $beforeColumnName = Coordinate::stringFromColumnIndex($beforeColumn - 1);
+        for ($i = $beforeRow; $i <= $highestRow - 1; ++$i) {
+            // Style
+            $coordinate = $beforeColumnName . $i;
+            if ($worksheet->cellExists($coordinate)) {
+                $xfIndex = $worksheet->getCell($coordinate)->getXfIndex();
+                for ($j = $beforeColumn; $j <= $beforeColumn - 1 + $numberOfColumns; ++$j) {
+                    if (!empty($xfIndex) || $worksheet->cellExists([$j, $i])) {
+                        $worksheet->getCell([$j, $i])->setXfIndex($xfIndex);
+                    }
+                }
+            }
         }
+    }
 
-        // Return new reference
-        return $newColumn . $newRow;
+    private function duplicateStylesByRow(Worksheet $worksheet, int $beforeColumn, int $beforeRow, string $highestColumn, int $numberOfRows): void
+    {
+        $highestColumnIndex = Coordinate::columnIndexFromString($highestColumn);
+        for ($i = $beforeColumn; $i <= $highestColumnIndex; ++$i) {
+            // Style
+            $coordinate = Coordinate::stringFromColumnIndex($i) . ($beforeRow - 1);
+            if ($worksheet->cellExists($coordinate)) {
+                $xfIndex = $worksheet->getCell($coordinate)->getXfIndex();
+                for ($j = $beforeRow; $j <= $beforeRow - 1 + $numberOfRows; ++$j) {
+                    if (!empty($xfIndex) || $worksheet->cellExists([$j, $i])) {
+                        $worksheet->getCell(Coordinate::stringFromColumnIndex($i) . $j)->setXfIndex($xfIndex);
+                    }
+                }
+            }
+        }
     }
 
     /**
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/ITextElement.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/ITextElement.php
index 39b70c868b..548e68ba59 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/ITextElement.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/ITextElement.php
@@ -2,35 +2,33 @@
 
 namespace PhpOffice\PhpSpreadsheet\RichText;
 
+use PhpOffice\PhpSpreadsheet\Style\Font;
+
 interface ITextElement
 {
     /**
      * Get text.
-     *
-     * @return string Text
      */
-    public function getText();
+    public function getText(): string;
 
     /**
      * Set text.
      *
      * @param string $text Text
      *
-     * @return ITextElement
+     * @return $this
      */
-    public function setText($text);
+    public function setText(string $text): self;
 
     /**
      * Get font.
-     *
-     * @return null|\PhpOffice\PhpSpreadsheet\Style\Font
      */
-    public function getFont();
+    public function getFont(): ?Font;
 
     /**
      * Get hash code.
      *
      * @return string Hash code
      */
-    public function getHashCode();
+    public function getHashCode(): string;
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/RichText.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/RichText.php
index 104177bd29..1dc391a6c7 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/RichText.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/RichText.php
@@ -5,50 +5,49 @@
 use PhpOffice\PhpSpreadsheet\Cell\Cell;
 use PhpOffice\PhpSpreadsheet\Cell\DataType;
 use PhpOffice\PhpSpreadsheet\IComparable;
+use Stringable;
 
-class RichText implements IComparable
+class RichText implements IComparable, Stringable
 {
     /**
      * Rich text elements.
      *
      * @var ITextElement[]
      */
-    private $richTextElements;
+    private array $richTextElements;
 
     /**
      * Create a new RichText instance.
-     *
-     * @param Cell $pCell
      */
-    public function __construct(?Cell $pCell = null)
+    public function __construct(?Cell $cell = null)
     {
         // Initialise variables
         $this->richTextElements = [];
 
         // Rich-Text string attached to cell?
-        if ($pCell !== null) {
+        if ($cell !== null) {
             // Add cell text and style
-            if ($pCell->getValue() != '') {
-                $objRun = new Run($pCell->getValue());
-                $objRun->setFont(clone $pCell->getWorksheet()->getStyle($pCell->getCoordinate())->getFont());
+            if ($cell->getValueString() !== '') {
+                $objRun = new Run($cell->getValueString());
+                $objRun->setFont(clone $cell->getWorksheet()->getStyle($cell->getCoordinate())->getFont());
                 $this->addText($objRun);
             }
 
             // Set parent value
-            $pCell->setValueExplicit($this, DataType::TYPE_STRING);
+            $cell->setValueExplicit($this, DataType::TYPE_STRING);
         }
     }
 
     /**
      * Add text.
      *
-     * @param ITextElement $pText Rich text element
+     * @param ITextElement $text Rich text element
      *
      * @return $this
      */
-    public function addText(ITextElement $pText)
+    public function addText(ITextElement $text): static
     {
-        $this->richTextElements[] = $pText;
+        $this->richTextElements[] = $text;
 
         return $this;
     }
@@ -56,13 +55,11 @@ public function addText(ITextElement $pText)
     /**
      * Create text.
      *
-     * @param string $pText Text
-     *
-     * @return TextElement
+     * @param string $text Text
      */
-    public function createText($pText)
+    public function createText(string $text): TextElement
     {
-        $objText = new TextElement($pText);
+        $objText = new TextElement($text);
         $this->addText($objText);
 
         return $objText;
@@ -71,13 +68,11 @@ public function createText($pText)
     /**
      * Create text run.
      *
-     * @param string $pText Text
-     *
-     * @return Run
+     * @param string $text Text
      */
-    public function createTextRun($pText)
+    public function createTextRun(string $text): Run
     {
-        $objText = new Run($pText);
+        $objText = new Run($text);
         $this->addText($objText);
 
         return $objText;
@@ -85,10 +80,8 @@ public function createTextRun($pText)
 
     /**
      * Get plain text.
-     *
-     * @return string
      */
-    public function getPlainText()
+    public function getPlainText(): string
     {
         // Return value
         $returnValue = '';
@@ -103,10 +96,8 @@ public function getPlainText()
 
     /**
      * Convert to string.
-     *
-     * @return string
      */
-    public function __toString()
+    public function __toString(): string
     {
         return $this->getPlainText();
     }
@@ -116,7 +107,7 @@ public function __toString()
      *
      * @return ITextElement[]
      */
-    public function getRichTextElements()
+    public function getRichTextElements(): array
     {
         return $this->richTextElements;
     }
@@ -128,7 +119,7 @@ public function getRichTextElements()
      *
      * @return $this
      */
-    public function setRichTextElements(array $textElements)
+    public function setRichTextElements(array $textElements): static
     {
         $this->richTextElements = $textElements;
 
@@ -140,7 +131,7 @@ public function setRichTextElements(array $textElements)
      *
      * @return string Hash code
      */
-    public function getHashCode()
+    public function getHashCode(): string
     {
         $hashElements = '';
         foreach ($this->richTextElements as $element) {
@@ -148,8 +139,8 @@ public function getHashCode()
         }
 
         return md5(
-            $hashElements .
-            __CLASS__
+            $hashElements
+            . __CLASS__
         );
     }
 
@@ -160,11 +151,14 @@ public function __clone()
     {
         $vars = get_object_vars($this);
         foreach ($vars as $key => $value) {
-            if (is_object($value)) {
-                $this->$key = clone $value;
-            } else {
-                $this->$key = $value;
+            $newValue = is_object($value) ? (clone $value) : $value;
+            if (is_array($value)) {
+                $newValue = [];
+                foreach ($value as $key2 => $value2) {
+                    $newValue[$key2] = is_object($value2) ? (clone $value2) : $value2;
+                }
             }
+            $this->$key = $newValue;
         }
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/Run.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/Run.php
index 592d0e36b6..6a6ccdd4bc 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/Run.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/Run.php
@@ -2,49 +2,55 @@
 
 namespace PhpOffice\PhpSpreadsheet\RichText;
 
+use PhpOffice\PhpSpreadsheet\Exception as SpreadsheetException;
 use PhpOffice\PhpSpreadsheet\Style\Font;
 
 class Run extends TextElement implements ITextElement
 {
     /**
      * Font.
-     *
-     * @var Font
      */
-    private $font;
+    private ?Font $font;
 
     /**
      * Create a new Run instance.
      *
-     * @param string $pText Text
+     * @param string $text Text
      */
-    public function __construct($pText = '')
+    public function __construct(string $text = '')
     {
-        parent::__construct($pText);
+        parent::__construct($text);
         // Initialise variables
         $this->font = new Font();
     }
 
     /**
      * Get font.
-     *
-     * @return null|\PhpOffice\PhpSpreadsheet\Style\Font
      */
-    public function getFont()
+    public function getFont(): ?Font
     {
         return $this->font;
     }
 
+    public function getFontOrThrow(): Font
+    {
+        if ($this->font === null) {
+            throw new SpreadsheetException('unexpected null font');
+        }
+
+        return $this->font;
+    }
+
     /**
      * Set font.
      *
-     * @param Font $pFont Font
+     * @param ?Font $font Font
      *
      * @return $this
      */
-    public function setFont(?Font $pFont = null)
+    public function setFont(?Font $font = null): static
     {
-        $this->font = $pFont;
+        $this->font = $font;
 
         return $this;
     }
@@ -54,12 +60,12 @@ public function setFont(?Font $pFont = null)
      *
      * @return string Hash code
      */
-    public function getHashCode()
+    public function getHashCode(): string
     {
         return md5(
-            $this->getText() .
-            $this->font->getHashCode() .
-            __CLASS__
+            $this->getText()
+            . (($this->font === null) ? '' : $this->font->getHashCode())
+            . __CLASS__
         );
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/TextElement.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/TextElement.php
index 26aebc0e96..e509d272d2 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/TextElement.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/TextElement.php
@@ -2,24 +2,24 @@
 
 namespace PhpOffice\PhpSpreadsheet\RichText;
 
+use PhpOffice\PhpSpreadsheet\Style\Font;
+
 class TextElement implements ITextElement
 {
     /**
      * Text.
-     *
-     * @var string
      */
-    private $text;
+    private string $text;
 
     /**
      * Create a new TextElement instance.
      *
-     * @param string $pText Text
+     * @param string $text Text
      */
-    public function __construct($pText = '')
+    public function __construct(string $text = '')
     {
         // Initialise variables
-        $this->text = $pText;
+        $this->text = $text;
     }
 
     /**
@@ -27,7 +27,7 @@ public function __construct($pText = '')
      *
      * @return string Text
      */
-    public function getText()
+    public function getText(): string
     {
         return $this->text;
     }
@@ -39,7 +39,7 @@ public function getText()
      *
      * @return $this
      */
-    public function setText($text)
+    public function setText(string $text): self
     {
         $this->text = $text;
 
@@ -47,11 +47,9 @@ public function setText($text)
     }
 
     /**
-     * Get font.
-     *
-     * @return null|\PhpOffice\PhpSpreadsheet\Style\Font
+     * Get font. For this class, the return value is always null.
      */
-    public function getFont()
+    public function getFont(): ?Font
     {
         return null;
     }
@@ -61,26 +59,11 @@ public function getFont()
      *
      * @return string Hash code
      */
-    public function getHashCode()
+    public function getHashCode(): string
     {
         return md5(
-            $this->text .
-            __CLASS__
+            $this->text
+            . __CLASS__
         );
     }
-
-    /**
-     * Implement PHP __clone to create a deep clone, not just a shallow copy.
-     */
-    public function __clone()
-    {
-        $vars = get_object_vars($this);
-        foreach ($vars as $key => $value) {
-            if (is_object($value)) {
-                $this->$key = clone $value;
-            } else {
-                $this->$key = $value;
-            }
-        }
-    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Settings.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Settings.php
index 8fdccbad18..7f727a8cc6 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Settings.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Settings.php
@@ -8,6 +8,7 @@
 use Psr\Http\Client\ClientInterface;
 use Psr\Http\Message\RequestFactoryInterface;
 use Psr\SimpleCache\CacheInterface;
+use ReflectionClass;
 
 class Settings
 {
@@ -15,46 +16,26 @@ class Settings
      * Class name of the chart renderer used for rendering charts
      * eg: PhpOffice\PhpSpreadsheet\Chart\Renderer\JpGraph.
      *
-     * @var string
+     * @var null|class-string<IRenderer>
      */
-    private static $chartRenderer;
+    private static ?string $chartRenderer = null;
 
     /**
      * Default options for libxml loader.
-     *
-     * @var int
-     */
-    private static $libXmlLoaderOptions = null;
-
-    /**
-     * Allow/disallow libxml_disable_entity_loader() call when not thread safe.
-     * Default behaviour is to do the check, but if you're running PHP versions
-     *      7.2 < 7.2.1
-     * then you may need to disable this check to prevent unwanted behaviour in other threads
-     * SECURITY WARNING: Changing this flag is not recommended.
-     *
-     * @var bool
      */
-    private static $libXmlDisableEntityLoader = true;
+    private static ?int $libXmlLoaderOptions = null;
 
     /**
      * The cache implementation to be used for cell collection.
-     *
-     * @var CacheInterface
      */
-    private static $cache;
+    private static ?CacheInterface $cache = null;
 
     /**
      * The HTTP client implementation to be used for network request.
-     *
-     * @var null|ClientInterface
      */
-    private static $httpClient;
+    private static ?ClientInterface $httpClient = null;
 
-    /**
-     * @var null|RequestFactoryInterface
-     */
-    private static $requestFactory;
+    private static ?RequestFactoryInterface $requestFactory = null;
 
     /**
      * Set the locale code to use for formula translations and any special formatting.
@@ -63,48 +44,65 @@ class Settings
      *
      * @return bool Success or failure
      */
-    public static function setLocale($locale)
+    public static function setLocale(string $locale): bool
     {
         return Calculation::getInstance()->setLocale($locale);
     }
 
+    public static function getLocale(): string
+    {
+        return Calculation::getInstance()->getLocale();
+    }
+
     /**
      * Identify to PhpSpreadsheet the external library to use for rendering charts.
      *
-     * @param string $rendererClass Class name of the chart renderer
+     * @param class-string<IRenderer> $rendererClassName Class name of the chart renderer
      *    eg: PhpOffice\PhpSpreadsheet\Chart\Renderer\JpGraph
      */
-    public static function setChartRenderer($rendererClass): void
+    public static function setChartRenderer(string $rendererClassName): void
     {
-        if (!is_a($rendererClass, IRenderer::class, true)) {
+        if (!is_a($rendererClassName, IRenderer::class, true)) {
             throw new Exception('Chart renderer must implement ' . IRenderer::class);
         }
 
-        self::$chartRenderer = $rendererClass;
+        self::$chartRenderer = $rendererClassName;
+    }
+
+    public static function unsetChartRenderer(): void
+    {
+        self::$chartRenderer = null;
     }
 
     /**
      * Return the Chart Rendering Library that PhpSpreadsheet is currently configured to use.
      *
-     * @return null|string Class name of the chart renderer
+     * @return null|class-string<IRenderer> Class name of the chart renderer
      *    eg: PhpOffice\PhpSpreadsheet\Chart\Renderer\JpGraph
      */
-    public static function getChartRenderer()
+    public static function getChartRenderer(): ?string
     {
         return self::$chartRenderer;
     }
 
+    public static function htmlEntityFlags(): int
+    {
+        return ENT_COMPAT;
+    }
+
     /**
      * Set default options for libxml loader.
      *
-     * @param int $options Default options for libxml loader
+     * @param ?int $options Default options for libxml loader
      */
-    public static function setLibXmlLoaderOptions($options): void
+    public static function setLibXmlLoaderOptions(?int $options): int
     {
-        if ($options === null && defined('LIBXML_DTDLOAD')) {
-            $options = LIBXML_DTDLOAD | LIBXML_DTDATTR;
+        if ($options === null) {
+            $options = defined('LIBXML_DTDLOAD') ? (LIBXML_DTDLOAD | LIBXML_DTDATTR) : 0;
         }
         self::$libXmlLoaderOptions = $options;
+
+        return $options;
     }
 
     /**
@@ -113,64 +111,40 @@ public static function setLibXmlLoaderOptions($options): void
      *
      * @return int Default options for libxml loader
      */
-    public static function getLibXmlLoaderOptions()
+    public static function getLibXmlLoaderOptions(): int
     {
-        if (self::$libXmlLoaderOptions === null && defined('LIBXML_DTDLOAD')) {
-            self::setLibXmlLoaderOptions(LIBXML_DTDLOAD | LIBXML_DTDATTR);
-        } elseif (self::$libXmlLoaderOptions === null) {
-            self::$libXmlLoaderOptions = 0;
+        if (self::$libXmlLoaderOptions === null) {
+            return self::setLibXmlLoaderOptions(null);
         }
 
         return self::$libXmlLoaderOptions;
     }
 
-    /**
-     * Enable/Disable the entity loader for libxml loader.
-     * Allow/disallow libxml_disable_entity_loader() call when not thread safe.
-     * Default behaviour is to do the check, but if you're running PHP versions
-     *      7.2 < 7.2.1
-     * then you may need to disable this check to prevent unwanted behaviour in other threads
-     * SECURITY WARNING: Changing this flag to false is not recommended.
-     *
-     * @param bool $state
-     */
-    public static function setLibXmlDisableEntityLoader($state): void
-    {
-        self::$libXmlDisableEntityLoader = (bool) $state;
-    }
-
-    /**
-     * Return the state of the entity loader (disabled/enabled) for libxml loader.
-     *
-     * @return bool $state
-     */
-    public static function getLibXmlDisableEntityLoader()
-    {
-        return self::$libXmlDisableEntityLoader;
-    }
-
     /**
      * Sets the implementation of cache that should be used for cell collection.
      */
-    public static function setCache(CacheInterface $cache): void
+    public static function setCache(?CacheInterface $cache): void
     {
         self::$cache = $cache;
     }
 
     /**
-     * Gets the implementation of cache that should be used for cell collection.
-     *
-     * @return CacheInterface
+     * Gets the implementation of cache that is being used for cell collection.
      */
-    public static function getCache()
+    public static function getCache(): CacheInterface
     {
         if (!self::$cache) {
-            self::$cache = new Memory();
+            self::$cache = self::useSimpleCacheVersion3() ? new Memory\SimpleCache3() : new Memory\SimpleCache1();
         }
 
         return self::$cache;
     }
 
+    public static function useSimpleCacheVersion3(): bool
+    {
+        return (new ReflectionClass(CacheInterface::class))->getMethod('get')->getReturnType() !== null;
+    }
+
     /**
      * Set the HTTP client implementation to be used for network request.
      */
@@ -194,7 +168,9 @@ public static function unsetHttpClient(): void
      */
     public static function getHttpClient(): ClientInterface
     {
-        self::assertHttpClient();
+        if (!self::$httpClient || !self::$requestFactory) {
+            throw new Exception('HTTP client must be configured via Settings::setHttpClient() to be able to use WEBSERVICE function.');
+        }
 
         return self::$httpClient;
     }
@@ -203,16 +179,11 @@ public static function getHttpClient(): ClientInterface
      * Get the HTTP request factory.
      */
     public static function getRequestFactory(): RequestFactoryInterface
-    {
-        self::assertHttpClient();
-
-        return self::$requestFactory;
-    }
-
-    private static function assertHttpClient(): void
     {
         if (!self::$httpClient || !self::$requestFactory) {
             throw new Exception('HTTP client must be configured via Settings::setHttpClient() to be able to use WEBSERVICE function.');
         }
+
+        return self::$requestFactory;
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/CodePage.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/CodePage.php
index 1d5d8933ed..307f8d931b 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/CodePage.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/CodePage.php
@@ -8,7 +8,7 @@ class CodePage
 {
     public const DEFAULT_CODE_PAGE = 'CP1252';
 
-    private static $pageArray = [
+    private static array $pageArray = [
         0 => 'CP1252', //    CodePage is not always correctly set when the xls file was saved by Apple's Numbers program
         367 => 'ASCII', //    ASCII
         437 => 'CP437', //    OEM US
@@ -56,7 +56,7 @@ class CodePage
         10010 => 'MACROMANIA', //    Macintosh Romania
         10017 => 'MACUKRAINE', //    Macintosh Ukraine
         10021 => 'MACTHAI', //    Macintosh Thai
-        10029 => 'MACCENTRALEUROPE', //    Macintosh Central Europe
+        10029 => ['MACCENTRALEUROPE', 'MAC-CENTRALEUROPE'], //    Macintosh Central Europe
         10079 => 'MACICELAND', //    Macintosh Icelandic
         10081 => 'MACTURKISH', //    Macintosh Turkish
         10082 => 'MACCROATIAN', //    Macintosh Croatian
@@ -65,6 +65,7 @@ class CodePage
         //32769 => 'unsupported', //    ANSI Latin I (BIFF2-BIFF3)
         65000 => 'UTF-7', //    Unicode (UTF-7)
         65001 => 'UTF-8', //    Unicode (UTF-8)
+        99999 => ['unsupported'], //    Unicode (UTF-8)
     ];
 
     public static function validate(string $codePage): bool
@@ -83,7 +84,20 @@ public static function validate(string $codePage): bool
     public static function numberToName(int $codePage): string
     {
         if (array_key_exists($codePage, self::$pageArray)) {
-            return self::$pageArray[$codePage];
+            $value = self::$pageArray[$codePage];
+            if (is_array($value)) {
+                foreach ($value as $encoding) {
+                    if (@iconv('UTF-8', $encoding, ' ') !== false) {
+                        self::$pageArray[$codePage] = $encoding;
+
+                        return $encoding;
+                    }
+                }
+
+                throw new PhpSpreadsheetException("Code page $codePage not implemented on this system.");
+            } else {
+                return $value;
+            }
         }
         if ($codePage == 720 || $codePage == 32769) {
             throw new PhpSpreadsheetException("Code page $codePage not supported."); //    OEM Arabic
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Date.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Date.php
index 7ddce04614..b20bb1d7bd 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Date.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Date.php
@@ -8,6 +8,7 @@
 use PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Cell\Cell;
+use PhpOffice\PhpSpreadsheet\Exception;
 use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
 use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
 
@@ -23,7 +24,7 @@ class Date
      *
      * @var string[]
      */
-    public static $monthNames = [
+    public static array $monthNames = [
         'Jan' => 'January',
         'Feb' => 'February',
         'Mar' => 'March',
@@ -41,7 +42,7 @@ class Date
     /**
      * @var string[]
      */
-    public static $numberSuffixes = [
+    public static array $numberSuffixes = [
         'st',
         'nd',
         'rd',
@@ -51,32 +52,28 @@ class Date
     /**
      * Base calendar year to use for calculations
      * Value is either CALENDAR_WINDOWS_1900 (1900) or CALENDAR_MAC_1904 (1904).
-     *
-     * @var int
      */
-    protected static $excelCalendar = self::CALENDAR_WINDOWS_1900;
+    protected static int $excelCalendar = self::CALENDAR_WINDOWS_1900;
 
     /**
      * Default timezone to use for DateTime objects.
-     *
-     * @var null|DateTimeZone
      */
-    protected static $defaultTimeZone;
+    protected static ?DateTimeZone $defaultTimeZone = null;
 
     /**
      * Set the Excel calendar (Windows 1900 or Mac 1904).
      *
-     * @param int $baseDate Excel base date (1900 or 1904)
+     * @param ?int $baseYear Excel base date (1900 or 1904)
      *
      * @return bool Success or failure
      */
-    public static function setExcelCalendar($baseDate)
+    public static function setExcelCalendar(?int $baseYear): bool
     {
         if (
-            ($baseDate == self::CALENDAR_WINDOWS_1900) ||
-            ($baseDate == self::CALENDAR_MAC_1904)
+            ($baseYear === self::CALENDAR_WINDOWS_1900)
+            || ($baseYear === self::CALENDAR_MAC_1904)
         ) {
-            self::$excelCalendar = $baseDate;
+            self::$excelCalendar = $baseYear;
 
             return true;
         }
@@ -89,7 +86,7 @@ public static function setExcelCalendar($baseDate)
      *
      * @return int Excel base date (1900 or 1904)
      */
-    public static function getExcelCalendar()
+    public static function getExcelCalendar(): int
     {
         return self::$excelCalendar;
     }
@@ -101,13 +98,13 @@ public static function getExcelCalendar()
      *
      * @return bool Success or failure
      */
-    public static function setDefaultTimezone($timeZone)
+    public static function setDefaultTimezone($timeZone): bool
     {
         try {
             $timeZone = self::validateTimeZone($timeZone);
             self::$defaultTimeZone = $timeZone;
             $retval = true;
-        } catch (PhpSpreadsheetException $e) {
+        } catch (PhpSpreadsheetException) {
             $retval = false;
         }
 
@@ -145,7 +142,7 @@ public static function getDefaultTimezoneOrNull(): ?DateTimeZone
      *
      * @return ?DateTimeZone The timezone as a timezone object
      */
-    private static function validateTimeZone($timeZone)
+    private static function validateTimeZone($timeZone): ?DateTimeZone
     {
         if ($timeZone instanceof DateTimeZone || $timeZone === null) {
             return $timeZone;
@@ -157,17 +154,47 @@ private static function validateTimeZone($timeZone)
         throw new PhpSpreadsheetException('Invalid timezone');
     }
 
+    /**
+     * @param mixed $value Converts a date/time in ISO-8601 standard format date string to an Excel
+     *                         serialized timestamp.
+     *                     See https://en.wikipedia.org/wiki/ISO_8601 for details of the ISO-8601 standard format.
+     */
+    public static function convertIsoDate(mixed $value): float|int
+    {
+        if (!is_string($value)) {
+            throw new Exception('Non-string value supplied for Iso Date conversion');
+        }
+
+        $date = new DateTime($value);
+        $dateErrors = DateTime::getLastErrors();
+
+        if (is_array($dateErrors) && ($dateErrors['warning_count'] > 0 || $dateErrors['error_count'] > 0)) {
+            throw new Exception("Invalid string $value supplied for datatype Date");
+        }
+
+        $newValue = self::PHPToExcel($date);
+        if ($newValue === false) {
+            throw new Exception("Invalid string $value supplied for datatype Date");
+        }
+
+        if (preg_match('/^\\s*\\d?\\d:\\d\\d(:\\d\\d([.]\\d+)?)?\\s*(am|pm)?\\s*$/i', $value) == 1) {
+            $newValue = fmod($newValue, 1.0);
+        }
+
+        return $newValue;
+    }
+
     /**
      * Convert a MS serialized datetime value from Excel to a PHP Date/Time object.
      *
      * @param float|int $excelTimestamp MS Excel serialized date/time value
      * @param null|DateTimeZone|string $timeZone The timezone to assume for the Excel timestamp,
-     *                                                                        if you don't want to treat it as a UTC value
-     *                                                                    Use the default (UST) unless you absolutely need a conversion
+     *                                           if you don't want to treat it as a UTC value
+     *                                           Use the default (UTC) unless you absolutely need a conversion
      *
      * @return DateTime PHP date/time object
      */
-    public static function excelToDateTimeObject($excelTimestamp, $timeZone = null)
+    public static function excelToDateTimeObject(float|int $excelTimestamp, null|DateTimeZone|string $timeZone = null): DateTime
     {
         $timeZone = ($timeZone === null) ? self::getDefaultTimezone() : self::validateTimeZone($timeZone);
         if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_EXCEL) {
@@ -189,11 +216,13 @@ public static function excelToDateTimeObject($excelTimestamp, $timeZone = null)
 
         $days = floor($excelTimestamp);
         $partDay = $excelTimestamp - $days;
-        $hours = floor($partDay * 24);
-        $partDay = $partDay * 24 - $hours;
-        $minutes = floor($partDay * 60);
-        $partDay = $partDay * 60 - $minutes;
-        $seconds = round($partDay * 60);
+        $hms = 86400 * $partDay;
+        $microseconds = (int) round(fmod($hms, 1) * 1000000);
+        $hms = (int) floor($hms);
+        $hours = intdiv($hms, 3600);
+        $hms -= $hours * 3600;
+        $minutes = intdiv($hms, 60);
+        $seconds = $hms % 60;
 
         if ($days >= 0) {
             $days = '+' . $days;
@@ -201,34 +230,39 @@ public static function excelToDateTimeObject($excelTimestamp, $timeZone = null)
         $interval = $days . ' days';
 
         return $baseDate->modify($interval)
-            ->setTime((int) $hours, (int) $minutes, (int) $seconds);
+            ->setTime($hours, $minutes, $seconds, $microseconds);
     }
 
     /**
      * Convert a MS serialized datetime value from Excel to a unix timestamp.
+     * The use of Unix timestamps, and therefore this function, is discouraged.
+     * They are not Y2038-safe on a 32-bit system, and have no timezone info.
      *
      * @param float|int $excelTimestamp MS Excel serialized date/time value
      * @param null|DateTimeZone|string $timeZone The timezone to assume for the Excel timestamp,
-     *                                                                        if you don't want to treat it as a UTC value
-     *                                                                    Use the default (UST) unless you absolutely need a conversion
+     *                                               if you don't want to treat it as a UTC value
+     *                                               Use the default (UTC) unless you absolutely need a conversion
      *
      * @return int Unix timetamp for this date/time
      */
-    public static function excelToTimestamp($excelTimestamp, $timeZone = null)
+    public static function excelToTimestamp($excelTimestamp, $timeZone = null): int
     {
-        return (int) self::excelToDateTimeObject($excelTimestamp, $timeZone)
-            ->format('U');
+        $dto = self::excelToDateTimeObject($excelTimestamp, $timeZone);
+        self::roundMicroseconds($dto);
+
+        return (int) $dto->format('U');
     }
 
     /**
      * Convert a date from PHP to an MS Excel serialized date/time value.
      *
-     * @param mixed $dateValue Unix Timestamp or PHP DateTime object or a string
+     * @param mixed $dateValue PHP DateTime object or a string - Unix timestamp is also permitted, but discouraged;
+     *    not Y2038-safe on a 32-bit system, and no timezone info
      *
-     * @return bool|float Excel date/time value
+     * @return false|float Excel date/time value
      *                                  or boolean FALSE on failure
      */
-    public static function PHPToExcel($dateValue)
+    public static function PHPToExcel(mixed $dateValue)
     {
         if ((is_object($dateValue)) && ($dateValue instanceof DateTimeInterface)) {
             return self::dateTimeToExcel($dateValue);
@@ -248,47 +282,44 @@ public static function PHPToExcel($dateValue)
      *
      * @return float MS Excel serialized date/time value
      */
-    public static function dateTimeToExcel(DateTimeInterface $dateValue)
+    public static function dateTimeToExcel(DateTimeInterface $dateValue): float
     {
+        $seconds = (float) sprintf('%d.%06d', $dateValue->format('s'), $dateValue->format('u'));
+
         return self::formattedPHPToExcel(
             (int) $dateValue->format('Y'),
             (int) $dateValue->format('m'),
             (int) $dateValue->format('d'),
             (int) $dateValue->format('H'),
             (int) $dateValue->format('i'),
-            (int) $dateValue->format('s')
+            $seconds
         );
     }
 
     /**
      * Convert a Unix timestamp to an MS Excel serialized date/time value.
+     * The use of Unix timestamps, and therefore this function, is discouraged.
+     * They are not Y2038-safe on a 32-bit system, and have no timezone info.
      *
-     * @param int $dateValue Unix Timestamp
+     * @param float|int|string $unixTimestamp Unix Timestamp
      *
      * @return false|float MS Excel serialized date/time value
      */
-    public static function timestampToExcel($dateValue)
+    public static function timestampToExcel($unixTimestamp): bool|float
     {
-        if (!is_numeric($dateValue)) {
+        if (!is_numeric($unixTimestamp)) {
             return false;
         }
 
-        return self::dateTimeToExcel(new DateTime('@' . $dateValue));
+        return self::dateTimeToExcel(new DateTime('@' . $unixTimestamp));
     }
 
     /**
      * formattedPHPToExcel.
      *
-     * @param int $year
-     * @param int $month
-     * @param int $day
-     * @param int $hours
-     * @param int $minutes
-     * @param int $seconds
-     *
      * @return float Excel date/time value
      */
-    public static function formattedPHPToExcel($year, $month, $day, $hours = 0, $minutes = 0, $seconds = 0)
+    public static function formattedPHPToExcel(int $year, int $month, int $day, int $hours = 0, int $minutes = 0, float|int $seconds = 0): float
     {
         if (self::$excelCalendar == self::CALENDAR_WINDOWS_1900) {
             //
@@ -314,8 +345,8 @@ public static function formattedPHPToExcel($year, $month, $day, $hours = 0, $min
         }
 
         //    Calculate the Julian Date, then subtract the Excel base date (JD 2415020 = 31-Dec-1899 Giving Excel Date of 0)
-        $century = (int) substr($year, 0, 2);
-        $decade = (int) substr($year, 2, 2);
+        $century = (int) substr((string) $year, 0, 2);
+        $decade = (int) substr((string) $year, 2, 2);
         $excelDate = floor((146097 * $century) / 4) + floor((1461 * $decade) / 4) + floor((153 * $month + 2) / 5) + $day + 1721119 - $myexcelBaseDate + $excel1900isLeapYear;
 
         $excelTime = (($hours * 3600) + ($minutes * 60) + $seconds) / 86400;
@@ -325,97 +356,87 @@ public static function formattedPHPToExcel($year, $month, $day, $hours = 0, $min
 
     /**
      * Is a given cell a date/time?
-     *
-     * @return bool
      */
-    public static function isDateTime(Cell $pCell)
+    public static function isDateTime(Cell $cell, mixed $value = null, bool $dateWithoutTimeOkay = true): bool
     {
-        return is_numeric($pCell->getCalculatedValue()) &&
-            self::isDateTimeFormat(
-                $pCell->getWorksheet()->getStyle(
-                    $pCell->getCoordinate()
-                )->getNumberFormat()
-            );
+        $result = false;
+        $worksheet = $cell->getWorksheetOrNull();
+        $spreadsheet = ($worksheet === null) ? null : $worksheet->getParent();
+        if ($worksheet !== null && $spreadsheet !== null) {
+            $index = $spreadsheet->getActiveSheetIndex();
+            $selected = $worksheet->getSelectedCells();
+
+            try {
+                $result = is_numeric($value ?? $cell->getCalculatedValue())
+                    && self::isDateTimeFormat(
+                        $worksheet->getStyle(
+                            $cell->getCoordinate()
+                        )->getNumberFormat(),
+                        $dateWithoutTimeOkay
+                    );
+            } catch (Exception) {
+                // Result is already false, so no need to actually do anything here
+            }
+            $worksheet->setSelectedCells($selected);
+            $spreadsheet->setActiveSheetIndex($index);
+        }
+
+        return $result;
     }
 
     /**
-     * Is a given number format a date/time?
-     *
-     * @return bool
+     * Is a given NumberFormat code a date/time format code?
      */
-    public static function isDateTimeFormat(NumberFormat $pFormat)
+    public static function isDateTimeFormat(NumberFormat $excelFormatCode, bool $dateWithoutTimeOkay = true): bool
     {
-        return self::isDateTimeFormatCode($pFormat->getFormatCode());
+        return self::isDateTimeFormatCode((string) $excelFormatCode->getFormatCode(), $dateWithoutTimeOkay);
     }
 
-    private static $possibleDateFormatCharacters = 'eymdHs';
+    private const POSSIBLE_DATETIME_FORMAT_CHARACTERS = 'eymdHs';
+    private const POSSIBLE_TIME_FORMAT_CHARACTERS = 'Hs'; // note - no 'm' due to ambiguity
 
     /**
      * Is a given number format code a date/time?
-     *
-     * @param string $pFormatCode
-     *
-     * @return bool
      */
-    public static function isDateTimeFormatCode($pFormatCode)
+    public static function isDateTimeFormatCode(string $excelFormatCode, bool $dateWithoutTimeOkay = true): bool
     {
-        if (strtolower($pFormatCode) === strtolower(NumberFormat::FORMAT_GENERAL)) {
+        if (strtolower($excelFormatCode) === strtolower(NumberFormat::FORMAT_GENERAL)) {
             //    "General" contains an epoch letter 'e', so we trap for it explicitly here (case-insensitive check)
             return false;
         }
-        if (preg_match('/[0#]E[+-]0/i', $pFormatCode)) {
+        if (preg_match('/[0#]E[+-]0/i', $excelFormatCode)) {
             //    Scientific format
             return false;
         }
 
         // Switch on formatcode
-        switch ($pFormatCode) {
-            //    Explicitly defined date formats
-            case NumberFormat::FORMAT_DATE_YYYYMMDD:
-            case NumberFormat::FORMAT_DATE_YYYYMMDD2:
-            case NumberFormat::FORMAT_DATE_DDMMYYYY:
-            case NumberFormat::FORMAT_DATE_DMYSLASH:
-            case NumberFormat::FORMAT_DATE_DMYMINUS:
-            case NumberFormat::FORMAT_DATE_DMMINUS:
-            case NumberFormat::FORMAT_DATE_MYMINUS:
-            case NumberFormat::FORMAT_DATE_DATETIME:
-            case NumberFormat::FORMAT_DATE_TIME1:
-            case NumberFormat::FORMAT_DATE_TIME2:
-            case NumberFormat::FORMAT_DATE_TIME3:
-            case NumberFormat::FORMAT_DATE_TIME4:
-            case NumberFormat::FORMAT_DATE_TIME5:
-            case NumberFormat::FORMAT_DATE_TIME6:
-            case NumberFormat::FORMAT_DATE_TIME7:
-            case NumberFormat::FORMAT_DATE_TIME8:
-            case NumberFormat::FORMAT_DATE_YYYYMMDDSLASH:
-            case NumberFormat::FORMAT_DATE_XLSX14:
-            case NumberFormat::FORMAT_DATE_XLSX15:
-            case NumberFormat::FORMAT_DATE_XLSX16:
-            case NumberFormat::FORMAT_DATE_XLSX17:
-            case NumberFormat::FORMAT_DATE_XLSX22:
-                return true;
+        $excelFormatCode = (string) NumberFormat::convertSystemFormats($excelFormatCode);
+        if (in_array($excelFormatCode, NumberFormat::DATE_TIME_OR_DATETIME_ARRAY, true)) {
+            return $dateWithoutTimeOkay || in_array($excelFormatCode, NumberFormat::TIME_OR_DATETIME_ARRAY);
         }
 
         //    Typically number, currency or accounting (or occasionally fraction) formats
-        if ((substr($pFormatCode, 0, 1) == '_') || (substr($pFormatCode, 0, 2) == '0 ')) {
+        if ((str_starts_with($excelFormatCode, '_')) || (str_starts_with($excelFormatCode, '0 '))) {
             return false;
         }
         // Some "special formats" provided in German Excel versions were detected as date time value,
         // so filter them out here - "\C\H\-00000" (Switzerland) and "\D-00000" (Germany).
-        if (\strpos($pFormatCode, '-00000') !== false) {
+        if (str_contains($excelFormatCode, '-00000')) {
             return false;
         }
+        $possibleFormatCharacters = $dateWithoutTimeOkay ? self::POSSIBLE_DATETIME_FORMAT_CHARACTERS : self::POSSIBLE_TIME_FORMAT_CHARACTERS;
         // Try checking for any of the date formatting characters that don't appear within square braces
-        if (preg_match('/(^|\])[^\[]*[' . self::$possibleDateFormatCharacters . ']/i', $pFormatCode)) {
+        if (preg_match('/(^|\])[^\[]*[' . $possibleFormatCharacters . ']/i', $excelFormatCode)) {
             //    We might also have a format mask containing quoted strings...
             //        we don't want to test for any of our characters within the quoted blocks
-            if (strpos($pFormatCode, '"') !== false) {
+            if (str_contains($excelFormatCode, '"')) {
                 $segMatcher = false;
-                foreach (explode('"', $pFormatCode) as $subVal) {
+                foreach (explode('"', $excelFormatCode) as $subVal) {
                     //    Only test in alternate array entries (the non-quoted blocks)
+                    $segMatcher = $segMatcher === false;
                     if (
-                        ($segMatcher = !$segMatcher) &&
-                        (preg_match('/(^|\])[^\[]*[' . self::$possibleDateFormatCharacters . ']/i', $subVal))
+                        $segMatcher
+                        && (preg_match('/(^|\])[^\[]*[' . $possibleFormatCharacters . ']/i', $subVal))
                     ) {
                         return true;
                     }
@@ -438,7 +459,7 @@ public static function isDateTimeFormatCode($pFormatCode)
      *
      * @return false|float Excel date/time serial value
      */
-    public static function stringToExcel($dateValue)
+    public static function stringToExcel(string $dateValue): bool|float
     {
         if (strlen($dateValue) < 2) {
             return false;
@@ -449,13 +470,13 @@ public static function stringToExcel($dateValue)
 
         $dateValueNew = DateTimeExcel\DateValue::fromString($dateValue);
 
-        if ($dateValueNew === Functions::VALUE()) {
+        if (!is_float($dateValueNew)) {
             return false;
         }
 
-        if (strpos($dateValue, ':') !== false) {
+        if (str_contains($dateValue, ':')) {
             $timeValue = DateTimeExcel\TimeValue::fromString($dateValue);
-            if ($timeValue === Functions::VALUE()) {
+            if (!is_float($timeValue)) {
                 return false;
             }
             $dateValueNew += $timeValue;
@@ -467,21 +488,21 @@ public static function stringToExcel($dateValue)
     /**
      * Converts a month name (either a long or a short name) to a month number.
      *
-     * @param string $month Month name or abbreviation
+     * @param string $monthName Month name or abbreviation
      *
      * @return int|string Month number (1 - 12), or the original string argument if it isn't a valid month name
      */
-    public static function monthStringToNumber($month)
+    public static function monthStringToNumber(string $monthName)
     {
         $monthIndex = 1;
         foreach (self::$monthNames as $shortMonthName => $longMonthName) {
-            if (($month === $longMonthName) || ($month === $shortMonthName)) {
+            if (($monthName === $longMonthName) || ($monthName === $shortMonthName)) {
                 return $monthIndex;
             }
             ++$monthIndex;
         }
 
-        return $month;
+        return $monthName;
     }
 
     /**
@@ -491,7 +512,7 @@ public static function monthStringToNumber($month)
      *
      * @return int|string The integer value with any ordinal stripped, or the original string argument if it isn't a valid numeric
      */
-    public static function dayStringToNumber($day)
+    public static function dayStringToNumber(string $day)
     {
         $strippedDayValue = (str_replace(self::$numberSuffixes, '', $day));
         if (is_numeric($strippedDayValue)) {
@@ -515,4 +536,17 @@ public static function formattedDateTimeFromTimestamp(string $date, string $form
 
         return $dtobj->format($format);
     }
+
+    /**
+     * Round the given DateTime object to seconds.
+     */
+    public static function roundMicroseconds(DateTime $dti): void
+    {
+        $microseconds = (int) $dti->format('u');
+        $rounded = (int) round($microseconds, -6);
+        $modify = $rounded - $microseconds;
+        if ($modify !== 0) {
+            $dti->modify(($modify > 0 ? '+' : '') . $modify . ' microseconds');
+        }
+    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Drawing.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Drawing.php
index ebb87ed18e..4eef791196 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Drawing.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Drawing.php
@@ -2,33 +2,34 @@
 
 namespace PhpOffice\PhpSpreadsheet\Shared;
 
-use GdImage;
+use SimpleXMLElement;
 
 class Drawing
 {
     /**
      * Convert pixels to EMU.
      *
-     * @param int $pValue Value in pixels
+     * @param int $pixelValue Value in pixels
      *
-     * @return int Value in EMU
+     * @return float|int Value in EMU
      */
-    public static function pixelsToEMU($pValue)
+    public static function pixelsToEMU(int $pixelValue): int|float
     {
-        return $pValue * 9525;
+        return $pixelValue * 9525;
     }
 
     /**
      * Convert EMU to pixels.
      *
-     * @param int $pValue Value in EMU
+     * @param int|SimpleXMLElement $emuValue Value in EMU
      *
      * @return int Value in pixels
      */
-    public static function EMUToPixels($pValue)
+    public static function EMUToPixels($emuValue): int
     {
-        if ($pValue != 0) {
-            return (int) round($pValue / 9525);
+        $emuValue = (int) $emuValue;
+        if ($emuValue != 0) {
+            return (int) round($emuValue / 9525);
         }
 
         return 0;
@@ -39,50 +40,51 @@ public static function EMUToPixels($pValue)
      * By inspection of a real Excel file using Calibri 11, one finds 1000px ~ 142.85546875
      * This gives a conversion factor of 7. Also, we assume that pixels and font size are proportional.
      *
-     * @param int $pValue Value in pixels
-     * @param \PhpOffice\PhpSpreadsheet\Style\Font $pDefaultFont Default font of the workbook
+     * @param int $pixelValue Value in pixels
      *
-     * @return int Value in cell dimension
+     * @return float|int Value in cell dimension
      */
-    public static function pixelsToCellDimension($pValue, \PhpOffice\PhpSpreadsheet\Style\Font $pDefaultFont)
+    public static function pixelsToCellDimension(int $pixelValue, \PhpOffice\PhpSpreadsheet\Style\Font $defaultFont): int|float
     {
         // Font name and size
-        $name = $pDefaultFont->getName();
-        $size = $pDefaultFont->getSize();
+        $name = $defaultFont->getName();
+        $size = $defaultFont->getSize();
 
-        if (isset(Font::$defaultColumnWidths[$name][$size])) {
+        if (isset(Font::DEFAULT_COLUMN_WIDTHS[$name][$size])) {
             // Exact width can be determined
-            $colWidth = $pValue * Font::$defaultColumnWidths[$name][$size]['width'] / Font::$defaultColumnWidths[$name][$size]['px'];
-        } else {
-            // We don't have data for this particular font and size, use approximation by
-            // extrapolating from Calibri 11
-            $colWidth = $pValue * 11 * Font::$defaultColumnWidths['Calibri'][11]['width'] / Font::$defaultColumnWidths['Calibri'][11]['px'] / $size;
+            return $pixelValue * Font::DEFAULT_COLUMN_WIDTHS[$name][$size]['width']
+                / Font::DEFAULT_COLUMN_WIDTHS[$name][$size]['px'];
         }
 
-        return $colWidth;
+        // We don't have data for this particular font and size, use approximation by
+        // extrapolating from Calibri 11
+        return $pixelValue * 11 * Font::DEFAULT_COLUMN_WIDTHS['Calibri'][11]['width']
+            / Font::DEFAULT_COLUMN_WIDTHS['Calibri'][11]['px'] / $size;
     }
 
     /**
      * Convert column width from (intrinsic) Excel units to pixels.
      *
-     * @param float $pValue Value in cell dimension
-     * @param \PhpOffice\PhpSpreadsheet\Style\Font $pDefaultFont Default font of the workbook
+     * @param float $cellWidth Value in cell dimension
+     * @param \PhpOffice\PhpSpreadsheet\Style\Font $defaultFont Default font of the workbook
      *
      * @return int Value in pixels
      */
-    public static function cellDimensionToPixels($pValue, \PhpOffice\PhpSpreadsheet\Style\Font $pDefaultFont)
+    public static function cellDimensionToPixels(float $cellWidth, \PhpOffice\PhpSpreadsheet\Style\Font $defaultFont): int
     {
         // Font name and size
-        $name = $pDefaultFont->getName();
-        $size = $pDefaultFont->getSize();
+        $name = $defaultFont->getName();
+        $size = $defaultFont->getSize();
 
-        if (isset(Font::$defaultColumnWidths[$name][$size])) {
+        if (isset(Font::DEFAULT_COLUMN_WIDTHS[$name][$size])) {
             // Exact width can be determined
-            $colWidth = $pValue * Font::$defaultColumnWidths[$name][$size]['px'] / Font::$defaultColumnWidths[$name][$size]['width'];
+            $colWidth = $cellWidth * Font::DEFAULT_COLUMN_WIDTHS[$name][$size]['px']
+                / Font::DEFAULT_COLUMN_WIDTHS[$name][$size]['width'];
         } else {
             // We don't have data for this particular font and size, use approximation by
             // extrapolating from Calibri 11
-            $colWidth = $pValue * $size * Font::$defaultColumnWidths['Calibri'][11]['px'] / Font::$defaultColumnWidths['Calibri'][11]['width'] / 11;
+            $colWidth = $cellWidth * $size * Font::DEFAULT_COLUMN_WIDTHS['Calibri'][11]['px']
+                / Font::DEFAULT_COLUMN_WIDTHS['Calibri'][11]['width'] / 11;
         }
 
         // Round pixels to closest integer
@@ -94,26 +96,26 @@ public static function cellDimensionToPixels($pValue, \PhpOffice\PhpSpreadsheet\
     /**
      * Convert pixels to points.
      *
-     * @param int $pValue Value in pixels
+     * @param int $pixelValue Value in pixels
      *
      * @return float Value in points
      */
-    public static function pixelsToPoints($pValue)
+    public static function pixelsToPoints(int $pixelValue): float
     {
-        return $pValue * 0.75;
+        return $pixelValue * 0.75;
     }
 
     /**
      * Convert points to pixels.
      *
-     * @param int $pValue Value in points
+     * @param float|int $pointValue Value in points
      *
      * @return int Value in pixels
      */
-    public static function pointsToPixels($pValue)
+    public static function pointsToPixels($pointValue): int
     {
-        if ($pValue != 0) {
-            return (int) ceil($pValue / 0.75);
+        if ($pointValue != 0) {
+            return (int) ceil($pointValue / 0.75);
         }
 
         return 0;
@@ -122,132 +124,29 @@ public static function pointsToPixels($pValue)
     /**
      * Convert degrees to angle.
      *
-     * @param int $pValue Degrees
+     * @param int $degrees Degrees
      *
      * @return int Angle
      */
-    public static function degreesToAngle($pValue)
+    public static function degreesToAngle(int $degrees): int
     {
-        return (int) round($pValue * 60000);
+        return (int) round($degrees * 60000);
     }
 
     /**
      * Convert angle to degrees.
      *
-     * @param int $pValue Angle
+     * @param int|SimpleXMLElement $angle Angle
      *
      * @return int Degrees
      */
-    public static function angleToDegrees($pValue)
+    public static function angleToDegrees($angle): int
     {
-        if ($pValue != 0) {
-            return (int) round($pValue / 60000);
+        $angle = (int) $angle;
+        if ($angle != 0) {
+            return (int) round($angle / 60000);
         }
 
         return 0;
     }
-
-    /**
-     * Create a new image from file. By alexander at alexauto dot nl.
-     *
-     * @see http://www.php.net/manual/en/function.imagecreatefromwbmp.php#86214
-     *
-     * @param string $p_sFile Path to Windows DIB (BMP) image
-     *
-     * @return GdImage|resource
-     */
-    public static function imagecreatefrombmp($p_sFile)
-    {
-        //    Load the image into a string
-        $file = fopen($p_sFile, 'rb');
-        $read = fread($file, 10);
-        while (!feof($file) && ($read != '')) {
-            $read .= fread($file, 1024);
-        }
-
-        $temp = unpack('H*', $read);
-        $hex = $temp[1];
-        $header = substr($hex, 0, 108);
-
-        //    Process the header
-        //    Structure: http://www.fastgraph.com/help/bmp_header_format.html
-        $width = 0;
-        $height = 0;
-        if (substr($header, 0, 4) == '424d') {
-            //    Cut it in parts of 2 bytes
-            $header_parts = str_split($header, 2);
-
-            //    Get the width        4 bytes
-            $width = hexdec($header_parts[19] . $header_parts[18]);
-
-            //    Get the height        4 bytes
-            $height = hexdec($header_parts[23] . $header_parts[22]);
-
-            //    Unset the header params
-            unset($header_parts);
-        }
-
-        //    Define starting X and Y
-        $x = 0;
-        $y = 1;
-
-        //    Create newimage
-        $image = imagecreatetruecolor($width, $height);
-
-        //    Grab the body from the image
-        $body = substr($hex, 108);
-
-        //    Calculate if padding at the end-line is needed
-        //    Divided by two to keep overview.
-        //    1 byte = 2 HEX-chars
-        $body_size = (strlen($body) / 2);
-        $header_size = ($width * $height);
-
-        //    Use end-line padding? Only when needed
-        $usePadding = ($body_size > ($header_size * 3) + 4);
-
-        //    Using a for-loop with index-calculation instaid of str_split to avoid large memory consumption
-        //    Calculate the next DWORD-position in the body
-        for ($i = 0; $i < $body_size; $i += 3) {
-            //    Calculate line-ending and padding
-            if ($x >= $width) {
-                // If padding needed, ignore image-padding
-                // Shift i to the ending of the current 32-bit-block
-                if ($usePadding) {
-                    $i += $width % 4;
-                }
-
-                //    Reset horizontal position
-                $x = 0;
-
-                //    Raise the height-position (bottom-up)
-                ++$y;
-
-                //    Reached the image-height? Break the for-loop
-                if ($y > $height) {
-                    break;
-                }
-            }
-
-            // Calculation of the RGB-pixel (defined as BGR in image-data)
-            // Define $i_pos as absolute position in the body
-            $i_pos = $i * 2;
-            $r = hexdec($body[$i_pos + 4] . $body[$i_pos + 5]);
-            $g = hexdec($body[$i_pos + 2] . $body[$i_pos + 3]);
-            $b = hexdec($body[$i_pos] . $body[$i_pos + 1]);
-
-            // Calculate and draw the pixel
-            $color = imagecolorallocate($image, $r, $g, $b);
-            imagesetpixel($image, $x, $height - $y, $color);
-
-            // Raise the horizontal position
-            ++$x;
-        }
-
-        // Unset the body / free the memory
-        unset($body);
-
-        //    Return image-object
-        return $image;
-    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher.php
index c6d0a6f811..9eb9956a2f 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher.php
@@ -6,58 +6,42 @@ class Escher
 {
     /**
      * Drawing Group Container.
-     *
-     * @var Escher\DggContainer
      */
-    private $dggContainer;
+    private ?Escher\DggContainer $dggContainer = null;
 
     /**
      * Drawing Container.
-     *
-     * @var Escher\DgContainer
      */
-    private $dgContainer;
+    private ?Escher\DgContainer $dgContainer = null;
 
     /**
      * Get Drawing Group Container.
-     *
-     * @return Escher\DggContainer
      */
-    public function getDggContainer()
+    public function getDggContainer(): ?Escher\DggContainer
     {
         return $this->dggContainer;
     }
 
     /**
      * Set Drawing Group Container.
-     *
-     * @param Escher\DggContainer $dggContainer
-     *
-     * @return Escher\DggContainer
      */
-    public function setDggContainer($dggContainer)
+    public function setDggContainer(Escher\DggContainer $dggContainer): Escher\DggContainer
     {
         return $this->dggContainer = $dggContainer;
     }
 
     /**
      * Get Drawing Container.
-     *
-     * @return Escher\DgContainer
      */
-    public function getDgContainer()
+    public function getDgContainer(): ?Escher\DgContainer
     {
         return $this->dgContainer;
     }
 
     /**
      * Set Drawing Container.
-     *
-     * @param Escher\DgContainer $dgContainer
-     *
-     * @return Escher\DgContainer
      */
-    public function setDgContainer($dgContainer)
+    public function setDgContainer(Escher\DgContainer $dgContainer): Escher\DgContainer
     {
         return $this->dgContainer = $dgContainer;
     }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DgContainer.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DgContainer.php
index b0d75d7833..0f4b7a8643 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DgContainer.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DgContainer.php
@@ -2,50 +2,58 @@
 
 namespace PhpOffice\PhpSpreadsheet\Shared\Escher;
 
+use PhpOffice\PhpSpreadsheet\Exception as SpreadsheetException;
+use PhpOffice\PhpSpreadsheet\Shared\Escher\DgContainer\SpgrContainer;
+
 class DgContainer
 {
     /**
      * Drawing index, 1-based.
-     *
-     * @var int
      */
-    private $dgId;
+    private ?int $dgId = null;
 
     /**
      * Last shape index in this drawing.
-     *
-     * @var int
      */
-    private $lastSpId;
+    private ?int $lastSpId = null;
 
-    private $spgrContainer;
+    private ?SpgrContainer $spgrContainer = null;
 
-    public function getDgId()
+    public function getDgId(): ?int
     {
         return $this->dgId;
     }
 
-    public function setDgId($value): void
+    public function setDgId(int $value): void
     {
         $this->dgId = $value;
     }
 
-    public function getLastSpId()
+    public function getLastSpId(): ?int
     {
         return $this->lastSpId;
     }
 
-    public function setLastSpId($value): void
+    public function setLastSpId(int $value): void
     {
         $this->lastSpId = $value;
     }
 
-    public function getSpgrContainer()
+    public function getSpgrContainer(): ?SpgrContainer
     {
         return $this->spgrContainer;
     }
 
-    public function setSpgrContainer($spgrContainer)
+    public function getSpgrContainerOrThrow(): SpgrContainer
+    {
+        if ($this->spgrContainer !== null) {
+            return $this->spgrContainer;
+        }
+
+        throw new SpreadsheetException('spgrContainer is unexpectedly null');
+    }
+
+    public function setSpgrContainer(SpgrContainer $spgrContainer): SpgrContainer
     {
         return $this->spgrContainer = $spgrContainer;
     }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DgContainer/SpgrContainer.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DgContainer/SpgrContainer.php
index 1da877262f..84363ab203 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DgContainer/SpgrContainer.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DgContainer/SpgrContainer.php
@@ -6,34 +6,26 @@ class SpgrContainer
 {
     /**
      * Parent Shape Group Container.
-     *
-     * @var \PhpOffice\PhpSpreadsheet\Shared\Escher\DgContainer\SpgrContainer
      */
-    private $parent;
+    private ?self $parent = null;
 
     /**
      * Shape Container collection.
-     *
-     * @var array
      */
-    private $children = [];
+    private array $children = [];
 
     /**
      * Set parent Shape Group Container.
-     *
-     * @param \PhpOffice\PhpSpreadsheet\Shared\Escher\DgContainer\SpgrContainer $parent
      */
-    public function setParent($parent): void
+    public function setParent(?self $parent): void
     {
         $this->parent = $parent;
     }
 
     /**
      * Get the parent Shape Group Container if any.
-     *
-     * @return null|\PhpOffice\PhpSpreadsheet\Shared\Escher\DgContainer\SpgrContainer
      */
-    public function getParent()
+    public function getParent(): ?self
     {
         return $this->parent;
     }
@@ -41,9 +33,9 @@ public function getParent()
     /**
      * Add a child. This will be either spgrContainer or spContainer.
      *
-     * @param mixed $child
+     * @param SpgrContainer|SpgrContainer\SpContainer $child child to be added
      */
-    public function addChild($child): void
+    public function addChild(mixed $child): void
     {
         $this->children[] = $child;
         $child->setParent($this);
@@ -52,7 +44,7 @@ public function addChild($child): void
     /**
      * Get collection of Shape Containers.
      */
-    public function getChildren()
+    public function getChildren(): array
     {
         return $this->children;
     }
@@ -62,7 +54,7 @@ public function getChildren()
      *
      * @return SpgrContainer\SpContainer[]
      */
-    public function getAllSpContainers()
+    public function getAllSpContainers(): array
     {
         $allSpContainers = [];
 
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php
index 8a81ff5797..c462d454cb 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php
@@ -8,184 +8,140 @@ class SpContainer
 {
     /**
      * Parent Shape Group Container.
-     *
-     * @var SpgrContainer
      */
-    private $parent;
+    private SpgrContainer $parent;
 
     /**
      * Is this a group shape?
-     *
-     * @var bool
      */
-    private $spgr = false;
+    private bool $spgr = false;
 
     /**
      * Shape type.
-     *
-     * @var int
      */
-    private $spType;
+    private int $spType;
 
     /**
      * Shape flag.
-     *
-     * @var int
      */
-    private $spFlag;
+    private int $spFlag;
 
     /**
      * Shape index (usually group shape has index 0, and the rest: 1,2,3...).
-     *
-     * @var int
      */
-    private $spId;
+    private int $spId;
 
     /**
      * Array of options.
-     *
-     * @var array
      */
-    private $OPT;
+    private array $OPT = [];
 
     /**
      * Cell coordinates of upper-left corner of shape, e.g. 'A1'.
-     *
-     * @var string
      */
-    private $startCoordinates;
+    private string $startCoordinates = '';
 
     /**
      * Horizontal offset of upper-left corner of shape measured in 1/1024 of column width.
-     *
-     * @var int
      */
-    private $startOffsetX;
+    private int|float $startOffsetX;
 
     /**
      * Vertical offset of upper-left corner of shape measured in 1/256 of row height.
-     *
-     * @var int
      */
-    private $startOffsetY;
+    private int|float $startOffsetY;
 
     /**
      * Cell coordinates of bottom-right corner of shape, e.g. 'B2'.
-     *
-     * @var string
      */
-    private $endCoordinates;
+    private string $endCoordinates;
 
     /**
      * Horizontal offset of bottom-right corner of shape measured in 1/1024 of column width.
-     *
-     * @var int
      */
-    private $endOffsetX;
+    private int|float $endOffsetX;
 
     /**
      * Vertical offset of bottom-right corner of shape measured in 1/256 of row height.
-     *
-     * @var int
      */
-    private $endOffsetY;
+    private int|float $endOffsetY;
 
     /**
      * Set parent Shape Group Container.
-     *
-     * @param SpgrContainer $parent
      */
-    public function setParent($parent): void
+    public function setParent(SpgrContainer $parent): void
     {
         $this->parent = $parent;
     }
 
     /**
      * Get the parent Shape Group Container.
-     *
-     * @return SpgrContainer
      */
-    public function getParent()
+    public function getParent(): SpgrContainer
     {
         return $this->parent;
     }
 
     /**
      * Set whether this is a group shape.
-     *
-     * @param bool $value
      */
-    public function setSpgr($value): void
+    public function setSpgr(bool $value): void
     {
         $this->spgr = $value;
     }
 
     /**
      * Get whether this is a group shape.
-     *
-     * @return bool
      */
-    public function getSpgr()
+    public function getSpgr(): bool
     {
         return $this->spgr;
     }
 
     /**
      * Set the shape type.
-     *
-     * @param int $value
      */
-    public function setSpType($value): void
+    public function setSpType(int $value): void
     {
         $this->spType = $value;
     }
 
     /**
      * Get the shape type.
-     *
-     * @return int
      */
-    public function getSpType()
+    public function getSpType(): int
     {
         return $this->spType;
     }
 
     /**
      * Set the shape flag.
-     *
-     * @param int $value
      */
-    public function setSpFlag($value): void
+    public function setSpFlag(int $value): void
     {
         $this->spFlag = $value;
     }
 
     /**
      * Get the shape flag.
-     *
-     * @return int
      */
-    public function getSpFlag()
+    public function getSpFlag(): int
     {
         return $this->spFlag;
     }
 
     /**
      * Set the shape index.
-     *
-     * @param int $value
      */
-    public function setSpId($value): void
+    public function setSpId(int $value): void
     {
         $this->spId = $value;
     }
 
     /**
      * Get the shape index.
-     *
-     * @return int
      */
-    public function getSpId()
+    public function getSpId(): int
     {
         return $this->spId;
     }
@@ -194,9 +150,8 @@ public function getSpId()
      * Set an option for the Shape Group Container.
      *
      * @param int $property The number specifies the option
-     * @param mixed $value
      */
-    public function setOPT($property, $value): void
+    public function setOPT(int $property, mixed $value): void
     {
         $this->OPT[$property] = $value;
     }
@@ -205,10 +160,8 @@ public function setOPT($property, $value): void
      * Get an option for the Shape Group Container.
      *
      * @param int $property The number specifies the option
-     *
-     * @return mixed
      */
-    public function getOPT($property)
+    public function getOPT(int $property): mixed
     {
         if (isset($this->OPT[$property])) {
             return $this->OPT[$property];
@@ -219,10 +172,8 @@ public function getOPT($property)
 
     /**
      * Get the collection of options.
-     *
-     * @return array
      */
-    public function getOPTCollection()
+    public function getOPTCollection(): array
     {
         return $this->OPT;
     }
@@ -232,57 +183,47 @@ public function getOPTCollection()
      *
      * @param string $value eg: 'A1'
      */
-    public function setStartCoordinates($value): void
+    public function setStartCoordinates(string $value): void
     {
         $this->startCoordinates = $value;
     }
 
     /**
      * Get cell coordinates of upper-left corner of shape.
-     *
-     * @return string
      */
-    public function getStartCoordinates()
+    public function getStartCoordinates(): string
     {
         return $this->startCoordinates;
     }
 
     /**
      * Set offset in x-direction of upper-left corner of shape measured in 1/1024 of column width.
-     *
-     * @param int $startOffsetX
      */
-    public function setStartOffsetX($startOffsetX): void
+    public function setStartOffsetX(int|float $startOffsetX): void
     {
         $this->startOffsetX = $startOffsetX;
     }
 
     /**
      * Get offset in x-direction of upper-left corner of shape measured in 1/1024 of column width.
-     *
-     * @return int
      */
-    public function getStartOffsetX()
+    public function getStartOffsetX(): int|float
     {
         return $this->startOffsetX;
     }
 
     /**
      * Set offset in y-direction of upper-left corner of shape measured in 1/256 of row height.
-     *
-     * @param int $startOffsetY
      */
-    public function setStartOffsetY($startOffsetY): void
+    public function setStartOffsetY(int|float $startOffsetY): void
     {
         $this->startOffsetY = $startOffsetY;
     }
 
     /**
      * Get offset in y-direction of upper-left corner of shape measured in 1/256 of row height.
-     *
-     * @return int
      */
-    public function getStartOffsetY()
+    public function getStartOffsetY(): int|float
     {
         return $this->startOffsetY;
     }
@@ -292,57 +233,47 @@ public function getStartOffsetY()
      *
      * @param string $value eg: 'A1'
      */
-    public function setEndCoordinates($value): void
+    public function setEndCoordinates(string $value): void
     {
         $this->endCoordinates = $value;
     }
 
     /**
      * Get cell coordinates of bottom-right corner of shape.
-     *
-     * @return string
      */
-    public function getEndCoordinates()
+    public function getEndCoordinates(): string
     {
         return $this->endCoordinates;
     }
 
     /**
      * Set offset in x-direction of bottom-right corner of shape measured in 1/1024 of column width.
-     *
-     * @param int $endOffsetX
      */
-    public function setEndOffsetX($endOffsetX): void
+    public function setEndOffsetX(int|float $endOffsetX): void
     {
         $this->endOffsetX = $endOffsetX;
     }
 
     /**
      * Get offset in x-direction of bottom-right corner of shape measured in 1/1024 of column width.
-     *
-     * @return int
      */
-    public function getEndOffsetX()
+    public function getEndOffsetX(): int|float
     {
         return $this->endOffsetX;
     }
 
     /**
      * Set offset in y-direction of bottom-right corner of shape measured in 1/256 of row height.
-     *
-     * @param int $endOffsetY
      */
-    public function setEndOffsetY($endOffsetY): void
+    public function setEndOffsetY(int|float $endOffsetY): void
     {
         $this->endOffsetY = $endOffsetY;
     }
 
     /**
      * Get offset in y-direction of bottom-right corner of shape measured in 1/256 of row height.
-     *
-     * @return int
      */
-    public function getEndOffsetY()
+    public function getEndOffsetY(): int|float
     {
         return $this->endOffsetY;
     }
@@ -354,7 +285,7 @@ public function getEndOffsetY()
      *
      * @return int Nesting level
      */
-    public function getNestingLevel()
+    public function getNestingLevel(): int
     {
         $nestingLevel = 0;
 
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer.php
index 1bd15b9edd..d0bf1bb5a1 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer.php
@@ -6,122 +6,94 @@ class DggContainer
 {
     /**
      * Maximum shape index of all shapes in all drawings increased by one.
-     *
-     * @var int
      */
-    private $spIdMax;
+    private int $spIdMax;
 
     /**
      * Total number of drawings saved.
-     *
-     * @var int
      */
-    private $cDgSaved;
+    private int $cDgSaved;
 
     /**
      * Total number of shapes saved (including group shapes).
-     *
-     * @var int
      */
-    private $cSpSaved;
+    private int $cSpSaved;
 
     /**
      * BLIP Store Container.
-     *
-     * @var DggContainer\BstoreContainer
      */
-    private $bstoreContainer;
+    private ?DggContainer\BstoreContainer $bstoreContainer = null;
 
     /**
      * Array of options for the drawing group.
-     *
-     * @var array
      */
-    private $OPT = [];
+    private array $OPT = [];
 
     /**
      * Array of identifier clusters containg information about the maximum shape identifiers.
-     *
-     * @var array
      */
-    private $IDCLs = [];
+    private array $IDCLs = [];
 
     /**
      * Get maximum shape index of all shapes in all drawings (plus one).
-     *
-     * @return int
      */
-    public function getSpIdMax()
+    public function getSpIdMax(): int
     {
         return $this->spIdMax;
     }
 
     /**
      * Set maximum shape index of all shapes in all drawings (plus one).
-     *
-     * @param int $value
      */
-    public function setSpIdMax($value): void
+    public function setSpIdMax(int $value): void
     {
         $this->spIdMax = $value;
     }
 
     /**
      * Get total number of drawings saved.
-     *
-     * @return int
      */
-    public function getCDgSaved()
+    public function getCDgSaved(): int
     {
         return $this->cDgSaved;
     }
 
     /**
      * Set total number of drawings saved.
-     *
-     * @param int $value
      */
-    public function setCDgSaved($value): void
+    public function setCDgSaved(int $value): void
     {
         $this->cDgSaved = $value;
     }
 
     /**
      * Get total number of shapes saved (including group shapes).
-     *
-     * @return int
      */
-    public function getCSpSaved()
+    public function getCSpSaved(): int
     {
         return $this->cSpSaved;
     }
 
     /**
      * Set total number of shapes saved (including group shapes).
-     *
-     * @param int $value
      */
-    public function setCSpSaved($value): void
+    public function setCSpSaved(int $value): void
     {
         $this->cSpSaved = $value;
     }
 
     /**
      * Get BLIP Store Container.
-     *
-     * @return DggContainer\BstoreContainer
      */
-    public function getBstoreContainer()
+    public function getBstoreContainer(): ?DggContainer\BstoreContainer
     {
         return $this->bstoreContainer;
     }
 
     /**
      * Set BLIP Store Container.
-     *
-     * @param DggContainer\BstoreContainer $bstoreContainer
      */
-    public function setBstoreContainer($bstoreContainer): void
+    public function setBstoreContainer(DggContainer\BstoreContainer $bstoreContainer): void
     {
         $this->bstoreContainer = $bstoreContainer;
     }
@@ -130,9 +102,8 @@ public function setBstoreContainer($bstoreContainer): void
      * Set an option for the drawing group.
      *
      * @param int $property The number specifies the option
-     * @param mixed $value
      */
-    public function setOPT($property, $value): void
+    public function setOPT(int $property, mixed $value): void
     {
         $this->OPT[$property] = $value;
     }
@@ -141,10 +112,8 @@ public function setOPT($property, $value): void
      * Get an option for the drawing group.
      *
      * @param int $property The number specifies the option
-     *
-     * @return mixed
      */
-    public function getOPT($property)
+    public function getOPT(int $property): mixed
     {
         if (isset($this->OPT[$property])) {
             return $this->OPT[$property];
@@ -155,21 +124,17 @@ public function getOPT($property)
 
     /**
      * Get identifier clusters.
-     *
-     * @return array
      */
-    public function getIDCLs()
+    public function getIDCLs(): array
     {
         return $this->IDCLs;
     }
 
     /**
      * Set identifier clusters. [<drawingId> => <max shape id>, ...].
-     *
-     * @param array $pValue
      */
-    public function setIDCLs($pValue): void
+    public function setIDCLs(array $IDCLs): void
     {
-        $this->IDCLs = $pValue;
+        $this->IDCLs = $IDCLs;
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer.php
index b07786ff65..2d13b42d07 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer.php
@@ -7,16 +7,14 @@ class BstoreContainer
     /**
      * BLIP Store Entries. Each of them holds one BLIP (Big Large Image or Picture).
      *
-     * @var array
+     * @var BstoreContainer\BSE[]
      */
-    private $BSECollection = [];
+    private array $BSECollection = [];
 
     /**
      * Add a BLIP Store Entry.
-     *
-     * @param BstoreContainer\BSE $BSE
      */
-    public function addBSE($BSE): void
+    public function addBSE(BstoreContainer\BSE $BSE): void
     {
         $this->BSECollection[] = $BSE;
         $BSE->setParent($this);
@@ -27,7 +25,7 @@ public function addBSE($BSE): void
      *
      * @return BstoreContainer\BSE[]
      */
-    public function getBSECollection()
+    public function getBSECollection(): array
     {
         return $this->BSECollection;
     }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer/BSE.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer/BSE.php
index e885146577..98e3656cf9 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer/BSE.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer/BSE.php
@@ -2,6 +2,8 @@
 
 namespace PhpOffice\PhpSpreadsheet\Shared\Escher\DggContainer\BstoreContainer;
 
+use PhpOffice\PhpSpreadsheet\Shared\Escher\DggContainer\BstoreContainer;
+
 class BSE
 {
     const BLIPTYPE_ERROR = 0x00;
@@ -17,51 +19,45 @@ class BSE
 
     /**
      * The parent BLIP Store Entry Container.
-     *
-     * @var \PhpOffice\PhpSpreadsheet\Shared\Escher\DggContainer\BstoreContainer
+     * Property is currently unused.
      */
-    private $parent;
+    private BstoreContainer $parent;
 
     /**
      * The BLIP (Big Large Image or Picture).
-     *
-     * @var BSE\Blip
      */
-    private $blip;
+    private ?BSE\Blip $blip = null;
 
     /**
      * The BLIP type.
-     *
-     * @var int
      */
-    private $blipType;
+    private int $blipType;
 
     /**
      * Set parent BLIP Store Entry Container.
-     *
-     * @param \PhpOffice\PhpSpreadsheet\Shared\Escher\DggContainer\BstoreContainer $parent
      */
-    public function setParent($parent): void
+    public function setParent(BstoreContainer $parent): void
     {
         $this->parent = $parent;
     }
 
+    public function getParent(): BstoreContainer
+    {
+        return $this->parent;
+    }
+
     /**
      * Get the BLIP.
-     *
-     * @return BSE\Blip
      */
-    public function getBlip()
+    public function getBlip(): ?BSE\Blip
     {
         return $this->blip;
     }
 
     /**
      * Set the BLIP.
-     *
-     * @param BSE\Blip $blip
      */
-    public function setBlip($blip): void
+    public function setBlip(BSE\Blip $blip): void
     {
         $this->blip = $blip;
         $blip->setParent($this);
@@ -69,20 +65,16 @@ public function setBlip($blip): void
 
     /**
      * Get the BLIP type.
-     *
-     * @return int
      */
-    public function getBlipType()
+    public function getBlipType(): int
     {
         return $this->blipType;
     }
 
     /**
      * Set the BLIP type.
-     *
-     * @param int $blipType
      */
-    public function setBlipType($blipType): void
+    public function setBlipType(int $blipType): void
     {
         $this->blipType = $blipType;
     }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php
index 500d7eaf3e..763bfe5780 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php
@@ -2,58 +2,48 @@
 
 namespace PhpOffice\PhpSpreadsheet\Shared\Escher\DggContainer\BstoreContainer\BSE;
 
+use PhpOffice\PhpSpreadsheet\Shared\Escher\DggContainer\BstoreContainer\BSE;
+
 class Blip
 {
     /**
      * The parent BSE.
-     *
-     * @var \PhpOffice\PhpSpreadsheet\Shared\Escher\DggContainer\BstoreContainer\BSE
      */
-    private $parent;
+    private BSE $parent;
 
     /**
      * Raw image data.
-     *
-     * @var string
      */
-    private $data;
+    private string $data;
 
     /**
      * Get the raw image data.
-     *
-     * @return string
      */
-    public function getData()
+    public function getData(): string
     {
         return $this->data;
     }
 
     /**
      * Set the raw image data.
-     *
-     * @param string $data
      */
-    public function setData($data): void
+    public function setData(string $data): void
     {
         $this->data = $data;
     }
 
     /**
      * Set parent BSE.
-     *
-     * @param \PhpOffice\PhpSpreadsheet\Shared\Escher\DggContainer\BstoreContainer\BSE $parent
      */
-    public function setParent($parent): void
+    public function setParent(BSE $parent): void
     {
         $this->parent = $parent;
     }
 
     /**
      * Get parent BSE.
-     *
-     * @return \PhpOffice\PhpSpreadsheet\Shared\Escher\DggContainer\BstoreContainer\BSE $parent
      */
-    public function getParent()
+    public function getParent(): BSE
     {
         return $this->parent;
     }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/File.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/File.php
index 7991ed458b..022c1bb0d1 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/File.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/File.php
@@ -2,95 +2,99 @@
 
 namespace PhpOffice\PhpSpreadsheet\Shared;
 
-use InvalidArgumentException;
 use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Reader\Exception as ReaderException;
 use ZipArchive;
 
 class File
 {
     /**
      * Use Temp or File Upload Temp for temporary files.
-     *
-     * @var bool
      */
-    protected static $useUploadTempDirectory = false;
+    protected static bool $useUploadTempDirectory = false;
 
     /**
      * Set the flag indicating whether the File Upload Temp directory should be used for temporary files.
-     *
-     * @param bool $useUploadTempDir Use File Upload Temporary directory (true or false)
      */
-    public static function setUseUploadTempDirectory($useUploadTempDir): void
+    public static function setUseUploadTempDirectory(bool $useUploadTempDir): void
     {
         self::$useUploadTempDirectory = (bool) $useUploadTempDir;
     }
 
     /**
      * Get the flag indicating whether the File Upload Temp directory should be used for temporary files.
-     *
-     * @return bool Use File Upload Temporary directory (true or false)
      */
-    public static function getUseUploadTempDirectory()
+    public static function getUseUploadTempDirectory(): bool
     {
         return self::$useUploadTempDirectory;
     }
 
+    // https://pkware.cachefly.net/webdocs/casestudies/APPNOTE.TXT
+    // Section 4.3.7
+    // Looks like there might be endian-ness considerations
+    private const ZIP_FIRST_4 = [
+        "\x50\x4b\x03\x04", // what it looks like on my system
+        "\x04\x03\x4b\x50", // what it says in documentation
+    ];
+
+    private static function validateZipFirst4(string $zipFile): bool
+    {
+        $contents = @file_get_contents($zipFile, false, null, 0, 4);
+
+        return in_array($contents, self::ZIP_FIRST_4, true);
+    }
+
     /**
      * Verify if a file exists.
-     *
-     * @param string $pFilename Filename
-     *
-     * @return bool
      */
-    public static function fileExists($pFilename)
+    public static function fileExists(string $filename): bool
     {
         // Sick construction, but it seems that
         // file_exists returns strange values when
         // doing the original file_exists on ZIP archives...
-        if (strtolower(substr($pFilename, 0, 3)) == 'zip') {
+        if (strtolower(substr($filename, 0, 6)) == 'zip://') {
             // Open ZIP file and verify if the file exists
-            $zipFile = substr($pFilename, 6, strpos($pFilename, '#') - 6);
-            $archiveFile = substr($pFilename, strpos($pFilename, '#') + 1);
+            $zipFile = substr($filename, 6, strrpos($filename, '#') - 6);
+            $archiveFile = substr($filename, strrpos($filename, '#') + 1);
 
-            $zip = new ZipArchive();
-            if ($zip->open($zipFile) === true) {
-                $returnValue = ($zip->getFromName($archiveFile) !== false);
-                $zip->close();
+            if (self::validateZipFirst4($zipFile)) {
+                $zip = new ZipArchive();
+                $res = $zip->open($zipFile);
+                if ($res === true) {
+                    $returnValue = ($zip->getFromName($archiveFile) !== false);
+                    $zip->close();
 
-                return $returnValue;
+                    return $returnValue;
+                }
             }
 
             return false;
         }
 
-        return file_exists($pFilename);
+        return file_exists($filename);
     }
 
     /**
      * Returns canonicalized absolute pathname, also for ZIP archives.
-     *
-     * @param string $pFilename
-     *
-     * @return string
      */
-    public static function realpath($pFilename)
+    public static function realpath(string $filename): string
     {
         // Returnvalue
         $returnValue = '';
 
         // Try using realpath()
-        if (file_exists($pFilename)) {
-            $returnValue = realpath($pFilename);
+        if (file_exists($filename)) {
+            $returnValue = realpath($filename) ?: '';
         }
 
         // Found something?
-        if ($returnValue == '' || ($returnValue === null)) {
-            $pathArray = explode('/', $pFilename);
+        if ($returnValue === '') {
+            $pathArray = explode('/', $filename);
             while (in_array('..', $pathArray) && $pathArray[0] != '..') {
                 $iMax = count($pathArray);
-                for ($i = 0; $i < $iMax; ++$i) {
-                    if ($pathArray[$i] == '..' && $i > 0) {
-                        unset($pathArray[$i], $pathArray[$i - 1]);
+                for ($i = 1; $i < $iMax; ++$i) {
+                    if ($pathArray[$i] == '..') {
+                        array_splice($pathArray, $i - 1, 2);
 
                         break;
                     }
@@ -105,24 +109,23 @@ public static function realpath($pFilename)
 
     /**
      * Get the systems temporary directory.
-     *
-     * @return string
      */
-    public static function sysGetTempDir()
+    public static function sysGetTempDir(): string
     {
+        $path = sys_get_temp_dir();
         if (self::$useUploadTempDirectory) {
             //  use upload-directory when defined to allow running on environments having very restricted
             //      open_basedir configs
             if (ini_get('upload_tmp_dir') !== false) {
                 if ($temp = ini_get('upload_tmp_dir')) {
                     if (file_exists($temp)) {
-                        return realpath($temp);
+                        $path = $temp;
                     }
                 }
             }
         }
 
-        return realpath(sys_get_temp_dir());
+        return realpath($path) ?: '';
     }
 
     public static function temporaryFilename(): string
@@ -137,17 +140,56 @@ public static function temporaryFilename(): string
 
     /**
      * Assert that given path is an existing file and is readable, otherwise throw exception.
-     *
-     * @param string $filename
      */
-    public static function assertFile($filename): void
+    public static function assertFile(string $filename, string $zipMember = ''): void
     {
         if (!is_file($filename)) {
-            throw new InvalidArgumentException('File "' . $filename . '" does not exist.');
+            throw new ReaderException('File "' . $filename . '" does not exist.');
         }
 
         if (!is_readable($filename)) {
-            throw new InvalidArgumentException('Could not open "' . $filename . '" for reading.');
+            throw new ReaderException('Could not open "' . $filename . '" for reading.');
+        }
+
+        if ($zipMember !== '') {
+            $zipfile = "zip://$filename#$zipMember";
+            if (!self::fileExists($zipfile)) {
+                // Has the file been saved with Windoze directory separators rather than unix?
+                $zipfile = "zip://$filename#" . str_replace('/', '\\', $zipMember);
+                if (!self::fileExists($zipfile)) {
+                    throw new ReaderException("Could not find zip member $zipfile");
+                }
+            }
         }
     }
+
+    /**
+     * Same as assertFile, except return true/false and don't throw Exception.
+     */
+    public static function testFileNoThrow(string $filename, ?string $zipMember = null): bool
+    {
+        if (!is_file($filename)) {
+            return false;
+        }
+        if (!is_readable($filename)) {
+            return false;
+        }
+        if ($zipMember === null) {
+            return true;
+        }
+        // validate zip, but don't check specific member
+        if ($zipMember === '') {
+            return self::validateZipFirst4($filename);
+        }
+
+        $zipfile = "zip://$filename#$zipMember";
+        if (self::fileExists($zipfile)) {
+            return true;
+        }
+
+        // Has the file been saved with Windoze directory separators rather than unix?
+        $zipfile = "zip://$filename#" . str_replace('/', '\\', $zipMember);
+
+        return self::fileExists($zipfile);
+    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Font.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Font.php
index 00629e6977..8a1225b1cf 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Font.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Font.php
@@ -5,6 +5,9 @@
 use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
 use PhpOffice\PhpSpreadsheet\RichText\RichText;
 use PhpOffice\PhpSpreadsheet\Style\Alignment;
+use PhpOffice\PhpSpreadsheet\Style\Font as FontStyle;
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
 
 class Font
 {
@@ -12,7 +15,7 @@ class Font
     const AUTOSIZE_METHOD_APPROX = 'approx';
     const AUTOSIZE_METHOD_EXACT = 'exact';
 
-    private static $autoSizeMethods = [
+    private const AUTOSIZE_METHODS = [
         self::AUTOSIZE_METHOD_APPROX,
         self::AUTOSIZE_METHOD_EXACT,
     ];
@@ -45,10 +48,10 @@ class Font
     const ARIAL_ITALIC = 'ariali.ttf';
     const ARIAL_BOLD_ITALIC = 'arialbi.ttf';
 
-    const CALIBRI = 'CALIBRI.TTF';
-    const CALIBRI_BOLD = 'CALIBRIB.TTF';
-    const CALIBRI_ITALIC = 'CALIBRII.TTF';
-    const CALIBRI_BOLD_ITALIC = 'CALIBRIZ.TTF';
+    const CALIBRI = 'calibri.ttf';
+    const CALIBRI_BOLD = 'calibrib.ttf';
+    const CALIBRI_ITALIC = 'calibrii.ttf';
+    const CALIBRI_BOLD_ITALIC = 'calibriz.ttf';
 
     const COMIC_SANS_MS = 'comic.ttf';
     const COMIC_SANS_MS_BOLD = 'comicbd.ttf';
@@ -100,190 +103,337 @@ class Font
     const VERDANA_ITALIC = 'verdanai.ttf';
     const VERDANA_BOLD_ITALIC = 'verdanaz.ttf';
 
+    const FONT_FILE_NAMES = [
+        'Arial' => [
+            'x' => self::ARIAL,
+            'xb' => self::ARIAL_BOLD,
+            'xi' => self::ARIAL_ITALIC,
+            'xbi' => self::ARIAL_BOLD_ITALIC,
+        ],
+        'Calibri' => [
+            'x' => self::CALIBRI,
+            'xb' => self::CALIBRI_BOLD,
+            'xi' => self::CALIBRI_ITALIC,
+            'xbi' => self::CALIBRI_BOLD_ITALIC,
+        ],
+        'Comic Sans MS' => [
+            'x' => self::COMIC_SANS_MS,
+            'xb' => self::COMIC_SANS_MS_BOLD,
+            'xi' => self::COMIC_SANS_MS,
+            'xbi' => self::COMIC_SANS_MS_BOLD,
+        ],
+        'Courier New' => [
+            'x' => self::COURIER_NEW,
+            'xb' => self::COURIER_NEW_BOLD,
+            'xi' => self::COURIER_NEW_ITALIC,
+            'xbi' => self::COURIER_NEW_BOLD_ITALIC,
+        ],
+        'Georgia' => [
+            'x' => self::GEORGIA,
+            'xb' => self::GEORGIA_BOLD,
+            'xi' => self::GEORGIA_ITALIC,
+            'xbi' => self::GEORGIA_BOLD_ITALIC,
+        ],
+        'Impact' => [
+            'x' => self::IMPACT,
+            'xb' => self::IMPACT,
+            'xi' => self::IMPACT,
+            'xbi' => self::IMPACT,
+        ],
+        'Liberation Sans' => [
+            'x' => self::LIBERATION_SANS,
+            'xb' => self::LIBERATION_SANS_BOLD,
+            'xi' => self::LIBERATION_SANS_ITALIC,
+            'xbi' => self::LIBERATION_SANS_BOLD_ITALIC,
+        ],
+        'Lucida Console' => [
+            'x' => self::LUCIDA_CONSOLE,
+            'xb' => self::LUCIDA_CONSOLE,
+            'xi' => self::LUCIDA_CONSOLE,
+            'xbi' => self::LUCIDA_CONSOLE,
+        ],
+        'Lucida Sans Unicode' => [
+            'x' => self::LUCIDA_SANS_UNICODE,
+            'xb' => self::LUCIDA_SANS_UNICODE,
+            'xi' => self::LUCIDA_SANS_UNICODE,
+            'xbi' => self::LUCIDA_SANS_UNICODE,
+        ],
+        'Microsoft Sans Serif' => [
+            'x' => self::MICROSOFT_SANS_SERIF,
+            'xb' => self::MICROSOFT_SANS_SERIF,
+            'xi' => self::MICROSOFT_SANS_SERIF,
+            'xbi' => self::MICROSOFT_SANS_SERIF,
+        ],
+        'Palatino Linotype' => [
+            'x' => self::PALATINO_LINOTYPE,
+            'xb' => self::PALATINO_LINOTYPE_BOLD,
+            'xi' => self::PALATINO_LINOTYPE_ITALIC,
+            'xbi' => self::PALATINO_LINOTYPE_BOLD_ITALIC,
+        ],
+        'Symbol' => [
+            'x' => self::SYMBOL,
+            'xb' => self::SYMBOL,
+            'xi' => self::SYMBOL,
+            'xbi' => self::SYMBOL,
+        ],
+        'Tahoma' => [
+            'x' => self::TAHOMA,
+            'xb' => self::TAHOMA_BOLD,
+            'xi' => self::TAHOMA,
+            'xbi' => self::TAHOMA_BOLD,
+        ],
+        'Times New Roman' => [
+            'x' => self::TIMES_NEW_ROMAN,
+            'xb' => self::TIMES_NEW_ROMAN_BOLD,
+            'xi' => self::TIMES_NEW_ROMAN_ITALIC,
+            'xbi' => self::TIMES_NEW_ROMAN_BOLD_ITALIC,
+        ],
+        'Trebuchet MS' => [
+            'x' => self::TREBUCHET_MS,
+            'xb' => self::TREBUCHET_MS_BOLD,
+            'xi' => self::TREBUCHET_MS_ITALIC,
+            'xbi' => self::TREBUCHET_MS_BOLD_ITALIC,
+        ],
+        'Verdana' => [
+            'x' => self::VERDANA,
+            'xb' => self::VERDANA_BOLD,
+            'xi' => self::VERDANA_ITALIC,
+            'xbi' => self::VERDANA_BOLD_ITALIC,
+        ],
+    ];
+
     /**
-     * AutoSize method.
+     * Array that can be used to supplement FONT_FILE_NAMES for calculating exact width.
      *
-     * @var string
+     * @var array<string, array<string, string>>
+     */
+    private static array $extraFontArray = [];
+
+    /** @param array<string, array<string, string>> $extraFontArray */
+    public static function setExtraFontArray(array $extraFontArray): void
+    {
+        self::$extraFontArray = $extraFontArray;
+    }
+
+    /** @return array<string, array<string, string>> */
+    public static function getExtraFontArray(): array
+    {
+        return self::$extraFontArray;
+    }
+
+    /**
+     * AutoSize method.
      */
-    private static $autoSizeMethod = self::AUTOSIZE_METHOD_APPROX;
+    private static string $autoSizeMethod = self::AUTOSIZE_METHOD_APPROX;
 
     /**
      * Path to folder containing TrueType font .ttf files.
-     *
-     * @var string
      */
-    private static $trueTypeFontPath = null;
+    private static string $trueTypeFontPath = '';
 
     /**
      * How wide is a default column for a given default font and size?
      * Empirical data found by inspecting real Excel files and reading off the pixel width
      * in Microsoft Office Excel 2007.
-     *
-     * @var array
+     * Added height in points.
      */
-    public static $defaultColumnWidths = [
+    public const DEFAULT_COLUMN_WIDTHS = [
         'Arial' => [
-            1 => ['px' => 24, 'width' => 12.00000000],
-            2 => ['px' => 24, 'width' => 12.00000000],
-            3 => ['px' => 32, 'width' => 10.66406250],
-            4 => ['px' => 32, 'width' => 10.66406250],
-            5 => ['px' => 40, 'width' => 10.00000000],
-            6 => ['px' => 48, 'width' => 9.59765625],
-            7 => ['px' => 48, 'width' => 9.59765625],
-            8 => ['px' => 56, 'width' => 9.33203125],
-            9 => ['px' => 64, 'width' => 9.14062500],
-            10 => ['px' => 64, 'width' => 9.14062500],
+            1 => ['px' => 24, 'width' => 12.00000000, 'height' => 5.25],
+            2 => ['px' => 24, 'width' => 12.00000000, 'height' => 5.25],
+            3 => ['px' => 32, 'width' => 10.66406250, 'height' => 6.0],
+
+            4 => ['px' => 32, 'width' => 10.66406250, 'height' => 6.75],
+            5 => ['px' => 40, 'width' => 10.00000000, 'height' => 8.25],
+            6 => ['px' => 48, 'width' => 9.59765625, 'height' => 8.25],
+            7 => ['px' => 48, 'width' => 9.59765625, 'height' => 9.0],
+            8 => ['px' => 56, 'width' => 9.33203125, 'height' => 11.25],
+            9 => ['px' => 64, 'width' => 9.14062500, 'height' => 12.0],
+            10 => ['px' => 64, 'width' => 9.14062500, 'height' => 12.75],
         ],
         'Calibri' => [
-            1 => ['px' => 24, 'width' => 12.00000000],
-            2 => ['px' => 24, 'width' => 12.00000000],
-            3 => ['px' => 32, 'width' => 10.66406250],
-            4 => ['px' => 32, 'width' => 10.66406250],
-            5 => ['px' => 40, 'width' => 10.00000000],
-            6 => ['px' => 48, 'width' => 9.59765625],
-            7 => ['px' => 48, 'width' => 9.59765625],
-            8 => ['px' => 56, 'width' => 9.33203125],
-            9 => ['px' => 56, 'width' => 9.33203125],
-            10 => ['px' => 64, 'width' => 9.14062500],
-            11 => ['px' => 64, 'width' => 9.14062500],
+            1 => ['px' => 24, 'width' => 12.00000000, 'height' => 5.25],
+            2 => ['px' => 24, 'width' => 12.00000000, 'height' => 5.25],
+            3 => ['px' => 32, 'width' => 10.66406250, 'height' => 6.00],
+            4 => ['px' => 32, 'width' => 10.66406250, 'height' => 6.75],
+            5 => ['px' => 40, 'width' => 10.00000000, 'height' => 8.25],
+            6 => ['px' => 48, 'width' => 9.59765625, 'height' => 8.25],
+            7 => ['px' => 48, 'width' => 9.59765625, 'height' => 9.0],
+            8 => ['px' => 56, 'width' => 9.33203125, 'height' => 11.25],
+            9 => ['px' => 56, 'width' => 9.33203125, 'height' => 12.0],
+            10 => ['px' => 64, 'width' => 9.14062500, 'height' => 12.75],
+            11 => ['px' => 64, 'width' => 9.14062500, 'height' => 15.0],
         ],
         'Verdana' => [
-            1 => ['px' => 24, 'width' => 12.00000000],
-            2 => ['px' => 24, 'width' => 12.00000000],
-            3 => ['px' => 32, 'width' => 10.66406250],
-            4 => ['px' => 32, 'width' => 10.66406250],
-            5 => ['px' => 40, 'width' => 10.00000000],
-            6 => ['px' => 48, 'width' => 9.59765625],
-            7 => ['px' => 48, 'width' => 9.59765625],
-            8 => ['px' => 64, 'width' => 9.14062500],
-            9 => ['px' => 72, 'width' => 9.00000000],
-            10 => ['px' => 72, 'width' => 9.00000000],
+            1 => ['px' => 24, 'width' => 12.00000000, 'height' => 5.25],
+            2 => ['px' => 24, 'width' => 12.00000000, 'height' => 5.25],
+            3 => ['px' => 32, 'width' => 10.66406250, 'height' => 6.0],
+            4 => ['px' => 32, 'width' => 10.66406250, 'height' => 6.75],
+            5 => ['px' => 40, 'width' => 10.00000000, 'height' => 8.25],
+            6 => ['px' => 48, 'width' => 9.59765625, 'height' => 8.25],
+            7 => ['px' => 48, 'width' => 9.59765625, 'height' => 9.0],
+            8 => ['px' => 64, 'width' => 9.14062500, 'height' => 10.5],
+            9 => ['px' => 72, 'width' => 9.00000000, 'height' => 11.25],
+            10 => ['px' => 72, 'width' => 9.00000000, 'height' => 12.75],
         ],
     ];
 
     /**
      * Set autoSize method.
      *
-     * @param string $pValue see self::AUTOSIZE_METHOD_*
+     * @param string $method see self::AUTOSIZE_METHOD_*
      *
      * @return bool Success or failure
      */
-    public static function setAutoSizeMethod($pValue)
+    public static function setAutoSizeMethod(string $method): bool
     {
-        if (!in_array($pValue, self::$autoSizeMethods)) {
+        if (!in_array($method, self::AUTOSIZE_METHODS)) {
             return false;
         }
-        self::$autoSizeMethod = $pValue;
+        self::$autoSizeMethod = $method;
 
         return true;
     }
 
     /**
      * Get autoSize method.
-     *
-     * @return string
      */
-    public static function getAutoSizeMethod()
+    public static function getAutoSizeMethod(): string
     {
         return self::$autoSizeMethod;
     }
 
     /**
      * Set the path to the folder containing .ttf files. There should be a trailing slash.
-     * Typical locations on variout some platforms:
+     * Path will be recursively searched for font file.
+     * Typical locations on various platforms:
      *    <ul>
      *        <li>C:/Windows/Fonts/</li>
      *        <li>/usr/share/fonts/truetype/</li>
      *        <li>~/.fonts/</li>
      * </ul>.
-     *
-     * @param string $pValue
      */
-    public static function setTrueTypeFontPath($pValue): void
+    public static function setTrueTypeFontPath(string $folderPath): void
     {
-        self::$trueTypeFontPath = $pValue;
+        self::$trueTypeFontPath = $folderPath;
     }
 
     /**
      * Get the path to the folder containing .ttf files.
-     *
-     * @return string
      */
-    public static function getTrueTypeFontPath()
+    public static function getTrueTypeFontPath(): string
     {
         return self::$trueTypeFontPath;
     }
 
+    /**
+     * Pad amount for exact in pixels; use best guess if null.
+     */
+    private static null|float|int $paddingAmountExact = null;
+
+    /**
+     * Set pad amount for exact in pixels; use best guess if null.
+     */
+    public static function setPaddingAmountExact(null|float|int $paddingAmountExact): void
+    {
+        self::$paddingAmountExact = $paddingAmountExact;
+    }
+
+    /**
+     * Get pad amount for exact in pixels; or null if using best guess.
+     */
+    public static function getPaddingAmountExact(): null|float|int
+    {
+        return self::$paddingAmountExact;
+    }
+
     /**
      * Calculate an (approximate) OpenXML column width, based on font size and text contained.
      *
-     * @param \PhpOffice\PhpSpreadsheet\Style\Font $font Font object
-     * @param RichText|string $cellText Text to calculate width
+     * @param FontStyle $font Font object
+     * @param null|RichText|string $cellText Text to calculate width
      * @param int $rotation Rotation angle
-     * @param null|\PhpOffice\PhpSpreadsheet\Style\Font $defaultFont Font object
-     *
-     * @return int Column width
+     * @param null|FontStyle $defaultFont Font object
+     * @param bool $filterAdjustment Add space for Autofilter or Table dropdown
      */
-    public static function calculateColumnWidth(\PhpOffice\PhpSpreadsheet\Style\Font $font, $cellText = '', $rotation = 0, ?\PhpOffice\PhpSpreadsheet\Style\Font $defaultFont = null)
-    {
+    public static function calculateColumnWidth(
+        FontStyle $font,
+        $cellText = '',
+        int $rotation = 0,
+        ?FontStyle $defaultFont = null,
+        bool $filterAdjustment = false,
+        int $indentAdjustment = 0
+    ): float {
         // If it is rich text, use plain text
         if ($cellText instanceof RichText) {
             $cellText = $cellText->getPlainText();
         }
 
         // Special case if there are one or more newline characters ("\n")
-        if (strpos($cellText ?? '', "\n") !== false) {
+        $cellText = (string) $cellText;
+        if (str_contains($cellText, "\n")) {
             $lineTexts = explode("\n", $cellText);
             $lineWidths = [];
             foreach ($lineTexts as $lineText) {
-                $lineWidths[] = self::calculateColumnWidth($font, $lineText, $rotation = 0, $defaultFont);
+                $lineWidths[] = self::calculateColumnWidth($font, $lineText, $rotation = 0, $defaultFont, $filterAdjustment);
             }
 
             return max($lineWidths); // width of longest line in cell
         }
 
         // Try to get the exact text width in pixels
-        $approximate = self::$autoSizeMethod == self::AUTOSIZE_METHOD_APPROX;
+        $approximate = self::$autoSizeMethod === self::AUTOSIZE_METHOD_APPROX;
         $columnWidth = 0;
         if (!$approximate) {
-            $columnWidthAdjust = ceil(self::getTextWidthPixelsExact('n', $font, 0) * 1.07);
-
             try {
+                $columnWidthAdjust = ceil(
+                    self::getTextWidthPixelsExact(
+                        str_repeat('n', 1 * (($filterAdjustment ? 3 : 1) + ($indentAdjustment * 2))),
+                        $font,
+                        0
+                    ) * 1.07
+                );
+
                 // Width of text in pixels excl. padding
                 // and addition because Excel adds some padding, just use approx width of 'n' glyph
-                $columnWidth = self::getTextWidthPixelsExact($cellText, $font, $rotation) + $columnWidthAdjust;
-            } catch (PhpSpreadsheetException $e) {
+                $columnWidth = self::getTextWidthPixelsExact($cellText, $font, $rotation) + (self::$paddingAmountExact ?? $columnWidthAdjust);
+            } catch (PhpSpreadsheetException) {
                 $approximate = true;
             }
         }
 
         if ($approximate) {
-            $columnWidthAdjust = self::getTextWidthPixelsApprox('n', $font, 0);
+            $columnWidthAdjust = self::getTextWidthPixelsApprox(
+                str_repeat('n', 1 * (($filterAdjustment ? 3 : 1) + ($indentAdjustment * 2))),
+                $font,
+                0
+            );
             // Width of text in pixels excl. padding, approximation
             // and addition because Excel adds some padding, just use approx width of 'n' glyph
             $columnWidth = self::getTextWidthPixelsApprox($cellText, $font, $rotation) + $columnWidthAdjust;
         }
 
         // Convert from pixel width to column width
-        $columnWidth = Drawing::pixelsToCellDimension($columnWidth, $defaultFont);
+        $columnWidth = Drawing::pixelsToCellDimension((int) $columnWidth, $defaultFont ?? new FontStyle());
 
         // Return
-        return (int) round($columnWidth, 6);
+        return round($columnWidth, 4);
     }
 
     /**
      * Get GD text width in pixels for a string of text in a certain font at a certain rotation angle.
      */
-    public static function getTextWidthPixelsExact(string $text, \PhpOffice\PhpSpreadsheet\Style\Font $font, int $rotation = 0): int
+    public static function getTextWidthPixelsExact(string $text, FontStyle $font, int $rotation = 0): float
     {
-        if (!function_exists('imagettfbbox')) {
-            throw new PhpSpreadsheetException('GD library needs to be enabled');
-        }
-
         // font size should really be supplied in pixels in GD2,
         // but since GD2 seems to assume 72dpi, pixels and points are the same
         $fontFile = self::getTrueTypeFontFileFromFont($font);
-        $textBox = imagettfbbox($font->getSize(), $rotation, $fontFile, $text);
+        $textBox = imagettfbbox($font->getSize() ?? 10.0, $rotation, $fontFile, $text);
+        if ($textBox === false) {
+            // @codeCoverageIgnoreStart
+            throw new PhpSpreadsheetException('imagettfbbox failed');
+            // @codeCoverageIgnoreEnd
+        }
 
         // Get corners positions
         $lowerLeftCornerX = $textBox[0];
@@ -292,45 +442,39 @@ public static function getTextWidthPixelsExact(string $text, \PhpOffice\PhpSprea
         $upperLeftCornerX = $textBox[6];
 
         // Consider the rotation when calculating the width
-        return max($lowerRightCornerX - $upperLeftCornerX, $upperRightCornerX - $lowerLeftCornerX);
+        return round(max($lowerRightCornerX - $upperLeftCornerX, $upperRightCornerX - $lowerLeftCornerX), 4);
     }
 
     /**
      * Get approximate width in pixels for a string of text in a certain font at a certain rotation angle.
      *
-     * @param string $columnText
-     * @param int $rotation
-     *
      * @return int Text width in pixels (no padding added)
      */
-    public static function getTextWidthPixelsApprox($columnText, \PhpOffice\PhpSpreadsheet\Style\Font $font, $rotation = 0)
+    public static function getTextWidthPixelsApprox(string $columnText, FontStyle $font, int $rotation = 0): int
     {
         $fontName = $font->getName();
         $fontSize = $font->getSize();
 
-        // Calculate column width in pixels. We assume fixed glyph width. Result varies with font name and size.
+        // Calculate column width in pixels.
+        // We assume fixed glyph width, but count double for "fullwidth" characters.
+        // Result varies with font name and size.
         switch ($fontName) {
-            case 'Calibri':
-                // value 8.26 was found via interpolation by inspecting real Excel files with Calibri 11 font.
-                $columnWidth = (int) (8.26 * StringHelper::countCharacters($columnText));
-                $columnWidth = $columnWidth * $fontSize / 11; // extrapolate from font size
-
-                break;
             case 'Arial':
                 // value 8 was set because of experience in different exports at Arial 10 font.
-                $columnWidth = (int) (8 * StringHelper::countCharacters($columnText));
+                $columnWidth = (int) (8 * StringHelper::countCharactersDbcs($columnText));
                 $columnWidth = $columnWidth * $fontSize / 10; // extrapolate from font size
 
                 break;
             case 'Verdana':
                 // value 8 was found via interpolation by inspecting real Excel files with Verdana 10 font.
-                $columnWidth = (int) (8 * StringHelper::countCharacters($columnText));
+                $columnWidth = (int) (8 * StringHelper::countCharactersDbcs($columnText));
                 $columnWidth = $columnWidth * $fontSize / 10; // extrapolate from font size
 
                 break;
             default:
                 // just assume Calibri
-                $columnWidth = (int) (8.26 * StringHelper::countCharacters($columnText));
+                // value 8.26 was found via interpolation by inspecting real Excel files with Calibri 11 font.
+                $columnWidth = (int) (8.26 * StringHelper::countCharactersDbcs($columnText));
                 $columnWidth = $columnWidth * $fontSize / 11; // extrapolate from font size
 
                 break;
@@ -344,7 +488,7 @@ public static function getTextWidthPixelsApprox($columnText, \PhpOffice\PhpSprea
             } else {
                 // rotated text
                 $columnWidth = $columnWidth * cos(deg2rad($rotation))
-                    + $fontSize * abs(sin(deg2rad($rotation))) / 5; // approximation
+                                + $fontSize * abs(sin(deg2rad($rotation))) / 5; // approximation
             }
         }
 
@@ -355,11 +499,11 @@ public static function getTextWidthPixelsApprox($columnText, \PhpOffice\PhpSprea
     /**
      * Calculate an (approximate) pixel size, based on a font points size.
      *
-     * @param int $fontSizeInPoints Font size (in points)
+     * @param float|int $fontSizeInPoints Font size (in points)
      *
      * @return int Font size (in pixels)
      */
-    public static function fontSizeToPixels($fontSizeInPoints)
+    public static function fontSizeToPixels(float|int $fontSizeInPoints): int
     {
         return (int) ((4 / 3) * $fontSizeInPoints);
     }
@@ -367,11 +511,11 @@ public static function fontSizeToPixels($fontSizeInPoints)
     /**
      * Calculate an (approximate) pixel size, based on inch size.
      *
-     * @param int $sizeInInch Font size (in inch)
+     * @param float|int $sizeInInch Font size (in inch)
      *
-     * @return int Size (in pixels)
+     * @return float|int Size (in pixels)
      */
-    public static function inchSizeToPixels($sizeInInch)
+    public static function inchSizeToPixels(int|float $sizeInInch): int|float
     {
         return $sizeInInch * 96;
     }
@@ -379,11 +523,11 @@ public static function inchSizeToPixels($sizeInInch)
     /**
      * Calculate an (approximate) pixel size, based on centimeter size.
      *
-     * @param int $sizeInCm Font size (in centimeters)
+     * @param float|int $sizeInCm Font size (in centimeters)
      *
      * @return float Size (in pixels)
      */
-    public static function centimeterSizeToPixels($sizeInCm)
+    public static function centimeterSizeToPixels(int|float $sizeInCm): float
     {
         return $sizeInCm * 37.795275591;
     }
@@ -391,183 +535,116 @@ public static function centimeterSizeToPixels($sizeInCm)
     /**
      * Returns the font path given the font.
      *
-     * @param \PhpOffice\PhpSpreadsheet\Style\Font $font
-     *
      * @return string Path to TrueType font file
      */
-    public static function getTrueTypeFontFileFromFont($font)
+    public static function getTrueTypeFontFileFromFont(FontStyle $font, bool $checkPath = true): string
     {
-        if (!file_exists(self::$trueTypeFontPath) || !is_dir(self::$trueTypeFontPath)) {
+        if ($checkPath && (!file_exists(self::$trueTypeFontPath) || !is_dir(self::$trueTypeFontPath))) {
             throw new PhpSpreadsheetException('Valid directory to TrueType Font files not specified');
         }
 
         $name = $font->getName();
+        $fontArray = array_merge(self::FONT_FILE_NAMES, self::$extraFontArray);
+        if (!isset($fontArray[$name])) {
+            throw new PhpSpreadsheetException('Unknown font name "' . $name . '". Cannot map to TrueType font file');
+        }
         $bold = $font->getBold();
         $italic = $font->getItalic();
-
-        // Check if we can map font to true type font file
-        switch ($name) {
-            case 'Arial':
-                $fontFile = (
-                $bold ? ($italic ? self::ARIAL_BOLD_ITALIC : self::ARIAL_BOLD)
-                    : ($italic ? self::ARIAL_ITALIC : self::ARIAL)
-                );
-
-                break;
-            case 'Calibri':
-                $fontFile = (
-                $bold ? ($italic ? self::CALIBRI_BOLD_ITALIC : self::CALIBRI_BOLD)
-                    : ($italic ? self::CALIBRI_ITALIC : self::CALIBRI)
-                );
-
-                break;
-            case 'Courier New':
-                $fontFile = (
-                $bold ? ($italic ? self::COURIER_NEW_BOLD_ITALIC : self::COURIER_NEW_BOLD)
-                    : ($italic ? self::COURIER_NEW_ITALIC : self::COURIER_NEW)
-                );
-
-                break;
-            case 'Comic Sans MS':
-                $fontFile = (
-                $bold ? self::COMIC_SANS_MS_BOLD : self::COMIC_SANS_MS
-                );
-
-                break;
-            case 'Georgia':
-                $fontFile = (
-                $bold ? ($italic ? self::GEORGIA_BOLD_ITALIC : self::GEORGIA_BOLD)
-                    : ($italic ? self::GEORGIA_ITALIC : self::GEORGIA)
-                );
-
-                break;
-            case 'Impact':
-                $fontFile = self::IMPACT;
-
-                break;
-            case 'Liberation Sans':
-                $fontFile = (
-                $bold ? ($italic ? self::LIBERATION_SANS_BOLD_ITALIC : self::LIBERATION_SANS_BOLD)
-                    : ($italic ? self::LIBERATION_SANS_ITALIC : self::LIBERATION_SANS)
-                );
-
-                break;
-            case 'Lucida Console':
-                $fontFile = self::LUCIDA_CONSOLE;
-
-                break;
-            case 'Lucida Sans Unicode':
-                $fontFile = self::LUCIDA_SANS_UNICODE;
-
-                break;
-            case 'Microsoft Sans Serif':
-                $fontFile = self::MICROSOFT_SANS_SERIF;
-
-                break;
-            case 'Palatino Linotype':
-                $fontFile = (
-                $bold ? ($italic ? self::PALATINO_LINOTYPE_BOLD_ITALIC : self::PALATINO_LINOTYPE_BOLD)
-                    : ($italic ? self::PALATINO_LINOTYPE_ITALIC : self::PALATINO_LINOTYPE)
-                );
-
-                break;
-            case 'Symbol':
-                $fontFile = self::SYMBOL;
-
-                break;
-            case 'Tahoma':
-                $fontFile = (
-                $bold ? self::TAHOMA_BOLD : self::TAHOMA
-                );
-
-                break;
-            case 'Times New Roman':
-                $fontFile = (
-                $bold ? ($italic ? self::TIMES_NEW_ROMAN_BOLD_ITALIC : self::TIMES_NEW_ROMAN_BOLD)
-                    : ($italic ? self::TIMES_NEW_ROMAN_ITALIC : self::TIMES_NEW_ROMAN)
-                );
-
-                break;
-            case 'Trebuchet MS':
-                $fontFile = (
-                $bold ? ($italic ? self::TREBUCHET_MS_BOLD_ITALIC : self::TREBUCHET_MS_BOLD)
-                    : ($italic ? self::TREBUCHET_MS_ITALIC : self::TREBUCHET_MS)
-                );
-
-                break;
-            case 'Verdana':
-                $fontFile = (
-                $bold ? ($italic ? self::VERDANA_BOLD_ITALIC : self::VERDANA_BOLD)
-                    : ($italic ? self::VERDANA_ITALIC : self::VERDANA)
-                );
-
-                break;
-            default:
-                throw new PhpSpreadsheetException('Unknown font name "' . $name . '". Cannot map to TrueType font file');
-
-                break;
+        $index = 'x';
+        if ($bold) {
+            $index .= 'b';
+        }
+        if ($italic) {
+            $index .= 'i';
         }
+        $fontFile = $fontArray[$name][$index];
 
-        $fontFile = self::$trueTypeFontPath . $fontFile;
+        $separator = '';
+        if (mb_strlen(self::$trueTypeFontPath) > 1 && mb_substr(self::$trueTypeFontPath, -1) !== '/' && mb_substr(self::$trueTypeFontPath, -1) !== '\\') {
+            $separator = DIRECTORY_SEPARATOR;
+        }
+        $fontFileAbsolute = preg_match('~^([A-Za-z]:)?[/\\\\]~', $fontFile) === 1;
+        if (!$fontFileAbsolute) {
+            $fontFile = self::findFontFile(self::$trueTypeFontPath, $fontFile) ?? self::$trueTypeFontPath . $separator . $fontFile;
+        }
 
         // Check if file actually exists
-        if (!file_exists($fontFile)) {
-            throw new PhpSpreadsheetException('TrueType Font file not found');
+        if ($checkPath && !file_exists($fontFile) && !$fontFileAbsolute) {
+            $alternateName = $name;
+            if ($index !== 'x' && $fontArray[$name][$index] !== $fontArray[$name]['x']) {
+                // Bold but no italic:
+                //   Comic Sans
+                //   Tahoma
+                // Neither bold nor italic:
+                //   Impact
+                //   Lucida Console
+                //   Lucida Sans Unicode
+                //   Microsoft Sans Serif
+                //   Symbol
+                if ($index === 'xb') {
+                    $alternateName .= ' Bold';
+                } elseif ($index === 'xi') {
+                    $alternateName .= ' Italic';
+                } elseif ($fontArray[$name]['xb'] === $fontArray[$name]['xbi']) {
+                    $alternateName .= ' Bold';
+                } else {
+                    $alternateName .= ' Bold Italic';
+                }
+            }
+            $fontFile = self::$trueTypeFontPath . $separator . $alternateName . '.ttf';
+            if (!file_exists($fontFile)) {
+                throw new PhpSpreadsheetException('TrueType Font file not found');
+            }
         }
 
         return $fontFile;
     }
 
+    public const CHARSET_FROM_FONT_NAME = [
+        'EucrosiaUPC' => self::CHARSET_ANSI_THAI,
+        'Wingdings' => self::CHARSET_SYMBOL,
+        'Wingdings 2' => self::CHARSET_SYMBOL,
+        'Wingdings 3' => self::CHARSET_SYMBOL,
+    ];
+
     /**
      * Returns the associated charset for the font name.
      *
-     * @param string $name Font name
+     * @param string $fontName Font name
      *
      * @return int Character set code
      */
-    public static function getCharsetFromFontName($name)
+    public static function getCharsetFromFontName(string $fontName): int
     {
-        switch ($name) {
-            // Add more cases. Check FONT records in real Excel files.
-            case 'EucrosiaUPC':
-                return self::CHARSET_ANSI_THAI;
-            case 'Wingdings':
-                return self::CHARSET_SYMBOL;
-            case 'Wingdings 2':
-                return self::CHARSET_SYMBOL;
-            case 'Wingdings 3':
-                return self::CHARSET_SYMBOL;
-            default:
-                return self::CHARSET_ANSI_LATIN;
-        }
+        return self::CHARSET_FROM_FONT_NAME[$fontName] ?? self::CHARSET_ANSI_LATIN;
     }
 
     /**
      * Get the effective column width for columns without a column dimension or column with width -1
      * For example, for Calibri 11 this is 9.140625 (64 px).
      *
-     * @param \PhpOffice\PhpSpreadsheet\Style\Font $font The workbooks default font
-     * @param bool $pPixels true = return column width in pixels, false = return in OOXML units
+     * @param FontStyle $font The workbooks default font
+     * @param bool $returnAsPixels true = return column width in pixels, false = return in OOXML units
      *
-     * @return mixed Column width
+     * @return ($returnAsPixels is true ? int : float) Column width
      */
-    public static function getDefaultColumnWidthByFont(\PhpOffice\PhpSpreadsheet\Style\Font $font, $pPixels = false)
+    public static function getDefaultColumnWidthByFont(FontStyle $font, bool $returnAsPixels = false): float|int
     {
-        if (isset(self::$defaultColumnWidths[$font->getName()][$font->getSize()])) {
+        if (isset(self::DEFAULT_COLUMN_WIDTHS[$font->getName()][$font->getSize()])) {
             // Exact width can be determined
-            $columnWidth = $pPixels ?
-                self::$defaultColumnWidths[$font->getName()][$font->getSize()]['px']
-                : self::$defaultColumnWidths[$font->getName()][$font->getSize()]['width'];
+            $columnWidth = $returnAsPixels
+                ? self::DEFAULT_COLUMN_WIDTHS[$font->getName()][$font->getSize()]['px']
+                    : self::DEFAULT_COLUMN_WIDTHS[$font->getName()][$font->getSize()]['width'];
         } else {
             // We don't have data for this particular font and size, use approximation by
             // extrapolating from Calibri 11
-            $columnWidth = $pPixels ?
-                self::$defaultColumnWidths['Calibri'][11]['px']
-                : self::$defaultColumnWidths['Calibri'][11]['width'];
+            $columnWidth = $returnAsPixels
+                ? self::DEFAULT_COLUMN_WIDTHS['Calibri'][11]['px']
+                    : self::DEFAULT_COLUMN_WIDTHS['Calibri'][11]['width'];
             $columnWidth = $columnWidth * $font->getSize() / 11;
 
             // Round pixels to closest integer
-            if ($pPixels) {
+            if ($returnAsPixels) {
                 $columnWidth = (int) round($columnWidth);
             }
         }
@@ -579,181 +656,63 @@ public static function getDefaultColumnWidthByFont(\PhpOffice\PhpSpreadsheet\Sty
      * Get the effective row height for rows without a row dimension or rows with height -1
      * For example, for Calibri 11 this is 15 points.
      *
-     * @param \PhpOffice\PhpSpreadsheet\Style\Font $font The workbooks default font
+     * @param FontStyle $font The workbooks default font
      *
      * @return float Row height in points
      */
-    public static function getDefaultRowHeightByFont(\PhpOffice\PhpSpreadsheet\Style\Font $font)
+    public static function getDefaultRowHeightByFont(FontStyle $font): float
     {
-        switch ($font->getName()) {
-            case 'Arial':
-                switch ($font->getSize()) {
-                    case 10:
-                        // inspection of Arial 10 workbook says 12.75pt ~17px
-                        $rowHeight = 12.75;
-
-                        break;
-                    case 9:
-                        // inspection of Arial 9 workbook says 12.00pt ~16px
-                        $rowHeight = 12;
-
-                        break;
-                    case 8:
-                        // inspection of Arial 8 workbook says 11.25pt ~15px
-                        $rowHeight = 11.25;
-
-                        break;
-                    case 7:
-                        // inspection of Arial 7 workbook says 9.00pt ~12px
-                        $rowHeight = 9;
-
-                        break;
-                    case 6:
-                    case 5:
-                        // inspection of Arial 5,6 workbook says 8.25pt ~11px
-                        $rowHeight = 8.25;
-
-                        break;
-                    case 4:
-                        // inspection of Arial 4 workbook says 6.75pt ~9px
-                        $rowHeight = 6.75;
-
-                        break;
-                    case 3:
-                        // inspection of Arial 3 workbook says 6.00pt ~8px
-                        $rowHeight = 6;
-
-                        break;
-                    case 2:
-                    case 1:
-                        // inspection of Arial 1,2 workbook says 5.25pt ~7px
-                        $rowHeight = 5.25;
-
-                        break;
-                    default:
-                        // use Arial 10 workbook as an approximation, extrapolation
-                        $rowHeight = 12.75 * $font->getSize() / 10;
-
-                        break;
-                }
+        $name = $font->getName();
+        $size = $font->getSize();
+        if (isset(self::DEFAULT_COLUMN_WIDTHS[$name][$size])) {
+            $rowHeight = self::DEFAULT_COLUMN_WIDTHS[$name][$size]['height'];
+        } elseif ($name === 'Arial' || $name === 'Verdana') {
+            $rowHeight = self::DEFAULT_COLUMN_WIDTHS[$name][10]['height'] * $size / 10.0;
+        } else {
+            $rowHeight = self::DEFAULT_COLUMN_WIDTHS['Calibri'][11]['height'] * $size / 11.0;
+        }
 
-                break;
-            case 'Calibri':
-                switch ($font->getSize()) {
-                    case 11:
-                        // inspection of Calibri 11 workbook says 15.00pt ~20px
-                        $rowHeight = 15;
-
-                        break;
-                    case 10:
-                        // inspection of Calibri 10 workbook says 12.75pt ~17px
-                        $rowHeight = 12.75;
-
-                        break;
-                    case 9:
-                        // inspection of Calibri 9 workbook says 12.00pt ~16px
-                        $rowHeight = 12;
-
-                        break;
-                    case 8:
-                        // inspection of Calibri 8 workbook says 11.25pt ~15px
-                        $rowHeight = 11.25;
-
-                        break;
-                    case 7:
-                        // inspection of Calibri 7 workbook says 9.00pt ~12px
-                        $rowHeight = 9;
-
-                        break;
-                    case 6:
-                    case 5:
-                        // inspection of Calibri 5,6 workbook says 8.25pt ~11px
-                        $rowHeight = 8.25;
-
-                        break;
-                    case 4:
-                        // inspection of Calibri 4 workbook says 6.75pt ~9px
-                        $rowHeight = 6.75;
-
-                        break;
-                    case 3:
-                        // inspection of Calibri 3 workbook says 6.00pt ~8px
-                        $rowHeight = 6.00;
-
-                        break;
-                    case 2:
-                    case 1:
-                        // inspection of Calibri 1,2 workbook says 5.25pt ~7px
-                        $rowHeight = 5.25;
-
-                        break;
-                    default:
-                        // use Calibri 11 workbook as an approximation, extrapolation
-                        $rowHeight = 15 * $font->getSize() / 11;
-
-                        break;
-                }
+        return $rowHeight;
+    }
 
-                break;
-            case 'Verdana':
-                switch ($font->getSize()) {
-                    case 10:
-                        // inspection of Verdana 10 workbook says 12.75pt ~17px
-                        $rowHeight = 12.75;
-
-                        break;
-                    case 9:
-                        // inspection of Verdana 9 workbook says 11.25pt ~15px
-                        $rowHeight = 11.25;
-
-                        break;
-                    case 8:
-                        // inspection of Verdana 8 workbook says 10.50pt ~14px
-                        $rowHeight = 10.50;
-
-                        break;
-                    case 7:
-                        // inspection of Verdana 7 workbook says 9.00pt ~12px
-                        $rowHeight = 9.00;
-
-                        break;
-                    case 6:
-                    case 5:
-                        // inspection of Verdana 5,6 workbook says 8.25pt ~11px
-                        $rowHeight = 8.25;
-
-                        break;
-                    case 4:
-                        // inspection of Verdana 4 workbook says 6.75pt ~9px
-                        $rowHeight = 6.75;
-
-                        break;
-                    case 3:
-                        // inspection of Verdana 3 workbook says 6.00pt ~8px
-                        $rowHeight = 6;
-
-                        break;
-                    case 2:
-                    case 1:
-                        // inspection of Verdana 1,2 workbook says 5.25pt ~7px
-                        $rowHeight = 5.25;
-
-                        break;
-                    default:
-                        // use Verdana 10 workbook as an approximation, extrapolation
-                        $rowHeight = 12.75 * $font->getSize() / 10;
-
-                        break;
+    private static function findFontFile(string $startDirectory, string $desiredFont): ?string
+    {
+        $fontPath = null;
+        if ($startDirectory === '') {
+            return null;
+        }
+        if (file_exists("$startDirectory/$desiredFont")) {
+            $fontPath = "$startDirectory/$desiredFont";
+        } else {
+            $iterations = 0;
+            $it = new RecursiveDirectoryIterator(
+                $startDirectory,
+                RecursiveDirectoryIterator::SKIP_DOTS
+                | RecursiveDirectoryIterator::FOLLOW_SYMLINKS
+            );
+            foreach (
+                new RecursiveIteratorIterator(
+                    $it,
+                    RecursiveIteratorIterator::LEAVES_ONLY,
+                    RecursiveIteratorIterator::CATCH_GET_CHILD
+                ) as $filex
+            ) {
+                /** @var string */
+                $file = $filex;
+                if (basename($file) === $desiredFont) {
+                    $fontPath = $file;
+
+                    break;
                 }
-
-                break;
-            default:
-                // just use Calibri as an approximation
-                $rowHeight = 15 * $font->getSize() / 11;
-
-                break;
+                ++$iterations;
+                if ($iterations > 5000) {
+                    // @codeCoverageIgnoreStart
+                    break;
+                    // @codeCoverageIgnoreEnd
+                }
+            }
         }
 
-        return $rowHeight;
+        return $fontPath;
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/IntOrFloat.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/IntOrFloat.php
index 060f09c883..2e20c9c301 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/IntOrFloat.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/IntOrFloat.php
@@ -7,12 +7,8 @@ class IntOrFloat
     /**
      * Help some functions with large results operate correctly on 32-bit,
      * by returning result as int when possible, float otherwise.
-     *
-     * @param float|int $value
-     *
-     * @return float|int
      */
-    public static function evaluate($value)
+    public static function evaluate(float|int $value): float|int
     {
         $iValue = (int) $value;
 
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/CHANGELOG.TXT b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/CHANGELOG.TXT
deleted file mode 100644
index 1c18a5da35..0000000000
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/CHANGELOG.TXT
+++ /dev/null
@@ -1,16 +0,0 @@
-Mar 1, 2005 11:15 AST by PM
-
-+ For consistency, renamed Math.php to Maths.java, utils to util, 
-  tests to test, docs to doc - 
-
-+ Removed conditional logic from top of Matrix class.
-
-+ Switched to using hypo function in Maths.php for all php-hypot calls.
-  NOTE TO SELF: Need to make sure that all decompositions have been 
-  switched over to using the bundled hypo.
-
-Feb 25, 2005 at 10:00 AST by PM
-
-+ Recommend using simpler Error.php instead of JAMA_Error.php but 
-  can be persuaded otherwise.
-
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/CholeskyDecomposition.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/CholeskyDecomposition.php
deleted file mode 100644
index 27d021768c..0000000000
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/CholeskyDecomposition.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-
-namespace PhpOffice\PhpSpreadsheet\Shared\JAMA;
-
-use PhpOffice\PhpSpreadsheet\Calculation\Exception as CalculationException;
-
-/**
- *    Cholesky decomposition class.
- *
- *    For a symmetric, positive definite matrix A, the Cholesky decomposition
- *    is an lower triangular matrix L so that A = L*L'.
- *
- *    If the matrix is not symmetric or positive definite, the constructor
- *    returns a partial decomposition and sets an internal flag that may
- *    be queried by the isSPD() method.
- *
- *    @author Paul Meagher
- *    @author Michael Bommarito
- *
- *    @version 1.2
- */
-class CholeskyDecomposition
-{
-    /**
-     * Decomposition storage.
-     *
-     * @var array
-     */
-    private $L = [];
-
-    /**
-     * Matrix row and column dimension.
-     *
-     * @var int
-     */
-    private $m;
-
-    /**
-     * Symmetric positive definite flag.
-     *
-     * @var bool
-     */
-    private $isspd = true;
-
-    /**
-     * CholeskyDecomposition.
-     *
-     *    Class constructor - decomposes symmetric positive definite matrix
-     *
-     * @param Matrix $A Matrix square symmetric positive definite matrix
-     */
-    public function __construct(Matrix $A)
-    {
-        $this->L = $A->getArray();
-        $this->m = $A->getRowDimension();
-
-        for ($i = 0; $i < $this->m; ++$i) {
-            for ($j = $i; $j < $this->m; ++$j) {
-                for ($sum = $this->L[$i][$j], $k = $i - 1; $k >= 0; --$k) {
-                    $sum -= $this->L[$i][$k] * $this->L[$j][$k];
-                }
-                if ($i == $j) {
-                    if ($sum >= 0) {
-                        $this->L[$i][$i] = sqrt($sum);
-                    } else {
-                        $this->isspd = false;
-                    }
-                } else {
-                    if ($this->L[$i][$i] != 0) {
-                        $this->L[$j][$i] = $sum / $this->L[$i][$i];
-                    }
-                }
-            }
-
-            for ($k = $i + 1; $k < $this->m; ++$k) {
-                $this->L[$i][$k] = 0.0;
-            }
-        }
-    }
-
-    /**
-     *    Is the matrix symmetric and positive definite?
-     *
-     * @return bool
-     */
-    public function isSPD()
-    {
-        return $this->isspd;
-    }
-
-    /**
-     * getL.
-     *
-     * Return triangular factor.
-     *
-     * @return Matrix Lower triangular matrix
-     */
-    public function getL()
-    {
-        return new Matrix($this->L);
-    }
-
-    /**
-     * Solve A*X = B.
-     *
-     * @param Matrix $B Row-equal matrix
-     *
-     * @return Matrix L * L' * X = B
-     */
-    public function solve(Matrix $B)
-    {
-        if ($B->getRowDimension() == $this->m) {
-            if ($this->isspd) {
-                $X = $B->getArray();
-                $nx = $B->getColumnDimension();
-
-                for ($k = 0; $k < $this->m; ++$k) {
-                    for ($i = $k + 1; $i < $this->m; ++$i) {
-                        for ($j = 0; $j < $nx; ++$j) {
-                            $X[$i][$j] -= $X[$k][$j] * $this->L[$i][$k];
-                        }
-                    }
-                    for ($j = 0; $j < $nx; ++$j) {
-                        $X[$k][$j] /= $this->L[$k][$k];
-                    }
-                }
-
-                for ($k = $this->m - 1; $k >= 0; --$k) {
-                    for ($j = 0; $j < $nx; ++$j) {
-                        $X[$k][$j] /= $this->L[$k][$k];
-                    }
-                    for ($i = 0; $i < $k; ++$i) {
-                        for ($j = 0; $j < $nx; ++$j) {
-                            $X[$i][$j] -= $X[$k][$j] * $this->L[$k][$i];
-                        }
-                    }
-                }
-
-                return new Matrix($X, $this->m, $nx);
-            }
-
-            throw new CalculationException(Matrix::MATRIX_SPD_EXCEPTION);
-        }
-
-        throw new CalculationException(Matrix::MATRIX_DIMENSION_EXCEPTION);
-    }
-}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/EigenvalueDecomposition.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/EigenvalueDecomposition.php
deleted file mode 100644
index 5c6ccfd3ac..0000000000
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/EigenvalueDecomposition.php
+++ /dev/null
@@ -1,870 +0,0 @@
-<?php
-
-namespace PhpOffice\PhpSpreadsheet\Shared\JAMA;
-
-/**
- *    Class to obtain eigenvalues and eigenvectors of a real matrix.
- *
- *    If A is symmetric, then A = V*D*V' where the eigenvalue matrix D
- *    is diagonal and the eigenvector matrix V is orthogonal (i.e.
- *    A = V.times(D.times(V.transpose())) and V.times(V.transpose())
- *    equals the identity matrix).
- *
- *    If A is not symmetric, then the eigenvalue matrix D is block diagonal
- *    with the real eigenvalues in 1-by-1 blocks and any complex eigenvalues,
- *    lambda + i*mu, in 2-by-2 blocks, [lambda, mu; -mu, lambda].  The
- *    columns of V represent the eigenvectors in the sense that A*V = V*D,
- *    i.e. A.times(V) equals V.times(D).  The matrix V may be badly
- *    conditioned, or even singular, so the validity of the equation
- *    A = V*D*inverse(V) depends upon V.cond().
- *
- * @author  Paul Meagher
- *
- * @version 1.1
- */
-class EigenvalueDecomposition
-{
-    /**
-     * Row and column dimension (square matrix).
-     *
-     * @var int
-     */
-    private $n;
-
-    /**
-     * Arrays for internal storage of eigenvalues.
-     *
-     * @var array
-     */
-    private $d = [];
-
-    private $e = [];
-
-    /**
-     * Array for internal storage of eigenvectors.
-     *
-     * @var array
-     */
-    private $V = [];
-
-    /**
-     * Array for internal storage of nonsymmetric Hessenberg form.
-     *
-     * @var array
-     */
-    private $H = [];
-
-    /**
-     * Working storage for nonsymmetric algorithm.
-     *
-     * @var array
-     */
-    private $ort;
-
-    /**
-     * Used for complex scalar division.
-     *
-     * @var float
-     */
-    private $cdivr;
-
-    private $cdivi;
-
-    /**
-     * @var array
-     */
-    private $A;
-
-    /**
-     * Symmetric Householder reduction to tridiagonal form.
-     */
-    private function tred2(): void
-    {
-        //  This is derived from the Algol procedures tred2 by
-        //  Bowdler, Martin, Reinsch, and Wilkinson, Handbook for
-        //  Auto. Comp., Vol.ii-Linear Algebra, and the corresponding
-        //  Fortran subroutine in EISPACK.
-        $this->d = $this->V[$this->n - 1];
-        $j = 0;
-        // Householder reduction to tridiagonal form.
-        for ($i = $this->n - 1; $i > 0; --$i) {
-            $i_ = $i - 1;
-            // Scale to avoid under/overflow.
-            $h = $scale = 0.0;
-            $scale += array_sum(array_map('abs', $this->d));
-            if ($scale == 0.0) {
-                $this->e[$i] = $this->d[$i_];
-                $this->d = array_slice($this->V[$i_], 0, $i_);
-                for ($j = 0; $j < $i; ++$j) {
-                    $this->V[$j][$i] = $this->V[$i][$j] = 0.0;
-                }
-            } else {
-                // Generate Householder vector.
-                for ($k = 0; $k < $i; ++$k) {
-                    $this->d[$k] /= $scale;
-                    $h += $this->d[$k] ** 2;
-                }
-                $f = $this->d[$i_];
-                $g = sqrt($h);
-                if ($f > 0) {
-                    $g = -$g;
-                }
-                $this->e[$i] = $scale * $g;
-                $h = $h - $f * $g;
-                $this->d[$i_] = $f - $g;
-                for ($j = 0; $j < $i; ++$j) {
-                    $this->e[$j] = 0.0;
-                }
-                // Apply similarity transformation to remaining columns.
-                for ($j = 0; $j < $i; ++$j) {
-                    $f = $this->d[$j];
-                    $this->V[$j][$i] = $f;
-                    $g = $this->e[$j] + $this->V[$j][$j] * $f;
-                    for ($k = $j + 1; $k <= $i_; ++$k) {
-                        $g += $this->V[$k][$j] * $this->d[$k];
-                        $this->e[$k] += $this->V[$k][$j] * $f;
-                    }
-                    $this->e[$j] = $g;
-                }
-                $f = 0.0;
-                for ($j = 0; $j < $i; ++$j) {
-                    $this->e[$j] /= $h;
-                    $f += $this->e[$j] * $this->d[$j];
-                }
-                $hh = $f / (2 * $h);
-                for ($j = 0; $j < $i; ++$j) {
-                    $this->e[$j] -= $hh * $this->d[$j];
-                }
-                for ($j = 0; $j < $i; ++$j) {
-                    $f = $this->d[$j];
-                    $g = $this->e[$j];
-                    for ($k = $j; $k <= $i_; ++$k) {
-                        $this->V[$k][$j] -= ($f * $this->e[$k] + $g * $this->d[$k]);
-                    }
-                    $this->d[$j] = $this->V[$i - 1][$j];
-                    $this->V[$i][$j] = 0.0;
-                }
-            }
-            $this->d[$i] = $h;
-        }
-
-        // Accumulate transformations.
-        for ($i = 0; $i < $this->n - 1; ++$i) {
-            $this->V[$this->n - 1][$i] = $this->V[$i][$i];
-            $this->V[$i][$i] = 1.0;
-            $h = $this->d[$i + 1];
-            if ($h != 0.0) {
-                for ($k = 0; $k <= $i; ++$k) {
-                    $this->d[$k] = $this->V[$k][$i + 1] / $h;
-                }
-                for ($j = 0; $j <= $i; ++$j) {
-                    $g = 0.0;
-                    for ($k = 0; $k <= $i; ++$k) {
-                        $g += $this->V[$k][$i + 1] * $this->V[$k][$j];
-                    }
-                    for ($k = 0; $k <= $i; ++$k) {
-                        $this->V[$k][$j] -= $g * $this->d[$k];
-                    }
-                }
-            }
-            for ($k = 0; $k <= $i; ++$k) {
-                $this->V[$k][$i + 1] = 0.0;
-            }
-        }
-
-        $this->d = $this->V[$this->n - 1];
-        $this->V[$this->n - 1] = array_fill(0, $j, 0.0);
-        $this->V[$this->n - 1][$this->n - 1] = 1.0;
-        $this->e[0] = 0.0;
-    }
-
-    /**
-     * Symmetric tridiagonal QL algorithm.
-     *
-     *    This is derived from the Algol procedures tql2, by
-     *    Bowdler, Martin, Reinsch, and Wilkinson, Handbook for
-     *    Auto. Comp., Vol.ii-Linear Algebra, and the corresponding
-     * Fortran subroutine in EISPACK.
-     */
-    private function tql2(): void
-    {
-        for ($i = 1; $i < $this->n; ++$i) {
-            $this->e[$i - 1] = $this->e[$i];
-        }
-        $this->e[$this->n - 1] = 0.0;
-        $f = 0.0;
-        $tst1 = 0.0;
-        $eps = 2.0 ** (-52.0);
-
-        for ($l = 0; $l < $this->n; ++$l) {
-            // Find small subdiagonal element
-            $tst1 = max($tst1, abs($this->d[$l]) + abs($this->e[$l]));
-            $m = $l;
-            while ($m < $this->n) {
-                if (abs($this->e[$m]) <= $eps * $tst1) {
-                    break;
-                }
-                ++$m;
-            }
-            // If m == l, $this->d[l] is an eigenvalue,
-            // otherwise, iterate.
-            if ($m > $l) {
-                $iter = 0;
-                do {
-                    // Could check iteration count here.
-                    ++$iter;
-                    // Compute implicit shift
-                    $g = $this->d[$l];
-                    $p = ($this->d[$l + 1] - $g) / (2.0 * $this->e[$l]);
-                    $r = hypo($p, 1.0);
-                    if ($p < 0) {
-                        $r *= -1;
-                    }
-                    $this->d[$l] = $this->e[$l] / ($p + $r);
-                    $this->d[$l + 1] = $this->e[$l] * ($p + $r);
-                    $dl1 = $this->d[$l + 1];
-                    $h = $g - $this->d[$l];
-                    for ($i = $l + 2; $i < $this->n; ++$i) {
-                        $this->d[$i] -= $h;
-                    }
-                    $f += $h;
-                    // Implicit QL transformation.
-                    $p = $this->d[$m];
-                    $c = 1.0;
-                    $c2 = $c3 = $c;
-                    $el1 = $this->e[$l + 1];
-                    $s = $s2 = 0.0;
-                    for ($i = $m - 1; $i >= $l; --$i) {
-                        $c3 = $c2;
-                        $c2 = $c;
-                        $s2 = $s;
-                        $g = $c * $this->e[$i];
-                        $h = $c * $p;
-                        $r = hypo($p, $this->e[$i]);
-                        $this->e[$i + 1] = $s * $r;
-                        $s = $this->e[$i] / $r;
-                        $c = $p / $r;
-                        $p = $c * $this->d[$i] - $s * $g;
-                        $this->d[$i + 1] = $h + $s * ($c * $g + $s * $this->d[$i]);
-                        // Accumulate transformation.
-                        for ($k = 0; $k < $this->n; ++$k) {
-                            $h = $this->V[$k][$i + 1];
-                            $this->V[$k][$i + 1] = $s * $this->V[$k][$i] + $c * $h;
-                            $this->V[$k][$i] = $c * $this->V[$k][$i] - $s * $h;
-                        }
-                    }
-                    $p = -$s * $s2 * $c3 * $el1 * $this->e[$l] / $dl1;
-                    $this->e[$l] = $s * $p;
-                    $this->d[$l] = $c * $p;
-                    // Check for convergence.
-                } while (abs($this->e[$l]) > $eps * $tst1);
-            }
-            $this->d[$l] = $this->d[$l] + $f;
-            $this->e[$l] = 0.0;
-        }
-
-        // Sort eigenvalues and corresponding vectors.
-        for ($i = 0; $i < $this->n - 1; ++$i) {
-            $k = $i;
-            $p = $this->d[$i];
-            for ($j = $i + 1; $j < $this->n; ++$j) {
-                if ($this->d[$j] < $p) {
-                    $k = $j;
-                    $p = $this->d[$j];
-                }
-            }
-            if ($k != $i) {
-                $this->d[$k] = $this->d[$i];
-                $this->d[$i] = $p;
-                for ($j = 0; $j < $this->n; ++$j) {
-                    $p = $this->V[$j][$i];
-                    $this->V[$j][$i] = $this->V[$j][$k];
-                    $this->V[$j][$k] = $p;
-                }
-            }
-        }
-    }
-
-    /**
-     * Nonsymmetric reduction to Hessenberg form.
-     *
-     *    This is derived from the Algol procedures orthes and ortran,
-     *    by Martin and Wilkinson, Handbook for Auto. Comp.,
-     *    Vol.ii-Linear Algebra, and the corresponding
-     * Fortran subroutines in EISPACK.
-     */
-    private function orthes(): void
-    {
-        $low = 0;
-        $high = $this->n - 1;
-
-        for ($m = $low + 1; $m <= $high - 1; ++$m) {
-            // Scale column.
-            $scale = 0.0;
-            for ($i = $m; $i <= $high; ++$i) {
-                $scale = $scale + abs($this->H[$i][$m - 1]);
-            }
-            if ($scale != 0.0) {
-                // Compute Householder transformation.
-                $h = 0.0;
-                for ($i = $high; $i >= $m; --$i) {
-                    $this->ort[$i] = $this->H[$i][$m - 1] / $scale;
-                    $h += $this->ort[$i] * $this->ort[$i];
-                }
-                $g = sqrt($h);
-                if ($this->ort[$m] > 0) {
-                    $g *= -1;
-                }
-                $h -= $this->ort[$m] * $g;
-                $this->ort[$m] -= $g;
-                // Apply Householder similarity transformation
-                // H = (I -u * u' / h) * H * (I -u * u') / h)
-                for ($j = $m; $j < $this->n; ++$j) {
-                    $f = 0.0;
-                    for ($i = $high; $i >= $m; --$i) {
-                        $f += $this->ort[$i] * $this->H[$i][$j];
-                    }
-                    $f /= $h;
-                    for ($i = $m; $i <= $high; ++$i) {
-                        $this->H[$i][$j] -= $f * $this->ort[$i];
-                    }
-                }
-                for ($i = 0; $i <= $high; ++$i) {
-                    $f = 0.0;
-                    for ($j = $high; $j >= $m; --$j) {
-                        $f += $this->ort[$j] * $this->H[$i][$j];
-                    }
-                    $f = $f / $h;
-                    for ($j = $m; $j <= $high; ++$j) {
-                        $this->H[$i][$j] -= $f * $this->ort[$j];
-                    }
-                }
-                $this->ort[$m] = $scale * $this->ort[$m];
-                $this->H[$m][$m - 1] = $scale * $g;
-            }
-        }
-
-        // Accumulate transformations (Algol's ortran).
-        for ($i = 0; $i < $this->n; ++$i) {
-            for ($j = 0; $j < $this->n; ++$j) {
-                $this->V[$i][$j] = ($i == $j ? 1.0 : 0.0);
-            }
-        }
-        for ($m = $high - 1; $m >= $low + 1; --$m) {
-            if ($this->H[$m][$m - 1] != 0.0) {
-                for ($i = $m + 1; $i <= $high; ++$i) {
-                    $this->ort[$i] = $this->H[$i][$m - 1];
-                }
-                for ($j = $m; $j <= $high; ++$j) {
-                    $g = 0.0;
-                    for ($i = $m; $i <= $high; ++$i) {
-                        $g += $this->ort[$i] * $this->V[$i][$j];
-                    }
-                    // Double division avoids possible underflow
-                    $g = ($g / $this->ort[$m]) / $this->H[$m][$m - 1];
-                    for ($i = $m; $i <= $high; ++$i) {
-                        $this->V[$i][$j] += $g * $this->ort[$i];
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Performs complex division.
-     *
-     * @param mixed $xr
-     * @param mixed $xi
-     * @param mixed $yr
-     * @param mixed $yi
-     */
-    private function cdiv($xr, $xi, $yr, $yi): void
-    {
-        if (abs($yr) > abs($yi)) {
-            $r = $yi / $yr;
-            $d = $yr + $r * $yi;
-            $this->cdivr = ($xr + $r * $xi) / $d;
-            $this->cdivi = ($xi - $r * $xr) / $d;
-        } else {
-            $r = $yr / $yi;
-            $d = $yi + $r * $yr;
-            $this->cdivr = ($r * $xr + $xi) / $d;
-            $this->cdivi = ($r * $xi - $xr) / $d;
-        }
-    }
-
-    /**
-     * Nonsymmetric reduction from Hessenberg to real Schur form.
-     *
-     *    Code is derived from the Algol procedure hqr2,
-     *    by Martin and Wilkinson, Handbook for Auto. Comp.,
-     *    Vol.ii-Linear Algebra, and the corresponding
-     * Fortran subroutine in EISPACK.
-     */
-    private function hqr2(): void
-    {
-        //  Initialize
-        $nn = $this->n;
-        $n = $nn - 1;
-        $low = 0;
-        $high = $nn - 1;
-        $eps = 2.0 ** (-52.0);
-        $exshift = 0.0;
-        $p = $q = $r = $s = $z = 0;
-        // Store roots isolated by balanc and compute matrix norm
-        $norm = 0.0;
-
-        for ($i = 0; $i < $nn; ++$i) {
-            if (($i < $low) || ($i > $high)) {
-                $this->d[$i] = $this->H[$i][$i];
-                $this->e[$i] = 0.0;
-            }
-            for ($j = max($i - 1, 0); $j < $nn; ++$j) {
-                $norm = $norm + abs($this->H[$i][$j]);
-            }
-        }
-
-        // Outer loop over eigenvalue index
-        $iter = 0;
-        while ($n >= $low) {
-            // Look for single small sub-diagonal element
-            $l = $n;
-            while ($l > $low) {
-                $s = abs($this->H[$l - 1][$l - 1]) + abs($this->H[$l][$l]);
-                if ($s == 0.0) {
-                    $s = $norm;
-                }
-                if (abs($this->H[$l][$l - 1]) < $eps * $s) {
-                    break;
-                }
-                --$l;
-            }
-            // Check for convergence
-            // One root found
-            if ($l == $n) {
-                $this->H[$n][$n] = $this->H[$n][$n] + $exshift;
-                $this->d[$n] = $this->H[$n][$n];
-                $this->e[$n] = 0.0;
-                --$n;
-                $iter = 0;
-            // Two roots found
-            } elseif ($l == $n - 1) {
-                $w = $this->H[$n][$n - 1] * $this->H[$n - 1][$n];
-                $p = ($this->H[$n - 1][$n - 1] - $this->H[$n][$n]) / 2.0;
-                $q = $p * $p + $w;
-                $z = sqrt(abs($q));
-                $this->H[$n][$n] = $this->H[$n][$n] + $exshift;
-                $this->H[$n - 1][$n - 1] = $this->H[$n - 1][$n - 1] + $exshift;
-                $x = $this->H[$n][$n];
-                // Real pair
-                if ($q >= 0) {
-                    if ($p >= 0) {
-                        $z = $p + $z;
-                    } else {
-                        $z = $p - $z;
-                    }
-                    $this->d[$n - 1] = $x + $z;
-                    $this->d[$n] = $this->d[$n - 1];
-                    if ($z != 0.0) {
-                        $this->d[$n] = $x - $w / $z;
-                    }
-                    $this->e[$n - 1] = 0.0;
-                    $this->e[$n] = 0.0;
-                    $x = $this->H[$n][$n - 1];
-                    $s = abs($x) + abs($z);
-                    $p = $x / $s;
-                    $q = $z / $s;
-                    $r = sqrt($p * $p + $q * $q);
-                    $p = $p / $r;
-                    $q = $q / $r;
-                    // Row modification
-                    for ($j = $n - 1; $j < $nn; ++$j) {
-                        $z = $this->H[$n - 1][$j];
-                        $this->H[$n - 1][$j] = $q * $z + $p * $this->H[$n][$j];
-                        $this->H[$n][$j] = $q * $this->H[$n][$j] - $p * $z;
-                    }
-                    // Column modification
-                    for ($i = 0; $i <= $n; ++$i) {
-                        $z = $this->H[$i][$n - 1];
-                        $this->H[$i][$n - 1] = $q * $z + $p * $this->H[$i][$n];
-                        $this->H[$i][$n] = $q * $this->H[$i][$n] - $p * $z;
-                    }
-                    // Accumulate transformations
-                    for ($i = $low; $i <= $high; ++$i) {
-                        $z = $this->V[$i][$n - 1];
-                        $this->V[$i][$n - 1] = $q * $z + $p * $this->V[$i][$n];
-                        $this->V[$i][$n] = $q * $this->V[$i][$n] - $p * $z;
-                    }
-                    // Complex pair
-                } else {
-                    $this->d[$n - 1] = $x + $p;
-                    $this->d[$n] = $x + $p;
-                    $this->e[$n - 1] = $z;
-                    $this->e[$n] = -$z;
-                }
-                $n = $n - 2;
-                $iter = 0;
-            // No convergence yet
-            } else {
-                // Form shift
-                $x = $this->H[$n][$n];
-                $y = 0.0;
-                $w = 0.0;
-                if ($l < $n) {
-                    $y = $this->H[$n - 1][$n - 1];
-                    $w = $this->H[$n][$n - 1] * $this->H[$n - 1][$n];
-                }
-                // Wilkinson's original ad hoc shift
-                if ($iter == 10) {
-                    $exshift += $x;
-                    for ($i = $low; $i <= $n; ++$i) {
-                        $this->H[$i][$i] -= $x;
-                    }
-                    $s = abs($this->H[$n][$n - 1]) + abs($this->H[$n - 1][$n - 2]);
-                    $x = $y = 0.75 * $s;
-                    $w = -0.4375 * $s * $s;
-                }
-                // MATLAB's new ad hoc shift
-                if ($iter == 30) {
-                    $s = ($y - $x) / 2.0;
-                    $s = $s * $s + $w;
-                    if ($s > 0) {
-                        $s = sqrt($s);
-                        if ($y < $x) {
-                            $s = -$s;
-                        }
-                        $s = $x - $w / (($y - $x) / 2.0 + $s);
-                        for ($i = $low; $i <= $n; ++$i) {
-                            $this->H[$i][$i] -= $s;
-                        }
-                        $exshift += $s;
-                        $x = $y = $w = 0.964;
-                    }
-                }
-                // Could check iteration count here.
-                $iter = $iter + 1;
-                // Look for two consecutive small sub-diagonal elements
-                $m = $n - 2;
-                while ($m >= $l) {
-                    $z = $this->H[$m][$m];
-                    $r = $x - $z;
-                    $s = $y - $z;
-                    $p = ($r * $s - $w) / $this->H[$m + 1][$m] + $this->H[$m][$m + 1];
-                    $q = $this->H[$m + 1][$m + 1] - $z - $r - $s;
-                    $r = $this->H[$m + 2][$m + 1];
-                    $s = abs($p) + abs($q) + abs($r);
-                    $p = $p / $s;
-                    $q = $q / $s;
-                    $r = $r / $s;
-                    if ($m == $l) {
-                        break;
-                    }
-                    if (
-                        abs($this->H[$m][$m - 1]) * (abs($q) + abs($r)) <
-                        $eps * (abs($p) * (abs($this->H[$m - 1][$m - 1]) + abs($z) + abs($this->H[$m + 1][$m + 1])))
-                    ) {
-                        break;
-                    }
-                    --$m;
-                }
-                for ($i = $m + 2; $i <= $n; ++$i) {
-                    $this->H[$i][$i - 2] = 0.0;
-                    if ($i > $m + 2) {
-                        $this->H[$i][$i - 3] = 0.0;
-                    }
-                }
-                // Double QR step involving rows l:n and columns m:n
-                for ($k = $m; $k <= $n - 1; ++$k) {
-                    $notlast = ($k != $n - 1);
-                    if ($k != $m) {
-                        $p = $this->H[$k][$k - 1];
-                        $q = $this->H[$k + 1][$k - 1];
-                        $r = ($notlast ? $this->H[$k + 2][$k - 1] : 0.0);
-                        $x = abs($p) + abs($q) + abs($r);
-                        if ($x != 0.0) {
-                            $p = $p / $x;
-                            $q = $q / $x;
-                            $r = $r / $x;
-                        }
-                    }
-                    if ($x == 0.0) {
-                        break;
-                    }
-                    $s = sqrt($p * $p + $q * $q + $r * $r);
-                    if ($p < 0) {
-                        $s = -$s;
-                    }
-                    if ($s != 0) {
-                        if ($k != $m) {
-                            $this->H[$k][$k - 1] = -$s * $x;
-                        } elseif ($l != $m) {
-                            $this->H[$k][$k - 1] = -$this->H[$k][$k - 1];
-                        }
-                        $p = $p + $s;
-                        $x = $p / $s;
-                        $y = $q / $s;
-                        $z = $r / $s;
-                        $q = $q / $p;
-                        $r = $r / $p;
-                        // Row modification
-                        for ($j = $k; $j < $nn; ++$j) {
-                            $p = $this->H[$k][$j] + $q * $this->H[$k + 1][$j];
-                            if ($notlast) {
-                                $p = $p + $r * $this->H[$k + 2][$j];
-                                $this->H[$k + 2][$j] = $this->H[$k + 2][$j] - $p * $z;
-                            }
-                            $this->H[$k][$j] = $this->H[$k][$j] - $p * $x;
-                            $this->H[$k + 1][$j] = $this->H[$k + 1][$j] - $p * $y;
-                        }
-                        // Column modification
-                        $iMax = min($n, $k + 3);
-                        for ($i = 0; $i <= $iMax; ++$i) {
-                            $p = $x * $this->H[$i][$k] + $y * $this->H[$i][$k + 1];
-                            if ($notlast) {
-                                $p = $p + $z * $this->H[$i][$k + 2];
-                                $this->H[$i][$k + 2] = $this->H[$i][$k + 2] - $p * $r;
-                            }
-                            $this->H[$i][$k] = $this->H[$i][$k] - $p;
-                            $this->H[$i][$k + 1] = $this->H[$i][$k + 1] - $p * $q;
-                        }
-                        // Accumulate transformations
-                        for ($i = $low; $i <= $high; ++$i) {
-                            $p = $x * $this->V[$i][$k] + $y * $this->V[$i][$k + 1];
-                            if ($notlast) {
-                                $p = $p + $z * $this->V[$i][$k + 2];
-                                $this->V[$i][$k + 2] = $this->V[$i][$k + 2] - $p * $r;
-                            }
-                            $this->V[$i][$k] = $this->V[$i][$k] - $p;
-                            $this->V[$i][$k + 1] = $this->V[$i][$k + 1] - $p * $q;
-                        }
-                    }  // ($s != 0)
-                }  // k loop
-            }  // check convergence
-        }  // while ($n >= $low)
-
-        // Backsubstitute to find vectors of upper triangular form
-        if ($norm == 0.0) {
-            return;
-        }
-
-        for ($n = $nn - 1; $n >= 0; --$n) {
-            $p = $this->d[$n];
-            $q = $this->e[$n];
-            // Real vector
-            if ($q == 0) {
-                $l = $n;
-                $this->H[$n][$n] = 1.0;
-                for ($i = $n - 1; $i >= 0; --$i) {
-                    $w = $this->H[$i][$i] - $p;
-                    $r = 0.0;
-                    for ($j = $l; $j <= $n; ++$j) {
-                        $r = $r + $this->H[$i][$j] * $this->H[$j][$n];
-                    }
-                    if ($this->e[$i] < 0.0) {
-                        $z = $w;
-                        $s = $r;
-                    } else {
-                        $l = $i;
-                        if ($this->e[$i] == 0.0) {
-                            if ($w != 0.0) {
-                                $this->H[$i][$n] = -$r / $w;
-                            } else {
-                                $this->H[$i][$n] = -$r / ($eps * $norm);
-                            }
-                            // Solve real equations
-                        } else {
-                            $x = $this->H[$i][$i + 1];
-                            $y = $this->H[$i + 1][$i];
-                            $q = ($this->d[$i] - $p) * ($this->d[$i] - $p) + $this->e[$i] * $this->e[$i];
-                            $t = ($x * $s - $z * $r) / $q;
-                            $this->H[$i][$n] = $t;
-                            if (abs($x) > abs($z)) {
-                                $this->H[$i + 1][$n] = (-$r - $w * $t) / $x;
-                            } else {
-                                $this->H[$i + 1][$n] = (-$s - $y * $t) / $z;
-                            }
-                        }
-                        // Overflow control
-                        $t = abs($this->H[$i][$n]);
-                        if (($eps * $t) * $t > 1) {
-                            for ($j = $i; $j <= $n; ++$j) {
-                                $this->H[$j][$n] = $this->H[$j][$n] / $t;
-                            }
-                        }
-                    }
-                }
-                // Complex vector
-            } elseif ($q < 0) {
-                $l = $n - 1;
-                // Last vector component imaginary so matrix is triangular
-                if (abs($this->H[$n][$n - 1]) > abs($this->H[$n - 1][$n])) {
-                    $this->H[$n - 1][$n - 1] = $q / $this->H[$n][$n - 1];
-                    $this->H[$n - 1][$n] = -($this->H[$n][$n] - $p) / $this->H[$n][$n - 1];
-                } else {
-                    $this->cdiv(0.0, -$this->H[$n - 1][$n], $this->H[$n - 1][$n - 1] - $p, $q);
-                    $this->H[$n - 1][$n - 1] = $this->cdivr;
-                    $this->H[$n - 1][$n] = $this->cdivi;
-                }
-                $this->H[$n][$n - 1] = 0.0;
-                $this->H[$n][$n] = 1.0;
-                for ($i = $n - 2; $i >= 0; --$i) {
-                    // double ra,sa,vr,vi;
-                    $ra = 0.0;
-                    $sa = 0.0;
-                    for ($j = $l; $j <= $n; ++$j) {
-                        $ra = $ra + $this->H[$i][$j] * $this->H[$j][$n - 1];
-                        $sa = $sa + $this->H[$i][$j] * $this->H[$j][$n];
-                    }
-                    $w = $this->H[$i][$i] - $p;
-                    if ($this->e[$i] < 0.0) {
-                        $z = $w;
-                        $r = $ra;
-                        $s = $sa;
-                    } else {
-                        $l = $i;
-                        if ($this->e[$i] == 0) {
-                            $this->cdiv(-$ra, -$sa, $w, $q);
-                            $this->H[$i][$n - 1] = $this->cdivr;
-                            $this->H[$i][$n] = $this->cdivi;
-                        } else {
-                            // Solve complex equations
-                            $x = $this->H[$i][$i + 1];
-                            $y = $this->H[$i + 1][$i];
-                            $vr = ($this->d[$i] - $p) * ($this->d[$i] - $p) + $this->e[$i] * $this->e[$i] - $q * $q;
-                            $vi = ($this->d[$i] - $p) * 2.0 * $q;
-                            if ($vr == 0.0 & $vi == 0.0) {
-                                $vr = $eps * $norm * (abs($w) + abs($q) + abs($x) + abs($y) + abs($z));
-                            }
-                            $this->cdiv($x * $r - $z * $ra + $q * $sa, $x * $s - $z * $sa - $q * $ra, $vr, $vi);
-                            $this->H[$i][$n - 1] = $this->cdivr;
-                            $this->H[$i][$n] = $this->cdivi;
-                            if (abs($x) > (abs($z) + abs($q))) {
-                                $this->H[$i + 1][$n - 1] = (-$ra - $w * $this->H[$i][$n - 1] + $q * $this->H[$i][$n]) / $x;
-                                $this->H[$i + 1][$n] = (-$sa - $w * $this->H[$i][$n] - $q * $this->H[$i][$n - 1]) / $x;
-                            } else {
-                                $this->cdiv(-$r - $y * $this->H[$i][$n - 1], -$s - $y * $this->H[$i][$n], $z, $q);
-                                $this->H[$i + 1][$n - 1] = $this->cdivr;
-                                $this->H[$i + 1][$n] = $this->cdivi;
-                            }
-                        }
-                        // Overflow control
-                        $t = max(abs($this->H[$i][$n - 1]), abs($this->H[$i][$n]));
-                        if (($eps * $t) * $t > 1) {
-                            for ($j = $i; $j <= $n; ++$j) {
-                                $this->H[$j][$n - 1] = $this->H[$j][$n - 1] / $t;
-                                $this->H[$j][$n] = $this->H[$j][$n] / $t;
-                            }
-                        }
-                    } // end else
-                } // end for
-            } // end else for complex case
-        } // end for
-
-        // Vectors of isolated roots
-        for ($i = 0; $i < $nn; ++$i) {
-            if ($i < $low | $i > $high) {
-                for ($j = $i; $j < $nn; ++$j) {
-                    $this->V[$i][$j] = $this->H[$i][$j];
-                }
-            }
-        }
-
-        // Back transformation to get eigenvectors of original matrix
-        for ($j = $nn - 1; $j >= $low; --$j) {
-            for ($i = $low; $i <= $high; ++$i) {
-                $z = 0.0;
-                $kMax = min($j, $high);
-                for ($k = $low; $k <= $kMax; ++$k) {
-                    $z = $z + $this->V[$i][$k] * $this->H[$k][$j];
-                }
-                $this->V[$i][$j] = $z;
-            }
-        }
-    }
-
-    // end hqr2
-
-    /**
-     * Constructor: Check for symmetry, then construct the eigenvalue decomposition.
-     *
-     * @param Matrix $Arg A Square matrix
-     */
-    public function __construct(Matrix $Arg)
-    {
-        $this->A = $Arg->getArray();
-        $this->n = $Arg->getColumnDimension();
-
-        $issymmetric = true;
-        for ($j = 0; ($j < $this->n) & $issymmetric; ++$j) {
-            for ($i = 0; ($i < $this->n) & $issymmetric; ++$i) {
-                $issymmetric = ($this->A[$i][$j] == $this->A[$j][$i]);
-            }
-        }
-
-        if ($issymmetric) {
-            $this->V = $this->A;
-            // Tridiagonalize.
-            $this->tred2();
-            // Diagonalize.
-            $this->tql2();
-        } else {
-            $this->H = $this->A;
-            $this->ort = [];
-            // Reduce to Hessenberg form.
-            $this->orthes();
-            // Reduce Hessenberg to real Schur form.
-            $this->hqr2();
-        }
-    }
-
-    /**
-     * Return the eigenvector matrix.
-     *
-     * @return Matrix V
-     */
-    public function getV()
-    {
-        return new Matrix($this->V, $this->n, $this->n);
-    }
-
-    /**
-     * Return the real parts of the eigenvalues.
-     *
-     * @return array real(diag(D))
-     */
-    public function getRealEigenvalues()
-    {
-        return $this->d;
-    }
-
-    /**
-     * Return the imaginary parts of the eigenvalues.
-     *
-     * @return array imag(diag(D))
-     */
-    public function getImagEigenvalues()
-    {
-        return $this->e;
-    }
-
-    /**
-     * Return the block diagonal eigenvalue matrix.
-     *
-     * @return Matrix D
-     */
-    public function getD()
-    {
-        $D = [];
-        for ($i = 0; $i < $this->n; ++$i) {
-            $D[$i] = array_fill(0, $this->n, 0.0);
-            $D[$i][$i] = $this->d[$i];
-            if ($this->e[$i] == 0) {
-                continue;
-            }
-            $o = ($this->e[$i] > 0) ? $i + 1 : $i - 1;
-            $D[$i][$o] = $this->e[$i];
-        }
-
-        return new Matrix($D);
-    }
-}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/LUDecomposition.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/LUDecomposition.php
deleted file mode 100644
index ecfe42bad9..0000000000
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/LUDecomposition.php
+++ /dev/null
@@ -1,284 +0,0 @@
-<?php
-
-namespace PhpOffice\PhpSpreadsheet\Shared\JAMA;
-
-use PhpOffice\PhpSpreadsheet\Calculation\Exception as CalculationException;
-
-/**
- *    For an m-by-n matrix A with m >= n, the LU decomposition is an m-by-n
- *    unit lower triangular matrix L, an n-by-n upper triangular matrix U,
- *    and a permutation vector piv of length m so that A(piv,:) = L*U.
- *    If m < n, then L is m-by-m and U is m-by-n.
- *
- *    The LU decompostion with pivoting always exists, even if the matrix is
- *    singular, so the constructor will never fail. The primary use of the
- *    LU decomposition is in the solution of square systems of simultaneous
- *    linear equations. This will fail if isNonsingular() returns false.
- *
- *    @author Paul Meagher
- *    @author Bartosz Matosiuk
- *    @author Michael Bommarito
- *
- *    @version 1.1
- */
-class LUDecomposition
-{
-    const MATRIX_SINGULAR_EXCEPTION = 'Can only perform operation on singular matrix.';
-    const MATRIX_SQUARE_EXCEPTION = 'Mismatched Row dimension';
-
-    /**
-     * Decomposition storage.
-     *
-     * @var array
-     */
-    private $LU = [];
-
-    /**
-     * Row dimension.
-     *
-     * @var int
-     */
-    private $m;
-
-    /**
-     * Column dimension.
-     *
-     * @var int
-     */
-    private $n;
-
-    /**
-     * Pivot sign.
-     *
-     * @var int
-     */
-    private $pivsign;
-
-    /**
-     * Internal storage of pivot vector.
-     *
-     * @var array
-     */
-    private $piv = [];
-
-    /**
-     * LU Decomposition constructor.
-     *
-     * @param Matrix $A Rectangular matrix
-     */
-    public function __construct($A)
-    {
-        if ($A instanceof Matrix) {
-            // Use a "left-looking", dot-product, Crout/Doolittle algorithm.
-            $this->LU = $A->getArray();
-            $this->m = $A->getRowDimension();
-            $this->n = $A->getColumnDimension();
-            for ($i = 0; $i < $this->m; ++$i) {
-                $this->piv[$i] = $i;
-            }
-            $this->pivsign = 1;
-            $LUrowi = $LUcolj = [];
-
-            // Outer loop.
-            for ($j = 0; $j < $this->n; ++$j) {
-                // Make a copy of the j-th column to localize references.
-                for ($i = 0; $i < $this->m; ++$i) {
-                    $LUcolj[$i] = &$this->LU[$i][$j];
-                }
-                // Apply previous transformations.
-                for ($i = 0; $i < $this->m; ++$i) {
-                    $LUrowi = $this->LU[$i];
-                    // Most of the time is spent in the following dot product.
-                    $kmax = min($i, $j);
-                    $s = 0.0;
-                    for ($k = 0; $k < $kmax; ++$k) {
-                        $s += $LUrowi[$k] * $LUcolj[$k];
-                    }
-                    $LUrowi[$j] = $LUcolj[$i] -= $s;
-                }
-                // Find pivot and exchange if necessary.
-                $p = $j;
-                for ($i = $j + 1; $i < $this->m; ++$i) {
-                    if (abs($LUcolj[$i]) > abs($LUcolj[$p])) {
-                        $p = $i;
-                    }
-                }
-                if ($p != $j) {
-                    for ($k = 0; $k < $this->n; ++$k) {
-                        $t = $this->LU[$p][$k];
-                        $this->LU[$p][$k] = $this->LU[$j][$k];
-                        $this->LU[$j][$k] = $t;
-                    }
-                    $k = $this->piv[$p];
-                    $this->piv[$p] = $this->piv[$j];
-                    $this->piv[$j] = $k;
-                    $this->pivsign = $this->pivsign * -1;
-                }
-                // Compute multipliers.
-                if (($j < $this->m) && ($this->LU[$j][$j] != 0.0)) {
-                    for ($i = $j + 1; $i < $this->m; ++$i) {
-                        $this->LU[$i][$j] /= $this->LU[$j][$j];
-                    }
-                }
-            }
-        } else {
-            throw new CalculationException(Matrix::ARGUMENT_TYPE_EXCEPTION);
-        }
-    }
-
-    //    function __construct()
-
-    /**
-     * Get lower triangular factor.
-     *
-     * @return Matrix Lower triangular factor
-     */
-    public function getL()
-    {
-        $L = [];
-        for ($i = 0; $i < $this->m; ++$i) {
-            for ($j = 0; $j < $this->n; ++$j) {
-                if ($i > $j) {
-                    $L[$i][$j] = $this->LU[$i][$j];
-                } elseif ($i == $j) {
-                    $L[$i][$j] = 1.0;
-                } else {
-                    $L[$i][$j] = 0.0;
-                }
-            }
-        }
-
-        return new Matrix($L);
-    }
-
-    //    function getL()
-
-    /**
-     * Get upper triangular factor.
-     *
-     * @return Matrix Upper triangular factor
-     */
-    public function getU()
-    {
-        $U = [];
-        for ($i = 0; $i < $this->n; ++$i) {
-            for ($j = 0; $j < $this->n; ++$j) {
-                if ($i <= $j) {
-                    $U[$i][$j] = $this->LU[$i][$j];
-                } else {
-                    $U[$i][$j] = 0.0;
-                }
-            }
-        }
-
-        return new Matrix($U);
-    }
-
-    //    function getU()
-
-    /**
-     * Return pivot permutation vector.
-     *
-     * @return array Pivot vector
-     */
-    public function getPivot()
-    {
-        return $this->piv;
-    }
-
-    //    function getPivot()
-
-    /**
-     * Alias for getPivot.
-     *
-     *    @see getPivot
-     */
-    public function getDoublePivot()
-    {
-        return $this->getPivot();
-    }
-
-    //    function getDoublePivot()
-
-    /**
-     *    Is the matrix nonsingular?
-     *
-     * @return bool true if U, and hence A, is nonsingular
-     */
-    public function isNonsingular()
-    {
-        for ($j = 0; $j < $this->n; ++$j) {
-            if ($this->LU[$j][$j] == 0) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    //    function isNonsingular()
-
-    /**
-     * Count determinants.
-     *
-     * @return float
-     */
-    public function det()
-    {
-        if ($this->m == $this->n) {
-            $d = $this->pivsign;
-            for ($j = 0; $j < $this->n; ++$j) {
-                $d *= $this->LU[$j][$j];
-            }
-
-            return $d;
-        }
-
-        throw new CalculationException(Matrix::MATRIX_DIMENSION_EXCEPTION);
-    }
-
-    //    function det()
-
-    /**
-     * Solve A*X = B.
-     *
-     * @param Matrix $B a Matrix with as many rows as A and any number of columns
-     *
-     * @return Matrix X so that L*U*X = B(piv,:)
-     */
-    public function solve(Matrix $B)
-    {
-        if ($B->getRowDimension() == $this->m) {
-            if ($this->isNonsingular()) {
-                // Copy right hand side with pivoting
-                $nx = $B->getColumnDimension();
-                $X = $B->getMatrix($this->piv, 0, $nx - 1);
-                // Solve L*Y = B(piv,:)
-                for ($k = 0; $k < $this->n; ++$k) {
-                    for ($i = $k + 1; $i < $this->n; ++$i) {
-                        for ($j = 0; $j < $nx; ++$j) {
-                            $X->A[$i][$j] -= $X->A[$k][$j] * $this->LU[$i][$k];
-                        }
-                    }
-                }
-                // Solve U*X = Y;
-                for ($k = $this->n - 1; $k >= 0; --$k) {
-                    for ($j = 0; $j < $nx; ++$j) {
-                        $X->A[$k][$j] /= $this->LU[$k][$k];
-                    }
-                    for ($i = 0; $i < $k; ++$i) {
-                        for ($j = 0; $j < $nx; ++$j) {
-                            $X->A[$i][$j] -= $X->A[$k][$j] * $this->LU[$i][$k];
-                        }
-                    }
-                }
-
-                return $X;
-            }
-
-            throw new CalculationException(self::MATRIX_SINGULAR_EXCEPTION);
-        }
-
-        throw new CalculationException(self::MATRIX_SQUARE_EXCEPTION);
-    }
-}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/Matrix.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/Matrix.php
deleted file mode 100644
index adf399ac7f..0000000000
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/Matrix.php
+++ /dev/null
@@ -1,1189 +0,0 @@
-<?php
-
-namespace PhpOffice\PhpSpreadsheet\Shared\JAMA;
-
-use PhpOffice\PhpSpreadsheet\Calculation\Exception as CalculationException;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
-use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
-
-/**
- * Matrix class.
- *
- * @author Paul Meagher
- * @author Michael Bommarito
- * @author Lukasz Karapuda
- * @author Bartek Matosiuk
- *
- * @version 1.8
- *
- * @see https://math.nist.gov/javanumerics/jama/
- */
-class Matrix
-{
-    const POLYMORPHIC_ARGUMENT_EXCEPTION = 'Invalid argument pattern for polymorphic function.';
-    const ARGUMENT_TYPE_EXCEPTION = 'Invalid argument type.';
-    const ARGUMENT_BOUNDS_EXCEPTION = 'Invalid argument range.';
-    const MATRIX_DIMENSION_EXCEPTION = 'Matrix dimensions are not equal.';
-    const ARRAY_LENGTH_EXCEPTION = 'Array length must be a multiple of m.';
-    const MATRIX_SPD_EXCEPTION = 'Can only perform operation on symmetric positive definite matrix.';
-
-    /**
-     * Matrix storage.
-     *
-     * @var array
-     */
-    public $A = [];
-
-    /**
-     * Matrix row dimension.
-     *
-     * @var int
-     */
-    private $m;
-
-    /**
-     * Matrix column dimension.
-     *
-     * @var int
-     */
-    private $n;
-
-    /**
-     * Polymorphic constructor.
-     *
-     * As PHP has no support for polymorphic constructors, we use tricks to make our own sort of polymorphism using func_num_args, func_get_arg, and gettype. In essence, we're just implementing a simple RTTI filter and calling the appropriate constructor.
-     */
-    public function __construct(...$args)
-    {
-        if (count($args) > 0) {
-            $match = implode(',', array_map('gettype', $args));
-
-            switch ($match) {
-                //Rectangular matrix - m x n initialized from 2D array
-                case 'array':
-                    $this->m = count($args[0]);
-                    $this->n = count($args[0][0]);
-                    $this->A = $args[0];
-
-                    break;
-                //Square matrix - n x n
-                case 'integer':
-                    $this->m = $args[0];
-                    $this->n = $args[0];
-                    $this->A = array_fill(0, $this->m, array_fill(0, $this->n, 0));
-
-                    break;
-                //Rectangular matrix - m x n
-                case 'integer,integer':
-                    $this->m = $args[0];
-                    $this->n = $args[1];
-                    $this->A = array_fill(0, $this->m, array_fill(0, $this->n, 0));
-
-                    break;
-                //Rectangular matrix - m x n initialized from packed array
-                case 'array,integer':
-                    $this->m = $args[1];
-                    if ($this->m != 0) {
-                        $this->n = count($args[0]) / $this->m;
-                    } else {
-                        $this->n = 0;
-                    }
-                    if (($this->m * $this->n) == count($args[0])) {
-                        for ($i = 0; $i < $this->m; ++$i) {
-                            for ($j = 0; $j < $this->n; ++$j) {
-                                $this->A[$i][$j] = $args[0][$i + $j * $this->m];
-                            }
-                        }
-                    } else {
-                        throw new CalculationException(self::ARRAY_LENGTH_EXCEPTION);
-                    }
-
-                    break;
-                default:
-                    throw new CalculationException(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
-
-                    break;
-            }
-        } else {
-            throw new CalculationException(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
-        }
-    }
-
-    /**
-     * getArray.
-     *
-     * @return array Matrix array
-     */
-    public function getArray()
-    {
-        return $this->A;
-    }
-
-    /**
-     * getRowDimension.
-     *
-     * @return int Row dimension
-     */
-    public function getRowDimension()
-    {
-        return $this->m;
-    }
-
-    /**
-     * getColumnDimension.
-     *
-     * @return int Column dimension
-     */
-    public function getColumnDimension()
-    {
-        return $this->n;
-    }
-
-    /**
-     * get.
-     *
-     * Get the i,j-th element of the matrix.
-     *
-     * @param int $i Row position
-     * @param int $j Column position
-     *
-     * @return float|int
-     */
-    public function get($i = null, $j = null)
-    {
-        return $this->A[$i][$j];
-    }
-
-    /**
-     * getMatrix.
-     *
-     *    Get a submatrix
-     *
-     * @return Matrix Submatrix
-     */
-    public function getMatrix(...$args)
-    {
-        if (count($args) > 0) {
-            $match = implode(',', array_map('gettype', $args));
-
-            switch ($match) {
-                //A($i0...; $j0...)
-                case 'integer,integer':
-                    [$i0, $j0] = $args;
-                    if ($i0 >= 0) {
-                        $m = $this->m - $i0;
-                    } else {
-                        throw new CalculationException(self::ARGUMENT_BOUNDS_EXCEPTION);
-                    }
-                    if ($j0 >= 0) {
-                        $n = $this->n - $j0;
-                    } else {
-                        throw new CalculationException(self::ARGUMENT_BOUNDS_EXCEPTION);
-                    }
-                    $R = new self($m, $n);
-                    for ($i = $i0; $i < $this->m; ++$i) {
-                        for ($j = $j0; $j < $this->n; ++$j) {
-                            $R->set($i, $j, $this->A[$i][$j]);
-                        }
-                    }
-
-                    return $R;
-
-                    break;
-                //A($i0...$iF; $j0...$jF)
-                case 'integer,integer,integer,integer':
-                    [$i0, $iF, $j0, $jF] = $args;
-                    if (($iF > $i0) && ($this->m >= $iF) && ($i0 >= 0)) {
-                        $m = $iF - $i0;
-                    } else {
-                        throw new CalculationException(self::ARGUMENT_BOUNDS_EXCEPTION);
-                    }
-                    if (($jF > $j0) && ($this->n >= $jF) && ($j0 >= 0)) {
-                        $n = $jF - $j0;
-                    } else {
-                        throw new CalculationException(self::ARGUMENT_BOUNDS_EXCEPTION);
-                    }
-                    $R = new self($m + 1, $n + 1);
-                    for ($i = $i0; $i <= $iF; ++$i) {
-                        for ($j = $j0; $j <= $jF; ++$j) {
-                            $R->set($i - $i0, $j - $j0, $this->A[$i][$j]);
-                        }
-                    }
-
-                    return $R;
-
-                    break;
-                //$R = array of row indices; $C = array of column indices
-                case 'array,array':
-                    [$RL, $CL] = $args;
-                    if (count($RL) > 0) {
-                        $m = count($RL);
-                    } else {
-                        throw new CalculationException(self::ARGUMENT_BOUNDS_EXCEPTION);
-                    }
-                    if (count($CL) > 0) {
-                        $n = count($CL);
-                    } else {
-                        throw new CalculationException(self::ARGUMENT_BOUNDS_EXCEPTION);
-                    }
-                    $R = new self($m, $n);
-                    for ($i = 0; $i < $m; ++$i) {
-                        for ($j = 0; $j < $n; ++$j) {
-                            $R->set($i, $j, $this->A[$RL[$i]][$CL[$j]]);
-                        }
-                    }
-
-                    return $R;
-
-                    break;
-                //A($i0...$iF); $CL = array of column indices
-                case 'integer,integer,array':
-                    [$i0, $iF, $CL] = $args;
-                    if (($iF > $i0) && ($this->m >= $iF) && ($i0 >= 0)) {
-                        $m = $iF - $i0;
-                    } else {
-                        throw new CalculationException(self::ARGUMENT_BOUNDS_EXCEPTION);
-                    }
-                    if (count($CL) > 0) {
-                        $n = count($CL);
-                    } else {
-                        throw new CalculationException(self::ARGUMENT_BOUNDS_EXCEPTION);
-                    }
-                    $R = new self($m, $n);
-                    for ($i = $i0; $i < $iF; ++$i) {
-                        for ($j = 0; $j < $n; ++$j) {
-                            $R->set($i - $i0, $j, $this->A[$i][$CL[$j]]);
-                        }
-                    }
-
-                    return $R;
-
-                    break;
-                //$RL = array of row indices
-                case 'array,integer,integer':
-                    [$RL, $j0, $jF] = $args;
-                    if (count($RL) > 0) {
-                        $m = count($RL);
-                    } else {
-                        throw new CalculationException(self::ARGUMENT_BOUNDS_EXCEPTION);
-                    }
-                    if (($jF >= $j0) && ($this->n >= $jF) && ($j0 >= 0)) {
-                        $n = $jF - $j0;
-                    } else {
-                        throw new CalculationException(self::ARGUMENT_BOUNDS_EXCEPTION);
-                    }
-                    $R = new self($m, $n + 1);
-                    for ($i = 0; $i < $m; ++$i) {
-                        for ($j = $j0; $j <= $jF; ++$j) {
-                            $R->set($i, $j - $j0, $this->A[$RL[$i]][$j]);
-                        }
-                    }
-
-                    return $R;
-
-                    break;
-                default:
-                    throw new CalculationException(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
-
-                    break;
-            }
-        } else {
-            throw new CalculationException(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
-        }
-    }
-
-    /**
-     * checkMatrixDimensions.
-     *
-     *    Is matrix B the same size?
-     *
-     * @param Matrix $B Matrix B
-     *
-     * @return bool
-     */
-    public function checkMatrixDimensions($B = null)
-    {
-        if ($B instanceof self) {
-            if (($this->m == $B->getRowDimension()) && ($this->n == $B->getColumnDimension())) {
-                return true;
-            }
-
-            throw new CalculationException(self::MATRIX_DIMENSION_EXCEPTION);
-        }
-
-        throw new CalculationException(self::ARGUMENT_TYPE_EXCEPTION);
-    }
-
-    //    function checkMatrixDimensions()
-
-    /**
-     * set.
-     *
-     * Set the i,j-th element of the matrix.
-     *
-     * @param int $i Row position
-     * @param int $j Column position
-     * @param float|int $c value
-     */
-    public function set($i = null, $j = null, $c = null): void
-    {
-        // Optimized set version just has this
-        $this->A[$i][$j] = $c;
-    }
-
-    //    function set()
-
-    /**
-     * identity.
-     *
-     * Generate an identity matrix.
-     *
-     * @param int $m Row dimension
-     * @param int $n Column dimension
-     *
-     * @return Matrix Identity matrix
-     */
-    public function identity($m = null, $n = null)
-    {
-        return $this->diagonal($m, $n, 1);
-    }
-
-    /**
-     * diagonal.
-     *
-     *    Generate a diagonal matrix
-     *
-     * @param int $m Row dimension
-     * @param int $n Column dimension
-     * @param mixed $c Diagonal value
-     *
-     * @return Matrix Diagonal matrix
-     */
-    public function diagonal($m = null, $n = null, $c = 1)
-    {
-        $R = new self($m, $n);
-        for ($i = 0; $i < $m; ++$i) {
-            $R->set($i, $i, $c);
-        }
-
-        return $R;
-    }
-
-    /**
-     * getMatrixByRow.
-     *
-     *    Get a submatrix by row index/range
-     *
-     * @param int $i0 Initial row index
-     * @param int $iF Final row index
-     *
-     * @return Matrix Submatrix
-     */
-    public function getMatrixByRow($i0 = null, $iF = null)
-    {
-        if (is_int($i0)) {
-            if (is_int($iF)) {
-                return $this->getMatrix($i0, 0, $iF + 1, $this->n);
-            }
-
-            return $this->getMatrix($i0, 0, $i0 + 1, $this->n);
-        }
-
-        throw new CalculationException(self::ARGUMENT_TYPE_EXCEPTION);
-    }
-
-    /**
-     * getMatrixByCol.
-     *
-     *    Get a submatrix by column index/range
-     *
-     * @param int $j0 Initial column index
-     * @param int $jF Final column index
-     *
-     * @return Matrix Submatrix
-     */
-    public function getMatrixByCol($j0 = null, $jF = null)
-    {
-        if (is_int($j0)) {
-            if (is_int($jF)) {
-                return $this->getMatrix(0, $j0, $this->m, $jF + 1);
-            }
-
-            return $this->getMatrix(0, $j0, $this->m, $j0 + 1);
-        }
-
-        throw new CalculationException(self::ARGUMENT_TYPE_EXCEPTION);
-    }
-
-    /**
-     * transpose.
-     *
-     *    Tranpose matrix
-     *
-     * @return Matrix Transposed matrix
-     */
-    public function transpose()
-    {
-        $R = new self($this->n, $this->m);
-        for ($i = 0; $i < $this->m; ++$i) {
-            for ($j = 0; $j < $this->n; ++$j) {
-                $R->set($j, $i, $this->A[$i][$j]);
-            }
-        }
-
-        return $R;
-    }
-
-    //    function transpose()
-
-    /**
-     * trace.
-     *
-     *    Sum of diagonal elements
-     *
-     * @return float Sum of diagonal elements
-     */
-    public function trace()
-    {
-        $s = 0;
-        $n = min($this->m, $this->n);
-        for ($i = 0; $i < $n; ++$i) {
-            $s += $this->A[$i][$i];
-        }
-
-        return $s;
-    }
-
-    /**
-     * plus.
-     *
-     *    A + B
-     *
-     * @return Matrix Sum
-     */
-    public function plus(...$args)
-    {
-        if (count($args) > 0) {
-            $match = implode(',', array_map('gettype', $args));
-
-            switch ($match) {
-                case 'object':
-                    if ($args[0] instanceof self) {
-                        $M = $args[0];
-                    } else {
-                        throw new CalculationException(self::ARGUMENT_TYPE_EXCEPTION);
-                    }
-
-                    break;
-                case 'array':
-                    $M = new self($args[0]);
-
-                    break;
-                default:
-                    throw new CalculationException(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
-
-                    break;
-            }
-            $this->checkMatrixDimensions($M);
-            for ($i = 0; $i < $this->m; ++$i) {
-                for ($j = 0; $j < $this->n; ++$j) {
-                    $M->set($i, $j, $M->get($i, $j) + $this->A[$i][$j]);
-                }
-            }
-
-            return $M;
-        }
-
-        throw new CalculationException(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
-    }
-
-    /**
-     * plusEquals.
-     *
-     *    A = A + B
-     *
-     * @return $this
-     */
-    public function plusEquals(...$args)
-    {
-        if (count($args) > 0) {
-            $match = implode(',', array_map('gettype', $args));
-
-            switch ($match) {
-                case 'object':
-                    if ($args[0] instanceof self) {
-                        $M = $args[0];
-                    } else {
-                        throw new CalculationException(self::ARGUMENT_TYPE_EXCEPTION);
-                    }
-
-                    break;
-                case 'array':
-                    $M = new self($args[0]);
-
-                    break;
-                default:
-                    throw new CalculationException(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
-
-                    break;
-            }
-            $this->checkMatrixDimensions($M);
-            for ($i = 0; $i < $this->m; ++$i) {
-                for ($j = 0; $j < $this->n; ++$j) {
-                    $validValues = true;
-                    $value = $M->get($i, $j);
-                    if ((is_string($this->A[$i][$j])) && (strlen($this->A[$i][$j]) > 0) && (!is_numeric($this->A[$i][$j]))) {
-                        $this->A[$i][$j] = trim($this->A[$i][$j], '"');
-                        $validValues &= StringHelper::convertToNumberIfFraction($this->A[$i][$j]);
-                    }
-                    if ((is_string($value)) && (strlen($value) > 0) && (!is_numeric($value))) {
-                        $value = trim($value, '"');
-                        $validValues &= StringHelper::convertToNumberIfFraction($value);
-                    }
-                    if ($validValues) {
-                        $this->A[$i][$j] += $value;
-                    } else {
-                        $this->A[$i][$j] = Functions::NAN();
-                    }
-                }
-            }
-
-            return $this;
-        }
-
-        throw new CalculationException(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
-    }
-
-    /**
-     * minus.
-     *
-     *    A - B
-     *
-     * @return Matrix Sum
-     */
-    public function minus(...$args)
-    {
-        if (count($args) > 0) {
-            $match = implode(',', array_map('gettype', $args));
-
-            switch ($match) {
-                case 'object':
-                    if ($args[0] instanceof self) {
-                        $M = $args[0];
-                    } else {
-                        throw new CalculationException(self::ARGUMENT_TYPE_EXCEPTION);
-                    }
-
-                    break;
-                case 'array':
-                    $M = new self($args[0]);
-
-                    break;
-                default:
-                    throw new CalculationException(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
-
-                    break;
-            }
-            $this->checkMatrixDimensions($M);
-            for ($i = 0; $i < $this->m; ++$i) {
-                for ($j = 0; $j < $this->n; ++$j) {
-                    $M->set($i, $j, $M->get($i, $j) - $this->A[$i][$j]);
-                }
-            }
-
-            return $M;
-        }
-
-        throw new CalculationException(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
-    }
-
-    /**
-     * minusEquals.
-     *
-     *    A = A - B
-     *
-     * @return $this
-     */
-    public function minusEquals(...$args)
-    {
-        if (count($args) > 0) {
-            $match = implode(',', array_map('gettype', $args));
-
-            switch ($match) {
-                case 'object':
-                    if ($args[0] instanceof self) {
-                        $M = $args[0];
-                    } else {
-                        throw new CalculationException(self::ARGUMENT_TYPE_EXCEPTION);
-                    }
-
-                    break;
-                case 'array':
-                    $M = new self($args[0]);
-
-                    break;
-                default:
-                    throw new CalculationException(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
-
-                    break;
-            }
-            $this->checkMatrixDimensions($M);
-            for ($i = 0; $i < $this->m; ++$i) {
-                for ($j = 0; $j < $this->n; ++$j) {
-                    $validValues = true;
-                    $value = $M->get($i, $j);
-                    if ((is_string($this->A[$i][$j])) && (strlen($this->A[$i][$j]) > 0) && (!is_numeric($this->A[$i][$j]))) {
-                        $this->A[$i][$j] = trim($this->A[$i][$j], '"');
-                        $validValues &= StringHelper::convertToNumberIfFraction($this->A[$i][$j]);
-                    }
-                    if ((is_string($value)) && (strlen($value) > 0) && (!is_numeric($value))) {
-                        $value = trim($value, '"');
-                        $validValues &= StringHelper::convertToNumberIfFraction($value);
-                    }
-                    if ($validValues) {
-                        $this->A[$i][$j] -= $value;
-                    } else {
-                        $this->A[$i][$j] = Functions::NAN();
-                    }
-                }
-            }
-
-            return $this;
-        }
-
-        throw new CalculationException(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
-    }
-
-    /**
-     * arrayTimes.
-     *
-     *    Element-by-element multiplication
-     *    Cij = Aij * Bij
-     *
-     * @return Matrix Matrix Cij
-     */
-    public function arrayTimes(...$args)
-    {
-        if (count($args) > 0) {
-            $match = implode(',', array_map('gettype', $args));
-
-            switch ($match) {
-                case 'object':
-                    if ($args[0] instanceof self) {
-                        $M = $args[0];
-                    } else {
-                        throw new CalculationException(self::ARGUMENT_TYPE_EXCEPTION);
-                    }
-
-                    break;
-                case 'array':
-                    $M = new self($args[0]);
-
-                    break;
-                default:
-                    throw new CalculationException(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
-
-                    break;
-            }
-            $this->checkMatrixDimensions($M);
-            for ($i = 0; $i < $this->m; ++$i) {
-                for ($j = 0; $j < $this->n; ++$j) {
-                    $M->set($i, $j, $M->get($i, $j) * $this->A[$i][$j]);
-                }
-            }
-
-            return $M;
-        }
-
-        throw new CalculationException(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
-    }
-
-    /**
-     * arrayTimesEquals.
-     *
-     *    Element-by-element multiplication
-     *    Aij = Aij * Bij
-     *
-     * @return $this
-     */
-    public function arrayTimesEquals(...$args)
-    {
-        if (count($args) > 0) {
-            $match = implode(',', array_map('gettype', $args));
-
-            switch ($match) {
-                case 'object':
-                    if ($args[0] instanceof self) {
-                        $M = $args[0];
-                    } else {
-                        throw new CalculationException(self::ARGUMENT_TYPE_EXCEPTION);
-                    }
-
-                    break;
-                case 'array':
-                    $M = new self($args[0]);
-
-                    break;
-                default:
-                    throw new CalculationException(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
-
-                    break;
-            }
-            $this->checkMatrixDimensions($M);
-            for ($i = 0; $i < $this->m; ++$i) {
-                for ($j = 0; $j < $this->n; ++$j) {
-                    $validValues = true;
-                    $value = $M->get($i, $j);
-                    if ((is_string($this->A[$i][$j])) && (strlen($this->A[$i][$j]) > 0) && (!is_numeric($this->A[$i][$j]))) {
-                        $this->A[$i][$j] = trim($this->A[$i][$j], '"');
-                        $validValues &= StringHelper::convertToNumberIfFraction($this->A[$i][$j]);
-                    }
-                    if ((is_string($value)) && (strlen($value) > 0) && (!is_numeric($value))) {
-                        $value = trim($value, '"');
-                        $validValues &= StringHelper::convertToNumberIfFraction($value);
-                    }
-                    if ($validValues) {
-                        $this->A[$i][$j] *= $value;
-                    } else {
-                        $this->A[$i][$j] = Functions::NAN();
-                    }
-                }
-            }
-
-            return $this;
-        }
-
-        throw new CalculationException(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
-    }
-
-    /**
-     * arrayRightDivide.
-     *
-     *    Element-by-element right division
-     *    A / B
-     *
-     * @return Matrix Division result
-     */
-    public function arrayRightDivide(...$args)
-    {
-        if (count($args) > 0) {
-            $match = implode(',', array_map('gettype', $args));
-
-            switch ($match) {
-                case 'object':
-                    if ($args[0] instanceof self) {
-                        $M = $args[0];
-                    } else {
-                        throw new CalculationException(self::ARGUMENT_TYPE_EXCEPTION);
-                    }
-
-                    break;
-                case 'array':
-                    $M = new self($args[0]);
-
-                    break;
-                default:
-                    throw new CalculationException(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
-
-                    break;
-            }
-            $this->checkMatrixDimensions($M);
-            for ($i = 0; $i < $this->m; ++$i) {
-                for ($j = 0; $j < $this->n; ++$j) {
-                    $validValues = true;
-                    $value = $M->get($i, $j);
-                    if ((is_string($this->A[$i][$j])) && (strlen($this->A[$i][$j]) > 0) && (!is_numeric($this->A[$i][$j]))) {
-                        $this->A[$i][$j] = trim($this->A[$i][$j], '"');
-                        $validValues &= StringHelper::convertToNumberIfFraction($this->A[$i][$j]);
-                    }
-                    if ((is_string($value)) && (strlen($value) > 0) && (!is_numeric($value))) {
-                        $value = trim($value, '"');
-                        $validValues &= StringHelper::convertToNumberIfFraction($value);
-                    }
-                    if ($validValues) {
-                        if ($value == 0) {
-                            //    Trap for Divide by Zero error
-                            $M->set($i, $j, '#DIV/0!');
-                        } else {
-                            $M->set($i, $j, $this->A[$i][$j] / $value);
-                        }
-                    } else {
-                        $M->set($i, $j, Functions::NAN());
-                    }
-                }
-            }
-
-            return $M;
-        }
-
-        throw new CalculationException(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
-    }
-
-    /**
-     * arrayRightDivideEquals.
-     *
-     *    Element-by-element right division
-     *    Aij = Aij / Bij
-     *
-     * @return Matrix Matrix Aij
-     */
-    public function arrayRightDivideEquals(...$args)
-    {
-        if (count($args) > 0) {
-            $match = implode(',', array_map('gettype', $args));
-
-            switch ($match) {
-                case 'object':
-                    if ($args[0] instanceof self) {
-                        $M = $args[0];
-                    } else {
-                        throw new CalculationException(self::ARGUMENT_TYPE_EXCEPTION);
-                    }
-
-                    break;
-                case 'array':
-                    $M = new self($args[0]);
-
-                    break;
-                default:
-                    throw new CalculationException(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
-
-                    break;
-            }
-            $this->checkMatrixDimensions($M);
-            for ($i = 0; $i < $this->m; ++$i) {
-                for ($j = 0; $j < $this->n; ++$j) {
-                    $this->A[$i][$j] = $this->A[$i][$j] / $M->get($i, $j);
-                }
-            }
-
-            return $M;
-        }
-
-        throw new CalculationException(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
-    }
-
-    /**
-     * arrayLeftDivide.
-     *
-     *    Element-by-element Left division
-     *    A / B
-     *
-     * @return Matrix Division result
-     */
-    public function arrayLeftDivide(...$args)
-    {
-        if (count($args) > 0) {
-            $match = implode(',', array_map('gettype', $args));
-
-            switch ($match) {
-                case 'object':
-                    if ($args[0] instanceof self) {
-                        $M = $args[0];
-                    } else {
-                        throw new CalculationException(self::ARGUMENT_TYPE_EXCEPTION);
-                    }
-
-                    break;
-                case 'array':
-                    $M = new self($args[0]);
-
-                    break;
-                default:
-                    throw new CalculationException(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
-
-                    break;
-            }
-            $this->checkMatrixDimensions($M);
-            for ($i = 0; $i < $this->m; ++$i) {
-                for ($j = 0; $j < $this->n; ++$j) {
-                    $M->set($i, $j, $M->get($i, $j) / $this->A[$i][$j]);
-                }
-            }
-
-            return $M;
-        }
-
-        throw new CalculationException(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
-    }
-
-    /**
-     * arrayLeftDivideEquals.
-     *
-     *    Element-by-element Left division
-     *    Aij = Aij / Bij
-     *
-     * @return Matrix Matrix Aij
-     */
-    public function arrayLeftDivideEquals(...$args)
-    {
-        if (count($args) > 0) {
-            $match = implode(',', array_map('gettype', $args));
-
-            switch ($match) {
-                case 'object':
-                    if ($args[0] instanceof self) {
-                        $M = $args[0];
-                    } else {
-                        throw new CalculationException(self::ARGUMENT_TYPE_EXCEPTION);
-                    }
-
-                    break;
-                case 'array':
-                    $M = new self($args[0]);
-
-                    break;
-                default:
-                    throw new CalculationException(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
-
-                    break;
-            }
-            $this->checkMatrixDimensions($M);
-            for ($i = 0; $i < $this->m; ++$i) {
-                for ($j = 0; $j < $this->n; ++$j) {
-                    $this->A[$i][$j] = $M->get($i, $j) / $this->A[$i][$j];
-                }
-            }
-
-            return $M;
-        }
-
-        throw new CalculationException(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
-    }
-
-    /**
-     * times.
-     *
-     *    Matrix multiplication
-     *
-     * @return Matrix Product
-     */
-    public function times(...$args)
-    {
-        if (count($args) > 0) {
-            $match = implode(',', array_map('gettype', $args));
-
-            switch ($match) {
-                case 'object':
-                    if ($args[0] instanceof self) {
-                        $B = $args[0];
-                    } else {
-                        throw new CalculationException(self::ARGUMENT_TYPE_EXCEPTION);
-                    }
-                    if ($this->n == $B->m) {
-                        $C = new self($this->m, $B->n);
-                        for ($j = 0; $j < $B->n; ++$j) {
-                            $Bcolj = [];
-                            for ($k = 0; $k < $this->n; ++$k) {
-                                $Bcolj[$k] = $B->A[$k][$j];
-                            }
-                            for ($i = 0; $i < $this->m; ++$i) {
-                                $Arowi = $this->A[$i];
-                                $s = 0;
-                                for ($k = 0; $k < $this->n; ++$k) {
-                                    $s += $Arowi[$k] * $Bcolj[$k];
-                                }
-                                $C->A[$i][$j] = $s;
-                            }
-                        }
-
-                        return $C;
-                    }
-
-                    throw new CalculationException(self::MATRIX_DIMENSION_EXCEPTION);
-                case 'array':
-                    $B = new self($args[0]);
-                    if ($this->n == $B->m) {
-                        $C = new self($this->m, $B->n);
-                        for ($i = 0; $i < $C->m; ++$i) {
-                            for ($j = 0; $j < $C->n; ++$j) {
-                                $s = '0';
-                                for ($k = 0; $k < $C->n; ++$k) {
-                                    $s += $this->A[$i][$k] * $B->A[$k][$j];
-                                }
-                                $C->A[$i][$j] = $s;
-                            }
-                        }
-
-                        return $C;
-                    }
-
-                    throw new CalculationException(self::MATRIX_DIMENSION_EXCEPTION);
-                case 'integer':
-                    $C = new self($this->A);
-                    for ($i = 0; $i < $C->m; ++$i) {
-                        for ($j = 0; $j < $C->n; ++$j) {
-                            $C->A[$i][$j] *= $args[0];
-                        }
-                    }
-
-                    return $C;
-                case 'double':
-                    $C = new self($this->m, $this->n);
-                    for ($i = 0; $i < $C->m; ++$i) {
-                        for ($j = 0; $j < $C->n; ++$j) {
-                            $C->A[$i][$j] = $args[0] * $this->A[$i][$j];
-                        }
-                    }
-
-                    return $C;
-                case 'float':
-                    $C = new self($this->A);
-                    for ($i = 0; $i < $C->m; ++$i) {
-                        for ($j = 0; $j < $C->n; ++$j) {
-                            $C->A[$i][$j] *= $args[0];
-                        }
-                    }
-
-                    return $C;
-                default:
-                    throw new CalculationException(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
-            }
-        } else {
-            throw new CalculationException(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
-        }
-    }
-
-    /**
-     * power.
-     *
-     *    A = A ^ B
-     *
-     * @return $this
-     */
-    public function power(...$args)
-    {
-        if (count($args) > 0) {
-            $match = implode(',', array_map('gettype', $args));
-
-            switch ($match) {
-                case 'object':
-                    if ($args[0] instanceof self) {
-                        $M = $args[0];
-                    } else {
-                        throw new CalculationException(self::ARGUMENT_TYPE_EXCEPTION);
-                    }
-
-                    break;
-                case 'array':
-                    $M = new self($args[0]);
-
-                    break;
-                default:
-                    throw new CalculationException(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
-
-                    break;
-            }
-            $this->checkMatrixDimensions($M);
-            for ($i = 0; $i < $this->m; ++$i) {
-                for ($j = 0; $j < $this->n; ++$j) {
-                    $validValues = true;
-                    $value = $M->get($i, $j);
-                    if ((is_string($this->A[$i][$j])) && (strlen($this->A[$i][$j]) > 0) && (!is_numeric($this->A[$i][$j]))) {
-                        $this->A[$i][$j] = trim($this->A[$i][$j], '"');
-                        $validValues &= StringHelper::convertToNumberIfFraction($this->A[$i][$j]);
-                    }
-                    if ((is_string($value)) && (strlen($value) > 0) && (!is_numeric($value))) {
-                        $value = trim($value, '"');
-                        $validValues &= StringHelper::convertToNumberIfFraction($value);
-                    }
-                    if ($validValues) {
-                        $this->A[$i][$j] = $this->A[$i][$j] ** $value;
-                    } else {
-                        $this->A[$i][$j] = Functions::NAN();
-                    }
-                }
-            }
-
-            return $this;
-        }
-
-        throw new CalculationException(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
-    }
-
-    /**
-     * concat.
-     *
-     *    A = A & B
-     *
-     * @return $this
-     */
-    public function concat(...$args)
-    {
-        if (count($args) > 0) {
-            $match = implode(',', array_map('gettype', $args));
-
-            switch ($match) {
-                case 'object':
-                    if ($args[0] instanceof self) {
-                        $M = $args[0];
-                    } else {
-                        throw new CalculationException(self::ARGUMENT_TYPE_EXCEPTION);
-                    }
-
-                    break;
-                case 'array':
-                    $M = new self($args[0]);
-
-                    break;
-                default:
-                    throw new CalculationException(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
-
-                    break;
-            }
-            $this->checkMatrixDimensions($M);
-            for ($i = 0; $i < $this->m; ++$i) {
-                for ($j = 0; $j < $this->n; ++$j) {
-                    $this->A[$i][$j] = trim($this->A[$i][$j], '"') . trim($M->get($i, $j), '"');
-                }
-            }
-
-            return $this;
-        }
-
-        throw new CalculationException(self::POLYMORPHIC_ARGUMENT_EXCEPTION);
-    }
-
-    /**
-     * Solve A*X = B.
-     *
-     * @param Matrix $B Right hand side
-     *
-     * @return Matrix ... Solution if A is square, least squares solution otherwise
-     */
-    public function solve(self $B)
-    {
-        if ($this->m == $this->n) {
-            $LU = new LUDecomposition($this);
-
-            return $LU->solve($B);
-        }
-        $QR = new QRDecomposition($this);
-
-        return $QR->solve($B);
-    }
-
-    /**
-     * Matrix inverse or pseudoinverse.
-     *
-     * @return Matrix ... Inverse(A) if A is square, pseudoinverse otherwise.
-     */
-    public function inverse()
-    {
-        return $this->solve($this->identity($this->m, $this->m));
-    }
-
-    /**
-     * det.
-     *
-     *    Calculate determinant
-     *
-     * @return float Determinant
-     */
-    public function det()
-    {
-        $L = new LUDecomposition($this);
-
-        return $L->det();
-    }
-}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/QRDecomposition.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/QRDecomposition.php
deleted file mode 100644
index 9b51f41390..0000000000
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/QRDecomposition.php
+++ /dev/null
@@ -1,245 +0,0 @@
-<?php
-
-namespace PhpOffice\PhpSpreadsheet\Shared\JAMA;
-
-use PhpOffice\PhpSpreadsheet\Calculation\Exception as CalculationException;
-
-/**
- *    For an m-by-n matrix A with m >= n, the QR decomposition is an m-by-n
- *    orthogonal matrix Q and an n-by-n upper triangular matrix R so that
- *    A = Q*R.
- *
- *    The QR decompostion always exists, even if the matrix does not have
- *    full rank, so the constructor will never fail.  The primary use of the
- *    QR decomposition is in the least squares solution of nonsquare systems
- *    of simultaneous linear equations.  This will fail if isFullRank()
- *    returns false.
- *
- * @author  Paul Meagher
- *
- * @version 1.1
- */
-class QRDecomposition
-{
-    const MATRIX_RANK_EXCEPTION = 'Can only perform operation on full-rank matrix.';
-
-    /**
-     * Array for internal storage of decomposition.
-     *
-     * @var array
-     */
-    private $QR = [];
-
-    /**
-     * Row dimension.
-     *
-     * @var int
-     */
-    private $m;
-
-    /**
-     * Column dimension.
-     *
-     * @var int
-     */
-    private $n;
-
-    /**
-     * Array for internal storage of diagonal of R.
-     *
-     * @var array
-     */
-    private $Rdiag = [];
-
-    /**
-     * QR Decomposition computed by Householder reflections.
-     *
-     * @param Matrix $A Rectangular matrix
-     */
-    public function __construct(Matrix $A)
-    {
-        // Initialize.
-        $this->QR = $A->getArray();
-        $this->m = $A->getRowDimension();
-        $this->n = $A->getColumnDimension();
-        // Main loop.
-        for ($k = 0; $k < $this->n; ++$k) {
-            // Compute 2-norm of k-th column without under/overflow.
-            $nrm = 0.0;
-            for ($i = $k; $i < $this->m; ++$i) {
-                $nrm = hypo($nrm, $this->QR[$i][$k]);
-            }
-            if ($nrm != 0.0) {
-                // Form k-th Householder vector.
-                if ($this->QR[$k][$k] < 0) {
-                    $nrm = -$nrm;
-                }
-                for ($i = $k; $i < $this->m; ++$i) {
-                    $this->QR[$i][$k] /= $nrm;
-                }
-                $this->QR[$k][$k] += 1.0;
-                // Apply transformation to remaining columns.
-                for ($j = $k + 1; $j < $this->n; ++$j) {
-                    $s = 0.0;
-                    for ($i = $k; $i < $this->m; ++$i) {
-                        $s += $this->QR[$i][$k] * $this->QR[$i][$j];
-                    }
-                    $s = -$s / $this->QR[$k][$k];
-                    for ($i = $k; $i < $this->m; ++$i) {
-                        $this->QR[$i][$j] += $s * $this->QR[$i][$k];
-                    }
-                }
-            }
-            $this->Rdiag[$k] = -$nrm;
-        }
-    }
-
-    //    function __construct()
-
-    /**
-     *    Is the matrix full rank?
-     *
-     * @return bool true if R, and hence A, has full rank, else false
-     */
-    public function isFullRank()
-    {
-        for ($j = 0; $j < $this->n; ++$j) {
-            if ($this->Rdiag[$j] == 0) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    //    function isFullRank()
-
-    /**
-     * Return the Householder vectors.
-     *
-     * @return Matrix Lower trapezoidal matrix whose columns define the reflections
-     */
-    public function getH()
-    {
-        $H = [];
-        for ($i = 0; $i < $this->m; ++$i) {
-            for ($j = 0; $j < $this->n; ++$j) {
-                if ($i >= $j) {
-                    $H[$i][$j] = $this->QR[$i][$j];
-                } else {
-                    $H[$i][$j] = 0.0;
-                }
-            }
-        }
-
-        return new Matrix($H);
-    }
-
-    //    function getH()
-
-    /**
-     * Return the upper triangular factor.
-     *
-     * @return Matrix upper triangular factor
-     */
-    public function getR()
-    {
-        $R = [];
-        for ($i = 0; $i < $this->n; ++$i) {
-            for ($j = 0; $j < $this->n; ++$j) {
-                if ($i < $j) {
-                    $R[$i][$j] = $this->QR[$i][$j];
-                } elseif ($i == $j) {
-                    $R[$i][$j] = $this->Rdiag[$i];
-                } else {
-                    $R[$i][$j] = 0.0;
-                }
-            }
-        }
-
-        return new Matrix($R);
-    }
-
-    //    function getR()
-
-    /**
-     * Generate and return the (economy-sized) orthogonal factor.
-     *
-     * @return Matrix orthogonal factor
-     */
-    public function getQ()
-    {
-        $Q = [];
-        for ($k = $this->n - 1; $k >= 0; --$k) {
-            for ($i = 0; $i < $this->m; ++$i) {
-                $Q[$i][$k] = 0.0;
-            }
-            $Q[$k][$k] = 1.0;
-            for ($j = $k; $j < $this->n; ++$j) {
-                if ($this->QR[$k][$k] != 0) {
-                    $s = 0.0;
-                    for ($i = $k; $i < $this->m; ++$i) {
-                        $s += $this->QR[$i][$k] * $Q[$i][$j];
-                    }
-                    $s = -$s / $this->QR[$k][$k];
-                    for ($i = $k; $i < $this->m; ++$i) {
-                        $Q[$i][$j] += $s * $this->QR[$i][$k];
-                    }
-                }
-            }
-        }
-
-        return new Matrix($Q);
-    }
-
-    //    function getQ()
-
-    /**
-     * Least squares solution of A*X = B.
-     *
-     * @param Matrix $B a Matrix with as many rows as A and any number of columns
-     *
-     * @return Matrix matrix that minimizes the two norm of Q*R*X-B
-     */
-    public function solve(Matrix $B)
-    {
-        if ($B->getRowDimension() == $this->m) {
-            if ($this->isFullRank()) {
-                // Copy right hand side
-                $nx = $B->getColumnDimension();
-                $X = $B->getArray();
-                // Compute Y = transpose(Q)*B
-                for ($k = 0; $k < $this->n; ++$k) {
-                    for ($j = 0; $j < $nx; ++$j) {
-                        $s = 0.0;
-                        for ($i = $k; $i < $this->m; ++$i) {
-                            $s += $this->QR[$i][$k] * $X[$i][$j];
-                        }
-                        $s = -$s / $this->QR[$k][$k];
-                        for ($i = $k; $i < $this->m; ++$i) {
-                            $X[$i][$j] += $s * $this->QR[$i][$k];
-                        }
-                    }
-                }
-                // Solve R*X = Y;
-                for ($k = $this->n - 1; $k >= 0; --$k) {
-                    for ($j = 0; $j < $nx; ++$j) {
-                        $X[$k][$j] /= $this->Rdiag[$k];
-                    }
-                    for ($i = 0; $i < $k; ++$i) {
-                        for ($j = 0; $j < $nx; ++$j) {
-                            $X[$i][$j] -= $X[$k][$j] * $this->QR[$i][$k];
-                        }
-                    }
-                }
-                $X = new Matrix($X);
-
-                return $X->getMatrix(0, $this->n - 1, 0, $nx);
-            }
-
-            throw new CalculationException(self::MATRIX_RANK_EXCEPTION);
-        }
-
-        throw new CalculationException(Matrix::MATRIX_DIMENSION_EXCEPTION);
-    }
-}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/SingularValueDecomposition.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/SingularValueDecomposition.php
deleted file mode 100644
index 6c8999d028..0000000000
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/SingularValueDecomposition.php
+++ /dev/null
@@ -1,529 +0,0 @@
-<?php
-
-namespace PhpOffice\PhpSpreadsheet\Shared\JAMA;
-
-/**
- *    For an m-by-n matrix A with m >= n, the singular value decomposition is
- *    an m-by-n orthogonal matrix U, an n-by-n diagonal matrix S, and
- *    an n-by-n orthogonal matrix V so that A = U*S*V'.
- *
- *    The singular values, sigma[$k] = S[$k][$k], are ordered so that
- *    sigma[0] >= sigma[1] >= ... >= sigma[n-1].
- *
- *    The singular value decompostion always exists, so the constructor will
- *    never fail.  The matrix condition number and the effective numerical
- *    rank can be computed from this decomposition.
- *
- *    @author  Paul Meagher
- *
- *    @version 1.1
- */
-class SingularValueDecomposition
-{
-    /**
-     * Internal storage of U.
-     *
-     * @var array
-     */
-    private $U = [];
-
-    /**
-     * Internal storage of V.
-     *
-     * @var array
-     */
-    private $V = [];
-
-    /**
-     * Internal storage of singular values.
-     *
-     * @var array
-     */
-    private $s = [];
-
-    /**
-     * Row dimension.
-     *
-     * @var int
-     */
-    private $m;
-
-    /**
-     * Column dimension.
-     *
-     * @var int
-     */
-    private $n;
-
-    /**
-     * Construct the singular value decomposition.
-     *
-     * Derived from LINPACK code.
-     *
-     * @param mixed $Arg Rectangular matrix
-     */
-    public function __construct($Arg)
-    {
-        // Initialize.
-        $A = $Arg->getArray();
-        $this->m = $Arg->getRowDimension();
-        $this->n = $Arg->getColumnDimension();
-        $nu = min($this->m, $this->n);
-        $e = [];
-        $work = [];
-        $wantu = true;
-        $wantv = true;
-        $nct = min($this->m - 1, $this->n);
-        $nrt = max(0, min($this->n - 2, $this->m));
-
-        // Reduce A to bidiagonal form, storing the diagonal elements
-        // in s and the super-diagonal elements in e.
-        $kMax = max($nct, $nrt);
-        for ($k = 0; $k < $kMax; ++$k) {
-            if ($k < $nct) {
-                // Compute the transformation for the k-th column and
-                // place the k-th diagonal in s[$k].
-                // Compute 2-norm of k-th column without under/overflow.
-                $this->s[$k] = 0;
-                for ($i = $k; $i < $this->m; ++$i) {
-                    $this->s[$k] = hypo($this->s[$k], $A[$i][$k]);
-                }
-                if ($this->s[$k] != 0.0) {
-                    if ($A[$k][$k] < 0.0) {
-                        $this->s[$k] = -$this->s[$k];
-                    }
-                    for ($i = $k; $i < $this->m; ++$i) {
-                        $A[$i][$k] /= $this->s[$k];
-                    }
-                    $A[$k][$k] += 1.0;
-                }
-                $this->s[$k] = -$this->s[$k];
-            }
-
-            for ($j = $k + 1; $j < $this->n; ++$j) {
-                if (($k < $nct) & ($this->s[$k] != 0.0)) {
-                    // Apply the transformation.
-                    $t = 0;
-                    for ($i = $k; $i < $this->m; ++$i) {
-                        $t += $A[$i][$k] * $A[$i][$j];
-                    }
-                    $t = -$t / $A[$k][$k];
-                    for ($i = $k; $i < $this->m; ++$i) {
-                        $A[$i][$j] += $t * $A[$i][$k];
-                    }
-                    // Place the k-th row of A into e for the
-                    // subsequent calculation of the row transformation.
-                    $e[$j] = $A[$k][$j];
-                }
-            }
-
-            if ($wantu && ($k < $nct)) {
-                // Place the transformation in U for subsequent back
-                // multiplication.
-                for ($i = $k; $i < $this->m; ++$i) {
-                    $this->U[$i][$k] = $A[$i][$k];
-                }
-            }
-
-            if ($k < $nrt) {
-                // Compute the k-th row transformation and place the
-                // k-th super-diagonal in e[$k].
-                // Compute 2-norm without under/overflow.
-                $e[$k] = 0;
-                for ($i = $k + 1; $i < $this->n; ++$i) {
-                    $e[$k] = hypo($e[$k], $e[$i]);
-                }
-                if ($e[$k] != 0.0) {
-                    if ($e[$k + 1] < 0.0) {
-                        $e[$k] = -$e[$k];
-                    }
-                    for ($i = $k + 1; $i < $this->n; ++$i) {
-                        $e[$i] /= $e[$k];
-                    }
-                    $e[$k + 1] += 1.0;
-                }
-                $e[$k] = -$e[$k];
-                if (($k + 1 < $this->m) && ($e[$k] != 0.0)) {
-                    // Apply the transformation.
-                    for ($i = $k + 1; $i < $this->m; ++$i) {
-                        $work[$i] = 0.0;
-                    }
-                    for ($j = $k + 1; $j < $this->n; ++$j) {
-                        for ($i = $k + 1; $i < $this->m; ++$i) {
-                            $work[$i] += $e[$j] * $A[$i][$j];
-                        }
-                    }
-                    for ($j = $k + 1; $j < $this->n; ++$j) {
-                        $t = -$e[$j] / $e[$k + 1];
-                        for ($i = $k + 1; $i < $this->m; ++$i) {
-                            $A[$i][$j] += $t * $work[$i];
-                        }
-                    }
-                }
-                if ($wantv) {
-                    // Place the transformation in V for subsequent
-                    // back multiplication.
-                    for ($i = $k + 1; $i < $this->n; ++$i) {
-                        $this->V[$i][$k] = $e[$i];
-                    }
-                }
-            }
-        }
-
-        // Set up the final bidiagonal matrix or order p.
-        $p = min($this->n, $this->m + 1);
-        if ($nct < $this->n) {
-            $this->s[$nct] = $A[$nct][$nct];
-        }
-        if ($this->m < $p) {
-            $this->s[$p - 1] = 0.0;
-        }
-        if ($nrt + 1 < $p) {
-            $e[$nrt] = $A[$nrt][$p - 1];
-        }
-        $e[$p - 1] = 0.0;
-        // If required, generate U.
-        if ($wantu) {
-            for ($j = $nct; $j < $nu; ++$j) {
-                for ($i = 0; $i < $this->m; ++$i) {
-                    $this->U[$i][$j] = 0.0;
-                }
-                $this->U[$j][$j] = 1.0;
-            }
-            for ($k = $nct - 1; $k >= 0; --$k) {
-                if ($this->s[$k] != 0.0) {
-                    for ($j = $k + 1; $j < $nu; ++$j) {
-                        $t = 0;
-                        for ($i = $k; $i < $this->m; ++$i) {
-                            $t += $this->U[$i][$k] * $this->U[$i][$j];
-                        }
-                        $t = -$t / $this->U[$k][$k];
-                        for ($i = $k; $i < $this->m; ++$i) {
-                            $this->U[$i][$j] += $t * $this->U[$i][$k];
-                        }
-                    }
-                    for ($i = $k; $i < $this->m; ++$i) {
-                        $this->U[$i][$k] = -$this->U[$i][$k];
-                    }
-                    $this->U[$k][$k] = 1.0 + $this->U[$k][$k];
-                    for ($i = 0; $i < $k - 1; ++$i) {
-                        $this->U[$i][$k] = 0.0;
-                    }
-                } else {
-                    for ($i = 0; $i < $this->m; ++$i) {
-                        $this->U[$i][$k] = 0.0;
-                    }
-                    $this->U[$k][$k] = 1.0;
-                }
-            }
-        }
-
-        // If required, generate V.
-        if ($wantv) {
-            for ($k = $this->n - 1; $k >= 0; --$k) {
-                if (($k < $nrt) && ($e[$k] != 0.0)) {
-                    for ($j = $k + 1; $j < $nu; ++$j) {
-                        $t = 0;
-                        for ($i = $k + 1; $i < $this->n; ++$i) {
-                            $t += $this->V[$i][$k] * $this->V[$i][$j];
-                        }
-                        $t = -$t / $this->V[$k + 1][$k];
-                        for ($i = $k + 1; $i < $this->n; ++$i) {
-                            $this->V[$i][$j] += $t * $this->V[$i][$k];
-                        }
-                    }
-                }
-                for ($i = 0; $i < $this->n; ++$i) {
-                    $this->V[$i][$k] = 0.0;
-                }
-                $this->V[$k][$k] = 1.0;
-            }
-        }
-
-        // Main iteration loop for the singular values.
-        $pp = $p - 1;
-        $iter = 0;
-        $eps = 2.0 ** (-52.0);
-
-        while ($p > 0) {
-            // Here is where a test for too many iterations would go.
-            // This section of the program inspects for negligible
-            // elements in the s and e arrays.  On completion the
-            // variables kase and k are set as follows:
-            // kase = 1  if s(p) and e[k-1] are negligible and k<p
-            // kase = 2  if s(k) is negligible and k<p
-            // kase = 3  if e[k-1] is negligible, k<p, and
-            //           s(k), ..., s(p) are not negligible (qr step).
-            // kase = 4  if e(p-1) is negligible (convergence).
-            for ($k = $p - 2; $k >= -1; --$k) {
-                if ($k == -1) {
-                    break;
-                }
-                if (abs($e[$k]) <= $eps * (abs($this->s[$k]) + abs($this->s[$k + 1]))) {
-                    $e[$k] = 0.0;
-
-                    break;
-                }
-            }
-            if ($k == $p - 2) {
-                $kase = 4;
-            } else {
-                for ($ks = $p - 1; $ks >= $k; --$ks) {
-                    if ($ks == $k) {
-                        break;
-                    }
-                    $t = ($ks != $p ? abs($e[$ks]) : 0.) + ($ks != $k + 1 ? abs($e[$ks - 1]) : 0.);
-                    if (abs($this->s[$ks]) <= $eps * $t) {
-                        $this->s[$ks] = 0.0;
-
-                        break;
-                    }
-                }
-                if ($ks == $k) {
-                    $kase = 3;
-                } elseif ($ks == $p - 1) {
-                    $kase = 1;
-                } else {
-                    $kase = 2;
-                    $k = $ks;
-                }
-            }
-            ++$k;
-
-            // Perform the task indicated by kase.
-            switch ($kase) {
-                // Deflate negligible s(p).
-                case 1:
-                    $f = $e[$p - 2];
-                    $e[$p - 2] = 0.0;
-                    for ($j = $p - 2; $j >= $k; --$j) {
-                        $t = hypo($this->s[$j], $f);
-                        $cs = $this->s[$j] / $t;
-                        $sn = $f / $t;
-                        $this->s[$j] = $t;
-                        if ($j != $k) {
-                            $f = -$sn * $e[$j - 1];
-                            $e[$j - 1] = $cs * $e[$j - 1];
-                        }
-                        if ($wantv) {
-                            for ($i = 0; $i < $this->n; ++$i) {
-                                $t = $cs * $this->V[$i][$j] + $sn * $this->V[$i][$p - 1];
-                                $this->V[$i][$p - 1] = -$sn * $this->V[$i][$j] + $cs * $this->V[$i][$p - 1];
-                                $this->V[$i][$j] = $t;
-                            }
-                        }
-                    }
-
-                    break;
-                // Split at negligible s(k).
-                case 2:
-                    $f = $e[$k - 1];
-                    $e[$k - 1] = 0.0;
-                    for ($j = $k; $j < $p; ++$j) {
-                        $t = hypo($this->s[$j], $f);
-                        $cs = $this->s[$j] / $t;
-                        $sn = $f / $t;
-                        $this->s[$j] = $t;
-                        $f = -$sn * $e[$j];
-                        $e[$j] = $cs * $e[$j];
-                        if ($wantu) {
-                            for ($i = 0; $i < $this->m; ++$i) {
-                                $t = $cs * $this->U[$i][$j] + $sn * $this->U[$i][$k - 1];
-                                $this->U[$i][$k - 1] = -$sn * $this->U[$i][$j] + $cs * $this->U[$i][$k - 1];
-                                $this->U[$i][$j] = $t;
-                            }
-                        }
-                    }
-
-                    break;
-                // Perform one qr step.
-                case 3:
-                    // Calculate the shift.
-                    $scale = max(max(max(max(abs($this->s[$p - 1]), abs($this->s[$p - 2])), abs($e[$p - 2])), abs($this->s[$k])), abs($e[$k]));
-                    $sp = $this->s[$p - 1] / $scale;
-                    $spm1 = $this->s[$p - 2] / $scale;
-                    $epm1 = $e[$p - 2] / $scale;
-                    $sk = $this->s[$k] / $scale;
-                    $ek = $e[$k] / $scale;
-                    $b = (($spm1 + $sp) * ($spm1 - $sp) + $epm1 * $epm1) / 2.0;
-                    $c = ($sp * $epm1) * ($sp * $epm1);
-                    $shift = 0.0;
-                    if (($b != 0.0) || ($c != 0.0)) {
-                        $shift = sqrt($b * $b + $c);
-                        if ($b < 0.0) {
-                            $shift = -$shift;
-                        }
-                        $shift = $c / ($b + $shift);
-                    }
-                    $f = ($sk + $sp) * ($sk - $sp) + $shift;
-                    $g = $sk * $ek;
-                    // Chase zeros.
-                    for ($j = $k; $j < $p - 1; ++$j) {
-                        $t = hypo($f, $g);
-                        $cs = $f / $t;
-                        $sn = $g / $t;
-                        if ($j != $k) {
-                            $e[$j - 1] = $t;
-                        }
-                        $f = $cs * $this->s[$j] + $sn * $e[$j];
-                        $e[$j] = $cs * $e[$j] - $sn * $this->s[$j];
-                        $g = $sn * $this->s[$j + 1];
-                        $this->s[$j + 1] = $cs * $this->s[$j + 1];
-                        if ($wantv) {
-                            for ($i = 0; $i < $this->n; ++$i) {
-                                $t = $cs * $this->V[$i][$j] + $sn * $this->V[$i][$j + 1];
-                                $this->V[$i][$j + 1] = -$sn * $this->V[$i][$j] + $cs * $this->V[$i][$j + 1];
-                                $this->V[$i][$j] = $t;
-                            }
-                        }
-                        $t = hypo($f, $g);
-                        $cs = $f / $t;
-                        $sn = $g / $t;
-                        $this->s[$j] = $t;
-                        $f = $cs * $e[$j] + $sn * $this->s[$j + 1];
-                        $this->s[$j + 1] = -$sn * $e[$j] + $cs * $this->s[$j + 1];
-                        $g = $sn * $e[$j + 1];
-                        $e[$j + 1] = $cs * $e[$j + 1];
-                        if ($wantu && ($j < $this->m - 1)) {
-                            for ($i = 0; $i < $this->m; ++$i) {
-                                $t = $cs * $this->U[$i][$j] + $sn * $this->U[$i][$j + 1];
-                                $this->U[$i][$j + 1] = -$sn * $this->U[$i][$j] + $cs * $this->U[$i][$j + 1];
-                                $this->U[$i][$j] = $t;
-                            }
-                        }
-                    }
-                    $e[$p - 2] = $f;
-                    $iter = $iter + 1;
-
-                    break;
-                // Convergence.
-                case 4:
-                    // Make the singular values positive.
-                    if ($this->s[$k] <= 0.0) {
-                        $this->s[$k] = ($this->s[$k] < 0.0 ? -$this->s[$k] : 0.0);
-                        if ($wantv) {
-                            for ($i = 0; $i <= $pp; ++$i) {
-                                $this->V[$i][$k] = -$this->V[$i][$k];
-                            }
-                        }
-                    }
-                    // Order the singular values.
-                    while ($k < $pp) {
-                        if ($this->s[$k] >= $this->s[$k + 1]) {
-                            break;
-                        }
-                        $t = $this->s[$k];
-                        $this->s[$k] = $this->s[$k + 1];
-                        $this->s[$k + 1] = $t;
-                        if ($wantv && ($k < $this->n - 1)) {
-                            for ($i = 0; $i < $this->n; ++$i) {
-                                $t = $this->V[$i][$k + 1];
-                                $this->V[$i][$k + 1] = $this->V[$i][$k];
-                                $this->V[$i][$k] = $t;
-                            }
-                        }
-                        if ($wantu && ($k < $this->m - 1)) {
-                            for ($i = 0; $i < $this->m; ++$i) {
-                                $t = $this->U[$i][$k + 1];
-                                $this->U[$i][$k + 1] = $this->U[$i][$k];
-                                $this->U[$i][$k] = $t;
-                            }
-                        }
-                        ++$k;
-                    }
-                    $iter = 0;
-                    --$p;
-
-                    break;
-            } // end switch
-        } // end while
-    }
-
-    /**
-     * Return the left singular vectors.
-     *
-     * @return Matrix U
-     */
-    public function getU()
-    {
-        return new Matrix($this->U, $this->m, min($this->m + 1, $this->n));
-    }
-
-    /**
-     * Return the right singular vectors.
-     *
-     * @return Matrix V
-     */
-    public function getV()
-    {
-        return new Matrix($this->V);
-    }
-
-    /**
-     * Return the one-dimensional array of singular values.
-     *
-     * @return array diagonal of S
-     */
-    public function getSingularValues()
-    {
-        return $this->s;
-    }
-
-    /**
-     * Return the diagonal matrix of singular values.
-     *
-     * @return Matrix S
-     */
-    public function getS()
-    {
-        $S = [];
-        for ($i = 0; $i < $this->n; ++$i) {
-            for ($j = 0; $j < $this->n; ++$j) {
-                $S[$i][$j] = 0.0;
-            }
-            $S[$i][$i] = $this->s[$i];
-        }
-
-        return new Matrix($S);
-    }
-
-    /**
-     * Two norm.
-     *
-     * @return float max(S)
-     */
-    public function norm2()
-    {
-        return $this->s[0];
-    }
-
-    /**
-     * Two norm condition number.
-     *
-     * @return float max(S)/min(S)
-     */
-    public function cond()
-    {
-        return $this->s[0] / $this->s[min($this->m, $this->n) - 1];
-    }
-
-    /**
-     * Effective numerical matrix rank.
-     *
-     * @return int Number of nonnegligible singular values
-     */
-    public function rank()
-    {
-        $eps = 2.0 ** (-52.0);
-        $tol = max($this->m, $this->n) * $this->s[0] * $eps;
-        $r = 0;
-        $iMax = count($this->s);
-        for ($i = 0; $i < $iMax; ++$i) {
-            if ($this->s[$i] > $tol) {
-                ++$r;
-            }
-        }
-
-        return $r;
-    }
-}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/utils/Maths.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/utils/Maths.php
deleted file mode 100644
index 49877b23ea..0000000000
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/utils/Maths.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- *    Pythagorean Theorem:.
- *
- *    a = 3
- *    b = 4
- *    r = sqrt(square(a) + square(b))
- *    r = 5
- *
- *    r = sqrt(a^2 + b^2) without under/overflow.
- *
- * @param mixed $a
- * @param mixed $b
- *
- * @return float
- */
-function hypo($a, $b)
-{
-    if (abs($a) > abs($b)) {
-        $r = $b / $a;
-        $r = abs($a) * sqrt(1 + $r * $r);
-    } elseif ($b != 0) {
-        $r = $a / $b;
-        $r = abs($b) * sqrt(1 + $r * $r);
-    } else {
-        $r = 0.0;
-    }
-
-    return $r;
-}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE.php
index 8ecfc6be5c..dbf6df80eb 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE.php
@@ -58,67 +58,59 @@ class OLE
 
     /**
      * Array of PPS's found on the OLE container.
-     *
-     * @var array
      */
-    public $_list = [];
+    public array $_list = [];
 
     /**
      * Root directory of OLE container.
-     *
-     * @var Root
      */
-    public $root;
+    public Root $root;
 
     /**
      * Big Block Allocation Table.
      *
      * @var array (blockId => nextBlockId)
      */
-    public $bbat;
+    public array $bbat;
 
     /**
      * Short Block Allocation Table.
      *
      * @var array (blockId => nextBlockId)
      */
-    public $sbat;
+    public array $sbat;
 
     /**
      * Size of big blocks. This is usually 512.
      *
      * @var int number of octets per block
      */
-    public $bigBlockSize;
+    public int $bigBlockSize;
 
     /**
      * Size of small blocks. This is usually 64.
      *
      * @var int number of octets per block
      */
-    public $smallBlockSize;
+    public int $smallBlockSize;
 
     /**
      * Threshold for big blocks.
-     *
-     * @var int
      */
-    public $bigBlockThreshold;
+    public int $bigBlockThreshold;
 
     /**
      * Reads an OLE container from the contents of the file given.
      *
      * @acces public
      *
-     * @param string $file
-     *
      * @return bool true on success, PEAR_Error on failure
      */
-    public function read($file)
+    public function read(string $filename): bool
     {
-        $fh = fopen($file, 'rb');
-        if (!$fh) {
-            throw new ReaderException("Can't open file $file");
+        $fh = @fopen($filename, 'rb');
+        if ($fh === false) {
+            throw new ReaderException("Can't open file $filename");
         }
         $this->_file_handle = $fh;
 
@@ -200,10 +192,8 @@ public function read($file)
 
     /**
      * @param int $blockId byte offset from beginning of file
-     *
-     * @return int
      */
-    public function getBlockOffset($blockId)
+    public function getBlockOffset(int $blockId): int
     {
         return 512 + $blockId * $this->bigBlockSize;
     }
@@ -239,19 +229,22 @@ public function getStream($blockIdOrPps)
             $path .= '&blockId=' . $blockIdOrPps;
         }
 
-        return fopen($path, 'rb');
+        $resource = fopen($path, 'rb');
+        if ($resource === false) {
+            throw new Exception("Unable to open stream $path");
+        }
+
+        return $resource;
     }
 
     /**
      * Reads a signed char.
      *
-     * @param resource $fh file handle
-     *
-     * @return int
+     * @param resource $fileHandle file handle
      */
-    private static function readInt1($fh)
+    private static function readInt1($fileHandle): int
     {
-        [, $tmp] = unpack('c', fread($fh, 1));
+        [, $tmp] = unpack('c', fread($fileHandle, 1) ?: '') ?: [0, 0];
 
         return $tmp;
     }
@@ -259,27 +252,30 @@ private static function readInt1($fh)
     /**
      * Reads an unsigned short (2 octets).
      *
-     * @param resource $fh file handle
-     *
-     * @return int
+     * @param resource $fileHandle file handle
      */
-    private static function readInt2($fh)
+    private static function readInt2($fileHandle): int
     {
-        [, $tmp] = unpack('v', fread($fh, 2));
+        [, $tmp] = unpack('v', fread($fileHandle, 2) ?: '') ?: [0, 0];
 
         return $tmp;
     }
 
+    private const SIGNED_4OCTET_LIMIT = 2147483648;
+
+    private const SIGNED_4OCTET_SUBTRACT = 2 * self::SIGNED_4OCTET_LIMIT;
+
     /**
-     * Reads an unsigned long (4 octets).
-     *
-     * @param resource $fh file handle
+     * Reads long (4 octets), interpreted as if signed on 32-bit system.
      *
-     * @return int
+     * @param resource $fileHandle file handle
      */
-    private static function readInt4($fh)
+    private static function readInt4($fileHandle): int
     {
-        [, $tmp] = unpack('V', fread($fh, 4));
+        [, $tmp] = unpack('V', fread($fileHandle, 4) ?: '') ?: [0, 0];
+        if ($tmp >= self::SIGNED_4OCTET_LIMIT) {
+            $tmp -= self::SIGNED_4OCTET_SUBTRACT;
+        }
 
         return $tmp;
     }
@@ -292,12 +288,12 @@ private static function readInt4($fh)
      *
      * @return bool true on success, PEAR_Error on failure
      */
-    public function readPpsWks($blockId)
+    public function readPpsWks(int $blockId): bool
     {
         $fh = $this->getStream($blockId);
         for ($pos = 0; true; $pos += 128) {
             fseek($fh, $pos, SEEK_SET);
-            $nameUtf16 = fread($fh, 64);
+            $nameUtf16 = (string) fread($fh, 64);
             $nameLength = self::readInt2($fh);
             $nameUtf16 = substr($nameUtf16, 0, $nameLength - 2);
             // Simple conversion from UTF-16LE to ISO-8859-1
@@ -305,7 +301,7 @@ public function readPpsWks($blockId)
             $type = self::readInt1($fh);
             switch ($type) {
                 case self::OLE_PPS_TYPE_ROOT:
-                    $pps = new OLE\PPS\Root(null, null, []);
+                    $pps = new Root(null, null, []);
                     $this->root = $pps;
 
                     break;
@@ -327,8 +323,8 @@ public function readPpsWks($blockId)
             $pps->NextPps = self::readInt4($fh);
             $pps->DirPps = self::readInt4($fh);
             fseek($fh, 20, SEEK_CUR);
-            $pps->Time1st = self::OLE2LocalDate(fread($fh, 8));
-            $pps->Time2nd = self::OLE2LocalDate(fread($fh, 8));
+            $pps->Time1st = self::OLE2LocalDate((string) fread($fh, 8));
+            $pps->Time2nd = self::OLE2LocalDate((string) fread($fh, 8));
             $pps->startBlock = self::readInt4($fh);
             $pps->Size = self::readInt4($fh);
             $pps->No = count($this->_list);
@@ -346,7 +342,7 @@ public function readPpsWks($blockId)
             if ($pps->Type == self::OLE_PPS_TYPE_DIR || $pps->Type == self::OLE_PPS_TYPE_ROOT) {
                 $nos = [$pps->DirPps];
                 $pps->children = [];
-                while ($nos) {
+                while (!empty($nos)) {
                     $no = array_pop($nos);
                     if ($no != -1) {
                         $childPps = $this->_list[$no];
@@ -369,16 +365,16 @@ public function readPpsWks($blockId)
      *
      * @return bool Whether the PPS tree for the given PPS is complete
      */
-    private function ppsTreeComplete($index)
+    private function ppsTreeComplete(int $index): bool
     {
-        return isset($this->_list[$index]) &&
-            ($pps = $this->_list[$index]) &&
-            ($pps->PrevPps == -1 ||
-                $this->ppsTreeComplete($pps->PrevPps)) &&
-            ($pps->NextPps == -1 ||
-                $this->ppsTreeComplete($pps->NextPps)) &&
-            ($pps->DirPps == -1 ||
-                $this->ppsTreeComplete($pps->DirPps));
+        return isset($this->_list[$index])
+            && ($pps = $this->_list[$index])
+            && ($pps->PrevPps == -1
+                || $this->ppsTreeComplete($pps->PrevPps))
+            && ($pps->NextPps == -1
+                || $this->ppsTreeComplete($pps->NextPps))
+            && ($pps->DirPps == -1
+                || $this->ppsTreeComplete($pps->DirPps));
     }
 
     /**
@@ -389,7 +385,7 @@ private function ppsTreeComplete($index)
      *
      * @return bool true if it's a File PPS, false otherwise
      */
-    public function isFile($index)
+    public function isFile(int $index): bool
     {
         if (isset($this->_list[$index])) {
             return $this->_list[$index]->Type == self::OLE_PPS_TYPE_FILE;
@@ -406,7 +402,7 @@ public function isFile($index)
      *
      * @return bool true if it's a Root PPS, false otherwise
      */
-    public function isRoot($index)
+    public function isRoot(int $index): bool
     {
         if (isset($this->_list[$index])) {
             return $this->_list[$index]->Type == self::OLE_PPS_TYPE_ROOT;
@@ -420,7 +416,7 @@ public function isRoot($index)
      *
      * @return int The total number of PPS's found in the OLE container
      */
-    public function ppsTotal()
+    public function ppsTotal(): int
     {
         return count($this->_list);
     }
@@ -438,14 +434,14 @@ public function ppsTotal()
      *
      * @see OLE_PPS_File::getStream()
      */
-    public function getData($index, $position, $length)
+    public function getData(int $index, int $position, int $length): string
     {
         // if position is not valid return empty string
         if (!isset($this->_list[$index]) || ($position >= $this->_list[$index]->Size) || ($position < 0)) {
             return '';
         }
         $fh = $this->getStream($this->_list[$index]);
-        $data = stream_get_contents($fh, $length, $position);
+        $data = (string) stream_get_contents($fh, $length, $position);
         fclose($fh);
 
         return $data;
@@ -459,7 +455,7 @@ public function getData($index, $position, $length)
      *
      * @return int The amount of bytes in data the PPS has
      */
-    public function getDataLength($index)
+    public function getDataLength(int $index): int
     {
         if (isset($this->_list[$index])) {
             return $this->_list[$index]->Size;
@@ -475,7 +471,7 @@ public function getDataLength($index)
      *
      * @return string The string in Unicode
      */
-    public static function ascToUcs($ascii)
+    public static function ascToUcs(string $ascii): string
     {
         $rawname = '';
         $iMax = strlen($ascii);
@@ -495,16 +491,13 @@ public static function ascToUcs($ascii)
      *
      * @return string The string for the OLE container
      */
-    public static function localDateToOLE($date)
+    public static function localDateToOLE($date): string
     {
         if (!$date) {
             return "\x00\x00\x00\x00\x00\x00\x00\x00";
         }
         $dateTime = Date::dateTimeFromTimestamp("$date");
 
-        // factor used for separating numbers into 4 bytes parts
-        $factor = 2 ** 32;
-
         // days from 1-1-1601 until the beggining of UNIX era
         $days = 134774;
         // calculate seconds
@@ -512,22 +505,15 @@ public static function localDateToOLE($date)
         // multiply just to make MS happy
         $big_date *= 10000000;
 
-        $high_part = floor($big_date / $factor);
-        // lower 4 bytes
-        $low_part = floor((($big_date / $factor) - $high_part) * $factor);
-
         // Make HEX string
         $res = '';
 
-        for ($i = 0; $i < 4; ++$i) {
-            $hex = $low_part % 0x100;
-            $res .= pack('c', $hex);
-            $low_part /= 0x100;
-        }
-        for ($i = 0; $i < 4; ++$i) {
-            $hex = $high_part % 0x100;
-            $res .= pack('c', $hex);
-            $high_part /= 0x100;
+        $factor = 2 ** 56;
+        while ($factor >= 1) {
+            $hex = (int) floor($big_date / $factor);
+            $res = pack('c', $hex) . $res;
+            $big_date = fmod($big_date, $factor);
+            $factor /= 256;
         }
 
         return $res;
@@ -540,14 +526,14 @@ public static function localDateToOLE($date)
      *
      * @return float|int The Unix timestamp corresponding to the string
      */
-    public static function OLE2LocalDate($oleTimestamp)
+    public static function OLE2LocalDate(string $oleTimestamp)
     {
         if (strlen($oleTimestamp) != 8) {
             throw new ReaderException('Expecting 8 byte string');
         }
 
         // convert to units of 100 ns since 1601:
-        $unpackedTimestamp = unpack('v4', $oleTimestamp);
+        $unpackedTimestamp = unpack('v4', $oleTimestamp) ?: [];
         $timestampHigh = (float) $unpackedTimestamp[4] * 65536 + (float) $unpackedTimestamp[3];
         $timestampLow = (float) $unpackedTimestamp[2] * 65536 + (float) $unpackedTimestamp[1];
 
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/ChainedBlockStream.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/ChainedBlockStream.php
index 43e4804d4d..61bd6acb01 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/ChainedBlockStream.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/ChainedBlockStream.php
@@ -6,33 +6,30 @@
 
 class ChainedBlockStream
 {
+    /** @var mixed */
+    public $context;
+
     /**
      * The OLE container of the file that is being read.
-     *
-     * @var null|OLE
      */
-    public $ole;
+    public ?OLE $ole = null;
 
     /**
      * Parameters specified by fopen().
-     *
-     * @var array
      */
-    public $params;
+    public array $params = [];
 
     /**
      * The binary data of the file.
-     *
-     * @var string
      */
-    public $data;
+    public string $data;
 
     /**
      * The file pointer.
      *
      * @var int byte offset
      */
-    public $pos;
+    public int $pos = 0;
 
     /**
      * Implements support for fopen().
@@ -42,13 +39,13 @@ class ChainedBlockStream
      *                                    ole-chainedblockstream://oleInstanceId=1
      * @param string $mode only "r" is supported
      * @param int $options mask of STREAM_REPORT_ERRORS and STREAM_USE_PATH
-     * @param string $openedPath absolute path of the opened stream (out parameter)
+     * @param ?string $openedPath absolute path of the opened stream (out parameter)
      *
      * @return bool true on success
      */
-    public function stream_open($path, $mode, $options, &$openedPath) // @codingStandardsIgnoreLine
+    public function stream_open(string $path, string $mode, int $options, ?string &$openedPath): bool // @codingStandardsIgnoreLine
     {
-        if ($mode != 'r') {
+        if ($mode[0] !== 'r') {
             if ($options & STREAM_REPORT_ERRORS) {
                 trigger_error('Only reading is supported', E_USER_WARNING);
             }
@@ -114,12 +111,12 @@ public function stream_close(): void // @codingStandardsIgnoreLine
      *
      * @return false|string
      */
-    public function stream_read($count) // @codingStandardsIgnoreLine
+    public function stream_read(int $count): bool|string // @codingStandardsIgnoreLine
     {
         if ($this->stream_eof()) {
             return false;
         }
-        $s = substr($this->data, $this->pos, $count);
+        $s = substr($this->data, (int) $this->pos, $count);
         $this->pos += $count;
 
         return $s;
@@ -130,7 +127,7 @@ public function stream_read($count) // @codingStandardsIgnoreLine
      *
      * @return bool TRUE if the file pointer is at EOF; otherwise FALSE
      */
-    public function stream_eof() // @codingStandardsIgnoreLine
+    public function stream_eof(): bool // @codingStandardsIgnoreLine
     {
         return $this->pos >= strlen($this->data);
     }
@@ -138,10 +135,8 @@ public function stream_eof() // @codingStandardsIgnoreLine
     /**
      * Returns the position of the file pointer, i.e. its offset into the file
      * stream. Implements support for ftell().
-     *
-     * @return int
      */
-    public function stream_tell() // @codingStandardsIgnoreLine
+    public function stream_tell(): int // @codingStandardsIgnoreLine
     {
         return $this->pos;
     }
@@ -151,16 +146,14 @@ public function stream_tell() // @codingStandardsIgnoreLine
      *
      * @param int $offset byte offset
      * @param int $whence SEEK_SET, SEEK_CUR or SEEK_END
-     *
-     * @return bool
      */
-    public function stream_seek($offset, $whence) // @codingStandardsIgnoreLine
+    public function stream_seek(int $offset, int $whence): bool // @codingStandardsIgnoreLine
     {
         if ($whence == SEEK_SET && $offset >= 0) {
             $this->pos = $offset;
         } elseif ($whence == SEEK_CUR && -$offset <= $this->pos) {
             $this->pos += $offset;
-        } elseif ($whence == SEEK_END && -$offset <= count($this->data)) {
+        } elseif ($whence == SEEK_END && -$offset <= count($this->data)) { // @phpstan-ignore-line
             $this->pos = strlen($this->data) + $offset;
         } else {
             return false;
@@ -172,10 +165,8 @@ public function stream_seek($offset, $whence) // @codingStandardsIgnoreLine
     /**
      * Implements support for fstat(). Currently the only supported field is
      * "size".
-     *
-     * @return array
      */
-    public function stream_stat() // @codingStandardsIgnoreLine
+    public function stream_stat(): array // @codingStandardsIgnoreLine
     {
         return [
             'size' => strlen($this->data),
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/PPS.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/PPS.php
index 8b9e92a881..3a77c78c6a 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/PPS.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/PPS.php
@@ -29,128 +29,100 @@
  */
 class PPS
 {
+    private const ALL_ONE_BITS = (PHP_INT_SIZE > 4) ? 0xFFFFFFFF : -1;
+
     /**
      * The PPS index.
-     *
-     * @var int
      */
-    public $No;
+    public int $No;
 
     /**
      * The PPS name (in Unicode).
-     *
-     * @var string
      */
-    public $Name;
+    public string $Name;
 
     /**
      * The PPS type. Dir, Root or File.
-     *
-     * @var int
      */
-    public $Type;
+    public int $Type;
 
     /**
      * The index of the previous PPS.
-     *
-     * @var int
      */
-    public $PrevPps;
+    public int $PrevPps;
 
     /**
      * The index of the next PPS.
-     *
-     * @var int
      */
-    public $NextPps;
+    public int $NextPps;
 
     /**
      * The index of it's first child if this is a Dir or Root PPS.
-     *
-     * @var int
      */
-    public $DirPps;
+    public int $DirPps;
 
     /**
      * A timestamp.
-     *
-     * @var float|int
      */
-    public $Time1st;
+    public float|int $Time1st;
 
     /**
      * A timestamp.
-     *
-     * @var float|int
      */
-    public $Time2nd;
+    public float|int $Time2nd;
 
     /**
      * Starting block (small or big) for this PPS's data  inside the container.
-     *
-     * @var int
      */
-    public $startBlock;
+    public ?int $startBlock = null;
 
     /**
      * The size of the PPS's data (in bytes).
-     *
-     * @var int
      */
-    public $Size;
+    public int $Size;
 
     /**
      * The PPS's data (only used if it's not using a temporary file).
-     *
-     * @var string
      */
-    public $_data;
+    public string $_data = '';
 
     /**
      * Array of child PPS's (only used by Root and Dir PPS's).
-     *
-     * @var array
      */
-    public $children = [];
+    public array $children = [];
 
     /**
      * Pointer to OLE container.
-     *
-     * @var OLE
      */
-    public $ole;
+    public OLE $ole;
 
     /**
      * The constructor.
      *
-     * @param int $No The PPS index
-     * @param string $name The PPS name
-     * @param int $type The PPS type. Dir, Root or File
-     * @param int $prev The index of the previous PPS
-     * @param int $next The index of the next PPS
-     * @param int $dir The index of it's first child if this is a Dir or Root PPS
+     * @param ?int $No The PPS index
+     * @param ?string $name The PPS name
+     * @param ?int $type The PPS type. Dir, Root or File
+     * @param ?int $prev The index of the previous PPS
+     * @param ?int $next The index of the next PPS
+     * @param ?int $dir The index of it's first child if this is a Dir or Root PPS
      * @param null|float|int $time_1st A timestamp
      * @param null|float|int $time_2nd A timestamp
-     * @param string $data The (usually binary) source data of the PPS
+     * @param ?string $data The (usually binary) source data of the PPS
      * @param array $children Array containing children PPS for this PPS
      */
-    public function __construct($No, $name, $type, $prev, $next, $dir, $time_1st, $time_2nd, $data, $children)
+    public function __construct(?int $No, ?string $name, ?int $type, ?int $prev, ?int $next, ?int $dir, $time_1st, $time_2nd, ?string $data, array $children)
     {
-        $this->No = $No;
-        $this->Name = $name;
-        $this->Type = $type;
-        $this->PrevPps = $prev;
-        $this->NextPps = $next;
-        $this->DirPps = $dir;
+        $this->No = (int) $No;
+        $this->Name = (string) $name;
+        $this->Type = (int) $type;
+        $this->PrevPps = (int) $prev;
+        $this->NextPps = (int) $next;
+        $this->DirPps = (int) $dir;
         $this->Time1st = $time_1st ?? 0;
         $this->Time2nd = $time_2nd ?? 0;
-        $this->_data = $data;
+        $this->_data = (string) $data;
         $this->children = $children;
-        if ($data != '') {
-            $this->Size = strlen($data);
-        } else {
-            $this->Size = 0;
-        }
+        $this->Size = strlen((string) $data);
     }
 
     /**
@@ -158,11 +130,11 @@ public function __construct($No, $name, $type, $prev, $next, $dir, $time_1st, $t
      *
      * @return int The amount of data (in bytes)
      */
-    public function getDataLen()
+    public function getDataLen(): int
     {
-        if (!isset($this->_data)) {
-            return 0;
-        }
+        //if (!isset($this->_data)) {
+        //    return 0;
+        //}
 
         return strlen($this->_data);
     }
@@ -172,7 +144,7 @@ public function getDataLen()
      *
      * @return string The binary string
      */
-    public function getPpsWk()
+    public function getPpsWk(): string
     {
         $ret = str_pad($this->Name, 64, "\x00");
 
@@ -202,25 +174,23 @@ public function getPpsWk()
      *
      * @param array $raList Reference to the array of PPS's for the whole OLE
      *                          container
-     * @param mixed $to_save
-     * @param mixed $depth
      *
      * @return int The index for this PPS
      */
-    public static function savePpsSetPnt(&$raList, $to_save, $depth = 0)
+    public static function savePpsSetPnt(array &$raList, mixed $to_save, int $depth = 0): int
     {
         if (!is_array($to_save) || (empty($to_save))) {
-            return 0xFFFFFFFF;
+            return self::ALL_ONE_BITS;
         } elseif (count($to_save) == 1) {
             $cnt = count($raList);
             // If the first entry, it's the root... Don't clone it!
             $raList[$cnt] = ($depth == 0) ? $to_save[0] : clone $to_save[0];
             $raList[$cnt]->No = $cnt;
-            $raList[$cnt]->PrevPps = 0xFFFFFFFF;
-            $raList[$cnt]->NextPps = 0xFFFFFFFF;
+            $raList[$cnt]->PrevPps = self::ALL_ONE_BITS;
+            $raList[$cnt]->NextPps = self::ALL_ONE_BITS;
             $raList[$cnt]->DirPps = self::savePpsSetPnt($raList, @$raList[$cnt]->children, $depth++);
         } else {
-            $iPos = floor(count($to_save) / 2);
+            $iPos = (int) floor(count($to_save) / 2);
             $aPrev = array_slice($to_save, 0, $iPos);
             $aNext = array_slice($to_save, $iPos + 1);
             $cnt = count($raList);
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/PPS/File.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/PPS/File.php
index dd1cda2de0..0798e3b52f 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/PPS/File.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/PPS/File.php
@@ -37,17 +37,15 @@ class File extends PPS
      *
      * @see OLE::ascToUcs()
      */
-    public function __construct($name)
+    public function __construct(string $name)
     {
         parent::__construct(null, $name, OLE::OLE_PPS_TYPE_FILE, null, null, null, null, null, '', []);
     }
 
     /**
      * Initialization method. Has to be called right after OLE_PPS_File().
-     *
-     * @return mixed true on success
      */
-    public function init()
+    public function init(): bool
     {
         return true;
     }
@@ -57,7 +55,7 @@ public function init()
      *
      * @param string $data The data to append
      */
-    public function append($data): void
+    public function append(string $data): void
     {
         $this->_data .= $data;
     }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/PPS/Root.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/PPS/Root.php
index c9b99a856c..64de77f40a 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/PPS/Root.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLE/PPS/Root.php
@@ -35,22 +35,16 @@ class Root extends PPS
      */
     private $fileHandle;
 
-    /**
-     * @var int
-     */
-    private $smallBlockSize;
+    private ?int $smallBlockSize = null;
 
-    /**
-     * @var int
-     */
-    private $bigBlockSize;
+    private ?int $bigBlockSize = null;
 
     /**
      * @param null|float|int $time_1st A timestamp
      * @param null|float|int $time_2nd A timestamp
      * @param File[] $raChild
      */
-    public function __construct($time_1st, $time_2nd, $raChild)
+    public function __construct($time_1st, $time_2nd, array $raChild)
     {
         parent::__construct(null, OLE::ascToUcs('Root Entry'), OLE::OLE_PPS_TYPE_ROOT, null, null, null, $time_1st, $time_2nd, null, $raChild);
     }
@@ -66,17 +60,17 @@ public function __construct($time_1st, $time_2nd, $raChild)
      *
      * @return bool true on success
      */
-    public function save($fileHandle)
+    public function save($fileHandle): bool
     {
         $this->fileHandle = $fileHandle;
 
         // Initial Setting for saving
-        $this->bigBlockSize = 2 ** (
+        $this->bigBlockSize = (int) (2 ** (
             (isset($this->bigBlockSize)) ? self::adjust2($this->bigBlockSize) : 9
-            );
-        $this->smallBlockSize = 2 ** (
+        ));
+        $this->smallBlockSize = (int) (2 ** (
             (isset($this->smallBlockSize)) ? self::adjust2($this->smallBlockSize) : 6
-            );
+        ));
 
         // Make an array of PPS's (for Save)
         $aList = [];
@@ -84,17 +78,17 @@ public function save($fileHandle)
         // calculate values for header
         [$iSBDcnt, $iBBcnt, $iPPScnt] = $this->calcSize($aList); //, $rhInfo);
         // Save Header
-        $this->saveHeader($iSBDcnt, $iBBcnt, $iPPScnt);
+        $this->saveHeader((int) $iSBDcnt, (int) $iBBcnt, (int) $iPPScnt);
 
         // Make Small Data string (write SBD)
         $this->_data = $this->makeSmallData($aList);
 
         // Write BB
-        $this->saveBigData($iSBDcnt, $aList);
+        $this->saveBigData((int) $iSBDcnt, $aList);
         // Write PPS
         $this->savePps($aList);
         // Write Big Block Depot and BDList and Adding Header informations
-        $this->saveBbd($iSBDcnt, $iBBcnt, $iPPScnt);
+        $this->saveBbd((int) $iSBDcnt, (int) $iBBcnt, (int) $iPPScnt);
 
         return true;
     }
@@ -106,11 +100,10 @@ public function save($fileHandle)
      *
      * @return float[] The array of numbers
      */
-    private function calcSize(&$raList)
+    private function calcSize(array &$raList): array
     {
         // Calculate Basic Setting
         [$iSBDcnt, $iBBcnt, $iPPScnt] = [0, 0, 0];
-        $iSmallLen = 0;
         $iSBcnt = 0;
         $iCount = count($raList);
         for ($i = 0; $i < $iCount; ++$i) {
@@ -120,16 +113,16 @@ private function calcSize(&$raList)
                     $iSBcnt += floor($raList[$i]->Size / $this->smallBlockSize)
                         + (($raList[$i]->Size % $this->smallBlockSize) ? 1 : 0);
                 } else {
-                    $iBBcnt += (floor($raList[$i]->Size / $this->bigBlockSize) +
-                        (($raList[$i]->Size % $this->bigBlockSize) ? 1 : 0));
+                    $iBBcnt += (floor($raList[$i]->Size / $this->bigBlockSize)
+                        + (($raList[$i]->Size % $this->bigBlockSize) ? 1 : 0));
                 }
             }
         }
         $iSmallLen = $iSBcnt * $this->smallBlockSize;
         $iSlCnt = floor($this->bigBlockSize / OLE::OLE_LONG_INT_SIZE);
         $iSBDcnt = floor($iSBcnt / $iSlCnt) + (($iSBcnt % $iSlCnt) ? 1 : 0);
-        $iBBcnt += (floor($iSmallLen / $this->bigBlockSize) +
-            (($iSmallLen % $this->bigBlockSize) ? 1 : 0));
+        $iBBcnt += (floor($iSmallLen / $this->bigBlockSize)
+            + (($iSmallLen % $this->bigBlockSize) ? 1 : 0));
         $iCnt = count($raList);
         $iBdCnt = $this->bigBlockSize / OLE::OLE_PPS_SIZE;
         $iPPScnt = (floor($iCnt / $iBdCnt) + (($iCnt % $iBdCnt) ? 1 : 0));
@@ -142,11 +135,9 @@ private function calcSize(&$raList)
      *
      * @param int $i2 The argument
      *
-     * @return float
-     *
      * @see save()
      */
-    private static function adjust2($i2)
+    private static function adjust2(int $i2): float
     {
         $iWk = log($i2) / log(2);
 
@@ -155,12 +146,8 @@ private static function adjust2($i2)
 
     /**
      * Save OLE header.
-     *
-     * @param int $iSBDcnt
-     * @param int $iBBcnt
-     * @param int $iPPScnt
      */
-    private function saveHeader($iSBDcnt, $iBBcnt, $iPPScnt): void
+    private function saveHeader(int $iSBDcnt, int $iBBcnt, int $iPPScnt): void
     {
         $FILE = $this->fileHandle;
 
@@ -195,7 +182,7 @@ private function saveHeader($iSBDcnt, $iBBcnt, $iPPScnt): void
             . "\x00\x00\x00\x00"
             . "\x00\x00\x00\x00"
             . "\x00\x00\x00\x00"
-            . pack('v', 0x3b)
+            . pack('v', 0x3B)
             . pack('v', 0x03)
             . pack('v', -2)
             . pack('v', 9)
@@ -236,10 +223,9 @@ private function saveHeader($iSBDcnt, $iBBcnt, $iPPScnt): void
     /**
      * Saving big data (PPS's with data bigger than \PhpOffice\PhpSpreadsheet\Shared\OLE::OLE_DATA_SIZE_SMALL).
      *
-     * @param int $iStBlk
      * @param array $raList Reference to array of PPS's
      */
-    private function saveBigData($iStBlk, &$raList): void
+    private function saveBigData(int $iStBlk, array &$raList): void
     {
         $FILE = $this->fileHandle;
 
@@ -256,9 +242,9 @@ private function saveBigData($iStBlk, &$raList): void
                     }
                     // Set For PPS
                     $raList[$i]->startBlock = $iStBlk;
-                    $iStBlk +=
-                        (floor($raList[$i]->Size / $this->bigBlockSize) +
-                            (($raList[$i]->Size % $this->bigBlockSize) ? 1 : 0));
+                    $iStBlk
+                        += (floor($raList[$i]->Size / $this->bigBlockSize)
+                            + (($raList[$i]->Size % $this->bigBlockSize) ? 1 : 0));
                 }
             }
         }
@@ -268,10 +254,8 @@ private function saveBigData($iStBlk, &$raList): void
      * get small data (PPS's with data smaller than \PhpOffice\PhpSpreadsheet\Shared\OLE::OLE_DATA_SIZE_SMALL).
      *
      * @param array $raList Reference to array of PPS's
-     *
-     * @return string
      */
-    private function makeSmallData(&$raList)
+    private function makeSmallData(array &$raList): string
     {
         $sRes = '';
         $FILE = $this->fileHandle;
@@ -321,7 +305,7 @@ private function makeSmallData(&$raList)
      *
      * @param array $raList Reference to an array with all PPS's
      */
-    private function savePps(&$raList): void
+    private function savePps(array &$raList): void
     {
         // Save each PPS WK
         $iC = count($raList);
@@ -338,12 +322,8 @@ private function savePps(&$raList): void
 
     /**
      * Saving Big Block Depot.
-     *
-     * @param int $iSbdSize
-     * @param int $iBsize
-     * @param int $iPpsCnt
      */
-    private function saveBbd($iSbdSize, $iBsize, $iPpsCnt): void
+    private function saveBbd(int $iSbdSize, int $iBsize, int $iPpsCnt): void
     {
         $FILE = $this->fileHandle;
         // Calculate Basic Setting
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLERead.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLERead.php
index c4dc572a14..645dbf779e 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLERead.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/OLERead.php
@@ -6,7 +6,7 @@
 
 class OLERead
 {
-    private $data = '';
+    private string $data = '';
 
     // Size of a sector = 512 bytes
     const BIG_BLOCK_SIZE = 0x200;
@@ -21,12 +21,12 @@ class OLERead
     const SMALL_BLOCK_THRESHOLD = 0x1000;
 
     // header offsets
-    const NUM_BIG_BLOCK_DEPOT_BLOCKS_POS = 0x2c;
+    const NUM_BIG_BLOCK_DEPOT_BLOCKS_POS = 0x2C;
     const ROOT_START_BLOCK_POS = 0x30;
-    const SMALL_BLOCK_DEPOT_BLOCK_POS = 0x3c;
+    const SMALL_BLOCK_DEPOT_BLOCK_POS = 0x3C;
     const EXTENSION_BLOCK_POS = 0x44;
     const NUM_EXTENSION_BLOCK_POS = 0x48;
-    const BIG_BLOCK_DEPOT_BLOCKS_POS = 0x4c;
+    const BIG_BLOCK_DEPOT_BLOCKS_POS = 0x4C;
 
     // property storage offsets (directory offsets)
     const SIZE_OF_NAME_POS = 0x40;
@@ -34,81 +34,51 @@ class OLERead
     const START_BLOCK_POS = 0x74;
     const SIZE_POS = 0x78;
 
-    public $wrkbook;
+    public ?int $wrkbook = null;
 
-    public $summaryInformation;
+    public ?int $summaryInformation = null;
 
-    public $documentSummaryInformation;
+    public ?int $documentSummaryInformation = null;
 
-    /**
-     * @var int
-     */
-    private $numBigBlockDepotBlocks;
+    private int $numBigBlockDepotBlocks;
 
-    /**
-     * @var int
-     */
-    private $rootStartBlock;
+    private int $rootStartBlock;
 
-    /**
-     * @var int
-     */
-    private $sbdStartBlock;
+    private int $sbdStartBlock;
 
-    /**
-     * @var int
-     */
-    private $extensionBlock;
+    private int $extensionBlock;
 
-    /**
-     * @var int
-     */
-    private $numExtensionBlocks;
+    private int $numExtensionBlocks;
 
-    /**
-     * @var string
-     */
-    private $bigBlockChain;
+    private string $bigBlockChain;
 
-    /**
-     * @var string
-     */
-    private $smallBlockChain;
+    private string $smallBlockChain;
 
-    /**
-     * @var string
-     */
-    private $entry;
+    private string $entry;
 
-    /**
-     * @var int
-     */
-    private $rootentry;
+    private int $rootentry;
 
-    /**
-     * @var array
-     */
-    private $props = [];
+    private array $props = [];
 
     /**
      * Read the file.
      */
-    public function read(string $pFilename): void
+    public function read(string $filename): void
     {
-        File::assertFile($pFilename);
+        File::assertFile($filename);
 
         // Get the file identifier
         // Don't bother reading the whole file until we know it's a valid OLE file
-        $this->data = file_get_contents($pFilename, false, null, 0, 8);
+        $this->data = (string) file_get_contents($filename, false, null, 0, 8);
 
         // Check OLE identifier
-        $identifierOle = pack('CCCCCCCC', 0xd0, 0xcf, 0x11, 0xe0, 0xa1, 0xb1, 0x1a, 0xe1);
+        $identifierOle = pack('CCCCCCCC', 0xD0, 0xCF, 0x11, 0xE0, 0xA1, 0xB1, 0x1A, 0xE1);
         if ($this->data != $identifierOle) {
-            throw new ReaderException('The filename ' . $pFilename . ' is not recognised as an OLE file');
+            throw new ReaderException('The filename ' . $filename . ' is not recognised as an OLE file');
         }
 
         // Get the file data
-        $this->data = file_get_contents($pFilename);
+        $this->data = (string) file_get_contents($filename);
 
         // Total number of sectors used for the SAT
         $this->numBigBlockDepotBlocks = self::getInt4d($this->data, self::NUM_BIG_BLOCK_DEPOT_BLOCKS_POS);
@@ -130,7 +100,7 @@ public function read(string $pFilename): void
 
         $bbdBlocks = $this->numBigBlockDepotBlocks;
 
-        if ($this->numExtensionBlocks != 0) {
+        if ($this->numExtensionBlocks !== 0) {
             $bbdBlocks = (self::BIG_BLOCK_SIZE - self::BIG_BLOCK_DEPOT_BLOCKS_POS) / 4;
         }
 
@@ -164,7 +134,6 @@ public function read(string $pFilename): void
             $pos += 4 * $bbs;
         }
 
-        $pos = 0;
         $sbdBlock = $this->sbdStartBlock;
         $this->smallBlockChain = '';
         while ($sbdBlock != -2) {
@@ -185,12 +154,8 @@ public function read(string $pFilename): void
 
     /**
      * Extract binary stream data.
-     *
-     * @param int $stream
-     *
-     * @return null|string
      */
-    public function getStream($stream)
+    public function getStream(?int $stream): ?string
     {
         if ($stream === null) {
             return null;
@@ -235,13 +200,12 @@ public function getStream($stream)
     /**
      * Read a standard stream (by joining sectors using information from SAT).
      *
-     * @param int $bl Sector ID where the stream starts
+     * @param int $block Sector ID where the stream starts
      *
      * @return string Data for standard stream
      */
-    private function readData($bl)
+    private function readData(int $block): string
     {
-        $block = $bl;
         $data = '';
 
         while ($block != -2) {
@@ -314,13 +278,8 @@ private function readPropertySets(): void
 
     /**
      * Read 4 bytes of data at specified position.
-     *
-     * @param string $data
-     * @param int $pos
-     *
-     * @return int
      */
-    private static function getInt4d($data, $pos)
+    private static function getInt4d(string $data, int $pos): int
     {
         if ($pos < 0) {
             // Invalid position
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/PasswordHasher.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/PasswordHasher.php
index 9fefe88fb5..fcdbc982dc 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/PasswordHasher.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/PasswordHasher.php
@@ -2,11 +2,13 @@
 
 namespace PhpOffice\PhpSpreadsheet\Shared;
 
-use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Exception as SpException;
 use PhpOffice\PhpSpreadsheet\Worksheet\Protection;
 
 class PasswordHasher
 {
+    const MAX_PASSWORD_LENGTH = 255;
+
     /**
      * Get algorithm name for PHP.
      */
@@ -34,36 +36,37 @@ private static function getAlgorithm(string $algorithmName): string
             return $mapping[$algorithmName];
         }
 
-        throw new Exception('Unsupported password algorithm: ' . $algorithmName);
+        throw new SpException('Unsupported password algorithm: ' . $algorithmName);
     }
 
     /**
      * Create a password hash from a given string.
      *
-     * This method is based on the algorithm provided by
+     * This method is based on the spec at:
+     * https://interoperability.blob.core.windows.net/files/MS-OFFCRYPTO/[MS-OFFCRYPTO].pdf
+     * 2.3.7.1 Binary Document Password Verifier Derivation Method 1
+     *
+     * It replaces a method based on the algorithm provided by
      * Daniel Rentz of OpenOffice and the PEAR package
      * Spreadsheet_Excel_Writer by Xavier Noguer <xnoguer@rezebra.com>.
      *
-     * @param string $pPassword Password to hash
+     * @param string $password Password to hash
      */
-    private static function defaultHashPassword(string $pPassword): string
+    private static function defaultHashPassword(string $password): string
     {
-        $password = 0x0000;
-        $charPos = 1; // char position
-
-        // split the plain text password in its component characters
-        $chars = preg_split('//', $pPassword, -1, PREG_SPLIT_NO_EMPTY);
-        foreach ($chars as $char) {
-            $value = ord($char) << $charPos++; // shifted ASCII value
-            $rotated_bits = $value >> 15; // rotated bits beyond bit 15
-            $value &= 0x7fff; // first 15 bits
-            $password ^= ($value | $rotated_bits);
+        $verifier = 0;
+        $pwlen = strlen($password);
+        $passwordArray = pack('c', $pwlen) . $password;
+        for ($i = $pwlen; $i >= 0; --$i) {
+            $intermediate1 = (($verifier & 0x4000) === 0) ? 0 : 1;
+            $intermediate2 = 2 * $verifier;
+            $intermediate2 = $intermediate2 & 0x7FFF;
+            $intermediate3 = $intermediate1 | $intermediate2;
+            $verifier = $intermediate3 ^ ord($passwordArray[$i]);
         }
+        $verifier ^= 0xCE4B;
 
-        $password ^= strlen($pPassword);
-        $password ^= 0xCE4B;
-
-        return strtoupper(dechex($password));
+        return strtoupper(dechex($verifier));
     }
 
     /**
@@ -82,6 +85,9 @@ private static function defaultHashPassword(string $pPassword): string
      */
     public static function hashPassword(string $password, string $algorithm = '', string $salt = '', int $spinCount = 10000): string
     {
+        if (strlen($password) > self::MAX_PASSWORD_LENGTH) {
+            throw new SpException('Password exceeds ' . self::MAX_PASSWORD_LENGTH . ' characters');
+        }
         $phpAlgorithm = self::getAlgorithm($algorithm);
         if (!$phpAlgorithm) {
             return self::defaultHashPassword($password);
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/StringHelper.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/StringHelper.php
index e85ce55d2d..aac3836ce4 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/StringHelper.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/StringHelper.php
@@ -2,63 +2,44 @@
 
 namespace PhpOffice\PhpSpreadsheet\Shared;
 
-use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
-
 class StringHelper
 {
-    /**    Constants                */
-    /**    Regular Expressions        */
-    //    Fraction
-    const STRING_REGEXP_FRACTION = '(-?)(\d+)\s+(\d+\/\d+)';
-
     /**
      * Control characters array.
      *
      * @var string[]
      */
-    private static $controlCharacters = [];
+    private static array $controlCharacters = [];
 
     /**
      * SYLK Characters array.
-     *
-     * @var array
      */
-    private static $SYLKCharacters = [];
+    private static array $SYLKCharacters = [];
 
     /**
      * Decimal separator.
-     *
-     * @var string
      */
-    private static $decimalSeparator;
+    private static ?string $decimalSeparator;
 
     /**
      * Thousands separator.
-     *
-     * @var string
      */
-    private static $thousandsSeparator;
+    private static ?string $thousandsSeparator;
 
     /**
      * Currency code.
-     *
-     * @var string
      */
-    private static $currencyCode;
+    private static ?string $currencyCode;
 
     /**
      * Is iconv extension avalable?
-     *
-     * @var bool
      */
-    private static $isIconvEnabled;
+    private static ?bool $isIconvEnabled;
 
     /**
      * iconv options.
-     *
-     * @var string
      */
-    private static $iconvOptions = '//IGNORE//TRANSLIT';
+    private static string $iconvOptions = '//IGNORE//TRANSLIT';
 
     /**
      * Build control characters array.
@@ -241,10 +222,8 @@ private static function buildSYLKCharacters(): void
 
     /**
      * Get whether iconv extension is available.
-     *
-     * @return bool
      */
-    public static function getIsIconvEnabled()
+    public static function getIsIconvEnabled(): bool
     {
         if (isset(self::$isIconvEnabled)) {
             return self::$isIconvEnabled;
@@ -294,15 +273,13 @@ private static function buildCharacterSets(): void
      * So you could end up with something like _x0008_ in a string (either in a cell value (<v>)
      * element or in the shared string <t> element.
      *
-     * @param string $value Value to unescape
-     *
-     * @return string
+     * @param string $textValue Value to unescape
      */
-    public static function controlCharacterOOXML2PHP($value)
+    public static function controlCharacterOOXML2PHP(string $textValue): string
     {
         self::buildCharacterSets();
 
-        return str_replace(array_keys(self::$controlCharacters), array_values(self::$controlCharacters), $value);
+        return str_replace(array_keys(self::$controlCharacters), array_values(self::$controlCharacters), $textValue);
     }
 
     /**
@@ -316,64 +293,49 @@ public static function controlCharacterOOXML2PHP($value)
      * So you could end up with something like _x0008_ in a string (either in a cell value (<v>)
      * element or in the shared string <t> element.
      *
-     * @param string $value Value to escape
-     *
-     * @return string
+     * @param string $textValue Value to escape
      */
-    public static function controlCharacterPHP2OOXML($value)
+    public static function controlCharacterPHP2OOXML(string $textValue): string
     {
         self::buildCharacterSets();
 
-        return str_replace(array_values(self::$controlCharacters), array_keys(self::$controlCharacters), $value);
+        return str_replace(array_values(self::$controlCharacters), array_keys(self::$controlCharacters), $textValue);
     }
 
     /**
-     * Try to sanitize UTF8, stripping invalid byte sequences. Not perfect. Does not surrogate characters.
-     *
-     * @param string $value
-     *
-     * @return string
+     * Try to sanitize UTF8, replacing invalid sequences with Unicode substitution characters.
      */
-    public static function sanitizeUTF8($value)
+    public static function sanitizeUTF8(string $textValue): string
     {
-        if (self::getIsIconvEnabled()) {
-            $value = @iconv('UTF-8', 'UTF-8', $value);
-
-            return $value;
-        }
-
-        $value = mb_convert_encoding($value, 'UTF-8', 'UTF-8');
-
-        return $value;
+        $textValue = str_replace(["\xef\xbf\xbe", "\xef\xbf\xbf"], "\xef\xbf\xbd", $textValue);
+        $subst = mb_substitute_character(); // default is question mark
+        mb_substitute_character(65533); // Unicode substitution character
+        // Phpstan does not think this can return false.
+        $returnValue = mb_convert_encoding($textValue, 'UTF-8', 'UTF-8');
+        mb_substitute_character($subst);
+
+        return $returnValue;
     }
 
     /**
      * Check if a string contains UTF8 data.
-     *
-     * @param string $value
-     *
-     * @return bool
      */
-    public static function isUTF8($value)
+    public static function isUTF8(string $textValue): bool
     {
-        return $value === '' || preg_match('/^./su', $value) === 1;
+        return $textValue === self::sanitizeUTF8($textValue);
     }
 
     /**
      * Formats a numeric value as a string for output in various output writers forcing
      * point as decimal separator in case locale is other than English.
-     *
-     * @param mixed $value
-     *
-     * @return string
      */
-    public static function formatNumber($value)
+    public static function formatNumber(float|int|string|null $numericValue): string
     {
-        if (is_float($value)) {
-            return str_replace(',', '.', $value);
+        if (is_float($numericValue)) {
+            return str_replace(',', '.', (string) $numericValue);
         }
 
-        return (string) $value;
+        return (string) $numericValue;
     }
 
     /**
@@ -383,25 +345,23 @@ public static function formatNumber($value)
      * although this will give wrong results for non-ASCII strings
      * see OpenOffice.org's Documentation of the Microsoft Excel File Format, sect. 2.5.3.
      *
-     * @param string $value UTF-8 encoded string
-     * @param mixed[] $arrcRuns Details of rich text runs in $value
-     *
-     * @return string
+     * @param string $textValue UTF-8 encoded string
+     * @param array<int, array{strlen: int, fontidx: int}> $arrcRuns Details of rich text runs in $value
      */
-    public static function UTF8toBIFF8UnicodeShort($value, $arrcRuns = [])
+    public static function UTF8toBIFF8UnicodeShort(string $textValue, array $arrcRuns = []): string
     {
         // character count
-        $ln = self::countCharacters($value, 'UTF-8');
+        $ln = self::countCharacters($textValue, 'UTF-8');
         // option flags
         if (empty($arrcRuns)) {
             $data = pack('CC', $ln, 0x0001);
             // characters
-            $data .= self::convertEncoding($value, 'UTF-16LE', 'UTF-8');
+            $data .= self::convertEncoding($textValue, 'UTF-16LE', 'UTF-8');
         } else {
             $data = pack('vC', $ln, 0x09);
             $data .= pack('v', count($arrcRuns));
             // characters
-            $data .= self::convertEncoding($value, 'UTF-16LE', 'UTF-8');
+            $data .= self::convertEncoding($textValue, 'UTF-16LE', 'UTF-8');
             foreach ($arrcRuns as $cRun) {
                 $data .= pack('v', $cRun['strlen']);
                 $data .= pack('v', $cRun['fontidx']);
@@ -418,17 +378,13 @@ public static function UTF8toBIFF8UnicodeShort($value, $arrcRuns = [])
      * although this will give wrong results for non-ASCII strings
      * see OpenOffice.org's Documentation of the Microsoft Excel File Format, sect. 2.5.3.
      *
-     * @param string $value UTF-8 encoded string
-     *
-     * @return string
+     * @param string $textValue UTF-8 encoded string
      */
-    public static function UTF8toBIFF8UnicodeLong($value)
+    public static function UTF8toBIFF8UnicodeLong(string $textValue): string
     {
-        // character count
-        $ln = self::countCharacters($value, 'UTF-8');
-
         // characters
-        $chars = self::convertEncoding($value, 'UTF-16LE', 'UTF-8');
+        $chars = self::convertEncoding($textValue, 'UTF-16LE', 'UTF-8');
+        $ln = (int) (strlen($chars) / 2);  // N.B. - strlen, not mb_strlen issue #642
 
         return pack('vC', $ln, 0x0001) . $chars;
     }
@@ -436,111 +392,114 @@ public static function UTF8toBIFF8UnicodeLong($value)
     /**
      * Convert string from one encoding to another.
      *
-     * @param string $value
      * @param string $to Encoding to convert to, e.g. 'UTF-8'
      * @param string $from Encoding to convert from, e.g. 'UTF-16LE'
-     *
-     * @return string
      */
-    public static function convertEncoding($value, $to, $from)
+    public static function convertEncoding(string $textValue, string $to, string $from): string
     {
         if (self::getIsIconvEnabled()) {
-            $result = iconv($from, $to . self::$iconvOptions, $value);
+            $result = iconv($from, $to . self::$iconvOptions, $textValue);
             if (false !== $result) {
                 return $result;
             }
         }
 
-        return mb_convert_encoding($value, $to, $from);
+        return mb_convert_encoding($textValue, $to, $from);
     }
 
     /**
      * Get character count.
      *
-     * @param string $value
-     * @param string $enc Encoding
+     * @param string $encoding Encoding
      *
      * @return int Character count
      */
-    public static function countCharacters($value, $enc = 'UTF-8')
+    public static function countCharacters(string $textValue, string $encoding = 'UTF-8'): int
     {
-        return mb_strlen($value ?? '', $enc);
+        return mb_strlen($textValue, $encoding);
     }
 
     /**
-     * Get a substring of a UTF-8 encoded string.
+     * Get character count using mb_strwidth rather than mb_strlen.
+     *
+     * @param string $encoding Encoding
      *
-     * @param string $pValue UTF-8 encoded string
-     * @param int $pStart Start offset
-     * @param int $pLength Maximum number of characters in substring
+     * @return int Character count
+     */
+    public static function countCharactersDbcs(string $textValue, string $encoding = 'UTF-8'): int
+    {
+        return mb_strwidth($textValue, $encoding);
+    }
+
+    /**
+     * Get a substring of a UTF-8 encoded string.
      *
-     * @return string
+     * @param string $textValue UTF-8 encoded string
+     * @param int $offset Start offset
+     * @param ?int $length Maximum number of characters in substring
      */
-    public static function substring($pValue, $pStart, $pLength = 0)
+    public static function substring(string $textValue, int $offset, ?int $length = 0): string
     {
-        return mb_substr($pValue, $pStart, $pLength, 'UTF-8');
+        return mb_substr($textValue, $offset, $length, 'UTF-8');
     }
 
     /**
      * Convert a UTF-8 encoded string to upper case.
      *
-     * @param string $pValue UTF-8 encoded string
-     *
-     * @return string
+     * @param string $textValue UTF-8 encoded string
      */
-    public static function strToUpper($pValue)
+    public static function strToUpper(string $textValue): string
     {
-        return mb_convert_case($pValue, MB_CASE_UPPER, 'UTF-8');
+        return mb_convert_case($textValue, MB_CASE_UPPER, 'UTF-8');
     }
 
     /**
      * Convert a UTF-8 encoded string to lower case.
      *
-     * @param string $pValue UTF-8 encoded string
-     *
-     * @return string
+     * @param string $textValue UTF-8 encoded string
      */
-    public static function strToLower($pValue)
+    public static function strToLower(string $textValue): string
     {
-        return mb_convert_case($pValue, MB_CASE_LOWER, 'UTF-8');
+        return mb_convert_case($textValue, MB_CASE_LOWER, 'UTF-8');
     }
 
     /**
      * Convert a UTF-8 encoded string to title/proper case
      * (uppercase every first character in each word, lower case all other characters).
      *
-     * @param string $pValue UTF-8 encoded string
-     *
-     * @return string
+     * @param string $textValue UTF-8 encoded string
      */
-    public static function strToTitle($pValue)
+    public static function strToTitle(string $textValue): string
     {
-        return mb_convert_case($pValue, MB_CASE_TITLE, 'UTF-8');
+        return mb_convert_case($textValue, MB_CASE_TITLE, 'UTF-8');
     }
 
-    public static function mbIsUpper($char)
+    public static function mbIsUpper(string $character): bool
     {
-        return mb_strtolower($char, 'UTF-8') != $char;
+        return mb_strtolower($character, 'UTF-8') !== $character;
     }
 
-    public static function mbStrSplit($string)
+    /**
+     * Splits a UTF-8 string into an array of individual characters.
+     */
+    public static function mbStrSplit(string $string): array
     {
         // Split at all position not after the start: ^
         // and not before the end: $
-        return preg_split('/(?<!^)(?!$)/u', $string);
+        $split = preg_split('/(?<!^)(?!$)/u', $string);
+
+        return ($split === false) ? [] : $split;
     }
 
     /**
      * Reverse the case of a string, so that all uppercase characters become lowercase
      * and all lowercase characters become uppercase.
      *
-     * @param string $pValue UTF-8 encoded string
-     *
-     * @return string
+     * @param string $textValue UTF-8 encoded string
      */
-    public static function strCaseReverse($pValue)
+    public static function strCaseReverse(string $textValue): string
     {
-        $characters = self::mbStrSplit($pValue);
+        $characters = self::mbStrSplit($textValue);
         foreach ($characters as &$character) {
             if (self::mbIsUpper($character)) {
                 $character = mb_strtolower($character, 'UTF-8');
@@ -552,36 +511,11 @@ public static function strCaseReverse($pValue)
         return implode('', $characters);
     }
 
-    /**
-     * Identify whether a string contains a fractional numeric value,
-     * and convert it to a numeric if it is.
-     *
-     * @param string $operand string value to test
-     *
-     * @return bool
-     */
-    public static function convertToNumberIfFraction(&$operand)
-    {
-        if (preg_match('/^' . self::STRING_REGEXP_FRACTION . '$/i', $operand, $match)) {
-            $sign = ($match[1] == '-') ? '-' : '+';
-            $fractionFormula = '=' . $sign . $match[2] . $sign . $match[3];
-            $operand = Calculation::getInstance()->_calculateFormulaValue($fractionFormula);
-
-            return true;
-        }
-
-        return false;
-    }
-
-    //    function convertToNumberIfFraction()
-
     /**
      * Get the decimal separator. If it has not yet been set explicitly, try to obtain number
      * formatting information from locale.
-     *
-     * @return string
      */
-    public static function getDecimalSeparator()
+    public static function getDecimalSeparator(): string
     {
         if (!isset(self::$decimalSeparator)) {
             $localeconv = localeconv();
@@ -601,20 +535,18 @@ public static function getDecimalSeparator()
      * Set the decimal separator. Only used by NumberFormat::toFormattedString()
      * to format output by \PhpOffice\PhpSpreadsheet\Writer\Html and \PhpOffice\PhpSpreadsheet\Writer\Pdf.
      *
-     * @param string $pValue Character for decimal separator
+     * @param ?string $separator Character for decimal separator
      */
-    public static function setDecimalSeparator($pValue): void
+    public static function setDecimalSeparator(?string $separator): void
     {
-        self::$decimalSeparator = $pValue;
+        self::$decimalSeparator = $separator;
     }
 
     /**
      * Get the thousands separator. If it has not yet been set explicitly, try to obtain number
      * formatting information from locale.
-     *
-     * @return string
      */
-    public static function getThousandsSeparator()
+    public static function getThousandsSeparator(): string
     {
         if (!isset(self::$thousandsSeparator)) {
             $localeconv = localeconv();
@@ -634,20 +566,18 @@ public static function getThousandsSeparator()
      * Set the thousands separator. Only used by NumberFormat::toFormattedString()
      * to format output by \PhpOffice\PhpSpreadsheet\Writer\Html and \PhpOffice\PhpSpreadsheet\Writer\Pdf.
      *
-     * @param string $pValue Character for thousands separator
+     * @param ?string $separator Character for thousands separator
      */
-    public static function setThousandsSeparator($pValue): void
+    public static function setThousandsSeparator(?string $separator): void
     {
-        self::$thousandsSeparator = $pValue;
+        self::$thousandsSeparator = $separator;
     }
 
     /**
      *    Get the currency code. If it has not yet been set explicitly, try to obtain the
      *        symbol information from locale.
-     *
-     * @return string
      */
-    public static function getCurrencyCode()
+    public static function getCurrencyCode(): string
     {
         if (!empty(self::$currencyCode)) {
             return self::$currencyCode;
@@ -672,51 +602,49 @@ public static function getCurrencyCode()
      * Set the currency code. Only used by NumberFormat::toFormattedString()
      *        to format output by \PhpOffice\PhpSpreadsheet\Writer\Html and \PhpOffice\PhpSpreadsheet\Writer\Pdf.
      *
-     * @param string $pValue Character for currency code
+     * @param ?string $currencyCode Character for currency code
      */
-    public static function setCurrencyCode($pValue): void
+    public static function setCurrencyCode(?string $currencyCode): void
     {
-        self::$currencyCode = $pValue;
+        self::$currencyCode = $currencyCode;
     }
 
     /**
      * Convert SYLK encoded string to UTF-8.
      *
-     * @param string $pValue
+     * @param string $textValue SYLK encoded string
      *
      * @return string UTF-8 encoded string
      */
-    public static function SYLKtoUTF8($pValue)
+    public static function SYLKtoUTF8(string $textValue): string
     {
         self::buildCharacterSets();
 
         // If there is no escape character in the string there is nothing to do
-        if (strpos($pValue, '') === false) {
-            return $pValue;
+        if (!str_contains($textValue, '')) {
+            return $textValue;
         }
 
         foreach (self::$SYLKCharacters as $k => $v) {
-            $pValue = str_replace($k, $v, $pValue);
+            $textValue = str_replace($k, $v, $textValue);
         }
 
-        return $pValue;
+        return $textValue;
     }
 
     /**
      * Retrieve any leading numeric part of a string, or return the full string if no leading numeric
      * (handles basic integer or float, but not exponent or non decimal).
      *
-     * @param string $value
-     *
-     * @return mixed string or only the leading numeric part of the string
+     * @return float|string string or only the leading numeric part of the string
      */
-    public static function testStringAsNumeric($value)
+    public static function testStringAsNumeric(string $textValue): float|string
     {
-        if (is_numeric($value)) {
-            return $value;
+        if (is_numeric($textValue)) {
+            return $textValue;
         }
-        $v = (float) $value;
+        $v = (float) $textValue;
 
-        return (is_numeric(substr($value, 0, strlen($v)))) ? $v : $value;
+        return (is_numeric(substr($textValue, 0, strlen((string) $v)))) ? $v : $textValue;
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/TimeZone.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/TimeZone.php
index a6f9850757..f6e8500b86 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/TimeZone.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/TimeZone.php
@@ -9,34 +9,32 @@ class TimeZone
 {
     /**
      * Default Timezone used for date/time conversions.
-     *
-     * @var string
      */
-    protected static $timezone = 'UTC';
+    protected static string $timezone = 'UTC';
 
     /**
      * Validate a Timezone name.
      *
-     * @param string $timezone Time zone (e.g. 'Europe/London')
+     * @param string $timezoneName Time zone (e.g. 'Europe/London')
      *
      * @return bool Success or failure
      */
-    private static function validateTimeZone($timezone)
+    private static function validateTimeZone(string $timezoneName): bool
     {
-        return in_array($timezone, DateTimeZone::listIdentifiers(DateTimeZone::ALL_WITH_BC));
+        return in_array($timezoneName, DateTimeZone::listIdentifiers(DateTimeZone::ALL_WITH_BC), true);
     }
 
     /**
      * Set the Default Timezone used for date/time conversions.
      *
-     * @param string $timezone Time zone (e.g. 'Europe/London')
+     * @param string $timezoneName Time zone (e.g. 'Europe/London')
      *
      * @return bool Success or failure
      */
-    public static function setTimeZone($timezone)
+    public static function setTimeZone(string $timezoneName): bool
     {
-        if (self::validateTimezone($timezone)) {
-            self::$timezone = $timezone;
+        if (self::validateTimeZone($timezoneName)) {
+            self::$timezone = $timezoneName;
 
             return true;
         }
@@ -49,7 +47,7 @@ public static function setTimeZone($timezone)
      *
      * @return string Timezone (e.g. 'Europe/London')
      */
-    public static function getTimeZone()
+    public static function getTimeZone(): string
     {
         return self::$timezone;
     }
@@ -58,19 +56,19 @@ public static function getTimeZone()
      *    Return the Timezone offset used for date/time conversions to/from UST
      * This requires both the timezone and the calculated date/time to allow for local DST.
      *
-     * @param ?string $timezone The timezone for finding the adjustment to UST
+     * @param ?string $timezoneName The timezone for finding the adjustment to UST
      * @param float|int $timestamp PHP date/time value
      *
      * @return int Number of seconds for timezone adjustment
      */
-    public static function getTimeZoneAdjustment($timezone, $timestamp)
+    public static function getTimeZoneAdjustment(?string $timezoneName, $timestamp): int
     {
-        $timezone = $timezone ?? self::$timezone;
+        $timezoneName = $timezoneName ?? self::$timezone;
         $dtobj = Date::dateTimeFromTimestamp("$timestamp");
-        if (!self::validateTimezone($timezone)) {
-            throw new PhpSpreadsheetException("Invalid timezone $timezone");
+        if (!self::validateTimeZone($timezoneName)) {
+            throw new PhpSpreadsheetException("Invalid timezone $timezoneName");
         }
-        $dtobj->setTimeZone(new DateTimeZone($timezone));
+        $dtobj->setTimeZone(new DateTimeZone($timezoneName));
 
         return $dtobj->getOffset();
     }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/BestFit.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/BestFit.php
index 7df4895332..f9dacfb8a7 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/BestFit.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/BestFit.php
@@ -6,87 +6,79 @@ abstract class BestFit
 {
     /**
      * Indicator flag for a calculation error.
-     *
-     * @var bool
      */
-    protected $error = false;
+    protected bool $error = false;
 
     /**
      * Algorithm type to use for best-fit.
-     *
-     * @var string
      */
-    protected $bestFitType = 'undetermined';
+    protected string $bestFitType = 'undetermined';
 
     /**
      * Number of entries in the sets of x- and y-value arrays.
-     *
-     * @var int
      */
-    protected $valueCount = 0;
+    protected int $valueCount;
 
     /**
      * X-value dataseries of values.
      *
      * @var float[]
      */
-    protected $xValues = [];
+    protected array $xValues = [];
 
     /**
      * Y-value dataseries of values.
      *
      * @var float[]
      */
-    protected $yValues = [];
+    protected array $yValues = [];
 
     /**
      * Flag indicating whether values should be adjusted to Y=0.
-     *
-     * @var bool
      */
-    protected $adjustToZero = false;
+    protected bool $adjustToZero = false;
 
     /**
      * Y-value series of best-fit values.
      *
      * @var float[]
      */
-    protected $yBestFitValues = [];
+    protected array $yBestFitValues = [];
 
-    protected $goodnessOfFit = 1;
+    protected float $goodnessOfFit = 1;
 
-    protected $stdevOfResiduals = 0;
+    protected float $stdevOfResiduals = 0;
 
-    protected $covariance = 0;
+    protected float $covariance = 0;
 
-    protected $correlation = 0;
+    protected float $correlation = 0;
 
-    protected $SSRegression = 0;
+    protected float $SSRegression = 0;
 
-    protected $SSResiduals = 0;
+    protected float $SSResiduals = 0;
 
-    protected $DFResiduals = 0;
+    protected float $DFResiduals = 0;
 
-    protected $f = 0;
+    protected float $f = 0;
 
-    protected $slope = 0;
+    protected float $slope = 0;
 
-    protected $slopeSE = 0;
+    protected float $slopeSE = 0;
 
-    protected $intersect = 0;
+    protected float $intersect = 0;
 
-    protected $intersectSE = 0;
+    protected float $intersectSE = 0;
 
-    protected $xOffset = 0;
+    protected float $xOffset = 0;
 
-    protected $yOffset = 0;
+    protected float $yOffset = 0;
 
-    public function getError()
+    public function getError(): bool
     {
         return $this->error;
     }
 
-    public function getBestFitType()
+    public function getBestFitType(): string
     {
         return $this->bestFitType;
     }
@@ -98,7 +90,7 @@ public function getBestFitType()
      *
      * @return float Y-Value
      */
-    abstract public function getValueOfYForX($xValue);
+    abstract public function getValueOfYForX(float $xValue): float;
 
     /**
      * Return the X-Value for a specified value of Y.
@@ -107,14 +99,14 @@ abstract public function getValueOfYForX($xValue);
      *
      * @return float X-Value
      */
-    abstract public function getValueOfXForY($yValue);
+    abstract public function getValueOfXForY(float $yValue): float;
 
     /**
      * Return the original set of X-Values.
      *
      * @return float[] X-Values
      */
-    public function getXValues()
+    public function getXValues(): array
     {
         return $this->xValues;
     }
@@ -123,19 +115,15 @@ public function getXValues()
      * Return the Equation of the best-fit line.
      *
      * @param int $dp Number of places of decimal precision to display
-     *
-     * @return string
      */
-    abstract public function getEquation($dp = 0);
+    abstract public function getEquation(int $dp = 0): string;
 
     /**
      * Return the Slope of the line.
      *
      * @param int $dp Number of places of decimal precision to display
-     *
-     * @return float
      */
-    public function getSlope($dp = 0)
+    public function getSlope(int $dp = 0): float
     {
         if ($dp != 0) {
             return round($this->slope, $dp);
@@ -148,10 +136,8 @@ public function getSlope($dp = 0)
      * Return the standard error of the Slope.
      *
      * @param int $dp Number of places of decimal precision to display
-     *
-     * @return float
      */
-    public function getSlopeSE($dp = 0)
+    public function getSlopeSE(int $dp = 0): float
     {
         if ($dp != 0) {
             return round($this->slopeSE, $dp);
@@ -164,10 +150,8 @@ public function getSlopeSE($dp = 0)
      * Return the Value of X where it intersects Y = 0.
      *
      * @param int $dp Number of places of decimal precision to display
-     *
-     * @return float
      */
-    public function getIntersect($dp = 0)
+    public function getIntersect(int $dp = 0): float
     {
         if ($dp != 0) {
             return round($this->intersect, $dp);
@@ -180,10 +164,8 @@ public function getIntersect($dp = 0)
      * Return the standard error of the Intersect.
      *
      * @param int $dp Number of places of decimal precision to display
-     *
-     * @return float
      */
-    public function getIntersectSE($dp = 0)
+    public function getIntersectSE(int $dp = 0): float
     {
         if ($dp != 0) {
             return round($this->intersectSE, $dp);
@@ -196,10 +178,8 @@ public function getIntersectSE($dp = 0)
      * Return the goodness of fit for this regression.
      *
      * @param int $dp Number of places of decimal precision to return
-     *
-     * @return float
      */
-    public function getGoodnessOfFit($dp = 0)
+    public function getGoodnessOfFit(int $dp = 0): float
     {
         if ($dp != 0) {
             return round($this->goodnessOfFit, $dp);
@@ -212,10 +192,8 @@ public function getGoodnessOfFit($dp = 0)
      * Return the goodness of fit for this regression.
      *
      * @param int $dp Number of places of decimal precision to return
-     *
-     * @return float
      */
-    public function getGoodnessOfFitPercent($dp = 0)
+    public function getGoodnessOfFitPercent(int $dp = 0): float
     {
         if ($dp != 0) {
             return round($this->goodnessOfFit * 100, $dp);
@@ -228,10 +206,8 @@ public function getGoodnessOfFitPercent($dp = 0)
      * Return the standard deviation of the residuals for this regression.
      *
      * @param int $dp Number of places of decimal precision to return
-     *
-     * @return float
      */
-    public function getStdevOfResiduals($dp = 0)
+    public function getStdevOfResiduals(int $dp = 0): float
     {
         if ($dp != 0) {
             return round($this->stdevOfResiduals, $dp);
@@ -242,10 +218,8 @@ public function getStdevOfResiduals($dp = 0)
 
     /**
      * @param int $dp Number of places of decimal precision to return
-     *
-     * @return float
      */
-    public function getSSRegression($dp = 0)
+    public function getSSRegression(int $dp = 0): float
     {
         if ($dp != 0) {
             return round($this->SSRegression, $dp);
@@ -256,10 +230,8 @@ public function getSSRegression($dp = 0)
 
     /**
      * @param int $dp Number of places of decimal precision to return
-     *
-     * @return float
      */
-    public function getSSResiduals($dp = 0)
+    public function getSSResiduals(int $dp = 0): float
     {
         if ($dp != 0) {
             return round($this->SSResiduals, $dp);
@@ -270,10 +242,8 @@ public function getSSResiduals($dp = 0)
 
     /**
      * @param int $dp Number of places of decimal precision to return
-     *
-     * @return float
      */
-    public function getDFResiduals($dp = 0)
+    public function getDFResiduals(int $dp = 0): float
     {
         if ($dp != 0) {
             return round($this->DFResiduals, $dp);
@@ -284,10 +254,8 @@ public function getDFResiduals($dp = 0)
 
     /**
      * @param int $dp Number of places of decimal precision to return
-     *
-     * @return float
      */
-    public function getF($dp = 0)
+    public function getF(int $dp = 0): float
     {
         if ($dp != 0) {
             return round($this->f, $dp);
@@ -298,10 +266,8 @@ public function getF($dp = 0)
 
     /**
      * @param int $dp Number of places of decimal precision to return
-     *
-     * @return float
      */
-    public function getCovariance($dp = 0)
+    public function getCovariance(int $dp = 0): float
     {
         if ($dp != 0) {
             return round($this->covariance, $dp);
@@ -312,10 +278,8 @@ public function getCovariance($dp = 0)
 
     /**
      * @param int $dp Number of places of decimal precision to return
-     *
-     * @return float
      */
-    public function getCorrelation($dp = 0)
+    public function getCorrelation(int $dp = 0): float
     {
         if ($dp != 0) {
             return round($this->correlation, $dp);
@@ -327,14 +291,14 @@ public function getCorrelation($dp = 0)
     /**
      * @return float[]
      */
-    public function getYBestFitValues()
+    public function getYBestFitValues(): array
     {
         return $this->yBestFitValues;
     }
 
-    protected function calculateGoodnessOfFit($sumX, $sumY, $sumX2, $sumY2, $sumXY, $meanX, $meanY, $const): void
+    protected function calculateGoodnessOfFit(float $sumX, float $sumY, float $sumX2, float $sumY2, float $sumXY, float $meanX, float $meanY, bool|int $const): void
     {
-        $SSres = $SScov = $SScor = $SStot = $SSsex = 0.0;
+        $SSres = $SScov = $SStot = $SSsex = 0.0;
         foreach ($this->xValues as $xKey => $xValue) {
             $bestFitY = $this->yBestFitValues[$xKey] = $this->getValueOfYForX($xValue);
 
@@ -360,7 +324,8 @@ protected function calculateGoodnessOfFit($sumX, $sumY, $sumX2, $sumY2, $sumXY,
         } else {
             $this->stdevOfResiduals = sqrt($SSres / $this->DFResiduals);
         }
-        if (($SStot == 0.0) || ($SSres == $SStot)) {
+
+        if ($SStot == 0.0 || $SSres == $SStot) {
             $this->goodnessOfFit = 1;
         } else {
             $this->goodnessOfFit = 1 - ($SSres / $SStot);
@@ -386,13 +351,12 @@ protected function calculateGoodnessOfFit($sumX, $sumY, $sumX2, $sumY2, $sumXY,
         }
     }
 
+    /** @return float|int */
     private function sumSquares(array $values)
     {
         return array_sum(
             array_map(
-                function ($value) {
-                    return $value ** 2;
-                },
+                fn ($value): float|int => $value ** 2,
                 $values
             )
         );
@@ -440,7 +404,7 @@ protected function leastSquareFit(array $yValues, array $xValues, bool $const):
      * @param float[] $yValues The set of Y-values for this regression
      * @param float[] $xValues The set of X-values for this regression
      */
-    public function __construct($yValues, $xValues = [])
+    public function __construct(array $yValues, array $xValues = [])
     {
         //    Calculate number of points
         $yValueCount = count($yValues);
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/ExponentialBestFit.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/ExponentialBestFit.php
index eb8cd746d3..ed2d8896aa 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/ExponentialBestFit.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/ExponentialBestFit.php
@@ -7,10 +7,8 @@ class ExponentialBestFit extends BestFit
     /**
      * Algorithm type to use for best-fit
      * (Name of this Trend class).
-     *
-     * @var string
      */
-    protected $bestFitType = 'exponential';
+    protected string $bestFitType = 'exponential';
 
     /**
      * Return the Y-Value for a specified value of X.
@@ -19,7 +17,7 @@ class ExponentialBestFit extends BestFit
      *
      * @return float Y-Value
      */
-    public function getValueOfYForX($xValue)
+    public function getValueOfYForX(float $xValue): float
     {
         return $this->getIntersect() * $this->getSlope() ** ($xValue - $this->xOffset);
     }
@@ -31,7 +29,7 @@ public function getValueOfYForX($xValue)
      *
      * @return float X-Value
      */
-    public function getValueOfXForY($yValue)
+    public function getValueOfXForY(float $yValue): float
     {
         return log(($yValue + $this->yOffset) / $this->getIntersect()) / log($this->getSlope());
     }
@@ -40,10 +38,8 @@ public function getValueOfXForY($yValue)
      * Return the Equation of the best-fit line.
      *
      * @param int $dp Number of places of decimal precision to display
-     *
-     * @return string
      */
-    public function getEquation($dp = 0)
+    public function getEquation(int $dp = 0): string
     {
         $slope = $this->getSlope($dp);
         $intersect = $this->getIntersect($dp);
@@ -55,10 +51,8 @@ public function getEquation($dp = 0)
      * Return the Slope of the line.
      *
      * @param int $dp Number of places of decimal precision to display
-     *
-     * @return float
      */
-    public function getSlope($dp = 0)
+    public function getSlope(int $dp = 0): float
     {
         if ($dp != 0) {
             return round(exp($this->slope), $dp);
@@ -71,10 +65,8 @@ public function getSlope($dp = 0)
      * Return the Value of X where it intersects Y = 0.
      *
      * @param int $dp Number of places of decimal precision to display
-     *
-     * @return float
      */
-    public function getIntersect($dp = 0)
+    public function getIntersect(int $dp = 0): float
     {
         if ($dp != 0) {
             return round(exp($this->intersect), $dp);
@@ -92,9 +84,7 @@ public function getIntersect($dp = 0)
     private function exponentialRegression(array $yValues, array $xValues, bool $const): void
     {
         $adjustedYValues = array_map(
-            function ($value) {
-                return ($value < 0.0) ? 0 - log(abs($value)) : log($value);
-            },
+            fn ($value): float => ($value < 0.0) ? 0 - log(abs($value)) : log($value),
             $yValues
         );
 
@@ -106,9 +96,8 @@ function ($value) {
      *
      * @param float[] $yValues The set of Y-values for this regression
      * @param float[] $xValues The set of X-values for this regression
-     * @param bool $const
      */
-    public function __construct($yValues, $xValues = [], $const = true)
+    public function __construct(array $yValues, array $xValues = [], bool $const = true)
     {
         parent::__construct($yValues, $xValues);
 
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/LinearBestFit.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/LinearBestFit.php
index 65d6b4ff44..8a54080037 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/LinearBestFit.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/LinearBestFit.php
@@ -7,10 +7,8 @@ class LinearBestFit extends BestFit
     /**
      * Algorithm type to use for best-fit
      * (Name of this Trend class).
-     *
-     * @var string
      */
-    protected $bestFitType = 'linear';
+    protected string $bestFitType = 'linear';
 
     /**
      * Return the Y-Value for a specified value of X.
@@ -19,7 +17,7 @@ class LinearBestFit extends BestFit
      *
      * @return float Y-Value
      */
-    public function getValueOfYForX($xValue)
+    public function getValueOfYForX(float $xValue): float
     {
         return $this->getIntersect() + $this->getSlope() * $xValue;
     }
@@ -31,7 +29,7 @@ public function getValueOfYForX($xValue)
      *
      * @return float X-Value
      */
-    public function getValueOfXForY($yValue)
+    public function getValueOfXForY(float $yValue): float
     {
         return ($yValue - $this->getIntersect()) / $this->getSlope();
     }
@@ -40,10 +38,8 @@ public function getValueOfXForY($yValue)
      * Return the Equation of the best-fit line.
      *
      * @param int $dp Number of places of decimal precision to display
-     *
-     * @return string
      */
-    public function getEquation($dp = 0)
+    public function getEquation(int $dp = 0): string
     {
         $slope = $this->getSlope($dp);
         $intersect = $this->getIntersect($dp);
@@ -67,9 +63,8 @@ private function linearRegression(array $yValues, array $xValues, bool $const):
      *
      * @param float[] $yValues The set of Y-values for this regression
      * @param float[] $xValues The set of X-values for this regression
-     * @param bool $const
      */
-    public function __construct($yValues, $xValues = [], $const = true)
+    public function __construct(array $yValues, array $xValues = [], bool $const = true)
     {
         parent::__construct($yValues, $xValues);
 
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/LogarithmicBestFit.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/LogarithmicBestFit.php
index 2366dc636a..3dec61b2df 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/LogarithmicBestFit.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/LogarithmicBestFit.php
@@ -7,10 +7,8 @@ class LogarithmicBestFit extends BestFit
     /**
      * Algorithm type to use for best-fit
      * (Name of this Trend class).
-     *
-     * @var string
      */
-    protected $bestFitType = 'logarithmic';
+    protected string $bestFitType = 'logarithmic';
 
     /**
      * Return the Y-Value for a specified value of X.
@@ -19,7 +17,7 @@ class LogarithmicBestFit extends BestFit
      *
      * @return float Y-Value
      */
-    public function getValueOfYForX($xValue)
+    public function getValueOfYForX(float $xValue): float
     {
         return $this->getIntersect() + $this->getSlope() * log($xValue - $this->xOffset);
     }
@@ -31,7 +29,7 @@ public function getValueOfYForX($xValue)
      *
      * @return float X-Value
      */
-    public function getValueOfXForY($yValue)
+    public function getValueOfXForY(float $yValue): float
     {
         return exp(($yValue - $this->getIntersect()) / $this->getSlope());
     }
@@ -40,10 +38,8 @@ public function getValueOfXForY($yValue)
      * Return the Equation of the best-fit line.
      *
      * @param int $dp Number of places of decimal precision to display
-     *
-     * @return string
      */
-    public function getEquation($dp = 0)
+    public function getEquation(int $dp = 0): string
     {
         $slope = $this->getSlope($dp);
         $intersect = $this->getIntersect($dp);
@@ -60,9 +56,7 @@ public function getEquation($dp = 0)
     private function logarithmicRegression(array $yValues, array $xValues, bool $const): void
     {
         $adjustedYValues = array_map(
-            function ($value) {
-                return ($value < 0.0) ? 0 - log(abs($value)) : log($value);
-            },
+            fn ($value): float => ($value < 0.0) ? 0 - log(abs($value)) : log($value),
             $yValues
         );
 
@@ -74,9 +68,8 @@ function ($value) {
      *
      * @param float[] $yValues The set of Y-values for this regression
      * @param float[] $xValues The set of X-values for this regression
-     * @param bool $const
      */
-    public function __construct($yValues, $xValues = [], $const = true)
+    public function __construct(array $yValues, array $xValues = [], bool $const = true)
     {
         parent::__construct($yValues, $xValues);
 
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/PolynomialBestFit.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/PolynomialBestFit.php
index 2c8eea5b7c..911a9c34f3 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/PolynomialBestFit.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/PolynomialBestFit.php
@@ -2,31 +2,29 @@
 
 namespace PhpOffice\PhpSpreadsheet\Shared\Trend;
 
-use PhpOffice\PhpSpreadsheet\Shared\JAMA\Matrix;
+use Matrix\Matrix;
 
+// Phpstan and Scrutinizer seem to have legitimate complaints.
+// $this->slope is specified where an array is expected in several places.
+// But it seems that it should always be float.
+// This code is probably not exercised at all in unit tests.
 class PolynomialBestFit extends BestFit
 {
     /**
      * Algorithm type to use for best-fit
      * (Name of this Trend class).
-     *
-     * @var string
      */
-    protected $bestFitType = 'polynomial';
+    protected string $bestFitType = 'polynomial';
 
     /**
      * Polynomial order.
-     *
-     * @var int
      */
-    protected $order = 0;
+    protected int $order = 0;
 
     /**
      * Return the order of this polynomial.
-     *
-     * @return int
      */
-    public function getOrder()
+    public function getOrder(): int
     {
         return $this->order;
     }
@@ -38,10 +36,11 @@ public function getOrder()
      *
      * @return float Y-Value
      */
-    public function getValueOfYForX($xValue)
+    public function getValueOfYForX(float $xValue): float
     {
         $retVal = $this->getIntersect();
         $slope = $this->getSlope();
+        // Phpstan and Scrutinizer are both correct - getSlope returns float, not array.
         // @phpstan-ignore-next-line
         foreach ($slope as $key => $value) {
             if ($value != 0.0) {
@@ -59,7 +58,7 @@ public function getValueOfYForX($xValue)
      *
      * @return float X-Value
      */
-    public function getValueOfXForY($yValue)
+    public function getValueOfXForY(float $yValue): float
     {
         return ($yValue - $this->getIntersect()) / $this->getSlope();
     }
@@ -68,15 +67,14 @@ public function getValueOfXForY($yValue)
      * Return the Equation of the best-fit line.
      *
      * @param int $dp Number of places of decimal precision to display
-     *
-     * @return string
      */
-    public function getEquation($dp = 0)
+    public function getEquation(int $dp = 0): string
     {
         $slope = $this->getSlope($dp);
         $intersect = $this->getIntersect($dp);
 
         $equation = 'Y = ' . $intersect;
+        // Phpstan and Scrutinizer are both correct - getSlope returns float, not array.
         // @phpstan-ignore-next-line
         foreach ($slope as $key => $value) {
             if ($value != 0.0) {
@@ -94,13 +92,12 @@ public function getEquation($dp = 0)
      * Return the Slope of the line.
      *
      * @param int $dp Number of places of decimal precision to display
-     *
-     * @return float
      */
-    public function getSlope($dp = 0)
+    public function getSlope(int $dp = 0): float
     {
         if ($dp != 0) {
             $coefficients = [];
+            //* @phpstan-ignore-next-line
             foreach ($this->slope as $coefficient) {
                 $coefficients[] = round($coefficient, $dp);
             }
@@ -112,8 +109,10 @@ public function getSlope($dp = 0)
         return $this->slope;
     }
 
-    public function getCoefficients($dp = 0)
+    public function getCoefficients(int $dp = 0): array
     {
+        // Phpstan and Scrutinizer are both correct - getSlope returns float, not array.
+        // @phpstan-ignore-next-line
         return array_merge([$this->getIntersect($dp)], $this->getSlope($dp));
     }
 
@@ -124,7 +123,7 @@ public function getCoefficients($dp = 0)
      * @param float[] $yValues The set of Y-values for this regression
      * @param float[] $xValues The set of X-values for this regression
      */
-    private function polynomialRegression($order, $yValues, $xValues): void
+    private function polynomialRegression(int $order, array $yValues, array $xValues): void
     {
         // calculate sums
         $x_sum = array_sum($xValues);
@@ -158,15 +157,19 @@ private function polynomialRegression($order, $yValues, $xValues): void
         $C = $matrixA->solve($matrixB);
 
         $coefficients = [];
-        for ($i = 0; $i < $C->getRowDimension(); ++$i) {
-            $r = $C->get($i, 0);
-            if (abs($r) <= 10 ** (-9)) {
+        for ($i = 0; $i < $C->rows; ++$i) {
+            $r = $C->getValue($i + 1, 1); // row and column are origin-1
+            if (!is_numeric($r) || abs($r) <= 10 ** (-9)) {
                 $r = 0;
+            } else {
+                $r += 0;
             }
             $coefficients[] = $r;
         }
 
-        $this->intersect = array_shift($coefficients);
+        $this->intersect = (float) array_shift($coefficients);
+        // Phpstan is correct
+        //* @phpstan-ignore-next-line
         $this->slope = $coefficients;
 
         $this->calculateGoodnessOfFit($x_sum, $y_sum, $xx_sum, $yy_sum, $xy_sum, 0, 0, 0);
@@ -182,7 +185,7 @@ private function polynomialRegression($order, $yValues, $xValues): void
      * @param float[] $yValues The set of Y-values for this regression
      * @param float[] $xValues The set of X-values for this regression
      */
-    public function __construct($order, $yValues, $xValues = [])
+    public function __construct(int $order, array $yValues, array $xValues = [])
     {
         parent::__construct($yValues, $xValues);
 
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/PowerBestFit.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/PowerBestFit.php
index cafd01158e..56b5a12b22 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/PowerBestFit.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/PowerBestFit.php
@@ -7,10 +7,8 @@ class PowerBestFit extends BestFit
     /**
      * Algorithm type to use for best-fit
      * (Name of this Trend class).
-     *
-     * @var string
      */
-    protected $bestFitType = 'power';
+    protected string $bestFitType = 'power';
 
     /**
      * Return the Y-Value for a specified value of X.
@@ -19,7 +17,7 @@ class PowerBestFit extends BestFit
      *
      * @return float Y-Value
      */
-    public function getValueOfYForX($xValue)
+    public function getValueOfYForX(float $xValue): float
     {
         return $this->getIntersect() * ($xValue - $this->xOffset) ** $this->getSlope();
     }
@@ -31,7 +29,7 @@ public function getValueOfYForX($xValue)
      *
      * @return float X-Value
      */
-    public function getValueOfXForY($yValue)
+    public function getValueOfXForY(float $yValue): float
     {
         return (($yValue + $this->yOffset) / $this->getIntersect()) ** (1 / $this->getSlope());
     }
@@ -40,10 +38,8 @@ public function getValueOfXForY($yValue)
      * Return the Equation of the best-fit line.
      *
      * @param int $dp Number of places of decimal precision to display
-     *
-     * @return string
      */
-    public function getEquation($dp = 0)
+    public function getEquation(int $dp = 0): string
     {
         $slope = $this->getSlope($dp);
         $intersect = $this->getIntersect($dp);
@@ -55,10 +51,8 @@ public function getEquation($dp = 0)
      * Return the Value of X where it intersects Y = 0.
      *
      * @param int $dp Number of places of decimal precision to display
-     *
-     * @return float
      */
-    public function getIntersect($dp = 0)
+    public function getIntersect(int $dp = 0): float
     {
         if ($dp != 0) {
             return round(exp($this->intersect), $dp);
@@ -76,15 +70,11 @@ public function getIntersect($dp = 0)
     private function powerRegression(array $yValues, array $xValues, bool $const): void
     {
         $adjustedYValues = array_map(
-            function ($value) {
-                return ($value < 0.0) ? 0 - log(abs($value)) : log($value);
-            },
+            fn ($value): float => ($value < 0.0) ? 0 - log(abs($value)) : log($value),
             $yValues
         );
         $adjustedXValues = array_map(
-            function ($value) {
-                return ($value < 0.0) ? 0 - log(abs($value)) : log($value);
-            },
+            fn ($value): float => ($value < 0.0) ? 0 - log(abs($value)) : log($value),
             $xValues
         );
 
@@ -96,9 +86,8 @@ function ($value) {
      *
      * @param float[] $yValues The set of Y-values for this regression
      * @param float[] $xValues The set of X-values for this regression
-     * @param bool $const
      */
-    public function __construct($yValues, $xValues = [], $const = true)
+    public function __construct(array $yValues, array $xValues = [], bool $const = true)
     {
         parent::__construct($yValues, $xValues);
 
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/Trend.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/Trend.php
index 61d1183aba..dc8794300d 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/Trend.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Trend/Trend.php
@@ -21,7 +21,7 @@ class Trend
      *
      * @var string[]
      */
-    private static $trendTypes = [
+    private static array $trendTypes = [
         self::TREND_LINEAR,
         self::TREND_LOGARITHMIC,
         self::TREND_EXPONENTIAL,
@@ -33,7 +33,7 @@ class Trend
      *
      * @var string[]
      */
-    private static $trendTypePolynomialOrders = [
+    private static array $trendTypePolynomialOrders = [
         self::TREND_POLYNOMIAL_2,
         self::TREND_POLYNOMIAL_3,
         self::TREND_POLYNOMIAL_4,
@@ -46,9 +46,9 @@ class Trend
      *
      * @var BestFit[]
      */
-    private static $trendCache = [];
+    private static array $trendCache = [];
 
-    public static function calculate($trendType = self::TREND_BEST_FIT, $yValues = [], $xValues = [], $const = true)
+    public static function calculate(string $trendType = self::TREND_BEST_FIT, array $yValues = [], array $xValues = [], bool $const = true): mixed
     {
         //    Calculate number of points in each dataset
         $nY = count($yValues);
@@ -82,7 +82,7 @@ public static function calculate($trendType = self::TREND_BEST_FIT, $yValues = [
             case self::TREND_POLYNOMIAL_5:
             case self::TREND_POLYNOMIAL_6:
                 if (!isset(self::$trendCache[$key])) {
-                    $order = substr($trendType, -1);
+                    $order = (int) substr($trendType, -1);
                     self::$trendCache[$key] = new PolynomialBestFit($order, $yValues, $xValues);
                 }
 
@@ -95,12 +95,13 @@ public static function calculate($trendType = self::TREND_BEST_FIT, $yValues = [
                 $bestFitValue = [];
                 foreach (self::$trendTypes as $trendMethod) {
                     $className = '\PhpOffice\PhpSpreadsheet\Shared\Trend\\' . $trendType . 'BestFit';
+                    //* @phpstan-ignore-next-line
                     $bestFit[$trendMethod] = new $className($yValues, $xValues, $const);
                     $bestFitValue[$trendMethod] = $bestFit[$trendMethod]->getGoodnessOfFit();
                 }
                 if ($trendType != self::TREND_BEST_FIT_NO_POLY) {
                     foreach (self::$trendTypePolynomialOrders as $trendMethod) {
-                        $order = substr($trendMethod, -1);
+                        $order = (int) substr($trendMethod, -1);
                         $bestFit[$trendMethod] = new PolynomialBestFit($order, $yValues, $xValues);
                         if ($bestFit[$trendMethod]->getError()) {
                             unset($bestFit[$trendMethod]);
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/XMLWriter.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/XMLWriter.php
index c35b7820d9..2703e98e99 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/XMLWriter.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/XMLWriter.php
@@ -2,9 +2,11 @@
 
 namespace PhpOffice\PhpSpreadsheet\Shared;
 
+use PhpOffice\PhpSpreadsheet\Exception as SpreadsheetException;
+
 class XMLWriter extends \XMLWriter
 {
-    public static $debugEnabled = false;
+    public static bool $debugEnabled = false;
 
     /** Temporary storage method */
     const STORAGE_MEMORY = 1;
@@ -12,31 +14,29 @@ class XMLWriter extends \XMLWriter
 
     /**
      * Temporary filename.
-     *
-     * @var string
      */
-    private $tempFileName = '';
+    private string $tempFileName = '';
 
     /**
      * Create a new XMLWriter instance.
      *
-     * @param int $pTemporaryStorage Temporary storage location
-     * @param string $pTemporaryStorageFolder Temporary storage folder
+     * @param int $temporaryStorage Temporary storage location
+     * @param ?string $temporaryStorageFolder Temporary storage folder
      */
-    public function __construct($pTemporaryStorage = self::STORAGE_MEMORY, $pTemporaryStorageFolder = null)
+    public function __construct(int $temporaryStorage = self::STORAGE_MEMORY, ?string $temporaryStorageFolder = null)
     {
         // Open temporary storage
-        if ($pTemporaryStorage == self::STORAGE_MEMORY) {
+        if ($temporaryStorage == self::STORAGE_MEMORY) {
             $this->openMemory();
         } else {
             // Create temporary filename
-            if ($pTemporaryStorageFolder === null) {
-                $pTemporaryStorageFolder = File::sysGetTempDir();
+            if ($temporaryStorageFolder === null) {
+                $temporaryStorageFolder = File::sysGetTempDir();
             }
-            $this->tempFileName = @tempnam($pTemporaryStorageFolder, 'xml');
+            $this->tempFileName = (string) @tempnam($temporaryStorageFolder, 'xml');
 
             // Open storage
-            if ($this->openUri($this->tempFileName) === false) {
+            if (empty($this->tempFileName) || $this->openUri($this->tempFileName) === false) {
                 // Fallback to memory...
                 $this->openMemory();
             }
@@ -54,39 +54,43 @@ public function __construct($pTemporaryStorage = self::STORAGE_MEMORY, $pTempora
     public function __destruct()
     {
         // Unlink temporary files
+        // There is nothing reasonable to do if unlink fails.
         if ($this->tempFileName != '') {
             @unlink($this->tempFileName);
         }
     }
 
+    public function __wakeup(): void
+    {
+        $this->tempFileName = '';
+
+        throw new SpreadsheetException('Unserialize not permitted');
+    }
+
     /**
      * Get written data.
-     *
-     * @return string
      */
-    public function getData()
+    public function getData(): string
     {
         if ($this->tempFileName == '') {
             return $this->outputMemory(true);
         }
         $this->flush();
 
-        return file_get_contents($this->tempFileName);
+        return file_get_contents($this->tempFileName) ?: '';
     }
 
     /**
      * Wrapper method for writeRaw.
      *
-     * @param string|string[] $text
-     *
-     * @return bool
+     * @param null|string|string[] $rawTextData
      */
-    public function writeRawData($text)
+    public function writeRawData($rawTextData): bool
     {
-        if (is_array($text)) {
-            $text = implode("\n", $text);
+        if (is_array($rawTextData)) {
+            $rawTextData = implode("\n", $rawTextData);
         }
 
-        return $this->writeRaw(htmlspecialchars($text ?? ''));
+        return $this->writeRaw(htmlspecialchars($rawTextData ?? ''));
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Xls.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Xls.php
index 26035ec683..cdb1bf243c 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Xls.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Xls.php
@@ -3,6 +3,7 @@
 namespace PhpOffice\PhpSpreadsheet\Shared;
 
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Helper\Dimension;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 
 class Xls
@@ -12,17 +13,17 @@ class Xls
      * x is the width in intrinsic Excel units (measuring width in number of normal characters)
      * This holds for Arial 10.
      *
-     * @param Worksheet $sheet The sheet
+     * @param Worksheet $worksheet The sheet
      * @param string $col The column
      *
      * @return int The width in pixels
      */
-    public static function sizeCol($sheet, $col = 'A')
+    public static function sizeCol(Worksheet $worksheet, string $col = 'A'): int
     {
         // default font of the workbook
-        $font = $sheet->getParent()->getDefaultStyle()->getFont();
+        $font = $worksheet->getParentOrThrow()->getDefaultStyle()->getFont();
 
-        $columnDimensions = $sheet->getColumnDimensions();
+        $columnDimensions = $worksheet->getColumnDimensions();
 
         // first find the true column width in pixels (uncollapsed and unhidden)
         if (isset($columnDimensions[$col]) && $columnDimensions[$col]->getWidth() != -1) {
@@ -30,9 +31,9 @@ public static function sizeCol($sheet, $col = 'A')
             $columnDimension = $columnDimensions[$col];
             $width = $columnDimension->getWidth();
             $pixelWidth = Drawing::cellDimensionToPixels($width, $font);
-        } elseif ($sheet->getDefaultColumnDimension()->getWidth() != -1) {
+        } elseif ($worksheet->getDefaultColumnDimension()->getWidth() != -1) {
             // then we have default column dimension with explicit width
-            $defaultColumnDimension = $sheet->getDefaultColumnDimension();
+            $defaultColumnDimension = $worksheet->getDefaultColumnDimension();
             $width = $defaultColumnDimension->getWidth();
             $pixelWidth = Drawing::cellDimensionToPixels($width, $font);
         } else {
@@ -55,17 +56,17 @@ public static function sizeCol($sheet, $col = 'A')
      * the relationship is: y = 4/3x. If the height hasn't been set by the user we
      * use the default value. If the row is hidden we use a value of zero.
      *
-     * @param Worksheet $sheet The sheet
+     * @param Worksheet $worksheet The sheet
      * @param int $row The row index (1-based)
      *
      * @return int The width in pixels
      */
-    public static function sizeRow($sheet, $row = 1)
+    public static function sizeRow(Worksheet $worksheet, int $row = 1): int
     {
         // default font of the workbook
-        $font = $sheet->getParent()->getDefaultStyle()->getFont();
+        $font = $worksheet->getParentOrThrow()->getDefaultStyle()->getFont();
 
-        $rowDimensions = $sheet->getRowDimensions();
+        $rowDimensions = $worksheet->getRowDimensions();
 
         // first find the true row height in pixels (uncollapsed and unhidden)
         if (isset($rowDimensions[$row]) && $rowDimensions[$row]->getRowHeight() != -1) {
@@ -73,15 +74,14 @@ public static function sizeRow($sheet, $row = 1)
             $rowDimension = $rowDimensions[$row];
             $rowHeight = $rowDimension->getRowHeight();
             $pixelRowHeight = (int) ceil(4 * $rowHeight / 3); // here we assume Arial 10
-        } elseif ($sheet->getDefaultRowDimension()->getRowHeight() != -1) {
+        } elseif ($worksheet->getDefaultRowDimension()->getRowHeight() != -1) {
             // then we have a default row dimension with explicit height
-            $defaultRowDimension = $sheet->getDefaultRowDimension();
-            $rowHeight = $defaultRowDimension->getRowHeight();
-            $pixelRowHeight = Drawing::pointsToPixels($rowHeight);
+            $defaultRowDimension = $worksheet->getDefaultRowDimension();
+            $pixelRowHeight = $defaultRowDimension->getRowHeight(Dimension::UOM_PIXELS);
         } else {
             // we don't even have any default row dimension. Height depends on default font
             $pointRowHeight = Font::getDefaultRowHeightByFont($font);
-            $pixelRowHeight = Font::fontSizeToPixels($pointRowHeight);
+            $pixelRowHeight = Font::fontSizeToPixels((int) $pointRowHeight);
         }
 
         // now find the effective row height in pixels
@@ -91,21 +91,19 @@ public static function sizeRow($sheet, $row = 1)
             $effectivePixelRowHeight = $pixelRowHeight;
         }
 
-        return $effectivePixelRowHeight;
+        return (int) $effectivePixelRowHeight;
     }
 
     /**
      * Get the horizontal distance in pixels between two anchors
      * The distanceX is found as sum of all the spanning columns widths minus correction for the two offsets.
      *
-     * @param string $startColumn
-     * @param int $startOffsetX Offset within start cell measured in 1/1024 of the cell width
-     * @param string $endColumn
-     * @param int $endOffsetX Offset within end cell measured in 1/1024 of the cell width
+     * @param float|int $startOffsetX Offset within start cell measured in 1/1024 of the cell width
+     * @param float|int $endOffsetX Offset within end cell measured in 1/1024 of the cell width
      *
      * @return int Horizontal measured in pixels
      */
-    public static function getDistanceX(Worksheet $sheet, $startColumn = 'A', $startOffsetX = 0, $endColumn = 'A', $endOffsetX = 0)
+    public static function getDistanceX(Worksheet $worksheet, string $startColumn = 'A', float|int $startOffsetX = 0, string $endColumn = 'A', float|int $endOffsetX = 0): int
     {
         $distanceX = 0;
 
@@ -113,14 +111,14 @@ public static function getDistanceX(Worksheet $sheet, $startColumn = 'A', $start
         $startColumnIndex = Coordinate::columnIndexFromString($startColumn);
         $endColumnIndex = Coordinate::columnIndexFromString($endColumn);
         for ($i = $startColumnIndex; $i <= $endColumnIndex; ++$i) {
-            $distanceX += self::sizeCol($sheet, Coordinate::stringFromColumnIndex($i));
+            $distanceX += self::sizeCol($worksheet, Coordinate::stringFromColumnIndex($i));
         }
 
         // correct for offsetX in startcell
-        $distanceX -= (int) floor(self::sizeCol($sheet, $startColumn) * $startOffsetX / 1024);
+        $distanceX -= (int) floor(self::sizeCol($worksheet, $startColumn) * $startOffsetX / 1024);
 
         // correct for offsetX in endcell
-        $distanceX -= (int) floor(self::sizeCol($sheet, $endColumn) * (1 - $endOffsetX / 1024));
+        $distanceX -= (int) floor(self::sizeCol($worksheet, $endColumn) * (1 - $endOffsetX / 1024));
 
         return $distanceX;
     }
@@ -130,26 +128,26 @@ public static function getDistanceX(Worksheet $sheet, $startColumn = 'A', $start
      * The distanceY is found as sum of all the spanning rows minus two offsets.
      *
      * @param int $startRow (1-based)
-     * @param int $startOffsetY Offset within start cell measured in 1/256 of the cell height
+     * @param float|int $startOffsetY Offset within start cell measured in 1/256 of the cell height
      * @param int $endRow (1-based)
-     * @param int $endOffsetY Offset within end cell measured in 1/256 of the cell height
+     * @param float|int $endOffsetY Offset within end cell measured in 1/256 of the cell height
      *
      * @return int Vertical distance measured in pixels
      */
-    public static function getDistanceY(Worksheet $sheet, $startRow = 1, $startOffsetY = 0, $endRow = 1, $endOffsetY = 0)
+    public static function getDistanceY(Worksheet $worksheet, int $startRow = 1, float|int $startOffsetY = 0, int $endRow = 1, float|int $endOffsetY = 0): int
     {
         $distanceY = 0;
 
         // add the widths of the spanning rows
         for ($row = $startRow; $row <= $endRow; ++$row) {
-            $distanceY += self::sizeRow($sheet, $row);
+            $distanceY += self::sizeRow($worksheet, $row);
         }
 
         // correct for offsetX in startcell
-        $distanceY -= (int) floor(self::sizeRow($sheet, $startRow) * $startOffsetY / 256);
+        $distanceY -= (int) floor(self::sizeRow($worksheet, $startRow) * $startOffsetY / 256);
 
         // correct for offsetX in endcell
-        $distanceY -= (int) floor(self::sizeRow($sheet, $endRow) * (1 - $endOffsetY / 256));
+        $distanceY -= (int) floor(self::sizeRow($worksheet, $endRow) * (1 - $endOffsetY / 256));
 
         return $distanceY;
     }
@@ -198,16 +196,13 @@ public static function getDistanceY(Worksheet $sheet, $startRow = 1, $startOffse
      *               W is the width of the cell
      *               H is the height of the cell
      *
-     * @param Worksheet $sheet
      * @param string $coordinates E.g. 'A1'
      * @param int $offsetX Horizontal offset in pixels
      * @param int $offsetY Vertical offset in pixels
      * @param int $width Width in pixels
      * @param int $height Height in pixels
-     *
-     * @return null|array
      */
-    public static function oneAnchor2twoAnchor($sheet, $coordinates, $offsetX, $offsetY, $width, $height)
+    public static function oneAnchor2twoAnchor(Worksheet $worksheet, string $coordinates, int $offsetX, int $offsetY, int $width, int $height): ?array
     {
         [$col_start, $row] = Coordinate::indexesFromString($coordinates);
         $row_start = $row - 1;
@@ -220,10 +215,10 @@ public static function oneAnchor2twoAnchor($sheet, $coordinates, $offsetX, $offs
         $row_end = $row_start; // Row containing bottom right corner of object
 
         // Zero the specified offset if greater than the cell dimensions
-        if ($x1 >= self::sizeCol($sheet, Coordinate::stringFromColumnIndex($col_start))) {
+        if ($x1 >= self::sizeCol($worksheet, Coordinate::stringFromColumnIndex($col_start))) {
             $x1 = 0;
         }
-        if ($y1 >= self::sizeRow($sheet, $row_start + 1)) {
+        if ($y1 >= self::sizeRow($worksheet, $row_start + 1)) {
             $y1 = 0;
         }
 
@@ -231,37 +226,37 @@ public static function oneAnchor2twoAnchor($sheet, $coordinates, $offsetX, $offs
         $height = $height + $y1 - 1;
 
         // Subtract the underlying cell widths to find the end cell of the image
-        while ($width >= self::sizeCol($sheet, Coordinate::stringFromColumnIndex($col_end))) {
-            $width -= self::sizeCol($sheet, Coordinate::stringFromColumnIndex($col_end));
+        while ($width >= self::sizeCol($worksheet, Coordinate::stringFromColumnIndex($col_end))) {
+            $width -= self::sizeCol($worksheet, Coordinate::stringFromColumnIndex($col_end));
             ++$col_end;
         }
 
         // Subtract the underlying cell heights to find the end cell of the image
-        while ($height >= self::sizeRow($sheet, $row_end + 1)) {
-            $height -= self::sizeRow($sheet, $row_end + 1);
+        while ($height >= self::sizeRow($worksheet, $row_end + 1)) {
+            $height -= self::sizeRow($worksheet, $row_end + 1);
             ++$row_end;
         }
 
         // Bitmap isn't allowed to start or finish in a hidden cell, i.e. a cell
         // with zero height or width.
-        if (self::sizeCol($sheet, Coordinate::stringFromColumnIndex($col_start)) == 0) {
+        if (self::sizeCol($worksheet, Coordinate::stringFromColumnIndex($col_start)) == 0) {
             return null;
         }
-        if (self::sizeCol($sheet, Coordinate::stringFromColumnIndex($col_end)) == 0) {
+        if (self::sizeCol($worksheet, Coordinate::stringFromColumnIndex($col_end)) == 0) {
             return null;
         }
-        if (self::sizeRow($sheet, $row_start + 1) == 0) {
+        if (self::sizeRow($worksheet, $row_start + 1) == 0) {
             return null;
         }
-        if (self::sizeRow($sheet, $row_end + 1) == 0) {
+        if (self::sizeRow($worksheet, $row_end + 1) == 0) {
             return null;
         }
 
         // Convert the pixel values to the percentage value expected by Excel
-        $x1 = $x1 / self::sizeCol($sheet, Coordinate::stringFromColumnIndex($col_start)) * 1024;
-        $y1 = $y1 / self::sizeRow($sheet, $row_start + 1) * 256;
-        $x2 = ($width + 1) / self::sizeCol($sheet, Coordinate::stringFromColumnIndex($col_end)) * 1024; // Distance to right side of object
-        $y2 = ($height + 1) / self::sizeRow($sheet, $row_end + 1) * 256; // Distance to bottom of object
+        $x1 = $x1 / self::sizeCol($worksheet, Coordinate::stringFromColumnIndex($col_start)) * 1024;
+        $y1 = $y1 / self::sizeRow($worksheet, $row_start + 1) * 256;
+        $x2 = ($width + 1) / self::sizeCol($worksheet, Coordinate::stringFromColumnIndex($col_end)) * 1024; // Distance to right side of object
+        $y2 = ($height + 1) / self::sizeRow($worksheet, $row_end + 1) * 256; // Distance to bottom of object
 
         $startCoordinates = Coordinate::stringFromColumnIndex($col_start) . ($row_start + 1);
         $endCoordinates = Coordinate::stringFromColumnIndex($col_end) . ($row_end + 1);
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Spreadsheet.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Spreadsheet.php
index db617ef620..c0a3a9bc21 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Spreadsheet.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Spreadsheet.php
@@ -2,13 +2,21 @@
 
 namespace PhpOffice\PhpSpreadsheet;
 
+use JsonSerializable;
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Document\Properties;
+use PhpOffice\PhpSpreadsheet\Document\Security;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx as XlsxReader;
+use PhpOffice\PhpSpreadsheet\Shared\Date;
+use PhpOffice\PhpSpreadsheet\Shared\File;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PhpOffice\PhpSpreadsheet\Style\Style;
 use PhpOffice\PhpSpreadsheet\Worksheet\Iterator;
+use PhpOffice\PhpSpreadsheet\Worksheet\Table;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx as XlsxWriter;
 
-class Spreadsheet
+class Spreadsheet implements JsonSerializable
 {
     // Allowable values for workbook window visilbity
     const VISIBILITY_VISIBLE = 'visible';
@@ -18,193 +26,162 @@ class Spreadsheet
     private const DEFINED_NAME_IS_RANGE = false;
     private const DEFINED_NAME_IS_FORMULA = true;
 
-    private static $workbookViewVisibilityValues = [
+    private const WORKBOOK_VIEW_VISIBILITY_VALUES = [
         self::VISIBILITY_VISIBLE,
         self::VISIBILITY_HIDDEN,
         self::VISIBILITY_VERY_HIDDEN,
     ];
 
+    protected int $excelCalendar = Date::CALENDAR_WINDOWS_1900;
+
     /**
      * Unique ID.
-     *
-     * @var string
      */
-    private $uniqueID;
+    private string $uniqueID;
 
     /**
      * Document properties.
-     *
-     * @var Document\Properties
      */
-    private $properties;
+    private Properties $properties;
 
     /**
      * Document security.
-     *
-     * @var Document\Security
      */
-    private $security;
+    private Security $security;
 
     /**
      * Collection of Worksheet objects.
      *
      * @var Worksheet[]
      */
-    private $workSheetCollection = [];
+    private array $workSheetCollection;
 
     /**
      * Calculation Engine.
-     *
-     * @var null|Calculation
      */
-    private $calculationEngine;
+    private ?Calculation $calculationEngine;
 
     /**
      * Active sheet index.
-     *
-     * @var int
      */
-    private $activeSheetIndex = 0;
+    private int $activeSheetIndex;
 
     /**
      * Named ranges.
      *
      * @var DefinedName[]
      */
-    private $definedNames = [];
+    private array $definedNames;
 
     /**
      * CellXf supervisor.
-     *
-     * @var Style
      */
-    private $cellXfSupervisor;
+    private Style $cellXfSupervisor;
 
     /**
      * CellXf collection.
      *
      * @var Style[]
      */
-    private $cellXfCollection = [];
+    private array $cellXfCollection = [];
 
     /**
      * CellStyleXf collection.
      *
      * @var Style[]
      */
-    private $cellStyleXfCollection = [];
+    private array $cellStyleXfCollection = [];
 
     /**
      * hasMacros : this workbook have macros ?
-     *
-     * @var bool
      */
-    private $hasMacros = false;
+    private bool $hasMacros = false;
 
     /**
      * macrosCode : all macros code as binary data (the vbaProject.bin file, this include form, code,  etc.), null if no macro.
-     *
-     * @var null|string
      */
-    private $macrosCode;
+    private ?string $macrosCode = null;
 
     /**
      * macrosCertificate : if macros are signed, contains binary data vbaProjectSignature.bin file, null if not signed.
-     *
-     * @var null|string
      */
-    private $macrosCertificate;
+    private ?string $macrosCertificate = null;
 
     /**
      * ribbonXMLData : null if workbook is'nt Excel 2007 or not contain a customized UI.
      *
      * @var null|array{target: string, data: string}
      */
-    private $ribbonXMLData;
+    private ?array $ribbonXMLData = null;
 
     /**
      * ribbonBinObjects : null if workbook is'nt Excel 2007 or not contain embedded objects (picture(s)) for Ribbon Elements
      * ignored if $ribbonXMLData is null.
-     *
-     * @var null|array
      */
-    private $ribbonBinObjects;
+    private ?array $ribbonBinObjects = null;
 
     /**
      * List of unparsed loaded data for export to same format with better compatibility.
      * It has to be minimized when the library start to support currently unparsed data.
-     *
-     * @var array
      */
-    private $unparsedLoadedData = [];
+    private array $unparsedLoadedData = [];
 
     /**
      * Controls visibility of the horizonal scroll bar in the application.
-     *
-     * @var bool
      */
-    private $showHorizontalScroll = true;
+    private bool $showHorizontalScroll = true;
 
     /**
      * Controls visibility of the horizonal scroll bar in the application.
-     *
-     * @var bool
      */
-    private $showVerticalScroll = true;
+    private bool $showVerticalScroll = true;
 
     /**
      * Controls visibility of the sheet tabs in the application.
-     *
-     * @var bool
      */
-    private $showSheetTabs = true;
+    private bool $showSheetTabs = true;
 
     /**
      * Specifies a boolean value that indicates whether the workbook window
      * is minimized.
-     *
-     * @var bool
      */
-    private $minimized = false;
+    private bool $minimized = false;
 
     /**
      * Specifies a boolean value that indicates whether to group dates
      * when presenting the user with filtering optiomd in the user
      * interface.
-     *
-     * @var bool
      */
-    private $autoFilterDateGrouping = true;
+    private bool $autoFilterDateGrouping = true;
 
     /**
      * Specifies the index to the first sheet in the book view.
-     *
-     * @var int
      */
-    private $firstSheetIndex = 0;
+    private int $firstSheetIndex = 0;
 
     /**
      * Specifies the visible status of the workbook.
-     *
-     * @var string
      */
-    private $visibility = self::VISIBILITY_VISIBLE;
+    private string $visibility = self::VISIBILITY_VISIBLE;
 
     /**
      * Specifies the ratio between the workbook tabs bar and the horizontal
      * scroll bar.  TabRatio is assumed to be out of 1000 of the horizontal
      * window width.
-     *
-     * @var int
      */
-    private $tabRatio = 600;
+    private int $tabRatio = 600;
+
+    private Theme $theme;
+
+    public function getTheme(): Theme
+    {
+        return $this->theme;
+    }
 
     /**
      * The workbook has macros ?
-     *
-     * @return bool
      */
-    public function hasMacros()
+    public function hasMacros(): bool
     {
         return $this->hasMacros;
     }
@@ -214,7 +191,7 @@ public function hasMacros()
      *
      * @param bool $hasMacros true|false
      */
-    public function setHasMacros($hasMacros): void
+    public function setHasMacros(bool $hasMacros): void
     {
         $this->hasMacros = (bool) $hasMacros;
     }
@@ -224,7 +201,7 @@ public function setHasMacros($hasMacros): void
      *
      * @param string $macroCode string|null
      */
-    public function setMacrosCode($macroCode): void
+    public function setMacrosCode(string $macroCode): void
     {
         $this->macrosCode = $macroCode;
         $this->setHasMacros($macroCode !== null);
@@ -232,20 +209,16 @@ public function setMacrosCode($macroCode): void
 
     /**
      * Return the macros code.
-     *
-     * @return null|string
      */
-    public function getMacrosCode()
+    public function getMacrosCode(): ?string
     {
         return $this->macrosCode;
     }
 
     /**
      * Set the macros certificate.
-     *
-     * @param null|string $certificate
      */
-    public function setMacrosCertificate($certificate): void
+    public function setMacrosCertificate(?string $certificate): void
     {
         $this->macrosCertificate = $certificate;
     }
@@ -255,17 +228,15 @@ public function setMacrosCertificate($certificate): void
      *
      * @return bool true|false
      */
-    public function hasMacrosCertificate()
+    public function hasMacrosCertificate(): bool
     {
         return $this->macrosCertificate !== null;
     }
 
     /**
      * Return the macros certificate.
-     *
-     * @return null|string
      */
-    public function getMacrosCertificate()
+    public function getMacrosCertificate(): ?string
     {
         return $this->macrosCertificate;
     }
@@ -282,13 +253,10 @@ public function discardMacros(): void
 
     /**
      * set ribbon XML data.
-     *
-     * @param null|mixed $target
-     * @param null|mixed $xmlData
      */
-    public function setRibbonXMLData($target, $xmlData): void
+    public function setRibbonXMLData(mixed $target, mixed $xmlData): void
     {
-        if ($target !== null && $xmlData !== null) {
+        if (is_string($target) && is_string($xmlData)) {
             $this->ribbonXMLData = ['target' => $target, 'data' => $xmlData];
         } else {
             $this->ribbonXMLData = null;
@@ -297,12 +265,8 @@ public function setRibbonXMLData($target, $xmlData): void
 
     /**
      * retrieve ribbon XML Data.
-     *
-     * @param string $what
-     *
-     * @return null|array|string
      */
-    public function getRibbonXMLData($what = 'all') //we need some constants here...
+    public function getRibbonXMLData(string $what = 'all'): null|array|string //we need some constants here...
     {
         $returnData = null;
         $what = strtolower($what);
@@ -313,7 +277,7 @@ public function getRibbonXMLData($what = 'all') //we need some constants here...
                 break;
             case 'target':
             case 'data':
-                if (is_array($this->ribbonXMLData) && isset($this->ribbonXMLData[$what])) {
+                if (is_array($this->ribbonXMLData)) {
                     $returnData = $this->ribbonXMLData[$what];
                 }
 
@@ -325,14 +289,11 @@ public function getRibbonXMLData($what = 'all') //we need some constants here...
 
     /**
      * store binaries ribbon objects (pictures).
-     *
-     * @param null|mixed $BinObjectsNames
-     * @param null|mixed $BinObjectsData
      */
-    public function setRibbonBinObjects($BinObjectsNames, $BinObjectsData): void
+    public function setRibbonBinObjects(mixed $binObjectsNames, mixed $binObjectsData): void
     {
-        if ($BinObjectsNames !== null && $BinObjectsData !== null) {
-            $this->ribbonBinObjects = ['names' => $BinObjectsNames, 'data' => $BinObjectsData];
+        if ($binObjectsNames !== null && $binObjectsData !== null) {
+            $this->ribbonBinObjects = ['names' => $binObjectsNames, 'data' => $binObjectsData];
         } else {
             $this->ribbonBinObjects = null;
         }
@@ -343,10 +304,8 @@ public function setRibbonBinObjects($BinObjectsNames, $BinObjectsData): void
      * It has to be minimized when the library start to support currently unparsed data.
      *
      * @internal
-     *
-     * @return array
      */
-    public function getUnparsedLoadedData()
+    public function getUnparsedLoadedData(): array
     {
         return $this->unparsedLoadedData;
     }
@@ -362,36 +321,16 @@ public function setUnparsedLoadedData(array $unparsedLoadedData): void
         $this->unparsedLoadedData = $unparsedLoadedData;
     }
 
-    /**
-     * return the extension of a filename. Internal use for a array_map callback (php<5.3 don't like lambda function).
-     *
-     * @param mixed $path
-     *
-     * @return string
-     */
-    private function getExtensionOnly($path)
-    {
-        $extension = pathinfo($path, PATHINFO_EXTENSION);
-
-        return is_array($extension) ? '' : $extension;
-    }
-
     /**
      * retrieve Binaries Ribbon Objects.
-     *
-     * @param string $what
-     *
-     * @return null|array
      */
-    public function getRibbonBinObjects($what = 'all')
+    public function getRibbonBinObjects(string $what = 'all'): ?array
     {
         $ReturnData = null;
         $what = strtolower($what);
         switch ($what) {
             case 'all':
                 return $this->ribbonBinObjects;
-
-                break;
             case 'names':
             case 'data':
                 if (is_array($this->ribbonBinObjects) && isset($this->ribbonBinObjects[$what])) {
@@ -401,11 +340,11 @@ public function getRibbonBinObjects($what = 'all')
                 break;
             case 'types':
                 if (
-                    is_array($this->ribbonBinObjects) &&
-                    isset($this->ribbonBinObjects['data']) && is_array($this->ribbonBinObjects['data'])
+                    is_array($this->ribbonBinObjects)
+                    && isset($this->ribbonBinObjects['data']) && is_array($this->ribbonBinObjects['data'])
                 ) {
                     $tmpTypes = array_keys($this->ribbonBinObjects['data']);
-                    $ReturnData = array_unique(array_map([$this, 'getExtensionOnly'], $tmpTypes));
+                    $ReturnData = array_unique(array_map(fn (string $path): string => pathinfo($path, PATHINFO_EXTENSION), $tmpTypes));
                 } else {
                     $ReturnData = []; // the caller want an array... not null if empty
                 }
@@ -418,20 +357,16 @@ public function getRibbonBinObjects($what = 'all')
 
     /**
      * This workbook have a custom UI ?
-     *
-     * @return bool
      */
-    public function hasRibbon()
+    public function hasRibbon(): bool
     {
         return $this->ribbonXMLData !== null;
     }
 
     /**
      * This workbook have additionnal object for the ribbon ?
-     *
-     * @return bool
      */
-    public function hasRibbonBinObjects()
+    public function hasRibbonBinObjects(): bool
     {
         return $this->ribbonBinObjects !== null;
     }
@@ -439,27 +374,23 @@ public function hasRibbonBinObjects()
     /**
      * Check if a sheet with a specified code name already exists.
      *
-     * @param string $pSheetCodeName Name of the worksheet to check
-     *
-     * @return bool
+     * @param string $codeName Name of the worksheet to check
      */
-    public function sheetCodeNameExists($pSheetCodeName)
+    public function sheetCodeNameExists(string $codeName): bool
     {
-        return $this->getSheetByCodeName($pSheetCodeName) !== null;
+        return $this->getSheetByCodeName($codeName) !== null;
     }
 
     /**
      * Get sheet by code name. Warning : sheet don't have always a code name !
      *
-     * @param string $pName Sheet name
-     *
-     * @return null|Worksheet
+     * @param string $codeName Sheet name
      */
-    public function getSheetByCodeName($pName)
+    public function getSheetByCodeName(string $codeName): ?Worksheet
     {
         $worksheetCount = count($this->workSheetCollection);
         for ($i = 0; $i < $worksheetCount; ++$i) {
-            if ($this->workSheetCollection[$i]->getCodeName() == $pName) {
+            if ($this->workSheetCollection[$i]->getCodeName() == $codeName) {
                 return $this->workSheetCollection[$i];
             }
         }
@@ -474,6 +405,7 @@ public function __construct()
     {
         $this->uniqueID = uniqid('', true);
         $this->calculationEngine = new Calculation($this);
+        $this->theme = new Theme();
 
         // Initialise worksheet collection and add one worksheet
         $this->workSheetCollection = [];
@@ -481,10 +413,10 @@ public function __construct()
         $this->activeSheetIndex = 0;
 
         // Create document properties
-        $this->properties = new Document\Properties();
+        $this->properties = new Properties();
 
         // Create document security
-        $this->security = new Document\Security();
+        $this->security = new Security();
 
         // Set defined names
         $this->definedNames = [];
@@ -507,6 +439,7 @@ public function __destruct()
         $this->calculationEngine = null;
         $this->cellXfCollection = [];
         $this->cellStyleXfCollection = [];
+        $this->definedNames = [];
     }
 
     /**
@@ -524,20 +457,16 @@ public function disconnectWorksheets(): void
 
     /**
      * Return the calculation engine for this worksheet.
-     *
-     * @return null|Calculation
      */
-    public function getCalculationEngine()
+    public function getCalculationEngine(): ?Calculation
     {
         return $this->calculationEngine;
     }
 
     /**
      * Get properties.
-     *
-     * @return Document\Properties
      */
-    public function getProperties()
+    public function getProperties(): Properties
     {
         return $this->properties;
     }
@@ -545,17 +474,15 @@ public function getProperties()
     /**
      * Set properties.
      */
-    public function setProperties(Document\Properties $pValue): void
+    public function setProperties(Properties $documentProperties): void
     {
-        $this->properties = $pValue;
+        $this->properties = $documentProperties;
     }
 
     /**
      * Get security.
-     *
-     * @return Document\Security
      */
-    public function getSecurity()
+    public function getSecurity(): Security
     {
         return $this->security;
     }
@@ -563,17 +490,15 @@ public function getSecurity()
     /**
      * Set security.
      */
-    public function setSecurity(Document\Security $pValue): void
+    public function setSecurity(Security $documentSecurity): void
     {
-        $this->security = $pValue;
+        $this->security = $documentSecurity;
     }
 
     /**
      * Get active sheet.
-     *
-     * @return Worksheet
      */
-    public function getActiveSheet()
+    public function getActiveSheet(): Worksheet
     {
         return $this->getSheet($this->activeSheetIndex);
     }
@@ -582,10 +507,8 @@ public function getActiveSheet()
      * Create sheet and add it to this workbook.
      *
      * @param null|int $sheetIndex Index where sheet should go (0,1,..., or null for last)
-     *
-     * @return Worksheet
      */
-    public function createSheet($sheetIndex = null)
+    public function createSheet(?int $sheetIndex = null): Worksheet
     {
         $newSheet = new Worksheet($this);
         $this->addSheet($newSheet, $sheetIndex);
@@ -596,76 +519,76 @@ public function createSheet($sheetIndex = null)
     /**
      * Check if a sheet with a specified name already exists.
      *
-     * @param string $pSheetName Name of the worksheet to check
-     *
-     * @return bool
+     * @param string $worksheetName Name of the worksheet to check
      */
-    public function sheetNameExists($pSheetName)
+    public function sheetNameExists(string $worksheetName): bool
     {
-        return $this->getSheetByName($pSheetName) !== null;
+        return $this->getSheetByName($worksheetName) !== null;
     }
 
     /**
      * Add sheet.
      *
-     * @param null|int $iSheetIndex Index where sheet should go (0,1,..., or null for last)
-     *
-     * @return Worksheet
+     * @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 $pSheet, $iSheetIndex = null)
+    public function addSheet(Worksheet $worksheet, ?int $sheetIndex = null): Worksheet
     {
-        if ($this->sheetNameExists($pSheet->getTitle())) {
+        if ($this->sheetNameExists($worksheet->getTitle())) {
             throw new Exception(
-                "Workbook already contains a worksheet named '{$pSheet->getTitle()}'. Rename this worksheet first."
+                "Workbook already contains a worksheet named '{$worksheet->getTitle()}'. Rename this worksheet first."
             );
         }
 
-        if ($iSheetIndex === null) {
+        if ($sheetIndex === null) {
             if ($this->activeSheetIndex < 0) {
                 $this->activeSheetIndex = 0;
             }
-            $this->workSheetCollection[] = $pSheet;
+            $this->workSheetCollection[] = $worksheet;
         } else {
             // Insert the sheet at the requested index
             array_splice(
                 $this->workSheetCollection,
-                $iSheetIndex,
+                $sheetIndex,
                 0,
-                [$pSheet]
+                [$worksheet]
             );
 
             // Adjust active sheet index if necessary
-            if ($this->activeSheetIndex >= $iSheetIndex) {
+            if ($this->activeSheetIndex >= $sheetIndex) {
                 ++$this->activeSheetIndex;
             }
+            if ($this->activeSheetIndex < 0) {
+                $this->activeSheetIndex = 0;
+            }
         }
 
-        if ($pSheet->getParent() === null) {
-            $pSheet->rebindParent($this);
+        if ($worksheet->getParent() === null) {
+            $worksheet->rebindParent($this);
         }
 
-        return $pSheet;
+        return $worksheet;
     }
 
     /**
      * Remove sheet by index.
      *
-     * @param int $pIndex Active sheet index
+     * @param int $sheetIndex Index position of the worksheet to remove
      */
-    public function removeSheetByIndex($pIndex): void
+    public function removeSheetByIndex(int $sheetIndex): void
     {
         $numSheets = count($this->workSheetCollection);
-        if ($pIndex > $numSheets - 1) {
+        if ($sheetIndex > $numSheets - 1) {
             throw new Exception(
-                "You tried to remove a sheet by the out of bounds index: {$pIndex}. The actual number of sheets is {$numSheets}."
+                "You tried to remove a sheet by the out of bounds index: {$sheetIndex}. The actual number of sheets is {$numSheets}."
             );
         }
-        array_splice($this->workSheetCollection, $pIndex, 1);
+        array_splice($this->workSheetCollection, $sheetIndex, 1);
 
         // Adjust active sheet index if necessary
         if (
-            ($this->activeSheetIndex >= $pIndex) &&
-            ($this->activeSheetIndex > 0 || $numSheets <= 1)
+            ($this->activeSheetIndex >= $sheetIndex)
+            && ($this->activeSheetIndex > 0 || $numSheets <= 1)
         ) {
             --$this->activeSheetIndex;
         }
@@ -674,21 +597,19 @@ public function removeSheetByIndex($pIndex): void
     /**
      * Get sheet by index.
      *
-     * @param int $pIndex Sheet index
-     *
-     * @return Worksheet
+     * @param int $sheetIndex Sheet index
      */
-    public function getSheet($pIndex)
+    public function getSheet(int $sheetIndex): Worksheet
     {
-        if (!isset($this->workSheetCollection[$pIndex])) {
+        if (!isset($this->workSheetCollection[$sheetIndex])) {
             $numSheets = $this->getSheetCount();
 
             throw new Exception(
-                "Your requested sheet index: {$pIndex} is out of bounds. The actual number of sheets is {$numSheets}."
+                "Your requested sheet index: {$sheetIndex} is out of bounds. The actual number of sheets is {$numSheets}."
             );
         }
 
-        return $this->workSheetCollection[$pIndex];
+        return $this->workSheetCollection[$sheetIndex];
     }
 
     /**
@@ -696,7 +617,7 @@ public function getSheet($pIndex)
      *
      * @return Worksheet[]
      */
-    public function getAllSheets()
+    public function getAllSheets(): array
     {
         return $this->workSheetCollection;
     }
@@ -704,15 +625,13 @@ public function getAllSheets()
     /**
      * Get sheet by name.
      *
-     * @param string $pName Sheet name
-     *
-     * @return null|Worksheet
+     * @param string $worksheetName Sheet name
      */
-    public function getSheetByName($pName)
+    public function getSheetByName(string $worksheetName): ?Worksheet
     {
         $worksheetCount = count($this->workSheetCollection);
         for ($i = 0; $i < $worksheetCount; ++$i) {
-            if ($this->workSheetCollection[$i]->getTitle() === trim($pName, "'")) {
+            if (strcasecmp($this->workSheetCollection[$i]->getTitle(), trim($worksheetName, "'")) === 0) {
                 return $this->workSheetCollection[$i];
             }
         }
@@ -720,15 +639,28 @@ public function getSheetByName($pName)
         return null;
     }
 
+    /**
+     * Get sheet by name, throwing exception if not found.
+     */
+    public function getSheetByNameOrThrow(string $worksheetName): Worksheet
+    {
+        $worksheet = $this->getSheetByName($worksheetName);
+        if ($worksheet === null) {
+            throw new Exception("Sheet $worksheetName does not exist.");
+        }
+
+        return $worksheet;
+    }
+
     /**
      * Get index for sheet.
      *
      * @return int index
      */
-    public function getIndex(Worksheet $pSheet)
+    public function getIndex(Worksheet $worksheet): int
     {
         foreach ($this->workSheetCollection as $key => $value) {
-            if ($value->getHashCode() === $pSheet->getHashCode()) {
+            if ($value->getHashCode() === $worksheet->getHashCode()) {
                 return $key;
             }
         }
@@ -739,35 +671,33 @@ public function getIndex(Worksheet $pSheet)
     /**
      * Set index for sheet by sheet name.
      *
-     * @param string $sheetName Sheet name to modify index for
-     * @param int $newIndex New index for the sheet
+     * @param string $worksheetName Sheet name to modify index for
+     * @param int $newIndexPosition New index for the sheet
      *
      * @return int New sheet index
      */
-    public function setIndexByName($sheetName, $newIndex)
+    public function setIndexByName(string $worksheetName, int $newIndexPosition): int
     {
-        $oldIndex = $this->getIndex($this->getSheetByName($sheetName));
-        $pSheet = array_splice(
+        $oldIndex = $this->getIndex($this->getSheetByNameOrThrow($worksheetName));
+        $worksheet = array_splice(
             $this->workSheetCollection,
             $oldIndex,
             1
         );
         array_splice(
             $this->workSheetCollection,
-            $newIndex,
+            $newIndexPosition,
             0,
-            $pSheet
+            $worksheet
         );
 
-        return $newIndex;
+        return $newIndexPosition;
     }
 
     /**
      * Get sheet count.
-     *
-     * @return int
      */
-    public function getSheetCount()
+    public function getSheetCount(): int
     {
         return count($this->workSheetCollection);
     }
@@ -777,7 +707,7 @@ public function getSheetCount()
      *
      * @return int Active sheet index
      */
-    public function getActiveSheetIndex()
+    public function getActiveSheetIndex(): int
     {
         return $this->activeSheetIndex;
     }
@@ -785,20 +715,18 @@ public function getActiveSheetIndex()
     /**
      * Set active sheet index.
      *
-     * @param int $pIndex Active sheet index
-     *
-     * @return Worksheet
+     * @param int $worksheetIndex Active sheet index
      */
-    public function setActiveSheetIndex($pIndex)
+    public function setActiveSheetIndex(int $worksheetIndex): Worksheet
     {
         $numSheets = count($this->workSheetCollection);
 
-        if ($pIndex > $numSheets - 1) {
+        if ($worksheetIndex > $numSheets - 1) {
             throw new Exception(
-                "You tried to set a sheet active by the out of bounds index: {$pIndex}. The actual number of sheets is {$numSheets}."
+                "You tried to set a sheet active by the out of bounds index: {$worksheetIndex}. The actual number of sheets is {$numSheets}."
             );
         }
-        $this->activeSheetIndex = $pIndex;
+        $this->activeSheetIndex = $worksheetIndex;
 
         return $this->getActiveSheet();
     }
@@ -806,19 +734,17 @@ public function setActiveSheetIndex($pIndex)
     /**
      * Set active sheet index by name.
      *
-     * @param string $pValue Sheet title
-     *
-     * @return Worksheet
+     * @param string $worksheetName Sheet title
      */
-    public function setActiveSheetIndexByName($pValue)
+    public function setActiveSheetIndexByName(string $worksheetName): Worksheet
     {
-        if (($worksheet = $this->getSheetByName($pValue)) instanceof Worksheet) {
+        if (($worksheet = $this->getSheetByName($worksheetName)) instanceof Worksheet) {
             $this->setActiveSheetIndex($this->getIndex($worksheet));
 
             return $worksheet;
         }
 
-        throw new Exception('Workbook does not contain sheet:' . $pValue);
+        throw new Exception('Workbook does not contain sheet:' . $worksheetName);
     }
 
     /**
@@ -826,7 +752,7 @@ public function setActiveSheetIndexByName($pValue)
      *
      * @return string[]
      */
-    public function getSheetNames()
+    public function getSheetNames(): array
     {
         $returnValue = [];
         $worksheetCount = $this->getSheetCount();
@@ -840,35 +766,46 @@ public function getSheetNames()
     /**
      * Add external sheet.
      *
-     * @param Worksheet $pSheet External sheet to add
-     * @param null|int $iSheetIndex Index where sheet should go (0,1,..., or null for last)
-     *
-     * @return Worksheet
+     * @param Worksheet $worksheet External sheet to add
+     * @param null|int $sheetIndex Index where sheet should go (0,1,..., or null for last)
      */
-    public function addExternalSheet(Worksheet $pSheet, $iSheetIndex = null)
+    public function addExternalSheet(Worksheet $worksheet, ?int $sheetIndex = null): Worksheet
     {
-        if ($this->sheetNameExists($pSheet->getTitle())) {
-            throw new Exception("Workbook already contains a worksheet named '{$pSheet->getTitle()}'. Rename the external sheet first.");
+        if ($this->sheetNameExists($worksheet->getTitle())) {
+            throw new Exception("Workbook already contains a worksheet named '{$worksheet->getTitle()}'. Rename the external sheet first.");
         }
 
         // count how many cellXfs there are in this workbook currently, we will need this below
         $countCellXfs = count($this->cellXfCollection);
 
         // copy all the shared cellXfs from the external workbook and append them to the current
-        foreach ($pSheet->getParent()->getCellXfCollection() as $cellXf) {
+        foreach ($worksheet->getParentOrThrow()->getCellXfCollection() as $cellXf) {
             $this->addCellXf(clone $cellXf);
         }
 
         // move sheet to this workbook
-        $pSheet->rebindParent($this);
+        $worksheet->rebindParent($this);
 
         // update the cellXfs
-        foreach ($pSheet->getCoordinates(false) as $coordinate) {
-            $cell = $pSheet->getCell($coordinate);
+        foreach ($worksheet->getCoordinates(false) as $coordinate) {
+            $cell = $worksheet->getCell($coordinate);
             $cell->setXfIndex($cell->getXfIndex() + $countCellXfs);
         }
 
-        return $this->addSheet($pSheet, $iSheetIndex);
+        // update the column dimensions Xfs
+        foreach ($worksheet->getColumnDimensions() as $columnDimension) {
+            $columnDimension->setXfIndex($columnDimension->getXfIndex() + $countCellXfs);
+        }
+
+        // update the row dimensions Xfs
+        foreach ($worksheet->getRowDimensions() as $rowDimension) {
+            $xfIndex = $rowDimension->getXfIndex();
+            if ($xfIndex !== null) {
+                $rowDimension->setXfIndex($xfIndex + $countCellXfs);
+            }
+        }
+
+        return $this->addSheet($worksheet, $sheetIndex);
     }
 
     /**
@@ -880,9 +817,7 @@ public function getNamedRanges(): array
     {
         return array_filter(
             $this->definedNames,
-            function (DefinedName $definedName) {
-                return $definedName->isFormula() === self::DEFINED_NAME_IS_RANGE;
-            }
+            fn (DefinedName $definedName): bool => $definedName->isFormula() === self::DEFINED_NAME_IS_RANGE
         );
     }
 
@@ -895,9 +830,7 @@ public function getNamedFormulae(): array
     {
         return array_filter(
             $this->definedNames,
-            function (DefinedName $definedName) {
-                return $definedName->isFormula() === self::DEFINED_NAME_IS_FORMULA;
-            }
+            fn (DefinedName $definedName): bool => $definedName->isFormula() === self::DEFINED_NAME_IS_FORMULA
         );
     }
 
@@ -948,9 +881,9 @@ public function addDefinedName(DefinedName $definedName): void
     /**
      * Get named range.
      *
-     * @param null|Worksheet $pSheet Scope. Use null for global scope
+     * @param null|Worksheet $worksheet Scope. Use null for global scope
      */
-    public function getNamedRange(string $namedRange, ?Worksheet $pSheet = null): ?NamedRange
+    public function getNamedRange(string $namedRange, ?Worksheet $worksheet = null): ?NamedRange
     {
         $returnValue = null;
 
@@ -959,7 +892,7 @@ public function getNamedRange(string $namedRange, ?Worksheet $pSheet = null): ?N
             // first look for global named range
             $returnValue = $this->getGlobalDefinedNameByType($namedRange, self::DEFINED_NAME_IS_RANGE);
             // then look for local named range (has priority over global named range if both names exist)
-            $returnValue = $this->getLocalDefinedNameByType($namedRange, self::DEFINED_NAME_IS_RANGE, $pSheet) ?: $returnValue;
+            $returnValue = $this->getLocalDefinedNameByType($namedRange, self::DEFINED_NAME_IS_RANGE, $worksheet) ?: $returnValue;
         }
 
         return $returnValue instanceof NamedRange ? $returnValue : null;
@@ -968,9 +901,9 @@ public function getNamedRange(string $namedRange, ?Worksheet $pSheet = null): ?N
     /**
      * Get named formula.
      *
-     * @param null|Worksheet $pSheet Scope. Use null for global scope
+     * @param null|Worksheet $worksheet Scope. Use null for global scope
      */
-    public function getNamedFormula(string $namedFormula, ?Worksheet $pSheet = null): ?NamedFormula
+    public function getNamedFormula(string $namedFormula, ?Worksheet $worksheet = null): ?NamedFormula
     {
         $returnValue = null;
 
@@ -979,7 +912,7 @@ public function getNamedFormula(string $namedFormula, ?Worksheet $pSheet = null)
             // first look for global named formula
             $returnValue = $this->getGlobalDefinedNameByType($namedFormula, self::DEFINED_NAME_IS_FORMULA);
             // then look for local named formula (has priority over global named formula if both names exist)
-            $returnValue = $this->getLocalDefinedNameByType($namedFormula, self::DEFINED_NAME_IS_FORMULA, $pSheet) ?: $returnValue;
+            $returnValue = $this->getLocalDefinedNameByType($namedFormula, self::DEFINED_NAME_IS_FORMULA, $worksheet) ?: $returnValue;
         }
 
         return $returnValue instanceof NamedFormula ? $returnValue : null;
@@ -994,13 +927,13 @@ private function getGlobalDefinedNameByType(string $name, bool $type): ?DefinedN
         return null;
     }
 
-    private function getLocalDefinedNameByType(string $name, bool $type, ?Worksheet $pSheet = null): ?DefinedName
+    private function getLocalDefinedNameByType(string $name, bool $type, ?Worksheet $worksheet = null): ?DefinedName
     {
         if (
-            ($pSheet !== null) && isset($this->definedNames[$pSheet->getTitle() . '!' . $name])
-            && $this->definedNames[$pSheet->getTitle() . '!' . $name]->isFormula() === $type
+            ($worksheet !== null) && isset($this->definedNames[$worksheet->getTitle() . '!' . $name])
+            && $this->definedNames[$worksheet->getTitle() . '!' . $name]->isFormula() === $type
         ) {
-            return $this->definedNames[$pSheet->getTitle() . '!' . $name];
+            return $this->definedNames[$worksheet->getTitle() . '!' . $name];
         }
 
         return null;
@@ -1009,9 +942,9 @@ private function getLocalDefinedNameByType(string $name, bool $type, ?Worksheet
     /**
      * Get named range.
      *
-     * @param null|Worksheet $pSheet Scope. Use null for global scope
+     * @param null|Worksheet $worksheet Scope. Use null for global scope
      */
-    public function getDefinedName(string $definedName, ?Worksheet $pSheet = null): ?DefinedName
+    public function getDefinedName(string $definedName, ?Worksheet $worksheet = null): ?DefinedName
     {
         $returnValue = null;
 
@@ -1023,8 +956,8 @@ public function getDefinedName(string $definedName, ?Worksheet $pSheet = null):
             }
 
             // then look for local defined name (has priority over global defined name if both names exist)
-            if (($pSheet !== null) && isset($this->definedNames[$pSheet->getTitle() . '!' . $definedName])) {
-                $returnValue = $this->definedNames[$pSheet->getTitle() . '!' . $definedName];
+            if (($worksheet !== null) && isset($this->definedNames[$worksheet->getTitle() . '!' . $definedName])) {
+                $returnValue = $this->definedNames[$worksheet->getTitle() . '!' . $definedName];
             }
         }
 
@@ -1034,53 +967,53 @@ public function getDefinedName(string $definedName, ?Worksheet $pSheet = null):
     /**
      * Remove named range.
      *
-     * @param null|Worksheet $pSheet scope: use null for global scope
+     * @param null|Worksheet $worksheet scope: use null for global scope
      *
      * @return $this
      */
-    public function removeNamedRange(string $namedRange, ?Worksheet $pSheet = null): self
+    public function removeNamedRange(string $namedRange, ?Worksheet $worksheet = null): self
     {
-        if ($this->getNamedRange($namedRange, $pSheet) === null) {
+        if ($this->getNamedRange($namedRange, $worksheet) === null) {
             return $this;
         }
 
-        return $this->removeDefinedName($namedRange, $pSheet);
+        return $this->removeDefinedName($namedRange, $worksheet);
     }
 
     /**
      * Remove named formula.
      *
-     * @param null|Worksheet $pSheet scope: use null for global scope
+     * @param null|Worksheet $worksheet scope: use null for global scope
      *
      * @return $this
      */
-    public function removeNamedFormula(string $namedFormula, ?Worksheet $pSheet = null): self
+    public function removeNamedFormula(string $namedFormula, ?Worksheet $worksheet = null): self
     {
-        if ($this->getNamedFormula($namedFormula, $pSheet) === null) {
+        if ($this->getNamedFormula($namedFormula, $worksheet) === null) {
             return $this;
         }
 
-        return $this->removeDefinedName($namedFormula, $pSheet);
+        return $this->removeDefinedName($namedFormula, $worksheet);
     }
 
     /**
      * Remove defined name.
      *
-     * @param null|Worksheet $pSheet scope: use null for global scope
+     * @param null|Worksheet $worksheet scope: use null for global scope
      *
      * @return $this
      */
-    public function removeDefinedName(string $definedName, ?Worksheet $pSheet = null): self
+    public function removeDefinedName(string $definedName, ?Worksheet $worksheet = null): self
     {
         $definedName = StringHelper::strToUpper($definedName);
 
-        if ($pSheet === null) {
+        if ($worksheet === null) {
             if (isset($this->definedNames[$definedName])) {
                 unset($this->definedNames[$definedName]);
             }
         } else {
-            if (isset($this->definedNames[$pSheet->getTitle() . '!' . $definedName])) {
-                unset($this->definedNames[$pSheet->getTitle() . '!' . $definedName]);
+            if (isset($this->definedNames[$worksheet->getTitle() . '!' . $definedName])) {
+                unset($this->definedNames[$worksheet->getTitle() . '!' . $definedName]);
             } elseif (isset($this->definedNames[$definedName])) {
                 unset($this->definedNames[$definedName]);
             }
@@ -1091,43 +1024,35 @@ public function removeDefinedName(string $definedName, ?Worksheet $pSheet = null
 
     /**
      * Get worksheet iterator.
-     *
-     * @return Iterator
      */
-    public function getWorksheetIterator()
+    public function getWorksheetIterator(): Iterator
     {
         return new Iterator($this);
     }
 
     /**
      * Copy workbook (!= clone!).
-     *
-     * @return Spreadsheet
      */
-    public function copy()
+    public function copy(): self
     {
-        $copied = clone $this;
+        $filename = File::temporaryFilename();
+        $writer = new XlsxWriter($this);
+        $writer->setIncludeCharts(true);
+        $writer->save($filename);
 
-        $worksheetCount = count($this->workSheetCollection);
-        for ($i = 0; $i < $worksheetCount; ++$i) {
-            $this->workSheetCollection[$i] = $this->workSheetCollection[$i]->copy();
-            $this->workSheetCollection[$i]->rebindParent($this);
-        }
+        $reader = new XlsxReader();
+        $reader->setIncludeCharts(true);
+        $reloadedSpreadsheet = $reader->load($filename);
+        unlink($filename);
 
-        return $copied;
+        return $reloadedSpreadsheet;
     }
 
-    /**
-     * Implement PHP __clone to create a deep clone, not just a shallow copy.
-     */
     public function __clone()
     {
-        // @phpstan-ignore-next-line
-        foreach ($this as $key => $val) {
-            if (is_object($val) || (is_array($val))) {
-                $this->{$key} = unserialize(serialize($val));
-            }
-        }
+        throw new Exception(
+            'Do not use clone on spreadsheet. Use spreadsheet->copy() instead.'
+        );
     }
 
     /**
@@ -1135,34 +1060,28 @@ public function __clone()
      *
      * @return Style[]
      */
-    public function getCellXfCollection()
+    public function getCellXfCollection(): array
     {
         return $this->cellXfCollection;
     }
 
     /**
      * Get cellXf by index.
-     *
-     * @param int $pIndex
-     *
-     * @return Style
      */
-    public function getCellXfByIndex($pIndex)
+    public function getCellXfByIndex(int $cellStyleIndex): Style
     {
-        return $this->cellXfCollection[$pIndex];
+        return $this->cellXfCollection[$cellStyleIndex];
     }
 
     /**
      * Get cellXf by hash code.
      *
-     * @param string $pValue
-     *
      * @return false|Style
      */
-    public function getCellXfByHashCode($pValue)
+    public function getCellXfByHashCode(string $hashcode): bool|Style
     {
         foreach ($this->cellXfCollection as $cellXf) {
-            if ($cellXf->getHashCode() === $pValue) {
+            if ($cellXf->getHashCode() === $hashcode) {
                 return $cellXf;
             }
         }
@@ -1172,22 +1091,16 @@ public function getCellXfByHashCode($pValue)
 
     /**
      * Check if style exists in style collection.
-     *
-     * @param Style $pCellStyle
-     *
-     * @return bool
      */
-    public function cellXfExists($pCellStyle)
+    public function cellXfExists(Style $cellStyleIndex): bool
     {
-        return in_array($pCellStyle, $this->cellXfCollection, true);
+        return in_array($cellStyleIndex, $this->cellXfCollection, true);
     }
 
     /**
      * Get default style.
-     *
-     * @return Style
      */
-    public function getDefaultStyle()
+    public function getDefaultStyle(): Style
     {
         if (isset($this->cellXfCollection[0])) {
             return $this->cellXfCollection[0];
@@ -1208,26 +1121,26 @@ public function addCellXf(Style $style): void
     /**
      * Remove cellXf by index. It is ensured that all cells get their xf index updated.
      *
-     * @param int $pIndex Index to cellXf
+     * @param int $cellStyleIndex Index to cellXf
      */
-    public function removeCellXfByIndex($pIndex): void
+    public function removeCellXfByIndex(int $cellStyleIndex): void
     {
-        if ($pIndex > count($this->cellXfCollection) - 1) {
+        if ($cellStyleIndex > count($this->cellXfCollection) - 1) {
             throw new Exception('CellXf index is out of bounds.');
         }
 
         // first remove the cellXf
-        array_splice($this->cellXfCollection, $pIndex, 1);
+        array_splice($this->cellXfCollection, $cellStyleIndex, 1);
 
         // then update cellXf indexes for cells
         foreach ($this->workSheetCollection as $worksheet) {
             foreach ($worksheet->getCoordinates(false) as $coordinate) {
                 $cell = $worksheet->getCell($coordinate);
                 $xfIndex = $cell->getXfIndex();
-                if ($xfIndex > $pIndex) {
+                if ($xfIndex > $cellStyleIndex) {
                     // decrease xf index by 1
                     $cell->setXfIndex($xfIndex - 1);
-                } elseif ($xfIndex == $pIndex) {
+                } elseif ($xfIndex == $cellStyleIndex) {
                     // set to default xf index 0
                     $cell->setXfIndex(0);
                 }
@@ -1237,10 +1150,8 @@ public function removeCellXfByIndex($pIndex): void
 
     /**
      * Get the cellXf supervisor.
-     *
-     * @return Style
      */
-    public function getCellXfSupervisor()
+    public function getCellXfSupervisor(): Style
     {
         return $this->cellXfSupervisor;
     }
@@ -1250,7 +1161,7 @@ public function getCellXfSupervisor()
      *
      * @return Style[]
      */
-    public function getCellStyleXfCollection()
+    public function getCellStyleXfCollection(): array
     {
         return $this->cellStyleXfCollection;
     }
@@ -1258,26 +1169,22 @@ public function getCellStyleXfCollection()
     /**
      * Get cellStyleXf by index.
      *
-     * @param int $pIndex Index to cellXf
-     *
-     * @return Style
+     * @param int $cellStyleIndex Index to cellXf
      */
-    public function getCellStyleXfByIndex($pIndex)
+    public function getCellStyleXfByIndex(int $cellStyleIndex): Style
     {
-        return $this->cellStyleXfCollection[$pIndex];
+        return $this->cellStyleXfCollection[$cellStyleIndex];
     }
 
     /**
      * Get cellStyleXf by hash code.
      *
-     * @param string $pValue
-     *
      * @return false|Style
      */
-    public function getCellStyleXfByHashCode($pValue)
+    public function getCellStyleXfByHashCode(string $hashcode): bool|Style
     {
         foreach ($this->cellStyleXfCollection as $cellStyleXf) {
-            if ($cellStyleXf->getHashCode() === $pValue) {
+            if ($cellStyleXf->getHashCode() === $hashcode) {
                 return $cellStyleXf;
             }
         }
@@ -1288,23 +1195,23 @@ public function getCellStyleXfByHashCode($pValue)
     /**
      * Add a cellStyleXf to the workbook.
      */
-    public function addCellStyleXf(Style $pStyle): void
+    public function addCellStyleXf(Style $style): void
     {
-        $this->cellStyleXfCollection[] = $pStyle;
-        $pStyle->setIndex(count($this->cellStyleXfCollection) - 1);
+        $this->cellStyleXfCollection[] = $style;
+        $style->setIndex(count($this->cellStyleXfCollection) - 1);
     }
 
     /**
      * Remove cellStyleXf by index.
      *
-     * @param int $pIndex Index to cellXf
+     * @param int $cellStyleIndex Index to cellXf
      */
-    public function removeCellStyleXfByIndex($pIndex): void
+    public function removeCellStyleXfByIndex(int $cellStyleIndex): void
     {
-        if ($pIndex > count($this->cellStyleXfCollection) - 1) {
+        if ($cellStyleIndex > count($this->cellStyleXfCollection) - 1) {
             throw new Exception('CellStyleXf index is out of bounds.');
         }
-        array_splice($this->cellStyleXfCollection, $pIndex, 1);
+        array_splice($this->cellStyleXfCollection, $cellStyleIndex, 1);
     }
 
     /**
@@ -1390,10 +1297,8 @@ public function garbageCollect(): void
 
     /**
      * Return the unique ID value assigned to this spreadsheet workbook.
-     *
-     * @return string
      */
-    public function getID()
+    public function getID(): string
     {
         return $this->uniqueID;
     }
@@ -1403,7 +1308,7 @@ public function getID()
      *
      * @return bool True if horizonal scroll bar is visible
      */
-    public function getShowHorizontalScroll()
+    public function getShowHorizontalScroll(): bool
     {
         return $this->showHorizontalScroll;
     }
@@ -1413,7 +1318,7 @@ public function getShowHorizontalScroll()
      *
      * @param bool $showHorizontalScroll True if horizonal scroll bar is visible
      */
-    public function setShowHorizontalScroll($showHorizontalScroll): void
+    public function setShowHorizontalScroll(bool $showHorizontalScroll): void
     {
         $this->showHorizontalScroll = (bool) $showHorizontalScroll;
     }
@@ -1423,7 +1328,7 @@ public function setShowHorizontalScroll($showHorizontalScroll): void
      *
      * @return bool True if vertical scroll bar is visible
      */
-    public function getShowVerticalScroll()
+    public function getShowVerticalScroll(): bool
     {
         return $this->showVerticalScroll;
     }
@@ -1433,7 +1338,7 @@ public function getShowVerticalScroll()
      *
      * @param bool $showVerticalScroll True if vertical scroll bar is visible
      */
-    public function setShowVerticalScroll($showVerticalScroll): void
+    public function setShowVerticalScroll(bool $showVerticalScroll): void
     {
         $this->showVerticalScroll = (bool) $showVerticalScroll;
     }
@@ -1443,7 +1348,7 @@ public function setShowVerticalScroll($showVerticalScroll): void
      *
      * @return bool True if the sheet tabs are visible
      */
-    public function getShowSheetTabs()
+    public function getShowSheetTabs(): bool
     {
         return $this->showSheetTabs;
     }
@@ -1453,7 +1358,7 @@ public function getShowSheetTabs()
      *
      * @param bool $showSheetTabs True if sheet tabs are visible
      */
-    public function setShowSheetTabs($showSheetTabs): void
+    public function setShowSheetTabs(bool $showSheetTabs): void
     {
         $this->showSheetTabs = (bool) $showSheetTabs;
     }
@@ -1463,7 +1368,7 @@ public function setShowSheetTabs($showSheetTabs): void
      *
      * @return bool true if workbook window is minimized
      */
-    public function getMinimized()
+    public function getMinimized(): bool
     {
         return $this->minimized;
     }
@@ -1473,7 +1378,7 @@ public function getMinimized()
      *
      * @param bool $minimized true if workbook window is minimized
      */
-    public function setMinimized($minimized): void
+    public function setMinimized(bool $minimized): void
     {
         $this->minimized = (bool) $minimized;
     }
@@ -1484,7 +1389,7 @@ public function setMinimized($minimized): void
      *
      * @return bool true if workbook window is minimized
      */
-    public function getAutoFilterDateGrouping()
+    public function getAutoFilterDateGrouping(): bool
     {
         return $this->autoFilterDateGrouping;
     }
@@ -1495,7 +1400,7 @@ public function getAutoFilterDateGrouping()
      *
      * @param bool $autoFilterDateGrouping true if workbook window is minimized
      */
-    public function setAutoFilterDateGrouping($autoFilterDateGrouping): void
+    public function setAutoFilterDateGrouping(bool $autoFilterDateGrouping): void
     {
         $this->autoFilterDateGrouping = (bool) $autoFilterDateGrouping;
     }
@@ -1505,7 +1410,7 @@ public function setAutoFilterDateGrouping($autoFilterDateGrouping): void
      *
      * @return int First sheet in book view
      */
-    public function getFirstSheetIndex()
+    public function getFirstSheetIndex(): int
     {
         return $this->firstSheetIndex;
     }
@@ -1515,7 +1420,7 @@ public function getFirstSheetIndex()
      *
      * @param int $firstSheetIndex First sheet in book view
      */
-    public function setFirstSheetIndex($firstSheetIndex): void
+    public function setFirstSheetIndex(int $firstSheetIndex): void
     {
         if ($firstSheetIndex >= 0) {
             $this->firstSheetIndex = (int) $firstSheetIndex;
@@ -1532,7 +1437,7 @@ public function setFirstSheetIndex($firstSheetIndex): void
      *
      * @return string Visible status
      */
-    public function getVisibility()
+    public function getVisibility(): string
     {
         return $this->visibility;
     }
@@ -1550,15 +1455,15 @@ public function getVisibility()
      *       Workbook window is hidden and cannot be shown in the
      *       user interface.
      *
-     * @param string $visibility visibility status of the workbook
+     * @param null|string $visibility visibility status of the workbook
      */
-    public function setVisibility($visibility): void
+    public function setVisibility(?string $visibility): void
     {
         if ($visibility === null) {
             $visibility = self::VISIBILITY_VISIBLE;
         }
 
-        if (in_array($visibility, self::$workbookViewVisibilityValues)) {
+        if (in_array($visibility, self::WORKBOOK_VIEW_VISIBILITY_VALUES)) {
             $this->visibility = $visibility;
         } else {
             throw new Exception('Invalid visibility value.');
@@ -1571,7 +1476,7 @@ public function setVisibility($visibility): void
      *
      * @return int Ratio between the workbook tabs bar and the horizontal scroll bar
      */
-    public function getTabRatio()
+    public function getTabRatio(): int
     {
         return $this->tabRatio;
     }
@@ -1582,12 +1487,108 @@ public function getTabRatio()
      *
      * @param int $tabRatio Ratio between the tabs bar and the horizontal scroll bar
      */
-    public function setTabRatio($tabRatio): void
+    public function setTabRatio(int $tabRatio): void
     {
-        if ($tabRatio >= 0 || $tabRatio <= 1000) {
+        if ($tabRatio >= 0 && $tabRatio <= 1000) {
             $this->tabRatio = (int) $tabRatio;
         } else {
             throw new Exception('Tab ratio must be between 0 and 1000.');
         }
     }
+
+    public function reevaluateAutoFilters(bool $resetToMax): void
+    {
+        foreach ($this->workSheetCollection as $sheet) {
+            $filter = $sheet->getAutoFilter();
+            if (!empty($filter->getRange())) {
+                if ($resetToMax) {
+                    $filter->setRangeToMaxRow();
+                }
+                $filter->showHideRows();
+            }
+        }
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function __serialize(): array
+    {
+        throw new Exception('Spreadsheet objects cannot be serialized');
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function jsonSerialize(): mixed
+    {
+        throw new Exception('Spreadsheet objects cannot be json encoded');
+    }
+
+    public function resetThemeFonts(): void
+    {
+        $majorFontLatin = $this->theme->getMajorFontLatin();
+        $minorFontLatin = $this->theme->getMinorFontLatin();
+        foreach ($this->cellXfCollection as $cellStyleXf) {
+            $scheme = $cellStyleXf->getFont()->getScheme();
+            if ($scheme === 'major') {
+                $cellStyleXf->getFont()->setName($majorFontLatin)->setScheme($scheme);
+            } elseif ($scheme === 'minor') {
+                $cellStyleXf->getFont()->setName($minorFontLatin)->setScheme($scheme);
+            }
+        }
+        foreach ($this->cellStyleXfCollection as $cellStyleXf) {
+            $scheme = $cellStyleXf->getFont()->getScheme();
+            if ($scheme === 'major') {
+                $cellStyleXf->getFont()->setName($majorFontLatin)->setScheme($scheme);
+            } elseif ($scheme === 'minor') {
+                $cellStyleXf->getFont()->setName($minorFontLatin)->setScheme($scheme);
+            }
+        }
+    }
+
+    public function getTableByName(string $tableName): ?Table
+    {
+        $table = null;
+        foreach ($this->workSheetCollection as $sheet) {
+            $table = $sheet->getTableByName($tableName);
+            if ($table !== null) {
+                break;
+            }
+        }
+
+        return $table;
+    }
+
+    /**
+     * @return bool Success or failure
+     */
+    public function setExcelCalendar(int $baseYear): bool
+    {
+        if (($baseYear === Date::CALENDAR_WINDOWS_1900) || ($baseYear === Date::CALENDAR_MAC_1904)) {
+            $this->excelCalendar = $baseYear;
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @return int Excel base date (1900 or 1904)
+     */
+    public function getExcelCalendar(): int
+    {
+        return $this->excelCalendar;
+    }
+
+    public function deleteLegacyDrawing(Worksheet $worksheet): void
+    {
+        unset($this->unparsedLoadedData['sheets'][$worksheet->getCodeName()]['legacyDrawing']);
+    }
+
+    public function getLegacyDrawing(Worksheet $worksheet): ?string
+    {
+        return $this->unparsedLoadedData['sheets'][$worksheet->getCodeName()]['legacyDrawing'] ?? null;
+    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Alignment.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Alignment.php
index e072c52411..3aed77c697 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Alignment.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Alignment.php
@@ -15,6 +15,27 @@ class Alignment extends Supervisor
     const HORIZONTAL_JUSTIFY = 'justify';
     const HORIZONTAL_FILL = 'fill';
     const HORIZONTAL_DISTRIBUTED = 'distributed'; // Excel2007 only
+    private const HORIZONTAL_CENTER_CONTINUOUS_LC = 'centercontinuous';
+    // Mapping for horizontal alignment
+    const HORIZONTAL_ALIGNMENT_FOR_XLSX = [
+        self::HORIZONTAL_LEFT => self::HORIZONTAL_LEFT,
+        self::HORIZONTAL_RIGHT => self::HORIZONTAL_RIGHT,
+        self::HORIZONTAL_CENTER => self::HORIZONTAL_CENTER,
+        self::HORIZONTAL_CENTER_CONTINUOUS => self::HORIZONTAL_CENTER_CONTINUOUS,
+        self::HORIZONTAL_JUSTIFY => self::HORIZONTAL_JUSTIFY,
+        self::HORIZONTAL_FILL => self::HORIZONTAL_FILL,
+        self::HORIZONTAL_DISTRIBUTED => self::HORIZONTAL_DISTRIBUTED,
+    ];
+    // Mapping for horizontal alignment CSS
+    const HORIZONTAL_ALIGNMENT_FOR_HTML = [
+        self::HORIZONTAL_LEFT => self::HORIZONTAL_LEFT,
+        self::HORIZONTAL_RIGHT => self::HORIZONTAL_RIGHT,
+        self::HORIZONTAL_CENTER => self::HORIZONTAL_CENTER,
+        self::HORIZONTAL_CENTER_CONTINUOUS => self::HORIZONTAL_CENTER,
+        self::HORIZONTAL_JUSTIFY => self::HORIZONTAL_JUSTIFY,
+        //self::HORIZONTAL_FILL => self::HORIZONTAL_FILL, // no reasonable equivalent for fill
+        self::HORIZONTAL_DISTRIBUTED => self::HORIZONTAL_JUSTIFY,
+    ];
 
     // Vertical alignment styles
     const VERTICAL_BOTTOM = 'bottom';
@@ -22,6 +43,45 @@ class Alignment extends Supervisor
     const VERTICAL_CENTER = 'center';
     const VERTICAL_JUSTIFY = 'justify';
     const VERTICAL_DISTRIBUTED = 'distributed'; // Excel2007 only
+    // Vertical alignment CSS
+    private const VERTICAL_BASELINE = 'baseline';
+    private const VERTICAL_MIDDLE = 'middle';
+    private const VERTICAL_SUB = 'sub';
+    private const VERTICAL_SUPER = 'super';
+    private const VERTICAL_TEXT_BOTTOM = 'text-bottom';
+    private const VERTICAL_TEXT_TOP = 'text-top';
+
+    // Mapping for vertical alignment
+    const VERTICAL_ALIGNMENT_FOR_XLSX = [
+        self::VERTICAL_BOTTOM => self::VERTICAL_BOTTOM,
+        self::VERTICAL_TOP => self::VERTICAL_TOP,
+        self::VERTICAL_CENTER => self::VERTICAL_CENTER,
+        self::VERTICAL_JUSTIFY => self::VERTICAL_JUSTIFY,
+        self::VERTICAL_DISTRIBUTED => self::VERTICAL_DISTRIBUTED,
+        // css settings that arent't in sync with Excel
+        self::VERTICAL_BASELINE => self::VERTICAL_BOTTOM,
+        self::VERTICAL_MIDDLE => self::VERTICAL_CENTER,
+        self::VERTICAL_SUB => self::VERTICAL_BOTTOM,
+        self::VERTICAL_SUPER => self::VERTICAL_TOP,
+        self::VERTICAL_TEXT_BOTTOM => self::VERTICAL_BOTTOM,
+        self::VERTICAL_TEXT_TOP => self::VERTICAL_TOP,
+    ];
+
+    // Mapping for vertical alignment for Html
+    const VERTICAL_ALIGNMENT_FOR_HTML = [
+        self::VERTICAL_BOTTOM => self::VERTICAL_BOTTOM,
+        self::VERTICAL_TOP => self::VERTICAL_TOP,
+        self::VERTICAL_CENTER => self::VERTICAL_MIDDLE,
+        self::VERTICAL_JUSTIFY => self::VERTICAL_MIDDLE,
+        self::VERTICAL_DISTRIBUTED => self::VERTICAL_MIDDLE,
+        // css settings that arent't in sync with Excel
+        self::VERTICAL_BASELINE => self::VERTICAL_BASELINE,
+        self::VERTICAL_MIDDLE => self::VERTICAL_MIDDLE,
+        self::VERTICAL_SUB => self::VERTICAL_SUB,
+        self::VERTICAL_SUPER => self::VERTICAL_SUPER,
+        self::VERTICAL_TEXT_BOTTOM => self::VERTICAL_TEXT_BOTTOM,
+        self::VERTICAL_TEXT_TOP => self::VERTICAL_TEXT_TOP,
+    ];
 
     // Read order
     const READORDER_CONTEXT = 0;
@@ -34,52 +94,38 @@ class Alignment extends Supervisor
 
     /**
      * Horizontal alignment.
-     *
-     * @var null|string
      */
-    protected $horizontal = self::HORIZONTAL_GENERAL;
+    protected ?string $horizontal = self::HORIZONTAL_GENERAL;
 
     /**
      * Vertical alignment.
-     *
-     * @var null|string
      */
-    protected $vertical = self::VERTICAL_BOTTOM;
+    protected ?string $vertical = self::VERTICAL_BOTTOM;
 
     /**
      * Text rotation.
-     *
-     * @var null|int
      */
-    protected $textRotation = 0;
+    protected ?int $textRotation = 0;
 
     /**
      * Wrap text.
-     *
-     * @var bool
      */
-    protected $wrapText = false;
+    protected bool $wrapText = false;
 
     /**
      * Shrink to fit.
-     *
-     * @var bool
      */
-    protected $shrinkToFit = false;
+    protected bool $shrinkToFit = false;
 
     /**
      * Indent - only possible with horizontal alignment left and right.
-     *
-     * @var int
      */
-    protected $indent = 0;
+    protected int $indent = 0;
 
     /**
      * Read order.
-     *
-     * @var int
      */
-    protected $readOrder = 0;
+    protected int $readOrder = 0;
 
     /**
      * Create a new Alignment.
@@ -91,7 +137,7 @@ class Alignment extends Supervisor
      *                                       Leave this value at default unless you understand exactly what
      *                                          its ramifications are
      */
-    public function __construct($isSupervisor = false, $isConditional = false)
+    public function __construct(bool $isSupervisor = false, bool $isConditional = false)
     {
         // Supervisor?
         parent::__construct($isSupervisor);
@@ -106,22 +152,19 @@ public function __construct($isSupervisor = false, $isConditional = false)
     /**
      * Get the shared style component for the currently active cell in currently active sheet.
      * Only used for style supervisor.
-     *
-     * @return Alignment
      */
-    public function getSharedComponent()
+    public function getSharedComponent(): self
     {
-        return $this->parent->getSharedComponent()->getAlignment();
+        /** @var Style $parent */
+        $parent = $this->parent;
+
+        return $parent->getSharedComponent()->getAlignment();
     }
 
     /**
      * Build style array from subcomponents.
-     *
-     * @param array $array
-     *
-     * @return array
      */
-    public function getStyleArray($array)
+    public function getStyleArray(array $array): array
     {
         return ['alignment' => $array];
     }
@@ -140,36 +183,36 @@ public function getStyleArray($array)
      * );
      * </code>
      *
-     * @param array $pStyles Array containing style information
+     * @param array $styleArray Array containing style information
      *
      * @return $this
      */
-    public function applyFromArray(array $pStyles)
+    public function applyFromArray(array $styleArray): static
     {
         if ($this->isSupervisor) {
             $this->getActiveSheet()->getStyle($this->getSelectedCells())
-                ->applyFromArray($this->getStyleArray($pStyles));
+                ->applyFromArray($this->getStyleArray($styleArray));
         } else {
-            if (isset($pStyles['horizontal'])) {
-                $this->setHorizontal($pStyles['horizontal']);
+            if (isset($styleArray['horizontal'])) {
+                $this->setHorizontal($styleArray['horizontal']);
             }
-            if (isset($pStyles['vertical'])) {
-                $this->setVertical($pStyles['vertical']);
+            if (isset($styleArray['vertical'])) {
+                $this->setVertical($styleArray['vertical']);
             }
-            if (isset($pStyles['textRotation'])) {
-                $this->setTextRotation($pStyles['textRotation']);
+            if (isset($styleArray['textRotation'])) {
+                $this->setTextRotation($styleArray['textRotation']);
             }
-            if (isset($pStyles['wrapText'])) {
-                $this->setWrapText($pStyles['wrapText']);
+            if (isset($styleArray['wrapText'])) {
+                $this->setWrapText($styleArray['wrapText']);
             }
-            if (isset($pStyles['shrinkToFit'])) {
-                $this->setShrinkToFit($pStyles['shrinkToFit']);
+            if (isset($styleArray['shrinkToFit'])) {
+                $this->setShrinkToFit($styleArray['shrinkToFit']);
             }
-            if (isset($pStyles['indent'])) {
-                $this->setIndent($pStyles['indent']);
+            if (isset($styleArray['indent'])) {
+                $this->setIndent($styleArray['indent']);
             }
-            if (isset($pStyles['readOrder'])) {
-                $this->setReadOrder($pStyles['readOrder']);
+            if (isset($styleArray['readOrder'])) {
+                $this->setReadOrder($styleArray['readOrder']);
             }
         }
 
@@ -178,10 +221,8 @@ public function applyFromArray(array $pStyles)
 
     /**
      * Get Horizontal.
-     *
-     * @return null|string
      */
-    public function getHorizontal()
+    public function getHorizontal(): null|string
     {
         if ($this->isSupervisor) {
             return $this->getSharedComponent()->getHorizontal();
@@ -193,21 +234,22 @@ public function getHorizontal()
     /**
      * Set Horizontal.
      *
-     * @param string $pValue see self::HORIZONTAL_*
+     * @param string $horizontalAlignment see self::HORIZONTAL_*
      *
      * @return $this
      */
-    public function setHorizontal($pValue)
+    public function setHorizontal(string $horizontalAlignment): static
     {
-        if ($pValue == '') {
-            $pValue = self::HORIZONTAL_GENERAL;
+        $horizontalAlignment = strtolower($horizontalAlignment);
+        if ($horizontalAlignment === self::HORIZONTAL_CENTER_CONTINUOUS_LC) {
+            $horizontalAlignment = self::HORIZONTAL_CENTER_CONTINUOUS;
         }
 
         if ($this->isSupervisor) {
-            $styleArray = $this->getStyleArray(['horizontal' => $pValue]);
+            $styleArray = $this->getStyleArray(['horizontal' => $horizontalAlignment]);
             $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
         } else {
-            $this->horizontal = $pValue;
+            $this->horizontal = $horizontalAlignment;
         }
 
         return $this;
@@ -215,10 +257,8 @@ public function setHorizontal($pValue)
 
     /**
      * Get Vertical.
-     *
-     * @return null|string
      */
-    public function getVertical()
+    public function getVertical(): null|string
     {
         if ($this->isSupervisor) {
             return $this->getSharedComponent()->getVertical();
@@ -230,21 +270,19 @@ public function getVertical()
     /**
      * Set Vertical.
      *
-     * @param string $pValue see self::VERTICAL_*
+     * @param string $verticalAlignment see self::VERTICAL_*
      *
      * @return $this
      */
-    public function setVertical($pValue)
+    public function setVertical(string $verticalAlignment): static
     {
-        if ($pValue == '') {
-            $pValue = self::VERTICAL_BOTTOM;
-        }
+        $verticalAlignment = strtolower($verticalAlignment);
 
         if ($this->isSupervisor) {
-            $styleArray = $this->getStyleArray(['vertical' => $pValue]);
+            $styleArray = $this->getStyleArray(['vertical' => $verticalAlignment]);
             $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
         } else {
-            $this->vertical = $pValue;
+            $this->vertical = $verticalAlignment;
         }
 
         return $this;
@@ -252,10 +290,8 @@ public function setVertical($pValue)
 
     /**
      * Get TextRotation.
-     *
-     * @return null|int
      */
-    public function getTextRotation()
+    public function getTextRotation(): null|int
     {
         if ($this->isSupervisor) {
             return $this->getSharedComponent()->getTextRotation();
@@ -267,24 +303,22 @@ public function getTextRotation()
     /**
      * Set TextRotation.
      *
-     * @param int $pValue
-     *
      * @return $this
      */
-    public function setTextRotation($pValue)
+    public function setTextRotation(int $angleInDegrees): static
     {
         // Excel2007 value 255 => PhpSpreadsheet value -165
-        if ($pValue == self::TEXTROTATION_STACK_EXCEL) {
-            $pValue = self::TEXTROTATION_STACK_PHPSPREADSHEET;
+        if ($angleInDegrees == self::TEXTROTATION_STACK_EXCEL) {
+            $angleInDegrees = self::TEXTROTATION_STACK_PHPSPREADSHEET;
         }
 
         // Set rotation
-        if (($pValue >= -90 && $pValue <= 90) || $pValue == self::TEXTROTATION_STACK_PHPSPREADSHEET) {
+        if (($angleInDegrees >= -90 && $angleInDegrees <= 90) || $angleInDegrees == self::TEXTROTATION_STACK_PHPSPREADSHEET) {
             if ($this->isSupervisor) {
-                $styleArray = $this->getStyleArray(['textRotation' => $pValue]);
+                $styleArray = $this->getStyleArray(['textRotation' => $angleInDegrees]);
                 $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
             } else {
-                $this->textRotation = $pValue;
+                $this->textRotation = $angleInDegrees;
             }
         } else {
             throw new PhpSpreadsheetException('Text rotation should be a value between -90 and 90.');
@@ -295,10 +329,8 @@ public function setTextRotation($pValue)
 
     /**
      * Get Wrap Text.
-     *
-     * @return bool
      */
-    public function getWrapText()
+    public function getWrapText(): bool
     {
         if ($this->isSupervisor) {
             return $this->getSharedComponent()->getWrapText();
@@ -310,20 +342,18 @@ public function getWrapText()
     /**
      * Set Wrap Text.
      *
-     * @param bool $pValue
-     *
      * @return $this
      */
-    public function setWrapText($pValue)
+    public function setWrapText(bool $wrapped): static
     {
-        if ($pValue == '') {
-            $pValue = false;
+        if ($wrapped == '') {
+            $wrapped = false;
         }
         if ($this->isSupervisor) {
-            $styleArray = $this->getStyleArray(['wrapText' => $pValue]);
+            $styleArray = $this->getStyleArray(['wrapText' => $wrapped]);
             $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
         } else {
-            $this->wrapText = $pValue;
+            $this->wrapText = $wrapped;
         }
 
         return $this;
@@ -331,10 +361,8 @@ public function setWrapText($pValue)
 
     /**
      * Get Shrink to fit.
-     *
-     * @return bool
      */
-    public function getShrinkToFit()
+    public function getShrinkToFit(): bool
     {
         if ($this->isSupervisor) {
             return $this->getSharedComponent()->getShrinkToFit();
@@ -346,20 +374,18 @@ public function getShrinkToFit()
     /**
      * Set Shrink to fit.
      *
-     * @param bool $pValue
-     *
      * @return $this
      */
-    public function setShrinkToFit($pValue)
+    public function setShrinkToFit(bool $shrink): static
     {
-        if ($pValue == '') {
-            $pValue = false;
+        if ($shrink == '') {
+            $shrink = false;
         }
         if ($this->isSupervisor) {
-            $styleArray = $this->getStyleArray(['shrinkToFit' => $pValue]);
+            $styleArray = $this->getStyleArray(['shrinkToFit' => $shrink]);
             $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
         } else {
-            $this->shrinkToFit = $pValue;
+            $this->shrinkToFit = $shrink;
         }
 
         return $this;
@@ -367,10 +393,8 @@ public function setShrinkToFit($pValue)
 
     /**
      * Get indent.
-     *
-     * @return int
      */
-    public function getIndent()
+    public function getIndent(): int
     {
         if ($this->isSupervisor) {
             return $this->getSharedComponent()->getIndent();
@@ -382,27 +406,25 @@ public function getIndent()
     /**
      * Set indent.
      *
-     * @param int $pValue
-     *
      * @return $this
      */
-    public function setIndent($pValue)
+    public function setIndent(int $indent): static
     {
-        if ($pValue > 0) {
+        if ($indent > 0) {
             if (
-                $this->getHorizontal() != self::HORIZONTAL_GENERAL &&
-                $this->getHorizontal() != self::HORIZONTAL_LEFT &&
-                $this->getHorizontal() != self::HORIZONTAL_RIGHT &&
-                $this->getHorizontal() != self::HORIZONTAL_DISTRIBUTED
+                $this->getHorizontal() != self::HORIZONTAL_GENERAL
+                && $this->getHorizontal() != self::HORIZONTAL_LEFT
+                && $this->getHorizontal() != self::HORIZONTAL_RIGHT
+                && $this->getHorizontal() != self::HORIZONTAL_DISTRIBUTED
             ) {
-                $pValue = 0; // indent not supported
+                $indent = 0; // indent not supported
             }
         }
         if ($this->isSupervisor) {
-            $styleArray = $this->getStyleArray(['indent' => $pValue]);
+            $styleArray = $this->getStyleArray(['indent' => $indent]);
             $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
         } else {
-            $this->indent = $pValue;
+            $this->indent = $indent;
         }
 
         return $this;
@@ -410,10 +432,8 @@ public function setIndent($pValue)
 
     /**
      * Get read order.
-     *
-     * @return int
      */
-    public function getReadOrder()
+    public function getReadOrder(): int
     {
         if ($this->isSupervisor) {
             return $this->getSharedComponent()->getReadOrder();
@@ -425,20 +445,18 @@ public function getReadOrder()
     /**
      * Set read order.
      *
-     * @param int $pValue
-     *
      * @return $this
      */
-    public function setReadOrder($pValue)
+    public function setReadOrder(int $readOrder): static
     {
-        if ($pValue < 0 || $pValue > 2) {
-            $pValue = 0;
+        if ($readOrder < 0 || $readOrder > 2) {
+            $readOrder = 0;
         }
         if ($this->isSupervisor) {
-            $styleArray = $this->getStyleArray(['readOrder' => $pValue]);
+            $styleArray = $this->getStyleArray(['readOrder' => $readOrder]);
             $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
         } else {
-            $this->readOrder = $pValue;
+            $this->readOrder = $readOrder;
         }
 
         return $this;
@@ -449,21 +467,21 @@ public function setReadOrder($pValue)
      *
      * @return string Hash code
      */
-    public function getHashCode()
+    public function getHashCode(): string
     {
         if ($this->isSupervisor) {
             return $this->getSharedComponent()->getHashCode();
         }
 
         return md5(
-            $this->horizontal .
-            $this->vertical .
-            $this->textRotation .
-            ($this->wrapText ? 't' : 'f') .
-            ($this->shrinkToFit ? 't' : 'f') .
-            $this->indent .
-            $this->readOrder .
-            __CLASS__
+            $this->horizontal
+            . $this->vertical
+            . $this->textRotation
+            . ($this->wrapText ? 't' : 'f')
+            . ($this->shrinkToFit ? 't' : 'f')
+            . $this->indent
+            . $this->readOrder
+            . __CLASS__
         );
     }
 
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Border.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Border.php
index a8af9d941c..07162566db 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Border.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Border.php
@@ -21,25 +21,19 @@ class Border extends Supervisor
     const BORDER_SLANTDASHDOT = 'slantDashDot';
     const BORDER_THICK = 'thick';
     const BORDER_THIN = 'thin';
+    const BORDER_OMIT = 'omit'; // should be used only for Conditional
 
     /**
      * Border style.
-     *
-     * @var string
      */
-    protected $borderStyle = self::BORDER_NONE;
+    protected string $borderStyle = self::BORDER_NONE;
 
     /**
      * Border color.
-     *
-     * @var Color
      */
-    protected $color;
+    protected Color $color;
 
-    /**
-     * @var null|int
-     */
-    public $colorIndex;
+    public ?int $colorIndex = null;
 
     /**
      * Create a new Border.
@@ -48,7 +42,7 @@ class Border extends Supervisor
      *                                    Leave this value at default unless you understand exactly what
      *                                        its ramifications are
      */
-    public function __construct($isSupervisor = false)
+    public function __construct(bool $isSupervisor = false, bool $isConditional = false)
     {
         // Supervisor?
         parent::__construct($isSupervisor);
@@ -60,44 +54,42 @@ public function __construct($isSupervisor = false)
         if ($isSupervisor) {
             $this->color->bindParent($this, 'color');
         }
+        if ($isConditional) {
+            $this->borderStyle = self::BORDER_OMIT;
+        }
     }
 
     /**
      * Get the shared style component for the currently active cell in currently active sheet.
      * Only used for style supervisor.
-     *
-     * @return Border
      */
-    public function getSharedComponent()
+    public function getSharedComponent(): self
     {
-        /** @var Borders $sharedComponent */
-        $sharedComponent = $this->parent->getSharedComponent();
-        switch ($this->parentPropertyName) {
-            case 'bottom':
-                return $sharedComponent->getBottom();
-            case 'diagonal':
-                return $sharedComponent->getDiagonal();
-            case 'left':
-                return $sharedComponent->getLeft();
-            case 'right':
-                return $sharedComponent->getRight();
-            case 'top':
-                return $sharedComponent->getTop();
-        }
+        /** @var Style $parent */
+        $parent = $this->parent;
 
-        throw new PhpSpreadsheetException('Cannot get shared component for a pseudo-border.');
+        /** @var Borders $sharedComponent */
+        $sharedComponent = $parent->getSharedComponent();
+
+        return match ($this->parentPropertyName) {
+            'bottom' => $sharedComponent->getBottom(),
+            'diagonal' => $sharedComponent->getDiagonal(),
+            'left' => $sharedComponent->getLeft(),
+            'right' => $sharedComponent->getRight(),
+            'top' => $sharedComponent->getTop(),
+            default => throw new PhpSpreadsheetException('Cannot get shared component for a pseudo-border.'),
+        };
     }
 
     /**
      * Build style array from subcomponents.
-     *
-     * @param array $array
-     *
-     * @return array
      */
-    public function getStyleArray($array)
+    public function getStyleArray(array $array): array
     {
-        return $this->parent->getStyleArray([$this->parentPropertyName => $array]);
+        /** @var Style $parent */
+        $parent = $this->parent;
+
+        return $parent->getStyleArray([$this->parentPropertyName => $array]);
     }
 
     /**
@@ -114,20 +106,20 @@ public function getStyleArray($array)
      * );
      * </code>
      *
-     * @param array $pStyles Array containing style information
+     * @param array $styleArray Array containing style information
      *
      * @return $this
      */
-    public function applyFromArray(array $pStyles)
+    public function applyFromArray(array $styleArray): static
     {
         if ($this->isSupervisor) {
-            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($pStyles));
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($styleArray));
         } else {
-            if (isset($pStyles['borderStyle'])) {
-                $this->setBorderStyle($pStyles['borderStyle']);
+            if (isset($styleArray['borderStyle'])) {
+                $this->setBorderStyle($styleArray['borderStyle']);
             }
-            if (isset($pStyles['color'])) {
-                $this->getColor()->applyFromArray($pStyles['color']);
+            if (isset($styleArray['color'])) {
+                $this->getColor()->applyFromArray($styleArray['color']);
             }
         }
 
@@ -136,10 +128,8 @@ public function applyFromArray(array $pStyles)
 
     /**
      * Get Border style.
-     *
-     * @return string
      */
-    public function getBorderStyle()
+    public function getBorderStyle(): string
     {
         if ($this->isSupervisor) {
             return $this->getSharedComponent()->getBorderStyle();
@@ -151,24 +141,24 @@ public function getBorderStyle()
     /**
      * Set Border style.
      *
-     * @param bool|string $pValue
-     *                            When passing a boolean, FALSE equates Border::BORDER_NONE
+     * @param bool|string $style When passing a boolean, FALSE equates Border::BORDER_NONE
      *                                and TRUE to Border::BORDER_MEDIUM
      *
      * @return $this
      */
-    public function setBorderStyle($pValue)
+    public function setBorderStyle(bool|string $style): static
     {
-        if (empty($pValue)) {
-            $pValue = self::BORDER_NONE;
-        } elseif (is_bool($pValue) && $pValue) {
-            $pValue = self::BORDER_MEDIUM;
+        if (empty($style)) {
+            $style = self::BORDER_NONE;
+        } elseif (is_bool($style)) {
+            $style = self::BORDER_MEDIUM;
         }
+
         if ($this->isSupervisor) {
-            $styleArray = $this->getStyleArray(['borderStyle' => $pValue]);
+            $styleArray = $this->getStyleArray(['borderStyle' => $style]);
             $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
         } else {
-            $this->borderStyle = $pValue;
+            $this->borderStyle = $style;
         }
 
         return $this;
@@ -176,10 +166,8 @@ public function setBorderStyle($pValue)
 
     /**
      * Get Border Color.
-     *
-     * @return Color
      */
-    public function getColor()
+    public function getColor(): Color
     {
         return $this->color;
     }
@@ -189,10 +177,10 @@ public function getColor()
      *
      * @return $this
      */
-    public function setColor(Color $pValue)
+    public function setColor(Color $color): static
     {
         // make sure parameter is a real color and not a supervisor
-        $color = $pValue->getIsSupervisor() ? $pValue->getSharedComponent() : $pValue;
+        $color = $color->getIsSupervisor() ? $color->getSharedComponent() : $color;
 
         if ($this->isSupervisor) {
             $styleArray = $this->getColor()->getStyleArray(['argb' => $color->getARGB()]);
@@ -209,16 +197,16 @@ public function setColor(Color $pValue)
      *
      * @return string Hash code
      */
-    public function getHashCode()
+    public function getHashCode(): string
     {
         if ($this->isSupervisor) {
             return $this->getSharedComponent()->getHashCode();
         }
 
         return md5(
-            $this->borderStyle .
-            $this->color->getHashCode() .
-            __CLASS__
+            $this->borderStyle
+            . $this->color->getHashCode()
+            . __CLASS__
         );
     }
 
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Borders.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Borders.php
index eeb4932a1e..93a95e67aa 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Borders.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Borders.php
@@ -14,80 +14,58 @@ class Borders extends Supervisor
 
     /**
      * Left.
-     *
-     * @var Border
      */
-    protected $left;
+    protected Border $left;
 
     /**
      * Right.
-     *
-     * @var Border
      */
-    protected $right;
+    protected Border $right;
 
     /**
      * Top.
-     *
-     * @var Border
      */
-    protected $top;
+    protected Border $top;
 
     /**
      * Bottom.
-     *
-     * @var Border
      */
-    protected $bottom;
+    protected Border $bottom;
 
     /**
      * Diagonal.
-     *
-     * @var Border
      */
-    protected $diagonal;
+    protected Border $diagonal;
 
     /**
      * DiagonalDirection.
-     *
-     * @var int
      */
-    protected $diagonalDirection;
+    protected int $diagonalDirection;
 
     /**
      * All borders pseudo-border. Only applies to supervisor.
-     *
-     * @var Border
      */
-    protected $allBorders;
+    protected Border $allBorders;
 
     /**
      * Outline pseudo-border. Only applies to supervisor.
-     *
-     * @var Border
      */
-    protected $outline;
+    protected Border $outline;
 
     /**
      * Inside pseudo-border. Only applies to supervisor.
-     *
-     * @var Border
      */
-    protected $inside;
+    protected Border $inside;
 
     /**
      * Vertical pseudo-border. Only applies to supervisor.
-     *
-     * @var Border
      */
-    protected $vertical;
+    protected Border $vertical;
 
     /**
      * Horizontal pseudo-border. Only applies to supervisor.
-     *
-     * @var Border
      */
-    protected $horizontal;
+    protected Border $horizontal;
 
     /**
      * Create a new Borders.
@@ -96,27 +74,27 @@ class Borders extends Supervisor
      *                                    Leave this value at default unless you understand exactly what
      *                                        its ramifications are
      */
-    public function __construct($isSupervisor = false)
+    public function __construct(bool $isSupervisor = false, bool $isConditional = false)
     {
         // Supervisor?
         parent::__construct($isSupervisor);
 
         // Initialise values
-        $this->left = new Border($isSupervisor);
-        $this->right = new Border($isSupervisor);
-        $this->top = new Border($isSupervisor);
-        $this->bottom = new Border($isSupervisor);
-        $this->diagonal = new Border($isSupervisor);
+        $this->left = new Border($isSupervisor, $isConditional);
+        $this->right = new Border($isSupervisor, $isConditional);
+        $this->top = new Border($isSupervisor, $isConditional);
+        $this->bottom = new Border($isSupervisor, $isConditional);
+        $this->diagonal = new Border($isSupervisor, $isConditional);
         $this->diagonalDirection = self::DIAGONAL_NONE;
 
         // Specially for supervisor
         if ($isSupervisor) {
             // Initialize pseudo-borders
-            $this->allBorders = new Border(true);
-            $this->outline = new Border(true);
-            $this->inside = new Border(true);
-            $this->vertical = new Border(true);
-            $this->horizontal = new Border(true);
+            $this->allBorders = new Border(true, $isConditional);
+            $this->outline = new Border(true, $isConditional);
+            $this->inside = new Border(true, $isConditional);
+            $this->vertical = new Border(true, $isConditional);
+            $this->horizontal = new Border(true, $isConditional);
 
             // bind parent if we are a supervisor
             $this->left->bindParent($this, 'left');
@@ -135,22 +113,19 @@ public function __construct($isSupervisor = false)
     /**
      * Get the shared style component for the currently active cell in currently active sheet.
      * Only used for style supervisor.
-     *
-     * @return Borders
      */
-    public function getSharedComponent()
+    public function getSharedComponent(): self
     {
-        return $this->parent->getSharedComponent()->getBorders();
+        /** @var Style $parent */
+        $parent = $this->parent;
+
+        return $parent->getSharedComponent()->getBorders();
     }
 
     /**
      * Build style array from subcomponents.
-     *
-     * @param array $array
-     *
-     * @return array
      */
-    public function getStyleArray($array)
+    public function getStyleArray(array $array): array
     {
         return ['borders' => $array];
     }
@@ -190,38 +165,38 @@ public function getStyleArray($array)
      * );
      * </code>
      *
-     * @param array $pStyles Array containing style information
+     * @param array $styleArray Array containing style information
      *
      * @return $this
      */
-    public function applyFromArray(array $pStyles)
+    public function applyFromArray(array $styleArray): static
     {
         if ($this->isSupervisor) {
-            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($pStyles));
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($styleArray));
         } else {
-            if (isset($pStyles['left'])) {
-                $this->getLeft()->applyFromArray($pStyles['left']);
+            if (isset($styleArray['left'])) {
+                $this->getLeft()->applyFromArray($styleArray['left']);
             }
-            if (isset($pStyles['right'])) {
-                $this->getRight()->applyFromArray($pStyles['right']);
+            if (isset($styleArray['right'])) {
+                $this->getRight()->applyFromArray($styleArray['right']);
             }
-            if (isset($pStyles['top'])) {
-                $this->getTop()->applyFromArray($pStyles['top']);
+            if (isset($styleArray['top'])) {
+                $this->getTop()->applyFromArray($styleArray['top']);
             }
-            if (isset($pStyles['bottom'])) {
-                $this->getBottom()->applyFromArray($pStyles['bottom']);
+            if (isset($styleArray['bottom'])) {
+                $this->getBottom()->applyFromArray($styleArray['bottom']);
             }
-            if (isset($pStyles['diagonal'])) {
-                $this->getDiagonal()->applyFromArray($pStyles['diagonal']);
+            if (isset($styleArray['diagonal'])) {
+                $this->getDiagonal()->applyFromArray($styleArray['diagonal']);
             }
-            if (isset($pStyles['diagonalDirection'])) {
-                $this->setDiagonalDirection($pStyles['diagonalDirection']);
+            if (isset($styleArray['diagonalDirection'])) {
+                $this->setDiagonalDirection($styleArray['diagonalDirection']);
             }
-            if (isset($pStyles['allBorders'])) {
-                $this->getLeft()->applyFromArray($pStyles['allBorders']);
-                $this->getRight()->applyFromArray($pStyles['allBorders']);
-                $this->getTop()->applyFromArray($pStyles['allBorders']);
-                $this->getBottom()->applyFromArray($pStyles['allBorders']);
+            if (isset($styleArray['allBorders'])) {
+                $this->getLeft()->applyFromArray($styleArray['allBorders']);
+                $this->getRight()->applyFromArray($styleArray['allBorders']);
+                $this->getTop()->applyFromArray($styleArray['allBorders']);
+                $this->getBottom()->applyFromArray($styleArray['allBorders']);
             }
         }
 
@@ -230,60 +205,48 @@ public function applyFromArray(array $pStyles)
 
     /**
      * Get Left.
-     *
-     * @return Border
      */
-    public function getLeft()
+    public function getLeft(): Border
     {
         return $this->left;
     }
 
     /**
      * Get Right.
-     *
-     * @return Border
      */
-    public function getRight()
+    public function getRight(): Border
     {
         return $this->right;
     }
 
     /**
      * Get Top.
-     *
-     * @return Border
      */
-    public function getTop()
+    public function getTop(): Border
     {
         return $this->top;
     }
 
     /**
      * Get Bottom.
-     *
-     * @return Border
      */
-    public function getBottom()
+    public function getBottom(): Border
     {
         return $this->bottom;
     }
 
     /**
      * Get Diagonal.
-     *
-     * @return Border
      */
-    public function getDiagonal()
+    public function getDiagonal(): Border
     {
         return $this->diagonal;
     }
 
     /**
      * Get AllBorders (pseudo-border). Only applies to supervisor.
-     *
-     * @return Border
      */
-    public function getAllBorders()
+    public function getAllBorders(): Border
     {
         if (!$this->isSupervisor) {
             throw new PhpSpreadsheetException('Can only get pseudo-border for supervisor.');
@@ -294,10 +257,8 @@ public function getAllBorders()
 
     /**
      * Get Outline (pseudo-border). Only applies to supervisor.
-     *
-     * @return Border
      */
-    public function getOutline()
+    public function getOutline(): Border
     {
         if (!$this->isSupervisor) {
             throw new PhpSpreadsheetException('Can only get pseudo-border for supervisor.');
@@ -308,10 +269,8 @@ public function getOutline()
 
     /**
      * Get Inside (pseudo-border). Only applies to supervisor.
-     *
-     * @return Border
      */
-    public function getInside()
+    public function getInside(): Border
     {
         if (!$this->isSupervisor) {
             throw new PhpSpreadsheetException('Can only get pseudo-border for supervisor.');
@@ -322,10 +281,8 @@ public function getInside()
 
     /**
      * Get Vertical (pseudo-border). Only applies to supervisor.
-     *
-     * @return Border
      */
-    public function getVertical()
+    public function getVertical(): Border
     {
         if (!$this->isSupervisor) {
             throw new PhpSpreadsheetException('Can only get pseudo-border for supervisor.');
@@ -336,10 +293,8 @@ public function getVertical()
 
     /**
      * Get Horizontal (pseudo-border). Only applies to supervisor.
-     *
-     * @return Border
      */
-    public function getHorizontal()
+    public function getHorizontal(): Border
     {
         if (!$this->isSupervisor) {
             throw new PhpSpreadsheetException('Can only get pseudo-border for supervisor.');
@@ -350,10 +305,8 @@ public function getHorizontal()
 
     /**
      * Get DiagonalDirection.
-     *
-     * @return int
      */
-    public function getDiagonalDirection()
+    public function getDiagonalDirection(): int
     {
         if ($this->isSupervisor) {
             return $this->getSharedComponent()->getDiagonalDirection();
@@ -365,20 +318,20 @@ public function getDiagonalDirection()
     /**
      * Set DiagonalDirection.
      *
-     * @param int $pValue see self::DIAGONAL_*
+     * @param int $direction see self::DIAGONAL_*
      *
      * @return $this
      */
-    public function setDiagonalDirection($pValue)
+    public function setDiagonalDirection(int $direction): static
     {
-        if ($pValue == '') {
-            $pValue = self::DIAGONAL_NONE;
+        if ($direction == '') {
+            $direction = self::DIAGONAL_NONE;
         }
         if ($this->isSupervisor) {
-            $styleArray = $this->getStyleArray(['diagonalDirection' => $pValue]);
+            $styleArray = $this->getStyleArray(['diagonalDirection' => $direction]);
             $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
         } else {
-            $this->diagonalDirection = $pValue;
+            $this->diagonalDirection = $direction;
         }
 
         return $this;
@@ -389,20 +342,20 @@ public function setDiagonalDirection($pValue)
      *
      * @return string Hash code
      */
-    public function getHashCode()
+    public function getHashCode(): string
     {
         if ($this->isSupervisor) {
             return $this->getSharedComponent()->getHashcode();
         }
 
         return md5(
-            $this->getLeft()->getHashCode() .
-            $this->getRight()->getHashCode() .
-            $this->getTop()->getHashCode() .
-            $this->getBottom()->getHashCode() .
-            $this->getDiagonal()->getHashCode() .
-            $this->getDiagonalDirection() .
-            __CLASS__
+            $this->getLeft()->getHashCode()
+            . $this->getRight()->getHashCode()
+            . $this->getTop()->getHashCode()
+            . $this->getBottom()->getHashCode()
+            . $this->getDiagonal()->getHashCode()
+            . $this->getDiagonalDirection()
+            . __CLASS__
         );
     }
 
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Color.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Color.php
index bf5d093f09..6f9db8a21d 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Color.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Color.php
@@ -26,25 +26,95 @@ class Color extends Supervisor
     const COLOR_DARKGREEN = 'FF008000';
     const COLOR_YELLOW = 'FFFFFF00';
     const COLOR_DARKYELLOW = 'FF808000';
+    const COLOR_MAGENTA = 'FFFF00FF';
+    const COLOR_CYAN = 'FF00FFFF';
+
+    const NAMED_COLOR_TRANSLATIONS = [
+        'Black' => self::COLOR_BLACK,
+        'White' => self::COLOR_WHITE,
+        'Red' => self::COLOR_RED,
+        'Green' => self::COLOR_GREEN,
+        'Blue' => self::COLOR_BLUE,
+        'Yellow' => self::COLOR_YELLOW,
+        'Magenta' => self::COLOR_MAGENTA,
+        'Cyan' => self::COLOR_CYAN,
+    ];
 
-    /**
-     * Indexed colors array.
-     *
-     * @var array
-     */
-    protected static $indexedColors;
+    const VALIDATE_ARGB_SIZE = 8;
+    const VALIDATE_RGB_SIZE = 6;
+    const VALIDATE_COLOR_6 = '/^[A-F0-9]{6}$/i';
+    const VALIDATE_COLOR_8 = '/^[A-F0-9]{8}$/i';
+
+    private const INDEXED_COLORS = [
+        1 => 'FF000000', //  System Colour #1 - Black
+        2 => 'FFFFFFFF', //  System Colour #2 - White
+        3 => 'FFFF0000', //  System Colour #3 - Red
+        4 => 'FF00FF00', //  System Colour #4 - Green
+        5 => 'FF0000FF', //  System Colour #5 - Blue
+        6 => 'FFFFFF00', //  System Colour #6 - Yellow
+        7 => 'FFFF00FF', //  System Colour #7- Magenta
+        8 => 'FF00FFFF', //  System Colour #8- Cyan
+        9 => 'FF800000', //  Standard Colour #9
+        10 => 'FF008000', //  Standard Colour #10
+        11 => 'FF000080', //  Standard Colour #11
+        12 => 'FF808000', //  Standard Colour #12
+        13 => 'FF800080', //  Standard Colour #13
+        14 => 'FF008080', //  Standard Colour #14
+        15 => 'FFC0C0C0', //  Standard Colour #15
+        16 => 'FF808080', //  Standard Colour #16
+        17 => 'FF9999FF', //  Chart Fill Colour #17
+        18 => 'FF993366', //  Chart Fill Colour #18
+        19 => 'FFFFFFCC', //  Chart Fill Colour #19
+        20 => 'FFCCFFFF', //  Chart Fill Colour #20
+        21 => 'FF660066', //  Chart Fill Colour #21
+        22 => 'FFFF8080', //  Chart Fill Colour #22
+        23 => 'FF0066CC', //  Chart Fill Colour #23
+        24 => 'FFCCCCFF', //  Chart Fill Colour #24
+        25 => 'FF000080', //  Chart Line Colour #25
+        26 => 'FFFF00FF', //  Chart Line Colour #26
+        27 => 'FFFFFF00', //  Chart Line Colour #27
+        28 => 'FF00FFFF', //  Chart Line Colour #28
+        29 => 'FF800080', //  Chart Line Colour #29
+        30 => 'FF800000', //  Chart Line Colour #30
+        31 => 'FF008080', //  Chart Line Colour #31
+        32 => 'FF0000FF', //  Chart Line Colour #32
+        33 => 'FF00CCFF', //  Standard Colour #33
+        34 => 'FFCCFFFF', //  Standard Colour #34
+        35 => 'FFCCFFCC', //  Standard Colour #35
+        36 => 'FFFFFF99', //  Standard Colour #36
+        37 => 'FF99CCFF', //  Standard Colour #37
+        38 => 'FFFF99CC', //  Standard Colour #38
+        39 => 'FFCC99FF', //  Standard Colour #39
+        40 => 'FFFFCC99', //  Standard Colour #40
+        41 => 'FF3366FF', //  Standard Colour #41
+        42 => 'FF33CCCC', //  Standard Colour #42
+        43 => 'FF99CC00', //  Standard Colour #43
+        44 => 'FFFFCC00', //  Standard Colour #44
+        45 => 'FFFF9900', //  Standard Colour #45
+        46 => 'FFFF6600', //  Standard Colour #46
+        47 => 'FF666699', //  Standard Colour #47
+        48 => 'FF969696', //  Standard Colour #48
+        49 => 'FF003366', //  Standard Colour #49
+        50 => 'FF339966', //  Standard Colour #50
+        51 => 'FF003300', //  Standard Colour #51
+        52 => 'FF333300', //  Standard Colour #52
+        53 => 'FF993300', //  Standard Colour #53
+        54 => 'FF993366', //  Standard Colour #54
+        55 => 'FF333399', //  Standard Colour #55
+        56 => 'FF333333', //  Standard Colour #56
+    ];
 
     /**
      * ARGB - Alpha RGB.
-     *
-     * @var string
      */
-    protected $argb;
+    protected ?string $argb = null;
+
+    private bool $hasChanged = false;
 
     /**
      * Create a new Color.
      *
-     * @param string $pARGB ARGB value for the colour
+     * @param string $colorValue ARGB value for the colour, or named colour
      * @param bool $isSupervisor Flag indicating if this is a supervisor or not
      *                                    Leave this value at default unless you understand exactly what
      *                                        its ramifications are
@@ -52,31 +122,32 @@ class Color extends Supervisor
      *                                    Leave this value at default unless you understand exactly what
      *                                        its ramifications are
      */
-    public function __construct($pARGB = self::COLOR_BLACK, $isSupervisor = false, $isConditional = false)
+    public function __construct(string $colorValue = self::COLOR_BLACK, bool $isSupervisor = false, bool $isConditional = false)
     {
         //    Supervisor?
         parent::__construct($isSupervisor);
 
         //    Initialise values
         if (!$isConditional) {
-            $this->argb = $pARGB;
+            $this->argb = $this->validateColor($colorValue) ?: self::COLOR_BLACK;
         }
     }
 
     /**
      * Get the shared style component for the currently active cell in currently active sheet.
      * Only used for style supervisor.
-     *
-     * @return Color
      */
-    public function getSharedComponent()
+    public function getSharedComponent(): self
     {
+        /** @var Style $parent */
+        $parent = $this->parent;
         /** @var Border|Fill $sharedComponent */
-        $sharedComponent = $this->parent->getSharedComponent();
-        if ($this->parentPropertyName === 'endColor') {
-            return $sharedComponent->getEndColor();
-        }
-        if ($this->parentPropertyName === 'startColor') {
+        $sharedComponent = $parent->getSharedComponent();
+        if ($sharedComponent instanceof Fill) {
+            if ($this->parentPropertyName === 'endColor') {
+                return $sharedComponent->getEndColor();
+            }
+
             return $sharedComponent->getStartColor();
         }
 
@@ -85,14 +156,13 @@ public function getSharedComponent()
 
     /**
      * Build style array from subcomponents.
-     *
-     * @param array $array
-     *
-     * @return array
      */
-    public function getStyleArray($array)
+    public function getStyleArray(array $array): array
     {
-        return $this->parent->getStyleArray([$this->parentPropertyName => $array]);
+        /** @var Style $parent */
+        $parent = $this->parent;
+
+        return $parent->getStyleArray([$this->parentPropertyName => $array]);
     }
 
     /**
@@ -102,32 +172,49 @@ public function getStyleArray($array)
      * $spreadsheet->getActiveSheet()->getStyle('B2')->getFont()->getColor()->applyFromArray(['rgb' => '808080']);
      * </code>
      *
-     * @param array $pStyles Array containing style information
+     * @param array $styleArray Array containing style information
      *
      * @return $this
      */
-    public function applyFromArray(array $pStyles)
+    public function applyFromArray(array $styleArray): static
     {
         if ($this->isSupervisor) {
-            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($pStyles));
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($styleArray));
         } else {
-            if (isset($pStyles['rgb'])) {
-                $this->setRGB($pStyles['rgb']);
+            if (isset($styleArray['rgb'])) {
+                $this->setRGB($styleArray['rgb']);
             }
-            if (isset($pStyles['argb'])) {
-                $this->setARGB($pStyles['argb']);
+            if (isset($styleArray['argb'])) {
+                $this->setARGB($styleArray['argb']);
             }
         }
 
         return $this;
     }
 
+    private function validateColor(?string $colorValue): string
+    {
+        if ($colorValue === null || $colorValue === '') {
+            return self::COLOR_BLACK;
+        }
+        $named = ucfirst(strtolower($colorValue));
+        if (array_key_exists($named, self::NAMED_COLOR_TRANSLATIONS)) {
+            return self::NAMED_COLOR_TRANSLATIONS[$named];
+        }
+        if (preg_match(self::VALIDATE_COLOR_8, $colorValue) === 1) {
+            return $colorValue;
+        }
+        if (preg_match(self::VALIDATE_COLOR_6, $colorValue) === 1) {
+            return 'FF' . $colorValue;
+        }
+
+        return '';
+    }
+
     /**
      * Get ARGB.
-     *
-     * @return string
      */
-    public function getARGB()
+    public function getARGB(): ?string
     {
         if ($this->isSupervisor) {
             return $this->getSharedComponent()->getARGB();
@@ -139,20 +226,23 @@ public function getARGB()
     /**
      * Set ARGB.
      *
-     * @param string $pValue see self::COLOR_*
+     * @param ?string $colorValue  ARGB value, or a named color
      *
      * @return $this
      */
-    public function setARGB($pValue)
+    public function setARGB(?string $colorValue = self::COLOR_BLACK): static
     {
-        if ($pValue == '') {
-            $pValue = self::COLOR_BLACK;
+        $this->hasChanged = true;
+        $colorValue = $this->validateColor($colorValue);
+        if ($colorValue === '') {
+            return $this;
         }
+
         if ($this->isSupervisor) {
-            $styleArray = $this->getStyleArray(['argb' => $pValue]);
+            $styleArray = $this->getStyleArray(['argb' => $colorValue]);
             $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
         } else {
-            $this->argb = $pValue;
+            $this->argb = $colorValue;
         }
 
         return $this;
@@ -160,10 +250,8 @@ public function setARGB($pValue)
 
     /**
      * Get RGB.
-     *
-     * @return string
      */
-    public function getRGB()
+    public function getRGB(): string
     {
         if ($this->isSupervisor) {
             return $this->getSharedComponent()->getRGB();
@@ -175,207 +263,123 @@ public function getRGB()
     /**
      * Set RGB.
      *
-     * @param string $pValue RGB value
+     * @param ?string $colorValue RGB value, or a named color
      *
      * @return $this
      */
-    public function setRGB($pValue)
+    public function setRGB(?string $colorValue = self::COLOR_BLACK): static
     {
-        if ($pValue == '') {
-            $pValue = '000000';
-        }
-        if ($this->isSupervisor) {
-            $styleArray = $this->getStyleArray(['argb' => 'FF' . $pValue]);
-            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-        } else {
-            $this->argb = 'FF' . $pValue;
-        }
-
-        return $this;
+        return $this->setARGB($colorValue);
     }
 
     /**
      * Get a specified colour component of an RGB value.
      *
-     * @param string $RGB The colour as an RGB value (e.g. FF00CCCC or CCDDEE
+     * @param string $rgbValue The colour as an RGB value (e.g. FF00CCCC or CCDDEE
      * @param int $offset Position within the RGB value to extract
      * @param bool $hex Flag indicating whether the component should be returned as a hex or a
      *                                    decimal value
      *
      * @return int|string The extracted colour component
      */
-    private static function getColourComponent($RGB, $offset, $hex = true)
+    private static function getColourComponent(string $rgbValue, int $offset, bool $hex = true): string|int
     {
-        $colour = substr($RGB, $offset, 2);
+        $colour = substr($rgbValue, $offset, 2) ?: '';
+        if (preg_match('/^[0-9a-f]{2}$/i', $colour) !== 1) {
+            $colour = '00';
+        }
 
-        return ($hex) ? $colour : hexdec($colour);
+        return ($hex) ? $colour : (int) hexdec($colour);
     }
 
     /**
      * Get the red colour component of an RGB value.
      *
-     * @param string $RGB The colour as an RGB value (e.g. FF00CCCC or CCDDEE
+     * @param string $rgbValue The colour as an RGB value (e.g. FF00CCCC or CCDDEE
      * @param bool $hex Flag indicating whether the component should be returned as a hex or a
      *                                    decimal value
      *
      * @return int|string The red colour component
      */
-    public static function getRed($RGB, $hex = true)
+    public static function getRed(string $rgbValue, bool $hex = true)
     {
-        return self::getColourComponent($RGB, strlen($RGB) - 6, $hex);
+        return self::getColourComponent($rgbValue, strlen($rgbValue) - 6, $hex);
     }
 
     /**
      * Get the green colour component of an RGB value.
      *
-     * @param string $RGB The colour as an RGB value (e.g. FF00CCCC or CCDDEE
+     * @param string $rgbValue The colour as an RGB value (e.g. FF00CCCC or CCDDEE
      * @param bool $hex Flag indicating whether the component should be returned as a hex or a
      *                                    decimal value
      *
      * @return int|string The green colour component
      */
-    public static function getGreen($RGB, $hex = true)
+    public static function getGreen(string $rgbValue, bool $hex = true)
     {
-        return self::getColourComponent($RGB, strlen($RGB) - 4, $hex);
+        return self::getColourComponent($rgbValue, strlen($rgbValue) - 4, $hex);
     }
 
     /**
      * Get the blue colour component of an RGB value.
      *
-     * @param string $RGB The colour as an RGB value (e.g. FF00CCCC or CCDDEE
+     * @param string $rgbValue The colour as an RGB value (e.g. FF00CCCC or CCDDEE
      * @param bool $hex Flag indicating whether the component should be returned as a hex or a
      *                                    decimal value
      *
      * @return int|string The blue colour component
      */
-    public static function getBlue($RGB, $hex = true)
+    public static function getBlue(string $rgbValue, bool $hex = true)
     {
-        return self::getColourComponent($RGB, strlen($RGB) - 2, $hex);
+        return self::getColourComponent($rgbValue, strlen($rgbValue) - 2, $hex);
     }
 
     /**
      * Adjust the brightness of a color.
      *
-     * @param string $hex The colour as an RGBA or RGB value (e.g. FF00CCCC or CCDDEE)
+     * @param string $hexColourValue The colour as an RGBA or RGB value (e.g. FF00CCCC or CCDDEE)
      * @param float $adjustPercentage The percentage by which to adjust the colour as a float from -1 to 1
      *
      * @return string The adjusted colour as an RGBA or RGB value (e.g. FF00CCCC or CCDDEE)
      */
-    public static function changeBrightness($hex, $adjustPercentage)
+    public static function changeBrightness(string $hexColourValue, float $adjustPercentage): string
     {
-        $rgba = (strlen($hex) === 8);
+        $rgba = (strlen($hexColourValue) === 8);
         $adjustPercentage = max(-1.0, min(1.0, $adjustPercentage));
 
         /** @var int $red */
-        $red = self::getRed($hex, false);
+        $red = self::getRed($hexColourValue, false);
         /** @var int $green */
-        $green = self::getGreen($hex, false);
+        $green = self::getGreen($hexColourValue, false);
         /** @var int $blue */
-        $blue = self::getBlue($hex, false);
-        if ($adjustPercentage > 0) {
-            $red += (255 - $red) * $adjustPercentage;
-            $green += (255 - $green) * $adjustPercentage;
-            $blue += (255 - $blue) * $adjustPercentage;
-        } else {
-            $red += $red * $adjustPercentage;
-            $green += $green * $adjustPercentage;
-            $blue += $blue * $adjustPercentage;
-        }
+        $blue = self::getBlue($hexColourValue, false);
 
-        $rgb = strtoupper(
-            str_pad(dechex((int) $red), 2, '0', 0) .
-            str_pad(dechex((int) $green), 2, '0', 0) .
-            str_pad(dechex((int) $blue), 2, '0', 0)
-        );
-
-        return (($rgba) ? 'FF' : '') . $rgb;
+        return (($rgba) ? 'FF' : '') . RgbTint::rgbAndTintToRgb($red, $green, $blue, $adjustPercentage);
     }
 
     /**
      * Get indexed color.
      *
-     * @param int $pIndex Index entry point into the colour array
+     * @param int $colorIndex Index entry point into the colour array
      * @param bool $background Flag to indicate whether default background or foreground colour
      *                                            should be returned if the indexed colour doesn't exist
-     *
-     * @return self
      */
-    public static function indexedColor($pIndex, $background = false)
+    public static function indexedColor(int $colorIndex, bool $background = false, ?array $palette = null): self
     {
         // Clean parameter
-        $pIndex = (int) $pIndex;
-
-        // Indexed colors
-        if (self::$indexedColors === null) {
-            self::$indexedColors = [
-                1 => 'FF000000', //  System Colour #1 - Black
-                2 => 'FFFFFFFF', //  System Colour #2 - White
-                3 => 'FFFF0000', //  System Colour #3 - Red
-                4 => 'FF00FF00', //  System Colour #4 - Green
-                5 => 'FF0000FF', //  System Colour #5 - Blue
-                6 => 'FFFFFF00', //  System Colour #6 - Yellow
-                7 => 'FFFF00FF', //  System Colour #7- Magenta
-                8 => 'FF00FFFF', //  System Colour #8- Cyan
-                9 => 'FF800000', //  Standard Colour #9
-                10 => 'FF008000', //  Standard Colour #10
-                11 => 'FF000080', //  Standard Colour #11
-                12 => 'FF808000', //  Standard Colour #12
-                13 => 'FF800080', //  Standard Colour #13
-                14 => 'FF008080', //  Standard Colour #14
-                15 => 'FFC0C0C0', //  Standard Colour #15
-                16 => 'FF808080', //  Standard Colour #16
-                17 => 'FF9999FF', //  Chart Fill Colour #17
-                18 => 'FF993366', //  Chart Fill Colour #18
-                19 => 'FFFFFFCC', //  Chart Fill Colour #19
-                20 => 'FFCCFFFF', //  Chart Fill Colour #20
-                21 => 'FF660066', //  Chart Fill Colour #21
-                22 => 'FFFF8080', //  Chart Fill Colour #22
-                23 => 'FF0066CC', //  Chart Fill Colour #23
-                24 => 'FFCCCCFF', //  Chart Fill Colour #24
-                25 => 'FF000080', //  Chart Line Colour #25
-                26 => 'FFFF00FF', //  Chart Line Colour #26
-                27 => 'FFFFFF00', //  Chart Line Colour #27
-                28 => 'FF00FFFF', //  Chart Line Colour #28
-                29 => 'FF800080', //  Chart Line Colour #29
-                30 => 'FF800000', //  Chart Line Colour #30
-                31 => 'FF008080', //  Chart Line Colour #31
-                32 => 'FF0000FF', //  Chart Line Colour #32
-                33 => 'FF00CCFF', //  Standard Colour #33
-                34 => 'FFCCFFFF', //  Standard Colour #34
-                35 => 'FFCCFFCC', //  Standard Colour #35
-                36 => 'FFFFFF99', //  Standard Colour #36
-                37 => 'FF99CCFF', //  Standard Colour #37
-                38 => 'FFFF99CC', //  Standard Colour #38
-                39 => 'FFCC99FF', //  Standard Colour #39
-                40 => 'FFFFCC99', //  Standard Colour #40
-                41 => 'FF3366FF', //  Standard Colour #41
-                42 => 'FF33CCCC', //  Standard Colour #42
-                43 => 'FF99CC00', //  Standard Colour #43
-                44 => 'FFFFCC00', //  Standard Colour #44
-                45 => 'FFFF9900', //  Standard Colour #45
-                46 => 'FFFF6600', //  Standard Colour #46
-                47 => 'FF666699', //  Standard Colour #47
-                48 => 'FF969696', //  Standard Colour #48
-                49 => 'FF003366', //  Standard Colour #49
-                50 => 'FF339966', //  Standard Colour #50
-                51 => 'FF003300', //  Standard Colour #51
-                52 => 'FF333300', //  Standard Colour #52
-                53 => 'FF993300', //  Standard Colour #53
-                54 => 'FF993366', //  Standard Colour #54
-                55 => 'FF333399', //  Standard Colour #55
-                56 => 'FF333333', //  Standard Colour #56
-            ];
-        }
-
-        if (isset(self::$indexedColors[$pIndex])) {
-            return new self(self::$indexedColors[$pIndex]);
-        }
+        $colorIndex = (int) $colorIndex;
 
-        if ($background) {
-            return new self(self::COLOR_WHITE);
+        if (empty($palette)) {
+            if (isset(self::INDEXED_COLORS[$colorIndex])) {
+                return new self(self::INDEXED_COLORS[$colorIndex]);
+            }
+        } else {
+            if (isset($palette[$colorIndex])) {
+                return new self($palette[$colorIndex]);
+            }
         }
 
-        return new self(self::COLOR_BLACK);
+        return ($background) ? new self(self::COLOR_WHITE) : new self(self::COLOR_BLACK);
     }
 
     /**
@@ -383,15 +387,15 @@ public static function indexedColor($pIndex, $background = false)
      *
      * @return string Hash code
      */
-    public function getHashCode()
+    public function getHashCode(): string
     {
         if ($this->isSupervisor) {
             return $this->getSharedComponent()->getHashCode();
         }
 
         return md5(
-            $this->argb .
-            __CLASS__
+            $this->argb
+            . __CLASS__
         );
     }
 
@@ -402,4 +406,13 @@ protected function exportArray1(): array
 
         return $exportedArray;
     }
+
+    public function getHasChanged(): bool
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->hasChanged;
+        }
+
+        return $this->hasChanged;
+    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Conditional.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Conditional.php
index 4cbc2746af..01a4d8a9f3 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Conditional.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Conditional.php
@@ -3,29 +3,46 @@
 namespace PhpOffice\PhpSpreadsheet\Style;
 
 use PhpOffice\PhpSpreadsheet\IComparable;
+use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\ConditionalColorScale;
 use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\ConditionalDataBar;
 
 class Conditional implements IComparable
 {
     // Condition types
     const CONDITION_NONE = 'none';
+    const CONDITION_BEGINSWITH = 'beginsWith';
     const CONDITION_CELLIS = 'cellIs';
+    const CONDITION_COLORSCALE = 'colorScale';
+    const CONDITION_CONTAINSBLANKS = 'containsBlanks';
+    const CONDITION_CONTAINSERRORS = 'containsErrors';
     const CONDITION_CONTAINSTEXT = 'containsText';
+    const CONDITION_DATABAR = 'dataBar';
+    const CONDITION_ENDSWITH = 'endsWith';
     const CONDITION_EXPRESSION = 'expression';
-    const CONDITION_CONTAINSBLANKS = 'containsBlanks';
     const CONDITION_NOTCONTAINSBLANKS = 'notContainsBlanks';
-    const CONDITION_DATABAR = 'dataBar';
+    const CONDITION_NOTCONTAINSERRORS = 'notContainsErrors';
     const CONDITION_NOTCONTAINSTEXT = 'notContainsText';
+    const CONDITION_TIMEPERIOD = 'timePeriod';
+    const CONDITION_DUPLICATES = 'duplicateValues';
+    const CONDITION_UNIQUE = 'uniqueValues';
 
     private const CONDITION_TYPES = [
+        self::CONDITION_BEGINSWITH,
         self::CONDITION_CELLIS,
+        self::CONDITION_COLORSCALE,
         self::CONDITION_CONTAINSBLANKS,
+        self::CONDITION_CONTAINSERRORS,
         self::CONDITION_CONTAINSTEXT,
         self::CONDITION_DATABAR,
+        self::CONDITION_DUPLICATES,
+        self::CONDITION_ENDSWITH,
         self::CONDITION_EXPRESSION,
         self::CONDITION_NONE,
         self::CONDITION_NOTCONTAINSBLANKS,
+        self::CONDITION_NOTCONTAINSERRORS,
         self::CONDITION_NOTCONTAINSTEXT,
+        self::CONDITION_TIMEPERIOD,
+        self::CONDITION_UNIQUE,
     ];
 
     // Operator types
@@ -43,52 +60,51 @@ class Conditional implements IComparable
     const OPERATOR_BETWEEN = 'between';
     const OPERATOR_NOTBETWEEN = 'notBetween';
 
+    const TIMEPERIOD_TODAY = 'today';
+    const TIMEPERIOD_YESTERDAY = 'yesterday';
+    const TIMEPERIOD_TOMORROW = 'tomorrow';
+    const TIMEPERIOD_LAST_7_DAYS = 'last7Days';
+    const TIMEPERIOD_LAST_WEEK = 'lastWeek';
+    const TIMEPERIOD_THIS_WEEK = 'thisWeek';
+    const TIMEPERIOD_NEXT_WEEK = 'nextWeek';
+    const TIMEPERIOD_LAST_MONTH = 'lastMonth';
+    const TIMEPERIOD_THIS_MONTH = 'thisMonth';
+    const TIMEPERIOD_NEXT_MONTH = 'nextMonth';
+
     /**
      * Condition type.
-     *
-     * @var string
      */
-    private $conditionType = self::CONDITION_NONE;
+    private string $conditionType = self::CONDITION_NONE;
 
     /**
      * Operator type.
-     *
-     * @var string
      */
-    private $operatorType = self::OPERATOR_NONE;
+    private string $operatorType = self::OPERATOR_NONE;
 
     /**
      * Text.
-     *
-     * @var string
      */
-    private $text;
+    private string $text = '';
 
     /**
      * Stop on this condition, if it matches.
-     *
-     * @var bool
      */
-    private $stopIfTrue = false;
+    private bool $stopIfTrue = false;
 
     /**
      * Condition.
      *
-     * @var string[]
+     * @var (bool|float|int|string)[]
      */
-    private $condition = [];
+    private array $condition = [];
 
-    /**
-     * @var ConditionalDataBar
-     */
-    private $dataBar;
+    private ?ConditionalDataBar $dataBar = null;
 
-    /**
-     * Style.
-     *
-     * @var Style
-     */
-    private $style;
+    private ?ConditionalColorScale $colorScale = null;
+
+    private Style $style;
+
+    private bool $noFormatSet = false;
 
     /**
      * Create a new Conditional.
@@ -99,12 +115,22 @@ public function __construct()
         $this->style = new Style(false, true);
     }
 
+    public function getNoFormatSet(): bool
+    {
+        return $this->noFormatSet;
+    }
+
+    public function setNoFormatSet(bool $noFormatSet): self
+    {
+        $this->noFormatSet = $noFormatSet;
+
+        return $this;
+    }
+
     /**
      * Get Condition type.
-     *
-     * @return string
      */
-    public function getConditionType()
+    public function getConditionType(): string
     {
         return $this->conditionType;
     }
@@ -112,23 +138,21 @@ public function getConditionType()
     /**
      * Set Condition type.
      *
-     * @param string $pValue Condition type, see self::CONDITION_*
+     * @param string $type Condition type, see self::CONDITION_*
      *
      * @return $this
      */
-    public function setConditionType($pValue)
+    public function setConditionType(string $type): static
     {
-        $this->conditionType = $pValue;
+        $this->conditionType = $type;
 
         return $this;
     }
 
     /**
      * Get Operator type.
-     *
-     * @return string
      */
-    public function getOperatorType()
+    public function getOperatorType(): string
     {
         return $this->operatorType;
     }
@@ -136,23 +160,21 @@ public function getOperatorType()
     /**
      * Set Operator type.
      *
-     * @param string $pValue Conditional operator type, see self::OPERATOR_*
+     * @param string $type Conditional operator type, see self::OPERATOR_*
      *
      * @return $this
      */
-    public function setOperatorType($pValue)
+    public function setOperatorType(string $type): static
     {
-        $this->operatorType = $pValue;
+        $this->operatorType = $type;
 
         return $this;
     }
 
     /**
      * Get text.
-     *
-     * @return string
      */
-    public function getText()
+    public function getText(): string
     {
         return $this->text;
     }
@@ -160,23 +182,19 @@ public function getText()
     /**
      * Set text.
      *
-     * @param string $value
-     *
      * @return $this
      */
-    public function setText($value)
+    public function setText(string $text): static
     {
-        $this->text = $value;
+        $this->text = $text;
 
         return $this;
     }
 
     /**
      * Get StopIfTrue.
-     *
-     * @return bool
      */
-    public function getStopIfTrue()
+    public function getStopIfTrue(): bool
     {
         return $this->stopIfTrue;
     }
@@ -184,13 +202,11 @@ public function getStopIfTrue()
     /**
      * Set StopIfTrue.
      *
-     * @param bool $value
-     *
      * @return $this
      */
-    public function setStopIfTrue($value)
+    public function setStopIfTrue(bool $stopIfTrue): static
     {
-        $this->stopIfTrue = $value;
+        $this->stopIfTrue = $stopIfTrue;
 
         return $this;
     }
@@ -198,9 +214,9 @@ public function setStopIfTrue($value)
     /**
      * Get Conditions.
      *
-     * @return string[]
+     * @return (bool|float|int|string)[]
      */
-    public function getConditions()
+    public function getConditions(): array
     {
         return $this->condition;
     }
@@ -208,16 +224,16 @@ public function getConditions()
     /**
      * Set Conditions.
      *
-     * @param bool|float|int|string|string[] $pValue Condition
+     * @param bool|(bool|float|int|string)[]|float|int|string $conditions Condition
      *
      * @return $this
      */
-    public function setConditions($pValue)
+    public function setConditions($conditions): static
     {
-        if (!is_array($pValue)) {
-            $pValue = [$pValue];
+        if (!is_array($conditions)) {
+            $conditions = [$conditions];
         }
-        $this->condition = $pValue;
+        $this->condition = $conditions;
 
         return $this;
     }
@@ -225,23 +241,21 @@ public function setConditions($pValue)
     /**
      * Add Condition.
      *
-     * @param string $pValue Condition
+     * @param bool|float|int|string $condition Condition
      *
      * @return $this
      */
-    public function addCondition($pValue)
+    public function addCondition($condition): static
     {
-        $this->condition[] = $pValue;
+        $this->condition[] = $condition;
 
         return $this;
     }
 
     /**
      * Get Style.
-     *
-     * @return Style
      */
-    public function getStyle()
+    public function getStyle(): Style
     {
         return $this->style;
     }
@@ -249,52 +263,52 @@ public function getStyle()
     /**
      * Set Style.
      *
-     * @param Style $pValue
-     *
      * @return $this
      */
-    public function setStyle(?Style $pValue = null)
+    public function setStyle(Style $style): static
     {
-        $this->style = $pValue;
+        $this->style = $style;
 
         return $this;
     }
 
-    /**
-     * get DataBar.
-     *
-     * @return ConditionalDataBar | null
-     */
-    public function getDataBar()
+    public function getDataBar(): ?ConditionalDataBar
     {
         return $this->dataBar;
     }
 
-    /**
-     * set DataBar.
-     *
-     * @return $this
-     */
-    public function setDataBar(ConditionalDataBar $dataBar)
+    public function setDataBar(ConditionalDataBar $dataBar): static
     {
         $this->dataBar = $dataBar;
 
         return $this;
     }
 
+    public function getColorScale(): ?ConditionalColorScale
+    {
+        return $this->colorScale;
+    }
+
+    public function setColorScale(ConditionalColorScale $colorScale): static
+    {
+        $this->colorScale = $colorScale;
+
+        return $this;
+    }
+
     /**
      * Get hash code.
      *
      * @return string Hash code
      */
-    public function getHashCode()
+    public function getHashCode(): string
     {
         return md5(
-            $this->conditionType .
-            $this->operatorType .
-            implode(';', $this->condition) .
-            $this->style->getHashCode() .
-            __CLASS__
+            $this->conditionType
+            . $this->operatorType
+            . implode(';', $this->condition)
+            . $this->style->getHashCode()
+            . __CLASS__
         );
     }
 
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/CellMatcher.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/CellMatcher.php
new file mode 100644
index 0000000000..e14ceacdca
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/CellMatcher.php
@@ -0,0 +1,273 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception;
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Style\Conditional;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class CellMatcher
+{
+    public const COMPARISON_OPERATORS = [
+        Conditional::OPERATOR_EQUAL => '=',
+        Conditional::OPERATOR_GREATERTHAN => '>',
+        Conditional::OPERATOR_GREATERTHANOREQUAL => '>=',
+        Conditional::OPERATOR_LESSTHAN => '<',
+        Conditional::OPERATOR_LESSTHANOREQUAL => '<=',
+        Conditional::OPERATOR_NOTEQUAL => '<>',
+    ];
+
+    public const COMPARISON_RANGE_OPERATORS = [
+        Conditional::OPERATOR_BETWEEN => 'IF(AND(A1>=%s,A1<=%s),TRUE,FALSE)',
+        Conditional::OPERATOR_NOTBETWEEN => 'IF(AND(A1>=%s,A1<=%s),FALSE,TRUE)',
+    ];
+
+    public const COMPARISON_DUPLICATES_OPERATORS = [
+        Conditional::CONDITION_DUPLICATES => "COUNTIF('%s'!%s,%s)>1",
+        Conditional::CONDITION_UNIQUE => "COUNTIF('%s'!%s,%s)=1",
+    ];
+
+    protected Cell $cell;
+
+    protected int $cellRow;
+
+    protected Worksheet $worksheet;
+
+    protected int $cellColumn;
+
+    protected string $conditionalRange;
+
+    protected string $referenceCell;
+
+    protected int $referenceRow;
+
+    protected int $referenceColumn;
+
+    protected Calculation $engine;
+
+    public function __construct(Cell $cell, string $conditionalRange)
+    {
+        $this->cell = $cell;
+        $this->worksheet = $cell->getWorksheet();
+        [$this->cellColumn, $this->cellRow] = Coordinate::indexesFromString($this->cell->getCoordinate());
+        $this->setReferenceCellForExpressions($conditionalRange);
+
+        $this->engine = Calculation::getInstance($this->worksheet->getParent());
+    }
+
+    protected function setReferenceCellForExpressions(string $conditionalRange): void
+    {
+        $conditionalRange = Coordinate::splitRange(str_replace('$', '', strtoupper($conditionalRange)));
+        [$this->referenceCell] = $conditionalRange[0];
+
+        [$this->referenceColumn, $this->referenceRow] = Coordinate::indexesFromString($this->referenceCell);
+
+        // Convert our conditional range to an absolute conditional range, so it can be used  "pinned" in formulae
+        $rangeSets = [];
+        foreach ($conditionalRange as $rangeSet) {
+            $absoluteRangeSet = array_map(
+                [Coordinate::class, 'absoluteCoordinate'],
+                $rangeSet
+            );
+            $rangeSets[] = implode(':', $absoluteRangeSet);
+        }
+        $this->conditionalRange = implode(',', $rangeSets);
+    }
+
+    public function evaluateConditional(Conditional $conditional): bool
+    {
+        // Some calculations may modify the stored cell; so reset it before every evaluation.
+        $cellColumn = Coordinate::stringFromColumnIndex($this->cellColumn);
+        $cellAddress = "{$cellColumn}{$this->cellRow}";
+        $this->cell = $this->worksheet->getCell($cellAddress);
+
+        return match ($conditional->getConditionType()) {
+            Conditional::CONDITION_CELLIS => $this->processOperatorComparison($conditional),
+            Conditional::CONDITION_DUPLICATES, Conditional::CONDITION_UNIQUE => $this->processDuplicatesComparison($conditional),
+            // Expression is NOT(ISERROR(SEARCH("<TEXT>",<Cell Reference>)))
+            Conditional::CONDITION_CONTAINSTEXT,
+            // Expression is ISERROR(SEARCH("<TEXT>",<Cell Reference>))
+            Conditional::CONDITION_NOTCONTAINSTEXT,
+            // Expression is LEFT(<Cell Reference>,LEN("<TEXT>"))="<TEXT>"
+            Conditional::CONDITION_BEGINSWITH,
+            // Expression is RIGHT(<Cell Reference>,LEN("<TEXT>"))="<TEXT>"
+            Conditional::CONDITION_ENDSWITH,
+            // Expression is LEN(TRIM(<Cell Reference>))=0
+            Conditional::CONDITION_CONTAINSBLANKS,
+            // Expression is LEN(TRIM(<Cell Reference>))>0
+            Conditional::CONDITION_NOTCONTAINSBLANKS,
+            // Expression is ISERROR(<Cell Reference>)
+            Conditional::CONDITION_CONTAINSERRORS,
+            // Expression is NOT(ISERROR(<Cell Reference>))
+            Conditional::CONDITION_NOTCONTAINSERRORS,
+            // Expression varies, depending on specified timePeriod value, e.g.
+            // Yesterday FLOOR(<Cell Reference>,1)=TODAY()-1
+            // Today FLOOR(<Cell Reference>,1)=TODAY()
+            // Tomorrow FLOOR(<Cell Reference>,1)=TODAY()+1
+            // Last 7 Days AND(TODAY()-FLOOR(<Cell Reference>,1)<=6,FLOOR(<Cell Reference>,1)<=TODAY())
+            Conditional::CONDITION_TIMEPERIOD,
+            Conditional::CONDITION_EXPRESSION => $this->processExpression($conditional),
+            default => false,
+        };
+    }
+
+    protected function wrapValue(mixed $value): float|int|string
+    {
+        if (!is_numeric($value)) {
+            if (is_bool($value)) {
+                return $value ? 'TRUE' : 'FALSE';
+            } elseif ($value === null) {
+                return 'NULL';
+            }
+
+            return '"' . $value . '"';
+        }
+
+        return $value;
+    }
+
+    protected function wrapCellValue(): float|int|string
+    {
+        $this->cell = $this->worksheet->getCell([$this->cellColumn, $this->cellRow]);
+
+        return $this->wrapValue($this->cell->getCalculatedValue());
+    }
+
+    protected function conditionCellAdjustment(array $matches): float|int|string
+    {
+        $column = $matches[6];
+        $row = $matches[7];
+
+        if (!str_contains($column, '$')) {
+            $column = Coordinate::columnIndexFromString($column);
+            $column += $this->cellColumn - $this->referenceColumn;
+            $column = Coordinate::stringFromColumnIndex($column);
+        }
+
+        if (!str_contains($row, '$')) {
+            $row += $this->cellRow - $this->referenceRow;
+        }
+
+        if (!empty($matches[4])) {
+            $worksheet = $this->worksheet->getParentOrThrow()->getSheetByName(trim($matches[4], "'"));
+            if ($worksheet === null) {
+                return $this->wrapValue(null);
+            }
+
+            return $this->wrapValue(
+                $worksheet
+                    ->getCell(str_replace('$', '', "{$column}{$row}"))
+                    ->getCalculatedValue()
+            );
+        }
+
+        return $this->wrapValue(
+            $this->worksheet
+                ->getCell(str_replace('$', '', "{$column}{$row}"))
+                ->getCalculatedValue()
+        );
+    }
+
+    protected function cellConditionCheck(string $condition): string
+    {
+        $splitCondition = explode(Calculation::FORMULA_STRING_QUOTE, $condition);
+        $i = false;
+        foreach ($splitCondition as &$value) {
+            //    Only count/replace in alternating array entries (ie. not in quoted strings)
+            $i = $i === false;
+            if ($i) {
+                $value = (string) preg_replace_callback(
+                    '/' . Calculation::CALCULATION_REGEXP_CELLREF_RELATIVE . '/i',
+                    [$this, 'conditionCellAdjustment'],
+                    $value
+                );
+            }
+        }
+        unset($value);
+
+        //    Then rebuild the condition string to return it
+        return implode(Calculation::FORMULA_STRING_QUOTE, $splitCondition);
+    }
+
+    protected function adjustConditionsForCellReferences(array $conditions): array
+    {
+        return array_map(
+            [$this, 'cellConditionCheck'],
+            $conditions
+        );
+    }
+
+    protected function processOperatorComparison(Conditional $conditional): bool
+    {
+        if (array_key_exists($conditional->getOperatorType(), self::COMPARISON_RANGE_OPERATORS)) {
+            return $this->processRangeOperator($conditional);
+        }
+
+        $operator = self::COMPARISON_OPERATORS[$conditional->getOperatorType()];
+        $conditions = $this->adjustConditionsForCellReferences($conditional->getConditions());
+        $expression = sprintf('%s%s%s', (string) $this->wrapCellValue(), $operator, (string) array_pop($conditions));
+
+        return $this->evaluateExpression($expression);
+    }
+
+    protected function processRangeOperator(Conditional $conditional): bool
+    {
+        $conditions = $this->adjustConditionsForCellReferences($conditional->getConditions());
+        sort($conditions);
+        $expression = sprintf(
+            (string) preg_replace(
+                '/\bA1\b/i',
+                (string) $this->wrapCellValue(),
+                self::COMPARISON_RANGE_OPERATORS[$conditional->getOperatorType()]
+            ),
+            ...$conditions
+        );
+
+        return $this->evaluateExpression($expression);
+    }
+
+    protected function processDuplicatesComparison(Conditional $conditional): bool
+    {
+        $worksheetName = $this->cell->getWorksheet()->getTitle();
+
+        $expression = sprintf(
+            self::COMPARISON_DUPLICATES_OPERATORS[$conditional->getConditionType()],
+            $worksheetName,
+            $this->conditionalRange,
+            $this->cellConditionCheck($this->cell->getCalculatedValueString())
+        );
+
+        return $this->evaluateExpression($expression);
+    }
+
+    protected function processExpression(Conditional $conditional): bool
+    {
+        $conditions = $this->adjustConditionsForCellReferences($conditional->getConditions());
+        $expression = array_pop($conditions);
+
+        $expression = (string) preg_replace(
+            '/\b' . $this->referenceCell . '\b/i',
+            (string) $this->wrapCellValue(),
+            $expression
+        );
+
+        return $this->evaluateExpression($expression);
+    }
+
+    protected function evaluateExpression(string $expression): bool
+    {
+        $expression = "={$expression}";
+
+        try {
+            $this->engine->flushInstance();
+            $result = (bool) $this->engine->calculateFormula($expression);
+        } catch (Exception) {
+            return false;
+        }
+
+        return $result;
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/CellStyleAssessor.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/CellStyleAssessor.php
new file mode 100644
index 0000000000..bcf59dee86
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/CellStyleAssessor.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting;
+
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
+use PhpOffice\PhpSpreadsheet\Style\Conditional;
+use PhpOffice\PhpSpreadsheet\Style\Style;
+
+class CellStyleAssessor
+{
+    protected CellMatcher $cellMatcher;
+
+    protected StyleMerger $styleMerger;
+
+    public function __construct(Cell $cell, string $conditionalRange)
+    {
+        $this->cellMatcher = new CellMatcher($cell, $conditionalRange);
+        $this->styleMerger = new StyleMerger($cell->getStyle());
+    }
+
+    /**
+     * @param Conditional[] $conditionalStyles
+     */
+    public function matchConditions(array $conditionalStyles = []): Style
+    {
+        foreach ($conditionalStyles as $conditional) {
+            if ($this->cellMatcher->evaluateConditional($conditional) === true) {
+                // Merging the conditional style into the base style goes in here
+                $this->styleMerger->mergeStyle($conditional->getStyle());
+                if ($conditional->getStopIfTrue() === true) {
+                    break;
+                }
+            }
+        }
+
+        return $this->styleMerger->getStyle();
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalColorScale.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalColorScale.php
new file mode 100644
index 0000000000..7fcc08038d
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalColorScale.php
@@ -0,0 +1,92 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting;
+
+use PhpOffice\PhpSpreadsheet\Style\Color;
+
+class ConditionalColorScale
+{
+    private ?ConditionalFormatValueObject $minimumConditionalFormatValueObject = null;
+
+    private ?ConditionalFormatValueObject $midpointConditionalFormatValueObject = null;
+
+    private ?ConditionalFormatValueObject $maximumConditionalFormatValueObject = null;
+
+    private ?Color $minimumColor = null;
+
+    private ?Color $midpointColor = null;
+
+    private ?Color $maximumColor = null;
+
+    public function getMinimumConditionalFormatValueObject(): ?ConditionalFormatValueObject
+    {
+        return $this->minimumConditionalFormatValueObject;
+    }
+
+    public function setMinimumConditionalFormatValueObject(ConditionalFormatValueObject $minimumConditionalFormatValueObject): self
+    {
+        $this->minimumConditionalFormatValueObject = $minimumConditionalFormatValueObject;
+
+        return $this;
+    }
+
+    public function getMidpointConditionalFormatValueObject(): ?ConditionalFormatValueObject
+    {
+        return $this->midpointConditionalFormatValueObject;
+    }
+
+    public function setMidpointConditionalFormatValueObject(ConditionalFormatValueObject $midpointConditionalFormatValueObject): self
+    {
+        $this->midpointConditionalFormatValueObject = $midpointConditionalFormatValueObject;
+
+        return $this;
+    }
+
+    public function getMaximumConditionalFormatValueObject(): ?ConditionalFormatValueObject
+    {
+        return $this->maximumConditionalFormatValueObject;
+    }
+
+    public function setMaximumConditionalFormatValueObject(ConditionalFormatValueObject $maximumConditionalFormatValueObject): self
+    {
+        $this->maximumConditionalFormatValueObject = $maximumConditionalFormatValueObject;
+
+        return $this;
+    }
+
+    public function getMinimumColor(): ?Color
+    {
+        return $this->minimumColor;
+    }
+
+    public function setMinimumColor(Color $minimumColor): self
+    {
+        $this->minimumColor = $minimumColor;
+
+        return $this;
+    }
+
+    public function getMidpointColor(): ?Color
+    {
+        return $this->midpointColor;
+    }
+
+    public function setMidpointColor(Color $midpointColor): self
+    {
+        $this->midpointColor = $midpointColor;
+
+        return $this;
+    }
+
+    public function getMaximumColor(): ?Color
+    {
+        return $this->maximumColor;
+    }
+
+    public function setMaximumColor(Color $maximumColor): self
+    {
+        $this->maximumColor = $maximumColor;
+
+        return $this;
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalDataBar.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalDataBar.php
index 54513670e4..370f102547 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalDataBar.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalDataBar.php
@@ -4,69 +4,46 @@
 
 class ConditionalDataBar
 {
-    /** <dataBar> attribute  */
+    private ?bool $showValue = null;
 
-    /** @var null|bool */
-    private $showValue;
+    private ?ConditionalFormatValueObject $minimumConditionalFormatValueObject = null;
 
-    /** <dataBar> children */
+    private ?ConditionalFormatValueObject $maximumConditionalFormatValueObject = null;
 
-    /** @var ConditionalFormatValueObject */
-    private $minimumConditionalFormatValueObject;
+    private string $color = '';
 
-    /** @var ConditionalFormatValueObject */
-    private $maximumConditionalFormatValueObject;
+    private ?ConditionalFormattingRuleExtension $conditionalFormattingRuleExt = null;
 
-    /** @var string */
-    private $color;
-
-    /** <extLst> */
-
-    /** @var ConditionalFormattingRuleExtension */
-    private $conditionalFormattingRuleExt;
-
-    /**
-     * @return null|bool
-     */
-    public function getShowValue()
+    public function getShowValue(): ?bool
     {
         return $this->showValue;
     }
 
-    /**
-     * @param bool $showValue
-     */
-    public function setShowValue($showValue)
+    public function setShowValue(bool $showValue): self
     {
         $this->showValue = $showValue;
 
         return $this;
     }
 
-    /**
-     * @return ConditionalFormatValueObject
-     */
-    public function getMinimumConditionalFormatValueObject()
+    public function getMinimumConditionalFormatValueObject(): ?ConditionalFormatValueObject
     {
         return $this->minimumConditionalFormatValueObject;
     }
 
-    public function setMinimumConditionalFormatValueObject(ConditionalFormatValueObject $minimumConditionalFormatValueObject)
+    public function setMinimumConditionalFormatValueObject(ConditionalFormatValueObject $minimumConditionalFormatValueObject): self
     {
         $this->minimumConditionalFormatValueObject = $minimumConditionalFormatValueObject;
 
         return $this;
     }
 
-    /**
-     * @return ConditionalFormatValueObject
-     */
-    public function getMaximumConditionalFormatValueObject()
+    public function getMaximumConditionalFormatValueObject(): ?ConditionalFormatValueObject
     {
         return $this->maximumConditionalFormatValueObject;
     }
 
-    public function setMaximumConditionalFormatValueObject(ConditionalFormatValueObject $maximumConditionalFormatValueObject)
+    public function setMaximumConditionalFormatValueObject(ConditionalFormatValueObject $maximumConditionalFormatValueObject): self
     {
         $this->maximumConditionalFormatValueObject = $maximumConditionalFormatValueObject;
 
@@ -85,15 +62,12 @@ public function setColor(string $color): self
         return $this;
     }
 
-    /**
-     * @return ConditionalFormattingRuleExtension
-     */
-    public function getConditionalFormattingRuleExt()
+    public function getConditionalFormattingRuleExt(): ?ConditionalFormattingRuleExtension
     {
         return $this->conditionalFormattingRuleExt;
     }
 
-    public function setConditionalFormattingRuleExt(ConditionalFormattingRuleExtension $conditionalFormattingRuleExt)
+    public function setConditionalFormattingRuleExt(ConditionalFormattingRuleExtension $conditionalFormattingRuleExt): self
     {
         $this->conditionalFormattingRuleExt = $conditionalFormattingRuleExt;
 
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalDataBarExtension.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalDataBarExtension.php
index c709cf3e70..28cd94bbdb 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalDataBarExtension.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalDataBarExtension.php
@@ -5,53 +5,39 @@
 class ConditionalDataBarExtension
 {
     /** <dataBar> attributes */
+    private int $minLength;
 
-    /** @var int */
-    private $minLength;
+    private int $maxLength;
 
-    /** @var int */
-    private $maxLength;
+    private ?bool $border = null;
 
-    /** @var null|bool */
-    private $border;
+    private ?bool $gradient = null;
 
-    /** @var null|bool */
-    private $gradient;
+    private ?string $direction = null;
 
-    /** @var string */
-    private $direction;
+    private ?bool $negativeBarBorderColorSameAsPositive = null;
 
-    /** @var null|bool */
-    private $negativeBarBorderColorSameAsPositive;
-
-    /** @var string */
-    private $axisPosition;
+    private ?string $axisPosition = null;
 
     // <dataBar> children
 
-    /** @var ConditionalFormatValueObject */
-    private $maximumConditionalFormatValueObject;
+    private ConditionalFormatValueObject $maximumConditionalFormatValueObject;
 
-    /** @var ConditionalFormatValueObject */
-    private $minimumConditionalFormatValueObject;
+    private ConditionalFormatValueObject $minimumConditionalFormatValueObject;
 
-    /** @var string */
-    private $borderColor;
+    private ?string $borderColor = null;
 
-    /** @var string */
-    private $negativeFillColor;
+    private ?string $negativeFillColor = null;
 
-    /** @var string */
-    private $negativeBorderColor;
+    private ?string $negativeBorderColor = null;
 
-    /** @var array */
-    private $axisColor = [
+    private array $axisColor = [
         'rgb' => null,
         'theme' => null,
         'tint' => null,
     ];
 
-    public function getXmlAttributes()
+    public function getXmlAttributes(): array
     {
         $ret = [];
         foreach (['minLength', 'maxLength', 'direction', 'axisPosition'] as $attrKey) {
@@ -68,7 +54,7 @@ public function getXmlAttributes()
         return $ret;
     }
 
-    public function getXmlElements()
+    public function getXmlElements(): array
     {
         $ret = [];
         $elms = ['borderColor', 'negativeFillColor', 'negativeBorderColor'];
@@ -87,10 +73,7 @@ public function getXmlElements()
         return $ret;
     }
 
-    /**
-     * @return int
-     */
-    public function getMinLength()
+    public function getMinLength(): int
     {
         return $this->minLength;
     }
@@ -102,10 +85,7 @@ public function setMinLength(int $minLength): self
         return $this;
     }
 
-    /**
-     * @return int
-     */
-    public function getMaxLength()
+    public function getMaxLength(): int
     {
         return $this->maxLength;
     }
@@ -117,10 +97,7 @@ public function setMaxLength(int $maxLength): self
         return $this;
     }
 
-    /**
-     * @return null|bool
-     */
-    public function getBorder()
+    public function getBorder(): ?bool
     {
         return $this->border;
     }
@@ -132,10 +109,7 @@ public function setBorder(bool $border): self
         return $this;
     }
 
-    /**
-     * @return null|bool
-     */
-    public function getGradient()
+    public function getGradient(): ?bool
     {
         return $this->gradient;
     }
@@ -147,10 +121,7 @@ public function setGradient(bool $gradient): self
         return $this;
     }
 
-    /**
-     * @return string
-     */
-    public function getDirection()
+    public function getDirection(): ?string
     {
         return $this->direction;
     }
@@ -162,10 +133,7 @@ public function setDirection(string $direction): self
         return $this;
     }
 
-    /**
-     * @return null|bool
-     */
-    public function getNegativeBarBorderColorSameAsPositive()
+    public function getNegativeBarBorderColorSameAsPositive(): ?bool
     {
         return $this->negativeBarBorderColorSameAsPositive;
     }
@@ -177,10 +145,7 @@ public function setNegativeBarBorderColorSameAsPositive(bool $negativeBarBorderC
         return $this;
     }
 
-    /**
-     * @return string
-     */
-    public function getAxisPosition()
+    public function getAxisPosition(): ?string
     {
         return $this->axisPosition;
     }
@@ -192,40 +157,31 @@ public function setAxisPosition(string $axisPosition): self
         return $this;
     }
 
-    /**
-     * @return ConditionalFormatValueObject
-     */
-    public function getMaximumConditionalFormatValueObject()
+    public function getMaximumConditionalFormatValueObject(): ConditionalFormatValueObject
     {
         return $this->maximumConditionalFormatValueObject;
     }
 
-    public function setMaximumConditionalFormatValueObject(ConditionalFormatValueObject $maximumConditionalFormatValueObject)
+    public function setMaximumConditionalFormatValueObject(ConditionalFormatValueObject $maximumConditionalFormatValueObject): self
     {
         $this->maximumConditionalFormatValueObject = $maximumConditionalFormatValueObject;
 
         return $this;
     }
 
-    /**
-     * @return ConditionalFormatValueObject
-     */
-    public function getMinimumConditionalFormatValueObject()
+    public function getMinimumConditionalFormatValueObject(): ConditionalFormatValueObject
     {
         return $this->minimumConditionalFormatValueObject;
     }
 
-    public function setMinimumConditionalFormatValueObject(ConditionalFormatValueObject $minimumConditionalFormatValueObject)
+    public function setMinimumConditionalFormatValueObject(ConditionalFormatValueObject $minimumConditionalFormatValueObject): self
     {
         $this->minimumConditionalFormatValueObject = $minimumConditionalFormatValueObject;
 
         return $this;
     }
 
-    /**
-     * @return string
-     */
-    public function getBorderColor()
+    public function getBorderColor(): ?string
     {
         return $this->borderColor;
     }
@@ -237,10 +193,7 @@ public function setBorderColor(string $borderColor): self
         return $this;
     }
 
-    /**
-     * @return string
-     */
-    public function getNegativeFillColor()
+    public function getNegativeFillColor(): ?string
     {
         return $this->negativeFillColor;
     }
@@ -252,10 +205,7 @@ public function setNegativeFillColor(string $negativeFillColor): self
         return $this;
     }
 
-    /**
-     * @return string
-     */
-    public function getNegativeBorderColor()
+    public function getNegativeBorderColor(): ?string
     {
         return $this->negativeBorderColor;
     }
@@ -272,12 +222,7 @@ public function getAxisColor(): array
         return $this->axisColor;
     }
 
-    /**
-     * @param mixed $rgb
-     * @param null|mixed $theme
-     * @param null|mixed $tint
-     */
-    public function setAxisColor($rgb, $theme = null, $tint = null): self
+    public function setAxisColor(mixed $rgb, mixed $theme = null, mixed $tint = null): self
     {
         $this->axisColor = [
             'rgb' => $rgb,
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormatValueObject.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormatValueObject.php
index 107969bf9f..e6d1035f4e 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormatValueObject.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormatValueObject.php
@@ -4,72 +4,49 @@
 
 class ConditionalFormatValueObject
 {
-    private $type;
+    private string $type;
 
-    private $value;
+    private null|float|int|string $value;
 
-    private $cellFormula;
+    private ?string $cellFormula;
 
-    /**
-     * ConditionalFormatValueObject constructor.
-     *
-     * @param null|mixed $cellFormula
-     */
-    public function __construct($type, $value = null, $cellFormula = null)
+    public function __construct(string $type, null|float|int|string $value = null, ?string $cellFormula = null)
     {
         $this->type = $type;
         $this->value = $value;
         $this->cellFormula = $cellFormula;
     }
 
-    /**
-     * @return mixed
-     */
-    public function getType()
+    public function getType(): string
     {
         return $this->type;
     }
 
-    /**
-     * @param mixed $type
-     */
-    public function setType($type)
+    public function setType(string $type): self
     {
         $this->type = $type;
 
         return $this;
     }
 
-    /**
-     * @return mixed
-     */
-    public function getValue()
+    public function getValue(): null|float|int|string
     {
         return $this->value;
     }
 
-    /**
-     * @param mixed $value
-     */
-    public function setValue($value)
+    public function setValue(null|float|int|string $value): self
     {
         $this->value = $value;
 
         return $this;
     }
 
-    /**
-     * @return mixed
-     */
-    public function getCellFormula()
+    public function getCellFormula(): ?string
     {
         return $this->cellFormula;
     }
 
-    /**
-     * @param mixed $cellFormula
-     */
-    public function setCellFormula($cellFormula)
+    public function setCellFormula(?string $cellFormula): self
     {
         $this->cellFormula = $cellFormula;
 
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormattingRuleExtension.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormattingRuleExtension.php
index 0797c2e8b9..c6c648ba24 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormattingRuleExtension.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormattingRuleExtension.php
@@ -9,24 +9,20 @@ class ConditionalFormattingRuleExtension
 {
     const CONDITION_EXTENSION_DATABAR = 'dataBar';
 
-    /** <conditionalFormatting> attributes */
-    private $id;
+    private string $id;
 
     /** @var string Conditional Formatting Rule */
-    private $cfRule;
+    private string $cfRule;
 
-    /** <conditionalFormatting> children */
-
-    /** @var ConditionalDataBarExtension */
-    private $dataBar;
+    private ConditionalDataBarExtension $dataBar;
 
     /** @var string Sequence of References */
-    private $sqref;
+    private string $sqref = '';
 
     /**
      * ConditionalFormattingRuleExtension constructor.
      */
-    public function __construct($id = null, string $cfRule = self::CONDITION_EXTENSION_DATABAR)
+    public function __construct(?string $id = null, string $cfRule = self::CONDITION_EXTENSION_DATABAR)
     {
         if (null === $id) {
             $this->id = '{' . $this->generateUuid() . '}';
@@ -36,7 +32,7 @@ public function __construct($id = null, string $cfRule = self::CONDITION_EXTENSI
         $this->cfRule = $cfRule;
     }
 
-    private function generateUuid()
+    private function generateUuid(): string
     {
         $chars = str_split('xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx');
 
@@ -51,7 +47,7 @@ private function generateUuid()
         return implode('', $chars);
     }
 
-    public static function parseExtLstXml($extLstXml)
+    public static function parseExtLstXml(?SimpleXMLElement $extLstXml): array
     {
         $conditionalFormattingRuleExtensions = [];
         $conditionalFormattingRuleExtensionXml = null;
@@ -70,11 +66,12 @@ public static function parseExtLstXml($extLstXml)
 
                 foreach ($extFormattingsXml->children($ns['x14']) as $extFormattingXml) {
                     $extCfRuleXml = $extFormattingXml->cfRule;
-                    if (((string) $extCfRuleXml->attributes()->type) !== Conditional::CONDITION_DATABAR) {
+                    $attributes = $extCfRuleXml->attributes();
+                    if (!$attributes || ((string) $attributes->type) !== Conditional::CONDITION_DATABAR) {
                         continue;
                     }
 
-                    $extFormattingRuleObj = new self((string) $extCfRuleXml->attributes()->id);
+                    $extFormattingRuleObj = new self((string) $attributes->id);
                     $extFormattingRuleObj->setSqref((string) $extFormattingXml->children($ns['xm'])->sqref);
                     $conditionalFormattingRuleExtensions[$extFormattingRuleObj->getId()] = $extFormattingRuleObj;
 
@@ -95,6 +92,9 @@ private static function parseExtDataBarAttributesFromXml(
         SimpleXMLElement $dataBarXml
     ): void {
         $dataBarAttribute = $dataBarXml->attributes();
+        if ($dataBarAttribute === null) {
+            return;
+        }
         if ($dataBarAttribute->minLength) {
             $extDataBarObj->setMinLength((int) $dataBarAttribute->minLength);
         }
@@ -118,46 +118,56 @@ private static function parseExtDataBarAttributesFromXml(
         }
     }
 
-    private static function parseExtDataBarElementChildrenFromXml(ConditionalDataBarExtension $extDataBarObj, SimpleXMLElement $dataBarXml, $ns): void
+    private static function parseExtDataBarElementChildrenFromXml(ConditionalDataBarExtension $extDataBarObj, SimpleXMLElement $dataBarXml, array $ns): void
     {
         if ($dataBarXml->borderColor) {
-            $extDataBarObj->setBorderColor((string) $dataBarXml->borderColor->attributes()['rgb']);
+            $attributes = $dataBarXml->borderColor->attributes();
+            if ($attributes !== null) {
+                $extDataBarObj->setBorderColor((string) $attributes['rgb']);
+            }
         }
         if ($dataBarXml->negativeFillColor) {
-            $extDataBarObj->setNegativeFillColor((string) $dataBarXml->negativeFillColor->attributes()['rgb']);
+            $attributes = $dataBarXml->negativeFillColor->attributes();
+            if ($attributes !== null) {
+                $extDataBarObj->setNegativeFillColor((string) $attributes['rgb']);
+            }
         }
         if ($dataBarXml->negativeBorderColor) {
-            $extDataBarObj->setNegativeBorderColor((string) $dataBarXml->negativeBorderColor->attributes()['rgb']);
+            $attributes = $dataBarXml->negativeBorderColor->attributes();
+            if ($attributes !== null) {
+                $extDataBarObj->setNegativeBorderColor((string) $attributes['rgb']);
+            }
         }
         if ($dataBarXml->axisColor) {
             $axisColorAttr = $dataBarXml->axisColor->attributes();
-            $extDataBarObj->setAxisColor((string) $axisColorAttr['rgb'], (string) $axisColorAttr['theme'], (string) $axisColorAttr['tint']);
+            if ($axisColorAttr !== null) {
+                $extDataBarObj->setAxisColor((string) $axisColorAttr['rgb'], (string) $axisColorAttr['theme'], (string) $axisColorAttr['tint']);
+            }
         }
         $cfvoIndex = 0;
         foreach ($dataBarXml->cfvo as $cfvo) {
             $f = (string) $cfvo->children($ns['xm'])->f;
+            $attributes = $cfvo->attributes();
+            if (!($attributes)) {
+                continue;
+            }
+
             if ($cfvoIndex === 0) {
-                $extDataBarObj->setMinimumConditionalFormatValueObject(new ConditionalFormatValueObject((string) $cfvo->attributes()['type'], null, (empty($f) ? null : $f)));
+                $extDataBarObj->setMinimumConditionalFormatValueObject(new ConditionalFormatValueObject((string) $attributes['type'], null, (empty($f) ? null : $f)));
             }
             if ($cfvoIndex === 1) {
-                $extDataBarObj->setMaximumConditionalFormatValueObject(new ConditionalFormatValueObject((string) $cfvo->attributes()['type'], null, (empty($f) ? null : $f)));
+                $extDataBarObj->setMaximumConditionalFormatValueObject(new ConditionalFormatValueObject((string) $attributes['type'], null, (empty($f) ? null : $f)));
             }
             ++$cfvoIndex;
         }
     }
 
-    /**
-     * @return mixed
-     */
-    public function getId()
+    public function getId(): string
     {
         return $this->id;
     }
 
-    /**
-     * @param mixed $id
-     */
-    public function setId($id): self
+    public function setId(string $id): self
     {
         $this->id = $id;
 
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/StyleMerger.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/StyleMerger.php
new file mode 100644
index 0000000000..9388848e74
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/StyleMerger.php
@@ -0,0 +1,115 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting;
+
+use PhpOffice\PhpSpreadsheet\Style\Border;
+use PhpOffice\PhpSpreadsheet\Style\Borders;
+use PhpOffice\PhpSpreadsheet\Style\Fill;
+use PhpOffice\PhpSpreadsheet\Style\Font;
+use PhpOffice\PhpSpreadsheet\Style\Style;
+
+class StyleMerger
+{
+    protected Style $baseStyle;
+
+    public function __construct(Style $baseStyle)
+    {
+        $this->baseStyle = $baseStyle;
+    }
+
+    public function getStyle(): Style
+    {
+        return $this->baseStyle;
+    }
+
+    public function mergeStyle(Style $style): void
+    {
+        if ($style->getNumberFormat() !== null && $style->getNumberFormat()->getFormatCode() !== null) {
+            $this->baseStyle->getNumberFormat()->setFormatCode($style->getNumberFormat()->getFormatCode());
+        }
+
+        if ($style->getFont() !== null) {
+            $this->mergeFontStyle($this->baseStyle->getFont(), $style->getFont());
+        }
+
+        if ($style->getFill() !== null) {
+            $this->mergeFillStyle($this->baseStyle->getFill(), $style->getFill());
+        }
+
+        if ($style->getBorders() !== null) {
+            $this->mergeBordersStyle($this->baseStyle->getBorders(), $style->getBorders());
+        }
+    }
+
+    protected function mergeFontStyle(Font $baseFontStyle, Font $fontStyle): void
+    {
+        if ($fontStyle->getBold() !== null) {
+            $baseFontStyle->setBold($fontStyle->getBold());
+        }
+
+        if ($fontStyle->getItalic() !== null) {
+            $baseFontStyle->setItalic($fontStyle->getItalic());
+        }
+
+        if ($fontStyle->getStrikethrough() !== null) {
+            $baseFontStyle->setStrikethrough($fontStyle->getStrikethrough());
+        }
+
+        if ($fontStyle->getUnderline() !== null) {
+            $baseFontStyle->setUnderline($fontStyle->getUnderline());
+        }
+
+        if ($fontStyle->getColor() !== null && $fontStyle->getColor()->getARGB() !== null) {
+            $baseFontStyle->setColor($fontStyle->getColor());
+        }
+    }
+
+    protected function mergeFillStyle(Fill $baseFillStyle, Fill $fillStyle): void
+    {
+        if ($fillStyle->getFillType() !== null) {
+            $baseFillStyle->setFillType($fillStyle->getFillType());
+        }
+
+        //if ($fillStyle->getRotation() !== null) {
+        $baseFillStyle->setRotation($fillStyle->getRotation());
+        //}
+
+        if ($fillStyle->getStartColor() !== null && $fillStyle->getStartColor()->getARGB() !== null) {
+            $baseFillStyle->setStartColor($fillStyle->getStartColor());
+        }
+
+        if ($fillStyle->getEndColor() !== null && $fillStyle->getEndColor()->getARGB() !== null) {
+            $baseFillStyle->setEndColor($fillStyle->getEndColor());
+        }
+    }
+
+    protected function mergeBordersStyle(Borders $baseBordersStyle, Borders $bordersStyle): void
+    {
+        if ($bordersStyle->getTop() !== null) {
+            $this->mergeBorderStyle($baseBordersStyle->getTop(), $bordersStyle->getTop());
+        }
+
+        if ($bordersStyle->getBottom() !== null) {
+            $this->mergeBorderStyle($baseBordersStyle->getBottom(), $bordersStyle->getBottom());
+        }
+
+        if ($bordersStyle->getLeft() !== null) {
+            $this->mergeBorderStyle($baseBordersStyle->getLeft(), $bordersStyle->getLeft());
+        }
+
+        if ($bordersStyle->getRight() !== null) {
+            $this->mergeBorderStyle($baseBordersStyle->getRight(), $bordersStyle->getRight());
+        }
+    }
+
+    protected function mergeBorderStyle(Border $baseBorderStyle, Border $borderStyle): void
+    {
+        //if ($borderStyle->getBorderStyle() !== null) {
+        $baseBorderStyle->setBorderStyle($borderStyle->getBorderStyle());
+        //}
+
+        if ($borderStyle->getColor() !== null && $borderStyle->getColor()->getARGB() !== null) {
+            $baseBorderStyle->setColor($borderStyle->getColor());
+        }
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard.php
new file mode 100644
index 0000000000..2791a2b98e
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting;
+
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Style\Conditional;
+use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\Wizard\WizardInterface;
+
+class Wizard
+{
+    public const CELL_VALUE = 'cellValue';
+    public const TEXT_VALUE = 'textValue';
+    public const BLANKS = Conditional::CONDITION_CONTAINSBLANKS;
+    public const NOT_BLANKS = Conditional::CONDITION_NOTCONTAINSBLANKS;
+    public const ERRORS = Conditional::CONDITION_CONTAINSERRORS;
+    public const NOT_ERRORS = Conditional::CONDITION_NOTCONTAINSERRORS;
+    public const EXPRESSION = Conditional::CONDITION_EXPRESSION;
+    public const FORMULA = Conditional::CONDITION_EXPRESSION;
+    public const DATES_OCCURRING = 'DateValue';
+    public const DUPLICATES = Conditional::CONDITION_DUPLICATES;
+    public const UNIQUE = Conditional::CONDITION_UNIQUE;
+
+    public const VALUE_TYPE_LITERAL = 'value';
+    public const VALUE_TYPE_CELL = 'cell';
+    public const VALUE_TYPE_FORMULA = 'formula';
+
+    protected string $cellRange;
+
+    public function __construct(string $cellRange)
+    {
+        $this->cellRange = $cellRange;
+    }
+
+    public function newRule(string $ruleType): WizardInterface
+    {
+        return match ($ruleType) {
+            self::CELL_VALUE => new Wizard\CellValue($this->cellRange),
+            self::TEXT_VALUE => new Wizard\TextValue($this->cellRange),
+            self::BLANKS => new Wizard\Blanks($this->cellRange, true),
+            self::NOT_BLANKS => new Wizard\Blanks($this->cellRange, false),
+            self::ERRORS => new Wizard\Errors($this->cellRange, true),
+            self::NOT_ERRORS => new Wizard\Errors($this->cellRange, false),
+            self::EXPRESSION, self::FORMULA => new Wizard\Expression($this->cellRange),
+            self::DATES_OCCURRING => new Wizard\DateValue($this->cellRange),
+            self::DUPLICATES => new Wizard\Duplicates($this->cellRange, false),
+            self::UNIQUE => new Wizard\Duplicates($this->cellRange, true),
+            default => throw new Exception('No wizard exists for this CF rule type'),
+        };
+    }
+
+    public static function fromConditional(Conditional $conditional, string $cellRange = 'A1'): WizardInterface
+    {
+        $conditionalType = $conditional->getConditionType();
+
+        return match ($conditionalType) {
+            Conditional::CONDITION_CELLIS => Wizard\CellValue::fromConditional($conditional, $cellRange),
+            Conditional::CONDITION_CONTAINSTEXT, Conditional::CONDITION_NOTCONTAINSTEXT, Conditional::CONDITION_BEGINSWITH, Conditional::CONDITION_ENDSWITH => Wizard\TextValue::fromConditional($conditional, $cellRange),
+            Conditional::CONDITION_CONTAINSBLANKS, Conditional::CONDITION_NOTCONTAINSBLANKS => Wizard\Blanks::fromConditional($conditional, $cellRange),
+            Conditional::CONDITION_CONTAINSERRORS, Conditional::CONDITION_NOTCONTAINSERRORS => Wizard\Errors::fromConditional($conditional, $cellRange),
+            Conditional::CONDITION_TIMEPERIOD => Wizard\DateValue::fromConditional($conditional, $cellRange),
+            Conditional::CONDITION_EXPRESSION => Wizard\Expression::fromConditional($conditional, $cellRange),
+            Conditional::CONDITION_DUPLICATES, Conditional::CONDITION_UNIQUE => Wizard\Duplicates::fromConditional($conditional, $cellRange),
+            default => throw new Exception('No wizard exists for this CF rule type'),
+        };
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/Blanks.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/Blanks.php
new file mode 100644
index 0000000000..5a8fe9b98a
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/Blanks.php
@@ -0,0 +1,95 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\Wizard;
+
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Style\Conditional;
+use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\Wizard;
+
+/**
+ * @method Blanks notBlank()
+ * @method Blanks notEmpty()
+ * @method Blanks isBlank()
+ * @method Blanks isEmpty()
+ */
+class Blanks extends WizardAbstract implements WizardInterface
+{
+    protected const OPERATORS = [
+        'notBlank' => false,
+        'isBlank' => true,
+        'notEmpty' => false,
+        'empty' => true,
+    ];
+
+    protected const EXPRESSIONS = [
+        Wizard::NOT_BLANKS => 'LEN(TRIM(%s))>0',
+        Wizard::BLANKS => 'LEN(TRIM(%s))=0',
+    ];
+
+    protected bool $inverse;
+
+    public function __construct(string $cellRange, bool $inverse = false)
+    {
+        parent::__construct($cellRange);
+        $this->inverse = $inverse;
+    }
+
+    protected function inverse(bool $inverse): void
+    {
+        $this->inverse = $inverse;
+    }
+
+    protected function getExpression(): void
+    {
+        $this->expression = sprintf(
+            self::EXPRESSIONS[$this->inverse ? Wizard::BLANKS : Wizard::NOT_BLANKS],
+            $this->referenceCell
+        );
+    }
+
+    public function getConditional(): Conditional
+    {
+        $this->getExpression();
+
+        $conditional = new Conditional();
+        $conditional->setConditionType(
+            $this->inverse ? Conditional::CONDITION_CONTAINSBLANKS : Conditional::CONDITION_NOTCONTAINSBLANKS
+        );
+        $conditional->setConditions([$this->expression]);
+        $conditional->setStyle($this->getStyle());
+        $conditional->setStopIfTrue($this->getStopIfTrue());
+
+        return $conditional;
+    }
+
+    public static function fromConditional(Conditional $conditional, string $cellRange = 'A1'): WizardInterface
+    {
+        if (
+            $conditional->getConditionType() !== Conditional::CONDITION_CONTAINSBLANKS
+            && $conditional->getConditionType() !== Conditional::CONDITION_NOTCONTAINSBLANKS
+        ) {
+            throw new Exception('Conditional is not a Blanks CF Rule conditional');
+        }
+
+        $wizard = new self($cellRange);
+        $wizard->style = $conditional->getStyle();
+        $wizard->stopIfTrue = $conditional->getStopIfTrue();
+        $wizard->inverse = $conditional->getConditionType() === Conditional::CONDITION_CONTAINSBLANKS;
+
+        return $wizard;
+    }
+
+    /**
+     * @param mixed[] $arguments
+     */
+    public function __call(string $methodName, array $arguments): self
+    {
+        if (!array_key_exists($methodName, self::OPERATORS)) {
+            throw new Exception('Invalid Operation for Blanks CF Rule Wizard');
+        }
+
+        $this->inverse(self::OPERATORS[$methodName]);
+
+        return $this;
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/CellValue.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/CellValue.php
new file mode 100644
index 0000000000..63f360b43e
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/CellValue.php
@@ -0,0 +1,186 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\Wizard;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Style\Conditional;
+use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\CellMatcher;
+use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\Wizard;
+
+/**
+ * @method CellValue equals($value, string $operandValueType = Wizard::VALUE_TYPE_LITERAL)
+ * @method CellValue notEquals($value, string $operandValueType = Wizard::VALUE_TYPE_LITERAL)
+ * @method CellValue greaterThan($value, string $operandValueType = Wizard::VALUE_TYPE_LITERAL)
+ * @method CellValue greaterThanOrEqual($value, string $operandValueType = Wizard::VALUE_TYPE_LITERAL)
+ * @method CellValue lessThan($value, string $operandValueType = Wizard::VALUE_TYPE_LITERAL)
+ * @method CellValue lessThanOrEqual($value, string $operandValueType = Wizard::VALUE_TYPE_LITERAL)
+ * @method CellValue between($value, string $operandValueType = Wizard::VALUE_TYPE_LITERAL)
+ * @method CellValue notBetween($value, string $operandValueType = Wizard::VALUE_TYPE_LITERAL)
+ * @method CellValue and($value, string $operandValueType = Wizard::VALUE_TYPE_LITERAL)
+ */
+class CellValue extends WizardAbstract implements WizardInterface
+{
+    protected const MAGIC_OPERATIONS = [
+        'equals' => Conditional::OPERATOR_EQUAL,
+        'notEquals' => Conditional::OPERATOR_NOTEQUAL,
+        'greaterThan' => Conditional::OPERATOR_GREATERTHAN,
+        'greaterThanOrEqual' => Conditional::OPERATOR_GREATERTHANOREQUAL,
+        'lessThan' => Conditional::OPERATOR_LESSTHAN,
+        'lessThanOrEqual' => Conditional::OPERATOR_LESSTHANOREQUAL,
+        'between' => Conditional::OPERATOR_BETWEEN,
+        'notBetween' => Conditional::OPERATOR_NOTBETWEEN,
+    ];
+
+    protected const SINGLE_OPERATORS = CellMatcher::COMPARISON_OPERATORS;
+
+    protected const RANGE_OPERATORS = CellMatcher::COMPARISON_RANGE_OPERATORS;
+
+    protected string $operator = Conditional::OPERATOR_EQUAL;
+
+    protected array $operand = [0];
+
+    /**
+     * @var string[]
+     */
+    protected array $operandValueType = [];
+
+    public function __construct(string $cellRange)
+    {
+        parent::__construct($cellRange);
+    }
+
+    protected function operator(string $operator): void
+    {
+        if ((!isset(self::SINGLE_OPERATORS[$operator])) && (!isset(self::RANGE_OPERATORS[$operator]))) {
+            throw new Exception('Invalid Operator for Cell Value CF Rule Wizard');
+        }
+
+        $this->operator = $operator;
+    }
+
+    protected function operand(int $index, mixed $operand, string $operandValueType = Wizard::VALUE_TYPE_LITERAL): void
+    {
+        if (is_string($operand)) {
+            $operand = $this->validateOperand($operand, $operandValueType);
+        }
+
+        $this->operand[$index] = $operand;
+        $this->operandValueType[$index] = $operandValueType;
+    }
+
+    /** @param null|bool|float|int|string $value value to be wrapped */
+    protected function wrapValue(mixed $value, string $operandValueType): float|int|string
+    {
+        if (!is_numeric($value) && !is_bool($value) && null !== $value) {
+            if ($operandValueType === Wizard::VALUE_TYPE_LITERAL) {
+                return '"' . str_replace('"', '""', $value) . '"';
+            }
+
+            return $this->cellConditionCheck($value);
+        }
+
+        if (null === $value) {
+            $value = 'NULL';
+        } elseif (is_bool($value)) {
+            $value = $value ? 'TRUE' : 'FALSE';
+        }
+
+        return $value;
+    }
+
+    public function getConditional(): Conditional
+    {
+        if (!isset(self::RANGE_OPERATORS[$this->operator])) {
+            unset($this->operand[1], $this->operandValueType[1]);
+        }
+        $values = array_map([$this, 'wrapValue'], $this->operand, $this->operandValueType);
+
+        $conditional = new Conditional();
+        $conditional->setConditionType(Conditional::CONDITION_CELLIS);
+        $conditional->setOperatorType($this->operator);
+        $conditional->setConditions($values);
+        $conditional->setStyle($this->getStyle());
+        $conditional->setStopIfTrue($this->getStopIfTrue());
+
+        return $conditional;
+    }
+
+    protected static function unwrapString(string $condition): string
+    {
+        if ((str_starts_with($condition, '"')) && (str_starts_with(strrev($condition), '"'))) {
+            $condition = substr($condition, 1, -1);
+        }
+
+        return str_replace('""', '"', $condition);
+    }
+
+    public static function fromConditional(Conditional $conditional, string $cellRange = 'A1'): WizardInterface
+    {
+        if ($conditional->getConditionType() !== Conditional::CONDITION_CELLIS) {
+            throw new Exception('Conditional is not a Cell Value CF Rule conditional');
+        }
+
+        $wizard = new self($cellRange);
+        $wizard->style = $conditional->getStyle();
+        $wizard->stopIfTrue = $conditional->getStopIfTrue();
+
+        $wizard->operator = $conditional->getOperatorType();
+        $conditions = $conditional->getConditions();
+        foreach ($conditions as $index => $condition) {
+            // Best-guess to try and identify if the text is a string literal, a cell reference or a formula?
+            $operandValueType = Wizard::VALUE_TYPE_LITERAL;
+            if (is_string($condition)) {
+                if (Calculation::keyInExcelConstants($condition)) {
+                    $condition = Calculation::getExcelConstants($condition);
+                } elseif (preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF_RELATIVE . '$/i', $condition)) {
+                    $operandValueType = Wizard::VALUE_TYPE_CELL;
+                    $condition = self::reverseAdjustCellRef($condition, $cellRange);
+                } elseif (
+                    preg_match('/\(\)/', $condition)
+                    || preg_match('/' . Calculation::CALCULATION_REGEXP_CELLREF_RELATIVE . '/i', $condition)
+                ) {
+                    $operandValueType = Wizard::VALUE_TYPE_FORMULA;
+                    $condition = self::reverseAdjustCellRef($condition, $cellRange);
+                } else {
+                    $condition = self::unwrapString($condition);
+                }
+            }
+            $wizard->operand($index, $condition, $operandValueType);
+        }
+
+        return $wizard;
+    }
+
+    /**
+     * @param mixed[] $arguments
+     */
+    public function __call(string $methodName, array $arguments): self
+    {
+        if (!isset(self::MAGIC_OPERATIONS[$methodName]) && $methodName !== 'and') {
+            throw new Exception('Invalid Operator for Cell Value CF Rule Wizard');
+        }
+
+        if ($methodName === 'and') {
+            if (!isset(self::RANGE_OPERATORS[$this->operator])) {
+                throw new Exception('AND Value is only appropriate for range operators');
+            }
+
+            $this->operand(1, ...$arguments);
+
+            return $this;
+        }
+
+        $this->operator(self::MAGIC_OPERATIONS[$methodName]);
+        //$this->operand(0, ...$arguments);
+        if (count($arguments) < 2) {
+            $this->operand(0, $arguments[0]);
+        } else {
+            /** @var string */
+            $arg1 = $arguments[1];
+            $this->operand(0, $arguments[0], $arg1);
+        }
+
+        return $this;
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/DateValue.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/DateValue.php
new file mode 100644
index 0000000000..23477e9c9a
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/DateValue.php
@@ -0,0 +1,109 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\Wizard;
+
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Style\Conditional;
+
+/**
+ * @method DateValue yesterday()
+ * @method DateValue today()
+ * @method DateValue tomorrow()
+ * @method DateValue lastSevenDays()
+ * @method DateValue lastWeek()
+ * @method DateValue thisWeek()
+ * @method DateValue nextWeek()
+ * @method DateValue lastMonth()
+ * @method DateValue thisMonth()
+ * @method DateValue nextMonth()
+ */
+class DateValue extends WizardAbstract implements WizardInterface
+{
+    protected const MAGIC_OPERATIONS = [
+        'yesterday' => Conditional::TIMEPERIOD_YESTERDAY,
+        'today' => Conditional::TIMEPERIOD_TODAY,
+        'tomorrow' => Conditional::TIMEPERIOD_TOMORROW,
+        'lastSevenDays' => Conditional::TIMEPERIOD_LAST_7_DAYS,
+        'last7Days' => Conditional::TIMEPERIOD_LAST_7_DAYS,
+        'lastWeek' => Conditional::TIMEPERIOD_LAST_WEEK,
+        'thisWeek' => Conditional::TIMEPERIOD_THIS_WEEK,
+        'nextWeek' => Conditional::TIMEPERIOD_NEXT_WEEK,
+        'lastMonth' => Conditional::TIMEPERIOD_LAST_MONTH,
+        'thisMonth' => Conditional::TIMEPERIOD_THIS_MONTH,
+        'nextMonth' => Conditional::TIMEPERIOD_NEXT_MONTH,
+    ];
+
+    protected const EXPRESSIONS = [
+        Conditional::TIMEPERIOD_YESTERDAY => 'FLOOR(%s,1)=TODAY()-1',
+        Conditional::TIMEPERIOD_TODAY => 'FLOOR(%s,1)=TODAY()',
+        Conditional::TIMEPERIOD_TOMORROW => 'FLOOR(%s,1)=TODAY()+1',
+        Conditional::TIMEPERIOD_LAST_7_DAYS => 'AND(TODAY()-FLOOR(%s,1)<=6,FLOOR(%s,1)<=TODAY())',
+        Conditional::TIMEPERIOD_LAST_WEEK => 'AND(TODAY()-ROUNDDOWN(%s,0)>=(WEEKDAY(TODAY())),TODAY()-ROUNDDOWN(%s,0)<(WEEKDAY(TODAY())+7))',
+        Conditional::TIMEPERIOD_THIS_WEEK => 'AND(TODAY()-ROUNDDOWN(%s,0)<=WEEKDAY(TODAY())-1,ROUNDDOWN(%s,0)-TODAY()<=7-WEEKDAY(TODAY()))',
+        Conditional::TIMEPERIOD_NEXT_WEEK => 'AND(ROUNDDOWN(%s,0)-TODAY()>(7-WEEKDAY(TODAY())),ROUNDDOWN(%s,0)-TODAY()<(15-WEEKDAY(TODAY())))',
+        Conditional::TIMEPERIOD_LAST_MONTH => 'AND(MONTH(%s)=MONTH(EDATE(TODAY(),0-1)),YEAR(%s)=YEAR(EDATE(TODAY(),0-1)))',
+        Conditional::TIMEPERIOD_THIS_MONTH => 'AND(MONTH(%s)=MONTH(TODAY()),YEAR(%s)=YEAR(TODAY()))',
+        Conditional::TIMEPERIOD_NEXT_MONTH => 'AND(MONTH(%s)=MONTH(EDATE(TODAY(),0+1)),YEAR(%s)=YEAR(EDATE(TODAY(),0+1)))',
+    ];
+
+    protected string $operator;
+
+    public function __construct(string $cellRange)
+    {
+        parent::__construct($cellRange);
+    }
+
+    protected function operator(string $operator): void
+    {
+        $this->operator = $operator;
+    }
+
+    protected function setExpression(): void
+    {
+        $referenceCount = substr_count(self::EXPRESSIONS[$this->operator], '%s');
+        $references = array_fill(0, $referenceCount, $this->referenceCell);
+        $this->expression = sprintf(self::EXPRESSIONS[$this->operator], ...$references);
+    }
+
+    public function getConditional(): Conditional
+    {
+        $this->setExpression();
+
+        $conditional = new Conditional();
+        $conditional->setConditionType(Conditional::CONDITION_TIMEPERIOD);
+        $conditional->setText($this->operator);
+        $conditional->setConditions([$this->expression]);
+        $conditional->setStyle($this->getStyle());
+        $conditional->setStopIfTrue($this->getStopIfTrue());
+
+        return $conditional;
+    }
+
+    public static function fromConditional(Conditional $conditional, string $cellRange = 'A1'): WizardInterface
+    {
+        if ($conditional->getConditionType() !== Conditional::CONDITION_TIMEPERIOD) {
+            throw new Exception('Conditional is not a Date Value CF Rule conditional');
+        }
+
+        $wizard = new self($cellRange);
+        $wizard->style = $conditional->getStyle();
+        $wizard->stopIfTrue = $conditional->getStopIfTrue();
+        $wizard->operator = $conditional->getText();
+
+        return $wizard;
+    }
+
+    /**
+     * @param mixed[] $arguments
+     */
+    public function __call(string $methodName, array $arguments): self
+    {
+        if (!isset(self::MAGIC_OPERATIONS[$methodName])) {
+            throw new Exception('Invalid Operation for Date Value CF Rule Wizard');
+        }
+
+        $this->operator(self::MAGIC_OPERATIONS[$methodName]);
+
+        return $this;
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/Duplicates.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/Duplicates.php
new file mode 100644
index 0000000000..0fbeddbbea
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/Duplicates.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\Wizard;
+
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Style\Conditional;
+
+/**
+ * @method Errors duplicates()
+ * @method Errors unique()
+ */
+class Duplicates extends WizardAbstract implements WizardInterface
+{
+    protected const OPERATORS = [
+        'duplicates' => false,
+        'unique' => true,
+    ];
+
+    protected bool $inverse;
+
+    public function __construct(string $cellRange, bool $inverse = false)
+    {
+        parent::__construct($cellRange);
+        $this->inverse = $inverse;
+    }
+
+    protected function inverse(bool $inverse): void
+    {
+        $this->inverse = $inverse;
+    }
+
+    public function getConditional(): Conditional
+    {
+        $conditional = new Conditional();
+        $conditional->setConditionType(
+            $this->inverse ? Conditional::CONDITION_UNIQUE : Conditional::CONDITION_DUPLICATES
+        );
+        $conditional->setStyle($this->getStyle());
+        $conditional->setStopIfTrue($this->getStopIfTrue());
+
+        return $conditional;
+    }
+
+    public static function fromConditional(Conditional $conditional, string $cellRange = 'A1'): WizardInterface
+    {
+        if (
+            $conditional->getConditionType() !== Conditional::CONDITION_DUPLICATES
+            && $conditional->getConditionType() !== Conditional::CONDITION_UNIQUE
+        ) {
+            throw new Exception('Conditional is not a Duplicates CF Rule conditional');
+        }
+
+        $wizard = new self($cellRange);
+        $wizard->style = $conditional->getStyle();
+        $wizard->stopIfTrue = $conditional->getStopIfTrue();
+        $wizard->inverse = $conditional->getConditionType() === Conditional::CONDITION_UNIQUE;
+
+        return $wizard;
+    }
+
+    /**
+     * @param mixed[] $arguments
+     */
+    public function __call(string $methodName, array $arguments): self
+    {
+        if (!array_key_exists($methodName, self::OPERATORS)) {
+            throw new Exception('Invalid Operation for Errors CF Rule Wizard');
+        }
+
+        $this->inverse(self::OPERATORS[$methodName]);
+
+        return $this;
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/Errors.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/Errors.php
new file mode 100644
index 0000000000..03a2381dc2
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/Errors.php
@@ -0,0 +1,91 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\Wizard;
+
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Style\Conditional;
+use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\Wizard;
+
+/**
+ * @method Errors notError()
+ * @method Errors isError()
+ */
+class Errors extends WizardAbstract implements WizardInterface
+{
+    protected const OPERATORS = [
+        'notError' => false,
+        'isError' => true,
+    ];
+
+    protected const EXPRESSIONS = [
+        Wizard::NOT_ERRORS => 'NOT(ISERROR(%s))',
+        Wizard::ERRORS => 'ISERROR(%s)',
+    ];
+
+    protected bool $inverse;
+
+    public function __construct(string $cellRange, bool $inverse = false)
+    {
+        parent::__construct($cellRange);
+        $this->inverse = $inverse;
+    }
+
+    protected function inverse(bool $inverse): void
+    {
+        $this->inverse = $inverse;
+    }
+
+    protected function getExpression(): void
+    {
+        $this->expression = sprintf(
+            self::EXPRESSIONS[$this->inverse ? Wizard::ERRORS : Wizard::NOT_ERRORS],
+            $this->referenceCell
+        );
+    }
+
+    public function getConditional(): Conditional
+    {
+        $this->getExpression();
+
+        $conditional = new Conditional();
+        $conditional->setConditionType(
+            $this->inverse ? Conditional::CONDITION_CONTAINSERRORS : Conditional::CONDITION_NOTCONTAINSERRORS
+        );
+        $conditional->setConditions([$this->expression]);
+        $conditional->setStyle($this->getStyle());
+        $conditional->setStopIfTrue($this->getStopIfTrue());
+
+        return $conditional;
+    }
+
+    public static function fromConditional(Conditional $conditional, string $cellRange = 'A1'): WizardInterface
+    {
+        if (
+            $conditional->getConditionType() !== Conditional::CONDITION_CONTAINSERRORS
+            && $conditional->getConditionType() !== Conditional::CONDITION_NOTCONTAINSERRORS
+        ) {
+            throw new Exception('Conditional is not an Errors CF Rule conditional');
+        }
+
+        $wizard = new self($cellRange);
+        $wizard->style = $conditional->getStyle();
+        $wizard->stopIfTrue = $conditional->getStopIfTrue();
+        $wizard->inverse = $conditional->getConditionType() === Conditional::CONDITION_CONTAINSERRORS;
+
+        return $wizard;
+    }
+
+    /**
+     * @param mixed[] $arguments
+     */
+    public function __call(string $methodName, array $arguments): self
+    {
+        if (!array_key_exists($methodName, self::OPERATORS)) {
+            throw new Exception('Invalid Operation for Errors CF Rule Wizard');
+        }
+
+        $this->inverse(self::OPERATORS[$methodName]);
+
+        return $this;
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/Expression.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/Expression.php
new file mode 100644
index 0000000000..3f95441150
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/Expression.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\Wizard;
+
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Style\Conditional;
+use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\Wizard;
+
+/**
+ * @method Expression formula(string $expression)
+ */
+class Expression extends WizardAbstract implements WizardInterface
+{
+    protected string $expression;
+
+    public function __construct(string $cellRange)
+    {
+        parent::__construct($cellRange);
+    }
+
+    public function expression(string $expression): self
+    {
+        $expression = $this->validateOperand($expression, Wizard::VALUE_TYPE_FORMULA);
+        $this->expression = $expression;
+
+        return $this;
+    }
+
+    public function getConditional(): Conditional
+    {
+        $expression = $this->adjustConditionsForCellReferences([$this->expression]);
+
+        $conditional = new Conditional();
+        $conditional->setConditionType(Conditional::CONDITION_EXPRESSION);
+        $conditional->setConditions($expression);
+        $conditional->setStyle($this->getStyle());
+        $conditional->setStopIfTrue($this->getStopIfTrue());
+
+        return $conditional;
+    }
+
+    public static function fromConditional(Conditional $conditional, string $cellRange = 'A1'): WizardInterface
+    {
+        if ($conditional->getConditionType() !== Conditional::CONDITION_EXPRESSION) {
+            throw new Exception('Conditional is not an Expression CF Rule conditional');
+        }
+
+        $wizard = new self($cellRange);
+        $wizard->style = $conditional->getStyle();
+        $wizard->stopIfTrue = $conditional->getStopIfTrue();
+        $wizard->expression = self::reverseAdjustCellRef((string) ($conditional->getConditions()[0]), $cellRange);
+
+        return $wizard;
+    }
+
+    /**
+     * @param string[] $arguments
+     */
+    public function __call(string $methodName, array $arguments): self
+    {
+        if ($methodName !== 'formula') {
+            throw new Exception('Invalid Operation for Expression CF Rule Wizard');
+        }
+
+        $this->expression(...$arguments);
+
+        return $this;
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/TextValue.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/TextValue.php
new file mode 100644
index 0000000000..b25c4f4298
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/TextValue.php
@@ -0,0 +1,164 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\Wizard;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Style\Conditional;
+use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\Wizard;
+
+/**
+ * @method TextValue contains(string $value, string $operandValueType = Wizard::VALUE_TYPE_LITERAL)
+ * @method TextValue doesNotContain(string $value, string $operandValueType = Wizard::VALUE_TYPE_LITERAL)
+ * @method TextValue doesntContain(string $value, string $operandValueType = Wizard::VALUE_TYPE_LITERAL)
+ * @method TextValue beginsWith(string $value, string $operandValueType = Wizard::VALUE_TYPE_LITERAL)
+ * @method TextValue startsWith(string $value, string $operandValueType = Wizard::VALUE_TYPE_LITERAL)
+ * @method TextValue endsWith(string $value, string $operandValueType = Wizard::VALUE_TYPE_LITERAL)
+ */
+class TextValue extends WizardAbstract implements WizardInterface
+{
+    protected const MAGIC_OPERATIONS = [
+        'contains' => Conditional::OPERATOR_CONTAINSTEXT,
+        'doesntContain' => Conditional::OPERATOR_NOTCONTAINS,
+        'doesNotContain' => Conditional::OPERATOR_NOTCONTAINS,
+        'beginsWith' => Conditional::OPERATOR_BEGINSWITH,
+        'startsWith' => Conditional::OPERATOR_BEGINSWITH,
+        'endsWith' => Conditional::OPERATOR_ENDSWITH,
+    ];
+
+    protected const OPERATORS = [
+        Conditional::OPERATOR_CONTAINSTEXT => Conditional::CONDITION_CONTAINSTEXT,
+        Conditional::OPERATOR_NOTCONTAINS => Conditional::CONDITION_NOTCONTAINSTEXT,
+        Conditional::OPERATOR_BEGINSWITH => Conditional::CONDITION_BEGINSWITH,
+        Conditional::OPERATOR_ENDSWITH => Conditional::CONDITION_ENDSWITH,
+    ];
+
+    protected const EXPRESSIONS = [
+        Conditional::OPERATOR_CONTAINSTEXT => 'NOT(ISERROR(SEARCH(%s,%s)))',
+        Conditional::OPERATOR_NOTCONTAINS => 'ISERROR(SEARCH(%s,%s))',
+        Conditional::OPERATOR_BEGINSWITH => 'LEFT(%s,LEN(%s))=%s',
+        Conditional::OPERATOR_ENDSWITH => 'RIGHT(%s,LEN(%s))=%s',
+    ];
+
+    protected string $operator;
+
+    protected string $operand;
+
+    protected string $operandValueType;
+
+    public function __construct(string $cellRange)
+    {
+        parent::__construct($cellRange);
+    }
+
+    protected function operator(string $operator): void
+    {
+        if (!isset(self::OPERATORS[$operator])) {
+            throw new Exception('Invalid Operator for Text Value CF Rule Wizard');
+        }
+
+        $this->operator = $operator;
+    }
+
+    protected function operand(string $operand, string $operandValueType = Wizard::VALUE_TYPE_LITERAL): void
+    {
+        $operand = $this->validateOperand($operand, $operandValueType);
+
+        $this->operand = $operand;
+        $this->operandValueType = $operandValueType;
+    }
+
+    protected function wrapValue(string $value): string
+    {
+        return '"' . $value . '"';
+    }
+
+    protected function setExpression(): void
+    {
+        $operand = $this->operandValueType === Wizard::VALUE_TYPE_LITERAL
+            ? $this->wrapValue(str_replace('"', '""', $this->operand))
+            : $this->cellConditionCheck($this->operand);
+
+        if (
+            $this->operator === Conditional::OPERATOR_CONTAINSTEXT
+            || $this->operator === Conditional::OPERATOR_NOTCONTAINS
+        ) {
+            $this->expression = sprintf(self::EXPRESSIONS[$this->operator], $operand, $this->referenceCell);
+        } else {
+            $this->expression = sprintf(self::EXPRESSIONS[$this->operator], $this->referenceCell, $operand, $operand);
+        }
+    }
+
+    public function getConditional(): Conditional
+    {
+        $this->setExpression();
+
+        $conditional = new Conditional();
+        $conditional->setConditionType(self::OPERATORS[$this->operator]);
+        $conditional->setOperatorType($this->operator);
+        $conditional->setText(
+            $this->operandValueType !== Wizard::VALUE_TYPE_LITERAL
+                ? $this->cellConditionCheck($this->operand)
+                : $this->operand
+        );
+        $conditional->setConditions([$this->expression]);
+        $conditional->setStyle($this->getStyle());
+        $conditional->setStopIfTrue($this->getStopIfTrue());
+
+        return $conditional;
+    }
+
+    public static function fromConditional(Conditional $conditional, string $cellRange = 'A1'): WizardInterface
+    {
+        if (!in_array($conditional->getConditionType(), self::OPERATORS, true)) {
+            throw new Exception('Conditional is not a Text Value CF Rule conditional');
+        }
+
+        $wizard = new self($cellRange);
+        $wizard->operator = (string) array_search($conditional->getConditionType(), self::OPERATORS, true);
+        $wizard->style = $conditional->getStyle();
+        $wizard->stopIfTrue = $conditional->getStopIfTrue();
+
+        // Best-guess to try and identify if the text is a string literal, a cell reference or a formula?
+        $wizard->operandValueType = Wizard::VALUE_TYPE_LITERAL;
+        $condition = $conditional->getText();
+        if (preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF_RELATIVE . '$/i', $condition)) {
+            $wizard->operandValueType = Wizard::VALUE_TYPE_CELL;
+            $condition = self::reverseAdjustCellRef($condition, $cellRange);
+        } elseif (
+            preg_match('/\(\)/', $condition)
+            || preg_match('/' . Calculation::CALCULATION_REGEXP_CELLREF_RELATIVE . '/i', $condition)
+        ) {
+            $wizard->operandValueType = Wizard::VALUE_TYPE_FORMULA;
+        }
+        $wizard->operand = $condition;
+
+        return $wizard;
+    }
+
+    /**
+     * @param mixed[] $arguments
+     */
+    public function __call(string $methodName, array $arguments): self
+    {
+        if (!isset(self::MAGIC_OPERATIONS[$methodName])) {
+            throw new Exception('Invalid Operation for Text Value CF Rule Wizard');
+        }
+
+        $this->operator(self::MAGIC_OPERATIONS[$methodName]);
+        //$this->operand(...$arguments);
+        if (count($arguments) < 2) {
+            /** @var string */
+            $arg0 = $arguments[0];
+            $this->operand($arg0);
+        } else {
+            /** @var string */
+            $arg0 = $arguments[0];
+            /** @var string */
+            $arg1 = $arguments[1];
+            $this->operand($arg0, $arg1);
+        }
+
+        return $this;
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/WizardAbstract.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/WizardAbstract.php
new file mode 100644
index 0000000000..953a55934c
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/WizardAbstract.php
@@ -0,0 +1,176 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\Wizard;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\Wizard;
+use PhpOffice\PhpSpreadsheet\Style\Style;
+
+abstract class WizardAbstract
+{
+    protected ?Style $style = null;
+
+    protected string $expression;
+
+    protected string $cellRange;
+
+    protected string $referenceCell;
+
+    protected int $referenceRow;
+
+    protected bool $stopIfTrue = false;
+
+    protected int $referenceColumn;
+
+    public function __construct(string $cellRange)
+    {
+        $this->setCellRange($cellRange);
+    }
+
+    public function getCellRange(): string
+    {
+        return $this->cellRange;
+    }
+
+    public function setCellRange(string $cellRange): void
+    {
+        $this->cellRange = $cellRange;
+        $this->setReferenceCellForExpressions($cellRange);
+    }
+
+    protected function setReferenceCellForExpressions(string $conditionalRange): void
+    {
+        $conditionalRange = Coordinate::splitRange(str_replace('$', '', strtoupper($conditionalRange)));
+        [$this->referenceCell] = $conditionalRange[0];
+
+        [$this->referenceColumn, $this->referenceRow] = Coordinate::indexesFromString($this->referenceCell);
+    }
+
+    public function getStopIfTrue(): bool
+    {
+        return $this->stopIfTrue;
+    }
+
+    public function setStopIfTrue(bool $stopIfTrue): void
+    {
+        $this->stopIfTrue = $stopIfTrue;
+    }
+
+    public function getStyle(): Style
+    {
+        return $this->style ?? new Style(false, true);
+    }
+
+    public function setStyle(Style $style): void
+    {
+        $this->style = $style;
+    }
+
+    protected function validateOperand(string $operand, string $operandValueType = Wizard::VALUE_TYPE_LITERAL): string
+    {
+        if (
+            $operandValueType === Wizard::VALUE_TYPE_LITERAL
+            && str_starts_with($operand, '"')
+            && str_ends_with($operand, '"')
+        ) {
+            $operand = str_replace('""', '"', substr($operand, 1, -1));
+        } elseif ($operandValueType === Wizard::VALUE_TYPE_FORMULA && str_starts_with($operand, '=')) {
+            $operand = substr($operand, 1);
+        }
+
+        return $operand;
+    }
+
+    protected static function reverseCellAdjustment(array $matches, int $referenceColumn, int $referenceRow): string
+    {
+        $worksheet = $matches[1];
+        $column = $matches[6];
+        $row = $matches[7];
+
+        if (!str_contains($column, '$')) {
+            $column = Coordinate::columnIndexFromString($column);
+            $column -= $referenceColumn - 1;
+            $column = Coordinate::stringFromColumnIndex($column);
+        }
+
+        if (!str_contains($row, '$')) {
+            $row -= $referenceRow - 1;
+        }
+
+        return "{$worksheet}{$column}{$row}";
+    }
+
+    public static function reverseAdjustCellRef(string $condition, string $cellRange): string
+    {
+        $conditionalRange = Coordinate::splitRange(str_replace('$', '', strtoupper($cellRange)));
+        [$referenceCell] = $conditionalRange[0];
+        [$referenceColumnIndex, $referenceRow] = Coordinate::indexesFromString($referenceCell);
+
+        $splitCondition = explode(Calculation::FORMULA_STRING_QUOTE, $condition);
+        $i = false;
+        foreach ($splitCondition as &$value) {
+            //    Only count/replace in alternating array entries (ie. not in quoted strings)
+            $i = $i === false;
+            if ($i) {
+                $value = (string) preg_replace_callback(
+                    '/' . Calculation::CALCULATION_REGEXP_CELLREF_RELATIVE . '/i',
+                    fn ($matches): string => self::reverseCellAdjustment($matches, $referenceColumnIndex, $referenceRow),
+                    $value
+                );
+            }
+        }
+        unset($value);
+
+        //    Then rebuild the condition string to return it
+        return implode(Calculation::FORMULA_STRING_QUOTE, $splitCondition);
+    }
+
+    protected function conditionCellAdjustment(array $matches): string
+    {
+        $worksheet = $matches[1];
+        $column = $matches[6];
+        $row = $matches[7];
+
+        if (!str_contains($column, '$')) {
+            $column = Coordinate::columnIndexFromString($column);
+            $column += $this->referenceColumn - 1;
+            $column = Coordinate::stringFromColumnIndex($column);
+        }
+
+        if (!str_contains($row, '$')) {
+            $row += $this->referenceRow - 1;
+        }
+
+        return "{$worksheet}{$column}{$row}";
+    }
+
+    protected function cellConditionCheck(string $condition): string
+    {
+        $splitCondition = explode(Calculation::FORMULA_STRING_QUOTE, $condition);
+        $i = false;
+        foreach ($splitCondition as &$value) {
+            //    Only count/replace in alternating array entries (ie. not in quoted strings)
+            $i = $i === false;
+            if ($i) {
+                $value = (string) preg_replace_callback(
+                    '/' . Calculation::CALCULATION_REGEXP_CELLREF_RELATIVE . '/i',
+                    [$this, 'conditionCellAdjustment'],
+                    $value
+                );
+            }
+        }
+        unset($value);
+
+        //    Then rebuild the condition string to return it
+        return implode(Calculation::FORMULA_STRING_QUOTE, $splitCondition);
+    }
+
+    protected function adjustConditionsForCellReferences(array $conditions): array
+    {
+        return array_map(
+            [$this, 'cellConditionCheck'],
+            $conditions
+        );
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/WizardInterface.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/WizardInterface.php
new file mode 100644
index 0000000000..10ad57b20e
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/WizardInterface.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\Wizard;
+
+use PhpOffice\PhpSpreadsheet\Style\Conditional;
+use PhpOffice\PhpSpreadsheet\Style\Style;
+
+interface WizardInterface
+{
+    public function getCellRange(): string;
+
+    public function setCellRange(string $cellRange): void;
+
+    public function getStyle(): Style;
+
+    public function setStyle(Style $style): void;
+
+    public function getStopIfTrue(): bool;
+
+    public function setStopIfTrue(bool $stopIfTrue): void;
+
+    public function getConditional(): Conditional;
+
+    public static function fromConditional(Conditional $conditional, string $cellRange = 'A1'): self;
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Fill.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Fill.php
index e793f1e70d..9ec5d7336e 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Fill.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Fill.php
@@ -27,43 +27,31 @@ class Fill extends Supervisor
     const FILL_PATTERN_LIGHTVERTICAL = 'lightVertical';
     const FILL_PATTERN_MEDIUMGRAY = 'mediumGray';
 
-    /**
-     * @var null|int
-     */
-    public $startcolorIndex;
+    public ?int $startcolorIndex = null;
 
-    /**
-     * @var null|int
-     */
-    public $endcolorIndex;
+    public ?int $endcolorIndex = null;
 
     /**
      * Fill type.
-     *
-     * @var null|string
      */
-    protected $fillType = self::FILL_NONE;
+    protected ?string $fillType = self::FILL_NONE;
 
     /**
      * Rotation.
-     *
-     * @var float
      */
-    protected $rotation = 0;
+    protected float $rotation = 0.0;
 
     /**
      * Start color.
-     *
-     * @var Color
      */
-    protected $startColor;
+    protected Color $startColor;
 
     /**
      * End color.
-     *
-     * @var Color
      */
-    protected $endColor;
+    protected Color $endColor;
+
+    private bool $colorChanged = false;
 
     /**
      * Create a new Fill.
@@ -75,7 +63,7 @@ class Fill extends Supervisor
      *                                    Leave this value at default unless you understand exactly what
      *                                        its ramifications are
      */
-    public function __construct($isSupervisor = false, $isConditional = false)
+    public function __construct(bool $isSupervisor = false, bool $isConditional = false)
     {
         // Supervisor?
         parent::__construct($isSupervisor);
@@ -97,22 +85,19 @@ public function __construct($isSupervisor = false, $isConditional = false)
     /**
      * Get the shared style component for the currently active cell in currently active sheet.
      * Only used for style supervisor.
-     *
-     * @return Fill
      */
-    public function getSharedComponent()
+    public function getSharedComponent(): self
     {
-        return $this->parent->getSharedComponent()->getFill();
+        /** @var Style $parent */
+        $parent = $this->parent;
+
+        return $parent->getSharedComponent()->getFill();
     }
 
     /**
      * Build style array from subcomponents.
-     *
-     * @param array $array
-     *
-     * @return array
      */
-    public function getStyleArray($array)
+    public function getStyleArray(array $array): array
     {
         return ['fill' => $array];
     }
@@ -124,7 +109,7 @@ public function getStyleArray($array)
      * $spreadsheet->getActiveSheet()->getStyle('B2')->getFill()->applyFromArray(
      *     [
      *         'fillType' => Fill::FILL_GRADIENT_LINEAR,
-     *         'rotation' => 0,
+     *         'rotation' => 0.0,
      *         'startColor' => [
      *             'rgb' => '000000'
      *         ],
@@ -135,30 +120,30 @@ public function getStyleArray($array)
      * );
      * </code>
      *
-     * @param array $pStyles Array containing style information
+     * @param array $styleArray Array containing style information
      *
      * @return $this
      */
-    public function applyFromArray(array $pStyles)
+    public function applyFromArray(array $styleArray): static
     {
         if ($this->isSupervisor) {
-            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($pStyles));
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($styleArray));
         } else {
-            if (isset($pStyles['fillType'])) {
-                $this->setFillType($pStyles['fillType']);
+            if (isset($styleArray['fillType'])) {
+                $this->setFillType($styleArray['fillType']);
             }
-            if (isset($pStyles['rotation'])) {
-                $this->setRotation($pStyles['rotation']);
+            if (isset($styleArray['rotation'])) {
+                $this->setRotation($styleArray['rotation']);
             }
-            if (isset($pStyles['startColor'])) {
-                $this->getStartColor()->applyFromArray($pStyles['startColor']);
+            if (isset($styleArray['startColor'])) {
+                $this->getStartColor()->applyFromArray($styleArray['startColor']);
             }
-            if (isset($pStyles['endColor'])) {
-                $this->getEndColor()->applyFromArray($pStyles['endColor']);
+            if (isset($styleArray['endColor'])) {
+                $this->getEndColor()->applyFromArray($styleArray['endColor']);
             }
-            if (isset($pStyles['color'])) {
-                $this->getStartColor()->applyFromArray($pStyles['color']);
-                $this->getEndColor()->applyFromArray($pStyles['color']);
+            if (isset($styleArray['color'])) {
+                $this->getStartColor()->applyFromArray($styleArray['color']);
+                $this->getEndColor()->applyFromArray($styleArray['color']);
             }
         }
 
@@ -167,10 +152,8 @@ public function applyFromArray(array $pStyles)
 
     /**
      * Get Fill Type.
-     *
-     * @return null|string
      */
-    public function getFillType()
+    public function getFillType(): ?string
     {
         if ($this->isSupervisor) {
             return $this->getSharedComponent()->getFillType();
@@ -182,17 +165,17 @@ public function getFillType()
     /**
      * Set Fill Type.
      *
-     * @param string $pValue Fill type, see self::FILL_*
+     * @param string $fillType Fill type, see self::FILL_*
      *
      * @return $this
      */
-    public function setFillType($pValue)
+    public function setFillType(string $fillType): static
     {
         if ($this->isSupervisor) {
-            $styleArray = $this->getStyleArray(['fillType' => $pValue]);
+            $styleArray = $this->getStyleArray(['fillType' => $fillType]);
             $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
         } else {
-            $this->fillType = $pValue;
+            $this->fillType = $fillType;
         }
 
         return $this;
@@ -200,10 +183,8 @@ public function setFillType($pValue)
 
     /**
      * Get Rotation.
-     *
-     * @return float
      */
-    public function getRotation()
+    public function getRotation(): float
     {
         if ($this->isSupervisor) {
             return $this->getSharedComponent()->getRotation();
@@ -215,17 +196,15 @@ public function getRotation()
     /**
      * Set Rotation.
      *
-     * @param float $pValue
-     *
      * @return $this
      */
-    public function setRotation($pValue)
+    public function setRotation(float $angleInDegrees): static
     {
         if ($this->isSupervisor) {
-            $styleArray = $this->getStyleArray(['rotation' => $pValue]);
+            $styleArray = $this->getStyleArray(['rotation' => $angleInDegrees]);
             $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
         } else {
-            $this->rotation = $pValue;
+            $this->rotation = $angleInDegrees;
         }
 
         return $this;
@@ -233,10 +212,8 @@ public function setRotation($pValue)
 
     /**
      * Get Start Color.
-     *
-     * @return Color
      */
-    public function getStartColor()
+    public function getStartColor(): Color
     {
         return $this->startColor;
     }
@@ -246,10 +223,11 @@ public function getStartColor()
      *
      * @return $this
      */
-    public function setStartColor(Color $pValue)
+    public function setStartColor(Color $color): static
     {
+        $this->colorChanged = true;
         // make sure parameter is a real color and not a supervisor
-        $color = $pValue->getIsSupervisor() ? $pValue->getSharedComponent() : $pValue;
+        $color = $color->getIsSupervisor() ? $color->getSharedComponent() : $color;
 
         if ($this->isSupervisor) {
             $styleArray = $this->getStartColor()->getStyleArray(['argb' => $color->getARGB()]);
@@ -263,10 +241,8 @@ public function setStartColor(Color $pValue)
 
     /**
      * Get End Color.
-     *
-     * @return Color
      */
-    public function getEndColor()
+    public function getEndColor(): Color
     {
         return $this->endColor;
     }
@@ -276,10 +252,11 @@ public function getEndColor()
      *
      * @return $this
      */
-    public function setEndColor(Color $pValue)
+    public function setEndColor(Color $color): static
     {
+        $this->colorChanged = true;
         // make sure parameter is a real color and not a supervisor
-        $color = $pValue->getIsSupervisor() ? $pValue->getSharedComponent() : $pValue;
+        $color = $color->getIsSupervisor() ? $color->getSharedComponent() : $color;
 
         if ($this->isSupervisor) {
             $styleArray = $this->getEndColor()->getStyleArray(['argb' => $color->getARGB()]);
@@ -291,34 +268,49 @@ public function setEndColor(Color $pValue)
         return $this;
     }
 
+    public function getColorsChanged(): bool
+    {
+        if ($this->isSupervisor) {
+            $changed = $this->getSharedComponent()->colorChanged;
+        } else {
+            $changed = $this->colorChanged;
+        }
+
+        return $changed || $this->startColor->getHasChanged() || $this->endColor->getHasChanged();
+    }
+
     /**
      * Get hash code.
      *
      * @return string Hash code
      */
-    public function getHashCode()
+    public function getHashCode(): string
     {
         if ($this->isSupervisor) {
             return $this->getSharedComponent()->getHashCode();
         }
+
         // Note that we don't care about colours for fill type NONE, but could have duplicate NONEs with
         //  different hashes if we don't explicitly prevent this
         return md5(
-            $this->getFillType() .
-            $this->getRotation() .
-            ($this->getFillType() !== self::FILL_NONE ? $this->getStartColor()->getHashCode() : '') .
-            ($this->getFillType() !== self::FILL_NONE ? $this->getEndColor()->getHashCode() : '') .
-            __CLASS__
+            $this->getFillType()
+            . $this->getRotation()
+            . ($this->getFillType() !== self::FILL_NONE ? $this->getStartColor()->getHashCode() : '')
+            . ($this->getFillType() !== self::FILL_NONE ? $this->getEndColor()->getHashCode() : '')
+            . ((string) $this->getColorsChanged())
+            . __CLASS__
         );
     }
 
     protected function exportArray1(): array
     {
         $exportedArray = [];
-        $this->exportArray2($exportedArray, 'endColor', $this->getEndColor());
         $this->exportArray2($exportedArray, 'fillType', $this->getFillType());
         $this->exportArray2($exportedArray, 'rotation', $this->getRotation());
-        $this->exportArray2($exportedArray, 'startColor', $this->getStartColor());
+        if ($this->getColorsChanged()) {
+            $this->exportArray2($exportedArray, 'endColor', $this->getEndColor());
+            $this->exportArray2($exportedArray, 'startColor', $this->getStartColor());
+        }
 
         return $exportedArray;
     }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Font.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Font.php
index 5f73c1d312..b96cfca601 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Font.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Font.php
@@ -2,6 +2,8 @@
 
 namespace PhpOffice\PhpSpreadsheet\Style;
 
+use PhpOffice\PhpSpreadsheet\Chart\ChartColor;
+
 class Font extends Supervisor
 {
     // Underline types
@@ -11,73 +13,79 @@ class Font extends Supervisor
     const UNDERLINE_SINGLE = 'single';
     const UNDERLINE_SINGLEACCOUNTING = 'singleAccounting';
 
+    const CAP_ALL = 'all';
+    const CAP_SMALL = 'small';
+    const CAP_NONE = 'none';
+    private const VALID_CAPS = [self::CAP_ALL, self::CAP_SMALL, self::CAP_NONE];
+
+    protected ?string $cap = null;
+
     /**
      * Font Name.
-     *
-     * @var null|string
      */
-    protected $name = 'Calibri';
+    protected ?string $name = 'Calibri';
+
+    /**
+     * The following 7 are used only for chart titles, I think.
+     */
+    private string $latin = '';
+
+    private string $eastAsian = '';
+
+    private string $complexScript = '';
+
+    private int $baseLine = 0;
+
+    private string $strikeType = '';
+
+    private ?ChartColor $underlineColor = null;
+
+    private ?ChartColor $chartColor = null;
+    // end of chart title items
 
     /**
      * Font Size.
-     *
-     * @var null|float
      */
-    protected $size = 11;
+    protected ?float $size = 11;
 
     /**
      * Bold.
-     *
-     * @var null|bool
      */
-    protected $bold = false;
+    protected ?bool $bold = false;
 
     /**
      * Italic.
-     *
-     * @var null|bool
      */
-    protected $italic = false;
+    protected ?bool $italic = false;
 
     /**
      * Superscript.
-     *
-     * @var null|bool
      */
-    protected $superscript = false;
+    protected ?bool $superscript = false;
 
     /**
      * Subscript.
-     *
-     * @var null|bool
      */
-    protected $subscript = false;
+    protected ?bool $subscript = false;
 
     /**
      * Underline.
-     *
-     * @var null|string
      */
-    protected $underline = self::UNDERLINE_NONE;
+    protected ?string $underline = self::UNDERLINE_NONE;
 
     /**
      * Strikethrough.
-     *
-     * @var null|bool
      */
-    protected $strikethrough = false;
+    protected ?bool $strikethrough = false;
 
     /**
      * Foreground color.
-     *
-     * @var Color
      */
-    protected $color;
+    protected Color $color;
 
-    /**
-     * @var null|int
-     */
-    public $colorIndex;
+    public ?int $colorIndex = null;
+
+    protected string $scheme = '';
 
     /**
      * Create a new Font.
@@ -89,7 +97,7 @@ class Font extends Supervisor
      *                                    Leave this value at default unless you understand exactly what
      *                                        its ramifications are
      */
-    public function __construct($isSupervisor = false, $isConditional = false)
+    public function __construct(bool $isSupervisor = false, bool $isConditional = false)
     {
         // Supervisor?
         parent::__construct($isSupervisor);
@@ -117,22 +125,19 @@ public function __construct($isSupervisor = false, $isConditional = false)
     /**
      * Get the shared style component for the currently active cell in currently active sheet.
      * Only used for style supervisor.
-     *
-     * @return Font
      */
-    public function getSharedComponent()
+    public function getSharedComponent(): self
     {
-        return $this->parent->getSharedComponent()->getFont();
+        /** @var Style $parent */
+        $parent = $this->parent;
+
+        return $parent->getSharedComponent()->getFont();
     }
 
     /**
      * Build style array from subcomponents.
-     *
-     * @param array $array
-     *
-     * @return array
      */
-    public function getStyleArray($array)
+    public function getStyleArray(array $array): array
     {
         return ['font' => $array];
     }
@@ -155,41 +160,59 @@ public function getStyleArray($array)
      * );
      * </code>
      *
-     * @param array $pStyles Array containing style information
+     * @param array $styleArray Array containing style information
      *
      * @return $this
      */
-    public function applyFromArray(array $pStyles)
+    public function applyFromArray(array $styleArray): static
     {
         if ($this->isSupervisor) {
-            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($pStyles));
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($styleArray));
         } else {
-            if (isset($pStyles['name'])) {
-                $this->setName($pStyles['name']);
+            if (isset($styleArray['name'])) {
+                $this->setName($styleArray['name']);
+            }
+            if (isset($styleArray['latin'])) {
+                $this->setLatin($styleArray['latin']);
+            }
+            if (isset($styleArray['eastAsian'])) {
+                $this->setEastAsian($styleArray['eastAsian']);
+            }
+            if (isset($styleArray['complexScript'])) {
+                $this->setComplexScript($styleArray['complexScript']);
             }
-            if (isset($pStyles['bold'])) {
-                $this->setBold($pStyles['bold']);
+            if (isset($styleArray['bold'])) {
+                $this->setBold($styleArray['bold']);
             }
-            if (isset($pStyles['italic'])) {
-                $this->setItalic($pStyles['italic']);
+            if (isset($styleArray['italic'])) {
+                $this->setItalic($styleArray['italic']);
             }
-            if (isset($pStyles['superscript'])) {
-                $this->setSuperscript($pStyles['superscript']);
+            if (isset($styleArray['superscript'])) {
+                $this->setSuperscript($styleArray['superscript']);
             }
-            if (isset($pStyles['subscript'])) {
-                $this->setSubscript($pStyles['subscript']);
+            if (isset($styleArray['subscript'])) {
+                $this->setSubscript($styleArray['subscript']);
             }
-            if (isset($pStyles['underline'])) {
-                $this->setUnderline($pStyles['underline']);
+            if (isset($styleArray['underline'])) {
+                $this->setUnderline($styleArray['underline']);
             }
-            if (isset($pStyles['strikethrough'])) {
-                $this->setStrikethrough($pStyles['strikethrough']);
+            if (isset($styleArray['strikethrough'])) {
+                $this->setStrikethrough($styleArray['strikethrough']);
             }
-            if (isset($pStyles['color'])) {
-                $this->getColor()->applyFromArray($pStyles['color']);
+            if (isset($styleArray['color'])) {
+                $this->getColor()->applyFromArray($styleArray['color']);
             }
-            if (isset($pStyles['size'])) {
-                $this->setSize($pStyles['size']);
+            if (isset($styleArray['size'])) {
+                $this->setSize($styleArray['size']);
+            }
+            if (isset($styleArray['chartColor'])) {
+                $this->chartColor = $styleArray['chartColor'];
+            }
+            if (isset($styleArray['scheme'])) {
+                $this->setScheme($styleArray['scheme']);
+            }
+            if (isset($styleArray['cap'])) {
+                $this->setCap($styleArray['cap']);
             }
         }
 
@@ -198,10 +221,8 @@ public function applyFromArray(array $pStyles)
 
     /**
      * Get Name.
-     *
-     * @return null|string
      */
-    public function getName()
+    public function getName(): ?string
     {
         if ($this->isSupervisor) {
             return $this->getSharedComponent()->getName();
@@ -210,14 +231,37 @@ public function getName()
         return $this->name;
     }
 
+    public function getLatin(): string
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getLatin();
+        }
+
+        return $this->latin;
+    }
+
+    public function getEastAsian(): string
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getEastAsian();
+        }
+
+        return $this->eastAsian;
+    }
+
+    public function getComplexScript(): string
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getComplexScript();
+        }
+
+        return $this->complexScript;
+    }
+
     /**
-     * Set Name.
-     *
-     * @param string $fontname
-     *
-     * @return $this
+     * Set Name and turn off Scheme.
      */
-    public function setName($fontname)
+    public function setName(string $fontname): self
     {
         if ($fontname == '') {
             $fontname = 'Calibri';
@@ -229,15 +273,67 @@ public function setName($fontname)
             $this->name = $fontname;
         }
 
+        return $this->setScheme('');
+    }
+
+    public function setLatin(string $fontname): self
+    {
+        if ($fontname == '') {
+            $fontname = 'Calibri';
+        }
+        if (!$this->isSupervisor) {
+            $this->latin = $fontname;
+        } else {
+            // should never be true
+            // @codeCoverageIgnoreStart
+            $styleArray = $this->getStyleArray(['latin' => $fontname]);
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+            // @codeCoverageIgnoreEnd
+        }
+
+        return $this;
+    }
+
+    public function setEastAsian(string $fontname): self
+    {
+        if ($fontname == '') {
+            $fontname = 'Calibri';
+        }
+        if (!$this->isSupervisor) {
+            $this->eastAsian = $fontname;
+        } else {
+            // should never be true
+            // @codeCoverageIgnoreStart
+            $styleArray = $this->getStyleArray(['eastAsian' => $fontname]);
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+            // @codeCoverageIgnoreEnd
+        }
+
+        return $this;
+    }
+
+    public function setComplexScript(string $fontname): self
+    {
+        if ($fontname == '') {
+            $fontname = 'Calibri';
+        }
+        if (!$this->isSupervisor) {
+            $this->complexScript = $fontname;
+        } else {
+            // should never be true
+            // @codeCoverageIgnoreStart
+            $styleArray = $this->getStyleArray(['complexScript' => $fontname]);
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+            // @codeCoverageIgnoreEnd
+        }
+
         return $this;
     }
 
     /**
      * Get Size.
-     *
-     * @return null|float
      */
-    public function getSize()
+    public function getSize(): ?float
     {
         if ($this->isSupervisor) {
             return $this->getSharedComponent()->getSize();
@@ -253,7 +349,7 @@ public function getSize()
      *
      * @return $this
      */
-    public function setSize($sizeInPoints)
+    public function setSize(mixed $sizeInPoints, bool $nullOk = false): static
     {
         if (is_string($sizeInPoints) || is_int($sizeInPoints)) {
             $sizeInPoints = (float) $sizeInPoints; // $pValue = 0 if given string is not numeric
@@ -262,7 +358,9 @@ public function setSize($sizeInPoints)
         // Size must be a positive floating point number
         // ECMA-376-1:2016, part 1, chapter 18.4.11 sz (Font Size), p. 1536
         if (!is_float($sizeInPoints) || !($sizeInPoints > 0)) {
-            $sizeInPoints = 10.0;
+            if (!$nullOk || $sizeInPoints !== null) {
+                $sizeInPoints = 10.0;
+            }
         }
 
         if ($this->isSupervisor) {
@@ -277,10 +375,8 @@ public function setSize($sizeInPoints)
 
     /**
      * Get Bold.
-     *
-     * @return null|bool
      */
-    public function getBold()
+    public function getBold(): ?bool
     {
         if ($this->isSupervisor) {
             return $this->getSharedComponent()->getBold();
@@ -292,20 +388,18 @@ public function getBold()
     /**
      * Set Bold.
      *
-     * @param bool $pValue
-     *
      * @return $this
      */
-    public function setBold($pValue)
+    public function setBold(bool $bold): static
     {
-        if ($pValue == '') {
-            $pValue = false;
+        if ($bold == '') {
+            $bold = false;
         }
         if ($this->isSupervisor) {
-            $styleArray = $this->getStyleArray(['bold' => $pValue]);
+            $styleArray = $this->getStyleArray(['bold' => $bold]);
             $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
         } else {
-            $this->bold = $pValue;
+            $this->bold = $bold;
         }
 
         return $this;
@@ -313,10 +407,8 @@ public function setBold($pValue)
 
     /**
      * Get Italic.
-     *
-     * @return null|bool
      */
-    public function getItalic()
+    public function getItalic(): ?bool
     {
         if ($this->isSupervisor) {
             return $this->getSharedComponent()->getItalic();
@@ -328,20 +420,18 @@ public function getItalic()
     /**
      * Set Italic.
      *
-     * @param bool $pValue
-     *
      * @return $this
      */
-    public function setItalic($pValue)
+    public function setItalic(bool $italic): static
     {
-        if ($pValue == '') {
-            $pValue = false;
+        if ($italic == '') {
+            $italic = false;
         }
         if ($this->isSupervisor) {
-            $styleArray = $this->getStyleArray(['italic' => $pValue]);
+            $styleArray = $this->getStyleArray(['italic' => $italic]);
             $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
         } else {
-            $this->italic = $pValue;
+            $this->italic = $italic;
         }
 
         return $this;
@@ -349,10 +439,8 @@ public function setItalic($pValue)
 
     /**
      * Get Superscript.
-     *
-     * @return null|bool
      */
-    public function getSuperscript()
+    public function getSuperscript(): ?bool
     {
         if ($this->isSupervisor) {
             return $this->getSharedComponent()->getSuperscript();
@@ -366,13 +454,13 @@ public function getSuperscript()
      *
      * @return $this
      */
-    public function setSuperscript(bool $pValue)
+    public function setSuperscript(bool $superscript): static
     {
         if ($this->isSupervisor) {
-            $styleArray = $this->getStyleArray(['superscript' => $pValue]);
+            $styleArray = $this->getStyleArray(['superscript' => $superscript]);
             $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
         } else {
-            $this->superscript = $pValue;
+            $this->superscript = $superscript;
             if ($this->superscript) {
                 $this->subscript = false;
             }
@@ -383,10 +471,8 @@ public function setSuperscript(bool $pValue)
 
     /**
      * Get Subscript.
-     *
-     * @return null|bool
      */
-    public function getSubscript()
+    public function getSubscript(): ?bool
     {
         if ($this->isSupervisor) {
             return $this->getSharedComponent()->getSubscript();
@@ -400,13 +486,13 @@ public function getSubscript()
      *
      * @return $this
      */
-    public function setSubscript(bool $pValue)
+    public function setSubscript(bool $subscript): static
     {
         if ($this->isSupervisor) {
-            $styleArray = $this->getStyleArray(['subscript' => $pValue]);
+            $styleArray = $this->getStyleArray(['subscript' => $subscript]);
             $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
         } else {
-            $this->subscript = $pValue;
+            $this->subscript = $subscript;
             if ($this->subscript) {
                 $this->superscript = false;
             }
@@ -415,12 +501,113 @@ public function setSubscript(bool $pValue)
         return $this;
     }
 
+    public function getBaseLine(): int
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getBaseLine();
+        }
+
+        return $this->baseLine;
+    }
+
+    public function setBaseLine(int $baseLine): self
+    {
+        if (!$this->isSupervisor) {
+            $this->baseLine = $baseLine;
+        } else {
+            // should never be true
+            // @codeCoverageIgnoreStart
+            $styleArray = $this->getStyleArray(['baseLine' => $baseLine]);
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+            // @codeCoverageIgnoreEnd
+        }
+
+        return $this;
+    }
+
+    public function getStrikeType(): string
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getStrikeType();
+        }
+
+        return $this->strikeType;
+    }
+
+    public function setStrikeType(string $strikeType): self
+    {
+        if (!$this->isSupervisor) {
+            $this->strikeType = $strikeType;
+        } else {
+            // should never be true
+            // @codeCoverageIgnoreStart
+            $styleArray = $this->getStyleArray(['strikeType' => $strikeType]);
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+            // @codeCoverageIgnoreEnd
+        }
+
+        return $this;
+    }
+
+    public function getUnderlineColor(): ?ChartColor
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getUnderlineColor();
+        }
+
+        return $this->underlineColor;
+    }
+
+    public function setUnderlineColor(array $colorArray): self
+    {
+        if (!$this->isSupervisor) {
+            $this->underlineColor = new ChartColor($colorArray);
+        } else {
+            // should never be true
+            // @codeCoverageIgnoreStart
+            $styleArray = $this->getStyleArray(['underlineColor' => $colorArray]);
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+            // @codeCoverageIgnoreEnd
+        }
+
+        return $this;
+    }
+
+    public function getChartColor(): ?ChartColor
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getChartColor();
+        }
+
+        return $this->chartColor;
+    }
+
+    public function setChartColor(array $colorArray): self
+    {
+        if (!$this->isSupervisor) {
+            $this->chartColor = new ChartColor($colorArray);
+        } else {
+            // should never be true
+            // @codeCoverageIgnoreStart
+            $styleArray = $this->getStyleArray(['chartColor' => $colorArray]);
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+            // @codeCoverageIgnoreEnd
+        }
+
+        return $this;
+    }
+
+    public function setChartColorFromObject(?ChartColor $chartColor): self
+    {
+        $this->chartColor = $chartColor;
+
+        return $this;
+    }
+
     /**
      * Get Underline.
-     *
-     * @return null|string
      */
-    public function getUnderline()
+    public function getUnderline(): ?string
     {
         if ($this->isSupervisor) {
             return $this->getSharedComponent()->getUnderline();
@@ -432,24 +619,24 @@ public function getUnderline()
     /**
      * Set Underline.
      *
-     * @param bool|string $pValue \PhpOffice\PhpSpreadsheet\Style\Font underline type
+     * @param bool|string $underlineStyle \PhpOffice\PhpSpreadsheet\Style\Font underline type
      *                                    If a boolean is passed, then TRUE equates to UNDERLINE_SINGLE,
      *                                        false equates to UNDERLINE_NONE
      *
      * @return $this
      */
-    public function setUnderline($pValue)
+    public function setUnderline($underlineStyle): static
     {
-        if (is_bool($pValue)) {
-            $pValue = ($pValue) ? self::UNDERLINE_SINGLE : self::UNDERLINE_NONE;
-        } elseif ($pValue == '') {
-            $pValue = self::UNDERLINE_NONE;
+        if (is_bool($underlineStyle)) {
+            $underlineStyle = ($underlineStyle) ? self::UNDERLINE_SINGLE : self::UNDERLINE_NONE;
+        } elseif ($underlineStyle == '') {
+            $underlineStyle = self::UNDERLINE_NONE;
         }
         if ($this->isSupervisor) {
-            $styleArray = $this->getStyleArray(['underline' => $pValue]);
+            $styleArray = $this->getStyleArray(['underline' => $underlineStyle]);
             $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
         } else {
-            $this->underline = $pValue;
+            $this->underline = $underlineStyle;
         }
 
         return $this;
@@ -457,10 +644,8 @@ public function setUnderline($pValue)
 
     /**
      * Get Strikethrough.
-     *
-     * @return null|bool
      */
-    public function getStrikethrough()
+    public function getStrikethrough(): ?bool
     {
         if ($this->isSupervisor) {
             return $this->getSharedComponent()->getStrikethrough();
@@ -472,21 +657,19 @@ public function getStrikethrough()
     /**
      * Set Strikethrough.
      *
-     * @param bool $pValue
-     *
      * @return $this
      */
-    public function setStrikethrough($pValue)
+    public function setStrikethrough(bool $strikethru): static
     {
-        if ($pValue == '') {
-            $pValue = false;
+        if ($strikethru == '') {
+            $strikethru = false;
         }
 
         if ($this->isSupervisor) {
-            $styleArray = $this->getStyleArray(['strikethrough' => $pValue]);
+            $styleArray = $this->getStyleArray(['strikethrough' => $strikethru]);
             $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
         } else {
-            $this->strikethrough = $pValue;
+            $this->strikethrough = $strikethru;
         }
 
         return $this;
@@ -494,10 +677,8 @@ public function setStrikethrough($pValue)
 
     /**
      * Get Color.
-     *
-     * @return Color
      */
-    public function getColor()
+    public function getColor(): Color
     {
         return $this->color;
     }
@@ -507,10 +688,10 @@ public function getColor()
      *
      * @return $this
      */
-    public function setColor(Color $pValue)
+    public function setColor(Color $color): static
     {
         // make sure parameter is a real color and not a supervisor
-        $color = $pValue->getIsSupervisor() ? $pValue->getSharedComponent() : $pValue;
+        $color = $color->getIsSupervisor() ? $color->getSharedComponent() : $color;
 
         if ($this->isSupervisor) {
             $styleArray = $this->getColor()->getStyleArray(['argb' => $color->getARGB()]);
@@ -522,44 +703,131 @@ public function setColor(Color $pValue)
         return $this;
     }
 
+    private function hashChartColor(?ChartColor $underlineColor): string
+    {
+        if ($underlineColor === null) {
+            return '';
+        }
+
+        return
+            $underlineColor->getValue()
+            . $underlineColor->getType()
+            . (string) $underlineColor->getAlpha();
+    }
+
     /**
      * Get hash code.
      *
      * @return string Hash code
      */
-    public function getHashCode()
+    public function getHashCode(): string
     {
         if ($this->isSupervisor) {
             return $this->getSharedComponent()->getHashCode();
         }
 
         return md5(
-            $this->name .
-            $this->size .
-            ($this->bold ? 't' : 'f') .
-            ($this->italic ? 't' : 'f') .
-            ($this->superscript ? 't' : 'f') .
-            ($this->subscript ? 't' : 'f') .
-            $this->underline .
-            ($this->strikethrough ? 't' : 'f') .
-            $this->color->getHashCode() .
-            __CLASS__
+            $this->name
+            . $this->size
+            . ($this->bold ? 't' : 'f')
+            . ($this->italic ? 't' : 'f')
+            . ($this->superscript ? 't' : 'f')
+            . ($this->subscript ? 't' : 'f')
+            . $this->underline
+            . ($this->strikethrough ? 't' : 'f')
+            . $this->color->getHashCode()
+            . $this->scheme
+            . implode(
+                '*',
+                [
+                    $this->latin,
+                    $this->eastAsian,
+                    $this->complexScript,
+                    $this->strikeType,
+                    $this->hashChartColor($this->chartColor),
+                    $this->hashChartColor($this->underlineColor),
+                    (string) $this->baseLine,
+                    (string) $this->cap,
+                ]
+            )
+            . __CLASS__
         );
     }
 
     protected function exportArray1(): array
     {
         $exportedArray = [];
+        $this->exportArray2($exportedArray, 'baseLine', $this->getBaseLine());
         $this->exportArray2($exportedArray, 'bold', $this->getBold());
+        $this->exportArray2($exportedArray, 'cap', $this->getCap());
+        $this->exportArray2($exportedArray, 'chartColor', $this->getChartColor());
         $this->exportArray2($exportedArray, 'color', $this->getColor());
+        $this->exportArray2($exportedArray, 'complexScript', $this->getComplexScript());
+        $this->exportArray2($exportedArray, 'eastAsian', $this->getEastAsian());
         $this->exportArray2($exportedArray, 'italic', $this->getItalic());
+        $this->exportArray2($exportedArray, 'latin', $this->getLatin());
         $this->exportArray2($exportedArray, 'name', $this->getName());
+        $this->exportArray2($exportedArray, 'scheme', $this->getScheme());
         $this->exportArray2($exportedArray, 'size', $this->getSize());
         $this->exportArray2($exportedArray, 'strikethrough', $this->getStrikethrough());
+        $this->exportArray2($exportedArray, 'strikeType', $this->getStrikeType());
         $this->exportArray2($exportedArray, 'subscript', $this->getSubscript());
         $this->exportArray2($exportedArray, 'superscript', $this->getSuperscript());
         $this->exportArray2($exportedArray, 'underline', $this->getUnderline());
+        $this->exportArray2($exportedArray, 'underlineColor', $this->getUnderlineColor());
 
         return $exportedArray;
     }
+
+    public function getScheme(): string
+    {
+        if ($this->isSupervisor) {
+            return $this->getSharedComponent()->getScheme();
+        }
+
+        return $this->scheme;
+    }
+
+    public function setScheme(string $scheme): self
+    {
+        if ($scheme === '' || $scheme === 'major' || $scheme === 'minor') {
+            if ($this->isSupervisor) {
+                $styleArray = $this->getStyleArray(['scheme' => $scheme]);
+                $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
+            } else {
+                $this->scheme = $scheme;
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set capitalization attribute. If not one of the permitted
+     * values (all, small, or none), set it to null.
+     * This will be honored only for the font for chart titles.
+     * None is distinguished from null because null will inherit
+     * the current value, whereas 'none' will override it.
+     */
+    public function setCap(string $cap): self
+    {
+        $this->cap = in_array($cap, self::VALID_CAPS, true) ? $cap : null;
+
+        return $this;
+    }
+
+    public function getCap(): ?string
+    {
+        return $this->cap;
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $this->color = clone $this->color;
+        $this->chartColor = ($this->chartColor === null) ? null : clone $this->chartColor;
+        $this->underlineColor = ($this->underlineColor === null) ? null : clone $this->underlineColor;
+    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat.php
index 6235d8640a..9c9a54560e 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat.php
@@ -2,6 +2,8 @@
 
 namespace PhpOffice\PhpSpreadsheet\Style;
 
+use PhpOffice\PhpSpreadsheet\RichText\RichText;
+
 class NumberFormat extends Supervisor
 {
     // Pre-defined formats
@@ -10,14 +12,15 @@ class NumberFormat extends Supervisor
     const FORMAT_TEXT = '@';
 
     const FORMAT_NUMBER = '0';
+    const FORMAT_NUMBER_0 = '0.0';
     const FORMAT_NUMBER_00 = '0.00';
     const FORMAT_NUMBER_COMMA_SEPARATED1 = '#,##0.00';
     const FORMAT_NUMBER_COMMA_SEPARATED2 = '#,##0.00_-';
 
     const FORMAT_PERCENTAGE = '0%';
+    const FORMAT_PERCENTAGE_0 = '0.0%';
     const FORMAT_PERCENTAGE_00 = '0.00%';
 
-    const FORMAT_DATE_YYYYMMDD2 = 'yyyy-mm-dd';
     const FORMAT_DATE_YYYYMMDD = 'yyyy-mm-dd';
     const FORMAT_DATE_DDMMYYYY = 'dd/mm/yyyy';
     const FORMAT_DATE_DMYSLASH = 'd/m/yy';
@@ -25,10 +28,12 @@ class NumberFormat extends Supervisor
     const FORMAT_DATE_DMMINUS = 'd-m';
     const FORMAT_DATE_MYMINUS = 'm-yy';
     const FORMAT_DATE_XLSX14 = 'mm-dd-yy';
+    const FORMAT_DATE_XLSX14_ACTUAL = 'm/d/yyyy';
     const FORMAT_DATE_XLSX15 = 'd-mmm-yy';
     const FORMAT_DATE_XLSX16 = 'd-mmm';
     const FORMAT_DATE_XLSX17 = 'mmm-yy';
     const FORMAT_DATE_XLSX22 = 'm/d/yy h:mm';
+    const FORMAT_DATE_XLSX22_ACTUAL = 'm/d/yyyy h:mm';
     const FORMAT_DATE_DATETIME = 'd/m/yy h:mm';
     const FORMAT_DATE_TIME1 = 'h:mm AM/PM';
     const FORMAT_DATE_TIME2 = 'h:mm:ss AM/PM';
@@ -39,34 +44,83 @@ class NumberFormat extends Supervisor
     const FORMAT_DATE_TIME7 = 'i:s.S';
     const FORMAT_DATE_TIME8 = 'h:mm:ss;@';
     const FORMAT_DATE_YYYYMMDDSLASH = 'yyyy/mm/dd;@';
-
-    const FORMAT_CURRENCY_USD_SIMPLE = '"$"#,##0.00_-';
-    const FORMAT_CURRENCY_USD = '$#,##0_-';
-    const FORMAT_CURRENCY_EUR_SIMPLE = '#,##0.00_-"€"';
-    const FORMAT_CURRENCY_EUR = '#,##0_-"€"';
+    const FORMAT_DATE_LONG_DATE = 'dddd, mmmm d, yyyy';
+
+    const DATE_TIME_OR_DATETIME_ARRAY = [
+        self::FORMAT_DATE_YYYYMMDD,
+        self::FORMAT_DATE_DDMMYYYY,
+        self::FORMAT_DATE_DMYSLASH,
+        self::FORMAT_DATE_DMYMINUS,
+        self::FORMAT_DATE_DMMINUS,
+        self::FORMAT_DATE_MYMINUS,
+        self::FORMAT_DATE_XLSX14,
+        self::FORMAT_DATE_XLSX14_ACTUAL,
+        self::FORMAT_DATE_XLSX15,
+        self::FORMAT_DATE_XLSX16,
+        self::FORMAT_DATE_XLSX17,
+        self::FORMAT_DATE_XLSX22,
+        self::FORMAT_DATE_XLSX22_ACTUAL,
+        self::FORMAT_DATE_DATETIME,
+        self::FORMAT_DATE_TIME1,
+        self::FORMAT_DATE_TIME2,
+        self::FORMAT_DATE_TIME3,
+        self::FORMAT_DATE_TIME4,
+        self::FORMAT_DATE_TIME5,
+        self::FORMAT_DATE_TIME6,
+        self::FORMAT_DATE_TIME7,
+        self::FORMAT_DATE_TIME8,
+        self::FORMAT_DATE_YYYYMMDDSLASH,
+        self::FORMAT_DATE_LONG_DATE,
+    ];
+    const TIME_OR_DATETIME_ARRAY = [
+        self::FORMAT_DATE_XLSX22,
+        self::FORMAT_DATE_DATETIME,
+        self::FORMAT_DATE_TIME1,
+        self::FORMAT_DATE_TIME2,
+        self::FORMAT_DATE_TIME3,
+        self::FORMAT_DATE_TIME4,
+        self::FORMAT_DATE_TIME5,
+        self::FORMAT_DATE_TIME6,
+        self::FORMAT_DATE_TIME7,
+        self::FORMAT_DATE_TIME8,
+    ];
+
+    const FORMAT_CURRENCY_USD_INTEGER = '$#,##0_-';
+    const FORMAT_CURRENCY_USD = '$#,##0.00_-';
+    const FORMAT_CURRENCY_EUR_INTEGER = '#,##0_-[$€]';
+    const FORMAT_CURRENCY_EUR = '#,##0.00_-[$€]';
     const FORMAT_ACCOUNTING_USD = '_("$"* #,##0.00_);_("$"* \(#,##0.00\);_("$"* "-"??_);_(@_)';
     const FORMAT_ACCOUNTING_EUR = '_("€"* #,##0.00_);_("€"* \(#,##0.00\);_("€"* "-"??_);_(@_)';
 
+    const SHORT_DATE_INDEX = 14;
+    const DATE_TIME_INDEX = 22;
+    const FORMAT_SYSDATE_X = '[$-x-sysdate]';
+    const FORMAT_SYSDATE_F800 = '[$-F800]';
+    const FORMAT_SYSTIME_X = '[$-x-systime]';
+    const FORMAT_SYSTIME_F400 = '[$-F400]';
+
+    protected static string $shortDateFormat = self::FORMAT_DATE_XLSX14_ACTUAL;
+
+    protected static string $longDateFormat = self::FORMAT_DATE_LONG_DATE;
+
+    protected static string $dateTimeFormat = self::FORMAT_DATE_XLSX22_ACTUAL;
+
+    protected static string $timeFormat = self::FORMAT_DATE_TIME2;
+
     /**
      * Excel built-in number formats.
-     *
-     * @var array
      */
-    protected static $builtInFormats;
+    protected static array $builtInFormats;
 
     /**
      * Excel built-in number formats (flipped, for faster lookups).
-     *
-     * @var array
      */
-    protected static $flippedBuiltInFormats;
+    protected static array $flippedBuiltInFormats;
 
     /**
      * Format Code.
-     *
-     * @var null|string
      */
-    protected $formatCode = self::FORMAT_GENERAL;
+    protected ?string $formatCode = self::FORMAT_GENERAL;
 
     /**
      * Built-in format Code.
@@ -85,7 +139,7 @@ class NumberFormat extends Supervisor
      *                                    Leave this value at default unless you understand exactly what
      *                                        its ramifications are
      */
-    public function __construct($isSupervisor = false, $isConditional = false)
+    public function __construct(bool $isSupervisor = false, bool $isConditional = false)
     {
         // Supervisor?
         parent::__construct($isSupervisor);
@@ -99,22 +153,19 @@ public function __construct($isSupervisor = false, $isConditional = false)
     /**
      * Get the shared style component for the currently active cell in currently active sheet.
      * Only used for style supervisor.
-     *
-     * @return NumberFormat
      */
-    public function getSharedComponent()
+    public function getSharedComponent(): self
     {
-        return $this->parent->getSharedComponent()->getNumberFormat();
+        /** @var Style $parent */
+        $parent = $this->parent;
+
+        return $parent->getSharedComponent()->getNumberFormat();
     }
 
     /**
      * Build style array from subcomponents.
-     *
-     * @param array $array
-     *
-     * @return array
      */
-    public function getStyleArray($array)
+    public function getStyleArray(array $array): array
     {
         return ['numberFormat' => $array];
     }
@@ -130,17 +181,17 @@ public function getStyleArray($array)
      * );
      * </code>
      *
-     * @param array $pStyles Array containing style information
+     * @param array $styleArray Array containing style information
      *
      * @return $this
      */
-    public function applyFromArray(array $pStyles)
+    public function applyFromArray(array $styleArray): static
     {
         if ($this->isSupervisor) {
-            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($pStyles));
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($styleArray));
         } else {
-            if (isset($pStyles['formatCode'])) {
-                $this->setFormatCode($pStyles['formatCode']);
+            if (isset($styleArray['formatCode'])) {
+                $this->setFormatCode($styleArray['formatCode']);
             }
         }
 
@@ -149,39 +200,61 @@ public function applyFromArray(array $pStyles)
 
     /**
      * Get Format Code.
-     *
-     * @return null|string
      */
-    public function getFormatCode()
+    public function getFormatCode(bool $extended = false): ?string
     {
         if ($this->isSupervisor) {
-            return $this->getSharedComponent()->getFormatCode();
+            return $this->getSharedComponent()->getFormatCode($extended);
         }
-        if ($this->builtInFormatCode !== false) {
-            return self::builtInFormatCode($this->builtInFormatCode);
+        $builtin = $this->getBuiltInFormatCode();
+        if (is_int($builtin)) {
+            if ($extended) {
+                if ($builtin === self::SHORT_DATE_INDEX) {
+                    return self::$shortDateFormat;
+                }
+                if ($builtin === self::DATE_TIME_INDEX) {
+                    return self::$dateTimeFormat;
+                }
+            }
+
+            return self::builtInFormatCode($builtin);
         }
 
-        return $this->formatCode;
+        return $extended ? self::convertSystemFormats($this->formatCode) : $this->formatCode;
+    }
+
+    public static function convertSystemFormats(?string $formatCode): ?string
+    {
+        if (is_string($formatCode)) {
+            if (stripos($formatCode, self::FORMAT_SYSDATE_F800) !== false || stripos($formatCode, self::FORMAT_SYSDATE_X) !== false) {
+                return self::$longDateFormat;
+            }
+            if (stripos($formatCode, self::FORMAT_SYSTIME_F400) !== false || stripos($formatCode, self::FORMAT_SYSTIME_X) !== false) {
+                return self::$timeFormat;
+            }
+        }
+
+        return $formatCode;
     }
 
     /**
      * Set Format Code.
      *
-     * @param string $pValue see self::FORMAT_*
+     * @param string $formatCode see self::FORMAT_*
      *
      * @return $this
      */
-    public function setFormatCode($pValue)
+    public function setFormatCode(string $formatCode): static
     {
-        if ($pValue == '') {
-            $pValue = self::FORMAT_GENERAL;
+        if ($formatCode == '') {
+            $formatCode = self::FORMAT_GENERAL;
         }
         if ($this->isSupervisor) {
-            $styleArray = $this->getStyleArray(['formatCode' => $pValue]);
+            $styleArray = $this->getStyleArray(['formatCode' => $formatCode]);
             $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
         } else {
-            $this->formatCode = $pValue;
-            $this->builtInFormatCode = self::builtInFormatCodeIndex($pValue);
+            $this->formatCode = $formatCode;
+            $this->builtInFormatCode = self::builtInFormatCodeIndex($formatCode);
         }
 
         return $this;
@@ -204,18 +277,18 @@ public function getBuiltInFormatCode()
     /**
      * Set Built-In Format Code.
      *
-     * @param int $pValue
+     * @param int $formatCodeIndex Id of the built-in format code to use
      *
      * @return $this
      */
-    public function setBuiltInFormatCode($pValue)
+    public function setBuiltInFormatCode(int $formatCodeIndex): static
     {
         if ($this->isSupervisor) {
-            $styleArray = $this->getStyleArray(['formatCode' => self::builtInFormatCode($pValue)]);
+            $styleArray = $this->getStyleArray(['formatCode' => self::builtInFormatCode($formatCodeIndex)]);
             $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
         } else {
-            $this->builtInFormatCode = $pValue;
-            $this->formatCode = self::builtInFormatCode($pValue);
+            $this->builtInFormatCode = $formatCodeIndex;
+            $this->formatCode = self::builtInFormatCode($formatCodeIndex);
         }
 
         return $this;
@@ -249,7 +322,7 @@ private static function fillBuiltInFormatCodes(): void
         //      KOR fmt 55: "yyyy/mm/dd"
 
         // Built-in format codes
-        if (self::$builtInFormats === null) {
+        if (empty(self::$builtInFormats)) {
             self::$builtInFormats = [];
 
             // General
@@ -264,15 +337,15 @@ private static function fillBuiltInFormatCodes(): void
             self::$builtInFormats[11] = '0.00E+00';
             self::$builtInFormats[12] = '# ?/?';
             self::$builtInFormats[13] = '# ??/??';
-            self::$builtInFormats[14] = 'm/d/yyyy'; // Despite ECMA 'mm-dd-yy';
-            self::$builtInFormats[15] = 'd-mmm-yy';
+            self::$builtInFormats[14] = self::FORMAT_DATE_XLSX14_ACTUAL; // Despite ECMA 'mm-dd-yy';
+            self::$builtInFormats[15] = self::FORMAT_DATE_XLSX15;
             self::$builtInFormats[16] = 'd-mmm';
             self::$builtInFormats[17] = 'mmm-yy';
             self::$builtInFormats[18] = 'h:mm AM/PM';
             self::$builtInFormats[19] = 'h:mm:ss AM/PM';
             self::$builtInFormats[20] = 'h:mm';
             self::$builtInFormats[21] = 'h:mm:ss';
-            self::$builtInFormats[22] = 'm/d/yyyy h:mm'; // Despite ECMA 'm/d/yy h:mm';
+            self::$builtInFormats[22] = self::FORMAT_DATE_XLSX22_ACTUAL; // Despite ECMA 'm/d/yy h:mm';
 
             self::$builtInFormats[37] = '#,##0_);(#,##0)'; //  Despite ECMA '#,##0 ;(#,##0)';
             self::$builtInFormats[38] = '#,##0_);[Red](#,##0)'; //  Despite ECMA '#,##0 ;[Red](#,##0)';
@@ -326,22 +399,18 @@ private static function fillBuiltInFormatCodes(): void
 
     /**
      * Get built-in format code.
-     *
-     * @param int $pIndex
-     *
-     * @return string
      */
-    public static function builtInFormatCode($pIndex)
+    public static function builtInFormatCode(int $index): string
     {
         // Clean parameter
-        $pIndex = (int) $pIndex;
+        $index = (int) $index;
 
         // Ensure built-in format codes are available
         self::fillBuiltInFormatCodes();
 
         // Lookup format code
-        if (isset(self::$builtInFormats[$pIndex])) {
-            return self::$builtInFormats[$pIndex];
+        if (isset(self::$builtInFormats[$index])) {
+            return self::$builtInFormats[$index];
         }
 
         return '';
@@ -350,18 +419,16 @@ public static function builtInFormatCode($pIndex)
     /**
      * Get built-in format code index.
      *
-     * @param string $formatCode
-     *
-     * @return bool|int
+     * @return false|int
      */
-    public static function builtInFormatCodeIndex($formatCode)
+    public static function builtInFormatCodeIndex(string $formatCodeIndex)
     {
         // Ensure built-in format codes are available
         self::fillBuiltInFormatCodes();
 
         // Lookup format code
-        if (array_key_exists($formatCode, self::$flippedBuiltInFormats)) {
-            return self::$flippedBuiltInFormats[$formatCode];
+        if (array_key_exists($formatCodeIndex, self::$flippedBuiltInFormats)) {
+            return self::$flippedBuiltInFormats[$formatCodeIndex];
         }
 
         return false;
@@ -372,29 +439,30 @@ public static function builtInFormatCodeIndex($formatCode)
      *
      * @return string Hash code
      */
-    public function getHashCode()
+    public function getHashCode(): string
     {
         if ($this->isSupervisor) {
             return $this->getSharedComponent()->getHashCode();
         }
 
         return md5(
-            $this->formatCode .
-            $this->builtInFormatCode .
-            __CLASS__
+            $this->formatCode
+            . $this->builtInFormatCode
+            . __CLASS__
         );
     }
 
     /**
      * Convert a value in a pre-defined format to a PHP string.
      *
-     * @param mixed $value Value to format
-     * @param string $format Format code, see = self::FORMAT_*
-     * @param array $callBack Callback function for additional formatting of string
+     * @param null|bool|float|int|RichText|string $value Value to format
+     * @param string $format Format code: see = self::FORMAT_* for predefined values;
+     *                          or can be any valid MS Excel custom format string
+     * @param ?array $callBack Callback function for additional formatting of string
      *
      * @return string Formatted string
      */
-    public static function toFormattedString($value, $format, $callBack = null)
+    public static function toFormattedString(mixed $value, string $format, ?array $callBack = null): string
     {
         return NumberFormat\Formatter::toFormattedString($value, $format, $callBack);
     }
@@ -406,4 +474,44 @@ protected function exportArray1(): array
 
         return $exportedArray;
     }
+
+    public static function getShortDateFormat(): string
+    {
+        return self::$shortDateFormat;
+    }
+
+    public static function setShortDateFormat(string $shortDateFormat): void
+    {
+        self::$shortDateFormat = $shortDateFormat;
+    }
+
+    public static function getLongDateFormat(): string
+    {
+        return self::$longDateFormat;
+    }
+
+    public static function setLongDateFormat(string $longDateFormat): void
+    {
+        self::$longDateFormat = $longDateFormat;
+    }
+
+    public static function getDateTimeFormat(): string
+    {
+        return self::$dateTimeFormat;
+    }
+
+    public static function setDateTimeFormat(string $dateTimeFormat): void
+    {
+        self::$dateTimeFormat = $dateTimeFormat;
+    }
+
+    public static function getTimeFormat(): string
+    {
+        return self::$timeFormat;
+    }
+
+    public static function setTimeFormat(string $timeFormat): void
+    {
+        self::$timeFormat = $timeFormat;
+    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/BaseFormatter.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/BaseFormatter.php
index 7988143c51..165779ba18 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/BaseFormatter.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/BaseFormatter.php
@@ -2,6 +2,8 @@
 
 namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat;
 
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+
 abstract class BaseFormatter
 {
     protected static function stripQuotes(string $format): string
@@ -9,4 +11,15 @@ protected static function stripQuotes(string $format): string
         // Some non-number strings are quoted, so we'll get rid of the quotes, likewise any positional * symbols
         return str_replace(['"', '*'], '', $format);
     }
+
+    protected static function adjustSeparators(string $value): string
+    {
+        $thousandsSeparator = StringHelper::getThousandsSeparator();
+        $decimalSeparator = StringHelper::getDecimalSeparator();
+        if ($thousandsSeparator !== ',' || $decimalSeparator !== '.') {
+            $value = str_replace(['.', ',', "\u{fffd}"], ["\u{fffd}", $thousandsSeparator, $decimalSeparator], $value);
+        }
+
+        return $value;
+    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/DateFormatter.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/DateFormatter.php
index db18e636fe..2aabd7f5f7 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/DateFormatter.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/DateFormatter.php
@@ -8,10 +8,8 @@ class DateFormatter
 {
     /**
      * Search/replace values to convert Excel date/time format masks to PHP format masks.
-     *
-     * @var array
      */
-    private static $dateFormatReplacements = [
+    private const DATE_FORMAT_REPLACEMENTS = [
         // first remove escapes related to non-format characters
         '\\' => '',
         //    12-hour suffix
@@ -32,10 +30,6 @@ class DateFormatter
         //    It isn't perfect, but the best way I know how
         ':mm' => ':i',
         'mm:' => 'i:',
-        //    month leading zero
-        'mm' => 'm',
-        //    month no leading zero
-        'm' => 'n',
         //    full day of week name
         'dddd' => 'l',
         //    short day of week name
@@ -44,85 +38,174 @@ class DateFormatter
         'dd' => 'd',
         //    days no leading zero
         'd' => 'j',
-        //    seconds
-        'ss' => 's',
         //    fractional seconds - no php equivalent
         '.s' => '',
     ];
 
     /**
      * Search/replace values to convert Excel date/time format masks hours to PHP format masks (24 hr clock).
-     *
-     * @var array
      */
-    private static $dateFormatReplacements24 = [
+    private const DATE_FORMAT_REPLACEMENTS24 = [
         'hh' => 'H',
         'h' => 'G',
+        //    month leading zero
+        'mm' => 'm',
+        //    month no leading zero
+        'm' => 'n',
+        //    seconds
+        'ss' => 's',
     ];
 
     /**
      * Search/replace values to convert Excel date/time format masks hours to PHP format masks (12 hr clock).
-     *
-     * @var array
      */
-    private static $dateFormatReplacements12 = [
+    private const DATE_FORMAT_REPLACEMENTS12 = [
         'hh' => 'h',
         'h' => 'g',
+        //    month leading zero
+        'mm' => 'm',
+        //    month no leading zero
+        'm' => 'n',
+        //    seconds
+        'ss' => 's',
     ];
 
-    public static function format($value, string $format): string
+    private const HOURS_IN_DAY = 24;
+    private const MINUTES_IN_DAY = 60 * self::HOURS_IN_DAY;
+    private const SECONDS_IN_DAY = 60 * self::MINUTES_IN_DAY;
+    private const INTERVAL_PRECISION = 10;
+    private const INTERVAL_LEADING_ZERO = [
+        '[hh]',
+        '[mm]',
+        '[ss]',
+    ];
+    private const INTERVAL_ROUND_PRECISION = [
+        // hours and minutes truncate
+        '[h]' => self::INTERVAL_PRECISION,
+        '[hh]' => self::INTERVAL_PRECISION,
+        '[m]' => self::INTERVAL_PRECISION,
+        '[mm]' => self::INTERVAL_PRECISION,
+        // seconds round
+        '[s]' => 0,
+        '[ss]' => 0,
+    ];
+    private const INTERVAL_MULTIPLIER = [
+        '[h]' => self::HOURS_IN_DAY,
+        '[hh]' => self::HOURS_IN_DAY,
+        '[m]' => self::MINUTES_IN_DAY,
+        '[mm]' => self::MINUTES_IN_DAY,
+        '[s]' => self::SECONDS_IN_DAY,
+        '[ss]' => self::SECONDS_IN_DAY,
+    ];
+
+    private static function tryInterval(bool &$seekingBracket, string &$block, mixed $value, string $format): void
+    {
+        if ($seekingBracket) {
+            if (str_contains($block, $format)) {
+                $hours = (string) (int) round(
+                    self::INTERVAL_MULTIPLIER[$format] * $value,
+                    self::INTERVAL_ROUND_PRECISION[$format]
+                );
+                if (strlen($hours) === 1 && in_array($format, self::INTERVAL_LEADING_ZERO, true)) {
+                    $hours = "0$hours";
+                }
+                $block = str_replace($format, $hours, $block);
+                $seekingBracket = false;
+            }
+        }
+    }
+
+    /** @param float|int $value value to be formatted */
+    public static function format(mixed $value, string $format): string
     {
         // strip off first part containing e.g. [$-F800] or [$USD-409]
         // general syntax: [$<Currency string>-<language info>]
         // language info is in hexadecimal
         // strip off chinese part like [DBNum1][$-804]
-        $format = preg_replace('/^(\[DBNum\d\])*(\[\$[^\]]*\])/i', '', $format);
+        $format = (string) preg_replace('/^(\[DBNum\d\])*(\[\$[^\]]*\])/i', '', $format);
 
         // OpenOffice.org uses upper-case number formats, e.g. 'YYYY', convert to lower-case;
         //    but we don't want to change any quoted strings
-        $format = preg_replace_callback('/(?:^|")([^"]*)(?:$|")/', ['self', 'setLowercaseCallback'], $format);
+        /** @var callable $callable */
+        $callable = [self::class, 'setLowercaseCallback'];
+        $format = (string) preg_replace_callback('/(?:^|")([^"]*)(?:$|")/', $callable, $format);
 
         // Only process the non-quoted blocks for date format characters
+
         $blocks = explode('"', $format);
         foreach ($blocks as $key => &$block) {
             if ($key % 2 == 0) {
-                $block = strtr($block, self::$dateFormatReplacements);
+                $block = strtr($block, self::DATE_FORMAT_REPLACEMENTS);
                 if (!strpos($block, 'A')) {
                     // 24-hour time format
                     // when [h]:mm format, the [h] should replace to the hours of the value * 24
-                    if (false !== strpos($block, '[h]')) {
-                        $hours = (int) ($value * 24);
-                        $block = str_replace('[h]', $hours, $block);
-
-                        continue;
-                    }
-                    $block = strtr($block, self::$dateFormatReplacements24);
+                    $seekingBracket = true;
+                    self::tryInterval($seekingBracket, $block, $value, '[h]');
+                    self::tryInterval($seekingBracket, $block, $value, '[hh]');
+                    self::tryInterval($seekingBracket, $block, $value, '[mm]');
+                    self::tryInterval($seekingBracket, $block, $value, '[m]');
+                    self::tryInterval($seekingBracket, $block, $value, '[s]');
+                    self::tryInterval($seekingBracket, $block, $value, '[ss]');
+                    $block = strtr($block, self::DATE_FORMAT_REPLACEMENTS24);
                 } else {
                     // 12-hour time format
-                    $block = strtr($block, self::$dateFormatReplacements12);
+                    $block = strtr($block, self::DATE_FORMAT_REPLACEMENTS12);
                 }
             }
         }
         $format = implode('"', $blocks);
 
         // escape any quoted characters so that DateTime format() will render them correctly
-        $format = preg_replace_callback('/"(.*)"/U', ['self', 'escapeQuotesCallback'], $format);
+        /** @var callable $callback */
+        $callback = [self::class, 'escapeQuotesCallback'];
+        $format = (string) preg_replace_callback('/"(.*)"/U', $callback, $format);
 
         $dateObj = Date::excelToDateTimeObject($value);
         // If the colon preceding minute had been quoted, as happens in
         // Excel 2003 XML formats, m will not have been changed to i above.
         // Change it now.
-        $format = \preg_replace('/\\\\:m/', ':i', $format);
+        $format = (string) \preg_replace('/\\\\:m/', ':i', $format);
+        $microseconds = (int) $dateObj->format('u');
+        if (str_contains($format, ':s.000')) {
+            $milliseconds = (int) round($microseconds / 1000.0);
+            if ($milliseconds === 1000) {
+                $milliseconds = 0;
+                $dateObj->modify('+1 second');
+            }
+            $dateObj->modify("-$microseconds microseconds");
+            $format = str_replace(':s.000', ':s.' . sprintf('%03d', $milliseconds), $format);
+        } elseif (str_contains($format, ':s.00')) {
+            $centiseconds = (int) round($microseconds / 10000.0);
+            if ($centiseconds === 100) {
+                $centiseconds = 0;
+                $dateObj->modify('+1 second');
+            }
+            $dateObj->modify("-$microseconds microseconds");
+            $format = str_replace(':s.00', ':s.' . sprintf('%02d', $centiseconds), $format);
+        } elseif (str_contains($format, ':s.0')) {
+            $deciseconds = (int) round($microseconds / 100000.0);
+            if ($deciseconds === 10) {
+                $deciseconds = 0;
+                $dateObj->modify('+1 second');
+            }
+            $dateObj->modify("-$microseconds microseconds");
+            $format = str_replace(':s.0', ':s.' . sprintf('%1d', $deciseconds), $format);
+        } else { // no fractional second
+            if ($microseconds >= 500000) {
+                $dateObj->modify('+1 second');
+            }
+            $dateObj->modify("-$microseconds microseconds");
+        }
 
         return $dateObj->format($format);
     }
 
-    private static function setLowercaseCallback($matches): string
+    private static function setLowercaseCallback(array $matches): string
     {
         return mb_strtolower($matches[0]);
     }
 
-    private static function escapeQuotesCallback($matches): string
+    private static function escapeQuotesCallback(array $matches): string
     {
         return '\\' . implode('\\', str_split($matches[1]));
     }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Formatter.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Formatter.php
index 01407e6423..64db544fe4 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Formatter.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Formatter.php
@@ -2,38 +2,48 @@
 
 namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat;
 
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Reader\Xls\Color\BIFF8;
+use PhpOffice\PhpSpreadsheet\RichText\RichText;
 use PhpOffice\PhpSpreadsheet\Style\Color;
 use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
 
-class Formatter
+class Formatter extends BaseFormatter
 {
-    private static function splitFormatCompare($value, $cond, $val, $dfcond, $dfval)
-    {
-        if (!$cond) {
-            $cond = $dfcond;
-            $val = $dfval;
-        }
-        switch ($cond) {
-            case '>':
-                return $value > $val;
-
-            case '<':
-                return $value < $val;
-
-            case '<=':
-                return $value <= $val;
-
-            case '<>':
-                return $value != $val;
+    /**
+     * Matches any @ symbol that isn't enclosed in quotes.
+     */
+    private const SYMBOL_AT = '/@(?=(?:[^"]*"[^"]*")*[^"]*\Z)/miu';
 
-            case '=':
-                return $value == $val;
+    /**
+     * Matches any ; symbol that isn't enclosed in quotes, for a "section" split.
+     */
+    private const SECTION_SPLIT = '/;(?=(?:[^"]*"[^"]*")*[^"]*\Z)/miu';
+
+    private static function splitFormatComparison(
+        mixed $value,
+        ?string $condition,
+        mixed $comparisonValue,
+        string $defaultCondition,
+        mixed $defaultComparisonValue
+    ): bool {
+        if (!$condition) {
+            $condition = $defaultCondition;
+            $comparisonValue = $defaultComparisonValue;
         }
 
-        return $value >= $val;
+        return match ($condition) {
+            '>' => $value > $comparisonValue,
+            '<' => $value < $comparisonValue,
+            '<=' => $value <= $comparisonValue,
+            '<>' => $value != $comparisonValue,
+            '=' => $value == $comparisonValue,
+            default => $value >= $comparisonValue,
+        };
     }
 
-    private static function splitFormat($sections, $value)
+    /** @param float|int|string $value value to be formatted */
+    private static function splitFormatForSectionSelection(array $sections, mixed $value): array
     {
         // Extract the relevant section depending on whether number is positive, negative, or zero?
         // Text not supported yet.
@@ -42,30 +52,35 @@ private static function splitFormat($sections, $value)
         //   2 sections:  [POSITIVE/ZERO/TEXT] [NEGATIVE]
         //   3 sections:  [POSITIVE/TEXT] [NEGATIVE] [ZERO]
         //   4 sections:  [POSITIVE] [NEGATIVE] [ZERO] [TEXT]
-        $cnt = count($sections);
-        $color_regex = '/\\[(' . implode('|', Color::NAMED_COLORS) . ')\\]/mui';
+        $sectionCount = count($sections);
+        // Colour could be a named colour, or a numeric index entry in the colour-palette
+        $color_regex = '/\\[(' . implode('|', Color::NAMED_COLORS) . '|color\\s*(\\d+))\\]/mui';
         $cond_regex = '/\\[(>|>=|<|<=|=|<>)([+-]?\\d+([.]\\d+)?)\\]/';
         $colors = ['', '', '', '', ''];
-        $condops = ['', '', '', '', ''];
-        $condvals = [0, 0, 0, 0, 0];
-        for ($idx = 0; $idx < $cnt; ++$idx) {
+        $conditionOperations = ['', '', '', '', ''];
+        $conditionComparisonValues = [0, 0, 0, 0, 0];
+        for ($idx = 0; $idx < $sectionCount; ++$idx) {
             if (preg_match($color_regex, $sections[$idx], $matches)) {
-                $colors[$idx] = $matches[0];
-                $sections[$idx] = preg_replace($color_regex, '', $sections[$idx]);
+                if (isset($matches[2])) {
+                    $colors[$idx] = '#' . BIFF8::lookup((int) $matches[2] + 7)['rgb'];
+                } else {
+                    $colors[$idx] = $matches[0];
+                }
+                $sections[$idx] = (string) preg_replace($color_regex, '', $sections[$idx]);
             }
             if (preg_match($cond_regex, $sections[$idx], $matches)) {
-                $condops[$idx] = $matches[1];
-                $condvals[$idx] = $matches[2];
-                $sections[$idx] = preg_replace($cond_regex, '', $sections[$idx]);
+                $conditionOperations[$idx] = $matches[1];
+                $conditionComparisonValues[$idx] = $matches[2];
+                $sections[$idx] = (string) preg_replace($cond_regex, '', $sections[$idx]);
             }
         }
         $color = $colors[0];
         $format = $sections[0];
         $absval = $value;
-        switch ($cnt) {
+        switch ($sectionCount) {
             case 2:
                 $absval = abs($value);
-                if (!self::splitFormatCompare($value, $condops[0], $condvals[0], '>=', 0)) {
+                if (!self::splitFormatComparison($value, $conditionOperations[0], $conditionComparisonValues[0], '>=', 0)) {
                     $color = $colors[1];
                     $format = $sections[1];
                 }
@@ -74,8 +89,8 @@ private static function splitFormat($sections, $value)
             case 3:
             case 4:
                 $absval = abs($value);
-                if (!self::splitFormatCompare($value, $condops[0], $condvals[0], '>', 0)) {
-                    if (self::splitFormatCompare($value, $condops[1], $condvals[1], '<', 0)) {
+                if (!self::splitFormatComparison($value, $conditionOperations[0], $conditionComparisonValues[0], '>', 0)) {
+                    if (self::splitFormatComparison($value, $conditionOperations[1], $conditionComparisonValues[1], '<', 0)) {
                         $color = $colors[1];
                         $format = $sections[1];
                     } else {
@@ -93,57 +108,76 @@ private static function splitFormat($sections, $value)
     /**
      * Convert a value in a pre-defined format to a PHP string.
      *
-     * @param mixed $value Value to format
-     * @param string $format Format code, see = NumberFormat::FORMAT_*
-     * @param array $callBack Callback function for additional formatting of string
+     * @param null|array|bool|float|int|RichText|string $value Value to format
+     * @param string $format Format code: see = self::FORMAT_* for predefined values;
+     *                          or can be any valid MS Excel custom format string
+     * @param ?array $callBack Callback function for additional formatting of string
      *
      * @return string Formatted string
      */
-    public static function toFormattedString($value, $format, $callBack = null)
+    public static function toFormattedString($value, string $format, ?array $callBack = null): string
     {
-        // For now we do not treat strings although section 4 of a format code affects strings
+        while (is_array($value)) {
+            $value = array_shift($value);
+        }
+        if (is_bool($value)) {
+            return $value ? Calculation::getTRUE() : Calculation::getFALSE();
+        }
+        // For now we do not treat strings in sections, although section 4 of a format code affects strings
+        // Process a single block format code containing @ for text substitution
+        if (preg_match(self::SECTION_SPLIT, $format) === 0 && preg_match(self::SYMBOL_AT, $format) === 1) {
+            return str_replace('"', '', preg_replace(self::SYMBOL_AT, (string) $value, $format) ?? '');
+        }
+
+        // If we have a text value, return it "as is"
         if (!is_numeric($value)) {
-            return $value;
+            return (string) $value;
         }
 
         // For 'General' format code, we just pass the value although this is not entirely the way Excel does it,
         // it seems to round numbers to a total of 10 digits.
         if (($format === NumberFormat::FORMAT_GENERAL) || ($format === NumberFormat::FORMAT_TEXT)) {
-            return $value;
+            return self::adjustSeparators((string) $value);
         }
 
-        $format = preg_replace_callback(
+        // Ignore square-$-brackets prefix in format string, like "[$-411]ge.m.d", "[$-010419]0%", etc
+        $format = (string) preg_replace('/^\[\$-[^\]]*\]/', '', $format);
+
+        $format = (string) preg_replace_callback(
             '/(["])(?:(?=(\\\\?))\\2.)*?\\1/u',
-            function ($matches) {
-                return str_replace('.', chr(0x00), $matches[0]);
-            },
+            fn (array $matches): string => str_replace('.', chr(0x00), $matches[0]),
             $format
         );
 
         // Convert any other escaped characters to quoted strings, e.g. (\T to "T")
-        $format = preg_replace('/(\\\(((.)(?!((AM\/PM)|(A\/P))))|([^ ])))(?=(?:[^"]|"[^"]*")*$)/ui', '"${2}"', $format);
+        $format = (string) preg_replace('/(\\\(((.)(?!((AM\/PM)|(A\/P))))|([^ ])))(?=(?:[^"]|"[^"]*")*$)/ui', '"${2}"', $format);
 
         // Get the sections, there can be up to four sections, separated with a semi-colon (but only if not a quoted literal)
-        $sections = preg_split('/(;)(?=(?:[^"]|"[^"]*")*$)/u', $format);
+        $sections = preg_split(self::SECTION_SPLIT, $format) ?: [];
 
-        [$colors, $format, $value] = self::splitFormat($sections, $value);
+        [$colors, $format, $value] = self::splitFormatForSectionSelection($sections, $value);
 
         // In Excel formats, "_" is used to add spacing,
         //    The following character indicates the size of the spacing, which we can't do in HTML, so we just use a standard space
-        $format = preg_replace('/_.?/ui', ' ', $format);
+        $format = (string) preg_replace('/_.?/ui', ' ', $format);
 
         // Let's begin inspecting the format and converting the value to a formatted string
-
-        //  Check for date/time characters (not inside quotes)
-        if (preg_match('/(\[\$[A-Z]*-[0-9A-F]*\])*[hmsdy](?=(?:[^"]|"[^"]*")*$)/miu', $format, $matches)) {
+        if (
+            //  Check for date/time characters (not inside quotes)
+            (preg_match('/(\[\$[A-Z]*-[0-9A-F]*\])*[hmsdy](?=(?:[^"]|"[^"]*")*$)/miu', $format))
+            //  Look out for Currency formats Issue 4124
+            && !(preg_match('/\[\$[A-Z]{3}\]/miu', $format))
+            // A date/time with a decimal time shouldn't have a digit placeholder before the decimal point
+            && (preg_match('/[0\?#]\.(?![^\[]*\])/miu', $format) === 0)
+        ) {
             // datetime format
             $value = DateFormatter::format($value, $format);
         } else {
-            if (substr($format, 0, 1) === '"' && substr($format, -1, 1) === '"' && substr_count($format, '"') === 2) {
+            if (str_starts_with($format, '"') && str_ends_with($format, '"') && substr_count($format, '"') === 2) {
                 $value = substr($format, 1, -1);
             } elseif (preg_match('/[0#, ]%/', $format)) {
-                // % number format
-                $value = PercentageFormatter::format($value, $format);
+                // % number format - avoid weird '-0' problem
+                $value = PercentageFormatter::format(0 + (float) $value, $format);
             } else {
                 $value = NumberFormatter::format($value, $format);
             }
@@ -155,8 +189,6 @@ function ($matches) {
             $value = $writerInstance->$function($value, $colors);
         }
 
-        $value = str_replace(chr(0x00), '.', $value);
-
-        return $value;
+        return str_replace(chr(0x00), '.', $value);
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/FractionFormatter.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/FractionFormatter.php
index 48d927f25d..ff80aa2f53 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/FractionFormatter.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/FractionFormatter.php
@@ -6,31 +6,46 @@
 
 class FractionFormatter extends BaseFormatter
 {
-    public static function format($value, string $format): string
+    /** @param null|bool|float|int|string $value  value to be formatted */
+    public static function format(mixed $value, string $format): string
     {
         $format = self::stripQuotes($format);
+        $value = (float) $value;
+        $absValue = abs($value);
 
         $sign = ($value < 0.0) ? '-' : '';
 
-        $integerPart = floor(abs($value));
-        $decimalPart = trim(fmod(abs($value), 1), '0.');
+        $integerPart = floor($absValue);
+
+        $decimalPart = self::getDecimal((string) $absValue);
+        if ($decimalPart === '0') {
+            return "{$sign}{$integerPart}";
+        }
         $decimalLength = strlen($decimalPart);
         $decimalDivisor = 10 ** $decimalLength;
 
-        $GCD = MathTrig\Gcd::evaluate($decimalPart, $decimalDivisor);
+        preg_match('/(#?.*\?)\/(\?+|\d+)/', $format, $matches);
+        $formatIntegerPart = $matches[1];
 
-        $adjustedDecimalPart = $decimalPart / $GCD;
-        $adjustedDecimalDivisor = $decimalDivisor / $GCD;
+        if (is_numeric($matches[2])) {
+            $fractionDivisor = 100 / (int) $matches[2];
+        } else {
+            /** @var float $fractionDivisor */
+            $fractionDivisor = MathTrig\Gcd::evaluate((int) $decimalPart, $decimalDivisor);
+        }
 
-        if ((strpos($format, '0') !== false)) {
+        $adjustedDecimalPart = (int) round((int) $decimalPart / $fractionDivisor, 0);
+        $adjustedDecimalDivisor = $decimalDivisor / $fractionDivisor;
+
+        if ((str_contains($formatIntegerPart, '0'))) {
             return "{$sign}{$integerPart} {$adjustedDecimalPart}/{$adjustedDecimalDivisor}";
-        } elseif ((strpos($format, '#') !== false)) {
+        } elseif ((str_contains($formatIntegerPart, '#'))) {
             if ($integerPart == 0) {
                 return "{$sign}{$adjustedDecimalPart}/{$adjustedDecimalDivisor}";
             }
 
             return "{$sign}{$integerPart} {$adjustedDecimalPart}/{$adjustedDecimalDivisor}";
-        } elseif ((substr($format, 0, 3) == '? ?')) {
+        } elseif ((str_starts_with($formatIntegerPart, '? ?'))) {
             if ($integerPart == 0) {
                 $integerPart = '';
             }
@@ -42,4 +57,14 @@ public static function format($value, string $format): string
 
         return "{$sign}{$adjustedDecimalPart}/{$adjustedDecimalDivisor}";
     }
+
+    private static function getDecimal(string $value): string
+    {
+        $decimalPart = '0';
+        if (preg_match('/^\\d*[.](\\d*[1-9])0*$/', $value, $matches) === 1) {
+            $decimalPart = $matches[1];
+        }
+
+        return $decimalPart;
+    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/NumberFormatter.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/NumberFormatter.php
index 0a94c33386..ea7aa27c37 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/NumberFormatter.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/NumberFormatter.php
@@ -5,11 +5,11 @@
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
 
-class NumberFormatter
+class NumberFormatter extends BaseFormatter
 {
     private const NUMBER_REGEX = '/(0+)(\\.?)(0*)/';
 
-    private static function mergeComplexNumberFormatMasks($numbers, $masks): array
+    private static function mergeComplexNumberFormatMasks(array $numbers, array $masks): array
     {
         $decimalCount = strlen($numbers[1]);
         $postDecimalMasks = [];
@@ -28,8 +28,9 @@ private static function mergeComplexNumberFormatMasks($numbers, $masks): array
         ];
     }
 
-    private static function processComplexNumberFormatMask($number, $mask): string
+    private static function processComplexNumberFormatMask(mixed $number, string $mask): string
     {
+        /** @var string $result */
         $result = $number;
         $maskingBlockCount = preg_match_all('/0+/', $mask, $maskingBlocks, PREG_OFFSET_CAPTURE);
 
@@ -42,43 +43,99 @@ private static function processComplexNumberFormatMask($number, $mask): string
                 $divisor = 10 ** $size;
                 $offset = $block[1];
 
-                $blockValue = sprintf("%0{$size}d", fmod($number, $divisor));
-                $number = floor($number / $divisor);
+                /** @var float $numberFloat */
+                $numberFloat = $number;
+                $blockValue = sprintf("%0{$size}d", fmod($numberFloat, $divisor));
+                $number = floor($numberFloat / $divisor);
                 $mask = substr_replace($mask, $blockValue, $offset, $size);
             }
+            /** @var string $numberString */
+            $numberString = $number;
             if ($number > 0) {
-                $mask = substr_replace($mask, $number, $offset, 0);
+                $mask = substr_replace($mask, $numberString, $offset, 0);
             }
             $result = $mask;
         }
 
-        return $result;
+        return self::makeString($result);
     }
 
-    private static function complexNumberFormatMask($number, $mask, $splitOnPoint = true): string
+    private static function complexNumberFormatMask(mixed $number, string $mask, bool $splitOnPoint = true): string
     {
-        $sign = ($number < 0.0) ? '-' : '';
-        $number = abs($number);
+        /** @var float $numberFloat */
+        $numberFloat = $number;
+        if ($splitOnPoint) {
+            $masks = explode('.', $mask);
+            if (count($masks) <= 2) {
+                $decmask = $masks[1] ?? '';
+                $decpos = substr_count($decmask, '0');
+                $numberFloat = round($numberFloat, $decpos);
+            }
+        }
+        $sign = ($numberFloat < 0.0) ? '-' : '';
+        $number = self::f2s(abs($numberFloat));
 
-        if ($splitOnPoint && strpos($mask, '.') !== false && strpos($number, '.') !== false) {
+        if ($splitOnPoint && str_contains($mask, '.') && str_contains($number, '.')) {
             $numbers = explode('.', $number);
             $masks = explode('.', $mask);
             if (count($masks) > 2) {
                 $masks = self::mergeComplexNumberFormatMasks($numbers, $masks);
             }
             $integerPart = self::complexNumberFormatMask($numbers[0], $masks[0], false);
+            $numlen = strlen($numbers[1]);
+            $msklen = strlen($masks[1]);
+            if ($numlen < $msklen) {
+                $numbers[1] .= str_repeat('0', $msklen - $numlen);
+            }
             $decimalPart = strrev(self::complexNumberFormatMask(strrev($numbers[1]), strrev($masks[1]), false));
+            $decimalPart = substr($decimalPart, 0, $msklen);
 
             return "{$sign}{$integerPart}.{$decimalPart}";
         }
 
+        if (strlen($number) < strlen($mask)) {
+            $number = str_repeat('0', strlen($mask) - strlen($number)) . $number;
+        }
         $result = self::processComplexNumberFormatMask($number, $mask);
 
         return "{$sign}{$result}";
     }
 
-    private static function formatStraightNumericValue($value, $format, array $matches, $useThousands): string
+    public static function f2s(float $f): string
+    {
+        return self::floatStringConvertScientific((string) $f);
+    }
+
+    public static function floatStringConvertScientific(string $s): string
     {
+        // convert only normalized form of scientific notation:
+        //  optional sign, single digit 1-9,
+        //    decimal point and digits (allowed to be omitted),
+        //    E (e permitted), optional sign, one or more digits
+        if (preg_match('/^([+-])?([1-9])([.]([0-9]+))?[eE]([+-]?[0-9]+)$/', $s, $matches) === 1) {
+            $exponent = (int) $matches[5];
+            $sign = ($matches[1] === '-') ? '-' : '';
+            if ($exponent >= 0) {
+                $exponentPlus1 = $exponent + 1;
+                $out = $matches[2] . $matches[4];
+                $len = strlen($out);
+                if ($len < $exponentPlus1) {
+                    $out .= str_repeat('0', $exponentPlus1 - $len);
+                }
+                $out = substr($out, 0, $exponentPlus1) . ((strlen($out) === $exponentPlus1) ? '' : ('.' . substr($out, $exponentPlus1)));
+                $s = "$sign$out";
+            } else {
+                $s = $sign . '0.' . str_repeat('0', -$exponent - 1) . $matches[2] . $matches[4];
+            }
+        }
+
+        return $s;
+    }
+
+    private static function formatStraightNumericValue(mixed $value, string $format, array $matches, bool $useThousands): string
+    {
+        /** @var float $valueFloat */
+        $valueFloat = $value;
         $left = $matches[1];
         $dec = $matches[2];
         $right = $matches[3];
@@ -87,101 +144,174 @@ private static function formatStraightNumericValue($value, $format, array $match
         $minWidth = strlen($left) + strlen($dec) + strlen($right);
         if ($useThousands) {
             $value = number_format(
-                $value,
+                $valueFloat,
                 strlen($right),
                 StringHelper::getDecimalSeparator(),
                 StringHelper::getThousandsSeparator()
             );
 
-            return preg_replace(self::NUMBER_REGEX, $value, $format);
+            return self::pregReplace(self::NUMBER_REGEX, $value, $format);
         }
 
         if (preg_match('/[0#]E[+-]0/i', $format)) {
             //    Scientific format
-            return sprintf('%5.2E', $value);
+            $decimals = strlen($right);
+            $size = $decimals + 3;
+
+            return sprintf("%{$size}.{$decimals}E", $valueFloat);
         } elseif (preg_match('/0([^\d\.]+)0/', $format) || substr_count($format, '.') > 1) {
-            if ($value == (int) $value && substr_count($format, '.') === 1) {
+            if ($valueFloat == floor($valueFloat) && substr_count($format, '.') === 1) {
                 $value *= 10 ** strlen(explode('.', $format)[1]);
             }
 
-            return self::complexNumberFormatMask($value, $format);
+            $result = self::complexNumberFormatMask($value, $format);
+            if (str_contains($result, 'E')) {
+                // This is a hack and doesn't match Excel.
+                // It will, at least, be an accurate representation,
+                //  even if formatted incorrectly.
+                // This is needed for absolute values >=1E18.
+                $result = self::f2s($valueFloat);
+            }
+
+            return $result;
         }
 
-        $sprintf_pattern = "%0$minWidth." . strlen($right) . 'f';
-        $value = sprintf($sprintf_pattern, $value);
+        $sprintf_pattern = "%0$minWidth." . strlen($right) . 'F';
 
-        return preg_replace(self::NUMBER_REGEX, $value, $format);
+        /** @var float $valueFloat */
+        $valueFloat = $value;
+        $value = self::adjustSeparators(sprintf($sprintf_pattern, round($valueFloat, strlen($right))));
+
+        return self::pregReplace(self::NUMBER_REGEX, $value, $format);
     }
 
-    public static function format($value, $format): string
+    /** @param float|int|numeric-string $value value to be formatted */
+    public static function format(mixed $value, string $format): string
     {
         // The "_" in this string has already been stripped out,
         // so this test is never true. Furthermore, testing
         // on Excel shows this format uses Euro symbol, not "EUR".
-        //if ($format === NumberFormat::FORMAT_CURRENCY_EUR_SIMPLE) {
-        //    return 'EUR ' . sprintf('%1.2f', $value);
-        //}
-
-        // Some non-number strings are quoted, so we'll get rid of the quotes, likewise any positional * symbols
-        $format = str_replace(['"', '*'], '', $format);
+        // if ($format === NumberFormat::FORMAT_CURRENCY_EUR_SIMPLE) {
+        //     return 'EUR ' . sprintf('%1.2f', $value);
+        // }
 
-        // Find out if we need thousands separator
-        // This is indicated by a comma enclosed by a digit placeholder:
-        //        #,#   or   0,0
-        $useThousands = preg_match('/(#,#|0,0)/', $format);
-        if ($useThousands) {
-            $format = preg_replace('/0,0/', '00', $format);
-            $format = preg_replace('/#,#/', '##', $format);
-        }
+        $baseFormat = $format;
 
-        // Scale thousands, millions,...
-        // This is indicated by a number of commas after a digit placeholder:
-        //        #,   or    0.0,,
-        $scale = 1; // same as no scale
-        $matches = [];
-        if (preg_match('/(#|0)(,+)/', $format, $matches)) {
-            $scale = 1000 ** strlen($matches[2]);
+        $useThousands = self::areThousandsRequired($format);
+        $scale = self::scaleThousandsMillions($format);
 
-            // strip the commas
-            $format = preg_replace('/0,+/', '0', $format);
-            $format = preg_replace('/#,+/', '#', $format);
-        }
-        if (preg_match('/#?.*\?\/\?/', $format, $m)) {
-            if ($value != (int) $value) {
-                $value = FractionFormatter::format($value, $format);
-            }
+        if (preg_match('/[#\?0]?.*[#\?0]\/(\?+|\d+|#)/', $format)) {
+            // It's a dirty hack; but replace # and 0 digit placeholders with ?
+            $format = (string) preg_replace('/[#0]+\//', '?/', $format);
+            $format = (string) preg_replace('/\/[#0]+/', '/?', $format);
+            $value = FractionFormatter::format($value, $format);
         } else {
             // Handle the number itself
-
             // scale number
             $value = $value / $scale;
-            // Strip #
-            $format = preg_replace('/\\#/', '0', $format);
-            // Remove locale code [$-###]
-            $format = preg_replace('/\[\$\-.*\]/', '', $format);
+            $paddingPlaceholder = (str_contains($format, '?'));
+
+            // Replace # or ? with 0
+            $format = self::pregReplace('/[\\#\?](?=(?:[^"]*"[^"]*")*[^"]*\Z)/', '0', $format);
+            // Remove locale code [$-###] for an LCID
+            $format = self::pregReplace('/\[\$\-.*\]/', '', $format);
 
             $n = '/\\[[^\\]]+\\]/';
-            $m = preg_replace($n, '', $format);
+            $m = self::pregReplace($n, '', $format);
+
+            // Some non-number strings are quoted, so we'll get rid of the quotes, likewise any positional * symbols
+            $format = self::makeString(str_replace(['"', '*'], '', $format));
             if (preg_match(self::NUMBER_REGEX, $m, $matches)) {
                 // There are placeholders for digits, so inject digits from the value into the mask
                 $value = self::formatStraightNumericValue($value, $format, $matches, $useThousands);
+                if ($paddingPlaceholder === true) {
+                    $value = self::padValue($value, $baseFormat);
+                }
             } elseif ($format !== NumberFormat::FORMAT_GENERAL) {
                 // Yes, I know that this is basically just a hack;
                 //      if there's no placeholders for digits, just return the format mask "as is"
-                $value = str_replace('?', '', $format ?? '');
+                $value = self::makeString(str_replace('?', '', $format));
             }
         }
 
         if (preg_match('/\[\$(.*)\]/u', $format, $m)) {
             //  Currency or Accounting
+            $value = preg_replace('/-0+(( |\\xc2\\xa0))?\\[/', '- [', (string) $value) ?? $value;
             $currencyCode = $m[1];
             [$currencyCode] = explode('-', $currencyCode);
             if ($currencyCode == '') {
                 $currencyCode = StringHelper::getCurrencyCode();
             }
-            $value = preg_replace('/\[\$([^\]]*)\]/u', $currencyCode, $value);
+            $value = self::pregReplace('/\[\$([^\]]*)\]/u', $currencyCode, (string) $value);
+        }
+
+        if (
+            (str_contains((string) $value, '0.'))
+            && ((str_contains($baseFormat, '#.')) || (str_contains($baseFormat, '?.')))
+        ) {
+            $value = preg_replace('/(\b)0\.|([^\d])0\./', '${2}.', (string) $value);
+        }
+
+        return (string) $value;
+    }
+
+    private static function makeString(array|string $value): string
+    {
+        return is_array($value) ? '' : "$value";
+    }
+
+    private static function pregReplace(string $pattern, string $replacement, string $subject): string
+    {
+        return self::makeString(preg_replace($pattern, $replacement, $subject) ?? '');
+    }
+
+    public static function padValue(string $value, string $baseFormat): string
+    {
+        $preDecimal = $postDecimal = '';
+        $pregArray = preg_split('/\.(?=(?:[^"]*"[^"]*")*[^"]*\Z)/miu', $baseFormat . '.?');
+        if (is_array($pregArray)) {
+            $preDecimal = $pregArray[0] ?? '';
+            $postDecimal = $pregArray[1] ?? '';
+        }
+
+        $length = strlen($value);
+        if (str_contains($postDecimal, '?')) {
+            $value = str_pad(rtrim($value, '0. '), $length, ' ', STR_PAD_RIGHT);
+        }
+        if (str_contains($preDecimal, '?')) {
+            $value = str_pad(ltrim($value, '0, '), $length, ' ', STR_PAD_LEFT);
         }
 
         return $value;
     }
+
+    /**
+     * Find out if we need thousands separator
+     * This is indicated by a comma enclosed by a digit placeholders: #, 0 or ?
+     */
+    public static function areThousandsRequired(string &$format): bool
+    {
+        $useThousands = (bool) preg_match('/([#\?0]),([#\?0])/', $format);
+        if ($useThousands) {
+            $format = self::pregReplace('/([#\?0]),([#\?0])/', '${1}${2}', $format);
+        }
+
+        return $useThousands;
+    }
+
+    /**
+     * Scale thousands, millions,...
+     * This is indicated by a number of commas after a digit placeholder: #, or 0.0,, or ?,.
+     */
+    public static function scaleThousandsMillions(string &$format): int
+    {
+        $scale = 1; // same as no scale
+        if (preg_match('/(#|0|\?)(,+)/', $format, $matches)) {
+            $scale = 1000 ** strlen($matches[2]);
+            // strip the commas
+            $format = self::pregReplace('/([#\?0]),+/', '${1}', $format);
+        }
+
+        return $scale;
+    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/PercentageFormatter.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/PercentageFormatter.php
index cf1731ec85..bb5b355498 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/PercentageFormatter.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/PercentageFormatter.php
@@ -6,6 +6,7 @@
 
 class PercentageFormatter extends BaseFormatter
 {
+    /** @param float|int $value */
     public static function format($value, string $format): string
     {
         if ($format === NumberFormat::FORMAT_PERCENTAGE) {
@@ -19,8 +20,9 @@ public static function format($value, string $format): string
         $vDecimalCount = strlen(rtrim($vDecimals, '0'));
 
         $format = str_replace('%', '%%', $format);
-        $wholePartSize = strlen((string) floor($value));
-        $decimalPartSize = $placeHolders = 0;
+        $wholePartSize = strlen((string) floor(abs($value)));
+        $decimalPartSize = 0;
+        $placeHolders = '';
         // Number of decimals
         if (preg_match('/\.([?0]+)/u', $format, $matches)) {
             $decimalPartSize = strlen($matches[1]);
@@ -29,14 +31,18 @@ public static function format($value, string $format): string
             $placeHolders = str_repeat(' ', strlen($matches[1]) - $decimalPartSize);
         }
         // Number of digits to display before the decimal
-        if (preg_match('/([#0,]+)\./u', $format, $matches)) {
-            $wholePartSize = max($wholePartSize, strlen($matches[1]));
+        if (preg_match('/([#0,]+)\.?/u', $format, $matches)) {
+            $firstZero = preg_replace('/^[#,]*/', '', $matches[1]) ?? '';
+            $wholePartSize = max($wholePartSize, strlen($firstZero));
         }
 
-        $wholePartSize += $decimalPartSize;
-        $replacement = "{$wholePartSize}.{$decimalPartSize}";
-        $mask = preg_replace('/[#0,]+\.?[?#0,]*/ui', "%{$replacement}f{$placeHolders}", $format);
+        $wholePartSize += $decimalPartSize + (int) ($decimalPartSize > 0);
+        $replacement = "0{$wholePartSize}.{$decimalPartSize}";
+        $mask = (string) preg_replace('/[#0,]+\.?[?#0,]*/ui', "%{$replacement}F{$placeHolders}", $format);
 
-        return sprintf($mask, $value);
+        /** @var float $valueFloat */
+        $valueFloat = $value;
+
+        return self::adjustSeparators(sprintf($mask, round($valueFloat, $decimalPartSize)));
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Accounting.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Accounting.php
new file mode 100644
index 0000000000..0c90a713b8
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Accounting.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat\Wizard;
+
+use NumberFormatter;
+use PhpOffice\PhpSpreadsheet\Exception;
+
+class Accounting extends CurrencyBase
+{
+    protected ?bool $overrideSpacing = true;
+
+    protected ?CurrencyNegative $overrideNegative = CurrencyNegative::parentheses;
+
+    /**
+     * @throws Exception if the Intl extension and ICU version don't support Accounting formats
+     */
+    protected function getLocaleFormat(): string
+    {
+        if (self::icuVersion() < 53.0) {
+            // @codeCoverageIgnoreStart
+            throw new Exception('The Intl extension does not support Accounting Formats without ICU 53');
+            // @codeCoverageIgnoreEnd
+        }
+
+        // Scrutinizer does not recognize CURRENCY_ACCOUNTING
+        $formatter = new Locale($this->fullLocale, NumberFormatter::CURRENCY_ACCOUNTING);
+        $mask = $formatter->format($this->stripLeadingRLM);
+        if ($this->decimals === 0) {
+            $mask = (string) preg_replace('/\.0+/miu', '', $mask);
+        }
+
+        return str_replace('¤', $this->formatCurrencyCode(), $mask);
+    }
+
+    public static function icuVersion(): float
+    {
+        [$major, $minor] = explode('.', INTL_ICU_VERSION);
+
+        return (float) "{$major}.{$minor}";
+    }
+
+    private function formatCurrencyCode(): string
+    {
+        if ($this->locale === null) {
+            return $this->currencyCode . '*';
+        }
+
+        return "[\${$this->currencyCode}-{$this->locale}]";
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Currency.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Currency.php
new file mode 100644
index 0000000000..e5828a152a
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Currency.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat\Wizard;
+
+class Currency extends CurrencyBase
+{
+    protected ?bool $overrideSpacing = false;
+
+    protected ?CurrencyNegative $overrideNegative = null;
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/CurrencyBase.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/CurrencyBase.php
new file mode 100644
index 0000000000..59e76db62a
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/CurrencyBase.php
@@ -0,0 +1,236 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat\Wizard;
+
+use NumberFormatter;
+use PhpOffice\PhpSpreadsheet\Exception;
+
+class CurrencyBase extends Number
+{
+    public const LEADING_SYMBOL = true;
+
+    public const TRAILING_SYMBOL = false;
+
+    public const SYMBOL_WITH_SPACING = true;
+
+    public const SYMBOL_WITHOUT_SPACING = false;
+
+    protected string $currencyCode = '$';
+
+    protected bool $currencySymbolPosition = self::LEADING_SYMBOL;
+
+    protected bool $currencySymbolSpacing = self::SYMBOL_WITHOUT_SPACING;
+
+    protected const DEFAULT_STRIP_LEADING_RLM = false;
+
+    protected bool $stripLeadingRLM = self::DEFAULT_STRIP_LEADING_RLM;
+
+    public const DEFAULT_NEGATIVE = CurrencyNegative::minus;
+
+    protected CurrencyNegative $negative = CurrencyNegative::minus;
+
+    protected ?bool $overrideSpacing = null;
+
+    protected ?CurrencyNegative $overrideNegative = null;
+
+    // Not sure why original code uses nbsp
+    private string $spaceOrNbsp = ' '; // or "\u{a0}"
+
+    /**
+     * @param string $currencyCode the currency symbol or code to display for this mask
+     * @param int $decimals number of decimal places to display, in the range 0-30
+     * @param bool $thousandsSeparator indicator whether the thousands separator should be used, or not
+     * @param bool $currencySymbolPosition indicates whether the currency symbol comes before or after the value
+     *              Possible values are Currency::LEADING_SYMBOL and Currency::TRAILING_SYMBOL
+     * @param bool $currencySymbolSpacing indicates whether there is spacing between the currency symbol and the value
+     *              Possible values are Currency::SYMBOL_WITH_SPACING and Currency::SYMBOL_WITHOUT_SPACING
+     *              However, Currency always uses WITHOUT and Accounting always uses WITH
+     * @param ?string $locale Set the locale for the currency format; or leave as the default null.
+     *          If provided, Locale values must be a valid formatted locale string (e.g. 'en-GB', 'fr', uz-Arab-AF).
+     *          Note that setting a locale will override any other settings defined in this class
+     *          other than the currency code; or decimals (unless the decimals value is set to 0).
+     * @param bool $stripLeadingRLM remove leading RLM added with
+     *          ICU 72.1+.
+     * @param CurrencyNegative $negative How to display negative numbers.
+     *                         Always use parentheses for Accounting.
+     *                         4 options for Currency.
+     *
+     * @throws Exception If a provided locale code is not a valid format
+     */
+    public function __construct(
+        string $currencyCode = '$',
+        int $decimals = 2,
+        bool $thousandsSeparator = true,
+        bool $currencySymbolPosition = self::LEADING_SYMBOL,
+        bool $currencySymbolSpacing = self::SYMBOL_WITHOUT_SPACING,
+        ?string $locale = null,
+        bool $stripLeadingRLM = self::DEFAULT_STRIP_LEADING_RLM,
+        CurrencyNegative $negative = CurrencyNegative::minus
+    ) {
+        $this->setCurrencyCode($currencyCode);
+        $this->setThousandsSeparator($thousandsSeparator);
+        $this->setDecimals($decimals);
+        $this->setCurrencySymbolPosition($currencySymbolPosition);
+        $this->setCurrencySymbolSpacing($currencySymbolSpacing);
+        $this->setLocale($locale);
+        $this->stripLeadingRLM = $stripLeadingRLM;
+        $this->negative = $negative;
+    }
+
+    public function setCurrencyCode(string $currencyCode): void
+    {
+        $this->currencyCode = $currencyCode;
+    }
+
+    public function setCurrencySymbolPosition(bool $currencySymbolPosition = self::LEADING_SYMBOL): void
+    {
+        $this->currencySymbolPosition = $currencySymbolPosition;
+    }
+
+    public function setCurrencySymbolSpacing(bool $currencySymbolSpacing = self::SYMBOL_WITHOUT_SPACING): void
+    {
+        $this->currencySymbolSpacing = $currencySymbolSpacing;
+    }
+
+    public function setStripLeadingRLM(bool $stripLeadingRLM): void
+    {
+        $this->stripLeadingRLM = $stripLeadingRLM;
+    }
+
+    public function setNegative(CurrencyNegative $negative): void
+    {
+        $this->negative = $negative;
+    }
+
+    protected function getLocaleFormat(): string
+    {
+        $formatter = new Locale($this->fullLocale, NumberFormatter::CURRENCY);
+        $mask = $formatter->format($this->stripLeadingRLM);
+        if ($this->decimals === 0) {
+            $mask = (string) preg_replace('/\.0+/miu', '', $mask);
+        }
+
+        return str_replace('¤', $this->formatCurrencyCode(), $mask);
+    }
+
+    private function formatCurrencyCode(): string
+    {
+        if ($this->locale === null) {
+            return $this->currencyCode;
+        }
+
+        return "[\${$this->currencyCode}-{$this->locale}]";
+    }
+
+    public function format(): string
+    {
+        if ($this->localeFormat !== null) {
+            return $this->localeFormat;
+        }
+        $symbolWithSpacing = $this->overrideSpacing ?? ($this->currencySymbolSpacing === self::SYMBOL_WITH_SPACING);
+        $negative = $this->overrideNegative ?? $this->negative;
+
+        // format if positive
+        $format = '_(';
+        if ($this->currencySymbolPosition === self::LEADING_SYMBOL) {
+            $format .= '"' . $this->currencyCode . '"';
+            if (preg_match('/^[A-Z]{3}$/i', $this->currencyCode) === 1) {
+                $format .= $this->spaceOrNbsp;
+            }
+            if (preg_match('/^[A-Z]{3}$/i', $this->currencyCode) === 1) {
+                $format .= $this->spaceOrNbsp;
+            }
+            if ($symbolWithSpacing) {
+                $format .= '*' . $this->spaceOrNbsp;
+            }
+        }
+        $format .= $this->thousandsSeparator ? '#,##0' : '0';
+        if ($this->decimals > 0) {
+            $format .= '.' . str_repeat('0', $this->decimals);
+        }
+        if ($this->currencySymbolPosition === self::TRAILING_SYMBOL) {
+            if ($symbolWithSpacing) {
+                $format .= $this->spaceOrNbsp;
+            } elseif (preg_match('/^[A-Z]{3}$/i', $this->currencyCode) === 1) {
+                $format .= $this->spaceOrNbsp;
+            }
+            $format .= '[$' . $this->currencyCode . ']';
+        }
+        $format .= '_)';
+
+        // format if negative
+        $format .= ';_(';
+        $format .= $negative->color();
+        $negativeStart = $negative->start();
+        if ($this->currencySymbolPosition === self::LEADING_SYMBOL) {
+            if ($negativeStart === '-' && !$symbolWithSpacing) {
+                $format .= $negativeStart;
+            }
+            $format .= '"' . $this->currencyCode . '"';
+            if (preg_match('/^[A-Z]{3}$/i', $this->currencyCode) === 1) {
+                $format .= $this->spaceOrNbsp;
+            }
+            if ($symbolWithSpacing) {
+                $format .= '*' . $this->spaceOrNbsp;
+            }
+            if ($negativeStart === '\\(' || ($symbolWithSpacing && $negativeStart === '-')) {
+                $format .= $negativeStart;
+            }
+        } else {
+            $format .= $negative->start();
+        }
+        $format .= $this->thousandsSeparator ? '#,##0' : '0';
+        if ($this->decimals > 0) {
+            $format .= '.' . str_repeat('0', $this->decimals);
+        }
+        $format .= $negative->end();
+        if ($this->currencySymbolPosition === self::TRAILING_SYMBOL) {
+            if ($symbolWithSpacing) {
+                // Do nothing - I can't figure out how to get
+                // everything to align if I put any kind of space here.
+                //$format .= "\u{2009}";
+            } elseif (preg_match('/^[A-Z]{3}$/i', $this->currencyCode) === 1) {
+                $format .= $this->spaceOrNbsp;
+            }
+            $format .= '[$' . $this->currencyCode . ']';
+        }
+        if ($this->currencySymbolPosition === self::TRAILING_SYMBOL) {
+            $format .= '_)';
+        } elseif ($symbolWithSpacing && $negativeStart === '-') {
+            $format .= ' ';
+        }
+        // format if zero
+        $format .= ';_(';
+        if ($this->currencySymbolPosition === self::LEADING_SYMBOL) {
+            $format .= '"' . $this->currencyCode . '"';
+        }
+        if ($symbolWithSpacing) {
+            if ($this->currencySymbolPosition === self::LEADING_SYMBOL) {
+                $format .= '*' . $this->spaceOrNbsp;
+            }
+            $format .= '"-"';
+            if ($this->decimals > 0) {
+                $format .= str_repeat('?', $this->decimals);
+            }
+        } else {
+            if (preg_match('/^[A-Z]{3}$/i', $this->currencyCode) === 1) {
+                $format .= $this->spaceOrNbsp;
+            }
+            $format .= '0';
+            if ($this->decimals > 0) {
+                $format .= '.' . str_repeat('0', $this->decimals);
+            }
+        }
+        if ($this->currencySymbolPosition === self::TRAILING_SYMBOL) {
+            if ($symbolWithSpacing) {
+                $format .= $this->spaceOrNbsp;
+            }
+            $format .= '[$' . $this->currencyCode . ']';
+        }
+        $format .= '_)';
+        // format if text
+        $format .= ';_(@_)';
+
+        return $format;
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/CurrencyNegative.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/CurrencyNegative.php
new file mode 100644
index 0000000000..d075d80af8
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/CurrencyNegative.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat\Wizard;
+
+enum CurrencyNegative
+{
+    case minus;
+    case redMinus;
+    case parentheses;
+    case redParentheses;
+
+    public function start(): string
+    {
+        return match ($this) {
+            self::minus, self::redMinus => '-',
+            self::parentheses, self::redParentheses => '\\(',
+        };
+    }
+
+    public function end(): string
+    {
+        return match ($this) {
+            self::minus, self::redMinus => '',
+            self::parentheses, self::redParentheses => '\\)',
+        };
+    }
+
+    public function color(): string
+    {
+        return match ($this) {
+            self::redParentheses, self::redMinus => '[Red]',
+            self::parentheses, self::minus => '',
+        };
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Date.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Date.php
new file mode 100644
index 0000000000..61ac117b79
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Date.php
@@ -0,0 +1,125 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat\Wizard;
+
+class Date extends DateTimeWizard
+{
+    /**
+     * Year (4 digits), e.g. 2023.
+     */
+    public const YEAR_FULL = 'yyyy';
+
+    /**
+     * Year (last 2 digits), e.g. 23.
+     */
+    public const YEAR_SHORT = 'yy';
+
+    public const MONTH_FIRST_LETTER = 'mmmmm';
+    /**
+     * Month name, long form, e.g. January.
+     */
+    public const MONTH_NAME_FULL = 'mmmm';
+    /**
+     * Month name, short form, e.g. Jan.
+     */
+    public const MONTH_NAME_SHORT = 'mmm';
+    /**
+     * Month number with a leading zero if required, e.g. 01.
+     */
+    public const MONTH_NUMBER_LONG = 'mm';
+
+    /**
+     * Month number without a leading zero, e.g. 1.
+     */
+    public const MONTH_NUMBER_SHORT = 'm';
+
+    /**
+     * Day of the week, full form, e.g. Tuesday.
+     */
+    public const WEEKDAY_NAME_LONG = 'dddd';
+
+    /**
+     * Day of the week, short form, e.g. Tue.
+     */
+    public const WEEKDAY_NAME_SHORT = 'ddd';
+
+    /**
+     * Day number with a leading zero, e.g. 03.
+     */
+    public const DAY_NUMBER_LONG = 'dd';
+
+    /**
+     * Day number without a leading zero, e.g. 3.
+     */
+    public const DAY_NUMBER_SHORT = 'd';
+
+    protected const DATE_BLOCKS = [
+        self::YEAR_FULL,
+        self::YEAR_SHORT,
+        self::MONTH_FIRST_LETTER,
+        self::MONTH_NAME_FULL,
+        self::MONTH_NAME_SHORT,
+        self::MONTH_NUMBER_LONG,
+        self::MONTH_NUMBER_SHORT,
+        self::WEEKDAY_NAME_LONG,
+        self::WEEKDAY_NAME_SHORT,
+        self::DAY_NUMBER_LONG,
+        self::DAY_NUMBER_SHORT,
+    ];
+
+    public const SEPARATOR_DASH = '-';
+    public const SEPARATOR_DOT = '.';
+    public const SEPARATOR_SLASH = '/';
+    public const SEPARATOR_SPACE_NONBREAKING = "\u{a0}";
+    public const SEPARATOR_SPACE = ' ';
+
+    protected const DATE_DEFAULT = [
+        self::YEAR_FULL,
+        self::MONTH_NUMBER_LONG,
+        self::DAY_NUMBER_LONG,
+    ];
+
+    /**
+     * @var string[]
+     */
+    protected array $separators;
+
+    /**
+     * @var string[]
+     */
+    protected array $formatBlocks;
+
+    /**
+     * @param null|string|string[] $separators
+     *        If you want to use the same separator for all format blocks, then it can be passed as a string literal;
+     *           if you wish to use different separators, then they should be passed as an array.
+     *        If you want to use only a single format block, then pass a null as the separator argument
+     */
+    public function __construct($separators = self::SEPARATOR_DASH, string ...$formatBlocks)
+    {
+        $separators ??= self::SEPARATOR_DASH;
+        $formatBlocks = (count($formatBlocks) === 0) ? self::DATE_DEFAULT : $formatBlocks;
+
+        $this->separators = $this->padSeparatorArray(
+            is_array($separators) ? $separators : [$separators],
+            count($formatBlocks) - 1
+        );
+        $this->formatBlocks = array_map([$this, 'mapFormatBlocks'], $formatBlocks);
+    }
+
+    private function mapFormatBlocks(string $value): string
+    {
+        // Any date masking codes are returned as lower case values
+        if (in_array(mb_strtolower($value), self::DATE_BLOCKS, true)) {
+            return mb_strtolower($value);
+        }
+
+        // Wrap any string literals in quotes, so that they're clearly defined as string literals
+        return $this->wrapLiteral($value);
+    }
+
+    public function format(): string
+    {
+        return implode('', array_map([$this, 'intersperse'], $this->formatBlocks, $this->separators));
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/DateTime.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/DateTime.php
new file mode 100644
index 0000000000..c0fdeed440
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/DateTime.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat\Wizard;
+
+class DateTime extends DateTimeWizard
+{
+    /**
+     * @var string[]
+     */
+    protected array $separators;
+
+    /**
+     * @var array<DateTimeWizard|string>
+     */
+    protected array $formatBlocks;
+
+    /**
+     * @param null|string|string[] $separators
+     *          If you want to use only a single format block, then pass a null as the separator argument
+     * @param DateTimeWizard|string ...$formatBlocks
+     */
+    public function __construct($separators, ...$formatBlocks)
+    {
+        $this->separators = $this->padSeparatorArray(
+            is_array($separators) ? $separators : [$separators],
+            count($formatBlocks) - 1
+        );
+        $this->formatBlocks = array_map([$this, 'mapFormatBlocks'], $formatBlocks);
+    }
+
+    private function mapFormatBlocks(DateTimeWizard|string $value): string
+    {
+        // Any date masking codes are returned as lower case values
+        if ($value instanceof DateTimeWizard) {
+            return $value->__toString();
+        }
+
+        // Wrap any string literals in quotes, so that they're clearly defined as string literals
+        return $this->wrapLiteral($value);
+    }
+
+    public function format(): string
+    {
+        return implode('', array_map([$this, 'intersperse'], $this->formatBlocks, $this->separators));
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/DateTimeWizard.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/DateTimeWizard.php
new file mode 100644
index 0000000000..8cd7da7cd0
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/DateTimeWizard.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat\Wizard;
+
+use Stringable;
+
+abstract class DateTimeWizard implements Stringable, Wizard
+{
+    protected const NO_ESCAPING_NEEDED = "$+-/():!^&'~{}<>= ";
+
+    protected function padSeparatorArray(array $separators, int $count): array
+    {
+        $lastSeparator = array_pop($separators);
+
+        return $separators + array_fill(0, $count, $lastSeparator);
+    }
+
+    protected function escapeSingleCharacter(string $value): string
+    {
+        if (str_contains(self::NO_ESCAPING_NEEDED, $value)) {
+            return $value;
+        }
+
+        return "\\{$value}";
+    }
+
+    protected function wrapLiteral(string $value): string
+    {
+        if (mb_strlen($value, 'UTF-8') === 1) {
+            return $this->escapeSingleCharacter($value);
+        }
+
+        // Wrap any other string literals in quotes, so that they're clearly defined as string literals
+        return '"' . str_replace('"', '""', $value) . '"';
+    }
+
+    protected function intersperse(string $formatBlock, ?string $separator): string
+    {
+        return "{$formatBlock}{$separator}";
+    }
+
+    public function __toString(): string
+    {
+        return $this->format();
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Duration.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Duration.php
new file mode 100644
index 0000000000..b81f77acb7
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Duration.php
@@ -0,0 +1,153 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat\Wizard;
+
+class Duration extends DateTimeWizard
+{
+    public const DAYS_DURATION = 'd';
+
+    /**
+     * Hours as a duration (can exceed 24), e.g. 29.
+     */
+    public const HOURS_DURATION = '[h]';
+
+    /**
+     * Hours without a leading zero, e.g. 9.
+     */
+    public const HOURS_SHORT = 'h';
+
+    /**
+     * Hours with a leading zero, e.g. 09.
+     */
+    public const HOURS_LONG = 'hh';
+
+    /**
+     * Minutes as a duration (can exceed 60), e.g. 109.
+     */
+    public const MINUTES_DURATION = '[m]';
+
+    /**
+     * Minutes without a leading zero, e.g. 5.
+     */
+    public const MINUTES_SHORT = 'm';
+
+    /**
+     * Minutes with a leading zero, e.g. 05.
+     */
+    public const MINUTES_LONG = 'mm';
+
+    /**
+     * Seconds as a duration (can exceed 60), e.g. 129.
+     */
+    public const SECONDS_DURATION = '[s]';
+
+    /**
+     * Seconds without a leading zero, e.g. 2.
+     */
+    public const SECONDS_SHORT = 's';
+
+    /**
+     * Seconds with a leading zero, e.g. 02.
+     */
+    public const SECONDS_LONG = 'ss';
+
+    protected const DURATION_BLOCKS = [
+        self::DAYS_DURATION,
+        self::HOURS_DURATION,
+        self::HOURS_LONG,
+        self::HOURS_SHORT,
+        self::MINUTES_DURATION,
+        self::MINUTES_LONG,
+        self::MINUTES_SHORT,
+        self::SECONDS_DURATION,
+        self::SECONDS_LONG,
+        self::SECONDS_SHORT,
+    ];
+
+    protected const DURATION_MASKS = [
+        self::DAYS_DURATION => self::DAYS_DURATION,
+        self::HOURS_DURATION => self::HOURS_SHORT,
+        self::MINUTES_DURATION => self::MINUTES_LONG,
+        self::SECONDS_DURATION => self::SECONDS_LONG,
+    ];
+
+    protected const DURATION_DEFAULTS = [
+        self::HOURS_LONG => self::HOURS_DURATION,
+        self::HOURS_SHORT => self::HOURS_DURATION,
+        self::MINUTES_LONG => self::MINUTES_DURATION,
+        self::MINUTES_SHORT => self::MINUTES_DURATION,
+        self::SECONDS_LONG => self::SECONDS_DURATION,
+        self::SECONDS_SHORT => self::SECONDS_DURATION,
+    ];
+
+    public const SEPARATOR_COLON = ':';
+    public const SEPARATOR_SPACE_NONBREAKING = "\u{a0}";
+    public const SEPARATOR_SPACE = ' ';
+
+    public const DURATION_DEFAULT = [
+        self::HOURS_DURATION,
+        self::MINUTES_LONG,
+        self::SECONDS_LONG,
+    ];
+
+    /**
+     * @var string[]
+     */
+    protected array $separators;
+
+    /**
+     * @var string[]
+     */
+    protected array $formatBlocks;
+
+    protected bool $durationIsSet = false;
+
+    /**
+     * @param null|string|string[] $separators
+     *        If you want to use the same separator for all format blocks, then it can be passed as a string literal;
+     *           if you wish to use different separators, then they should be passed as an array.
+     *        If you want to use only a single format block, then pass a null as the separator argument
+     */
+    public function __construct($separators = self::SEPARATOR_COLON, string ...$formatBlocks)
+    {
+        $separators ??= self::SEPARATOR_COLON;
+        $formatBlocks = (count($formatBlocks) === 0) ? self::DURATION_DEFAULT : $formatBlocks;
+
+        $this->separators = $this->padSeparatorArray(
+            is_array($separators) ? $separators : [$separators],
+            count($formatBlocks) - 1
+        );
+        $this->formatBlocks = array_map([$this, 'mapFormatBlocks'], $formatBlocks);
+
+        if ($this->durationIsSet === false) {
+            // We need at least one duration mask, so if none has been set we change the first mask element
+            //    to a duration.
+            $this->formatBlocks[0] = self::DURATION_DEFAULTS[mb_strtolower($this->formatBlocks[0])];
+        }
+    }
+
+    private function mapFormatBlocks(string $value): string
+    {
+        // Any duration masking codes are returned as lower case values
+        if (in_array(mb_strtolower($value), self::DURATION_BLOCKS, true)) {
+            if (array_key_exists(mb_strtolower($value), self::DURATION_MASKS)) {
+                if ($this->durationIsSet) {
+                    // We should only have a single duration mask, the first defined in the mask set,
+                    //    so convert any additional duration masks to standard time masks.
+                    $value = self::DURATION_MASKS[mb_strtolower($value)];
+                }
+                $this->durationIsSet = true;
+            }
+
+            return mb_strtolower($value);
+        }
+
+        // Wrap any string literals in quotes, so that they're clearly defined as string literals
+        return $this->wrapLiteral($value);
+    }
+
+    public function format(): string
+    {
+        return implode('', array_map([$this, 'intersperse'], $this->formatBlocks, $this->separators));
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Locale.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Locale.php
new file mode 100644
index 0000000000..0c02286be6
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Locale.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat\Wizard;
+
+use NumberFormatter;
+use PhpOffice\PhpSpreadsheet\Exception;
+
+final class Locale
+{
+    /**
+     * Language code: ISO-639 2 character, alpha.
+     * Optional script code: ISO-15924 4 alpha.
+     * Optional country code: ISO-3166-1, 2 character alpha.
+     * Separated by underscores or dashes.
+     */
+    public const STRUCTURE = '/^(?P<language>[a-z]{2})([-_](?P<script>[a-z]{4}))?([-_](?P<country>[a-z]{2}))?$/i';
+
+    private NumberFormatter $formatter;
+
+    public function __construct(?string $locale, int $style)
+    {
+        if (class_exists(NumberFormatter::class) === false) {
+            throw new Exception();
+        }
+
+        $formatterLocale = str_replace('-', '_', $locale ?? '');
+        $this->formatter = new NumberFormatter($formatterLocale, $style);
+        if ($this->formatter->getLocale() !== $formatterLocale) {
+            throw new Exception("Unable to read locale data for '{$locale}'");
+        }
+    }
+
+    public function format(bool $stripRlm = true): string
+    {
+        $str = $this->formatter->getPattern();
+
+        return ($stripRlm && str_starts_with($str, "\xe2\x80\x8f")) ? substr($str, 3) : $str;
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Number.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Number.php
new file mode 100644
index 0000000000..d7e7cd07fd
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Number.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat\Wizard;
+
+use PhpOffice\PhpSpreadsheet\Exception;
+
+class Number extends NumberBase implements Wizard
+{
+    public const WITH_THOUSANDS_SEPARATOR = true;
+
+    public const WITHOUT_THOUSANDS_SEPARATOR = false;
+
+    protected bool $thousandsSeparator = true;
+
+    /**
+     * @param int $decimals number of decimal places to display, in the range 0-30
+     * @param bool $thousandsSeparator indicator whether the thousands separator should be used, or not
+     * @param ?string $locale Set the locale for the number format; or leave as the default null.
+     *          Locale has no effect for Number Format values, and is retained here only for compatibility
+     *              with the other Wizards.
+     *          If provided, Locale values must be a valid formatted locale string (e.g. 'en-GB', 'fr', uz-Arab-AF).
+     *
+     * @throws Exception If a provided locale code is not a valid format
+     */
+    public function __construct(
+        int $decimals = 2,
+        bool $thousandsSeparator = self::WITH_THOUSANDS_SEPARATOR,
+        ?string $locale = null
+    ) {
+        $this->setDecimals($decimals);
+        $this->setThousandsSeparator($thousandsSeparator);
+        $this->setLocale($locale);
+    }
+
+    public function setThousandsSeparator(bool $thousandsSeparator = self::WITH_THOUSANDS_SEPARATOR): void
+    {
+        $this->thousandsSeparator = $thousandsSeparator;
+    }
+
+    /**
+     * As MS Excel cannot easily handle Lakh, which is the only locale-specific Number format variant,
+     *       we don't use locale with Numbers.
+     */
+    protected function getLocaleFormat(): string
+    {
+        return $this->format();
+    }
+
+    public function format(): string
+    {
+        return sprintf(
+            '%s0%s',
+            $this->thousandsSeparator ? '#,##' : null,
+            $this->decimals > 0 ? '.' . str_repeat('0', $this->decimals) : null
+        );
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/NumberBase.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/NumberBase.php
new file mode 100644
index 0000000000..53f6b3dd8b
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/NumberBase.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat\Wizard;
+
+use NumberFormatter;
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+use Stringable;
+
+abstract class NumberBase implements Stringable
+{
+    protected const MAX_DECIMALS = 30;
+
+    protected int $decimals = 2;
+
+    protected ?string $locale = null;
+
+    protected ?string $fullLocale = null;
+
+    protected ?string $localeFormat = null;
+
+    public function setDecimals(int $decimals = 2): void
+    {
+        $this->decimals = ($decimals > self::MAX_DECIMALS) ? self::MAX_DECIMALS : max($decimals, 0);
+    }
+
+    /**
+     * Setting a locale will override any settings defined in this class.
+     *
+     * @throws Exception If the locale code is not a valid format
+     */
+    public function setLocale(?string $locale = null): void
+    {
+        if ($locale === null) {
+            $this->localeFormat = $this->locale = $this->fullLocale = null;
+
+            return;
+        }
+
+        $this->locale = $this->validateLocale($locale);
+
+        if (class_exists(NumberFormatter::class)) {
+            $this->localeFormat = $this->getLocaleFormat();
+        }
+    }
+
+    /**
+     * Stub: should be implemented as a concrete method in concrete wizards.
+     */
+    abstract protected function getLocaleFormat(): string;
+
+    /**
+     * @throws Exception If the locale code is not a valid format
+     */
+    private function validateLocale(string $locale): string
+    {
+        if (preg_match(Locale::STRUCTURE, $locale, $matches, PREG_UNMATCHED_AS_NULL) !== 1) {
+            throw new Exception("Invalid locale code '{$locale}'");
+        }
+
+        ['language' => $language, 'script' => $script, 'country' => $country] = $matches;
+        // Set case and separator to match standardised locale case
+        $language = strtolower($language ?? '');
+        $script = ($script === null) ? null : ucfirst(strtolower($script));
+        $country = ($country === null) ? null : strtoupper($country);
+
+        $this->fullLocale = implode('-', array_filter([$language, $script, $country]));
+
+        return $country === null ? $language : "{$language}-{$country}";
+    }
+
+    public function format(): string
+    {
+        return NumberFormat::FORMAT_GENERAL;
+    }
+
+    public function __toString(): string
+    {
+        return $this->format();
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Percentage.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Percentage.php
new file mode 100644
index 0000000000..003c0ddf10
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Percentage.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat\Wizard;
+
+use NumberFormatter;
+use PhpOffice\PhpSpreadsheet\Exception;
+
+class Percentage extends NumberBase implements Wizard
+{
+    /**
+     * @param int $decimals number of decimal places to display, in the range 0-30
+     * @param ?string $locale Set the locale for the percentage format; or leave as the default null.
+     *          If provided, Locale values must be a valid formatted locale string (e.g. 'en-GB', 'fr', uz-Arab-AF).
+     *
+     * @throws Exception If a provided locale code is not a valid format
+     */
+    public function __construct(int $decimals = 2, ?string $locale = null)
+    {
+        $this->setDecimals($decimals);
+        $this->setLocale($locale);
+    }
+
+    protected function getLocaleFormat(): string
+    {
+        $formatter = new Locale($this->fullLocale, NumberFormatter::PERCENT);
+
+        return $this->decimals > 0
+            ? str_replace('0', '0.' . str_repeat('0', $this->decimals), $formatter->format())
+            : $formatter->format();
+    }
+
+    public function format(): string
+    {
+        if ($this->localeFormat !== null) {
+            return $this->localeFormat;
+        }
+
+        return sprintf('0%s%%', $this->decimals > 0 ? '.' . str_repeat('0', $this->decimals) : null);
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Scientific.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Scientific.php
new file mode 100644
index 0000000000..2c25efd149
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Scientific.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat\Wizard;
+
+use PhpOffice\PhpSpreadsheet\Exception;
+
+class Scientific extends NumberBase implements Wizard
+{
+    /**
+     * @param int $decimals number of decimal places to display, in the range 0-30
+     * @param ?string $locale Set the locale for the scientific format; or leave as the default null.
+     *          Locale has no effect for Scientific Format values, and is retained here for compatibility
+     *              with the other Wizards.
+     *          If provided, Locale values must be a valid formatted locale string (e.g. 'en-GB', 'fr', uz-Arab-AF).
+     *
+     * @throws Exception If a provided locale code is not a valid format
+     */
+    public function __construct(int $decimals = 2, ?string $locale = null)
+    {
+        $this->setDecimals($decimals);
+        $this->setLocale($locale);
+    }
+
+    protected function getLocaleFormat(): string
+    {
+        return $this->format();
+    }
+
+    public function format(): string
+    {
+        return sprintf('0%sE+00', $this->decimals > 0 ? '.' . str_repeat('0', $this->decimals) : null);
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Time.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Time.php
new file mode 100644
index 0000000000..64b9104a69
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Time.php
@@ -0,0 +1,105 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat\Wizard;
+
+class Time extends DateTimeWizard
+{
+    /**
+     * Hours without a leading zero, e.g. 9.
+     */
+    public const HOURS_SHORT = 'h';
+
+    /**
+     * Hours with a leading zero, e.g. 09.
+     */
+    public const HOURS_LONG = 'hh';
+
+    /**
+     * Minutes without a leading zero, e.g. 5.
+     */
+    public const MINUTES_SHORT = 'm';
+
+    /**
+     * Minutes with a leading zero, e.g. 05.
+     */
+    public const MINUTES_LONG = 'mm';
+
+    /**
+     * Seconds without a leading zero, e.g. 2.
+     */
+    public const SECONDS_SHORT = 's';
+
+    /**
+     * Seconds with a leading zero, e.g. 02.
+     */
+    public const SECONDS_LONG = 'ss';
+
+    public const MORNING_AFTERNOON = 'AM/PM';
+
+    protected const TIME_BLOCKS = [
+        self::HOURS_LONG,
+        self::HOURS_SHORT,
+        self::MINUTES_LONG,
+        self::MINUTES_SHORT,
+        self::SECONDS_LONG,
+        self::SECONDS_SHORT,
+        self::MORNING_AFTERNOON,
+    ];
+
+    public const SEPARATOR_COLON = ':';
+    public const SEPARATOR_SPACE_NONBREAKING = "\u{a0}";
+    public const SEPARATOR_SPACE = ' ';
+
+    protected const TIME_DEFAULT = [
+        self::HOURS_LONG,
+        self::MINUTES_LONG,
+        self::SECONDS_LONG,
+    ];
+
+    /**
+     * @var string[]
+     */
+    protected array $separators;
+
+    /**
+     * @var string[]
+     */
+    protected array $formatBlocks;
+
+    /**
+     * @param null|string|string[] $separators
+     *        If you want to use the same separator for all format blocks, then it can be passed as a string literal;
+     *           if you wish to use different separators, then they should be passed as an array.
+     *        If you want to use only a single format block, then pass a null as the separator argument
+     */
+    public function __construct($separators = self::SEPARATOR_COLON, string ...$formatBlocks)
+    {
+        $separators ??= self::SEPARATOR_COLON;
+        $formatBlocks = (count($formatBlocks) === 0) ? self::TIME_DEFAULT : $formatBlocks;
+
+        $this->separators = $this->padSeparatorArray(
+            is_array($separators) ? $separators : [$separators],
+            count($formatBlocks) - 1
+        );
+        $this->formatBlocks = array_map([$this, 'mapFormatBlocks'], $formatBlocks);
+    }
+
+    private function mapFormatBlocks(string $value): string
+    {
+        // Any date masking codes are returned as lower case values
+        //     except for AM/PM, which is set to uppercase
+        if (in_array(mb_strtolower($value), self::TIME_BLOCKS, true)) {
+            return mb_strtolower($value);
+        } elseif (mb_strtoupper($value) === self::MORNING_AFTERNOON) {
+            return mb_strtoupper($value);
+        }
+
+        // Wrap any string literals in quotes, so that they're clearly defined as string literals
+        return $this->wrapLiteral($value);
+    }
+
+    public function format(): string
+    {
+        return implode('', array_map([$this, 'intersperse'], $this->formatBlocks, $this->separators));
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Wizard.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Wizard.php
new file mode 100644
index 0000000000..de4dc4f818
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Wizard.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style\NumberFormat\Wizard;
+
+interface Wizard
+{
+    public function format(): string;
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Protection.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Protection.php
index 9ae7d4bb36..55a6526c88 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Protection.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Protection.php
@@ -11,17 +11,13 @@ class Protection extends Supervisor
 
     /**
      * Locked.
-     *
-     * @var string
      */
-    protected $locked;
+    protected ?string $locked = null;
 
     /**
      * Hidden.
-     *
-     * @var string
      */
-    protected $hidden;
+    protected ?string $hidden = null;
 
     /**
      * Create a new Protection.
@@ -33,7 +29,7 @@ class Protection extends Supervisor
      *                                    Leave this value at default unless you understand exactly what
      *                                        its ramifications are
      */
-    public function __construct($isSupervisor = false, $isConditional = false)
+    public function __construct(bool $isSupervisor = false, bool $isConditional = false)
     {
         // Supervisor?
         parent::__construct($isSupervisor);
@@ -48,22 +44,19 @@ public function __construct($isSupervisor = false, $isConditional = false)
     /**
      * Get the shared style component for the currently active cell in currently active sheet.
      * Only used for style supervisor.
-     *
-     * @return Protection
      */
-    public function getSharedComponent()
+    public function getSharedComponent(): self
     {
-        return $this->parent->getSharedComponent()->getProtection();
+        /** @var Style $parent */
+        $parent = $this->parent;
+
+        return $parent->getSharedComponent()->getProtection();
     }
 
     /**
      * Build style array from subcomponents.
-     *
-     * @param array $array
-     *
-     * @return array
      */
-    public function getStyleArray($array)
+    public function getStyleArray(array $array): array
     {
         return ['protection' => $array];
     }
@@ -80,20 +73,20 @@ public function getStyleArray($array)
      * );
      * </code>
      *
-     * @param array $pStyles Array containing style information
+     * @param array $styleArray Array containing style information
      *
      * @return $this
      */
-    public function applyFromArray(array $pStyles)
+    public function applyFromArray(array $styleArray): static
     {
         if ($this->isSupervisor) {
-            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($pStyles));
+            $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($styleArray));
         } else {
-            if (isset($pStyles['locked'])) {
-                $this->setLocked($pStyles['locked']);
+            if (isset($styleArray['locked'])) {
+                $this->setLocked($styleArray['locked']);
             }
-            if (isset($pStyles['hidden'])) {
-                $this->setHidden($pStyles['hidden']);
+            if (isset($styleArray['hidden'])) {
+                $this->setHidden($styleArray['hidden']);
             }
         }
 
@@ -102,10 +95,8 @@ public function applyFromArray(array $pStyles)
 
     /**
      * Get locked.
-     *
-     * @return string
      */
-    public function getLocked()
+    public function getLocked(): ?string
     {
         if ($this->isSupervisor) {
             return $this->getSharedComponent()->getLocked();
@@ -117,17 +108,17 @@ public function getLocked()
     /**
      * Set locked.
      *
-     * @param string $pValue see self::PROTECTION_*
+     * @param string $lockType see self::PROTECTION_*
      *
      * @return $this
      */
-    public function setLocked($pValue)
+    public function setLocked(string $lockType): static
     {
         if ($this->isSupervisor) {
-            $styleArray = $this->getStyleArray(['locked' => $pValue]);
+            $styleArray = $this->getStyleArray(['locked' => $lockType]);
             $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
         } else {
-            $this->locked = $pValue;
+            $this->locked = $lockType;
         }
 
         return $this;
@@ -135,10 +126,8 @@ public function setLocked($pValue)
 
     /**
      * Get hidden.
-     *
-     * @return string
      */
-    public function getHidden()
+    public function getHidden(): ?string
     {
         if ($this->isSupervisor) {
             return $this->getSharedComponent()->getHidden();
@@ -150,17 +139,17 @@ public function getHidden()
     /**
      * Set hidden.
      *
-     * @param string $pValue see self::PROTECTION_*
+     * @param string $hiddenType see self::PROTECTION_*
      *
      * @return $this
      */
-    public function setHidden($pValue)
+    public function setHidden(string $hiddenType): static
     {
         if ($this->isSupervisor) {
-            $styleArray = $this->getStyleArray(['hidden' => $pValue]);
+            $styleArray = $this->getStyleArray(['hidden' => $hiddenType]);
             $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
         } else {
-            $this->hidden = $pValue;
+            $this->hidden = $hiddenType;
         }
 
         return $this;
@@ -171,16 +160,16 @@ public function setHidden($pValue)
      *
      * @return string Hash code
      */
-    public function getHashCode()
+    public function getHashCode(): string
     {
         if ($this->isSupervisor) {
             return $this->getSharedComponent()->getHashCode();
         }
 
         return md5(
-            $this->locked .
-            $this->hidden .
-            __CLASS__
+            $this->locked
+            . $this->hidden
+            . __CLASS__
         );
     }
 
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/RgbTint.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/RgbTint.php
new file mode 100644
index 0000000000..07d0d77c9e
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/RgbTint.php
@@ -0,0 +1,172 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Style;
+
+/**
+ * Class to handle tint applied to color.
+ * Code borrows heavily from some Python projects.
+ *
+ * @see https://docs.python.org/3/library/colorsys.html
+ * @see https://gist.github.com/Mike-Honey/b36e651e9a7f1d2e1d60ce1c63b9b633
+ */
+class RgbTint
+{
+    private const ONE_THIRD = 1.0 / 3.0;
+    private const ONE_SIXTH = 1.0 / 6.0;
+    private const TWO_THIRD = 2.0 / 3.0;
+    private const RGBMAX = 255.0;
+    /**
+     * MS excel's tint function expects that HLS is base 240.
+     *
+     * @see https://social.msdn.microsoft.com/Forums/en-US/e9d8c136-6d62-4098-9b1b-dac786149f43/excel-color-tint-algorithm-incorrect?forum=os_binaryfile#d3c2ac95-52e0-476b-86f1-e2a697f24969
+     */
+    private const HLSMAX = 240.0;
+
+    /**
+     * Convert red/green/blue to hue/luminance/saturation.
+     *
+     * @param float $red 0.0 through 1.0
+     * @param float $green 0.0 through 1.0
+     * @param float $blue 0.0 through 1.0
+     *
+     * @return float[]
+     */
+    private static function rgbToHls(float $red, float $green, float $blue): array
+    {
+        $maxc = max($red, $green, $blue);
+        $minc = min($red, $green, $blue);
+        $luminance = ($minc + $maxc) / 2.0;
+        if ($minc === $maxc) {
+            return [0.0, $luminance, 0.0];
+        }
+        $maxMinusMin = $maxc - $minc;
+        if ($luminance <= 0.5) {
+            $s = $maxMinusMin / ($maxc + $minc);
+        } else {
+            $s = $maxMinusMin / (2.0 - $maxc - $minc);
+        }
+        $rc = ($maxc - $red) / $maxMinusMin;
+        $gc = ($maxc - $green) / $maxMinusMin;
+        $bc = ($maxc - $blue) / $maxMinusMin;
+        if ($red === $maxc) {
+            $h = $bc - $gc;
+        } elseif ($green === $maxc) {
+            $h = 2.0 + $rc - $bc;
+        } else {
+            $h = 4.0 + $gc - $rc;
+        }
+        $h = self::positiveDecimalPart($h / 6.0);
+
+        return [$h, $luminance, $s];
+    }
+
+    /**
+     * Convert hue/luminance/saturation to red/green/blue.
+     *
+     * @param float $hue 0.0 through 1.0
+     * @param float $luminance 0.0 through 1.0
+     * @param float $saturation 0.0 through 1.0
+     *
+     * @return float[]
+     */
+    private static function hlsToRgb(float $hue, float $luminance, float $saturation): array
+    {
+        if ($saturation === 0.0) {
+            return [$luminance, $luminance, $luminance];
+        }
+        if ($luminance <= 0.5) {
+            $m2 = $luminance * (1.0 + $saturation);
+        } else {
+            $m2 = $luminance + $saturation - ($luminance * $saturation);
+        }
+        $m1 = 2.0 * $luminance - $m2;
+
+        return [
+            self::vFunction($m1, $m2, $hue + self::ONE_THIRD),
+            self::vFunction($m1, $m2, $hue),
+            self::vFunction($m1, $m2, $hue - self::ONE_THIRD),
+        ];
+    }
+
+    private static function vFunction(float $m1, float $m2, float $hue): float
+    {
+        $hue = self::positiveDecimalPart($hue);
+        if ($hue < self::ONE_SIXTH) {
+            return $m1 + ($m2 - $m1) * $hue * 6.0;
+        }
+        if ($hue < 0.5) {
+            return $m2;
+        }
+        if ($hue < self::TWO_THIRD) {
+            return $m1 + ($m2 - $m1) * (self::TWO_THIRD - $hue) * 6.0;
+        }
+
+        return $m1;
+    }
+
+    private static function positiveDecimalPart(float $hue): float
+    {
+        $hue = fmod($hue, 1.0);
+
+        return ($hue >= 0.0) ? $hue : (1.0 + $hue);
+    }
+
+    /**
+     * Convert red/green/blue to HLSMAX-based hue/luminance/saturation.
+     *
+     * @return int[]
+     */
+    private static function rgbToMsHls(int $red, int $green, int $blue): array
+    {
+        $red01 = $red / self::RGBMAX;
+        $green01 = $green / self::RGBMAX;
+        $blue01 = $blue / self::RGBMAX;
+        [$hue, $luminance, $saturation] = self::rgbToHls($red01, $green01, $blue01);
+
+        return [
+            (int) round($hue * self::HLSMAX),
+            (int) round($luminance * self::HLSMAX),
+            (int) round($saturation * self::HLSMAX),
+        ];
+    }
+
+    /**
+     * Converts HLSMAX based HLS values to rgb values in the range (0,1).
+     *
+     * @return float[]
+     */
+    private static function msHlsToRgb(int $hue, int $lightness, int $saturation): array
+    {
+        return self::hlsToRgb($hue / self::HLSMAX, $lightness / self::HLSMAX, $saturation / self::HLSMAX);
+    }
+
+    /**
+     * Tints HLSMAX based luminance.
+     *
+     * @see http://ciintelligence.blogspot.co.uk/2012/02/converting-excel-theme-color-and-tint.html
+     */
+    private static function tintLuminance(float $tint, float $luminance): int
+    {
+        if ($tint < 0) {
+            return (int) round($luminance * (1.0 + $tint));
+        }
+
+        return (int) round($luminance * (1.0 - $tint) + (self::HLSMAX - self::HLSMAX * (1.0 - $tint)));
+    }
+
+    /**
+     * Return result of tinting supplied rgb as 6 hex digits.
+     */
+    public static function rgbAndTintToRgb(int $red, int $green, int $blue, float $tint): string
+    {
+        [$hue, $luminance, $saturation] = self::rgbToMsHls($red, $green, $blue);
+        [$red, $green, $blue] = self::msHlsToRgb($hue, self::tintLuminance($tint, $luminance), $saturation);
+
+        return sprintf(
+            '%02X%02X%02X',
+            (int) round($red * self::RGBMAX),
+            (int) round($green * self::RGBMAX),
+            (int) round($blue * self::RGBMAX)
+        );
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Style.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Style.php
index 224c0feb0a..68ca39e06e 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Style.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Style.php
@@ -2,66 +2,72 @@
 
 namespace PhpOffice\PhpSpreadsheet\Style;
 
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 
 class Style extends Supervisor
 {
     /**
      * Font.
-     *
-     * @var Font
      */
-    protected $font;
+    protected Font $font;
 
     /**
      * Fill.
-     *
-     * @var Fill
      */
-    protected $fill;
+    protected Fill $fill;
 
     /**
      * Borders.
-     *
-     * @var Borders
      */
-    protected $borders;
+    protected Borders $borders;
 
     /**
      * Alignment.
-     *
-     * @var Alignment
      */
-    protected $alignment;
+    protected Alignment $alignment;
 
     /**
      * Number Format.
-     *
-     * @var NumberFormat
      */
-    protected $numberFormat;
+    protected NumberFormat $numberFormat;
 
     /**
      * Protection.
-     *
-     * @var Protection
      */
-    protected $protection;
+    protected Protection $protection;
 
     /**
      * Index of style in collection. Only used for real style.
-     *
-     * @var int
      */
-    protected $index;
+    protected int $index;
 
     /**
      * Use Quote Prefix when displaying in cell editor. Only used for real style.
+     */
+    protected bool $quotePrefix = false;
+
+    /**
+     * Internal cache for styles
+     * Used when applying style on range of cells (column or row) and cleared when
+     * all cells in range is styled.
+     *
+     * PhpSpreadsheet will always minimize the amount of styles used. So cells with
+     * same styles will reference the same Style instance. To check if two styles
+     * are similar Style::getHashCode() is used. This call is expensive. To minimize
+     * the need to call this method we can cache the internal PHP object id of the
+     * Style in the range. Style::getHashCode() will then only be called when we
+     * encounter a unique style.
      *
-     * @var bool
+     * @see Style::applyFromArray()
+     * @see Style::getHashCode()
+     *
+     * @var null|array<string, array>
      */
-    protected $quotePrefix = false;
+    private static ?array $cachedStyles = null;
 
     /**
      * Create a new Style.
@@ -73,14 +79,14 @@ class Style extends Supervisor
      *       Leave this value at default unless you understand exactly what
      *    its ramifications are
      */
-    public function __construct($isSupervisor = false, $isConditional = false)
+    public function __construct(bool $isSupervisor = false, bool $isConditional = false)
     {
         parent::__construct($isSupervisor);
 
         // Initialise values
         $this->font = new Font($isSupervisor, $isConditional);
         $this->fill = new Fill($isSupervisor, $isConditional);
-        $this->borders = new Borders($isSupervisor);
+        $this->borders = new Borders($isSupervisor, $isConditional);
         $this->alignment = new Alignment($isSupervisor, $isConditional);
         $this->numberFormat = new NumberFormat($isSupervisor, $isConditional);
         $this->protection = new Protection($isSupervisor, $isConditional);
@@ -99,13 +105,11 @@ public function __construct($isSupervisor = false, $isConditional = false)
     /**
      * Get the shared style component for the currently active cell in currently active sheet.
      * Only used for style supervisor.
-     *
-     * @return Style
      */
-    public function getSharedComponent()
+    public function getSharedComponent(): self
     {
         $activeSheet = $this->getActiveSheet();
-        $selectedCell = $this->getActiveCell(); // e.g. 'A1'
+        $selectedCell = Functions::trimSheetFromCellReference($this->getActiveCell()); // e.g. 'A1'
 
         if ($activeSheet->cellExists($selectedCell)) {
             $xfIndex = $activeSheet->getCell($selectedCell)->getXfIndex();
@@ -113,27 +117,21 @@ public function getSharedComponent()
             $xfIndex = 0;
         }
 
-        return $this->parent->getCellXfByIndex($xfIndex);
+        return $activeSheet->getParentOrThrow()->getCellXfByIndex($xfIndex);
     }
 
     /**
      * Get parent. Only used for style supervisor.
-     *
-     * @return Spreadsheet
      */
-    public function getParent()
+    public function getParent(): Spreadsheet
     {
-        return $this->parent;
+        return $this->getActiveSheet()->getParentOrThrow();
     }
 
     /**
      * Build style array from subcomponents.
-     *
-     * @param array $array
-     *
-     * @return array
      */
-    public function getStyleArray($array)
+    public function getStyleArray(array $array): array
     {
         return ['quotePrefix' => $array];
     }
@@ -178,21 +176,28 @@ public function getStyleArray($array)
      * );
      * </code>
      *
-     * @param array $pStyles Array containing style information
-     * @param bool $pAdvanced advanced mode for setting borders
+     * @param array $styleArray Array containing style information
+     * @param bool $advancedBorders advanced mode for setting borders
      *
      * @return $this
      */
-    public function applyFromArray(array $pStyles, $pAdvanced = true)
+    public function applyFromArray(array $styleArray, bool $advancedBorders = true): static
     {
         if ($this->isSupervisor) {
             $pRange = $this->getSelectedCells();
 
-            // Uppercase coordinate
+            // Uppercase coordinate and strip any Worksheet reference from the selected range
             $pRange = strtoupper($pRange);
+            if (str_contains($pRange, '!')) {
+                $pRangeWorksheet = StringHelper::strToUpper(trim(substr($pRange, 0, (int) strrpos($pRange, '!')), "'"));
+                if ($pRangeWorksheet !== '' && StringHelper::strToUpper($this->getActiveSheet()->getTitle()) !== $pRangeWorksheet) {
+                    throw new Exception('Invalid Worksheet for specified Range');
+                }
+                $pRange = strtoupper(Functions::trimSheetFromCellReference($pRange));
+            }
 
             // Is it a cell range or a single cell?
-            if (strpos($pRange, ':') === false) {
+            if (!str_contains($pRange, ':')) {
                 $rangeA = $pRange;
                 $rangeB = $pRange;
             } else {
@@ -216,36 +221,36 @@ public function applyFromArray(array $pStyles, $pAdvanced = true)
             }
 
             // ADVANCED MODE:
-            if ($pAdvanced && isset($pStyles['borders'])) {
+            if ($advancedBorders && isset($styleArray['borders'])) {
                 // 'allBorders' is a shorthand property for 'outline' and 'inside' and
                 //        it applies to components that have not been set explicitly
-                if (isset($pStyles['borders']['allBorders'])) {
+                if (isset($styleArray['borders']['allBorders'])) {
                     foreach (['outline', 'inside'] as $component) {
-                        if (!isset($pStyles['borders'][$component])) {
-                            $pStyles['borders'][$component] = $pStyles['borders']['allBorders'];
+                        if (!isset($styleArray['borders'][$component])) {
+                            $styleArray['borders'][$component] = $styleArray['borders']['allBorders'];
                         }
                     }
-                    unset($pStyles['borders']['allBorders']); // not needed any more
+                    unset($styleArray['borders']['allBorders']); // not needed any more
                 }
                 // 'outline' is a shorthand property for 'top', 'right', 'bottom', 'left'
                 //        it applies to components that have not been set explicitly
-                if (isset($pStyles['borders']['outline'])) {
+                if (isset($styleArray['borders']['outline'])) {
                     foreach (['top', 'right', 'bottom', 'left'] as $component) {
-                        if (!isset($pStyles['borders'][$component])) {
-                            $pStyles['borders'][$component] = $pStyles['borders']['outline'];
+                        if (!isset($styleArray['borders'][$component])) {
+                            $styleArray['borders'][$component] = $styleArray['borders']['outline'];
                         }
                     }
-                    unset($pStyles['borders']['outline']); // not needed any more
+                    unset($styleArray['borders']['outline']); // not needed any more
                 }
                 // 'inside' is a shorthand property for 'vertical' and 'horizontal'
                 //        it applies to components that have not been set explicitly
-                if (isset($pStyles['borders']['inside'])) {
+                if (isset($styleArray['borders']['inside'])) {
                     foreach (['vertical', 'horizontal'] as $component) {
-                        if (!isset($pStyles['borders'][$component])) {
-                            $pStyles['borders'][$component] = $pStyles['borders']['inside'];
+                        if (!isset($styleArray['borders'][$component])) {
+                            $styleArray['borders'][$component] = $styleArray['borders']['inside'];
                         }
                     }
-                    unset($pStyles['borders']['inside']); // not needed any more
+                    unset($styleArray['borders']['inside']); // not needed any more
                 }
                 // width and height characteristics of selection, 1, 2, or 3 (for 3 or more)
                 $xMax = min($rangeEndIndexes[0] - $rangeStartIndexes[0] + 1, 3);
@@ -254,12 +259,12 @@ public function applyFromArray(array $pStyles, $pAdvanced = true)
                 // loop through up to 3 x 3 = 9 regions
                 for ($x = 1; $x <= $xMax; ++$x) {
                     // start column index for region
-                    $colStart = ($x == 3) ?
-                        Coordinate::stringFromColumnIndex($rangeEndIndexes[0])
+                    $colStart = ($x == 3)
+                        ? Coordinate::stringFromColumnIndex($rangeEndIndexes[0])
                         : Coordinate::stringFromColumnIndex($rangeStartIndexes[0] + $x - 1);
                     // end column index for region
-                    $colEnd = ($x == 1) ?
-                        Coordinate::stringFromColumnIndex($rangeStartIndexes[0])
+                    $colEnd = ($x == 1)
+                        ? Coordinate::stringFromColumnIndex($rangeStartIndexes[0])
                         : Coordinate::stringFromColumnIndex($rangeEndIndexes[0] - $xMax + $x);
 
                     for ($y = 1; $y <= $yMax; ++$y) {
@@ -283,18 +288,18 @@ public function applyFromArray(array $pStyles, $pAdvanced = true)
                         }
 
                         // start row index for region
-                        $rowStart = ($y == 3) ?
-                            $rangeEndIndexes[1] : $rangeStartIndexes[1] + $y - 1;
+                        $rowStart = ($y == 3)
+                            ? $rangeEndIndexes[1] : $rangeStartIndexes[1] + $y - 1;
 
                         // end row index for region
-                        $rowEnd = ($y == 1) ?
-                            $rangeStartIndexes[1] : $rangeEndIndexes[1] - $yMax + $y;
+                        $rowEnd = ($y == 1)
+                            ? $rangeStartIndexes[1] : $rangeEndIndexes[1] - $yMax + $y;
 
                         // build range for region
                         $range = $colStart . $rowStart . ':' . $colEnd . $rowEnd;
 
                         // retrieve relevant style array for region
-                        $regionStyles = $pStyles;
+                        $regionStyles = $styleArray;
                         unset($regionStyles['borders']['inside']);
 
                         // what are the inner edges of the region when looking at the selection
@@ -306,8 +311,8 @@ public function applyFromArray(array $pStyles, $pAdvanced = true)
                                 case 'top':
                                 case 'bottom':
                                     // should pick up 'horizontal' border property if set
-                                    if (isset($pStyles['borders']['horizontal'])) {
-                                        $regionStyles['borders'][$innerEdge] = $pStyles['borders']['horizontal'];
+                                    if (isset($styleArray['borders']['horizontal'])) {
+                                        $regionStyles['borders'][$innerEdge] = $styleArray['borders']['horizontal'];
                                     } else {
                                         unset($regionStyles['borders'][$innerEdge]);
                                     }
@@ -316,8 +321,8 @@ public function applyFromArray(array $pStyles, $pAdvanced = true)
                                 case 'left':
                                 case 'right':
                                     // should pick up 'vertical' border property if set
-                                    if (isset($pStyles['borders']['vertical'])) {
-                                        $regionStyles['borders'][$innerEdge] = $pStyles['borders']['vertical'];
+                                    if (isset($styleArray['borders']['vertical'])) {
+                                        $regionStyles['borders'][$innerEdge] = $styleArray['borders']['vertical'];
                                     } else {
                                         unset($regionStyles['borders'][$innerEdge]);
                                     }
@@ -341,27 +346,77 @@ public function applyFromArray(array $pStyles, $pAdvanced = true)
             // Selection type, inspect
             if (preg_match('/^[A-Z]+1:[A-Z]+1048576$/', $pRange)) {
                 $selectionType = 'COLUMN';
+
+                // Enable caching of styles
+                self::$cachedStyles = ['hashByObjId' => [], 'styleByHash' => []];
             } elseif (preg_match('/^A\d+:XFD\d+$/', $pRange)) {
                 $selectionType = 'ROW';
+
+                // Enable caching of styles
+                self::$cachedStyles = ['hashByObjId' => [], 'styleByHash' => []];
             } else {
                 $selectionType = 'CELL';
             }
 
             // First loop through columns, rows, or cells to find out which styles are affected by this operation
-            $oldXfIndexes = $this->getOldXfIndexes($selectionType, $rangeStartIndexes, $rangeEndIndexes, $columnStart, $columnEnd, $pStyles);
+            $oldXfIndexes = $this->getOldXfIndexes($selectionType, $rangeStartIndexes, $rangeEndIndexes, $columnStart, $columnEnd, $styleArray);
 
             // clone each of the affected styles, apply the style array, and add the new styles to the workbook
-            $workbook = $this->getActiveSheet()->getParent();
+            $workbook = $this->getActiveSheet()->getParentOrThrow();
             $newXfIndexes = [];
             foreach ($oldXfIndexes as $oldXfIndex => $dummy) {
                 $style = $workbook->getCellXfByIndex($oldXfIndex);
-                $newStyle = clone $style;
-                $newStyle->applyFromArray($pStyles);
 
-                if ($existingStyle = $workbook->getCellXfByHashCode($newStyle->getHashCode())) {
+                // $cachedStyles is set when applying style for a range of cells, either column or row
+                if (self::$cachedStyles === null) {
+                    // Clone the old style and apply style-array
+                    $newStyle = clone $style;
+                    $newStyle->applyFromArray($styleArray);
+
+                    // Look for existing style we can use instead (reduce memory usage)
+                    $existingStyle = $workbook->getCellXfByHashCode($newStyle->getHashCode());
+                } else {
+                    // Style cache is stored by Style::getHashCode(). But calling this method is
+                    // expensive. So we cache the php obj id -> hash.
+                    $objId = spl_object_id($style);
+
+                    // Look for the original HashCode
+                    $styleHash = self::$cachedStyles['hashByObjId'][$objId] ?? null;
+                    if ($styleHash === null) {
+                        // This object_id is not cached, store the hashcode in case encounter again
+                        $styleHash = self::$cachedStyles['hashByObjId'][$objId] = $style->getHashCode();
+                    }
+
+                    // Find existing style by hash.
+                    $existingStyle = self::$cachedStyles['styleByHash'][$styleHash] ?? null;
+
+                    if (!$existingStyle) {
+                        // The old style combined with the new style array is not cached, so we create it now
+                        $newStyle = clone $style;
+                        $newStyle->applyFromArray($styleArray);
+
+                        // Look for similar style in workbook to reduce memory usage
+                        $existingStyle = $workbook->getCellXfByHashCode($newStyle->getHashCode());
+
+                        // Cache the new style by original hashcode
+                        self::$cachedStyles['styleByHash'][$styleHash] = $existingStyle instanceof self ? $existingStyle : $newStyle;
+                    }
+                }
+
+                if ($existingStyle) {
                     // there is already such cell Xf in our collection
                     $newXfIndexes[$oldXfIndex] = $existingStyle->getIndex();
                 } else {
+                    if (!isset($newStyle)) {
+                        // Handle bug in PHPStan, see https://github.com/phpstan/phpstan/issues/5805
+                        // $newStyle should always be defined.
+                        // This block might not be needed in the future
+                        // @codeCoverageIgnoreStart
+                        $newStyle = clone $style;
+                        $newStyle->applyFromArray($styleArray);
+                        // @codeCoverageIgnoreEnd
+                    }
+
                     // we don't have such a cell Xf, need to add
                     $workbook->addCellXf($newStyle);
                     $newXfIndexes[$oldXfIndex] = $newStyle->getIndex();
@@ -377,6 +432,9 @@ public function applyFromArray(array $pStyles, $pAdvanced = true)
                         $columnDimension->setXfIndex($newXfIndexes[$oldXfIndex]);
                     }
 
+                    // Disable caching of styles
+                    self::$cachedStyles = null;
+
                     break;
                 case 'ROW':
                     for ($row = $rangeStartIndexes[1]; $row <= $rangeEndIndexes[1]; ++$row) {
@@ -386,11 +444,14 @@ public function applyFromArray(array $pStyles, $pAdvanced = true)
                         $rowDimension->setXfIndex($newXfIndexes[$oldXfIndex]);
                     }
 
+                    // Disable caching of styles
+                    self::$cachedStyles = null;
+
                     break;
                 case 'CELL':
                     for ($col = $rangeStartIndexes[0]; $col <= $rangeEndIndexes[0]; ++$col) {
                         for ($row = $rangeStartIndexes[1]; $row <= $rangeEndIndexes[1]; ++$row) {
-                            $cell = $this->getActiveSheet()->getCellByColumnAndRow($col, $row);
+                            $cell = $this->getActiveSheet()->getCell([$col, $row]);
                             $oldXfIndex = $cell->getXfIndex();
                             $cell->setXfIndex($newXfIndexes[$oldXfIndex]);
                         }
@@ -400,33 +461,33 @@ public function applyFromArray(array $pStyles, $pAdvanced = true)
             }
         } else {
             // not a supervisor, just apply the style array directly on style object
-            if (isset($pStyles['fill'])) {
-                $this->getFill()->applyFromArray($pStyles['fill']);
+            if (isset($styleArray['fill'])) {
+                $this->getFill()->applyFromArray($styleArray['fill']);
             }
-            if (isset($pStyles['font'])) {
-                $this->getFont()->applyFromArray($pStyles['font']);
+            if (isset($styleArray['font'])) {
+                $this->getFont()->applyFromArray($styleArray['font']);
             }
-            if (isset($pStyles['borders'])) {
-                $this->getBorders()->applyFromArray($pStyles['borders']);
+            if (isset($styleArray['borders'])) {
+                $this->getBorders()->applyFromArray($styleArray['borders']);
             }
-            if (isset($pStyles['alignment'])) {
-                $this->getAlignment()->applyFromArray($pStyles['alignment']);
+            if (isset($styleArray['alignment'])) {
+                $this->getAlignment()->applyFromArray($styleArray['alignment']);
             }
-            if (isset($pStyles['numberFormat'])) {
-                $this->getNumberFormat()->applyFromArray($pStyles['numberFormat']);
+            if (isset($styleArray['numberFormat'])) {
+                $this->getNumberFormat()->applyFromArray($styleArray['numberFormat']);
             }
-            if (isset($pStyles['protection'])) {
-                $this->getProtection()->applyFromArray($pStyles['protection']);
+            if (isset($styleArray['protection'])) {
+                $this->getProtection()->applyFromArray($styleArray['protection']);
             }
-            if (isset($pStyles['quotePrefix'])) {
-                $this->quotePrefix = $pStyles['quotePrefix'];
+            if (isset($styleArray['quotePrefix'])) {
+                $this->quotePrefix = $styleArray['quotePrefix'];
             }
         }
 
         return $this;
     }
 
-    private function getOldXfIndexes(string $selectionType, array $rangeStart, array $rangeEnd, string $columnStart, string $columnEnd, array $pStyles): array
+    private function getOldXfIndexes(string $selectionType, array $rangeStart, array $rangeEnd, string $columnStart, string $columnEnd, array $styleArray): array
     {
         $oldXfIndexes = [];
         switch ($selectionType) {
@@ -439,7 +500,7 @@ private function getOldXfIndexes(string $selectionType, array $rangeStart, array
                     $cellIterator->setIterateOnlyExistingCells(true);
                     foreach ($cellIterator as $columnCell) {
                         if ($columnCell !== null) {
-                            $columnCell->getStyle()->applyFromArray($pStyles);
+                            $columnCell->getStyle()->applyFromArray($styleArray);
                         }
                     }
                 }
@@ -458,7 +519,7 @@ private function getOldXfIndexes(string $selectionType, array $rangeStart, array
                     $cellIterator->setIterateOnlyExistingCells(true);
                     foreach ($cellIterator as $rowCell) {
                         if ($rowCell !== null) {
-                            $rowCell->getStyle()->applyFromArray($pStyles);
+                            $rowCell->getStyle()->applyFromArray($styleArray);
                         }
                     }
                 }
@@ -467,7 +528,7 @@ private function getOldXfIndexes(string $selectionType, array $rangeStart, array
             case 'CELL':
                 for ($col = $rangeStart[0]; $col <= $rangeEnd[0]; ++$col) {
                     for ($row = $rangeStart[1]; $row <= $rangeEnd[1]; ++$row) {
-                        $oldXfIndexes[$this->getActiveSheet()->getCellByColumnAndRow($col, $row)->getXfIndex()] = true;
+                        $oldXfIndexes[$this->getActiveSheet()->getCell([$col, $row])->getXfIndex()] = true;
                     }
                 }
 
@@ -479,20 +540,16 @@ private function getOldXfIndexes(string $selectionType, array $rangeStart, array
 
     /**
      * Get Fill.
-     *
-     * @return Fill
      */
-    public function getFill()
+    public function getFill(): Fill
     {
         return $this->fill;
     }
 
     /**
      * Get Font.
-     *
-     * @return Font
      */
-    public function getFont()
+    public function getFont(): Font
     {
         return $this->font;
     }
@@ -502,7 +559,7 @@ public function getFont()
      *
      * @return $this
      */
-    public function setFont(Font $font)
+    public function setFont(Font $font): static
     {
         $this->font = $font;
 
@@ -511,30 +568,24 @@ public function setFont(Font $font)
 
     /**
      * Get Borders.
-     *
-     * @return Borders
      */
-    public function getBorders()
+    public function getBorders(): Borders
     {
         return $this->borders;
     }
 
     /**
      * Get Alignment.
-     *
-     * @return Alignment
      */
-    public function getAlignment()
+    public function getAlignment(): Alignment
     {
         return $this->alignment;
     }
 
     /**
      * Get Number Format.
-     *
-     * @return NumberFormat
      */
-    public function getNumberFormat()
+    public function getNumberFormat(): NumberFormat
     {
         return $this->numberFormat;
     }
@@ -544,7 +595,7 @@ public function getNumberFormat()
      *
      * @return Conditional[]
      */
-    public function getConditionalStyles()
+    public function getConditionalStyles(): array
     {
         return $this->getActiveSheet()->getConditionalStyles($this->getActiveCell());
     }
@@ -552,33 +603,29 @@ public function getConditionalStyles()
     /**
      * Set Conditional Styles. Only used on supervisor.
      *
-     * @param Conditional[] $pValue Array of conditional styles
+     * @param Conditional[] $conditionalStyleArray Array of conditional styles
      *
      * @return $this
      */
-    public function setConditionalStyles(array $pValue)
+    public function setConditionalStyles(array $conditionalStyleArray): static
     {
-        $this->getActiveSheet()->setConditionalStyles($this->getSelectedCells(), $pValue);
+        $this->getActiveSheet()->setConditionalStyles($this->getSelectedCells(), $conditionalStyleArray);
 
         return $this;
     }
 
     /**
      * Get Protection.
-     *
-     * @return Protection
      */
-    public function getProtection()
+    public function getProtection(): Protection
     {
         return $this->protection;
     }
 
     /**
      * Get quote prefix.
-     *
-     * @return bool
      */
-    public function getQuotePrefix()
+    public function getQuotePrefix(): bool
     {
         if ($this->isSupervisor) {
             return $this->getSharedComponent()->getQuotePrefix();
@@ -590,20 +637,18 @@ public function getQuotePrefix()
     /**
      * Set quote prefix.
      *
-     * @param bool $pValue
-     *
      * @return $this
      */
-    public function setQuotePrefix($pValue)
+    public function setQuotePrefix(bool $quotePrefix): static
     {
-        if ($pValue == '') {
-            $pValue = false;
+        if ($quotePrefix == '') {
+            $quotePrefix = false;
         }
         if ($this->isSupervisor) {
-            $styleArray = ['quotePrefix' => $pValue];
+            $styleArray = ['quotePrefix' => $quotePrefix];
             $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
         } else {
-            $this->quotePrefix = (bool) $pValue;
+            $this->quotePrefix = (bool) $quotePrefix;
         }
 
         return $this;
@@ -614,38 +659,34 @@ public function setQuotePrefix($pValue)
      *
      * @return string Hash code
      */
-    public function getHashCode()
+    public function getHashCode(): string
     {
         return md5(
-            $this->fill->getHashCode() .
-            $this->font->getHashCode() .
-            $this->borders->getHashCode() .
-            $this->alignment->getHashCode() .
-            $this->numberFormat->getHashCode() .
-            $this->protection->getHashCode() .
-            ($this->quotePrefix ? 't' : 'f') .
-            __CLASS__
+            $this->fill->getHashCode()
+            . $this->font->getHashCode()
+            . $this->borders->getHashCode()
+            . $this->alignment->getHashCode()
+            . $this->numberFormat->getHashCode()
+            . $this->protection->getHashCode()
+            . ($this->quotePrefix ? 't' : 'f')
+            . __CLASS__
         );
     }
 
     /**
      * Get own index in style collection.
-     *
-     * @return int
      */
-    public function getIndex()
+    public function getIndex(): int
     {
         return $this->index;
     }
 
     /**
      * Set own index in style collection.
-     *
-     * @param int $pValue
      */
-    public function setIndex($pValue): void
+    public function setIndex(int $index): void
     {
-        $this->index = $pValue;
+        $this->index = $index;
     }
 
     protected function exportArray1(): array
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Supervisor.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Supervisor.php
index 7f655bef72..8388ef6cd7 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Supervisor.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Supervisor.php
@@ -10,24 +10,20 @@ abstract class Supervisor implements IComparable
 {
     /**
      * Supervisor?
-     *
-     * @var bool
      */
-    protected $isSupervisor;
+    protected bool $isSupervisor;
 
     /**
      * Parent. Only used for supervisor.
      *
-     * @var Spreadsheet|Style
+     * @var Spreadsheet|Supervisor
      */
     protected $parent;
 
     /**
      * Parent property name.
-     *
-     * @var null|string
      */
-    protected $parentPropertyName;
+    protected ?string $parentPropertyName = null;
 
     /**
      * Create a new Supervisor.
@@ -36,7 +32,7 @@ abstract class Supervisor implements IComparable
      *                                    Leave this value at default unless you understand exactly what
      *                                        its ramifications are
      */
-    public function __construct($isSupervisor = false)
+    public function __construct(bool $isSupervisor = false)
     {
         // Supervisor?
         $this->isSupervisor = $isSupervisor;
@@ -45,12 +41,9 @@ public function __construct($isSupervisor = false)
     /**
      * Bind parent. Only used for supervisor.
      *
-     * @param Spreadsheet|Style $parent
-     * @param null|string $parentPropertyName
-     *
      * @return $this
      */
-    public function bindParent($parent, $parentPropertyName = null)
+    public function bindParent(Spreadsheet|self $parent, ?string $parentPropertyName = null)
     {
         $this->parent = $parent;
         $this->parentPropertyName = $parentPropertyName;
@@ -60,20 +53,16 @@ public function bindParent($parent, $parentPropertyName = null)
 
     /**
      * Is this a supervisor or a cell style component?
-     *
-     * @return bool
      */
-    public function getIsSupervisor()
+    public function getIsSupervisor(): bool
     {
         return $this->isSupervisor;
     }
 
     /**
      * Get the currently active sheet. Only used for supervisor.
-     *
-     * @return Worksheet
      */
-    public function getActiveSheet()
+    public function getActiveSheet(): Worksheet
     {
         return $this->parent->getActiveSheet();
     }
@@ -84,7 +73,7 @@ public function getActiveSheet()
      *
      * @return string E.g. 'A1'
      */
-    public function getSelectedCells()
+    public function getSelectedCells(): string
     {
         return $this->getActiveSheet()->getSelectedCells();
     }
@@ -95,7 +84,7 @@ public function getSelectedCells()
      *
      * @return string E.g. 'A1'
      */
-    public function getActiveCell()
+    public function getActiveCell(): string
     {
         return $this->getActiveSheet()->getActiveCell();
     }
@@ -144,10 +133,8 @@ abstract protected function exportArray1(): array;
      * The parameter objOrValue is either a primitive type,
      * which is the value added to the array,
      * or a Style object to be recursively added via exportArray.
-     *
-     * @param mixed $objOrValue
      */
-    final protected function exportArray2(array &$exportedArray, string $index, $objOrValue): void
+    final protected function exportArray2(array &$exportedArray, string $index, mixed $objOrValue): void
     {
         if ($objOrValue instanceof self) {
             $exportedArray[$index] = $objOrValue->exportArray();
@@ -155,4 +142,15 @@ final protected function exportArray2(array &$exportedArray, string $index, $obj
             $exportedArray[$index] = $objOrValue;
         }
     }
+
+    /**
+     * Get the shared style component for the currently active cell in currently active sheet.
+     * Only used for style supervisor.
+     */
+    abstract public function getSharedComponent(): mixed;
+
+    /**
+     * Build style array from subcomponents.
+     */
+    abstract public function getStyleArray(array $array): array;
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Theme.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Theme.php
new file mode 100644
index 0000000000..adeef80b39
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Theme.php
@@ -0,0 +1,259 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet;
+
+class Theme
+{
+    private string $themeColorName = 'Office';
+
+    private string $themeFontName = 'Office';
+
+    public const COLOR_SCHEME_2013_PLUS_NAME = 'Office 2013+';
+    public const COLOR_SCHEME_2013_PLUS = [
+        'dk1' => '000000',
+        'lt1' => 'FFFFFF',
+        'dk2' => '44546A',
+        'lt2' => 'E7E6E6',
+        'accent1' => '4472C4',
+        'accent2' => 'ED7D31',
+        'accent3' => 'A5A5A5',
+        'accent4' => 'FFC000',
+        'accent5' => '5B9BD5',
+        'accent6' => '70AD47',
+        'hlink' => '0563C1',
+        'folHlink' => '954F72',
+    ];
+
+    public const COLOR_SCHEME_2007_2010_NAME = 'Office 2007-2010';
+    public const COLOR_SCHEME_2007_2010 = [
+        'dk1' => '000000',
+        'lt1' => 'FFFFFF',
+        'dk2' => '1F497D',
+        'lt2' => 'EEECE1',
+        'accent1' => '4F81BD',
+        'accent2' => 'C0504D',
+        'accent3' => '9BBB59',
+        'accent4' => '8064A2',
+        'accent5' => '4BACC6',
+        'accent6' => 'F79646',
+        'hlink' => '0000FF',
+        'folHlink' => '800080',
+    ];
+
+    /** @var string[] */
+    private array $themeColors = self::COLOR_SCHEME_2007_2010;
+
+    private string $majorFontLatin = 'Cambria';
+
+    private string $majorFontEastAsian = '';
+
+    private string $majorFontComplexScript = '';
+
+    private string $minorFontLatin = 'Calibri';
+
+    private string $minorFontEastAsian = '';
+
+    private string $minorFontComplexScript = '';
+
+    /**
+     * Map of Major (header) fonts to write.
+     *
+     * @var string[]
+     */
+    private array $majorFontSubstitutions = self::FONTS_TIMES_SUBSTITUTIONS;
+
+    /**
+     * Map of Minor (body) fonts to write.
+     *
+     * @var string[]
+     */
+    private array $minorFontSubstitutions = self::FONTS_ARIAL_SUBSTITUTIONS;
+
+    public const FONTS_TIMES_SUBSTITUTIONS = [
+        'Jpan' => 'ＭＳ Ｐゴシック',
+        'Hang' => '맑은 고딕',
+        'Hans' => '宋体',
+        'Hant' => '新細明體',
+        'Arab' => 'Times New Roman',
+        'Hebr' => 'Times New Roman',
+        'Thai' => 'Tahoma',
+        'Ethi' => 'Nyala',
+        'Beng' => 'Vrinda',
+        'Gujr' => 'Shruti',
+        'Khmr' => 'MoolBoran',
+        'Knda' => 'Tunga',
+        'Guru' => 'Raavi',
+        'Cans' => 'Euphemia',
+        'Cher' => 'Plantagenet Cherokee',
+        'Yiii' => 'Microsoft Yi Baiti',
+        'Tibt' => 'Microsoft Himalaya',
+        'Thaa' => 'MV Boli',
+        'Deva' => 'Mangal',
+        'Telu' => 'Gautami',
+        'Taml' => 'Latha',
+        'Syrc' => 'Estrangelo Edessa',
+        'Orya' => 'Kalinga',
+        'Mlym' => 'Kartika',
+        'Laoo' => 'DokChampa',
+        'Sinh' => 'Iskoola Pota',
+        'Mong' => 'Mongolian Baiti',
+        'Viet' => 'Times New Roman',
+        'Uigh' => 'Microsoft Uighur',
+        'Geor' => 'Sylfaen',
+    ];
+
+    public const FONTS_ARIAL_SUBSTITUTIONS = [
+        'Jpan' => 'ＭＳ Ｐゴシック',
+        'Hang' => '맑은 고딕',
+        'Hans' => '宋体',
+        'Hant' => '新細明體',
+        'Arab' => 'Arial',
+        'Hebr' => 'Arial',
+        'Thai' => 'Tahoma',
+        'Ethi' => 'Nyala',
+        'Beng' => 'Vrinda',
+        'Gujr' => 'Shruti',
+        'Khmr' => 'DaunPenh',
+        'Knda' => 'Tunga',
+        'Guru' => 'Raavi',
+        'Cans' => 'Euphemia',
+        'Cher' => 'Plantagenet Cherokee',
+        'Yiii' => 'Microsoft Yi Baiti',
+        'Tibt' => 'Microsoft Himalaya',
+        'Thaa' => 'MV Boli',
+        'Deva' => 'Mangal',
+        'Telu' => 'Gautami',
+        'Taml' => 'Latha',
+        'Syrc' => 'Estrangelo Edessa',
+        'Orya' => 'Kalinga',
+        'Mlym' => 'Kartika',
+        'Laoo' => 'DokChampa',
+        'Sinh' => 'Iskoola Pota',
+        'Mong' => 'Mongolian Baiti',
+        'Viet' => 'Arial',
+        'Uigh' => 'Microsoft Uighur',
+        'Geor' => 'Sylfaen',
+    ];
+
+    public function getThemeColors(): array
+    {
+        return $this->themeColors;
+    }
+
+    public function setThemeColor(string $key, string $value): self
+    {
+        $this->themeColors[$key] = $value;
+
+        return $this;
+    }
+
+    public function getThemeColorName(): string
+    {
+        return $this->themeColorName;
+    }
+
+    public function setThemeColorName(string $name, ?array $themeColors = null): self
+    {
+        $this->themeColorName = $name;
+        if ($name === self::COLOR_SCHEME_2007_2010_NAME) {
+            $themeColors = $themeColors ?? self::COLOR_SCHEME_2007_2010;
+        } elseif ($name === self::COLOR_SCHEME_2013_PLUS_NAME) {
+            $themeColors = $themeColors ?? self::COLOR_SCHEME_2013_PLUS;
+        }
+        if ($themeColors !== null) {
+            $this->themeColors = $themeColors;
+        }
+
+        return $this;
+    }
+
+    public function getMajorFontLatin(): string
+    {
+        return $this->majorFontLatin;
+    }
+
+    public function getMajorFontEastAsian(): string
+    {
+        return $this->majorFontEastAsian;
+    }
+
+    public function getMajorFontComplexScript(): string
+    {
+        return $this->majorFontComplexScript;
+    }
+
+    public function getMajorFontSubstitutions(): array
+    {
+        return $this->majorFontSubstitutions;
+    }
+
+    public function setMajorFontValues(?string $latin, ?string $eastAsian, ?string $complexScript, ?array $substitutions): self
+    {
+        if (!empty($latin)) {
+            $this->majorFontLatin = $latin;
+        }
+        if ($eastAsian !== null) {
+            $this->majorFontEastAsian = $eastAsian;
+        }
+        if ($complexScript !== null) {
+            $this->majorFontComplexScript = $complexScript;
+        }
+        if ($substitutions !== null) {
+            $this->majorFontSubstitutions = $substitutions;
+        }
+
+        return $this;
+    }
+
+    public function getMinorFontLatin(): string
+    {
+        return $this->minorFontLatin;
+    }
+
+    public function getMinorFontEastAsian(): string
+    {
+        return $this->minorFontEastAsian;
+    }
+
+    public function getMinorFontComplexScript(): string
+    {
+        return $this->minorFontComplexScript;
+    }
+
+    public function getMinorFontSubstitutions(): array
+    {
+        return $this->minorFontSubstitutions;
+    }
+
+    public function setMinorFontValues(?string $latin, ?string $eastAsian, ?string $complexScript, ?array $substitutions): self
+    {
+        if (!empty($latin)) {
+            $this->minorFontLatin = $latin;
+        }
+        if ($eastAsian !== null) {
+            $this->minorFontEastAsian = $eastAsian;
+        }
+        if ($complexScript !== null) {
+            $this->minorFontComplexScript = $complexScript;
+        }
+        if ($substitutions !== null) {
+            $this->minorFontSubstitutions = $substitutions;
+        }
+
+        return $this;
+    }
+
+    public function getThemeFontName(): string
+    {
+        return $this->themeFontName;
+    }
+
+    public function setThemeFontName(?string $name): self
+    {
+        if (!empty($name)) {
+            $this->themeFontName = $name;
+        }
+
+        return $this;
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter.php
index b846f7b683..2c4a469559 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter.php
@@ -2,54 +2,78 @@
 
 namespace PhpOffice\PhpSpreadsheet\Worksheet;
 
+use DateTime;
+use DateTimeZone;
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
-use PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Internal\WildcardMatch;
+use PhpOffice\PhpSpreadsheet\Cell\AddressRange;
+use PhpOffice\PhpSpreadsheet\Cell\CellAddress;
+use PhpOffice\PhpSpreadsheet\Cell\CellRange;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
-use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
+use PhpOffice\PhpSpreadsheet\Exception;
 use PhpOffice\PhpSpreadsheet\Shared\Date;
+use PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter\Column\Rule;
+use Stringable;
 
-class AutoFilter
+class AutoFilter implements Stringable
 {
     /**
      * Autofilter Worksheet.
-     *
-     * @var null|Worksheet
      */
-    private $workSheet;
+    private ?Worksheet $workSheet;
 
     /**
      * Autofilter Range.
-     *
-     * @var string
      */
-    private $range = '';
+    private string $range;
 
     /**
      * Autofilter Column Ruleset.
      *
      * @var AutoFilter\Column[]
      */
-    private $columns = [];
+    private array $columns = [];
+
+    private bool $evaluated = false;
+
+    public function getEvaluated(): bool
+    {
+        return $this->evaluated;
+    }
+
+    public function setEvaluated(bool $value): void
+    {
+        $this->evaluated = $value;
+    }
 
     /**
      * Create a new AutoFilter.
      *
-     * @param string $pRange Cell range (i.e. A1:E10)
-     * @param Worksheet $pSheet
+     * @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' is permitted
+     *              or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
+     *              or an AddressRange object.
      */
-    public function __construct($pRange = '', ?Worksheet $pSheet = null)
+    public function __construct(AddressRange|string|array $range = '', ?Worksheet $worksheet = null)
+    {
+        if ($range !== '') {
+            [, $range] = Worksheet::extractSheetTitle(Validations::validateCellRange($range), true);
+        }
+
+        $this->range = $range ?? '';
+        $this->workSheet = $worksheet;
+    }
+
+    public function __destruct()
     {
-        $this->range = $pRange;
-        $this->workSheet = $pSheet;
+        $this->workSheet = null;
     }
 
     /**
      * Get AutoFilter Parent Worksheet.
-     *
-     * @return null|Worksheet
      */
-    public function getParent()
+    public function getParent(): null|Worksheet
     {
         return $this->workSheet;
     }
@@ -57,58 +81,73 @@ public function getParent()
     /**
      * Set AutoFilter Parent Worksheet.
      *
-     * @param Worksheet $pSheet
-     *
      * @return $this
      */
-    public function setParent(?Worksheet $pSheet = null)
+    public function setParent(?Worksheet $worksheet = null): static
     {
-        $this->workSheet = $pSheet;
+        $this->evaluated = false;
+        $this->workSheet = $worksheet;
 
         return $this;
     }
 
     /**
      * Get AutoFilter Range.
-     *
-     * @return string
      */
-    public function getRange()
+    public function getRange(): string
     {
         return $this->range;
     }
 
     /**
-     * Set AutoFilter Range.
-     *
-     * @param string $pRange Cell range (i.e. A1:E10)
+     * Set AutoFilter Cell Range.
      *
-     * @return $this
+     * @param AddressRange<CellRange>|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 a Cell address like 'A1' is permitted
+     *              or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
+     *              or an AddressRange object.
      */
-    public function setRange($pRange)
+    public function setRange(AddressRange|string|array $range = ''): self
     {
+        $this->evaluated = false;
         // extract coordinate
-        [$worksheet, $pRange] = Worksheet::extractSheetTitle($pRange, true);
-
-        if (strpos($pRange, ':') !== false) {
-            $this->range = $pRange;
-        } elseif (empty($pRange)) {
-            $this->range = '';
-        } else {
-            throw new PhpSpreadsheetException('Autofilter must be set on a range of cells.');
+        if ($range !== '') {
+            [, $range] = Worksheet::extractSheetTitle(Validations::validateCellRange($range), true);
         }
 
-        if (empty($pRange)) {
+        if (empty($range)) {
             //    Discard all column rules
             $this->columns = [];
-        } else {
-            //    Discard any column rules that are no longer valid within this range
-            [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($this->range);
-            foreach ($this->columns as $key => $value) {
-                $colIndex = Coordinate::columnIndexFromString($key);
-                if (($rangeStart[0] > $colIndex) || ($rangeEnd[0] < $colIndex)) {
-                    unset($this->columns[$key]);
-                }
+            $this->range = '';
+
+            return $this;
+        }
+
+        if (ctype_digit($range) || ctype_alpha($range)) {
+            throw new Exception("{$range} is an invalid range for AutoFilter");
+        }
+
+        $this->range = $range;
+        //    Discard any column rules that are no longer valid within this range
+        [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($this->range);
+        foreach ($this->columns as $key => $value) {
+            $colIndex = Coordinate::columnIndexFromString($key);
+            if (($rangeStart[0] > $colIndex) || ($rangeEnd[0] < $colIndex)) {
+                unset($this->columns[$key]);
+            }
+        }
+
+        return $this;
+    }
+
+    public function setRangeToMaxRow(): self
+    {
+        $this->evaluated = false;
+        if ($this->workSheet !== null) {
+            $thisrange = $this->range;
+            $range = (string) preg_replace('/\\d+$/', (string) $this->workSheet->getHighestRow(), $thisrange);
+            if ($range !== $thisrange) {
+                $this->setRange($range);
             }
         }
 
@@ -120,7 +159,7 @@ public function setRange($pRange)
      *
      * @return AutoFilter\Column[]
      */
-    public function getColumns()
+    public function getColumns(): array
     {
         return $this->columns;
     }
@@ -132,16 +171,16 @@ public function getColumns()
      *
      * @return int The column offset within the autofilter range
      */
-    public function testColumnInRange($column)
+    public function testColumnInRange(string $column): int
     {
         if (empty($this->range)) {
-            throw new PhpSpreadsheetException('No autofilter range is defined.');
+            throw new Exception('No autofilter range is defined.');
         }
 
         $columnIndex = Coordinate::columnIndexFromString($column);
         [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($this->range);
         if (($rangeStart[0] > $columnIndex) || ($rangeEnd[0] < $columnIndex)) {
-            throw new PhpSpreadsheetException('Column is outside of current autofilter range.');
+            throw new Exception('Column is outside of current autofilter range.');
         }
 
         return $columnIndex - $rangeStart[0];
@@ -150,44 +189,40 @@ public function testColumnInRange($column)
     /**
      * Get a specified AutoFilter Column Offset within the defined AutoFilter range.
      *
-     * @param string $pColumn Column name (e.g. A)
+     * @param string $column Column name (e.g. A)
      *
      * @return int The offset of the specified column within the autofilter range
      */
-    public function getColumnOffset($pColumn)
+    public function getColumnOffset(string $column): int
     {
-        return $this->testColumnInRange($pColumn);
+        return $this->testColumnInRange($column);
     }
 
     /**
      * Get a specified AutoFilter Column.
      *
-     * @param string $pColumn Column name (e.g. A)
-     *
-     * @return AutoFilter\Column
+     * @param string $column Column name (e.g. A)
      */
-    public function getColumn($pColumn)
+    public function getColumn(string $column): AutoFilter\Column
     {
-        $this->testColumnInRange($pColumn);
+        $this->testColumnInRange($column);
 
-        if (!isset($this->columns[$pColumn])) {
-            $this->columns[$pColumn] = new AutoFilter\Column($pColumn, $this);
+        if (!isset($this->columns[$column])) {
+            $this->columns[$column] = new AutoFilter\Column($column, $this);
         }
 
-        return $this->columns[$pColumn];
+        return $this->columns[$column];
     }
 
     /**
      * Get a specified AutoFilter Column by it's offset.
      *
-     * @param int $pColumnOffset Column offset within range (starting from 0)
-     *
-     * @return AutoFilter\Column
+     * @param int $columnOffset Column offset within range (starting from 0)
      */
-    public function getColumnByOffset($pColumnOffset)
+    public function getColumnByOffset(int $columnOffset): AutoFilter\Column
     {
         [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($this->range);
-        $pColumn = Coordinate::stringFromColumnIndex($rangeStart[0] + $pColumnOffset);
+        $pColumn = Coordinate::stringFromColumnIndex($rangeStart[0] + $columnOffset);
 
         return $this->getColumn($pColumn);
     }
@@ -195,27 +230,28 @@ public function getColumnByOffset($pColumnOffset)
     /**
      * Set AutoFilter.
      *
-     * @param AutoFilter\Column|string $pColumn
+     * @param AutoFilter\Column|string $columnObjectOrString
      *            A simple string containing a Column ID like 'A' is permitted
      *
      * @return $this
      */
-    public function setColumn($pColumn)
+    public function setColumn(AutoFilter\Column|string $columnObjectOrString): static
     {
-        if ((is_string($pColumn)) && (!empty($pColumn))) {
-            $column = $pColumn;
-        } elseif (is_object($pColumn) && ($pColumn instanceof AutoFilter\Column)) {
-            $column = $pColumn->getColumnIndex();
+        $this->evaluated = false;
+        if ((is_string($columnObjectOrString)) && (!empty($columnObjectOrString))) {
+            $column = $columnObjectOrString;
+        } elseif ($columnObjectOrString instanceof AutoFilter\Column) {
+            $column = $columnObjectOrString->getColumnIndex();
         } else {
-            throw new PhpSpreadsheetException('Column is not within the autofilter range.');
+            throw new Exception('Column is not within the autofilter range.');
         }
         $this->testColumnInRange($column);
 
-        if (is_string($pColumn)) {
-            $this->columns[$pColumn] = new AutoFilter\Column($pColumn, $this);
-        } elseif (is_object($pColumn) && ($pColumn instanceof AutoFilter\Column)) {
-            $pColumn->setParent($this);
-            $this->columns[$column] = $pColumn;
+        if (is_string($columnObjectOrString)) {
+            $this->columns[$columnObjectOrString] = new AutoFilter\Column($columnObjectOrString, $this);
+        } else {
+            $columnObjectOrString->setParent($this);
+            $this->columns[$column] = $columnObjectOrString;
         }
         ksort($this->columns);
 
@@ -225,16 +261,17 @@ public function setColumn($pColumn)
     /**
      * Clear a specified AutoFilter Column.
      *
-     * @param string $pColumn Column name (e.g. A)
+     * @param string $column Column name (e.g. A)
      *
      * @return $this
      */
-    public function clearColumn($pColumn)
+    public function clearColumn(string $column): static
     {
-        $this->testColumnInRange($pColumn);
+        $this->evaluated = false;
+        $this->testColumnInRange($column);
 
-        if (isset($this->columns[$pColumn])) {
-            unset($this->columns[$pColumn]);
+        if (isset($this->columns[$column])) {
+            unset($this->columns[$column]);
         }
 
         return $this;
@@ -252,8 +289,9 @@ public function clearColumn($pColumn)
      *
      * @return $this
      */
-    public function shiftColumn($fromColumn, $toColumn)
+    public function shiftColumn(string $fromColumn, string $toColumn): static
     {
+        $this->evaluated = false;
         $fromColumn = strtoupper($fromColumn);
         $toColumn = strtoupper($toColumn);
 
@@ -273,12 +311,9 @@ public function shiftColumn($fromColumn, $toColumn)
     /**
      * Test if cell value is in the defined set of values.
      *
-     * @param mixed $cellValue
-     * @param mixed[] $dataSet
-     *
-     * @return bool
+     * @param array{blanks: bool, filterValues: array<string,array<string,string>>} $dataSet
      */
-    private static function filterTestInSimpleDataSet($cellValue, $dataSet)
+    protected static function filterTestInSimpleDataSet(mixed $cellValue, array $dataSet): bool
     {
         $dataSetValues = $dataSet['filterValues'];
         $blanks = $dataSet['blanks'];
@@ -292,37 +327,36 @@ private static function filterTestInSimpleDataSet($cellValue, $dataSet)
     /**
      * Test if cell value is in the defined set of Excel date values.
      *
-     * @param mixed $cellValue
-     * @param mixed[] $dataSet
-     *
-     * @return bool
+     * @param array{blanks: bool, filterValues: array<string,array<string,string>>} $dataSet
      */
-    private static function filterTestInDateGroupSet($cellValue, $dataSet)
+    protected static function filterTestInDateGroupSet(mixed $cellValue, array $dataSet): bool
     {
         $dateSet = $dataSet['filterValues'];
         $blanks = $dataSet['blanks'];
         if (($cellValue == '') || ($cellValue === null)) {
             return $blanks;
         }
+        $timeZone = new DateTimeZone('UTC');
 
         if (is_numeric($cellValue)) {
-            $dateValue = Date::excelToTimestamp($cellValue);
+            $dateTime = Date::excelToDateTimeObject((float) $cellValue, $timeZone);
+            $cellValue = (float) $cellValue;
             if ($cellValue < 1) {
                 //    Just the time part
-                $dtVal = date('His', $dateValue);
+                $dtVal = $dateTime->format('His');
                 $dateSet = $dateSet['time'];
             } elseif ($cellValue == floor($cellValue)) {
                 //    Just the date part
-                $dtVal = date('Ymd', $dateValue);
+                $dtVal = $dateTime->format('Ymd');
                 $dateSet = $dateSet['date'];
             } else {
                 //    date and time parts
-                $dtVal = date('YmdHis', $dateValue);
+                $dtVal = $dateTime->format('YmdHis');
                 $dateSet = $dateSet['dateTime'];
             }
             foreach ($dateSet as $dateValue) {
                 //    Use of substr to extract value at the appropriate group level
-                if (substr($dtVal, 0, strlen($dateValue)) == $dateValue) {
+                if (str_starts_with($dtVal, $dateValue)) {
                     return true;
                 }
             }
@@ -334,13 +368,11 @@ private static function filterTestInDateGroupSet($cellValue, $dataSet)
     /**
      * Test if cell value is within a set of values defined by a ruleset.
      *
-     * @param mixed $cellValue
      * @param mixed[] $ruleSet
-     *
-     * @return bool
      */
-    private static function filterTestInCustomDataSet($cellValue, $ruleSet)
+    protected static function filterTestInCustomDataSet(mixed $cellValue, array $ruleSet): bool
     {
+        /** @var array[] $dataSet */
         $dataSet = $ruleSet['filterRules'];
         $join = $ruleSet['join'];
         $customRuleForBlanks = $ruleSet['customRuleForBlanks'] ?? false;
@@ -353,54 +385,77 @@ private static function filterTestInCustomDataSet($cellValue, $ruleSet)
         }
         $returnVal = ($join == AutoFilter\Column::AUTOFILTER_COLUMN_JOIN_AND);
         foreach ($dataSet as $rule) {
+            /** @var string $ruleValue */
+            $ruleValue = $rule['value'];
+            /** @var string $ruleOperator */
+            $ruleOperator = $rule['operator'];
+            /** @var string $cellValueString */
+            $cellValueString = $cellValue ?? '';
             $retVal = false;
 
-            if (is_numeric($rule['value'])) {
+            if (is_numeric($ruleValue)) {
                 //    Numeric values are tested using the appropriate operator
-                switch ($rule['operator']) {
-                    case AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_EQUAL:
-                        $retVal = ($cellValue == $rule['value']);
+                $numericTest = is_numeric($cellValue);
+                switch ($ruleOperator) {
+                    case Rule::AUTOFILTER_COLUMN_RULE_EQUAL:
+                        $retVal = $numericTest && ($cellValue == $ruleValue);
 
                         break;
-                    case AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_NOTEQUAL:
-                        $retVal = ($cellValue != $rule['value']);
+                    case Rule::AUTOFILTER_COLUMN_RULE_NOTEQUAL:
+                        $retVal = !$numericTest || ($cellValue != $ruleValue);
 
                         break;
-                    case AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_GREATERTHAN:
-                        $retVal = ($cellValue > $rule['value']);
+                    case Rule::AUTOFILTER_COLUMN_RULE_GREATERTHAN:
+                        $retVal = $numericTest && ($cellValue > $ruleValue);
 
                         break;
-                    case AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL:
-                        $retVal = ($cellValue >= $rule['value']);
+                    case Rule::AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL:
+                        $retVal = $numericTest && ($cellValue >= $ruleValue);
 
                         break;
-                    case AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_LESSTHAN:
-                        $retVal = ($cellValue < $rule['value']);
+                    case Rule::AUTOFILTER_COLUMN_RULE_LESSTHAN:
+                        $retVal = $numericTest && ($cellValue < $ruleValue);
 
                         break;
-                    case AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_LESSTHANOREQUAL:
-                        $retVal = ($cellValue <= $rule['value']);
+                    case Rule::AUTOFILTER_COLUMN_RULE_LESSTHANOREQUAL:
+                        $retVal = $numericTest && ($cellValue <= $ruleValue);
 
                         break;
                 }
-            } elseif ($rule['value'] == '') {
-                switch ($rule['operator']) {
-                    case AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_EQUAL:
-                        $retVal = (($cellValue == '') || ($cellValue === null));
+            } elseif ($ruleValue == '') {
+                $retVal = match ($ruleOperator) {
+                    Rule::AUTOFILTER_COLUMN_RULE_EQUAL => ($cellValue == '') || ($cellValue === null),
+                    Rule::AUTOFILTER_COLUMN_RULE_NOTEQUAL => ($cellValue != '') && ($cellValue !== null),
+                    default => true,
+                };
+            } else {
+                //    String values are always tested for equality, factoring in for wildcards (hence a regexp test)
+                switch ($ruleOperator) {
+                    case Rule::AUTOFILTER_COLUMN_RULE_EQUAL:
+                        $retVal = (bool) preg_match('/^' . $ruleValue . '$/i', $cellValueString);
+
+                        break;
+                    case Rule::AUTOFILTER_COLUMN_RULE_NOTEQUAL:
+                        $retVal = !((bool) preg_match('/^' . $ruleValue . '$/i', $cellValueString));
+
+                        break;
+                    case Rule::AUTOFILTER_COLUMN_RULE_GREATERTHAN:
+                        $retVal = strcasecmp($cellValueString, $ruleValue) > 0;
+
+                        break;
+                    case Rule::AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL:
+                        $retVal = strcasecmp($cellValueString, $ruleValue) >= 0;
 
                         break;
-                    case AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_NOTEQUAL:
-                        $retVal = (($cellValue != '') && ($cellValue !== null));
+                    case Rule::AUTOFILTER_COLUMN_RULE_LESSTHAN:
+                        $retVal = strcasecmp($cellValueString, $ruleValue) < 0;
 
                         break;
-                    default:
-                        $retVal = true;
+                    case Rule::AUTOFILTER_COLUMN_RULE_LESSTHANOREQUAL:
+                        $retVal = strcasecmp($cellValueString, $ruleValue) <= 0;
 
                         break;
                 }
-            } else {
-                //    String values are always tested for equality, factoring in for wildcards (hence a regexp test)
-                $retVal = preg_match('/^' . $rule['value'] . '$/i', $cellValue);
             }
             //    If there are multiple conditions, then we need to test both using the appropriate join operator
             switch ($join) {
@@ -426,12 +481,9 @@ private static function filterTestInCustomDataSet($cellValue, $ruleSet)
     /**
      * Test if cell date value is matches a set of values defined by a set of months.
      *
-     * @param mixed $cellValue
      * @param mixed[] $monthSet
-     *
-     * @return bool
      */
-    private static function filterTestInPeriodDateSet($cellValue, $monthSet)
+    protected static function filterTestInPeriodDateSet(mixed $cellValue, array $monthSet): bool
     {
         //    Blank cells are always ignored, so return a FALSE
         if (($cellValue == '') || ($cellValue === null)) {
@@ -439,7 +491,8 @@ private static function filterTestInPeriodDateSet($cellValue, $monthSet)
         }
 
         if (is_numeric($cellValue)) {
-            $dateValue = date('m', Date::excelToTimestamp($cellValue));
+            $dateObject = Date::excelToDateTimeObject((float) $cellValue, new DateTimeZone('UTC'));
+            $dateValue = (int) $dateObject->format('m');
             if (in_array($dateValue, $monthSet)) {
                 return true;
             }
@@ -448,156 +501,280 @@ private static function filterTestInPeriodDateSet($cellValue, $monthSet)
         return false;
     }
 
-    /**
-     * Search/Replace arrays to convert Excel wildcard syntax to a regexp syntax for preg_matching.
-     *
-     * @var array
-     */
-    private static $fromReplace = ['\*', '\?', '~~', '~.*', '~.?'];
+    private static function makeDateObject(int $year, int $month, int $day, int $hour = 0, int $minute = 0, int $second = 0): DateTime
+    {
+        $baseDate = new DateTime();
+        $baseDate->setDate($year, $month, $day);
+        $baseDate->setTime($hour, $minute, $second);
 
-    private static $toReplace = ['.*', '.', '~', '\*', '\?'];
+        return $baseDate;
+    }
 
-    /**
-     * Convert a dynamic rule daterange to a custom filter range expression for ease of calculation.
-     *
-     * @param string $dynamicRuleType
-     * @param AutoFilter\Column $filterColumn
-     *
-     * @return mixed[]
-     */
-    private function dynamicFilterDateRange($dynamicRuleType, &$filterColumn)
+    private const DATE_FUNCTIONS = [
+        Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTMONTH => 'dynamicLastMonth',
+        Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTQUARTER => 'dynamicLastQuarter',
+        Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTWEEK => 'dynamicLastWeek',
+        Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTYEAR => 'dynamicLastYear',
+        Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTMONTH => 'dynamicNextMonth',
+        Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTQUARTER => 'dynamicNextQuarter',
+        Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTWEEK => 'dynamicNextWeek',
+        Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTYEAR => 'dynamicNextYear',
+        Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISMONTH => 'dynamicThisMonth',
+        Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISQUARTER => 'dynamicThisQuarter',
+        Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISWEEK => 'dynamicThisWeek',
+        Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISYEAR => 'dynamicThisYear',
+        Rule::AUTOFILTER_RULETYPE_DYNAMIC_TODAY => 'dynamicToday',
+        Rule::AUTOFILTER_RULETYPE_DYNAMIC_TOMORROW => 'dynamicTomorrow',
+        Rule::AUTOFILTER_RULETYPE_DYNAMIC_YEARTODATE => 'dynamicYearToDate',
+        Rule::AUTOFILTER_RULETYPE_DYNAMIC_YESTERDAY => 'dynamicYesterday',
+    ];
+
+    private static function dynamicLastMonth(): array
     {
-        $rDateType = Functions::getReturnDateType();
-        Functions::setReturnDateType(Functions::RETURNDATE_PHP_NUMERIC);
-        $val = $maxVal = null;
+        $maxval = new DateTime();
+        $year = (int) $maxval->format('Y');
+        $month = (int) $maxval->format('m');
+        $maxval->setDate($year, $month, 1);
+        $maxval->setTime(0, 0, 0);
+        $val = clone $maxval;
+        $val->modify('-1 month');
+
+        return [$val, $maxval];
+    }
 
-        $ruleValues = [];
-        $baseDate = DateTimeExcel\Current::now();
-        //    Calculate start/end dates for the required date range based on current date
-        switch ($dynamicRuleType) {
-            case AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTWEEK:
-                $baseDate = strtotime('-7 days', $baseDate);
+    private static function firstDayOfQuarter(): DateTime
+    {
+        $val = new DateTime();
+        $year = (int) $val->format('Y');
+        $month = (int) $val->format('m');
+        $month = 3 * intdiv($month - 1, 3) + 1;
+        $val->setDate($year, $month, 1);
+        $val->setTime(0, 0, 0);
+
+        return $val;
+    }
 
-                break;
-            case AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTWEEK:
-                $baseDate = strtotime('-7 days', $baseDate);
+    private static function dynamicLastQuarter(): array
+    {
+        $maxval = self::firstDayOfQuarter();
+        $val = clone $maxval;
+        $val->modify('-3 months');
 
-                break;
-            case AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTMONTH:
-                $baseDate = strtotime('-1 month', gmmktime(0, 0, 0, 1, date('m', $baseDate), date('Y', $baseDate)));
+        return [$val, $maxval];
+    }
 
-                break;
-            case AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTMONTH:
-                $baseDate = strtotime('+1 month', gmmktime(0, 0, 0, 1, date('m', $baseDate), date('Y', $baseDate)));
+    private static function dynamicLastWeek(): array
+    {
+        $val = new DateTime();
+        $val->setTime(0, 0, 0);
+        $dayOfWeek = (int) $val->format('w'); // Sunday is 0
+        $subtract = $dayOfWeek + 7; // revert to prior Sunday
+        $val->modify("-$subtract days");
+        $maxval = clone $val;
+        $maxval->modify('+7 days');
+
+        return [$val, $maxval];
+    }
 
-                break;
-            case AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTQUARTER:
-                $baseDate = strtotime('-3 month', gmmktime(0, 0, 0, 1, date('m', $baseDate), date('Y', $baseDate)));
+    private static function dynamicLastYear(): array
+    {
+        $val = new DateTime();
+        $year = (int) $val->format('Y');
+        $val = self::makeDateObject($year - 1, 1, 1);
+        $maxval = self::makeDateObject($year, 1, 1);
 
-                break;
-            case AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTQUARTER:
-                $baseDate = strtotime('+3 month', gmmktime(0, 0, 0, 1, date('m', $baseDate), date('Y', $baseDate)));
+        return [$val, $maxval];
+    }
 
-                break;
-            case AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTYEAR:
-                $baseDate = strtotime('-1 year', gmmktime(0, 0, 0, 1, date('m', $baseDate), date('Y', $baseDate)));
+    private static function dynamicNextMonth(): array
+    {
+        $val = new DateTime();
+        $year = (int) $val->format('Y');
+        $month = (int) $val->format('m');
+        $val->setDate($year, $month, 1);
+        $val->setTime(0, 0, 0);
+        $val->modify('+1 month');
+        $maxval = clone $val;
+        $maxval->modify('+1 month');
+
+        return [$val, $maxval];
+    }
 
-                break;
-            case AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTYEAR:
-                $baseDate = strtotime('+1 year', gmmktime(0, 0, 0, 1, date('m', $baseDate), date('Y', $baseDate)));
+    private static function dynamicNextQuarter(): array
+    {
+        $val = self::firstDayOfQuarter();
+        $val->modify('+3 months');
+        $maxval = clone $val;
+        $maxval->modify('+3 months');
 
-                break;
-        }
+        return [$val, $maxval];
+    }
 
-        switch ($dynamicRuleType) {
-            case AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_TODAY:
-            case AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_YESTERDAY:
-            case AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_TOMORROW:
-                $maxVal = (int) Date::PHPtoExcel(strtotime('+1 day', $baseDate));
-                $val = (int) Date::PHPToExcel($baseDate);
-
-                break;
-            case AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_YEARTODATE:
-                $maxVal = (int) Date::PHPtoExcel(strtotime('+1 day', $baseDate));
-                $val = (int) Date::PHPToExcel(gmmktime(0, 0, 0, 1, 1, date('Y', $baseDate)));
-
-                break;
-            case AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISYEAR:
-            case AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTYEAR:
-            case AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTYEAR:
-                $maxVal = (int) Date::PHPToExcel(gmmktime(0, 0, 0, 31, 12, date('Y', $baseDate)));
-                ++$maxVal;
-                $val = (int) Date::PHPToExcel(gmmktime(0, 0, 0, 1, 1, date('Y', $baseDate)));
-
-                break;
-            case AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISQUARTER:
-            case AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTQUARTER:
-            case AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTQUARTER:
-                $thisMonth = date('m', $baseDate);
-                $thisQuarter = floor(--$thisMonth / 3);
-                $maxVal = (int) Date::PHPtoExcel(gmmktime(0, 0, 0, date('t', $baseDate), (1 + $thisQuarter) * 3, date('Y', $baseDate)));
-                ++$maxVal;
-                $val = (int) Date::PHPToExcel(gmmktime(0, 0, 0, 1, 1 + $thisQuarter * 3, date('Y', $baseDate)));
-
-                break;
-            case AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISMONTH:
-            case AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTMONTH:
-            case AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTMONTH:
-                $maxVal = (int) Date::PHPtoExcel(gmmktime(0, 0, 0, date('t', $baseDate), date('m', $baseDate), date('Y', $baseDate)));
-                ++$maxVal;
-                $val = (int) Date::PHPToExcel(gmmktime(0, 0, 0, 1, date('m', $baseDate), date('Y', $baseDate)));
-
-                break;
-            case AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISWEEK:
-            case AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTWEEK:
-            case AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTWEEK:
-                $dayOfWeek = date('w', $baseDate);
-                $val = (int) Date::PHPToExcel($baseDate) - $dayOfWeek;
-                $maxVal = $val + 7;
-
-                break;
-        }
+    private static function dynamicNextWeek(): array
+    {
+        $val = new DateTime();
+        $val->setTime(0, 0, 0);
+        $dayOfWeek = (int) $val->format('w'); // Sunday is 0
+        $add = 7 - $dayOfWeek; // move to next Sunday
+        $val->modify("+$add days");
+        $maxval = clone $val;
+        $maxval->modify('+7 days');
+
+        return [$val, $maxval];
+    }
+
+    private static function dynamicNextYear(): array
+    {
+        $val = new DateTime();
+        $year = (int) $val->format('Y');
+        $val = self::makeDateObject($year + 1, 1, 1);
+        $maxval = self::makeDateObject($year + 2, 1, 1);
+
+        return [$val, $maxval];
+    }
 
-        switch ($dynamicRuleType) {
-            //    Adjust Today dates for Yesterday and Tomorrow
-            case AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_YESTERDAY:
-                --$maxVal;
-                --$val;
+    private static function dynamicThisMonth(): array
+    {
+        $baseDate = new DateTime();
+        $baseDate->setTime(0, 0, 0);
+        $year = (int) $baseDate->format('Y');
+        $month = (int) $baseDate->format('m');
+        $val = self::makeDateObject($year, $month, 1);
+        $maxval = clone $val;
+        $maxval->modify('+1 month');
+
+        return [$val, $maxval];
+    }
 
-                break;
-            case AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_TOMORROW:
-                ++$maxVal;
-                ++$val;
+    private static function dynamicThisQuarter(): array
+    {
+        $val = self::firstDayOfQuarter();
+        $maxval = clone $val;
+        $maxval->modify('+3 months');
 
-                break;
+        return [$val, $maxval];
+    }
+
+    private static function dynamicThisWeek(): array
+    {
+        $val = new DateTime();
+        $val->setTime(0, 0, 0);
+        $dayOfWeek = (int) $val->format('w'); // Sunday is 0
+        $subtract = $dayOfWeek; // revert to Sunday
+        $val->modify("-$subtract days");
+        $maxval = clone $val;
+        $maxval->modify('+7 days');
+
+        return [$val, $maxval];
+    }
+
+    private static function dynamicThisYear(): array
+    {
+        $val = new DateTime();
+        $year = (int) $val->format('Y');
+        $val = self::makeDateObject($year, 1, 1);
+        $maxval = self::makeDateObject($year + 1, 1, 1);
+
+        return [$val, $maxval];
+    }
+
+    private static function dynamicToday(): array
+    {
+        $val = new DateTime();
+        $val->setTime(0, 0, 0);
+        $maxval = clone $val;
+        $maxval->modify('+1 day');
+
+        return [$val, $maxval];
+    }
+
+    private static function dynamicTomorrow(): array
+    {
+        $val = new DateTime();
+        $val->setTime(0, 0, 0);
+        $val->modify('+1 day');
+        $maxval = clone $val;
+        $maxval->modify('+1 day');
+
+        return [$val, $maxval];
+    }
+
+    private static function dynamicYearToDate(): array
+    {
+        $maxval = new DateTime();
+        $maxval->setTime(0, 0, 0);
+        $val = self::makeDateObject((int) $maxval->format('Y'), 1, 1);
+        $maxval->modify('+1 day');
+
+        return [$val, $maxval];
+    }
+
+    private static function dynamicYesterday(): array
+    {
+        $maxval = new DateTime();
+        $maxval->setTime(0, 0, 0);
+        $val = clone $maxval;
+        $val->modify('-1 day');
+
+        return [$val, $maxval];
+    }
+
+    /**
+     * Convert a dynamic rule daterange to a custom filter range expression for ease of calculation.
+     *
+     * @return mixed[]
+     */
+    private function dynamicFilterDateRange(string $dynamicRuleType, AutoFilter\Column &$filterColumn): array
+    {
+        $ruleValues = [];
+        $callBack = [__CLASS__, self::DATE_FUNCTIONS[$dynamicRuleType]]; // What if not found?
+        //    Calculate start/end dates for the required date range based on current date
+        //    Val is lowest permitted value.
+        //    Maxval is greater than highest permitted value
+        $val = $maxval = 0;
+        if (is_callable($callBack)) {
+            [$val, $maxval] = $callBack();
         }
+        $val = Date::dateTimeToExcel($val);
+        $maxval = Date::dateTimeToExcel($maxval);
 
         //    Set the filter column rule attributes ready for writing
-        $filterColumn->setAttributes(['val' => $val, 'maxVal' => $maxVal]);
+        $filterColumn->setAttributes(['val' => $val, 'maxVal' => $maxval]);
 
         //    Set the rules for identifying rows for hide/show
-        $ruleValues[] = ['operator' => AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL, 'value' => $val];
-        $ruleValues[] = ['operator' => AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_LESSTHAN, 'value' => $maxVal];
-        Functions::setReturnDateType($rDateType);
+        $ruleValues[] = ['operator' => Rule::AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL, 'value' => $val];
+        $ruleValues[] = ['operator' => Rule::AUTOFILTER_COLUMN_RULE_LESSTHAN, 'value' => $maxval];
 
         return ['method' => 'filterTestInCustomDataSet', 'arguments' => ['filterRules' => $ruleValues, 'join' => AutoFilter\Column::AUTOFILTER_COLUMN_JOIN_AND]];
     }
 
-    private function calculateTopTenValue($columnID, $startRow, $endRow, $ruleType, $ruleValue)
+    /**
+     * Apply the AutoFilter rules to the AutoFilter Range.
+     */
+    private function calculateTopTenValue(string $columnID, int $startRow, int $endRow, ?string $ruleType, mixed $ruleValue): mixed
     {
         $range = $columnID . $startRow . ':' . $columnID . $endRow;
-        $dataValues = Functions::flattenArray($this->workSheet->rangeToArray($range, null, true, false));
+        $retVal = null;
+        if ($this->workSheet !== null) {
+            $dataValues = Functions::flattenArray($this->workSheet->rangeToArray($range, null, true, false));
+            $dataValues = array_filter($dataValues);
 
-        $dataValues = array_filter($dataValues);
-        if ($ruleType == AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP) {
-            rsort($dataValues);
-        } else {
-            sort($dataValues);
-        }
+            if ($ruleType == Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP) {
+                rsort($dataValues);
+            } else {
+                sort($dataValues);
+            }
 
-        $slice = array_slice($dataValues, 0, $ruleValue);
+            if (is_numeric($ruleValue)) {
+                $ruleValue = (int) $ruleValue;
+            }
+            if ($ruleValue === null || is_int($ruleValue)) {
+                $slice = array_slice($dataValues, 0, $ruleValue);
+                $retVal = array_pop($slice);
+            }
+        }
 
-        return array_pop($slice);
+        return $retVal;
     }
 
     /**
@@ -605,8 +782,11 @@ private function calculateTopTenValue($columnID, $startRow, $endRow, $ruleType,
      *
      * @return $this
      */
-    public function showHideRows()
+    public function showHideRows(): static
     {
+        if ($this->workSheet === null) {
+            return $this;
+        }
         [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($this->range);
 
         //    The heading row should always be visible
@@ -630,13 +810,13 @@ public function showHideRows()
                     if (count($ruleValues) != count($ruleDataSet)) {
                         $blanks = true;
                     }
-                    if ($ruleType == AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_FILTER) {
+                    if ($ruleType == Rule::AUTOFILTER_RULETYPE_FILTER) {
                         //    Filter on absolute values
                         $columnFilterTests[$columnID] = [
                             'method' => 'filterTestInSimpleDataSet',
                             'arguments' => ['filterValues' => $ruleDataSet, 'blanks' => $blanks],
                         ];
-                    } else {
+                    } elseif ($ruleType !== null) {
                         //    Filter on date group values
                         $arguments = [
                             'date' => [],
@@ -644,42 +824,45 @@ public function showHideRows()
                             'dateTime' => [],
                         ];
                         foreach ($ruleDataSet as $ruleValue) {
+                            if (!is_array($ruleValue)) {
+                                continue;
+                            }
                             $date = $time = '';
                             if (
-                                (isset($ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_YEAR])) &&
-                                ($ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_YEAR] !== '')
+                                (isset($ruleValue[Rule::AUTOFILTER_RULETYPE_DATEGROUP_YEAR]))
+                                && ($ruleValue[Rule::AUTOFILTER_RULETYPE_DATEGROUP_YEAR] !== '')
                             ) {
-                                $date .= sprintf('%04d', $ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_YEAR]);
+                                $date .= sprintf('%04d', $ruleValue[Rule::AUTOFILTER_RULETYPE_DATEGROUP_YEAR]);
                             }
                             if (
-                                (isset($ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_MONTH])) &&
-                                ($ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_MONTH] != '')
+                                (isset($ruleValue[Rule::AUTOFILTER_RULETYPE_DATEGROUP_MONTH]))
+                                && ($ruleValue[Rule::AUTOFILTER_RULETYPE_DATEGROUP_MONTH] != '')
                             ) {
-                                $date .= sprintf('%02d', $ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_MONTH]);
+                                $date .= sprintf('%02d', $ruleValue[Rule::AUTOFILTER_RULETYPE_DATEGROUP_MONTH]);
                             }
                             if (
-                                (isset($ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_DAY])) &&
-                                ($ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_DAY] !== '')
+                                (isset($ruleValue[Rule::AUTOFILTER_RULETYPE_DATEGROUP_DAY]))
+                                && ($ruleValue[Rule::AUTOFILTER_RULETYPE_DATEGROUP_DAY] !== '')
                             ) {
-                                $date .= sprintf('%02d', $ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_DAY]);
+                                $date .= sprintf('%02d', $ruleValue[Rule::AUTOFILTER_RULETYPE_DATEGROUP_DAY]);
                             }
                             if (
-                                (isset($ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_HOUR])) &&
-                                ($ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_HOUR] !== '')
+                                (isset($ruleValue[Rule::AUTOFILTER_RULETYPE_DATEGROUP_HOUR]))
+                                && ($ruleValue[Rule::AUTOFILTER_RULETYPE_DATEGROUP_HOUR] !== '')
                             ) {
-                                $time .= sprintf('%02d', $ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_HOUR]);
+                                $time .= sprintf('%02d', $ruleValue[Rule::AUTOFILTER_RULETYPE_DATEGROUP_HOUR]);
                             }
                             if (
-                                (isset($ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_MINUTE])) &&
-                                ($ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_MINUTE] !== '')
+                                (isset($ruleValue[Rule::AUTOFILTER_RULETYPE_DATEGROUP_MINUTE]))
+                                && ($ruleValue[Rule::AUTOFILTER_RULETYPE_DATEGROUP_MINUTE] !== '')
                             ) {
-                                $time .= sprintf('%02d', $ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_MINUTE]);
+                                $time .= sprintf('%02d', $ruleValue[Rule::AUTOFILTER_RULETYPE_DATEGROUP_MINUTE]);
                             }
                             if (
-                                (isset($ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND])) &&
-                                ($ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND] !== '')
+                                (isset($ruleValue[Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND]))
+                                && ($ruleValue[Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND] !== '')
                             ) {
-                                $time .= sprintf('%02d', $ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND]);
+                                $time .= sprintf('%02d', $ruleValue[Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND]);
                             }
                             $dateTime = $date . $time;
                             $arguments['date'][] = $date;
@@ -698,15 +881,14 @@ public function showHideRows()
 
                     break;
                 case AutoFilter\Column::AUTOFILTER_FILTERTYPE_CUSTOMFILTER:
-                    $customRuleForBlanks = false;
+                    $customRuleForBlanks = true;
                     $ruleValues = [];
                     //    Build a list of the filter value selections
                     foreach ($rules as $rule) {
                         $ruleValue = $rule->getValue();
-                        if (!is_numeric($ruleValue)) {
+                        if (!is_array($ruleValue) && !is_numeric($ruleValue)) {
                             //    Convert to a regexp allowing for regexp reserved characters, wildcards and escaped wildcards
-                            $ruleValue = preg_quote($ruleValue);
-                            $ruleValue = str_replace(self::$fromReplace, self::$toReplace, $ruleValue);
+                            $ruleValue = WildcardMatch::wildcard($ruleValue);
                             if (trim($ruleValue) == '') {
                                 $customRuleForBlanks = true;
                                 $ruleValue = trim($ruleValue);
@@ -727,17 +909,20 @@ public function showHideRows()
                         //    We should only ever have one Dynamic Filter Rule anyway
                         $dynamicRuleType = $rule->getGrouping();
                         if (
-                            ($dynamicRuleType == AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_ABOVEAVERAGE) ||
-                            ($dynamicRuleType == AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_BELOWAVERAGE)
+                            ($dynamicRuleType == Rule::AUTOFILTER_RULETYPE_DYNAMIC_ABOVEAVERAGE)
+                            || ($dynamicRuleType == Rule::AUTOFILTER_RULETYPE_DYNAMIC_BELOWAVERAGE)
                         ) {
                             //    Number (Average) based
                             //    Calculate the average
                             $averageFormula = '=AVERAGE(' . $columnID . ($rangeStart[1] + 1) . ':' . $columnID . $rangeEnd[1] . ')';
-                            $average = Calculation::getInstance()->calculateFormula($averageFormula, null, $this->workSheet->getCell('A1'));
+                            $average = Calculation::getInstance($this->workSheet->getParent())->calculateFormula($averageFormula, null, $this->workSheet->getCell('A1'));
+                            while (is_array($average)) {
+                                $average = array_pop($average);
+                            }
                             //    Set above/below rule based on greaterThan or LessTan
-                            $operator = ($dynamicRuleType === AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_ABOVEAVERAGE)
-                                ? AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_GREATERTHAN
-                                : AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_LESSTHAN;
+                            $operator = ($dynamicRuleType === Rule::AUTOFILTER_RULETYPE_DYNAMIC_ABOVEAVERAGE)
+                                ? Rule::AUTOFILTER_COLUMN_RULE_GREATERTHAN
+                                : Rule::AUTOFILTER_COLUMN_RULE_LESSTHAN;
                             $ruleValues[] = [
                                 'operator' => $operator,
                                 'value' => $average,
@@ -788,8 +973,8 @@ public function showHideRows()
                         $ruleValue = $rule->getValue();
                         $ruleOperator = $rule->getOperator();
                     }
-                    if ($ruleOperator === AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_PERCENT) {
-                        $ruleValue = floor($ruleValue * ($dataRowCount / 100));
+                    if (is_numeric($ruleValue) && $ruleOperator === Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_PERCENT) {
+                        $ruleValue = (int) floor((float) $ruleValue * ($dataRowCount / 100));
                     }
                     if (!is_array($ruleValue) && $ruleValue < 1) {
                         $ruleValue = 1;
@@ -798,11 +983,12 @@ public function showHideRows()
                         $ruleValue = 500;
                     }
 
-                    $maxVal = $this->calculateTopTenValue($columnID, $rangeStart[1] + 1, $rangeEnd[1], $toptenRuleType, $ruleValue);
+                    /** @var float|int|string */
+                    $maxVal = $this->calculateTopTenValue($columnID, $rangeStart[1] + 1, (int) $rangeEnd[1], $toptenRuleType, $ruleValue);
 
-                    $operator = ($toptenRuleType == AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP)
-                        ? AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL
-                        : AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_LESSTHANOREQUAL;
+                    $operator = ($toptenRuleType == Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP)
+                        ? Rule::AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL
+                        : Rule::AUTOFILTER_COLUMN_RULE_LESSTHANOREQUAL;
                     $ruleValues[] = ['operator' => $operator, 'value' => $maxVal];
                     $columnFilterTests[$columnID] = [
                         'method' => 'filterTestInCustomDataSet',
@@ -814,29 +1000,59 @@ public function showHideRows()
             }
         }
 
+        $rangeEnd[1] = $this->autoExtendRange($rangeStart[1], $rangeEnd[1]);
+
         //    Execute the column tests for each row in the autoFilter range to determine show/hide,
         for ($row = $rangeStart[1] + 1; $row <= $rangeEnd[1]; ++$row) {
             $result = true;
             foreach ($columnFilterTests as $columnID => $columnFilterTest) {
                 $cellValue = $this->workSheet->getCell($columnID . $row)->getCalculatedValue();
                 //    Execute the filter test
-                $result = $result &&
-                    call_user_func_array(
-                        [self::class, $columnFilterTest['method']],
-                        [$cellValue, $columnFilterTest['arguments']]
-                    );
+                /** @var callable */
+                $temp = [self::class, $columnFilterTest['method']];
+                /** @var bool */
+                $result // $result && // phpstan says $result is always true here
+                    = call_user_func_array($temp, [$cellValue, $columnFilterTest['arguments']]);
                 //    If filter test has resulted in FALSE, exit the loop straightaway rather than running any more tests
                 if (!$result) {
                     break;
                 }
             }
             //    Set show/hide for the row based on the result of the autoFilter result
-            $this->workSheet->getRowDimension($row)->setVisible($result);
+            //    If the RowDimension object has not been allocated yet and the row should be visible,
+            //    then we can avoid any operation since the rows are visible by default (saves a lot of memory)
+            if ($result === false || $this->workSheet->rowDimensionExists((int) $row)) {
+                $this->workSheet->getRowDimension((int) $row)->setVisible($result);
+            }
         }
+        $this->evaluated = true;
 
         return $this;
     }
 
+    /**
+     * Magic Range Auto-sizing.
+     * For a single row rangeSet, we follow MS Excel rules, and search for the first empty row to determine our range.
+     */
+    public function autoExtendRange(int $startRow, int $endRow): int
+    {
+        if ($startRow === $endRow && $this->workSheet !== null) {
+            try {
+                $rowIterator = $this->workSheet->getRowIterator($startRow + 1);
+            } catch (Exception) {
+                // If there are no rows below $startRow
+                return $startRow;
+            }
+            foreach ($rowIterator as $row) {
+                if ($row->isEmpty(CellIterator::TREAT_NULL_VALUE_AS_EMPTY_CELL | CellIterator::TREAT_EMPTY_STRING_AS_EMPTY_CELL) === true) {
+                    return $row->getRowIndex() - 1;
+                }
+            }
+        }
+
+        return $endRow;
+    }
+
     /**
      * Implement PHP __clone to create a deep clone, not just a shallow copy.
      */
@@ -869,7 +1085,7 @@ public function __clone()
      * toString method replicates previous behavior by returning the range if object is
      * referenced as a property of its parent.
      */
-    public function __toString()
+    public function __toString(): string
     {
         return (string) $this->range;
     }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter/Column.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter/Column.php
index 8ec0ca3b0a..514cf10123 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter/Column.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter/Column.php
@@ -21,7 +21,7 @@ class Column
      *
      * @var string[]
      */
-    private static $filterTypes = [
+    private static array $filterTypes = [
         //    Currently we're not handling
         //        colorFilter
         //        extLst
@@ -41,71 +41,68 @@ class Column
      *
      * @var string[]
      */
-    private static $ruleJoins = [
+    private static array $ruleJoins = [
         self::AUTOFILTER_COLUMN_JOIN_AND,
         self::AUTOFILTER_COLUMN_JOIN_OR,
     ];
 
     /**
      * Autofilter.
-     *
-     * @var null|AutoFilter
      */
-    private $parent;
+    private ?AutoFilter $parent;
 
     /**
      * Autofilter Column Index.
-     *
-     * @var string
      */
-    private $columnIndex = '';
+    private string $columnIndex;
 
     /**
      * Autofilter Column Filter Type.
-     *
-     * @var string
      */
-    private $filterType = self::AUTOFILTER_FILTERTYPE_FILTER;
+    private string $filterType = self::AUTOFILTER_FILTERTYPE_FILTER;
 
     /**
      * Autofilter Multiple Rules And/Or.
-     *
-     * @var string
      */
-    private $join = self::AUTOFILTER_COLUMN_JOIN_OR;
+    private string $join = self::AUTOFILTER_COLUMN_JOIN_OR;
 
     /**
      * Autofilter Column Rules.
      *
      * @var Column\Rule[]
      */
-    private $ruleset = [];
+    private array $ruleset = [];
 
     /**
      * Autofilter Column Dynamic Attributes.
      *
-     * @var mixed[]
+     * @var (float|int|string)[]
      */
-    private $attributes = [];
+    private array $attributes = [];
 
     /**
      * Create a new Column.
      *
-     * @param string $pColumn Column (e.g. A)
-     * @param AutoFilter $pParent Autofilter for this column
+     * @param string $column Column (e.g. A)
+     * @param ?AutoFilter $parent Autofilter for this column
      */
-    public function __construct($pColumn, ?AutoFilter $pParent = null)
+    public function __construct(string $column, ?AutoFilter $parent = null)
+    {
+        $this->columnIndex = $column;
+        $this->parent = $parent;
+    }
+
+    public function setEvaluatedFalse(): void
     {
-        $this->columnIndex = $pColumn;
-        $this->parent = $pParent;
+        if ($this->parent !== null) {
+            $this->parent->setEvaluated(false);
+        }
     }
 
     /**
      * Get AutoFilter column index as string eg: 'A'.
-     *
-     * @return string
      */
-    public function getColumnIndex()
+    public function getColumnIndex(): string
     {
         return $this->columnIndex;
     }
@@ -113,29 +110,28 @@ public function getColumnIndex()
     /**
      * Set AutoFilter column index as string eg: 'A'.
      *
-     * @param string $pColumn Column (e.g. A)
+     * @param string $column Column (e.g. A)
      *
      * @return $this
      */
-    public function setColumnIndex($pColumn)
+    public function setColumnIndex(string $column): static
     {
+        $this->setEvaluatedFalse();
         // Uppercase coordinate
-        $pColumn = strtoupper($pColumn);
+        $column = strtoupper($column);
         if ($this->parent !== null) {
-            $this->parent->testColumnInRange($pColumn);
+            $this->parent->testColumnInRange($column);
         }
 
-        $this->columnIndex = $pColumn;
+        $this->columnIndex = $column;
 
         return $this;
     }
 
     /**
      * Get this Column's AutoFilter Parent.
-     *
-     * @return null|AutoFilter
      */
-    public function getParent()
+    public function getParent(): ?AutoFilter
     {
         return $this->parent;
     }
@@ -143,23 +139,20 @@ public function getParent()
     /**
      * Set this Column's AutoFilter Parent.
      *
-     * @param AutoFilter $pParent
-     *
      * @return $this
      */
-    public function setParent(?AutoFilter $pParent = null)
+    public function setParent(?AutoFilter $parent = null): static
     {
-        $this->parent = $pParent;
+        $this->setEvaluatedFalse();
+        $this->parent = $parent;
 
         return $this;
     }
 
     /**
      * Get AutoFilter Type.
-     *
-     * @return string
      */
-    public function getFilterType()
+    public function getFilterType(): string
     {
         return $this->filterType;
     }
@@ -167,27 +160,27 @@ public function getFilterType()
     /**
      * Set AutoFilter Type.
      *
-     * @param string $pFilterType
-     *
      * @return $this
      */
-    public function setFilterType($pFilterType)
+    public function setFilterType(string $filterType): static
     {
-        if (!in_array($pFilterType, self::$filterTypes)) {
+        $this->setEvaluatedFalse();
+        if (!in_array($filterType, self::$filterTypes)) {
             throw new PhpSpreadsheetException('Invalid filter type for column AutoFilter.');
         }
+        if ($filterType === self::AUTOFILTER_FILTERTYPE_CUSTOMFILTER && count($this->ruleset) > 2) {
+            throw new PhpSpreadsheetException('No more than 2 rules are allowed in a Custom Filter');
+        }
 
-        $this->filterType = $pFilterType;
+        $this->filterType = $filterType;
 
         return $this;
     }
 
     /**
      * Get AutoFilter Multiple Rules And/Or Join.
-     *
-     * @return string
      */
-    public function getJoin()
+    public function getJoin(): string
     {
         return $this->join;
     }
@@ -195,19 +188,20 @@ public function getJoin()
     /**
      * Set AutoFilter Multiple Rules And/Or.
      *
-     * @param string $pJoin And/Or
+     * @param string $join And/Or
      *
      * @return $this
      */
-    public function setJoin($pJoin)
+    public function setJoin(string $join): static
     {
+        $this->setEvaluatedFalse();
         // Lowercase And/Or
-        $pJoin = strtolower($pJoin);
-        if (!in_array($pJoin, self::$ruleJoins)) {
+        $join = strtolower($join);
+        if (!in_array($join, self::$ruleJoins)) {
             throw new PhpSpreadsheetException('Invalid rule connection for column AutoFilter.');
         }
 
-        $this->join = $pJoin;
+        $this->join = $join;
 
         return $this;
     }
@@ -215,12 +209,13 @@ public function setJoin($pJoin)
     /**
      * Set AutoFilter Attributes.
      *
-     * @param string[] $attributes
+     * @param (float|int|string)[] $attributes
      *
      * @return $this
      */
-    public function setAttributes(array $attributes)
+    public function setAttributes(array $attributes): static
     {
+        $this->setEvaluatedFalse();
         $this->attributes = $attributes;
 
         return $this;
@@ -229,14 +224,15 @@ public function setAttributes(array $attributes)
     /**
      * Set An AutoFilter Attribute.
      *
-     * @param string $pName Attribute Name
-     * @param string $pValue Attribute Value
+     * @param string $name Attribute Name
+     * @param float|int|string $value Attribute Value
      *
      * @return $this
      */
-    public function setAttribute($pName, $pValue)
+    public function setAttribute(string $name, $value): static
     {
-        $this->attributes[$pName] = $pValue;
+        $this->setEvaluatedFalse();
+        $this->attributes[$name] = $value;
 
         return $this;
     }
@@ -244,9 +240,9 @@ public function setAttribute($pName, $pValue)
     /**
      * Get AutoFilter Column Attributes.
      *
-     * @return string[]
+     * @return (float|int|string)[]
      */
-    public function getAttributes()
+    public function getAttributes(): array
     {
         return $this->attributes;
     }
@@ -254,25 +250,28 @@ public function getAttributes()
     /**
      * Get specific AutoFilter Column Attribute.
      *
-     * @param string $pName Attribute Name
-     *
-     * @return null|string
+     * @param string $name Attribute Name
      */
-    public function getAttribute($pName)
+    public function getAttribute(string $name): null|float|int|string
     {
-        if (isset($this->attributes[$pName])) {
-            return $this->attributes[$pName];
+        if (isset($this->attributes[$name])) {
+            return $this->attributes[$name];
         }
 
         return null;
     }
 
+    public function ruleCount(): int
+    {
+        return count($this->ruleset);
+    }
+
     /**
      * Get all AutoFilter Column Rules.
      *
      * @return Column\Rule[]
      */
-    public function getRules()
+    public function getRules(): array
     {
         return $this->ruleset;
     }
@@ -280,26 +279,26 @@ public function getRules()
     /**
      * Get a specified AutoFilter Column Rule.
      *
-     * @param int $pIndex Rule index in the ruleset array
-     *
-     * @return Column\Rule
+     * @param int $index Rule index in the ruleset array
      */
-    public function getRule($pIndex)
+    public function getRule(int $index): Column\Rule
     {
-        if (!isset($this->ruleset[$pIndex])) {
-            $this->ruleset[$pIndex] = new Column\Rule($this);
+        if (!isset($this->ruleset[$index])) {
+            $this->ruleset[$index] = new Column\Rule($this);
         }
 
-        return $this->ruleset[$pIndex];
+        return $this->ruleset[$index];
     }
 
     /**
      * Create a new AutoFilter Column Rule in the ruleset.
-     *
-     * @return Column\Rule
      */
-    public function createRule()
+    public function createRule(): Column\Rule
     {
+        $this->setEvaluatedFalse();
+        if ($this->filterType === self::AUTOFILTER_FILTERTYPE_CUSTOMFILTER && count($this->ruleset) >= 2) {
+            throw new PhpSpreadsheetException('No more than 2 rules are allowed in a Custom Filter');
+        }
         $this->ruleset[] = new Column\Rule($this);
 
         return end($this->ruleset);
@@ -310,10 +309,11 @@ public function createRule()
      *
      * @return $this
      */
-    public function addRule(Column\Rule $pRule)
+    public function addRule(Column\Rule $rule): static
     {
-        $pRule->setParent($this);
-        $this->ruleset[] = $pRule;
+        $this->setEvaluatedFalse();
+        $rule->setParent($this);
+        $this->ruleset[] = $rule;
 
         return $this;
     }
@@ -322,14 +322,15 @@ public function addRule(Column\Rule $pRule)
      * Delete a specified AutoFilter Column Rule
      * If the number of rules is reduced to 1, then we reset And/Or logic to Or.
      *
-     * @param int $pIndex Rule index in the ruleset array
+     * @param int $index Rule index in the ruleset array
      *
      * @return $this
      */
-    public function deleteRule($pIndex)
+    public function deleteRule(int $index): static
     {
-        if (isset($this->ruleset[$pIndex])) {
-            unset($this->ruleset[$pIndex]);
+        $this->setEvaluatedFalse();
+        if (isset($this->ruleset[$index])) {
+            unset($this->ruleset[$index]);
             //    If we've just deleted down to a single rule, then reset And/Or joining to Or
             if (count($this->ruleset) <= 1) {
                 $this->setJoin(self::AUTOFILTER_COLUMN_JOIN_OR);
@@ -344,8 +345,9 @@ public function deleteRule($pIndex)
      *
      * @return $this
      */
-    public function clearRules()
+    public function clearRules(): static
     {
+        $this->setEvaluatedFalse();
         $this->ruleset = [];
         $this->setJoin(self::AUTOFILTER_COLUMN_JOIN_OR);
 
@@ -358,6 +360,7 @@ public function clearRules()
     public function __clone()
     {
         $vars = get_object_vars($this);
+        /** @var AutoFilter\Column\Rule[] $value */
         foreach ($vars as $key => $value) {
             if ($key === 'parent') {
                 // Detach from autofilter parent
@@ -370,8 +373,6 @@ public function __clone()
                     $cloned->setParent($this); // attach the new cloned Rule to this new cloned Autofilter Cloned object
                     $this->ruleset[$k] = $cloned;
                 }
-            } elseif (is_object($value)) {
-                $this->$key = clone $value;
             } else {
                 $this->$key = $value;
             }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter/Column/Rule.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter/Column/Rule.php
index 330a164105..93768a1ce8 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter/Column/Rule.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter/Column/Rule.php
@@ -13,7 +13,7 @@ class Rule
     const AUTOFILTER_RULETYPE_DYNAMICFILTER = 'dynamicFilter';
     const AUTOFILTER_RULETYPE_TOPTENFILTER = 'top10Filter';
 
-    private static $ruleTypes = [
+    private const RULE_TYPES = [
         //    Currently we're not handling
         //        colorFilter
         //        extLst
@@ -32,7 +32,7 @@ class Rule
     const AUTOFILTER_RULETYPE_DATEGROUP_MINUTE = 'minute';
     const AUTOFILTER_RULETYPE_DATEGROUP_SECOND = 'second';
 
-    private static $dateTimeGroups = [
+    private const DATE_TIME_GROUPS = [
         self::AUTOFILTER_RULETYPE_DATEGROUP_YEAR,
         self::AUTOFILTER_RULETYPE_DATEGROUP_MONTH,
         self::AUTOFILTER_RULETYPE_DATEGROUP_DAY,
@@ -88,7 +88,7 @@ class Rule
     const AUTOFILTER_RULETYPE_DYNAMIC_ABOVEAVERAGE = 'aboveAverage';
     const AUTOFILTER_RULETYPE_DYNAMIC_BELOWAVERAGE = 'belowAverage';
 
-    private static $dynamicTypes = [
+    private const DYNAMIC_TYPES = [
         self::AUTOFILTER_RULETYPE_DYNAMIC_YESTERDAY,
         self::AUTOFILTER_RULETYPE_DYNAMIC_TODAY,
         self::AUTOFILTER_RULETYPE_DYNAMIC_TOMORROW,
@@ -125,15 +125,7 @@ class Rule
         self::AUTOFILTER_RULETYPE_DYNAMIC_BELOWAVERAGE,
     ];
 
-    /*
-     *    The only valid filter rule operators for filter and customFilter types are:
-     *        <xsd:enumeration value="equal"/>
-     *        <xsd:enumeration value="lessThan"/>
-     *        <xsd:enumeration value="lessThanOrEqual"/>
-     *        <xsd:enumeration value="notEqual"/>
-     *        <xsd:enumeration value="greaterThanOrEqual"/>
-     *        <xsd:enumeration value="greaterThan"/>
-     */
+    // Filter rule operators for filter and customFilter types.
     const AUTOFILTER_COLUMN_RULE_EQUAL = 'equal';
     const AUTOFILTER_COLUMN_RULE_NOTEQUAL = 'notEqual';
     const AUTOFILTER_COLUMN_RULE_GREATERTHAN = 'greaterThan';
@@ -141,7 +133,7 @@ class Rule
     const AUTOFILTER_COLUMN_RULE_LESSTHAN = 'lessThan';
     const AUTOFILTER_COLUMN_RULE_LESSTHANOREQUAL = 'lessThanOrEqual';
 
-    private static $operators = [
+    private const OPERATORS = [
         self::AUTOFILTER_COLUMN_RULE_EQUAL,
         self::AUTOFILTER_COLUMN_RULE_NOTEQUAL,
         self::AUTOFILTER_COLUMN_RULE_GREATERTHAN,
@@ -153,7 +145,7 @@ class Rule
     const AUTOFILTER_COLUMN_RULE_TOPTEN_BY_VALUE = 'byValue';
     const AUTOFILTER_COLUMN_RULE_TOPTEN_PERCENT = 'byPercent';
 
-    private static $topTenValue = [
+    private const TOP_TEN_VALUE = [
         self::AUTOFILTER_COLUMN_RULE_TOPTEN_BY_VALUE,
         self::AUTOFILTER_COLUMN_RULE_TOPTEN_PERCENT,
     ];
@@ -161,96 +153,68 @@ class Rule
     const AUTOFILTER_COLUMN_RULE_TOPTEN_TOP = 'top';
     const AUTOFILTER_COLUMN_RULE_TOPTEN_BOTTOM = 'bottom';
 
-    private static $topTenType = [
+    private const TOP_TEN_TYPE = [
         self::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP,
         self::AUTOFILTER_COLUMN_RULE_TOPTEN_BOTTOM,
     ];
 
-    // Rule Operators (Numeric, Boolean etc)
-//    const AUTOFILTER_COLUMN_RULE_BETWEEN            = 'between';        //    greaterThanOrEqual 1 && lessThanOrEqual 2
+    //  Unimplented Rule Operators (Numeric, Boolean etc)
+    //    const AUTOFILTER_COLUMN_RULE_BETWEEN = 'between';        //    greaterThanOrEqual 1 && lessThanOrEqual 2
     // Rule Operators (Numeric Special) which are translated to standard numeric operators with calculated values
-//    const AUTOFILTER_COLUMN_RULE_TOPTEN                = 'topTen';            //    greaterThan calculated value
-//    const AUTOFILTER_COLUMN_RULE_TOPTENPERCENT        = 'topTenPercent';    //    greaterThan calculated value
-//    const AUTOFILTER_COLUMN_RULE_ABOVEAVERAGE        = 'aboveAverage';    //    Value is calculated as the average
-//    const AUTOFILTER_COLUMN_RULE_BELOWAVERAGE        = 'belowAverage';    //    Value is calculated as the average
     // Rule Operators (String) which are set as wild-carded values
-//    const AUTOFILTER_COLUMN_RULE_BEGINSWITH            = 'beginsWith';            // A*
-//    const AUTOFILTER_COLUMN_RULE_ENDSWITH            = 'endsWith';            // *Z
-//    const AUTOFILTER_COLUMN_RULE_CONTAINS            = 'contains';            // *B*
-//    const AUTOFILTER_COLUMN_RULE_DOESNTCONTAIN        = 'notEqual';            //    notEqual *B*
+    //    const AUTOFILTER_COLUMN_RULE_BEGINSWITH            = 'beginsWith';            // A*
+    //    const AUTOFILTER_COLUMN_RULE_ENDSWITH            = 'endsWith';            // *Z
+    //    const AUTOFILTER_COLUMN_RULE_CONTAINS            = 'contains';            // *B*
+    //    const AUTOFILTER_COLUMN_RULE_DOESNTCONTAIN        = 'notEqual';            //    notEqual *B*
     // Rule Operators (Date Special) which are translated to standard numeric operators with calculated values
-//    const AUTOFILTER_COLUMN_RULE_BEFORE                = 'lessThan';
-//    const AUTOFILTER_COLUMN_RULE_AFTER                = 'greaterThan';
-//    const AUTOFILTER_COLUMN_RULE_YESTERDAY            = 'yesterday';
-//    const AUTOFILTER_COLUMN_RULE_TODAY                = 'today';
-//    const AUTOFILTER_COLUMN_RULE_TOMORROW            = 'tomorrow';
-//    const AUTOFILTER_COLUMN_RULE_LASTWEEK            = 'lastWeek';
-//    const AUTOFILTER_COLUMN_RULE_THISWEEK            = 'thisWeek';
-//    const AUTOFILTER_COLUMN_RULE_NEXTWEEK            = 'nextWeek';
-//    const AUTOFILTER_COLUMN_RULE_LASTMONTH            = 'lastMonth';
-//    const AUTOFILTER_COLUMN_RULE_THISMONTH            = 'thisMonth';
-//    const AUTOFILTER_COLUMN_RULE_NEXTMONTH            = 'nextMonth';
-//    const AUTOFILTER_COLUMN_RULE_LASTQUARTER        = 'lastQuarter';
-//    const AUTOFILTER_COLUMN_RULE_THISQUARTER        = 'thisQuarter';
-//    const AUTOFILTER_COLUMN_RULE_NEXTQUARTER        = 'nextQuarter';
-//    const AUTOFILTER_COLUMN_RULE_LASTYEAR            = 'lastYear';
-//    const AUTOFILTER_COLUMN_RULE_THISYEAR            = 'thisYear';
-//    const AUTOFILTER_COLUMN_RULE_NEXTYEAR            = 'nextYear';
-//    const AUTOFILTER_COLUMN_RULE_YEARTODATE            = 'yearToDate';            //    <dynamicFilter val="40909" type="yearToDate" maxVal="41113"/>
-//    const AUTOFILTER_COLUMN_RULE_ALLDATESINMONTH    = 'allDatesInMonth';    //    <dynamicFilter type="M2"/> for Month/February
-//    const AUTOFILTER_COLUMN_RULE_ALLDATESINQUARTER    = 'allDatesInQuarter';    //    <dynamicFilter type="Q2"/> for Quarter 2
-
+    //    const AUTOFILTER_COLUMN_RULE_BEFORE                = 'lessThan';
+    //    const AUTOFILTER_COLUMN_RULE_AFTER                = 'greaterThan';
     /**
      * Autofilter Column.
-     *
-     * @var Column
      */
-    private $parent;
+    private ?Column $parent;
 
     /**
      * Autofilter Rule Type.
-     *
-     * @var string
      */
-    private $ruleType = self::AUTOFILTER_RULETYPE_FILTER;
+    private string $ruleType = self::AUTOFILTER_RULETYPE_FILTER;
 
     /**
      * Autofilter Rule Value.
      *
-     * @var string|string[]
+     * @var int|int[]|string|string[]
      */
     private $value = '';
 
     /**
      * Autofilter Rule Operator.
-     *
-     * @var string
      */
-    private $operator = self::AUTOFILTER_COLUMN_RULE_EQUAL;
+    private string $operator = self::AUTOFILTER_COLUMN_RULE_EQUAL;
 
     /**
      * DateTimeGrouping Group Value.
-     *
-     * @var string
      */
-    private $grouping = '';
+    private string $grouping = '';
 
     /**
      * Create a new Rule.
-     *
-     * @param Column $pParent
      */
-    public function __construct(?Column $pParent = null)
+    public function __construct(?Column $parent = null)
     {
-        $this->parent = $pParent;
+        $this->parent = $parent;
+    }
+
+    private function setEvaluatedFalse(): void
+    {
+        if ($this->parent !== null) {
+            $this->parent->setEvaluatedFalse();
+        }
     }
 
     /**
      * Get AutoFilter Rule Type.
-     *
-     * @return string
      */
-    public function getRuleType()
+    public function getRuleType(): string
     {
         return $this->ruleType;
     }
@@ -258,17 +222,18 @@ public function getRuleType()
     /**
      * Set AutoFilter Rule Type.
      *
-     * @param string $pRuleType see self::AUTOFILTER_RULETYPE_*
+     * @param string $ruleType see self::AUTOFILTER_RULETYPE_*
      *
      * @return $this
      */
-    public function setRuleType($pRuleType)
+    public function setRuleType(string $ruleType): static
     {
-        if (!in_array($pRuleType, self::$ruleTypes)) {
+        $this->setEvaluatedFalse();
+        if (!in_array($ruleType, self::RULE_TYPES)) {
             throw new PhpSpreadsheetException('Invalid rule type for column AutoFilter Rule.');
         }
 
-        $this->ruleType = $pRuleType;
+        $this->ruleType = $ruleType;
 
         return $this;
     }
@@ -276,7 +241,7 @@ public function setRuleType($pRuleType)
     /**
      * Get AutoFilter Rule Value.
      *
-     * @return string|string[]
+     * @return int|int[]|string|string[]
      */
     public function getValue()
     {
@@ -286,41 +251,40 @@ public function getValue()
     /**
      * Set AutoFilter Rule Value.
      *
-     * @param string|string[] $pValue
+     * @param int|int[]|string|string[] $value
      *
      * @return $this
      */
-    public function setValue($pValue)
+    public function setValue($value): static
     {
-        if (is_array($pValue)) {
+        $this->setEvaluatedFalse();
+        if (is_array($value)) {
             $grouping = -1;
-            foreach ($pValue as $key => $value) {
+            foreach ($value as $key => $v) {
                 //    Validate array entries
-                if (!in_array($key, self::$dateTimeGroups)) {
+                if (!in_array($key, self::DATE_TIME_GROUPS)) {
                     //    Remove any invalid entries from the value array
-                    unset($pValue[$key]);
+                    unset($value[$key]);
                 } else {
                     //    Work out what the dateTime grouping will be
-                    $grouping = max($grouping, array_search($key, self::$dateTimeGroups));
+                    $grouping = max($grouping, array_search($key, self::DATE_TIME_GROUPS));
                 }
             }
-            if (count($pValue) == 0) {
+            if (count($value) == 0) {
                 throw new PhpSpreadsheetException('Invalid rule value for column AutoFilter Rule.');
             }
             //    Set the dateTime grouping that we've anticipated
-            $this->setGrouping(self::$dateTimeGroups[$grouping]);
+            $this->setGrouping(self::DATE_TIME_GROUPS[$grouping]);
         }
-        $this->value = $pValue;
+        $this->value = $value;
 
         return $this;
     }
 
     /**
      * Get AutoFilter Rule Operator.
-     *
-     * @return string
      */
-    public function getOperator()
+    public function getOperator(): string
     {
         return $this->operator;
     }
@@ -328,32 +292,31 @@ public function getOperator()
     /**
      * Set AutoFilter Rule Operator.
      *
-     * @param string $pOperator see self::AUTOFILTER_COLUMN_RULE_*
+     * @param string $operator see self::AUTOFILTER_COLUMN_RULE_*
      *
      * @return $this
      */
-    public function setOperator($pOperator)
+    public function setOperator(string $operator): static
     {
-        if (empty($pOperator)) {
-            $pOperator = self::AUTOFILTER_COLUMN_RULE_EQUAL;
+        $this->setEvaluatedFalse();
+        if (empty($operator)) {
+            $operator = self::AUTOFILTER_COLUMN_RULE_EQUAL;
         }
         if (
-            (!in_array($pOperator, self::$operators)) &&
-            (!in_array($pOperator, self::$topTenValue))
+            (!in_array($operator, self::OPERATORS))
+            && (!in_array($operator, self::TOP_TEN_VALUE))
         ) {
             throw new PhpSpreadsheetException('Invalid operator for column AutoFilter Rule.');
         }
-        $this->operator = $pOperator;
+        $this->operator = $operator;
 
         return $this;
     }
 
     /**
      * Get AutoFilter Rule Grouping.
-     *
-     * @return string
      */
-    public function getGrouping()
+    public function getGrouping(): string
     {
         return $this->grouping;
     }
@@ -361,21 +324,20 @@ public function getGrouping()
     /**
      * Set AutoFilter Rule Grouping.
      *
-     * @param string $pGrouping
-     *
      * @return $this
      */
-    public function setGrouping($pGrouping)
+    public function setGrouping(string $grouping): static
     {
+        $this->setEvaluatedFalse();
         if (
-            ($pGrouping !== null) &&
-            (!in_array($pGrouping, self::$dateTimeGroups)) &&
-            (!in_array($pGrouping, self::$dynamicTypes)) &&
-            (!in_array($pGrouping, self::$topTenType))
+            ($grouping !== null)
+            && (!in_array($grouping, self::DATE_TIME_GROUPS))
+            && (!in_array($grouping, self::DYNAMIC_TYPES))
+            && (!in_array($grouping, self::TOP_TEN_TYPE))
         ) {
-            throw new PhpSpreadsheetException('Invalid rule type for column AutoFilter Rule.');
+            throw new PhpSpreadsheetException('Invalid grouping for column AutoFilter Rule.');
         }
-        $this->grouping = $pGrouping;
+        $this->grouping = $grouping;
 
         return $this;
     }
@@ -383,21 +345,21 @@ public function setGrouping($pGrouping)
     /**
      * Set AutoFilter Rule.
      *
-     * @param string $pOperator see self::AUTOFILTER_COLUMN_RULE_*
-     * @param string|string[] $pValue
-     * @param string $pGrouping
+     * @param string $operator see self::AUTOFILTER_COLUMN_RULE_*
+     * @param int|int[]|string|string[] $value
      *
      * @return $this
      */
-    public function setRule($pOperator, $pValue, $pGrouping = null)
+    public function setRule(string $operator, $value, ?string $grouping = null): static
     {
-        $this->setOperator($pOperator);
-        $this->setValue($pValue);
+        $this->setEvaluatedFalse();
+        $this->setOperator($operator);
+        $this->setValue($value);
         //  Only set grouping if it's been passed in as a user-supplied argument,
         //      otherwise we're calculating it when we setValue() and don't want to overwrite that
         //      If the user supplies an argumnet for grouping, then on their own head be it
-        if ($pGrouping !== null) {
-            $this->setGrouping($pGrouping);
+        if ($grouping !== null) {
+            $this->setGrouping($grouping);
         }
 
         return $this;
@@ -405,10 +367,8 @@ public function setRule($pOperator, $pValue, $pGrouping = null)
 
     /**
      * Get this Rule's AutoFilter Column Parent.
-     *
-     * @return Column
      */
-    public function getParent()
+    public function getParent(): ?Column
     {
         return $this->parent;
     }
@@ -416,13 +376,12 @@ public function getParent()
     /**
      * Set this Rule's AutoFilter Column Parent.
      *
-     * @param Column $pParent
-     *
      * @return $this
      */
-    public function setParent(?Column $pParent = null)
+    public function setParent(?Column $parent = null): static
     {
-        $this->parent = $pParent;
+        $this->setEvaluatedFalse();
+        $this->parent = $parent;
 
         return $this;
     }
@@ -435,11 +394,9 @@ public function __clone()
         $vars = get_object_vars($this);
         foreach ($vars as $key => $value) {
             if (is_object($value)) {
-                if ($key == 'parent') {
+                if ($key == 'parent') { // this is only object
                     //    Detach from autofilter column parent
                     $this->$key = null;
-                } else {
-                    $this->$key = clone $value;
                 }
             } else {
                 $this->$key = $value;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFit.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFit.php
new file mode 100644
index 0000000000..46a0e9c747
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFit.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Worksheet;
+
+use PhpOffice\PhpSpreadsheet\Cell\CellAddress;
+use PhpOffice\PhpSpreadsheet\Cell\CellRange;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+
+class AutoFit
+{
+    protected Worksheet $worksheet;
+
+    public function __construct(Worksheet $worksheet)
+    {
+        $this->worksheet = $worksheet;
+    }
+
+    public function getAutoFilterIndentRanges(): array
+    {
+        $autoFilterIndentRanges = [];
+        $autoFilterIndentRanges[] = $this->getAutoFilterIndentRange($this->worksheet->getAutoFilter());
+
+        foreach ($this->worksheet->getTableCollection() as $table) {
+            /** @var Table $table */
+            if ($table->getShowHeaderRow() === true && $table->getAllowFilter() === true) {
+                $autoFilter = $table->getAutoFilter();
+                if ($autoFilter !== null) {
+                    $autoFilterIndentRanges[] = $this->getAutoFilterIndentRange($autoFilter);
+                }
+            }
+        }
+
+        return array_filter($autoFilterIndentRanges);
+    }
+
+    private function getAutoFilterIndentRange(AutoFilter $autoFilter): ?string
+    {
+        $autoFilterRange = $autoFilter->getRange();
+        $autoFilterIndentRange = null;
+
+        if (!empty($autoFilterRange)) {
+            $autoFilterRangeBoundaries = Coordinate::rangeBoundaries($autoFilterRange);
+            $autoFilterIndentRange = (string) new CellRange(
+                CellAddress::fromColumnAndRow($autoFilterRangeBoundaries[0][0], $autoFilterRangeBoundaries[0][1]),
+                CellAddress::fromColumnAndRow($autoFilterRangeBoundaries[1][0], $autoFilterRangeBoundaries[0][1])
+            );
+        }
+
+        return $autoFilterIndentRange;
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/BaseDrawing.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/BaseDrawing.php
index 5829671b48..50323dbcad 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/BaseDrawing.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/BaseDrawing.php
@@ -5,106 +5,131 @@
 use PhpOffice\PhpSpreadsheet\Cell\Hyperlink;
 use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
 use PhpOffice\PhpSpreadsheet\IComparable;
+use PhpOffice\PhpSpreadsheet\Worksheet\Drawing\Shadow;
+use SimpleXMLElement;
 
 class BaseDrawing implements IComparable
 {
+    const EDIT_AS_ABSOLUTE = 'absolute';
+    const EDIT_AS_ONECELL = 'oneCell';
+    const EDIT_AS_TWOCELL = 'twoCell';
+    private const VALID_EDIT_AS = [
+        self::EDIT_AS_ABSOLUTE,
+        self::EDIT_AS_ONECELL,
+        self::EDIT_AS_TWOCELL,
+    ];
+
+    /**
+     * The editAs attribute, used only with two cell anchor.
+     */
+    protected string $editAs = '';
+
     /**
      * Image counter.
-     *
-     * @var int
      */
-    private static $imageCounter = 0;
+    private static int $imageCounter = 0;
 
     /**
      * Image index.
-     *
-     * @var int
      */
-    private $imageIndex = 0;
+    private int $imageIndex;
 
     /**
      * Name.
-     *
-     * @var string
      */
-    protected $name;
+    protected string $name = '';
 
     /**
      * Description.
-     *
-     * @var string
      */
-    protected $description;
+    protected string $description = '';
 
     /**
      * Worksheet.
-     *
-     * @var null|Worksheet
      */
-    protected $worksheet;
+    protected ?Worksheet $worksheet = null;
 
     /**
      * Coordinates.
-     *
-     * @var string
      */
-    protected $coordinates;
+    protected string $coordinates = 'A1';
 
     /**
      * Offset X.
-     *
-     * @var int
      */
-    protected $offsetX;
+    protected int $offsetX = 0;
 
     /**
      * Offset Y.
-     *
-     * @var int
      */
-    protected $offsetY;
+    protected int $offsetY = 0;
+
+    /**
+     * Coordinates2.
+     */
+    protected string $coordinates2 = '';
+
+    /**
+     * Offset X2.
+     */
+    protected int $offsetX2 = 0;
+
+    /**
+     * Offset Y2.
+     */
+    protected int $offsetY2 = 0;
 
     /**
      * Width.
-     *
-     * @var int
      */
-    protected $width;
+    protected int $width = 0;
 
     /**
      * Height.
-     *
-     * @var int
      */
-    protected $height;
+    protected int $height = 0;
+
+    /**
+     * Pixel width of image. See $width for the size the Drawing will be in the sheet.
+     */
+    protected int $imageWidth = 0;
+
+    /**
+     * Pixel width of image. See $height for the size the Drawing will be in the sheet.
+     */
+    protected int $imageHeight = 0;
 
     /**
      * Proportional resize.
-     *
-     * @var bool
      */
-    protected $resizeProportional;
+    protected bool $resizeProportional = true;
 
     /**
      * Rotation.
-     *
-     * @var int
      */
-    protected $rotation;
+    protected int $rotation = 0;
+
+    protected bool $flipVertical = false;
+
+    protected bool $flipHorizontal = false;
 
     /**
      * Shadow.
-     *
-     * @var Drawing\Shadow
      */
-    protected $shadow;
+    protected Shadow $shadow;
 
     /**
      * Image hyperlink.
-     *
-     * @var null|Hyperlink
      */
-    private $hyperlink;
+    private ?Hyperlink $hyperlink = null;
+
+    /**
+     * Image type.
+     */
+    protected int $type = IMAGETYPE_UNKNOWN;
+
+    /** @var null|SimpleXMLElement|string[] */
+    protected $srcRect = [];
 
     /**
      * Create a new BaseDrawing.
@@ -112,87 +137,48 @@ class BaseDrawing implements IComparable
     public function __construct()
     {
         // Initialise values
-        $this->name = '';
-        $this->description = '';
-        $this->worksheet = null;
-        $this->coordinates = 'A1';
-        $this->offsetX = 0;
-        $this->offsetY = 0;
-        $this->width = 0;
-        $this->height = 0;
-        $this->resizeProportional = true;
-        $this->rotation = 0;
-        $this->shadow = new Drawing\Shadow();
+        $this->setShadow();
 
         // Set image index
         ++self::$imageCounter;
         $this->imageIndex = self::$imageCounter;
     }
 
-    /**
-     * Get image index.
-     *
-     * @return int
-     */
-    public function getImageIndex()
+    public function __destruct()
+    {
+        $this->worksheet = null;
+    }
+
+    public function getImageIndex(): int
     {
         return $this->imageIndex;
     }
 
-    /**
-     * Get Name.
-     *
-     * @return string
-     */
-    public function getName()
+    public function getName(): string
     {
         return $this->name;
     }
 
-    /**
-     * Set Name.
-     *
-     * @param string $pValue
-     *
-     * @return $this
-     */
-    public function setName($pValue)
+    public function setName(string $name): self
     {
-        $this->name = $pValue;
+        $this->name = $name;
 
         return $this;
     }
 
-    /**
-     * Get Description.
-     *
-     * @return string
-     */
-    public function getDescription()
+    public function getDescription(): string
     {
         return $this->description;
     }
 
-    /**
-     * Set Description.
-     *
-     * @param string $description
-     *
-     * @return $this
-     */
-    public function setDescription($description)
+    public function setDescription(string $description): self
     {
         $this->description = $description;
 
         return $this;
     }
 
-    /**
-     * Get Worksheet.
-     *
-     * @return null|Worksheet
-     */
-    public function getWorksheet()
+    public function getWorksheet(): ?Worksheet
     {
         return $this->worksheet;
     }
@@ -200,20 +186,19 @@ public function getWorksheet()
     /**
      * Set Worksheet.
      *
-     * @param Worksheet $pValue
-     * @param bool $pOverrideOld If a Worksheet has already been assigned, overwrite it and remove image from old Worksheet?
-     *
-     * @return $this
+     * @param bool $overrideOld If a Worksheet has already been assigned, overwrite it and remove image from old Worksheet?
      */
-    public function setWorksheet(?Worksheet $pValue = null, $pOverrideOld = false)
+    public function setWorksheet(?Worksheet $worksheet = null, bool $overrideOld = false): self
     {
         if ($this->worksheet === null) {
             // Add drawing to \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet
-            $this->worksheet = $pValue;
-            $this->worksheet->getCell($this->coordinates);
-            $this->worksheet->getDrawingCollection()->append($this);
+            if ($worksheet !== null && !($this instanceof Drawing && $this->getPath() === '')) {
+                $this->worksheet = $worksheet;
+                $this->worksheet->getCell($this->coordinates);
+                $this->worksheet->getDrawingCollection()->append($this);
+            }
         } else {
-            if ($pOverrideOld) {
+            if ($overrideOld) {
                 // Remove drawing from old \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet
                 $iterator = $this->worksheet->getDrawingCollection()->getIterator();
 
@@ -227,7 +212,7 @@ public function setWorksheet(?Worksheet $pValue = null, $pOverrideOld = false)
                 }
 
                 // Set new \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet
-                $this->setWorksheet($pValue);
+                $this->setWorksheet($worksheet);
             } else {
                 throw new PhpSpreadsheetException('A Worksheet has already been assigned. Drawings can only exist on one \\PhpOffice\\PhpSpreadsheet\\Worksheet.');
             }
@@ -236,136 +221,112 @@ public function setWorksheet(?Worksheet $pValue = null, $pOverrideOld = false)
         return $this;
     }
 
-    /**
-     * Get Coordinates.
-     *
-     * @return string
-     */
-    public function getCoordinates()
+    public function getCoordinates(): string
     {
         return $this->coordinates;
     }
 
-    /**
-     * Set Coordinates.
-     *
-     * @param string $pValue eg: 'A1'
-     *
-     * @return $this
-     */
-    public function setCoordinates($pValue)
+    public function setCoordinates(string $coordinates): self
     {
-        $this->coordinates = $pValue;
+        $this->coordinates = $coordinates;
 
         return $this;
     }
 
-    /**
-     * Get OffsetX.
-     *
-     * @return int
-     */
-    public function getOffsetX()
+    public function getOffsetX(): int
     {
         return $this->offsetX;
     }
 
-    /**
-     * Set OffsetX.
-     *
-     * @param int $pValue
-     *
-     * @return $this
-     */
-    public function setOffsetX($pValue)
+    public function setOffsetX(int $offsetX): self
     {
-        $this->offsetX = $pValue;
+        $this->offsetX = $offsetX;
 
         return $this;
     }
 
-    /**
-     * Get OffsetY.
-     *
-     * @return int
-     */
-    public function getOffsetY()
+    public function getOffsetY(): int
     {
         return $this->offsetY;
     }
 
-    /**
-     * Set OffsetY.
-     *
-     * @param int $pValue
-     *
-     * @return $this
-     */
-    public function setOffsetY($pValue)
+    public function setOffsetY(int $offsetY): self
     {
-        $this->offsetY = $pValue;
+        $this->offsetY = $offsetY;
 
         return $this;
     }
 
-    /**
-     * Get Width.
-     *
-     * @return int
-     */
-    public function getWidth()
+    public function getCoordinates2(): string
+    {
+        return $this->coordinates2;
+    }
+
+    public function setCoordinates2(string $coordinates2): self
+    {
+        $this->coordinates2 = $coordinates2;
+
+        return $this;
+    }
+
+    public function getOffsetX2(): int
+    {
+        return $this->offsetX2;
+    }
+
+    public function setOffsetX2(int $offsetX2): self
+    {
+        $this->offsetX2 = $offsetX2;
+
+        return $this;
+    }
+
+    public function getOffsetY2(): int
+    {
+        return $this->offsetY2;
+    }
+
+    public function setOffsetY2(int $offsetY2): self
+    {
+        $this->offsetY2 = $offsetY2;
+
+        return $this;
+    }
+
+    public function getWidth(): int
     {
         return $this->width;
     }
 
-    /**
-     * Set Width.
-     *
-     * @param int $pValue
-     *
-     * @return $this
-     */
-    public function setWidth($pValue)
+    public function setWidth(int $width): self
     {
         // Resize proportional?
-        if ($this->resizeProportional && $pValue != 0) {
+        if ($this->resizeProportional && $width != 0) {
             $ratio = $this->height / ($this->width != 0 ? $this->width : 1);
-            $this->height = (int) round($ratio * $pValue);
+            $this->height = (int) round($ratio * $width);
         }
 
         // Set width
-        $this->width = $pValue;
+        $this->width = $width;
 
         return $this;
     }
 
-    /**
-     * Get Height.
-     *
-     * @return int
-     */
-    public function getHeight()
+    public function getHeight(): int
     {
         return $this->height;
     }
 
-    /**
-     * Set Height.
-     *
-     * @param int $pValue
-     *
-     * @return $this
-     */
-    public function setHeight($pValue)
+    public function setHeight(int $height): self
     {
         // Resize proportional?
-        if ($this->resizeProportional && $pValue != 0) {
+        if ($this->resizeProportional && $height != 0) {
             $ratio = $this->width / ($this->height != 0 ? $this->height : 1);
-            $this->width = (int) round($ratio * $pValue);
+            $this->width = (int) round($ratio * $height);
         }
 
         // Set height
-        $this->height = $pValue;
+        $this->height = $height;
 
         return $this;
     }
@@ -380,13 +341,8 @@ public function setHeight($pValue)
      * </code>
      *
      * @author Vincent@luo MSN:kele_100@hotmail.com
-     *
-     * @param int $width
-     * @param int $height
-     *
-     * @return $this
      */
-    public function setWidthAndHeight($width, $height)
+    public function setWidthAndHeight(int $width, int $height): self
     {
         $xratio = $width / ($this->width != 0 ? $this->width : 1);
         $yratio = $height / ($this->height != 0 ? $this->height : 1);
@@ -406,74 +362,38 @@ public function setWidthAndHeight($width, $height)
         return $this;
     }
 
-    /**
-     * Get ResizeProportional.
-     *
-     * @return bool
-     */
-    public function getResizeProportional()
+    public function getResizeProportional(): bool
     {
         return $this->resizeProportional;
     }
 
-    /**
-     * Set ResizeProportional.
-     *
-     * @param bool $pValue
-     *
-     * @return $this
-     */
-    public function setResizeProportional($pValue)
+    public function setResizeProportional(bool $resizeProportional): self
     {
-        $this->resizeProportional = $pValue;
+        $this->resizeProportional = $resizeProportional;
 
         return $this;
     }
 
-    /**
-     * Get Rotation.
-     *
-     * @return int
-     */
-    public function getRotation()
+    public function getRotation(): int
     {
         return $this->rotation;
     }
 
-    /**
-     * Set Rotation.
-     *
-     * @param int $pValue
-     *
-     * @return $this
-     */
-    public function setRotation($pValue)
+    public function setRotation(int $rotation): self
     {
-        $this->rotation = $pValue;
+        $this->rotation = $rotation;
 
         return $this;
     }
 
-    /**
-     * Get Shadow.
-     *
-     * @return Drawing\Shadow
-     */
-    public function getShadow()
+    public function getShadow(): Shadow
     {
         return $this->shadow;
     }
 
-    /**
-     * Set Shadow.
-     *
-     * @param Drawing\Shadow $pValue
-     *
-     * @return $this
-     */
-    public function setShadow(?Drawing\Shadow $pValue = null)
+    public function setShadow(?Shadow $shadow = null): self
     {
-        $this->shadow = $pValue;
+        $this->shadow = $shadow ?? new Shadow();
 
         return $this;
     }
@@ -483,20 +403,23 @@ public function setShadow(?Drawing\Shadow $pValue = null)
      *
      * @return string Hash code
      */
-    public function getHashCode()
+    public function getHashCode(): string
     {
         return md5(
-            $this->name .
-            $this->description .
-            $this->worksheet->getHashCode() .
-            $this->coordinates .
-            $this->offsetX .
-            $this->offsetY .
-            $this->width .
-            $this->height .
-            $this->rotation .
-            $this->shadow->getHashCode() .
-            __CLASS__
+            $this->name
+            . $this->description
+            . (($this->worksheet === null) ? '' : $this->worksheet->getHashCode())
+            . $this->coordinates
+            . $this->offsetX
+            . $this->offsetY
+            . $this->coordinates2
+            . $this->offsetX2
+            . $this->offsetY2
+            . $this->width
+            . $this->height
+            . $this->rotation
+            . $this->shadow->getHashCode()
+            . __CLASS__
         );
     }
 
@@ -517,16 +440,110 @@ public function __clone()
         }
     }
 
-    public function setHyperlink(?Hyperlink $pHyperlink = null): void
+    public function setHyperlink(?Hyperlink $hyperlink = null): void
     {
-        $this->hyperlink = $pHyperlink;
+        $this->hyperlink = $hyperlink;
+    }
+
+    public function getHyperlink(): ?Hyperlink
+    {
+        return $this->hyperlink;
     }
 
     /**
-     * @return null|Hyperlink
+     * Set Fact Sizes and Type of Image.
      */
-    public function getHyperlink()
+    protected function setSizesAndType(string $path): void
     {
-        return $this->hyperlink;
+        if ($this->imageWidth === 0 && $this->imageHeight === 0 && $this->type === IMAGETYPE_UNKNOWN) {
+            $imageData = getimagesize($path);
+
+            if (!empty($imageData)) {
+                $this->imageWidth = $imageData[0];
+                $this->imageHeight = $imageData[1];
+                $this->type = $imageData[2];
+            }
+        }
+        if ($this->width === 0 && $this->height === 0) {
+            $this->width = $this->imageWidth;
+            $this->height = $this->imageHeight;
+        }
+    }
+
+    /**
+     * Get Image Type.
+     */
+    public function getType(): int
+    {
+        return $this->type;
+    }
+
+    public function getImageWidth(): int
+    {
+        return $this->imageWidth;
+    }
+
+    public function getImageHeight(): int
+    {
+        return $this->imageHeight;
+    }
+
+    public function getEditAs(): string
+    {
+        return $this->editAs;
+    }
+
+    public function setEditAs(string $editAs): self
+    {
+        $this->editAs = $editAs;
+
+        return $this;
+    }
+
+    public function validEditAs(): bool
+    {
+        return in_array($this->editAs, self::VALID_EDIT_AS, true);
+    }
+
+    /**
+     * @return null|SimpleXMLElement|string[]
+     */
+    public function getSrcRect()
+    {
+        return $this->srcRect;
+    }
+
+    /**
+     * @param null|SimpleXMLElement|string[] $srcRect
+     */
+    public function setSrcRect($srcRect): self
+    {
+        $this->srcRect = $srcRect;
+
+        return $this;
+    }
+
+    public function setFlipHorizontal(bool $flipHorizontal): self
+    {
+        $this->flipHorizontal = $flipHorizontal;
+
+        return $this;
+    }
+
+    public function getFlipHorizontal(): bool
+    {
+        return $this->flipHorizontal;
+    }
+
+    public function setFlipVertical(bool $flipVertical): self
+    {
+        $this->flipVertical = $flipVertical;
+
+        return $this;
+    }
+
+    public function getFlipVertical(): bool
+    {
+        return $this->flipVertical;
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/CellIterator.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/CellIterator.php
index 31f6ae6565..2522c336f6 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/CellIterator.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/CellIterator.php
@@ -2,31 +2,62 @@
 
 namespace PhpOffice\PhpSpreadsheet\Worksheet;
 
-use Iterator;
+use Iterator as NativeIterator;
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
+use PhpOffice\PhpSpreadsheet\Collection\Cells;
 
-abstract class CellIterator implements Iterator
+/**
+ * @template TKey
+ *
+ * @implements NativeIterator<TKey, Cell>
+ */
+abstract class CellIterator implements NativeIterator
 {
+    public const TREAT_NULL_VALUE_AS_EMPTY_CELL = 1;
+
+    public const TREAT_EMPTY_STRING_AS_EMPTY_CELL = 2;
+
+    public const IF_NOT_EXISTS_RETURN_NULL = false;
+
+    public const IF_NOT_EXISTS_CREATE_NEW = true;
+
     /**
      * Worksheet to iterate.
-     *
-     * @var Worksheet
      */
-    protected $worksheet;
+    protected Worksheet $worksheet;
+
+    /**
+     * Cell Collection to iterate.
+     */
+    protected Cells $cellCollection;
 
     /**
      * Iterate only existing cells.
-     *
-     * @var bool
      */
-    protected $onlyExistingCells = false;
+    protected bool $onlyExistingCells = false;
+
+    /**
+     * If iterating all cells, and a cell doesn't exist, identifies whether a new cell should be created,
+     *    or if the iterator should return a null value.
+     */
+    protected bool $ifNotExists = self::IF_NOT_EXISTS_CREATE_NEW;
 
     /**
      * Destructor.
      */
     public function __destruct()
     {
-        // @phpstan-ignore-next-line
-        $this->worksheet = null;
+        unset($this->worksheet, $this->cellCollection);
+    }
+
+    public function getIfNotExists(): bool
+    {
+        return $this->ifNotExists;
+    }
+
+    public function setIfNotExists(bool $ifNotExists = self::IF_NOT_EXISTS_CREATE_NEW): void
+    {
+        $this->ifNotExists = $ifNotExists;
     }
 
     /**
@@ -38,9 +69,9 @@ public function getIterateOnlyExistingCells(): bool
     }
 
     /**
-     * Validate start/end values for "IterateOnlyExistingCells" mode, and adjust if necessary.
+     * Validate start/end values for 'IterateOnlyExistingCells' mode, and adjust if necessary.
      */
-    abstract protected function adjustForExistingOnlyRange();
+    abstract protected function adjustForExistingOnlyRange(): void;
 
     /**
      * Set the iterator to loop only existing cells.
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Column.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Column.php
index 8abbabe58a..ef4ad2dfd6 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Column.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Column.php
@@ -4,30 +4,20 @@
 
 class Column
 {
-    /**
-     * \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet.
-     *
-     * @var Worksheet
-     */
-    private $parent;
+    private Worksheet $worksheet;
 
     /**
      * Column index.
-     *
-     * @var string
      */
-    private $columnIndex;
+    private string $columnIndex;
 
     /**
      * Create a new column.
-     *
-     * @param Worksheet $parent
-     * @param string $columnIndex
      */
-    public function __construct(?Worksheet $parent = null, $columnIndex = 'A')
+    public function __construct(Worksheet $worksheet, string $columnIndex = 'A')
     {
         // Set parent and column index
-        $this->parent = $parent;
+        $this->worksheet = $worksheet;
         $this->columnIndex = $columnIndex;
     }
 
@@ -36,8 +26,7 @@ public function __construct(?Worksheet $parent = null, $columnIndex = 'A')
      */
     public function __destruct()
     {
-        // @phpstan-ignore-next-line
-        $this->parent = null;
+        unset($this->worksheet);
     }
 
     /**
@@ -52,12 +41,70 @@ public function getColumnIndex(): string
      * Get cell iterator.
      *
      * @param int $startRow The row number at which to start iterating
-     * @param int $endRow Optionally, the row number at which to stop iterating
+     * @param ?int $endRow Optionally, the row number at which to stop iterating
+     */
+    public function getCellIterator(int $startRow = 1, ?int $endRow = null, bool $iterateOnlyExistingCells = false): ColumnCellIterator
+    {
+        return new ColumnCellIterator($this->worksheet, $this->columnIndex, $startRow, $endRow, $iterateOnlyExistingCells);
+    }
+
+    /**
+     * Get row iterator. Synonym for getCellIterator().
      *
-     * @return ColumnCellIterator
+     * @param int $startRow The row number at which to start iterating
+     * @param ?int $endRow Optionally, the row number at which to stop iterating
+     */
+    public function getRowIterator(int $startRow = 1, ?int $endRow = null, bool $iterateOnlyExistingCells = false): ColumnCellIterator
+    {
+        return $this->getCellIterator($startRow, $endRow, $iterateOnlyExistingCells);
+    }
+
+    /**
+     * Returns a boolean true if the column contains no cells. By default, this means that no cell records exist in the
+     *         collection for this column. false will be returned otherwise.
+     *     This rule can be modified by passing a $definitionOfEmptyFlags value:
+     *          1 - CellIterator::TREAT_NULL_VALUE_AS_EMPTY_CELL If the only cells in the collection are null value
+     *                  cells, then the column will be considered empty.
+     *          2 - CellIterator::TREAT_EMPTY_STRING_AS_EMPTY_CELL If the only cells in the collection are empty
+     *                  string value cells, then the column will be considered empty.
+     *          3 - CellIterator::TREAT_NULL_VALUE_AS_EMPTY_CELL | CellIterator::TREAT_EMPTY_STRING_AS_EMPTY_CELL
+     *                  If the only cells in the collection are null value or empty string value cells, then the column
+     *                  will be considered empty.
+     *
+     * @param int $definitionOfEmptyFlags
+     *              Possible Flag Values are:
+     *                  CellIterator::TREAT_NULL_VALUE_AS_EMPTY_CELL
+     *                  CellIterator::TREAT_EMPTY_STRING_AS_EMPTY_CELL
+     * @param int $startRow The row number at which to start checking if cells are empty
+     * @param ?int $endRow Optionally, the row number at which to stop checking if cells are empty
+     */
+    public function isEmpty(int $definitionOfEmptyFlags = 0, int $startRow = 1, ?int $endRow = null): bool
+    {
+        $nullValueCellIsEmpty = (bool) ($definitionOfEmptyFlags & CellIterator::TREAT_NULL_VALUE_AS_EMPTY_CELL);
+        $emptyStringCellIsEmpty = (bool) ($definitionOfEmptyFlags & CellIterator::TREAT_EMPTY_STRING_AS_EMPTY_CELL);
+
+        $cellIterator = $this->getCellIterator($startRow, $endRow);
+        $cellIterator->setIterateOnlyExistingCells(true);
+        foreach ($cellIterator as $cell) {
+            $value = $cell->getValue();
+            if ($value === null && $nullValueCellIsEmpty === true) {
+                continue;
+            }
+            if ($value === '' && $emptyStringCellIsEmpty === true) {
+                continue;
+            }
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Returns bound worksheet.
      */
-    public function getCellIterator($startRow = 1, $endRow = null)
+    public function getWorksheet(): Worksheet
     {
-        return new ColumnCellIterator($this->parent, $this->columnIndex, $startRow, $endRow);
+        return $this->worksheet;
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ColumnCellIterator.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ColumnCellIterator.php
index 6577211407..16a007ab06 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ColumnCellIterator.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ColumnCellIterator.php
@@ -6,51 +6,48 @@
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
 
+/**
+ * @extends CellIterator<int>
+ */
 class ColumnCellIterator extends CellIterator
 {
     /**
      * Current iterator position.
-     *
-     * @var int
      */
-    private $currentRow;
+    private int $currentRow;
 
     /**
      * Column index.
-     *
-     * @var int
      */
-    private $columnIndex;
+    private int $columnIndex;
 
     /**
      * Start position.
-     *
-     * @var int
      */
-    private $startRow = 1;
+    private int $startRow = 1;
 
     /**
      * End position.
-     *
-     * @var int
      */
-    private $endRow = 1;
+    private int $endRow = 1;
 
     /**
      * Create a new row iterator.
      *
-     * @param Worksheet $subject The worksheet to iterate over
+     * @param Worksheet $worksheet The worksheet to iterate over
      * @param string $columnIndex The column that we want to iterate
      * @param int $startRow The row number at which to start iterating
-     * @param int $endRow Optionally, the row number at which to stop iterating
+     * @param ?int $endRow Optionally, the row number at which to stop iterating
      */
-    public function __construct(?Worksheet $subject = null, $columnIndex = 'A', $startRow = 1, $endRow = null)
+    public function __construct(Worksheet $worksheet, string $columnIndex = 'A', int $startRow = 1, ?int $endRow = null, bool $iterateOnlyExistingCells = false)
     {
         // Set subject
-        $this->worksheet = $subject;
+        $this->worksheet = $worksheet;
+        $this->cellCollection = $worksheet->getCellCollection();
         $this->columnIndex = Coordinate::columnIndexFromString($columnIndex);
         $this->resetEnd($endRow);
         $this->resetStart($startRow);
+        $this->setIterateOnlyExistingCells($iterateOnlyExistingCells);
     }
 
     /**
@@ -60,7 +57,7 @@ public function __construct(?Worksheet $subject = null, $columnIndex = 'A', $sta
      *
      * @return $this
      */
-    public function resetStart(int $startRow = 1)
+    public function resetStart(int $startRow = 1): static
     {
         $this->startRow = $startRow;
         $this->adjustForExistingOnlyRange();
@@ -72,11 +69,11 @@ public function resetStart(int $startRow = 1)
     /**
      * (Re)Set the end row.
      *
-     * @param int $endRow The row number at which to stop iterating
+     * @param ?int $endRow The row number at which to stop iterating
      *
      * @return $this
      */
-    public function resetEnd($endRow = null)
+    public function resetEnd(?int $endRow = null): static
     {
         $this->endRow = $endRow ?: $this->worksheet->getHighestRow();
         $this->adjustForExistingOnlyRange();
@@ -91,9 +88,12 @@ public function resetEnd($endRow = null)
      *
      * @return $this
      */
-    public function seek(int $row = 1)
+    public function seek(int $row = 1): static
     {
-        if ($this->onlyExistingCells && !($this->worksheet->cellExistsByColumnAndRow($this->columnIndex, $row))) {
+        if (
+            $this->onlyExistingCells
+            && (!$this->cellCollection->has(Coordinate::stringFromColumnIndex($this->columnIndex) . $row))
+        ) {
             throw new PhpSpreadsheetException('In "IterateOnlyExistingCells" mode and Cell does not exist');
         }
         if (($row < $this->startRow) || ($row > $this->endRow)) {
@@ -117,7 +117,15 @@ public function rewind(): void
      */
     public function current(): ?Cell
     {
-        return $this->worksheet->getCellByColumnAndRow($this->columnIndex, $this->currentRow);
+        $cellAddress = Coordinate::stringFromColumnIndex($this->columnIndex) . $this->currentRow;
+
+        return $this->cellCollection->has($cellAddress)
+            ? $this->cellCollection->get($cellAddress)
+            : (
+                $this->ifNotExists === self::IF_NOT_EXISTS_CREATE_NEW
+                ? $this->worksheet->createNewCell($cellAddress)
+                : null
+            );
     }
 
     /**
@@ -133,12 +141,13 @@ public function key(): int
      */
     public function next(): void
     {
+        $columnAddress = Coordinate::stringFromColumnIndex($this->columnIndex);
         do {
             ++$this->currentRow;
         } while (
-            ($this->onlyExistingCells) &&
-            (!$this->worksheet->cellExistsByColumnAndRow($this->columnIndex, $this->currentRow)) &&
-            ($this->currentRow <= $this->endRow)
+            ($this->onlyExistingCells)
+            && ($this->currentRow <= $this->endRow)
+            && (!$this->cellCollection->has($columnAddress . $this->currentRow))
         );
     }
 
@@ -147,12 +156,13 @@ public function next(): void
      */
     public function prev(): void
     {
+        $columnAddress = Coordinate::stringFromColumnIndex($this->columnIndex);
         do {
             --$this->currentRow;
         } while (
-            ($this->onlyExistingCells) &&
-            (!$this->worksheet->cellExistsByColumnAndRow($this->columnIndex, $this->currentRow)) &&
-            ($this->currentRow >= $this->startRow)
+            ($this->onlyExistingCells)
+            && ($this->currentRow >= $this->startRow)
+            && (!$this->cellCollection->has($columnAddress . $this->currentRow))
         );
     }
 
@@ -170,15 +180,16 @@ public function valid(): bool
     protected function adjustForExistingOnlyRange(): void
     {
         if ($this->onlyExistingCells) {
+            $columnAddress = Coordinate::stringFromColumnIndex($this->columnIndex);
             while (
-                (!$this->worksheet->cellExistsByColumnAndRow($this->columnIndex, $this->startRow)) &&
-                ($this->startRow <= $this->endRow)
+                (!$this->cellCollection->has($columnAddress . $this->startRow))
+                && ($this->startRow <= $this->endRow)
             ) {
                 ++$this->startRow;
             }
             while (
-                (!$this->worksheet->cellExistsByColumnAndRow($this->columnIndex, $this->endRow)) &&
-                ($this->endRow >= $this->startRow)
+                (!$this->cellCollection->has($columnAddress . $this->endRow))
+                && ($this->endRow >= $this->startRow)
             ) {
                 --$this->endRow;
             }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ColumnDimension.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ColumnDimension.php
index 12b1efdf29..8ac405becf 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ColumnDimension.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ColumnDimension.php
@@ -2,40 +2,37 @@
 
 namespace PhpOffice\PhpSpreadsheet\Worksheet;
 
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Helper\Dimension as CssDimension;
+
 class ColumnDimension extends Dimension
 {
     /**
      * Column index.
-     *
-     * @var string
      */
-    private $columnIndex;
+    private ?string $columnIndex;
 
     /**
      * Column width.
      *
      * When this is set to a negative value, the column width should be ignored by IWriter
-     *
-     * @var float
      */
-    private $width = -1;
+    private float $width = -1;
 
     /**
      * Auto size?
-     *
-     * @var bool
      */
-    private $autoSize = false;
+    private bool $autoSize = false;
 
     /**
      * Create a new ColumnDimension.
      *
-     * @param string $pIndex Character column index
+     * @param ?string $index Character column index
      */
-    public function __construct($pIndex = 'A')
+    public function __construct(?string $index = 'A')
     {
         // Initialise values
-        $this->columnIndex = $pIndex;
+        $this->columnIndex = $index;
 
         // set dimension as unformatted by default
         parent::__construct(0);
@@ -44,39 +41,70 @@ public function __construct($pIndex = 'A')
     /**
      * Get column index as string eg: 'A'.
      */
-    public function getColumnIndex(): string
+    public function getColumnIndex(): ?string
     {
         return $this->columnIndex;
     }
 
     /**
      * Set column index as string eg: 'A'.
-     *
-     * @return $this
      */
-    public function setColumnIndex(string $index)
+    public function setColumnIndex(string $index): self
     {
         $this->columnIndex = $index;
 
         return $this;
     }
 
+    /**
+     * Get column index as numeric.
+     */
+    public function getColumnNumeric(): int
+    {
+        return Coordinate::columnIndexFromString($this->columnIndex ?? '');
+    }
+
+    /**
+     * Set column index as numeric.
+     */
+    public function setColumnNumeric(int $index): self
+    {
+        $this->columnIndex = Coordinate::stringFromColumnIndex($index);
+
+        return $this;
+    }
+
     /**
      * Get Width.
+     *
+     * Each unit of column width is equal to the width of one character in the default font size. A value of -1
+     *      tells Excel to display this column in its default width.
+     * By default, this will be the return value; but this method also accepts an optional unit of measure argument
+     *    and will convert the returned value to the specified UoM..
      */
-    public function getWidth(): float
+    public function getWidth(?string $unitOfMeasure = null): float
     {
-        return $this->width;
+        return ($unitOfMeasure === null || $this->width < 0)
+            ? $this->width
+            : (new CssDimension((string) $this->width))->toUnit($unitOfMeasure);
     }
 
     /**
      * Set Width.
      *
+     * Each unit of column width is equal to the width of one character in the default font size. A value of -1
+     *      tells Excel to display this column in its default width.
+     * By default, this will be the unit of measure for the passed value; but this method also accepts an
+     *    optional unit of measure argument, and will convert the value from the specified UoM using an
+     *    approximation method.
+     *
      * @return $this
      */
-    public function setWidth(float $width)
+    public function setWidth(float $width, ?string $unitOfMeasure = null): static
     {
-        $this->width = $width;
+        $this->width = ($unitOfMeasure === null || $width < 0)
+            ? $width
+            : (new CssDimension("{$width}{$unitOfMeasure}"))->width();
 
         return $this;
     }
@@ -94,7 +122,7 @@ public function getAutoSize(): bool
      *
      * @return $this
      */
-    public function setAutoSize(bool $autosizeEnabled)
+    public function setAutoSize(bool $autosizeEnabled): static
     {
         $this->autoSize = $autosizeEnabled;
 
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ColumnIterator.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ColumnIterator.php
index 0651a7a458..69939c39fa 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ColumnIterator.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ColumnIterator.php
@@ -2,49 +2,44 @@
 
 namespace PhpOffice\PhpSpreadsheet\Worksheet;
 
-use Iterator;
+use Iterator as NativeIterator;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Exception;
 use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
 
-class ColumnIterator implements Iterator
+/**
+ * @implements NativeIterator<string, Column>
+ */
+class ColumnIterator implements NativeIterator
 {
     /**
      * Worksheet to iterate.
-     *
-     * @var Worksheet
      */
-    private $worksheet;
+    private Worksheet $worksheet;
 
     /**
      * Current iterator position.
-     *
-     * @var int
      */
-    private $currentColumnIndex = 1;
+    private int $currentColumnIndex = 1;
 
     /**
      * Start position.
-     *
-     * @var int
      */
-    private $startColumnIndex = 1;
+    private int $startColumnIndex = 1;
 
     /**
      * End position.
-     *
-     * @var int
      */
-    private $endColumnIndex = 1;
+    private int $endColumnIndex = 1;
 
     /**
      * Create a new column iterator.
      *
      * @param Worksheet $worksheet The worksheet to iterate over
      * @param string $startColumn The column address at which to start iterating
-     * @param string $endColumn Optionally, the column address at which to stop iterating
+     * @param ?string $endColumn Optionally, the column address at which to stop iterating
      */
-    public function __construct(Worksheet $worksheet, $startColumn = 'A', $endColumn = null)
+    public function __construct(Worksheet $worksheet, string $startColumn = 'A', ?string $endColumn = null)
     {
         // Set subject
         $this->worksheet = $worksheet;
@@ -57,8 +52,7 @@ public function __construct(Worksheet $worksheet, $startColumn = 'A', $endColumn
      */
     public function __destruct()
     {
-        // @phpstan-ignore-next-line
-        $this->worksheet = null;
+        unset($this->worksheet);
     }
 
     /**
@@ -68,7 +62,7 @@ public function __destruct()
      *
      * @return $this
      */
-    public function resetStart(string $startColumn = 'A')
+    public function resetStart(string $startColumn = 'A'): static
     {
         $startColumnIndex = Coordinate::columnIndexFromString($startColumn);
         if ($startColumnIndex > Coordinate::columnIndexFromString($this->worksheet->getHighestColumn())) {
@@ -89,11 +83,11 @@ public function resetStart(string $startColumn = 'A')
     /**
      * (Re)Set the end column.
      *
-     * @param string $endColumn The column address at which to stop iterating
+     * @param ?string $endColumn The column address at which to stop iterating
      *
      * @return $this
      */
-    public function resetEnd($endColumn = null)
+    public function resetEnd(?string $endColumn = null): static
     {
         $endColumn = $endColumn ?: $this->worksheet->getHighestColumn();
         $this->endColumnIndex = Coordinate::columnIndexFromString($endColumn);
@@ -108,7 +102,7 @@ public function resetEnd($endColumn = null)
      *
      * @return $this
      */
-    public function seek(string $column = 'A')
+    public function seek(string $column = 'A'): static
     {
         $column = Coordinate::columnIndexFromString($column);
         if (($column < $this->startColumnIndex) || ($column > $this->endColumnIndex)) {
@@ -131,10 +125,8 @@ public function rewind(): void
 
     /**
      * Return the current column in this worksheet.
-     *
-     * @return Column
      */
-    public function current()
+    public function current(): Column
     {
         return new Column($this->worksheet, Coordinate::stringFromColumnIndex($this->currentColumnIndex));
     }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Dimension.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Dimension.php
index 4b3a0da869..7a88f8c93d 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Dimension.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Dimension.php
@@ -8,38 +8,30 @@ abstract class Dimension
 {
     /**
      * Visible?
-     *
-     * @var bool
      */
-    private $visible = true;
+    private bool $visible = true;
 
     /**
      * Outline level.
-     *
-     * @var int
      */
-    private $outlineLevel = 0;
+    private int $outlineLevel = 0;
 
     /**
      * Collapsed.
-     *
-     * @var bool
      */
-    private $collapsed = false;
+    private bool $collapsed = false;
 
     /**
      * Index to cellXf. Null value means row has no explicit cellXf format.
-     *
-     * @var null|int
      */
-    private $xfIndex;
+    private ?int $xfIndex;
 
     /**
      * Create a new Dimension.
      *
-     * @param int $initialValue Numeric row index
+     * @param ?int $initialValue Numeric row index
      */
-    public function __construct($initialValue = null)
+    public function __construct(?int $initialValue = null)
     {
         // set dimension as unformatted by default
         $this->xfIndex = $initialValue;
@@ -112,8 +104,6 @@ public function setCollapsed(bool $collapsed)
 
     /**
      * Get index to cellXf.
-     *
-     * @return int
      */
     public function getXfIndex(): ?int
     {
@@ -125,25 +115,10 @@ public function getXfIndex(): ?int
      *
      * @return $this
      */
-    public function setXfIndex(int $pValue)
+    public function setXfIndex(int $XfIndex)
     {
-        $this->xfIndex = $pValue;
+        $this->xfIndex = $XfIndex;
 
         return $this;
     }
-
-    /**
-     * Implement PHP __clone to create a deep clone, not just a shallow copy.
-     */
-    public function __clone()
-    {
-        $vars = get_object_vars($this);
-        foreach ($vars as $key => $value) {
-            if (is_object($value)) {
-                $this->$key = clone $value;
-            } else {
-                $this->$key = $value;
-            }
-        }
-    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Drawing.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Drawing.php
index 1f1dae93ab..bee049100d 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Drawing.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Drawing.php
@@ -3,15 +3,26 @@
 namespace PhpOffice\PhpSpreadsheet\Worksheet;
 
 use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
+use ZipArchive;
 
 class Drawing extends BaseDrawing
 {
+    const IMAGE_TYPES_CONVERTION_MAP = [
+        IMAGETYPE_GIF => IMAGETYPE_PNG,
+        IMAGETYPE_JPEG => IMAGETYPE_JPEG,
+        IMAGETYPE_PNG => IMAGETYPE_PNG,
+        IMAGETYPE_BMP => IMAGETYPE_PNG,
+    ];
+
     /**
      * Path.
-     *
-     * @var string
      */
-    private $path;
+    private string $path;
+
+    /**
+     * Whether or not we are dealing with a URL.
+     */
+    private bool $isUrl;
 
     /**
      * Create a new Drawing.
@@ -20,6 +31,7 @@ public function __construct()
     {
         // Initialise values
         $this->path = '';
+        $this->isUrl = false;
 
         // Initialize parent
         parent::__construct();
@@ -27,45 +39,46 @@ public function __construct()
 
     /**
      * Get Filename.
-     *
-     * @return string
      */
-    public function getFilename()
+    public function getFilename(): string
     {
         return basename($this->path);
     }
 
     /**
      * Get indexed filename (using image index).
-     *
-     * @return string
      */
-    public function getIndexedFilename()
+    public function getIndexedFilename(): string
     {
-        $fileName = $this->getFilename();
-        $fileName = str_replace(' ', '_', $fileName);
-
-        return str_replace('.' . $this->getExtension(), '', $fileName) . $this->getImageIndex() . '.' . $this->getExtension();
+        return md5($this->path) . '.' . $this->getExtension();
     }
 
     /**
      * Get Extension.
-     *
-     * @return string
      */
-    public function getExtension()
+    public function getExtension(): string
     {
         $exploded = explode('.', basename($this->path));
 
         return $exploded[count($exploded) - 1];
     }
 
+    /**
+     * Get full filepath to store drawing in zip archive.
+     */
+    public function getMediaFilename(): string
+    {
+        if (!array_key_exists($this->type, self::IMAGE_TYPES_CONVERTION_MAP)) {
+            throw new PhpSpreadsheetException('Unsupported image type in comment background. Supported types: PNG, JPEG, BMP, GIF.');
+        }
+
+        return sprintf('image%d%s', $this->getImageIndex(), $this->getImageFileExtensionForSave());
+    }
+
     /**
      * Get Path.
-     *
-     * @return string
      */
-    public function getPath()
+    public function getPath(): string
     {
         return $this->path;
     }
@@ -73,42 +86,154 @@ public function getPath()
     /**
      * Set Path.
      *
-     * @param string $pValue File path
-     * @param bool $pVerifyFile Verify file
+     * @param string $path File path
+     * @param bool $verifyFile Verify file
+     * @param ?ZipArchive $zip Zip archive instance
      *
      * @return $this
      */
-    public function setPath($pValue, $pVerifyFile = true)
+    public function setPath(string $path, bool $verifyFile = true, ?ZipArchive $zip = null): static
     {
-        if ($pVerifyFile) {
-            if (file_exists($pValue)) {
-                $this->path = $pValue;
+        $this->isUrl = false;
+        if (preg_match('~^data:image/[a-z]+;base64,~', $path) === 1) {
+            $this->path = $path;
 
-                if ($this->width == 0 && $this->height == 0) {
-                    // Get width/height
-                    [$this->width, $this->height] = getimagesize($pValue);
+            return $this;
+        }
+
+        $this->path = '';
+        // Check if a URL has been passed. https://stackoverflow.com/a/2058596/1252979
+        if (filter_var($path, FILTER_VALIDATE_URL)) {
+            if (!preg_match('/^(http|https|file|ftp|s3):/', $path)) {
+                throw new PhpSpreadsheetException('Invalid protocol for linked drawing');
+            }
+            // Implicit that it is a URL, rather store info than running check above on value in other places.
+            $this->isUrl = true;
+            $ctx = null;
+            // https://github.com/php/php-src/issues/16023
+            if (str_starts_with($path, 'https:')) {
+                $ctx = stream_context_create(['ssl' => ['crypto_method' => STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT]]);
+            }
+            $imageContents = @file_get_contents($path, false, $ctx);
+            if ($imageContents !== false) {
+                $filePath = tempnam(sys_get_temp_dir(), 'Drawing');
+                if ($filePath) {
+                    $put = @file_put_contents($filePath, $imageContents);
+                    if ($put !== false) {
+                        if ($this->isImage($filePath)) {
+                            $this->path = $path;
+                            $this->setSizesAndType($filePath);
+                        }
+                        unlink($filePath);
+                    }
+                }
+            }
+        } elseif ($zip instanceof ZipArchive) {
+            $zipPath = explode('#', $path)[1];
+            $locate = @$zip->locateName($zipPath);
+            if ($locate !== false) {
+                if ($this->isImage($path)) {
+                    $this->path = $path;
+                    $this->setSizesAndType($path);
                 }
-            } else {
-                throw new PhpSpreadsheetException("File $pValue not found!");
             }
         } else {
-            $this->path = $pValue;
+            $exists = @file_exists($path);
+            if ($exists !== false && $this->isImage($path)) {
+                $this->path = $path;
+                $this->setSizesAndType($path);
+            }
+        }
+        if ($this->path === '' && $verifyFile) {
+            throw new PhpSpreadsheetException("File $path not found!");
         }
 
         return $this;
     }
 
+    private function isImage(string $path): bool
+    {
+        $mime = (string) @mime_content_type($path);
+        $retVal = false;
+        if (str_starts_with($mime, 'image/')) {
+            $retVal = true;
+        } elseif ($mime === 'application/octet-stream') {
+            $extension = pathinfo($path, PATHINFO_EXTENSION);
+            $retVal = in_array($extension, ['bin', 'emf'], true);
+        }
+
+        return $retVal;
+    }
+
+    /**
+     * Get isURL.
+     */
+    public function getIsURL(): bool
+    {
+        return $this->isUrl;
+    }
+
+    /**
+     * Set isURL.
+     *
+     * @return $this
+     */
+    public function setIsURL(bool $isUrl): self
+    {
+        $this->isUrl = $isUrl;
+
+        return $this;
+    }
+
     /**
      * Get hash code.
      *
      * @return string Hash code
      */
-    public function getHashCode()
+    public function getHashCode(): string
     {
         return md5(
-            $this->path .
-            parent::getHashCode() .
-            __CLASS__
+            $this->path
+            . parent::getHashCode()
+            . __CLASS__
         );
     }
+
+    /**
+     * Get Image Type for Save.
+     */
+    public function getImageTypeForSave(): int
+    {
+        if (!array_key_exists($this->type, self::IMAGE_TYPES_CONVERTION_MAP)) {
+            throw new PhpSpreadsheetException('Unsupported image type in comment background. Supported types: PNG, JPEG, BMP, GIF.');
+        }
+
+        return self::IMAGE_TYPES_CONVERTION_MAP[$this->type];
+    }
+
+    /**
+     * Get Image file extention for Save.
+     */
+    public function getImageFileExtensionForSave(bool $includeDot = true): string
+    {
+        if (!array_key_exists($this->type, self::IMAGE_TYPES_CONVERTION_MAP)) {
+            throw new PhpSpreadsheetException('Unsupported image type in comment background. Supported types: PNG, JPEG, BMP, GIF.');
+        }
+
+        $result = image_type_to_extension(self::IMAGE_TYPES_CONVERTION_MAP[$this->type], $includeDot);
+
+        return "$result";
+    }
+
+    /**
+     * Get Image mime type.
+     */
+    public function getImageMimeType(): string
+    {
+        if (!array_key_exists($this->type, self::IMAGE_TYPES_CONVERTION_MAP)) {
+            throw new PhpSpreadsheetException('Unsupported image type in comment background. Supported types: PNG, JPEG, BMP, GIF.');
+        }
+
+        return image_type_to_mime_type(self::IMAGE_TYPES_CONVERTION_MAP[$this->type]);
+    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Drawing/Shadow.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Drawing/Shadow.php
index 0557c83cb8..e002d5f5a8 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Drawing/Shadow.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Drawing/Shadow.php
@@ -19,56 +19,42 @@ class Shadow implements IComparable
 
     /**
      * Visible.
-     *
-     * @var bool
      */
-    private $visible;
+    private bool $visible;
 
     /**
      * Blur radius.
      *
      * Defaults to 6
-     *
-     * @var int
      */
-    private $blurRadius;
+    private int $blurRadius;
 
     /**
      * Shadow distance.
      *
      * Defaults to 2
-     *
-     * @var int
      */
-    private $distance;
+    private int $distance;
 
     /**
      * Shadow direction (in degrees).
-     *
-     * @var int
      */
-    private $direction;
+    private int $direction;
 
     /**
      * Shadow alignment.
-     *
-     * @var string
      */
-    private $alignment;
+    private string $alignment;
 
     /**
      * Color.
-     *
-     * @var Color
      */
-    private $color;
+    private Color $color;
 
     /**
      * Alpha.
-     *
-     * @var int
      */
-    private $alpha;
+    private int $alpha;
 
     /**
      * Create a new Shadow.
@@ -87,10 +73,8 @@ public function __construct()
 
     /**
      * Get Visible.
-     *
-     * @return bool
      */
-    public function getVisible()
+    public function getVisible(): bool
     {
         return $this->visible;
     }
@@ -98,23 +82,19 @@ public function getVisible()
     /**
      * Set Visible.
      *
-     * @param bool $pValue
-     *
      * @return $this
      */
-    public function setVisible($pValue)
+    public function setVisible(bool $visible): static
     {
-        $this->visible = $pValue;
+        $this->visible = $visible;
 
         return $this;
     }
 
     /**
      * Get Blur radius.
-     *
-     * @return int
      */
-    public function getBlurRadius()
+    public function getBlurRadius(): int
     {
         return $this->blurRadius;
     }
@@ -122,23 +102,19 @@ public function getBlurRadius()
     /**
      * Set Blur radius.
      *
-     * @param int $pValue
-     *
      * @return $this
      */
-    public function setBlurRadius($pValue)
+    public function setBlurRadius(int $blurRadius): static
     {
-        $this->blurRadius = $pValue;
+        $this->blurRadius = $blurRadius;
 
         return $this;
     }
 
     /**
      * Get Shadow distance.
-     *
-     * @return int
      */
-    public function getDistance()
+    public function getDistance(): int
     {
         return $this->distance;
     }
@@ -146,23 +122,19 @@ public function getDistance()
     /**
      * Set Shadow distance.
      *
-     * @param int $pValue
-     *
      * @return $this
      */
-    public function setDistance($pValue)
+    public function setDistance(int $distance): static
     {
-        $this->distance = $pValue;
+        $this->distance = $distance;
 
         return $this;
     }
 
     /**
      * Get Shadow direction (in degrees).
-     *
-     * @return int
      */
-    public function getDirection()
+    public function getDirection(): int
     {
         return $this->direction;
     }
@@ -170,23 +142,19 @@ public function getDirection()
     /**
      * Set Shadow direction (in degrees).
      *
-     * @param int $pValue
-     *
      * @return $this
      */
-    public function setDirection($pValue)
+    public function setDirection(int $direction): static
     {
-        $this->direction = $pValue;
+        $this->direction = $direction;
 
         return $this;
     }
 
     /**
      * Get Shadow alignment.
-     *
-     * @return string
      */
-    public function getAlignment()
+    public function getAlignment(): string
     {
         return $this->alignment;
     }
@@ -194,23 +162,19 @@ public function getAlignment()
     /**
      * Set Shadow alignment.
      *
-     * @param string $pValue
-     *
      * @return $this
      */
-    public function setAlignment($pValue)
+    public function setAlignment(string $alignment): static
     {
-        $this->alignment = $pValue;
+        $this->alignment = $alignment;
 
         return $this;
     }
 
     /**
      * Get Color.
-     *
-     * @return Color
      */
-    public function getColor()
+    public function getColor(): Color
     {
         return $this->color;
     }
@@ -218,23 +182,19 @@ public function getColor()
     /**
      * Set Color.
      *
-     * @param Color $pValue
-     *
      * @return $this
      */
-    public function setColor(?Color $pValue = null)
+    public function setColor(Color $color): static
     {
-        $this->color = $pValue;
+        $this->color = $color;
 
         return $this;
     }
 
     /**
      * Get Alpha.
-     *
-     * @return int
      */
-    public function getAlpha()
+    public function getAlpha(): int
     {
         return $this->alpha;
     }
@@ -242,13 +202,11 @@ public function getAlpha()
     /**
      * Set Alpha.
      *
-     * @param int $pValue
-     *
      * @return $this
      */
-    public function setAlpha($pValue)
+    public function setAlpha(int $alpha): static
     {
-        $this->alpha = $pValue;
+        $this->alpha = $alpha;
 
         return $this;
     }
@@ -258,17 +216,17 @@ public function setAlpha($pValue)
      *
      * @return string Hash code
      */
-    public function getHashCode()
+    public function getHashCode(): string
     {
         return md5(
-            ($this->visible ? 't' : 'f') .
-            $this->blurRadius .
-            $this->distance .
-            $this->direction .
-            $this->alignment .
-            $this->color->getHashCode() .
-            $this->alpha .
-            __CLASS__
+            ($this->visible ? 't' : 'f')
+            . $this->blurRadius
+            . $this->distance
+            . $this->direction
+            . $this->alignment
+            . $this->color->getHashCode()
+            . $this->alpha
+            . __CLASS__
         );
     }
 
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/HeaderFooter.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/HeaderFooter.php
index cc37e7f5df..68716c060e 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/HeaderFooter.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/HeaderFooter.php
@@ -75,80 +75,60 @@ class HeaderFooter
 
     /**
      * OddHeader.
-     *
-     * @var string
      */
-    private $oddHeader = '';
+    private string $oddHeader = '';
 
     /**
      * OddFooter.
-     *
-     * @var string
      */
-    private $oddFooter = '';
+    private string $oddFooter = '';
 
     /**
      * EvenHeader.
-     *
-     * @var string
      */
-    private $evenHeader = '';
+    private string $evenHeader = '';
 
     /**
      * EvenFooter.
-     *
-     * @var string
      */
-    private $evenFooter = '';
+    private string $evenFooter = '';
 
     /**
      * FirstHeader.
-     *
-     * @var string
      */
-    private $firstHeader = '';
+    private string $firstHeader = '';
 
     /**
      * FirstFooter.
-     *
-     * @var string
      */
-    private $firstFooter = '';
+    private string $firstFooter = '';
 
     /**
      * Different header for Odd/Even, defaults to false.
-     *
-     * @var bool
      */
-    private $differentOddEven = false;
+    private bool $differentOddEven = false;
 
     /**
      * Different header for first page, defaults to false.
-     *
-     * @var bool
      */
-    private $differentFirst = false;
+    private bool $differentFirst = false;
 
     /**
      * Scale with document, defaults to true.
-     *
-     * @var bool
      */
-    private $scaleWithDocument = true;
+    private bool $scaleWithDocument = true;
 
     /**
      * Align with margins, defaults to true.
-     *
-     * @var bool
      */
-    private $alignWithMargins = true;
+    private bool $alignWithMargins = true;
 
     /**
      * Header/footer images.
      *
      * @var HeaderFooterDrawing[]
      */
-    private $headerFooterImages = [];
+    private array $headerFooterImages = [];
 
     /**
      * Create a new HeaderFooter.
@@ -159,10 +139,8 @@ public function __construct()
 
     /**
      * Get OddHeader.
-     *
-     * @return string
      */
-    public function getOddHeader()
+    public function getOddHeader(): string
     {
         return $this->oddHeader;
     }
@@ -170,23 +148,19 @@ public function getOddHeader()
     /**
      * Set OddHeader.
      *
-     * @param string $pValue
-     *
      * @return $this
      */
-    public function setOddHeader($pValue)
+    public function setOddHeader(string $oddHeader): static
     {
-        $this->oddHeader = $pValue;
+        $this->oddHeader = $oddHeader;
 
         return $this;
     }
 
     /**
      * Get OddFooter.
-     *
-     * @return string
      */
-    public function getOddFooter()
+    public function getOddFooter(): string
     {
         return $this->oddFooter;
     }
@@ -194,23 +168,19 @@ public function getOddFooter()
     /**
      * Set OddFooter.
      *
-     * @param string $pValue
-     *
      * @return $this
      */
-    public function setOddFooter($pValue)
+    public function setOddFooter(string $oddFooter): static
     {
-        $this->oddFooter = $pValue;
+        $this->oddFooter = $oddFooter;
 
         return $this;
     }
 
     /**
      * Get EvenHeader.
-     *
-     * @return string
      */
-    public function getEvenHeader()
+    public function getEvenHeader(): string
     {
         return $this->evenHeader;
     }
@@ -218,23 +188,19 @@ public function getEvenHeader()
     /**
      * Set EvenHeader.
      *
-     * @param string $pValue
-     *
      * @return $this
      */
-    public function setEvenHeader($pValue)
+    public function setEvenHeader(string $eventHeader): static
     {
-        $this->evenHeader = $pValue;
+        $this->evenHeader = $eventHeader;
 
         return $this;
     }
 
     /**
      * Get EvenFooter.
-     *
-     * @return string
      */
-    public function getEvenFooter()
+    public function getEvenFooter(): string
     {
         return $this->evenFooter;
     }
@@ -242,23 +208,19 @@ public function getEvenFooter()
     /**
      * Set EvenFooter.
      *
-     * @param string $pValue
-     *
      * @return $this
      */
-    public function setEvenFooter($pValue)
+    public function setEvenFooter(string $evenFooter): static
     {
-        $this->evenFooter = $pValue;
+        $this->evenFooter = $evenFooter;
 
         return $this;
     }
 
     /**
      * Get FirstHeader.
-     *
-     * @return string
      */
-    public function getFirstHeader()
+    public function getFirstHeader(): string
     {
         return $this->firstHeader;
     }
@@ -266,23 +228,19 @@ public function getFirstHeader()
     /**
      * Set FirstHeader.
      *
-     * @param string $pValue
-     *
      * @return $this
      */
-    public function setFirstHeader($pValue)
+    public function setFirstHeader(string $firstHeader): static
     {
-        $this->firstHeader = $pValue;
+        $this->firstHeader = $firstHeader;
 
         return $this;
     }
 
     /**
      * Get FirstFooter.
-     *
-     * @return string
      */
-    public function getFirstFooter()
+    public function getFirstFooter(): string
     {
         return $this->firstFooter;
     }
@@ -290,23 +248,19 @@ public function getFirstFooter()
     /**
      * Set FirstFooter.
      *
-     * @param string $pValue
-     *
      * @return $this
      */
-    public function setFirstFooter($pValue)
+    public function setFirstFooter(string $firstFooter): static
     {
-        $this->firstFooter = $pValue;
+        $this->firstFooter = $firstFooter;
 
         return $this;
     }
 
     /**
      * Get DifferentOddEven.
-     *
-     * @return bool
      */
-    public function getDifferentOddEven()
+    public function getDifferentOddEven(): bool
     {
         return $this->differentOddEven;
     }
@@ -314,23 +268,19 @@ public function getDifferentOddEven()
     /**
      * Set DifferentOddEven.
      *
-     * @param bool $pValue
-     *
      * @return $this
      */
-    public function setDifferentOddEven($pValue)
+    public function setDifferentOddEven(bool $differentOddEvent): static
     {
-        $this->differentOddEven = $pValue;
+        $this->differentOddEven = $differentOddEvent;
 
         return $this;
     }
 
     /**
      * Get DifferentFirst.
-     *
-     * @return bool
      */
-    public function getDifferentFirst()
+    public function getDifferentFirst(): bool
     {
         return $this->differentFirst;
     }
@@ -338,23 +288,19 @@ public function getDifferentFirst()
     /**
      * Set DifferentFirst.
      *
-     * @param bool $pValue
-     *
      * @return $this
      */
-    public function setDifferentFirst($pValue)
+    public function setDifferentFirst(bool $differentFirst): static
     {
-        $this->differentFirst = $pValue;
+        $this->differentFirst = $differentFirst;
 
         return $this;
     }
 
     /**
      * Get ScaleWithDocument.
-     *
-     * @return bool
      */
-    public function getScaleWithDocument()
+    public function getScaleWithDocument(): bool
     {
         return $this->scaleWithDocument;
     }
@@ -362,23 +308,19 @@ public function getScaleWithDocument()
     /**
      * Set ScaleWithDocument.
      *
-     * @param bool $pValue
-     *
      * @return $this
      */
-    public function setScaleWithDocument($pValue)
+    public function setScaleWithDocument(bool $scaleWithDocument): static
     {
-        $this->scaleWithDocument = $pValue;
+        $this->scaleWithDocument = $scaleWithDocument;
 
         return $this;
     }
 
     /**
      * Get AlignWithMargins.
-     *
-     * @return bool
      */
-    public function getAlignWithMargins()
+    public function getAlignWithMargins(): bool
     {
         return $this->alignWithMargins;
     }
@@ -386,13 +328,11 @@ public function getAlignWithMargins()
     /**
      * Set AlignWithMargins.
      *
-     * @param bool $pValue
-     *
      * @return $this
      */
-    public function setAlignWithMargins($pValue)
+    public function setAlignWithMargins(bool $alignWithMargins): static
     {
-        $this->alignWithMargins = $pValue;
+        $this->alignWithMargins = $alignWithMargins;
 
         return $this;
     }
@@ -400,11 +340,9 @@ public function setAlignWithMargins($pValue)
     /**
      * Add header/footer image.
      *
-     * @param string $location
-     *
      * @return $this
      */
-    public function addImage(HeaderFooterDrawing $image, $location = self::IMAGE_HEADER_LEFT)
+    public function addImage(HeaderFooterDrawing $image, string $location = self::IMAGE_HEADER_LEFT): static
     {
         $this->headerFooterImages[$location] = $image;
 
@@ -414,11 +352,9 @@ public function addImage(HeaderFooterDrawing $image, $location = self::IMAGE_HEA
     /**
      * Remove header/footer image.
      *
-     * @param string $location
-     *
      * @return $this
      */
-    public function removeImage($location = self::IMAGE_HEADER_LEFT)
+    public function removeImage(string $location = self::IMAGE_HEADER_LEFT): static
     {
         if (isset($this->headerFooterImages[$location])) {
             unset($this->headerFooterImages[$location]);
@@ -434,7 +370,7 @@ public function removeImage($location = self::IMAGE_HEADER_LEFT)
      *
      * @return $this
      */
-    public function setImages(array $images)
+    public function setImages(array $images): static
     {
         $this->headerFooterImages = $images;
 
@@ -446,7 +382,7 @@ public function setImages(array $images)
      *
      * @return HeaderFooterDrawing[]
      */
-    public function getImages()
+    public function getImages(): array
     {
         // Sort array
         $images = [];
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/HeaderFooterDrawing.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/HeaderFooterDrawing.php
index b42c7324c1..6dddb791d1 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/HeaderFooterDrawing.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/HeaderFooterDrawing.php
@@ -9,16 +9,16 @@ class HeaderFooterDrawing extends Drawing
      *
      * @return string Hash code
      */
-    public function getHashCode()
+    public function getHashCode(): string
     {
         return md5(
-            $this->getPath() .
-            $this->name .
-            $this->offsetX .
-            $this->offsetY .
-            $this->width .
-            $this->height .
-            __CLASS__
+            $this->getPath()
+            . $this->name
+            . $this->offsetX
+            . $this->offsetY
+            . $this->width
+            . $this->height
+            . __CLASS__
         );
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Iterator.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Iterator.php
index 7eb2a858f4..9223718484 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Iterator.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Iterator.php
@@ -4,21 +4,20 @@
 
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 
+/**
+ * @implements \Iterator<int, Worksheet>
+ */
 class Iterator implements \Iterator
 {
     /**
      * Spreadsheet to iterate.
-     *
-     * @var Spreadsheet
      */
-    private $subject;
+    private Spreadsheet $subject;
 
     /**
      * Current iterator position.
-     *
-     * @var int
      */
-    private $position = 0;
+    private int $position = 0;
 
     /**
      * Create a new worksheet iterator.
@@ -63,8 +62,6 @@ public function next(): void
 
     /**
      * Are there more Worksheet instances available?
-     *
-     * @return bool
      */
     public function valid(): bool
     {
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/MemoryDrawing.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/MemoryDrawing.php
index 7789543a60..e15a798d33 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/MemoryDrawing.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/MemoryDrawing.php
@@ -4,6 +4,7 @@
 
 use GdImage;
 use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Shared\File;
 
 class MemoryDrawing extends BaseDrawing
 {
@@ -19,33 +20,31 @@ class MemoryDrawing extends BaseDrawing
     const MIMETYPE_GIF = 'image/gif';
     const MIMETYPE_JPEG = 'image/jpeg';
 
+    const SUPPORTED_MIME_TYPES = [
+        self::MIMETYPE_GIF,
+        self::MIMETYPE_JPEG,
+        self::MIMETYPE_PNG,
+    ];
+
     /**
      * Image resource.
-     *
-     * @var null|GdImage|resource
      */
-    private $imageResource;
+    private null|GdImage $imageResource = null;
 
     /**
      * Rendering function.
-     *
-     * @var string
      */
-    private $renderingFunction;
+    private string $renderingFunction;
 
     /**
      * Mime type.
-     *
-     * @var string
      */
-    private $mimeType;
+    private string $mimeType;
 
     /**
      * Unique name.
-     *
-     * @var string
      */
-    private $uniqueName;
+    private string $uniqueName;
 
     /**
      * Create a new MemoryDrawing.
@@ -64,9 +63,10 @@ public function __construct()
     public function __destruct()
     {
         if ($this->imageResource) {
-            imagedestroy($this->imageResource);
+            @imagedestroy($this->imageResource);
             $this->imageResource = null;
         }
+        $this->worksheet = null;
     }
 
     public function __clone()
@@ -81,8 +81,8 @@ private function cloneResource(): void
             return;
         }
 
-        $width = imagesx($this->imageResource);
-        $height = imagesy($this->imageResource);
+        $width = (int) imagesx($this->imageResource);
+        $height = (int) imagesy($this->imageResource);
 
         if (imageistruecolor($this->imageResource)) {
             $clone = imagecreatetruecolor($width, $height);
@@ -101,10 +101,8 @@ private function cloneResource(): void
             // If the image has transparency...
             $transparent = imagecolortransparent($this->imageResource);
             if ($transparent >= 0) {
+                // Starting with Php8.0, next function throws rather than return false
                 $rgb = imagecolorsforindex($this->imageResource, $transparent);
-                if ($rgb === false) {
-                    throw new Exception('Could not get image colors');
-                }
 
                 imagesavealpha($clone, true);
                 $color = imagecolorallocatealpha($clone, $rgb['red'], $rgb['green'], $rgb['blue'], $rgb['alpha']);
@@ -123,11 +121,122 @@ private function cloneResource(): void
     }
 
     /**
-     * Get image resource.
+     * @param resource $imageStream Stream data to be converted to a Memory Drawing
+     *
+     * @throws Exception
+     */
+    public static function fromStream($imageStream): self
+    {
+        $streamValue = stream_get_contents($imageStream);
+        if ($streamValue === false) {
+            throw new Exception('Unable to read data from stream');
+        }
+
+        return self::fromString($streamValue);
+    }
+
+    /**
+     * @param string $imageString String data to be converted to a Memory Drawing
      *
-     * @return null|GdImage|resource
+     * @throws Exception
+     */
+    public static function fromString(string $imageString): self
+    {
+        $gdImage = @imagecreatefromstring($imageString);
+        if ($gdImage === false) {
+            throw new Exception('Value cannot be converted to an image');
+        }
+
+        $mimeType = self::identifyMimeType($imageString);
+        if (imageistruecolor($gdImage) || imagecolortransparent($gdImage) >= 0) {
+            imagesavealpha($gdImage, true);
+        }
+        $renderingFunction = self::identifyRenderingFunction($mimeType);
+
+        $drawing = new self();
+        $drawing->setImageResource($gdImage);
+        $drawing->setRenderingFunction($renderingFunction);
+        $drawing->setMimeType($mimeType);
+
+        return $drawing;
+    }
+
+    private static function identifyRenderingFunction(string $mimeType): string
+    {
+        return match ($mimeType) {
+            self::MIMETYPE_PNG => self::RENDERING_PNG,
+            self::MIMETYPE_JPEG => self::RENDERING_JPEG,
+            self::MIMETYPE_GIF => self::RENDERING_GIF,
+            default => self::RENDERING_DEFAULT,
+        };
+    }
+
+    /**
+     * @throws Exception
+     */
+    private static function identifyMimeType(string $imageString): string
+    {
+        $temporaryFileName = File::temporaryFilename();
+        file_put_contents($temporaryFileName, $imageString);
+
+        $mimeType = self::identifyMimeTypeUsingExif($temporaryFileName);
+        if ($mimeType !== null) {
+            unlink($temporaryFileName);
+
+            return $mimeType;
+        }
+
+        $mimeType = self::identifyMimeTypeUsingGd($temporaryFileName);
+        if ($mimeType !== null) {
+            unlink($temporaryFileName);
+
+            return $mimeType;
+        }
+
+        unlink($temporaryFileName);
+
+        return self::MIMETYPE_DEFAULT;
+    }
+
+    private static function identifyMimeTypeUsingExif(string $temporaryFileName): ?string
+    {
+        if (function_exists('exif_imagetype')) {
+            $imageType = @exif_imagetype($temporaryFileName);
+            $mimeType = ($imageType) ? image_type_to_mime_type($imageType) : null;
+
+            return self::supportedMimeTypes($mimeType);
+        }
+
+        return null;
+    }
+
+    private static function identifyMimeTypeUsingGd(string $temporaryFileName): ?string
+    {
+        if (function_exists('getimagesize')) {
+            $imageSize = @getimagesize($temporaryFileName);
+            if (is_array($imageSize)) {
+                $mimeType = $imageSize['mime'];
+
+                return self::supportedMimeTypes($mimeType);
+            }
+        }
+
+        return null;
+    }
+
+    private static function supportedMimeTypes(?string $mimeType = null): ?string
+    {
+        if (in_array($mimeType, self::SUPPORTED_MIME_TYPES, true)) {
+            return $mimeType;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get image resource.
      */
-    public function getImageResource()
+    public function getImageResource(): ?GdImage
     {
         return $this->imageResource;
     }
@@ -135,18 +244,16 @@ public function getImageResource()
     /**
      * Set image resource.
      *
-     * @param GdImage|resource $value
-     *
      * @return $this
      */
-    public function setImageResource($value)
+    public function setImageResource(?GdImage $value): static
     {
         $this->imageResource = $value;
 
         if ($this->imageResource !== null) {
             // Get width/height
-            $this->width = imagesx($this->imageResource);
-            $this->height = imagesy($this->imageResource);
+            $this->width = (int) imagesx($this->imageResource);
+            $this->height = (int) imagesy($this->imageResource);
         }
 
         return $this;
@@ -154,10 +261,8 @@ public function setImageResource($value)
 
     /**
      * Get rendering function.
-     *
-     * @return string
      */
-    public function getRenderingFunction()
+    public function getRenderingFunction(): string
     {
         return $this->renderingFunction;
     }
@@ -169,7 +274,7 @@ public function getRenderingFunction()
      *
      * @return $this
      */
-    public function setRenderingFunction($value)
+    public function setRenderingFunction(string $value): static
     {
         $this->renderingFunction = $value;
 
@@ -178,10 +283,8 @@ public function setRenderingFunction($value)
 
     /**
      * Get mime type.
-     *
-     * @return string
      */
-    public function getMimeType()
+    public function getMimeType(): string
     {
         return $this->mimeType;
     }
@@ -193,7 +296,7 @@ public function getMimeType()
      *
      * @return $this
      */
-    public function setMimeType($value)
+    public function setMimeType(string $value): static
     {
         $this->mimeType = $value;
 
@@ -202,10 +305,8 @@ public function setMimeType($value)
 
     /**
      * Get indexed filename (using image index).
-     *
-     * @return string
      */
-    public function getIndexedFilename()
+    public function getIndexedFilename(): string
     {
         $extension = strtolower($this->getMimeType());
         $extension = explode('/', $extension);
@@ -219,14 +320,14 @@ public function getIndexedFilename()
      *
      * @return string Hash code
      */
-    public function getHashCode()
+    public function getHashCode(): string
     {
         return md5(
-            $this->renderingFunction .
-            $this->mimeType .
-            $this->uniqueName .
-            parent::getHashCode() .
-            __CLASS__
+            $this->renderingFunction
+            . $this->mimeType
+            . $this->uniqueName
+            . parent::getHashCode()
+            . __CLASS__
         );
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/PageBreak.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/PageBreak.php
new file mode 100644
index 0000000000..05a6074dd1
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/PageBreak.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Worksheet;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Cell\CellAddress;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+
+class PageBreak
+{
+    private int $breakType;
+
+    private string $coordinate;
+
+    private int $maxColOrRow;
+
+    /**
+     * @param array{0: int, 1: int}|CellAddress|string $coordinate
+     */
+    public function __construct(int $breakType, CellAddress|string|array $coordinate, int $maxColOrRow = -1)
+    {
+        $coordinate = Functions::trimSheetFromCellReference(Validations::validateCellAddress($coordinate));
+        $this->breakType = $breakType;
+        $this->coordinate = $coordinate;
+        $this->maxColOrRow = $maxColOrRow;
+    }
+
+    public function getBreakType(): int
+    {
+        return $this->breakType;
+    }
+
+    public function getCoordinate(): string
+    {
+        return $this->coordinate;
+    }
+
+    public function getMaxColOrRow(): int
+    {
+        return $this->maxColOrRow;
+    }
+
+    public function getColumnInt(): int
+    {
+        return Coordinate::indexesFromString($this->coordinate)[0];
+    }
+
+    public function getRow(): int
+    {
+        return Coordinate::indexesFromString($this->coordinate)[1];
+    }
+
+    public function getColumnString(): string
+    {
+        return Coordinate::indexesFromString($this->coordinate)[2];
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/PageMargins.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/PageMargins.php
index a8297933ad..1b3767a7ca 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/PageMargins.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/PageMargins.php
@@ -6,45 +6,33 @@ class PageMargins
 {
     /**
      * Left.
-     *
-     * @var float
      */
-    private $left = 0.7;
+    private float $left = 0.7;
 
     /**
      * Right.
-     *
-     * @var float
      */
-    private $right = 0.7;
+    private float $right = 0.7;
 
     /**
      * Top.
-     *
-     * @var float
      */
-    private $top = 0.75;
+    private float $top = 0.75;
 
     /**
      * Bottom.
-     *
-     * @var float
      */
-    private $bottom = 0.75;
+    private float $bottom = 0.75;
 
     /**
      * Header.
-     *
-     * @var float
      */
-    private $header = 0.3;
+    private float $header = 0.3;
 
     /**
      * Footer.
-     *
-     * @var float
      */
-    private $footer = 0.3;
+    private float $footer = 0.3;
 
     /**
      * Create a new PageMargins.
@@ -55,10 +43,8 @@ public function __construct()
 
     /**
      * Get Left.
-     *
-     * @return float
      */
-    public function getLeft()
+    public function getLeft(): float
     {
         return $this->left;
     }
@@ -66,23 +52,19 @@ public function getLeft()
     /**
      * Set Left.
      *
-     * @param float $pValue
-     *
      * @return $this
      */
-    public function setLeft($pValue)
+    public function setLeft(float $left): static
     {
-        $this->left = $pValue;
+        $this->left = $left;
 
         return $this;
     }
 
     /**
      * Get Right.
-     *
-     * @return float
      */
-    public function getRight()
+    public function getRight(): float
     {
         return $this->right;
     }
@@ -90,23 +72,19 @@ public function getRight()
     /**
      * Set Right.
      *
-     * @param float $pValue
-     *
      * @return $this
      */
-    public function setRight($pValue)
+    public function setRight(float $right): static
     {
-        $this->right = $pValue;
+        $this->right = $right;
 
         return $this;
     }
 
     /**
      * Get Top.
-     *
-     * @return float
      */
-    public function getTop()
+    public function getTop(): float
     {
         return $this->top;
     }
@@ -114,23 +92,19 @@ public function getTop()
     /**
      * Set Top.
      *
-     * @param float $pValue
-     *
      * @return $this
      */
-    public function setTop($pValue)
+    public function setTop(float $top): static
     {
-        $this->top = $pValue;
+        $this->top = $top;
 
         return $this;
     }
 
     /**
      * Get Bottom.
-     *
-     * @return float
      */
-    public function getBottom()
+    public function getBottom(): float
     {
         return $this->bottom;
     }
@@ -138,23 +112,19 @@ public function getBottom()
     /**
      * Set Bottom.
      *
-     * @param float $pValue
-     *
      * @return $this
      */
-    public function setBottom($pValue)
+    public function setBottom(float $bottom): static
     {
-        $this->bottom = $pValue;
+        $this->bottom = $bottom;
 
         return $this;
     }
 
     /**
      * Get Header.
-     *
-     * @return float
      */
-    public function getHeader()
+    public function getHeader(): float
     {
         return $this->header;
     }
@@ -162,23 +132,19 @@ public function getHeader()
     /**
      * Set Header.
      *
-     * @param float $pValue
-     *
      * @return $this
      */
-    public function setHeader($pValue)
+    public function setHeader(float $header): static
     {
-        $this->header = $pValue;
+        $this->header = $header;
 
         return $this;
     }
 
     /**
      * Get Footer.
-     *
-     * @return float
      */
-    public function getFooter()
+    public function getFooter(): float
     {
         return $this->footer;
     }
@@ -186,32 +152,15 @@ public function getFooter()
     /**
      * Set Footer.
      *
-     * @param float $pValue
-     *
      * @return $this
      */
-    public function setFooter($pValue)
+    public function setFooter(float $footer): static
     {
-        $this->footer = $pValue;
+        $this->footer = $footer;
 
         return $this;
     }
 
-    /**
-     * Implement PHP __clone to create a deep clone, not just a shallow copy.
-     */
-    public function __clone()
-    {
-        $vars = get_object_vars($this);
-        foreach ($vars as $key => $value) {
-            if (is_object($value)) {
-                $this->$key = clone $value;
-            } else {
-                $this->$key = $value;
-            }
-        }
-    }
-
     public static function fromCentimeters(float $value): float
     {
         return $value / 2.54;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/PageSetup.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/PageSetup.php
index 7f3f71dc33..f8c2dd1277 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/PageSetup.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/PageSetup.php
@@ -159,135 +159,138 @@ class PageSetup
     const PAGEORDER_OVER_THEN_DOWN = 'overThenDown';
     const PAGEORDER_DOWN_THEN_OVER = 'downThenOver';
 
+    /**
+     * Paper size default.
+     */
+    private static int $paperSizeDefault = self::PAPERSIZE_LETTER;
+
     /**
      * Paper size.
-     *
-     * @var int
      */
-    private $paperSize = self::PAPERSIZE_LETTER;
+    private ?int $paperSize = null;
+
+    /**
+     * Orientation default.
+     */
+    private static string $orientationDefault = self::ORIENTATION_DEFAULT;
 
     /**
      * Orientation.
-     *
-     * @var string
      */
-    private $orientation = self::ORIENTATION_DEFAULT;
+    private string $orientation;
 
     /**
      * Scale (Print Scale).
      *
      * Print scaling. Valid values range from 10 to 400
      * This setting is overridden when fitToWidth and/or fitToHeight are in use
-     *
-     * @var null|int
      */
-    private $scale = 100;
+    private ?int $scale = 100;
 
     /**
      * Fit To Page
      * Whether scale or fitToWith / fitToHeight applies.
-     *
-     * @var bool
      */
-    private $fitToPage = false;
+    private bool $fitToPage = false;
 
     /**
      * Fit To Height
      * Number of vertical pages to fit on.
-     *
-     * @var null|int
      */
-    private $fitToHeight = 1;
+    private ?int $fitToHeight = 1;
 
     /**
      * Fit To Width
      * Number of horizontal pages to fit on.
-     *
-     * @var null|int
      */
-    private $fitToWidth = 1;
+    private ?int $fitToWidth = 1;
 
     /**
      * Columns to repeat at left.
      *
      * @var array Containing start column and end column, empty array if option unset
      */
-    private $columnsToRepeatAtLeft = ['', ''];
+    private array $columnsToRepeatAtLeft = ['', ''];
 
     /**
      * Rows to repeat at top.
      *
      * @var array Containing start row number and end row number, empty array if option unset
      */
-    private $rowsToRepeatAtTop = [0, 0];
+    private array $rowsToRepeatAtTop = [0, 0];
 
     /**
      * Center page horizontally.
-     *
-     * @var bool
      */
-    private $horizontalCentered = false;
+    private bool $horizontalCentered = false;
 
     /**
      * Center page vertically.
-     *
-     * @var bool
      */
-    private $verticalCentered = false;
+    private bool $verticalCentered = false;
 
     /**
      * Print area.
-     *
-     * @var null|string
      */
-    private $printArea;
+    private ?string $printArea = null;
 
     /**
      * First page number.
-     *
-     * @var int
      */
-    private $firstPageNumber;
+    private ?int $firstPageNumber = null;
 
-    private $pageOrder = self::PAGEORDER_DOWN_THEN_OVER;
+    private string $pageOrder = self::PAGEORDER_DOWN_THEN_OVER;
 
     /**
      * Create a new PageSetup.
      */
     public function __construct()
     {
+        $this->orientation = self::$orientationDefault;
     }
 
     /**
      * Get Paper Size.
-     *
-     * @return int
      */
-    public function getPaperSize()
+    public function getPaperSize(): int
     {
-        return $this->paperSize;
+        return $this->paperSize ?? self::$paperSizeDefault;
     }
 
     /**
      * Set Paper Size.
      *
-     * @param int $pValue see self::PAPERSIZE_*
+     * @param int $paperSize see self::PAPERSIZE_*
      *
      * @return $this
      */
-    public function setPaperSize($pValue)
+    public function setPaperSize(int $paperSize): static
     {
-        $this->paperSize = $pValue;
+        $this->paperSize = $paperSize;
 
         return $this;
     }
 
+    /**
+     * Get Paper Size default.
+     */
+    public static function getPaperSizeDefault(): int
+    {
+        return self::$paperSizeDefault;
+    }
+
+    /**
+     * Set Paper Size Default.
+     */
+    public static function setPaperSizeDefault(int $paperSize): void
+    {
+        self::$paperSizeDefault = $paperSize;
+    }
+
     /**
      * Get Orientation.
-     *
-     * @return string
      */
-    public function getOrientation()
+    public function getOrientation(): string
     {
         return $this->orientation;
     }
@@ -295,23 +298,35 @@ public function getOrientation()
     /**
      * Set Orientation.
      *
-     * @param string $pValue see self::ORIENTATION_*
+     * @param string $orientation see self::ORIENTATION_*
      *
      * @return $this
      */
-    public function setOrientation($pValue)
+    public function setOrientation(string $orientation): static
     {
-        $this->orientation = $pValue;
+        if ($orientation === self::ORIENTATION_LANDSCAPE || $orientation === self::ORIENTATION_PORTRAIT || $orientation === self::ORIENTATION_DEFAULT) {
+            $this->orientation = $orientation;
+        }
 
         return $this;
     }
 
+    public static function getOrientationDefault(): string
+    {
+        return self::$orientationDefault;
+    }
+
+    public static function setOrientationDefault(string $orientation): void
+    {
+        if ($orientation === self::ORIENTATION_LANDSCAPE || $orientation === self::ORIENTATION_PORTRAIT || $orientation === self::ORIENTATION_DEFAULT) {
+            self::$orientationDefault = $orientation;
+        }
+    }
+
     /**
      * Get Scale.
-     *
-     * @return null|int
      */
-    public function getScale()
+    public function getScale(): ?int
     {
         return $this->scale;
     }
@@ -321,18 +336,17 @@ public function getScale()
      * Print scaling. Valid values range from 10 to 400
      * This setting is overridden when fitToWidth and/or fitToHeight are in use.
      *
-     * @param null|int $pValue
-     * @param bool $pUpdate Update fitToPage so scaling applies rather than fitToHeight / fitToWidth
+     * @param bool $update Update fitToPage so scaling applies rather than fitToHeight / fitToWidth
      *
      * @return $this
      */
-    public function setScale($pValue, $pUpdate = true)
+    public function setScale(?int $scale, bool $update = true): static
     {
         // Microsoft Office Excel 2007 only allows setting a scale between 10 and 400 via the user interface,
         // but it is apparently still able to handle any scale >= 0, where 0 results in 100
-        if (($pValue >= 0) || $pValue === null) {
-            $this->scale = $pValue;
-            if ($pUpdate) {
+        if ($scale === null || $scale >= 0) {
+            $this->scale = $scale;
+            if ($update) {
                 $this->fitToPage = false;
             }
         } else {
@@ -344,10 +358,8 @@ public function setScale($pValue, $pUpdate = true)
 
     /**
      * Get Fit To Page.
-     *
-     * @return bool
      */
-    public function getFitToPage()
+    public function getFitToPage(): bool
     {
         return $this->fitToPage;
     }
@@ -355,23 +367,19 @@ public function getFitToPage()
     /**
      * Set Fit To Page.
      *
-     * @param bool $pValue
-     *
      * @return $this
      */
-    public function setFitToPage($pValue)
+    public function setFitToPage(bool $fitToPage): static
     {
-        $this->fitToPage = $pValue;
+        $this->fitToPage = $fitToPage;
 
         return $this;
     }
 
     /**
      * Get Fit To Height.
-     *
-     * @return null|int
      */
-    public function getFitToHeight()
+    public function getFitToHeight(): ?int
     {
         return $this->fitToHeight;
     }
@@ -379,15 +387,14 @@ public function getFitToHeight()
     /**
      * Set Fit To Height.
      *
-     * @param null|int $pValue
-     * @param bool $pUpdate Update fitToPage so it applies rather than scaling
+     * @param bool $update Update fitToPage so it applies rather than scaling
      *
      * @return $this
      */
-    public function setFitToHeight($pValue, $pUpdate = true)
+    public function setFitToHeight(?int $fitToHeight, bool $update = true): static
     {
-        $this->fitToHeight = $pValue;
-        if ($pUpdate) {
+        $this->fitToHeight = $fitToHeight;
+        if ($update) {
             $this->fitToPage = true;
         }
 
@@ -396,10 +403,8 @@ public function setFitToHeight($pValue, $pUpdate = true)
 
     /**
      * Get Fit To Width.
-     *
-     * @return null|int
      */
-    public function getFitToWidth()
+    public function getFitToWidth(): ?int
     {
         return $this->fitToWidth;
     }
@@ -407,15 +412,14 @@ public function getFitToWidth()
     /**
      * Set Fit To Width.
      *
-     * @param null|int $pValue
-     * @param bool $pUpdate Update fitToPage so it applies rather than scaling
+     * @param bool $update Update fitToPage so it applies rather than scaling
      *
      * @return $this
      */
-    public function setFitToWidth($pValue, $pUpdate = true)
+    public function setFitToWidth(?int $value, bool $update = true): static
     {
-        $this->fitToWidth = $pValue;
-        if ($pUpdate) {
+        $this->fitToWidth = $value;
+        if ($update) {
             $this->fitToPage = true;
         }
 
@@ -424,12 +428,10 @@ public function setFitToWidth($pValue, $pUpdate = true)
 
     /**
      * Is Columns to repeat at left set?
-     *
-     * @return bool
      */
-    public function isColumnsToRepeatAtLeftSet()
+    public function isColumnsToRepeatAtLeftSet(): bool
     {
-        if (is_array($this->columnsToRepeatAtLeft)) {
+        if (!empty($this->columnsToRepeatAtLeft)) {
             if ($this->columnsToRepeatAtLeft[0] != '' && $this->columnsToRepeatAtLeft[1] != '') {
                 return true;
             }
@@ -443,7 +445,7 @@ public function isColumnsToRepeatAtLeftSet()
      *
      * @return array Containing start column and end column, empty array if option unset
      */
-    public function getColumnsToRepeatAtLeft()
+    public function getColumnsToRepeatAtLeft(): array
     {
         return $this->columnsToRepeatAtLeft;
     }
@@ -451,13 +453,13 @@ public function getColumnsToRepeatAtLeft()
     /**
      * Set Columns to repeat at left.
      *
-     * @param array $pValue Containing start column and end column, empty array if option unset
+     * @param array $columnsToRepeatAtLeft Containing start column and end column, empty array if option unset
      *
      * @return $this
      */
-    public function setColumnsToRepeatAtLeft(array $pValue)
+    public function setColumnsToRepeatAtLeft(array $columnsToRepeatAtLeft): static
     {
-        $this->columnsToRepeatAtLeft = $pValue;
+        $this->columnsToRepeatAtLeft = $columnsToRepeatAtLeft;
 
         return $this;
     }
@@ -465,26 +467,24 @@ public function setColumnsToRepeatAtLeft(array $pValue)
     /**
      * Set Columns to repeat at left by start and end.
      *
-     * @param string $pStart eg: 'A'
-     * @param string $pEnd eg: 'B'
+     * @param string $start eg: 'A'
+     * @param string $end eg: 'B'
      *
      * @return $this
      */
-    public function setColumnsToRepeatAtLeftByStartAndEnd($pStart, $pEnd)
+    public function setColumnsToRepeatAtLeftByStartAndEnd(string $start, string $end): static
     {
-        $this->columnsToRepeatAtLeft = [$pStart, $pEnd];
+        $this->columnsToRepeatAtLeft = [$start, $end];
 
         return $this;
     }
 
     /**
      * Is Rows to repeat at top set?
-     *
-     * @return bool
      */
-    public function isRowsToRepeatAtTopSet()
+    public function isRowsToRepeatAtTopSet(): bool
     {
-        if (is_array($this->rowsToRepeatAtTop)) {
+        if (!empty($this->rowsToRepeatAtTop)) {
             if ($this->rowsToRepeatAtTop[0] != 0 && $this->rowsToRepeatAtTop[1] != 0) {
                 return true;
             }
@@ -498,7 +498,7 @@ public function isRowsToRepeatAtTopSet()
      *
      * @return array Containing start column and end column, empty array if option unset
      */
-    public function getRowsToRepeatAtTop()
+    public function getRowsToRepeatAtTop(): array
     {
         return $this->rowsToRepeatAtTop;
     }
@@ -506,13 +506,13 @@ public function getRowsToRepeatAtTop()
     /**
      * Set Rows to repeat at top.
      *
-     * @param array $pValue Containing start column and end column, empty array if option unset
+     * @param array $rowsToRepeatAtTop Containing start column and end column, empty array if option unset
      *
      * @return $this
      */
-    public function setRowsToRepeatAtTop(array $pValue)
+    public function setRowsToRepeatAtTop(array $rowsToRepeatAtTop): static
     {
-        $this->rowsToRepeatAtTop = $pValue;
+        $this->rowsToRepeatAtTop = $rowsToRepeatAtTop;
 
         return $this;
     }
@@ -520,24 +520,22 @@ public function setRowsToRepeatAtTop(array $pValue)
     /**
      * Set Rows to repeat at top by start and end.
      *
-     * @param int $pStart eg: 1
-     * @param int $pEnd eg: 1
+     * @param int $start eg: 1
+     * @param int $end eg: 1
      *
      * @return $this
      */
-    public function setRowsToRepeatAtTopByStartAndEnd($pStart, $pEnd)
+    public function setRowsToRepeatAtTopByStartAndEnd(int $start, int $end): static
     {
-        $this->rowsToRepeatAtTop = [$pStart, $pEnd];
+        $this->rowsToRepeatAtTop = [$start, $end];
 
         return $this;
     }
 
     /**
      * Get center page horizontally.
-     *
-     * @return bool
      */
-    public function getHorizontalCentered()
+    public function getHorizontalCentered(): bool
     {
         return $this->horizontalCentered;
     }
@@ -545,11 +543,9 @@ public function getHorizontalCentered()
     /**
      * Set center page horizontally.
      *
-     * @param bool $value
-     *
      * @return $this
      */
-    public function setHorizontalCentered($value)
+    public function setHorizontalCentered(bool $value): static
     {
         $this->horizontalCentered = $value;
 
@@ -558,10 +554,8 @@ public function setHorizontalCentered($value)
 
     /**
      * Get center page vertically.
-     *
-     * @return bool
      */
-    public function getVerticalCentered()
+    public function getVerticalCentered(): bool
     {
         return $this->verticalCentered;
     }
@@ -569,11 +563,9 @@ public function getVerticalCentered()
     /**
      * Set center page vertically.
      *
-     * @param bool $value
-     *
      * @return $this
      */
-    public function setVerticalCentered($value)
+    public function setVerticalCentered(bool $value): static
     {
         $this->verticalCentered = $value;
 
@@ -587,15 +579,13 @@ public function setVerticalCentered($value)
      *                            Default behaviour, or a index value of 0, will return all ranges as a comma-separated string
      *                            Otherwise, the specific range identified by the value of $index will be returned
      *                            Print areas are numbered from 1
-     *
-     * @return string
      */
-    public function getPrintArea($index = 0)
+    public function getPrintArea(int $index = 0): string
     {
         if ($index == 0) {
-            return $this->printArea;
+            return (string) $this->printArea;
         }
-        $printAreas = explode(',', $this->printArea);
+        $printAreas = explode(',', (string) $this->printArea);
         if (isset($printAreas[$index - 1])) {
             return $printAreas[$index - 1];
         }
@@ -610,15 +600,13 @@ public function getPrintArea($index = 0)
      *                            Default behaviour, or an index value of 0, will identify whether any print range is set
      *                            Otherwise, existence of the range identified by the value of $index will be returned
      *                            Print areas are numbered from 1
-     *
-     * @return bool
      */
-    public function isPrintAreaSet($index = 0)
+    public function isPrintAreaSet(int $index = 0): bool
     {
         if ($index == 0) {
             return $this->printArea !== null;
         }
-        $printAreas = explode(',', $this->printArea);
+        $printAreas = explode(',', (string) $this->printArea);
 
         return isset($printAreas[$index - 1]);
     }
@@ -633,12 +621,12 @@ public function isPrintAreaSet($index = 0)
      *
      * @return $this
      */
-    public function clearPrintArea($index = 0)
+    public function clearPrintArea(int $index = 0): static
     {
         if ($index == 0) {
             $this->printArea = null;
         } else {
-            $printAreas = explode(',', $this->printArea);
+            $printAreas = explode(',', (string) $this->printArea);
             if (isset($printAreas[$index - 1])) {
                 unset($printAreas[$index - 1]);
                 $this->printArea = implode(',', $printAreas);
@@ -651,7 +639,6 @@ public function clearPrintArea($index = 0)
     /**
      * Set print area. e.g. 'A1:D10' or 'A1:D10,G5:M20'.
      *
-     * @param string $value
      * @param int $index Identifier for a specific print area range allowing several ranges to be set
      *                            When the method is "O"verwrite, then a positive integer index will overwrite that indexed
      *                                entry in the print areas list; a negative index value will identify which entry to
@@ -668,13 +655,13 @@ public function clearPrintArea($index = 0)
      *
      * @return $this
      */
-    public function setPrintArea($value, $index = 0, $method = self::SETPRINTRANGE_OVERWRITE)
+    public function setPrintArea(string $value, int $index = 0, string $method = self::SETPRINTRANGE_OVERWRITE): static
     {
-        if (strpos($value, '!') !== false) {
+        if (str_contains($value, '!')) {
             throw new PhpSpreadsheetException('Cell coordinate must not specify a worksheet.');
-        } elseif (strpos($value, ':') === false) {
+        } elseif (!str_contains($value, ':')) {
             throw new PhpSpreadsheetException('Cell coordinate must be a range of cells.');
-        } elseif (strpos($value, '$') !== false) {
+        } elseif (str_contains($value, '$')) {
             throw new PhpSpreadsheetException('Cell coordinate must not be absolute.');
         }
         $value = strtoupper($value);
@@ -686,7 +673,7 @@ public function setPrintArea($value, $index = 0, $method = self::SETPRINTRANGE_O
             if ($index == 0) {
                 $this->printArea = $value;
             } else {
-                $printAreas = explode(',', $this->printArea);
+                $printAreas = explode(',', (string) $this->printArea);
                 if ($index < 0) {
                     $index = count($printAreas) - abs($index) + 1;
                 }
@@ -700,9 +687,9 @@ public function setPrintArea($value, $index = 0, $method = self::SETPRINTRANGE_O
             if ($index == 0) {
                 $this->printArea = $this->printArea ? ($this->printArea . ',' . $value) : $value;
             } else {
-                $printAreas = explode(',', $this->printArea);
+                $printAreas = explode(',', (string) $this->printArea);
                 if ($index < 0) {
-                    $index = abs($index) - 1;
+                    $index = (int) abs($index) - 1;
                 }
                 if ($index > count($printAreas)) {
                     throw new PhpSpreadsheetException('Invalid index for setting print range.');
@@ -720,7 +707,6 @@ public function setPrintArea($value, $index = 0, $method = self::SETPRINTRANGE_O
     /**
      * Add a new print area (e.g. 'A1:D10' or 'A1:D10,G5:M20') to the list of print areas.
      *
-     * @param string $value
      * @param int $index Identifier for a specific print area range allowing several ranges to be set
      *                            A positive index will insert after that indexed entry in the print areas list, while a
      *                                negative index will insert before the indexed entry.
@@ -730,7 +716,7 @@ public function setPrintArea($value, $index = 0, $method = self::SETPRINTRANGE_O
      *
      * @return $this
      */
-    public function addPrintArea($value, $index = -1)
+    public function addPrintArea(string $value, int $index = -1): static
     {
         return $this->setPrintArea($value, $index, self::SETPRINTRANGE_INSERT);
     }
@@ -758,7 +744,7 @@ public function addPrintArea($value, $index = -1)
      *
      * @return $this
      */
-    public function setPrintAreaByColumnAndRow($column1, $row1, $column2, $row2, $index = 0, $method = self::SETPRINTRANGE_OVERWRITE)
+    public function setPrintAreaByColumnAndRow(int $column1, int $row1, int $column2, int $row2, int $index = 0, string $method = self::SETPRINTRANGE_OVERWRITE): static
     {
         return $this->setPrintArea(
             Coordinate::stringFromColumnIndex($column1) . $row1 . ':' . Coordinate::stringFromColumnIndex($column2) . $row2,
@@ -783,7 +769,7 @@ public function setPrintAreaByColumnAndRow($column1, $row1, $column2, $row2, $in
      *
      * @return $this
      */
-    public function addPrintAreaByColumnAndRow($column1, $row1, $column2, $row2, $index = -1)
+    public function addPrintAreaByColumnAndRow(int $column1, int $row1, int $column2, int $row2, int $index = -1): static
     {
         return $this->setPrintArea(
             Coordinate::stringFromColumnIndex($column1) . $row1 . ':' . Coordinate::stringFromColumnIndex($column2) . $row2,
@@ -794,10 +780,8 @@ public function addPrintAreaByColumnAndRow($column1, $row1, $column2, $row2, $in
 
     /**
      * Get first page number.
-     *
-     * @return int
      */
-    public function getFirstPageNumber()
+    public function getFirstPageNumber(): ?int
     {
         return $this->firstPageNumber;
     }
@@ -805,11 +789,9 @@ public function getFirstPageNumber()
     /**
      * Set first page number.
      *
-     * @param int $value
-     *
      * @return $this
      */
-    public function setFirstPageNumber($value)
+    public function setFirstPageNumber(?int $value): static
     {
         $this->firstPageNumber = $value;
 
@@ -821,7 +803,7 @@ public function setFirstPageNumber($value)
      *
      * @return $this
      */
-    public function resetFirstPageNumber()
+    public function resetFirstPageNumber(): static
     {
         return $this->setFirstPageNumber(null);
     }
@@ -839,19 +821,4 @@ public function setPageOrder(?string $pageOrder): self
 
         return $this;
     }
-
-    /**
-     * Implement PHP __clone to create a deep clone, not just a shallow copy.
-     */
-    public function __clone()
-    {
-        $vars = get_object_vars($this);
-        foreach ($vars as $key => $value) {
-            if (is_object($value)) {
-                $this->$key = clone $value;
-            } else {
-                $this->$key = $value;
-            }
-        }
-    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Pane.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Pane.php
new file mode 100644
index 0000000000..cbf523d4d3
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Pane.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Worksheet;
+
+class Pane
+{
+    private string $sqref;
+
+    private string $activeCell;
+
+    private string $position;
+
+    public function __construct(string $position, string $sqref = '', string $activeCell = '')
+    {
+        $this->sqref = $sqref;
+        $this->activeCell = $activeCell;
+        $this->position = $position;
+    }
+
+    public function getPosition(): string
+    {
+        return $this->position;
+    }
+
+    public function getSqref(): string
+    {
+        return $this->sqref;
+    }
+
+    public function setSqref(string $sqref): self
+    {
+        $this->sqref = $sqref;
+
+        return $this;
+    }
+
+    public function getActiveCell(): string
+    {
+        return $this->activeCell;
+    }
+
+    public function setActiveCell(string $activeCell): self
+    {
+        $this->activeCell = $activeCell;
+
+        return $this;
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ProtectedRange.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ProtectedRange.php
new file mode 100644
index 0000000000..bd4197628f
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ProtectedRange.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Worksheet;
+
+class ProtectedRange
+{
+    private string $name = '';
+
+    private string $password = '';
+
+    private string $sqref;
+
+    private string $securityDescriptor = '';
+
+    /**
+     * No setters aside from constructor.
+     */
+    public function __construct(string $sqref, string $password = '', string $name = '', string $securityDescriptor = '')
+    {
+        $this->sqref = $sqref;
+        $this->name = $name;
+        $this->password = $password;
+        $this->securityDescriptor = $securityDescriptor;
+    }
+
+    public function getSqref(): string
+    {
+        return $this->sqref;
+    }
+
+    public function getName(): string
+    {
+        return $this->name ?: ('p' . md5($this->sqref));
+    }
+
+    public function getPassword(): string
+    {
+        return $this->password;
+    }
+
+    public function getSecurityDescriptor(): string
+    {
+        return $this->securityDescriptor;
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Protection.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Protection.php
index ba3af0a799..520994dcf7 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Protection.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Protection.php
@@ -18,144 +18,104 @@ class Protection
     const ALGORITHM_WHIRLPOOL = 'WHIRLPOOL';
 
     /**
-     * Sheet.
-     *
-     * @var bool
+     * Autofilters are locked when sheet is protected, default true.
      */
-    private $sheet = false;
+    private ?bool $autoFilter = null;
 
     /**
-     * Objects.
-     *
-     * @var bool
+     * Deleting columns is locked when sheet is protected, default true.
      */
-    private $objects = false;
+    private ?bool $deleteColumns = null;
 
     /**
-     * Scenarios.
-     *
-     * @var bool
+     * Deleting rows is locked when sheet is protected, default true.
      */
-    private $scenarios = false;
+    private ?bool $deleteRows = null;
 
     /**
-     * Format cells.
-     *
-     * @var bool
+     * Formatting cells is locked when sheet is protected, default true.
      */
-    private $formatCells = false;
+    private ?bool $formatCells = null;
 
     /**
-     * Format columns.
-     *
-     * @var bool
+     * Formatting columns is locked when sheet is protected, default true.
      */
-    private $formatColumns = false;
+    private ?bool $formatColumns = null;
 
     /**
-     * Format rows.
-     *
-     * @var bool
+     * Formatting rows is locked when sheet is protected, default true.
      */
-    private $formatRows = false;
+    private ?bool $formatRows = null;
 
     /**
-     * Insert columns.
-     *
-     * @var bool
+     * Inserting columns is locked when sheet is protected, default true.
      */
-    private $insertColumns = false;
+    private ?bool $insertColumns = null;
 
     /**
-     * Insert rows.
-     *
-     * @var bool
+     * Inserting hyperlinks is locked when sheet is protected, default true.
      */
-    private $insertRows = false;
+    private ?bool $insertHyperlinks = null;
 
     /**
-     * Insert hyperlinks.
-     *
-     * @var bool
+     * Inserting rows is locked when sheet is protected, default true.
      */
-    private $insertHyperlinks = false;
+    private ?bool $insertRows = null;
 
     /**
-     * Delete columns.
-     *
-     * @var bool
+     * Objects are locked when sheet is protected, default false.
      */
-    private $deleteColumns = false;
+    private ?bool $objects = null;
 
     /**
-     * Delete rows.
-     *
-     * @var bool
+     * Pivot tables are locked when the sheet is protected, default true.
      */
-    private $deleteRows = false;
+    private ?bool $pivotTables = null;
 
     /**
-     * Select locked cells.
-     *
-     * @var bool
+     * Scenarios are locked when sheet is protected, default false.
      */
-    private $selectLockedCells = false;
+    private ?bool $scenarios = null;
 
     /**
-     * Sort.
-     *
-     * @var bool
+     * Selection of locked cells is locked when sheet is protected, default false.
      */
-    private $sort = false;
+    private ?bool $selectLockedCells = null;
 
     /**
-     * AutoFilter.
-     *
-     * @var bool
+     * Selection of unlocked cells is locked when sheet is protected, default false.
      */
-    private $autoFilter = false;
+    private ?bool $selectUnlockedCells = null;
 
     /**
-     * Pivot tables.
-     *
-     * @var bool
+     * Sheet is locked when sheet is protected, default false.
      */
-    private $pivotTables = false;
+    private ?bool $sheet = null;
 
     /**
-     * Select unlocked cells.
-     *
-     * @var bool
+     * Sorting is locked when sheet is protected, default true.
      */
-    private $selectUnlockedCells = false;
+    private ?bool $sort = null;
 
     /**
      * Hashed password.
-     *
-     * @var string
      */
-    private $password = '';
+    private string $password = '';
 
     /**
      * Algorithm name.
-     *
-     * @var string
      */
-    private $algorithm = '';
+    private string $algorithm = '';
 
     /**
      * Salt value.
-     *
-     * @var string
      */
-    private $salt = '';
+    private string $salt = '';
 
     /**
      * Spin count.
-     *
-     * @var int
      */
-    private $spinCount = 10000;
+    private int $spinCount = 10000;
 
     /**
      * Create a new Protection.
@@ -166,419 +126,225 @@ public function __construct()
 
     /**
      * Is some sort of protection enabled?
-     *
-     * @return bool
-     */
-    public function isProtectionEnabled()
-    {
-        return $this->sheet ||
-            $this->objects ||
-            $this->scenarios ||
-            $this->formatCells ||
-            $this->formatColumns ||
-            $this->formatRows ||
-            $this->insertColumns ||
-            $this->insertRows ||
-            $this->insertHyperlinks ||
-            $this->deleteColumns ||
-            $this->deleteRows ||
-            $this->selectLockedCells ||
-            $this->sort ||
-            $this->autoFilter ||
-            $this->pivotTables ||
-            $this->selectUnlockedCells;
-    }
-
-    /**
-     * Get Sheet.
-     *
-     * @return bool
      */
-    public function getSheet()
+    public function isProtectionEnabled(): bool
+    {
+        return
+            $this->password !== ''
+            || isset($this->sheet)
+            || isset($this->objects)
+            || isset($this->scenarios)
+            || isset($this->formatCells)
+            || isset($this->formatColumns)
+            || isset($this->formatRows)
+            || isset($this->insertColumns)
+            || isset($this->insertRows)
+            || isset($this->insertHyperlinks)
+            || isset($this->deleteColumns)
+            || isset($this->deleteRows)
+            || isset($this->selectLockedCells)
+            || isset($this->sort)
+            || isset($this->autoFilter)
+            || isset($this->pivotTables)
+            || isset($this->selectUnlockedCells);
+    }
+
+    public function getSheet(): ?bool
     {
         return $this->sheet;
     }
 
-    /**
-     * Set Sheet.
-     *
-     * @param bool $pValue
-     *
-     * @return $this
-     */
-    public function setSheet($pValue)
+    public function setSheet(?bool $sheet): self
     {
-        $this->sheet = $pValue;
+        $this->sheet = $sheet;
 
         return $this;
     }
 
-    /**
-     * Get Objects.
-     *
-     * @return bool
-     */
-    public function getObjects()
+    public function getObjects(): ?bool
     {
         return $this->objects;
     }
 
-    /**
-     * Set Objects.
-     *
-     * @param bool $pValue
-     *
-     * @return $this
-     */
-    public function setObjects($pValue)
+    public function setObjects(?bool $objects): self
     {
-        $this->objects = $pValue;
+        $this->objects = $objects;
 
         return $this;
     }
 
-    /**
-     * Get Scenarios.
-     *
-     * @return bool
-     */
-    public function getScenarios()
+    public function getScenarios(): ?bool
     {
         return $this->scenarios;
     }
 
-    /**
-     * Set Scenarios.
-     *
-     * @param bool $pValue
-     *
-     * @return $this
-     */
-    public function setScenarios($pValue)
+    public function setScenarios(?bool $scenarios): self
     {
-        $this->scenarios = $pValue;
+        $this->scenarios = $scenarios;
 
         return $this;
     }
 
-    /**
-     * Get FormatCells.
-     *
-     * @return bool
-     */
-    public function getFormatCells()
+    public function getFormatCells(): ?bool
     {
         return $this->formatCells;
     }
 
-    /**
-     * Set FormatCells.
-     *
-     * @param bool $pValue
-     *
-     * @return $this
-     */
-    public function setFormatCells($pValue)
+    public function setFormatCells(?bool $formatCells): self
     {
-        $this->formatCells = $pValue;
+        $this->formatCells = $formatCells;
 
         return $this;
     }
 
-    /**
-     * Get FormatColumns.
-     *
-     * @return bool
-     */
-    public function getFormatColumns()
+    public function getFormatColumns(): ?bool
     {
         return $this->formatColumns;
     }
 
-    /**
-     * Set FormatColumns.
-     *
-     * @param bool $pValue
-     *
-     * @return $this
-     */
-    public function setFormatColumns($pValue)
+    public function setFormatColumns(?bool $formatColumns): self
     {
-        $this->formatColumns = $pValue;
+        $this->formatColumns = $formatColumns;
 
         return $this;
     }
 
-    /**
-     * Get FormatRows.
-     *
-     * @return bool
-     */
-    public function getFormatRows()
+    public function getFormatRows(): ?bool
     {
         return $this->formatRows;
     }
 
-    /**
-     * Set FormatRows.
-     *
-     * @param bool $pValue
-     *
-     * @return $this
-     */
-    public function setFormatRows($pValue)
+    public function setFormatRows(?bool $formatRows): self
     {
-        $this->formatRows = $pValue;
+        $this->formatRows = $formatRows;
 
         return $this;
     }
 
-    /**
-     * Get InsertColumns.
-     *
-     * @return bool
-     */
-    public function getInsertColumns()
+    public function getInsertColumns(): ?bool
     {
         return $this->insertColumns;
     }
 
-    /**
-     * Set InsertColumns.
-     *
-     * @param bool $pValue
-     *
-     * @return $this
-     */
-    public function setInsertColumns($pValue)
+    public function setInsertColumns(?bool $insertColumns): self
     {
-        $this->insertColumns = $pValue;
+        $this->insertColumns = $insertColumns;
 
         return $this;
     }
 
-    /**
-     * Get InsertRows.
-     *
-     * @return bool
-     */
-    public function getInsertRows()
+    public function getInsertRows(): ?bool
     {
         return $this->insertRows;
     }
 
-    /**
-     * Set InsertRows.
-     *
-     * @param bool $pValue
-     *
-     * @return $this
-     */
-    public function setInsertRows($pValue)
+    public function setInsertRows(?bool $insertRows): self
     {
-        $this->insertRows = $pValue;
+        $this->insertRows = $insertRows;
 
         return $this;
     }
 
-    /**
-     * Get InsertHyperlinks.
-     *
-     * @return bool
-     */
-    public function getInsertHyperlinks()
+    public function getInsertHyperlinks(): ?bool
     {
         return $this->insertHyperlinks;
     }
 
-    /**
-     * Set InsertHyperlinks.
-     *
-     * @param bool $pValue
-     *
-     * @return $this
-     */
-    public function setInsertHyperlinks($pValue)
+    public function setInsertHyperlinks(?bool $insertHyperLinks): self
     {
-        $this->insertHyperlinks = $pValue;
+        $this->insertHyperlinks = $insertHyperLinks;
 
         return $this;
     }
 
-    /**
-     * Get DeleteColumns.
-     *
-     * @return bool
-     */
-    public function getDeleteColumns()
+    public function getDeleteColumns(): ?bool
     {
         return $this->deleteColumns;
     }
 
-    /**
-     * Set DeleteColumns.
-     *
-     * @param bool $pValue
-     *
-     * @return $this
-     */
-    public function setDeleteColumns($pValue)
+    public function setDeleteColumns(?bool $deleteColumns): self
     {
-        $this->deleteColumns = $pValue;
+        $this->deleteColumns = $deleteColumns;
 
         return $this;
     }
 
-    /**
-     * Get DeleteRows.
-     *
-     * @return bool
-     */
-    public function getDeleteRows()
+    public function getDeleteRows(): ?bool
     {
         return $this->deleteRows;
     }
 
-    /**
-     * Set DeleteRows.
-     *
-     * @param bool $pValue
-     *
-     * @return $this
-     */
-    public function setDeleteRows($pValue)
+    public function setDeleteRows(?bool $deleteRows): self
     {
-        $this->deleteRows = $pValue;
+        $this->deleteRows = $deleteRows;
 
         return $this;
     }
 
-    /**
-     * Get SelectLockedCells.
-     *
-     * @return bool
-     */
-    public function getSelectLockedCells()
+    public function getSelectLockedCells(): ?bool
     {
         return $this->selectLockedCells;
     }
 
-    /**
-     * Set SelectLockedCells.
-     *
-     * @param bool $pValue
-     *
-     * @return $this
-     */
-    public function setSelectLockedCells($pValue)
+    public function setSelectLockedCells(?bool $selectLockedCells): self
     {
-        $this->selectLockedCells = $pValue;
+        $this->selectLockedCells = $selectLockedCells;
 
         return $this;
     }
 
-    /**
-     * Get Sort.
-     *
-     * @return bool
-     */
-    public function getSort()
+    public function getSort(): ?bool
     {
         return $this->sort;
     }
 
-    /**
-     * Set Sort.
-     *
-     * @param bool $pValue
-     *
-     * @return $this
-     */
-    public function setSort($pValue)
+    public function setSort(?bool $sort): self
     {
-        $this->sort = $pValue;
+        $this->sort = $sort;
 
         return $this;
     }
 
-    /**
-     * Get AutoFilter.
-     *
-     * @return bool
-     */
-    public function getAutoFilter()
+    public function getAutoFilter(): ?bool
     {
         return $this->autoFilter;
     }
 
-    /**
-     * Set AutoFilter.
-     *
-     * @param bool $pValue
-     *
-     * @return $this
-     */
-    public function setAutoFilter($pValue)
+    public function setAutoFilter(?bool $autoFilter): self
     {
-        $this->autoFilter = $pValue;
+        $this->autoFilter = $autoFilter;
 
         return $this;
     }
 
-    /**
-     * Get PivotTables.
-     *
-     * @return bool
-     */
-    public function getPivotTables()
+    public function getPivotTables(): ?bool
     {
         return $this->pivotTables;
     }
 
-    /**
-     * Set PivotTables.
-     *
-     * @param bool $pValue
-     *
-     * @return $this
-     */
-    public function setPivotTables($pValue)
+    public function setPivotTables(?bool $pivotTables): self
     {
-        $this->pivotTables = $pValue;
+        $this->pivotTables = $pivotTables;
 
         return $this;
     }
 
-    /**
-     * Get SelectUnlockedCells.
-     *
-     * @return bool
-     */
-    public function getSelectUnlockedCells()
+    public function getSelectUnlockedCells(): ?bool
     {
         return $this->selectUnlockedCells;
     }
 
-    /**
-     * Set SelectUnlockedCells.
-     *
-     * @param bool $pValue
-     *
-     * @return $this
-     */
-    public function setSelectUnlockedCells($pValue)
+    public function setSelectUnlockedCells(?bool $selectUnlockedCells): self
     {
-        $this->selectUnlockedCells = $pValue;
+        $this->selectUnlockedCells = $selectUnlockedCells;
 
         return $this;
     }
 
     /**
      * Get hashed password.
-     *
-     * @return string
      */
-    public function getPassword()
+    public function getPassword(): string
     {
         return $this->password;
     }
@@ -586,24 +352,28 @@ public function getPassword()
     /**
      * Set Password.
      *
-     * @param string $pValue
-     * @param bool $pAlreadyHashed If the password has already been hashed, set this to true
+     * @param bool $alreadyHashed If the password has already been hashed, set this to true
      *
      * @return $this
      */
-    public function setPassword($pValue, $pAlreadyHashed = false)
+    public function setPassword(string $password, bool $alreadyHashed = false): static
     {
-        if (!$pAlreadyHashed) {
+        if (!$alreadyHashed) {
             $salt = $this->generateSalt();
             $this->setSalt($salt);
-            $pValue = PasswordHasher::hashPassword($pValue, $this->getAlgorithm(), $this->getSalt(), $this->getSpinCount());
+            $password = PasswordHasher::hashPassword($password, $this->getAlgorithm(), $this->getSalt(), $this->getSpinCount());
         }
 
-        $this->password = $pValue;
+        $this->password = $password;
 
         return $this;
     }
 
+    public function setHashValue(string $password): self
+    {
+        return $this->setPassword($password, true);
+    }
+
     /**
      * Create a pseudorandom string.
      */
@@ -623,25 +393,36 @@ public function getAlgorithm(): string
     /**
      * Set algorithm name.
      */
-    public function setAlgorithm(string $algorithm): void
+    public function setAlgorithm(string $algorithm): self
     {
-        $this->algorithm = $algorithm;
+        return $this->setAlgorithmName($algorithm);
     }
 
     /**
-     * Get salt value.
+     * Set algorithm name.
      */
+    public function setAlgorithmName(string $algorithm): self
+    {
+        $this->algorithm = $algorithm;
+
+        return $this;
+    }
+
     public function getSalt(): string
     {
         return $this->salt;
     }
 
-    /**
-     * Set salt value.
-     */
-    public function setSalt(string $salt): void
+    public function setSalt(string $salt): self
+    {
+        return $this->setSaltValue($salt);
+    }
+
+    public function setSaltValue(string $salt): self
     {
         $this->salt = $salt;
+
+        return $this;
     }
 
     /**
@@ -655,9 +436,11 @@ public function getSpinCount(): int
     /**
      * Set spin count.
      */
-    public function setSpinCount(int $spinCount): void
+    public function setSpinCount(int $spinCount): self
     {
         $this->spinCount = $spinCount;
+
+        return $this;
     }
 
     /**
@@ -665,7 +448,7 @@ public function setSpinCount(int $spinCount): void
      */
     public function verify(string $password): bool
     {
-        if (!$this->isProtectionEnabled()) {
+        if ($this->password === '') {
             return true;
         }
 
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Row.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Row.php
index 01053c397a..49d13da52a 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Row.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Row.php
@@ -4,27 +4,17 @@
 
 class Row
 {
-    /**
-     * \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet.
-     *
-     * @var Worksheet
-     */
-    private $worksheet;
+    private Worksheet $worksheet;
 
     /**
      * Row index.
-     *
-     * @var int
      */
-    private $rowIndex = 0;
+    private int $rowIndex;
 
     /**
      * Create a new row.
-     *
-     * @param Worksheet $worksheet
-     * @param int $rowIndex
      */
-    public function __construct(?Worksheet $worksheet = null, $rowIndex = 1)
+    public function __construct(Worksheet $worksheet, int $rowIndex = 1)
     {
         // Set parent and row index
         $this->worksheet = $worksheet;
@@ -36,8 +26,7 @@ public function __construct(?Worksheet $worksheet = null, $rowIndex = 1)
      */
     public function __destruct()
     {
-        // @phpstan-ignore-next-line
-        $this->worksheet = null;
+        unset($this->worksheet);
     }
 
     /**
@@ -52,13 +41,63 @@ public function getRowIndex(): int
      * Get cell iterator.
      *
      * @param string $startColumn The column address at which to start iterating
-     * @param string $endColumn Optionally, the column address at which to stop iterating
+     * @param ?string $endColumn Optionally, the column address at which to stop iterating
+     */
+    public function getCellIterator(string $startColumn = 'A', ?string $endColumn = null, bool $iterateOnlyExistingCells = false): RowCellIterator
+    {
+        return new RowCellIterator($this->worksheet, $this->rowIndex, $startColumn, $endColumn, $iterateOnlyExistingCells);
+    }
+
+    /**
+     * Get column iterator. Synonym for getCellIterator().
+     *
+     * @param string $startColumn The column address at which to start iterating
+     * @param ?string $endColumn Optionally, the column address at which to stop iterating
+     */
+    public function getColumnIterator(string $startColumn = 'A', ?string $endColumn = null, bool $iterateOnlyExistingCells = false): RowCellIterator
+    {
+        return $this->getCellIterator($startColumn, $endColumn, $iterateOnlyExistingCells);
+    }
+
+    /**
+     * Returns a boolean true if the row contains no cells. By default, this means that no cell records exist in the
+     *         collection for this row. false will be returned otherwise.
+     *     This rule can be modified by passing a $definitionOfEmptyFlags value:
+     *          1 - CellIterator::TREAT_NULL_VALUE_AS_EMPTY_CELL If the only cells in the collection are null value
+     *                  cells, then the row will be considered empty.
+     *          2 - CellIterator::TREAT_EMPTY_STRING_AS_EMPTY_CELL If the only cells in the collection are empty
+     *                  string value cells, then the row will be considered empty.
+     *          3 - CellIterator::TREAT_NULL_VALUE_AS_EMPTY_CELL | CellIterator::TREAT_EMPTY_STRING_AS_EMPTY_CELL
+     *                  If the only cells in the collection are null value or empty string value cells, then the row
+     *                  will be considered empty.
      *
-     * @return RowCellIterator
+     * @param int $definitionOfEmptyFlags
+     *              Possible Flag Values are:
+     *                  CellIterator::TREAT_NULL_VALUE_AS_EMPTY_CELL
+     *                  CellIterator::TREAT_EMPTY_STRING_AS_EMPTY_CELL
+     * @param string $startColumn The column address at which to start checking if cells are empty
+     * @param ?string $endColumn Optionally, the column address at which to stop checking if cells are empty
      */
-    public function getCellIterator($startColumn = 'A', $endColumn = null)
+    public function isEmpty(int $definitionOfEmptyFlags = 0, string $startColumn = 'A', ?string $endColumn = null): bool
     {
-        return new RowCellIterator($this->worksheet, $this->rowIndex, $startColumn, $endColumn);
+        $nullValueCellIsEmpty = (bool) ($definitionOfEmptyFlags & CellIterator::TREAT_NULL_VALUE_AS_EMPTY_CELL);
+        $emptyStringCellIsEmpty = (bool) ($definitionOfEmptyFlags & CellIterator::TREAT_EMPTY_STRING_AS_EMPTY_CELL);
+
+        $cellIterator = $this->getCellIterator($startColumn, $endColumn);
+        $cellIterator->setIterateOnlyExistingCells(true);
+        foreach ($cellIterator as $cell) {
+            $value = $cell->getValue();
+            if ($value === null && $nullValueCellIsEmpty === true) {
+                continue;
+            }
+            if ($value === '' && $emptyStringCellIsEmpty === true) {
+                continue;
+            }
+
+            return false;
+        }
+
+        return true;
     }
 
     /**
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/RowCellIterator.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/RowCellIterator.php
index 6a96a826a5..4d4901c820 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/RowCellIterator.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/RowCellIterator.php
@@ -6,35 +6,30 @@
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
 
+/**
+ * @extends CellIterator<string>
+ */
 class RowCellIterator extends CellIterator
 {
     /**
      * Current iterator position.
-     *
-     * @var int
      */
-    private $currentColumnIndex;
+    private int $currentColumnIndex;
 
     /**
      * Row index.
-     *
-     * @var int
      */
-    private $rowIndex = 1;
+    private int $rowIndex;
 
     /**
      * Start position.
-     *
-     * @var int
      */
-    private $startColumnIndex = 1;
+    private int $startColumnIndex = 1;
 
     /**
      * End position.
-     *
-     * @var int
      */
-    private $endColumnIndex = 1;
+    private int $endColumnIndex = 1;
 
     /**
      * Create a new column iterator.
@@ -42,15 +37,17 @@ class RowCellIterator extends CellIterator
      * @param Worksheet $worksheet The worksheet to iterate over
      * @param int $rowIndex The row that we want to iterate
      * @param string $startColumn The column address at which to start iterating
-     * @param string $endColumn Optionally, the column address at which to stop iterating
+     * @param ?string $endColumn Optionally, the column address at which to stop iterating
      */
-    public function __construct(?Worksheet $worksheet = null, $rowIndex = 1, $startColumn = 'A', $endColumn = null)
+    public function __construct(Worksheet $worksheet, int $rowIndex = 1, string $startColumn = 'A', ?string $endColumn = null, bool $iterateOnlyExistingCells = false)
     {
         // Set subject and row index
         $this->worksheet = $worksheet;
+        $this->cellCollection = $worksheet->getCellCollection();
         $this->rowIndex = $rowIndex;
         $this->resetEnd($endColumn);
         $this->resetStart($startColumn);
+        $this->setIterateOnlyExistingCells($iterateOnlyExistingCells);
     }
 
     /**
@@ -60,7 +57,7 @@ public function __construct(?Worksheet $worksheet = null, $rowIndex = 1, $startC
      *
      * @return $this
      */
-    public function resetStart(string $startColumn = 'A')
+    public function resetStart(string $startColumn = 'A'): static
     {
         $this->startColumnIndex = Coordinate::columnIndexFromString($startColumn);
         $this->adjustForExistingOnlyRange();
@@ -72,11 +69,11 @@ public function resetStart(string $startColumn = 'A')
     /**
      * (Re)Set the end column.
      *
-     * @param string $endColumn The column address at which to stop iterating
+     * @param ?string $endColumn The column address at which to stop iterating
      *
      * @return $this
      */
-    public function resetEnd($endColumn = null)
+    public function resetEnd(?string $endColumn = null): static
     {
         $endColumn = $endColumn ?: $this->worksheet->getHighestColumn();
         $this->endColumnIndex = Coordinate::columnIndexFromString($endColumn);
@@ -92,17 +89,16 @@ public function resetEnd($endColumn = null)
      *
      * @return $this
      */
-    public function seek(string $column = 'A')
+    public function seek(string $column = 'A'): static
     {
-        $columnx = $column;
-        $column = Coordinate::columnIndexFromString($column);
-        if ($this->onlyExistingCells && !($this->worksheet->cellExistsByColumnAndRow($column, $this->rowIndex))) {
+        $columnId = Coordinate::columnIndexFromString($column);
+        if ($this->onlyExistingCells && !($this->cellCollection->has($column . $this->rowIndex))) {
             throw new PhpSpreadsheetException('In "IterateOnlyExistingCells" mode and Cell does not exist');
         }
-        if (($column < $this->startColumnIndex) || ($column > $this->endColumnIndex)) {
-            throw new PhpSpreadsheetException("Column $columnx is out of range ({$this->startColumnIndex} - {$this->endColumnIndex})");
+        if (($columnId < $this->startColumnIndex) || ($columnId > $this->endColumnIndex)) {
+            throw new PhpSpreadsheetException("Column $column is out of range ({$this->startColumnIndex} - {$this->endColumnIndex})");
         }
-        $this->currentColumnIndex = $column;
+        $this->currentColumnIndex = $columnId;
 
         return $this;
     }
@@ -120,7 +116,15 @@ public function rewind(): void
      */
     public function current(): ?Cell
     {
-        return $this->worksheet->getCellByColumnAndRow($this->currentColumnIndex, $this->rowIndex);
+        $cellAddress = Coordinate::stringFromColumnIndex($this->currentColumnIndex) . $this->rowIndex;
+
+        return $this->cellCollection->has($cellAddress)
+            ? $this->cellCollection->get($cellAddress)
+            : (
+                $this->ifNotExists === self::IF_NOT_EXISTS_CREATE_NEW
+                ? $this->worksheet->createNewCell($cellAddress)
+                : null
+            );
     }
 
     /**
@@ -138,7 +142,7 @@ public function next(): void
     {
         do {
             ++$this->currentColumnIndex;
-        } while (($this->onlyExistingCells) && (!$this->worksheet->cellExistsByColumnAndRow($this->currentColumnIndex, $this->rowIndex)) && ($this->currentColumnIndex <= $this->endColumnIndex));
+        } while (($this->onlyExistingCells) && (!$this->cellCollection->has(Coordinate::stringFromColumnIndex($this->currentColumnIndex) . $this->rowIndex)) && ($this->currentColumnIndex <= $this->endColumnIndex));
     }
 
     /**
@@ -148,15 +152,13 @@ public function prev(): void
     {
         do {
             --$this->currentColumnIndex;
-        } while (($this->onlyExistingCells) && (!$this->worksheet->cellExistsByColumnAndRow($this->currentColumnIndex, $this->rowIndex)) && ($this->currentColumnIndex >= $this->startColumnIndex));
+        } while (($this->onlyExistingCells) && (!$this->cellCollection->has(Coordinate::stringFromColumnIndex($this->currentColumnIndex) . $this->rowIndex)) && ($this->currentColumnIndex >= $this->startColumnIndex));
     }
 
     /**
      * Indicate if more columns exist in the worksheet range of columns that we're iterating.
-     *
-     * @return bool
      */
-    public function valid()
+    public function valid(): bool
     {
         return $this->currentColumnIndex <= $this->endColumnIndex && $this->currentColumnIndex >= $this->startColumnIndex;
     }
@@ -175,10 +177,10 @@ public function getCurrentColumnIndex(): int
     protected function adjustForExistingOnlyRange(): void
     {
         if ($this->onlyExistingCells) {
-            while ((!$this->worksheet->cellExistsByColumnAndRow($this->startColumnIndex, $this->rowIndex)) && ($this->startColumnIndex <= $this->endColumnIndex)) {
+            while ((!$this->cellCollection->has(Coordinate::stringFromColumnIndex($this->startColumnIndex) . $this->rowIndex)) && ($this->startColumnIndex <= $this->endColumnIndex)) {
                 ++$this->startColumnIndex;
             }
-            while ((!$this->worksheet->cellExistsByColumnAndRow($this->endColumnIndex, $this->rowIndex)) && ($this->endColumnIndex >= $this->startColumnIndex)) {
+            while ((!$this->cellCollection->has(Coordinate::stringFromColumnIndex($this->endColumnIndex) . $this->rowIndex)) && ($this->endColumnIndex >= $this->startColumnIndex)) {
                 --$this->endColumnIndex;
             }
         }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/RowDimension.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/RowDimension.php
index d86dd80f8b..e94a63b303 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/RowDimension.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/RowDimension.php
@@ -2,40 +2,36 @@
 
 namespace PhpOffice\PhpSpreadsheet\Worksheet;
 
+use PhpOffice\PhpSpreadsheet\Helper\Dimension as CssDimension;
+
 class RowDimension extends Dimension
 {
     /**
      * Row index.
-     *
-     * @var int
      */
-    private $rowIndex;
+    private ?int $rowIndex;
 
     /**
      * Row height (in pt).
      *
      * When this is set to a negative value, the row height should be ignored by IWriter
-     *
-     * @var float
      */
-    private $height = -1;
+    private float $height = -1;
 
     /**
      * ZeroHeight for Row?
-     *
-     * @var bool
      */
-    private $zeroHeight = false;
+    private bool $zeroHeight = false;
 
     /**
      * Create a new RowDimension.
      *
-     * @param int $pIndex Numeric row index
+     * @param ?int $index Numeric row index
      */
-    public function __construct($pIndex = 0)
+    public function __construct(?int $index = 0)
     {
         // Initialise values
-        $this->rowIndex = $pIndex;
+        $this->rowIndex = $index;
 
         // set dimension as unformatted by default
         parent::__construct(null);
@@ -44,7 +40,7 @@ public function __construct($pIndex = 0)
     /**
      * Get Row Index.
      */
-    public function getRowIndex(): int
+    public function getRowIndex(): ?int
     {
         return $this->rowIndex;
     }
@@ -54,7 +50,7 @@ public function getRowIndex(): int
      *
      * @return $this
      */
-    public function setRowIndex(int $index)
+    public function setRowIndex(int $index): static
     {
         $this->rowIndex = $index;
 
@@ -63,24 +59,31 @@ public function setRowIndex(int $index)
 
     /**
      * Get Row Height.
-     *
-     * @return float
+     * By default, this will be in points; but this method also accepts an optional unit of measure
+     *    argument, and will convert the value from points to the specified UoM.
+     *    A value of -1 tells Excel to display this column in its default height.
      */
-    public function getRowHeight()
+    public function getRowHeight(?string $unitOfMeasure = null): float
     {
-        return $this->height;
+        return ($unitOfMeasure === null || $this->height < 0)
+            ? $this->height
+            : (new CssDimension($this->height . CssDimension::UOM_POINTS))->toUnit($unitOfMeasure);
     }
 
     /**
      * Set Row Height.
      *
-     * @param float $height
+     * @param float $height in points. A value of -1 tells Excel to display this column in its default height.
+     * By default, this will be the passed argument value; but this method also accepts an optional unit of measure
+     *    argument, and will convert the passed argument value to points from the specified UoM
      *
      * @return $this
      */
-    public function setRowHeight($height)
+    public function setRowHeight(float $height, ?string $unitOfMeasure = null): static
     {
-        $this->height = $height;
+        $this->height = ($unitOfMeasure === null || $height < 0)
+            ? $height
+            : (new CssDimension("{$height}{$unitOfMeasure}"))->height();
 
         return $this;
     }
@@ -98,9 +101,9 @@ public function getZeroHeight(): bool
      *
      * @return $this
      */
-    public function setZeroHeight(bool $pValue)
+    public function setZeroHeight(bool $zeroHeight): static
     {
-        $this->zeroHeight = $pValue;
+        $this->zeroHeight = $zeroHeight;
 
         return $this;
     }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/RowIterator.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/RowIterator.php
index 7d49f1acde..9d42ee9813 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/RowIterator.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/RowIterator.php
@@ -2,47 +2,42 @@
 
 namespace PhpOffice\PhpSpreadsheet\Worksheet;
 
-use Iterator;
+use Iterator as NativeIterator;
 use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
 
-class RowIterator implements Iterator
+/**
+ * @implements NativeIterator<int, Row>
+ */
+class RowIterator implements NativeIterator
 {
     /**
      * Worksheet to iterate.
-     *
-     * @var Worksheet
      */
-    private $subject;
+    private Worksheet $subject;
 
     /**
      * Current iterator position.
-     *
-     * @var int
      */
-    private $position = 1;
+    private int $position = 1;
 
     /**
      * Start position.
-     *
-     * @var int
      */
-    private $startRow = 1;
+    private int $startRow = 1;
 
     /**
      * End position.
-     *
-     * @var int
      */
-    private $endRow = 1;
+    private int $endRow = 1;
 
     /**
      * Create a new row iterator.
      *
      * @param Worksheet $subject The worksheet to iterate over
      * @param int $startRow The row number at which to start iterating
-     * @param int $endRow Optionally, the row number at which to stop iterating
+     * @param ?int $endRow Optionally, the row number at which to stop iterating
      */
-    public function __construct(Worksheet $subject, $startRow = 1, $endRow = null)
+    public function __construct(Worksheet $subject, int $startRow = 1, ?int $endRow = null)
     {
         // Set subject
         $this->subject = $subject;
@@ -50,6 +45,11 @@ public function __construct(Worksheet $subject, $startRow = 1, $endRow = null)
         $this->resetStart($startRow);
     }
 
+    public function __destruct()
+    {
+        unset($this->subject);
+    }
+
     /**
      * (Re)Set the start row and the current row pointer.
      *
@@ -57,7 +57,7 @@ public function __construct(Worksheet $subject, $startRow = 1, $endRow = null)
      *
      * @return $this
      */
-    public function resetStart(int $startRow = 1)
+    public function resetStart(int $startRow = 1): static
     {
         if ($startRow > $this->subject->getHighestRow()) {
             throw new PhpSpreadsheetException(
@@ -77,11 +77,11 @@ public function resetStart(int $startRow = 1)
     /**
      * (Re)Set the end row.
      *
-     * @param int $endRow The row number at which to stop iterating
+     * @param ?int $endRow The row number at which to stop iterating
      *
      * @return $this
      */
-    public function resetEnd($endRow = null)
+    public function resetEnd(?int $endRow = null): static
     {
         $this->endRow = $endRow ?: $this->subject->getHighestRow();
 
@@ -95,7 +95,7 @@ public function resetEnd($endRow = null)
      *
      * @return $this
      */
-    public function seek(int $row = 1)
+    public function seek(int $row = 1): static
     {
         if (($row < $this->startRow) || ($row > $this->endRow)) {
             throw new PhpSpreadsheetException("Row $row is out of range ({$this->startRow} - {$this->endRow})");
@@ -115,10 +115,8 @@ public function rewind(): void
 
     /**
      * Return the current row in this worksheet.
-     *
-     * @return Row
      */
-    public function current()
+    public function current(): Row
     {
         return new Row($this->subject, $this->position);
     }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/SheetView.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/SheetView.php
index 2f7d3812be..dca2bf5cc5 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/SheetView.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/SheetView.php
@@ -11,7 +11,7 @@ class SheetView
     const SHEETVIEW_PAGE_LAYOUT = 'pageLayout';
     const SHEETVIEW_PAGE_BREAK_PREVIEW = 'pageBreakPreview';
 
-    private static $sheetViewTypes = [
+    private const SHEET_VIEW_TYPES = [
         self::SHEETVIEW_NORMAL,
         self::SHEETVIEW_PAGE_LAYOUT,
         self::SHEETVIEW_PAGE_BREAK_PREVIEW,
@@ -21,38 +21,44 @@ class SheetView
      * ZoomScale.
      *
      * Valid values range from 10 to 400.
-     *
-     * @var int
      */
-    private $zoomScale = 100;
+    private ?int $zoomScale = 100;
 
     /**
      * ZoomScaleNormal.
      *
      * Valid values range from 10 to 400.
+     */
+    private ?int $zoomScaleNormal = 100;
+
+    /**
+     * ZoomScalePageLayoutView.
      *
-     * @var int
+     * Valid values range from 10 to 400.
      */
-    private $zoomScaleNormal = 100;
+    private int $zoomScalePageLayoutView = 100;
+
+    /**
+     * ZoomScaleSheetLayoutView.
+     *
+     * Valid values range from 10 to 400.
+     */
+    private int $zoomScaleSheetLayoutView = 100;
 
     /**
      * ShowZeros.
      *
      * If true, "null" values from a calculation will be shown as "0". This is the default Excel behaviour and can be changed
      * with the advanced worksheet option "Show a zero in cells that have zero value"
-     *
-     * @var bool
      */
-    private $showZeros = true;
+    private bool $showZeros = true;
 
     /**
      * View.
      *
      * Valid values range from 10 to 400.
-     *
-     * @var string
      */
-    private $sheetviewType = self::SHEETVIEW_NORMAL;
+    private string $sheetviewType = self::SHEETVIEW_NORMAL;
 
     /**
      * Create a new SheetView.
@@ -63,10 +69,8 @@ public function __construct()
 
     /**
      * Get ZoomScale.
-     *
-     * @return int
      */
-    public function getZoomScale()
+    public function getZoomScale(): ?int
     {
         return $this->zoomScale;
     }
@@ -75,16 +79,14 @@ public function getZoomScale()
      * Set ZoomScale.
      * Valid values range from 10 to 400.
      *
-     * @param int $pValue
-     *
      * @return $this
      */
-    public function setZoomScale($pValue)
+    public function setZoomScale(?int $zoomScale): static
     {
         // Microsoft Office Excel 2007 only allows setting a scale between 10 and 400 via the user interface,
         // but it is apparently still able to handle any scale >= 1
-        if (($pValue >= 1) || $pValue === null) {
-            $this->zoomScale = $pValue;
+        if ($zoomScale === null || $zoomScale >= 1) {
+            $this->zoomScale = $zoomScale;
         } else {
             throw new PhpSpreadsheetException('Scale must be greater than or equal to 1.');
         }
@@ -94,10 +96,8 @@ public function setZoomScale($pValue)
 
     /**
      * Get ZoomScaleNormal.
-     *
-     * @return int
      */
-    public function getZoomScaleNormal()
+    public function getZoomScaleNormal(): ?int
     {
         return $this->zoomScaleNormal;
     }
@@ -106,14 +106,44 @@ public function getZoomScaleNormal()
      * Set ZoomScale.
      * Valid values range from 10 to 400.
      *
-     * @param int $pValue
-     *
      * @return $this
      */
-    public function setZoomScaleNormal($pValue)
+    public function setZoomScaleNormal(?int $zoomScaleNormal): static
     {
-        if (($pValue >= 1) || $pValue === null) {
-            $this->zoomScaleNormal = $pValue;
+        if ($zoomScaleNormal === null || $zoomScaleNormal >= 1) {
+            $this->zoomScaleNormal = $zoomScaleNormal;
+        } else {
+            throw new PhpSpreadsheetException('Scale must be greater than or equal to 1.');
+        }
+
+        return $this;
+    }
+
+    public function getZoomScalePageLayoutView(): int
+    {
+        return $this->zoomScalePageLayoutView;
+    }
+
+    public function setZoomScalePageLayoutView(int $zoomScalePageLayoutView): static
+    {
+        if ($zoomScalePageLayoutView >= 1) {
+            $this->zoomScalePageLayoutView = $zoomScalePageLayoutView;
+        } else {
+            throw new PhpSpreadsheetException('Scale must be greater than or equal to 1.');
+        }
+
+        return $this;
+    }
+
+    public function getZoomScaleSheetLayoutView(): int
+    {
+        return $this->zoomScaleSheetLayoutView;
+    }
+
+    public function setZoomScaleSheetLayoutView(int $zoomScaleSheetLayoutView): static
+    {
+        if ($zoomScaleSheetLayoutView >= 1) {
+            $this->zoomScaleSheetLayoutView = $zoomScaleSheetLayoutView;
         } else {
             throw new PhpSpreadsheetException('Scale must be greater than or equal to 1.');
         }
@@ -123,28 +153,21 @@ public function setZoomScaleNormal($pValue)
 
     /**
      * Set ShowZeroes setting.
-     *
-     * @param bool $pValue
      */
-    public function setShowZeros($pValue): void
+    public function setShowZeros(bool $showZeros): void
     {
-        $this->showZeros = $pValue;
+        $this->showZeros = $showZeros;
     }
 
-    /**
-     * @return bool
-     */
-    public function getShowZeros()
+    public function getShowZeros(): bool
     {
         return $this->showZeros;
     }
 
     /**
      * Get View.
-     *
-     * @return string
      */
-    public function getView()
+    public function getView(): string
     {
         return $this->sheetviewType;
     }
@@ -157,37 +180,20 @@ public function getView()
      *        'pageLayout'        self::SHEETVIEW_PAGE_LAYOUT
      *        'pageBreakPreview'  self::SHEETVIEW_PAGE_BREAK_PREVIEW
      *
-     * @param string $pValue
-     *
      * @return $this
      */
-    public function setView($pValue)
+    public function setView(?string $sheetViewType): static
     {
         // MS Excel 2007 allows setting the view to 'normal', 'pageLayout' or 'pageBreakPreview' via the user interface
-        if ($pValue === null) {
-            $pValue = self::SHEETVIEW_NORMAL;
+        if ($sheetViewType === null) {
+            $sheetViewType = self::SHEETVIEW_NORMAL;
         }
-        if (in_array($pValue, self::$sheetViewTypes)) {
-            $this->sheetviewType = $pValue;
+        if (in_array($sheetViewType, self::SHEET_VIEW_TYPES)) {
+            $this->sheetviewType = $sheetViewType;
         } else {
             throw new PhpSpreadsheetException('Invalid sheetview layout type.');
         }
 
         return $this;
     }
-
-    /**
-     * Implement PHP __clone to create a deep clone, not just a shallow copy.
-     */
-    public function __clone()
-    {
-        $vars = get_object_vars($this);
-        foreach ($vars as $key => $value) {
-            if (is_object($value)) {
-                $this->$key = clone $value;
-            } else {
-                $this->$key = $value;
-            }
-        }
-    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Table.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Table.php
new file mode 100644
index 0000000000..234014a0ff
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Table.php
@@ -0,0 +1,579 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Worksheet;
+
+use PhpOffice\PhpSpreadsheet\Cell\AddressRange;
+use PhpOffice\PhpSpreadsheet\Cell\CellAddress;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Cell\DataType;
+use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\Table\TableStyle;
+use Stringable;
+
+class Table implements Stringable
+{
+    /**
+     * Table Name.
+     */
+    private string $name;
+
+    /**
+     * Show Header Row.
+     */
+    private bool $showHeaderRow = true;
+
+    /**
+     * Show Totals Row.
+     */
+    private bool $showTotalsRow = false;
+
+    /**
+     * Table Range.
+     */
+    private string $range = '';
+
+    /**
+     * Table Worksheet.
+     */
+    private ?Worksheet $workSheet = null;
+
+    /**
+     * Table allow filter.
+     */
+    private bool $allowFilter = true;
+
+    /**
+     * Table Column.
+     *
+     * @var Table\Column[]
+     */
+    private array $columns = [];
+
+    /**
+     * Table Style.
+     */
+    private TableStyle $style;
+
+    /**
+     * Table AutoFilter.
+     */
+    private AutoFilter $autoFilter;
+
+    /**
+     * Create a new Table.
+     *
+     * @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' is permitted
+     *              or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
+     *              or an AddressRange object.
+     * @param string $name (e.g. Table1)
+     */
+    public function __construct(AddressRange|string|array $range = '', string $name = '')
+    {
+        $this->style = new TableStyle();
+        $this->autoFilter = new AutoFilter($range);
+        $this->setRange($range);
+        $this->setName($name);
+    }
+
+    /**
+     * Code to execute when this table is unset().
+     */
+    public function __destruct()
+    {
+        $this->workSheet = null;
+    }
+
+    /**
+     * Get Table name.
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * Set Table name.
+     *
+     * @throws PhpSpreadsheetException
+     */
+    public function setName(string $name): self
+    {
+        $name = trim($name);
+
+        if (!empty($name)) {
+            if (strlen($name) === 1 && in_array($name, ['C', 'c', 'R', 'r'])) {
+                throw new PhpSpreadsheetException('The table name is invalid');
+            }
+            if (StringHelper::countCharacters($name) > 255) {
+                throw new PhpSpreadsheetException('The table name cannot be longer than 255 characters');
+            }
+            // Check for A1 or R1C1 cell reference notation
+            if (
+                preg_match(Coordinate::A1_COORDINATE_REGEX, $name)
+                || preg_match('/^R\[?\-?[0-9]*\]?C\[?\-?[0-9]*\]?$/i', $name)
+            ) {
+                throw new PhpSpreadsheetException('The table name can\'t be the same as a cell reference');
+            }
+            if (!preg_match('/^[\p{L}_\\\\]/iu', $name)) {
+                throw new PhpSpreadsheetException('The table name must begin a name with a letter, an underscore character (_), or a backslash (\)');
+            }
+            if (!preg_match('/^[\p{L}_\\\\][\p{L}\p{M}0-9\._]+$/iu', $name)) {
+                throw new PhpSpreadsheetException('The table name contains invalid characters');
+            }
+
+            $this->checkForDuplicateTableNames($name, $this->workSheet);
+            $this->updateStructuredReferences($name);
+        }
+
+        $this->name = $name;
+
+        return $this;
+    }
+
+    /**
+     * @throws PhpSpreadsheetException
+     */
+    private function checkForDuplicateTableNames(string $name, ?Worksheet $worksheet): void
+    {
+        // Remember that table names are case-insensitive
+        $tableName = StringHelper::strToLower($name);
+
+        if ($worksheet !== null && StringHelper::strToLower($this->name) !== $name) {
+            $spreadsheet = $worksheet->getParentOrThrow();
+
+            foreach ($spreadsheet->getWorksheetIterator() as $sheet) {
+                foreach ($sheet->getTableCollection() as $table) {
+                    if (StringHelper::strToLower($table->getName()) === $tableName && $table != $this) {
+                        throw new PhpSpreadsheetException("Spreadsheet already contains a table named '{$this->name}'");
+                    }
+                }
+            }
+        }
+    }
+
+    private function updateStructuredReferences(string $name): void
+    {
+        if (!$this->workSheet || !$this->name) {
+            return;
+        }
+
+        // Remember that table names are case-insensitive
+        if (StringHelper::strToLower($this->name) !== StringHelper::strToLower($name)) {
+            // We need to check all formula cells that might contain fully-qualified Structured References
+            //    that refer to this table, and update those formulae to reference the new table name
+            $spreadsheet = $this->workSheet->getParentOrThrow();
+            foreach ($spreadsheet->getWorksheetIterator() as $sheet) {
+                $this->updateStructuredReferencesInCells($sheet, $name);
+            }
+            $this->updateStructuredReferencesInNamedFormulae($spreadsheet, $name);
+        }
+    }
+
+    private function updateStructuredReferencesInCells(Worksheet $worksheet, string $newName): void
+    {
+        $pattern = '/' . preg_quote($this->name, '/') . '\[/mui';
+
+        foreach ($worksheet->getCoordinates(false) as $coordinate) {
+            $cell = $worksheet->getCell($coordinate);
+            if ($cell->getDataType() === DataType::TYPE_FORMULA) {
+                $formula = $cell->getValueString();
+                if (preg_match($pattern, $formula) === 1) {
+                    $formula = preg_replace($pattern, "{$newName}[", $formula);
+                    $cell->setValueExplicit($formula, DataType::TYPE_FORMULA);
+                }
+            }
+        }
+    }
+
+    private function updateStructuredReferencesInNamedFormulae(Spreadsheet $spreadsheet, string $newName): void
+    {
+        $pattern = '/' . preg_quote($this->name, '/') . '\[/mui';
+
+        foreach ($spreadsheet->getNamedFormulae() as $namedFormula) {
+            $formula = $namedFormula->getValue();
+            if (preg_match($pattern, $formula) === 1) {
+                $formula = preg_replace($pattern, "{$newName}[", $formula) ?? '';
+                $namedFormula->setValue($formula);
+            }
+        }
+    }
+
+    /**
+     * Get show Header Row.
+     */
+    public function getShowHeaderRow(): bool
+    {
+        return $this->showHeaderRow;
+    }
+
+    /**
+     * Set show Header Row.
+     */
+    public function setShowHeaderRow(bool $showHeaderRow): self
+    {
+        $this->showHeaderRow = $showHeaderRow;
+
+        return $this;
+    }
+
+    /**
+     * Get show Totals Row.
+     */
+    public function getShowTotalsRow(): bool
+    {
+        return $this->showTotalsRow;
+    }
+
+    /**
+     * Set show Totals Row.
+     */
+    public function setShowTotalsRow(bool $showTotalsRow): self
+    {
+        $this->showTotalsRow = $showTotalsRow;
+
+        return $this;
+    }
+
+    /**
+     * Get allow filter.
+     * If false, autofiltering is disabled for the table, if true it is enabled.
+     */
+    public function getAllowFilter(): bool
+    {
+        return $this->allowFilter;
+    }
+
+    /**
+     * Set show Autofiltering.
+     * Disabling autofiltering has the same effect as hiding the filter button on all the columns in the table.
+     */
+    public function setAllowFilter(bool $allowFilter): self
+    {
+        $this->allowFilter = $allowFilter;
+
+        return $this;
+    }
+
+    /**
+     * Get Table Range.
+     */
+    public function getRange(): string
+    {
+        return $this->range;
+    }
+
+    /**
+     * Set Table 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' is permitted
+     *              or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
+     *              or an AddressRange object.
+     */
+    public function setRange(AddressRange|string|array $range = ''): self
+    {
+        // extract coordinate
+        if ($range !== '') {
+            [, $range] = Worksheet::extractSheetTitle(Validations::validateCellRange($range), true);
+        }
+        if (empty($range)) {
+            //    Discard all column rules
+            $this->columns = [];
+            $this->range = '';
+
+            return $this;
+        }
+
+        if (!str_contains($range, ':')) {
+            throw new PhpSpreadsheetException('Table must be set on a range of cells.');
+        }
+
+        [$width, $height] = Coordinate::rangeDimension($range);
+        if ($width < 1 || $height < 1) {
+            throw new PhpSpreadsheetException('The table range must be at least 1 column and row');
+        }
+
+        $this->range = $range;
+        $this->autoFilter->setRange($range);
+
+        //    Discard any column rules that are no longer valid within this range
+        [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($this->range);
+        foreach ($this->columns as $key => $value) {
+            $colIndex = Coordinate::columnIndexFromString($key);
+            if (($rangeStart[0] > $colIndex) || ($rangeEnd[0] < $colIndex)) {
+                unset($this->columns[$key]);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set Table Cell Range to max row.
+     */
+    public function setRangeToMaxRow(): self
+    {
+        if ($this->workSheet !== null) {
+            $thisrange = $this->range;
+            $range = (string) preg_replace('/\\d+$/', (string) $this->workSheet->getHighestRow(), $thisrange);
+            if ($range !== $thisrange) {
+                $this->setRange($range);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get Table's Worksheet.
+     */
+    public function getWorksheet(): ?Worksheet
+    {
+        return $this->workSheet;
+    }
+
+    /**
+     * Set Table's Worksheet.
+     */
+    public function setWorksheet(?Worksheet $worksheet = null): self
+    {
+        if ($this->name !== '' && $worksheet !== null) {
+            $spreadsheet = $worksheet->getParentOrThrow();
+            $tableName = StringHelper::strToUpper($this->name);
+
+            foreach ($spreadsheet->getWorksheetIterator() as $sheet) {
+                foreach ($sheet->getTableCollection() as $table) {
+                    if (StringHelper::strToUpper($table->getName()) === $tableName) {
+                        throw new PhpSpreadsheetException("Workbook already contains a table named '{$this->name}'");
+                    }
+                }
+            }
+        }
+
+        $this->workSheet = $worksheet;
+        $this->autoFilter->setParent($worksheet);
+
+        return $this;
+    }
+
+    /**
+     * Get all Table Columns.
+     *
+     * @return Table\Column[]
+     */
+    public function getColumns(): array
+    {
+        return $this->columns;
+    }
+
+    /**
+     * Validate that the specified column is in the Table range.
+     *
+     * @param string $column Column name (e.g. A)
+     *
+     * @return int The column offset within the table range
+     */
+    public function isColumnInRange(string $column): int
+    {
+        if (empty($this->range)) {
+            throw new PhpSpreadsheetException('No table range is defined.');
+        }
+
+        $columnIndex = Coordinate::columnIndexFromString($column);
+        [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($this->range);
+        if (($rangeStart[0] > $columnIndex) || ($rangeEnd[0] < $columnIndex)) {
+            throw new PhpSpreadsheetException('Column is outside of current table range.');
+        }
+
+        return $columnIndex - $rangeStart[0];
+    }
+
+    /**
+     * Get a specified Table Column Offset within the defined Table range.
+     *
+     * @param string $column Column name (e.g. A)
+     *
+     * @return int The offset of the specified column within the table range
+     */
+    public function getColumnOffset(string $column): int
+    {
+        return $this->isColumnInRange($column);
+    }
+
+    /**
+     * Get a specified Table Column.
+     *
+     * @param string $column Column name (e.g. A)
+     */
+    public function getColumn(string $column): Table\Column
+    {
+        $this->isColumnInRange($column);
+
+        if (!isset($this->columns[$column])) {
+            $this->columns[$column] = new Table\Column($column, $this);
+        }
+
+        return $this->columns[$column];
+    }
+
+    /**
+     * Get a specified Table Column by it's offset.
+     *
+     * @param int $columnOffset Column offset within range (starting from 0)
+     */
+    public function getColumnByOffset(int $columnOffset): Table\Column
+    {
+        [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($this->range);
+        $pColumn = Coordinate::stringFromColumnIndex($rangeStart[0] + $columnOffset);
+
+        return $this->getColumn($pColumn);
+    }
+
+    /**
+     * Set Table.
+     *
+     * @param string|Table\Column $columnObjectOrString
+     *            A simple string containing a Column ID like 'A' is permitted
+     */
+    public function setColumn(string|Table\Column $columnObjectOrString): self
+    {
+        if ((is_string($columnObjectOrString)) && (!empty($columnObjectOrString))) {
+            $column = $columnObjectOrString;
+        } elseif (is_object($columnObjectOrString) && ($columnObjectOrString instanceof Table\Column)) {
+            $column = $columnObjectOrString->getColumnIndex();
+        } else {
+            throw new PhpSpreadsheetException('Column is not within the table range.');
+        }
+        $this->isColumnInRange($column);
+
+        if (is_string($columnObjectOrString)) {
+            $this->columns[$columnObjectOrString] = new Table\Column($columnObjectOrString, $this);
+        } else {
+            $columnObjectOrString->setTable($this);
+            $this->columns[$column] = $columnObjectOrString;
+        }
+        ksort($this->columns);
+
+        return $this;
+    }
+
+    /**
+     * Clear a specified Table Column.
+     *
+     * @param string $column Column name (e.g. A)
+     */
+    public function clearColumn(string $column): self
+    {
+        $this->isColumnInRange($column);
+
+        if (isset($this->columns[$column])) {
+            unset($this->columns[$column]);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Shift an Table Column Rule to a different column.
+     *
+     * Note: This method bypasses validation of the destination column to ensure it is within this Table range.
+     *        Nor does it verify whether any column rule already exists at $toColumn, but will simply override any existing value.
+     *        Use with caution.
+     *
+     * @param string $fromColumn Column name (e.g. A)
+     * @param string $toColumn Column name (e.g. B)
+     */
+    public function shiftColumn(string $fromColumn, string $toColumn): self
+    {
+        $fromColumn = strtoupper($fromColumn);
+        $toColumn = strtoupper($toColumn);
+
+        if (($fromColumn !== null) && (isset($this->columns[$fromColumn])) && ($toColumn !== null)) {
+            $this->columns[$fromColumn]->setTable();
+            $this->columns[$fromColumn]->setColumnIndex($toColumn);
+            $this->columns[$toColumn] = $this->columns[$fromColumn];
+            $this->columns[$toColumn]->setTable($this);
+            unset($this->columns[$fromColumn]);
+
+            ksort($this->columns);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get table Style.
+     */
+    public function getStyle(): TableStyle
+    {
+        return $this->style;
+    }
+
+    /**
+     * Set table Style.
+     */
+    public function setStyle(TableStyle $style): self
+    {
+        $this->style = $style;
+
+        return $this;
+    }
+
+    /**
+     * Get AutoFilter.
+     */
+    public function getAutoFilter(): AutoFilter
+    {
+        return $this->autoFilter;
+    }
+
+    /**
+     * Set AutoFilter.
+     */
+    public function setAutoFilter(AutoFilter $autoFilter): self
+    {
+        $this->autoFilter = $autoFilter;
+
+        return $this;
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if (is_object($value)) {
+                if ($key === 'workSheet') {
+                    //    Detach from worksheet
+                    $this->{$key} = null;
+                } else {
+                    $this->{$key} = clone $value;
+                }
+            } elseif ((is_array($value)) && ($key === 'columns')) {
+                //    The columns array of \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet\Table objects
+                $this->{$key} = [];
+                foreach ($value as $k => $v) {
+                    $this->{$key}[$k] = clone $v;
+                    // attach the new cloned Column to this new cloned Table object
+                    $this->{$key}[$k]->setTable($this);
+                }
+            } else {
+                $this->{$key} = $value;
+            }
+        }
+    }
+
+    /**
+     * toString method replicates previous behavior by returning the range if object is
+     * referenced as a property of its worksheet.
+     */
+    public function __toString(): string
+    {
+        return (string) $this->range;
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Table/Column.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Table/Column.php
new file mode 100644
index 0000000000..257e3e390d
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Table/Column.php
@@ -0,0 +1,240 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Worksheet\Table;
+
+use PhpOffice\PhpSpreadsheet\Cell\DataType;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\Table;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class Column
+{
+    /**
+     * Table Column Index.
+     */
+    private string $columnIndex;
+
+    /**
+     * Show Filter Button.
+     */
+    private bool $showFilterButton = true;
+
+    /**
+     * Total Row Label.
+     */
+    private ?string $totalsRowLabel = null;
+
+    /**
+     * Total Row Function.
+     */
+    private ?string $totalsRowFunction = null;
+
+    /**
+     * Total Row Formula.
+     */
+    private ?string $totalsRowFormula = null;
+
+    /**
+     * Column Formula.
+     */
+    private ?string $columnFormula = null;
+
+    /**
+     * Table.
+     */
+    private ?Table $table;
+
+    /**
+     * Create a new Column.
+     *
+     * @param string $column Column (e.g. A)
+     * @param ?Table $table Table for this column
+     */
+    public function __construct(string $column, ?Table $table = null)
+    {
+        $this->columnIndex = $column;
+        $this->table = $table;
+    }
+
+    /**
+     * Get Table column index as string eg: 'A'.
+     */
+    public function getColumnIndex(): string
+    {
+        return $this->columnIndex;
+    }
+
+    /**
+     * Set Table column index as string eg: 'A'.
+     *
+     * @param string $column Column (e.g. A)
+     */
+    public function setColumnIndex(string $column): self
+    {
+        // Uppercase coordinate
+        $column = strtoupper($column);
+        if ($this->table !== null) {
+            $this->table->isColumnInRange($column);
+        }
+
+        $this->columnIndex = $column;
+
+        return $this;
+    }
+
+    /**
+     * Get show Filter Button.
+     */
+    public function getShowFilterButton(): bool
+    {
+        return $this->showFilterButton;
+    }
+
+    /**
+     * Set show Filter Button.
+     */
+    public function setShowFilterButton(bool $showFilterButton): self
+    {
+        $this->showFilterButton = $showFilterButton;
+
+        return $this;
+    }
+
+    /**
+     * Get total Row Label.
+     */
+    public function getTotalsRowLabel(): ?string
+    {
+        return $this->totalsRowLabel;
+    }
+
+    /**
+     * Set total Row Label.
+     */
+    public function setTotalsRowLabel(string $totalsRowLabel): self
+    {
+        $this->totalsRowLabel = $totalsRowLabel;
+
+        return $this;
+    }
+
+    /**
+     * Get total Row Function.
+     */
+    public function getTotalsRowFunction(): ?string
+    {
+        return $this->totalsRowFunction;
+    }
+
+    /**
+     * Set total Row Function.
+     */
+    public function setTotalsRowFunction(string $totalsRowFunction): self
+    {
+        $this->totalsRowFunction = $totalsRowFunction;
+
+        return $this;
+    }
+
+    /**
+     * Get total Row Formula.
+     */
+    public function getTotalsRowFormula(): ?string
+    {
+        return $this->totalsRowFormula;
+    }
+
+    /**
+     * Set total Row Formula.
+     */
+    public function setTotalsRowFormula(string $totalsRowFormula): self
+    {
+        $this->totalsRowFormula = $totalsRowFormula;
+
+        return $this;
+    }
+
+    /**
+     * Get column Formula.
+     */
+    public function getColumnFormula(): ?string
+    {
+        return $this->columnFormula;
+    }
+
+    /**
+     * Set column Formula.
+     */
+    public function setColumnFormula(string $columnFormula): self
+    {
+        $this->columnFormula = $columnFormula;
+
+        return $this;
+    }
+
+    /**
+     * Get this Column's Table.
+     */
+    public function getTable(): ?Table
+    {
+        return $this->table;
+    }
+
+    /**
+     * Set this Column's Table.
+     */
+    public function setTable(?Table $table = null): self
+    {
+        $this->table = $table;
+
+        return $this;
+    }
+
+    public static function updateStructuredReferences(?Worksheet $workSheet, ?string $oldTitle, ?string $newTitle): void
+    {
+        if ($workSheet === null || $oldTitle === null || $oldTitle === '' || $newTitle === null) {
+            return;
+        }
+
+        // Remember that table headings are case-insensitive
+        if (StringHelper::strToLower($oldTitle) !== StringHelper::strToLower($newTitle)) {
+            // We need to check all formula cells that might contain Structured References that refer
+            //    to this column, and update those formulae to reference the new column text
+            $spreadsheet = $workSheet->getParentOrThrow();
+            foreach ($spreadsheet->getWorksheetIterator() as $sheet) {
+                self::updateStructuredReferencesInCells($sheet, $oldTitle, $newTitle);
+            }
+            self::updateStructuredReferencesInNamedFormulae($spreadsheet, $oldTitle, $newTitle);
+        }
+    }
+
+    private static function updateStructuredReferencesInCells(Worksheet $worksheet, string $oldTitle, string $newTitle): void
+    {
+        $pattern = '/\[(@?)' . preg_quote($oldTitle, '/') . '\]/mui';
+
+        foreach ($worksheet->getCoordinates(false) as $coordinate) {
+            $cell = $worksheet->getCell($coordinate);
+            if ($cell->getDataType() === DataType::TYPE_FORMULA) {
+                $formula = $cell->getValueString();
+                if (preg_match($pattern, $formula) === 1) {
+                    $formula = preg_replace($pattern, "[$1{$newTitle}]", $formula);
+                    $cell->setValueExplicit($formula, DataType::TYPE_FORMULA);
+                }
+            }
+        }
+    }
+
+    private static function updateStructuredReferencesInNamedFormulae(Spreadsheet $spreadsheet, string $oldTitle, string $newTitle): void
+    {
+        $pattern = '/\[(@?)' . preg_quote($oldTitle, '/') . '\]/mui';
+
+        foreach ($spreadsheet->getNamedFormulae() as $namedFormula) {
+            $formula = $namedFormula->getValue();
+            if (preg_match($pattern, $formula) === 1) {
+                $formula = preg_replace($pattern, "[$1{$newTitle}]", $formula) ?? '';
+                $namedFormula->setValue($formula);
+            }
+        }
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Table/TableStyle.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Table/TableStyle.php
new file mode 100644
index 0000000000..81153027da
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Table/TableStyle.php
@@ -0,0 +1,218 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Worksheet\Table;
+
+use PhpOffice\PhpSpreadsheet\Worksheet\Table;
+
+class TableStyle
+{
+    const TABLE_STYLE_NONE = '';
+    const TABLE_STYLE_LIGHT1 = 'TableStyleLight1';
+    const TABLE_STYLE_LIGHT2 = 'TableStyleLight2';
+    const TABLE_STYLE_LIGHT3 = 'TableStyleLight3';
+    const TABLE_STYLE_LIGHT4 = 'TableStyleLight4';
+    const TABLE_STYLE_LIGHT5 = 'TableStyleLight5';
+    const TABLE_STYLE_LIGHT6 = 'TableStyleLight6';
+    const TABLE_STYLE_LIGHT7 = 'TableStyleLight7';
+    const TABLE_STYLE_LIGHT8 = 'TableStyleLight8';
+    const TABLE_STYLE_LIGHT9 = 'TableStyleLight9';
+    const TABLE_STYLE_LIGHT10 = 'TableStyleLight10';
+    const TABLE_STYLE_LIGHT11 = 'TableStyleLight11';
+    const TABLE_STYLE_LIGHT12 = 'TableStyleLight12';
+    const TABLE_STYLE_LIGHT13 = 'TableStyleLight13';
+    const TABLE_STYLE_LIGHT14 = 'TableStyleLight14';
+    const TABLE_STYLE_LIGHT15 = 'TableStyleLight15';
+    const TABLE_STYLE_LIGHT16 = 'TableStyleLight16';
+    const TABLE_STYLE_LIGHT17 = 'TableStyleLight17';
+    const TABLE_STYLE_LIGHT18 = 'TableStyleLight18';
+    const TABLE_STYLE_LIGHT19 = 'TableStyleLight19';
+    const TABLE_STYLE_LIGHT20 = 'TableStyleLight20';
+    const TABLE_STYLE_LIGHT21 = 'TableStyleLight21';
+    const TABLE_STYLE_MEDIUM1 = 'TableStyleMedium1';
+    const TABLE_STYLE_MEDIUM2 = 'TableStyleMedium2';
+    const TABLE_STYLE_MEDIUM3 = 'TableStyleMedium3';
+    const TABLE_STYLE_MEDIUM4 = 'TableStyleMedium4';
+    const TABLE_STYLE_MEDIUM5 = 'TableStyleMedium5';
+    const TABLE_STYLE_MEDIUM6 = 'TableStyleMedium6';
+    const TABLE_STYLE_MEDIUM7 = 'TableStyleMedium7';
+    const TABLE_STYLE_MEDIUM8 = 'TableStyleMedium8';
+    const TABLE_STYLE_MEDIUM9 = 'TableStyleMedium9';
+    const TABLE_STYLE_MEDIUM10 = 'TableStyleMedium10';
+    const TABLE_STYLE_MEDIUM11 = 'TableStyleMedium11';
+    const TABLE_STYLE_MEDIUM12 = 'TableStyleMedium12';
+    const TABLE_STYLE_MEDIUM13 = 'TableStyleMedium13';
+    const TABLE_STYLE_MEDIUM14 = 'TableStyleMedium14';
+    const TABLE_STYLE_MEDIUM15 = 'TableStyleMedium15';
+    const TABLE_STYLE_MEDIUM16 = 'TableStyleMedium16';
+    const TABLE_STYLE_MEDIUM17 = 'TableStyleMedium17';
+    const TABLE_STYLE_MEDIUM18 = 'TableStyleMedium18';
+    const TABLE_STYLE_MEDIUM19 = 'TableStyleMedium19';
+    const TABLE_STYLE_MEDIUM20 = 'TableStyleMedium20';
+    const TABLE_STYLE_MEDIUM21 = 'TableStyleMedium21';
+    const TABLE_STYLE_MEDIUM22 = 'TableStyleMedium22';
+    const TABLE_STYLE_MEDIUM23 = 'TableStyleMedium23';
+    const TABLE_STYLE_MEDIUM24 = 'TableStyleMedium24';
+    const TABLE_STYLE_MEDIUM25 = 'TableStyleMedium25';
+    const TABLE_STYLE_MEDIUM26 = 'TableStyleMedium26';
+    const TABLE_STYLE_MEDIUM27 = 'TableStyleMedium27';
+    const TABLE_STYLE_MEDIUM28 = 'TableStyleMedium28';
+    const TABLE_STYLE_DARK1 = 'TableStyleDark1';
+    const TABLE_STYLE_DARK2 = 'TableStyleDark2';
+    const TABLE_STYLE_DARK3 = 'TableStyleDark3';
+    const TABLE_STYLE_DARK4 = 'TableStyleDark4';
+    const TABLE_STYLE_DARK5 = 'TableStyleDark5';
+    const TABLE_STYLE_DARK6 = 'TableStyleDark6';
+    const TABLE_STYLE_DARK7 = 'TableStyleDark7';
+    const TABLE_STYLE_DARK8 = 'TableStyleDark8';
+    const TABLE_STYLE_DARK9 = 'TableStyleDark9';
+    const TABLE_STYLE_DARK10 = 'TableStyleDark10';
+    const TABLE_STYLE_DARK11 = 'TableStyleDark11';
+
+    /**
+     * Theme.
+     */
+    private string $theme;
+
+    /**
+     * Show First Column.
+     */
+    private bool $showFirstColumn = false;
+
+    /**
+     * Show Last Column.
+     */
+    private bool $showLastColumn = false;
+
+    /**
+     * Show Row Stripes.
+     */
+    private bool $showRowStripes = false;
+
+    /**
+     * Show Column Stripes.
+     */
+    private bool $showColumnStripes = false;
+
+    /**
+     * Table.
+     */
+    private ?Table $table = null;
+
+    /**
+     * Create a new Table Style.
+     *
+     * @param string $theme (e.g. TableStyle::TABLE_STYLE_MEDIUM2)
+     */
+    public function __construct(string $theme = self::TABLE_STYLE_MEDIUM2)
+    {
+        $this->theme = $theme;
+    }
+
+    /**
+     * Get theme.
+     */
+    public function getTheme(): string
+    {
+        return $this->theme;
+    }
+
+    /**
+     * Set theme.
+     */
+    public function setTheme(string $theme): self
+    {
+        $this->theme = $theme;
+
+        return $this;
+    }
+
+    /**
+     * Get show First Column.
+     */
+    public function getShowFirstColumn(): bool
+    {
+        return $this->showFirstColumn;
+    }
+
+    /**
+     * Set show First Column.
+     */
+    public function setShowFirstColumn(bool $showFirstColumn): self
+    {
+        $this->showFirstColumn = $showFirstColumn;
+
+        return $this;
+    }
+
+    /**
+     * Get show Last Column.
+     */
+    public function getShowLastColumn(): bool
+    {
+        return $this->showLastColumn;
+    }
+
+    /**
+     * Set show Last Column.
+     */
+    public function setShowLastColumn(bool $showLastColumn): self
+    {
+        $this->showLastColumn = $showLastColumn;
+
+        return $this;
+    }
+
+    /**
+     * Get show Row Stripes.
+     */
+    public function getShowRowStripes(): bool
+    {
+        return $this->showRowStripes;
+    }
+
+    /**
+     * Set show Row Stripes.
+     */
+    public function setShowRowStripes(bool $showRowStripes): self
+    {
+        $this->showRowStripes = $showRowStripes;
+
+        return $this;
+    }
+
+    /**
+     * Get show Column Stripes.
+     */
+    public function getShowColumnStripes(): bool
+    {
+        return $this->showColumnStripes;
+    }
+
+    /**
+     * Set show Column Stripes.
+     */
+    public function setShowColumnStripes(bool $showColumnStripes): self
+    {
+        $this->showColumnStripes = $showColumnStripes;
+
+        return $this;
+    }
+
+    /**
+     * Get this Style's Table.
+     */
+    public function getTable(): ?Table
+    {
+        return $this->table;
+    }
+
+    /**
+     * Set this Style's Table.
+     */
+    public function setTable(?Table $table = null): self
+    {
+        $this->table = $table;
+
+        return $this;
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Validations.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Validations.php
new file mode 100644
index 0000000000..99b5eedbc5
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Validations.php
@@ -0,0 +1,118 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Worksheet;
+
+use PhpOffice\PhpSpreadsheet\Cell\AddressRange;
+use PhpOffice\PhpSpreadsheet\Cell\CellAddress;
+use PhpOffice\PhpSpreadsheet\Cell\CellRange;
+use PhpOffice\PhpSpreadsheet\Exception as SpreadsheetException;
+
+class Validations
+{
+    /**
+     * Validate a cell address.
+     *
+     * @param null|array{0: int, 1: int}|CellAddress|string $cellAddress Coordinate of the cell as a string, eg: 'C5';
+     *               or as an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
+     */
+    public static function validateCellAddress(null|CellAddress|string|array $cellAddress): string
+    {
+        if (is_string($cellAddress)) {
+            [$worksheet, $address] = Worksheet::extractSheetTitle($cellAddress, true);
+//            if (!empty($worksheet) && $worksheet !== $this->getTitle()) {
+//                throw new Exception('Reference is not for this worksheet');
+//            }
+
+            return empty($worksheet) ? strtoupper("$address") : $worksheet . '!' . strtoupper("$address");
+        }
+
+        if (is_array($cellAddress)) {
+            $cellAddress = CellAddress::fromColumnRowArray($cellAddress);
+        }
+
+        return (string) $cellAddress;
+    }
+
+    /**
+     * 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';
+     *               or as an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 12]),
+     *               or as a CellAddress or AddressRange object.
+     */
+    public static function validateCellOrCellRange(AddressRange|CellAddress|int|string|array $cellRange): string
+    {
+        if (is_string($cellRange) || is_numeric($cellRange)) {
+            // Convert a single column reference like 'A' to 'A:A',
+            //    a single row reference like '1' to '1:1'
+            $cellRange = (string) preg_replace('/^([A-Z]+|\d+)$/', '${1}:${1}', (string) $cellRange);
+        } elseif (is_object($cellRange) && $cellRange instanceof CellAddress) {
+            $cellRange = new CellRange($cellRange, $cellRange);
+        }
+
+        return self::validateCellRange($cellRange);
+    }
+
+    private const SETMAXROW = '${1}1:${2}' . AddressRange::MAX_ROW;
+    private const SETMAXCOL = 'A${1}:' . AddressRange::MAX_COLUMN . '${2}';
+
+    /**
+     * 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';
+     *               or as an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 12]),
+     *               or as an AddressRange object.
+     */
+    public static function validateCellRange(AddressRange|string|array $cellRange): string
+    {
+        if (is_string($cellRange)) {
+            [$worksheet, $addressRange] = Worksheet::extractSheetTitle($cellRange, true);
+
+            // Convert Column ranges like 'A:C' to 'A1:C1048576'
+            //      or Row ranges like '1:3' to 'A1:XFD3'
+            $addressRange = (string) preg_replace(
+                ['/^([A-Z]+):([A-Z]+)$/i', '/^(\\d+):(\\d+)$/'],
+                [self::SETMAXROW, self::SETMAXCOL],
+                $addressRange ?? ''
+            );
+
+            return empty($worksheet) ? strtoupper($addressRange) : $worksheet . '!' . strtoupper($addressRange);
+        }
+
+        if (is_array($cellRange)) {
+            switch (count($cellRange)) {
+                case 4:
+                    $from = [$cellRange[0], $cellRange[1]];
+                    $to = [$cellRange[2], $cellRange[3]];
+
+                    break;
+                case 2:
+                    $from = [$cellRange[0], $cellRange[1]];
+                    $to = [$cellRange[0], $cellRange[1]];
+
+                    break;
+                default:
+                    throw new SpreadsheetException('CellRange array length must be 2 or 4');
+            }
+            $cellRange = new CellRange(CellAddress::fromColumnRowArray($from), CellAddress::fromColumnRowArray($to));
+        }
+
+        return (string) $cellRange;
+    }
+
+    public static function definedNameToCoordinate(string $coordinate, Worksheet $worksheet): string
+    {
+        // Uppercase coordinate
+        $coordinate = strtoupper($coordinate);
+        // Eliminate leading equal sign
+        $testCoordinate = (string) preg_replace('/^=/', '', $coordinate);
+        $defined = $worksheet->getParentOrThrow()->getDefinedName($testCoordinate, $worksheet);
+        if ($defined !== null) {
+            if ($defined->getWorksheet() === $worksheet && !$defined->isFormula()) {
+                $coordinate = (string) preg_replace('/^=/', '', $defined->getValue());
+            }
+        }
+
+        return $coordinate;
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Worksheet.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Worksheet.php
index 0f2602910e..9f01e16972 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Worksheet.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Worksheet.php
@@ -3,12 +3,17 @@
 namespace PhpOffice\PhpSpreadsheet\Worksheet;
 
 use ArrayObject;
+use Generator;
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Cell\AddressRange;
 use PhpOffice\PhpSpreadsheet\Cell\Cell;
+use PhpOffice\PhpSpreadsheet\Cell\CellAddress;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Cell\DataType;
 use PhpOffice\PhpSpreadsheet\Cell\DataValidation;
 use PhpOffice\PhpSpreadsheet\Cell\Hyperlink;
+use PhpOffice\PhpSpreadsheet\Cell\IValueBinder;
 use PhpOffice\PhpSpreadsheet\Chart\Chart;
 use PhpOffice\PhpSpreadsheet\Collection\Cells;
 use PhpOffice\PhpSpreadsheet\Collection\CellsFactory;
@@ -20,22 +25,32 @@
 use PhpOffice\PhpSpreadsheet\RichText\RichText;
 use PhpOffice\PhpSpreadsheet\Shared;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Style\Alignment;
 use PhpOffice\PhpSpreadsheet\Style\Color;
 use PhpOffice\PhpSpreadsheet\Style\Conditional;
 use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+use PhpOffice\PhpSpreadsheet\Style\Protection as StyleProtection;
 use PhpOffice\PhpSpreadsheet\Style\Style;
 
 class Worksheet implements IComparable
 {
     // Break types
-    const BREAK_NONE = 0;
-    const BREAK_ROW = 1;
-    const BREAK_COLUMN = 2;
+    public const BREAK_NONE = 0;
+    public const BREAK_ROW = 1;
+    public const BREAK_COLUMN = 2;
+    // Maximum column for row break
+    public const BREAK_ROW_MAX_COLUMN = 16383;
 
     // Sheet state
-    const SHEETSTATE_VISIBLE = 'visible';
-    const SHEETSTATE_HIDDEN = 'hidden';
-    const SHEETSTATE_VERYHIDDEN = 'veryHidden';
+    public const SHEETSTATE_VISIBLE = 'visible';
+    public const SHEETSTATE_HIDDEN = 'hidden';
+    public const SHEETSTATE_VERYHIDDEN = 'veryHidden';
+
+    public const MERGE_CELL_CONTENT_EMPTY = 'empty';
+    public const MERGE_CELL_CONTENT_HIDE = 'hide';
+    public const MERGE_CELL_CONTENT_MERGE = 'merge';
+
+    protected const SHEET_NAME_REQUIRES_NO_QUOTES = '/^[_\p{L}][_\p{L}\p{N}]*$/mui';
 
     /**
      * Maximum 31 characters allowed for sheet title.
@@ -46,309 +61,273 @@ class Worksheet implements IComparable
 
     /**
      * Invalid characters in sheet title.
-     *
-     * @var array
      */
-    private static $invalidCharacters = ['*', ':', '/', '\\', '?', '[', ']'];
+    private static array $invalidCharacters = ['*', ':', '/', '\\', '?', '[', ']'];
 
     /**
      * Parent spreadsheet.
-     *
-     * @var Spreadsheet
      */
-    private $parent;
+    private ?Spreadsheet $parent = null;
 
     /**
      * Collection of cells.
-     *
-     * @var Cells
      */
-    private $cellCollection;
+    private Cells $cellCollection;
+
+    private bool $cellCollectionInitialized = true;
 
     /**
      * Collection of row dimensions.
      *
      * @var RowDimension[]
      */
-    private $rowDimensions = [];
+    private array $rowDimensions = [];
 
     /**
      * Default row dimension.
-     *
-     * @var RowDimension
      */
-    private $defaultRowDimension;
+    private RowDimension $defaultRowDimension;
 
     /**
      * Collection of column dimensions.
      *
      * @var ColumnDimension[]
      */
-    private $columnDimensions = [];
+    private array $columnDimensions = [];
 
     /**
      * Default column dimension.
-     *
-     * @var ColumnDimension
      */
-    private $defaultColumnDimension;
+    private ColumnDimension $defaultColumnDimension;
 
     /**
      * Collection of drawings.
      *
-     * @var ArrayObject<BaseDrawing>
+     * @var ArrayObject<int, BaseDrawing>
      */
-    private $drawingCollection;
+    private ArrayObject $drawingCollection;
 
     /**
      * Collection of Chart objects.
      *
-     * @var ArrayObject<Chart>
+     * @var ArrayObject<int, Chart>
      */
-    private $chartCollection;
+    private ArrayObject $chartCollection;
 
     /**
-     * Worksheet title.
+     * Collection of Table objects.
      *
-     * @var string
+     * @var ArrayObject<int, Table>
+     */
+    private ArrayObject $tableCollection;
+
+    /**
+     * Worksheet title.
      */
-    private $title;
+    private string $title = '';
 
     /**
      * Sheet state.
-     *
-     * @var string
      */
-    private $sheetState;
+    private string $sheetState;
 
     /**
      * Page setup.
-     *
-     * @var PageSetup
      */
-    private $pageSetup;
+    private PageSetup $pageSetup;
 
     /**
      * Page margins.
-     *
-     * @var PageMargins
      */
-    private $pageMargins;
+    private PageMargins $pageMargins;
 
     /**
      * Page header/footer.
-     *
-     * @var HeaderFooter
      */
-    private $headerFooter;
+    private HeaderFooter $headerFooter;
 
     /**
      * Sheet view.
-     *
-     * @var SheetView
      */
-    private $sheetView;
+    private SheetView $sheetView;
 
     /**
      * Protection.
-     *
-     * @var Protection
      */
-    private $protection;
+    private Protection $protection;
 
     /**
      * Collection of styles.
      *
      * @var Style[]
      */
-    private $styles = [];
+    private array $styles = [];
 
     /**
      * Conditional styles. Indexed by cell coordinate, e.g. 'A1'.
-     *
-     * @var array
      */
-    private $conditionalStylesCollection = [];
+    private array $conditionalStylesCollection = [];
 
     /**
-     * Is the current cell collection sorted already?
+     * Collection of row breaks.
      *
-     * @var bool
+     * @var PageBreak[]
      */
-    private $cellCollectionIsSorted = false;
+    private array $rowBreaks = [];
 
     /**
-     * Collection of breaks.
+     * Collection of column breaks.
      *
-     * @var int[]
+     * @var PageBreak[]
      */
-    private $breaks = [];
+    private array $columnBreaks = [];
 
     /**
      * Collection of merged cell ranges.
      *
      * @var string[]
      */
-    private $mergeCells = [];
+    private array $mergeCells = [];
 
     /**
      * Collection of protected cell ranges.
      *
-     * @var string[]
+     * @var ProtectedRange[]
      */
-    private $protectedCells = [];
+    private array $protectedCells = [];
 
     /**
      * Autofilter Range and selection.
-     *
-     * @var AutoFilter
      */
-    private $autoFilter;
+    private AutoFilter $autoFilter;
 
     /**
      * Freeze pane.
-     *
-     * @var null|string
      */
-    private $freezePane;
+    private ?string $freezePane = null;
 
     /**
      * Default position of the right bottom pane.
+     */
+    private ?string $topLeftCell = null;
+
+    private string $paneTopLeftCell = '';
+
+    private string $activePane = '';
+
+    private int $xSplit = 0;
+
+    private int $ySplit = 0;
+
+    private string $paneState = '';
+
+    /**
+     * Properties of the 4 panes.
      *
-     * @var null|string
+     * @var (null|Pane)[]
      */
-    private $topLeftCell;
+    private array $panes = [
+        'bottomRight' => null,
+        'bottomLeft' => null,
+        'topRight' => null,
+        'topLeft' => null,
+    ];
 
     /**
      * Show gridlines?
-     *
-     * @var bool
      */
-    private $showGridlines = true;
+    private bool $showGridlines = true;
 
     /**
      * Print gridlines?
-     *
-     * @var bool
      */
-    private $printGridlines = false;
+    private bool $printGridlines = false;
 
     /**
      * Show row and column headers?
-     *
-     * @var bool
      */
-    private $showRowColHeaders = true;
+    private bool $showRowColHeaders = true;
 
     /**
      * Show summary below? (Row/Column outline).
-     *
-     * @var bool
      */
-    private $showSummaryBelow = true;
+    private bool $showSummaryBelow = true;
 
     /**
      * Show summary right? (Row/Column outline).
-     *
-     * @var bool
      */
-    private $showSummaryRight = true;
+    private bool $showSummaryRight = true;
 
     /**
      * Collection of comments.
      *
      * @var Comment[]
      */
-    private $comments = [];
+    private array $comments = [];
 
     /**
      * Active cell. (Only one!).
-     *
-     * @var string
      */
-    private $activeCell = 'A1';
+    private string $activeCell = 'A1';
 
     /**
      * Selected cells.
-     *
-     * @var string
      */
-    private $selectedCells = 'A1';
+    private string $selectedCells = 'A1';
 
     /**
      * Cached highest column.
-     *
-     * @var int
      */
-    private $cachedHighestColumn = 1;
+    private int $cachedHighestColumn = 1;
 
     /**
      * Cached highest row.
-     *
-     * @var int
      */
-    private $cachedHighestRow = 1;
+    private int $cachedHighestRow = 1;
 
     /**
      * Right-to-left?
-     *
-     * @var bool
      */
-    private $rightToLeft = false;
+    private bool $rightToLeft = false;
 
     /**
      * Hyperlinks. Indexed by cell coordinate, e.g. 'A1'.
-     *
-     * @var array
      */
-    private $hyperlinkCollection = [];
+    private array $hyperlinkCollection = [];
 
     /**
      * Data validation objects. Indexed by cell coordinate, e.g. 'A1'.
-     *
-     * @var array
      */
-    private $dataValidationCollection = [];
+    private array $dataValidationCollection = [];
 
     /**
      * Tab color.
-     *
-     * @var null|Color
      */
-    private $tabColor;
+    private ?Color $tabColor = null;
 
     /**
      * Dirty flag.
-     *
-     * @var bool
      */
-    private $dirty = true;
+    private bool $dirty = true;
 
     /**
      * Hash.
-     *
-     * @var string
      */
-    private $hash;
+    private string $hash;
 
     /**
      * CodeName.
-     *
-     * @var string
      */
-    private $codeName;
+    private ?string $codeName = null;
 
     /**
      * Create a new worksheet.
-     *
-     * @param Spreadsheet $parent
-     * @param string $pTitle
      */
-    public function __construct(?Spreadsheet $parent = null, $pTitle = 'Worksheet')
+    public function __construct(?Spreadsheet $parent = null, string $title = 'Worksheet')
     {
         // Set parent and title
         $this->parent = $parent;
-        $this->setTitle($pTitle, false);
+        $this->setTitle($title, false);
         // setTitle can change $pTitle
         $this->setCodeName($this->getTitle());
         $this->setSheetState(self::SHEETSTATE_VISIBLE);
@@ -372,7 +351,10 @@ public function __construct(?Spreadsheet $parent = null, $pTitle = 'Worksheet')
         $this->defaultRowDimension = new RowDimension(null);
         // Default column dimension
         $this->defaultColumnDimension = new ColumnDimension(null);
-        $this->autoFilter = new AutoFilter(null, $this);
+        // AutoFilter
+        $this->autoFilter = new AutoFilter('', $this);
+        // Table collection
+        $this->tableCollection = new ArrayObject();
     }
 
     /**
@@ -381,13 +363,12 @@ public function __construct(?Spreadsheet $parent = null, $pTitle = 'Worksheet')
      */
     public function disconnectCells(): void
     {
-        if ($this->cellCollection !== null) {
+        if ($this->cellCollectionInitialized) {
             $this->cellCollection->unsetWorksheetCells();
-            // @phpstan-ignore-next-line
-            $this->cellCollection = null;
+            unset($this->cellCollection);
+            $this->cellCollectionInitialized = false;
         }
         //    detach ourself from the workbook, so that it can then delete this worksheet successfully
-        // @phpstan-ignore-next-line
         $this->parent = null;
     }
 
@@ -399,25 +380,21 @@ public function __destruct()
         Calculation::getInstance($this->parent)->clearCalculationCacheForWorksheet($this->title);
 
         $this->disconnectCells();
-        $this->rowDimensions = [];
+        unset($this->rowDimensions, $this->columnDimensions, $this->tableCollection, $this->drawingCollection, $this->chartCollection, $this->autoFilter);
     }
 
     /**
      * Return the cell collection.
-     *
-     * @return Cells
      */
-    public function getCellCollection()
+    public function getCellCollection(): Cells
     {
         return $this->cellCollection;
     }
 
     /**
      * Get array of invalid characters for sheet title.
-     *
-     * @return array
      */
-    public static function getInvalidCharacters()
+    public static function getInvalidCharacters(): array
     {
         return self::$invalidCharacters;
     }
@@ -425,53 +402,53 @@ public static function getInvalidCharacters()
     /**
      * Check sheet code name for valid Excel syntax.
      *
-     * @param string $pValue The string to check
+     * @param string $sheetCodeName The string to check
      *
      * @return string The valid string
      */
-    private static function checkSheetCodeName($pValue)
+    private static function checkSheetCodeName(string $sheetCodeName): string
     {
-        $CharCount = Shared\StringHelper::countCharacters($pValue);
-        if ($CharCount == 0) {
+        $charCount = Shared\StringHelper::countCharacters($sheetCodeName);
+        if ($charCount == 0) {
             throw new Exception('Sheet code name cannot be empty.');
         }
         // Some of the printable ASCII characters are invalid:  * : / \ ? [ ] and  first and last characters cannot be a "'"
         if (
-            (str_replace(self::$invalidCharacters, '', $pValue) !== $pValue) ||
-            (Shared\StringHelper::substring($pValue, -1, 1) == '\'') ||
-            (Shared\StringHelper::substring($pValue, 0, 1) == '\'')
+            (str_replace(self::$invalidCharacters, '', $sheetCodeName) !== $sheetCodeName)
+            || (Shared\StringHelper::substring($sheetCodeName, -1, 1) == '\'')
+            || (Shared\StringHelper::substring($sheetCodeName, 0, 1) == '\'')
         ) {
             throw new Exception('Invalid character found in sheet code name');
         }
 
         // Enforce maximum characters allowed for sheet title
-        if ($CharCount > self::SHEET_TITLE_MAXIMUM_LENGTH) {
+        if ($charCount > self::SHEET_TITLE_MAXIMUM_LENGTH) {
             throw new Exception('Maximum ' . self::SHEET_TITLE_MAXIMUM_LENGTH . ' characters allowed in sheet code name.');
         }
 
-        return $pValue;
+        return $sheetCodeName;
     }
 
     /**
      * Check sheet title for valid Excel syntax.
      *
-     * @param string $pValue The string to check
+     * @param string $sheetTitle The string to check
      *
      * @return string The valid string
      */
-    private static function checkSheetTitle($pValue)
+    private static function checkSheetTitle(string $sheetTitle): string
     {
         // Some of the printable ASCII characters are invalid:  * : / \ ? [ ]
-        if (str_replace(self::$invalidCharacters, '', $pValue) !== $pValue) {
+        if (str_replace(self::$invalidCharacters, '', $sheetTitle) !== $sheetTitle) {
             throw new Exception('Invalid character found in sheet title');
         }
 
         // Enforce maximum characters allowed for sheet title
-        if (Shared\StringHelper::countCharacters($pValue) > self::SHEET_TITLE_MAXIMUM_LENGTH) {
+        if (Shared\StringHelper::countCharacters($sheetTitle) > self::SHEET_TITLE_MAXIMUM_LENGTH) {
             throw new Exception('Maximum ' . self::SHEET_TITLE_MAXIMUM_LENGTH . ' characters allowed in sheet title.');
         }
 
-        return $pValue;
+        return $sheetTitle;
     }
 
     /**
@@ -481,9 +458,9 @@ private static function checkSheetTitle($pValue)
      *
      * @return string[]
      */
-    public function getCoordinates($sorted = true)
+    public function getCoordinates(bool $sorted = true): array
     {
-        if ($this->cellCollection == null) {
+        if ($this->cellCollectionInitialized === false) {
             return [];
         }
 
@@ -499,17 +476,15 @@ public function getCoordinates($sorted = true)
      *
      * @return RowDimension[]
      */
-    public function getRowDimensions()
+    public function getRowDimensions(): array
     {
         return $this->rowDimensions;
     }
 
     /**
      * Get default row dimension.
-     *
-     * @return RowDimension
      */
-    public function getDefaultRowDimension()
+    public function getDefaultRowDimension(): RowDimension
     {
         return $this->defaultRowDimension;
     }
@@ -519,17 +494,24 @@ public function getDefaultRowDimension()
      *
      * @return ColumnDimension[]
      */
-    public function getColumnDimensions()
+    public function getColumnDimensions(): array
     {
+        /** @var callable $callable */
+        $callable = [self::class, 'columnDimensionCompare'];
+        uasort($this->columnDimensions, $callable);
+
         return $this->columnDimensions;
     }
 
+    private static function columnDimensionCompare(ColumnDimension $a, ColumnDimension $b): int
+    {
+        return $a->getColumnNumeric() - $b->getColumnNumeric();
+    }
+
     /**
      * Get default column dimension.
-     *
-     * @return ColumnDimension
      */
-    public function getDefaultColumnDimension()
+    public function getDefaultColumnDimension(): ColumnDimension
     {
         return $this->defaultColumnDimension;
     }
@@ -537,9 +519,9 @@ public function getDefaultColumnDimension()
     /**
      * Get collection of drawings.
      *
-     * @return ArrayObject<BaseDrawing>
+     * @return ArrayObject<int, BaseDrawing>
      */
-    public function getDrawingCollection()
+    public function getDrawingCollection(): ArrayObject
     {
         return $this->drawingCollection;
     }
@@ -547,31 +529,19 @@ public function getDrawingCollection()
     /**
      * Get collection of charts.
      *
-     * @return ArrayObject<Chart>
+     * @return ArrayObject<int, Chart>
      */
-    public function getChartCollection()
+    public function getChartCollection(): ArrayObject
     {
         return $this->chartCollection;
     }
 
-    /**
-     * Add chart.
-     *
-     * @param null|int $iChartIndex Index where chart should go (0,1,..., or null for last)
-     *
-     * @return Chart
-     */
-    public function addChart(Chart $pChart, $iChartIndex = null)
+    public function addChart(Chart $chart): Chart
     {
-        $pChart->setWorksheet($this);
-        if ($iChartIndex === null) {
-            $this->chartCollection[] = $pChart;
-        } else {
-            // Insert the chart at the requested index
-            array_splice($this->chartCollection, $iChartIndex, 0, [$pChart]);
-        }
+        $chart->setWorksheet($this);
+        $this->chartCollection[] = $chart;
 
-        return $pChart;
+        return $chart;
     }
 
     /**
@@ -579,7 +549,7 @@ public function addChart(Chart $pChart, $iChartIndex = null)
      *
      * @return int The number of charts
      */
-    public function getChartCount()
+    public function getChartCount(): int
     {
         return count($this->chartCollection);
     }
@@ -587,11 +557,11 @@ public function getChartCount()
     /**
      * Get a chart by its index position.
      *
-     * @param string $index Chart index position
+     * @param ?string $index Chart index position
      *
      * @return Chart|false
      */
-    public function getChartByIndex($index)
+    public function getChartByIndex(?string $index)
     {
         $chartCount = count($this->chartCollection);
         if ($chartCount == 0) {
@@ -612,7 +582,7 @@ public function getChartByIndex($index)
      *
      * @return string[] The names of charts
      */
-    public function getChartNames()
+    public function getChartNames(): array
     {
         $chartNames = [];
         foreach ($this->chartCollection as $chart) {
@@ -629,32 +599,36 @@ public function getChartNames()
      *
      * @return Chart|false
      */
-    public function getChartByName($chartName)
+    public function getChartByName(string $chartName)
     {
-        $chartCount = count($this->chartCollection);
-        if ($chartCount == 0) {
-            return false;
-        }
         foreach ($this->chartCollection as $index => $chart) {
             if ($chart->getName() == $chartName) {
-                return $this->chartCollection[$index];
+                return $chart;
             }
         }
 
         return false;
     }
 
+    public function getChartByNameOrThrow(string $chartName): Chart
+    {
+        $chart = $this->getChartByName($chartName);
+        if ($chart !== false) {
+            return $chart;
+        }
+
+        throw new Exception("Sheet does not have a chart named $chartName.");
+    }
+
     /**
      * Refresh column dimensions.
      *
      * @return $this
      */
-    public function refreshColumnDimensions()
+    public function refreshColumnDimensions(): static
     {
-        $currentColumnDimensions = $this->getColumnDimensions();
         $newColumnDimensions = [];
-
-        foreach ($currentColumnDimensions as $objColumnDimension) {
+        foreach ($this->getColumnDimensions() as $objColumnDimension) {
             $newColumnDimensions[$objColumnDimension->getColumnIndex()] = $objColumnDimension;
         }
 
@@ -668,12 +642,10 @@ public function refreshColumnDimensions()
      *
      * @return $this
      */
-    public function refreshRowDimensions()
+    public function refreshRowDimensions(): static
     {
-        $currentRowDimensions = $this->getRowDimensions();
         $newRowDimensions = [];
-
-        foreach ($currentRowDimensions as $objRowDimension) {
+        foreach ($this->getRowDimensions() as $objRowDimension) {
             $newRowDimensions[$objRowDimension->getRowIndex()] = $objRowDimension;
         }
 
@@ -687,7 +659,7 @@ public function refreshRowDimensions()
      *
      * @return string String containing the dimension of this worksheet
      */
-    public function calculateWorksheetDimension()
+    public function calculateWorksheetDimension(): string
     {
         // Return
         return 'A1:' . $this->getHighestColumn() . $this->getHighestRow();
@@ -698,7 +670,7 @@ public function calculateWorksheetDimension()
      *
      * @return string String containing the dimension of this worksheet that actually contain data
      */
-    public function calculateWorksheetDataDimension()
+    public function calculateWorksheetDataDimension(): string
     {
         // Return
         return 'A1:' . $this->getHighestDataColumn() . $this->getHighestDataRow();
@@ -709,8 +681,10 @@ public function calculateWorksheetDataDimension()
      *
      * @return $this
      */
-    public function calculateColumnWidths()
+    public function calculateColumnWidths(): static
     {
+        $activeSheet = $this->getParent()?->getActiveSheetIndex();
+        $selectedCells = $this->selectedCells;
         // initialize $autoSizes array
         $autoSizes = [];
         foreach ($this->getColumnDimensions() as $colDimension) {
@@ -721,6 +695,7 @@ public function calculateColumnWidths()
 
         // There is only something to do if there are some auto-size columns
         if (!empty($autoSizes)) {
+            $holdActivePane = $this->activePane;
             // build list of cells references that participate in a merge
             $isMergeCell = [];
             foreach ($this->getMergeCells() as $cells) {
@@ -729,9 +704,12 @@ public function calculateColumnWidths()
                 }
             }
 
+            $autoFilterIndentRanges = (new AutoFit($this))->getAutoFilterIndentRanges();
+
             // loop through all cells in the worksheet
             foreach ($this->getCoordinates(false) as $coordinate) {
                 $cell = $this->getCellOrNull($coordinate);
+
                 if ($cell !== null && isset($autoSizes[$this->cellCollection->getCurrentColumn()])) {
                     //Determine if cell is in merge range
                     $isMerged = isset($isMergeCell[$this->cellCollection->getCurrentCoordinate()]);
@@ -739,33 +717,58 @@ public function calculateColumnWidths()
                     //By default merged cells should be ignored
                     $isMergedButProceed = false;
 
-                    //The only exception is if it's a merge range value cell of a 'vertical' randge (1 column wide)
+                    //The only exception is if it's a merge range value cell of a 'vertical' range (1 column wide)
                     if ($isMerged && $cell->isMergeRangeValueCell()) {
-                        $range = $cell->getMergeRange();
+                        $range = (string) $cell->getMergeRange();
                         $rangeBoundaries = Coordinate::rangeDimension($range);
-                        if ($rangeBoundaries[0] == 1) {
+                        if ($rangeBoundaries[0] === 1) {
                             $isMergedButProceed = true;
                         }
                     }
 
-                    // Determine width if cell does not participate in a merge or does and is a value cell of 1-column wide range
+                    // Determine width if cell is not part of a merge or does and is a value cell of 1-column wide range
                     if (!$isMerged || $isMergedButProceed) {
+                        // Determine if we need to make an adjustment for the first row in an AutoFilter range that
+                        //    has a column filter dropdown
+                        $filterAdjustment = false;
+                        if (!empty($autoFilterIndentRanges)) {
+                            foreach ($autoFilterIndentRanges as $autoFilterFirstRowRange) {
+                                if ($cell->isInRange($autoFilterFirstRowRange)) {
+                                    $filterAdjustment = true;
+
+                                    break;
+                                }
+                            }
+                        }
+
+                        $indentAdjustment = $cell->getStyle()->getAlignment()->getIndent();
+                        $indentAdjustment += (int) ($cell->getStyle()->getAlignment()->getHorizontal() === Alignment::HORIZONTAL_CENTER);
+
                         // Calculated value
                         // To formatted string
                         $cellValue = NumberFormat::toFormattedString(
-                            $cell->getCalculatedValue(),
-                            $this->getParent()->getCellXfByIndex($cell->getXfIndex())->getNumberFormat()->getFormatCode()
+                            $cell->getCalculatedValueString(),
+                            (string) $this->getParentOrThrow()->getCellXfByIndex($cell->getXfIndex())
+                                ->getNumberFormat()->getFormatCode(true)
                         );
 
-                        $autoSizes[$this->cellCollection->getCurrentColumn()] = max(
-                            (float) $autoSizes[$this->cellCollection->getCurrentColumn()],
-                            (float) Shared\Font::calculateColumnWidth(
-                                $this->getParent()->getCellXfByIndex($cell->getXfIndex())->getFont(),
-                                $cellValue,
-                                $this->getParent()->getCellXfByIndex($cell->getXfIndex())->getAlignment()->getTextRotation(),
-                                $this->getParent()->getDefaultStyle()->getFont()
-                            )
-                        );
+                        if ($cellValue !== null && $cellValue !== '') {
+                            $autoSizes[$this->cellCollection->getCurrentColumn()] = max(
+                                $autoSizes[$this->cellCollection->getCurrentColumn()],
+                                round(
+                                    Shared\Font::calculateColumnWidth(
+                                        $this->getParentOrThrow()->getCellXfByIndex($cell->getXfIndex())->getFont(),
+                                        $cellValue,
+                                        (int) $this->getParentOrThrow()->getCellXfByIndex($cell->getXfIndex())
+                                            ->getAlignment()->getTextRotation(),
+                                        $this->getParentOrThrow()->getDefaultStyle()->getFont(),
+                                        $filterAdjustment,
+                                        $indentAdjustment
+                                    ),
+                                    3
+                                )
+                            );
+                        }
                     }
                 }
             }
@@ -777,27 +780,42 @@ public function calculateColumnWidths()
                 }
                 $this->getColumnDimension($columnIndex)->setWidth($width);
             }
+            $this->activePane = $holdActivePane;
+        }
+        if ($activeSheet !== null && $activeSheet >= 0) {
+            $this->getParent()?->setActiveSheetIndex($activeSheet);
         }
+        $this->setSelectedCells($selectedCells);
 
         return $this;
     }
 
     /**
-     * Get parent.
-     *
-     * @return Spreadsheet
+     * Get parent or null.
      */
-    public function getParent()
+    public function getParent(): ?Spreadsheet
     {
         return $this->parent;
     }
 
+    /**
+     * Get parent, throw exception if null.
+     */
+    public function getParentOrThrow(): Spreadsheet
+    {
+        if ($this->parent !== null) {
+            return $this->parent;
+        }
+
+        throw new Exception('Sheet does not have a parent.');
+    }
+
     /**
      * Re-bind parent.
      *
      * @return $this
      */
-    public function rebindParent(Spreadsheet $parent)
+    public function rebindParent(Spreadsheet $parent): static
     {
         if ($this->parent !== null) {
             $definedNames = $this->parent->getDefinedNames();
@@ -816,10 +834,8 @@ public function rebindParent(Spreadsheet $parent)
 
     /**
      * Get title.
-     *
-     * @return string
      */
-    public function getTitle()
+    public function getTitle(): string
     {
         return $this->title;
     }
@@ -838,7 +854,7 @@ public function getTitle()
      *
      * @return $this
      */
-    public function setTitle($title, $updateFormulaCellReferences = true, $validate = true)
+    public function setTitle(string $title, bool $updateFormulaCellReferences = true, bool $validate = true): static
     {
         // Is this a 'rename' or not?
         if ($this->getTitle() == $title) {
@@ -889,7 +905,7 @@ public function setTitle($title, $updateFormulaCellReferences = true, $validate
             $this->parent->getCalculationEngine()
                 ->renameCalculationCacheForWorksheet($oldTitle, $newTitle);
             if ($updateFormulaCellReferences) {
-                ReferenceHelper::getInstance()->updateNamedFormulas($this->parent, $oldTitle, $newTitle);
+                ReferenceHelper::getInstance()->updateNamedFormulae($this->parent, $oldTitle, $newTitle);
             }
         }
 
@@ -901,7 +917,7 @@ public function setTitle($title, $updateFormulaCellReferences = true, $validate
      *
      * @return string Sheet state (visible, hidden, veryHidden)
      */
-    public function getSheetState()
+    public function getSheetState(): string
     {
         return $this->sheetState;
     }
@@ -913,7 +929,7 @@ public function getSheetState()
      *
      * @return $this
      */
-    public function setSheetState($value)
+    public function setSheetState(string $value): static
     {
         $this->sheetState = $value;
 
@@ -922,10 +938,8 @@ public function setSheetState($value)
 
     /**
      * Get page setup.
-     *
-     * @return PageSetup
      */
-    public function getPageSetup()
+    public function getPageSetup(): PageSetup
     {
         return $this->pageSetup;
     }
@@ -935,19 +949,17 @@ public function getPageSetup()
      *
      * @return $this
      */
-    public function setPageSetup(PageSetup $pValue)
+    public function setPageSetup(PageSetup $pageSetup): static
     {
-        $this->pageSetup = $pValue;
+        $this->pageSetup = $pageSetup;
 
         return $this;
     }
 
     /**
      * Get page margins.
-     *
-     * @return PageMargins
      */
-    public function getPageMargins()
+    public function getPageMargins(): PageMargins
     {
         return $this->pageMargins;
     }
@@ -957,19 +969,17 @@ public function getPageMargins()
      *
      * @return $this
      */
-    public function setPageMargins(PageMargins $pValue)
+    public function setPageMargins(PageMargins $pageMargins): static
     {
-        $this->pageMargins = $pValue;
+        $this->pageMargins = $pageMargins;
 
         return $this;
     }
 
     /**
      * Get page header/footer.
-     *
-     * @return HeaderFooter
      */
-    public function getHeaderFooter()
+    public function getHeaderFooter(): HeaderFooter
     {
         return $this->headerFooter;
     }
@@ -979,19 +989,17 @@ public function getHeaderFooter()
      *
      * @return $this
      */
-    public function setHeaderFooter(HeaderFooter $pValue)
+    public function setHeaderFooter(HeaderFooter $headerFooter): static
     {
-        $this->headerFooter = $pValue;
+        $this->headerFooter = $headerFooter;
 
         return $this;
     }
 
     /**
      * Get sheet view.
-     *
-     * @return SheetView
      */
-    public function getSheetView()
+    public function getSheetView(): SheetView
     {
         return $this->sheetView;
     }
@@ -1001,19 +1009,17 @@ public function getSheetView()
      *
      * @return $this
      */
-    public function setSheetView(SheetView $pValue)
+    public function setSheetView(SheetView $sheetView): static
     {
-        $this->sheetView = $pValue;
+        $this->sheetView = $sheetView;
 
         return $this;
     }
 
     /**
      * Get Protection.
-     *
-     * @return Protection
      */
-    public function getProtection()
+    public function getProtection(): Protection
     {
         return $this->protection;
     }
@@ -1023,9 +1029,9 @@ public function getProtection()
      *
      * @return $this
      */
-    public function setProtection(Protection $pValue)
+    public function setProtection(Protection $protection): static
     {
-        $this->protection = $pValue;
+        $this->protection = $protection;
         $this->dirty = true;
 
         return $this;
@@ -1034,14 +1040,14 @@ public function setProtection(Protection $pValue)
     /**
      * Get highest worksheet column.
      *
-     * @param string $row Return the data highest column for the specified row,
+     * @param null|int|string $row Return the data highest column for the specified row,
      *                                     or the highest column of any row if no row number is passed
      *
      * @return string Highest column name
      */
-    public function getHighestColumn($row = null)
+    public function getHighestColumn($row = null): string
     {
-        if ($row == null) {
+        if ($row === null) {
             return Coordinate::stringFromColumnIndex($this->cachedHighestColumn);
         }
 
@@ -1051,12 +1057,12 @@ public function getHighestColumn($row = null)
     /**
      * Get highest worksheet column that contains data.
      *
-     * @param string $row Return the highest data column for the specified row,
+     * @param null|int|string $row Return the highest data column for the specified row,
      *                                     or the highest data column of any row if no row number is passed
      *
      * @return string Highest column name that contains data
      */
-    public function getHighestDataColumn($row = null)
+    public function getHighestDataColumn($row = null): string
     {
         return $this->cellCollection->getHighestColumn($row);
     }
@@ -1064,14 +1070,14 @@ public function getHighestDataColumn($row = null)
     /**
      * Get highest worksheet row.
      *
-     * @param string $column Return the highest data row for the specified column,
+     * @param null|string $column Return the highest data row for the specified column,
      *                                     or the highest row of any column if no column letter is passed
      *
      * @return int Highest row number
      */
-    public function getHighestRow($column = null)
+    public function getHighestRow(?string $column = null): int
     {
-        if ($column == null) {
+        if ($column === null) {
             return $this->cachedHighestRow;
         }
 
@@ -1081,12 +1087,12 @@ public function getHighestRow($column = null)
     /**
      * Get highest worksheet row that contains data.
      *
-     * @param string $column Return the highest data row for the specified column,
+     * @param null|string $column Return the highest data row for the specified column,
      *                                     or the highest data row of any column if no column letter is passed
      *
      * @return int Highest row number that contains data
      */
-    public function getHighestDataRow($column = null)
+    public function getHighestDataRow(?string $column = null): int
     {
         return $this->cellCollection->getHighestRow($column);
     }
@@ -1096,7 +1102,7 @@ public function getHighestDataRow($column = null)
      *
      * @return array Highest column name and highest row number
      */
-    public function getHighestRowAndColumn()
+    public function getHighestRowAndColumn(): array
     {
         return $this->cellCollection->getHighestRowAndColumn();
     }
@@ -1104,30 +1110,17 @@ public function getHighestRowAndColumn()
     /**
      * Set a cell value.
      *
-     * @param string $pCoordinate Coordinate of the cell, eg: 'A1'
-     * @param mixed $pValue Value of the cell
-     *
-     * @return $this
-     */
-    public function setCellValue($pCoordinate, $pValue)
-    {
-        $this->getCell($pCoordinate)->setValue($pValue);
-
-        return $this;
-    }
-
-    /**
-     * Set a cell value by using numeric cell coordinates.
-     *
-     * @param int $columnIndex Numeric column coordinate of the cell
-     * @param int $row Numeric row coordinate of the cell
-     * @param mixed $value Value of the cell
+     * @param array{0: int, 1: int}|CellAddress|string $coordinate Coordinate of the cell as a string, eg: 'C5';
+     *               or as an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
+     * @param mixed $value Value for the cell
+     * @param null|IValueBinder $binder Value Binder to override the currently set Value Binder
      *
      * @return $this
      */
-    public function setCellValueByColumnAndRow($columnIndex, $row, $value)
+    public function setCellValue(CellAddress|string|array $coordinate, mixed $value, ?IValueBinder $binder = null): static
     {
-        $this->getCellByColumnAndRow($columnIndex, $row)->setValue($value);
+        $cellAddress = Functions::trimSheetFromCellReference(Validations::validateCellAddress($coordinate));
+        $this->getCell($cellAddress)->setValue($value, $binder);
 
         return $this;
     }
@@ -1135,33 +1128,24 @@ public function setCellValueByColumnAndRow($columnIndex, $row, $value)
     /**
      * Set a cell value.
      *
-     * @param string $pCoordinate Coordinate of the cell, eg: 'A1'
-     * @param mixed $pValue Value of the cell
-     * @param string $pDataType Explicit data type, see DataType::TYPE_*
-     *
-     * @return $this
-     */
-    public function setCellValueExplicit($pCoordinate, $pValue, $pDataType)
-    {
-        // Set value
-        $this->getCell($pCoordinate)->setValueExplicit($pValue, $pDataType);
-
-        return $this;
-    }
-
-    /**
-     * Set a cell value by using numeric cell coordinates.
-     *
-     * @param int $columnIndex Numeric column coordinate of the cell
-     * @param int $row Numeric row coordinate of the cell
+     * @param array{0: int, 1: int}|CellAddress|string $coordinate Coordinate of the cell as a string, eg: 'C5';
+     *               or as an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
      * @param mixed $value Value of the cell
      * @param string $dataType Explicit data type, see DataType::TYPE_*
+     *        Note that PhpSpreadsheet does not validate that the value and datatype are consistent, in using this
+     *             method, then it is your responsibility as an end-user developer to validate that the value and
+     *             the datatype match.
+     *       If you do mismatch value and datatpe, then the value you enter may be changed to match the datatype
+     *          that you specify.
+     *
+     * @see DataType
      *
      * @return $this
      */
-    public function setCellValueExplicitByColumnAndRow($columnIndex, $row, $value, $dataType)
+    public function setCellValueExplicit(CellAddress|string|array $coordinate, mixed $value, string $dataType): static
     {
-        $this->getCellByColumnAndRow($columnIndex, $row)->setValueExplicit($value, $dataType);
+        $cellAddress = Functions::trimSheetFromCellReference(Validations::validateCellAddress($coordinate));
+        $this->getCell($cellAddress)->setValueExplicit($value, $dataType);
 
         return $this;
     }
@@ -1169,23 +1153,31 @@ public function setCellValueExplicitByColumnAndRow($columnIndex, $row, $value, $
     /**
      * Get cell at a specific coordinate.
      *
-     * @param string $coordinate Coordinate of the cell, eg: 'A1'
+     * @param array{0: int, 1: int}|CellAddress|string $coordinate Coordinate of the cell as a string, eg: 'C5';
+     *               or as an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
      *
      * @return Cell Cell that was found or created
+     *              WARNING: Because the cell collection can be cached to reduce memory, it only allows one
+     *              "active" cell at a time in memory. If you assign that cell to a variable, then select
+     *              another cell using getCell() or any of its variants, the newly selected cell becomes
+     *              the "active" cell, and any previous assignment becomes a disconnected reference because
+     *              the active cell has changed.
      */
-    public function getCell(string $coordinate): Cell
+    public function getCell(CellAddress|string|array $coordinate): Cell
     {
+        $cellAddress = Functions::trimSheetFromCellReference(Validations::validateCellAddress($coordinate));
+
         // Shortcut for increased performance for the vast majority of simple cases
-        if ($this->cellCollection->has($coordinate)) {
+        if ($this->cellCollection->has($cellAddress)) {
             /** @var Cell $cell */
-            $cell = $this->cellCollection->get($coordinate);
+            $cell = $this->cellCollection->get($cellAddress);
 
             return $cell;
         }
 
         /** @var Worksheet $sheet */
-        [$sheet, $finalCoordinate] = $this->getWorksheetAndCoordinate($coordinate);
-        $cell = $sheet->cellCollection->get($finalCoordinate);
+        [$sheet, $finalCoordinate] = $this->getWorksheetAndCoordinate($cellAddress);
+        $cell = $sheet->getCellCollection()->get($finalCoordinate);
 
         return $cell ?? $sheet->createNewCell($finalCoordinate);
     }
@@ -1196,46 +1188,47 @@ public function getCell(string $coordinate): Cell
      *
      * @return array{0: Worksheet, 1: string}
      */
-    private function getWorksheetAndCoordinate(string $pCoordinate): array
+    private function getWorksheetAndCoordinate(string $coordinate): array
     {
         $sheet = null;
         $finalCoordinate = null;
 
         // Worksheet reference?
-        if (strpos($pCoordinate, '!') !== false) {
-            $worksheetReference = self::extractSheetTitle($pCoordinate, true);
+        if (str_contains($coordinate, '!')) {
+            $worksheetReference = self::extractSheetTitle($coordinate, true);
 
-            $sheet = $this->parent->getSheetByName($worksheetReference[0]);
+            $sheet = $this->getParentOrThrow()->getSheetByName($worksheetReference[0]);
             $finalCoordinate = strtoupper($worksheetReference[1]);
 
-            if (!$sheet) {
+            if ($sheet === null) {
                 throw new Exception('Sheet not found for name: ' . $worksheetReference[0]);
             }
         } elseif (
-            !preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/i', $pCoordinate) &&
-            preg_match('/^' . Calculation::CALCULATION_REGEXP_DEFINEDNAME . '$/i', $pCoordinate)
+            !preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/i', $coordinate)
+            && preg_match('/^' . Calculation::CALCULATION_REGEXP_DEFINEDNAME . '$/iu', $coordinate)
         ) {
             // Named range?
-            $namedRange = $this->validateNamedRange($pCoordinate, true);
+            $namedRange = $this->validateNamedRange($coordinate, true);
             if ($namedRange !== null) {
                 $sheet = $namedRange->getWorksheet();
-                if (!$sheet) {
+                if ($sheet === null) {
                     throw new Exception('Sheet not found for named range: ' . $namedRange->getName());
                 }
 
+                /** @phpstan-ignore-next-line */
                 $cellCoordinate = ltrim(substr($namedRange->getValue(), strrpos($namedRange->getValue(), '!')), '!');
                 $finalCoordinate = str_replace('$', '', $cellCoordinate);
             }
         }
 
-        if (!$sheet || !$finalCoordinate) {
+        if ($sheet === null || $finalCoordinate === null) {
             $sheet = $this;
-            $finalCoordinate = strtoupper($pCoordinate);
+            $finalCoordinate = strtoupper($coordinate);
         }
 
         if (Coordinate::coordinateIsRange($finalCoordinate)) {
             throw new Exception('Cell coordinate string can not be a range of cells.');
-        } elseif (strpos($finalCoordinate, '$') !== false) {
+        } elseif (str_contains($finalCoordinate, '$')) {
             throw new Exception('Cell coordinate must not be absolute.');
         }
 
@@ -1249,7 +1242,7 @@ private function getWorksheetAndCoordinate(string $pCoordinate): array
      *
      * @return null|Cell Cell that was found or null
      */
-    private function getCellOrNull($coordinate): ?Cell
+    private function getCellOrNull(string $coordinate): ?Cell
     {
         // Check cell collection
         if ($this->cellCollection->has($coordinate)) {
@@ -1259,64 +1252,52 @@ private function getCellOrNull($coordinate): ?Cell
         return null;
     }
 
-    /**
-     * Get cell at a specific coordinate by using numeric cell coordinates.
-     *
-     * @param int $columnIndex Numeric column coordinate of the cell
-     * @param int $row Numeric row coordinate of the cell
-     *
-     * @return Cell Cell that was found/created or null
-     */
-    public function getCellByColumnAndRow($columnIndex, $row): Cell
-    {
-        $columnLetter = Coordinate::stringFromColumnIndex($columnIndex);
-        $coordinate = $columnLetter . $row;
-
-        if ($this->cellCollection->has($coordinate)) {
-            /** @var Cell $cell */
-            $cell = $this->cellCollection->get($coordinate);
-
-            return $cell;
-        }
-
-        // Create new cell object, if required
-        return $this->createNewCell($coordinate);
-    }
-
     /**
      * Create a new cell at the specified coordinate.
      *
-     * @param string $pCoordinate Coordinate of the cell
+     * @param string $coordinate Coordinate of the cell
      *
      * @return Cell Cell that was created
+     *              WARNING: Because the cell collection can be cached to reduce memory, it only allows one
+     *              "active" cell at a time in memory. If you assign that cell to a variable, then select
+     *              another cell using getCell() or any of its variants, the newly selected cell becomes
+     *              the "active" cell, and any previous assignment becomes a disconnected reference because
+     *              the active cell has changed.
      */
-    private function createNewCell($pCoordinate)
+    public function createNewCell(string $coordinate): Cell
     {
+        [$column, $row, $columnString] = Coordinate::indexesFromString($coordinate);
         $cell = new Cell(null, DataType::TYPE_NULL, $this);
-        $this->cellCollection->add($pCoordinate, $cell);
-        $this->cellCollectionIsSorted = false;
+        $this->cellCollection->add($coordinate, $cell);
 
         // Coordinates
-        [$column, $row] = Coordinate::coordinateFromString($pCoordinate);
-        $aIndexes = Coordinate::indexesFromString($pCoordinate);
-        if ($this->cachedHighestColumn < $aIndexes[0]) {
-            $this->cachedHighestColumn = $aIndexes[0];
+        if ($column > $this->cachedHighestColumn) {
+            $this->cachedHighestColumn = $column;
         }
-        if ($aIndexes[1] > $this->cachedHighestRow) {
-            $this->cachedHighestRow = $aIndexes[1];
+        if ($row > $this->cachedHighestRow) {
+            $this->cachedHighestRow = $row;
         }
 
         // Cell needs appropriate xfIndex from dimensions records
         //    but don't create dimension records if they don't already exist
         $rowDimension = $this->rowDimensions[$row] ?? null;
-        $columnDimension = $this->columnDimensions[$column] ?? null;
-
-        if ($rowDimension !== null && $rowDimension->getXfIndex() > 0) {
-            // then there is a row dimension with explicit style, assign it to the cell
-            $cell->setXfIndex($rowDimension->getXfIndex());
-        } elseif ($columnDimension !== null && $columnDimension->getXfIndex() > 0) {
-            // then there is a column dimension, assign it to the cell
-            $cell->setXfIndex($columnDimension->getXfIndex());
+        $columnDimension = $this->columnDimensions[$columnString] ?? null;
+
+        $xfSet = false;
+        if ($rowDimension !== null) {
+            $rowXf = (int) $rowDimension->getXfIndex();
+            if ($rowXf > 0) {
+                // then there is a row dimension with explicit style, assign it to the cell
+                $cell->setXfIndex($rowXf);
+                $xfSet = true;
+            }
+        }
+        if (!$xfSet && $columnDimension !== null) {
+            $colXf = (int) $columnDimension->getXfIndex();
+            if ($colXf > 0) {
+                // then there is a column dimension, assign it to the cell
+                $cell->setXfIndex($colXf);
+            }
         }
 
         return $cell;
@@ -1325,69 +1306,65 @@ private function createNewCell($pCoordinate)
     /**
      * Does the cell at a specific coordinate exist?
      *
-     * @param string $coordinate Coordinate of the cell eg: 'A1'
-     *
-     * @return bool
+     * @param array{0: int, 1: int}|CellAddress|string $coordinate Coordinate of the cell as a string, eg: 'C5';
+     *               or as an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
      */
-    public function cellExists($coordinate)
+    public function cellExists(CellAddress|string|array $coordinate): bool
     {
-        /** @var Worksheet $sheet */
-        [$sheet, $finalCoordinate] = $this->getWorksheetAndCoordinate($coordinate);
-
-        return $sheet->cellCollection->has($finalCoordinate);
-    }
+        $cellAddress = Validations::validateCellAddress($coordinate);
+        [$sheet, $finalCoordinate] = $this->getWorksheetAndCoordinate($cellAddress);
 
-    /**
-     * Cell at a specific coordinate by using numeric cell coordinates exists?
-     *
-     * @param int $columnIndex Numeric column coordinate of the cell
-     * @param int $row Numeric row coordinate of the cell
-     *
-     * @return bool
-     */
-    public function cellExistsByColumnAndRow($columnIndex, $row)
-    {
-        return $this->cellExists(Coordinate::stringFromColumnIndex($columnIndex) . $row);
+        return $sheet->getCellCollection()->has($finalCoordinate);
     }
 
     /**
      * Get row dimension at a specific row.
      *
-     * @param int $pRow Numeric index of the row
+     * @param int $row Numeric index of the row
      */
-    public function getRowDimension(int $pRow): RowDimension
+    public function getRowDimension(int $row): RowDimension
     {
         // Get row dimension
-        if (!isset($this->rowDimensions[$pRow])) {
-            $this->rowDimensions[$pRow] = new RowDimension($pRow);
+        if (!isset($this->rowDimensions[$row])) {
+            $this->rowDimensions[$row] = new RowDimension($row);
 
-            $this->cachedHighestRow = max($this->cachedHighestRow, $pRow);
+            $this->cachedHighestRow = max($this->cachedHighestRow, $row);
         }
 
-        return $this->rowDimensions[$pRow];
+        return $this->rowDimensions[$row];
+    }
+
+    public function rowDimensionExists(int $row): bool
+    {
+        return isset($this->rowDimensions[$row]);
+    }
+
+    public function columnDimensionExists(string $column): bool
+    {
+        return isset($this->columnDimensions[$column]);
     }
 
     /**
      * Get column dimension at a specific column.
      *
-     * @param string $pColumn String index of the column eg: 'A'
+     * @param string $column String index of the column eg: 'A'
      */
-    public function getColumnDimension(string $pColumn): ColumnDimension
+    public function getColumnDimension(string $column): ColumnDimension
     {
         // Uppercase coordinate
-        $pColumn = strtoupper($pColumn);
+        $column = strtoupper($column);
 
         // Fetch dimensions
-        if (!isset($this->columnDimensions[$pColumn])) {
-            $this->columnDimensions[$pColumn] = new ColumnDimension($pColumn);
+        if (!isset($this->columnDimensions[$column])) {
+            $this->columnDimensions[$column] = new ColumnDimension($column);
 
-            $columnIndex = Coordinate::columnIndexFromString($pColumn);
+            $columnIndex = Coordinate::columnIndexFromString($column);
             if ($this->cachedHighestColumn < $columnIndex) {
                 $this->cachedHighestColumn = $columnIndex;
             }
         }
 
-        return $this->columnDimensions[$pColumn];
+        return $this->columnDimensions[$column];
     }
 
     /**
@@ -1405,7 +1382,7 @@ public function getColumnDimensionByColumn(int $columnIndex): ColumnDimension
      *
      * @return Style[]
      */
-    public function getStyles()
+    public function getStyles(): array
     {
         return $this->styles;
     }
@@ -1413,70 +1390,115 @@ public function getStyles()
     /**
      * Get style for cell.
      *
-     * @param string $pCellCoordinate Cell coordinate (or range) to get style for, eg: 'A1'
-     *
-     * @return Style
+     * @param AddressRange<CellAddress>|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.
      */
-    public function getStyle($pCellCoordinate)
+    public function getStyle(AddressRange|CellAddress|int|string|array $cellCoordinate): Style
     {
+        $cellCoordinate = Validations::validateCellOrCellRange($cellCoordinate);
+
         // set this sheet as active
-        $this->parent->setActiveSheetIndex($this->parent->getIndex($this));
+        $this->getParentOrThrow()->setActiveSheetIndex($this->getParentOrThrow()->getIndex($this));
 
         // set cell coordinate as active
-        $this->setSelectedCells($pCellCoordinate);
+        $this->setSelectedCells($cellCoordinate);
 
-        return $this->parent->getCellXfSupervisor();
+        return $this->getParentOrThrow()->getCellXfSupervisor();
     }
 
     /**
      * Get conditional styles for a cell.
      *
-     * @param string $pCoordinate eg: 'A1'
+     * @param string $coordinate eg: 'A1' or 'A1:A3'.
+     *          If a single cell is referenced, then the array of conditional styles will be returned if the cell is
+     *               included in a conditional style range.
+     *          If a range of cells is specified, then the styles will only be returned if the range matches the entire
+     *               range of the conditional.
      *
      * @return Conditional[]
      */
-    public function getConditionalStyles($pCoordinate)
+    public function getConditionalStyles(string $coordinate): array
+    {
+        $coordinate = strtoupper($coordinate);
+        if (str_contains($coordinate, ':')) {
+            return $this->conditionalStylesCollection[$coordinate] ?? [];
+        }
+
+        $cell = $this->getCell($coordinate);
+        foreach (array_keys($this->conditionalStylesCollection) as $conditionalRange) {
+            $cellBlocks = explode(',', Coordinate::resolveUnionAndIntersection($conditionalRange));
+            foreach ($cellBlocks as $cellBlock) {
+                if ($cell->isInRange($cellBlock)) {
+                    return $this->conditionalStylesCollection[$conditionalRange];
+                }
+            }
+        }
+
+        return [];
+    }
+
+    public function getConditionalRange(string $coordinate): ?string
     {
-        $pCoordinate = strtoupper($pCoordinate);
-        if (!isset($this->conditionalStylesCollection[$pCoordinate])) {
-            $this->conditionalStylesCollection[$pCoordinate] = [];
+        $coordinate = strtoupper($coordinate);
+        $cell = $this->getCell($coordinate);
+        foreach (array_keys($this->conditionalStylesCollection) as $conditionalRange) {
+            $cellBlocks = explode(',', Coordinate::resolveUnionAndIntersection($conditionalRange));
+            foreach ($cellBlocks as $cellBlock) {
+                if ($cell->isInRange($cellBlock)) {
+                    return $conditionalRange;
+                }
+            }
         }
 
-        return $this->conditionalStylesCollection[$pCoordinate];
+        return null;
     }
 
     /**
      * Do conditional styles exist for this cell?
      *
-     * @param string $pCoordinate eg: 'A1'
-     *
-     * @return bool
+     * @param string $coordinate eg: 'A1' or 'A1:A3'.
+     *          If a single cell is specified, then this method will return true if that cell is included in a
+     *               conditional style range.
+     *          If a range of cells is specified, then true will only be returned if the range matches the entire
+     *               range of the conditional.
      */
-    public function conditionalStylesExists($pCoordinate)
+    public function conditionalStylesExists(string $coordinate): bool
     {
-        return isset($this->conditionalStylesCollection[strtoupper($pCoordinate)]);
+        $coordinate = strtoupper($coordinate);
+        if (str_contains($coordinate, ':')) {
+            return isset($this->conditionalStylesCollection[$coordinate]);
+        }
+
+        $cell = $this->getCell($coordinate);
+        foreach (array_keys($this->conditionalStylesCollection) as $conditionalRange) {
+            if ($cell->isInRange($conditionalRange)) {
+                return true;
+            }
+        }
+
+        return false;
     }
 
     /**
      * Removes conditional styles for a cell.
      *
-     * @param string $pCoordinate eg: 'A1'
+     * @param string $coordinate eg: 'A1'
      *
      * @return $this
      */
-    public function removeConditionalStyles($pCoordinate)
+    public function removeConditionalStyles(string $coordinate): static
     {
-        unset($this->conditionalStylesCollection[strtoupper($pCoordinate)]);
+        unset($this->conditionalStylesCollection[strtoupper($coordinate)]);
 
         return $this;
     }
 
     /**
      * Get collection of conditional styles.
-     *
-     * @return array
      */
-    public function getConditionalStylesCollection()
+    public function getConditionalStylesCollection(): array
     {
         return $this->conditionalStylesCollection;
     }
@@ -1484,64 +1506,43 @@ public function getConditionalStylesCollection()
     /**
      * Set conditional styles.
      *
-     * @param string $pCoordinate eg: 'A1'
-     * @param Conditional[] $pValue
+     * @param string $coordinate eg: 'A1'
+     * @param Conditional[] $styles
      *
      * @return $this
      */
-    public function setConditionalStyles($pCoordinate, $pValue)
+    public function setConditionalStyles(string $coordinate, array $styles): static
     {
-        $this->conditionalStylesCollection[strtoupper($pCoordinate)] = $pValue;
+        $this->conditionalStylesCollection[strtoupper($coordinate)] = $styles;
 
         return $this;
     }
 
-    /**
-     * Get style for cell by using numeric cell coordinates.
-     *
-     * @param int $columnIndex1 Numeric column coordinate of the cell
-     * @param int $row1 Numeric row coordinate of the cell
-     * @param null|int $columnIndex2 Numeric column coordinate of the range cell
-     * @param null|int $row2 Numeric row coordinate of the range cell
-     *
-     * @return Style
-     */
-    public function getStyleByColumnAndRow($columnIndex1, $row1, $columnIndex2 = null, $row2 = null)
-    {
-        if ($columnIndex2 !== null && $row2 !== null) {
-            $cellRange = Coordinate::stringFromColumnIndex($columnIndex1) . $row1 . ':' . Coordinate::stringFromColumnIndex($columnIndex2) . $row2;
-
-            return $this->getStyle($cellRange);
-        }
-
-        return $this->getStyle(Coordinate::stringFromColumnIndex($columnIndex1) . $row1);
-    }
-
     /**
      * Duplicate cell style to a range of cells.
      *
      * Please note that this will overwrite existing cell styles for cells in range!
      *
-     * @param Style $pCellStyle Cell style to duplicate
-     * @param string $pRange Range of cells (i.e. "A1:B10"), or just one cell (i.e. "A1")
+     * @param Style $style Cell style to duplicate
+     * @param string $range Range of cells (i.e. "A1:B10"), or just one cell (i.e. "A1")
      *
      * @return $this
      */
-    public function duplicateStyle(Style $pCellStyle, $pRange)
+    public function duplicateStyle(Style $style, string $range): static
     {
         // Add the style to the workbook if necessary
-        $workbook = $this->parent;
-        if ($existingStyle = $this->parent->getCellXfByHashCode($pCellStyle->getHashCode())) {
+        $workbook = $this->getParentOrThrow();
+        if ($existingStyle = $workbook->getCellXfByHashCode($style->getHashCode())) {
             // there is already such cell Xf in our collection
             $xfIndex = $existingStyle->getIndex();
         } else {
             // we don't have such a cell Xf, need to add
-            $workbook->addCellXf($pCellStyle);
-            $xfIndex = $pCellStyle->getIndex();
+            $workbook->addCellXf($style);
+            $xfIndex = $style->getIndex();
         }
 
         // Calculate range outer borders
-        [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($pRange . ':' . $pRange);
+        [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($range . ':' . $range);
 
         // Make sure we can loop upwards on rows and columns
         if ($rangeStart[0] > $rangeEnd[0] && $rangeStart[1] > $rangeEnd[1]) {
@@ -1565,21 +1566,21 @@ public function duplicateStyle(Style $pCellStyle, $pRange)
      *
      * Please note that this will overwrite existing cell styles for cells in range!
      *
-     * @param Conditional[] $pCellStyle Cell style to duplicate
-     * @param string $pRange Range of cells (i.e. "A1:B10"), or just one cell (i.e. "A1")
+     * @param Conditional[] $styles Cell style to duplicate
+     * @param string $range Range of cells (i.e. "A1:B10"), or just one cell (i.e. "A1")
      *
      * @return $this
      */
-    public function duplicateConditionalStyle(array $pCellStyle, $pRange = '')
+    public function duplicateConditionalStyle(array $styles, string $range = ''): static
     {
-        foreach ($pCellStyle as $cellStyle) {
+        foreach ($styles as $cellStyle) {
             if (!($cellStyle instanceof Conditional)) {
                 throw new Exception('Style is not a conditional style');
             }
         }
 
         // Calculate range outer borders
-        [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($pRange . ':' . $pRange);
+        [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($range . ':' . $range);
 
         // Make sure we can loop upwards on rows and columns
         if ($rangeStart[0] > $rangeEnd[0] && $rangeStart[1] > $rangeEnd[1]) {
@@ -1591,7 +1592,7 @@ public function duplicateConditionalStyle(array $pCellStyle, $pRange = '')
         // Loop through cells and apply styles
         for ($col = $rangeStart[0]; $col <= $rangeEnd[0]; ++$col) {
             for ($row = $rangeStart[1]; $row <= $rangeEnd[1]; ++$row) {
-                $this->setConditionalStyles(Coordinate::stringFromColumnIndex($col) . $row, $pCellStyle);
+                $this->setConditionalStyles(Coordinate::stringFromColumnIndex($col) . $row, $styles);
             }
         }
 
@@ -1601,274 +1602,348 @@ public function duplicateConditionalStyle(array $pCellStyle, $pRange = '')
     /**
      * Set break on a cell.
      *
-     * @param string $pCoordinate Cell coordinate (e.g. A1)
-     * @param int $pBreak Break type (type of Worksheet::BREAK_*)
+     * @param array{0: int, 1: int}|CellAddress|string $coordinate Coordinate of the cell as a string, eg: 'C5';
+     *               or as an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
+     * @param int $break Break type (type of Worksheet::BREAK_*)
      *
      * @return $this
      */
-    public function setBreak($pCoordinate, $pBreak)
+    public function setBreak(CellAddress|string|array $coordinate, int $break, int $max = -1): static
     {
-        // Uppercase coordinate
-        $pCoordinate = strtoupper($pCoordinate);
+        $cellAddress = Functions::trimSheetFromCellReference(Validations::validateCellAddress($coordinate));
 
-        if ($pCoordinate != '') {
-            if ($pBreak == self::BREAK_NONE) {
-                if (isset($this->breaks[$pCoordinate])) {
-                    unset($this->breaks[$pCoordinate]);
-                }
-            } else {
-                $this->breaks[$pCoordinate] = $pBreak;
-            }
-        } else {
-            throw new Exception('No cell coordinate specified.');
+        if ($break === self::BREAK_NONE) {
+            unset($this->rowBreaks[$cellAddress], $this->columnBreaks[$cellAddress]);
+        } elseif ($break === self::BREAK_ROW) {
+            $this->rowBreaks[$cellAddress] = new PageBreak($break, $cellAddress, $max);
+        } elseif ($break === self::BREAK_COLUMN) {
+            $this->columnBreaks[$cellAddress] = new PageBreak($break, $cellAddress, $max);
         }
 
         return $this;
     }
 
-    /**
-     * Set break on a cell by using numeric cell coordinates.
-     *
-     * @param int $columnIndex Numeric column coordinate of the cell
-     * @param int $row Numeric row coordinate of the cell
-     * @param int $break Break type (type of Worksheet::BREAK_*)
-     *
-     * @return $this
-     */
-    public function setBreakByColumnAndRow($columnIndex, $row, $break)
-    {
-        return $this->setBreak(Coordinate::stringFromColumnIndex($columnIndex) . $row, $break);
-    }
-
     /**
      * Get breaks.
      *
      * @return int[]
      */
-    public function getBreaks()
+    public function getBreaks(): array
     {
-        return $this->breaks;
+        $breaks = [];
+        /** @var callable $compareFunction */
+        $compareFunction = [self::class, 'compareRowBreaks'];
+        uksort($this->rowBreaks, $compareFunction);
+        foreach ($this->rowBreaks as $break) {
+            $breaks[$break->getCoordinate()] = self::BREAK_ROW;
+        }
+        /** @var callable $compareFunction */
+        $compareFunction = [self::class, 'compareColumnBreaks'];
+        uksort($this->columnBreaks, $compareFunction);
+        foreach ($this->columnBreaks as $break) {
+            $breaks[$break->getCoordinate()] = self::BREAK_COLUMN;
+        }
+
+        return $breaks;
     }
 
     /**
-     * Set merge on a cell range.
-     *
-     * @param string $pRange Cell range (e.g. A1:E1)
+     * Get row breaks.
      *
-     * @return $this
+     * @return PageBreak[]
      */
-    public function mergeCells($pRange)
+    public function getRowBreaks(): array
     {
-        // Uppercase coordinate
-        $pRange = strtoupper($pRange);
+        /** @var callable $compareFunction */
+        $compareFunction = [self::class, 'compareRowBreaks'];
+        uksort($this->rowBreaks, $compareFunction);
 
-        if (strpos($pRange, ':') !== false) {
-            $this->mergeCells[$pRange] = $pRange;
-
-            // make sure cells are created
+        return $this->rowBreaks;
+    }
 
-            // get the cells in the range
-            $aReferences = Coordinate::extractAllCellReferencesInRange($pRange);
+    protected static function compareRowBreaks(string $coordinate1, string $coordinate2): int
+    {
+        $row1 = Coordinate::indexesFromString($coordinate1)[1];
+        $row2 = Coordinate::indexesFromString($coordinate2)[1];
 
-            // create upper left cell if it does not already exist
-            $upperLeft = $aReferences[0];
-            if (!$this->cellExists($upperLeft)) {
-                $this->getCell($upperLeft)->setValueExplicit(null, DataType::TYPE_NULL);
-            }
+        return $row1 - $row2;
+    }
 
-            // Blank out the rest of the cells in the range (if they exist)
-            $count = count($aReferences);
-            for ($i = 1; $i < $count; ++$i) {
-                if ($this->cellExists($aReferences[$i])) {
-                    $this->getCell($aReferences[$i])->setValueExplicit(null, DataType::TYPE_NULL);
-                }
-            }
-        } else {
-            throw new Exception('Merge must be set on a range of cells.');
-        }
+    protected static function compareColumnBreaks(string $coordinate1, string $coordinate2): int
+    {
+        $column1 = Coordinate::indexesFromString($coordinate1)[0];
+        $column2 = Coordinate::indexesFromString($coordinate2)[0];
 
-        return $this;
+        return $column1 - $column2;
     }
 
     /**
-     * Set merge on a cell range by using numeric cell coordinates.
+     * Get column breaks.
      *
-     * @param int $columnIndex1 Numeric column coordinate of the first cell
-     * @param int $row1 Numeric row coordinate of the first cell
-     * @param int $columnIndex2 Numeric column coordinate of the last cell
-     * @param int $row2 Numeric row coordinate of the last cell
-     *
-     * @return $this
+     * @return PageBreak[]
      */
-    public function mergeCellsByColumnAndRow($columnIndex1, $row1, $columnIndex2, $row2)
+    public function getColumnBreaks(): array
     {
-        $cellRange = Coordinate::stringFromColumnIndex($columnIndex1) . $row1 . ':' . Coordinate::stringFromColumnIndex($columnIndex2) . $row2;
+        /** @var callable $compareFunction */
+        $compareFunction = [self::class, 'compareColumnBreaks'];
+        uksort($this->columnBreaks, $compareFunction);
 
-        return $this->mergeCells($cellRange);
+        return $this->columnBreaks;
     }
 
     /**
-     * Remove merge on a cell range.
+     * Set merge on a cell range.
      *
-     * @param string $pRange Cell range (e.g. A1:E1)
+     * @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'
+     *              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.
+     *               Possible values are:
+     *                   MERGE_CELL_CONTENT_EMPTY - Empty the content of the hidden cells
+     *                   MERGE_CELL_CONTENT_HIDE - Keep the content of the hidden cells
+     *                   MERGE_CELL_CONTENT_MERGE - Move the content of the hidden cells into the first cell
      *
      * @return $this
      */
-    public function unmergeCells($pRange)
+    public function mergeCells(AddressRange|string|array $range, string $behaviour = self::MERGE_CELL_CONTENT_EMPTY): static
     {
-        // Uppercase coordinate
-        $pRange = strtoupper($pRange);
+        $range = Functions::trimSheetFromCellReference(Validations::validateCellRange($range));
+
+        if (!str_contains($range, ':')) {
+            $range .= ":{$range}";
+        }
+
+        if (preg_match('/^([A-Z]+)(\\d+):([A-Z]+)(\\d+)$/', $range, $matches) !== 1) {
+            throw new Exception('Merge must be on a valid range of cells.');
+        }
+
+        $this->mergeCells[$range] = $range;
+        $firstRow = (int) $matches[2];
+        $lastRow = (int) $matches[4];
+        $firstColumn = $matches[1];
+        $lastColumn = $matches[3];
+        $firstColumnIndex = Coordinate::columnIndexFromString($firstColumn);
+        $lastColumnIndex = Coordinate::columnIndexFromString($lastColumn);
+        $numberRows = $lastRow - $firstRow;
+        $numberColumns = $lastColumnIndex - $firstColumnIndex;
 
-        if (strpos($pRange, ':') !== false) {
-            if (isset($this->mergeCells[$pRange])) {
-                unset($this->mergeCells[$pRange]);
+        if ($numberRows === 1 && $numberColumns === 1) {
+            return $this;
+        }
+
+        // create upper left cell if it does not already exist
+        $upperLeft = "{$firstColumn}{$firstRow}";
+        if (!$this->cellExists($upperLeft)) {
+            $this->getCell($upperLeft)->setValueExplicit(null, DataType::TYPE_NULL);
+        }
+
+        if ($behaviour !== self::MERGE_CELL_CONTENT_HIDE) {
+            // Blank out the rest of the cells in the range (if they exist)
+            if ($numberRows > $numberColumns) {
+                $this->clearMergeCellsByColumn($firstColumn, $lastColumn, $firstRow, $lastRow, $upperLeft, $behaviour);
             } else {
-                throw new Exception('Cell range ' . $pRange . ' not known as merged.');
+                $this->clearMergeCellsByRow($firstColumn, $lastColumnIndex, $firstRow, $lastRow, $upperLeft, $behaviour);
             }
-        } else {
-            throw new Exception('Merge can only be removed from a range of cells.');
         }
 
         return $this;
     }
 
-    /**
-     * Remove merge on a cell range by using numeric cell coordinates.
-     *
-     * @param int $columnIndex1 Numeric column coordinate of the first cell
-     * @param int $row1 Numeric row coordinate of the first cell
-     * @param int $columnIndex2 Numeric column coordinate of the last cell
-     * @param int $row2 Numeric row coordinate of the last cell
-     *
-     * @return $this
-     */
-    public function unmergeCellsByColumnAndRow($columnIndex1, $row1, $columnIndex2, $row2)
+    private function clearMergeCellsByColumn(string $firstColumn, string $lastColumn, int $firstRow, int $lastRow, string $upperLeft, string $behaviour): void
     {
-        $cellRange = Coordinate::stringFromColumnIndex($columnIndex1) . $row1 . ':' . Coordinate::stringFromColumnIndex($columnIndex2) . $row2;
-
-        return $this->unmergeCells($cellRange);
-    }
+        $leftCellValue = ($behaviour === self::MERGE_CELL_CONTENT_MERGE)
+            ? [$this->getCell($upperLeft)->getFormattedValue()]
+            : [];
 
-    /**
-     * Get merge cells array.
-     *
-     * @return string[]
-     */
-    public function getMergeCells()
+        foreach ($this->getColumnIterator($firstColumn, $lastColumn) as $column) {
+            $iterator = $column->getCellIterator($firstRow);
+            $iterator->setIterateOnlyExistingCells(true);
+            foreach ($iterator as $cell) {
+                if ($cell !== null) {
+                    $row = $cell->getRow();
+                    if ($row > $lastRow) {
+                        break;
+                    }
+                    $leftCellValue = $this->mergeCellBehaviour($cell, $upperLeft, $behaviour, $leftCellValue);
+                }
+            }
+        }
+
+        if ($behaviour === self::MERGE_CELL_CONTENT_MERGE) {
+            $this->getCell($upperLeft)->setValueExplicit(implode(' ', $leftCellValue), DataType::TYPE_STRING);
+        }
+    }
+
+    private function clearMergeCellsByRow(string $firstColumn, int $lastColumnIndex, int $firstRow, int $lastRow, string $upperLeft, string $behaviour): void
     {
-        return $this->mergeCells;
+        $leftCellValue = ($behaviour === self::MERGE_CELL_CONTENT_MERGE)
+            ? [$this->getCell($upperLeft)->getFormattedValue()]
+            : [];
+
+        foreach ($this->getRowIterator($firstRow, $lastRow) as $row) {
+            $iterator = $row->getCellIterator($firstColumn);
+            $iterator->setIterateOnlyExistingCells(true);
+            foreach ($iterator as $cell) {
+                if ($cell !== null) {
+                    $column = $cell->getColumn();
+                    $columnIndex = Coordinate::columnIndexFromString($column);
+                    if ($columnIndex > $lastColumnIndex) {
+                        break;
+                    }
+                    $leftCellValue = $this->mergeCellBehaviour($cell, $upperLeft, $behaviour, $leftCellValue);
+                }
+            }
+        }
+
+        if ($behaviour === self::MERGE_CELL_CONTENT_MERGE) {
+            $this->getCell($upperLeft)->setValueExplicit(implode(' ', $leftCellValue), DataType::TYPE_STRING);
+        }
+    }
+
+    public function mergeCellBehaviour(Cell $cell, string $upperLeft, string $behaviour, array $leftCellValue): array
+    {
+        if ($cell->getCoordinate() !== $upperLeft) {
+            Calculation::getInstance($cell->getWorksheet()->getParentOrThrow())->flushInstance();
+            if ($behaviour === self::MERGE_CELL_CONTENT_MERGE) {
+                $cellValue = $cell->getFormattedValue();
+                if ($cellValue !== '') {
+                    $leftCellValue[] = $cellValue;
+                }
+            }
+            $cell->setValueExplicit(null, DataType::TYPE_NULL);
+        }
+
+        return $leftCellValue;
     }
 
     /**
-     * Set merge cells array for the entire sheet. Use instead mergeCells() to merge
-     * a single cell range.
+     * Remove merge on a cell range.
      *
-     * @param string[] $pValue
+     * @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'
+     *              or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
+     *              or an AddressRange.
      *
      * @return $this
      */
-    public function setMergeCells(array $pValue)
+    public function unmergeCells(AddressRange|string|array $range): static
     {
-        $this->mergeCells = $pValue;
+        $range = Functions::trimSheetFromCellReference(Validations::validateCellRange($range));
+
+        if (str_contains($range, ':')) {
+            if (isset($this->mergeCells[$range])) {
+                unset($this->mergeCells[$range]);
+            } else {
+                throw new Exception('Cell range ' . $range . ' not known as merged.');
+            }
+        } else {
+            throw new Exception('Merge can only be removed from a range of cells.');
+        }
 
         return $this;
     }
 
     /**
-     * Set protection on a cell range.
+     * Get merge cells array.
+     *
+     * @return string[]
+     */
+    public function getMergeCells(): array
+    {
+        return $this->mergeCells;
+    }
+
+    /**
+     * Set merge cells array for the entire sheet. Use instead mergeCells() to merge
+     * a single cell range.
      *
-     * @param string $pRange Cell (e.g. A1) or cell range (e.g. A1:E1)
-     * @param string $pPassword Password to unlock the protection
-     * @param bool $pAlreadyHashed If the password has already been hashed, set this to true
+     * @param string[] $mergeCells
      *
      * @return $this
      */
-    public function protectCells($pRange, $pPassword, $pAlreadyHashed = false)
+    public function setMergeCells(array $mergeCells): static
     {
-        // Uppercase coordinate
-        $pRange = strtoupper($pRange);
-
-        if (!$pAlreadyHashed) {
-            $pPassword = Shared\PasswordHasher::hashPassword($pPassword);
-        }
-        $this->protectedCells[$pRange] = $pPassword;
+        $this->mergeCells = $mergeCells;
 
         return $this;
     }
 
     /**
-     * Set protection on a cell range by using numeric cell coordinates.
+     * Set protection on a cell or cell range.
      *
-     * @param int $columnIndex1 Numeric column coordinate of the first cell
-     * @param int $row1 Numeric row coordinate of the first cell
-     * @param int $columnIndex2 Numeric column coordinate of the last cell
-     * @param int $row2 Numeric row coordinate of the last cell
+     * @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'
+     *              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
      * @param bool $alreadyHashed If the password has already been hashed, set this to true
      *
      * @return $this
      */
-    public function protectCellsByColumnAndRow($columnIndex1, $row1, $columnIndex2, $row2, $password, $alreadyHashed = false)
+    public function protectCells(AddressRange|CellAddress|int|string|array $range, string $password = '', bool $alreadyHashed = false, string $name = '', string $securityDescriptor = ''): static
     {
-        $cellRange = Coordinate::stringFromColumnIndex($columnIndex1) . $row1 . ':' . Coordinate::stringFromColumnIndex($columnIndex2) . $row2;
+        $range = Functions::trimSheetFromCellReference(Validations::validateCellOrCellRange($range));
+
+        if (!$alreadyHashed && $password !== '') {
+            $password = Shared\PasswordHasher::hashPassword($password);
+        }
+        $this->protectedCells[$range] = new ProtectedRange($range, $password, $name, $securityDescriptor);
 
-        return $this->protectCells($cellRange, $password, $alreadyHashed);
+        return $this;
     }
 
     /**
-     * Remove protection on a cell range.
+     * Remove protection on a cell or cell range.
      *
-     * @param string $pRange Cell (e.g. A1) or cell range (e.g. A1:E1)
+     * @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'
+     *              or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
+     *              or a CellAddress or AddressRange object.
      *
      * @return $this
      */
-    public function unprotectCells($pRange)
+    public function unprotectCells(AddressRange|CellAddress|int|string|array $range): static
     {
-        // Uppercase coordinate
-        $pRange = strtoupper($pRange);
+        $range = Functions::trimSheetFromCellReference(Validations::validateCellOrCellRange($range));
 
-        if (isset($this->protectedCells[$pRange])) {
-            unset($this->protectedCells[$pRange]);
+        if (isset($this->protectedCells[$range])) {
+            unset($this->protectedCells[$range]);
         } else {
-            throw new Exception('Cell range ' . $pRange . ' not known as protected.');
+            throw new Exception('Cell range ' . $range . ' not known as protected.');
         }
 
         return $this;
     }
 
     /**
-     * Remove protection on a cell range by using numeric cell coordinates.
+     * Get password for protected cells.
      *
-     * @param int $columnIndex1 Numeric column coordinate of the first cell
-     * @param int $row1 Numeric row coordinate of the first cell
-     * @param int $columnIndex2 Numeric column coordinate of the last cell
-     * @param int $row2 Numeric row coordinate of the last cell
+     * @return string[]
      *
-     * @return $this
+     * @deprecated 2.0.1 use getProtectedCellRanges instead
+     * @see Worksheet::getProtectedCellRanges()
      */
-    public function unprotectCellsByColumnAndRow($columnIndex1, $row1, $columnIndex2, $row2)
+    public function getProtectedCells(): array
     {
-        $cellRange = Coordinate::stringFromColumnIndex($columnIndex1) . $row1 . ':' . Coordinate::stringFromColumnIndex($columnIndex2) . $row2;
+        $array = [];
+        foreach ($this->protectedCells as $key => $protectedRange) {
+            $array[$key] = $protectedRange->getPassword();
+        }
 
-        return $this->unprotectCells($cellRange);
+        return $array;
     }
 
     /**
      * Get protected cells.
      *
-     * @return string[]
+     * @return ProtectedRange[]
      */
-    public function getProtectedCells()
+    public function getProtectedCellRanges(): array
     {
         return $this->protectedCells;
     }
 
     /**
      * Get Autofilter.
-     *
-     * @return AutoFilter
      */
-    public function getAutoFilter()
+    public function getAutoFilter(): AutoFilter
     {
         return $this->autoFilter;
     }
@@ -1876,59 +1951,136 @@ public function getAutoFilter()
     /**
      * Set AutoFilter.
      *
-     * @param AutoFilter|string $pValue
+     * @param AddressRange<CellAddress>|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.
      *
      * @return $this
      */
-    public function setAutoFilter($pValue)
+    public function setAutoFilter(AddressRange|string|array|AutoFilter $autoFilterOrRange): static
     {
-        if (is_string($pValue)) {
-            $this->autoFilter->setRange($pValue);
-        } elseif (is_object($pValue) && ($pValue instanceof AutoFilter)) {
-            $this->autoFilter = $pValue;
+        if (is_object($autoFilterOrRange) && ($autoFilterOrRange instanceof AutoFilter)) {
+            $this->autoFilter = $autoFilterOrRange;
+        } else {
+            $cellRange = Functions::trimSheetFromCellReference(Validations::validateCellRange($autoFilterOrRange));
+
+            $this->autoFilter->setRange($cellRange);
         }
 
         return $this;
     }
 
     /**
-     * Set Autofilter Range by using numeric cell coordinates.
+     * Remove autofilter.
+     */
+    public function removeAutoFilter(): self
+    {
+        $this->autoFilter->setRange('');
+
+        return $this;
+    }
+
+    /**
+     * Get collection of Tables.
      *
-     * @param int $columnIndex1 Numeric column coordinate of the first cell
-     * @param int $row1 Numeric row coordinate of the first cell
-     * @param int $columnIndex2 Numeric column coordinate of the second cell
-     * @param int $row2 Numeric row coordinate of the second cell
+     * @return ArrayObject<int, Table>
+     */
+    public function getTableCollection(): ArrayObject
+    {
+        return $this->tableCollection;
+    }
+
+    /**
+     * Add Table.
      *
      * @return $this
      */
-    public function setAutoFilterByColumnAndRow($columnIndex1, $row1, $columnIndex2, $row2)
+    public function addTable(Table $table): self
     {
-        return $this->setAutoFilter(
-            Coordinate::stringFromColumnIndex($columnIndex1) . $row1
-            . ':' .
-            Coordinate::stringFromColumnIndex($columnIndex2) . $row2
-        );
+        $table->setWorksheet($this);
+        $this->tableCollection[] = $table;
+
+        return $this;
     }
 
     /**
-     * Remove autofilter.
+     * @return string[] array of Table names
+     */
+    public function getTableNames(): array
+    {
+        $tableNames = [];
+
+        foreach ($this->tableCollection as $table) {
+            /** @var Table $table */
+            $tableNames[] = $table->getName();
+        }
+
+        return $tableNames;
+    }
+
+    /**
+     * @param string $name the table name to search
+     *
+     * @return null|Table The table from the tables collection, or null if not found
+     */
+    public function getTableByName(string $name): ?Table
+    {
+        $tableIndex = $this->getTableIndexByName($name);
+
+        return ($tableIndex === null) ? null : $this->tableCollection[$tableIndex];
+    }
+
+    /**
+     * @param string $name the table name to search
+     *
+     * @return null|int The index of the located table in the tables collection, or null if not found
+     */
+    protected function getTableIndexByName(string $name): ?int
+    {
+        $name = Shared\StringHelper::strToUpper($name);
+        foreach ($this->tableCollection as $index => $table) {
+            /** @var Table $table */
+            if (Shared\StringHelper::strToUpper($table->getName()) === $name) {
+                return $index;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Remove Table by name.
+     *
+     * @param string $name Table name
      *
      * @return $this
      */
-    public function removeAutoFilter()
+    public function removeTableByName(string $name): self
+    {
+        $tableIndex = $this->getTableIndexByName($name);
+
+        if ($tableIndex !== null) {
+            unset($this->tableCollection[$tableIndex]);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Remove collection of Tables.
+     */
+    public function removeTableCollection(): self
     {
-        $this->autoFilter->setRange(null);
+        $this->tableCollection = new ArrayObject();
 
         return $this;
     }
 
     /**
      * Get Freeze Pane.
-     *
-     * @return string
      */
-    public function getFreezePane()
+    public function getFreezePane(): ?string
     {
         return $this->freezePane;
     }
@@ -1942,39 +2094,69 @@ public function getFreezePane()
      *     - B1 will freeze the columns to the left of cell B1 (i.e column A)
      *     - B2 will freeze the rows above and to the left of cell B2 (i.e row 1 and column A)
      *
-     * @param null|string $cell Position of the split
-     * @param null|string $topLeftCell default position of the right bottom pane
+     * @param null|array{0: int, 1: int}|CellAddress|string $coordinate Coordinate of the cell as a string, eg: 'C5';
+     *            or as an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
+     *        Passing a null value for this argument will clear any existing freeze pane for this worksheet.
+     * @param null|array{0: int, 1: int}|CellAddress|string $topLeftCell default position of the right bottom pane
+     *            Coordinate of the cell as a string, eg: 'C5'; or as an array of [$columnIndex, $row] (e.g. [3, 5]),
+     *            or a CellAddress object.
      *
      * @return $this
      */
-    public function freezePane($cell, $topLeftCell = null)
-    {
-        if (is_string($cell) && Coordinate::coordinateIsRange($cell)) {
+    public function freezePane(null|CellAddress|string|array $coordinate, null|CellAddress|string|array $topLeftCell = null, bool $frozenSplit = false): static
+    {
+        $this->panes = [
+            'bottomRight' => null,
+            'bottomLeft' => null,
+            'topRight' => null,
+            'topLeft' => null,
+        ];
+        $cellAddress = ($coordinate !== null)
+            ? Functions::trimSheetFromCellReference(Validations::validateCellAddress($coordinate))
+            : null;
+        if ($cellAddress !== null && Coordinate::coordinateIsRange($cellAddress)) {
             throw new Exception('Freeze pane can not be set on a range of cells.');
         }
+        $topLeftCell = ($topLeftCell !== null)
+            ? Functions::trimSheetFromCellReference(Validations::validateCellAddress($topLeftCell))
+            : null;
 
-        if ($cell !== null && $topLeftCell === null) {
-            $coordinate = Coordinate::coordinateFromString($cell);
+        if ($cellAddress !== null && $topLeftCell === null) {
+            $coordinate = Coordinate::coordinateFromString($cellAddress);
             $topLeftCell = $coordinate[0] . $coordinate[1];
         }
 
-        $this->freezePane = $cell;
+        $topLeftCell = "$topLeftCell";
+        $this->paneTopLeftCell = $topLeftCell;
+
+        $this->freezePane = $cellAddress;
         $this->topLeftCell = $topLeftCell;
+        if ($cellAddress === null) {
+            $this->paneState = '';
+            $this->xSplit = $this->ySplit = 0;
+            $this->activePane = '';
+        } else {
+            $coordinates = Coordinate::indexesFromString($cellAddress);
+            $this->xSplit = $coordinates[0] - 1;
+            $this->ySplit = $coordinates[1] - 1;
+            if ($this->xSplit > 0 || $this->ySplit > 0) {
+                $this->paneState = $frozenSplit ? self::PANE_FROZENSPLIT : self::PANE_FROZEN;
+                $this->setSelectedCellsActivePane();
+            } else {
+                $this->paneState = '';
+                $this->freezePane = null;
+                $this->activePane = '';
+            }
+        }
 
         return $this;
     }
 
-    /**
-     * Freeze Pane by using numeric cell coordinates.
-     *
-     * @param int $columnIndex Numeric column coordinate of the cell
-     * @param int $row Numeric row coordinate of the cell
-     *
-     * @return $this
-     */
-    public function freezePaneByColumnAndRow($columnIndex, $row)
+    public function setTopLeftCell(string $topLeftCell): self
     {
-        return $this->freezePane(Coordinate::stringFromColumnIndex($columnIndex) . $row);
+        $this->topLeftCell = $topLeftCell;
+
+        return $this;
     }
 
     /**
@@ -1982,34 +2164,134 @@ public function freezePaneByColumnAndRow($columnIndex, $row)
      *
      * @return $this
      */
-    public function unfreezePane()
+    public function unfreezePane(): static
     {
         return $this->freezePane(null);
     }
 
     /**
      * Get the default position of the right bottom pane.
-     *
-     * @return null|string
      */
-    public function getTopLeftCell()
+    public function getTopLeftCell(): ?string
     {
         return $this->topLeftCell;
     }
 
+    public function getPaneTopLeftCell(): string
+    {
+        return $this->paneTopLeftCell;
+    }
+
+    public function setPaneTopLeftCell(string $paneTopLeftCell): self
+    {
+        $this->paneTopLeftCell = $paneTopLeftCell;
+
+        return $this;
+    }
+
+    public function usesPanes(): bool
+    {
+        return $this->xSplit > 0 || $this->ySplit > 0;
+    }
+
+    public function getPane(string $position): ?Pane
+    {
+        return $this->panes[$position] ?? null;
+    }
+
+    public function setPane(string $position, ?Pane $pane): self
+    {
+        if (array_key_exists($position, $this->panes)) {
+            $this->panes[$position] = $pane;
+        }
+
+        return $this;
+    }
+
+    /** @return (null|Pane)[] */
+    public function getPanes(): array
+    {
+        return $this->panes;
+    }
+
+    public function getActivePane(): string
+    {
+        return $this->activePane;
+    }
+
+    public function setActivePane(string $activePane): self
+    {
+        $this->activePane = array_key_exists($activePane, $this->panes) ? $activePane : '';
+
+        return $this;
+    }
+
+    public function getXSplit(): int
+    {
+        return $this->xSplit;
+    }
+
+    public function setXSplit(int $xSplit): self
+    {
+        $this->xSplit = $xSplit;
+        if (in_array($this->paneState, self::VALIDFROZENSTATE, true)) {
+            $this->freezePane([$this->xSplit + 1, $this->ySplit + 1], $this->topLeftCell, $this->paneState === self::PANE_FROZENSPLIT);
+        }
+
+        return $this;
+    }
+
+    public function getYSplit(): int
+    {
+        return $this->ySplit;
+    }
+
+    public function setYSplit(int $ySplit): self
+    {
+        $this->ySplit = $ySplit;
+        if (in_array($this->paneState, self::VALIDFROZENSTATE, true)) {
+            $this->freezePane([$this->xSplit + 1, $this->ySplit + 1], $this->topLeftCell, $this->paneState === self::PANE_FROZENSPLIT);
+        }
+
+        return $this;
+    }
+
+    public function getPaneState(): string
+    {
+        return $this->paneState;
+    }
+
+    public const PANE_FROZEN = 'frozen';
+    public const PANE_FROZENSPLIT = 'frozenSplit';
+    public const PANE_SPLIT = 'split';
+    private const VALIDPANESTATE = [self::PANE_FROZEN, self::PANE_SPLIT, self::PANE_FROZENSPLIT];
+    private const VALIDFROZENSTATE = [self::PANE_FROZEN, self::PANE_FROZENSPLIT];
+
+    public function setPaneState(string $paneState): self
+    {
+        $this->paneState = in_array($paneState, self::VALIDPANESTATE, true) ? $paneState : '';
+        if (in_array($this->paneState, self::VALIDFROZENSTATE, true)) {
+            $this->freezePane([$this->xSplit + 1, $this->ySplit + 1], $this->topLeftCell, $this->paneState === self::PANE_FROZENSPLIT);
+        } else {
+            $this->freezePane = null;
+        }
+
+        return $this;
+    }
+
     /**
      * Insert a new row, updating all possible related data.
      *
-     * @param int $pBefore Insert before this one
-     * @param int $pNumRows Number of rows to insert
+     * @param int $before Insert before this row number
+     * @param int $numberOfRows Number of new rows to insert
      *
      * @return $this
      */
-    public function insertNewRowBefore($pBefore, $pNumRows = 1)
+    public function insertNewRowBefore(int $before, int $numberOfRows = 1): static
     {
-        if ($pBefore >= 1) {
+        if ($before >= 1) {
             $objReferenceHelper = ReferenceHelper::getInstance();
-            $objReferenceHelper->insertNewBefore('A' . $pBefore, 0, $pNumRows, $this);
+            $objReferenceHelper->insertNewBefore('A' . $before, 0, $numberOfRows, $this);
         } else {
             throw new Exception('Rows can only be inserted before at least row 1.');
         }
@@ -2020,16 +2302,16 @@ public function insertNewRowBefore($pBefore, $pNumRows = 1)
     /**
      * Insert a new column, updating all possible related data.
      *
-     * @param string $pBefore Insert before this one, eg: 'A'
-     * @param int $pNumCols Number of columns to insert
+     * @param string $before Insert before this column Name, eg: 'A'
+     * @param int $numberOfColumns Number of new columns to insert
      *
      * @return $this
      */
-    public function insertNewColumnBefore($pBefore, $pNumCols = 1)
+    public function insertNewColumnBefore(string $before, int $numberOfColumns = 1): static
     {
-        if (!is_numeric($pBefore)) {
+        if (!is_numeric($before)) {
             $objReferenceHelper = ReferenceHelper::getInstance();
-            $objReferenceHelper->insertNewBefore($pBefore . '1', $pNumCols, 0, $this);
+            $objReferenceHelper->insertNewBefore($before . '1', $numberOfColumns, 0, $this);
         } else {
             throw new Exception('Column references should not be numeric.');
         }
@@ -2040,15 +2322,15 @@ public function insertNewColumnBefore($pBefore, $pNumCols = 1)
     /**
      * Insert a new column, updating all possible related data.
      *
-     * @param int $beforeColumnIndex Insert before this one (numeric column coordinate of the cell)
-     * @param int $pNumCols Number of columns to insert
+     * @param int $beforeColumnIndex Insert before this column ID (numeric column coordinate of the cell)
+     * @param int $numberOfColumns Number of new columns to insert
      *
      * @return $this
      */
-    public function insertNewColumnBeforeByIndex($beforeColumnIndex, $pNumCols = 1)
+    public function insertNewColumnBeforeByIndex(int $beforeColumnIndex, int $numberOfColumns = 1): static
     {
         if ($beforeColumnIndex >= 1) {
-            return $this->insertNewColumnBefore(Coordinate::stringFromColumnIndex($beforeColumnIndex), $pNumCols);
+            return $this->insertNewColumnBefore(Coordinate::stringFromColumnIndex($beforeColumnIndex), $numberOfColumns);
         }
 
         throw new Exception('Columns can only be inserted before at least column A (1).');
@@ -2057,67 +2339,93 @@ public function insertNewColumnBeforeByIndex($beforeColumnIndex, $pNumCols = 1)
     /**
      * Delete a row, updating all possible related data.
      *
-     * @param int $pRow Remove starting with this one
-     * @param int $pNumRows Number of rows to remove
+     * @param int $row Remove rows, starting with this row number
+     * @param int $numberOfRows Number of rows to remove
      *
      * @return $this
      */
-    public function removeRow($pRow, $pNumRows = 1)
+    public function removeRow(int $row, int $numberOfRows = 1): static
     {
-        if ($pRow < 1) {
+        if ($row < 1) {
             throw new Exception('Rows to be deleted should at least start from row 1.');
         }
 
+        $holdRowDimensions = $this->removeRowDimensions($row, $numberOfRows);
         $highestRow = $this->getHighestDataRow();
         $removedRowsCounter = 0;
 
-        for ($r = 0; $r < $pNumRows; ++$r) {
-            if ($pRow + $r <= $highestRow) {
-                $this->getCellCollection()->removeRow($pRow + $r);
+        for ($r = 0; $r < $numberOfRows; ++$r) {
+            if ($row + $r <= $highestRow) {
+                $this->cellCollection->removeRow($row + $r);
                 ++$removedRowsCounter;
             }
         }
 
         $objReferenceHelper = ReferenceHelper::getInstance();
-        $objReferenceHelper->insertNewBefore('A' . ($pRow + $pNumRows), 0, -$pNumRows, $this);
+        $objReferenceHelper->insertNewBefore('A' . ($row + $numberOfRows), 0, -$numberOfRows, $this);
         for ($r = 0; $r < $removedRowsCounter; ++$r) {
-            $this->getCellCollection()->removeRow($highestRow);
+            $this->cellCollection->removeRow($highestRow);
             --$highestRow;
         }
 
+        $this->rowDimensions = $holdRowDimensions;
+
         return $this;
     }
 
+    private function removeRowDimensions(int $row, int $numberOfRows): array
+    {
+        $highRow = $row + $numberOfRows - 1;
+        $holdRowDimensions = [];
+        foreach ($this->rowDimensions as $rowDimension) {
+            $num = $rowDimension->getRowIndex();
+            if ($num < $row) {
+                $holdRowDimensions[$num] = $rowDimension;
+            } elseif ($num > $highRow) {
+                $num -= $numberOfRows;
+                $cloneDimension = clone $rowDimension;
+                $cloneDimension->setRowIndex($num);
+                $holdRowDimensions[$num] = $cloneDimension;
+            }
+        }
+
+        return $holdRowDimensions;
+    }
+
     /**
      * Remove a column, updating all possible related data.
      *
-     * @param string $pColumn Remove starting with this one, eg: 'A'
-     * @param int $pNumCols Number of columns to remove
+     * @param string $column Remove columns starting with this column name, eg: 'A'
+     * @param int $numberOfColumns Number of columns to remove
      *
      * @return $this
      */
-    public function removeColumn($pColumn, $pNumCols = 1)
+    public function removeColumn(string $column, int $numberOfColumns = 1): static
     {
-        if (is_numeric($pColumn)) {
+        if (is_numeric($column)) {
             throw new Exception('Column references should not be numeric.');
         }
 
         $highestColumn = $this->getHighestDataColumn();
         $highestColumnIndex = Coordinate::columnIndexFromString($highestColumn);
-        $pColumnIndex = Coordinate::columnIndexFromString($pColumn);
+        $pColumnIndex = Coordinate::columnIndexFromString($column);
+
+        $holdColumnDimensions = $this->removeColumnDimensions($pColumnIndex, $numberOfColumns);
+
+        $column = Coordinate::stringFromColumnIndex($pColumnIndex + $numberOfColumns);
+        $objReferenceHelper = ReferenceHelper::getInstance();
+        $objReferenceHelper->insertNewBefore($column . '1', -$numberOfColumns, 0, $this);
+
+        $this->columnDimensions = $holdColumnDimensions;
 
         if ($pColumnIndex > $highestColumnIndex) {
             return $this;
         }
 
-        $pColumn = Coordinate::stringFromColumnIndex($pColumnIndex + $pNumCols);
-        $objReferenceHelper = ReferenceHelper::getInstance();
-        $objReferenceHelper->insertNewBefore($pColumn . '1', -$pNumCols, 0, $this);
-
         $maxPossibleColumnsToBeRemoved = $highestColumnIndex - $pColumnIndex + 1;
 
-        for ($c = 0, $n = min($maxPossibleColumnsToBeRemoved, $pNumCols); $c < $n; ++$c) {
-            $this->getCellCollection()->removeColumn($highestColumn);
+        for ($c = 0, $n = min($maxPossibleColumnsToBeRemoved, $numberOfColumns); $c < $n; ++$c) {
+            $this->cellCollection->removeColumn($highestColumn);
             $highestColumn = Coordinate::stringFromColumnIndex(Coordinate::columnIndexFromString($highestColumn) - 1);
         }
 
@@ -2126,15 +2434,35 @@ public function removeColumn($pColumn, $pNumCols = 1)
         return $this;
     }
 
+    private function removeColumnDimensions(int $pColumnIndex, int $numberOfColumns): array
+    {
+        $highCol = $pColumnIndex + $numberOfColumns - 1;
+        $holdColumnDimensions = [];
+        foreach ($this->columnDimensions as $columnDimension) {
+            $num = $columnDimension->getColumnNumeric();
+            if ($num < $pColumnIndex) {
+                $str = $columnDimension->getColumnIndex();
+                $holdColumnDimensions[$str] = $columnDimension;
+            } elseif ($num > $highCol) {
+                $cloneDimension = clone $columnDimension;
+                $cloneDimension->setColumnNumeric($num - $numberOfColumns);
+                $str = $cloneDimension->getColumnIndex();
+                $holdColumnDimensions[$str] = $cloneDimension;
+            }
+        }
+
+        return $holdColumnDimensions;
+    }
+
     /**
      * Remove a column, updating all possible related data.
      *
-     * @param int $columnIndex Remove starting with this one (numeric column coordinate of the cell)
+     * @param int $columnIndex Remove starting with this column Index (numeric column coordinate)
      * @param int $numColumns Number of columns to remove
      *
      * @return $this
      */
-    public function removeColumnByIndex($columnIndex, $numColumns = 1)
+    public function removeColumnByIndex(int $columnIndex, int $numColumns = 1): static
     {
         if ($columnIndex >= 1) {
             return $this->removeColumn(Coordinate::stringFromColumnIndex($columnIndex), $numColumns);
@@ -2145,10 +2473,8 @@ public function removeColumnByIndex($columnIndex, $numColumns = 1)
 
     /**
      * Show gridlines?
-     *
-     * @return bool
      */
-    public function getShowGridlines()
+    public function getShowGridlines(): bool
     {
         return $this->showGridlines;
     }
@@ -2156,23 +2482,21 @@ public function getShowGridlines()
     /**
      * Set show gridlines.
      *
-     * @param bool $pValue Show gridlines (true/false)
+     * @param bool $showGridLines Show gridlines (true/false)
      *
      * @return $this
      */
-    public function setShowGridlines($pValue)
+    public function setShowGridlines(bool $showGridLines): self
     {
-        $this->showGridlines = $pValue;
+        $this->showGridlines = $showGridLines;
 
         return $this;
     }
 
     /**
      * Print gridlines?
-     *
-     * @return bool
      */
-    public function getPrintGridlines()
+    public function getPrintGridlines(): bool
     {
         return $this->printGridlines;
     }
@@ -2180,23 +2504,21 @@ public function getPrintGridlines()
     /**
      * Set print gridlines.
      *
-     * @param bool $pValue Print gridlines (true/false)
+     * @param bool $printGridLines Print gridlines (true/false)
      *
      * @return $this
      */
-    public function setPrintGridlines($pValue)
+    public function setPrintGridlines(bool $printGridLines): self
     {
-        $this->printGridlines = $pValue;
+        $this->printGridlines = $printGridLines;
 
         return $this;
     }
 
     /**
      * Show row and column headers?
-     *
-     * @return bool
      */
-    public function getShowRowColHeaders()
+    public function getShowRowColHeaders(): bool
     {
         return $this->showRowColHeaders;
     }
@@ -2204,23 +2526,21 @@ public function getShowRowColHeaders()
     /**
      * Set show row and column headers.
      *
-     * @param bool $pValue Show row and column headers (true/false)
+     * @param bool $showRowColHeaders Show row and column headers (true/false)
      *
      * @return $this
      */
-    public function setShowRowColHeaders($pValue)
+    public function setShowRowColHeaders(bool $showRowColHeaders): self
     {
-        $this->showRowColHeaders = $pValue;
+        $this->showRowColHeaders = $showRowColHeaders;
 
         return $this;
     }
 
     /**
      * Show summary below? (Row/Column outlining).
-     *
-     * @return bool
      */
-    public function getShowSummaryBelow()
+    public function getShowSummaryBelow(): bool
     {
         return $this->showSummaryBelow;
     }
@@ -2228,23 +2548,21 @@ public function getShowSummaryBelow()
     /**
      * Set show summary below.
      *
-     * @param bool $pValue Show summary below (true/false)
+     * @param bool $showSummaryBelow Show summary below (true/false)
      *
      * @return $this
      */
-    public function setShowSummaryBelow($pValue)
+    public function setShowSummaryBelow(bool $showSummaryBelow): self
     {
-        $this->showSummaryBelow = $pValue;
+        $this->showSummaryBelow = $showSummaryBelow;
 
         return $this;
     }
 
     /**
      * Show summary right? (Row/Column outlining).
-     *
-     * @return bool
      */
-    public function getShowSummaryRight()
+    public function getShowSummaryRight(): bool
     {
         return $this->showSummaryRight;
     }
@@ -2252,13 +2570,13 @@ public function getShowSummaryRight()
     /**
      * Set show summary right.
      *
-     * @param bool $pValue Show summary right (true/false)
+     * @param bool $showSummaryRight Show summary right (true/false)
      *
      * @return $this
      */
-    public function setShowSummaryRight($pValue)
+    public function setShowSummaryRight(bool $showSummaryRight): self
     {
-        $this->showSummaryRight = $pValue;
+        $this->showSummaryRight = $showSummaryRight;
 
         return $this;
     }
@@ -2268,7 +2586,7 @@ public function setShowSummaryRight($pValue)
      *
      * @return Comment[]
      */
-    public function getComments()
+    public function getComments(): array
     {
         return $this->comments;
     }
@@ -2276,60 +2594,74 @@ public function getComments()
     /**
      * Set comments array for the entire sheet.
      *
-     * @param Comment[] $pValue
+     * @param Comment[] $comments
      *
      * @return $this
      */
-    public function setComments(array $pValue)
+    public function setComments(array $comments): self
     {
-        $this->comments = $pValue;
+        $this->comments = $comments;
 
         return $this;
     }
 
     /**
-     * Get comment for cell.
+     * Remove comment from cell.
      *
-     * @param string $pCellCoordinate Cell coordinate to get comment for, eg: 'A1'
+     * @param array{0: int, 1: int}|CellAddress|string $cellCoordinate Coordinate of the cell as a string, eg: 'C5';
+     *               or as an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
      *
-     * @return Comment
+     * @return $this
      */
-    public function getComment($pCellCoordinate)
+    public function removeComment(CellAddress|string|array $cellCoordinate): self
     {
-        // Uppercase coordinate
-        $pCellCoordinate = strtoupper($pCellCoordinate);
+        $cellAddress = Functions::trimSheetFromCellReference(Validations::validateCellAddress($cellCoordinate));
 
-        if (Coordinate::coordinateIsRange($pCellCoordinate)) {
+        if (Coordinate::coordinateIsRange($cellAddress)) {
             throw new Exception('Cell coordinate string can not be a range of cells.');
-        } elseif (strpos($pCellCoordinate, '$') !== false) {
+        } elseif (str_contains($cellAddress, '$')) {
             throw new Exception('Cell coordinate string must not be absolute.');
-        } elseif ($pCellCoordinate == '') {
+        } elseif ($cellAddress == '') {
             throw new Exception('Cell coordinate can not be zero-length string.');
         }
-
-        // Check if we already have a comment for this cell.
-        if (isset($this->comments[$pCellCoordinate])) {
-            return $this->comments[$pCellCoordinate];
+        // Check if we have a comment for this cell and delete it
+        if (isset($this->comments[$cellAddress])) {
+            unset($this->comments[$cellAddress]);
         }
 
-        // If not, create a new comment.
-        $newComment = new Comment();
-        $this->comments[$pCellCoordinate] = $newComment;
-
-        return $newComment;
+        return $this;
     }
 
     /**
-     * Get comment for cell by using numeric cell coordinates.
-     *
-     * @param int $columnIndex Numeric column coordinate of the cell
-     * @param int $row Numeric row coordinate of the cell
+     * Get comment for cell.
      *
-     * @return Comment
+     * @param array{0: int, 1: int}|CellAddress|string $cellCoordinate Coordinate of the cell as a string, eg: 'C5';
+     *               or as an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
      */
-    public function getCommentByColumnAndRow($columnIndex, $row)
+    public function getComment(CellAddress|string|array $cellCoordinate, bool $attachNew = true): Comment
     {
-        return $this->getComment(Coordinate::stringFromColumnIndex($columnIndex) . $row);
+        $cellAddress = Functions::trimSheetFromCellReference(Validations::validateCellAddress($cellCoordinate));
+
+        if (Coordinate::coordinateIsRange($cellAddress)) {
+            throw new Exception('Cell coordinate string can not be a range of cells.');
+        } elseif (str_contains($cellAddress, '$')) {
+            throw new Exception('Cell coordinate string must not be absolute.');
+        } elseif ($cellAddress == '') {
+            throw new Exception('Cell coordinate can not be zero-length string.');
+        }
+
+        // Check if we already have a comment for this cell.
+        if (isset($this->comments[$cellAddress])) {
+            return $this->comments[$cellAddress];
+        }
+
+        // If not, create a new comment.
+        $newComment = new Comment();
+        if ($attachNew) {
+            $this->comments[$cellAddress] = $newComment;
+        }
+
+        return $newComment;
     }
 
     /**
@@ -2337,17 +2669,15 @@ public function getCommentByColumnAndRow($columnIndex, $row)
      *
      * @return string Example: 'A1'
      */
-    public function getActiveCell()
+    public function getActiveCell(): string
     {
         return $this->activeCell;
     }
 
     /**
      * Get selected cells.
-     *
-     * @return string
      */
-    public function getSelectedCells()
+    public function getSelectedCells(): string
     {
         return $this->selectedCells;
     }
@@ -2355,69 +2685,66 @@ public function getSelectedCells()
     /**
      * Selected cell.
      *
-     * @param string $pCoordinate Cell (i.e. A1)
+     * @param string $coordinate Cell (i.e. A1)
      *
      * @return $this
      */
-    public function setSelectedCell($pCoordinate)
+    public function setSelectedCell(string $coordinate): static
     {
-        return $this->setSelectedCells($pCoordinate);
+        return $this->setSelectedCells($coordinate);
     }
 
     /**
      * Select a range of cells.
      *
-     * @param string $pCoordinate Cell range, examples: 'A1', 'B2:G5', 'A:C', '3:6'
+     * @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'
+     *              or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
+     *              or a CellAddress or AddressRange object.
      *
      * @return $this
      */
-    public function setSelectedCells($pCoordinate)
+    public function setSelectedCells(AddressRange|CellAddress|int|string|array $coordinate): static
     {
-        // Uppercase coordinate
-        $pCoordinate = strtoupper($pCoordinate);
-
-        // Convert 'A' to 'A:A'
-        $pCoordinate = preg_replace('/^([A-Z]+)$/', '${1}:${1}', $pCoordinate);
-
-        // Convert '1' to '1:1'
-        $pCoordinate = preg_replace('/^(\d+)$/', '${1}:${1}', $pCoordinate);
-
-        // Convert 'A:C' to 'A1:C1048576'
-        $pCoordinate = preg_replace('/^([A-Z]+):([A-Z]+)$/', '${1}1:${2}1048576', $pCoordinate);
-
-        // Convert '1:3' to 'A1:XFD3'
-        $pCoordinate = preg_replace('/^(\d+):(\d+)$/', 'A${1}:XFD${2}', $pCoordinate);
+        if (is_string($coordinate)) {
+            $coordinate = Validations::definedNameToCoordinate($coordinate, $this);
+        }
+        $coordinate = Validations::validateCellOrCellRange($coordinate);
 
-        if (Coordinate::coordinateIsRange($pCoordinate)) {
-            [$first] = Coordinate::splitRange($pCoordinate);
+        if (Coordinate::coordinateIsRange($coordinate)) {
+            [$first] = Coordinate::splitRange($coordinate);
             $this->activeCell = $first[0];
         } else {
-            $this->activeCell = $pCoordinate;
+            $this->activeCell = $coordinate;
         }
-        $this->selectedCells = $pCoordinate;
+        $this->selectedCells = $coordinate;
+        $this->setSelectedCellsActivePane();
 
         return $this;
     }
 
-    /**
-     * Selected cell by using numeric cell coordinates.
-     *
-     * @param int $columnIndex Numeric column coordinate of the cell
-     * @param int $row Numeric row coordinate of the cell
-     *
-     * @return $this
-     */
-    public function setSelectedCellByColumnAndRow($columnIndex, $row)
+    private function setSelectedCellsActivePane(): void
     {
-        return $this->setSelectedCells(Coordinate::stringFromColumnIndex($columnIndex) . $row);
+        if (!empty($this->freezePane)) {
+            $coordinateC = Coordinate::indexesFromString($this->freezePane);
+            $coordinateT = Coordinate::indexesFromString($this->activeCell);
+            if ($coordinateC[0] === 1) {
+                $activePane = ($coordinateT[1] <= $coordinateC[1]) ? 'topLeft' : 'bottomLeft';
+            } elseif ($coordinateC[1] === 1) {
+                $activePane = ($coordinateT[0] <= $coordinateC[0]) ? 'topLeft' : 'topRight';
+            } elseif ($coordinateT[1] <= $coordinateC[1]) {
+                $activePane = ($coordinateT[0] <= $coordinateC[0]) ? 'topLeft' : 'topRight';
+            } else {
+                $activePane = ($coordinateT[0] <= $coordinateC[0]) ? 'bottomLeft' : 'bottomRight';
+            }
+            $this->setActivePane($activePane);
+            $this->panes[$activePane] = new Pane($activePane, $this->selectedCells, $this->activeCell);
+        }
     }
 
     /**
      * Get right-to-left.
-     *
-     * @return bool
      */
-    public function getRightToLeft()
+    public function getRightToLeft(): bool
     {
         return $this->rightToLeft;
     }
@@ -2429,7 +2756,7 @@ public function getRightToLeft()
      *
      * @return $this
      */
-    public function setRightToLeft($value)
+    public function setRightToLeft(bool $value): static
     {
         $this->rightToLeft = $value;
 
@@ -2446,7 +2773,7 @@ public function setRightToLeft($value)
      *
      * @return $this
      */
-    public function fromArray(array $source, $nullValue = null, $startCell = 'A1', $strictNullComparison = false)
+    public function fromArray(array $source, mixed $nullValue = null, string $startCell = 'A1', bool $strictNullComparison = false): static
     {
         //    Convert a 1-D array to 2-D (for ease of looping)
         if (!is_array(end($source))) {
@@ -2479,74 +2806,184 @@ public function fromArray(array $source, $nullValue = null, $startCell = 'A1', $
         return $this;
     }
 
+    /**
+     * @param null|bool|float|int|RichText|string $nullValue value to use when null
+     *
+     * @throws Exception
+     * @throws \PhpOffice\PhpSpreadsheet\Calculation\Exception
+     */
+    protected function cellToArray(Cell $cell, bool $calculateFormulas, bool $formatData, mixed $nullValue): mixed
+    {
+        $returnValue = $nullValue;
+
+        if ($cell->getValue() !== null) {
+            if ($cell->getValue() instanceof RichText) {
+                $returnValue = $cell->getValue()->getPlainText();
+            } else {
+                $returnValue = ($calculateFormulas) ? $cell->getCalculatedValue() : $cell->getValue();
+            }
+
+            if ($formatData) {
+                $style = $this->getParentOrThrow()->getCellXfByIndex($cell->getXfIndex());
+                /** @var null|bool|float|int|RichText|string */
+                $returnValuex = $returnValue;
+                $returnValue = NumberFormat::toFormattedString(
+                    $returnValuex,
+                    $style->getNumberFormat()->getFormatCode() ?? NumberFormat::FORMAT_GENERAL
+                );
+            }
+        }
+
+        return $returnValue;
+    }
+
     /**
      * Create array from a range of cells.
      *
-     * @param string $pRange Range of cells (i.e. "A1:B10"), or just one cell (i.e. "A1")
-     * @param mixed $nullValue Value returned in the array entry if a cell doesn't exist
+     * @param null|bool|float|int|RichText|string $nullValue Value returned in the array entry if a cell doesn't exist
      * @param bool $calculateFormulas Should formulas be calculated?
      * @param bool $formatData Should formatting be applied to cell values?
      * @param bool $returnCellRef False - Return a simple array of rows and columns indexed by number counting from zero
-     *                               True - Return rows and columns indexed by their actual row and column IDs
-     *
-     * @return array
-     */
-    public function rangeToArray($pRange, $nullValue = null, $calculateFormulas = true, $formatData = true, $returnCellRef = false)
-    {
-        // Returnvalue
+     *                             True - Return rows and columns indexed by their actual row and column IDs
+     * @param bool $ignoreHidden False - Return values for rows/columns even if they are defined as hidden.
+     *                            True - Don't return values for rows/columns that are defined as hidden.
+     */
+    public function rangeToArray(
+        string $range,
+        mixed $nullValue = null,
+        bool $calculateFormulas = true,
+        bool $formatData = true,
+        bool $returnCellRef = false,
+        bool $ignoreHidden = false,
+        bool $reduceArrays = false
+    ): array {
         $returnValue = [];
+
+        // Loop through rows
+        foreach ($this->rangeToArrayYieldRows($range, $nullValue, $calculateFormulas, $formatData, $returnCellRef, $ignoreHidden, $reduceArrays) as $rowRef => $rowArray) {
+            $returnValue[$rowRef] = $rowArray;
+        }
+
+        // Return
+        return $returnValue;
+    }
+
+    /**
+     * Create array from a range of cells, yielding each row in turn.
+     *
+     * @param null|bool|float|int|RichText|string $nullValue Value returned in the array entry if a cell doesn't exist
+     * @param bool $calculateFormulas Should formulas be calculated?
+     * @param bool $formatData Should formatting be applied to cell values?
+     * @param bool $returnCellRef False - Return a simple array of rows and columns indexed by number counting from zero
+     *                             True - Return rows and columns indexed by their actual row and column IDs
+     * @param bool $ignoreHidden False - Return values for rows/columns even if they are defined as hidden.
+     *                            True - Don't return values for rows/columns that are defined as hidden.
+     *
+     * @return Generator<array>
+     */
+    public function rangeToArrayYieldRows(
+        string $range,
+        mixed $nullValue = null,
+        bool $calculateFormulas = true,
+        bool $formatData = true,
+        bool $returnCellRef = false,
+        bool $ignoreHidden = false,
+        bool $reduceArrays = false
+    ) {
+        $range = Validations::validateCellOrCellRange($range);
+
         //    Identify the range that we need to extract from the worksheet
-        [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($pRange);
+        [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($range);
         $minCol = Coordinate::stringFromColumnIndex($rangeStart[0]);
         $minRow = $rangeStart[1];
         $maxCol = Coordinate::stringFromColumnIndex($rangeEnd[0]);
         $maxRow = $rangeEnd[1];
+        $minColInt = $rangeStart[0];
+        $maxColInt = $rangeEnd[0];
 
         ++$maxCol;
+        /** @var array<string, bool> */
+        $hiddenColumns = [];
+        $nullRow = $this->buildNullRow($nullValue, $minCol, $maxCol, $returnCellRef, $ignoreHidden, $hiddenColumns);
+        $hideColumns = !empty($hiddenColumns);
+
+        $keys = $this->cellCollection->getSortedCoordinatesInt();
+        $keyIndex = 0;
+        $keysCount = count($keys);
         // Loop through rows
-        $r = -1;
         for ($row = $minRow; $row <= $maxRow; ++$row) {
-            $rRef = $returnCellRef ? $row : ++$r;
-            $c = -1;
-            // Loop through columns in the current row
-            for ($col = $minCol; $col != $maxCol; ++$col) {
-                $cRef = $returnCellRef ? $col : ++$c;
-                //    Using getCell() will create a new cell if it doesn't already exist. We don't want that to happen
-                //        so we test and retrieve directly against cellCollection
-                if ($this->cellCollection->has($col . $row)) {
-                    // Cell exists
-                    $cell = $this->cellCollection->get($col . $row);
-                    if ($cell->getValue() !== null) {
-                        if ($cell->getValue() instanceof RichText) {
-                            $returnValue[$rRef][$cRef] = $cell->getValue()->getPlainText();
-                        } else {
-                            if ($calculateFormulas) {
-                                $returnValue[$rRef][$cRef] = $cell->getCalculatedValue();
-                            } else {
-                                $returnValue[$rRef][$cRef] = $cell->getValue();
-                            }
-                        }
+            if (($ignoreHidden === true) && ($this->isRowVisible($row) === false)) {
+                continue;
+            }
+            $rowRef = $returnCellRef ? $row : ($row - $minRow);
+            $returnValue = $nullRow;
 
-                        if ($formatData) {
-                            $style = $this->parent->getCellXfByIndex($cell->getXfIndex());
-                            $returnValue[$rRef][$cRef] = NumberFormat::toFormattedString(
-                                $returnValue[$rRef][$cRef],
-                                ($style && $style->getNumberFormat()) ? $style->getNumberFormat()->getFormatCode() : NumberFormat::FORMAT_GENERAL
-                            );
+            $index = ($row - 1) * AddressRange::MAX_COLUMN_INT + 1;
+            $indexPlus = $index + AddressRange::MAX_COLUMN_INT - 1;
+            while ($keyIndex < $keysCount && $keys[$keyIndex] < $index) {
+                ++$keyIndex;
+            }
+            while ($keyIndex < $keysCount && $keys[$keyIndex] <= $indexPlus) {
+                $key = $keys[$keyIndex];
+                $thisRow = intdiv($key - 1, AddressRange::MAX_COLUMN_INT) + 1;
+                $thisCol = ($key % AddressRange::MAX_COLUMN_INT) ?: AddressRange::MAX_COLUMN_INT;
+                if ($thisCol >= $minColInt && $thisCol <= $maxColInt) {
+                    $col = Coordinate::stringFromColumnIndex($thisCol);
+                    if ($hideColumns === false || !isset($hiddenColumns[$col])) {
+                        $columnRef = $returnCellRef ? $col : ($thisCol - $minColInt);
+                        $cell = $this->cellCollection->get("{$col}{$thisRow}");
+                        if ($cell !== null) {
+                            $value = $this->cellToArray($cell, $calculateFormulas, $formatData, $nullValue);
+                            if ($reduceArrays) {
+                                while (is_array($value)) {
+                                    $value = array_shift($value);
+                                }
+                            }
+                            if ($value !== $nullValue) {
+                                $returnValue[$columnRef] = $value;
+                            }
                         }
-                    } else {
-                        // Cell holds a NULL
-                        $returnValue[$rRef][$cRef] = $nullValue;
                     }
-                } else {
-                    // Cell doesn't exist
-                    $returnValue[$rRef][$cRef] = $nullValue;
                 }
+                ++$keyIndex;
             }
+
+            yield $rowRef => $returnValue;
         }
+    }
 
-        // Return
-        return $returnValue;
+    /**
+     * Prepare a row data filled with null values to deduplicate the memory areas for empty rows.
+     *
+     * @param mixed $nullValue Value returned in the array entry if a cell doesn't exist
+     * @param string $minCol Start column of the range
+     * @param string $maxCol End column of the range
+     * @param bool $returnCellRef False - Return a simple array of rows and columns indexed by number counting from zero
+     *                              True - Return rows and columns indexed by their actual row and column IDs
+     * @param bool $ignoreHidden False - Return values for rows/columns even if they are defined as hidden.
+     *                             True - Don't return values for rows/columns that are defined as hidden.
+     * @param array<string, bool> $hiddenColumns
+     */
+    private function buildNullRow(
+        mixed $nullValue,
+        string $minCol,
+        string $maxCol,
+        bool $returnCellRef,
+        bool $ignoreHidden,
+        array &$hiddenColumns
+    ): array {
+        $nullRow = [];
+        $c = -1;
+        for ($col = $minCol; $col !== $maxCol; ++$col) {
+            if ($ignoreHidden === true && $this->columnDimensionExists($col) && $this->getColumnDimension($col)->getVisible() === false) {
+                $hiddenColumns[$col] = true;
+            } else {
+                $columnRef = $returnCellRef ? $col : ++$c;
+                $nullRow[$columnRef] = $nullValue;
+            }
+        }
+
+        return $nullRow;
     }
 
     private function validateNamedRange(string $definedName, bool $returnNullIfInvalid = false): ?DefinedName
@@ -2568,14 +3005,17 @@ private function validateNamedRange(string $definedName, bool $returnNullIfInval
             throw new Exception('Defined Named ' . $definedName . ' is a formula, not a range or cell.');
         }
 
-        if ($namedRange->getLocalOnly() && $this->getHashCode() !== $namedRange->getWorksheet()->getHashCode()) {
-            if ($returnNullIfInvalid) {
-                return null;
-            }
+        if ($namedRange->getLocalOnly()) {
+            $worksheet = $namedRange->getWorksheet();
+            if ($worksheet === null || $this->getHashCode() !== $worksheet->getHashCode()) {
+                if ($returnNullIfInvalid) {
+                    return null;
+                }
 
-            throw new Exception(
-                'Named range ' . $definedName . ' is not accessible from within sheet ' . $this->getTitle()
-            );
+                throw new Exception(
+                    'Named range ' . $definedName . ' is not accessible from within sheet ' . $this->getTitle()
+                );
+            }
         }
 
         return $namedRange;
@@ -2585,57 +3025,75 @@ private function validateNamedRange(string $definedName, bool $returnNullIfInval
      * Create array from a range of cells.
      *
      * @param string $definedName The Named Range that should be returned
-     * @param mixed $nullValue Value returned in the array entry if a cell doesn't exist
+     * @param null|bool|float|int|RichText|string $nullValue Value returned in the array entry if a cell doesn't exist
      * @param bool $calculateFormulas Should formulas be calculated?
      * @param bool $formatData Should formatting be applied to cell values?
      * @param bool $returnCellRef False - Return a simple array of rows and columns indexed by number counting from zero
-     *                                True - Return rows and columns indexed by their actual row and column IDs
-     *
-     * @return array
-     */
-    public function namedRangeToArray(string $definedName, $nullValue = null, $calculateFormulas = true, $formatData = true, $returnCellRef = false)
-    {
+     *                             True - Return rows and columns indexed by their actual row and column IDs
+     * @param bool $ignoreHidden False - Return values for rows/columns even if they are defined as hidden.
+     *                            True - Don't return values for rows/columns that are defined as hidden.
+     */
+    public function namedRangeToArray(
+        string $definedName,
+        mixed $nullValue = null,
+        bool $calculateFormulas = true,
+        bool $formatData = true,
+        bool $returnCellRef = false,
+        bool $ignoreHidden = false,
+        bool $reduceArrays = false
+    ): array {
+        $retVal = [];
         $namedRange = $this->validateNamedRange($definedName);
-        $workSheet = $namedRange->getWorksheet();
-        $cellRange = ltrim(substr($namedRange->getValue(), strrpos($namedRange->getValue(), '!')), '!');
-        $cellRange = str_replace('$', '', $cellRange);
+        if ($namedRange !== null) {
+            $cellRange = ltrim(substr($namedRange->getValue(), (int) strrpos($namedRange->getValue(), '!')), '!');
+            $cellRange = str_replace('$', '', $cellRange);
+            $workSheet = $namedRange->getWorksheet();
+            if ($workSheet !== null) {
+                $retVal = $workSheet->rangeToArray($cellRange, $nullValue, $calculateFormulas, $formatData, $returnCellRef, $ignoreHidden, $reduceArrays);
+            }
+        }
 
-        return $workSheet->rangeToArray($cellRange, $nullValue, $calculateFormulas, $formatData, $returnCellRef);
+        return $retVal;
     }
 
     /**
      * Create array from worksheet.
      *
-     * @param mixed $nullValue Value returned in the array entry if a cell doesn't exist
+     * @param null|bool|float|int|RichText|string $nullValue Value returned in the array entry if a cell doesn't exist
      * @param bool $calculateFormulas Should formulas be calculated?
      * @param bool $formatData Should formatting be applied to cell values?
      * @param bool $returnCellRef False - Return a simple array of rows and columns indexed by number counting from zero
-     *                               True - Return rows and columns indexed by their actual row and column IDs
-     *
-     * @return array
-     */
-    public function toArray($nullValue = null, $calculateFormulas = true, $formatData = true, $returnCellRef = false)
-    {
+     *                             True - Return rows and columns indexed by their actual row and column IDs
+     * @param bool $ignoreHidden False - Return values for rows/columns even if they are defined as hidden.
+     *                            True - Don't return values for rows/columns that are defined as hidden.
+     */
+    public function toArray(
+        mixed $nullValue = null,
+        bool $calculateFormulas = true,
+        bool $formatData = true,
+        bool $returnCellRef = false,
+        bool $ignoreHidden = false,
+        bool $reduceArrays = false
+    ): array {
         // Garbage collect...
         $this->garbageCollect();
+        $this->calculateArrays($calculateFormulas);
 
         //    Identify the range that we need to extract from the worksheet
         $maxCol = $this->getHighestColumn();
         $maxRow = $this->getHighestRow();
 
         // Return
-        return $this->rangeToArray('A1:' . $maxCol . $maxRow, $nullValue, $calculateFormulas, $formatData, $returnCellRef);
+        return $this->rangeToArray("A1:{$maxCol}{$maxRow}", $nullValue, $calculateFormulas, $formatData, $returnCellRef, $ignoreHidden, $reduceArrays);
     }
 
     /**
      * Get row iterator.
      *
      * @param int $startRow The row number at which to start iterating
-     * @param int $endRow The row number at which to stop iterating
-     *
-     * @return RowIterator
+     * @param ?int $endRow The row number at which to stop iterating
      */
-    public function getRowIterator($startRow = 1, $endRow = null)
+    public function getRowIterator(int $startRow = 1, ?int $endRow = null): RowIterator
     {
         return new RowIterator($this, $startRow, $endRow);
     }
@@ -2644,11 +3102,9 @@ public function getRowIterator($startRow = 1, $endRow = null)
      * Get column iterator.
      *
      * @param string $startColumn The column address at which to start iterating
-     * @param string $endColumn The column address at which to stop iterating
-     *
-     * @return ColumnIterator
+     * @param ?string $endColumn The column address at which to stop iterating
      */
-    public function getColumnIterator($startColumn = 'A', $endColumn = null)
+    public function getColumnIterator(string $startColumn = 'A', ?string $endColumn = null): ColumnIterator
     {
         return new ColumnIterator($this, $startColumn, $endColumn);
     }
@@ -2658,7 +3114,7 @@ public function getColumnIterator($startColumn = 'A', $endColumn = null)
      *
      * @return $this
      */
-    public function garbageCollect()
+    public function garbageCollect(): static
     {
         // Flush cache
         $this->cellCollection->get('A1');
@@ -2695,7 +3151,7 @@ public function garbageCollect()
      *
      * @return string Hash code
      */
-    public function getHashCode()
+    public function getHashCode(): string
     {
         if ($this->dirty) {
             $this->hash = md5($this->title . $this->autoFilter . ($this->protection->isProtectionEnabled() ? 't' : 'f') . __CLASS__);
@@ -2709,60 +3165,66 @@ public function getHashCode()
      * Extract worksheet title from range.
      *
      * Example: extractSheetTitle("testSheet!A1") ==> 'A1'
+     * Example: extractSheetTitle("testSheet!A1:C3") ==> 'A1:C3'
      * Example: extractSheetTitle("'testSheet 1'!A1", true) ==> ['testSheet 1', 'A1'];
+     * Example: extractSheetTitle("'testSheet 1'!A1:C3", true) ==> ['testSheet 1', 'A1:C3'];
+     * Example: extractSheetTitle("A1", true) ==> ['', 'A1'];
+     * Example: extractSheetTitle("A1:C3", true) ==> ['', 'A1:C3']
      *
-     * @param string $pRange Range to extract title from
+     * @param ?string $range Range to extract title from
      * @param bool $returnRange Return range? (see example)
      *
-     * @return mixed
+     * @return ($range is non-empty-string ? ($returnRange is true ? array{0: string, 1: string} : string) : ($returnRange is true ? array{0: null, 1: null} : null))
      */
-    public static function extractSheetTitle($pRange, $returnRange = false)
+    public static function extractSheetTitle(?string $range, bool $returnRange = false): array|null|string
     {
+        if (empty($range)) {
+            return $returnRange ? [null, null] : null;
+        }
+
         // Sheet title included?
-        if (($sep = strrpos($pRange, '!')) === false) {
-            return $returnRange ? ['', $pRange] : '';
+        if (($sep = strrpos($range, '!')) === false) {
+            return $returnRange ? ['', $range] : '';
         }
 
         if ($returnRange) {
-            return [substr($pRange, 0, $sep), substr($pRange, $sep + 1)];
+            return [substr($range, 0, $sep), substr($range, $sep + 1)];
         }
 
-        return substr($pRange, $sep + 1);
+        return substr($range, $sep + 1);
     }
 
     /**
      * Get hyperlink.
      *
-     * @param string $pCellCoordinate Cell coordinate to get hyperlink for, eg: 'A1'
-     *
-     * @return Hyperlink
+     * @param string $cellCoordinate Cell coordinate to get hyperlink for, eg: 'A1'
      */
-    public function getHyperlink($pCellCoordinate)
+    public function getHyperlink(string $cellCoordinate): Hyperlink
     {
         // return hyperlink if we already have one
-        if (isset($this->hyperlinkCollection[$pCellCoordinate])) {
-            return $this->hyperlinkCollection[$pCellCoordinate];
+        if (isset($this->hyperlinkCollection[$cellCoordinate])) {
+            return $this->hyperlinkCollection[$cellCoordinate];
         }
 
         // else create hyperlink
-        $this->hyperlinkCollection[$pCellCoordinate] = new Hyperlink();
+        $this->hyperlinkCollection[$cellCoordinate] = new Hyperlink();
 
-        return $this->hyperlinkCollection[$pCellCoordinate];
+        return $this->hyperlinkCollection[$cellCoordinate];
     }
 
     /**
      * Set hyperlink.
      *
-     * @param string $pCellCoordinate Cell coordinate to insert hyperlink, eg: 'A1'
+     * @param string $cellCoordinate Cell coordinate to insert hyperlink, eg: 'A1'
      *
      * @return $this
      */
-    public function setHyperlink($pCellCoordinate, ?Hyperlink $pHyperlink = null)
+    public function setHyperlink(string $cellCoordinate, ?Hyperlink $hyperlink = null): static
     {
-        if ($pHyperlink === null) {
-            unset($this->hyperlinkCollection[$pCellCoordinate]);
+        if ($hyperlink === null) {
+            unset($this->hyperlinkCollection[$cellCoordinate]);
         } else {
-            $this->hyperlinkCollection[$pCellCoordinate] = $pHyperlink;
+            $this->hyperlinkCollection[$cellCoordinate] = $hyperlink;
         }
 
         return $this;
@@ -2771,13 +3233,11 @@ public function setHyperlink($pCellCoordinate, ?Hyperlink $pHyperlink = null)
     /**
      * Hyperlink at a specific coordinate exists?
      *
-     * @param string $pCoordinate eg: 'A1'
-     *
-     * @return bool
+     * @param string $coordinate eg: 'A1'
      */
-    public function hyperlinkExists($pCoordinate)
+    public function hyperlinkExists(string $coordinate): bool
     {
-        return isset($this->hyperlinkCollection[$pCoordinate]);
+        return isset($this->hyperlinkCollection[$coordinate]);
     }
 
     /**
@@ -2785,7 +3245,7 @@ public function hyperlinkExists($pCoordinate)
      *
      * @return Hyperlink[]
      */
-    public function getHyperlinkCollection()
+    public function getHyperlinkCollection(): array
     {
         return $this->hyperlinkCollection;
     }
@@ -2793,36 +3253,34 @@ public function getHyperlinkCollection()
     /**
      * Get data validation.
      *
-     * @param string $pCellCoordinate Cell coordinate to get data validation for, eg: 'A1'
-     *
-     * @return DataValidation
+     * @param string $cellCoordinate Cell coordinate to get data validation for, eg: 'A1'
      */
-    public function getDataValidation($pCellCoordinate)
+    public function getDataValidation(string $cellCoordinate): DataValidation
     {
         // return data validation if we already have one
-        if (isset($this->dataValidationCollection[$pCellCoordinate])) {
-            return $this->dataValidationCollection[$pCellCoordinate];
+        if (isset($this->dataValidationCollection[$cellCoordinate])) {
+            return $this->dataValidationCollection[$cellCoordinate];
         }
 
         // else create data validation
-        $this->dataValidationCollection[$pCellCoordinate] = new DataValidation();
+        $this->dataValidationCollection[$cellCoordinate] = new DataValidation();
 
-        return $this->dataValidationCollection[$pCellCoordinate];
+        return $this->dataValidationCollection[$cellCoordinate];
     }
 
     /**
      * Set data validation.
      *
-     * @param string $pCellCoordinate Cell coordinate to insert data validation, eg: 'A1'
+     * @param string $cellCoordinate Cell coordinate to insert data validation, eg: 'A1'
      *
      * @return $this
      */
-    public function setDataValidation($pCellCoordinate, ?DataValidation $pDataValidation = null)
+    public function setDataValidation(string $cellCoordinate, ?DataValidation $dataValidation = null): static
     {
-        if ($pDataValidation === null) {
-            unset($this->dataValidationCollection[$pCellCoordinate]);
+        if ($dataValidation === null) {
+            unset($this->dataValidationCollection[$cellCoordinate]);
         } else {
-            $this->dataValidationCollection[$pCellCoordinate] = $pDataValidation;
+            $this->dataValidationCollection[$cellCoordinate] = $dataValidation;
         }
 
         return $this;
@@ -2831,13 +3289,11 @@ public function setDataValidation($pCellCoordinate, ?DataValidation $pDataValida
     /**
      * Data validation at a specific coordinate exists?
      *
-     * @param string $pCoordinate eg: 'A1'
-     *
-     * @return bool
+     * @param string $coordinate eg: 'A1'
      */
-    public function dataValidationExists($pCoordinate)
+    public function dataValidationExists(string $coordinate): bool
     {
-        return isset($this->dataValidationCollection[$pCoordinate]);
+        return isset($this->dataValidationCollection[$coordinate]);
     }
 
     /**
@@ -2845,7 +3301,7 @@ public function dataValidationExists($pCoordinate)
      *
      * @return DataValidation[]
      */
-    public function getDataValidationCollection()
+    public function getDataValidationCollection(): array
     {
         return $this->dataValidationCollection;
     }
@@ -2853,11 +3309,9 @@ public function getDataValidationCollection()
     /**
      * Accepts a range, returning it as a range that falls within the current highest row and column of the worksheet.
      *
-     * @param string $range
-     *
      * @return string Adjusted range value
      */
-    public function shrinkRangeToFit($range)
+    public function shrinkRangeToFit(string $range): string
     {
         $maxCol = $this->getHighestColumn();
         $maxRow = $this->getHighestRow();
@@ -2888,10 +3342,8 @@ public function shrinkRangeToFit($range)
 
     /**
      * Get tab color.
-     *
-     * @return Color
      */
-    public function getTabColor()
+    public function getTabColor(): Color
     {
         if ($this->tabColor === null) {
             $this->tabColor = new Color();
@@ -2905,7 +3357,7 @@ public function getTabColor()
      *
      * @return $this
      */
-    public function resetTabColor()
+    public function resetTabColor(): static
     {
         $this->tabColor = null;
 
@@ -2914,24 +3366,80 @@ public function resetTabColor()
 
     /**
      * Tab color set?
-     *
-     * @return bool
      */
-    public function isTabColorSet()
+    public function isTabColorSet(): bool
     {
         return $this->tabColor !== null;
     }
 
     /**
      * Copy worksheet (!= clone!).
-     *
-     * @return static
      */
-    public function copy()
+    public function copy(): static
     {
         return clone $this;
     }
 
+    /**
+     * Returns a boolean true if the specified row contains no cells. By default, this means that no cell records
+     *          exist in the collection for this row. false will be returned otherwise.
+     *     This rule can be modified by passing a $definitionOfEmptyFlags value:
+     *          1 - CellIterator::TREAT_NULL_VALUE_AS_EMPTY_CELL If the only cells in the collection are null value
+     *                  cells, then the row will be considered empty.
+     *          2 - CellIterator::TREAT_EMPTY_STRING_AS_EMPTY_CELL If the only cells in the collection are empty
+     *                  string value cells, then the row will be considered empty.
+     *          3 - CellIterator::TREAT_NULL_VALUE_AS_EMPTY_CELL | CellIterator::TREAT_EMPTY_STRING_AS_EMPTY_CELL
+     *                  If the only cells in the collection are null value or empty string value cells, then the row
+     *                  will be considered empty.
+     *
+     * @param int $definitionOfEmptyFlags
+     *              Possible Flag Values are:
+     *                  CellIterator::TREAT_NULL_VALUE_AS_EMPTY_CELL
+     *                  CellIterator::TREAT_EMPTY_STRING_AS_EMPTY_CELL
+     */
+    public function isEmptyRow(int $rowId, int $definitionOfEmptyFlags = 0): bool
+    {
+        try {
+            $iterator = new RowIterator($this, $rowId, $rowId);
+            $iterator->seek($rowId);
+            $row = $iterator->current();
+        } catch (Exception) {
+            return true;
+        }
+
+        return $row->isEmpty($definitionOfEmptyFlags);
+    }
+
+    /**
+     * Returns a boolean true if the specified column contains no cells. By default, this means that no cell records
+     *          exist in the collection for this column. false will be returned otherwise.
+     *     This rule can be modified by passing a $definitionOfEmptyFlags value:
+     *          1 - CellIterator::TREAT_NULL_VALUE_AS_EMPTY_CELL If the only cells in the collection are null value
+     *                  cells, then the column will be considered empty.
+     *          2 - CellIterator::TREAT_EMPTY_STRING_AS_EMPTY_CELL If the only cells in the collection are empty
+     *                  string value cells, then the column will be considered empty.
+     *          3 - CellIterator::TREAT_NULL_VALUE_AS_EMPTY_CELL | CellIterator::TREAT_EMPTY_STRING_AS_EMPTY_CELL
+     *                  If the only cells in the collection are null value or empty string value cells, then the column
+     *                  will be considered empty.
+     *
+     * @param int $definitionOfEmptyFlags
+     *              Possible Flag Values are:
+     *                  CellIterator::TREAT_NULL_VALUE_AS_EMPTY_CELL
+     *                  CellIterator::TREAT_EMPTY_STRING_AS_EMPTY_CELL
+     */
+    public function isEmptyColumn(string $columnId, int $definitionOfEmptyFlags = 0): bool
+    {
+        try {
+            $iterator = new ColumnIterator($this, $columnId, $columnId);
+            $iterator->seek($columnId);
+            $column = $iterator->current();
+        } catch (Exception) {
+            return true;
+        }
+
+        return $column->isEmpty($definitionOfEmptyFlags);
+    }
+
     /**
      * Implement PHP __clone to create a deep clone, not just a shallow copy.
      */
@@ -2951,10 +3459,23 @@ public function __clone()
                     $currentCollection = $this->drawingCollection;
                     $this->drawingCollection = new ArrayObject();
                     foreach ($currentCollection as $item) {
-                        if (is_object($item)) {
-                            $newDrawing = clone $item;
-                            $newDrawing->setWorksheet($this);
-                        }
+                        $newDrawing = clone $item;
+                        $newDrawing->setWorksheet($this);
+                    }
+                } elseif ($key == 'tableCollection') {
+                    $currentCollection = $this->tableCollection;
+                    $this->tableCollection = new ArrayObject();
+                    foreach ($currentCollection as $item) {
+                        $newTable = clone $item;
+                        $newTable->setName($item->getName() . 'clone');
+                        $this->addTable($newTable);
+                    }
+                } elseif ($key == 'chartCollection') {
+                    $currentCollection = $this->chartCollection;
+                    $this->chartCollection = new ArrayObject();
+                    foreach ($currentCollection as $item) {
+                        $newChart = clone $item;
+                        $this->addChart($newChart);
                     }
                 } elseif (($key == 'autoFilter') && ($this->autoFilter instanceof AutoFilter)) {
                     $newAutoFilter = clone $this->autoFilter;
@@ -2970,78 +3491,251 @@ public function __clone()
     /**
      * Define the code name of the sheet.
      *
-     * @param string $pValue Same rule as Title minus space not allowed (but, like Excel, change
+     * @param string $codeName Same rule as Title minus space not allowed (but, like Excel, change
      *                       silently space to underscore)
      * @param bool $validate False to skip validation of new title. WARNING: This should only be set
      *                       at parse time (by Readers), where titles can be assumed to be valid.
      *
      * @return $this
      */
-    public function setCodeName($pValue, $validate = true)
+    public function setCodeName(string $codeName, bool $validate = true): static
     {
         // Is this a 'rename' or not?
-        if ($this->getCodeName() == $pValue) {
+        if ($this->getCodeName() == $codeName) {
             return $this;
         }
 
         if ($validate) {
-            $pValue = str_replace(' ', '_', $pValue); //Excel does this automatically without flinching, we are doing the same
+            $codeName = str_replace(' ', '_', $codeName); //Excel does this automatically without flinching, we are doing the same
 
             // Syntax check
             // throw an exception if not valid
-            self::checkSheetCodeName($pValue);
+            self::checkSheetCodeName($codeName);
 
             // We use the same code that setTitle to find a valid codeName else not using a space (Excel don't like) but a '_'
 
-            if ($this->getParent()) {
+            if ($this->parent !== null) {
                 // Is there already such sheet name?
-                if ($this->getParent()->sheetCodeNameExists($pValue)) {
+                if ($this->parent->sheetCodeNameExists($codeName)) {
                     // Use name, but append with lowest possible integer
 
-                    if (Shared\StringHelper::countCharacters($pValue) > 29) {
-                        $pValue = Shared\StringHelper::substring($pValue, 0, 29);
+                    if (Shared\StringHelper::countCharacters($codeName) > 29) {
+                        $codeName = Shared\StringHelper::substring($codeName, 0, 29);
                     }
                     $i = 1;
-                    while ($this->getParent()->sheetCodeNameExists($pValue . '_' . $i)) {
+                    while ($this->getParentOrThrow()->sheetCodeNameExists($codeName . '_' . $i)) {
                         ++$i;
                         if ($i == 10) {
-                            if (Shared\StringHelper::countCharacters($pValue) > 28) {
-                                $pValue = Shared\StringHelper::substring($pValue, 0, 28);
+                            if (Shared\StringHelper::countCharacters($codeName) > 28) {
+                                $codeName = Shared\StringHelper::substring($codeName, 0, 28);
                             }
                         } elseif ($i == 100) {
-                            if (Shared\StringHelper::countCharacters($pValue) > 27) {
-                                $pValue = Shared\StringHelper::substring($pValue, 0, 27);
+                            if (Shared\StringHelper::countCharacters($codeName) > 27) {
+                                $codeName = Shared\StringHelper::substring($codeName, 0, 27);
                             }
                         }
                     }
 
-                    $pValue .= '_' . $i; // ok, we have a valid name
+                    $codeName .= '_' . $i; // ok, we have a valid name
                 }
             }
         }
 
-        $this->codeName = $pValue;
+        $this->codeName = $codeName;
 
         return $this;
     }
 
     /**
      * Return the code name of the sheet.
-     *
-     * @return null|string
      */
-    public function getCodeName()
+    public function getCodeName(): ?string
     {
         return $this->codeName;
     }
 
     /**
      * Sheet has a code name ?
-     *
-     * @return bool
      */
-    public function hasCodeName()
+    public function hasCodeName(): bool
     {
         return $this->codeName !== null;
     }
+
+    public static function nameRequiresQuotes(string $sheetName): bool
+    {
+        return preg_match(self::SHEET_NAME_REQUIRES_NO_QUOTES, $sheetName) !== 1;
+    }
+
+    public function isRowVisible(int $row): bool
+    {
+        return !$this->rowDimensionExists($row) || $this->getRowDimension($row)->getVisible();
+    }
+
+    /**
+     * Same as Cell->isLocked, but without creating cell if it doesn't exist.
+     */
+    public function isCellLocked(string $coordinate): bool
+    {
+        if ($this->getProtection()->getsheet() !== true) {
+            return false;
+        }
+        if ($this->cellExists($coordinate)) {
+            return $this->getCell($coordinate)->isLocked();
+        }
+        $spreadsheet = $this->parent;
+        $xfIndex = $this->getXfIndex($coordinate);
+        if ($spreadsheet === null || $xfIndex === null) {
+            return true;
+        }
+
+        return $spreadsheet->getCellXfByIndex($xfIndex)->getProtection()->getLocked() !== StyleProtection::PROTECTION_UNPROTECTED;
+    }
+
+    /**
+     * Same as Cell->isHiddenOnFormulaBar, but without creating cell if it doesn't exist.
+     */
+    public function isCellHiddenOnFormulaBar(string $coordinate): bool
+    {
+        if ($this->cellExists($coordinate)) {
+            return $this->getCell($coordinate)->isHiddenOnFormulaBar();
+        }
+
+        // cell doesn't exist, therefore isn't a formula,
+        // therefore isn't hidden on formula bar.
+        return false;
+    }
+
+    private function getXfIndex(string $coordinate): ?int
+    {
+        [$column, $row] = Coordinate::coordinateFromString($coordinate);
+        $row = (int) $row;
+        $xfIndex = null;
+        if ($this->rowDimensionExists($row)) {
+            $xfIndex = $this->getRowDimension($row)->getXfIndex();
+        }
+        if ($xfIndex === null && $this->ColumnDimensionExists($column)) {
+            $xfIndex = $this->getColumnDimension($column)->getXfIndex();
+        }
+
+        return $xfIndex;
+    }
+
+    private string $backgroundImage = '';
+
+    private string $backgroundMime = '';
+
+    private string $backgroundExtension = '';
+
+    public function getBackgroundImage(): string
+    {
+        return $this->backgroundImage;
+    }
+
+    public function getBackgroundMime(): string
+    {
+        return $this->backgroundMime;
+    }
+
+    public function getBackgroundExtension(): string
+    {
+        return $this->backgroundExtension;
+    }
+
+    /**
+     * Set background image.
+     * Used on read/write for Xlsx.
+     * Used on write for Html.
+     *
+     * @param string $backgroundImage Image represented as a string, e.g. results of file_get_contents
+     */
+    public function setBackgroundImage(string $backgroundImage): self
+    {
+        $imageArray = getimagesizefromstring($backgroundImage) ?: ['mime' => ''];
+        $mime = $imageArray['mime'];
+        if ($mime !== '') {
+            $extension = explode('/', $mime);
+            $extension = $extension[1];
+            $this->backgroundImage = $backgroundImage;
+            $this->backgroundMime = $mime;
+            $this->backgroundExtension = $extension;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Copy cells, adjusting relative cell references in formulas.
+     * Acts similarly to Excel "fill handle" feature.
+     *
+     * @param string $fromCell Single source cell, e.g. C3
+     * @param string $toCells Single cell or cell range, e.g. C4 or C4:C10
+     * @param bool $copyStyle Copy styles as well as values, defaults to true
+     */
+    public function copyCells(string $fromCell, string $toCells, bool $copyStyle = true): void
+    {
+        $toArray = Coordinate::extractAllCellReferencesInRange($toCells);
+        $valueString = $this->getCell($fromCell)->getValueString();
+        $style = $this->getStyle($fromCell)->exportArray();
+        $fromIndexes = Coordinate::indexesFromString($fromCell);
+        $referenceHelper = ReferenceHelper::getInstance();
+        foreach ($toArray as $destination) {
+            if ($destination !== $fromCell) {
+                $toIndexes = Coordinate::indexesFromString($destination);
+                $this->getCell($destination)->setValue($referenceHelper->updateFormulaReferences($valueString, 'A1', $toIndexes[0] - $fromIndexes[0], $toIndexes[1] - $fromIndexes[1]));
+                if ($copyStyle) {
+                    $this->getCell($destination)->getStyle()->applyFromArray($style);
+                }
+            }
+        }
+    }
+
+    public function calculateArrays(bool $preCalculateFormulas = true): void
+    {
+        if ($preCalculateFormulas && Calculation::getInstance($this->parent)->getInstanceArrayReturnType() === Calculation::RETURN_ARRAY_AS_ARRAY) {
+            $keys = $this->cellCollection->getCoordinates();
+            foreach ($keys as $key) {
+                if ($this->getCell($key)->getDataType() === DataType::TYPE_FORMULA) {
+                    $this->getCell($key)->getCalculatedValue();
+                }
+            }
+        }
+    }
+
+    public function isCellInSpillRange(string $coordinate): bool
+    {
+        if (Calculation::getInstance($this->parent)->getInstanceArrayReturnType() !== Calculation::RETURN_ARRAY_AS_ARRAY) {
+            return false;
+        }
+        $this->calculateArrays();
+        $keys = $this->cellCollection->getCoordinates();
+        foreach ($keys as $key) {
+            $attributes = $this->getCell($key)->getFormulaAttributes();
+            if (isset($attributes['ref'])) {
+                if (Coordinate::coordinateIsInsideRange($attributes['ref'], $coordinate)) {
+                    // false for first cell in range, true otherwise
+                    return $coordinate !== $key;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    public function applyStylesFromArray(string $coordinate, array $styleArray): bool
+    {
+        $spreadsheet = $this->parent;
+        if ($spreadsheet === null) {
+            return false;
+        }
+        $activeSheetIndex = $spreadsheet->getActiveSheetIndex();
+        $originalSelected = $this->selectedCells;
+        $this->getStyle($coordinate)->applyFromArray($styleArray);
+        $this->setSelectedCells($originalSelected);
+        if ($activeSheetIndex >= 0) {
+            $spreadsheet->setActiveSheetIndex($activeSheetIndex);
+        }
+
+        return true;
+    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/BaseWriter.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/BaseWriter.php
index afda5c433e..3883244156 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/BaseWriter.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/BaseWriter.php
@@ -6,94 +6,93 @@ abstract class BaseWriter implements IWriter
 {
     /**
      * Write charts that are defined in the workbook?
-     * Identifies whether the Writer should write definitions for any charts that exist in the PhpSpreadsheet object;.
-     *
-     * @var bool
+     * Identifies whether the Writer should write definitions for any charts that exist in the PhpSpreadsheet object.
      */
-    protected $includeCharts = false;
+    protected bool $includeCharts = false;
 
     /**
      * Pre-calculate formulas
      * Forces PhpSpreadsheet to recalculate all formulae in a workbook when saving, so that the pre-calculated values are
      * immediately available to MS Excel or other office spreadsheet viewer when opening the file.
-     *
-     * @var bool
      */
-    protected $preCalculateFormulas = true;
+    protected bool $preCalculateFormulas = true;
 
     /**
      * Use disk caching where possible?
-     *
-     * @var bool
      */
-    private $useDiskCaching = false;
+    private bool $useDiskCaching = false;
 
     /**
      * Disk caching directory.
-     *
-     * @var string
      */
-    private $diskCachingDirectory = './';
+    private string $diskCachingDirectory = './';
 
     /**
      * @var resource
      */
     protected $fileHandle;
 
-    /**
-     * @var bool
-     */
-    private $shouldCloseFile;
+    private bool $shouldCloseFile;
 
-    public function getIncludeCharts()
+    public function getIncludeCharts(): bool
     {
         return $this->includeCharts;
     }
 
-    public function setIncludeCharts($pValue)
+    public function setIncludeCharts(bool $includeCharts): self
     {
-        $this->includeCharts = (bool) $pValue;
+        $this->includeCharts = $includeCharts;
 
         return $this;
     }
 
-    public function getPreCalculateFormulas()
+    public function getPreCalculateFormulas(): bool
     {
         return $this->preCalculateFormulas;
     }
 
-    public function setPreCalculateFormulas($pValue)
+    public function setPreCalculateFormulas(bool $precalculateFormulas): self
     {
-        $this->preCalculateFormulas = (bool) $pValue;
+        $this->preCalculateFormulas = $precalculateFormulas;
 
         return $this;
     }
 
-    public function getUseDiskCaching()
+    public function getUseDiskCaching(): bool
     {
         return $this->useDiskCaching;
     }
 
-    public function setUseDiskCaching($pValue, $pDirectory = null)
+    public function setUseDiskCaching(bool $useDiskCache, ?string $cacheDirectory = null): self
     {
-        $this->useDiskCaching = $pValue;
+        $this->useDiskCaching = $useDiskCache;
 
-        if ($pDirectory !== null) {
-            if (is_dir($pDirectory)) {
-                $this->diskCachingDirectory = $pDirectory;
+        if ($cacheDirectory !== null) {
+            if (is_dir($cacheDirectory)) {
+                $this->diskCachingDirectory = $cacheDirectory;
             } else {
-                throw new Exception("Directory does not exist: $pDirectory");
+                throw new Exception("Directory does not exist: $cacheDirectory");
             }
         }
 
         return $this;
     }
 
-    public function getDiskCachingDirectory()
+    public function getDiskCachingDirectory(): string
     {
         return $this->diskCachingDirectory;
     }
 
+    protected function processFlags(int $flags): void
+    {
+        if (((bool) ($flags & self::SAVE_WITH_CHARTS)) === true) {
+            $this->setIncludeCharts(true);
+        }
+        if (((bool) ($flags & self::DISABLE_PRECALCULATE_FORMULAE)) === true) {
+            $this->setPreCalculateFormulas(false);
+        }
+    }
+
     /**
      * Open file handle.
      *
@@ -108,7 +107,14 @@ public function openFileHandle($filename): void
             return;
         }
 
-        $fileHandle = $filename ? fopen($filename, 'wb+') : false;
+        $mode = 'wb';
+        $scheme = parse_url($filename, PHP_URL_SCHEME);
+        if ($scheme === 's3') {
+            // @codeCoverageIgnoreStart
+            $mode = 'w';
+            // @codeCoverageIgnoreEnd
+        }
+        $fileHandle = $filename ? fopen($filename, $mode) : false;
         if ($fileHandle === false) {
             throw new Exception('Could not open file "' . $filename . '" for writing.');
         }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Csv.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Csv.php
index 188a83a803..d15bc654c2 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Csv.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Csv.php
@@ -3,78 +3,67 @@
 namespace PhpOffice\PhpSpreadsheet\Writer;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use Stringable;
 
 class Csv extends BaseWriter
 {
     /**
      * PhpSpreadsheet object.
-     *
-     * @var Spreadsheet
      */
-    private $spreadsheet;
+    private Spreadsheet $spreadsheet;
 
     /**
      * Delimiter.
-     *
-     * @var string
      */
-    private $delimiter = ',';
+    private string $delimiter = ',';
 
     /**
      * Enclosure.
-     *
-     * @var string
      */
-    private $enclosure = '"';
+    private string $enclosure = '"';
 
     /**
      * Line ending.
-     *
-     * @var string
      */
-    private $lineEnding = PHP_EOL;
+    private string $lineEnding = PHP_EOL;
 
     /**
      * Sheet index to write.
-     *
-     * @var int
      */
-    private $sheetIndex = 0;
+    private int $sheetIndex = 0;
 
     /**
-     * Whether to write a BOM (for UTF8).
-     *
-     * @var bool
+     * Whether to write a UTF8 BOM.
      */
-    private $useBOM = false;
+    private bool $useBOM = false;
 
     /**
      * Whether to write a Separator line as the first line of the file
      *     sep=x.
-     *
-     * @var bool
      */
-    private $includeSeparatorLine = false;
+    private bool $includeSeparatorLine = false;
 
     /**
      * Whether to write a fully Excel compatible CSV file.
-     *
-     * @var bool
      */
-    private $excelCompatibility = false;
+    private bool $excelCompatibility = false;
 
     /**
      * Output encoding.
-     *
-     * @var string
      */
-    private $outputEncoding = '';
+    private string $outputEncoding = '';
+
+    /**
+     * Whether number of columns should be allowed to vary
+     * between rows, or use a fixed range based on the max
+     * column overall.
+     */
+    private bool $variableColumns = false;
 
     /**
      * Create a new CSV.
-     *
-     * @param Spreadsheet $spreadsheet Spreadsheet object
      */
     public function __construct(Spreadsheet $spreadsheet)
     {
@@ -84,20 +73,21 @@ public function __construct(Spreadsheet $spreadsheet)
     /**
      * Save PhpSpreadsheet to file.
      *
-     * @param resource|string $pFilename
+     * @param resource|string $filename
      */
-    public function save($pFilename): void
+    public function save($filename, int $flags = 0): void
     {
+        $this->processFlags($flags);
+
         // Fetch sheet
         $sheet = $this->spreadsheet->getSheet($this->sheetIndex);
 
         $saveDebugLog = Calculation::getInstance($this->spreadsheet)->getDebugLog()->getWriteDebugLog();
         Calculation::getInstance($this->spreadsheet)->getDebugLog()->setWriteDebugLog(false);
-        $saveArrayReturnType = Calculation::getArrayReturnType();
-        Calculation::setArrayReturnType(Calculation::RETURN_ARRAY_AS_VALUE);
+        $sheet->calculateArrays($this->preCalculateFormulas);
 
         // Open file
-        $this->openFileHandle($pFilename);
+        $this->openFileHandle($filename);
 
         if ($this->excelCompatibility) {
             $this->setUseBOM(true); //  Enforce UTF-8 BOM Header
@@ -122,144 +112,100 @@ public function save($pFilename): void
         $maxRow = $sheet->getHighestDataRow();
 
         // Write rows to file
-        for ($row = 1; $row <= $maxRow; ++$row) {
-            // Convert the row to an array...
-            $cellsArray = $sheet->rangeToArray('A' . $row . ':' . $maxCol . $row, '', $this->preCalculateFormulas);
-            // ... and write to the file
-            $this->writeLine($this->fileHandle, $cellsArray[0]);
+        $row = 0;
+        foreach ($sheet->rangeToArrayYieldRows("A1:$maxCol$maxRow", '', $this->preCalculateFormulas) as $cellsArray) {
+            ++$row;
+            if ($this->variableColumns) {
+                $column = $sheet->getHighestDataColumn($row);
+                if ($column === 'A' && !$sheet->cellExists("A$row")) {
+                    $cellsArray = [];
+                } else {
+                    array_splice($cellsArray, Coordinate::columnIndexFromString($column));
+                }
+            }
+            $this->writeLine($this->fileHandle, $cellsArray);
         }
 
         $this->maybeCloseFileHandle();
-        Calculation::setArrayReturnType($saveArrayReturnType);
         Calculation::getInstance($this->spreadsheet)->getDebugLog()->setWriteDebugLog($saveDebugLog);
     }
 
-    /**
-     * Get delimiter.
-     *
-     * @return string
-     */
-    public function getDelimiter()
+    public function getDelimiter(): string
     {
         return $this->delimiter;
     }
 
-    /**
-     * Set delimiter.
-     *
-     * @param string $pValue Delimiter, defaults to ','
-     *
-     * @return $this
-     */
-    public function setDelimiter($pValue)
+    public function setDelimiter(string $delimiter): self
     {
-        $this->delimiter = $pValue;
+        $this->delimiter = $delimiter;
 
         return $this;
     }
 
-    /**
-     * Get enclosure.
-     *
-     * @return string
-     */
-    public function getEnclosure()
+    public function getEnclosure(): string
     {
         return $this->enclosure;
     }
 
-    /**
-     * Set enclosure.
-     *
-     * @param string $pValue Enclosure, defaults to "
-     *
-     * @return $this
-     */
-    public function setEnclosure($pValue = '"')
+    public function setEnclosure(string $enclosure = '"'): self
     {
-        $this->enclosure = $pValue;
+        $this->enclosure = $enclosure;
 
         return $this;
     }
 
-    /**
-     * Get line ending.
-     *
-     * @return string
-     */
-    public function getLineEnding()
+    public function getLineEnding(): string
     {
         return $this->lineEnding;
     }
 
-    /**
-     * Set line ending.
-     *
-     * @param string $pValue Line ending, defaults to OS line ending (PHP_EOL)
-     *
-     * @return $this
-     */
-    public function setLineEnding($pValue)
+    public function setLineEnding(string $lineEnding): self
     {
-        $this->lineEnding = $pValue;
+        $this->lineEnding = $lineEnding;
 
         return $this;
     }
 
     /**
      * Get whether BOM should be used.
-     *
-     * @return bool
      */
-    public function getUseBOM()
+    public function getUseBOM(): bool
     {
         return $this->useBOM;
     }
 
     /**
-     * Set whether BOM should be used.
-     *
-     * @param bool $pValue Use UTF-8 byte-order mark? Defaults to false
-     *
-     * @return $this
+     * Set whether BOM should be used, typically when non-ASCII characters are used.
      */
-    public function setUseBOM($pValue)
+    public function setUseBOM(bool $useBOM): self
     {
-        $this->useBOM = $pValue;
+        $this->useBOM = $useBOM;
 
         return $this;
     }
 
     /**
      * Get whether a separator line should be included.
-     *
-     * @return bool
      */
-    public function getIncludeSeparatorLine()
+    public function getIncludeSeparatorLine(): bool
     {
         return $this->includeSeparatorLine;
     }
 
     /**
      * Set whether a separator line should be included as the first line of the file.
-     *
-     * @param bool $pValue Use separator line? Defaults to false
-     *
-     * @return $this
      */
-    public function setIncludeSeparatorLine($pValue)
+    public function setIncludeSeparatorLine(bool $includeSeparatorLine): self
     {
-        $this->includeSeparatorLine = $pValue;
+        $this->includeSeparatorLine = $includeSeparatorLine;
 
         return $this;
     }
 
     /**
      * Get whether the file should be saved with full Excel Compatibility.
-     *
-     * @return bool
      */
-    public function getExcelCompatibility()
+    public function getExcelCompatibility(): bool
     {
         return $this->excelCompatibility;
     }
@@ -267,67 +213,41 @@ public function getExcelCompatibility()
     /**
      * Set whether the file should be saved with full Excel Compatibility.
      *
-     * @param bool $pValue Set the file to be written as a fully Excel compatible csv file
+     * @param bool $excelCompatibility Set the file to be written as a fully Excel compatible csv file
      *                                Note that this overrides other settings such as useBOM, enclosure and delimiter
-     *
-     * @return $this
      */
-    public function setExcelCompatibility($pValue)
+    public function setExcelCompatibility(bool $excelCompatibility): self
     {
-        $this->excelCompatibility = $pValue;
+        $this->excelCompatibility = $excelCompatibility;
 
         return $this;
     }
 
-    /**
-     * Get sheet index.
-     *
-     * @return int
-     */
-    public function getSheetIndex()
+    public function getSheetIndex(): int
     {
         return $this->sheetIndex;
     }
 
-    /**
-     * Set sheet index.
-     *
-     * @param int $pValue Sheet index
-     *
-     * @return $this
-     */
-    public function setSheetIndex($pValue)
+    public function setSheetIndex(int $sheetIndex): self
     {
-        $this->sheetIndex = $pValue;
+        $this->sheetIndex = $sheetIndex;
 
         return $this;
     }
 
-    /**
-     * Get output encoding.
-     *
-     * @return string
-     */
-    public function getOutputEncoding()
+    public function getOutputEncoding(): string
     {
         return $this->outputEncoding;
     }
 
-    /**
-     * Set output encoding.
-     *
-     * @param string $pValue Output encoding
-     *
-     * @return $this
-     */
-    public function setOutputEncoding($pValue)
+    public function setOutputEncoding(string $outputEnconding): self
     {
-        $this->outputEncoding = $pValue;
+        $this->outputEncoding = $outputEnconding;
 
         return $this;
     }
 
-    private $enclosureRequired = true;
+    private bool $enclosureRequired = true;
 
     public function setEnclosureRequired(bool $value): self
     {
@@ -341,13 +261,27 @@ public function getEnclosureRequired(): bool
         return $this->enclosureRequired;
     }
 
+    /**
+     * Convert boolean to TRUE/FALSE; otherwise return element cast to string.
+     *
+     * @param null|bool|float|int|string|Stringable $element element to be converted
+     */
+    private static function elementToString(mixed $element): string
+    {
+        if (is_bool($element)) {
+            return $element ? 'TRUE' : 'FALSE';
+        }
+
+        return (string) $element;
+    }
+
     /**
      * Write line to CSV file.
      *
-     * @param resource $pFileHandle PHP filehandle
-     * @param array $pValues Array containing values in a row
+     * @param resource $fileHandle PHP filehandle
+     * @param array $values Array containing values in a row
      */
-    private function writeLine($pFileHandle, array $pValues): void
+    private function writeLine($fileHandle, array $values): void
     {
         // No leading delimiter
         $delimiter = '';
@@ -355,7 +289,9 @@ private function writeLine($pFileHandle, array $pValues): void
         // Build the line
         $line = '';
 
-        foreach ($pValues as $element) {
+        /** @var null|bool|float|int|string|Stringable $element */
+        foreach ($values as $element) {
+            $element = self::elementToString($element);
             // Add delimiter
             $line .= $delimiter;
             $delimiter = $this->delimiter;
@@ -381,6 +317,28 @@ private function writeLine($pFileHandle, array $pValues): void
         if ($this->outputEncoding != '') {
             $line = mb_convert_encoding($line, $this->outputEncoding);
         }
-        fwrite($pFileHandle, $line);
+        fwrite($fileHandle, $line);
+    }
+
+    /**
+     * Get whether number of columns should be allowed to vary
+     * between rows, or use a fixed range based on the max
+     * column overall.
+     */
+    public function getVariableColumns(): bool
+    {
+        return $this->variableColumns;
+    }
+
+    /**
+     * Set whether number of columns should be allowed to vary
+     * between rows, or use a fixed range based on the max
+     * column overall.
+     */
+    public function setVariableColumns(bool $pValue): self
+    {
+        $this->variableColumns = $pValue;
+
+        return $this;
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Html.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Html.php
index 0e7f788b47..6f607e421f 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Html.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Html.php
@@ -2,13 +2,16 @@
 
 namespace PhpOffice\PhpSpreadsheet\Writer;
 
-use HTMLPurifier;
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Cell\Cell;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Chart\Chart;
+use PhpOffice\PhpSpreadsheet\Comment;
+use PhpOffice\PhpSpreadsheet\Document\Properties;
 use PhpOffice\PhpSpreadsheet\RichText\RichText;
 use PhpOffice\PhpSpreadsheet\RichText\Run;
+use PhpOffice\PhpSpreadsheet\Settings;
+use PhpOffice\PhpSpreadsheet\Shared\Date;
 use PhpOffice\PhpSpreadsheet\Shared\Drawing as SharedDrawing;
 use PhpOffice\PhpSpreadsheet\Shared\File;
 use PhpOffice\PhpSpreadsheet\Shared\Font as SharedFont;
@@ -21,116 +24,109 @@
 use PhpOffice\PhpSpreadsheet\Style\Font;
 use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
 use PhpOffice\PhpSpreadsheet\Style\Style;
+use PhpOffice\PhpSpreadsheet\Worksheet\BaseDrawing;
 use PhpOffice\PhpSpreadsheet\Worksheet\Drawing;
 use PhpOffice\PhpSpreadsheet\Worksheet\MemoryDrawing;
+use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 
 class Html extends BaseWriter
 {
+    private const DEFAULT_CELL_WIDTH_POINTS = 42;
+
+    private const DEFAULT_CELL_WIDTH_PIXELS = 56;
+
+    /**
+     * Migration aid to tell if html tags will be treated as plaintext in comments.
+     *     if (
+     *         defined(
+     *             \PhpOffice\PhpSpreadsheet\Writer\Html::class
+     *             . '::COMMENT_HTML_TAGS_PLAINTEXT'
+     *         )
+     *     ) {
+     *         new logic with styling in TextRun elements
+     *     } else {
+     *         old logic with styling via Html tags
+     *     }.
+     */
+    public const COMMENT_HTML_TAGS_PLAINTEXT = true;
+
     /**
      * Spreadsheet object.
-     *
-     * @var Spreadsheet
      */
-    protected $spreadsheet;
+    protected Spreadsheet $spreadsheet;
 
     /**
      * Sheet index to write.
-     *
-     * @var null|int
      */
-    private $sheetIndex = 0;
+    private ?int $sheetIndex = 0;
 
     /**
      * Images root.
-     *
-     * @var string
      */
-    private $imagesRoot = '';
+    private string $imagesRoot = '';
 
     /**
      * embed images, or link to images.
-     *
-     * @var bool
      */
-    private $embedImages = false;
+    protected bool $embedImages = false;
 
     /**
      * Use inline CSS?
-     *
-     * @var bool
      */
-    private $useInlineCss = false;
-
-    /**
-     * Use embedded CSS?
-     *
-     * @var bool
-     */
-    private $useEmbeddedCSS = true;
+    private bool $useInlineCss = false;
 
     /**
      * Array of CSS styles.
-     *
-     * @var array
      */
-    private $cssStyles;
+    private ?array $cssStyles = null;
 
     /**
      * Array of column widths in points.
-     *
-     * @var array
      */
-    private $columnWidths;
+    private array $columnWidths;
 
     /**
      * Default font.
-     *
-     * @var Font
      */
-    private $defaultFont;
+    private Font $defaultFont;
 
     /**
      * Flag whether spans have been calculated.
-     *
-     * @var bool
      */
-    private $spansAreCalculated = false;
+    private bool $spansAreCalculated = false;
 
     /**
      * Excel cells that should not be written as HTML cells.
-     *
-     * @var array
      */
-    private $isSpannedCell = [];
+    private array $isSpannedCell = [];
 
     /**
      * Excel cells that are upper-left corner in a cell merge.
-     *
-     * @var array
      */
-    private $isBaseCell = [];
+    private array $isBaseCell = [];
 
     /**
      * Excel rows that should not be written as HTML rows.
-     *
-     * @var array
      */
-    private $isSpannedRow = [];
+    private array $isSpannedRow = [];
 
     /**
      * Is the current writer creating PDF?
+     */
+    protected bool $isPdf = false;
+
+    /**
+     * Is the current writer creating mPDF?
      *
-     * @var bool
+     * @deprecated 2.0.1 use instanceof Mpdf instead
      */
-    protected $isPdf = false;
+    protected bool $isMPdf = false;
 
     /**
      * Generate the Navigation block.
-     *
-     * @var bool
      */
-    private $generateSheetNavigationBlock = true;
+    private bool $generateSheetNavigationBlock = true;
 
     /**
      * Callback for editing generated html.
@@ -139,6 +135,12 @@ class Html extends BaseWriter
      */
     private $editHtmlCallback;
 
+    /** @var BaseDrawing[] */
+    private $sheetDrawings;
+
+    /** @var Chart[] */
+    private $sheetCharts;
+
     /**
      * Create a new HTML.
      */
@@ -151,12 +153,14 @@ public function __construct(Spreadsheet $spreadsheet)
     /**
      * Save Spreadsheet to file.
      *
-     * @param resource|string $pFilename
+     * @param resource|string $filename
      */
-    public function save($pFilename): void
+    public function save($filename, int $flags = 0): void
     {
+        $this->processFlags($flags);
+
         // Open file
-        $this->openFileHandle($pFilename);
+        $this->openFileHandle($filename);
 
         // Write html
         fwrite($this->fileHandle, $this->generateHTMLAll());
@@ -167,18 +171,18 @@ public function save($pFilename): void
 
     /**
      * Save Spreadsheet as html to variable.
-     *
-     * @return string
      */
-    public function generateHtmlAll()
+    public function generateHtmlAll(): string
     {
+        $sheets = $this->generateSheetPrep();
+        foreach ($sheets as $sheet) {
+            $sheet->calculateArrays($this->preCalculateFormulas);
+        }
         // garbage collect
         $this->spreadsheet->garbageCollect();
 
         $saveDebugLog = Calculation::getInstance($this->spreadsheet)->getDebugLog()->getWriteDebugLog();
         Calculation::getInstance($this->spreadsheet)->getDebugLog()->setWriteDebugLog(false);
-        $saveArrayReturnType = Calculation::getArrayReturnType();
-        Calculation::setArrayReturnType(Calculation::RETURN_ARRAY_AS_VALUE);
 
         // Build CSS
         $this->buildCSS(!$this->useInlineCss);
@@ -203,7 +207,6 @@ public function generateHtmlAll()
             $html = $callback($html);
         }
 
-        Calculation::setArrayReturnType($saveArrayReturnType);
         Calculation::getInstance($this->spreadsheet)->getDebugLog()->setWriteDebugLog($saveDebugLog);
 
         return $html;
@@ -220,47 +223,29 @@ public function setEditHtmlCallback(?callable $callback): void
         $this->editHtmlCallback = $callback;
     }
 
-    const VALIGN_ARR = [
-        Alignment::VERTICAL_BOTTOM => 'bottom',
-        Alignment::VERTICAL_TOP => 'top',
-        Alignment::VERTICAL_CENTER => 'middle',
-        Alignment::VERTICAL_JUSTIFY => 'middle',
-    ];
-
     /**
      * Map VAlign.
      *
      * @param string $vAlign Vertical alignment
-     *
-     * @return string
      */
-    private function mapVAlign($vAlign)
+    private function mapVAlign(string $vAlign): string
     {
-        return array_key_exists($vAlign, self::VALIGN_ARR) ? self::VALIGN_ARR[$vAlign] : 'baseline';
+        return Alignment::VERTICAL_ALIGNMENT_FOR_HTML[$vAlign] ?? '';
     }
 
-    const HALIGN_ARR = [
-        Alignment::HORIZONTAL_LEFT => 'left',
-        Alignment::HORIZONTAL_RIGHT => 'right',
-        Alignment::HORIZONTAL_CENTER => 'center',
-        Alignment::HORIZONTAL_CENTER_CONTINUOUS => 'center',
-        Alignment::HORIZONTAL_JUSTIFY => 'justify',
-    ];
-
     /**
      * Map HAlign.
      *
      * @param string $hAlign Horizontal alignment
-     *
-     * @return string
      */
-    private function mapHAlign($hAlign)
+    private function mapHAlign(string $hAlign): string
     {
-        return array_key_exists($hAlign, self::HALIGN_ARR) ? self::HALIGN_ARR[$hAlign] : '';
+        return Alignment::HORIZONTAL_ALIGNMENT_FOR_HTML[$hAlign] ?? '';
     }
 
+    const BORDER_NONE = 'none';
     const BORDER_ARR = [
-        Border::BORDER_NONE => 'none',
+        Border::BORDER_NONE => self::BORDER_NONE,
         Border::BORDER_DASHDOT => '1px dashed',
         Border::BORDER_DASHDOTDOT => '1px dotted',
         Border::BORDER_DASHED => '1px dashed',
@@ -277,21 +262,17 @@ private function mapHAlign($hAlign)
     /**
      * Map border style.
      *
-     * @param int $borderStyle Sheet index
-     *
-     * @return string
+     * @param int|string $borderStyle Sheet index
      */
-    private function mapBorderStyle($borderStyle)
+    private function mapBorderStyle($borderStyle): string
     {
-        return array_key_exists($borderStyle, self::BORDER_ARR) ? self::BORDER_ARR[$borderStyle] : '1px solid';
+        return self::BORDER_ARR[$borderStyle] ?? '1px solid';
     }
 
     /**
      * Get sheet index.
-     *
-     * @return int
      */
-    public function getSheetIndex()
+    public function getSheetIndex(): ?int
     {
         return $this->sheetIndex;
     }
@@ -299,23 +280,21 @@ public function getSheetIndex()
     /**
      * Set sheet index.
      *
-     * @param int $pValue Sheet index
+     * @param int $sheetIndex Sheet index
      *
      * @return $this
      */
-    public function setSheetIndex($pValue)
+    public function setSheetIndex(int $sheetIndex): static
     {
-        $this->sheetIndex = $pValue;
+        $this->sheetIndex = $sheetIndex;
 
         return $this;
     }
 
     /**
      * Get sheet index.
-     *
-     * @return bool
      */
-    public function getGenerateSheetNavigationBlock()
+    public function getGenerateSheetNavigationBlock(): bool
     {
         return $this->generateSheetNavigationBlock;
     }
@@ -323,13 +302,13 @@ public function getGenerateSheetNavigationBlock()
     /**
      * Set sheet index.
      *
-     * @param bool $pValue Flag indicating whether the sheet navigation block should be generated or not
+     * @param bool $generateSheetNavigationBlock Flag indicating whether the sheet navigation block should be generated or not
      *
      * @return $this
      */
-    public function setGenerateSheetNavigationBlock($pValue)
+    public function setGenerateSheetNavigationBlock(bool $generateSheetNavigationBlock): static
     {
-        $this->generateSheetNavigationBlock = (bool) $pValue;
+        $this->generateSheetNavigationBlock = (bool) $generateSheetNavigationBlock;
 
         return $this;
     }
@@ -339,26 +318,36 @@ public function setGenerateSheetNavigationBlock($pValue)
      *
      * @return $this
      */
-    public function writeAllSheets()
+    public function writeAllSheets(): static
     {
         $this->sheetIndex = null;
 
         return $this;
     }
 
-    private static function generateMeta($val, $desc)
+    private static function generateMeta(?string $val, string $desc): string
     {
-        return $val ? ('      <meta name="' . $desc . '" content="' . htmlspecialchars($val) . '" />' . PHP_EOL) : '';
+        return ($val || $val === '0')
+            ? ('      <meta name="' . $desc . '" content="' . htmlspecialchars($val, Settings::htmlEntityFlags()) . '" />' . PHP_EOL)
+            : '';
     }
 
+    public const BODY_LINE = '  <body>' . PHP_EOL;
+
+    private const CUSTOM_TO_META = [
+        Properties::PROPERTY_TYPE_BOOLEAN => 'bool',
+        Properties::PROPERTY_TYPE_DATE => 'date',
+        Properties::PROPERTY_TYPE_FLOAT => 'float',
+        Properties::PROPERTY_TYPE_INTEGER => 'int',
+        Properties::PROPERTY_TYPE_STRING => 'string',
+    ];
+
     /**
      * Generate HTML header.
      *
-     * @param bool $pIncludeStyles Include styles?
-     *
-     * @return string
+     * @param bool $includeStyles Include styles?
      */
-    public function generateHTMLHeader($pIncludeStyles = false)
+    public function generateHTMLHeader(bool $includeStyles = false): string
     {
         // Construct HTML
         $properties = $this->spreadsheet->getProperties();
@@ -367,7 +356,11 @@ public function generateHTMLHeader($pIncludeStyles = false)
         $html .= '  <head>' . PHP_EOL;
         $html .= '      <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />' . PHP_EOL;
         $html .= '      <meta name="generator" content="PhpSpreadsheet, https://github.com/PHPOffice/PhpSpreadsheet" />' . PHP_EOL;
-        $html .= '      <title>' . htmlspecialchars($properties->getTitle()) . '</title>' . PHP_EOL;
+        $title = $properties->getTitle();
+        if ($title === '') {
+            $title = $this->spreadsheet->getActiveSheet()->getTitle();
+        }
+        $html .= '      <title>' . htmlspecialchars($title, Settings::htmlEntityFlags()) . '</title>' . PHP_EOL;
         $html .= self::generateMeta($properties->getCreator(), 'author');
         $html .= self::generateMeta($properties->getTitle(), 'title');
         $html .= self::generateMeta($properties->getDescription(), 'description');
@@ -376,21 +369,50 @@ public function generateHTMLHeader($pIncludeStyles = false)
         $html .= self::generateMeta($properties->getCategory(), 'category');
         $html .= self::generateMeta($properties->getCompany(), 'company');
         $html .= self::generateMeta($properties->getManager(), 'manager');
+        $html .= self::generateMeta($properties->getLastModifiedBy(), 'lastModifiedBy');
+        $html .= self::generateMeta($properties->getViewport(), 'viewport');
+        $date = Date::dateTimeFromTimestamp((string) $properties->getCreated());
+        $date->setTimeZone(Date::getDefaultOrLocalTimeZone());
+        $html .= self::generateMeta($date->format(DATE_W3C), 'created');
+        $date = Date::dateTimeFromTimestamp((string) $properties->getModified());
+        $date->setTimeZone(Date::getDefaultOrLocalTimeZone());
+        $html .= self::generateMeta($date->format(DATE_W3C), 'modified');
+
+        $customProperties = $properties->getCustomProperties();
+        foreach ($customProperties as $customProperty) {
+            $propertyValue = $properties->getCustomPropertyValue($customProperty);
+            $propertyType = $properties->getCustomPropertyType($customProperty);
+            $propertyQualifier = self::CUSTOM_TO_META[$propertyType] ?? null;
+            if ($propertyQualifier !== null) {
+                if ($propertyType === Properties::PROPERTY_TYPE_BOOLEAN) {
+                    $propertyValue = $propertyValue ? '1' : '0';
+                } elseif ($propertyType === Properties::PROPERTY_TYPE_DATE) {
+                    $date = Date::dateTimeFromTimestamp((string) $propertyValue);
+                    $date->setTimeZone(Date::getDefaultOrLocalTimeZone());
+                    $propertyValue = $date->format(DATE_W3C);
+                } else {
+                    $propertyValue = (string) $propertyValue;
+                }
+                $html .= self::generateMeta($propertyValue, "custom.$propertyQualifier.$customProperty");
+            }
+        }
 
-        $html .= $pIncludeStyles ? $this->generateStyles(true) : $this->generatePageDeclarations(true);
+        if (!empty($properties->getHyperlinkBase())) {
+            $html .= '      <base href="' . $properties->getHyperlinkBase() . '" />' . PHP_EOL;
+        }
+
+        $html .= $includeStyles ? $this->generateStyles(true) : $this->generatePageDeclarations(true);
 
         $html .= '  </head>' . PHP_EOL;
         $html .= '' . PHP_EOL;
-        $html .= '  <body>' . PHP_EOL;
+        $html .= self::BODY_LINE;
 
         return $html;
     }
 
-    private function generateSheetPrep()
+    /** @return Worksheet[] */
+    private function generateSheetPrep(): array
     {
-        // Ensure that Spans have been calculated?
-        $this->calculateSpans();
-
         // Fetch sheets
         if ($this->sheetIndex === null) {
             $sheets = $this->spreadsheet->getAllSheets();
@@ -401,7 +423,7 @@ private function generateSheetPrep()
         return $sheets;
     }
 
-    private function generateSheetStarts($sheet, $rowMin)
+    private function generateSheetStarts(Worksheet $sheet, int $rowMin): array
     {
         // calculate start of <tbody>, <thead>
         $tbodyStart = $rowMin;
@@ -420,7 +442,7 @@ private function generateSheetStarts($sheet, $rowMin)
         return [$theadStart, $theadEnd, $tbodyStart];
     }
 
-    private function generateSheetTags($row, $theadStart, $theadEnd, $tbodyStart)
+    private function generateSheetTags(int $row, int $theadStart, int $theadEnd, int $tbodyStart): array
     {
         // <thead> ?
         $startTag = ($row == $theadStart) ? ('        <thead>' . PHP_EOL) : '';
@@ -435,11 +457,11 @@ private function generateSheetTags($row, $theadStart, $theadEnd, $tbodyStart)
 
     /**
      * Generate sheet data.
-     *
-     * @return string
      */
-    public function generateSheetData()
+    public function generateSheetData(): string
     {
+        // Ensure that Spans have been calculated?
+        $this->calculateSpans();
         $sheets = $this->generateSheetPrep();
 
         // Construct HTML
@@ -450,11 +472,14 @@ public function generateSheetData()
         foreach ($sheets as $sheet) {
             // Write table header
             $html .= $this->generateTableHeader($sheet);
+            $this->sheetCharts = [];
+            $this->sheetDrawings = [];
 
             // Get worksheet dimension
             [$min, $max] = explode(':', $sheet->calculateWorksheetDataDimension());
-            [$minCol, $minRow] = Coordinate::indexesFromString($min);
+            [$minCol, $minRow, $minColString] = Coordinate::indexesFromString($min);
             [$maxCol, $maxRow] = Coordinate::indexesFromString($max);
+            $this->extendRowsAndColumns($sheet, $maxCol, $maxRow);
 
             [$theadStart, $theadEnd, $tbodyStart] = $this->generateSheetStarts($sheet, $minRow);
 
@@ -465,26 +490,26 @@ public function generateSheetData()
                 $html .= $startTag;
 
                 // Write row if there are HTML table cells in it
-                if (!isset($this->isSpannedRow[$sheet->getParent()->getIndex($sheet)][$row])) {
+                if ($this->shouldGenerateRow($sheet, $row) && !isset($this->isSpannedRow[$sheet->getParentOrThrow()->getIndex($sheet)][$row])) {
                     // Start a new rowData
                     $rowData = [];
                     // Loop through columns
                     $column = $minCol;
+                    $colStr = $minColString;
                     while ($column <= $maxCol) {
                         // Cell exists?
-                        if ($sheet->cellExistsByColumnAndRow($column, $row)) {
-                            $rowData[$column] = Coordinate::stringFromColumnIndex($column) . $row;
-                        } else {
-                            $rowData[$column] = '';
+                        $cellAddress = Coordinate::stringFromColumnIndex($column) . $row;
+                        if ($this->shouldGenerateColumn($sheet, $colStr)) {
+                            $rowData[$column] = ($sheet->getCellCollection()->has($cellAddress)) ? $cellAddress : '';
                         }
                         ++$column;
+                        ++$colStr;
                     }
                     $html .= $this->generateRow($sheet, $rowData, $row - 1, $cellType);
                 }
 
                 $html .= $endTag;
             }
-            $html .= $this->extendRowsForChartsAndImages($sheet, $row);
 
             // Write table footer
             $html .= $this->generateTableFooter();
@@ -504,10 +529,8 @@ public function generateSheetData()
 
     /**
      * Generate sheet tabs.
-     *
-     * @return string
      */
-    public function generateNavigation()
+    public function generateNavigation(): string
     {
         // Fetch sheets
         $sheets = [];
@@ -528,7 +551,7 @@ public function generateNavigation()
             $html .= '<ul class="navigation">' . PHP_EOL;
 
             foreach ($sheets as $sheet) {
-                $html .= '  <li class="sheet' . $sheetId . '"><a href="#sheet' . htmlspecialchars($sheetId, HTML_SPECIAL_CHARS_FLAGS) . '">' . $sheet->getTitle() . '</a></li>' . PHP_EOL;
+                $html .= '  <li class="sheet' . $sheetId . '"><a href="#sheet' . $sheetId . '">' . $sheet->getTitle() . '</a></li>' . PHP_EOL;
                 ++$sheetId;
             }
 
@@ -538,100 +561,49 @@ public function generateNavigation()
         return $html;
     }
 
-    /**
-     * Extend Row if chart is placed after nominal end of row.
-     * This code should be exercised by sample:
-     * Chart/32_Chart_read_write_PDF.php.
-     * However, that test is suppressed due to out-of-date
-     * Jpgraph code issuing warnings. So, don't measure
-     * code coverage for this function till that is fixed.
-     *
-     * @param Worksheet $pSheet \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet
-     * @param int $row Row to check for charts
-     *
-     * @return array
-     *
-     * @codeCoverageIgnore
-     */
-    private function extendRowsForCharts(Worksheet $pSheet, int $row)
+    private function extendRowsAndColumns(Worksheet $worksheet, int &$colMax, int &$rowMax): void
     {
-        $rowMax = $row;
-        $colMax = 'A';
-        $anyfound = false;
         if ($this->includeCharts) {
-            foreach ($pSheet->getChartCollection() as $chart) {
+            foreach ($worksheet->getChartCollection() as $chart) {
                 if ($chart instanceof Chart) {
-                    $anyfound = true;
                     $chartCoordinates = $chart->getTopLeftPosition();
-                    $chartTL = Coordinate::coordinateFromString($chartCoordinates['cell']);
-                    $chartCol = Coordinate::columnIndexFromString($chartTL[0]);
+                    $this->sheetCharts[$chartCoordinates['cell']] = $chart;
+                    $chartTL = Coordinate::indexesFromString($chartCoordinates['cell']);
                     if ($chartTL[1] > $rowMax) {
                         $rowMax = $chartTL[1];
-                        if ($chartCol > Coordinate::columnIndexFromString($colMax)) {
-                            $colMax = $chartTL[0];
-                        }
+                    }
+                    if ($chartTL[0] > $colMax) {
+                        $colMax = $chartTL[0];
                     }
                 }
             }
         }
-
-        return [$rowMax, $colMax, $anyfound];
-    }
-
-    private function extendRowsForChartsAndImages(Worksheet $pSheet, int $row): string
-    {
-        [$rowMax, $colMax, $anyfound] = $this->extendRowsForCharts($pSheet, $row);
-
-        foreach ($pSheet->getDrawingCollection() as $drawing) {
-            $anyfound = true;
-            $imageTL = Coordinate::coordinateFromString($drawing->getCoordinates());
-            $imageCol = Coordinate::columnIndexFromString($imageTL[0]);
+        foreach ($worksheet->getDrawingCollection() as $drawing) {
+            if ($drawing instanceof Drawing && $drawing->getPath() === '') {
+                continue;
+            }
+            $imageTL = Coordinate::indexesFromString($drawing->getCoordinates());
+            $this->sheetDrawings[$drawing->getCoordinates()] = $drawing;
             if ($imageTL[1] > $rowMax) {
                 $rowMax = $imageTL[1];
-                if ($imageCol > Coordinate::columnIndexFromString($colMax)) {
-                    $colMax = $imageTL[0];
-                }
             }
-        }
-
-        // Don't extend rows if not needed
-        if ($row === $rowMax || !$anyfound) {
-            return '';
-        }
-
-        $html = '';
-        ++$colMax;
-        ++$row;
-        while ($row <= $rowMax) {
-            $html .= '<tr>';
-            for ($col = 'A'; $col != $colMax; ++$col) {
-                $htmlx = $this->writeImageInCell($pSheet, $col . $row);
-                $htmlx .= $this->includeCharts ? $this->writeChartInCell($pSheet, $col . $row) : '';
-                if ($htmlx) {
-                    $html .= "<td class='style0' style='position: relative;'>$htmlx</td>";
-                } else {
-                    $html .= "<td class='style0'></td>";
-                }
+            if ($imageTL[0] > $colMax) {
+                $colMax = $imageTL[0];
             }
-            ++$row;
-            $html .= '</tr>' . PHP_EOL;
         }
-
-        return $html;
     }
 
     /**
      * Convert Windows file name to file protocol URL.
      *
      * @param string $filename file name on local system
-     *
-     * @return string
      */
-    public static function winFileToUrl($filename)
+    public static function winFileToUrl(string $filename, bool $mpdf = false): string
     {
         // Windows filename
         if (substr($filename, 1, 2) === ':\\') {
-            $filename = 'file:///' . str_replace('\\', '/', $filename);
+            $protocol = $mpdf ? '' : 'file:///';
+            $filename = $protocol . str_replace('\\', '/', $filename);
         }
 
         return $filename;
@@ -640,70 +612,74 @@ public static function winFileToUrl($filename)
     /**
      * Generate image tag in cell.
      *
-     * @param Worksheet $pSheet \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet
      * @param string $coordinates Cell coordinates
-     *
-     * @return string
      */
-    private function writeImageInCell(Worksheet $pSheet, $coordinates)
+    private function writeImageInCell(string $coordinates): string
     {
         // Construct HTML
         $html = '';
 
         // Write images
-        foreach ($pSheet->getDrawingCollection() as $drawing) {
-            if ($drawing->getCoordinates() != $coordinates) {
-                continue;
-            }
+        $drawing = $this->sheetDrawings[$coordinates] ?? null;
+        if ($drawing !== null) {
             $filedesc = $drawing->getDescription();
             $filedesc = $filedesc ? htmlspecialchars($filedesc, ENT_QUOTES) : 'Embedded image';
-            if ($drawing instanceof Drawing) {
+            if ($drawing instanceof Drawing && $drawing->getPath() !== '') {
                 $filename = $drawing->getPath();
 
                 // Strip off eventual '.'
-                $filename = preg_replace('/^[.]/', '', $filename);
+                $filename = (string) preg_replace('/^[.]/', '', $filename);
 
                 // Prepend images root
                 $filename = $this->getImagesRoot() . $filename;
 
                 // Strip off eventual '.' if followed by non-/
-                $filename = preg_replace('@^[.]([^/])@', '$1', $filename);
+                $filename = (string) preg_replace('@^[.]([^/])@', '$1', $filename);
 
                 // Convert UTF8 data to PCDATA
-                $filename = htmlspecialchars($filename);
+                $filename = htmlspecialchars($filename, Settings::htmlEntityFlags());
 
                 $html .= PHP_EOL;
-                $imageData = self::winFileToUrl($filename);
+                $imageData = self::winFileToUrl($filename, $this instanceof Pdf\Mpdf);
 
-                if ($this->embedImages && !$this->isPdf) {
+                if ($this->embedImages || str_starts_with($imageData, 'zip://')) {
+                    $imageData = 'data:,';
                     $picture = @file_get_contents($filename);
                     if ($picture !== false) {
-                        $imageDetails = getimagesize($filename);
-                        // base64 encode the binary data
-                        $base64 = base64_encode($picture);
-                        $imageData = 'data:' . $imageDetails['mime'] . ';base64,' . $base64;
+                        $mimeContentType = (string) @mime_content_type($filename);
+                        if (str_starts_with($mimeContentType, 'image/')) {
+                            // base64 encode the binary data
+                            $base64 = base64_encode($picture);
+                            $imageData = 'data:' . $mimeContentType . ';base64,' . $base64;
+                        }
                     }
                 }
 
-                $html .= '<img style="position: absolute; z-index: 1; left: ' .
-                    $drawing->getOffsetX() . 'px; top: ' . $drawing->getOffsetY() . 'px; width: ' .
-                    $drawing->getWidth() . 'px; height: ' . $drawing->getHeight() . 'px;" src="' .
-                    $imageData . '" alt="' . $filedesc . '" />';
+                $html .= '<img style="position: absolute; z-index: 1; left: '
+                    . $drawing->getOffsetX() . 'px; top: ' . $drawing->getOffsetY() . 'px; width: '
+                    . $drawing->getWidth() . 'px; height: ' . $drawing->getHeight() . 'px;" src="'
+                    . $imageData . '" alt="' . $filedesc . '" />';
             } elseif ($drawing instanceof MemoryDrawing) {
                 $imageResource = $drawing->getImageResource();
                 if ($imageResource) {
                     ob_start(); //  Let's start output buffering.
                     imagepng($imageResource); //  This will normally output the image, but because of ob_start(), it won't.
-                    $contents = ob_get_contents(); //  Instead, output above is saved to $contents
+                    $contents = (string) ob_get_contents(); //  Instead, output above is saved to $contents
                     ob_end_clean(); //  End the output buffer.
 
-                    $dataUri = 'data:image/jpeg;base64,' . base64_encode($contents);
+                    $dataUri = 'data:image/png;base64,' . base64_encode($contents);
 
                     //  Because of the nature of tables, width is more important than height.
                     //  max-width: 100% ensures that image doesnt overflow containing cell
+                    //    However, PR #3535 broke test
+                    //    25_In_memory_image, apparently because
+                    //    of the use of max-with. In addition,
+                    //    non-memory-drawings don't use max-width.
+                    //    Its use here is suspect and is being eliminated.
                     //  width: X sets width of supplied image.
                     //  As a result, images bigger than cell will be contained and images smaller will not get stretched
-                    $html .= '<img alt="' . $filedesc . '" src="' . $dataUri . '" style="max-width:100%;width:' . $drawing->getWidth() . 'px;" />';
+                    $html .= '<img alt="' . $filedesc . '" src="' . $dataUri . '" style="width:' . $drawing->getWidth() . 'px;left: '
+                        . $drawing->getOffsetX() . 'px; top: ' . $drawing->getOffsetY() . 'px;position: absolute; z-index: 1;" />';
                 }
             }
         }
@@ -715,49 +691,54 @@ private function writeImageInCell(Worksheet $pSheet, $coordinates)
      * Generate chart tag in cell.
      * This code should be exercised by sample:
      * Chart/32_Chart_read_write_PDF.php.
-     * However, that test is suppressed due to out-of-date
-     * Jpgraph code issuing warnings. So, don't measure
-     * code coverage for this function till that is fixed.
-     *
-     * @param Worksheet $pSheet \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet
-     * @param string $coordinates Cell coordinates
-     *
-     * @return string
-     *
-     * @codeCoverageIgnore
      */
-    private function writeChartInCell(Worksheet $pSheet, $coordinates)
+    private function writeChartInCell(Worksheet $worksheet, string $coordinates): string
     {
         // Construct HTML
         $html = '';
 
         // Write charts
-        foreach ($pSheet->getChartCollection() as $chart) {
-            if ($chart instanceof Chart) {
-                $chartCoordinates = $chart->getTopLeftPosition();
-                if ($chartCoordinates['cell'] == $coordinates) {
-                    $chartFileName = File::sysGetTempDir() . '/' . uniqid('', true) . '.png';
-                    if (!$chart->render($chartFileName)) {
-                        return '';
-                    }
-
-                    $html .= PHP_EOL;
-                    $imageDetails = getimagesize($chartFileName);
-                    $filedesc = $chart->getTitle();
-                    $filedesc = $filedesc ? self::getChartCaption($filedesc->getCaption()) : '';
-                    $filedesc = $filedesc ? htmlspecialchars($filedesc, ENT_QUOTES) : 'Embedded chart';
-                    if ($fp = fopen($chartFileName, 'rb', 0)) {
-                        $picture = fread($fp, filesize($chartFileName));
-                        fclose($fp);
-                        // base64 encode the binary data
-                        $base64 = base64_encode($picture);
-                        $imageData = 'data:' . $imageDetails['mime'] . ';base64,' . $base64;
-
-                        $html .= '<img style="position: absolute; z-index: 1; left: ' . $chartCoordinates['xOffset'] . 'px; top: ' . $chartCoordinates['yOffset'] . 'px; width: ' . $imageDetails[0] . 'px; height: ' . $imageDetails[1] . 'px;" src="' . $imageData . '" alt="' . $filedesc . '" />' . PHP_EOL;
-
-                        unlink($chartFileName);
-                    }
+        $chart = $this->sheetCharts[$coordinates] ?? null;
+        if ($chart !== null) {
+            $chartCoordinates = $chart->getTopLeftPosition();
+            $chartFileName = File::sysGetTempDir() . '/' . uniqid('', true) . '.png';
+            $renderedWidth = $chart->getRenderedWidth();
+            $renderedHeight = $chart->getRenderedHeight();
+            if ($renderedWidth === null || $renderedHeight === null) {
+                $this->adjustRendererPositions($chart, $worksheet);
+            }
+            $title = $chart->getTitle();
+            $caption = null;
+            $filedesc = '';
+            if ($title !== null) {
+                $calculatedTitle = $title->getCalculatedTitle($worksheet->getParent());
+                if ($calculatedTitle !== null) {
+                    $caption = $title->getCaption();
+                    $title->setCaption($calculatedTitle);
                 }
+                $filedesc = $title->getCaptionText($worksheet->getParent());
+            }
+            $renderSuccessful = $chart->render($chartFileName);
+            $chart->setRenderedWidth($renderedWidth);
+            $chart->setRenderedHeight($renderedHeight);
+            if (isset($title, $caption)) {
+                $title->setCaption($caption);
+            }
+            if (!$renderSuccessful) {
+                return '';
+            }
+
+            $html .= PHP_EOL;
+            $imageDetails = getimagesize($chartFileName) ?: ['', '', 'mime' => ''];
+
+            $filedesc = $filedesc ? htmlspecialchars($filedesc, ENT_QUOTES) : 'Embedded chart';
+            $picture = file_get_contents($chartFileName);
+            unlink($chartFileName);
+            if ($picture !== false) {
+                $base64 = base64_encode($picture);
+                $imageData = 'data:' . $imageDetails['mime'] . ';base64,' . $base64;
+
+                $html .= '<img style="position: absolute; z-index: 1; left: ' . $chartCoordinates['xOffset'] . 'px; top: ' . $chartCoordinates['yOffset'] . 'px; width: ' . $imageDetails[0] . 'px; height: ' . $imageDetails[1] . 'px;" src="' . $imageData . '" alt="' . $filedesc . '" />' . PHP_EOL;
             }
         }
 
@@ -765,35 +746,43 @@ private function writeChartInCell(Worksheet $pSheet, $coordinates)
         return $html;
     }
 
-    /**
-     * Extend Row if chart is placed after nominal end of row.
-     * This code should be exercised by sample:
-     * Chart/32_Chart_read_write_PDF.php.
-     * However, that test is suppressed due to out-of-date
-     * Jpgraph code issuing warnings. So, don't measure
-     * code coverage for this function till that is fixed.
-     * Caption is described in documentation as fixed,
-     * but in 32_Chart it is somehow an array of RichText.
-     *
-     * @param mixed $cap
-     *
-     * @return string
-     *
-     * @codeCoverageIgnore
-     */
-    private static function getChartCaption($cap)
+    private function adjustRendererPositions(Chart $chart, Worksheet $sheet): void
     {
-        return is_array($cap) ? implode(' ', $cap) : $cap;
+        $topLeft = $chart->getTopLeftPosition();
+        $bottomRight = $chart->getBottomRightPosition();
+        $tlCell = $topLeft['cell'];
+        $brCell = $bottomRight['cell'];
+        if ($tlCell !== '' && $brCell !== '') {
+            $tlCoordinate = Coordinate::indexesFromString($tlCell);
+            $brCoordinate = Coordinate::indexesFromString($brCell);
+            $totalHeight = 0.0;
+            $totalWidth = 0.0;
+            $defaultRowHeight = $sheet->getDefaultRowDimension()->getRowHeight();
+            $defaultRowHeight = SharedDrawing::pointsToPixels(($defaultRowHeight >= 0) ? $defaultRowHeight : SharedFont::getDefaultRowHeightByFont($this->defaultFont));
+            if ($tlCoordinate[1] <= $brCoordinate[1] && $tlCoordinate[0] <= $brCoordinate[0]) {
+                for ($row = $tlCoordinate[1]; $row <= $brCoordinate[1]; ++$row) {
+                    $height = $sheet->getRowDimension($row)->getRowHeight('pt');
+                    $totalHeight += ($height >= 0) ? $height : $defaultRowHeight;
+                }
+                $rightEdge = $brCoordinate[2];
+                ++$rightEdge;
+                for ($column = $tlCoordinate[2]; $column !== $rightEdge; ++$column) {
+                    $width = $sheet->getColumnDimension($column)->getWidth();
+                    $width = ($width < 0) ? self::DEFAULT_CELL_WIDTH_PIXELS : SharedDrawing::cellDimensionToPixels($sheet->getColumnDimension($column)->getWidth(), $this->defaultFont);
+                    $totalWidth += $width;
+                }
+                $chart->setRenderedWidth($totalWidth);
+                $chart->setRenderedHeight($totalHeight);
+            }
+        }
     }
 
     /**
      * Generate CSS styles.
      *
      * @param bool $generateSurroundingHTML Generate surrounding HTML tags? (&lt;style&gt; and &lt;/style&gt;)
-     *
-     * @return string
      */
-    public function generateStyles($generateSurroundingHTML = true)
+    public function generateStyles(bool $generateSurroundingHTML = true): string
     {
         // Build CSS
         $css = $this->buildCSS($generateSurroundingHTML);
@@ -847,7 +836,17 @@ private function buildCssRowHeights(Worksheet $sheet, array &$css, int $sheetInd
     private function buildCssPerSheet(Worksheet $sheet, array &$css): void
     {
         // Calculate hash code
-        $sheetIndex = $sheet->getParent()->getIndex($sheet);
+        $sheetIndex = $sheet->getParentOrThrow()->getIndex($sheet);
+        $setup = $sheet->getPageSetup();
+        if ($setup->getFitToPage() && $setup->getFitToHeight() === 1) {
+            $css["table.sheet$sheetIndex"]['page-break-inside'] = 'avoid';
+            $css["table.sheet$sheetIndex"]['break-inside'] = 'avoid';
+        }
+        $picture = $sheet->getBackgroundImage();
+        if ($picture !== '') {
+            $base64 = base64_encode($picture);
+            $css["table.sheet$sheetIndex"]['background-image'] = 'url(data:' . $sheet->getBackgroundMime() . ';base64,' . $base64 . ')';
+        }
 
         // Build styles
         // Calculate column widths
@@ -856,9 +855,13 @@ private function buildCssPerSheet(Worksheet $sheet, array &$css): void
         // col elements, initialize
         $highestColumnIndex = Coordinate::columnIndexFromString($sheet->getHighestColumn()) - 1;
         $column = -1;
+        $colStr = 'A';
         while ($column++ < $highestColumnIndex) {
-            $this->columnWidths[$sheetIndex][$column] = 42; // approximation
-            $css['table.sheet' . $sheetIndex . ' col.col' . $column]['width'] = '42pt';
+            $this->columnWidths[$sheetIndex][$column] = self::DEFAULT_CELL_WIDTH_POINTS; // approximation
+            if ($this->shouldGenerateColumn($sheet, $colStr)) {
+                $css['table.sheet' . $sheetIndex . ' col.col' . $column]['width'] = self::DEFAULT_CELL_WIDTH_POINTS . 'pt';
+            }
+            ++$colStr;
         }
 
         // col elements, loop through columnDimensions and set width
@@ -868,6 +871,9 @@ private function buildCssPerSheet(Worksheet $sheet, array &$css): void
             $width = SharedDrawing::pixelsToPoints($width);
             if ($columnDimension->getVisible() === false) {
                 $css['table.sheet' . $sheetIndex . ' .column' . $column]['display'] = 'none';
+                // This would be better but Firefox has an 11-year-old bug.
+                // https://bugzilla.mozilla.org/show_bug.cgi?id=819045
+                //$css['table.sheet' . $sheetIndex . ' col.col' . $column]['visibility'] = 'collapse';
             }
             if ($width >= 0) {
                 $this->columnWidths[$sheetIndex][$column] = $width;
@@ -899,10 +905,8 @@ private function buildCssPerSheet(Worksheet $sheet, array &$css): void
      * Build CSS styles.
      *
      * @param bool $generateSurroundingHTML Generate surrounding HTML style? (html { })
-     *
-     * @return array
      */
-    public function buildCSS($generateSurroundingHTML = true)
+    public function buildCSS(bool $generateSurroundingHTML = true): array
     {
         // Cached?
         if ($this->cssStyles !== null) {
@@ -965,8 +969,8 @@ public function buildCSS($generateSurroundingHTML = true)
 
         // Calculate cell style hashes
         foreach ($this->spreadsheet->getCellXfCollection() as $index => $style) {
-            $css['td.style' . $index] = $this->createCSSStyle($style);
-            $css['th.style' . $index] = $this->createCSSStyle($style);
+            $css['td.style' . $index . ', th.style' . $index] = $this->createCSSStyle($style);
+            //$css['th.style' . $index] = $this->createCSSStyle($style);
         }
 
         // Fetch sheets
@@ -993,39 +997,44 @@ public function buildCSS($generateSurroundingHTML = true)
 
     /**
      * Create CSS style.
-     *
-     * @return array
      */
-    private function createCSSStyle(Style $pStyle)
+    private function createCSSStyle(Style $style): array
     {
         // Create CSS
         return array_merge(
-            $this->createCSSStyleAlignment($pStyle->getAlignment()),
-            $this->createCSSStyleBorders($pStyle->getBorders()),
-            $this->createCSSStyleFont($pStyle->getFont()),
-            $this->createCSSStyleFill($pStyle->getFill())
+            $this->createCSSStyleAlignment($style->getAlignment()),
+            $this->createCSSStyleBorders($style->getBorders()),
+            $this->createCSSStyleFont($style->getFont()),
+            $this->createCSSStyleFill($style->getFill())
         );
     }
 
     /**
-     * Create CSS style (\PhpOffice\PhpSpreadsheet\Style\Alignment).
-     *
-     * @param Alignment $pStyle \PhpOffice\PhpSpreadsheet\Style\Alignment
-     *
-     * @return array
+     * Create CSS style.
      */
-    private function createCSSStyleAlignment(Alignment $pStyle)
+    private function createCSSStyleAlignment(Alignment $alignment): array
     {
         // Construct CSS
         $css = [];
 
         // Create CSS
-        $css['vertical-align'] = $this->mapVAlign($pStyle->getVertical());
-        $textAlign = $this->mapHAlign($pStyle->getHorizontal());
+        $verticalAlign = $this->mapVAlign($alignment->getVertical() ?? '');
+        if ($verticalAlign) {
+            $css['vertical-align'] = $verticalAlign;
+        }
+        $textAlign = $this->mapHAlign($alignment->getHorizontal() ?? '');
         if ($textAlign) {
             $css['text-align'] = $textAlign;
             if (in_array($textAlign, ['left', 'right'])) {
-                $css['padding-' . $textAlign] = (string) ((int) $pStyle->getIndent() * 9) . 'px';
+                $css['padding-' . $textAlign] = (string) ((int) $alignment->getIndent() * 9) . 'px';
+            }
+        }
+        $rotation = $alignment->getTextRotation();
+        if ($rotation !== 0 && $rotation !== Alignment::TEXTROTATION_STACK_PHPSPREADSHEET) {
+            if ($this instanceof Pdf\Mpdf) {
+                $css['text-rotate'] = "$rotation";
+            } else {
+                $css['transform'] = "rotate({$rotation}deg)";
             }
         }
 
@@ -1033,89 +1042,99 @@ private function createCSSStyleAlignment(Alignment $pStyle)
     }
 
     /**
-     * Create CSS style (\PhpOffice\PhpSpreadsheet\Style\Font).
-     *
-     * @return array
+     * Create CSS style.
      */
-    private function createCSSStyleFont(Font $pStyle)
+    private function createCSSStyleFont(Font $font): array
     {
         // Construct CSS
         $css = [];
 
         // Create CSS
-        if ($pStyle->getBold()) {
+        if ($font->getBold()) {
             $css['font-weight'] = 'bold';
         }
-        if ($pStyle->getUnderline() != Font::UNDERLINE_NONE && $pStyle->getStrikethrough()) {
+        if ($font->getUnderline() != Font::UNDERLINE_NONE && $font->getStrikethrough()) {
             $css['text-decoration'] = 'underline line-through';
-        } elseif ($pStyle->getUnderline() != Font::UNDERLINE_NONE) {
+        } elseif ($font->getUnderline() != Font::UNDERLINE_NONE) {
             $css['text-decoration'] = 'underline';
-        } elseif ($pStyle->getStrikethrough()) {
+        } elseif ($font->getStrikethrough()) {
             $css['text-decoration'] = 'line-through';
         }
-        if ($pStyle->getItalic()) {
+        if ($font->getItalic()) {
             $css['font-style'] = 'italic';
         }
 
-        $css['color'] = '#' . $pStyle->getColor()->getRGB();
-        $css['font-family'] = '\'' . $pStyle->getName() . '\'';
-        $css['font-size'] = $pStyle->getSize() . 'pt';
+        $css['color'] = '#' . $font->getColor()->getRGB();
+        $css['font-family'] = '\'' . htmlspecialchars((string) $font->getName(), ENT_QUOTES) . '\'';
+        $css['font-size'] = $font->getSize() . 'pt';
 
         return $css;
     }
 
     /**
-     * Create CSS style (Borders).
-     *
-     * @param Borders $pStyle Borders
+     * Create CSS style.
      *
-     * @return array
+     * @param Borders $borders Borders
      */
-    private function createCSSStyleBorders(Borders $pStyle)
+    private function createCSSStyleBorders(Borders $borders): array
     {
         // Construct CSS
         $css = [];
 
         // Create CSS
-        $css['border-bottom'] = $this->createCSSStyleBorder($pStyle->getBottom());
-        $css['border-top'] = $this->createCSSStyleBorder($pStyle->getTop());
-        $css['border-left'] = $this->createCSSStyleBorder($pStyle->getLeft());
-        $css['border-right'] = $this->createCSSStyleBorder($pStyle->getRight());
+        if (!($this instanceof Pdf\Mpdf)) {
+            $css['border-bottom'] = $this->createCSSStyleBorder($borders->getBottom());
+            $css['border-top'] = $this->createCSSStyleBorder($borders->getTop());
+            $css['border-left'] = $this->createCSSStyleBorder($borders->getLeft());
+            $css['border-right'] = $this->createCSSStyleBorder($borders->getRight());
+        } else {
+            // Mpdf doesn't process !important, so omit unimportant border none
+            if ($borders->getBottom()->getBorderStyle() !== Border::BORDER_NONE) {
+                $css['border-bottom'] = $this->createCSSStyleBorder($borders->getBottom());
+            }
+            if ($borders->getTop()->getBorderStyle() !== Border::BORDER_NONE) {
+                $css['border-top'] = $this->createCSSStyleBorder($borders->getTop());
+            }
+            if ($borders->getLeft()->getBorderStyle() !== Border::BORDER_NONE) {
+                $css['border-left'] = $this->createCSSStyleBorder($borders->getLeft());
+            }
+            if ($borders->getRight()->getBorderStyle() !== Border::BORDER_NONE) {
+                $css['border-right'] = $this->createCSSStyleBorder($borders->getRight());
+            }
+        }
 
         return $css;
     }
 
     /**
-     * Create CSS style (Border).
-     *
-     * @param Border $pStyle Border
+     * Create CSS style.
      *
-     * @return string
+     * @param Border $border Border
      */
-    private function createCSSStyleBorder(Border $pStyle)
+    private function createCSSStyleBorder(Border $border): string
     {
         //    Create CSS - add !important to non-none border styles for merged cells
-        $borderStyle = $this->mapBorderStyle($pStyle->getBorderStyle());
+        $borderStyle = $this->mapBorderStyle($border->getBorderStyle());
 
-        return $borderStyle . ' #' . $pStyle->getColor()->getRGB() . (($borderStyle == 'none') ? '' : ' !important');
+        return $borderStyle . ' #' . $border->getColor()->getRGB() . (($borderStyle === self::BORDER_NONE) ? '' : ' !important');
     }
 
     /**
      * Create CSS style (Fill).
      *
-     * @param Fill $pStyle Fill
-     *
-     * @return array
+     * @param Fill $fill Fill
      */
-    private function createCSSStyleFill(Fill $pStyle)
+    private function createCSSStyleFill(Fill $fill): array
     {
         // Construct HTML
         $css = [];
 
         // Create CSS
-        $value = $pStyle->getFillType() == Fill::FILL_NONE ?
-            'white' : '#' . $pStyle->getStartColor()->getRGB();
-        $css['background-color'] = $value;
+        if ($fill->getFillType() !== Fill::FILL_NONE) {
+            $value = $fill->getFillType() == Fill::FILL_NONE
+                ? 'white' : '#' . $fill->getStartColor()->getRGB();
+            $css['background-color'] = $value;
+        }
 
         return $css;
     }
@@ -1123,7 +1142,7 @@ private function createCSSStyleFill(Fill $pStyle)
     /**
      * Generate HTML footer.
      */
-    public function generateHTMLFooter()
+    public function generateHTMLFooter(): string
     {
         // Construct HTML
         $html = '';
@@ -1133,13 +1152,13 @@ public function generateHTMLFooter()
         return $html;
     }
 
-    private function generateTableTagInline($pSheet, $id)
+    private function generateTableTagInline(Worksheet $worksheet, string $id): string
     {
-        $style = isset($this->cssStyles['table']) ?
-            $this->assembleCSS($this->cssStyles['table']) : '';
+        $style = isset($this->cssStyles['table'])
+            ? $this->assembleCSS($this->cssStyles['table']) : '';
 
-        $prntgrid = $pSheet->getPrintGridlines();
-        $viewgrid = $this->isPdf ? $prntgrid : $pSheet->getShowGridlines();
+        $prntgrid = $worksheet->getPrintGridlines();
+        $viewgrid = $this->isPdf ? $prntgrid : $worksheet->getShowGridlines();
         if ($viewgrid && $prntgrid) {
             $html = "    <table border='1' cellpadding='1' $id cellspacing='1' style='$style' class='gridlines gridlinesp'>" . PHP_EOL;
         } elseif ($viewgrid) {
@@ -1153,49 +1172,47 @@ private function generateTableTagInline($pSheet, $id)
         return $html;
     }
 
-    private function generateTableTag($pSheet, $id, &$html, $sheetIndex): void
+    private function generateTableTag(Worksheet $worksheet, string $id, string &$html, int $sheetIndex): void
     {
         if (!$this->useInlineCss) {
-            $gridlines = $pSheet->getShowGridlines() ? ' gridlines' : '';
-            $gridlinesp = $pSheet->getPrintGridlines() ? ' gridlinesp' : '';
+            $gridlines = $worksheet->getShowGridlines() ? ' gridlines' : '';
+            $gridlinesp = $worksheet->getPrintGridlines() ? ' gridlinesp' : '';
             $html .= "    <table border='0' cellpadding='0' cellspacing='0' $id class='sheet$sheetIndex$gridlines$gridlinesp'>" . PHP_EOL;
         } else {
-            $html .= $this->generateTableTagInline($pSheet, $id);
+            $html .= $this->generateTableTagInline($worksheet, $id);
         }
     }
 
     /**
      * Generate table header.
      *
-     * @param Worksheet $pSheet The worksheet for the table we are writing
+     * @param Worksheet $worksheet The worksheet for the table we are writing
      * @param bool $showid whether or not to add id to table tag
-     *
-     * @return string
      */
-    private function generateTableHeader($pSheet, $showid = true)
+    private function generateTableHeader(Worksheet $worksheet, bool $showid = true): string
     {
-        $sheetIndex = $pSheet->getParent()->getIndex($pSheet);
+        $sheetIndex = $worksheet->getParentOrThrow()->getIndex($worksheet);
 
         // Construct HTML
         $html = '';
         $id = $showid ? "id='sheet$sheetIndex'" : '';
         if ($showid) {
-            $html .= "<div style='page: page$sheetIndex'>\n";
+            $html .= "<div style='page: page$sheetIndex'>" . PHP_EOL;
         } else {
-            $html .= "<div style='page: page$sheetIndex' class='scrpgbrk'>\n";
+            $html .= "<div style='page: page$sheetIndex' class='scrpgbrk'>" . PHP_EOL;
         }
 
-        $this->generateTableTag($pSheet, $id, $html, $sheetIndex);
+        $this->generateTableTag($worksheet, $id, $html, $sheetIndex);
 
         // Write <col> elements
-        $highestColumnIndex = Coordinate::columnIndexFromString($pSheet->getHighestColumn()) - 1;
+        $highestColumnIndex = Coordinate::columnIndexFromString($worksheet->getHighestColumn()) - 1;
         $i = -1;
         while ($i++ < $highestColumnIndex) {
             if (!$this->useInlineCss) {
                 $html .= '        <col class="col' . $i . '" />' . PHP_EOL;
             } else {
-                $style = isset($this->cssStyles['table.sheet' . $sheetIndex . ' col.col' . $i]) ?
-                    $this->assembleCSS($this->cssStyles['table.sheet' . $sheetIndex . ' col.col' . $i]) : '';
+                $style = isset($this->cssStyles['table.sheet' . $sheetIndex . ' col.col' . $i])
+                    ? $this->assembleCSS($this->cssStyles['table.sheet' . $sheetIndex . ' col.col' . $i]) : '';
                 $html .= '        <col style="' . $style . '" />' . PHP_EOL;
             }
         }
@@ -1206,7 +1223,7 @@ private function generateTableHeader($pSheet, $showid = true)
     /**
      * Generate table footer.
      */
-    private function generateTableFooter()
+    private function generateTableFooter(): string
     {
         return '    </tbody></table>' . PHP_EOL . '</div>' . PHP_EOL;
     }
@@ -1214,20 +1231,17 @@ private function generateTableFooter()
     /**
      * Generate row start.
      *
-     * @param Worksheet $pSheet \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet
      * @param int $sheetIndex Sheet index (0-based)
-     * @param int $pRow row number
-     *
-     * @return string
+     * @param int $row row number
      */
-    private function generateRowStart(Worksheet $pSheet, $sheetIndex, $pRow)
+    private function generateRowStart(Worksheet $worksheet, int $sheetIndex, int $row): string
     {
         $html = '';
-        if (count($pSheet->getBreaks()) > 0) {
-            $breaks = $pSheet->getBreaks();
+        if (count($worksheet->getBreaks()) > 0) {
+            $breaks = $worksheet->getRowBreaks();
 
             // check if a break is needed before this row
-            if (isset($breaks['A' . $pRow])) {
+            if (isset($breaks['A' . $row])) {
                 // close table: </table>
                 $html .= $this->generateTableFooter();
                 if ($this->isPdf && $this->useInlineCss) {
@@ -1235,17 +1249,17 @@ private function generateRowStart(Worksheet $pSheet, $sheetIndex, $pRow)
                 }
 
                 // open table again: <table> + <col> etc.
-                $html .= $this->generateTableHeader($pSheet, false);
+                $html .= $this->generateTableHeader($worksheet, false);
                 $html .= '<tbody>' . PHP_EOL;
             }
         }
 
         // Write row start
         if (!$this->useInlineCss) {
-            $html .= '          <tr class="row' . $pRow . '">' . PHP_EOL;
+            $html .= '          <tr class="row' . $row . '">' . PHP_EOL;
         } else {
-            $style = isset($this->cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $pRow])
-                ? $this->assembleCSS($this->cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $pRow]) : '';
+            $style = isset($this->cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $row])
+                ? $this->assembleCSS($this->cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $row]) : '';
 
             $html .= '          <tr style="' . $style . '">' . PHP_EOL;
         }
@@ -1253,12 +1267,12 @@ private function generateRowStart(Worksheet $pSheet, $sheetIndex, $pRow)
         return $html;
     }
 
-    private function generateRowCellCss($pSheet, $cellAddress, $pRow, $colNum)
+    private function generateRowCellCss(Worksheet $worksheet, string $cellAddress, int $row, int $columnNumber): array
     {
-        $cell = ($cellAddress > '') ? $pSheet->getCell($cellAddress) : '';
-        $coordinate = Coordinate::stringFromColumnIndex($colNum + 1) . ($pRow + 1);
+        $cell = ($cellAddress > '') ? $worksheet->getCellCollection()->get($cellAddress) : '';
+        $coordinate = Coordinate::stringFromColumnIndex($columnNumber + 1) . ($row + 1);
         if (!$this->useInlineCss) {
-            $cssClass = 'column' . $colNum;
+            $cssClass = 'column' . $columnNumber;
         } else {
             $cssClass = [];
             // The statements below do nothing.
@@ -1279,27 +1293,32 @@ private function generateRowCellCss($pSheet, $cellAddress, $pRow, $colNum)
         return [$cell, $cssClass, $coordinate];
     }
 
-    private function generateRowCellDataValueRich($cell, &$cellData): void
+    private function generateRowCellDataValueRich(RichText $richText): string
     {
+        $cellData = '';
         // Loop through rich text elements
-        $elements = $cell->getValue()->getRichTextElements();
+        $elements = $richText->getRichTextElements();
         foreach ($elements as $element) {
             // Rich text start?
             if ($element instanceof Run) {
-                $cellData .= '<span style="' . $this->assembleCSS($this->createCSSStyleFont($element->getFont())) . '">';
-
                 $cellEnd = '';
-                if ($element->getFont()->getSuperscript()) {
-                    $cellData .= '<sup>';
-                    $cellEnd = '</sup>';
-                } elseif ($element->getFont()->getSubscript()) {
-                    $cellData .= '<sub>';
-                    $cellEnd = '</sub>';
+                if ($element->getFont() !== null) {
+                    $cellData .= '<span style="' . $this->assembleCSS($this->createCSSStyleFont($element->getFont())) . '">';
+
+                    if ($element->getFont()->getSuperscript()) {
+                        $cellData .= '<sup>';
+                        $cellEnd = '</sup>';
+                    } elseif ($element->getFont()->getSubscript()) {
+                        $cellData .= '<sub>';
+                        $cellEnd = '</sub>';
+                    }
+                } else {
+                    $cellData .= '<span>';
                 }
 
                 // Convert UTF8 data to PCDATA
                 $cellText = $element->getText();
-                $cellData .= htmlspecialchars($cellText);
+                $cellData .= htmlspecialchars($cellText, Settings::htmlEntityFlags());
 
                 $cellData .= $cellEnd;
 
@@ -1307,69 +1326,71 @@ private function generateRowCellDataValueRich($cell, &$cellData): void
             } else {
                 // Convert UTF8 data to PCDATA
                 $cellText = $element->getText();
-                $cellData .= htmlspecialchars($cellText);
+                $cellData .= htmlspecialchars($cellText, Settings::htmlEntityFlags());
             }
         }
+
+        return nl2br($cellData);
     }
 
-    private function generateRowCellDataValue($pSheet, $cell, &$cellData): void
+    private function generateRowCellDataValue(Worksheet $worksheet, Cell $cell, string &$cellData): void
     {
         if ($cell->getValue() instanceof RichText) {
-            $this->generateRowCellDataValueRich($cell, $cellData);
+            $cellData .= $this->generateRowCellDataValueRich($cell->getValue());
         } else {
             $origData = $this->preCalculateFormulas ? $cell->getCalculatedValue() : $cell->getValue();
+            $origData2 = $this->preCalculateFormulas ? $cell->getCalculatedValueString() : $cell->getValueString();
+            $formatCode = $worksheet->getParentOrThrow()->getCellXfByIndex($cell->getXfIndex())->getNumberFormat()->getFormatCode();
+
             $cellData = NumberFormat::toFormattedString(
-                $origData,
-                $pSheet->getParent()->getCellXfByIndex($cell->getXfIndex())->getNumberFormat()->getFormatCode(),
+                $origData2,
+                $formatCode ?? NumberFormat::FORMAT_GENERAL,
                 [$this, 'formatColor']
             );
+
             if ($cellData === $origData) {
-                $cellData = htmlspecialchars($cellData ?? '');
+                $cellData = htmlspecialchars($cellData, Settings::htmlEntityFlags());
             }
-            if ($pSheet->getParent()->getCellXfByIndex($cell->getXfIndex())->getFont()->getSuperscript()) {
+            if ($worksheet->getParentOrThrow()->getCellXfByIndex($cell->getXfIndex())->getFont()->getSuperscript()) {
                 $cellData = '<sup>' . $cellData . '</sup>';
-            } elseif ($pSheet->getParent()->getCellXfByIndex($cell->getXfIndex())->getFont()->getSubscript()) {
+            } elseif ($worksheet->getParentOrThrow()->getCellXfByIndex($cell->getXfIndex())->getFont()->getSubscript()) {
                 $cellData = '<sub>' . $cellData . '</sub>';
             }
         }
     }
 
-    private function generateRowCellData($pSheet, $cell, &$cssClass, $cellType)
+    private function generateRowCellData(Worksheet $worksheet, null|Cell|string $cell, array|string &$cssClass): string
     {
         $cellData = '&nbsp;';
         if ($cell instanceof Cell) {
             $cellData = '';
             // Don't know what this does, and no test cases.
             //if ($cell->getParent() === null) {
-            //    $cell->attach($pSheet);
+            //    $cell->attach($worksheet);
             //}
             // Value
-            $this->generateRowCellDataValue($pSheet, $cell, $cellData);
+            $this->generateRowCellDataValue($worksheet, $cell, $cellData);
 
             // 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 = preg_replace('/(?m)(?:^|\\G) /', '&nbsp;', $cellData);
+            $cellData = (string) preg_replace('/(?m)(?:^|\\G) /', '&nbsp;', $cellData);
 
             // convert newline "\n" to '<br>'
             $cellData = nl2br($cellData);
 
             // Extend CSS class?
-            if (!$this->useInlineCss) {
+            if (!$this->useInlineCss && is_string($cssClass)) {
                 $cssClass .= ' style' . $cell->getXfIndex();
                 $cssClass .= ' ' . $cell->getDataType();
-            } else {
-                if ($cellType == 'th') {
-                    if (isset($this->cssStyles['th.style' . $cell->getXfIndex()])) {
-                        $cssClass = array_merge($cssClass, $this->cssStyles['th.style' . $cell->getXfIndex()]);
-                    }
-                } else {
-                    if (isset($this->cssStyles['td.style' . $cell->getXfIndex()])) {
-                        $cssClass = array_merge($cssClass, $this->cssStyles['td.style' . $cell->getXfIndex()]);
-                    }
+            } elseif (is_array($cssClass)) {
+                $index = $cell->getXfIndex();
+                $styleIndex = 'td.style' . $index . ', th.style' . $index;
+                if (isset($this->cssStyles[$styleIndex])) {
+                    $cssClass = array_merge($cssClass, $this->cssStyles[$styleIndex]);
                 }
 
                 // General horizontal alignment: Actual horizontal alignment depends on dataType
-                $sharedStyle = $pSheet->getParent()->getCellXfByIndex($cell->getXfIndex());
+                $sharedStyle = $worksheet->getParentOrThrow()->getCellXfByIndex($cell->getXfIndex());
                 if (
                     $sharedStyle->getAlignment()->getHorizontal() == Alignment::HORIZONTAL_GENERAL
                     && isset($this->cssStyles['.' . $cell->getDataType()]['text-align'])
@@ -1387,12 +1408,12 @@ private function generateRowCellData($pSheet, $cell, &$cssClass, $cellType)
         return $cellData;
     }
 
-    private function generateRowIncludeCharts($pSheet, $coordinate)
+    private function generateRowIncludeCharts(Worksheet $worksheet, string $coordinate): string
     {
-        return $this->includeCharts ? $this->writeChartInCell($pSheet, $coordinate) : '';
+        return $this->includeCharts ? $this->writeChartInCell($worksheet, $coordinate) : '';
     }
 
-    private function generateRowSpans($html, $rowSpan, $colSpan)
+    private function generateRowSpans(string $html, int $rowSpan, int $colSpan): string
     {
         $html .= ($colSpan > 1) ? (' colspan="' . $colSpan . '"') : '';
         $html .= ($rowSpan > 1) ? (' rowspan="' . $rowSpan . '"') : '';
@@ -1400,15 +1421,26 @@ private function generateRowSpans($html, $rowSpan, $colSpan)
         return $html;
     }
 
-    private function generateRowWriteCell(&$html, $pSheet, $coordinate, $cellType, $cellData, $colSpan, $rowSpan, $cssClass, $colNum, $sheetIndex, $pRow): void
-    {
+    private function generateRowWriteCell(
+        string &$html,
+        Worksheet $worksheet,
+        string $coordinate,
+        string $cellType,
+        string $cellData,
+        int $colSpan,
+        int $rowSpan,
+        array|string $cssClass,
+        int $colNum,
+        int $sheetIndex,
+        int $row
+    ): void {
         // Image?
-        $htmlx = $this->writeImageInCell($pSheet, $coordinate);
+        $htmlx = $this->writeImageInCell($coordinate);
         // Chart?
-        $htmlx .= $this->generateRowIncludeCharts($pSheet, $coordinate);
+        $htmlx .= $this->generateRowIncludeCharts($worksheet, $coordinate);
         // Column start
         $html .= '            <' . $cellType;
-        if (!$this->useInlineCss && !$this->isPdf) {
+        if (!$this->useInlineCss && !$this->isPdf && is_string($cssClass)) {
             $html .= ' class="' . $cssClass . '"';
             if ($htmlx) {
                 $html .= " style='position: relative;'";
@@ -1418,9 +1450,11 @@ private function generateRowWriteCell(&$html, $pSheet, $coordinate, $cellType, $
             // We must explicitly write the width of the <td> element because TCPDF
             // does not recognize e.g. <col style="width:42pt">
             if ($this->useInlineCss) {
-                $xcssClass = $cssClass;
+                $xcssClass = is_array($cssClass) ? $cssClass : [];
             } else {
-                $html .= ' class="' . $cssClass . '"';
+                if (is_string($cssClass)) {
+                    $html .= ' class="' . $cssClass . '"';
+                }
                 $xcssClass = [];
             }
             $width = 0;
@@ -1431,27 +1465,36 @@ private function generateRowWriteCell(&$html, $pSheet, $coordinate, $cellType, $
                     $width += $this->columnWidths[$sheetIndex][$i];
                 }
             }
-            $xcssClass['width'] = $width . 'pt';
-
+            $xcssClass['width'] = (string) $width . 'pt';
             // We must also explicitly write the height of the <td> element because TCPDF
             // does not recognize e.g. <tr style="height:50pt">
-            if (isset($this->cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $pRow]['height'])) {
-                $height = $this->cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $pRow]['height'];
+            if (isset($this->cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $row]['height'])) {
+                $height = $this->cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $row]['height'];
                 $xcssClass['height'] = $height;
             }
             //** end of redundant code **
+            if ($this->useInlineCss) {
+                foreach (['border-top', 'border-bottom', 'border-right', 'border-left'] as $borderType) {
+                    if (($xcssClass[$borderType] ?? '') === 'none #000000') {
+                        unset($xcssClass[$borderType]);
+                    }
+                }
+            }
 
             if ($htmlx) {
                 $xcssClass['position'] = 'relative';
             }
             $html .= ' style="' . $this->assembleCSS($xcssClass) . '"';
+            if ($this->useInlineCss) {
+                $html .= ' class="gridlines gridlinesp"';
+            }
         }
         $html = $this->generateRowSpans($html, $rowSpan, $colSpan);
 
         $html .= '>';
         $html .= $htmlx;
 
-        $html .= $this->writeComment($pSheet, $coordinate);
+        $html .= $this->writeComment($worksheet, $coordinate);
 
         // Cell data
         $html .= $cellData;
@@ -1463,58 +1506,67 @@ private function generateRowWriteCell(&$html, $pSheet, $coordinate, $cellType, $
     /**
      * Generate row.
      *
-     * @param Worksheet $pSheet \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet
-     * @param array $pValues Array containing cells in a row
-     * @param int $pRow Row number (0-based)
+     * @param array $values Array containing cells in a row
+     * @param int $row Row number (0-based)
      * @param string $cellType eg: 'td'
-     *
-     * @return string
      */
-    private function generateRow(Worksheet $pSheet, array $pValues, $pRow, $cellType)
+    private function generateRow(Worksheet $worksheet, array $values, int $row, string $cellType): string
     {
         // Sheet index
-        $sheetIndex = $pSheet->getParent()->getIndex($pSheet);
-        $html = $this->generateRowStart($pSheet, $sheetIndex, $pRow);
+        $sheetIndex = $worksheet->getParentOrThrow()->getIndex($worksheet);
+        $html = $this->generateRowStart($worksheet, $sheetIndex, $row);
 
         // Write cells
         $colNum = 0;
-        foreach ($pValues as $cellAddress) {
-            [$cell, $cssClass, $coordinate] = $this->generateRowCellCss($pSheet, $cellAddress, $pRow, $colNum);
-
-            $colSpan = 1;
-            $rowSpan = 1;
+        foreach ($values as $cellAddress) {
+            [$cell, $cssClass, $coordinate] = $this->generateRowCellCss($worksheet, $cellAddress, $row, $colNum);
 
             // Cell Data
-            $cellData = $this->generateRowCellData($pSheet, $cell, $cssClass, $cellType);
+            $cellData = $this->generateRowCellData($worksheet, $cell, $cssClass);
 
             // Hyperlink?
-            if ($pSheet->hyperlinkExists($coordinate) && !$pSheet->getHyperlink($coordinate)->isInternal()) {
-                $cellData = '<a href="' . htmlspecialchars($pSheet->getHyperlink($coordinate)->getUrl()) . '" title="' . htmlspecialchars($pSheet->getHyperlink($coordinate)->getTooltip()) . '">' . htmlspecialchars($cellData, HTML_SPECIAL_CHARS_FLAGS) . '</a>';
+            if ($worksheet->hyperlinkExists($coordinate) && !$worksheet->getHyperlink($coordinate)->isInternal()) {
+                $url = $worksheet->getHyperlink($coordinate)->getUrl();
+                $urldecode = strtolower(html_entity_decode(trim($url), encoding: 'UTF-8'));
+                $parseScheme = preg_match('/^(\\w+):/', $urldecode, $matches);
+                if ($parseScheme === 1 && !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>';
+                }
             }
 
             // Should the cell be written or is it swallowed by a rowspan or colspan?
-            $writeCell = !(isset($this->isSpannedCell[$pSheet->getParent()->getIndex($pSheet)][$pRow + 1][$colNum])
-                && $this->isSpannedCell[$pSheet->getParent()->getIndex($pSheet)][$pRow + 1][$colNum]);
+            $writeCell = !(isset($this->isSpannedCell[$worksheet->getParentOrThrow()->getIndex($worksheet)][$row + 1][$colNum])
+                && $this->isSpannedCell[$worksheet->getParentOrThrow()->getIndex($worksheet)][$row + 1][$colNum]);
 
             // Colspan and Rowspan
-            $colspan = 1;
-            $rowspan = 1;
-            if (isset($this->isBaseCell[$pSheet->getParent()->getIndex($pSheet)][$pRow + 1][$colNum])) {
-                $spans = $this->isBaseCell[$pSheet->getParent()->getIndex($pSheet)][$pRow + 1][$colNum];
+            $colSpan = 1;
+            $rowSpan = 1;
+            if (isset($this->isBaseCell[$worksheet->getParentOrThrow()->getIndex($worksheet)][$row + 1][$colNum])) {
+                $spans = $this->isBaseCell[$worksheet->getParentOrThrow()->getIndex($worksheet)][$row + 1][$colNum];
                 $rowSpan = $spans['rowspan'];
                 $colSpan = $spans['colspan'];
 
                 //    Also apply style from last cell in merge to fix borders -
                 //        relies on !important for non-none border declarations in createCSSStyleBorder
-                $endCellCoord = Coordinate::stringFromColumnIndex($colNum + $colSpan) . ($pRow + $rowSpan);
+                $endCellCoord = Coordinate::stringFromColumnIndex($colNum + $colSpan) . ($row + $rowSpan);
                 if (!$this->useInlineCss) {
-                    $cssClass .= ' style' . $pSheet->getCell($endCellCoord)->getXfIndex();
+                    $cssClass .= ' style' . $worksheet->getCell($endCellCoord)->getXfIndex();
+                } else {
+                    $endBorders = $this->spreadsheet->getCellXfByIndex($worksheet->getCell($endCellCoord)->getXfIndex())->getBorders();
+                    $altBorders = $this->createCSSStyleBorders($endBorders);
+                    foreach ($altBorders as $altKey => $altValue) {
+                        if (str_contains($altValue, '!important')) {
+                            $cssClass[$altKey] = $altValue;
+                        }
+                    }
                 }
             }
 
             // Write
             if ($writeCell) {
-                $this->generateRowWriteCell($html, $pSheet, $coordinate, $cellType, $cellData, $colSpan, $rowSpan, $cssClass, $colNum, $sheetIndex, $pRow);
+                $this->generateRowWriteCell($html, $worksheet, $coordinate, $cellType, $cellData, $colSpan, $rowSpan, $cssClass, $colNum, $sheetIndex, $row);
             }
 
             // Next column
@@ -1530,13 +1582,11 @@ private function generateRow(Worksheet $pSheet, array $pValues, $pRow, $cellType
 
     /**
      * Takes array where of CSS properties / values and converts to CSS string.
-     *
-     * @return string
      */
-    private function assembleCSS(array $pValue = [])
+    private function assembleCSS(array $values = []): string
     {
         $pairs = [];
-        foreach ($pValue as $property => $value) {
+        foreach ($values as $property => $value) {
             $pairs[] = $property . ':' . $value;
         }
         $string = implode('; ', $pairs);
@@ -1546,10 +1596,8 @@ private function assembleCSS(array $pValue = [])
 
     /**
      * Get images root.
-     *
-     * @return string
      */
-    public function getImagesRoot()
+    public function getImagesRoot(): string
     {
         return $this->imagesRoot;
     }
@@ -1557,23 +1605,19 @@ public function getImagesRoot()
     /**
      * Set images root.
      *
-     * @param string $pValue
-     *
      * @return $this
      */
-    public function setImagesRoot($pValue)
+    public function setImagesRoot(string $imagesRoot): static
     {
-        $this->imagesRoot = $pValue;
+        $this->imagesRoot = $imagesRoot;
 
         return $this;
     }
 
     /**
      * Get embed images.
-     *
-     * @return bool
      */
-    public function getEmbedImages()
+    public function getEmbedImages(): bool
     {
         return $this->embedImages;
     }
@@ -1581,23 +1625,19 @@ public function getEmbedImages()
     /**
      * Set embed images.
      *
-     * @param bool $pValue
-     *
      * @return $this
      */
-    public function setEmbedImages($pValue)
+    public function setEmbedImages(bool $embedImages): static
     {
-        $this->embedImages = $pValue;
+        $this->embedImages = $embedImages;
 
         return $this;
     }
 
     /**
      * Get use inline CSS?
-     *
-     * @return bool
      */
-    public function getUseInlineCss()
+    public function getUseInlineCss(): bool
     {
         return $this->useInlineCss;
     }
@@ -1605,45 +1645,11 @@ public function getUseInlineCss()
     /**
      * Set use inline CSS?
      *
-     * @param bool $pValue
-     *
-     * @return $this
-     */
-    public function setUseInlineCss($pValue)
-    {
-        $this->useInlineCss = $pValue;
-
-        return $this;
-    }
-
-    /**
-     * Get use embedded CSS?
-     *
-     * @return bool
-     *
-     * @codeCoverageIgnore
-     *
-     * @deprecated no longer used
-     */
-    public function getUseEmbeddedCSS()
-    {
-        return $this->useEmbeddedCSS;
-    }
-
-    /**
-     * Set use embedded CSS?
-     *
-     * @param bool $pValue
-     *
      * @return $this
-     *
-     * @codeCoverageIgnore
-     *
-     * @deprecated no longer used
      */
-    public function setUseEmbeddedCSS($pValue)
+    public function setUseInlineCss(bool $useInlineCss): static
     {
-        $this->useEmbeddedCSS = $pValue;
+        $this->useInlineCss = $useInlineCss;
 
         return $this;
     }
@@ -1651,32 +1657,30 @@ public function setUseEmbeddedCSS($pValue)
     /**
      * Add color to formatted string as inline style.
      *
-     * @param string $pValue Plain formatted value without color
-     * @param string $pFormat Format code
-     *
-     * @return string
+     * @param string $value Plain formatted value without color
+     * @param string $format Format code
      */
-    public function formatColor($pValue, $pFormat)
+    public function formatColor(string $value, string $format): string
     {
         // Color information, e.g. [Red] is always at the beginning
         $color = null; // initialize
         $matches = [];
 
         $color_regex = '/^\\[[a-zA-Z]+\\]/';
-        if (preg_match($color_regex, $pFormat, $matches)) {
+        if (preg_match($color_regex, $format, $matches)) {
             $color = str_replace(['[', ']'], '', $matches[0]);
             $color = strtolower($color);
         }
 
         // convert to PCDATA
-        $value = htmlspecialchars($pValue);
+        $result = htmlspecialchars($value, Settings::htmlEntityFlags());
 
         // color span tag
         if ($color !== null) {
-            $value = '<span style="color:' . $color . '">' . $value . '</span>';
+            $result = '<span style="color:' . $color . '">' . $result . '</span>';
         }
 
-        return $value;
+        return $result;
     }
 
     /**
@@ -1690,8 +1694,8 @@ private function calculateSpans(): void
         // Identify all cells that should be omitted in HTML due to cell merge.
         // In HTML only the upper-left cell should be written and it should have
         //   appropriate rowspan / colspan attribute
-        $sheetIndexes = $this->sheetIndex !== null ?
-            [$this->sheetIndex] : range(0, $this->spreadsheet->getSheetCount() - 1);
+        $sheetIndexes = $this->sheetIndex !== null
+            ? [$this->sheetIndex] : range(0, $this->spreadsheet->getSheetCount() - 1);
 
         foreach ($sheetIndexes as $sheetIndex) {
             $sheet = $this->spreadsheet->getSheet($sheetIndex);
@@ -1745,7 +1749,7 @@ private function calculateSpans(): void
         $this->spansAreCalculated = true;
     }
 
-    private function calculateSpansOmitRows($sheet, $sheetIndex, $candidateSpannedRow): void
+    private function calculateSpansOmitRows(Worksheet $sheet, int $sheetIndex, array $candidateSpannedRow): void
     {
         // Identify which rows should be omitted in HTML. These are the rows where all the cells
         //   participate in a merge and the where base cells are somewhere above.
@@ -1767,7 +1771,7 @@ private function calculateSpansOmitRows($sheet, $sheetIndex, $candidateSpannedRo
                 while ($c++ < $e) {
                     $baseCell = $this->isSpannedCell[$sheetIndex][$rowIndex][$c]['baseCell'];
 
-                    if (!in_array($baseCell, $adjustedBaseCells)) {
+                    if (!in_array($baseCell, $adjustedBaseCells, true)) {
                         // subtract rowspan by 1
                         --$this->isBaseCell[$sheetIndex][$baseCell[0]][$baseCell[1]]['rowspan'];
                         $adjustedBaseCells[] = $baseCell;
@@ -1781,20 +1785,21 @@ private function calculateSpansOmitRows($sheet, $sheetIndex, $candidateSpannedRo
      * Write a comment in the same format as LibreOffice.
      *
      * @see https://github.com/LibreOffice/core/blob/9fc9bf3240f8c62ad7859947ab8a033ac1fe93fa/sc/source/filter/html/htmlexp.cxx#L1073-L1092
-     *
-     * @param string $coordinate
-     *
-     * @return string
      */
-    private function writeComment(Worksheet $pSheet, $coordinate)
+    private function writeComment(Worksheet $worksheet, string $coordinate): string
     {
         $result = '';
-        if (!$this->isPdf && isset($pSheet->getComments()[$coordinate])) {
-            $sanitizer = new HTMLPurifier();
-            $sanitizedString = $sanitizer->purify($pSheet->getComment($coordinate)->getText()->getPlainText());
+        if (!$this->isPdf && isset($worksheet->getComments()[$coordinate])) {
+            $sanitizedString = $this->generateRowCellDataValueRich($worksheet->getComment($coordinate)->getText());
+            $dir = ($worksheet->getComment($coordinate)->getTextboxDirection() === Comment::TEXTBOX_DIRECTION_RTL) ? ' dir="rtl"' : '';
+            $align = strtolower($worksheet->getComment($coordinate)->getAlignment());
+            $alignment = Alignment::HORIZONTAL_ALIGNMENT_FOR_HTML[$align] ?? '';
+            if ($alignment !== '') {
+                $alignment = " style=\"text-align:$alignment\"";
+            }
             if ($sanitizedString !== '') {
                 $result .= '<a class="comment-indicator"></a>';
-                $result .= '<div class="comment">' . nl2br($sanitizedString) . '</div>';
+                $result .= "<div class=\"comment\"$dir$alignment>" . $sanitizedString . '</div>';
                 $result .= PHP_EOL;
             }
         }
@@ -1802,14 +1807,16 @@ private function writeComment(Worksheet $pSheet, $coordinate)
         return $result;
     }
 
+    public function getOrientation(): ?string
+    {
+        // Expect Pdf classes to override this method.
+        return $this->isPdf ? PageSetup::ORIENTATION_PORTRAIT : null;
+    }
+
     /**
      * Generate @page declarations.
-     *
-     * @param bool $generateSurroundingHTML
-     *
-     * @return    string
      */
-    private function generatePageDeclarations($generateSurroundingHTML)
+    private function generatePageDeclarations(bool $generateSurroundingHTML): string
     {
         // Ensure that Spans have been calculated?
         $this->calculateSpans();
@@ -1827,44 +1834,65 @@ private function generatePageDeclarations($generateSurroundingHTML)
 
         // Loop all sheets
         $sheetId = 0;
-        foreach ($sheets as $pSheet) {
+        foreach ($sheets as $worksheet) {
             $htmlPage .= "@page page$sheetId { ";
-            $left = StringHelper::formatNumber($pSheet->getPageMargins()->getLeft()) . 'in; ';
+            $left = StringHelper::formatNumber($worksheet->getPageMargins()->getLeft()) . 'in; ';
             $htmlPage .= 'margin-left: ' . $left;
-            $right = StringHelper::FormatNumber($pSheet->getPageMargins()->getRight()) . 'in; ';
+            $right = StringHelper::FormatNumber($worksheet->getPageMargins()->getRight()) . 'in; ';
             $htmlPage .= 'margin-right: ' . $right;
-            $top = StringHelper::FormatNumber($pSheet->getPageMargins()->getTop()) . 'in; ';
+            $top = StringHelper::FormatNumber($worksheet->getPageMargins()->getTop()) . 'in; ';
             $htmlPage .= 'margin-top: ' . $top;
-            $bottom = StringHelper::FormatNumber($pSheet->getPageMargins()->getBottom()) . 'in; ';
+            $bottom = StringHelper::FormatNumber($worksheet->getPageMargins()->getBottom()) . 'in; ';
             $htmlPage .= 'margin-bottom: ' . $bottom;
-            $orientation = $pSheet->getPageSetup()->getOrientation();
-            if ($orientation === \PhpOffice\PhpSpreadsheet\Worksheet\PageSetup::ORIENTATION_LANDSCAPE) {
+            $orientation = $this->getOrientation() ?? $worksheet->getPageSetup()->getOrientation();
+            if ($orientation === PageSetup::ORIENTATION_LANDSCAPE) {
                 $htmlPage .= 'size: landscape; ';
-            } elseif ($orientation === \PhpOffice\PhpSpreadsheet\Worksheet\PageSetup::ORIENTATION_PORTRAIT) {
+            } elseif ($orientation === PageSetup::ORIENTATION_PORTRAIT) {
                 $htmlPage .= 'size: portrait; ';
             }
-            $htmlPage .= "}\n";
+            $htmlPage .= '}' . PHP_EOL;
             ++$sheetId;
         }
-        $htmlPage .= <<<EOF
-.navigation {page-break-after: always;}
-.scrpgbrk, div + div {page-break-before: always;}
-@media screen {
-  .gridlines td {border: 1px solid black;}
-  .gridlines th {border: 1px solid black;}
-  body>div {margin-top: 5px;}
-  body>div:first-child {margin-top: 0;}
-  .scrpgbrk {margin-top: 1px;}
-}
-@media print {
-  .gridlinesp td {border: 1px solid black;}
-  .gridlinesp th {border: 1px solid black;}
-  .navigation {display: none;}
-}
-
-EOF;
+        $htmlPage .= implode(PHP_EOL, [
+            '.navigation {page-break-after: always;}',
+            '.scrpgbrk, div + div {page-break-before: always;}',
+            '@media screen {',
+            '  .gridlines td {border: 1px solid black;}',
+            '  .gridlines th {border: 1px solid black;}',
+            '  body>div {margin-top: 5px;}',
+            '  body>div:first-child {margin-top: 0;}',
+            '  .scrpgbrk {margin-top: 1px;}',
+            '}',
+            '@media print {',
+            '  .gridlinesp td {border: 1px solid black;}',
+            '  .gridlinesp th {border: 1px solid black;}',
+            '  .navigation {display: none;}',
+            '}',
+            '',
+        ]);
         $htmlPage .= $generateSurroundingHTML ? ('</style>' . PHP_EOL) : '';
 
         return $htmlPage;
     }
+
+    private function shouldGenerateRow(Worksheet $sheet, int $row): bool
+    {
+        if (!($this instanceof Pdf\Mpdf || $this instanceof Pdf\Tcpdf)) {
+            return true;
+        }
+
+        return $sheet->isRowVisible($row);
+    }
+
+    private function shouldGenerateColumn(Worksheet $sheet, string $colStr): bool
+    {
+        if (!($this instanceof Pdf\Mpdf || $this instanceof Pdf\Tcpdf)) {
+            return true;
+        }
+        if (!$sheet->columnDimensionExists($colStr)) {
+            return true;
+        }
+
+        return $sheet->getColumnDimension($colStr)->getVisible();
+    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/IWriter.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/IWriter.php
index 5129d65583..cd48306797 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/IWriter.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/IWriter.php
@@ -6,8 +6,14 @@
 
 interface IWriter
 {
+    public const SAVE_WITH_CHARTS = 1;
+
+    public const DISABLE_PRECALCULATE_FORMULAE = 2;
+
     /**
      * IWriter constructor.
+     *
+     * @param Spreadsheet $spreadsheet The spreadsheet that we want to save using this Writer
      */
     public function __construct(Spreadsheet $spreadsheet);
 
@@ -15,21 +21,17 @@ public function __construct(Spreadsheet $spreadsheet);
      * Write charts in workbook?
      *        If this is true, then the Writer will write definitions for any charts that exist in the PhpSpreadsheet object.
      *        If false (the default) it will ignore any charts defined in the PhpSpreadsheet object.
-     *
-     * @return bool
      */
-    public function getIncludeCharts();
+    public function getIncludeCharts(): bool;
 
     /**
      * Set write charts in workbook
      *        Set to true, to advise the Writer to include any charts that exist in the PhpSpreadsheet object.
      *        Set to false (the default) to ignore charts.
      *
-     * @param bool $pValue
-     *
-     * @return IWriter
+     * @return $this
      */
-    public function setIncludeCharts($pValue);
+    public function setIncludeCharts(bool $includeCharts): self;
 
     /**
      * Get Pre-Calculate Formulas flag
@@ -38,50 +40,48 @@ public function setIncludeCharts($pValue);
      *        viewer when opening the file
      *     If false, then formulae are not calculated on save. This is faster for saving in PhpSpreadsheet, but slower
      *        when opening the resulting file in MS Excel, because Excel has to recalculate the formulae itself.
-     *
-     * @return bool
      */
-    public function getPreCalculateFormulas();
+    public function getPreCalculateFormulas(): bool;
 
     /**
      * Set Pre-Calculate Formulas
      *        Set to true (the default) to advise the Writer to calculate all formulae on save
      *        Set to false to prevent precalculation of formulae on save.
      *
-     * @param bool $pValue Pre-Calculate Formulas?
+     * @param bool $precalculateFormulas Pre-Calculate Formulas?
      *
-     * @return IWriter
+     * @return $this
      */
-    public function setPreCalculateFormulas($pValue);
+    public function setPreCalculateFormulas(bool $precalculateFormulas): self;
 
     /**
      * Save PhpSpreadsheet to file.
      *
-     * @param resource|string $pFilename Name of the file to save
+     * @param resource|string $filename Name of the file to save
+     * @param int $flags Flags that can change the behaviour of the Writer:
+     *            self::SAVE_WITH_CHARTS                Save any charts that are defined (if the Writer supports Charts)
+     *            self::DISABLE_PRECALCULATE_FORMULAE   Don't Precalculate formulae before saving the file
+     *
+     * @throws Exception
      */
-    public function save($pFilename);
+    public function save($filename, int $flags = 0): void;
 
     /**
      * Get use disk caching where possible?
-     *
-     * @return bool
      */
-    public function getUseDiskCaching();
+    public function getUseDiskCaching(): bool;
 
     /**
      * Set use disk caching where possible?
      *
-     * @param bool $pValue
-     * @param string $pDirectory Disk caching directory
+     * @param ?string $cacheDirectory Disk caching directory
      *
-     * @return IWriter
+     * @return $this
      */
-    public function setUseDiskCaching($pValue, $pDirectory = null);
+    public function setUseDiskCaching(bool $useDiskCache, ?string $cacheDirectory = null): self;
 
     /**
      * Get disk caching directory.
-     *
-     * @return string
      */
-    public function getDiskCachingDirectory();
+    public function getDiskCachingDirectory(): string;
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods.php
index f07ade9a58..638c16f1e1 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods.php
@@ -12,52 +12,28 @@
 use PhpOffice\PhpSpreadsheet\Writer\Ods\Styles;
 use PhpOffice\PhpSpreadsheet\Writer\Ods\Thumbnails;
 use ZipStream\Exception\OverflowException;
-use ZipStream\Option\Archive;
 use ZipStream\ZipStream;
 
 class Ods extends BaseWriter
 {
     /**
      * Private PhpSpreadsheet.
-     *
-     * @var Spreadsheet
      */
-    private $spreadSheet;
+    private Spreadsheet $spreadSheet;
 
-    /**
-     * @var Content
-     */
-    private $writerPartContent;
+    private Content $writerPartContent;
 
-    /**
-     * @var Meta
-     */
-    private $writerPartMeta;
+    private Meta $writerPartMeta;
 
-    /**
-     * @var MetaInf
-     */
-    private $writerPartMetaInf;
+    private MetaInf $writerPartMetaInf;
 
-    /**
-     * @var Mimetype
-     */
-    private $writerPartMimetype;
+    private Mimetype $writerPartMimetype;
 
-    /**
-     * @var Settings
-     */
-    private $writerPartSettings;
+    private Settings $writerPartSettings;
 
-    /**
-     * @var Styles
-     */
-    private $writerPartStyles;
+    private Styles $writerPartStyles;
 
-    /**
-     * @var Thumbnails
-     */
-    private $writerPartThumbnails;
+    private Thumbnails $writerPartThumbnails;
 
     /**
      * Create a new Ods.
@@ -113,33 +89,32 @@ public function getWriterPartThumbnails(): Thumbnails
     /**
      * Save PhpSpreadsheet to file.
      *
-     * @param resource|string $pFilename
+     * @param resource|string $filename
      */
-    public function save($pFilename): void
+    public function save($filename, int $flags = 0): void
     {
-        if (!$this->spreadSheet) {
-            throw new WriterException('PhpSpreadsheet object unassigned.');
-        }
+        $this->processFlags($flags);
 
         // garbage collect
         $this->spreadSheet->garbageCollect();
 
-        $this->openFileHandle($pFilename);
+        $this->openFileHandle($filename);
 
         $zip = $this->createZip();
 
         $zip->addFile('META-INF/manifest.xml', $this->getWriterPartMetaInf()->write());
         $zip->addFile('Thumbnails/thumbnail.png', $this->getWriterPartthumbnails()->write());
+        // Settings always need to be written before Content; Styles after Content
+        $zip->addFile('settings.xml', $this->getWriterPartsettings()->write());
         $zip->addFile('content.xml', $this->getWriterPartcontent()->write());
         $zip->addFile('meta.xml', $this->getWriterPartmeta()->write());
         $zip->addFile('mimetype', $this->getWriterPartmimetype()->write());
-        $zip->addFile('settings.xml', $this->getWriterPartsettings()->write());
         $zip->addFile('styles.xml', $this->getWriterPartstyles()->write());
 
         // Close file
         try {
             $zip->finish();
-        } catch (OverflowException $e) {
+        } catch (OverflowException) {
             throw new WriterException('Could not close resource.');
         }
 
@@ -148,10 +123,8 @@ public function save($pFilename): void
 
     /**
      * Create zip object.
-     *
-     * @return ZipStream
      */
-    private function createZip()
+    private function createZip(): ZipStream
     {
         // Try opening the ZIP file
         if (!is_resource($this->fileHandle)) {
@@ -159,25 +132,15 @@ private function createZip()
         }
 
         // Create new ZIP stream
-        $options = new Archive();
-        $options->setEnableZip64(false);
-        $options->setOutputStream($this->fileHandle);
-
-        return new ZipStream(null, $options);
+        return ZipStream0::newZipStream($this->fileHandle);
     }
 
     /**
      * Get Spreadsheet object.
-     *
-     * @return Spreadsheet
      */
-    public function getSpreadsheet()
+    public function getSpreadsheet(): Spreadsheet
     {
-        if ($this->spreadSheet !== null) {
-            return $this->spreadSheet;
-        }
-
-        throw new WriterException('No PhpSpreadsheet assigned.');
+        return $this->spreadSheet;
     }
 
     /**
@@ -187,7 +150,7 @@ public function getSpreadsheet()
      *
      * @return $this
      */
-    public function setSpreadsheet(Spreadsheet $spreadsheet)
+    public function setSpreadsheet(Spreadsheet $spreadsheet): static
     {
         $this->spreadSheet = $spreadsheet;
 
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/AutoFilters.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/AutoFilters.php
index cf0450f199..6d757e9186 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/AutoFilters.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/AutoFilters.php
@@ -9,15 +9,9 @@
 
 class AutoFilters
 {
-    /**
-     * @var XMLWriter
-     */
-    private $objWriter;
+    private XMLWriter $objWriter;
 
-    /**
-     * @var Spreadsheet
-     */
-    private $spreadsheet;
+    private Spreadsheet $spreadsheet;
 
     public function __construct(XMLWriter $objWriter, Spreadsheet $spreadsheet)
     {
@@ -53,7 +47,7 @@ public function write(): void
         }
     }
 
-    protected function formatRange(Worksheet $worksheet, Autofilter $autofilter): string
+    protected function formatRange(Worksheet $worksheet, AutoFilter $autofilter): string
     {
         $title = $worksheet->getTitle();
         $range = $autofilter->getRange();
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Cell/Comment.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Cell/Comment.php
index b0829bf1de..f0b7d57041 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Cell/Comment.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Cell/Comment.php
@@ -24,7 +24,22 @@ public static function write(XMLWriter $objWriter, Cell $cell): void
         $objWriter->writeAttribute('svg:x', $comment->getMarginLeft());
         $objWriter->writeAttribute('svg:y', $comment->getMarginTop());
         $objWriter->writeElement('dc:creator', $comment->getAuthor());
-        $objWriter->writeElement('text:p', $comment->getText()->getPlainText());
+
+        $objWriter->startElement('text:p');
+        $text = $comment->getText()->getPlainText();
+        $textElements = explode("\n", $text);
+        $newLineOwed = false;
+        foreach ($textElements as $textSegment) {
+            if ($newLineOwed) {
+                $objWriter->writeElement('text:line-break');
+            }
+            $newLineOwed = true;
+            if ($textSegment !== '') {
+                $objWriter->writeElement('text:span', $textSegment);
+            }
+        }
+        $objWriter->endElement(); // text:p
+
         $objWriter->endElement();
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Cell/Style.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Cell/Style.php
index f8aae20c0b..7573230689 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Cell/Style.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Cell/Style.php
@@ -2,17 +2,26 @@
 
 namespace PhpOffice\PhpSpreadsheet\Writer\Ods\Cell;
 
+use PhpOffice\PhpSpreadsheet\Helper\Dimension;
 use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
 use PhpOffice\PhpSpreadsheet\Style\Alignment;
+use PhpOffice\PhpSpreadsheet\Style\Border;
+use PhpOffice\PhpSpreadsheet\Style\Borders;
 use PhpOffice\PhpSpreadsheet\Style\Fill;
 use PhpOffice\PhpSpreadsheet\Style\Font;
 use PhpOffice\PhpSpreadsheet\Style\Style as CellStyle;
+use PhpOffice\PhpSpreadsheet\Worksheet\ColumnDimension;
+use PhpOffice\PhpSpreadsheet\Worksheet\RowDimension;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 
 class Style
 {
     public const CELL_STYLE_PREFIX = 'ce';
+    public const COLUMN_STYLE_PREFIX = 'co';
+    public const ROW_STYLE_PREFIX = 'ro';
+    public const TABLE_STYLE_PREFIX = 'ta';
 
-    private $writer;
+    private XMLWriter $writer;
 
     public function __construct(XMLWriter $writer)
     {
@@ -21,34 +30,22 @@ public function __construct(XMLWriter $writer)
 
     private function mapHorizontalAlignment(string $horizontalAlignment): string
     {
-        switch ($horizontalAlignment) {
-            case Alignment::HORIZONTAL_CENTER:
-            case Alignment::HORIZONTAL_CENTER_CONTINUOUS:
-            case Alignment::HORIZONTAL_DISTRIBUTED:
-                return 'center';
-            case Alignment::HORIZONTAL_RIGHT:
-                return 'end';
-            case Alignment::HORIZONTAL_FILL:
-            case Alignment::HORIZONTAL_JUSTIFY:
-                return 'justify';
-        }
-
-        return 'start';
+        return match ($horizontalAlignment) {
+            Alignment::HORIZONTAL_CENTER, Alignment::HORIZONTAL_CENTER_CONTINUOUS, Alignment::HORIZONTAL_DISTRIBUTED => 'center',
+            Alignment::HORIZONTAL_RIGHT => 'end',
+            Alignment::HORIZONTAL_FILL, Alignment::HORIZONTAL_JUSTIFY => 'justify',
+            default => 'start',
+        };
     }
 
     private function mapVerticalAlignment(string $verticalAlignment): string
     {
-        switch ($verticalAlignment) {
-            case Alignment::VERTICAL_TOP:
-                return 'top';
-            case Alignment::VERTICAL_CENTER:
-                return 'middle';
-            case Alignment::VERTICAL_DISTRIBUTED:
-            case Alignment::VERTICAL_JUSTIFY:
-                return 'automatic';
-        }
-
-        return 'bottom';
+        return match ($verticalAlignment) {
+            Alignment::VERTICAL_TOP => 'top',
+            Alignment::VERTICAL_CENTER => 'middle',
+            Alignment::VERTICAL_DISTRIBUTED, Alignment::VERTICAL_JUSTIFY => 'automatic',
+            default => 'bottom',
+        };
     }
 
     private function writeFillStyle(Fill $fill): void
@@ -70,6 +67,80 @@ private function writeFillStyle(Fill $fill): void
         }
     }
 
+    private function writeBordersStyle(Borders $borders): void
+    {
+        $this->writeBorderStyle('bottom', $borders->getBottom());
+        $this->writeBorderStyle('left', $borders->getLeft());
+        $this->writeBorderStyle('right', $borders->getRight());
+        $this->writeBorderStyle('top', $borders->getTop());
+    }
+
+    private function writeBorderStyle(string $direction, Border $border): void
+    {
+        if ($border->getBorderStyle() === Border::BORDER_NONE) {
+            return;
+        }
+
+        $this->writer->writeAttribute('fo:border-' . $direction, sprintf(
+            '%s %s #%s',
+            $this->mapBorderWidth($border),
+            $this->mapBorderStyle($border),
+            $border->getColor()->getRGB(),
+        ));
+    }
+
+    private function mapBorderWidth(Border $border): string
+    {
+        switch ($border->getBorderStyle()) {
+            case Border::BORDER_THIN:
+            case Border::BORDER_DASHED:
+            case Border::BORDER_DASHDOT:
+            case Border::BORDER_DASHDOTDOT:
+            case Border::BORDER_DOTTED:
+            case Border::BORDER_HAIR:
+                return '0.75pt';
+            case Border::BORDER_MEDIUM:
+            case Border::BORDER_MEDIUMDASHED:
+            case Border::BORDER_MEDIUMDASHDOT:
+            case Border::BORDER_MEDIUMDASHDOTDOT:
+            case Border::BORDER_SLANTDASHDOT:
+                return '1.75pt';
+            case Border::BORDER_DOUBLE:
+            case Border::BORDER_THICK:
+                return '2.5pt';
+        }
+
+        return '1pt';
+    }
+
+    private function mapBorderStyle(Border $border): string
+    {
+        switch ($border->getBorderStyle()) {
+            case Border::BORDER_DOTTED:
+            case Border::BORDER_MEDIUMDASHDOTDOT:
+                return Border::BORDER_DOTTED;
+
+            case Border::BORDER_DASHED:
+            case Border::BORDER_DASHDOT:
+            case Border::BORDER_DASHDOTDOT:
+            case Border::BORDER_MEDIUMDASHDOT:
+            case Border::BORDER_MEDIUMDASHED:
+            case Border::BORDER_SLANTDASHDOT:
+                return Border::BORDER_DASHED;
+
+            case Border::BORDER_DOUBLE:
+                return Border::BORDER_DOUBLE;
+
+            case Border::BORDER_HAIR:
+            case Border::BORDER_MEDIUM:
+            case Border::BORDER_THICK:
+            case Border::BORDER_THIN:
+                return 'solid';
+        }
+
+        return 'solid';
+    }
+
     private function writeCellProperties(CellStyle $style): void
     {
         // Align
@@ -90,9 +161,10 @@ private function writeCellProperties(CellStyle $style): void
         $this->writer->writeAttribute('style:rotation-align', 'none');
 
         // Fill
-        if ($fill = $style->getFill()) {
-            $this->writeFillStyle($fill);
-        }
+        $this->writeFillStyle($style->getFill());
+
+        // Border
+        $this->writeBordersStyle($style->getBorders());
 
         $this->writer->endElement();
 
@@ -106,16 +178,11 @@ private function writeCellProperties(CellStyle $style): void
 
     protected function mapUnderlineStyle(Font $font): string
     {
-        switch ($font->getUnderline()) {
-            case Font::UNDERLINE_DOUBLE:
-            case Font::UNDERLINE_DOUBLEACCOUNTING:
-                return'double';
-            case Font::UNDERLINE_SINGLE:
-            case Font::UNDERLINE_SINGLEACCOUNTING:
-                return'single';
-        }
-
-        return 'none';
+        return match ($font->getUnderline()) {
+            Font::UNDERLINE_DOUBLE, Font::UNDERLINE_DOUBLEACCOUNTING => 'double',
+            Font::UNDERLINE_SINGLE, Font::UNDERLINE_SINGLEACCOUNTING => 'single',
+            default => 'none',
+        };
     }
 
     protected function writeTextProperties(CellStyle $style): void
@@ -135,9 +202,7 @@ protected function writeTextProperties(CellStyle $style): void
             $this->writer->writeAttribute('fo:font-style', 'italic');
         }
 
-        if ($color = $font->getColor()) {
-            $this->writer->writeAttribute('fo:color', sprintf('#%s', $color->getRGB()));
-        }
+        $this->writer->writeAttribute('fo:color', sprintf('#%s', $font->getColor()->getRGB()));
 
         if ($family = $font->getName()) {
             $this->writer->writeAttribute('fo:font-family', $family);
@@ -159,6 +224,83 @@ protected function writeTextProperties(CellStyle $style): void
         $this->writer->endElement(); // Close style:text-properties
     }
 
+    protected function writeColumnProperties(ColumnDimension $columnDimension): void
+    {
+        $this->writer->startElement('style:table-column-properties');
+        $this->writer->writeAttribute(
+            'style:column-width',
+            round($columnDimension->getWidth(Dimension::UOM_CENTIMETERS), 3) . 'cm'
+        );
+        $this->writer->writeAttribute('fo:break-before', 'auto');
+
+        // End
+        $this->writer->endElement(); // Close style:table-column-properties
+    }
+
+    public function writeColumnStyles(ColumnDimension $columnDimension, int $sheetId): void
+    {
+        $this->writer->startElement('style:style');
+        $this->writer->writeAttribute('style:family', 'table-column');
+        $this->writer->writeAttribute(
+            'style:name',
+            sprintf('%s_%d_%d', self::COLUMN_STYLE_PREFIX, $sheetId, $columnDimension->getColumnNumeric())
+        );
+
+        $this->writeColumnProperties($columnDimension);
+
+        // End
+        $this->writer->endElement(); // Close style:style
+    }
+
+    protected function writeRowProperties(RowDimension $rowDimension): void
+    {
+        $this->writer->startElement('style:table-row-properties');
+        $this->writer->writeAttribute(
+            'style:row-height',
+            round($rowDimension->getRowHeight(Dimension::UOM_CENTIMETERS), 3) . 'cm'
+        );
+        $this->writer->writeAttribute('style:use-optimal-row-height', 'false');
+        $this->writer->writeAttribute('fo:break-before', 'auto');
+
+        // End
+        $this->writer->endElement(); // Close style:table-row-properties
+    }
+
+    public function writeRowStyles(RowDimension $rowDimension, int $sheetId): void
+    {
+        $this->writer->startElement('style:style');
+        $this->writer->writeAttribute('style:family', 'table-row');
+        $this->writer->writeAttribute(
+            'style:name',
+            sprintf('%s_%d_%d', self::ROW_STYLE_PREFIX, $sheetId, $rowDimension->getRowIndex())
+        );
+
+        $this->writeRowProperties($rowDimension);
+
+        // End
+        $this->writer->endElement(); // Close style:style
+    }
+
+    public function writeTableStyle(Worksheet $worksheet, int $sheetId): void
+    {
+        $this->writer->startElement('style:style');
+        $this->writer->writeAttribute('style:family', 'table');
+        $this->writer->writeAttribute(
+            'style:name',
+            sprintf('%s%d', self::TABLE_STYLE_PREFIX, $sheetId)
+        );
+
+        $this->writer->startElement('style:table-properties');
+
+        $this->writer->writeAttribute(
+            'table:display',
+            $worksheet->getSheetState() === Worksheet::SHEETSTATE_VISIBLE ? 'true' : 'false'
+        );
+
+        $this->writer->endElement(); // Close style:table-properties
+        $this->writer->endElement(); // Close style:style
+    }
+
     public function write(CellStyle $style): void
     {
         $this->writer->startElement('style:style');
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Content.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Content.php
index a589e54923..b40054f079 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Content.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Content.php
@@ -2,14 +2,15 @@
 
 namespace PhpOffice\PhpSpreadsheet\Writer\Ods;
 
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\Exception as CalculationException;
 use PhpOffice\PhpSpreadsheet\Cell\Cell;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Cell\DataType;
 use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
-use PhpOffice\PhpSpreadsheet\Worksheet\Row;
+use PhpOffice\PhpSpreadsheet\Worksheet\RowCellIterator;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
-use PhpOffice\PhpSpreadsheet\Writer\Exception;
 use PhpOffice\PhpSpreadsheet\Writer\Ods;
 use PhpOffice\PhpSpreadsheet\Writer\Ods\Cell\Comment;
 use PhpOffice\PhpSpreadsheet\Writer\Ods\Cell\Style;
@@ -22,7 +23,7 @@ class Content extends WriterPart
     const NUMBER_COLS_REPEATED_MAX = 1024;
     const NUMBER_ROWS_REPEATED_MAX = 1048576;
 
-    private $formulaConvertor;
+    private Formula $formulaConvertor;
 
     /**
      * Set parent Ods writer.
@@ -117,16 +118,34 @@ public function write(): string
      */
     private function writeSheets(XMLWriter $objWriter): void
     {
-        $spreadsheet = $this->getParentWriter()->getSpreadsheet(); /** @var Spreadsheet $spreadsheet */
+        $spreadsheet = $this->getParentWriter()->getSpreadsheet();
         $sheetCount = $spreadsheet->getSheetCount();
-        for ($i = 0; $i < $sheetCount; ++$i) {
+        for ($sheetIndex = 0; $sheetIndex < $sheetCount; ++$sheetIndex) {
+            $spreadsheet->getSheet($sheetIndex)->calculateArrays($this->getParentWriter()->getPreCalculateFormulas());
             $objWriter->startElement('table:table');
-            $objWriter->writeAttribute('table:name', $spreadsheet->getSheet($i)->getTitle());
+            $objWriter->writeAttribute('table:name', $spreadsheet->getSheet($sheetIndex)->getTitle());
+            $objWriter->writeAttribute('table:style-name', Style::TABLE_STYLE_PREFIX . (string) ($sheetIndex + 1));
             $objWriter->writeElement('office:forms');
-            $objWriter->startElement('table:table-column');
-            $objWriter->writeAttribute('table:number-columns-repeated', self::NUMBER_COLS_REPEATED_MAX);
-            $objWriter->endElement();
-            $this->writeRows($objWriter, $spreadsheet->getSheet($i));
+            $lastColumn = 0;
+            foreach ($spreadsheet->getSheet($sheetIndex)->getColumnDimensions() as $columnDimension) {
+                $thisColumn = $columnDimension->getColumnNumeric();
+                $emptyColumns = $thisColumn - $lastColumn - 1;
+                if ($emptyColumns > 0) {
+                    $objWriter->startElement('table:table-column');
+                    $objWriter->writeAttribute('table:number-columns-repeated', (string) $emptyColumns);
+                    $objWriter->endElement();
+                }
+                $lastColumn = $thisColumn;
+                $objWriter->startElement('table:table-column');
+                $objWriter->writeAttribute(
+                    'table:style-name',
+                    sprintf('%s_%d_%d', Style::COLUMN_STYLE_PREFIX, $sheetIndex, $columnDimension->getColumnNumeric())
+                );
+                $objWriter->writeAttribute('table:default-cell-style-name', 'ce0');
+//                $objWriter->writeAttribute('table:number-columns-repeated', self::NUMBER_COLS_REPEATED_MAX);
+                $objWriter->endElement();
+            }
+            $this->writeRows($objWriter, $spreadsheet->getSheet($sheetIndex), $sheetIndex);
             $objWriter->endElement();
         }
     }
@@ -134,48 +153,51 @@ private function writeSheets(XMLWriter $objWriter): void
     /**
      * Write rows of the specified sheet.
      */
-    private function writeRows(XMLWriter $objWriter, Worksheet $sheet): void
+    private function writeRows(XMLWriter $objWriter, Worksheet $sheet, int $sheetIndex): void
     {
         $numberRowsRepeated = self::NUMBER_ROWS_REPEATED_MAX;
         $span_row = 0;
         $rows = $sheet->getRowIterator();
-        while ($rows->valid()) {
+        foreach ($rows as $row) {
+            $cellIterator = $row->getCellIterator();
             --$numberRowsRepeated;
-            $row = $rows->current();
-            if ($row->getCellIterator()->valid()) {
+            if ($cellIterator->valid()) {
+                $objWriter->startElement('table:table-row');
                 if ($span_row) {
-                    $objWriter->startElement('table:table-row');
                     if ($span_row > 1) {
-                        $objWriter->writeAttribute('table:number-rows-repeated', $span_row);
+                        $objWriter->writeAttribute('table:number-rows-repeated', (string) $span_row);
                     }
                     $objWriter->startElement('table:table-cell');
-                    $objWriter->writeAttribute('table:number-columns-repeated', self::NUMBER_COLS_REPEATED_MAX);
-                    $objWriter->endElement();
+                    $objWriter->writeAttribute('table:number-columns-repeated', (string) self::NUMBER_COLS_REPEATED_MAX);
                     $objWriter->endElement();
                     $span_row = 0;
+                } else {
+                    if ($sheet->rowDimensionExists($row->getRowIndex()) && $sheet->getRowDimension($row->getRowIndex())->getRowHeight() > 0) {
+                        $objWriter->writeAttribute(
+                            'table:style-name',
+                            sprintf('%s_%d_%d', Style::ROW_STYLE_PREFIX, $sheetIndex, $row->getRowIndex())
+                        );
+                    }
+                    $this->writeCells($objWriter, $cellIterator);
                 }
-                $objWriter->startElement('table:table-row');
-                $this->writeCells($objWriter, $row);
                 $objWriter->endElement();
             } else {
                 ++$span_row;
             }
-            $rows->next();
         }
     }
 
     /**
      * Write cells of the specified row.
      */
-    private function writeCells(XMLWriter $objWriter, Row $row): void
+    private function writeCells(XMLWriter $objWriter, RowCellIterator $cells): void
     {
         $numberColsRepeated = self::NUMBER_COLS_REPEATED_MAX;
         $prevColumn = -1;
-        $cells = $row->getCellIterator();
-        while ($cells->valid()) {
-            /** @var \PhpOffice\PhpSpreadsheet\Cell\Cell $cell */
-            $cell = $cells->current();
+        foreach ($cells as $cell) {
+            /** @var Cell $cell */
             $column = Coordinate::columnIndexFromString($cell->getColumn()) - 1;
+            $attributes = $cell->getFormulaAttributes() ?? [];
 
             $this->writeCellSpan($objWriter, $column, $prevColumn);
             $objWriter->startElement('table:table-cell');
@@ -190,8 +212,8 @@ private function writeCells(XMLWriter $objWriter, Row $row): void
             switch ($cell->getDataType()) {
                 case DataType::TYPE_BOOL:
                     $objWriter->writeAttribute('office:value-type', 'boolean');
-                    $objWriter->writeAttribute('office:value', $cell->getValue());
-                    $objWriter->writeElement('text:p', $cell->getValue());
+                    $objWriter->writeAttribute('office:boolean-value', $cell->getValue() ? 'true' : 'false');
+                    $objWriter->writeElement('text:p', Calculation::getInstance()->getLocaleBoolean($cell->getValue() ? 'TRUE' : 'FALSE'));
 
                     break;
                 case DataType::TYPE_ERROR:
@@ -202,15 +224,31 @@ private function writeCells(XMLWriter $objWriter, Row $row): void
 
                     break;
                 case DataType::TYPE_FORMULA:
-                    $formulaValue = $cell->getValue();
+                    $formulaValue = $cell->getValueString();
                     if ($this->getParentWriter()->getPreCalculateFormulas()) {
                         try {
-                            $formulaValue = $cell->getCalculatedValue();
-                        } catch (Exception $e) {
+                            $formulaValue = $cell->getCalculatedValueString();
+                        } catch (CalculationException $e) {
                             // don't do anything
                         }
                     }
-                    $objWriter->writeAttribute('table:formula', $this->formulaConvertor->convertFormula($cell->getValue()));
+                    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) {
+                            $matrixRowSpan = 1;
+                            $matrixColSpan = 1;
+                            if (isset($matches[3])) {
+                                $minRow = (int) $matches[2];
+                                $maxRow = (int) $matches[5];
+                                $matrixRowSpan = $maxRow - $minRow + 1;
+                                $minCol = Coordinate::columnIndexFromString($matches[1]);
+                                $maxCol = Coordinate::columnIndexFromString($matches[4]);
+                                $matrixColSpan = $maxCol - $minCol + 1;
+                            }
+                            $objWriter->writeAttribute('table:number-matrix-columns-spanned', "$matrixColSpan");
+                            $objWriter->writeAttribute('table:number-matrix-rows-spanned', "$matrixRowSpan");
+                        }
+                    }
+                    $objWriter->writeAttribute('table:formula', $this->formulaConvertor->convertFormula($cell->getValueString()));
                     if (is_numeric($formulaValue)) {
                         $objWriter->writeAttribute('office:value-type', 'float');
                     } else {
@@ -222,28 +260,44 @@ private function writeCells(XMLWriter $objWriter, Row $row): void
                     break;
                 case DataType::TYPE_NUMERIC:
                     $objWriter->writeAttribute('office:value-type', 'float');
-                    $objWriter->writeAttribute('office:value', $cell->getValue());
-                    $objWriter->writeElement('text:p', $cell->getValue());
+                    $objWriter->writeAttribute('office:value', $cell->getValueString());
+                    $objWriter->writeElement('text:p', $cell->getValueString());
 
                     break;
                 case DataType::TYPE_INLINE:
                     // break intentionally omitted
                 case DataType::TYPE_STRING:
                     $objWriter->writeAttribute('office:value-type', 'string');
-                    $objWriter->writeElement('text:p', $cell->getValue());
+                    $url = $cell->getHyperlink()->getUrl();
+                    if (empty($url)) {
+                        $objWriter->writeElement('text:p', $cell->getValueString());
+                    } else {
+                        $objWriter->startElement('text:p');
+                        $objWriter->startElement('text:a');
+                        $sheets = 'sheet://';
+                        $lensheets = strlen($sheets);
+                        if (substr($url, 0, $lensheets) === $sheets) {
+                            $url = '#' . substr($url, $lensheets);
+                        }
+                        $objWriter->writeAttribute('xlink:href', $url);
+                        $objWriter->writeAttribute('xlink:type', 'simple');
+                        $objWriter->text($cell->getValueString());
+                        $objWriter->endElement(); // text:a
+                        $objWriter->endElement(); // text:p
+                    }
 
                     break;
             }
             Comment::write($objWriter, $cell);
             $objWriter->endElement();
             $prevColumn = $column;
-            $cells->next();
         }
+
         $numberColsRepeated = $numberColsRepeated - $prevColumn - 1;
         if ($numberColsRepeated > 0) {
             if ($numberColsRepeated > 1) {
                 $objWriter->startElement('table:table-cell');
-                $objWriter->writeAttribute('table:number-columns-repeated', $numberColsRepeated);
+                $objWriter->writeAttribute('table:number-columns-repeated', (string) $numberColsRepeated);
                 $objWriter->endElement();
             } else {
                 $objWriter->writeElement('table:table-cell');
@@ -253,18 +307,15 @@ private function writeCells(XMLWriter $objWriter, Row $row): void
 
     /**
      * Write span.
-     *
-     * @param int $curColumn
-     * @param int $prevColumn
      */
-    private function writeCellSpan(XMLWriter $objWriter, $curColumn, $prevColumn): void
+    private function writeCellSpan(XMLWriter $objWriter, int $curColumn, int $prevColumn): void
     {
         $diff = $curColumn - $prevColumn - 1;
         if (1 === $diff) {
             $objWriter->writeElement('table:table-cell');
         } elseif ($diff > 1) {
             $objWriter->startElement('table:table-cell');
-            $objWriter->writeAttribute('table:number-columns-repeated', $diff);
+            $objWriter->writeAttribute('table:number-columns-repeated', (string) $diff);
             $objWriter->endElement();
         }
     }
@@ -275,6 +326,28 @@ private function writeCellSpan(XMLWriter $objWriter, $curColumn, $prevColumn): v
     private function writeXfStyles(XMLWriter $writer, Spreadsheet $spreadsheet): void
     {
         $styleWriter = new Style($writer);
+
+        $sheetCount = $spreadsheet->getSheetCount();
+        for ($i = 0; $i < $sheetCount; ++$i) {
+            $worksheet = $spreadsheet->getSheet($i);
+            $styleWriter->writeTableStyle($worksheet, $i + 1);
+
+            $worksheet->calculateColumnWidths();
+            foreach ($worksheet->getColumnDimensions() as $columnDimension) {
+                if ($columnDimension->getWidth() !== -1.0) {
+                    $styleWriter->writeColumnStyles($columnDimension, $i);
+                }
+            }
+        }
+        for ($i = 0; $i < $sheetCount; ++$i) {
+            $worksheet = $spreadsheet->getSheet($i);
+            foreach ($worksheet->getRowDimensions() as $rowDimension) {
+                if ($rowDimension->getRowHeight() > 0.0) {
+                    $styleWriter->writeRowStyles($rowDimension, $i);
+                }
+            }
+        }
+
         foreach ($spreadsheet->getCellXfCollection() as $style) {
             $styleWriter->write($style);
         }
@@ -289,14 +362,14 @@ private function writeCellMerge(XMLWriter $objWriter, Cell $cell): void
             return;
         }
 
-        $mergeRange = Coordinate::splitRange($cell->getMergeRange());
+        $mergeRange = Coordinate::splitRange((string) $cell->getMergeRange());
         [$startCell, $endCell] = $mergeRange[0];
         $start = Coordinate::coordinateFromString($startCell);
         $end = Coordinate::coordinateFromString($endCell);
         $columnSpan = Coordinate::columnIndexFromString($end[0]) - Coordinate::columnIndexFromString($start[0]) + 1;
         $rowSpan = ((int) $end[1]) - ((int) $start[1]) + 1;
 
-        $objWriter->writeAttribute('table:number-columns-spanned', $columnSpan);
-        $objWriter->writeAttribute('table:number-rows-spanned', $rowSpan);
+        $objWriter->writeAttribute('table:number-columns-spanned', (string) $columnSpan);
+        $objWriter->writeAttribute('table:number-rows-spanned', (string) $rowSpan);
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Formula.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Formula.php
index db766fb42e..9385607be4 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Formula.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Formula.php
@@ -7,7 +7,7 @@
 
 class Formula
 {
-    private $definedNames = [];
+    private array $definedNames = [];
 
     /**
      * @param DefinedName[] $definedNames
@@ -24,7 +24,7 @@ public function convertFormula(string $formula, string $worksheetName = ''): str
         $formula = $this->convertCellReferences($formula, $worksheetName);
         $formula = $this->convertDefinedNames($formula);
 
-        if (substr($formula, 0, 1) !== '=') {
+        if (!str_starts_with($formula, '=')) {
             $formula = '=' . $formula;
         }
 
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Meta.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Meta.php
index 16f7c8b540..b47b25539f 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Meta.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Meta.php
@@ -65,12 +65,12 @@ public function write(): string
         //<meta:document-statistic meta:table-count="XXX" meta:cell-count="XXX" meta:object-count="XXX"/>
         $objWriter->startElement('meta:user-defined');
         $objWriter->writeAttribute('meta:name', 'Company');
-        $objWriter->writeRaw($spreadsheet->getProperties()->getCompany());
+        $objWriter->writeRawData($spreadsheet->getProperties()->getCompany());
         $objWriter->endElement();
 
         $objWriter->startElement('meta:user-defined');
         $objWriter->writeAttribute('meta:name', 'category');
-        $objWriter->writeRaw($spreadsheet->getProperties()->getCategory());
+        $objWriter->writeRawData($spreadsheet->getProperties()->getCategory());
         $objWriter->endElement();
 
         self::writeDocPropsCustom($objWriter, $spreadsheet);
@@ -85,7 +85,7 @@ public function write(): string
     private static function writeDocPropsCustom(XMLWriter $objWriter, Spreadsheet $spreadsheet): void
     {
         $customPropertyList = $spreadsheet->getProperties()->getCustomProperties();
-        foreach ($customPropertyList as $key => $customProperty) {
+        foreach ($customPropertyList as $customProperty) {
             $propertyValue = $spreadsheet->getProperties()->getCustomPropertyValue($customProperty);
             $propertyType = $spreadsheet->getProperties()->getCustomPropertyType($customProperty);
 
@@ -96,7 +96,7 @@ private static function writeDocPropsCustom(XMLWriter $objWriter, Spreadsheet $s
                 case Properties::PROPERTY_TYPE_INTEGER:
                 case Properties::PROPERTY_TYPE_FLOAT:
                     $objWriter->writeAttribute('meta:value-type', 'float');
-                    $objWriter->writeRawData($propertyValue);
+                    $objWriter->writeRawData((string) $propertyValue);
 
                     break;
                 case Properties::PROPERTY_TYPE_BOOLEAN:
@@ -106,12 +106,12 @@ private static function writeDocPropsCustom(XMLWriter $objWriter, Spreadsheet $s
                     break;
                 case Properties::PROPERTY_TYPE_DATE:
                     $objWriter->writeAttribute('meta:value-type', 'date');
-                    $dtobj = Date::dateTimeFromTimestamp($propertyValue ?? 0);
+                    $dtobj = Date::dateTimeFromTimestamp((string) ($propertyValue ?? 0));
                     $objWriter->writeRawData($dtobj->format(DATE_W3C));
 
                     break;
                 default:
-                    $objWriter->writeRawData($propertyValue);
+                    $objWriter->writeRawData((string) $propertyValue);
 
                     break;
             }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/NamedExpressions.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/NamedExpressions.php
index ae1c4217b0..72b1dd0562 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/NamedExpressions.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/NamedExpressions.php
@@ -10,13 +10,13 @@
 
 class NamedExpressions
 {
-    private $objWriter;
+    private XMLWriter $objWriter;
 
-    private $spreadsheet;
+    private Spreadsheet $spreadsheet;
 
-    private $formulaConvertor;
+    private Formula $formulaConvertor;
 
-    public function __construct(XMLWriter $objWriter, Spreadsheet $spreadsheet, $formulaConvertor)
+    public function __construct(XMLWriter $objWriter, Spreadsheet $spreadsheet, Formula $formulaConvertor)
     {
         $this->objWriter = $objWriter;
         $this->spreadsheet = $spreadsheet;
@@ -51,23 +51,29 @@ private function writeExpressions(): void
 
     private function writeNamedFormula(DefinedName $definedName, Worksheet $defaultWorksheet): void
     {
+        $title = ($definedName->getWorksheet() !== null) ? $definedName->getWorksheet()->getTitle() : $defaultWorksheet->getTitle();
         $this->objWriter->writeAttribute('table:name', $definedName->getName());
         $this->objWriter->writeAttribute(
             'table:expression',
-            $this->formulaConvertor->convertFormula($definedName->getValue(), $definedName->getWorksheet()->getTitle())
+            $this->formulaConvertor->convertFormula($definedName->getValue(), $title)
         );
         $this->objWriter->writeAttribute('table:base-cell-address', $this->convertAddress(
             $definedName,
-            "'" . (($definedName->getWorksheet() !== null) ? $definedName->getWorksheet()->getTitle() : $defaultWorksheet->getTitle()) . "'!\$A\$1"
+            "'" . $title . "'!\$A\$1"
         ));
     }
 
     private function writeNamedRange(DefinedName $definedName): void
     {
+        $baseCell = '$A$1';
+        $ws = $definedName->getWorksheet();
+        if ($ws !== null) {
+            $baseCell = "'" . $ws->getTitle() . "'!$baseCell";
+        }
         $this->objWriter->writeAttribute('table:name', $definedName->getName());
         $this->objWriter->writeAttribute('table:base-cell-address', $this->convertAddress(
             $definedName,
-            "'" . $definedName->getWorksheet()->getTitle() . "'!\$A\$1"
+            $baseCell
         ));
         $this->objWriter->writeAttribute('table:cell-range-address', $this->convertAddress($definedName, $definedName->getValue()));
     }
@@ -100,7 +106,10 @@ private function convertAddress(DefinedName $definedName, string $address): stri
             if (empty($worksheet)) {
                 if (($offset === 0) || ($address[$offset - 1] !== ':')) {
                     // We need a worksheet
-                    $worksheet = $definedName->getWorksheet()->getTitle();
+                    $ws = $definedName->getWorksheet();
+                    if ($ws !== null) {
+                        $worksheet = $ws->getTitle();
+                    }
                 }
             } else {
                 $worksheet = str_replace("''", "'", trim($worksheet, "'"));
@@ -119,7 +128,7 @@ private function convertAddress(DefinedName $definedName, string $address): stri
             $address = substr($address, 0, $offset) . $newRange . substr($address, $offset + $length);
         }
 
-        if (substr($address, 0, 1) === '=') {
+        if (str_starts_with($address, '=')) {
             $address = substr($address, 1);
         }
 
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Settings.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Settings.php
index 047bd410b2..cfe1b598d9 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Settings.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/Settings.php
@@ -2,8 +2,11 @@
 
 namespace PhpOffice\PhpSpreadsheet\Writer\Ods;
 
+use PhpOffice\PhpSpreadsheet\Cell\CellAddress;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 
 class Settings extends WriterPart
 {
@@ -45,28 +48,9 @@ public function write(): string
         $objWriter->text('view1');
         $objWriter->endElement(); // ViewId
         $objWriter->startElement('config:config-item-map-named');
-        $objWriter->writeAttribute('config:name', 'Tables');
-        foreach ($spreadsheet->getWorksheetIterator() as $ws) {
-            $objWriter->startElement('config:config-item-map-entry');
-            $objWriter->writeAttribute('config:name', $ws->getTitle());
-            $selected = $ws->getSelectedCells();
-            if (preg_match('/^([a-z]+)([0-9]+)/i', $selected, $matches) === 1) {
-                $colSel = Coordinate::columnIndexFromString($matches[1]) - 1;
-                $rowSel = (int) $matches[2] - 1;
-                $objWriter->startElement('config:config-item');
-                $objWriter->writeAttribute('config:name', 'CursorPositionX');
-                $objWriter->writeAttribute('config:type', 'int');
-                $objWriter->text($colSel);
-                $objWriter->endElement();
-                $objWriter->startElement('config:config-item');
-                $objWriter->writeAttribute('config:name', 'CursorPositionY');
-                $objWriter->writeAttribute('config:type', 'int');
-                $objWriter->text($rowSel);
-                $objWriter->endElement();
-            }
-            $objWriter->endElement(); // config:config-item-map-entry
-        }
-        $objWriter->endElement(); // config:config-item-map-named
+
+        $this->writeAllWorksheetSettings($objWriter, $spreadsheet);
+
         $wstitle = $spreadsheet->getActiveSheet()->getTitle();
         $objWriter->startElement('config:config-item');
         $objWriter->writeAttribute('config:name', 'ActiveTable');
@@ -85,4 +69,84 @@ public function write(): string
 
         return $objWriter->getData();
     }
+
+    private function writeAllWorksheetSettings(XMLWriter $objWriter, Spreadsheet $spreadsheet): void
+    {
+        $objWriter->writeAttribute('config:name', 'Tables');
+
+        foreach ($spreadsheet->getWorksheetIterator() as $worksheet) {
+            $this->writeWorksheetSettings($objWriter, $worksheet);
+        }
+
+        $objWriter->endElement(); // config:config-item-map-entry Tables
+    }
+
+    private function writeWorksheetSettings(XMLWriter $objWriter, Worksheet $worksheet): void
+    {
+        $objWriter->startElement('config:config-item-map-entry');
+        $objWriter->writeAttribute('config:name', $worksheet->getTitle());
+
+        $this->writeSelectedCells($objWriter, $worksheet);
+        if ($worksheet->getFreezePane() !== null) {
+            $this->writeFreezePane($objWriter, $worksheet);
+        }
+
+        $objWriter->endElement(); // config:config-item-map-entry Worksheet
+    }
+
+    private function writeSelectedCells(XMLWriter $objWriter, Worksheet $worksheet): void
+    {
+        $selected = $worksheet->getSelectedCells();
+        if (preg_match('/^([a-z]+)([0-9]+)/i', $selected, $matches) === 1) {
+            $colSel = Coordinate::columnIndexFromString($matches[1]) - 1;
+            $rowSel = (int) $matches[2] - 1;
+            $objWriter->startElement('config:config-item');
+            $objWriter->writeAttribute('config:name', 'CursorPositionX');
+            $objWriter->writeAttribute('config:type', 'int');
+            $objWriter->text((string) $colSel);
+            $objWriter->endElement();
+            $objWriter->startElement('config:config-item');
+            $objWriter->writeAttribute('config:name', 'CursorPositionY');
+            $objWriter->writeAttribute('config:type', 'int');
+            $objWriter->text((string) $rowSel);
+            $objWriter->endElement();
+        }
+    }
+
+    private function writeSplitValue(XMLWriter $objWriter, string $splitMode, string $type, string $value): void
+    {
+        $objWriter->startElement('config:config-item');
+        $objWriter->writeAttribute('config:name', $splitMode);
+        $objWriter->writeAttribute('config:type', $type);
+        $objWriter->text($value);
+        $objWriter->endElement();
+    }
+
+    private function writeFreezePane(XMLWriter $objWriter, Worksheet $worksheet): void
+    {
+        $freezePane = CellAddress::fromCellAddress($worksheet->getFreezePane() ?? '');
+        if ($freezePane->cellAddress() === 'A1') {
+            return;
+        }
+
+        $columnId = $freezePane->columnId();
+        $columnName = $freezePane->columnName();
+        $row = $freezePane->rowId();
+
+        $this->writeSplitValue($objWriter, 'HorizontalSplitMode', 'short', '2');
+        $this->writeSplitValue($objWriter, 'HorizontalSplitPosition', 'int', (string) ($columnId - 1));
+        $this->writeSplitValue($objWriter, 'PositionLeft', 'short', '0');
+        $this->writeSplitValue($objWriter, 'PositionRight', 'short', (string) ($columnId - 1));
+
+        for ($column = 'A'; $column !== $columnName; ++$column) {
+            $worksheet->getColumnDimension($column)->setAutoSize(true);
+        }
+
+        $this->writeSplitValue($objWriter, 'VerticalSplitMode', 'short', '2');
+        $this->writeSplitValue($objWriter, 'VerticalSplitPosition', 'int', (string) ($row - 1));
+        $this->writeSplitValue($objWriter, 'PositionTop', 'short', '0');
+        $this->writeSplitValue($objWriter, 'PositionBottom', 'short', (string) ($row - 1));
+
+        $this->writeSplitValue($objWriter, 'ActiveSplitRange', 'short', '3');
+    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/WriterPart.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/WriterPart.php
index 17d5d16931..366fdd90af 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/WriterPart.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Ods/WriterPart.php
@@ -8,17 +8,13 @@ abstract class WriterPart
 {
     /**
      * Parent Ods object.
-     *
-     * @var Ods
      */
-    private $parentWriter;
+    private Ods $parentWriter;
 
     /**
      * Get Ods writer.
-     *
-     * @return Ods
      */
-    public function getParentWriter()
+    public function getParentWriter(): Ods
     {
         return $this->parentWriter;
     }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf.php
index 36f3966d16..17e1905084 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf.php
@@ -11,38 +11,28 @@ abstract class Pdf extends Html
 {
     /**
      * Temporary storage directory.
-     *
-     * @var string
      */
-    protected $tempDir = '';
+    protected string $tempDir;
 
     /**
      * Font.
-     *
-     * @var string
      */
-    protected $font = 'freesans';
+    protected string $font = 'freesans';
 
     /**
      * Orientation (Over-ride).
-     *
-     * @var string
      */
-    protected $orientation;
+    protected ?string $orientation = null;
 
     /**
      * Paper size (Over-ride).
-     *
-     * @var int
      */
-    protected $paperSize;
+    protected ?int $paperSize = null;
 
     /**
      * Paper Sizes xRef List.
-     *
-     * @var array
      */
-    protected static $paperSizes = [
+    protected static array $paperSizes = [
         PageSetup::PAPERSIZE_LETTER => 'LETTER', //    (8.5 in. by 11 in.)
         PageSetup::PAPERSIZE_LETTER_SMALL => 'LETTER', //    (8.5 in. by 11 in.)
         PageSetup::PAPERSIZE_TABLOID => [792.00, 1224.00], //    (11 in. by 17 in.)
@@ -126,10 +116,8 @@ public function __construct(Spreadsheet $spreadsheet)
 
     /**
      * Get Font.
-     *
-     * @return string
      */
-    public function getFont()
+    public function getFont(): string
     {
         return $this->font;
     }
@@ -141,11 +129,9 @@ public function getFont()
      *      'arialunicid0-korean'
      *      'arialunicid0-japanese'.
      *
-     * @param string $fontName
-     *
      * @return $this
      */
-    public function setFont($fontName)
+    public function setFont(string $fontName)
     {
         $this->font = $fontName;
 
@@ -154,10 +140,8 @@ public function setFont($fontName)
 
     /**
      * Get Paper Size.
-     *
-     * @return int
      */
-    public function getPaperSize()
+    public function getPaperSize(): ?int
     {
         return $this->paperSize;
     }
@@ -165,23 +149,19 @@ public function getPaperSize()
     /**
      * Set Paper Size.
      *
-     * @param int $pValue Paper size see PageSetup::PAPERSIZE_*
-     *
-     * @return self
+     * @param int $paperSize Paper size see PageSetup::PAPERSIZE_*
      */
-    public function setPaperSize($pValue)
+    public function setPaperSize(int $paperSize): self
     {
-        $this->paperSize = $pValue;
+        $this->paperSize = $paperSize;
 
         return $this;
     }
 
     /**
      * Get Orientation.
-     *
-     * @return string
      */
-    public function getOrientation()
+    public function getOrientation(): ?string
     {
         return $this->orientation;
     }
@@ -189,23 +169,19 @@ public function getOrientation()
     /**
      * Set Orientation.
      *
-     * @param string $pValue Page orientation see PageSetup::ORIENTATION_*
-     *
-     * @return self
+     * @param string $orientation Page orientation see PageSetup::ORIENTATION_*
      */
-    public function setOrientation($pValue)
+    public function setOrientation(string $orientation): self
     {
-        $this->orientation = $pValue;
+        $this->orientation = $orientation;
 
         return $this;
     }
 
     /**
      * Get temporary storage directory.
-     *
-     * @return string
      */
-    public function getTempDir()
+    public function getTempDir(): string
     {
         return $this->tempDir;
     }
@@ -213,16 +189,14 @@ public function getTempDir()
     /**
      * Set temporary storage directory.
      *
-     * @param string $pValue Temporary storage directory
-     *
-     * @return self
+     * @param string $temporaryDirectory Temporary storage directory
      */
-    public function setTempDir($pValue)
+    public function setTempDir(string $temporaryDirectory): self
     {
-        if (is_dir($pValue)) {
-            $this->tempDir = $pValue;
+        if (is_dir($temporaryDirectory)) {
+            $this->tempDir = $temporaryDirectory;
         } else {
-            throw new WriterException("Directory does not exist: $pValue");
+            throw new WriterException("Directory does not exist: $temporaryDirectory");
         }
 
         return $this;
@@ -231,14 +205,14 @@ public function setTempDir($pValue)
     /**
      * Save Spreadsheet to PDF file, pre-save.
      *
-     * @param string $pFilename Name of the file to save as
+     * @param resource|string $filename Name of the file to save as
      *
      * @return resource
      */
-    protected function prepareForSave($pFilename)
+    protected function prepareForSave($filename)
     {
         //  Open file
-        $this->openFileHandle($pFilename);
+        $this->openFileHandle($filename);
 
         return $this->fileHandle;
     }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf/Dompdf.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf/Dompdf.php
index 87e8eeb5f6..6569980aca 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf/Dompdf.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf/Dompdf.php
@@ -7,12 +7,17 @@
 
 class Dompdf extends Pdf
 {
+    /**
+     * embed images, or link to images.
+     */
+    protected bool $embedImages = true;
+
     /**
      * Gets the implementation of external PDF library that should be used.
      *
      * @return \Dompdf\Dompdf implementation
      */
-    protected function createExternalWriterInstance()
+    protected function createExternalWriterInstance(): \Dompdf\Dompdf
     {
         return new \Dompdf\Dompdf();
     }
@@ -20,43 +25,24 @@ protected function createExternalWriterInstance()
     /**
      * Save Spreadsheet to file.
      *
-     * @param string $pFilename Name of the file to save as
+     * @param string $filename Name of the file to save as
      */
-    public function save($pFilename): void
+    public function save($filename, int $flags = 0): void
     {
-        $fileHandle = parent::prepareForSave($pFilename);
-
-        //  Default PDF paper size
-        $paperSize = 'LETTER'; //    Letter    (8.5 in. by 11 in.)
+        $fileHandle = parent::prepareForSave($filename);
 
         //  Check for paper size and page orientation
-        if ($this->getSheetIndex() === null) {
-            $orientation = ($this->spreadsheet->getSheet(0)->getPageSetup()->getOrientation()
-                == PageSetup::ORIENTATION_LANDSCAPE) ? 'L' : 'P';
-            $printPaperSize = $this->spreadsheet->getSheet(0)->getPageSetup()->getPaperSize();
-        } else {
-            $orientation = ($this->spreadsheet->getSheet($this->getSheetIndex())->getPageSetup()->getOrientation()
-                == PageSetup::ORIENTATION_LANDSCAPE) ? 'L' : 'P';
-            $printPaperSize = $this->spreadsheet->getSheet($this->getSheetIndex())->getPageSetup()->getPaperSize();
+        $setup = $this->spreadsheet->getSheet($this->getSheetIndex() ?? 0)->getPageSetup();
+        $orientation = $this->getOrientation() ?? $setup->getOrientation();
+        $orientation = ($orientation === PageSetup::ORIENTATION_LANDSCAPE) ? 'L' : 'P';
+        $printPaperSize = $this->getPaperSize() ?? $setup->getPaperSize();
+        $paperSize = self::$paperSizes[$printPaperSize] ?? PageSetup::getPaperSizeDefault();
+        if (is_array($paperSize) && count($paperSize) === 2) {
+            $paperSize = [0.0, 0.0, $paperSize[0], $paperSize[1]];
         }
 
         $orientation = ($orientation == 'L') ? 'landscape' : 'portrait';
 
-        //  Override Page Orientation
-        if ($this->getOrientation() !== null) {
-            $orientation = ($this->getOrientation() == PageSetup::ORIENTATION_DEFAULT)
-                ? PageSetup::ORIENTATION_PORTRAIT
-                : $this->getOrientation();
-        }
-        //  Override Paper Size
-        if ($this->getPaperSize() !== null) {
-            $printPaperSize = $this->getPaperSize();
-        }
-
-        if (isset(self::$paperSizes[$printPaperSize])) {
-            $paperSize = self::$paperSizes[$printPaperSize];
-        }
-
         //  Create PDF
         $pdf = $this->createExternalWriterInstance();
         $pdf->setPaper($paperSize, $orientation);
@@ -65,7 +51,7 @@ public function save($pFilename): void
         $pdf->render();
 
         //  Write to file
-        fwrite($fileHandle, $pdf->output());
+        fwrite($fileHandle, $pdf->output() ?? '');
 
         parent::restoreStateAfterSave();
     }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf/Mpdf.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf/Mpdf.php
index 56ac693066..ca031b45e5 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf/Mpdf.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf/Mpdf.php
@@ -7,6 +7,16 @@
 
 class Mpdf extends Pdf
 {
+    public const SIMULATED_BODY_START = '<!-- simulated body start -->';
+    private const BODY_TAG = '<body>';
+
+    /**
+     * Is the current writer creating mPDF?
+     *
+     * @deprecated 2.0.1 use instanceof Mpdf instead
+     */
+    protected bool $isMPdf = true;
+
     /**
      * Gets the implementation of external PDF library that should be used.
      *
@@ -14,7 +24,7 @@ class Mpdf extends Pdf
      *
      * @return \Mpdf\Mpdf implementation
      */
-    protected function createExternalWriterInstance($config)
+    protected function createExternalWriterInstance(array $config): \Mpdf\Mpdf
     {
         return new \Mpdf\Mpdf($config);
     }
@@ -22,43 +32,18 @@ protected function createExternalWriterInstance($config)
     /**
      * Save Spreadsheet to file.
      *
-     * @param string $pFilename Name of the file to save as
+     * @param string $filename Name of the file to save as
      */
-    public function save($pFilename): void
+    public function save($filename, int $flags = 0): void
     {
-        $fileHandle = parent::prepareForSave($pFilename);
-
-        //  Default PDF paper size
-        $paperSize = 'LETTER'; //    Letter    (8.5 in. by 11 in.)
+        $fileHandle = parent::prepareForSave($filename);
 
         //  Check for paper size and page orientation
-        if (null === $this->getSheetIndex()) {
-            $orientation = ($this->spreadsheet->getSheet(0)->getPageSetup()->getOrientation()
-                == PageSetup::ORIENTATION_LANDSCAPE) ? 'L' : 'P';
-            $printPaperSize = $this->spreadsheet->getSheet(0)->getPageSetup()->getPaperSize();
-        } else {
-            $orientation = ($this->spreadsheet->getSheet($this->getSheetIndex())->getPageSetup()->getOrientation()
-                == PageSetup::ORIENTATION_LANDSCAPE) ? 'L' : 'P';
-            $printPaperSize = $this->spreadsheet->getSheet($this->getSheetIndex())->getPageSetup()->getPaperSize();
-        }
-        $this->setOrientation($orientation);
-
-        //  Override Page Orientation
-        if (null !== $this->getOrientation()) {
-            $orientation = ($this->getOrientation() == PageSetup::ORIENTATION_DEFAULT)
-                ? PageSetup::ORIENTATION_PORTRAIT
-                : $this->getOrientation();
-        }
-        $orientation = strtoupper($orientation);
-
-        //  Override Paper Size
-        if (null !== $this->getPaperSize()) {
-            $printPaperSize = $this->getPaperSize();
-        }
-
-        if (isset(self::$paperSizes[$printPaperSize])) {
-            $paperSize = self::$paperSizes[$printPaperSize];
-        }
+        $setup = $this->spreadsheet->getSheet($this->getSheetIndex() ?? 0)->getPageSetup();
+        $orientation = $this->getOrientation() ?? $setup->getOrientation();
+        $orientation = ($orientation === PageSetup::ORIENTATION_LANDSCAPE) ? 'L' : 'P';
+        $printPaperSize = $this->getPaperSize() ?? $setup->getPaperSize();
+        $paperSize = self::$paperSizes[$printPaperSize] ?? PageSetup::getPaperSizeDefault();
 
         //  Create PDF
         $config = ['tempDir' => $this->tempDir . '/mpdf'];
@@ -82,8 +67,22 @@ public function save($pFilename): void
         $pdf->SetCreator($this->spreadsheet->getProperties()->getCreator());
 
         $html = $this->generateHTMLAll();
-        foreach (\array_chunk(\explode(PHP_EOL, $html), 1000) as $lines) {
-            $pdf->WriteHTML(\implode(PHP_EOL, $lines));
+        $bodyLocation = strpos($html, self::SIMULATED_BODY_START);
+        if ($bodyLocation === false) {
+            $bodyLocation = strpos($html, self::BODY_TAG);
+            if ($bodyLocation !== false) {
+                $bodyLocation += strlen(self::BODY_TAG);
+            }
+        }
+        // Make sure first data presented to Mpdf includes body tag
+        //   (and any htmlpageheader/htmlpagefooter tags)
+        //   so that Mpdf doesn't parse it as content. Issue 2432.
+        if ($bodyLocation !== false) {
+            $pdf->WriteHTML(substr($html, 0, $bodyLocation));
+            $html = substr($html, $bodyLocation);
+        }
+        foreach (explode("\n", $html) as $line) {
+            $pdf->WriteHTML("$line\n");
         }
 
         //  Write to file
@@ -94,12 +93,8 @@ public function save($pFilename): void
 
     /**
      * Convert inches to mm.
-     *
-     * @param float $inches
-     *
-     * @return float
      */
-    private function inchesToMm($inches)
+    private function inchesToMm(float $inches): float
     {
         return $inches * 25.4;
     }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf/Tcpdf.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf/Tcpdf.php
index 56e917e3f2..747ebbd50b 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf/Tcpdf.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Pdf/Tcpdf.php
@@ -28,7 +28,7 @@ public function __construct(Spreadsheet $spreadsheet)
      *
      * @return \TCPDF implementation
      */
-    protected function createExternalWriterInstance($orientation, $unit, $paperSize)
+    protected function createExternalWriterInstance(string $orientation, string $unit, $paperSize): \TCPDF
     {
         return new \TCPDF($orientation, $unit, $paperSize);
     }
@@ -36,42 +36,22 @@ protected function createExternalWriterInstance($orientation, $unit, $paperSize)
     /**
      * Save Spreadsheet to file.
      *
-     * @param string $pFilename Name of the file to save as
+     * @param string $filename Name of the file to save as
      */
-    public function save($pFilename): void
+    public function save($filename, int $flags = 0): void
     {
-        $fileHandle = parent::prepareForSave($pFilename);
+        $fileHandle = parent::prepareForSave($filename);
 
         //  Default PDF paper size
         $paperSize = 'LETTER'; //    Letter    (8.5 in. by 11 in.)
 
         //  Check for paper size and page orientation
-        if ($this->getSheetIndex() === null) {
-            $orientation = ($this->spreadsheet->getSheet(0)->getPageSetup()->getOrientation()
-                == PageSetup::ORIENTATION_LANDSCAPE) ? 'L' : 'P';
-            $printPaperSize = $this->spreadsheet->getSheet(0)->getPageSetup()->getPaperSize();
-            $printMargins = $this->spreadsheet->getSheet(0)->getPageMargins();
-        } else {
-            $orientation = ($this->spreadsheet->getSheet($this->getSheetIndex())->getPageSetup()->getOrientation()
-                == PageSetup::ORIENTATION_LANDSCAPE) ? 'L' : 'P';
-            $printPaperSize = $this->spreadsheet->getSheet($this->getSheetIndex())->getPageSetup()->getPaperSize();
-            $printMargins = $this->spreadsheet->getSheet($this->getSheetIndex())->getPageMargins();
-        }
-
-        //  Override Page Orientation
-        if ($this->getOrientation() !== null) {
-            $orientation = ($this->getOrientation() == PageSetup::ORIENTATION_LANDSCAPE)
-                ? 'L'
-                : 'P';
-        }
-        //  Override Paper Size
-        if ($this->getPaperSize() !== null) {
-            $printPaperSize = $this->getPaperSize();
-        }
-
-        if (isset(self::$paperSizes[$printPaperSize])) {
-            $paperSize = self::$paperSizes[$printPaperSize];
-        }
+        $setup = $this->spreadsheet->getSheet($this->getSheetIndex() ?? 0)->getPageSetup();
+        $orientation = $this->getOrientation() ?? $setup->getOrientation();
+        $orientation = ($orientation === PageSetup::ORIENTATION_LANDSCAPE) ? 'L' : 'P';
+        $printPaperSize = $this->getPaperSize() ?? $setup->getPaperSize();
+        $paperSize = self::$paperSizes[$printPaperSize] ?? PageSetup::getPaperSizeDefault();
+        $printMargins = $this->spreadsheet->getSheet($this->getSheetIndex() ?? 0)->getPageMargins();
 
         //  Create PDF
         $pdf = $this->createExternalWriterInstance($orientation, 'pt', $paperSize);
@@ -97,7 +77,7 @@ public function save($pFilename): void
         $pdf->SetCreator($this->spreadsheet->getProperties()->getCreator());
 
         //  Write to file
-        fwrite($fileHandle, $pdf->output($pFilename, 'S'));
+        fwrite($fileHandle, $pdf->output('', 'S'));
 
         parent::restoreStateAfterSave();
     }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls.php
index 624dc41419..48dc9e08e2 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls.php
@@ -4,10 +4,10 @@
 
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\RichText\RichText;
 use PhpOffice\PhpSpreadsheet\RichText\Run;
-use PhpOffice\PhpSpreadsheet\Shared\Drawing as SharedDrawing;
 use PhpOffice\PhpSpreadsheet\Shared\Escher;
 use PhpOffice\PhpSpreadsheet\Shared\Escher\DgContainer;
 use PhpOffice\PhpSpreadsheet\Shared\Escher\DgContainer\SpgrContainer;
@@ -31,76 +31,55 @@ class Xls extends BaseWriter
 {
     /**
      * PhpSpreadsheet object.
-     *
-     * @var Spreadsheet
      */
-    private $spreadsheet;
+    private Spreadsheet $spreadsheet;
 
     /**
      * Total number of shared strings in workbook.
-     *
-     * @var int
      */
-    private $strTotal = 0;
+    private int $strTotal = 0;
 
     /**
      * Number of unique shared strings in workbook.
-     *
-     * @var int
      */
-    private $strUnique = 0;
+    private int $strUnique = 0;
 
     /**
      * Array of unique shared strings in workbook.
-     *
-     * @var array
      */
-    private $strTable = [];
+    private array $strTable = [];
 
     /**
      * Color cache. Mapping between RGB value and color index.
-     *
-     * @var array
      */
-    private $colors;
+    private array $colors;
 
     /**
      * Formula parser.
-     *
-     * @var Parser
      */
-    private $parser;
+    private Parser $parser;
 
     /**
      * Identifier clusters for drawings. Used in MSODRAWINGGROUP record.
-     *
-     * @var array
      */
-    private $IDCLs;
+    private array $IDCLs;
 
     /**
      * Basic OLE object summary information.
-     *
-     * @var string
      */
-    private $summaryInformation;
+    private string $summaryInformation;
 
     /**
      * Extended OLE object document summary information.
-     *
-     * @var string
      */
-    private $documentSummaryInformation;
+    private string $documentSummaryInformation;
 
-    /**
-     * @var Workbook
-     */
-    private $writerWorkbook;
+    private Workbook $writerWorkbook;
 
     /**
      * @var Worksheet[]
      */
-    private $writerWorksheets;
+    private array $writerWorksheets;
 
     /**
      * Create a new Xls Writer.
@@ -111,16 +90,18 @@ public function __construct(Spreadsheet $spreadsheet)
     {
         $this->spreadsheet = $spreadsheet;
 
-        $this->parser = new Xls\Parser($spreadsheet);
+        $this->parser = new Parser($spreadsheet);
     }
 
     /**
      * Save Spreadsheet to file.
      *
-     * @param resource|string $pFilename
+     * @param resource|string $filename
      */
-    public function save($pFilename): void
+    public function save($filename, int $flags = 0): void
     {
+        $this->processFlags($flags);
+
         // garbage collect
         $this->spreadsheet->garbageCollect();
 
@@ -133,12 +114,12 @@ public function save($pFilename): void
         $this->colors = [];
 
         // Initialise workbook writer
-        $this->writerWorkbook = new Xls\Workbook($this->spreadsheet, $this->strTotal, $this->strUnique, $this->strTable, $this->colors, $this->parser);
+        $this->writerWorkbook = new Workbook($this->spreadsheet, $this->strTotal, $this->strUnique, $this->strTable, $this->colors, $this->parser);
 
         // Initialise worksheet writers
         $countSheets = $this->spreadsheet->getSheetCount();
         for ($i = 0; $i < $countSheets; ++$i) {
-            $this->writerWorksheets[$i] = new Xls\Worksheet($this->strTotal, $this->strUnique, $this->strTable, $this->colors, $this->parser, $this->preCalculateFormulas, $this->spreadsheet->getSheet($i));
+            $this->writerWorksheets[$i] = new Worksheet($this->strTotal, $this->strUnique, $this->strTable, $this->colors, $this->parser, $this->preCalculateFormulas, $this->spreadsheet->getSheet($i), $this->writerWorkbook);
         }
 
         // build Escher objects. Escher objects for workbooks needs to be build before Escher object for workbook.
@@ -159,15 +140,18 @@ public function save($pFilename): void
 
         // add fonts from rich text eleemnts
         for ($i = 0; $i < $countSheets; ++$i) {
-            foreach ($this->writerWorksheets[$i]->phpSheet->getCoordinates() as $coordinate) {
-                $cell = $this->writerWorksheets[$i]->phpSheet->getCell($coordinate);
+            foreach ($this->writerWorksheets[$i]->phpSheet->getCellCollection()->getCoordinates() as $coordinate) {
+                /** @var Cell $cell */
+                $cell = $this->writerWorksheets[$i]->phpSheet->getCellCollection()->get($coordinate);
                 $cVal = $cell->getValue();
                 if ($cVal instanceof RichText) {
                     $elements = $cVal->getRichTextElements();
                     foreach ($elements as $element) {
                         if ($element instanceof Run) {
                             $font = $element->getFont();
-                            $this->writerWorksheets[$i]->fontHashIndex[$font->getHashCode()] = $this->writerWorkbook->addFont($font);
+                            if ($font !== null) {
+                                $this->writerWorksheets[$i]->fontHashIndex[$font->getHashCode()] = $this->writerWorkbook->addFont($font);
+                            }
                         }
                     }
                 }
@@ -196,14 +180,14 @@ public function save($pFilename): void
 
         $this->documentSummaryInformation = $this->writeDocumentSummaryInformation();
         // initialize OLE Document Summary Information
-        if (isset($this->documentSummaryInformation) && !empty($this->documentSummaryInformation)) {
+        if (!empty($this->documentSummaryInformation)) {
             $OLE_DocumentSummaryInformation = new File(OLE::ascToUcs(chr(5) . 'DocumentSummaryInformation'));
             $OLE_DocumentSummaryInformation->append($this->documentSummaryInformation);
         }
 
         $this->summaryInformation = $this->writeSummaryInformation();
         // initialize OLE Summary Information
-        if (isset($this->summaryInformation) && !empty($this->summaryInformation)) {
+        if (!empty($this->summaryInformation)) {
             $OLE_SummaryInformation = new File(OLE::ascToUcs(chr(5) . 'SummaryInformation'));
             $OLE_SummaryInformation->append($this->summaryInformation);
         }
@@ -222,7 +206,7 @@ public function save($pFilename): void
         $time = $this->spreadsheet->getProperties()->getModified();
         $root = new Root($time, $time, $arrRootData);
         // save the OLE file
-        $this->openFileHandle($pFilename);
+        $this->openFileHandle($filename);
         $root->save($this->fileHandle);
         $this->maybeCloseFileHandle();
 
@@ -242,9 +226,7 @@ private function buildWorksheetEschers(): void
 
         foreach ($this->spreadsheet->getAllsheets() as $sheet) {
             // sheet index
-            $sheetIndex = $sheet->getParent()->getIndex($sheet);
-
-            $escher = null;
+            $sheetIndex = $sheet->getParentOrThrow()->getIndex($sheet);
 
             // check if there are any shapes for this sheet
             $filterRange = $sheet->getAutoFilter()->getRange();
@@ -259,7 +241,7 @@ private function buildWorksheetEschers(): void
             $dgContainer = new DgContainer();
 
             // set the drawing index (we use sheet index + 1)
-            $dgId = $sheet->getParent()->getIndex($sheet) + 1;
+            $dgId = $sheet->getParentOrThrow()->getIndex($sheet) + 1;
             $dgContainer->setDgId($dgId);
             $escher->setDgContainer($dgContainer);
 
@@ -271,7 +253,7 @@ private function buildWorksheetEschers(): void
             $spContainer = new SpContainer();
             $spContainer->setSpgr(true);
             $spContainer->setSpType(0);
-            $spContainer->setSpId(($sheet->getParent()->getIndex($sheet) + 1) << 10);
+            $spContainer->setSpId(($sheet->getParentOrThrow()->getIndex($sheet) + 1) << 10);
             $spgrContainer->addChild($spContainer);
 
             // add the shapes
@@ -293,7 +275,7 @@ private function buildWorksheetEschers(): void
 
                 // set the shape index (we combine 1-based sheet index and $countShapes to create unique shape index)
                 $reducedSpId = $countShapes[$sheetIndex];
-                $spId = $reducedSpId | ($sheet->getParent()->getIndex($sheet) + 1) << 10;
+                $spId = $reducedSpId | ($sheet->getParentOrThrow()->getIndex($sheet) + 1) << 10;
                 $spContainer->setSpId($spId);
 
                 // keep track of last reducedSpId
@@ -314,14 +296,16 @@ private function buildWorksheetEschers(): void
 
                 $twoAnchor = \PhpOffice\PhpSpreadsheet\Shared\Xls::oneAnchor2twoAnchor($sheet, $coordinates, $offsetX, $offsetY, $width, $height);
 
-                $spContainer->setStartCoordinates($twoAnchor['startCoordinates']);
-                $spContainer->setStartOffsetX($twoAnchor['startOffsetX']);
-                $spContainer->setStartOffsetY($twoAnchor['startOffsetY']);
-                $spContainer->setEndCoordinates($twoAnchor['endCoordinates']);
-                $spContainer->setEndOffsetX($twoAnchor['endOffsetX']);
-                $spContainer->setEndOffsetY($twoAnchor['endOffsetY']);
+                if (is_array($twoAnchor)) {
+                    $spContainer->setStartCoordinates($twoAnchor['startCoordinates']);
+                    $spContainer->setStartOffsetX($twoAnchor['startOffsetX']);
+                    $spContainer->setStartOffsetY($twoAnchor['startOffsetY']);
+                    $spContainer->setEndCoordinates($twoAnchor['endCoordinates']);
+                    $spContainer->setEndOffsetX($twoAnchor['endOffsetX']);
+                    $spContainer->setEndOffsetY($twoAnchor['endOffsetY']);
 
-                $spgrContainer->addChild($spContainer);
+                    $spgrContainer->addChild($spContainer);
+                }
             }
 
             // AutoFilters
@@ -350,7 +334,7 @@ private function buildWorksheetEschers(): void
 
                     // set the shape index (we combine 1-based sheet index and $countShapes to create unique shape index)
                     $reducedSpId = $countShapes[$sheetIndex];
-                    $spId = $reducedSpId | ($sheet->getParent()->getIndex($sheet) + 1) << 10;
+                    $spId = $reducedSpId | ($sheet->getParentOrThrow()->getIndex($sheet) + 1) << 10;
                     $spContainer->setSpId($spId);
 
                     // keep track of last reducedSpId
@@ -413,7 +397,7 @@ private function processMemoryDrawing(BstoreContainer &$bstoreContainer, MemoryD
         ob_end_clean();
 
         $blip = new Blip();
-        $blip->setData($blipData);
+        $blip->setData("$blipData");
 
         $BSE = new BSE();
         $BSE->setBlipType($blipType);
@@ -422,19 +406,26 @@ private function processMemoryDrawing(BstoreContainer &$bstoreContainer, MemoryD
         $bstoreContainer->addBSE($BSE);
     }
 
+    private static int $two = 2; // phpstan silliness
+
     private function processDrawing(BstoreContainer &$bstoreContainer, Drawing $drawing): void
     {
-        $blipType = null;
+        $blipType = 0;
         $blipData = '';
         $filename = $drawing->getPath();
 
-        [$imagesx, $imagesy, $imageFormat] = getimagesize($filename);
+        $imageSize = getimagesize($filename);
+        $imageFormat = empty($imageSize) ? 0 : ($imageSize[self::$two] ?? 0);
 
         switch ($imageFormat) {
             case 1: // GIF, not supported by BIFF8, we convert to PNG
                 $blipType = BSE::BLIPTYPE_PNG;
+                $newImage = @imagecreatefromgif($filename);
+                if ($newImage === false) {
+                    throw new Exception("Unable to create image from $filename");
+                }
                 ob_start();
-                imagepng(imagecreatefromgif($filename));
+                imagepng($newImage);
                 $blipData = ob_get_contents();
                 ob_end_clean();
 
@@ -451,8 +442,12 @@ private function processDrawing(BstoreContainer &$bstoreContainer, Drawing $draw
                 break;
             case 6: // Windows DIB (BMP), we convert to PNG
                 $blipType = BSE::BLIPTYPE_PNG;
+                $newImage = @imagecreatefrombmp($filename);
+                if ($newImage === false) {
+                    throw new Exception("Unable to create image from $filename");
+                }
                 ob_start();
-                imagepng(SharedDrawing::imagecreatefrombmp($filename));
+                imagepng($newImage);
                 $blipData = ob_get_contents();
                 ob_end_clean();
 
@@ -472,7 +467,7 @@ private function processDrawing(BstoreContainer &$bstoreContainer, Drawing $draw
 
     private function processBaseDrawing(BstoreContainer &$bstoreContainer, BaseDrawing $drawing): void
     {
-        if ($drawing instanceof Drawing) {
+        if ($drawing instanceof Drawing && $drawing->getPath() !== '') {
             $this->processDrawing($bstoreContainer, $drawing);
         } elseif ($drawing instanceof MemoryDrawing) {
             $this->processMemoryDrawing($bstoreContainer, $drawing, $drawing->getRenderingFunction());
@@ -555,10 +550,8 @@ private function buildWorkbookEscher(): void
 
     /**
      * Build the OLE Part for DocumentSummary Information.
-     *
-     * @return string
      */
-    private function writeDocumentSummaryInformation()
+    private function writeDocumentSummaryInformation(): string
     {
         // offset: 0; size: 2; must be 0xFE 0xFF (UTF-16 LE byte order mark)
         $data = pack('v', 0xFFFE);
@@ -728,7 +721,6 @@ private function writeDocumentSummaryInformation()
             } elseif ($dataProp['type']['data'] == 0x1E) { // null-terminated string prepended by dword string length
                 // Null-terminated string
                 $dataProp['data']['data'] .= chr(0);
-                // @phpstan-ignore-next-line
                 ++$dataProp['data']['length'];
                 // Complete the string with null string for being a %4
                 $dataProp['data']['length'] = $dataProp['data']['length'] + ((4 - $dataProp['data']['length'] % 4) == 4 ? 0 : (4 - $dataProp['data']['length'] % 4));
@@ -738,15 +730,9 @@ private function writeDocumentSummaryInformation()
                 $dataSection_Content .= $dataProp['data']['data'];
 
                 $dataSection_Content_Offset += 4 + 4 + strlen($dataProp['data']['data']);
-            // Condition below can never be true
-            //} elseif ($dataProp['type']['data'] == 0x40) { // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
-            //    $dataSection_Content .= $dataProp['data']['data'];
-
-            //    $dataSection_Content_Offset += 4 + 8;
             } else {
                 $dataSection_Content .= $dataProp['data']['data'];
 
-                // @phpstan-ignore-next-line
                 $dataSection_Content_Offset += 4 + $dataProp['data']['length'];
             }
         }
@@ -766,10 +752,7 @@ private function writeDocumentSummaryInformation()
         return $data;
     }
 
-    /**
-     * @param float|int $dataProp
-     */
-    private function writeSummaryPropOle($dataProp, int &$dataSection_NumProps, array &$dataSection, int $sumdata, int $typdata): void
+    private function writeSummaryPropOle(float|int $dataProp, int &$dataSection_NumProps, array &$dataSection, int $sumdata, int $typdata): void
     {
         if ($dataProp) {
             $dataSection[] = [
@@ -797,10 +780,8 @@ private function writeSummaryProp(string $dataProp, int &$dataSection_NumProps,
 
     /**
      * Build the OLE Part for Summary Information.
-     *
-     * @return string
      */
-    private function writeSummaryInformation()
+    private function writeSummaryInformation(): string
     {
         // offset: 0; size: 2; must be 0xFE 0xFF (UTF-16 LE byte order mark)
         $data = pack('v', 0xFFFE);
@@ -836,14 +817,14 @@ private function writeSummaryInformation()
         ++$dataSection_NumProps;
 
         $props = $this->spreadsheet->getProperties();
-        $this->writeSummaryProp($props->getTitle(), $dataSection_NumProps, $dataSection, 0x02, 0x1e);
-        $this->writeSummaryProp($props->getSubject(), $dataSection_NumProps, $dataSection, 0x03, 0x1e);
-        $this->writeSummaryProp($props->getCreator(), $dataSection_NumProps, $dataSection, 0x04, 0x1e);
-        $this->writeSummaryProp($props->getKeywords(), $dataSection_NumProps, $dataSection, 0x05, 0x1e);
-        $this->writeSummaryProp($props->getDescription(), $dataSection_NumProps, $dataSection, 0x06, 0x1e);
-        $this->writeSummaryProp($props->getLastModifiedBy(), $dataSection_NumProps, $dataSection, 0x08, 0x1e);
-        $this->writeSummaryPropOle($props->getCreated(), $dataSection_NumProps, $dataSection, 0x0c, 0x40);
-        $this->writeSummaryPropOle($props->getModified(), $dataSection_NumProps, $dataSection, 0x0d, 0x40);
+        $this->writeSummaryProp($props->getTitle(), $dataSection_NumProps, $dataSection, 0x02, 0x1E);
+        $this->writeSummaryProp($props->getSubject(), $dataSection_NumProps, $dataSection, 0x03, 0x1E);
+        $this->writeSummaryProp($props->getCreator(), $dataSection_NumProps, $dataSection, 0x04, 0x1E);
+        $this->writeSummaryProp($props->getKeywords(), $dataSection_NumProps, $dataSection, 0x05, 0x1E);
+        $this->writeSummaryProp($props->getDescription(), $dataSection_NumProps, $dataSection, 0x06, 0x1E);
+        $this->writeSummaryProp($props->getLastModifiedBy(), $dataSection_NumProps, $dataSection, 0x08, 0x1E);
+        $this->writeSummaryPropOle($props->getCreated(), $dataSection_NumProps, $dataSection, 0x0C, 0x40);
+        $this->writeSummaryPropOle($props->getModified(), $dataSection_NumProps, $dataSection, 0x0D, 0x40);
 
         //    Security
         $dataSection[] = [
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/BIFFwriter.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/BIFFwriter.php
index 4a7e065633..8db570d0c8 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/BIFFwriter.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/BIFFwriter.php
@@ -41,33 +41,25 @@ class BIFFwriter
 {
     /**
      * The byte order of this architecture. 0 => little endian, 1 => big endian.
-     *
-     * @var int
      */
-    private static $byteOrder;
+    private static ?int $byteOrder;
 
     /**
      * The string containing the data of the BIFF stream.
-     *
-     * @var null|string
      */
-    public $_data;
+    public ?string $_data;
 
     /**
      * The size of the data in bytes. Should be the same as strlen($this->_data).
-     *
-     * @var int
      */
-    public $_datasize;
+    public int $_datasize;
 
     /**
      * The maximum length for a BIFF record (excluding record header and length field). See addContinue().
      *
-     * @var int
-     *
      * @see addContinue()
      */
-    private $limit = 8224;
+    private int $limit = 8224;
 
     /**
      * Constructor.
@@ -81,10 +73,8 @@ public function __construct()
     /**
      * Determine the byte order and store it as class data to avoid
      * recalculating it for each call to new().
-     *
-     * @return int
      */
-    public static function getByteOrder()
+    public static function getByteOrder(): int
     {
         if (!isset(self::$byteOrder)) {
             // Check if "pack" gives the required IEEE 64bit float
@@ -109,7 +99,7 @@ public static function getByteOrder()
      *
      * @param string $data binary data to append
      */
-    protected function append($data): void
+    protected function append(string $data): void
     {
         if (strlen($data) - 4 > $this->limit) {
             $data = $this->addContinue($data);
@@ -122,10 +112,8 @@ protected function append($data): void
      * General storage function like append, but returns string instead of modifying $this->_data.
      *
      * @param string $data binary data to write
-     *
-     * @return string
      */
-    public function writeData($data)
+    public function writeData(string $data): string
     {
         if (strlen($data) - 4 > $this->limit) {
             $data = $this->addContinue($data);
@@ -142,7 +130,7 @@ public function writeData($data)
      * @param int $type type of BIFF file to write: 0x0005 Workbook,
      *                       0x0010 Worksheet
      */
-    protected function storeBof($type): void
+    protected function storeBof(int $type): void
     {
         $record = 0x0809; // Record identifier    (BIFF5-BIFF8)
         $length = 0x0010;
@@ -175,7 +163,7 @@ protected function storeEof(): void
     /**
      * Writes Excel EOF record to indicate the end of a BIFF stream.
      */
-    public function writeEof()
+    public function writeEof(): string
     {
         $record = 0x000A; // Record identifier
         $length = 0x0000; // Number of bytes to follow
@@ -196,7 +184,7 @@ public function writeEof()
      *
      * @return string A very convenient string of continue blocks
      */
-    private function addContinue($data)
+    private function addContinue(string $data): string
     {
         $limit = $this->limit;
         $record = 0x003C; // Record identifier
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/CellDataValidation.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/CellDataValidation.php
index 7e9b3cfa4e..fee123f551 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/CellDataValidation.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/CellDataValidation.php
@@ -9,7 +9,7 @@ class CellDataValidation
     /**
      * @var array<string, int>
      */
-    protected static $validationTypeMap = [
+    protected static array $validationTypeMap = [
         DataValidation::TYPE_NONE => 0x00,
         DataValidation::TYPE_WHOLE => 0x01,
         DataValidation::TYPE_DECIMAL => 0x02,
@@ -23,7 +23,7 @@ class CellDataValidation
     /**
      * @var array<string, int>
      */
-    protected static $errorStyleMap = [
+    protected static array $errorStyleMap = [
         DataValidation::STYLE_STOP => 0x00,
         DataValidation::STYLE_WARNING => 0x01,
         DataValidation::STYLE_INFORMATION => 0x02,
@@ -32,7 +32,7 @@ class CellDataValidation
     /**
      * @var array<string, int>
      */
-    protected static $operatorMap = [
+    protected static array $operatorMap = [
         DataValidation::OPERATOR_BETWEEN => 0x00,
         DataValidation::OPERATOR_NOTBETWEEN => 0x01,
         DataValidation::OPERATOR_EQUAL => 0x02,
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/ConditionalHelper.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/ConditionalHelper.php
new file mode 100644
index 0000000000..c33d0d0544
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/ConditionalHelper.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Xls;
+
+use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
+use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\Wizard;
+
+class ConditionalHelper
+{
+    /**
+     * Formula parser.
+     */
+    protected Parser $parser;
+
+    protected mixed $condition;
+
+    protected string $cellRange;
+
+    protected ?string $tokens = null;
+
+    protected int $size;
+
+    public function __construct(Parser $parser)
+    {
+        $this->parser = $parser;
+    }
+
+    public function processCondition(mixed $condition, string $cellRange): void
+    {
+        $this->condition = $condition;
+        $this->cellRange = $cellRange;
+
+        if (is_int($condition) || is_float($condition)) {
+            $this->size = ($condition <= 65535 ? 3 : 0x0000);
+            $this->tokens = pack('Cv', 0x1E, $condition);
+        } else {
+            try {
+                /** @var float|int|string */
+                $conditionx = $condition;
+                $formula = Wizard\WizardAbstract::reverseAdjustCellRef((string) $conditionx, $cellRange);
+                $this->parser->parse($formula);
+                $this->tokens = $this->parser->toReversePolish();
+                $this->size = strlen($this->tokens ?? '');
+            } catch (PhpSpreadsheetException) {
+                // In the event of a parser error with a formula value, we set the expression to ptgInt + 0
+                $this->tokens = pack('Cv', 0x1E, 0);
+                $this->size = 3;
+            }
+        }
+    }
+
+    public function tokens(): ?string
+    {
+        return $this->tokens;
+    }
+
+    public function size(): int
+    {
+        return $this->size;
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/ErrorCode.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/ErrorCode.php
index 7a864f50f3..e74f4f405a 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/ErrorCode.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/ErrorCode.php
@@ -7,7 +7,7 @@ class ErrorCode
     /**
      * @var array<string, int>
      */
-    protected static $errorCodeMap = [
+    protected static array $errorCodeMap = [
         '#NULL!' => 0x00,
         '#DIV/0!' => 0x07,
         '#VALUE!' => 0x0F,
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Escher.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Escher.php
index e42139b35c..c3993be04e 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Escher.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Escher.php
@@ -3,6 +3,7 @@
 namespace PhpOffice\PhpSpreadsheet\Writer\Xls;
 
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Shared\Escher as SharedEscher;
 use PhpOffice\PhpSpreadsheet\Shared\Escher\DgContainer;
 use PhpOffice\PhpSpreadsheet\Shared\Escher\DgContainer\SpgrContainer;
 use PhpOffice\PhpSpreadsheet\Shared\Escher\DgContainer\SpgrContainer\SpContainer;
@@ -16,49 +17,41 @@ class Escher
     /**
      * The object we are writing.
      */
-    private $object;
+    private Blip|BSE|BstoreContainer|DgContainer|DggContainer|Escher|SpContainer|SpgrContainer|SharedEscher $object;
 
     /**
      * The written binary data.
      */
-    private $data;
+    private string $data;
 
     /**
      * Shape offsets. Positions in binary stream where a new shape record begins.
-     *
-     * @var array
      */
-    private $spOffsets;
+    private array $spOffsets;
 
     /**
      * Shape types.
-     *
-     * @var array
      */
-    private $spTypes;
+    private array $spTypes;
 
     /**
      * Constructor.
-     *
-     * @param mixed $object
      */
-    public function __construct($object)
+    public function __construct(Blip|BSE|BstoreContainer|DgContainer|DggContainer|self|SpContainer|SpgrContainer|SharedEscher $object)
     {
         $this->object = $object;
     }
 
     /**
      * Process the object to be written.
-     *
-     * @return string
      */
-    public function close()
+    public function close(): string
     {
         // initialize
         $this->data = '';
 
-        switch (get_class($this->object)) {
-            case \PhpOffice\PhpSpreadsheet\Shared\Escher::class:
+        switch ($this->object::class) {
+            case SharedEscher::class:
                 if ($dggContainer = $this->object->getDggContainer()) {
                     $writer = new self($dggContainer);
                     $this->data = $writer->close();
@@ -85,8 +78,8 @@ public function close()
                 $recVerInstance |= $recInstance << 4;
 
                 // dgg data
-                $dggData =
-                    pack(
+                $dggData
+                    = pack(
                         'VVVV',
                         $this->object->getSpIdMax(), // maximum shape identifier increased by one
                         $this->object->getCDgSaved() + 1, // number of file identifier clusters increased by one
@@ -282,7 +275,7 @@ public function close()
                 $header = pack('vvV', $recVerInstance, $recType, $length);
 
                 // number of shapes in this drawing (including group shape)
-                $countShapes = count($this->object->getSpgrContainer()->getChildren());
+                $countShapes = count($this->object->getSpgrContainerOrThrow()->getChildren());
                 $innerData .= $header . pack('VV', $countShapes, $this->object->getLastSpId());
 
                 // write the spgrContainer
@@ -413,8 +406,6 @@ public function close()
 
                 // the client anchor
                 if ($this->object->getStartCoordinates()) {
-                    $clientAnchorData = '';
-
                     $recVer = 0x0;
                     $recInstance = 0x0;
                     $recType = 0xF010;
@@ -490,20 +481,16 @@ public function close()
 
     /**
      * Gets the shape offsets.
-     *
-     * @return array
      */
-    public function getSpOffsets()
+    public function getSpOffsets(): array
     {
         return $this->spOffsets;
     }
 
     /**
      * Gets the shape types.
-     *
-     * @return array
      */
-    public function getSpTypes()
+    public function getSpTypes(): array
     {
         return $this->spTypes;
     }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Font.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Font.php
index 1266cf24cf..9a1aa8a14a 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Font.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Font.php
@@ -8,17 +8,13 @@ class Font
 {
     /**
      * Color index.
-     *
-     * @var int
      */
-    private $colorIndex;
+    private int $colorIndex;
 
     /**
      * Font.
-     *
-     * @var \PhpOffice\PhpSpreadsheet\Style\Font
      */
-    private $font;
+    private \PhpOffice\PhpSpreadsheet\Style\Font $font;
 
     /**
      * Constructor.
@@ -31,23 +27,21 @@ public function __construct(\PhpOffice\PhpSpreadsheet\Style\Font $font)
 
     /**
      * Set the color index.
-     *
-     * @param int $colorIndex
      */
-    public function setColorIndex($colorIndex): void
+    public function setColorIndex(int $colorIndex): void
     {
         $this->colorIndex = $colorIndex;
     }
 
+    private static int $notImplemented = 0;
+
     /**
      * Get font record data.
-     *
-     * @return string
      */
-    public function writeFont()
+    public function writeFont(): string
     {
-        $font_outline = 0;
-        $font_shadow = 0;
+        $font_outline = self::$notImplemented;
+        $font_shadow = self::$notImplemented;
 
         $icv = $this->colorIndex; // Index to color palette
         if ($this->font->getSuperscript()) {
@@ -58,7 +52,7 @@ public function writeFont()
             $sss = 0;
         }
         $bFamily = 0; // Font family
-        $bCharSet = \PhpOffice\PhpSpreadsheet\Shared\Font::getCharsetFromFontName($this->font->getName()); // Character set
+        $bCharSet = \PhpOffice\PhpSpreadsheet\Shared\Font::getCharsetFromFontName((string) $this->font->getName()); // Character set
 
         $record = 0x31; // Record identifier
         $reserved = 0x00; // Reserved
@@ -87,12 +81,12 @@ public function writeFont()
             self::mapBold($this->font->getBold()),
             // Superscript/Subscript
             $sss,
-            self::mapUnderline($this->font->getUnderline()),
+            self::mapUnderline((string) $this->font->getUnderline()),
             $bFamily,
             $bCharSet,
             $reserved
         );
-        $data .= StringHelper::UTF8toBIFF8UnicodeShort($this->font->getName());
+        $data .= StringHelper::UTF8toBIFF8UnicodeShort((string) $this->font->getName());
 
         $length = strlen($data);
         $header = pack('vv', $record, $length);
@@ -102,14 +96,10 @@ public function writeFont()
 
     /**
      * Map to BIFF5-BIFF8 codes for bold.
-     *
-     * @param bool $bold
-     *
-     * @return int
      */
-    private static function mapBold($bold)
+    private static function mapBold(?bool $bold): int
     {
-        if ($bold) {
+        if ($bold === true) {
             return 0x2BC; //  700 = Bold font weight
         }
 
@@ -121,7 +111,7 @@ private static function mapBold($bold)
      *
      * @var int[]
      */
-    private static $mapUnderline = [
+    private static array $mapUnderline = [
         \PhpOffice\PhpSpreadsheet\Style\Font::UNDERLINE_NONE => 0x00,
         \PhpOffice\PhpSpreadsheet\Style\Font::UNDERLINE_SINGLE => 0x01,
         \PhpOffice\PhpSpreadsheet\Style\Font::UNDERLINE_DOUBLE => 0x02,
@@ -131,12 +121,8 @@ private static function mapBold($bold)
 
     /**
      * Map underline.
-     *
-     * @param string $underline
-     *
-     * @return int
      */
-    private static function mapUnderline($underline)
+    private static function mapUnderline(string $underline): int
     {
         if (isset(self::$mapUnderline[$underline])) {
             return self::$mapUnderline[$underline];
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Parser.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Parser.php
index 4033fd53e3..9e9b6fe705 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Parser.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Parser.php
@@ -49,59 +49,43 @@ class Parser
 
     /**
      * The index of the character we are currently looking at.
-     *
-     * @var int
      */
-    public $currentCharacter;
+    public int $currentCharacter;
 
     /**
      * The token we are working on.
-     *
-     * @var string
      */
-    public $currentToken;
+    public string $currentToken;
 
     /**
      * The formula to parse.
-     *
-     * @var string
      */
-    private $formula;
+    private string $formula;
 
     /**
      * The character ahead of the current char.
-     *
-     * @var string
      */
-    public $lookAhead;
+    public string $lookAhead;
 
     /**
      * The parse tree to be generated.
-     *
-     * @var string
      */
-    public $parseTree;
+    public array|string $parseTree;
 
     /**
      * Array of external sheets.
-     *
-     * @var array
      */
-    private $externalSheets;
+    private array $externalSheets;
 
     /**
      * Array of sheet references in the form of REF structures.
-     *
-     * @var array
      */
-    public $references;
+    public array $references;
 
     /**
      * The Excel ptg indices.
-     *
-     * @var array
      */
-    private $ptg = [
+    private array $ptg = [
         'ptgExp' => 0x01,
         'ptgTbl' => 0x02,
         'ptgAdd' => 0x03,
@@ -212,10 +196,8 @@ class Parser
      *           -1  is a variable  number of arguments.
      * class: The reference, value or array class of the function args.
      * vol:   The function is volatile.
-     *
-     * @var array
      */
-    private $functions = [
+    private array $functions = [
         // function                  ptg  args  class  vol
         'COUNT' => [0, -1, 0, 0],
         'IF' => [1, -1, 1, 0],
@@ -469,7 +451,7 @@ class Parser
         'BAHTTEXT' => [368, 1, 0, 0],
     ];
 
-    private $spreadsheet;
+    private Spreadsheet $spreadsheet;
 
     /**
      * The class constructor.
@@ -490,51 +472,68 @@ public function __construct(Spreadsheet $spreadsheet)
     /**
      * Convert a token to the proper ptg value.
      *
-     * @param mixed $token the token to convert
+     * @param string $token the token to convert
      *
-     * @return mixed the converted token on success
+     * @return string the converted token on success
      */
-    private function convert($token)
+    private function convert(string $token): string
     {
         if (preg_match('/"([^"]|""){0,255}"/', $token)) {
             return $this->convertString($token);
-        } elseif (is_numeric($token)) {
+        }
+        if (is_numeric($token)) {
             return $this->convertNumber($token);
+        }
         // match references like A1 or $A$1
-        } elseif (preg_match('/^\$?([A-Ia-i]?[A-Za-z])\$?(\d+)$/', $token)) {
+        if (preg_match('/^\$?([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
-        } elseif (preg_match('/^' . self::REGEX_SHEET_TITLE_UNQUOTED . '(\\:' . self::REGEX_SHEET_TITLE_UNQUOTED . ')?\\!\$?[A-Ia-i]?[A-Za-z]\$?(\\d+)$/u', $token)) {
+        if (preg_match('/^' . 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
-        } elseif (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . '(\\:' . self::REGEX_SHEET_TITLE_QUOTED . ")?'\\!\\$?[A-Ia-i]?[A-Za-z]\\$?(\\d+)$/u", $token)) {
+        if (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . '(\\:' . self::REGEX_SHEET_TITLE_QUOTED . ")?'\\!\\$?[A-Ia-i]?[A-Za-z]\\$?(\\d+)$/u", $token)) {
             return $this->convertRef3d($token);
+        }
         // match ranges like A1:B2 or $A$1:$B$2
-        } elseif (preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?(\d+)\:(\$)?[A-Ia-i]?[A-Za-z](\$)?(\d+)$/', $token)) {
+        if (preg_match('/^(\$)?[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
-        } elseif (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_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)) {
             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
-        } elseif (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 (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)) {
             return $this->convertRange3d($token);
+        }
         // operators (including parentheses)
-        } elseif (isset($this->ptg[$token])) {
+        if (isset($this->ptg[$token])) {
             return pack('C', $this->ptg[$token]);
+        }
         // match error codes
-        } elseif (preg_match('/^#[A-Z0\\/]{3,5}[!?]{1}$/', $token) || $token == '#N/A') {
+        if (preg_match('/^#[A-Z0\\/]{3,5}[!?]{1}$/', $token) || $token == '#N/A') {
             return $this->convertError($token);
-        } elseif (preg_match('/^' . Calculation::CALCULATION_REGEXP_DEFINEDNAME . '$/mui', $token) && $this->spreadsheet->getDefinedName($token) !== null) {
+        }
+        if (preg_match('/^' . 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().
-            /*elseif (preg_match("/[A-Z0-9\xc0-\xdc\.]+/", $token))
-            {
-                return($this->convertFunction($token, $this->_func_args));
-            }*/
-            // if it's an argument, ignore the token (the argument remains)
-        } elseif ($token == 'arg') {
+        /*if (preg_match("/[A-Z0-9\xc0-\xdc\.]+/", $token))
+        {
+            return($this->convertFunction($token, $this->_func_args));
+        }*/
+        // if it's an argument, ignore the token (the argument remains)
+        if ($token == 'arg') {
             return '';
         }
+        if (preg_match('/^true$/i', $token)) {
+            return $this->convertBool(1);
+        }
+        if (preg_match('/^false$/i', $token)) {
+            return $this->convertBool(0);
+        }
 
         // TODO: use real error codes
         throw new WriterException("Unknown token $token");
@@ -543,33 +542,36 @@ private function convert($token)
     /**
      * Convert a number token to ptgInt or ptgNum.
      *
-     * @param mixed $num an integer or double for conversion to its ptg value
-     *
-     * @return string
+     * @param float|int|string $num an integer or double for conversion to its ptg value
      */
-    private function convertNumber($num)
+    private function convertNumber(mixed $num): string
     {
         // Integer in the range 0..2**16-1
-        if ((preg_match('/^\\d+$/', $num)) && ($num <= 65535)) {
+        if ((preg_match('/^\\d+$/', (string) $num)) && ($num <= 65535)) {
             return pack('Cv', $this->ptg['ptgInt'], $num);
         }
 
         // A float
         if (BIFFwriter::getByteOrder()) { // if it's Big Endian
-            $num = strrev($num);
+            $num = strrev((string) $num);
         }
 
         return pack('Cd', $this->ptg['ptgNum'], $num);
     }
 
+    private function convertBool(int $num): string
+    {
+        return pack('CC', $this->ptg['ptgBool'], $num);
+    }
+
     /**
      * Convert a string token to ptgStr.
      *
      * @param string $string a string for conversion to its ptg value
      *
-     * @return mixed the converted token on success
+     * @return string the converted token
      */
-    private function convertString($string)
+    private function convertString(string $string): string
     {
         // chop away beggining and ending quotes
         $string = substr($string, 1, -1);
@@ -589,7 +591,7 @@ private function convertString($string)
      *
      * @return string The packed ptg for the function
      */
-    private function convertFunction($token, $num_args)
+    private function convertFunction(string $token, int $num_args): string
     {
         $args = $this->functions[$token][1];
 
@@ -606,11 +608,8 @@ private function convertFunction($token, $num_args)
      * Convert an Excel range such as A1:D4 to a ptgRefV.
      *
      * @param string $range An Excel range in the A1:A2
-     * @param int $class
-     *
-     * @return string
      */
-    private function convertRange2d($range, $class = 0)
+    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
@@ -620,7 +619,6 @@ private function convertRange2d($range, $class = 0)
             // TODO: use real error codes
             throw new WriterException('Unknown range separator');
         }
-
         // Convert the cell references
         [$row1, $col1] = $this->cellToPackedRowcol($cell1);
         [$row2, $col2] = $this->cellToPackedRowcol($cell2);
@@ -646,18 +644,18 @@ private function convertRange2d($range, $class = 0)
      *
      * @param string $token an Excel range in the Sheet1!A1:A2 format
      *
-     * @return mixed the packed ptgArea3d token on success
+     * @return string the packed ptgArea3d token on success
      */
-    private function convertRange3d($token)
+    private function convertRange3d(string $token): string
     {
         // Split the ref at the ! symbol
         [$ext_ref, $range] = PhpspreadsheetWorksheet::extractSheetTitle($token, true);
 
         // Convert the external reference part (different for BIFF8)
-        $ext_ref = $this->getRefIndex($ext_ref);
+        $ext_ref = $this->getRefIndex($ext_ref ?? '');
 
         // Split the range into 2 cell refs
-        [$cell1, $cell2] = explode(':', $range);
+        [$cell1, $cell2] = explode(':', $range ?? '');
 
         // Convert the cell references
         if (preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?(\\d+)$/', $cell1)) {
@@ -680,7 +678,7 @@ private function convertRange3d($token)
      *
      * @return string The cell in packed() format with the corresponding ptg
      */
-    private function convertRef2d($cell)
+    private function convertRef2d(string $cell): string
     {
         // Convert the cell reference
         $cell_array = $this->cellToPackedRowcol($cell);
@@ -698,18 +696,18 @@ private function convertRef2d($cell)
      *
      * @param string $cell An Excel cell reference
      *
-     * @return mixed the packed ptgRef3d token on success
+     * @return string the packed ptgRef3d token on success
      */
-    private function convertRef3d($cell)
+    private function convertRef3d(string $cell): string
     {
         // Split the ref at the ! symbol
         [$ext_ref, $cell] = PhpspreadsheetWorksheet::extractSheetTitle($cell, true);
 
         // Convert the external reference part (different for BIFF8)
-        $ext_ref = $this->getRefIndex($ext_ref);
+        $ext_ref = $this->getRefIndex($ext_ref ?? '');
 
         // Convert the cell reference part
-        [$row, $col] = $this->cellToPackedRowcol($cell);
+        [$row, $col] = $this->cellToPackedRowcol($cell ?? '');
 
         // The ptg value depends on the class of the ptg.
         $ptgRef = pack('C', $this->ptg['ptgRef3dA']);
@@ -724,47 +722,45 @@ private function convertRef3d($cell)
      *
      * @return string The error code ptgErr
      */
-    private function convertError($errorCode)
+    private function convertError(string $errorCode): string
     {
-        switch ($errorCode) {
-            case '#NULL!':
-                return pack('C', 0x00);
-            case '#DIV/0!':
-                return pack('C', 0x07);
-            case '#VALUE!':
-                return pack('C', 0x0F);
-            case '#REF!':
-                return pack('C', 0x17);
-            case '#NAME?':
-                return pack('C', 0x1D);
-            case '#NUM!':
-                return pack('C', 0x24);
-            case '#N/A':
-                return pack('C', 0x2A);
-        }
-
-        return pack('C', 0xFF);
+        return match ($errorCode) {
+            '#NULL!' => pack('C', 0x00),
+            '#DIV/0!' => pack('C', 0x07),
+            '#VALUE!' => pack('C', 0x0F),
+            '#REF!' => pack('C', 0x17),
+            '#NAME?' => pack('C', 0x1D),
+            '#NUM!' => pack('C', 0x24),
+            '#N/A' => pack('C', 0x2A),
+            default => pack('C', 0xFF),
+        };
     }
 
+    private bool $tryDefinedName = false;
+
     private function convertDefinedName(string $name): string
     {
         if (strlen($name) > 255) {
             throw new WriterException('Defined Name is too long');
         }
 
-        $nameReference = 1;
-        foreach ($this->spreadsheet->getDefinedNames() as $definedName) {
-            if ($name === $definedName->getName()) {
-                break;
+        if ($this->tryDefinedName) {
+            // @codeCoverageIgnoreStart
+            $nameReference = 1;
+            foreach ($this->spreadsheet->getDefinedNames() as $definedName) {
+                if ($name === $definedName->getName()) {
+                    break;
+                }
+                ++$nameReference;
             }
-            ++$nameReference;
-        }
 
-        $ptgRef = pack('Cvxx', $this->ptg['ptgName'], $nameReference);
+            $ptgRef = pack('Cvxx', $this->ptg['ptgName'], $nameReference);
 
-        throw new WriterException('Cannot yet write formulae with defined names to Xls');
+            return $ptgRef;
+            // @codeCoverageIgnoreEnd
+        }
 
-        return $ptgRef;
+        throw new WriterException('Cannot yet write formulae with defined names to Xls');
     }
 
     /**
@@ -774,12 +770,11 @@ private function convertDefinedName(string $name): string
      *
      * @param string $ext_ref The name of the external reference
      *
-     * @return mixed The reference index in packed() format on success
+     * @return string The reference index in packed() format on success
      */
-    private function getRefIndex($ext_ref)
+    private function getRefIndex(string $ext_ref): string
     {
-        $ext_ref = preg_replace("/^'/", '', $ext_ref); // Remove leading  ' if any.
-        $ext_ref = preg_replace("/'$/", '', $ext_ref); // Remove trailing ' if any.
+        $ext_ref = (string) 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.
@@ -837,7 +832,7 @@ private function getRefIndex($ext_ref)
      *
      * @return int The sheet index, -1 if the sheet was not found
      */
-    private function getSheetIndex($sheet_name)
+    private function getSheetIndex(string $sheet_name): int
     {
         if (!isset($this->externalSheets[$sheet_name])) {
             return -1;
@@ -854,9 +849,9 @@ private function getSheetIndex($sheet_name)
      * @param string $name The name of the worksheet being added
      * @param int $index The index of the worksheet being added
      *
-     * @see \PhpOffice\PhpSpreadsheet\Writer\Xls\Workbook::addWorksheet()
+     * @see Workbook::addWorksheet
      */
-    public function setExtSheet($name, $index): void
+    public function setExtSheet(string $name, int $index): void
     {
         $this->externalSheets[$name] = $index;
     }
@@ -868,7 +863,7 @@ public function setExtSheet($name, $index): void
      *
      * @return array Array containing the row and column in packed() format
      */
-    private function cellToPackedRowcol($cell)
+    private function cellToPackedRowcol(string $cell): array
     {
         $cell = strtoupper($cell);
         [$row, $col, $row_rel, $col_rel] = $this->cellToRowcol($cell);
@@ -897,7 +892,7 @@ private function cellToPackedRowcol($cell)
      *
      * @return array Array containing (row1,col1,row2,col2) in packed() format
      */
-    private function rangeToPackedRange($range)
+    private function rangeToPackedRange(string $range): array
     {
         preg_match('/(\$)?(\d+)\:(\$)?(\d+)/', $range, $match);
         // return absolute rows if there is a $ in the ref
@@ -935,10 +930,8 @@ private function rangeToPackedRange($range)
      * whether the row or column are relative references.
      *
      * @param string $cell the Excel cell reference in A1 format
-     *
-     * @return array
      */
-    private function cellToRowcol($cell)
+    private function cellToRowcol(string $cell): array
     {
         preg_match('/(\$)?([A-I]?[A-Z])(\$)?(\d+)/', $cell, $match);
         // return absolute column if there is a $ in the ref
@@ -966,7 +959,7 @@ private function cellToRowcol($cell)
     /**
      * Advance to the next valid token.
      */
-    private function advance()
+    private function advance(): void
     {
         $token = '';
         $i = $this->currentCharacter;
@@ -996,7 +989,7 @@ private function advance()
                 $this->currentCharacter = $i + 1;
                 $this->currentToken = $token;
 
-                return 1;
+                return;
             }
 
             if ($i < ($formula_length - 2)) {
@@ -1006,17 +999,16 @@ private function advance()
             }
             ++$i;
         }
-        //die("Lexical error ".$this->currentCharacter);
     }
 
     /**
      * Checks if it's a valid token.
      *
-     * @param mixed $token the token to check
+     * @param string $token the token to check
      *
-     * @return mixed The checked token or false on failure
+     * @return string The checked token or empty string on failure
      */
-    private function match($token)
+    private function match(string $token): string
     {
         switch ($token) {
             case '+':
@@ -1036,7 +1028,6 @@ private function match($token)
             case '%':
                 return $token;
 
-                break;
             case '>':
                 if ($this->lookAhead === '=') { // it's a GE token
                     break;
@@ -1044,7 +1035,6 @@ private function match($token)
 
                 return $token;
 
-                break;
             case '<':
                 // it's a LE or a NE token
                 if (($this->lookAhead === '=') || ($this->lookAhead === '>')) {
@@ -1052,49 +1042,64 @@ private function match($token)
                 }
 
                 return $token;
+        }
 
-                break;
-            default:
-                // 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 !== '!')) {
-                    return $token;
-                } elseif (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 it's an external reference (Sheet1!A1 or Sheet1:Sheet2!A1 or Sheet1!$A$1 or Sheet1:Sheet2!$A$1)
-                    return $token;
-                } elseif (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 it's an external reference ('Sheet1'!A1 or 'Sheet1:Sheet2'!A1 or 'Sheet1'!$A$1 or 'Sheet1:Sheet2'!$A$1)
-                    return $token;
-                } elseif (preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+:(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+$/', $token) && !preg_match('/\d/', $this->lookAhead)) {
-                    // if it's a range A1:A2 or $A$1:$A$2
-                    return $token;
-                } elseif (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 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
-                    return $token;
-                } elseif (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 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
-                    return $token;
-                } elseif (is_numeric($token) && (!is_numeric($token . $this->lookAhead) || ($this->lookAhead == '')) && ($this->lookAhead !== '!') && ($this->lookAhead !== ':')) {
-                    // If it's a number (check that it's not a sheet name or range)
-                    return $token;
-                } elseif (preg_match('/"([^"]|""){0,255}"/', $token) && $this->lookAhead !== '"' && (substr_count($token, '"') % 2 == 0)) {
-                    // If it's a string (of maximum 255 characters)
-                    return $token;
-                } elseif (preg_match('/^#[A-Z0\\/]{3,5}[!?]{1}$/', $token) || $token === '#N/A') {
-                    // If it's an error code
-                    return $token;
-                } elseif (preg_match("/^[A-Z0-9\xc0-\xdc\\.]+$/i", $token) && ($this->lookAhead === '(')) {
-                    // if it's a function call
-                    return $token;
-                } elseif (preg_match('/^' . Calculation::CALCULATION_REGEXP_DEFINEDNAME . '$/miu', $token) && $this->spreadsheet->getDefinedName($token) !== null) {
-                    return $token;
-                } elseif (substr($token, -1) === ')') {
-                    //    It's an argument of some description (e.g. a named range),
-                    //        precise nature yet to be determined
-                    return $token;
-                }
-
-                return '';
+        // 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 !== '!')) {
+            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 !== '.')) {
+            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 !== '.')) {
+            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)) {
+            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)) {
+            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)) {
+            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 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') {
+            return $token;
+        }
+        // if it's a function call
+        if (preg_match("/^[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) {
+            return $token;
+        }
+        if (preg_match('/^true$/i', $token) && ($this->lookAhead === ')' || $this->lookAhead === ',')) {
+            return $token;
+        }
+        if (preg_match('/^false$/i', $token) && ($this->lookAhead === ')' || $this->lookAhead === ',')) {
+            return $token;
         }
+        if (str_ends_with($token, ')')) {
+            //    It's an argument of some description (e.g. a named range),
+            //        precise nature yet to be determined
+            return $token;
+        }
+
+        return '';
     }
 
     /**
@@ -1103,9 +1108,9 @@ private function match($token)
      * @param string $formula the formula to parse, without the initial equal
      *                        sign (=)
      *
-     * @return mixed true on success
+     * @return bool true on success
      */
-    public function parse($formula)
+    public function parse(string $formula): bool
     {
         $this->currentCharacter = 0;
         $this->formula = (string) $formula;
@@ -1120,9 +1125,9 @@ public function parse($formula)
      * It parses a condition. It assumes the following rule:
      * Cond -> Expr [(">" | "<") Expr].
      *
-     * @return mixed The parsed ptg'd tree on success
+     * @return array The parsed ptg'd tree on success
      */
-    private function condition()
+    private function condition(): array
     {
         $result = $this->expression();
         if ($this->currentToken == '<') {
@@ -1162,9 +1167,9 @@ private function condition()
      *      -> "+" Term : Positive value
      *      -> Error code.
      *
-     * @return mixed The parsed ptg'd tree on success
+     * @return array The parsed ptg'd tree on success
      */
-    private function expression()
+    private function expression(): array
     {
         // If it's a string return a string node
         if (preg_match('/"([^"]|""){0,255}"/', $this->currentToken)) {
@@ -1177,21 +1182,18 @@ private function expression()
             $this->advance();
 
             return $result;
-        // If it's an error code
-        } elseif (preg_match('/^#[A-Z0\\/]{3,5}[!?]{1}$/', $this->currentToken) || $this->currentToken == '#N/A') {
+        } elseif (preg_match('/^#[A-Z0\\/]{3,5}[!?]{1}$/', $this->currentToken) || $this->currentToken == '#N/A') { // error code
             $result = $this->createTree($this->currentToken, 'ptgErr', '');
             $this->advance();
 
             return $result;
-        // If it's a negative value
-        } elseif ($this->currentToken == '-') {
+        } elseif ($this->currentToken == '-') { // negative value
             // catch "-" Term
             $this->advance();
             $result2 = $this->expression();
 
             return $this->createTree('ptgUminus', $result2, '');
-        // If it's a positive value
-        } elseif ($this->currentToken == '+') {
+        } elseif ($this->currentToken == '+') { // positive value
             // catch "+" Term
             $this->advance();
             $result2 = $this->expression();
@@ -1205,9 +1207,9 @@ private function expression()
             $result = $this->createTree('ptgConcat', $result, $result2);
         }
         while (
-            ($this->currentToken == '+') ||
-            ($this->currentToken == '-') ||
-            ($this->currentToken == '^')
+            ($this->currentToken == '+')
+            || ($this->currentToken == '-')
+            || ($this->currentToken == '^')
         ) {
             if ($this->currentToken == '+') {
                 $this->advance();
@@ -1235,7 +1237,7 @@ private function expression()
      *
      * @see fact()
      */
-    private function parenthesizedExpression()
+    private function parenthesizedExpression(): array
     {
         return $this->createTree('ptgParen', $this->expression(), '');
     }
@@ -1244,14 +1246,14 @@ private function parenthesizedExpression()
      * It parses a term. It assumes the following rule:
      * Term -> Fact [("*" | "/") Fact].
      *
-     * @return mixed The parsed ptg'd tree on success
+     * @return array The parsed ptg'd tree on success
      */
-    private function term()
+    private function term(): array
     {
         $result = $this->fact();
         while (
-            ($this->currentToken == '*') ||
-            ($this->currentToken == '/')
+            ($this->currentToken == '*')
+            || ($this->currentToken == '/')
         ) {
             if ($this->currentToken == '*') {
                 $this->advance();
@@ -1275,11 +1277,12 @@ private function term()
      *       | Number
      *       | Function.
      *
-     * @return mixed The parsed ptg'd tree on success
+     * @return array The parsed ptg'd tree on success
      */
-    private function fact()
+    private function fact(): array
     {
-        if ($this->currentToken === '(') {
+        $currentToken = $this->currentToken;
+        if ($currentToken === '(') {
             $this->advance(); // eat the "("
             $result = $this->parenthesizedExpression();
             if ($this->currentToken !== ')') {
@@ -1295,21 +1298,24 @@ private function fact()
             $this->advance();
 
             return $result;
-        } elseif (preg_match('/^' . self::REGEX_SHEET_TITLE_UNQUOTED . '(\\:' . self::REGEX_SHEET_TITLE_UNQUOTED . ')?\\!\$?[A-Ia-i]?[A-Za-z]\$?\\d+$/u', $this->currentToken)) {
+        }
+        if (preg_match('/^' . 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;
-        } elseif (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . '(\\:' . self::REGEX_SHEET_TITLE_QUOTED . ")?'\\!\\$?[A-Ia-i]?[A-Za-z]\\$?\\d+$/u", $this->currentToken)) {
+        }
+        if (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . '(\\:' . self::REGEX_SHEET_TITLE_QUOTED . ")?'\\!\\$?[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;
-        } elseif (
-            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)
+        }
+        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)
         ) {
             // if it's a range A1:B2 or $A$1:$B$2
             // must be an error?
@@ -1317,21 +1323,24 @@ private function fact()
             $this->advance();
 
             return $result;
-        } elseif (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_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 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, '', '');
             $this->advance();
 
             return $result;
-        } elseif (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 (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 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, '', '');
             $this->advance();
 
             return $result;
-        } elseif (is_numeric($this->currentToken)) {
+        }
+        if (is_numeric($this->currentToken)) {
             // If it's a number or a percent
             if ($this->lookAhead === '%') {
                 $result = $this->createTree('ptgPercent', $this->currentToken, '');
@@ -1342,15 +1351,23 @@ private function fact()
             $this->advance();
 
             return $result;
-        } elseif (preg_match("/^[A-Z0-9\xc0-\xdc\\.]+$/i", $this->currentToken) && ($this->lookAhead === '(')) {
+        }
+        if (preg_match("/^[A-Z0-9\xc0-\xdc\\.]+$/i", $this->currentToken) && ($this->lookAhead === '(')) {
             // if it's a function call
             return $this->func();
-        } elseif (preg_match('/^' . Calculation::CALCULATION_REGEXP_DEFINEDNAME . '$/miu', $this->currentToken) && $this->spreadsheet->getDefinedName($this->currentToken) !== null) {
+        }
+        if (preg_match('/^' . 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)) {
+            $result = $this->createTree($this->currentToken, '', '');
+            $this->advance();
+
+            return $result;
+        }
 
         throw new WriterException('Syntax error: ' . $this->currentToken . ', lookahead: ' . $this->lookAhead . ', current char: ' . $this->currentCharacter);
     }
@@ -1359,9 +1376,9 @@ private function fact()
      * It parses a function call. It assumes the following rule:
      * Func -> ( Expr [,Expr]* ).
      *
-     * @return mixed The parsed ptg'd tree on success
+     * @return array The parsed ptg'd tree on success
      */
-    private function func()
+    private function func(): array
     {
         $num_args = 0; // number of arguments received
         $function = strtoupper($this->currentToken);
@@ -1408,7 +1425,7 @@ private function func()
      *
      * @return array A tree
      */
-    private function createTree($value, $left, $right)
+    private function createTree(mixed $value, mixed $left, mixed $right): array
     {
         return ['value' => $value, 'left' => $left, 'right' => $right];
     }
@@ -1440,12 +1457,15 @@ private function createTree($value, $left, $right)
      *
      * @return string The tree in reverse polish notation
      */
-    public function toReversePolish($tree = [])
+    public function toReversePolish(array $tree = []): string
     {
         $polish = ''; // the string we are going to return
         if (empty($tree)) { // If it's the first call use parseTree
             $tree = $this->parseTree;
         }
+        if (!is_array($tree) || !isset($tree['left'], $tree['right'], $tree['value'])) {
+            throw new WriterException('Unexpected non-array');
+        }
 
         if (is_array($tree['left'])) {
             $converted_tree = $this->toReversePolish($tree['left']);
@@ -1463,11 +1483,11 @@ public function toReversePolish($tree = [])
         }
         // 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']) &&
-            !is_numeric($tree['value']) &&
-            !isset($this->ptg[$tree['value']])
+            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'])
+            && !is_numeric($tree['value'])
+            && !isset($this->ptg[$tree['value']])
         ) {
             // left subtree for a function is always an array.
             if ($tree['left'] != '') {
@@ -1476,7 +1496,7 @@ public function toReversePolish($tree = [])
                 $left_tree = '';
             }
 
-            // add it's left subtree and return.
+            // add its left subtree and return.
             return $left_tree . $this->convertFunction($tree['value'], $tree['right']);
         }
         $converted_tree = $this->convert($tree['value']);
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Style/CellAlignment.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Style/CellAlignment.php
index 711d88d209..81da6353a9 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Style/CellAlignment.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Style/CellAlignment.php
@@ -9,7 +9,7 @@ class CellAlignment
     /**
      * @var array<string, int>
      */
-    private static $horizontalMap = [
+    private static array $horizontalMap = [
         Alignment::HORIZONTAL_GENERAL => 0,
         Alignment::HORIZONTAL_LEFT => 1,
         Alignment::HORIZONTAL_RIGHT => 3,
@@ -21,7 +21,7 @@ class CellAlignment
     /**
      * @var array<string, int>
      */
-    private static $verticalMap = [
+    private static array $verticalMap = [
         Alignment::VERTICAL_BOTTOM => 2,
         Alignment::VERTICAL_TOP => 0,
         Alignment::VERTICAL_CENTER => 1,
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Style/CellBorder.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Style/CellBorder.php
index 8d47d6aa7c..e97a1f7914 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Style/CellBorder.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Style/CellBorder.php
@@ -9,7 +9,7 @@ class CellBorder
     /**
      * @var array<string, int>
      */
-    protected static $styleMap = [
+    protected static array $styleMap = [
         Border::BORDER_NONE => 0x00,
         Border::BORDER_THIN => 0x01,
         Border::BORDER_MEDIUM => 0x02,
@@ -24,6 +24,7 @@ class CellBorder
         Border::BORDER_DASHDOTDOT => 0x0B,
         Border::BORDER_MEDIUMDASHDOTDOT => 0x0C,
         Border::BORDER_SLANTDASHDOT => 0x0D,
+        Border::BORDER_OMIT => 0x00,
     ];
 
     public static function style(Border $border): int
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Style/CellFill.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Style/CellFill.php
index f5a8c4700e..a0a932a967 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Style/CellFill.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Style/CellFill.php
@@ -9,7 +9,7 @@ class CellFill
     /**
      * @var array<string, int>
      */
-    protected static $fillStyleMap = [
+    protected static array $fillStyleMap = [
         Fill::FILL_NONE => 0x00,
         Fill::FILL_SOLID => 0x01,
         Fill::FILL_PATTERN_MEDIUMGRAY => 0x02,
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Style/ColorMap.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Style/ColorMap.php
deleted file mode 100644
index caf85c0499..0000000000
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Style/ColorMap.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-namespace PhpOffice\PhpSpreadsheet\Writer\Xls\Style;
-
-use PhpOffice\PhpSpreadsheet\Style\Color;
-
-class ColorMap
-{
-    /**
-     * @var array<string, int>
-     */
-    private static $colorMap = [
-        '#000000' => 0x08,
-        '#FFFFFF' => 0x09,
-        '#FF0000' => 0x0A,
-        '#00FF00' => 0x0B,
-        '#0000FF' => 0x0C,
-        '#FFFF00' => 0x0D,
-        '#FF00FF' => 0x0E,
-        '#00FFFF' => 0x0F,
-        '#800000' => 0x10,
-        '#008000' => 0x11,
-        '#000080' => 0x12,
-        '#808000' => 0x13,
-        '#800080' => 0x14,
-        '#008080' => 0x15,
-        '#C0C0C0' => 0x16,
-        '#808080' => 0x17,
-        '#9999FF' => 0x18,
-        '#993366' => 0x19,
-        '#FFFFCC' => 0x1A,
-        '#CCFFFF' => 0x1B,
-        '#660066' => 0x1C,
-        '#FF8080' => 0x1D,
-        '#0066CC' => 0x1E,
-        '#CCCCFF' => 0x1F,
-        //        '#000080' => 0x20,
-        //        '#FF00FF' => 0x21,
-        //        '#FFFF00' => 0x22,
-        //        '#00FFFF' => 0x23,
-        //        '#800080' => 0x24,
-        //        '#800000' => 0x25,
-        //        '#008080' => 0x26,
-        //        '#0000FF' => 0x27,
-        '#00CCFF' => 0x28,
-        //        '#CCFFFF' => 0x29,
-        '#CCFFCC' => 0x2A,
-        '#FFFF99' => 0x2B,
-        '#99CCFF' => 0x2C,
-        '#FF99CC' => 0x2D,
-        '#CC99FF' => 0x2E,
-        '#FFCC99' => 0x2F,
-        '#3366FF' => 0x30,
-        '#33CCCC' => 0x31,
-        '#99CC00' => 0x32,
-        '#FFCC00' => 0x33,
-        '#FF9900' => 0x34,
-        '#FF6600' => 0x35,
-        '#666699' => 0x36,
-        '#969696' => 0x37,
-        '#003366' => 0x38,
-        '#339966' => 0x39,
-        '#003300' => 0x3A,
-        '#333300' => 0x3B,
-        '#993300' => 0x3C,
-        //        '#993366' => 0x3D,
-        '#333399' => 0x3E,
-        '#333333' => 0x3F,
-    ];
-
-    public static function lookup(Color $color, int $defaultIndex = 0x00): int
-    {
-        $colorRgb = $color->getRGB();
-        if (is_string($colorRgb) && array_key_exists("#{$colorRgb}", self::$colorMap)) {
-            return self::$colorMap["#{$colorRgb}"];
-        }
-
-//      TODO Try and map RGB value to nearest colour within the define pallette
-//        $red =  Color::getRed($colorRgb, false);
-//        $green = Color::getGreen($colorRgb, false);
-//        $blue = Color::getBlue($colorRgb, false);
-
-//        $paletteSpace = 3;
-//        $newColor = ($red * $paletteSpace / 256) * ($paletteSpace * $paletteSpace) +
-//            ($green * $paletteSpace / 256) * $paletteSpace +
-//            ($blue * $paletteSpace / 256);
-
-        return $defaultIndex;
-    }
-}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Workbook.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Workbook.php
index a917185d89..a1a5faf8f4 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Workbook.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Workbook.php
@@ -49,129 +49,99 @@ class Workbook extends BIFFwriter
 {
     /**
      * Formula parser.
-     *
-     * @var \PhpOffice\PhpSpreadsheet\Writer\Xls\Parser
      */
-    private $parser;
+    private Parser $parser;
 
-    /**
-     * The BIFF file size for the workbook.
-     *
-     * @var int
+    /*
+     * The BIFF file size for the workbook. Not currently used.
      *
      * @see calcSheetOffsets()
      */
-    private $biffSize;
+    //private int $biffSize;
 
     /**
      * XF Writers.
      *
-     * @var \PhpOffice\PhpSpreadsheet\Writer\Xls\Xf[]
+     * @var Xf[]
      */
-    private $xfWriters = [];
+    private array $xfWriters = [];
 
     /**
      * Array containing the colour palette.
-     *
-     * @var array
      */
-    private $palette;
+    private array $palette;
 
     /**
      * The codepage indicates the text encoding used for strings.
-     *
-     * @var int
      */
-    private $codepage;
+    private int $codepage;
 
     /**
      * The country code used for localization.
-     *
-     * @var int
      */
-    private $countryCode;
+    private int $countryCode;
 
     /**
      * Workbook.
-     *
-     * @var Spreadsheet
      */
-    private $spreadsheet;
+    private Spreadsheet $spreadsheet;
 
     /**
      * Fonts writers.
      *
      * @var Font[]
      */
-    private $fontWriters = [];
+    private array $fontWriters = [];
 
     /**
      * Added fonts. Maps from font's hash => index in workbook.
-     *
-     * @var array
      */
-    private $addedFonts = [];
+    private array $addedFonts = [];
 
     /**
      * Shared number formats.
-     *
-     * @var array
      */
-    private $numberFormats = [];
+    private array $numberFormats = [];
 
     /**
      * Added number formats. Maps from numberFormat's hash => index in workbook.
-     *
-     * @var array
      */
-    private $addedNumberFormats = [];
+    private array $addedNumberFormats = [];
 
     /**
      * Sizes of the binary worksheet streams.
-     *
-     * @var array
      */
-    private $worksheetSizes = [];
+    private array $worksheetSizes = [];
 
     /**
      * Offsets of the binary worksheet streams relative to the start of the global workbook stream.
-     *
-     * @var array
      */
-    private $worksheetOffsets = [];
+    private array $worksheetOffsets = [];
 
     /**
      * Total number of shared strings in workbook.
-     *
-     * @var int
      */
-    private $stringTotal;
+    private int $stringTotal;
 
     /**
      * Number of unique shared strings in workbook.
-     *
-     * @var int
      */
-    private $stringUnique;
+    private int $stringUnique;
 
     /**
      * Array of unique shared strings in workbook.
-     *
-     * @var array
      */
-    private $stringTable;
+    private array $stringTable;
 
     /**
      * Color cache.
      */
-    private $colors;
+    private array $colors;
 
     /**
      * Escher object corresponding to MSODRAWINGGROUP.
-     *
-     * @var \PhpOffice\PhpSpreadsheet\Shared\Escher
      */
-    private $escher;
+    private ?\PhpOffice\PhpSpreadsheet\Shared\Escher $escher = null;
 
     /**
      * Class constructor.
@@ -183,13 +153,13 @@ class Workbook extends BIFFwriter
      * @param array $colors Colour Table
      * @param Parser $parser The formula parser created for the Workbook
      */
-    public function __construct(Spreadsheet $spreadsheet, &$str_total, &$str_unique, &$str_table, &$colors, Parser $parser)
+    public function __construct(Spreadsheet $spreadsheet, int &$str_total, int &$str_unique, array &$str_table, array &$colors, Parser $parser)
     {
         // It needs to call its parent's constructor explicitly
         parent::__construct();
 
         $this->parser = $parser;
-        $this->biffSize = 0;
+        //$this->biffSize = 0;
         $this->palette = [];
         $this->countryCode = -1;
 
@@ -228,7 +198,7 @@ public function __construct(Spreadsheet $spreadsheet, &$str_total, &$str_unique,
      *
      * @return int Index to XF record
      */
-    public function addXfWriter(Style $style, $isStyleXf = false)
+    public function addXfWriter(Style $style, bool $isStyleXf = false): int
     {
         $xfWriter = new Xf($style);
         $xfWriter->setIsStyleXf($isStyleXf);
@@ -276,7 +246,7 @@ public function addXfWriter(Style $style, $isStyleXf = false)
      *
      * @return int Index to FONT record
      */
-    public function addFont(\PhpOffice\PhpSpreadsheet\Style\Font $font)
+    public function addFont(\PhpOffice\PhpSpreadsheet\Style\Font $font): int
     {
         $fontHashCode = $font->getHashCode();
         if (isset($this->addedFonts[$fontHashCode])) {
@@ -302,11 +272,11 @@ public function addFont(\PhpOffice\PhpSpreadsheet\Style\Font $font)
      *
      * @return int Color index
      */
-    private function addColor($rgb)
+    public function addColor(string $rgb, int $default = 0): int
     {
         if (!isset($this->colors[$rgb])) {
-            $color =
-                [
+            $color
+                = [
                     hexdec(substr($rgb, 0, 2)),
                     hexdec(substr($rgb, 2, 2)),
                     hexdec(substr($rgb, 4)),
@@ -328,7 +298,7 @@ private function addColor($rgb)
                     $this->colors[$rgb] = $colorIndex;
                 } else {
                     // no room for more custom colors, just map to black
-                    $colorIndex = 0;
+                    $colorIndex = $default;
                 }
             }
         } else {
@@ -346,51 +316,51 @@ private function setPaletteXl97(): void
     {
         $this->palette = [
             0x08 => [0x00, 0x00, 0x00, 0x00],
-            0x09 => [0xff, 0xff, 0xff, 0x00],
-            0x0A => [0xff, 0x00, 0x00, 0x00],
-            0x0B => [0x00, 0xff, 0x00, 0x00],
-            0x0C => [0x00, 0x00, 0xff, 0x00],
-            0x0D => [0xff, 0xff, 0x00, 0x00],
-            0x0E => [0xff, 0x00, 0xff, 0x00],
-            0x0F => [0x00, 0xff, 0xff, 0x00],
+            0x09 => [0xFF, 0xFF, 0xFF, 0x00],
+            0x0A => [0xFF, 0x00, 0x00, 0x00],
+            0x0B => [0x00, 0xFF, 0x00, 0x00],
+            0x0C => [0x00, 0x00, 0xFF, 0x00],
+            0x0D => [0xFF, 0xFF, 0x00, 0x00],
+            0x0E => [0xFF, 0x00, 0xFF, 0x00],
+            0x0F => [0x00, 0xFF, 0xFF, 0x00],
             0x10 => [0x80, 0x00, 0x00, 0x00],
             0x11 => [0x00, 0x80, 0x00, 0x00],
             0x12 => [0x00, 0x00, 0x80, 0x00],
             0x13 => [0x80, 0x80, 0x00, 0x00],
             0x14 => [0x80, 0x00, 0x80, 0x00],
             0x15 => [0x00, 0x80, 0x80, 0x00],
-            0x16 => [0xc0, 0xc0, 0xc0, 0x00],
+            0x16 => [0xC0, 0xC0, 0xC0, 0x00],
             0x17 => [0x80, 0x80, 0x80, 0x00],
-            0x18 => [0x99, 0x99, 0xff, 0x00],
+            0x18 => [0x99, 0x99, 0xFF, 0x00],
             0x19 => [0x99, 0x33, 0x66, 0x00],
-            0x1A => [0xff, 0xff, 0xcc, 0x00],
-            0x1B => [0xcc, 0xff, 0xff, 0x00],
+            0x1A => [0xFF, 0xFF, 0xCC, 0x00],
+            0x1B => [0xCC, 0xFF, 0xFF, 0x00],
             0x1C => [0x66, 0x00, 0x66, 0x00],
-            0x1D => [0xff, 0x80, 0x80, 0x00],
-            0x1E => [0x00, 0x66, 0xcc, 0x00],
-            0x1F => [0xcc, 0xcc, 0xff, 0x00],
+            0x1D => [0xFF, 0x80, 0x80, 0x00],
+            0x1E => [0x00, 0x66, 0xCC, 0x00],
+            0x1F => [0xCC, 0xCC, 0xFF, 0x00],
             0x20 => [0x00, 0x00, 0x80, 0x00],
-            0x21 => [0xff, 0x00, 0xff, 0x00],
-            0x22 => [0xff, 0xff, 0x00, 0x00],
-            0x23 => [0x00, 0xff, 0xff, 0x00],
+            0x21 => [0xFF, 0x00, 0xFF, 0x00],
+            0x22 => [0xFF, 0xFF, 0x00, 0x00],
+            0x23 => [0x00, 0xFF, 0xFF, 0x00],
             0x24 => [0x80, 0x00, 0x80, 0x00],
             0x25 => [0x80, 0x00, 0x00, 0x00],
             0x26 => [0x00, 0x80, 0x80, 0x00],
-            0x27 => [0x00, 0x00, 0xff, 0x00],
-            0x28 => [0x00, 0xcc, 0xff, 0x00],
-            0x29 => [0xcc, 0xff, 0xff, 0x00],
-            0x2A => [0xcc, 0xff, 0xcc, 0x00],
-            0x2B => [0xff, 0xff, 0x99, 0x00],
-            0x2C => [0x99, 0xcc, 0xff, 0x00],
-            0x2D => [0xff, 0x99, 0xcc, 0x00],
-            0x2E => [0xcc, 0x99, 0xff, 0x00],
-            0x2F => [0xff, 0xcc, 0x99, 0x00],
-            0x30 => [0x33, 0x66, 0xff, 0x00],
-            0x31 => [0x33, 0xcc, 0xcc, 0x00],
-            0x32 => [0x99, 0xcc, 0x00, 0x00],
-            0x33 => [0xff, 0xcc, 0x00, 0x00],
-            0x34 => [0xff, 0x99, 0x00, 0x00],
-            0x35 => [0xff, 0x66, 0x00, 0x00],
+            0x27 => [0x00, 0x00, 0xFF, 0x00],
+            0x28 => [0x00, 0xCC, 0xFF, 0x00],
+            0x29 => [0xCC, 0xFF, 0xFF, 0x00],
+            0x2A => [0xCC, 0xFF, 0xCC, 0x00],
+            0x2B => [0xFF, 0xFF, 0x99, 0x00],
+            0x2C => [0x99, 0xCC, 0xFF, 0x00],
+            0x2D => [0xFF, 0x99, 0xCC, 0x00],
+            0x2E => [0xCC, 0x99, 0xFF, 0x00],
+            0x2F => [0xFF, 0xCC, 0x99, 0x00],
+            0x30 => [0x33, 0x66, 0xFF, 0x00],
+            0x31 => [0x33, 0xCC, 0xCC, 0x00],
+            0x32 => [0x99, 0xCC, 0x00, 0x00],
+            0x33 => [0xFF, 0xCC, 0x00, 0x00],
+            0x34 => [0xFF, 0x99, 0x00, 0x00],
+            0x35 => [0xFF, 0x66, 0x00, 0x00],
             0x36 => [0x66, 0x66, 0x99, 0x00],
             0x37 => [0x96, 0x96, 0x96, 0x00],
             0x38 => [0x00, 0x33, 0x66, 0x00],
@@ -408,13 +378,13 @@ private function setPaletteXl97(): void
      * Assemble worksheets into a workbook and send the BIFF data to an OLE
      * storage.
      *
-     * @param array $pWorksheetSizes The sizes in bytes of the binary worksheet streams
+     * @param array $worksheetSizes The sizes in bytes of the binary worksheet streams
      *
      * @return string Binary data for workbook stream
      */
-    public function writeWorkbook(array $pWorksheetSizes)
+    public function writeWorkbook(array $worksheetSizes): string
     {
-        $this->worksheetSizes = $pWorksheetSizes;
+        $this->worksheetSizes = $worksheetSizes;
 
         // Calculate the number of selected worksheet tabs and call the finalization
         // methods for each worksheet
@@ -482,7 +452,7 @@ private function calcSheetOffsets(): void
             $this->worksheetOffsets[$i] = $offset;
             $offset += $this->worksheetSizes[$i];
         }
-        $this->biffSize = $offset;
+        //$this->biffSize = $offset;
     }
 
     /**
@@ -523,9 +493,9 @@ private function writeAllStyles(): void
         $this->writeStyle();
     }
 
-    private function parseDefinedNameValue(DefinedName $pDefinedName): string
+    private function parseDefinedNameValue(DefinedName $definedName): string
     {
-        $definedRange = $pDefinedName->getValue();
+        $definedRange = $definedName->getValue();
         $splitCount = preg_match_all(
             '/' . Calculation::CALCULATION_REGEXP_CELLREF . '/mui',
             $definedRange,
@@ -552,7 +522,7 @@ private function parseDefinedNameValue(DefinedName $pDefinedName): string
             if (empty($worksheet)) {
                 if (($offset === 0) || ($definedRange[$offset - 1] !== ':')) {
                     // We should have a worksheet
-                    $worksheet = $pDefinedName->getWorksheet() ? $pDefinedName->getWorksheet()->getTitle() : null;
+                    $worksheet = $definedName->getWorksheet() ? $definedName->getWorksheet()->getTitle() : null;
                 }
             } else {
                 $worksheet = str_replace("''", "'", trim($worksheet, "'"));
@@ -578,7 +548,7 @@ private function parseDefinedNameValue(DefinedName $pDefinedName): string
      * Writes all the DEFINEDNAME records (BIFF8).
      * So far this is only used for repeating rows/columns (print titles) and print areas.
      */
-    private function writeAllDefinedNamesBiff8()
+    private function writeAllDefinedNamesBiff8(): string
     {
         $chunk = '';
 
@@ -591,7 +561,7 @@ private function writeAllDefinedNamesBiff8()
 
                 // parse formula
                 try {
-                    $error = $this->parser->parse($range);
+                    $this->parser->parse($range);
                     $formulaData = $this->parser->toReversePolish();
 
                     // make sure tRef3d is of type tRef3dR (0x3A)
@@ -601,13 +571,14 @@ private function writeAllDefinedNamesBiff8()
 
                     if ($definedName->getLocalOnly()) {
                         // local scope
-                        $scope = $this->spreadsheet->getIndex($definedName->getScope()) + 1;
+                        $scopeWs = $definedName->getScope();
+                        $scope = ($scopeWs === null) ? 0 : ($this->spreadsheet->getIndex($scopeWs) + 1);
                     } else {
                         // global scope
                         $scope = 0;
                     }
                     $chunk .= $this->writeData($this->writeDefinedNameBiff8($definedName->getName(), $formulaData, $scope, false));
-                } catch (PhpSpreadsheetException $e) {
+                } catch (PhpSpreadsheetException) {
                     // do nothing
                 }
             }
@@ -637,9 +608,8 @@ private function writeAllDefinedNamesBiff8()
 
                 // store the DEFINEDNAME record
                 $chunk .= $this->writeData($this->writeDefinedNameBiff8(pack('C', 0x07), $formulaData, $i + 1, true));
-
-            // (exclusive) either repeatColumns or repeatRows
             } elseif ($sheetSetup->isColumnsToRepeatAtLeftSet() || $sheetSetup->isRowsToRepeatAtTopSet()) {
+                // (exclusive) either repeatColumns or repeatRows.
                 // Columns to repeat
                 if ($sheetSetup->isColumnsToRepeatAtLeftSet()) {
                     $repeat = $sheetSetup->getColumnsToRepeatAtLeft();
@@ -726,7 +696,7 @@ private function writeAllDefinedNamesBiff8()
      *
      * @return string Complete binary record data
      */
-    private function writeDefinedNameBiff8($name, $formulaData, $sheetIndex = 0, $isBuiltIn = false)
+    private function writeDefinedNameBiff8(string $name, string $formulaData, int $sheetIndex = 0, bool $isBuiltIn = false): string
     {
         $record = 0x0018;
 
@@ -755,14 +725,12 @@ private function writeDefinedNameBiff8($name, $formulaData, $sheetIndex = 0, $is
     /**
      * Write a short NAME record.
      *
-     * @param string $name
      * @param int $sheetIndex 1-based sheet index the defined name applies to. 0 = global
      * @param int[][] $rangeBounds range boundaries
-     * @param bool $isHidden
      *
      * @return string Complete binary record data
      * */
-    private function writeShortNameBiff8($name, $sheetIndex, $rangeBounds, $isHidden = false)
+    private function writeShortNameBiff8(string $name, int $sheetIndex, array $rangeBounds, bool $isHidden = false): string
     {
         $record = 0x0018;
 
@@ -841,35 +809,21 @@ private function writeWindow1(): void
      *
      * @param int $offset Location of worksheet BOF
      */
-    private function writeBoundSheet(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $sheet, $offset): void
+    private function writeBoundSheet(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $sheet, int $offset): void
     {
         $sheetname = $sheet->getTitle();
         $record = 0x0085; // Record identifier
-
-        // sheet state
-        switch ($sheet->getSheetState()) {
-            case \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet::SHEETSTATE_VISIBLE:
-                $ss = 0x00;
-
-                break;
-            case \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet::SHEETSTATE_HIDDEN:
-                $ss = 0x01;
-
-                break;
-            case \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet::SHEETSTATE_VERYHIDDEN:
-                $ss = 0x02;
-
-                break;
-            default:
-                $ss = 0x00;
-
-                break;
-        }
+        $ss = match ($sheet->getSheetState()) {
+            \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet::SHEETSTATE_VISIBLE => 0x00,
+            \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet::SHEETSTATE_HIDDEN => 0x01,
+            \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet::SHEETSTATE_VERYHIDDEN => 0x02,
+            default => 0x00,
+        };
 
         // sheet type
         $st = 0x00;
 
-        $grbit = 0x0000; // Visibility and sheet type
+        //$grbit = 0x0000; // Visibility and sheet type
 
         $data = pack('VCC', $offset, $ss, $st);
         $data .= StringHelper::UTF8toBIFF8UnicodeShort($sheetname);
@@ -882,7 +836,7 @@ private function writeBoundSheet(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $
     /**
      * Write Internal SUPBOOK record.
      */
-    private function writeSupbookInternal()
+    private function writeSupbookInternal(): string
     {
         $record = 0x01AE; // Record identifier
         $length = 0x0004; // Bytes to follow
@@ -897,13 +851,13 @@ private function writeSupbookInternal()
      * Writes the Excel BIFF EXTERNSHEET record. These references are used by
      * formulas.
      */
-    private function writeExternalsheetBiff8()
+    private function writeExternalsheetBiff8(): string
     {
         $totalReferences = count($this->parser->references);
         $record = 0x0017; // Record identifier
         $length = 2 + 6 * $totalReferences; // Number of bytes to follow
 
-        $supbook_index = 0; // FIXME: only using internal SUPBOOK record
+        //$supbook_index = 0; // FIXME: only using internal SUPBOOK record
         $header = pack('vv', $record, $length);
         $data = pack('v', $totalReferences);
         for ($i = 0; $i < $totalReferences; ++$i) {
@@ -923,7 +877,7 @@ private function writeStyle(): void
 
         $ixfe = 0x8000; // Index to cell style XF
         $BuiltIn = 0x00; // Built-in style
-        $iLevel = 0xff; // Outline style level
+        $iLevel = 0xFF; // Outline style level
 
         $header = pack('vv', $record, $length);
         $data = pack('vCC', $ixfe, $BuiltIn, $iLevel);
@@ -936,7 +890,7 @@ private function writeStyle(): void
      * @param string $format Custom format string
      * @param int $ifmt Format index code
      */
-    private function writeNumberFormat($format, $ifmt): void
+    private function writeNumberFormat(string $format, int $ifmt): void
     {
         $record = 0x041E; // Record identifier
 
@@ -956,9 +910,9 @@ private function writeDateMode(): void
         $record = 0x0022; // Record identifier
         $length = 0x0002; // Bytes to follow
 
-        $f1904 = (Date::getExcelCalendar() === Date::CALENDAR_MAC_1904)
-            ? 1
-            : 0; // Flag for 1904 date system
+        $f1904 = ($this->spreadsheet->getExcelCalendar() === Date::CALENDAR_MAC_1904)
+            ? 1  // Flag for 1904 date system
+            : 0; // Flag for 1900 date system
 
         $header = pack('vv', $record, $length);
         $data = pack('v', $f1904);
@@ -967,10 +921,8 @@ private function writeDateMode(): void
 
     /**
      * Stores the COUNTRY record for localization.
-     *
-     * @return string
      */
-    private function writeCountry()
+    private function writeCountry(): string
     {
         $record = 0x008C; // Record identifier
         $length = 4; // Number of bytes to follow
@@ -984,10 +936,8 @@ private function writeCountry()
 
     /**
      * Write the RECALCID record.
-     *
-     * @return string
      */
-    private function writeRecalcId()
+    private function writeRecalcId(): string
     {
         $record = 0x01C1; // Record identifier
         $length = 8; // Number of bytes to follow
@@ -1037,7 +987,7 @@ private function writePalette(): void
      *
      * @return string Binary data
      */
-    private function writeSharedStringsTable()
+    private function writeSharedStringsTable(): string
     {
         // maximum size of record data (excluding record header)
         $continue_limit = 8224;
@@ -1056,7 +1006,7 @@ private function writeSharedStringsTable()
             $headerinfo = unpack('vlength/Cencoding', $string);
 
             // currently, this is always 1 = uncompressed
-            $encoding = $headerinfo['encoding'];
+            $encoding = $headerinfo['encoding'] ?? 1;
 
             // initialize finished writing current $string
             $finished = false;
@@ -1096,16 +1046,15 @@ private function writeSharedStringsTable()
                     // 2. space remaining is greater than or equal to minimum space needed
                     //        here we write as much as we can in the current block, then move to next record data block
 
-                    // 1. space remaining is less than minimum space needed
                     if ($space_remaining < $min_space_needed) {
+                        // 1. space remaining is less than minimum space needed.
                         // we close the block, store the block data
                         $recordDatas[] = $recordData;
 
                         // and start new record data block where we start writing the string
                         $recordData = '';
-
-                    // 2. space remaining is greater than or equal to minimum space needed
                     } else {
+                        // 2. space remaining is greater than or equal to minimum space needed.
                         // initialize effective remaining space, for Unicode strings this may need to be reduced by 1, see below
                         $effective_space_remaining = $space_remaining;
 
@@ -1129,7 +1078,7 @@ private function writeSharedStringsTable()
 
         // Store the last record data block unless it is empty
         // if there was no need for any continue records, this will be the for SST record data block itself
-        if (strlen($recordData) > 0) {
+        if ($recordData !== '') {
             $recordDatas[] = $recordData;
         }
 
@@ -1151,7 +1100,7 @@ private function writeSharedStringsTable()
     /**
      * Writes the MSODRAWINGGROUP record if needed. Possibly split using CONTINUE records.
      */
-    private function writeMsoDrawingGroup()
+    private function writeMsoDrawingGroup(): string
     {
         // write the Escher stream if necessary
         if (isset($this->escher)) {
@@ -1170,21 +1119,17 @@ private function writeMsoDrawingGroup()
 
     /**
      * Get Escher object.
-     *
-     * @return \PhpOffice\PhpSpreadsheet\Shared\Escher
      */
-    public function getEscher()
+    public function getEscher(): ?\PhpOffice\PhpSpreadsheet\Shared\Escher
     {
         return $this->escher;
     }
 
     /**
      * Set Escher object.
-     *
-     * @param \PhpOffice\PhpSpreadsheet\Shared\Escher $pValue
      */
-    public function setEscher(?\PhpOffice\PhpSpreadsheet\Shared\Escher $pValue = null): void
+    public function setEscher(?\PhpOffice\PhpSpreadsheet\Shared\Escher $escher): void
     {
-        $this->escher = $pValue;
+        $this->escher = $escher;
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Worksheet.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Worksheet.php
index 894ce03acd..1254ca2be3 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Worksheet.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Worksheet.php
@@ -3,6 +3,7 @@
 namespace PhpOffice\PhpSpreadsheet\Writer\Xls;
 
 use GdImage;
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Cell\DataType;
 use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
@@ -11,7 +12,7 @@
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PhpOffice\PhpSpreadsheet\Shared\Xls;
 use PhpOffice\PhpSpreadsheet\Style\Border;
-use PhpOffice\PhpSpreadsheet\Style\Color;
+use PhpOffice\PhpSpreadsheet\Style\Borders;
 use PhpOffice\PhpSpreadsheet\Style\Conditional;
 use PhpOffice\PhpSpreadsheet\Style\Protection;
 use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
@@ -54,160 +55,107 @@
 // */
 class Worksheet extends BIFFwriter
 {
-    /**
-     * Formula parser.
-     *
-     * @var \PhpOffice\PhpSpreadsheet\Writer\Xls\Parser
-     */
-    private $parser;
+    private static int $always0 = 0;
 
-    /**
-     * Maximum number of characters for a string (LABEL record in BIFF5).
-     *
-     * @var int
-     */
-    private $xlsStringMaxLength;
+    private static int $always1 = 1;
 
     /**
-     * Array containing format information for columns.
-     *
-     * @var array
+     * Formula parser.
      */
-    private $columnInfo;
+    private Parser $parser;
 
     /**
-     * Array containing the selected area for the worksheet.
-     *
-     * @var array
+     * Array containing format information for columns.
      */
-    private $selection;
+    private array $columnInfo;
 
     /**
      * The active pane for the worksheet.
-     *
-     * @var int
      */
-    private $activePane;
+    private int $activePane;
 
     /**
      * Whether to use outline.
-     *
-     * @var bool
      */
-    private $outlineOn;
+    private bool $outlineOn;
 
     /**
      * Auto outline styles.
-     *
-     * @var bool
      */
-    private $outlineStyle;
+    private bool $outlineStyle;
 
     /**
      * Whether to have outline summary below.
-     *
-     * @var bool
+     * Not currently used.
      */
-    private $outlineBelow;
+    private bool $outlineBelow; //* @phpstan-ignore-line
 
     /**
      * Whether to have outline summary at the right.
-     *
-     * @var bool
+     * Not currently used.
      */
-    private $outlineRight;
+    private bool $outlineRight; //* @phpstan-ignore-line
 
     /**
      * Reference to the total number of strings in the workbook.
-     *
-     * @var int
      */
-    private $stringTotal;
+    private int $stringTotal;
 
     /**
      * Reference to the number of unique strings in the workbook.
-     *
-     * @var int
      */
-    private $stringUnique;
+    private int $stringUnique;
 
     /**
      * Reference to the array containing all the unique strings in the workbook.
-     *
-     * @var array
      */
-    private $stringTable;
+    private array $stringTable;
 
     /**
      * Color cache.
      */
-    private $colors;
+    private array $colors;
 
     /**
      * Index of first used row (at least 0).
-     *
-     * @var int
      */
-    private $firstRowIndex;
+    private int $firstRowIndex;
 
     /**
      * Index of last used row. (no used rows means -1).
-     *
-     * @var int
      */
-    private $lastRowIndex;
+    private int $lastRowIndex;
 
     /**
      * Index of first used column (at least 0).
-     *
-     * @var int
      */
-    private $firstColumnIndex;
+    private int $firstColumnIndex;
 
     /**
      * Index of last used column (no used columns means -1).
-     *
-     * @var int
      */
-    private $lastColumnIndex;
+    private int $lastColumnIndex;
 
     /**
      * Sheet object.
-     *
-     * @var \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet
      */
-    public $phpSheet;
-
-    /**
-     * Count cell style Xfs.
-     *
-     * @var int
-     */
-    private $countCellStyleXfs;
+    public \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $phpSheet;
 
     /**
      * Escher object corresponding to MSODRAWING.
-     *
-     * @var \PhpOffice\PhpSpreadsheet\Shared\Escher
      */
-    private $escher;
+    private ?\PhpOffice\PhpSpreadsheet\Shared\Escher $escher = null;
 
     /**
      * Array of font hashes associated to FONT records index.
-     *
-     * @var array
      */
-    public $fontHashIndex;
+    public array $fontHashIndex;
 
-    /**
-     * @var bool
-     */
-    private $preCalculateFormulas;
+    private bool $preCalculateFormulas;
 
-    /**
-     * @var int
-     */
-    private $printHeaders;
+    private int $printHeaders;
+
+    private ?Workbook $writerWorkbook;
 
     /**
      * Constructor.
@@ -220,7 +168,7 @@ class Worksheet extends BIFFwriter
      * @param bool $preCalculateFormulas Flag indicating whether formulas should be calculated or just written
      * @param \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $phpSheet The worksheet to write
      */
-    public function __construct(&$str_total, &$str_unique, &$str_table, &$colors, Parser $parser, $preCalculateFormulas, \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $phpSheet)
+    public function __construct(int &$str_total, int &$str_unique, array &$str_table, array &$colors, Parser $parser, bool $preCalculateFormulas, \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $phpSheet, ?Workbook $writerWorkbook = null)
     {
         // It needs to call its parent's constructor explicitly
         parent::__construct();
@@ -234,9 +182,7 @@ public function __construct(&$str_total, &$str_unique, &$str_table, &$colors, Pa
 
         $this->phpSheet = $phpSheet;
 
-        $this->xlsStringMaxLength = 255;
         $this->columnInfo = [];
-        $this->selection = [0, 0, 0, 0];
         $this->activePane = 3;
 
         $this->printHeaders = 0;
@@ -265,15 +211,14 @@ public function __construct(&$str_total, &$str_unique, &$str_table, &$colors, Pa
         if ($this->lastColumnIndex > 255) {
             $this->lastColumnIndex = 255;
         }
-
-        $this->countCellStyleXfs = count($phpSheet->getParent()->getCellStyleXfCollection());
+        $this->writerWorkbook = $writerWorkbook;
     }
 
     /**
      * Add data to the beginning of the workbook (note the reverse order)
      * and to the end of the workbook.
      *
-     * @see \PhpOffice\PhpSpreadsheet\Writer\Xls\Workbook::storeWorkbook()
+     * @see Workbook::storeWorkbook
      */
     public function close(): void
     {
@@ -281,7 +226,7 @@ public function close(): void
 
         // Storing selected cells and active sheet because it changes while parsing cells with formulas.
         $selectedCells = $this->phpSheet->getSelectedCells();
-        $activeSheetIndex = $this->phpSheet->getParent()->getActiveSheetIndex();
+        $activeSheetIndex = $this->phpSheet->getParentOrThrow()->getActiveSheetIndex();
 
         // Write BOF record
         $this->storeBof(0x0010);
@@ -300,7 +245,7 @@ public function close(): void
 
         // Column dimensions
         if (($defaultWidth = $phpSheet->getDefaultColumnDimension()->getWidth()) < 0) {
-            $defaultWidth = \PhpOffice\PhpSpreadsheet\Shared\Font::getDefaultColumnWidthByFont($phpSheet->getParent()->getDefaultStyle()->getFont());
+            $defaultWidth = \PhpOffice\PhpSpreadsheet\Shared\Font::getDefaultColumnWidthByFont($phpSheet->getParentOrThrow()->getDefaultStyle()->getFont());
         }
 
         $columnDimensions = $phpSheet->getColumnDimensions();
@@ -400,8 +345,9 @@ public function close(): void
         }
 
         // Write Cells
-        foreach ($phpSheet->getCoordinates() as $coordinate) {
-            $cell = $phpSheet->getCell($coordinate);
+        foreach ($phpSheet->getCellCollection()->getSortedCoordinates() as $coordinate) {
+            /** @var Cell $cell */
+            $cell = $phpSheet->getCellCollection()->get($coordinate);
             $row = $cell->getRow() - 1;
             $column = Coordinate::columnIndexFromString($cell->getColumn()) - 1;
 
@@ -420,10 +366,12 @@ public function close(): void
                 $elements = $cVal->getRichTextElements();
                 foreach ($elements as $element) {
                     // FONT Index
+                    $str_fontidx = 0;
                     if ($element instanceof Run) {
-                        $str_fontidx = $this->fontHashIndex[$element->getFont()->getHashCode()];
-                    } else {
-                        $str_fontidx = 0;
+                        $getFont = $element->getFont();
+                        if ($getFont !== null) {
+                            $str_fontidx = $this->fontHashIndex[$getFont->getHashCode()];
+                        }
                     }
                     $arrcRun[] = ['strlen' => $str_pos, 'fontidx' => $str_fontidx];
                     // Position FROM
@@ -433,52 +381,42 @@ public function close(): void
             } else {
                 switch ($cell->getDatatype()) {
                     case DataType::TYPE_STRING:
+                    case DataType::TYPE_INLINE:
                     case DataType::TYPE_NULL:
                         if ($cVal === '' || $cVal === null) {
                             $this->writeBlank($row, $column, $xfIndex);
                         } else {
-                            $this->writeString($row, $column, $cVal, $xfIndex);
+                            $this->writeString($row, $column, $cell->getValueString(), $xfIndex);
                         }
 
                         break;
                     case DataType::TYPE_NUMERIC:
-                        $this->writeNumber($row, $column, $cVal, $xfIndex);
+                        $this->writeNumber($row, $column, is_numeric($cVal) ? ($cVal + 0) : 0, $xfIndex);
 
                         break;
                     case DataType::TYPE_FORMULA:
-                        $calculatedValue = $this->preCalculateFormulas ?
-                            $cell->getCalculatedValue() : null;
-                        if (self::WRITE_FORMULA_EXCEPTION == $this->writeFormula($row, $column, $cVal, $xfIndex, $calculatedValue)) {
+                        $calculatedValue = $this->preCalculateFormulas ? $cell->getCalculatedValue() : null;
+                        $calculatedValueString = $this->preCalculateFormulas ? $cell->getCalculatedValueString() : '';
+                        if (self::WRITE_FORMULA_EXCEPTION == $this->writeFormula($row, $column, $cell->getValueString(), $xfIndex, $calculatedValue)) {
                             if ($calculatedValue === null) {
                                 $calculatedValue = $cell->getCalculatedValue();
                             }
                             $calctype = gettype($calculatedValue);
-                            switch ($calctype) {
-                                case 'integer':
-                                case 'double':
-                                    $this->writeNumber($row, $column, $calculatedValue, $xfIndex);
-
-                                    break;
-                                case 'string':
-                                    $this->writeString($row, $column, $calculatedValue, $xfIndex);
-
-                                    break;
-                                case 'boolean':
-                                    $this->writeBoolErr($row, $column, $calculatedValue, 0, $xfIndex);
-
-                                    break;
-                                default:
-                                    $this->writeString($row, $column, $cVal, $xfIndex);
-                            }
+                            match ($calctype) {
+                                'integer', 'double' => $this->writeNumber($row, $column, is_numeric($calculatedValue) ? ((float) $calculatedValue) : 0.0, $xfIndex),
+                                'string' => $this->writeString($row, $column, $calculatedValueString, $xfIndex),
+                                'boolean' => $this->writeBoolErr($row, $column, (int) $calculatedValueString, 0, $xfIndex),
+                                default => $this->writeString($row, $column, $cell->getValueString(), $xfIndex),
+                            };
                         }
 
                         break;
                     case DataType::TYPE_BOOL:
-                        $this->writeBoolErr($row, $column, $cVal, 0, $xfIndex);
+                        $this->writeBoolErr($row, $column, (int) $cell->getValueString(), 0, $xfIndex);
 
                         break;
                     case DataType::TYPE_ERROR:
-                        $this->writeBoolErr($row, $column, ErrorCode::error($cVal), 1, $xfIndex);
+                        $this->writeBoolErr($row, $column, ErrorCode::error($cell->getValueString()), 1, $xfIndex);
 
                         break;
                 }
@@ -489,7 +427,7 @@ public function close(): void
         $this->writeMsoDrawing();
 
         // Restoring active sheet.
-        $this->phpSheet->getParent()->setActiveSheetIndex($activeSheetIndex);
+        $this->phpSheet->getParentOrThrow()->setActiveSheetIndex($activeSheetIndex);
 
         // Write WINDOW2 record
         $this->writeWindow2();
@@ -513,16 +451,23 @@ public function close(): void
         $this->writeMergedCells();
 
         // Hyperlinks
+        $phpParent = $phpSheet->getParent();
+        $hyperlinkbase = ($phpParent === null) ? '' : $phpParent->getProperties()->getHyperlinkBase();
         foreach ($phpSheet->getHyperLinkCollection() as $coordinate => $hyperlink) {
             [$column, $row] = Coordinate::indexesFromString($coordinate);
 
             $url = $hyperlink->getUrl();
 
-            if (strpos($url, 'sheet://') !== false) {
+            if (str_contains($url, 'sheet://')) {
                 // internal to current workbook
                 $url = str_replace('sheet://', 'internal:', $url);
             } elseif (preg_match('/^(http:|https:|ftp:|mailto:)/', $url)) {
                 // URL
+            } elseif (!empty($hyperlinkbase) && preg_match('~^([A-Za-z]:)?[/\\\\]~', $url) !== 1) {
+                $url = "$hyperlinkbase$url";
+                if (preg_match('/^(http:|https:|ftp:|mailto:)/', $url) !== 1) {
+                    $url = 'external:' . $url;
+                }
             } else {
                 // external (local file)
                 $url = 'external:' . $url;
@@ -538,37 +483,45 @@ public function close(): void
         $this->writeSheetProtection();
         $this->writeRangeProtection();
 
-        $arrConditionalStyles = $phpSheet->getConditionalStylesCollection();
-        if (!empty($arrConditionalStyles)) {
-            $arrConditional = [];
+        // Write Conditional Formatting Rules and Styles
+        $this->writeConditionalFormatting();
 
-            $cfHeaderWritten = false;
+        $this->storeEof();
+    }
+
+    private function writeConditionalFormatting(): void
+    {
+        $conditionalFormulaHelper = new ConditionalHelper($this->parser);
+
+        $arrConditionalStyles = [];
+        foreach ($this->phpSheet->getConditionalStylesCollection() as $key => $value) {
+            $keyExplode = explode(',', Coordinate::resolveUnionAndIntersection($key));
+            foreach ($keyExplode as $exploded) {
+                $arrConditionalStyles[$exploded] = $value;
+            }
+        }
+        if (!empty($arrConditionalStyles)) {
             // Write ConditionalFormattingTable records
             foreach ($arrConditionalStyles as $cellCoordinate => $conditionalStyles) {
+                $cfHeaderWritten = false;
                 foreach ($conditionalStyles as $conditional) {
                     /** @var Conditional $conditional */
                     if (
-                        $conditional->getConditionType() == Conditional::CONDITION_EXPRESSION ||
-                        $conditional->getConditionType() == Conditional::CONDITION_CELLIS
+                        $conditional->getConditionType() === Conditional::CONDITION_EXPRESSION
+                        || $conditional->getConditionType() === Conditional::CONDITION_CELLIS
                     ) {
                         // Write CFHEADER record (only if there are Conditional Styles that we are able to write)
                         if ($cfHeaderWritten === false) {
-                            $this->writeCFHeader();
-                            $cfHeaderWritten = true;
+                            $cfHeaderWritten = $this->writeCFHeader($cellCoordinate, $conditionalStyles);
                         }
-                        if (!isset($arrConditional[$conditional->getHashCode()])) {
-                            // This hash code has been handled
-                            $arrConditional[$conditional->getHashCode()] = true;
-
+                        if ($cfHeaderWritten === true) {
                             // Write CFRULE record
-                            $this->writeCFRule($conditional);
+                            $this->writeCFRule($conditionalFormulaHelper, $conditional, $cellCoordinate);
                         }
                     }
                 }
             }
         }
-
-        $this->storeEof();
     }
 
     /**
@@ -580,7 +533,7 @@ public function close(): void
      *
      * @return string Binary data
      */
-    private function writeBIFF8CellRangeAddressFixed($range)
+    private function writeBIFF8CellRangeAddressFixed(string $range): string
     {
         $explodes = explode(':', $range);
 
@@ -606,7 +559,7 @@ private function writeBIFF8CellRangeAddressFixed($range)
      *
      * @return string The data
      */
-    public function getData()
+    public function getData(): string
     {
         // Return data stored in memory
         if (isset($this->_data)) {
@@ -625,7 +578,7 @@ public function getData()
      *
      * @param int $print Whether to print the headers or not. Defaults to 1 (print).
      */
-    public function printRowColHeaders($print = 1): void
+    public function printRowColHeaders(int $print = 1): void
     {
         $this->printHeaders = $print;
     }
@@ -633,13 +586,8 @@ public function printRowColHeaders($print = 1): void
     /**
      * This method sets the properties for outlining and grouping. The defaults
      * correspond to Excel's defaults.
-     *
-     * @param bool $visible
-     * @param bool $symbols_below
-     * @param bool $symbols_right
-     * @param bool $auto_style
      */
-    public function setOutline($visible = true, $symbols_below = true, $symbols_right = true, $auto_style = false): void
+    public function setOutline(bool $visible = true, bool $symbols_below = true, bool $symbols_right = true, bool $auto_style = false): void
     {
         $this->outlineOn = $visible;
         $this->outlineBelow = $symbols_below;
@@ -658,11 +606,9 @@ public function setOutline($visible = true, $symbols_below = true, $symbols_righ
      * @param int $row Zero indexed row
      * @param int $col Zero indexed column
      * @param float $num The number to write
-     * @param mixed $xfIndex The optional XF format
-     *
-     * @return int
+     * @param int $xfIndex The optional XF format
      */
-    private function writeNumber($row, $col, $num, $xfIndex)
+    private function writeNumber(int $row, int $col, float $num, int $xfIndex): int
     {
         $record = 0x0203; // Record identifier
         $length = 0x000E; // Number of bytes to follow
@@ -687,7 +633,7 @@ private function writeNumber($row, $col, $num, $xfIndex)
      * @param string $str The string
      * @param int $xfIndex Index to XF record
      */
-    private function writeString($row, $col, $str, $xfIndex): void
+    private function writeString(int $row, int $col, string $str, int $xfIndex): void
     {
         $this->writeLabelSst($row, $col, $str, $xfIndex);
     }
@@ -702,7 +648,7 @@ private function writeString($row, $col, $str, $xfIndex): void
      * @param int $xfIndex The XF format index for the cell
      * @param array $arrcRun Index to Font record and characters beginning
      */
-    private function writeRichTextString($row, $col, $str, $xfIndex, $arrcRun): void
+    private function writeRichTextString(int $row, int $col, string $str, int $xfIndex, array $arrcRun): void
     {
         $record = 0x00FD; // Record identifier
         $length = 0x000A; // Bytes to follow
@@ -727,9 +673,9 @@ private function writeRichTextString($row, $col, $str, $xfIndex, $arrcRun): void
      * @param int $row Zero indexed row
      * @param int $col Zero indexed column
      * @param string $str The string to write
-     * @param mixed $xfIndex The XF format index for the cell
+     * @param int $xfIndex The XF format index for the cell
      */
-    private function writeLabelSst($row, $col, $str, $xfIndex): void
+    private function writeLabelSst(int $row, int $col, string $str, int $xfIndex): void
     {
         $record = 0x00FD; // Record identifier
         $length = 0x000A; // Bytes to follow
@@ -761,11 +707,9 @@ private function writeLabelSst($row, $col, $str, $xfIndex): void
      *
      * @param int $row Zero indexed row
      * @param int $col Zero indexed column
-     * @param mixed $xfIndex The XF format index
-     *
-     * @return int
+     * @param int $xfIndex The XF format index
      */
-    public function writeBlank($row, $col, $xfIndex)
+    public function writeBlank(int $row, int $col, int $xfIndex): int
     {
         $record = 0x0201; // Record identifier
         $length = 0x0006; // Number of bytes to follow
@@ -782,13 +726,9 @@ public function writeBlank($row, $col, $xfIndex)
      *
      * @param int $row Row index (0-based)
      * @param int $col Column index (0-based)
-     * @param int $value
-     * @param bool $isError Error or Boolean?
-     * @param int $xfIndex
-     *
-     * @return int
+     * @param int $isError Error or Boolean?
      */
-    private function writeBoolErr($row, $col, $value, $isError, $xfIndex)
+    private function writeBoolErr(int $row, int $col, int $value, int $isError, int $xfIndex): int
     {
         $record = 0x0205;
         $length = 8;
@@ -805,6 +745,18 @@ private function writeBoolErr($row, $col, $value, $isError, $xfIndex)
     const WRITE_FORMULA_RANGE = -2;
     const WRITE_FORMULA_EXCEPTION = -3;
 
+    private static bool $allowThrow = false;
+
+    public static function setAllowThrow(bool $allowThrow): void
+    {
+        self::$allowThrow = $allowThrow;
+    }
+
+    public static function getAllowThrow(): bool
+    {
+        return self::$allowThrow;
+    }
+
     /**
      * Write a formula to the specified row and column (zero indexed).
      * The textual representation of the formula is passed to the parser in
@@ -818,12 +770,10 @@ private function writeBoolErr($row, $col, $value, $isError, $xfIndex)
      * @param int $row Zero indexed row
      * @param int $col Zero indexed column
      * @param string $formula The formula text string
-     * @param mixed $xfIndex The XF format index
+     * @param int $xfIndex The XF format index
      * @param mixed $calculatedValue Calculated value
-     *
-     * @return int
      */
-    private function writeFormula($row, $col, $formula, $xfIndex, $calculatedValue)
+    private function writeFormula(int $row, int $col, string $formula, int $xfIndex, mixed $calculatedValue): int
     {
         $record = 0x0006; // Record identifier
         // Initialize possible additional value for STRING record that should be written after the FORMULA record?
@@ -895,16 +845,18 @@ private function writeFormula($row, $col, $formula, $xfIndex, $calculatedValue)
 
             return self::WRITE_FORMULA_NORMAL;
         } catch (PhpSpreadsheetException $e) {
+            if (self::$allowThrow) {
+                throw $e;
+            }
+
             return self::WRITE_FORMULA_EXCEPTION;
         }
     }
 
     /**
      * Write a STRING record. This.
-     *
-     * @param string $stringValue
      */
-    private function writeStringRecord($stringValue): void
+    private function writeStringRecord(string $stringValue): void
     {
         $record = 0x0207; // Record identifier
         $data = StringHelper::UTF8toBIFF8UnicodeLong($stringValue);
@@ -930,7 +882,7 @@ private function writeStringRecord($stringValue): void
      * @param int $col Column
      * @param string $url URL string
      */
-    private function writeUrl($row, $col, $url): void
+    private function writeUrl(int $row, int $col, string $url): void
     {
         // Add start row and col to arg list
         $this->writeUrlRange($row, $col, $row, $col, $url);
@@ -950,7 +902,7 @@ private function writeUrl($row, $col, $url): void
      *
      * @see writeUrl()
      */
-    private function writeUrlRange($row1, $col1, $row2, $col2, $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)) {
@@ -976,7 +928,7 @@ private function writeUrlRange($row1, $col1, $row2, $col2, $url): void
      *
      * @see writeUrl()
      */
-    public function writeUrlWeb($row1, $col1, $row2, $col2, $url): void
+    public function writeUrlWeb(int $row1, int $col1, int $row2, int $col2, string $url): void
     {
         $record = 0x01B8; // Record identifier
 
@@ -988,6 +940,8 @@ public function writeUrlWeb($row1, $col1, $row2, $col2, $url): void
         $options = pack('V', 0x03);
 
         // Convert URL to a null terminated wchar string
+
+        /** @phpstan-ignore-next-line */
         $url = implode("\0", preg_split("''", $url, -1, PREG_SPLIT_NO_EMPTY));
         $url = $url . "\0\0\0";
 
@@ -1016,12 +970,12 @@ public function writeUrlWeb($row1, $col1, $row2, $col2, $url): void
      *
      * @see writeUrl()
      */
-    private function writeUrlInternal($row1, $col1, $row2, $col2, $url): void
+    private function writeUrlInternal(int $row1, int $col1, int $row2, int $col2, string $url): void
     {
         $record = 0x01B8; // Record identifier
 
         // Strip URL type
-        $url = preg_replace('/^internal:/', '', $url);
+        $url = (string) preg_replace('/^internal:/', '', $url);
 
         // Pack the undocumented parts of the hyperlink stream
         $unknown1 = pack('H*', 'D0C9EA79F9BACE118C8200AA004BA90B02000000');
@@ -1064,7 +1018,7 @@ private function writeUrlInternal($row1, $col1, $row2, $col2, $url): void
      *
      * @see writeUrl()
      */
-    private function writeUrlExternal($row1, $col1, $row2, $col2, $url): void
+    private function writeUrlExternal(int $row1, int $col1, int $row2, int $col2, string $url): void
     {
         // Network drives are different. We will handle them separately
         // MS/Novell network drives and shares start with \\
@@ -1073,12 +1027,10 @@ private function writeUrlExternal($row1, $col1, $row2, $col2, $url): void
         }
 
         $record = 0x01B8; // Record identifier
-        $length = 0x00000; // Bytes to follow
 
         // Strip URL type and change Unix dir separator to Dos style (if needed)
         //
-        $url = preg_replace('/^external:/', '', $url);
-        $url = preg_replace('/\//', '\\', $url);
+        $url = (string) preg_replace(['/^external:/', '/\//'], ['', '\\'], $url);
 
         // Determine if the link is relative or absolute:
         //   relative if link contains no dir separator, "somefile.xls"
@@ -1107,32 +1059,32 @@ private function writeUrlExternal($row1, $col1, $row2, $col2, $url): void
         $up_count = pack('v', $up_count);
 
         // Store the short dos dir name (null terminated)
-        $dir_short = preg_replace('/\\.\\.\\\\/', '', $dir_long) . "\0";
+        $dir_short = (string) preg_replace('/\\.\\.\\\\/', '', $dir_long) . "\0";
 
         // Store the long dir name as a wchar string (non-null terminated)
-        $dir_long = $dir_long . "\0";
+        //$dir_long = $dir_long . "\0";
 
         // Pack the lengths of the dir strings
         $dir_short_len = pack('V', strlen($dir_short));
-        $dir_long_len = pack('V', strlen($dir_long));
+        //$dir_long_len = pack('V', strlen($dir_long));
         $stream_len = pack('V', 0); //strlen($dir_long) + 0x06);
 
         // Pack the undocumented parts of the hyperlink stream
         $unknown1 = pack('H*', 'D0C9EA79F9BACE118C8200AA004BA90B02000000');
         $unknown2 = pack('H*', '0303000000000000C000000000000046');
         $unknown3 = pack('H*', 'FFFFADDE000000000000000000000000000000000000000');
-        $unknown4 = pack('v', 0x03);
+        //$unknown4 = pack('v', 0x03);
 
         // Pack the main data stream
-        $data = pack('vvvv', $row1, $row2, $col1, $col2) .
-            $unknown1 .
-            $link_type .
-            $unknown2 .
-            $up_count .
-            $dir_short_len .
-            $dir_short .
-            $unknown3 .
-            $stream_len; /*.
+        $data = pack('vvvv', $row1, $row2, $col1, $col2)
+            . $unknown1
+            . $link_type
+            . $unknown2
+            . $up_count
+            . $dir_short_len
+            . $dir_short
+            . $unknown3
+            . $stream_len; /*.
                           $dir_long_len .
                           $unknown4     .
                           $dir_long     .
@@ -1157,7 +1109,7 @@ private function writeUrlExternal($row1, $col1, $row2, $col2, $url): void
      * @param bool $hidden The optional hidden attribute
      * @param int $level The optional outline level for row, in range [0,7]
      */
-    private function writeRow($row, $height, $xfIndex, $hidden = false, $level = 0): void
+    private function writeRow(int $row, int $height, int $xfIndex, bool $hidden = false, int $level = 0): void
     {
         $record = 0x0208; // Record identifier
         $length = 0x0010; // Number of bytes to follow
@@ -1177,7 +1129,7 @@ private function writeRow($row, $height, $xfIndex, $hidden = false, $level = 0):
         if ($height !== null) {
             $miyRw = $height * 20; // row height
         } else {
-            $miyRw = 0xff; // default row height is 256
+            $miyRw = 0xFF; // default row height is 256
         }
 
         // Set the options flags. fUnsynced is used to show that the font and row
@@ -1225,7 +1177,6 @@ private function writeWindow2(): void
         $record = 0x023E; // Record identifier
         $length = 0x0012;
 
-        $grbit = 0x00B6; // Option flags
         $rwTop = 0x0000; // Top row visible in window
         $colLeft = 0x0000; // Leftmost column visible in window
 
@@ -1240,7 +1191,7 @@ private function writeWindow2(): void
         $fDspGuts = $this->outlineOn; // 7
         $fFrozenNoSplit = 0; // 0 - bit
         // no support in PhpSpreadsheet for selected sheet, therefore sheet is only selected if it is the active sheet
-        $fSelected = ($this->phpSheet === $this->phpSheet->getParent()->getActiveSheet()) ? 1 : 0;
+        $fSelected = ($this->phpSheet === $this->phpSheet->getParentOrThrow()->getActiveSheet()) ? 1 : 0;
         $fPageBreakPreview = $this->phpSheet->getSheetView()->getView() === SheetView::SHEETVIEW_PAGE_BREAK_PREVIEW;
 
         $grbit = $fDspFmla;
@@ -1320,7 +1271,7 @@ private function writeDefcol(): void
      *                4 => Option flags.
      *                5 => Optional outline level
      */
-    private function writeColinfo($col_array): void
+    private function writeColinfo(array $col_array): void
     {
         $colFirst = $col_array[0] ?? null;
         $colLast = $col_array[1] ?? null;
@@ -1479,6 +1430,24 @@ private function writeSheetLayout(): void
         $this->append($header . $recordData);
     }
 
+    private static function protectionBitsDefaultFalse(?bool $value, int $shift): int
+    {
+        if ($value === false) {
+            return 1 << $shift;
+        }
+
+        return 0;
+    }
+
+    private static function protectionBitsDefaultTrue(?bool $value, int $shift): int
+    {
+        if ($value !== false) {
+            return 1 << $shift;
+        }
+
+        return 0;
+    }
+
     /**
      * Write SHEETPROTECTION.
      */
@@ -1488,21 +1457,22 @@ private function writeSheetProtection(): void
         $record = 0x0867;
 
         // prepare options
-        $options = (int) !$this->phpSheet->getProtection()->getObjects()
-            | (int) !$this->phpSheet->getProtection()->getScenarios() << 1
-            | (int) !$this->phpSheet->getProtection()->getFormatCells() << 2
-            | (int) !$this->phpSheet->getProtection()->getFormatColumns() << 3
-            | (int) !$this->phpSheet->getProtection()->getFormatRows() << 4
-            | (int) !$this->phpSheet->getProtection()->getInsertColumns() << 5
-            | (int) !$this->phpSheet->getProtection()->getInsertRows() << 6
-            | (int) !$this->phpSheet->getProtection()->getInsertHyperlinks() << 7
-            | (int) !$this->phpSheet->getProtection()->getDeleteColumns() << 8
-            | (int) !$this->phpSheet->getProtection()->getDeleteRows() << 9
-            | (int) !$this->phpSheet->getProtection()->getSelectLockedCells() << 10
-            | (int) !$this->phpSheet->getProtection()->getSort() << 11
-            | (int) !$this->phpSheet->getProtection()->getAutoFilter() << 12
-            | (int) !$this->phpSheet->getProtection()->getPivotTables() << 13
-            | (int) !$this->phpSheet->getProtection()->getSelectUnlockedCells() << 14;
+        $protection = $this->phpSheet->getProtection();
+        $options = self::protectionBitsDefaultTrue($protection->getObjects(), 0)
+            | self::protectionBitsDefaultTrue($protection->getScenarios(), 1)
+            | self::protectionBitsDefaultFalse($protection->getFormatCells(), 2)
+            | self::protectionBitsDefaultFalse($protection->getFormatColumns(), 3)
+            | self::protectionBitsDefaultFalse($protection->getFormatRows(), 4)
+            | self::protectionBitsDefaultFalse($protection->getInsertColumns(), 5)
+            | self::protectionBitsDefaultFalse($protection->getInsertRows(), 6)
+            | self::protectionBitsDefaultFalse($protection->getInsertHyperlinks(), 7)
+            | self::protectionBitsDefaultFalse($protection->getDeleteColumns(), 8)
+            | self::protectionBitsDefaultFalse($protection->getDeleteRows(), 9)
+            | self::protectionBitsDefaultTrue($protection->getSelectLockedCells(), 10)
+            | self::protectionBitsDefaultFalse($protection->getSort(), 11)
+            | self::protectionBitsDefaultFalse($protection->getAutoFilter(), 12)
+            | self::protectionBitsDefaultFalse($protection->getPivotTables(), 13)
+            | self::protectionBitsDefaultTrue($protection->getSelectUnlockedCells(), 14);
 
         // record data
         $recordData = pack(
@@ -1531,7 +1501,8 @@ private function writeSheetProtection(): void
      */
     private function writeRangeProtection(): void
     {
-        foreach ($this->phpSheet->getProtectedCells() as $range => $password) {
+        foreach ($this->phpSheet->getProtectedCellRanges() as $range => $protectedCells) {
+            $password = $protectedCells->getPassword();
             // number of ranges, e.g. 'A1:B3 C20:D25'
             $cellRanges = explode(' ', $range);
             $cref = count($cellRanges);
@@ -1588,7 +1559,7 @@ private function writePanes(): void
         $x = $column - 1;
         $y = $row - 1;
 
-        [$leftMostColumn, $topRow] = Coordinate::indexesFromString($this->phpSheet->getTopLeftCell());
+        [$leftMostColumn, $topRow] = Coordinate::indexesFromString($this->phpSheet->getTopLeftCell() ?? '');
         //Coordinates are zero-based in xls files
         $rwTop = $topRow - 1;
         $colLeft = $leftMostColumn - 1;
@@ -1598,7 +1569,7 @@ private function writePanes(): void
 
         // Determine which pane should be active. There is also the undocumented
         // option to override this should it be necessary: may be removed later.
-        $pnnAct = null;
+        $pnnAct = 0;
         if ($x != 0 && $y != 0) {
             $pnnAct = 0; // Bottom right
         }
@@ -1633,7 +1604,6 @@ private function writeSetup(): void
         $iPageStart = 0x01; // Starting page number
         $iFitWidth = (int) $this->phpSheet->getPageSetup()->getFitToWidth(); // Fit to number of pages wide
         $iFitHeight = (int) $this->phpSheet->getPageSetup()->getFitToHeight(); // Fit to number of pages high
-        $grbit = 0x00; // Option flags
         $iRes = 0x0258; // Print resolution
         $iVRes = 0x0258; // Vertical print resolution
 
@@ -1644,7 +1614,7 @@ private function writeSetup(): void
 
         // Order of printing pages
         $fLeftToRight = $this->phpSheet->getPageSetup()->getPageOrder() === PageSetup::PAGEORDER_DOWN_THEN_OVER
-            ? 0x1 : 0x0;
+            ? 0x0 : 0x1;
         // Page orientation
         $fLandscape = ($this->phpSheet->getPageSetup()->getOrientation() == PageSetup::ORIENTATION_LANDSCAPE)
             ? 0x0 : 0x1;
@@ -1839,7 +1809,7 @@ private function writeMarginBottom(): void
      */
     private function writePrintHeaders(): void
     {
-        $record = 0x002a; // Record identifier
+        $record = 0x002A; // Record identifier
         $length = 0x0002; // Bytes to follow
 
         $fPrintRwCol = $this->printHeaders; // Boolean flag
@@ -1855,7 +1825,7 @@ private function writePrintHeaders(): void
      */
     private function writePrintGridlines(): void
     {
-        $record = 0x002b; // Record identifier
+        $record = 0x002B; // Record identifier
         $length = 0x0002; // Bytes to follow
 
         $fPrintGrid = $this->phpSheet->getPrintGridlines() ? 1 : 0; // Boolean flag
@@ -1989,27 +1959,15 @@ private function writeBreaks(): void
         $vbreaks = [];
         $hbreaks = [];
 
-        foreach ($this->phpSheet->getBreaks() as $cell => $breakType) {
+        foreach ($this->phpSheet->getRowBreaks() as $cell => $break) {
             // Fetch coordinates
             $coordinates = Coordinate::coordinateFromString($cell);
-
-            // Decide what to do by the type of break
-            switch ($breakType) {
-                case \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet::BREAK_COLUMN:
-                    // Add to list of vertical breaks
-                    $vbreaks[] = Coordinate::columnIndexFromString($coordinates[0]) - 1;
-
-                    break;
-                case \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet::BREAK_ROW:
-                    // Add to list of horizontal breaks
-                    $hbreaks[] = $coordinates[1];
-
-                    break;
-                case \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet::BREAK_NONE:
-                default:
-                    // Nothing to do
-                    break;
-            }
+            $hbreaks[] = $coordinates[1];
+        }
+        foreach ($this->phpSheet->getColumnBreaks() as $cell => $break) {
+            // Fetch coordinates
+            $coordinates = Coordinate::indexesFromString($cell);
+            $vbreaks[] = $coordinates[0] - 1;
         }
 
         //horizontal page breaks
@@ -2020,7 +1978,7 @@ private function writeBreaks(): void
                 array_shift($hbreaks);
             }
 
-            $record = 0x001b; // Record identifier
+            $record = 0x001B; // Record identifier
             $cbrk = count($hbreaks); // Number of page breaks
             $length = 2 + 6 * $cbrk; // Bytes to follow
 
@@ -2029,7 +1987,7 @@ private function writeBreaks(): void
 
             // Append each page break
             foreach ($hbreaks as $hbreak) {
-                $data .= pack('vvv', $hbreak, 0x0000, 0x00ff);
+                $data .= pack('vvv', $hbreak, 0x0000, 0x00FF);
             }
 
             $this->append($header . $data);
@@ -2047,7 +2005,7 @@ private function writeBreaks(): void
                 array_shift($vbreaks);
             }
 
-            $record = 0x001a; // Record identifier
+            $record = 0x001A; // Record identifier
             $cbrk = count($vbreaks); // Number of page breaks
             $length = 2 + 6 * $cbrk; // Bytes to follow
 
@@ -2056,7 +2014,7 @@ private function writeBreaks(): void
 
             // Append each page break
             foreach ($vbreaks as $vbreak) {
-                $data .= pack('vvv', $vbreak, 0x0000, 0xffff);
+                $data .= pack('vvv', $vbreak, 0x0000, 0xFFFF);
             }
 
             $this->append($header . $data);
@@ -2069,7 +2027,7 @@ private function writeBreaks(): void
     private function writeProtect(): void
     {
         // Exit unless sheet protection has been specified
-        if (!$this->phpSheet->getProtection()->getSheet()) {
+        if ($this->phpSheet->getProtection()->getSheet() !== true) {
             return;
         }
 
@@ -2090,12 +2048,12 @@ private function writeProtect(): void
     private function writeScenProtect(): void
     {
         // Exit if sheet protection is not active
-        if (!$this->phpSheet->getProtection()->getSheet()) {
+        if ($this->phpSheet->getProtection()->getSheet() !== true) {
             return;
         }
 
         // Exit if scenarios are not protected
-        if (!$this->phpSheet->getProtection()->getScenarios()) {
+        if ($this->phpSheet->getProtection()->getScenarios() !== true) {
             return;
         }
 
@@ -2114,12 +2072,12 @@ private function writeScenProtect(): void
     private function writeObjectProtect(): void
     {
         // Exit if sheet protection is not active
-        if (!$this->phpSheet->getProtection()->getSheet()) {
+        if ($this->phpSheet->getProtection()->getSheet() !== true) {
             return;
         }
 
         // Exit if objects are not protected
-        if (!$this->phpSheet->getProtection()->getObjects()) {
+        if ($this->phpSheet->getProtection()->getObjects() !== true) {
             return;
         }
 
@@ -2138,7 +2096,7 @@ private function writeObjectProtect(): void
     private function writePassword(): void
     {
         // Exit unless sheet protection and password have been specified
-        if (!$this->phpSheet->getProtection()->getSheet() || !$this->phpSheet->getProtection()->getPassword()) {
+        if ($this->phpSheet->getProtection()->getSheet() !== true || !$this->phpSheet->getProtection()->getPassword() || $this->phpSheet->getProtection()->getAlgorithm() !== '') {
             return;
         }
 
@@ -2158,17 +2116,17 @@ private function writePassword(): void
      *
      * @param int $row The row we are going to insert the bitmap into
      * @param int $col The column we are going to insert the bitmap into
-     * @param mixed $bitmap The bitmap filename or GD-image resource
+     * @param GdImage|string $bitmap The bitmap filename or GD-image resource
      * @param int $x the horizontal position (offset) of the image inside the cell
      * @param int $y the vertical position (offset) of the image inside the cell
      * @param float $scale_x The horizontal scale
      * @param float $scale_y The vertical scale
      */
-    public function insertBitmap($row, $col, $bitmap, $x = 0, $y = 0, $scale_x = 1, $scale_y = 1): void
+    public function insertBitmap(int $row, int $col, GdImage|string $bitmap, int $x = 0, int $y = 0, float $scale_x = 1, float $scale_y = 1): void
     {
-        $bitmap_array = (is_resource($bitmap) || $bitmap instanceof GdImage
+        $bitmap_array = $bitmap instanceof GdImage
             ? $this->processBitmapGd($bitmap)
-            : $this->processBitmap($bitmap));
+            : $this->processBitmap($bitmap);
         [$width, $height, $size, $data] = $bitmap_array;
 
         // Scale the frame of the image.
@@ -2176,10 +2134,10 @@ public function insertBitmap($row, $col, $bitmap, $x = 0, $y = 0, $scale_x = 1,
         $height *= $scale_y;
 
         // Calculate the vertices of the image and write the OBJ record
-        $this->positionImage($col, $row, $x, $y, $width, $height);
+        $this->positionImage($col, $row, $x, $y, (int) $width, (int) $height);
 
         // Write the IMDATA record to store the bitmap data
-        $record = 0x007f;
+        $record = 0x007F;
         $length = 8 + $size;
         $cf = 0x09;
         $env = 0x01;
@@ -2239,7 +2197,7 @@ public function insertBitmap($row, $col, $bitmap, $x = 0, $y = 0, $scale_x = 1,
      * @param int $width Width of image frame
      * @param int $height Height of image frame
      */
-    public function positionImage($col_start, $row_start, $x1, $y1, $width, $height): void
+    public function positionImage(int $col_start, int $row_start, int $x1, int $y1, int $width, int $height): void
     {
         // Initialise end cell to the same as the start cell
         $col_end = $col_start; // Col containing lower right corner of object
@@ -2300,16 +2258,16 @@ public function positionImage($col_start, $row_start, $x1, $y1, $width, $height)
      * @param int $colL Column containing upper left corner of object
      * @param int $dxL Distance from left side of cell
      * @param int $rwT Row containing top left corner of object
-     * @param int $dyT Distance from top of cell
+     * @param float|int $dyT Distance from top of cell
      * @param int $colR Column containing lower right corner of object
      * @param int $dxR Distance from right of cell
      * @param int $rwB Row containing bottom right corner of object
      * @param int $dyB Distance from bottom of cell
      */
-    private function writeObjPicture($colL, $dxL, $rwT, $dyT, $colR, $dxR, $rwB, $dyB): void
+    private function writeObjPicture(int $colL, int $dxL, int $rwT, int|float $dyT, int $colR, int $dxR, int $rwB, int $dyB): void
     {
-        $record = 0x005d; // Record identifier
-        $length = 0x003c; // Bytes to follow
+        $record = 0x005D; // Record identifier
+        $length = 0x003C; // Bytes to follow
 
         $cObj = 0x0001; // Count of objects in file (set to 1)
         $OT = 0x0008; // Object type. 8 = Picture
@@ -2325,7 +2283,7 @@ private function writeObjPicture($colL, $dxL, $rwT, $dyT, $colR, $dxR, $rwB, $dy
         $fls = 0x00; // Fill pattern
         $fAuto = 0x00; // Automatic fill
         $icv = 0x08; // Line colour
-        $lns = 0xff; // Line style
+        $lns = 0xFF; // Line style
         $lnw = 0x01; // Line weight
         $fAutoB = 0x00; // Automatic border
         $frs = 0x0000; // Frame style
@@ -2374,23 +2332,26 @@ private function writeObjPicture($colL, $dxL, $rwT, $dyT, $colR, $dxR, $rwB, $dy
     /**
      * Convert a GD-image into the internal format.
      *
-     * @param GdImage|resource $image The image to process
+     * @param GdImage $image The image to process
      *
      * @return array Array with data and properties of the bitmap
      */
-    public function processBitmapGd($image)
+    public function processBitmapGd(GdImage $image): array
     {
         $width = imagesx($image);
         $height = imagesy($image);
 
-        $data = pack('Vvvvv', 0x000c, $width, $height, 0x01, 0x18);
+        $data = pack('Vvvvv', 0x000C, $width, $height, 0x01, 0x18);
         for ($j = $height; --$j;) {
             for ($i = 0; $i < $width; ++$i) {
+                /** @phpstan-ignore-next-line */
                 $color = imagecolorsforindex($image, imagecolorat($image, $i, $j));
-                foreach (['red', 'green', 'blue'] as $key) {
-                    $color[$key] = $color[$key] + round((255 - $color[$key]) * $color['alpha'] / 127);
+                if ($color !== false) {
+                    foreach (['red', 'green', 'blue'] as $key) {
+                        $color[$key] = $color[$key] + (int) round((255 - $color[$key]) * $color['alpha'] / 127);
+                    }
+                    $data .= chr($color['blue']) . chr($color['green']) . chr($color['red']);
                 }
-                $data .= chr($color['blue']) . chr($color['green']) . chr($color['red']);
             }
             if (3 * $width % 4) {
                 $data .= str_repeat("\x00", 4 - 3 * $width % 4);
@@ -2409,16 +2370,16 @@ public function processBitmapGd($image)
      *
      * @return array Array with data and properties of the bitmap
      */
-    public function processBitmap($bitmap)
+    public function processBitmap(string $bitmap): array
     {
         // Open file.
         $bmp_fd = @fopen($bitmap, 'rb');
-        if (!$bmp_fd) {
+        if ($bmp_fd === false || 0 === (int) filesize($bitmap)) {
             throw new WriterException("Couldn't import $bitmap");
         }
 
         // Slurp the file into a string.
-        $data = fread($bmp_fd, filesize($bitmap));
+        $data = (string) fread($bmp_fd, (int) filesize($bitmap));
 
         // Check that the file is big enough to be a bitmap.
         if (strlen($data) <= 0x36) {
@@ -2426,8 +2387,9 @@ public function processBitmap($bitmap)
         }
 
         // The first 2 bytes are used to identify the bitmap.
+
         $identity = unpack('A2ident', $data);
-        if ($identity['ident'] != 'BM') {
+        if ($identity === false || $identity['ident'] != 'BM') {
             throw new WriterException("$bitmap doesn't appear to be a valid bitmap image.\n");
         }
 
@@ -2437,7 +2399,7 @@ public function processBitmap($bitmap)
         // Read and remove the bitmap size. This is more reliable than reading
         // the data size at offset 0x22.
         //
-        $size_array = unpack('Vsa', substr($data, 0, 4));
+        $size_array = unpack('Vsa', substr($data, 0, 4)) ?: [];
         $size = $size_array['sa'];
         $data = substr($data, 4);
         $size -= 0x36; // Subtract size of bitmap header.
@@ -2447,7 +2409,7 @@ public function processBitmap($bitmap)
         $data = substr($data, 12);
 
         // Read and remove the bitmap width and height. Verify the sizes.
-        $width_and_height = unpack('V2', substr($data, 0, 8));
+        $width_and_height = unpack('V2', substr($data, 0, 8)) ?: [];
         $width = $width_and_height[1];
         $height = $width_and_height[2];
         $data = substr($data, 8);
@@ -2461,7 +2423,7 @@ public function processBitmap($bitmap)
         // Read and remove the bitmap planes and bpp data. Verify them.
         $planes_and_bitcount = unpack('v2', substr($data, 0, 4));
         $data = substr($data, 4);
-        if ($planes_and_bitcount[2] != 24) { // Bitcount
+        if ($planes_and_bitcount === false || $planes_and_bitcount[2] != 24) { // Bitcount
             throw new WriterException("$bitmap isn't a 24bit true color bitmap.\n");
         }
         if ($planes_and_bitcount[1] != 1) {
@@ -2472,7 +2434,7 @@ public function processBitmap($bitmap)
         $compression = unpack('Vcomp', substr($data, 0, 4));
         $data = substr($data, 4);
 
-        if ($compression['comp'] != 0) {
+        if ($compression === false || $compression['comp'] != 0) {
             throw new WriterException("$bitmap: compression not supported in bitmap image.\n");
         }
 
@@ -2480,7 +2442,7 @@ public function processBitmap($bitmap)
         $data = substr($data, 20);
 
         // Add the BITMAPCOREHEADER data
-        $header = pack('Vvvvv', 0x000c, $width, $height, 0x01, 0x18);
+        $header = pack('Vvvvv', 0x000C, $width, $height, 0x01, 0x18);
         $data = $header . $data;
 
         return [$width, $height, $size, $data];
@@ -2507,22 +2469,18 @@ private function writeZoom(): void
 
     /**
      * Get Escher object.
-     *
-     * @return \PhpOffice\PhpSpreadsheet\Shared\Escher
      */
-    public function getEscher()
+    public function getEscher(): ?\PhpOffice\PhpSpreadsheet\Shared\Escher
     {
         return $this->escher;
     }
 
     /**
      * Set Escher object.
-     *
-     * @param \PhpOffice\PhpSpreadsheet\Shared\Escher $pValue
      */
-    public function setEscher(?\PhpOffice\PhpSpreadsheet\Shared\Escher $pValue = null): void
+    public function setEscher(?\PhpOffice\PhpSpreadsheet\Shared\Escher $escher): void
     {
-        $this->escher = $pValue;
+        $this->escher = $escher;
     }
 
     /**
@@ -2560,8 +2518,8 @@ private function writeMsoDrawing(): void
                 // ftCmo
                 if ($spTypes[$i] == 0x00C9) {
                     // Add ftCmo (common object data) subobject
-                    $objData .=
-                        pack(
+                    $objData
+                        .= pack(
                             'vvvvvVVV',
                             0x0015, // 0x0015 = ftCmo
                             0x0012, // length of ftCmo data
@@ -2581,8 +2539,8 @@ private function writeMsoDrawing(): void
                     $objData .= pack('H*', '00000000010001030000020008005700');
                 } else {
                     // Add ftCmo (common object data) subobject
-                    $objData .=
-                        pack(
+                    $objData
+                        .= pack(
                             'vvvvvVVV',
                             0x0015, // 0x0015 = ftCmo
                             0x0012, // length of ftCmo data
@@ -2596,8 +2554,8 @@ private function writeMsoDrawing(): void
                 }
 
                 // ftEnd
-                $objData .=
-                    pack(
+                $objData
+                    .= pack(
                         'vv',
                         0x0000, // 0x0000 = ftEnd
                         0x0000  // length of ftEnd data
@@ -2675,23 +2633,23 @@ private function writeDataValidity(): void
                 $data = pack('V', $options);
 
                 // prompt title
-                $promptTitle = $dataValidation->getPromptTitle() !== '' ?
-                    $dataValidation->getPromptTitle() : chr(0);
+                $promptTitle = $dataValidation->getPromptTitle() !== ''
+                    ? $dataValidation->getPromptTitle() : chr(0);
                 $data .= StringHelper::UTF8toBIFF8UnicodeLong($promptTitle);
 
                 // error title
-                $errorTitle = $dataValidation->getErrorTitle() !== '' ?
-                    $dataValidation->getErrorTitle() : chr(0);
+                $errorTitle = $dataValidation->getErrorTitle() !== ''
+                    ? $dataValidation->getErrorTitle() : chr(0);
                 $data .= StringHelper::UTF8toBIFF8UnicodeLong($errorTitle);
 
                 // prompt text
-                $prompt = $dataValidation->getPrompt() !== '' ?
-                    $dataValidation->getPrompt() : chr(0);
+                $prompt = $dataValidation->getPrompt() !== ''
+                    ? $dataValidation->getPrompt() : chr(0);
                 $data .= StringHelper::UTF8toBIFF8UnicodeLong($prompt);
 
                 // error text
-                $error = $dataValidation->getError() !== '' ?
-                    $dataValidation->getError() : chr(0);
+                $error = $dataValidation->getError() !== ''
+                    ? $dataValidation->getError() : chr(0);
                 $data .= StringHelper::UTF8toBIFF8UnicodeLong($error);
 
                 // formula 1
@@ -2719,7 +2677,7 @@ private function writeDataValidity(): void
                     $this->parser->parse($formula2);
                     $formula2 = $this->parser->toReversePolish();
                     $sz2 = strlen($formula2);
-                } catch (PhpSpreadsheetException $e) {
+                } catch (PhpSpreadsheetException) {
                     $sz2 = 0;
                     $formula2 = '';
                 }
@@ -2748,7 +2706,7 @@ private function writePageLayoutView(): void
 
         $rt = 0x088B; // 2
         $grbitFrt = 0x0000; // 2
-        $reserved = 0x0000000000000000; // 8
+        //$reserved = 0x0000000000000000; // 8
         $wScalvePLV = $this->phpSheet->getSheetView()->getZoomScale(); // 2
 
         // The options flags that comprise $grbit
@@ -2771,12 +2729,17 @@ private function writePageLayoutView(): void
 
     /**
      * Write CFRule Record.
+     *
+     * @see https://www.openoffice.org/sc/excelfileformat.pdf Search for CFHEADER followed by CFRULE
      */
-    private function writeCFRule(Conditional $conditional): void
-    {
+    private function writeCFRule(
+        ConditionalHelper $conditionalFormulaHelper,
+        Conditional $conditional,
+        string $cellRange
+    ): void {
         $record = 0x01B1; // Record identifier
-        $type = null;  //  Type of the CF
-        $operatorType = null;   //  Comparison operator
+        $type = null; // Type of the CF
+        $operatorType = null; // Comparison operator
 
         if ($conditional->getConditionType() == Conditional::CONDITION_EXPRESSION) {
             $type = 0x02;
@@ -2817,7 +2780,7 @@ private function writeCFRule(Conditional $conditional): void
                     $operatorType = 0x01;
 
                     break;
-                // not OPERATOR_NOTBETWEEN 0x02
+                    // not OPERATOR_NOTBETWEEN 0x02
             }
         }
 
@@ -2825,26 +2788,28 @@ private function writeCFRule(Conditional $conditional): void
         // $szValue2 : size of the formula data for second value or formula
         $arrConditions = $conditional->getConditions();
         $numConditions = count($arrConditions);
-        if ($numConditions == 1) {
-            $szValue1 = ($arrConditions[0] <= 65535 ? 3 : 0x0000);
-            $szValue2 = 0x0000;
-            $operand1 = pack('Cv', 0x1E, $arrConditions[0]);
-            $operand2 = null;
-        } elseif ($numConditions == 2 && ($conditional->getOperatorType() == Conditional::OPERATOR_BETWEEN)) {
-            $szValue1 = ($arrConditions[0] <= 65535 ? 3 : 0x0000);
-            $szValue2 = ($arrConditions[1] <= 65535 ? 3 : 0x0000);
-            $operand1 = pack('Cv', 0x1E, $arrConditions[0]);
-            $operand2 = pack('Cv', 0x1E, $arrConditions[1]);
-        } else {
-            $szValue1 = 0x0000;
-            $szValue2 = 0x0000;
-            $operand1 = null;
-            $operand2 = null;
+
+        $szValue1 = 0x0000;
+        $szValue2 = 0x0000;
+        $operand1 = null;
+        $operand2 = null;
+
+        if ($numConditions === 1) {
+            $conditionalFormulaHelper->processCondition($arrConditions[0], $cellRange);
+            $szValue1 = $conditionalFormulaHelper->size();
+            $operand1 = $conditionalFormulaHelper->tokens();
+        } elseif ($numConditions === 2 && ($conditional->getOperatorType() === Conditional::OPERATOR_BETWEEN)) {
+            $conditionalFormulaHelper->processCondition($arrConditions[0], $cellRange);
+            $szValue1 = $conditionalFormulaHelper->size();
+            $operand1 = $conditionalFormulaHelper->tokens();
+            $conditionalFormulaHelper->processCondition($arrConditions[1], $cellRange);
+            $szValue2 = $conditionalFormulaHelper->size();
+            $operand2 = $conditionalFormulaHelper->tokens();
         }
 
         // $flags : Option flags
         // Alignment
-        $bAlignHz = ($conditional->getStyle()->getAlignment()->getHorizontal() === null ? 1 : 0);
+        /*$bAlignHz = ($conditional->getStyle()->getAlignment()->getHorizontal() === null ? 1 : 0);
         $bAlignVt = ($conditional->getStyle()->getAlignment()->getVertical() === null ? 1 : 0);
         $bAlignWrapTx = ($conditional->getStyle()->getAlignment()->getWrapText() === false ? 1 : 0);
         $bTxRotation = ($conditional->getStyle()->getAlignment()->getTextRotation() === null ? 1 : 0);
@@ -2854,34 +2819,35 @@ private function writeCFRule(Conditional $conditional): void
             $bFormatAlign = 1;
         } else {
             $bFormatAlign = 0;
-        }
+        }*/
         // Protection
-        $bProtLocked = ($conditional->getStyle()->getProtection()->getLocked() == null ? 1 : 0);
-        $bProtHidden = ($conditional->getStyle()->getProtection()->getHidden() == null ? 1 : 0);
+        /*$bProtLocked = ($conditional->getStyle()->getProtection()->getLocked() === null ? 1 : 0);
+        $bProtHidden = ($conditional->getStyle()->getProtection()->getHidden() === null ? 1 : 0);
         if ($bProtLocked == 0 || $bProtHidden == 0) {
             $bFormatProt = 1;
         } else {
             $bFormatProt = 0;
-        }
+        }*/
         // Border
-        $bBorderLeft = ($conditional->getStyle()->getBorders()->getLeft()->getColor()->getARGB() == Color::COLOR_BLACK
-        && $conditional->getStyle()->getBorders()->getLeft()->getBorderStyle() == Border::BORDER_NONE ? 1 : 0);
-        $bBorderRight = ($conditional->getStyle()->getBorders()->getRight()->getColor()->getARGB() == Color::COLOR_BLACK
-        && $conditional->getStyle()->getBorders()->getRight()->getBorderStyle() == Border::BORDER_NONE ? 1 : 0);
-        $bBorderTop = ($conditional->getStyle()->getBorders()->getTop()->getColor()->getARGB() == Color::COLOR_BLACK
-        && $conditional->getStyle()->getBorders()->getTop()->getBorderStyle() == Border::BORDER_NONE ? 1 : 0);
-        $bBorderBottom = ($conditional->getStyle()->getBorders()->getBottom()->getColor()->getARGB() == Color::COLOR_BLACK
-        && $conditional->getStyle()->getBorders()->getBottom()->getBorderStyle() == Border::BORDER_NONE ? 1 : 0);
-        if ($bBorderLeft == 0 || $bBorderRight == 0 || $bBorderTop == 0 || $bBorderBottom == 0) {
+        $bBorderLeft = ($conditional->getStyle()->getBorders()->getLeft()->getBorderStyle() !== Border::BORDER_OMIT) ? 1 : 0;
+        $bBorderRight = ($conditional->getStyle()->getBorders()->getRight()->getBorderStyle() !== Border::BORDER_OMIT) ? 1 : 0;
+        $bBorderTop = ($conditional->getStyle()->getBorders()->getTop()->getBorderStyle() !== Border::BORDER_OMIT) ? 1 : 0;
+        $bBorderBottom = ($conditional->getStyle()->getBorders()->getBottom()->getBorderStyle() !== Border::BORDER_OMIT) ? 1 : 0;
+        //$diagonalDirection = $conditional->getStyle()->getBorders()->getDiagonalDirection();
+        // Excel does not support conditional diagonal border even for xlsx
+        $bBorderDiagTop = self::$always0; //$diagonalDirection === Borders::DIAGONAL_DOWN || $diagonalDirection === Borders::DIAGONAL_BOTH;
+        $bBorderDiagBottom = self::$always0; //$diagonalDirection === Borders::DIAGONAL_UP || $diagonalDirection === Borders::DIAGONAL_BOTH;
+
+        if ($bBorderLeft === 1 || $bBorderRight === 1 || $bBorderTop === 1 || $bBorderBottom === 1 || $bBorderDiagTop === 1 || $bBorderDiagBottom === 1) {
             $bFormatBorder = 1;
         } else {
             $bFormatBorder = 0;
         }
         // Pattern
         $bFillStyle = ($conditional->getStyle()->getFill()->getFillType() === null ? 0 : 1);
-        $bFillColor = ($conditional->getStyle()->getFill()->getStartColor()->getARGB() == null ? 0 : 1);
-        $bFillColorBg = ($conditional->getStyle()->getFill()->getEndColor()->getARGB() == null ? 0 : 1);
-        if ($bFillStyle == 0 || $bFillColor == 0 || $bFillColorBg == 0) {
+        $bFillColor = ($conditional->getStyle()->getFill()->getStartColor()->getARGB() === null ? 0 : 1);
+        $bFillColorBg = ($conditional->getStyle()->getFill()->getEndColor()->getARGB() === null ? 0 : 1);
+        if ($bFillStyle == 1 || $bFillColor == 1 || $bFillColorBg == 1) {
             $bFormatFill = 1;
         } else {
             $bFormatFill = 0;
@@ -2896,7 +2862,7 @@ private function writeCFRule(Conditional $conditional): void
             || $conditional->getStyle()->getFont()->getSubscript() !== null
             || $conditional->getStyle()->getFont()->getUnderline() !== null
             || $conditional->getStyle()->getFont()->getStrikethrough() !== null
-            || $conditional->getStyle()->getFont()->getColor()->getARGB() != null
+            || $conditional->getStyle()->getFont()->getColor()->getARGB() !== null
         ) {
             $bFormatFont = 1;
         } else {
@@ -2904,46 +2870,46 @@ private function writeCFRule(Conditional $conditional): void
         }
         // Alignment
         $flags = 0;
-        $flags |= (1 == $bAlignHz ? 0x00000001 : 0);
-        $flags |= (1 == $bAlignVt ? 0x00000002 : 0);
-        $flags |= (1 == $bAlignWrapTx ? 0x00000004 : 0);
-        $flags |= (1 == $bTxRotation ? 0x00000008 : 0);
+        //$flags |= (1 == $bAlignHz ? 0x00000001 : 0);
+        //$flags |= (1 == $bAlignVt ? 0x00000002 : 0);
+        //$flags |= (1 == $bAlignWrapTx ? 0x00000004 : 0);
+        //$flags |= (1 == $bTxRotation ? 0x00000008 : 0);
         // Justify last line flag
-        $flags |= (1 == 1 ? 0x00000010 : 0);
-        $flags |= (1 == $bIndent ? 0x00000020 : 0);
-        $flags |= (1 == $bShrinkToFit ? 0x00000040 : 0);
+        $flags |= (1 == self::$always1 ? 0x00000010 : 0);
+        //$flags |= (1 == $bIndent ? 0x00000020 : 0);
+        //$flags |= (1 == $bShrinkToFit ? 0x00000040 : 0);
         // Default
-        $flags |= (1 == 1 ? 0x00000080 : 0);
+        $flags |= (1 == self::$always1 ? 0x00000080 : 0);
         // Protection
-        $flags |= (1 == $bProtLocked ? 0x00000100 : 0);
-        $flags |= (1 == $bProtHidden ? 0x00000200 : 0);
-        // Border
-        $flags |= (1 == $bBorderLeft ? 0x00000400 : 0);
-        $flags |= (1 == $bBorderRight ? 0x00000800 : 0);
-        $flags |= (1 == $bBorderTop ? 0x00001000 : 0);
-        $flags |= (1 == $bBorderBottom ? 0x00002000 : 0);
-        $flags |= (1 == 1 ? 0x00004000 : 0); // Top left to Bottom right border
-        $flags |= (1 == 1 ? 0x00008000 : 0); // Bottom left to Top right border
+        //$flags |= (1 == $bProtLocked ? 0x00000100 : 0);
+        //$flags |= (1 == $bProtHidden ? 0x00000200 : 0);
+        // Border, note that flags are opposite of what you might expect
+        $flags |= (0 == $bBorderLeft ? 0x00000400 : 0);
+        $flags |= (0 == $bBorderRight ? 0x00000800 : 0);
+        $flags |= (0 == $bBorderTop ? 0x00001000 : 0);
+        $flags |= (0 == $bBorderBottom ? 0x00002000 : 0);
+        $flags |= (0 === $bBorderDiagTop ? 0x00004000 : 0); // Top left to Bottom right border
+        $flags |= (0 === $bBorderDiagBottom ? 0x00008000 : 0); // Bottom left to Top right border
         // Pattern
         $flags |= (1 == $bFillStyle ? 0x00010000 : 0);
         $flags |= (1 == $bFillColor ? 0x00020000 : 0);
         $flags |= (1 == $bFillColorBg ? 0x00040000 : 0);
-        $flags |= (1 == 1 ? 0x00380000 : 0);
+        $flags |= (1 == self::$always1 ? 0x00380000 : 0);
         // Font
         $flags |= (1 == $bFormatFont ? 0x04000000 : 0);
         // Alignment:
-        $flags |= (1 == $bFormatAlign ? 0x08000000 : 0);
+        //$flags |= (1 == $bFormatAlign ? 0x08000000 : 0);
         // Border
         $flags |= (1 == $bFormatBorder ? 0x10000000 : 0);
         // Pattern
         $flags |= (1 == $bFormatFill ? 0x20000000 : 0);
         // Protection
-        $flags |= (1 == $bFormatProt ? 0x40000000 : 0);
+        //$flags |= (1 == $bFormatProt ? 0x40000000 : 0);
         // Text direction
-        $flags |= (1 == 0 ? 0x80000000 : 0);
+        $flags |= (1 == self::$always0 ? 0x80000000 : 0);
 
         $dataBlockFont = null;
-        $dataBlockAlign = null;
+        //$dataBlockAlign = null;
         $dataBlockBorder = null;
         $dataBlockFill = null;
 
@@ -2963,10 +2929,19 @@ private function writeCFRule(Conditional $conditional): void
                 $dataBlockFont .= pack('V', 20 * $conditional->getStyle()->getFont()->getSize());
             }
             // Font Options
-            $dataBlockFont .= pack('V', 0);
+            $italicStrike = 0;
+            if ($conditional->getStyle()->getFont()->getItalic() === true) {
+                $italicStrike |= 2;
+            }
+            if ($conditional->getStyle()->getFont()->getStrikethrough() === true) {
+                $italicStrike |= 0x80;
+            }
+            $dataBlockFont .= pack('V', $italicStrike);
             // Font weight
             if ($conditional->getStyle()->getFont()->getBold() === true) {
                 $dataBlockFont .= pack('v', 0x02BC);
+            } elseif ($conditional->getStyle()->getFont()->getBold() === null) {
+                $dataBlockFont .= pack('v', 0x0000);
             } else {
                 $dataBlockFont .= pack('v', 0x0190);
             }
@@ -3017,19 +2992,17 @@ private function writeCFRule(Conditional $conditional): void
             // Not used (3)
             $dataBlockFont .= pack('vC', 0x0000, 0x00);
             // Font color index
-            $colorIdx = Style\ColorMap::lookup($conditional->getStyle()->getFont()->getColor(), 0x00);
-
+            $colorIdx = $this->workbookColorIndex($conditional->getStyle()->getFont()->getColor()->getRgb(), 0);
             $dataBlockFont .= pack('V', $colorIdx);
             // Not used (4)
             $dataBlockFont .= pack('V', 0x00000000);
             // Options flags for modified font attributes
             $optionsFlags = 0;
-            $optionsFlagsBold = ($conditional->getStyle()->getFont()->getBold() === null ? 1 : 0);
-            $optionsFlags |= (1 == $optionsFlagsBold ? 0x00000002 : 0);
-            $optionsFlags |= (1 == 1 ? 0x00000008 : 0);
-            $optionsFlags |= (1 == 1 ? 0x00000010 : 0);
-            $optionsFlags |= (1 == 0 ? 0x00000020 : 0);
-            $optionsFlags |= (1 == 1 ? 0x00000080 : 0);
+            $optionsFlags |= ($conditional->getStyle()->getFont()->getBold() === null && $conditional->getStyle()->getFont()->getItalic() === null) ? 2 : 0;
+            $optionsFlags |= (1 == self::$always1 ? 0x00000008 : 0);
+            $optionsFlags |= (1 == self::$always1 ? 0x00000010 : 0);
+            $optionsFlags |= (1 == self::$always0 ? 0x00000020 : 0);
+            $optionsFlags |= ($conditional->getStyle()->getFont()->getStrikethrough() === null) ? 0x80 : 0;
             $dataBlockFont .= pack('V', $optionsFlags);
             // Escapement type
             $dataBlockFont .= pack('V', $fontEscapement);
@@ -3044,7 +3017,7 @@ private function writeCFRule(Conditional $conditional): void
             // Always
             $dataBlockFont .= pack('v', 0x0001);
         }
-        if ($bFormatAlign === 1) {
+        /*if ($bFormatAlign === 1) {
             // Alignment and text break
             $blockAlign = Style\CellAlignment::horizontal($conditional->getStyle()->getAlignment());
             $blockAlign |= Style\CellAlignment::wrap($conditional->getStyle()->getAlignment()) << 3;
@@ -3067,31 +3040,52 @@ private function writeCFRule(Conditional $conditional): void
             $blockIndentRelative = 255;
 
             $dataBlockAlign = pack('CCvvv', $blockAlign, $blockRotation, $blockIndent, $blockIndentRelative, 0x0000);
-        }
+        }*/
         if ($bFormatBorder === 1) {
             $blockLineStyle = Style\CellBorder::style($conditional->getStyle()->getBorders()->getLeft());
             $blockLineStyle |= Style\CellBorder::style($conditional->getStyle()->getBorders()->getRight()) << 4;
             $blockLineStyle |= Style\CellBorder::style($conditional->getStyle()->getBorders()->getTop()) << 8;
             $blockLineStyle |= Style\CellBorder::style($conditional->getStyle()->getBorders()->getBottom()) << 12;
 
-            // TODO writeCFRule() => $blockLineStyle => Index Color for left line
-            // TODO writeCFRule() => $blockLineStyle => Index Color for right line
-            // TODO writeCFRule() => $blockLineStyle => Top-left to bottom-right on/off
-            // TODO writeCFRule() => $blockLineStyle => Bottom-left to top-right on/off
+            if ($bBorderLeft !== 0) {
+                $colorIdx = $this->workbookColorIndex($conditional->getStyle()->getBorders()->getLeft()->getColor()->getRgb(), 0);
+                $blockLineStyle |= $colorIdx << 16;
+            }
+            if ($bBorderRight !== 0) {
+                $colorIdx = $this->workbookColorIndex($conditional->getStyle()->getBorders()->getRight()->getColor()->getRgb(), 0);
+                $blockLineStyle |= $colorIdx << 23;
+            }
             $blockColor = 0;
-            // TODO writeCFRule() => $blockColor => Index Color for top line
-            // TODO writeCFRule() => $blockColor => Index Color for bottom line
-            // TODO writeCFRule() => $blockColor => Index Color for diagonal line
-            $blockColor |= Style\CellBorder::style($conditional->getStyle()->getBorders()->getDiagonal()) << 21;
-            $dataBlockBorder = pack('vv', $blockLineStyle, $blockColor);
+            if ($bBorderTop !== 0) {
+                $colorIdx = $this->workbookColorIndex($conditional->getStyle()->getBorders()->getTop()->getColor()->getRgb(), 0);
+                $blockColor |= $colorIdx;
+            }
+            if ($bBorderBottom !== 0) {
+                $colorIdx = $this->workbookColorIndex($conditional->getStyle()->getBorders()->getBottom()->getColor()->getRgb(), 0);
+                $blockColor |= $colorIdx << 7;
+            }
+            /* Excel does not support condtional diagonal borders even for xlsx
+            if ($bBorderDiagTop !== 0 || $bBorderDiagBottom !== 0) {
+                $colorIdx = $this->workbookColorIndex($conditional->getStyle()->getBorders()->getDiagonal()->getColor()->getRgb(), 0);
+                $blockColor |= $colorIdx << 14;
+                $blockColor |= Style\CellBorder::style($conditional->getStyle()->getBorders()->getDiagonal()) << 21;
+                if ($bBorderDiagTop !== 0) {
+                    $blockLineStyle |= 1 << 30;
+                }
+                if ($bBorderDiagBottom !== 0) {
+                    $blockLineStyle |= 1 << 31;
+                }
+            }
+            */
+            $dataBlockBorder = pack('VV', $blockLineStyle, $blockColor);
         }
         if ($bFormatFill === 1) {
             // Fill Pattern Style
             $blockFillPatternStyle = Style\CellFill::style($conditional->getStyle()->getFill());
             // Background Color
-            $colorIdxBg = Style\ColorMap::lookup($conditional->getStyle()->getFill()->getStartColor(), 0x41);
+            $colorIdxBg = $this->workbookColorIndex($conditional->getStyle()->getFill()->getStartColor()->getRgb(), 0x41);
             // Foreground Color
-            $colorIdxFg = Style\ColorMap::lookup($conditional->getStyle()->getFill()->getEndColor(), 0x40);
+            $colorIdxFg = $this->workbookColorIndex($conditional->getStyle()->getFill()->getEndColor()->getRgb(), 0x40);
 
             $dataBlockFill = pack('v', $blockFillPatternStyle);
             $dataBlockFill .= pack('v', $colorIdxFg | ($colorIdxBg << 7));
@@ -3101,18 +3095,18 @@ private function writeCFRule(Conditional $conditional): void
         if ($bFormatFont === 1) { // Block Formatting : OK
             $data .= $dataBlockFont;
         }
-        if ($bFormatAlign === 1) {
-            $data .= $dataBlockAlign;
-        }
+        //if ($bFormatAlign === 1) {
+        //    $data .= $dataBlockAlign;
+        //}
         if ($bFormatBorder === 1) {
             $data .= $dataBlockBorder;
         }
         if ($bFormatFill === 1) { // Block Formatting : OK
             $data .= $dataBlockFill;
         }
-        if ($bFormatProt == 1) {
-            $data .= $this->getDataBlockProtection($conditional);
-        }
+        //if ($bFormatProt == 1) {
+        //    $data .= $this->getDataBlockProtection($conditional);
+        //}
         if ($operand1 !== null) {
             $data .= $operand1;
         }
@@ -3125,8 +3119,10 @@ private function writeCFRule(Conditional $conditional): void
 
     /**
      * Write CFHeader record.
+     *
+     * @param Conditional[] $conditionalStyles
      */
-    private function writeCFHeader(): void
+    private function writeCFHeader(string $cellCoordinate, array $conditionalStyles): bool
     {
         $record = 0x01B0; // Record identifier
         $length = 0x0016; // Bytes to follow
@@ -3135,33 +3131,32 @@ private function writeCFHeader(): void
         $numColumnMax = null;
         $numRowMin = null;
         $numRowMax = null;
+
         $arrConditional = [];
-        foreach ($this->phpSheet->getConditionalStylesCollection() as $cellCoordinate => $conditionalStyles) {
-            foreach ($conditionalStyles as $conditional) {
-                if (
-                    $conditional->getConditionType() == Conditional::CONDITION_EXPRESSION ||
-                    $conditional->getConditionType() == Conditional::CONDITION_CELLIS
-                ) {
-                    if (!in_array($conditional->getHashCode(), $arrConditional)) {
-                        $arrConditional[] = $conditional->getHashCode();
-                    }
-                    // Cells
-                    $rangeCoordinates = Coordinate::rangeBoundaries($cellCoordinate);
-                    if ($numColumnMin === null || ($numColumnMin > $rangeCoordinates[0][0])) {
-                        $numColumnMin = $rangeCoordinates[0][0];
-                    }
-                    if ($numColumnMax === null || ($numColumnMax < $rangeCoordinates[1][0])) {
-                        $numColumnMax = $rangeCoordinates[1][0];
-                    }
-                    if ($numRowMin === null || ($numRowMin > $rangeCoordinates[0][1])) {
-                        $numRowMin = (int) $rangeCoordinates[0][1];
-                    }
-                    if ($numRowMax === null || ($numRowMax < $rangeCoordinates[1][1])) {
-                        $numRowMax = (int) $rangeCoordinates[1][1];
-                    }
-                }
+        foreach ($conditionalStyles as $conditional) {
+            if (!in_array($conditional->getHashCode(), $arrConditional)) {
+                $arrConditional[] = $conditional->getHashCode();
+            }
+            // Cells
+            $rangeCoordinates = Coordinate::rangeBoundaries($cellCoordinate);
+            if ($numColumnMin === null || ($numColumnMin > $rangeCoordinates[0][0])) {
+                $numColumnMin = $rangeCoordinates[0][0];
+            }
+            if ($numColumnMax === null || ($numColumnMax < $rangeCoordinates[1][0])) {
+                $numColumnMax = $rangeCoordinates[1][0];
             }
+            if ($numRowMin === null || ($numRowMin > $rangeCoordinates[0][1])) {
+                $numRowMin = (int) $rangeCoordinates[0][1];
+            }
+            if ($numRowMax === null || ($numRowMax < $rangeCoordinates[1][1])) {
+                $numRowMax = (int) $rangeCoordinates[1][1];
+            }
+        }
+
+        if (count($arrConditional) === 0) {
+            return false;
         }
+
         $needRedraw = 1;
         $cellRange = pack('vvvv', $numRowMin - 1, $numRowMax - 1, $numColumnMin - 1, $numColumnMax - 1);
 
@@ -3171,9 +3166,11 @@ private function writeCFHeader(): void
         $data .= pack('v', 0x0001);
         $data .= $cellRange;
         $this->append($header . $data);
+
+        return true;
     }
 
-    private function getDataBlockProtection(Conditional $conditional): int
+    /*private function getDataBlockProtection(Conditional $conditional): int
     {
         $dataBlockProtection = 0;
         if ($conditional->getStyle()->getProtection()->getLocked() == Protection::PROTECTION_PROTECTED) {
@@ -3184,5 +3181,10 @@ private function getDataBlockProtection(Conditional $conditional): int
         }
 
         return $dataBlockProtection;
+    }*/
+
+    private function workbookColorIndex(?string $rgb, int $default): int
+    {
+        return (empty($rgb) || $this->writerWorkbook === null) ? $default : $this->writerWorkbook->addColor($rgb, $default);
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Xf.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Xf.php
index b2dbc67acd..2ab5a4ebca 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Xf.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xls/Xf.php
@@ -48,88 +48,58 @@ class Xf
 {
     /**
      * Style XF or a cell XF ?
-     *
-     * @var bool
      */
-    private $isStyleXf;
+    private bool $isStyleXf;
 
     /**
      * Index to the FONT record. Index 4 does not exist.
-     *
-     * @var int
      */
-    private $fontIndex;
+    private int $fontIndex;
 
     /**
      * An index (2 bytes) to a FORMAT record (number format).
-     *
-     * @var int
      */
-    private $numberFormatIndex;
+    private int $numberFormatIndex;
 
     /**
      * 1 bit, apparently not used.
-     *
-     * @var int
      */
-    private $textJustLast;
+    private int $textJustLast;
 
     /**
      * The cell's foreground color.
-     *
-     * @var int
      */
-    private $foregroundColor;
+    private int $foregroundColor;
 
     /**
      * The cell's background color.
-     *
-     * @var int
      */
-    private $backgroundColor;
+    private int $backgroundColor;
 
     /**
      * Color of the bottom border of the cell.
-     *
-     * @var int
      */
-    private $bottomBorderColor;
+    private int $bottomBorderColor;
 
     /**
      * Color of the top border of the cell.
-     *
-     * @var int
      */
-    private $topBorderColor;
+    private int $topBorderColor;
 
     /**
      * Color of the left border of the cell.
-     *
-     * @var int
      */
-    private $leftBorderColor;
+    private int $leftBorderColor;
 
     /**
      * Color of the right border of the cell.
-     *
-     * @var int
-     */
-    private $rightBorderColor;
-
-    /**
-     * @var int
      */
-    private $diag;
+    private int $rightBorderColor;
 
-    /**
-     * @var int
-     */
-    private $diagColor;
+    //private $diag; // theoretically int, not yet implemented
+    private int $diagColor;
 
-    /**
-     * @var Style
-     */
-    private $style;
+    private Style $style;
 
     /**
      * Constructor.
@@ -148,7 +118,7 @@ public function __construct(Style $style)
         $this->foregroundColor = 0x40;
         $this->backgroundColor = 0x41;
 
-        $this->diag = 0;
+        //$this->diag = 0;
 
         $this->bottomBorderColor = 0x40;
         $this->topBorderColor = 0x40;
@@ -163,7 +133,7 @@ public function __construct(Style $style)
      *
      * @return string The XF record
      */
-    public function writeXf()
+    public function writeXf(): string
     {
         // Set the type of the XF record and some of the attributes.
         if ($this->isStyleXf) {
@@ -177,10 +147,10 @@ public function writeXf()
         $atr_num = ($this->numberFormatIndex != 0) ? 1 : 0;
         $atr_fnt = ($this->fontIndex != 0) ? 1 : 0;
         $atr_alc = ((int) $this->style->getAlignment()->getWrapText()) ? 1 : 0;
-        $atr_bdr = (CellBorder::style($this->style->getBorders()->getBottom()) ||
-            CellBorder::style($this->style->getBorders()->getTop()) ||
-            CellBorder::style($this->style->getBorders()->getLeft()) ||
-            CellBorder::style($this->style->getBorders()->getRight())) ? 1 : 0;
+        $atr_bdr = (CellBorder::style($this->style->getBorders()->getBottom())
+            || CellBorder::style($this->style->getBorders()->getTop())
+            || CellBorder::style($this->style->getBorders()->getLeft())
+            || CellBorder::style($this->style->getBorders()->getRight())) ? 1 : 0;
         $atr_pat = ($this->foregroundColor != 0x40) ? 1 : 0;
         $atr_pat = ($this->backgroundColor != 0x41) ? 1 : $atr_pat;
         $atr_pat = CellFill::style($this->style->getFill()) ? 1 : $atr_pat;
@@ -254,7 +224,7 @@ public function writeXf()
         $biff8_options |= (int) $this->style->getAlignment()->getShrinkToFit() << 4;
 
         $data = pack('vvvC', $ifnt, $ifmt, $style, $align);
-        $data .= pack('CCC', self::mapTextRotation($this->style->getAlignment()->getTextRotation()), $biff8_options, $used_attrib);
+        $data .= pack('CCC', self::mapTextRotation((int) $this->style->getAlignment()->getTextRotation()), $biff8_options, $used_attrib);
         $data .= pack('VVv', $border1, $border2, $icv);
 
         return $header . $data;
@@ -262,10 +232,8 @@ public function writeXf()
 
     /**
      * Is this a style XF ?
-     *
-     * @param bool $value
      */
-    public function setIsStyleXf($value): void
+    public function setIsStyleXf(bool $value): void
     {
         $this->isStyleXf = $value;
     }
@@ -275,7 +243,7 @@ public function setIsStyleXf($value): void
      *
      * @param int $colorIndex Color index
      */
-    public function setBottomColor($colorIndex): void
+    public function setBottomColor(int $colorIndex): void
     {
         $this->bottomBorderColor = $colorIndex;
     }
@@ -285,7 +253,7 @@ public function setBottomColor($colorIndex): void
      *
      * @param int $colorIndex Color index
      */
-    public function setTopColor($colorIndex): void
+    public function setTopColor(int $colorIndex): void
     {
         $this->topBorderColor = $colorIndex;
     }
@@ -295,7 +263,7 @@ public function setTopColor($colorIndex): void
      *
      * @param int $colorIndex Color index
      */
-    public function setLeftColor($colorIndex): void
+    public function setLeftColor(int $colorIndex): void
     {
         $this->leftBorderColor = $colorIndex;
     }
@@ -305,7 +273,7 @@ public function setLeftColor($colorIndex): void
      *
      * @param int $colorIndex Color index
      */
-    public function setRightColor($colorIndex): void
+    public function setRightColor(int $colorIndex): void
     {
         $this->rightBorderColor = $colorIndex;
     }
@@ -315,7 +283,7 @@ public function setRightColor($colorIndex): void
      *
      * @param int $colorIndex Color index
      */
-    public function setDiagColor($colorIndex): void
+    public function setDiagColor(int $colorIndex): void
     {
         $this->diagColor = $colorIndex;
     }
@@ -325,7 +293,7 @@ public function setDiagColor($colorIndex): void
      *
      * @param int $colorIndex Color index
      */
-    public function setFgColor($colorIndex): void
+    public function setFgColor(int $colorIndex): void
     {
         $this->foregroundColor = $colorIndex;
     }
@@ -335,7 +303,7 @@ public function setFgColor($colorIndex): void
      *
      * @param int $colorIndex Color index
      */
-    public function setBgColor($colorIndex): void
+    public function setBgColor(int $colorIndex): void
     {
         $this->backgroundColor = $colorIndex;
     }
@@ -346,7 +314,7 @@ public function setBgColor($colorIndex): void
      *
      * @param int $numberFormatIndex Index to format record
      */
-    public function setNumberFormatIndex($numberFormatIndex): void
+    public function setNumberFormatIndex(int $numberFormatIndex): void
     {
         $this->numberFormatIndex = $numberFormatIndex;
     }
@@ -356,19 +324,15 @@ public function setNumberFormatIndex($numberFormatIndex): void
      *
      * @param int $value Font index, note that value 4 does not exist
      */
-    public function setFontIndex($value): void
+    public function setFontIndex(int $value): void
     {
         $this->fontIndex = $value;
     }
 
     /**
      * Map to BIFF8 codes for text rotation angle.
-     *
-     * @param int $textRotation
-     *
-     * @return int
      */
-    private static function mapTextRotation($textRotation)
+    private static function mapTextRotation(int $textRotation): int
     {
         if ($textRotation >= 0) {
             return $textRotation;
@@ -388,14 +352,10 @@ private static function mapTextRotation($textRotation)
 
     /**
      * Map locked values.
-     *
-     * @param string $locked
-     *
-     * @return int
      */
-    private static function mapLocked($locked)
+    private static function mapLocked(?string $locked): int
     {
-        return array_key_exists($locked, self::LOCK_ARRAY) ? self::LOCK_ARRAY[$locked] : 1;
+        return $locked !== null && array_key_exists($locked, self::LOCK_ARRAY) ? self::LOCK_ARRAY[$locked] : 1;
     }
 
     private const HIDDEN_ARRAY = [
@@ -406,13 +366,9 @@ private static function mapLocked($locked)
 
     /**
      * Map hidden.
-     *
-     * @param string $hidden
-     *
-     * @return int
      */
-    private static function mapHidden($hidden)
+    private static function mapHidden(?string $hidden): int
     {
-        return array_key_exists($hidden, self::HIDDEN_ARRAY) ? self::HIDDEN_ARRAY[$hidden] : 0;
+        return $hidden !== null && array_key_exists($hidden, self::HIDDEN_ARRAY) ? self::HIDDEN_ARRAY[$hidden] : 0;
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx.php
index 27ceb55901..a9d06db581 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx.php
@@ -25,157 +25,120 @@
 use PhpOffice\PhpSpreadsheet\Writer\Xlsx\RelsVBA;
 use PhpOffice\PhpSpreadsheet\Writer\Xlsx\StringTable;
 use PhpOffice\PhpSpreadsheet\Writer\Xlsx\Style;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx\Table;
 use PhpOffice\PhpSpreadsheet\Writer\Xlsx\Theme;
 use PhpOffice\PhpSpreadsheet\Writer\Xlsx\Workbook;
 use PhpOffice\PhpSpreadsheet\Writer\Xlsx\Worksheet;
 use ZipArchive;
 use ZipStream\Exception\OverflowException;
-use ZipStream\Option\Archive;
 use ZipStream\ZipStream;
 
 class Xlsx extends BaseWriter
 {
     /**
      * Office2003 compatibility.
-     *
-     * @var bool
      */
-    private $office2003compatibility = false;
+    private bool $office2003compatibility = false;
 
     /**
      * Private Spreadsheet.
-     *
-     * @var Spreadsheet
      */
-    private $spreadSheet;
+    private Spreadsheet $spreadSheet;
 
     /**
      * Private string table.
      *
      * @var string[]
      */
-    private $stringTable = [];
+    private array $stringTable = [];
 
     /**
      * Private unique Conditional HashTable.
      *
      * @var HashTable<Conditional>
      */
-    private $stylesConditionalHashTable;
+    private HashTable $stylesConditionalHashTable;
 
     /**
      * Private unique Style HashTable.
      *
      * @var HashTable<\PhpOffice\PhpSpreadsheet\Style\Style>
      */
-    private $styleHashTable;
+    private HashTable $styleHashTable;
 
     /**
      * Private unique Fill HashTable.
      *
      * @var HashTable<Fill>
      */
-    private $fillHashTable;
+    private HashTable $fillHashTable;
 
     /**
      * Private unique \PhpOffice\PhpSpreadsheet\Style\Font HashTable.
      *
      * @var HashTable<Font>
      */
-    private $fontHashTable;
+    private HashTable $fontHashTable;
 
     /**
      * Private unique Borders HashTable.
      *
      * @var HashTable<Borders>
      */
-    private $bordersHashTable;
+    private HashTable $bordersHashTable;
 
     /**
      * Private unique NumberFormat HashTable.
      *
      * @var HashTable<NumberFormat>
      */
-    private $numFmtHashTable;
+    private HashTable $numFmtHashTable;
 
     /**
      * Private unique \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet\BaseDrawing HashTable.
      *
      * @var HashTable<BaseDrawing>
      */
-    private $drawingHashTable;
+    private HashTable $drawingHashTable;
 
     /**
      * Private handle for zip stream.
-     *
-     * @var ZipStream
      */
-    private $zip;
+    private ZipStream $zip;
 
-    /**
-     * @var Chart
-     */
-    private $writerPartChart;
+    private Chart $writerPartChart;
 
-    /**
-     * @var Comments
-     */
-    private $writerPartComments;
+    private Comments $writerPartComments;
 
-    /**
-     * @var ContentTypes
-     */
-    private $writerPartContentTypes;
+    private ContentTypes $writerPartContentTypes;
 
-    /**
-     * @var DocProps
-     */
-    private $writerPartDocProps;
+    private DocProps $writerPartDocProps;
 
-    /**
-     * @var Drawing
-     */
-    private $writerPartDrawing;
+    private Drawing $writerPartDrawing;
 
-    /**
-     * @var Rels
-     */
-    private $writerPartRels;
+    private Rels $writerPartRels;
 
-    /**
-     * @var RelsRibbon
-     */
-    private $writerPartRelsRibbon;
+    private RelsRibbon $writerPartRelsRibbon;
 
-    /**
-     * @var RelsVBA
-     */
-    private $writerPartRelsVBA;
+    private RelsVBA $writerPartRelsVBA;
 
-    /**
-     * @var StringTable
-     */
-    private $writerPartStringTable;
+    private StringTable $writerPartStringTable;
 
-    /**
-     * @var Style
-     */
-    private $writerPartStyle;
+    private Style $writerPartStyle;
 
-    /**
-     * @var Theme
-     */
-    private $writerPartTheme;
+    private Theme $writerPartTheme;
 
-    /**
-     * @var Workbook
-     */
-    private $writerPartWorkbook;
+    private Table $writerPartTable;
 
-    /**
-     * @var Worksheet
-     */
-    private $writerPartWorksheet;
+    private Workbook $writerPartWorkbook;
+
+    private Worksheet $writerPartWorksheet;
+
+    private bool $explicitStyle0 = false;
+
+    private bool $useCSEArrays = false;
+
+    private bool $useDynamicArray = false;
 
     /**
      * Create a new Xlsx Writer.
@@ -196,24 +159,19 @@ public function __construct(Spreadsheet $spreadsheet)
         $this->writerPartStringTable = new StringTable($this);
         $this->writerPartStyle = new Style($this);
         $this->writerPartTheme = new Theme($this);
+        $this->writerPartTable = new Table($this);
         $this->writerPartWorkbook = new Workbook($this);
         $this->writerPartWorksheet = new Worksheet($this);
 
         // Set HashTable variables
-        // @phpstan-ignore-next-line
         $this->bordersHashTable = new HashTable();
-        // @phpstan-ignore-next-line
         $this->drawingHashTable = new HashTable();
-        // @phpstan-ignore-next-line
         $this->fillHashTable = new HashTable();
-        // @phpstan-ignore-next-line
         $this->fontHashTable = new HashTable();
-        // @phpstan-ignore-next-line
         $this->numFmtHashTable = new HashTable();
-        // @phpstan-ignore-next-line
         $this->styleHashTable = new HashTable();
-        // @phpstan-ignore-next-line
         $this->stylesConditionalHashTable = new HashTable();
+        $this->determineUseDynamicArrays();
     }
 
     public function getWriterPartChart(): Chart
@@ -271,6 +229,11 @@ public function getWriterPartTheme(): Theme
         return $this->writerPartTheme;
     }
 
+    public function getWriterPartTable(): Table
+    {
+        return $this->writerPartTable;
+    }
+
     public function getWriterPartWorkbook(): Workbook
     {
         return $this->writerPartWorkbook;
@@ -284,10 +247,13 @@ public function getWriterPartWorksheet(): Worksheet
     /**
      * Save PhpSpreadsheet to file.
      *
-     * @param resource|string $pFilename
+     * @param resource|string $filename
      */
-    public function save($pFilename): void
+    public function save($filename, int $flags = 0): void
     {
+        $this->processFlags($flags);
+        $this->determineUseDynamicArrays();
+
         // garbage collect
         $this->pathNames = [];
         $this->spreadSheet->garbageCollect();
@@ -317,6 +283,10 @@ public function save($pFilename): void
         $zipContent = [];
         // Add [Content_Types].xml to ZIP file
         $zipContent['[Content_Types].xml'] = $this->getWriterPartContentTypes()->writeContentTypes($this->spreadSheet, $this->includeCharts);
+        $metadataData = (new Xlsx\Metadata($this))->writeMetadata();
+        if ($metadataData !== '') {
+            $zipContent['xl/metadata.xml'] = $metadataData;
+        }
 
         //if hasMacros, add the vbaProject.bin file, Certificate file(if exists)
         if ($this->spreadSheet->hasMacros()) {
@@ -328,19 +298,22 @@ public function save($pFilename): void
                     //signed macros ?
                     // Yes : add the certificate file and the related rels file
                     $zipContent['xl/vbaProjectSignature.bin'] = $this->spreadSheet->getMacrosCertificate();
-                    $zipContent['xl/_rels/vbaProject.bin.rels'] = $this->getWriterPartRelsVBA()->writeVBARelationships($this->spreadSheet);
+                    $zipContent['xl/_rels/vbaProject.bin.rels'] = $this->getWriterPartRelsVBA()->writeVBARelationships();
                 }
             }
         }
         //a custom UI in this workbook ? add it ("base" xml and additional objects (pictures) and rels)
         if ($this->spreadSheet->hasRibbon()) {
             $tmpRibbonTarget = $this->spreadSheet->getRibbonXMLData('target');
+            $tmpRibbonTarget = is_string($tmpRibbonTarget) ? $tmpRibbonTarget : '';
             $zipContent[$tmpRibbonTarget] = $this->spreadSheet->getRibbonXMLData('data');
             if ($this->spreadSheet->hasRibbonBinObjects()) {
                 $tmpRootPath = dirname($tmpRibbonTarget) . '/';
                 $ribbonBinObjects = $this->spreadSheet->getRibbonBinObjects('data'); //the files to write
-                foreach ($ribbonBinObjects as $aPath => $aContent) {
-                    $zipContent[$tmpRootPath . $aPath] = $aContent;
+                if (is_array($ribbonBinObjects)) {
+                    foreach ($ribbonBinObjects as $aPath => $aContent) {
+                        $zipContent[$tmpRootPath . $aPath] = $aContent;
+                    }
                 }
                 //the rels for files
                 $zipContent[$tmpRootPath . '_rels/' . basename($tmpRibbonTarget) . '.rels'] = $this->getWriterPartRelsRibbon()->writeRibbonRelationships($this->spreadSheet);
@@ -387,10 +360,11 @@ public function save($pFilename): void
         }
 
         $chartRef1 = 0;
+        $tableRef1 = 1;
         // Add worksheet relationships (drawings, ...)
         for ($i = 0; $i < $this->spreadSheet->getSheetCount(); ++$i) {
             // Add relationships
-            $zipContent['xl/worksheets/_rels/sheet' . ($i + 1) . '.xml.rels'] = $this->getWriterPartRels()->writeWorksheetRelationships($this->spreadSheet->getSheet($i), ($i + 1), $this->includeCharts);
+            $zipContent['xl/worksheets/_rels/sheet' . ($i + 1) . '.xml.rels'] = $this->getWriterPartRels()->writeWorksheetRelationships($this->spreadSheet->getSheet($i), ($i + 1), $this->includeCharts, $tableRef1, $zipContent);
 
             // Add unparsedLoadedData
             $sheetCodeName = $this->spreadSheet->getSheet($i)->getCodeName();
@@ -425,29 +399,49 @@ public function save($pFilename): void
             }
 
             // Add unparsed drawings
-            if (isset($unparsedLoadedData['sheets'][$sheetCodeName]['Drawings'])) {
+            if (isset($unparsedLoadedData['sheets'][$sheetCodeName]['Drawings']) && !isset($zipContent['xl/drawings/drawing' . ($i + 1) . '.xml'])) {
                 foreach ($unparsedLoadedData['sheets'][$sheetCodeName]['Drawings'] as $relId => $drawingXml) {
                     $drawingFile = array_search($relId, $unparsedLoadedData['sheets'][$sheetCodeName]['drawingOriginalIds']);
                     if ($drawingFile !== false) {
-                        $drawingFile = ltrim($drawingFile, '.');
-                        $zipContent['xl' . $drawingFile] = $drawingXml;
+                        //$drawingFile = ltrim($drawingFile, '.');
+                        //$zipContent['xl' . $drawingFile] = $drawingXml;
+                        $zipContent['xl/drawings/drawing' . ($i + 1) . '.xml'] = $drawingXml;
                     }
                 }
             }
+            if (isset($unparsedLoadedData['sheets'][$sheetCodeName]['drawingOriginalIds']) && !isset($zipContent['xl/drawings/drawing' . ($i + 1) . '.xml'])) {
+                $zipContent['xl/drawings/drawing' . ($i + 1) . '.xml'] = '<xml></xml>';
+            }
 
             // Add comment relationship parts
-            if (count($this->spreadSheet->getSheet($i)->getComments()) > 0) {
+            $legacy = $unparsedLoadedData['sheets'][$this->spreadSheet->getSheet($i)->getCodeName()]['legacyDrawing'] ?? null;
+            if (count($this->spreadSheet->getSheet($i)->getComments()) > 0 || $legacy !== null) {
+                // VML Comments relationships
+                $zipContent['xl/drawings/_rels/vmlDrawing' . ($i + 1) . '.vml.rels'] = $this->getWriterPartRels()->writeVMLDrawingRelationships($this->spreadSheet->getSheet($i));
+
                 // VML Comments
-                $zipContent['xl/drawings/vmlDrawing' . ($i + 1) . '.vml'] = $this->getWriterPartComments()->writeVMLComments($this->spreadSheet->getSheet($i));
+                $zipContent['xl/drawings/vmlDrawing' . ($i + 1) . '.vml'] = $legacy ?? $this->getWriterPartComments()->writeVMLComments($this->spreadSheet->getSheet($i));
+            }
 
-                // Comments
+            // Comments
+            if (count($this->spreadSheet->getSheet($i)->getComments()) > 0) {
                 $zipContent['xl/comments' . ($i + 1) . '.xml'] = $this->getWriterPartComments()->writeComments($this->spreadSheet->getSheet($i));
+
+                // Media
+                foreach ($this->spreadSheet->getSheet($i)->getComments() as $comment) {
+                    if ($comment->hasBackgroundImage()) {
+                        $image = $comment->getBackgroundImage();
+                        $zipContent['xl/media/' . $image->getMediaFilename()] = $this->processDrawing($image);
+                    }
+                }
             }
 
             // Add unparsed relationship parts
             if (isset($unparsedLoadedData['sheets'][$sheetCodeName]['vmlDrawings'])) {
                 foreach ($unparsedLoadedData['sheets'][$sheetCodeName]['vmlDrawings'] as $vmlDrawing) {
-                    $zipContent[$vmlDrawing['filePath']] = $vmlDrawing['content'];
+                    if (!isset($zipContent[$vmlDrawing['filePath']])) {
+                        $zipContent[$vmlDrawing['filePath']] = $vmlDrawing['content'];
+                    }
                 }
             }
 
@@ -461,9 +455,17 @@ public function save($pFilename): void
 
                 // Media
                 foreach ($this->spreadSheet->getSheet($i)->getHeaderFooter()->getImages() as $image) {
-                    $zipContent['xl/media/' . $image->getIndexedFilename()] = file_get_contents($image->getPath());
+                    if ($image->getPath() !== '') {
+                        $zipContent['xl/media/' . $image->getIndexedFilename()] = file_get_contents($image->getPath());
+                    }
                 }
             }
+
+            // Add Table parts
+            $tables = $this->spreadSheet->getSheet($i)->getTableCollection();
+            foreach ($tables as $table) {
+                $zipContent['xl/tables/table' . $tableRef1 . '.xml'] = $this->getWriterPartTable()->writeTable($table, $tableRef1++);
+            }
         }
 
         // Add media
@@ -471,7 +473,10 @@ public function save($pFilename): void
             if ($this->getDrawingHashTable()->getByIndex($i) instanceof WorksheetDrawing) {
                 $imageContents = null;
                 $imagePath = $this->getDrawingHashTable()->getByIndex($i)->getPath();
-                if (strpos($imagePath, 'zip://') !== false) {
+                if ($imagePath === '') {
+                    continue;
+                }
+                if (str_contains($imagePath, 'zip://')) {
                     $imagePath = substr($imagePath, 6);
                     $imagePathSplitted = explode('#', $imagePath);
 
@@ -484,37 +489,35 @@ public function save($pFilename): void
                     $imageContents = file_get_contents($imagePath);
                 }
 
-                $zipContent['xl/media/' . str_replace(' ', '_', $this->getDrawingHashTable()->getByIndex($i)->getIndexedFilename())] = $imageContents;
+                $zipContent['xl/media/' . $this->getDrawingHashTable()->getByIndex($i)->getIndexedFilename()] = $imageContents;
             } elseif ($this->getDrawingHashTable()->getByIndex($i) instanceof MemoryDrawing) {
                 ob_start();
+                /** @var callable $callable */
+                $callable = $this->getDrawingHashTable()->getByIndex($i)->getRenderingFunction();
                 call_user_func(
-                    $this->getDrawingHashTable()->getByIndex($i)->getRenderingFunction(),
+                    $callable,
                     $this->getDrawingHashTable()->getByIndex($i)->getImageResource()
                 );
                 $imageContents = ob_get_contents();
                 ob_end_clean();
 
-                $zipContent['xl/media/' . str_replace(' ', '_', $this->getDrawingHashTable()->getByIndex($i)->getIndexedFilename())] = $imageContents;
+                $zipContent['xl/media/' . $this->getDrawingHashTable()->getByIndex($i)->getIndexedFilename()] = $imageContents;
             }
         }
 
         Functions::setReturnDateType($saveDateReturnType);
         Calculation::getInstance($this->spreadSheet)->getDebugLog()->setWriteDebugLog($saveDebugLog);
 
-        $this->openFileHandle($pFilename);
-
-        $options = new Archive();
-        $options->setEnableZip64(false);
-        $options->setOutputStream($this->fileHandle);
+        $this->openFileHandle($filename);
 
-        $this->zip = new ZipStream(null, $options);
+        $this->zip = ZipStream0::newZipStream($this->fileHandle);
 
         $this->addZipFiles($zipContent);
 
         // Close file
         try {
             $this->zip->finish();
-        } catch (OverflowException $e) {
+        } catch (OverflowException) {
             throw new WriterException('Could not close resource.');
         }
 
@@ -523,10 +526,8 @@ public function save($pFilename): void
 
     /**
      * Get Spreadsheet object.
-     *
-     * @return Spreadsheet
      */
-    public function getSpreadsheet()
+    public function getSpreadsheet(): Spreadsheet
     {
         return $this->spreadSheet;
     }
@@ -538,7 +539,7 @@ public function getSpreadsheet()
      *
      * @return $this
      */
-    public function setSpreadsheet(Spreadsheet $spreadsheet)
+    public function setSpreadsheet(Spreadsheet $spreadsheet): static
     {
         $this->spreadSheet = $spreadsheet;
 
@@ -550,7 +551,7 @@ public function setSpreadsheet(Spreadsheet $spreadsheet)
      *
      * @return string[]
      */
-    public function getStringTable()
+    public function getStringTable(): array
     {
         return $this->stringTable;
     }
@@ -560,7 +561,7 @@ public function getStringTable()
      *
      * @return HashTable<\PhpOffice\PhpSpreadsheet\Style\Style>
      */
-    public function getStyleHashTable()
+    public function getStyleHashTable(): HashTable
     {
         return $this->styleHashTable;
     }
@@ -570,7 +571,7 @@ public function getStyleHashTable()
      *
      * @return HashTable<Conditional>
      */
-    public function getStylesConditionalHashTable()
+    public function getStylesConditionalHashTable(): HashTable
     {
         return $this->stylesConditionalHashTable;
     }
@@ -580,7 +581,7 @@ public function getStylesConditionalHashTable()
      *
      * @return HashTable<Fill>
      */
-    public function getFillHashTable()
+    public function getFillHashTable(): HashTable
     {
         return $this->fillHashTable;
     }
@@ -590,7 +591,7 @@ public function getFillHashTable()
      *
      * @return HashTable<Font>
      */
-    public function getFontHashTable()
+    public function getFontHashTable(): HashTable
     {
         return $this->fontHashTable;
     }
@@ -600,7 +601,7 @@ public function getFontHashTable()
      *
      * @return HashTable<Borders>
      */
-    public function getBordersHashTable()
+    public function getBordersHashTable(): HashTable
     {
         return $this->bordersHashTable;
     }
@@ -610,7 +611,7 @@ public function getBordersHashTable()
      *
      * @return HashTable<NumberFormat>
      */
-    public function getNumFmtHashTable()
+    public function getNumFmtHashTable(): HashTable
     {
         return $this->numFmtHashTable;
     }
@@ -620,17 +621,15 @@ public function getNumFmtHashTable()
      *
      * @return HashTable<BaseDrawing>
      */
-    public function getDrawingHashTable()
+    public function getDrawingHashTable(): HashTable
     {
         return $this->drawingHashTable;
     }
 
     /**
      * Get Office2003 compatibility.
-     *
-     * @return bool
      */
-    public function getOffice2003Compatibility()
+    public function getOffice2003Compatibility(): bool
     {
         return $this->office2003compatibility;
     }
@@ -638,18 +637,18 @@ public function getOffice2003Compatibility()
     /**
      * Set Office2003 compatibility.
      *
-     * @param bool $pValue Office2003 compatibility?
+     * @param bool $office2003compatibility Office2003 compatibility?
      *
      * @return $this
      */
-    public function setOffice2003Compatibility($pValue)
+    public function setOffice2003Compatibility(bool $office2003compatibility): static
     {
-        $this->office2003compatibility = $pValue;
+        $this->office2003compatibility = $office2003compatibility;
 
         return $this;
     }
 
-    private $pathNames = [];
+    private array $pathNames = [];
 
     private function addZipFile(string $path, string $content): void
     {
@@ -665,4 +664,87 @@ private function addZipFiles(array $zipContent): void
             $this->addZipFile($path, $content);
         }
     }
+
+    private function processDrawing(WorksheetDrawing $drawing): string|null|false
+    {
+        $data = null;
+        $filename = $drawing->getPath();
+        if ($filename === '') {
+            return null;
+        }
+        $imageData = getimagesize($filename);
+
+        if (!empty($imageData)) {
+            switch ($imageData[2]) {
+                case 1: // GIF, not supported by BIFF8, we convert to PNG
+                    $image = imagecreatefromgif($filename);
+                    if ($image !== false) {
+                        ob_start();
+                        imagepng($image);
+                        $data = ob_get_contents();
+                        ob_end_clean();
+                    }
+
+                    break;
+
+                case 2: // JPEG
+                    $data = file_get_contents($filename);
+
+                    break;
+
+                case 3: // PNG
+                    $data = file_get_contents($filename);
+
+                    break;
+
+                case 6: // Windows DIB (BMP), we convert to PNG
+                    $image = imagecreatefrombmp($filename);
+                    if ($image !== false) {
+                        ob_start();
+                        imagepng($image);
+                        $data = ob_get_contents();
+                        ob_end_clean();
+                    }
+
+                    break;
+            }
+        }
+
+        return $data;
+    }
+
+    public function getExplicitStyle0(): bool
+    {
+        return $this->explicitStyle0;
+    }
+
+    /**
+     * This may be useful if non-default Alignment is part of default style
+     * and you think you might want to open the spreadsheet
+     * with LibreOffice or Gnumeric.
+     */
+    public function setExplicitStyle0(bool $explicitStyle0): self
+    {
+        $this->explicitStyle0 = $explicitStyle0;
+
+        return $this;
+    }
+
+    public function setUseCSEArrays(?bool $useCSEArrays): void
+    {
+        if ($useCSEArrays !== null) {
+            $this->useCSEArrays = $useCSEArrays;
+        }
+        $this->determineUseDynamicArrays();
+    }
+
+    public function useDynamicArrays(): bool
+    {
+        return $this->useDynamicArray;
+    }
+
+    private function determineUseDynamicArrays(): void
+    {
+        $this->useDynamicArray = $this->preCalculateFormulas && Calculation::getInstance($this->spreadSheet)->getInstanceArrayReturnType() === Calculation::RETURN_ARRAY_AS_ARRAY && !$this->useCSEArrays;
+    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/AutoFilter.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/AutoFilter.php
new file mode 100644
index 0000000000..d96ac096e5
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/AutoFilter.php
@@ -0,0 +1,125 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
+use PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter\Column;
+use PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter\Column\Rule;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet as ActualWorksheet;
+
+class AutoFilter extends WriterPart
+{
+    /**
+     * Write AutoFilter.
+     */
+    public static function writeAutoFilter(XMLWriter $objWriter, ActualWorksheet $worksheet): void
+    {
+        $autoFilterRange = $worksheet->getAutoFilter()->getRange();
+        if (!empty($autoFilterRange)) {
+            // autoFilter
+            $objWriter->startElement('autoFilter');
+
+            // Strip any worksheet reference from the filter coordinates
+            $range = Coordinate::splitRange($autoFilterRange);
+            $range = $range[0];
+            //    Strip any worksheet ref
+            [$ws, $range[0]] = ActualWorksheet::extractSheetTitle($range[0], true);
+            $range = implode(':', $range);
+
+            $objWriter->writeAttribute('ref', str_replace('$', '', $range));
+
+            $columns = $worksheet->getAutoFilter()->getColumns();
+            if (count($columns) > 0) {
+                foreach ($columns as $columnID => $column) {
+                    $colId = $worksheet->getAutoFilter()->getColumnOffset($columnID);
+                    self::writeAutoFilterColumn($objWriter, $column, $colId);
+                }
+            }
+            $objWriter->endElement();
+        }
+    }
+
+    /**
+     * Write AutoFilter's filterColumn.
+     */
+    public static function writeAutoFilterColumn(XMLWriter $objWriter, Column $column, int $colId): void
+    {
+        $rules = $column->getRules();
+        if (count($rules) > 0) {
+            $objWriter->startElement('filterColumn');
+            $objWriter->writeAttribute('colId', "$colId");
+
+            $objWriter->startElement($column->getFilterType());
+            if ($column->getJoin() == Column::AUTOFILTER_COLUMN_JOIN_AND) {
+                $objWriter->writeAttribute('and', '1');
+            }
+
+            foreach ($rules as $rule) {
+                self::writeAutoFilterColumnRule($column, $rule, $objWriter);
+            }
+
+            $objWriter->endElement();
+
+            $objWriter->endElement();
+        }
+    }
+
+    /**
+     * Write AutoFilter's filterColumn Rule.
+     */
+    private static function writeAutoFilterColumnRule(Column $column, Rule $rule, XMLWriter $objWriter): void
+    {
+        if (
+            ($column->getFilterType() === Column::AUTOFILTER_FILTERTYPE_FILTER)
+            && ($rule->getOperator() === Rule::AUTOFILTER_COLUMN_RULE_EQUAL)
+            && ($rule->getValue() === '')
+        ) {
+            //    Filter rule for Blanks
+            $objWriter->writeAttribute('blank', '1');
+        } elseif ($rule->getRuleType() === Rule::AUTOFILTER_RULETYPE_DYNAMICFILTER) {
+            //    Dynamic Filter Rule
+            $objWriter->writeAttribute('type', $rule->getGrouping());
+            $val = $column->getAttribute('val');
+            if ($val !== null) {
+                $objWriter->writeAttribute('val', "$val");
+            }
+            $maxVal = $column->getAttribute('maxVal');
+            if ($maxVal !== null) {
+                $objWriter->writeAttribute('maxVal', "$maxVal");
+            }
+        } elseif ($rule->getRuleType() === Rule::AUTOFILTER_RULETYPE_TOPTENFILTER) {
+            //    Top 10 Filter Rule
+            $ruleValue = $rule->getValue();
+            if (!is_array($ruleValue)) {
+                $objWriter->writeAttribute('val', "$ruleValue");
+            }
+            $objWriter->writeAttribute('percent', (($rule->getOperator() === Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_PERCENT) ? '1' : '0'));
+            $objWriter->writeAttribute('top', (($rule->getGrouping() === Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP) ? '1' : '0'));
+        } else {
+            //    Filter, DateGroupItem or CustomFilter
+            $objWriter->startElement($rule->getRuleType());
+
+            if ($rule->getOperator() !== Rule::AUTOFILTER_COLUMN_RULE_EQUAL) {
+                $objWriter->writeAttribute('operator', $rule->getOperator());
+            }
+            if ($rule->getRuleType() === Rule::AUTOFILTER_RULETYPE_DATEGROUP) {
+                // Date Group filters
+                $ruleValue = $rule->getValue();
+                if (is_array($ruleValue)) {
+                    foreach ($ruleValue as $key => $value) {
+                        $objWriter->writeAttribute($key, "$value");
+                    }
+                }
+                $objWriter->writeAttribute('dateTimeGrouping', $rule->getGrouping());
+            } else {
+                $ruleValue = $rule->getValue();
+                if (!is_array($ruleValue)) {
+                    $objWriter->writeAttribute('val', "$ruleValue");
+                }
+            }
+
+            $objWriter->endElement();
+        }
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Chart.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Chart.php
index 56b890bbf0..ca16557a88 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Chart.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Chart.php
@@ -3,37 +3,31 @@
 namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 
 use PhpOffice\PhpSpreadsheet\Chart\Axis;
+use PhpOffice\PhpSpreadsheet\Chart\ChartColor;
 use PhpOffice\PhpSpreadsheet\Chart\DataSeries;
 use PhpOffice\PhpSpreadsheet\Chart\DataSeriesValues;
-use PhpOffice\PhpSpreadsheet\Chart\GridLines;
 use PhpOffice\PhpSpreadsheet\Chart\Layout;
 use PhpOffice\PhpSpreadsheet\Chart\Legend;
 use PhpOffice\PhpSpreadsheet\Chart\PlotArea;
+use PhpOffice\PhpSpreadsheet\Chart\Properties;
 use PhpOffice\PhpSpreadsheet\Chart\Title;
-use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+use PhpOffice\PhpSpreadsheet\Chart\TrendLine;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Namespaces;
 use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
+use PhpOffice\PhpSpreadsheet\Style\Font;
 use PhpOffice\PhpSpreadsheet\Writer\Exception as WriterException;
 
 class Chart extends WriterPart
 {
-    protected $calculateCellValues;
-
-    /**
-     * @var int
-     */
-    private $seriesIndex;
+    private int $seriesIndex;
 
     /**
      * Write charts to XML format.
      *
-     * @param mixed $calculateCellValues
-     *
      * @return string XML Output
      */
-    public function writeChart(\PhpOffice\PhpSpreadsheet\Chart\Chart $pChart, $calculateCellValues = true)
+    public function writeChart(\PhpOffice\PhpSpreadsheet\Chart\Chart $chart, bool $calculateCellValues = true): string
     {
-        $this->calculateCellValues = $calculateCellValues;
-
         // Create XML writer
         $objWriter = null;
         if ($this->getParentWriter()->getUseDiskCaching()) {
@@ -42,8 +36,8 @@ public function writeChart(\PhpOffice\PhpSpreadsheet\Chart\Chart $pChart, $calcu
             $objWriter = new XMLWriter(XMLWriter::STORAGE_MEMORY);
         }
         //    Ensure that data series values are up-to-date before we save
-        if ($this->calculateCellValues) {
-            $pChart->refresh();
+        if ($calculateCellValues) {
+            $chart->refresh();
         }
 
         // XML header
@@ -51,104 +45,208 @@ public function writeChart(\PhpOffice\PhpSpreadsheet\Chart\Chart $pChart, $calcu
 
         // c:chartSpace
         $objWriter->startElement('c:chartSpace');
-        $objWriter->writeAttribute('xmlns:c', 'http://schemas.openxmlformats.org/drawingml/2006/chart');
-        $objWriter->writeAttribute('xmlns:a', 'http://schemas.openxmlformats.org/drawingml/2006/main');
-        $objWriter->writeAttribute('xmlns:r', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships');
+        $objWriter->writeAttribute('xmlns:c', Namespaces::CHART);
+        $objWriter->writeAttribute('xmlns:a', Namespaces::DRAWINGML);
+        $objWriter->writeAttribute('xmlns:r', Namespaces::SCHEMA_OFFICE_DOCUMENT);
 
         $objWriter->startElement('c:date1904');
-        $objWriter->writeAttribute('val', 0);
+        $objWriter->writeAttribute('val', '0');
         $objWriter->endElement();
         $objWriter->startElement('c:lang');
         $objWriter->writeAttribute('val', 'en-GB');
         $objWriter->endElement();
         $objWriter->startElement('c:roundedCorners');
-        $objWriter->writeAttribute('val', 0);
+        $objWriter->writeAttribute('val', $chart->getRoundedCorners() ? '1' : '0');
         $objWriter->endElement();
 
         $this->writeAlternateContent($objWriter);
 
         $objWriter->startElement('c:chart');
 
-        $this->writeTitle($objWriter, $pChart->getTitle());
+        $this->writeTitle($objWriter, $chart->getTitle());
 
         $objWriter->startElement('c:autoTitleDeleted');
-        $objWriter->writeAttribute('val', 0);
+        $objWriter->writeAttribute('val', (string) (int) $chart->getAutoTitleDeleted());
         $objWriter->endElement();
 
-        $this->writePlotArea($objWriter, $pChart->getWorksheet(), $pChart->getPlotArea(), $pChart->getXAxisLabel(), $pChart->getYAxisLabel(), $pChart->getChartAxisX(), $pChart->getChartAxisY(), $pChart->getMajorGridlines(), $pChart->getMinorGridlines());
+        $objWriter->startElement('c:view3D');
+        $surface2D = false;
+        $plotArea = $chart->getPlotArea();
+        if ($plotArea !== null) {
+            $seriesArray = $plotArea->getPlotGroup();
+            foreach ($seriesArray as $series) {
+                if ($series->getPlotType() === DataSeries::TYPE_SURFACECHART) {
+                    $surface2D = true;
+
+                    break;
+                }
+            }
+        }
+        $this->writeView3D($objWriter, $chart->getRotX(), 'c:rotX', $surface2D, 90);
+        $this->writeView3D($objWriter, $chart->getRotY(), 'c:rotY', $surface2D);
+        $this->writeView3D($objWriter, $chart->getRAngAx(), 'c:rAngAx', $surface2D);
+        $this->writeView3D($objWriter, $chart->getPerspective(), 'c:perspective', $surface2D);
+        $objWriter->endElement(); // view3D
 
-        $this->writeLegend($objWriter, $pChart->getLegend());
+        $this->writePlotArea($objWriter, $chart->getPlotArea(), $chart->getXAxisLabel(), $chart->getYAxisLabel(), $chart->getChartAxisX(), $chart->getChartAxisY());
+
+        $this->writeLegend($objWriter, $chart->getLegend());
 
         $objWriter->startElement('c:plotVisOnly');
-        $objWriter->writeAttribute('val', (int) $pChart->getPlotVisibleOnly());
+        $objWriter->writeAttribute('val', (string) (int) $chart->getPlotVisibleOnly());
         $objWriter->endElement();
 
-        $objWriter->startElement('c:dispBlanksAs');
-        $objWriter->writeAttribute('val', $pChart->getDisplayBlanksAs());
-        $objWriter->endElement();
+        if ($chart->getDisplayBlanksAs() !== '') {
+            $objWriter->startElement('c:dispBlanksAs');
+            $objWriter->writeAttribute('val', $chart->getDisplayBlanksAs());
+            $objWriter->endElement();
+        }
 
         $objWriter->startElement('c:showDLblsOverMax');
-        $objWriter->writeAttribute('val', 0);
+        $objWriter->writeAttribute('val', '0');
         $objWriter->endElement();
 
-        $objWriter->endElement();
+        $objWriter->endElement(); // c:chart
+
+        $objWriter->startElement('c:spPr');
+        if ($chart->getNoFill()) {
+            $objWriter->startElement('a:noFill');
+            $objWriter->endElement(); // a:noFill
+        }
+        $fillColor = $chart->getFillColor();
+        if ($fillColor->isUsable()) {
+            $this->writeColor($objWriter, $fillColor);
+        }
+        $borderLines = $chart->getBorderLines();
+        $this->writeLineStyles($objWriter, $borderLines);
+        $this->writeEffects($objWriter, $borderLines);
+        $objWriter->endElement(); // c:spPr
 
         $this->writePrintSettings($objWriter);
 
-        $objWriter->endElement();
+        $objWriter->endElement(); // c:chartSpace
 
         // Return
         return $objWriter->getData();
     }
 
+    private function writeView3D(XMLWriter $objWriter, ?int $value, string $tag, bool $surface2D, int $default = 0): void
+    {
+        if ($value === null && $surface2D) {
+            $value = $default;
+        }
+        if ($value !== null) {
+            $objWriter->startElement($tag);
+            $objWriter->writeAttribute('val', "$value");
+            $objWriter->endElement();
+        }
+    }
+
     /**
      * Write Chart Title.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param Title $title
      */
     private function writeTitle(XMLWriter $objWriter, ?Title $title = null): void
     {
         if ($title === null) {
             return;
         }
+        if ($this->writeCalculatedTitle($objWriter, $title)) {
+            return;
+        }
 
         $objWriter->startElement('c:title');
-        $objWriter->startElement('c:tx');
-        $objWriter->startElement('c:rich');
+        $caption = $title->getCaption();
+        if ($caption !== null) {
+            $objWriter->startElement('c:tx');
+            $objWriter->startElement('c:rich');
 
-        $objWriter->startElement('a:bodyPr');
-        $objWriter->endElement();
+            $objWriter->startElement('a:bodyPr');
+            $objWriter->endElement(); // a:bodyPr
 
-        $objWriter->startElement('a:lstStyle');
-        $objWriter->endElement();
+            $objWriter->startElement('a:lstStyle');
+            $objWriter->endElement(); // a:lstStyle
 
-        $objWriter->startElement('a:p');
+            $objWriter->startElement('a:p');
+            $objWriter->startElement('a:pPr');
+            $objWriter->startElement('a:defRPr');
+            $objWriter->endElement(); // a:defRPr
+            $objWriter->endElement(); // a:pPr
 
-        $caption = $title->getCaption();
-        if ((is_array($caption)) && (count($caption) > 0)) {
-            $caption = $caption[0];
+            if (is_array($caption)) {
+                $caption = $caption[0] ?? '';
+            }
+            $this->getParentWriter()->getWriterPartstringtable()->writeRichTextForCharts($objWriter, $caption, 'a');
+
+            $objWriter->endElement(); // a:p
+            $objWriter->endElement(); // c:rich
+            $objWriter->endElement(); // c:tx
         }
-        $this->getParentWriter()->getWriterPartstringtable()->writeRichTextForCharts($objWriter, $caption, 'a');
 
-        $objWriter->endElement();
-        $objWriter->endElement();
-        $objWriter->endElement();
+        $this->writeLayout($objWriter, $title->getLayout());
+
+        $objWriter->startElement('c:overlay');
+        $objWriter->writeAttribute('val', ($title->getOverlay()) ? '1' : '0');
+        $objWriter->endElement(); // c:overlay
+
+        $objWriter->endElement(); // c:title
+    }
+
+    /**
+     * Write Calculated Chart Title.
+     */
+    private function writeCalculatedTitle(XMLWriter $objWriter, Title $title): bool
+    {
+        $calc = $title->getCalculatedTitle($this->getParentWriter()->getSpreadsheet());
+        if (empty($calc)) {
+            return false;
+        }
+
+        $objWriter->startElement('c:title');
+        $objWriter->startElement('c:tx');
+        $objWriter->startElement('c:strRef');
+        $objWriter->writeElement('c:f', $title->getCellReference());
+        $objWriter->startElement('c:strCache');
+
+        $objWriter->startElement('c:ptCount');
+        $objWriter->writeAttribute('val', '1');
+        $objWriter->endElement(); // c:ptCount
+        $objWriter->startElement('c:pt');
+        $objWriter->writeAttribute('idx', '0');
+        $objWriter->writeElement('c:v', $calc);
+        $objWriter->endElement(); // c:pt
+
+        $objWriter->endElement(); // c:strCache
+        $objWriter->endElement(); // c:strRef
+        $objWriter->endElement(); // c:tx
 
         $this->writeLayout($objWriter, $title->getLayout());
 
         $objWriter->startElement('c:overlay');
-        $objWriter->writeAttribute('val', 0);
-        $objWriter->endElement();
+        $objWriter->writeAttribute('val', ($title->getOverlay()) ? '1' : '0');
+        $objWriter->endElement(); // c:overlay
+        // c:spPr
 
-        $objWriter->endElement();
+        // c:txPr
+        $labelFont = $title->getFont();
+        if ($labelFont !== null) {
+            $objWriter->startElement('c:txPr');
+
+            $objWriter->startElement('a:bodyPr');
+            $objWriter->endElement(); // a:bodyPr
+            $objWriter->startElement('a:lstStyle');
+            $objWriter->endElement(); // a:lstStyle
+            $this->writeLabelFont($objWriter, $labelFont, null);
+
+            $objWriter->endElement(); // c:txPr
+        }
+
+        $objWriter->endElement(); // c:title
+
+        return true;
     }
 
     /**
      * Write Chart Legend.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param Legend $legend
      */
     private function writeLegend(XMLWriter $objWriter, ?Legend $legend = null): void
     {
@@ -168,6 +266,17 @@ private function writeLegend(XMLWriter $objWriter, ?Legend $legend = null): void
         $objWriter->writeAttribute('val', ($legend->getOverlay()) ? '1' : '0');
         $objWriter->endElement();
 
+        $objWriter->startElement('c:spPr');
+        $fillColor = $legend->getFillColor();
+        if ($fillColor->isUsable()) {
+            $this->writeColor($objWriter, $fillColor);
+        }
+        $borderLines = $legend->getBorderLines();
+        $this->writeLineStyles($objWriter, $borderLines);
+        $this->writeEffects($objWriter, $borderLines);
+        $objWriter->endElement(); // c:spPr
+
+        $legendText = $legend->getLegendText();
         $objWriter->startElement('c:txPr');
         $objWriter->startElement('a:bodyPr');
         $objWriter->endElement();
@@ -177,38 +286,36 @@ private function writeLegend(XMLWriter $objWriter, ?Legend $legend = null): void
 
         $objWriter->startElement('a:p');
         $objWriter->startElement('a:pPr');
-        $objWriter->writeAttribute('rtl', 0);
+        $objWriter->writeAttribute('rtl', '0');
 
         $objWriter->startElement('a:defRPr');
-        $objWriter->endElement();
-        $objWriter->endElement();
+        if ($legendText !== null) {
+            $this->writeColor($objWriter, $legendText->getFillColorObject());
+            $this->writeEffects($objWriter, $legendText);
+        }
+        $objWriter->endElement(); // a:defRpr
+        $objWriter->endElement(); // a:pPr
 
         $objWriter->startElement('a:endParaRPr');
         $objWriter->writeAttribute('lang', 'en-US');
-        $objWriter->endElement();
+        $objWriter->endElement(); // a:endParaRPr
 
-        $objWriter->endElement();
-        $objWriter->endElement();
+        $objWriter->endElement(); // a:p
+        $objWriter->endElement(); // c:txPr
 
-        $objWriter->endElement();
+        $objWriter->endElement(); // c:legend
     }
 
     /**
      * Write Chart Plot Area.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param Title $xAxisLabel
-     * @param Title $yAxisLabel
-     * @param Axis $xAxis
-     * @param Axis $yAxis
      */
-    private function writePlotArea(XMLWriter $objWriter, \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $pSheet, PlotArea $plotArea, ?Title $xAxisLabel = null, ?Title $yAxisLabel = null, ?Axis $xAxis = null, ?Axis $yAxis = null, ?GridLines $majorGridlines = null, ?GridLines $minorGridlines = null): void
+    private function writePlotArea(XMLWriter $objWriter, ?PlotArea $plotArea, ?Title $xAxisLabel = null, ?Title $yAxisLabel = null, ?Axis $xAxis = null, ?Axis $yAxis = null): void
     {
         if ($plotArea === null) {
             return;
         }
 
-        $id1 = $id2 = 0;
+        $id1 = $id2 = $id3 = '0';
         $this->seriesIndex = 0;
         $objWriter->startElement('c:plotArea');
 
@@ -230,14 +337,18 @@ private function writePlotArea(XMLWriter $objWriter, \PhpOffice\PhpSpreadsheet\W
                 $groupType = $plotGroup->getPlotType();
                 if ($groupType == $chartType) {
                     $plotStyle = $plotGroup->getPlotStyle();
-                    if ($groupType === DataSeries::TYPE_RADARCHART) {
+                    if (!empty($plotStyle) && $groupType === DataSeries::TYPE_RADARCHART) {
                         $objWriter->startElement('c:radarStyle');
                         $objWriter->writeAttribute('val', $plotStyle);
                         $objWriter->endElement();
-                    } elseif ($groupType === DataSeries::TYPE_SCATTERCHART) {
+                    } elseif (!empty($plotStyle) && $groupType === DataSeries::TYPE_SCATTERCHART) {
                         $objWriter->startElement('c:scatterStyle');
                         $objWriter->writeAttribute('val', $plotStyle);
                         $objWriter->endElement();
+                    } elseif ($groupType === DataSeries::TYPE_SURFACECHART_3D || $groupType === DataSeries::TYPE_SURFACECHART) {
+                        $objWriter->startElement('c:wireframe');
+                        $objWriter->writeAttribute('val', $plotStyle ? '1' : '0');
+                        $objWriter->endElement();
                     }
 
                     $this->writePlotGroup($plotGroup, $chartType, $objWriter, $catIsMultiLevelSeries, $valIsMultiLevelSeries, $plotGroupingType);
@@ -249,48 +360,59 @@ private function writePlotArea(XMLWriter $objWriter, \PhpOffice\PhpSpreadsheet\W
             if ($chartType === DataSeries::TYPE_LINECHART && $plotGroup) {
                 //    Line only, Line3D can't be smoothed
                 $objWriter->startElement('c:smooth');
-                $objWriter->writeAttribute('val', (int) $plotGroup->getSmoothLine());
+                $objWriter->writeAttribute('val', (string) (int) $plotGroup->getSmoothLine());
                 $objWriter->endElement();
             } elseif (($chartType === DataSeries::TYPE_BARCHART) || ($chartType === DataSeries::TYPE_BARCHART_3D)) {
                 $objWriter->startElement('c:gapWidth');
-                $objWriter->writeAttribute('val', 150);
+                $objWriter->writeAttribute('val', '150');
                 $objWriter->endElement();
 
                 if ($plotGroupingType == 'percentStacked' || $plotGroupingType == 'stacked') {
                     $objWriter->startElement('c:overlap');
-                    $objWriter->writeAttribute('val', 100);
+                    $objWriter->writeAttribute('val', '100');
                     $objWriter->endElement();
                 }
             } elseif ($chartType === DataSeries::TYPE_BUBBLECHART) {
-                $objWriter->startElement('c:bubbleScale');
-                $objWriter->writeAttribute('val', 25);
-                $objWriter->endElement();
+                $scale = ($plotGroup === null) ? '' : (string) $plotGroup->getPlotStyle();
+                if ($scale !== '') {
+                    $objWriter->startElement('c:bubbleScale');
+                    $objWriter->writeAttribute('val', $scale);
+                    $objWriter->endElement();
+                }
 
                 $objWriter->startElement('c:showNegBubbles');
-                $objWriter->writeAttribute('val', 0);
+                $objWriter->writeAttribute('val', '0');
                 $objWriter->endElement();
             } elseif ($chartType === DataSeries::TYPE_STOCKCHART) {
                 $objWriter->startElement('c:hiLowLines');
                 $objWriter->endElement();
 
-                $objWriter->startElement('c:upDownBars');
-
-                $objWriter->startElement('c:gapWidth');
-                $objWriter->writeAttribute('val', 300);
-                $objWriter->endElement();
-
-                $objWriter->startElement('c:upBars');
-                $objWriter->endElement();
-
-                $objWriter->startElement('c:downBars');
-                $objWriter->endElement();
-
-                $objWriter->endElement();
+                $gapWidth = $plotArea->getGapWidth();
+                $upBars = $plotArea->getUseUpBars();
+                $downBars = $plotArea->getUseDownBars();
+                if ($gapWidth !== null || $upBars || $downBars) {
+                    $objWriter->startElement('c:upDownBars');
+                    if ($gapWidth !== null) {
+                        $objWriter->startElement('c:gapWidth');
+                        $objWriter->writeAttribute('val', "$gapWidth");
+                        $objWriter->endElement();
+                    }
+                    if ($upBars) {
+                        $objWriter->startElement('c:upBars');
+                        $objWriter->endElement();
+                    }
+                    if ($downBars) {
+                        $objWriter->startElement('c:downBars');
+                        $objWriter->endElement();
+                    }
+                    $objWriter->endElement(); // c:upDownBars
+                }
             }
 
-            //    Generate 2 unique numbers to use for axId values
-            $id1 = '75091328';
-            $id2 = '75089408';
+            //    Generate 3 unique numbers to use for axId values
+            $id1 = '110438656';
+            $id2 = '110444544';
+            $id3 = '110365312'; // used in Surface Chart
 
             if (($chartType !== DataSeries::TYPE_PIECHART) && ($chartType !== DataSeries::TYPE_PIECHART_3D) && ($chartType !== DataSeries::TYPE_DONUTCHART)) {
                 $objWriter->startElement('c:axId');
@@ -299,14 +421,19 @@ private function writePlotArea(XMLWriter $objWriter, \PhpOffice\PhpSpreadsheet\W
                 $objWriter->startElement('c:axId');
                 $objWriter->writeAttribute('val', $id2);
                 $objWriter->endElement();
+                if ($chartType === DataSeries::TYPE_SURFACECHART_3D || $chartType === DataSeries::TYPE_SURFACECHART) {
+                    $objWriter->startElement('c:axId');
+                    $objWriter->writeAttribute('val', $id3);
+                    $objWriter->endElement();
+                }
             } else {
                 $objWriter->startElement('c:firstSliceAng');
-                $objWriter->writeAttribute('val', 0);
+                $objWriter->writeAttribute('val', '0');
                 $objWriter->endElement();
 
                 if ($chartType === DataSeries::TYPE_DONUTCHART) {
                     $objWriter->startElement('c:holeSize');
-                    $objWriter->writeAttribute('val', 50);
+                    $objWriter->writeAttribute('val', '50');
                     $objWriter->endElement();
                 }
             }
@@ -316,133 +443,231 @@ private function writePlotArea(XMLWriter $objWriter, \PhpOffice\PhpSpreadsheet\W
 
         if (($chartType !== DataSeries::TYPE_PIECHART) && ($chartType !== DataSeries::TYPE_PIECHART_3D) && ($chartType !== DataSeries::TYPE_DONUTCHART)) {
             if ($chartType === DataSeries::TYPE_BUBBLECHART) {
-                $this->writeValueAxis($objWriter, $xAxisLabel, $chartType, $id1, $id2, $catIsMultiLevelSeries, $xAxis, $majorGridlines, $minorGridlines);
+                $this->writeValueAxis($objWriter, $xAxisLabel, $chartType, $id2, $id1, $catIsMultiLevelSeries, $xAxis ?? new Axis());
             } else {
-                $this->writeCategoryAxis($objWriter, $xAxisLabel, $id1, $id2, $catIsMultiLevelSeries, $xAxis);
+                $this->writeCategoryAxis($objWriter, $xAxisLabel, $id1, $id2, $catIsMultiLevelSeries, $xAxis ?? new Axis());
             }
 
-            $this->writeValueAxis($objWriter, $yAxisLabel, $chartType, $id1, $id2, $valIsMultiLevelSeries, $yAxis, $majorGridlines, $minorGridlines);
+            $this->writeValueAxis($objWriter, $yAxisLabel, $chartType, $id1, $id2, $valIsMultiLevelSeries, $yAxis ?? new Axis());
+            if ($chartType === DataSeries::TYPE_SURFACECHART_3D || $chartType === DataSeries::TYPE_SURFACECHART) {
+                $this->writeSerAxis($objWriter, $id2, $id3);
+            }
+        }
+        $stops = $plotArea->getGradientFillStops();
+        if ($plotArea->getNoFill() || !empty($stops)) {
+            $objWriter->startElement('c:spPr');
+            if ($plotArea->getNoFill()) {
+                $objWriter->startElement('a:noFill');
+                $objWriter->endElement(); // a:noFill
+            }
+            if (!empty($stops)) {
+                $objWriter->startElement('a:gradFill');
+                $objWriter->startElement('a:gsLst');
+                foreach ($stops as $stop) {
+                    $objWriter->startElement('a:gs');
+                    $objWriter->writeAttribute('pos', (string) (Properties::PERCENTAGE_MULTIPLIER * (float) $stop[0]));
+                    $this->writeColor($objWriter, $stop[1], false);
+                    $objWriter->endElement(); // a:gs
+                }
+                $objWriter->endElement(); // a:gsLst
+                $angle = $plotArea->getGradientFillAngle();
+                if ($angle !== null) {
+                    $objWriter->startElement('a:lin');
+                    $objWriter->writeAttribute('ang', Properties::angleToXml($angle));
+                    $objWriter->endElement(); // a:lin
+                }
+                $objWriter->endElement(); // a:gradFill
+            }
+            $objWriter->endElement(); // c:spPr
         }
 
-        $objWriter->endElement();
+        $objWriter->endElement(); // c:plotArea
+    }
+
+    private function writeDataLabelsBool(XMLWriter $objWriter, string $name, ?bool $value): void
+    {
+        if ($value !== null) {
+            $objWriter->startElement("c:$name");
+            $objWriter->writeAttribute('val', $value ? '1' : '0');
+            $objWriter->endElement();
+        }
     }
 
     /**
      * Write Data Labels.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param \PhpOffice\PhpSpreadsheet\Chart\Layout $chartLayout Chart layout
      */
     private function writeDataLabels(XMLWriter $objWriter, ?Layout $chartLayout = null): void
     {
+        if (!isset($chartLayout)) {
+            return;
+        }
         $objWriter->startElement('c:dLbls');
 
-        $objWriter->startElement('c:showLegendKey');
-        $showLegendKey = (empty($chartLayout)) ? 0 : $chartLayout->getShowLegendKey();
-        $objWriter->writeAttribute('val', ((empty($showLegendKey)) ? 0 : 1));
-        $objWriter->endElement();
-
-        $objWriter->startElement('c:showVal');
-        $showVal = (empty($chartLayout)) ? 0 : $chartLayout->getShowVal();
-        $objWriter->writeAttribute('val', ((empty($showVal)) ? 0 : 1));
-        $objWriter->endElement();
-
-        $objWriter->startElement('c:showCatName');
-        $showCatName = (empty($chartLayout)) ? 0 : $chartLayout->getShowCatName();
-        $objWriter->writeAttribute('val', ((empty($showCatName)) ? 0 : 1));
-        $objWriter->endElement();
-
-        $objWriter->startElement('c:showSerName');
-        $showSerName = (empty($chartLayout)) ? 0 : $chartLayout->getShowSerName();
-        $objWriter->writeAttribute('val', ((empty($showSerName)) ? 0 : 1));
-        $objWriter->endElement();
+        $fillColor = $chartLayout->getLabelFillColor();
+        $borderColor = $chartLayout->getLabelBorderColor();
+        if ($fillColor && $fillColor->isUsable()) {
+            $objWriter->startElement('c:spPr');
+            $this->writeColor($objWriter, $fillColor);
+            if ($borderColor && $borderColor->isUsable()) {
+                $objWriter->startElement('a:ln');
+                $this->writeColor($objWriter, $borderColor);
+                $objWriter->endElement(); // a:ln
+            }
+            $objWriter->endElement(); // c:spPr
+        }
+        $labelFont = $chartLayout->getLabelFont();
+        if ($labelFont !== null) {
+            $objWriter->startElement('c:txPr');
 
-        $objWriter->startElement('c:showPercent');
-        $showPercent = (empty($chartLayout)) ? 0 : $chartLayout->getShowPercent();
-        $objWriter->writeAttribute('val', ((empty($showPercent)) ? 0 : 1));
-        $objWriter->endElement();
+            $objWriter->startElement('a:bodyPr');
+            $objWriter->writeAttribute('wrap', 'square');
+            $objWriter->writeAttribute('lIns', '38100');
+            $objWriter->writeAttribute('tIns', '19050');
+            $objWriter->writeAttribute('rIns', '38100');
+            $objWriter->writeAttribute('bIns', '19050');
+            $objWriter->writeAttribute('anchor', 'ctr');
+            $objWriter->startElement('a:spAutoFit');
+            $objWriter->endElement(); // a:spAutoFit
+            $objWriter->endElement(); // a:bodyPr
 
-        $objWriter->startElement('c:showBubbleSize');
-        $showBubbleSize = (empty($chartLayout)) ? 0 : $chartLayout->getShowBubbleSize();
-        $objWriter->writeAttribute('val', ((empty($showBubbleSize)) ? 0 : 1));
-        $objWriter->endElement();
+            $objWriter->startElement('a:lstStyle');
+            $objWriter->endElement(); // a:lstStyle
+            $this->writeLabelFont($objWriter, $labelFont, $chartLayout->getLabelEffects());
 
-        $objWriter->startElement('c:showLeaderLines');
-        $showLeaderLines = (empty($chartLayout)) ? 1 : $chartLayout->getShowLeaderLines();
-        $objWriter->writeAttribute('val', ((empty($showLeaderLines)) ? 0 : 1));
-        $objWriter->endElement();
+            $objWriter->endElement(); // c:txPr
+        }
 
-        $objWriter->endElement();
+        if ($chartLayout->getNumFmtCode() !== '') {
+            $objWriter->startElement('c:numFmt');
+            $objWriter->writeAttribute('formatCode', $chartLayout->getnumFmtCode());
+            $objWriter->writeAttribute('sourceLinked', (string) (int) $chartLayout->getnumFmtLinked());
+            $objWriter->endElement(); // c:numFmt
+        }
+        if ($chartLayout->getDLblPos() !== '') {
+            $objWriter->startElement('c:dLblPos');
+            $objWriter->writeAttribute('val', $chartLayout->getDLblPos());
+            $objWriter->endElement(); // c:dLblPos
+        }
+        $this->writeDataLabelsBool($objWriter, 'showLegendKey', $chartLayout->getShowLegendKey());
+        $this->writeDataLabelsBool($objWriter, 'showVal', $chartLayout->getShowVal());
+        $this->writeDataLabelsBool($objWriter, 'showCatName', $chartLayout->getShowCatName());
+        $this->writeDataLabelsBool($objWriter, 'showSerName', $chartLayout->getShowSerName());
+        $this->writeDataLabelsBool($objWriter, 'showPercent', $chartLayout->getShowPercent());
+        $this->writeDataLabelsBool($objWriter, 'showBubbleSize', $chartLayout->getShowBubbleSize());
+        $this->writeDataLabelsBool($objWriter, 'showLeaderLines', $chartLayout->getShowLeaderLines());
+
+        $objWriter->endElement(); // c:dLbls
     }
 
     /**
      * Write Category Axis.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param Title $xAxisLabel
-     * @param string $id1
-     * @param string $id2
-     * @param bool $isMultiLevelSeries
      */
-    private function writeCategoryAxis($objWriter, $xAxisLabel, $id1, $id2, $isMultiLevelSeries, Axis $yAxis): void
+    private function writeCategoryAxis(XMLWriter $objWriter, ?Title $xAxisLabel, string $id1, string $id2, bool $isMultiLevelSeries, Axis $yAxis): void
     {
-        $objWriter->startElement('c:catAx');
+        // N.B. writeCategoryAxis may be invoked with the last parameter($yAxis) using $xAxis for ScatterChart, etc
+        // In that case, xAxis may contain values like the yAxis, or it may be a date axis (LINECHART).
+        $axisType = $yAxis->getAxisType();
+        if ($axisType !== '') {
+            $objWriter->startElement("c:$axisType");
+        } elseif ($yAxis->getAxisIsNumericFormat()) {
+            $objWriter->startElement('c:' . Axis::AXIS_TYPE_VALUE);
+        } else {
+            $objWriter->startElement('c:' . Axis::AXIS_TYPE_CATEGORY);
+        }
+        $majorGridlines = $yAxis->getMajorGridlines();
+        $minorGridlines = $yAxis->getMinorGridlines();
 
-        if ($id1 > 0) {
+        if ($id1 !== '0') {
             $objWriter->startElement('c:axId');
             $objWriter->writeAttribute('val', $id1);
             $objWriter->endElement();
         }
 
         $objWriter->startElement('c:scaling');
-        $objWriter->startElement('c:orientation');
-        $objWriter->writeAttribute('val', $yAxis->getAxisOptionsProperty('orientation'));
-        $objWriter->endElement();
-        $objWriter->endElement();
+        if (is_numeric($yAxis->getAxisOptionsProperty('logBase'))) {
+            $logBase = $yAxis->getAxisOptionsProperty('logBase') + 0;
+            if ($logBase >= 2 && $logBase <= 1000) {
+                $objWriter->startElement('c:logBase');
+                $objWriter->writeAttribute('val', (string) $logBase);
+                $objWriter->endElement();
+            }
+        }
+        if ($yAxis->getAxisOptionsProperty('maximum') !== null) {
+            $objWriter->startElement('c:max');
+            $objWriter->writeAttribute('val', $yAxis->getAxisOptionsProperty('maximum'));
+            $objWriter->endElement();
+        }
+        if ($yAxis->getAxisOptionsProperty('minimum') !== null) {
+            $objWriter->startElement('c:min');
+            $objWriter->writeAttribute('val', $yAxis->getAxisOptionsProperty('minimum'));
+            $objWriter->endElement();
+        }
+        if (!empty($yAxis->getAxisOptionsProperty('orientation'))) {
+            $objWriter->startElement('c:orientation');
+            $objWriter->writeAttribute('val', $yAxis->getAxisOptionsProperty('orientation'));
+            $objWriter->endElement();
+        }
+        $objWriter->endElement(); // c:scaling
 
         $objWriter->startElement('c:delete');
-        $objWriter->writeAttribute('val', 0);
+        $objWriter->writeAttribute('val', $yAxis->getAxisOptionsProperty('hidden') ?? '0');
         $objWriter->endElement();
 
         $objWriter->startElement('c:axPos');
         $objWriter->writeAttribute('val', 'b');
         $objWriter->endElement();
 
+        if ($majorGridlines !== null) {
+            $objWriter->startElement('c:majorGridlines');
+            $objWriter->startElement('c:spPr');
+            $this->writeLineStyles($objWriter, $majorGridlines);
+            $this->writeEffects($objWriter, $majorGridlines);
+            $objWriter->endElement(); //end spPr
+            $objWriter->endElement(); //end majorGridLines
+        }
+
+        if ($minorGridlines !== null && $minorGridlines->getObjectState()) {
+            $objWriter->startElement('c:minorGridlines');
+            $objWriter->startElement('c:spPr');
+            $this->writeLineStyles($objWriter, $minorGridlines);
+            $this->writeEffects($objWriter, $minorGridlines);
+            $objWriter->endElement(); //end spPr
+            $objWriter->endElement(); //end minorGridLines
+        }
+
         if ($xAxisLabel !== null) {
             $objWriter->startElement('c:title');
-            $objWriter->startElement('c:tx');
-            $objWriter->startElement('c:rich');
+            $caption = $xAxisLabel->getCaption();
+            if ($caption !== null) {
+                $objWriter->startElement('c:tx');
+                $objWriter->startElement('c:rich');
 
-            $objWriter->startElement('a:bodyPr');
-            $objWriter->endElement();
+                $objWriter->startElement('a:bodyPr');
+                $objWriter->endElement(); // a:bodyPr
 
-            $objWriter->startElement('a:lstStyle');
-            $objWriter->endElement();
+                $objWriter->startElement('a:lstStyle');
+                $objWriter->endElement(); // a::lstStyle
 
-            $objWriter->startElement('a:p');
-            $objWriter->startElement('a:r');
+                $objWriter->startElement('a:p');
 
-            $caption = $xAxisLabel->getCaption();
-            if (is_array($caption)) {
-                $caption = $caption[0];
-            }
-            $objWriter->startElement('a:t');
-            $objWriter->writeRawData(StringHelper::controlCharacterPHP2OOXML($caption));
-            $objWriter->endElement();
+                if (is_array($caption)) {
+                    $caption = $caption[0];
+                }
+                $this->getParentWriter()->getWriterPartstringtable()->writeRichTextForCharts($objWriter, $caption, 'a');
 
-            $objWriter->endElement();
-            $objWriter->endElement();
-            $objWriter->endElement();
-            $objWriter->endElement();
+                $objWriter->endElement(); // a:p
+                $objWriter->endElement(); // c:rich
+                $objWriter->endElement(); // c:tx
+            }
 
             $layout = $xAxisLabel->getLayout();
             $this->writeLayout($objWriter, $layout);
 
             $objWriter->startElement('c:overlay');
-            $objWriter->writeAttribute('val', 0);
-            $objWriter->endElement();
+            $objWriter->writeAttribute('val', '0');
+            $objWriter->endElement(); // c:overlay
 
-            $objWriter->endElement();
+            $objWriter->endElement(); // c:title
         }
 
         $objWriter->startElement('c:numFmt');
@@ -450,30 +675,73 @@ private function writeCategoryAxis($objWriter, $xAxisLabel, $id1, $id2, $isMulti
         $objWriter->writeAttribute('sourceLinked', $yAxis->getAxisNumberSourceLinked());
         $objWriter->endElement();
 
-        $objWriter->startElement('c:majorTickMark');
-        $objWriter->writeAttribute('val', $yAxis->getAxisOptionsProperty('major_tick_mark'));
-        $objWriter->endElement();
+        if (!empty($yAxis->getAxisOptionsProperty('major_tick_mark'))) {
+            $objWriter->startElement('c:majorTickMark');
+            $objWriter->writeAttribute('val', $yAxis->getAxisOptionsProperty('major_tick_mark'));
+            $objWriter->endElement();
+        }
 
-        $objWriter->startElement('c:minorTickMark');
-        $objWriter->writeAttribute('val', $yAxis->getAxisOptionsProperty('minor_tick_mark'));
-        $objWriter->endElement();
+        if (!empty($yAxis->getAxisOptionsProperty('minor_tick_mark'))) {
+            $objWriter->startElement('c:minorTickMark');
+            $objWriter->writeAttribute('val', $yAxis->getAxisOptionsProperty('minor_tick_mark'));
+            $objWriter->endElement();
+        }
 
-        $objWriter->startElement('c:tickLblPos');
-        $objWriter->writeAttribute('val', $yAxis->getAxisOptionsProperty('axis_labels'));
-        $objWriter->endElement();
+        if (!empty($yAxis->getAxisOptionsProperty('axis_labels'))) {
+            $objWriter->startElement('c:tickLblPos');
+            $objWriter->writeAttribute('val', $yAxis->getAxisOptionsProperty('axis_labels'));
+            $objWriter->endElement();
+        }
+
+        $textRotation = $yAxis->getAxisOptionsProperty('textRotation');
+        $axisText = $yAxis->getAxisText();
+
+        if ($axisText !== null || is_numeric($textRotation)) {
+            $objWriter->startElement('c:txPr');
+            $objWriter->startElement('a:bodyPr');
+            if (is_numeric($textRotation)) {
+                $objWriter->writeAttribute('rot', Properties::angleToXml((float) $textRotation));
+            }
+            $objWriter->endElement(); // a:bodyPr
+            $objWriter->startElement('a:lstStyle');
+            $objWriter->endElement(); // a:lstStyle
+            $this->writeLabelFont($objWriter, ($axisText === null) ? null : $axisText->getFont(), $axisText);
+            $objWriter->endElement(); // c:txPr
+        }
 
-        if ($id2 > 0) {
+        $objWriter->startElement('c:spPr');
+        $this->writeColor($objWriter, $yAxis->getFillColorObject());
+        $this->writeLineStyles($objWriter, $yAxis, $yAxis->getNoFill());
+        $this->writeEffects($objWriter, $yAxis);
+        $objWriter->endElement(); // spPr
+
+        if ($yAxis->getAxisOptionsProperty('major_unit') !== null) {
+            $objWriter->startElement('c:majorUnit');
+            $objWriter->writeAttribute('val', $yAxis->getAxisOptionsProperty('major_unit'));
+            $objWriter->endElement();
+        }
+
+        if ($yAxis->getAxisOptionsProperty('minor_unit') !== null) {
+            $objWriter->startElement('c:minorUnit');
+            $objWriter->writeAttribute('val', $yAxis->getAxisOptionsProperty('minor_unit'));
+            $objWriter->endElement();
+        }
+
+        if ($id2 !== '0') {
             $objWriter->startElement('c:crossAx');
             $objWriter->writeAttribute('val', $id2);
             $objWriter->endElement();
 
-            $objWriter->startElement('c:crosses');
-            $objWriter->writeAttribute('val', $yAxis->getAxisOptionsProperty('horizontal_crosses'));
-            $objWriter->endElement();
+            if (!empty($yAxis->getAxisOptionsProperty('horizontal_crosses'))) {
+                $objWriter->startElement('c:crosses');
+                $objWriter->writeAttribute('val', $yAxis->getAxisOptionsProperty('horizontal_crosses'));
+                $objWriter->endElement();
+            }
         }
 
         $objWriter->startElement('c:auto');
-        $objWriter->writeAttribute('val', 1);
+        // LineChart with dateAx wants '0'
+        $objWriter->writeAttribute('val', ($axisType === Axis::AXIS_TYPE_DATE) ? '0' : '1');
         $objWriter->endElement();
 
         $objWriter->startElement('c:lblAlgn');
@@ -481,12 +749,36 @@ private function writeCategoryAxis($objWriter, $xAxisLabel, $id1, $id2, $isMulti
         $objWriter->endElement();
 
         $objWriter->startElement('c:lblOffset');
-        $objWriter->writeAttribute('val', 100);
+        $objWriter->writeAttribute('val', '100');
         $objWriter->endElement();
 
+        if ($axisType === Axis::AXIS_TYPE_DATE) {
+            $property = 'baseTimeUnit';
+            $propertyVal = $yAxis->getAxisOptionsProperty($property);
+            if (!empty($propertyVal)) {
+                $objWriter->startElement("c:$property");
+                $objWriter->writeAttribute('val', $propertyVal);
+                $objWriter->endElement();
+            }
+            $property = 'majorTimeUnit';
+            $propertyVal = $yAxis->getAxisOptionsProperty($property);
+            if (!empty($propertyVal)) {
+                $objWriter->startElement("c:$property");
+                $objWriter->writeAttribute('val', $propertyVal);
+                $objWriter->endElement();
+            }
+            $property = 'minorTimeUnit';
+            $propertyVal = $yAxis->getAxisOptionsProperty($property);
+            if (!empty($propertyVal)) {
+                $objWriter->startElement("c:$property");
+                $objWriter->writeAttribute('val', $propertyVal);
+                $objWriter->endElement();
+            }
+        }
+
         if ($isMultiLevelSeries) {
             $objWriter->startElement('c:noMultiLvlLbl');
-            $objWriter->writeAttribute('val', 0);
+            $objWriter->writeAttribute('val', '0');
             $objWriter->endElement();
         }
         $objWriter->endElement();
@@ -495,24 +787,29 @@ private function writeCategoryAxis($objWriter, $xAxisLabel, $id1, $id2, $isMulti
     /**
      * Write Value Axis.
      *
-     * @param XMLWriter $objWriter XML Writer
-     * @param Title $yAxisLabel
-     * @param string $groupType Chart type
-     * @param string $id1
-     * @param string $id2
-     * @param bool $isMultiLevelSeries
+     * @param null|string $groupType Chart type
      */
-    private function writeValueAxis($objWriter, $yAxisLabel, $groupType, $id1, $id2, $isMultiLevelSeries, Axis $xAxis, GridLines $majorGridlines, GridLines $minorGridlines): void
+    private function writeValueAxis(XMLWriter $objWriter, ?Title $yAxisLabel, ?string $groupType, string $id1, string $id2, bool $isMultiLevelSeries, Axis $xAxis): void
     {
-        $objWriter->startElement('c:valAx');
+        $objWriter->startElement('c:' . Axis::AXIS_TYPE_VALUE);
+        $majorGridlines = $xAxis->getMajorGridlines();
+        $minorGridlines = $xAxis->getMinorGridlines();
 
-        if ($id2 > 0) {
+        if ($id2 !== '0') {
             $objWriter->startElement('c:axId');
             $objWriter->writeAttribute('val', $id2);
             $objWriter->endElement();
         }
 
         $objWriter->startElement('c:scaling');
+        if (is_numeric($xAxis->getAxisOptionsProperty('logBase'))) {
+            $logBase = $xAxis->getAxisOptionsProperty('logBase') + 0;
+            if ($logBase >= 2 && $logBase <= 1000) {
+                $objWriter->startElement('c:logBase');
+                $objWriter->writeAttribute('val', (string) $logBase);
+                $objWriter->endElement();
+            }
+        }
 
         if ($xAxis->getAxisOptionsProperty('maximum') !== null) {
             $objWriter->startElement('c:max');
@@ -526,415 +823,127 @@ private function writeValueAxis($objWriter, $yAxisLabel, $groupType, $id1, $id2,
             $objWriter->endElement();
         }
 
-        $objWriter->startElement('c:orientation');
-        $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('orientation'));
+        if (!empty($xAxis->getAxisOptionsProperty('orientation'))) {
+            $objWriter->startElement('c:orientation');
+            $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('orientation'));
+            $objWriter->endElement();
+        }
 
-        $objWriter->endElement();
-        $objWriter->endElement();
+        $objWriter->endElement(); // c:scaling
 
         $objWriter->startElement('c:delete');
-        $objWriter->writeAttribute('val', 0);
+        $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('hidden') ?? '0');
         $objWriter->endElement();
 
         $objWriter->startElement('c:axPos');
         $objWriter->writeAttribute('val', 'l');
         $objWriter->endElement();
 
-        $objWriter->startElement('c:majorGridlines');
-        $objWriter->startElement('c:spPr');
-
-        if ($majorGridlines->getLineColorProperty('value') !== null) {
-            $objWriter->startElement('a:ln');
-            $objWriter->writeAttribute('w', $majorGridlines->getLineStyleProperty('width'));
-            $objWriter->startElement('a:solidFill');
-            $objWriter->startElement("a:{$majorGridlines->getLineColorProperty('type')}");
-            $objWriter->writeAttribute('val', $majorGridlines->getLineColorProperty('value'));
-            $objWriter->startElement('a:alpha');
-            $objWriter->writeAttribute('val', $majorGridlines->getLineColorProperty('alpha'));
-            $objWriter->endElement(); //end alpha
-            $objWriter->endElement(); //end srgbClr
-            $objWriter->endElement(); //end solidFill
-
-            $objWriter->startElement('a:prstDash');
-            $objWriter->writeAttribute('val', $majorGridlines->getLineStyleProperty('dash'));
-            $objWriter->endElement();
-
-            if ($majorGridlines->getLineStyleProperty('join') == 'miter') {
-                $objWriter->startElement('a:miter');
-                $objWriter->writeAttribute('lim', '800000');
-                $objWriter->endElement();
-            } else {
-                $objWriter->startElement('a:bevel');
-                $objWriter->endElement();
-            }
-
-            if ($majorGridlines->getLineStyleProperty(['arrow', 'head', 'type']) !== null) {
-                $objWriter->startElement('a:headEnd');
-                $objWriter->writeAttribute('type', $majorGridlines->getLineStyleProperty(['arrow', 'head', 'type']));
-                $objWriter->writeAttribute('w', $majorGridlines->getLineStyleArrowParameters('head', 'w'));
-                $objWriter->writeAttribute('len', $majorGridlines->getLineStyleArrowParameters('head', 'len'));
-                $objWriter->endElement();
-            }
-
-            if ($majorGridlines->getLineStyleProperty(['arrow', 'end', 'type']) !== null) {
-                $objWriter->startElement('a:tailEnd');
-                $objWriter->writeAttribute('type', $majorGridlines->getLineStyleProperty(['arrow', 'end', 'type']));
-                $objWriter->writeAttribute('w', $majorGridlines->getLineStyleArrowParameters('end', 'w'));
-                $objWriter->writeAttribute('len', $majorGridlines->getLineStyleArrowParameters('end', 'len'));
-                $objWriter->endElement();
-            }
-            $objWriter->endElement(); //end ln
-        }
-        $objWriter->startElement('a:effectLst');
-
-        if ($majorGridlines->getGlowSize() !== null) {
-            $objWriter->startElement('a:glow');
-            $objWriter->writeAttribute('rad', $majorGridlines->getGlowSize());
-            $objWriter->startElement("a:{$majorGridlines->getGlowColor('type')}");
-            $objWriter->writeAttribute('val', $majorGridlines->getGlowColor('value'));
-            $objWriter->startElement('a:alpha');
-            $objWriter->writeAttribute('val', $majorGridlines->getGlowColor('alpha'));
-            $objWriter->endElement(); //end alpha
-            $objWriter->endElement(); //end schemeClr
-            $objWriter->endElement(); //end glow
-        }
-
-        if ($majorGridlines->getShadowProperty('presets') !== null) {
-            $objWriter->startElement("a:{$majorGridlines->getShadowProperty('effect')}");
-            if ($majorGridlines->getShadowProperty('blur') !== null) {
-                $objWriter->writeAttribute('blurRad', $majorGridlines->getShadowProperty('blur'));
-            }
-            if ($majorGridlines->getShadowProperty('distance') !== null) {
-                $objWriter->writeAttribute('dist', $majorGridlines->getShadowProperty('distance'));
-            }
-            if ($majorGridlines->getShadowProperty('direction') !== null) {
-                $objWriter->writeAttribute('dir', $majorGridlines->getShadowProperty('direction'));
-            }
-            if ($majorGridlines->getShadowProperty('algn') !== null) {
-                $objWriter->writeAttribute('algn', $majorGridlines->getShadowProperty('algn'));
-            }
-            if ($majorGridlines->getShadowProperty(['size', 'sx']) !== null) {
-                $objWriter->writeAttribute('sx', $majorGridlines->getShadowProperty(['size', 'sx']));
-            }
-            if ($majorGridlines->getShadowProperty(['size', 'sy']) !== null) {
-                $objWriter->writeAttribute('sy', $majorGridlines->getShadowProperty(['size', 'sy']));
-            }
-            if ($majorGridlines->getShadowProperty(['size', 'kx']) !== null) {
-                $objWriter->writeAttribute('kx', $majorGridlines->getShadowProperty(['size', 'kx']));
-            }
-            if ($majorGridlines->getShadowProperty('rotWithShape') !== null) {
-                $objWriter->writeAttribute('rotWithShape', $majorGridlines->getShadowProperty('rotWithShape'));
-            }
-            $objWriter->startElement("a:{$majorGridlines->getShadowProperty(['color', 'type'])}");
-            $objWriter->writeAttribute('val', $majorGridlines->getShadowProperty(['color', 'value']));
-
-            $objWriter->startElement('a:alpha');
-            $objWriter->writeAttribute('val', $majorGridlines->getShadowProperty(['color', 'alpha']));
-            $objWriter->endElement(); //end alpha
-
-            $objWriter->endElement(); //end color:type
-            $objWriter->endElement(); //end shadow
-        }
-
-        if ($majorGridlines->getSoftEdgesSize() !== null) {
-            $objWriter->startElement('a:softEdge');
-            $objWriter->writeAttribute('rad', $majorGridlines->getSoftEdgesSize());
-            $objWriter->endElement(); //end softEdge
+        if ($majorGridlines !== null) {
+            $objWriter->startElement('c:majorGridlines');
+            $objWriter->startElement('c:spPr');
+            $this->writeLineStyles($objWriter, $majorGridlines);
+            $this->writeEffects($objWriter, $majorGridlines);
+            $objWriter->endElement(); //end spPr
+            $objWriter->endElement(); //end majorGridLines
         }
 
-        $objWriter->endElement(); //end effectLst
-        $objWriter->endElement(); //end spPr
-        $objWriter->endElement(); //end majorGridLines
-
-        if ($minorGridlines->getObjectState()) {
+        if ($minorGridlines !== null && $minorGridlines->getObjectState()) {
             $objWriter->startElement('c:minorGridlines');
             $objWriter->startElement('c:spPr');
-
-            if ($minorGridlines->getLineColorProperty('value') !== null) {
-                $objWriter->startElement('a:ln');
-                $objWriter->writeAttribute('w', $minorGridlines->getLineStyleProperty('width'));
-                $objWriter->startElement('a:solidFill');
-                $objWriter->startElement("a:{$minorGridlines->getLineColorProperty('type')}");
-                $objWriter->writeAttribute('val', $minorGridlines->getLineColorProperty('value'));
-                $objWriter->startElement('a:alpha');
-                $objWriter->writeAttribute('val', $minorGridlines->getLineColorProperty('alpha'));
-                $objWriter->endElement(); //end alpha
-                $objWriter->endElement(); //end srgbClr
-                $objWriter->endElement(); //end solidFill
-
-                $objWriter->startElement('a:prstDash');
-                $objWriter->writeAttribute('val', $minorGridlines->getLineStyleProperty('dash'));
-                $objWriter->endElement();
-
-                if ($minorGridlines->getLineStyleProperty('join') == 'miter') {
-                    $objWriter->startElement('a:miter');
-                    $objWriter->writeAttribute('lim', '800000');
-                    $objWriter->endElement();
-                } else {
-                    $objWriter->startElement('a:bevel');
-                    $objWriter->endElement();
-                }
-
-                if ($minorGridlines->getLineStyleProperty(['arrow', 'head', 'type']) !== null) {
-                    $objWriter->startElement('a:headEnd');
-                    $objWriter->writeAttribute('type', $minorGridlines->getLineStyleProperty(['arrow', 'head', 'type']));
-                    $objWriter->writeAttribute('w', $minorGridlines->getLineStyleArrowParameters('head', 'w'));
-                    $objWriter->writeAttribute('len', $minorGridlines->getLineStyleArrowParameters('head', 'len'));
-                    $objWriter->endElement();
-                }
-
-                if ($minorGridlines->getLineStyleProperty(['arrow', 'end', 'type']) !== null) {
-                    $objWriter->startElement('a:tailEnd');
-                    $objWriter->writeAttribute('type', $minorGridlines->getLineStyleProperty(['arrow', 'end', 'type']));
-                    $objWriter->writeAttribute('w', $minorGridlines->getLineStyleArrowParameters('end', 'w'));
-                    $objWriter->writeAttribute('len', $minorGridlines->getLineStyleArrowParameters('end', 'len'));
-                    $objWriter->endElement();
-                }
-                $objWriter->endElement(); //end ln
-            }
-
-            $objWriter->startElement('a:effectLst');
-
-            if ($minorGridlines->getGlowSize() !== null) {
-                $objWriter->startElement('a:glow');
-                $objWriter->writeAttribute('rad', $minorGridlines->getGlowSize());
-                $objWriter->startElement("a:{$minorGridlines->getGlowColor('type')}");
-                $objWriter->writeAttribute('val', $minorGridlines->getGlowColor('value'));
-                $objWriter->startElement('a:alpha');
-                $objWriter->writeAttribute('val', $minorGridlines->getGlowColor('alpha'));
-                $objWriter->endElement(); //end alpha
-                $objWriter->endElement(); //end schemeClr
-                $objWriter->endElement(); //end glow
-            }
-
-            if ($minorGridlines->getShadowProperty('presets') !== null) {
-                $objWriter->startElement("a:{$minorGridlines->getShadowProperty('effect')}");
-                if ($minorGridlines->getShadowProperty('blur') !== null) {
-                    $objWriter->writeAttribute('blurRad', $minorGridlines->getShadowProperty('blur'));
-                }
-                if ($minorGridlines->getShadowProperty('distance') !== null) {
-                    $objWriter->writeAttribute('dist', $minorGridlines->getShadowProperty('distance'));
-                }
-                if ($minorGridlines->getShadowProperty('direction') !== null) {
-                    $objWriter->writeAttribute('dir', $minorGridlines->getShadowProperty('direction'));
-                }
-                if ($minorGridlines->getShadowProperty('algn') !== null) {
-                    $objWriter->writeAttribute('algn', $minorGridlines->getShadowProperty('algn'));
-                }
-                if ($minorGridlines->getShadowProperty(['size', 'sx']) !== null) {
-                    $objWriter->writeAttribute('sx', $minorGridlines->getShadowProperty(['size', 'sx']));
-                }
-                if ($minorGridlines->getShadowProperty(['size', 'sy']) !== null) {
-                    $objWriter->writeAttribute('sy', $minorGridlines->getShadowProperty(['size', 'sy']));
-                }
-                if ($minorGridlines->getShadowProperty(['size', 'kx']) !== null) {
-                    $objWriter->writeAttribute('kx', $minorGridlines->getShadowProperty(['size', 'kx']));
-                }
-                if ($minorGridlines->getShadowProperty('rotWithShape') !== null) {
-                    $objWriter->writeAttribute('rotWithShape', $minorGridlines->getShadowProperty('rotWithShape'));
-                }
-                $objWriter->startElement("a:{$minorGridlines->getShadowProperty(['color', 'type'])}");
-                $objWriter->writeAttribute('val', $minorGridlines->getShadowProperty(['color', 'value']));
-                $objWriter->startElement('a:alpha');
-                $objWriter->writeAttribute('val', $minorGridlines->getShadowProperty(['color', 'alpha']));
-                $objWriter->endElement(); //end alpha
-                $objWriter->endElement(); //end color:type
-                $objWriter->endElement(); //end shadow
-            }
-
-            if ($minorGridlines->getSoftEdgesSize() !== null) {
-                $objWriter->startElement('a:softEdge');
-                $objWriter->writeAttribute('rad', $minorGridlines->getSoftEdgesSize());
-                $objWriter->endElement(); //end softEdge
-            }
-
-            $objWriter->endElement(); //end effectLst
+            $this->writeLineStyles($objWriter, $minorGridlines);
+            $this->writeEffects($objWriter, $minorGridlines);
             $objWriter->endElement(); //end spPr
             $objWriter->endElement(); //end minorGridLines
         }
 
         if ($yAxisLabel !== null) {
             $objWriter->startElement('c:title');
-            $objWriter->startElement('c:tx');
-            $objWriter->startElement('c:rich');
+            $caption = $yAxisLabel->getCaption();
+            if ($caption !== null) {
+                $objWriter->startElement('c:tx');
+                $objWriter->startElement('c:rich');
 
-            $objWriter->startElement('a:bodyPr');
-            $objWriter->endElement();
+                $objWriter->startElement('a:bodyPr');
+                $objWriter->endElement(); // a:bodyPr
 
-            $objWriter->startElement('a:lstStyle');
-            $objWriter->endElement();
+                $objWriter->startElement('a:lstStyle');
+                $objWriter->endElement(); // a:lstStyle
 
-            $objWriter->startElement('a:p');
-            $objWriter->startElement('a:r');
+                $objWriter->startElement('a:p');
 
-            $caption = $yAxisLabel->getCaption();
-            if (is_array($caption)) {
-                $caption = $caption[0];
-            }
-
-            $objWriter->startElement('a:t');
-            $objWriter->writeRawData(StringHelper::controlCharacterPHP2OOXML($caption));
-            $objWriter->endElement();
+                if (is_array($caption)) {
+                    $caption = $caption[0];
+                }
+                $this->getParentWriter()->getWriterPartstringtable()->writeRichTextForCharts($objWriter, $caption, 'a');
 
-            $objWriter->endElement();
-            $objWriter->endElement();
-            $objWriter->endElement();
-            $objWriter->endElement();
+                $objWriter->endElement(); // a:p
+                $objWriter->endElement(); // c:rich
+                $objWriter->endElement(); // c:tx
+            }
 
             if ($groupType !== DataSeries::TYPE_BUBBLECHART) {
                 $layout = $yAxisLabel->getLayout();
-                $this->writeLayout($objWriter, $layout);
-            }
-
-            $objWriter->startElement('c:overlay');
-            $objWriter->writeAttribute('val', 0);
-            $objWriter->endElement();
-
-            $objWriter->endElement();
-        }
-
-        $objWriter->startElement('c:numFmt');
-        $objWriter->writeAttribute('formatCode', $xAxis->getAxisNumberFormat());
-        $objWriter->writeAttribute('sourceLinked', $xAxis->getAxisNumberSourceLinked());
-        $objWriter->endElement();
-
-        $objWriter->startElement('c:majorTickMark');
-        $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('major_tick_mark'));
-        $objWriter->endElement();
-
-        $objWriter->startElement('c:minorTickMark');
-        $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('minor_tick_mark'));
-        $objWriter->endElement();
-
-        $objWriter->startElement('c:tickLblPos');
-        $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('axis_labels'));
-        $objWriter->endElement();
-
-        $objWriter->startElement('c:spPr');
-
-        if ($xAxis->getFillProperty('value') !== null) {
-            $objWriter->startElement('a:solidFill');
-            $objWriter->startElement('a:' . $xAxis->getFillProperty('type'));
-            $objWriter->writeAttribute('val', $xAxis->getFillProperty('value'));
-            $objWriter->startElement('a:alpha');
-            $objWriter->writeAttribute('val', $xAxis->getFillProperty('alpha'));
-            $objWriter->endElement();
-            $objWriter->endElement();
-            $objWriter->endElement();
-        }
-
-        $objWriter->startElement('a:ln');
-
-        $objWriter->writeAttribute('w', $xAxis->getLineStyleProperty('width'));
-        $objWriter->writeAttribute('cap', $xAxis->getLineStyleProperty('cap'));
-        $objWriter->writeAttribute('cmpd', $xAxis->getLineStyleProperty('compound'));
-
-        if ($xAxis->getLineProperty('value') !== null) {
-            $objWriter->startElement('a:solidFill');
-            $objWriter->startElement('a:' . $xAxis->getLineProperty('type'));
-            $objWriter->writeAttribute('val', $xAxis->getLineProperty('value'));
-            $objWriter->startElement('a:alpha');
-            $objWriter->writeAttribute('val', $xAxis->getLineProperty('alpha'));
-            $objWriter->endElement();
-            $objWriter->endElement();
-            $objWriter->endElement();
-        }
-
-        $objWriter->startElement('a:prstDash');
-        $objWriter->writeAttribute('val', $xAxis->getLineStyleProperty('dash'));
-        $objWriter->endElement();
-
-        if ($xAxis->getLineStyleProperty('join') == 'miter') {
-            $objWriter->startElement('a:miter');
-            $objWriter->writeAttribute('lim', '800000');
-            $objWriter->endElement();
-        } else {
-            $objWriter->startElement('a:bevel');
-            $objWriter->endElement();
-        }
+                $this->writeLayout($objWriter, $layout);
+            }
 
-        if ($xAxis->getLineStyleProperty(['arrow', 'head', 'type']) !== null) {
-            $objWriter->startElement('a:headEnd');
-            $objWriter->writeAttribute('type', $xAxis->getLineStyleProperty(['arrow', 'head', 'type']));
-            $objWriter->writeAttribute('w', $xAxis->getLineStyleArrowWidth('head'));
-            $objWriter->writeAttribute('len', $xAxis->getLineStyleArrowLength('head'));
-            $objWriter->endElement();
-        }
+            $objWriter->startElement('c:overlay');
+            $objWriter->writeAttribute('val', '0');
+            $objWriter->endElement(); // c:overlay
 
-        if ($xAxis->getLineStyleProperty(['arrow', 'end', 'type']) !== null) {
-            $objWriter->startElement('a:tailEnd');
-            $objWriter->writeAttribute('type', $xAxis->getLineStyleProperty(['arrow', 'end', 'type']));
-            $objWriter->writeAttribute('w', $xAxis->getLineStyleArrowWidth('end'));
-            $objWriter->writeAttribute('len', $xAxis->getLineStyleArrowLength('end'));
-            $objWriter->endElement();
+            $objWriter->endElement(); // c:title
         }
 
+        $objWriter->startElement('c:numFmt');
+        $objWriter->writeAttribute('formatCode', $xAxis->getAxisNumberFormat());
+        $objWriter->writeAttribute('sourceLinked', $xAxis->getAxisNumberSourceLinked());
         $objWriter->endElement();
 
-        $objWriter->startElement('a:effectLst');
-
-        if ($xAxis->getGlowProperty('size') !== null) {
-            $objWriter->startElement('a:glow');
-            $objWriter->writeAttribute('rad', $xAxis->getGlowProperty('size'));
-            $objWriter->startElement("a:{$xAxis->getGlowProperty(['color', 'type'])}");
-            $objWriter->writeAttribute('val', $xAxis->getGlowProperty(['color', 'value']));
-            $objWriter->startElement('a:alpha');
-            $objWriter->writeAttribute('val', $xAxis->getGlowProperty(['color', 'alpha']));
+        if (!empty($xAxis->getAxisOptionsProperty('major_tick_mark'))) {
+            $objWriter->startElement('c:majorTickMark');
+            $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('major_tick_mark'));
             $objWriter->endElement();
+        }
+
+        if (!empty($xAxis->getAxisOptionsProperty('minor_tick_mark'))) {
+            $objWriter->startElement('c:minorTickMark');
+            $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('minor_tick_mark'));
             $objWriter->endElement();
+        }
+
+        if (!empty($xAxis->getAxisOptionsProperty('axis_labels'))) {
+            $objWriter->startElement('c:tickLblPos');
+            $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('axis_labels'));
             $objWriter->endElement();
         }
 
-        if ($xAxis->getShadowProperty('presets') !== null) {
-            $objWriter->startElement("a:{$xAxis->getShadowProperty('effect')}");
+        $textRotation = $xAxis->getAxisOptionsProperty('textRotation');
+        $axisText = $xAxis->getAxisText();
 
-            if ($xAxis->getShadowProperty('blur') !== null) {
-                $objWriter->writeAttribute('blurRad', $xAxis->getShadowProperty('blur'));
-            }
-            if ($xAxis->getShadowProperty('distance') !== null) {
-                $objWriter->writeAttribute('dist', $xAxis->getShadowProperty('distance'));
-            }
-            if ($xAxis->getShadowProperty('direction') !== null) {
-                $objWriter->writeAttribute('dir', $xAxis->getShadowProperty('direction'));
-            }
-            if ($xAxis->getShadowProperty('algn') !== null) {
-                $objWriter->writeAttribute('algn', $xAxis->getShadowProperty('algn'));
-            }
-            if ($xAxis->getShadowProperty(['size', 'sx']) !== null) {
-                $objWriter->writeAttribute('sx', $xAxis->getShadowProperty(['size', 'sx']));
-            }
-            if ($xAxis->getShadowProperty(['size', 'sy']) !== null) {
-                $objWriter->writeAttribute('sy', $xAxis->getShadowProperty(['size', 'sy']));
-            }
-            if ($xAxis->getShadowProperty(['size', 'kx']) !== null) {
-                $objWriter->writeAttribute('kx', $xAxis->getShadowProperty(['size', 'kx']));
-            }
-            if ($xAxis->getShadowProperty('rotWithShape') !== null) {
-                $objWriter->writeAttribute('rotWithShape', $xAxis->getShadowProperty('rotWithShape'));
+        if ($axisText !== null || is_numeric($textRotation)) {
+            $objWriter->startElement('c:txPr');
+            $objWriter->startElement('a:bodyPr');
+            if (is_numeric($textRotation)) {
+                $objWriter->writeAttribute('rot', Properties::angleToXml((float) $textRotation));
             }
+            $objWriter->endElement(); // a:bodyPr
+            $objWriter->startElement('a:lstStyle');
+            $objWriter->endElement(); // a:lstStyle
 
-            $objWriter->startElement("a:{$xAxis->getShadowProperty(['color', 'type'])}");
-            $objWriter->writeAttribute('val', $xAxis->getShadowProperty(['color', 'value']));
-            $objWriter->startElement('a:alpha');
-            $objWriter->writeAttribute('val', $xAxis->getShadowProperty(['color', 'alpha']));
-            $objWriter->endElement();
-            $objWriter->endElement();
-
-            $objWriter->endElement();
-        }
+            $this->writeLabelFont($objWriter, ($axisText === null) ? null : $axisText->getFont(), $axisText);
 
-        if ($xAxis->getSoftEdgesSize() !== null) {
-            $objWriter->startElement('a:softEdge');
-            $objWriter->writeAttribute('rad', $xAxis->getSoftEdgesSize());
-            $objWriter->endElement();
+            $objWriter->endElement(); // c:txPr
         }
 
-        $objWriter->endElement(); //effectList
+        $objWriter->startElement('c:spPr');
+        $this->writeColor($objWriter, $xAxis->getFillColorObject());
+        $this->writeLineStyles($objWriter, $xAxis, $xAxis->getNoFill());
+        $this->writeEffects($objWriter, $xAxis);
         $objWriter->endElement(); //end spPr
 
-        if ($id1 > 0) {
+        if ($id1 !== '0') {
             $objWriter->startElement('c:crossAx');
-            $objWriter->writeAttribute('val', $id2);
+            $objWriter->writeAttribute('val', $id1);
             $objWriter->endElement();
 
             if ($xAxis->getAxisOptionsProperty('horizontal_crosses_value') !== null) {
@@ -942,14 +951,36 @@ private function writeValueAxis($objWriter, $yAxisLabel, $groupType, $id1, $id2,
                 $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('horizontal_crosses_value'));
                 $objWriter->endElement();
             } else {
-                $objWriter->startElement('c:crosses');
-                $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('horizontal_crosses'));
+                $crosses = $xAxis->getAxisOptionsProperty('horizontal_crosses');
+                if ($crosses) {
+                    $objWriter->startElement('c:crosses');
+                    $objWriter->writeAttribute('val', $crosses);
+                    $objWriter->endElement();
+                }
+            }
+
+            $crossBetween = $xAxis->getCrossBetween();
+            if ($crossBetween !== '') {
+                $objWriter->startElement('c:crossBetween');
+                $objWriter->writeAttribute('val', $crossBetween);
                 $objWriter->endElement();
             }
 
-            $objWriter->startElement('c:crossBetween');
-            $objWriter->writeAttribute('val', 'midCat');
-            $objWriter->endElement();
+            if ($xAxis->getAxisType() === Axis::AXIS_TYPE_VALUE) {
+                $dispUnits = $xAxis->getAxisOptionsProperty('dispUnitsBuiltIn');
+                $dispUnits = ($dispUnits == Axis::TRILLION_INDEX) ? Axis::DISP_UNITS_TRILLIONS : (is_numeric($dispUnits) ? (Axis::DISP_UNITS_BUILTIN_INT[(int) $dispUnits] ?? '') : $dispUnits);
+                if (in_array($dispUnits, Axis::DISP_UNITS_BUILTIN_INT, true)) {
+                    $objWriter->startElement('c:dispUnits');
+                    $objWriter->startElement('c:builtInUnit');
+                    $objWriter->writeAttribute('val', $dispUnits);
+                    $objWriter->endElement(); // c:builtInUnit
+                    if ($xAxis->getDispUnitsTitle() !== null) {
+                        // TODO output title elements
+                        $objWriter->writeElement('c:dispUnitsLbl');
+                    }
+                    $objWriter->endElement(); // c:dispUnits
+                }
+            }
 
             if ($xAxis->getAxisOptionsProperty('major_unit') !== null) {
                 $objWriter->startElement('c:majorUnit');
@@ -967,7 +998,7 @@ private function writeValueAxis($objWriter, $yAxisLabel, $groupType, $id1, $id2,
         if ($isMultiLevelSeries) {
             if ($groupType !== DataSeries::TYPE_BUBBLECHART) {
                 $objWriter->startElement('c:noMultiLvlLbl');
-                $objWriter->writeAttribute('val', 0);
+                $objWriter->writeAttribute('val', '0');
                 $objWriter->endElement();
             }
         }
@@ -975,28 +1006,78 @@ private function writeValueAxis($objWriter, $yAxisLabel, $groupType, $id1, $id2,
         $objWriter->endElement();
     }
 
+    /**
+     * Write Ser Axis, for Surface chart.
+     */
+    private function writeSerAxis(XMLWriter $objWriter, string $id2, string $id3): void
+    {
+        $objWriter->startElement('c:serAx');
+
+        $objWriter->startElement('c:axId');
+        $objWriter->writeAttribute('val', $id3);
+        $objWriter->endElement(); // axId
+
+        $objWriter->startElement('c:scaling');
+        $objWriter->startElement('c:orientation');
+        $objWriter->writeAttribute('val', 'minMax');
+        $objWriter->endElement(); // orientation
+        $objWriter->endElement(); // scaling
+
+        $objWriter->startElement('c:delete');
+        $objWriter->writeAttribute('val', '0');
+        $objWriter->endElement(); // delete
+
+        $objWriter->startElement('c:axPos');
+        $objWriter->writeAttribute('val', 'b');
+        $objWriter->endElement(); // axPos
+
+        $objWriter->startElement('c:majorTickMark');
+        $objWriter->writeAttribute('val', 'out');
+        $objWriter->endElement(); // majorTickMark
+
+        $objWriter->startElement('c:minorTickMark');
+        $objWriter->writeAttribute('val', 'none');
+        $objWriter->endElement(); // minorTickMark
+
+        $objWriter->startElement('c:tickLblPos');
+        $objWriter->writeAttribute('val', 'nextTo');
+        $objWriter->endElement(); // tickLblPos
+
+        $objWriter->startElement('c:crossAx');
+        $objWriter->writeAttribute('val', $id2);
+        $objWriter->endElement(); // crossAx
+
+        $objWriter->startElement('c:crosses');
+        $objWriter->writeAttribute('val', 'autoZero');
+        $objWriter->endElement(); // crosses
+
+        $objWriter->endElement(); //serAx
+    }
+
     /**
      * Get the data series type(s) for a chart plot series.
      *
-     * @param PlotArea $plotArea
-     *
-     * @return array|string
+     * @return string[]
      */
-    private static function getChartType($plotArea)
+    private static function getChartType(PlotArea $plotArea): array
     {
         $groupCount = $plotArea->getPlotGroupCount();
 
         if ($groupCount == 1) {
-            $chartType = [$plotArea->getPlotGroupByIndex(0)->getPlotType()];
+            $plotType = $plotArea->getPlotGroupByIndex(0)->getPlotType();
+            $chartType = ($plotType === null) ? [] : [$plotType];
         } else {
             $chartTypes = [];
             for ($i = 0; $i < $groupCount; ++$i) {
-                $chartTypes[] = $plotArea->getPlotGroupByIndex($i)->getPlotType();
+                $plotType = $plotArea->getPlotGroupByIndex($i)->getPlotType();
+                if ($plotType !== null) {
+                    $chartTypes[] = $plotType;
+                }
             }
             $chartType = array_unique($chartTypes);
-            if (count($chartTypes) == 0) {
-                throw new WriterException('Chart is not yet implemented');
-            }
+        }
+        if (count($chartType) == 0) {
+            throw new WriterException('Chart is not yet implemented');
         }
 
         return $chartType;
@@ -1004,47 +1085,34 @@ private static function getChartType($plotArea)
 
     /**
      * Method writing plot series values.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param int       $val       value for idx (default: 3)
-     * @param string    $fillColor hex color (default: FF9900)
-     *
-     * @return XMLWriter XML Writer
      */
-    private function writePlotSeriesValuesElement($objWriter, $val = 3, $fillColor = 'FF9900')
+    private function writePlotSeriesValuesElement(XMLWriter $objWriter, int $val, ?ChartColor $fillColor): void
     {
+        if ($fillColor === null || !$fillColor->isUsable()) {
+            return;
+        }
         $objWriter->startElement('c:dPt');
-        $objWriter->startElement('c:idx');
-        $objWriter->writeAttribute('val', $val);
-        $objWriter->endElement();
 
-        $objWriter->startElement('c:bubble3D');
-        $objWriter->writeAttribute('val', 0);
-        $objWriter->endElement();
+        $objWriter->startElement('c:idx');
+        $objWriter->writeAttribute('val', "$val");
+        $objWriter->endElement(); // c:idx
 
         $objWriter->startElement('c:spPr');
-        $objWriter->startElement('a:solidFill');
-        $objWriter->startElement('a:srgbClr');
-        $objWriter->writeAttribute('val', $fillColor);
-        $objWriter->endElement();
-        $objWriter->endElement();
-        $objWriter->endElement();
-        $objWriter->endElement();
+        $this->writeColor($objWriter, $fillColor);
+        $objWriter->endElement(); // c:spPr
 
-        return $objWriter;
+        $objWriter->endElement(); // c:dPt
     }
 
     /**
      * Write Plot Group (series of related plots).
      *
-     * @param DataSeries $plotGroup
      * @param string $groupType Type of plot for dataseries
-     * @param XMLWriter $objWriter XML Writer
      * @param bool $catIsMultiLevelSeries Is category a multi-series category
      * @param bool $valIsMultiLevelSeries Is value set a multi-series set
      * @param string $plotGroupingType Type of grouping for multi-series values
      */
-    private function writePlotGroup($plotGroup, $groupType, $objWriter, &$catIsMultiLevelSeries, &$valIsMultiLevelSeries, &$plotGroupingType): void
+    private function writePlotGroup(?DataSeries $plotGroup, string $groupType, XMLWriter $objWriter, bool &$catIsMultiLevelSeries, bool &$valIsMultiLevelSeries, string &$plotGroupingType): void
     {
         if ($plotGroup === null) {
             return;
@@ -1056,8 +1124,8 @@ private function writePlotGroup($plotGroup, $groupType, $objWriter, &$catIsMulti
             $objWriter->endElement();
         }
 
-        if ($plotGroup->getPlotGrouping() !== null) {
-            $plotGroupingType = $plotGroup->getPlotGrouping();
+        $plotGroupingType = $plotGroup->getPlotGrouping();
+        if ($plotGroupingType !== null && $groupType !== DataSeries::TYPE_SURFACECHART && $groupType !== DataSeries::TYPE_SURFACECHART_3D) {
             $objWriter->startElement('c:grouping');
             $objWriter->writeAttribute('val', $plotGroupingType);
             $objWriter->endElement();
@@ -1071,11 +1139,11 @@ private function writePlotGroup($plotGroup, $groupType, $objWriter, &$catIsMulti
             if ($groupType !== DataSeries::TYPE_LINECHART) {
                 if (($groupType == DataSeries::TYPE_PIECHART) || ($groupType == DataSeries::TYPE_PIECHART_3D) || ($groupType == DataSeries::TYPE_DONUTCHART) || ($plotSeriesCount > 1)) {
                     $objWriter->startElement('c:varyColors');
-                    $objWriter->writeAttribute('val', 1);
+                    $objWriter->writeAttribute('val', '1');
                     $objWriter->endElement();
                 } else {
                     $objWriter->startElement('c:varyColors');
-                    $objWriter->writeAttribute('val', 0);
+                    $objWriter->writeAttribute('val', '0');
                     $objWriter->endElement();
                 }
             }
@@ -1085,44 +1153,39 @@ private function writePlotGroup($plotGroup, $groupType, $objWriter, &$catIsMulti
         foreach ($plotSeriesOrder as $plotSeriesIdx => $plotSeriesRef) {
             $objWriter->startElement('c:ser');
 
-            $plotLabel = $plotGroup->getPlotLabelByIndex($plotSeriesIdx);
-            if ($plotLabel) {
-                $fillColor = $plotLabel->getFillColor();
-                if ($fillColor !== null && !is_array($fillColor)) {
-                    $objWriter->startElement('c:spPr');
-                    $objWriter->startElement('a:solidFill');
-                    $objWriter->startElement('a:srgbClr');
-                    $objWriter->writeAttribute('val', $fillColor);
-                    $objWriter->endElement();
-                    $objWriter->endElement();
-                    $objWriter->endElement();
-                }
-            }
-
             $objWriter->startElement('c:idx');
-            $objWriter->writeAttribute('val', $this->seriesIndex + $plotSeriesIdx);
+            $adder = array_key_exists(0, $plotSeriesOrder) ? $this->seriesIndex : 0;
+            $objWriter->writeAttribute('val', (string) ($adder + $plotSeriesIdx));
             $objWriter->endElement();
 
             $objWriter->startElement('c:order');
-            $objWriter->writeAttribute('val', $this->seriesIndex + $plotSeriesRef);
+            $objWriter->writeAttribute('val', (string) ($adder + $plotSeriesRef));
             $objWriter->endElement();
 
+            $plotLabel = $plotGroup->getPlotLabelByIndex($plotSeriesIdx);
+            $labelFill = null;
+            if ($plotLabel && $groupType === DataSeries::TYPE_LINECHART) {
+                $labelFill = $plotLabel->getFillColorObject();
+                $labelFill = ($labelFill instanceof ChartColor) ? $labelFill : null;
+            }
+
             //    Values
-            $plotSeriesValues = $plotGroup->getPlotValuesByIndex($plotSeriesRef);
+            $plotSeriesValues = $plotGroup->getPlotValuesByIndex($plotSeriesIdx);
 
-            if (($groupType == DataSeries::TYPE_PIECHART) || ($groupType == DataSeries::TYPE_PIECHART_3D) || ($groupType == DataSeries::TYPE_DONUTCHART)) {
-                $fillColorValues = $plotSeriesValues->getFillColor();
+            if ($plotSeriesValues !== false && in_array($groupType, self::CUSTOM_COLOR_TYPES, true)) {
+                $fillColorValues = $plotSeriesValues->getFillColorObject();
                 if ($fillColorValues !== null && is_array($fillColorValues)) {
-                    foreach ($plotSeriesValues->getDataValues() as $dataKey => $dataValue) {
-                        $this->writePlotSeriesValuesElement($objWriter, $dataKey, ($fillColorValues[$dataKey] ?? 'FF9900'));
+                    foreach (($plotSeriesValues->getDataValues() ?? []) as $dataKey => $dataValue) {
+                        $this->writePlotSeriesValuesElement($objWriter, $dataKey, $fillColorValues[$dataKey] ?? null);
                     }
-                } else {
-                    $this->writePlotSeriesValuesElement($objWriter);
                 }
             }
+            if ($plotSeriesValues !== false && $plotSeriesValues->getLabelLayout()) {
+                $this->writeDataLabels($objWriter, $plotSeriesValues->getLabelLayout());
+            }
 
             //    Labels
-            $plotSeriesLabel = $plotGroup->getPlotLabelByIndex($plotSeriesRef);
+            $plotSeriesLabel = $plotGroup->getPlotLabelByIndex($plotSeriesIdx);
             if ($plotSeriesLabel && ($plotSeriesLabel->getPointCount() > 0)) {
                 $objWriter->startElement('c:tx');
                 $objWriter->startElement('c:strRef');
@@ -1132,35 +1195,62 @@ private function writePlotGroup($plotGroup, $groupType, $objWriter, &$catIsMulti
             }
 
             //    Formatting for the points
-            if (($groupType == DataSeries::TYPE_LINECHART) || ($groupType == DataSeries::TYPE_STOCKCHART)) {
-                $plotLineWidth = 12700;
-                if ($plotSeriesValues) {
-                    $plotLineWidth = $plotSeriesValues->getLineWidth();
-                }
-
+            if (
+                $plotSeriesValues !== false
+            ) {
                 $objWriter->startElement('c:spPr');
-                $objWriter->startElement('a:ln');
-                $objWriter->writeAttribute('w', $plotLineWidth);
-                if ($groupType == DataSeries::TYPE_STOCKCHART) {
-                    $objWriter->startElement('a:noFill');
-                    $objWriter->endElement();
+                if ($plotLabel && $groupType !== DataSeries::TYPE_LINECHART) {
+                    $fillColor = $plotLabel->getFillColorObject();
+                    if ($fillColor !== null && !is_array($fillColor) && $fillColor->isUsable()) {
+                        $this->writeColor($objWriter, $fillColor);
+                    }
                 }
-                $objWriter->endElement();
-                $objWriter->endElement();
+                $fillObject = $labelFill ?? $plotSeriesValues->getFillColorObject();
+                $callLineStyles = true;
+                if ($fillObject instanceof ChartColor && $fillObject->isUsable()) {
+                    if ($groupType === DataSeries::TYPE_LINECHART) {
+                        $objWriter->startElement('a:ln');
+                        $callLineStyles = false;
+                    }
+                    $this->writeColor($objWriter, $fillObject);
+                    if (!$callLineStyles) {
+                        $objWriter->endElement(); // a:ln
+                    }
+                }
+                $nofill = $groupType === DataSeries::TYPE_STOCKCHART || (($groupType === DataSeries::TYPE_SCATTERCHART || $groupType === DataSeries::TYPE_LINECHART) && !$plotSeriesValues->getScatterLines());
+                if ($callLineStyles) {
+                    $this->writeLineStyles($objWriter, $plotSeriesValues, $nofill);
+                    $this->writeEffects($objWriter, $plotSeriesValues);
+                }
+                $objWriter->endElement(); // c:spPr
             }
 
             if ($plotSeriesValues) {
                 $plotSeriesMarker = $plotSeriesValues->getPointMarker();
-                if ($plotSeriesMarker) {
+                $markerFillColor = $plotSeriesValues->getMarkerFillColor();
+                $fillUsed = $markerFillColor->IsUsable();
+                $markerBorderColor = $plotSeriesValues->getMarkerBorderColor();
+                $borderUsed = $markerBorderColor->isUsable();
+                if ($plotSeriesMarker || $fillUsed || $borderUsed) {
                     $objWriter->startElement('c:marker');
                     $objWriter->startElement('c:symbol');
-                    $objWriter->writeAttribute('val', $plotSeriesMarker);
+                    if ($plotSeriesMarker) {
+                        $objWriter->writeAttribute('val', $plotSeriesMarker);
+                    }
                     $objWriter->endElement();
 
                     if ($plotSeriesMarker !== 'none') {
                         $objWriter->startElement('c:size');
-                        $objWriter->writeAttribute('val', 3);
-                        $objWriter->endElement();
+                        $objWriter->writeAttribute('val', (string) $plotSeriesValues->getPointSize());
+                        $objWriter->endElement(); // c:size
+                        $objWriter->startElement('c:spPr');
+                        $this->writeColor($objWriter, $markerFillColor);
+                        if ($borderUsed) {
+                            $objWriter->startElement('a:ln');
+                            $this->writeColor($objWriter, $markerBorderColor);
+                            $objWriter->endElement(); // a:ln
+                        }
+                        $objWriter->endElement(); // spPr
                     }
 
                     $objWriter->endElement();
@@ -1169,23 +1259,103 @@ private function writePlotGroup($plotGroup, $groupType, $objWriter, &$catIsMulti
 
             if (($groupType === DataSeries::TYPE_BARCHART) || ($groupType === DataSeries::TYPE_BARCHART_3D) || ($groupType === DataSeries::TYPE_BUBBLECHART)) {
                 $objWriter->startElement('c:invertIfNegative');
-                $objWriter->writeAttribute('val', 0);
+                $objWriter->writeAttribute('val', '0');
                 $objWriter->endElement();
             }
+            // Trendlines
+            if ($plotSeriesValues !== false) {
+                foreach ($plotSeriesValues->getTrendLines() as $trendLine) {
+                    $trendLineType = $trendLine->getTrendLineType();
+                    $order = $trendLine->getOrder();
+                    $period = $trendLine->getPeriod();
+                    $dispRSqr = $trendLine->getDispRSqr();
+                    $dispEq = $trendLine->getDispEq();
+                    $forward = $trendLine->getForward();
+                    $backward = $trendLine->getBackward();
+                    $intercept = $trendLine->getIntercept();
+                    $name = $trendLine->getName();
+                    $trendLineColor = $trendLine->getLineColor(); // ChartColor
+
+                    $objWriter->startElement('c:trendline'); // N.B. lowercase 'ell'
+                    if ($name !== '') {
+                        $objWriter->startElement('c:name');
+                        $objWriter->writeRawData($name);
+                        $objWriter->endElement(); // c:name
+                    }
+                    $objWriter->startElement('c:spPr');
+
+                    if (!$trendLineColor->isUsable()) {
+                        // use dataSeriesValues line color as a backup if $trendLineColor is null
+                        $dsvLineColor = $plotSeriesValues->getLineColor();
+                        if ($dsvLineColor->isUsable()) {
+                            $trendLine
+                                ->getLineColor()
+                                ->setColorProperties($dsvLineColor->getValue(), $dsvLineColor->getAlpha(), $dsvLineColor->getType());
+                        }
+                    } // otherwise, hope Excel does the right thing
+
+                    $this->writeLineStyles($objWriter, $trendLine, false); // suppress noFill
+
+                    $objWriter->endElement(); // spPr
+
+                    $objWriter->startElement('c:trendlineType'); // N.B lowercase 'ell'
+                    $objWriter->writeAttribute('val', $trendLineType);
+                    $objWriter->endElement(); // trendlineType
+                    if ($backward !== 0.0) {
+                        $objWriter->startElement('c:backward');
+                        $objWriter->writeAttribute('val', "$backward");
+                        $objWriter->endElement(); // c:backward
+                    }
+                    if ($forward !== 0.0) {
+                        $objWriter->startElement('c:forward');
+                        $objWriter->writeAttribute('val', "$forward");
+                        $objWriter->endElement(); // c:forward
+                    }
+                    if ($intercept !== 0.0) {
+                        $objWriter->startElement('c:intercept');
+                        $objWriter->writeAttribute('val', "$intercept");
+                        $objWriter->endElement(); // c:intercept
+                    }
+                    if ($trendLineType == TrendLine::TRENDLINE_POLYNOMIAL) {
+                        $objWriter->startElement('c:order');
+                        $objWriter->writeAttribute('val', $order);
+                        $objWriter->endElement(); // order
+                    }
+                    if ($trendLineType == TrendLine::TRENDLINE_MOVING_AVG) {
+                        $objWriter->startElement('c:period');
+                        $objWriter->writeAttribute('val', $period);
+                        $objWriter->endElement(); // period
+                    }
+                    $objWriter->startElement('c:dispRSqr');
+                    $objWriter->writeAttribute('val', $dispRSqr ? '1' : '0');
+                    $objWriter->endElement();
+                    $objWriter->startElement('c:dispEq');
+                    $objWriter->writeAttribute('val', $dispEq ? '1' : '0');
+                    $objWriter->endElement();
+                    if ($groupType === DataSeries::TYPE_SCATTERCHART || $groupType === DataSeries::TYPE_LINECHART) {
+                        $objWriter->startElement('c:trendlineLbl');
+                        $objWriter->startElement('c:numFmt');
+                        $objWriter->writeAttribute('formatCode', 'General');
+                        $objWriter->writeAttribute('sourceLinked', '0');
+                        $objWriter->endElement();  // numFmt
+                        $objWriter->endElement();  // trendlineLbl
+                    }
+
+                    $objWriter->endElement(); // trendline
+                }
+            }
 
             //    Category Labels
-            $plotSeriesCategory = $plotGroup->getPlotCategoryByIndex($plotSeriesRef);
+            $plotSeriesCategory = $plotGroup->getPlotCategoryByIndex($plotSeriesIdx);
             if ($plotSeriesCategory && ($plotSeriesCategory->getPointCount() > 0)) {
                 $catIsMultiLevelSeries = $catIsMultiLevelSeries || $plotSeriesCategory->isMultiLevelSeries();
 
                 if (($groupType == DataSeries::TYPE_PIECHART) || ($groupType == DataSeries::TYPE_PIECHART_3D) || ($groupType == DataSeries::TYPE_DONUTCHART)) {
-                    if ($plotGroup->getPlotStyle() !== null) {
-                        $plotStyle = $plotGroup->getPlotStyle();
-                        if ($plotStyle) {
-                            $objWriter->startElement('c:explosion');
-                            $objWriter->writeAttribute('val', 25);
-                            $objWriter->endElement();
-                        }
+                    $plotStyle = $plotGroup->getPlotStyle();
+                    if (is_numeric($plotStyle)) {
+                        $objWriter->startElement('c:explosion');
+                        $objWriter->writeAttribute('val', $plotStyle);
+                        $objWriter->endElement();
                     }
                 }
 
@@ -1195,7 +1365,14 @@ private function writePlotGroup($plotGroup, $groupType, $objWriter, &$catIsMulti
                     $objWriter->startElement('c:cat');
                 }
 
-                $this->writePlotSeriesValues($plotSeriesCategory, $objWriter, $groupType, 'str');
+                // xVals (Categories) are not always 'str'
+                // Test X-axis Label's Datatype to decide 'str' vs 'num'
+                $CategoryDatatype = $plotSeriesCategory->getDataType();
+                if ($CategoryDatatype == DataSeriesValues::DATASERIES_TYPE_NUMBER) {
+                    $this->writePlotSeriesValues($plotSeriesCategory, $objWriter, $groupType, 'num');
+                } else {
+                    $this->writePlotSeriesValues($plotSeriesCategory, $objWriter, $groupType, 'str');
+                }
                 $objWriter->endElement();
             }
 
@@ -1211,10 +1388,31 @@ private function writePlotGroup($plotGroup, $groupType, $objWriter, &$catIsMulti
 
                 $this->writePlotSeriesValues($plotSeriesValues, $objWriter, $groupType, 'num');
                 $objWriter->endElement();
+                if ($groupType === DataSeries::TYPE_SCATTERCHART && $plotGroup->getPlotStyle() === 'smoothMarker') {
+                    $objWriter->startElement('c:smooth');
+                    $objWriter->writeAttribute('val', $plotSeriesValues->getSmoothLine() ? '1' : '0');
+                    $objWriter->endElement();
+                }
             }
 
             if ($groupType === DataSeries::TYPE_BUBBLECHART) {
-                $this->writeBubbles($plotSeriesValues, $objWriter);
+                if (!empty($plotGroup->getPlotBubbleSizes()[$plotSeriesIdx])) {
+                    $objWriter->startElement('c:bubbleSize');
+                    $this->writePlotSeriesValues(
+                        $plotGroup->getPlotBubbleSizes()[$plotSeriesIdx],
+                        $objWriter,
+                        $groupType,
+                        'num'
+                    );
+                    $objWriter->endElement();
+                    if ($plotSeriesValues !== false) {
+                        $objWriter->startElement('c:bubble3D');
+                        $objWriter->writeAttribute('val', $plotSeriesValues->getBubble3D() ? '1' : '0');
+                        $objWriter->endElement();
+                    }
+                } elseif ($plotSeriesValues !== false) {
+                    $this->writeBubbles($plotSeriesValues, $objWriter);
+                }
             }
 
             $objWriter->endElement();
@@ -1225,11 +1423,8 @@ private function writePlotGroup($plotGroup, $groupType, $objWriter, &$catIsMulti
 
     /**
      * Write Plot Series Label.
-     *
-     * @param DataSeriesValues $plotSeriesLabel
-     * @param XMLWriter $objWriter XML Writer
      */
-    private function writePlotSeriesLabel($plotSeriesLabel, $objWriter): void
+    private function writePlotSeriesLabel(?DataSeriesValues $plotSeriesLabel, XMLWriter $objWriter): void
     {
         if ($plotSeriesLabel === null) {
             return;
@@ -1241,10 +1436,10 @@ private function writePlotSeriesLabel($plotSeriesLabel, $objWriter): void
 
         $objWriter->startElement('c:strCache');
         $objWriter->startElement('c:ptCount');
-        $objWriter->writeAttribute('val', $plotSeriesLabel->getPointCount());
+        $objWriter->writeAttribute('val', (string) $plotSeriesLabel->getPointCount());
         $objWriter->endElement();
 
-        foreach ($plotSeriesLabel->getDataValues() as $plotLabelKey => $plotLabelValue) {
+        foreach (($plotSeriesLabel->getDataValues() ?? []) as $plotLabelKey => $plotLabelValue) {
             $objWriter->startElement('c:pt');
             $objWriter->writeAttribute('idx', $plotLabelKey);
 
@@ -1259,12 +1454,10 @@ private function writePlotSeriesLabel($plotSeriesLabel, $objWriter): void
     /**
      * Write Plot Series Values.
      *
-     * @param DataSeriesValues $plotSeriesValues
-     * @param XMLWriter $objWriter XML Writer
      * @param string $groupType Type of plot for dataseries
      * @param string $dataType Datatype of series values
      */
-    private function writePlotSeriesValues($plotSeriesValues, XMLWriter $objWriter, $groupType, $dataType = 'str'): void
+    private function writePlotSeriesValues(?DataSeriesValues $plotSeriesValues, XMLWriter $objWriter, string $groupType, string $dataType = 'str'): void
     {
         if ($plotSeriesValues === null) {
             return;
@@ -1282,13 +1475,13 @@ private function writePlotSeriesValues($plotSeriesValues, XMLWriter $objWriter,
             $objWriter->startElement('c:multiLvlStrCache');
 
             $objWriter->startElement('c:ptCount');
-            $objWriter->writeAttribute('val', $plotSeriesValues->getPointCount());
+            $objWriter->writeAttribute('val', (string) $plotSeriesValues->getPointCount());
             $objWriter->endElement();
 
             for ($level = 0; $level < $levelCount; ++$level) {
                 $objWriter->startElement('c:lvl');
 
-                foreach ($plotSeriesValues->getDataValues() as $plotSeriesKey => $plotSeriesValue) {
+                foreach (($plotSeriesValues->getDataValues() ?? []) as $plotSeriesKey => $plotSeriesValue) {
                     if (isset($plotSeriesValue[$level])) {
                         $objWriter->startElement('c:pt');
                         $objWriter->writeAttribute('idx', $plotSeriesKey);
@@ -1313,23 +1506,26 @@ private function writePlotSeriesValues($plotSeriesValues, XMLWriter $objWriter,
             $objWriter->writeRawData($plotSeriesValues->getDataSource());
             $objWriter->endElement();
 
-            $objWriter->startElement('c:' . $dataType . 'Cache');
+            $count = $plotSeriesValues->getPointCount();
+            $source = $plotSeriesValues->getDataSource();
+            $values = $plotSeriesValues->getDataValues();
+            if ($count > 1 || ($count === 1 && is_array($values) && array_key_exists(0, $values) && "=$source" !== (string) $values[0])) {
+                $objWriter->startElement('c:' . $dataType . 'Cache');
 
-            if (($groupType != DataSeries::TYPE_PIECHART) && ($groupType != DataSeries::TYPE_PIECHART_3D) && ($groupType != DataSeries::TYPE_DONUTCHART)) {
-                if (($plotSeriesValues->getFormatCode() !== null) && ($plotSeriesValues->getFormatCode() !== '')) {
-                    $objWriter->startElement('c:formatCode');
-                    $objWriter->writeRawData($plotSeriesValues->getFormatCode());
-                    $objWriter->endElement();
+                if (($groupType != DataSeries::TYPE_PIECHART) && ($groupType != DataSeries::TYPE_PIECHART_3D) && ($groupType != DataSeries::TYPE_DONUTCHART)) {
+                    if (($plotSeriesValues->getFormatCode() !== null) && ($plotSeriesValues->getFormatCode() !== '')) {
+                        $objWriter->startElement('c:formatCode');
+                        $objWriter->writeRawData($plotSeriesValues->getFormatCode());
+                        $objWriter->endElement();
+                    }
                 }
-            }
 
-            $objWriter->startElement('c:ptCount');
-            $objWriter->writeAttribute('val', $plotSeriesValues->getPointCount());
-            $objWriter->endElement();
+                $objWriter->startElement('c:ptCount');
+                $objWriter->writeAttribute('val', (string) $plotSeriesValues->getPointCount());
+                $objWriter->endElement();
 
-            $dataValues = $plotSeriesValues->getDataValues();
-            if (!empty($dataValues)) {
-                if (is_array($dataValues)) {
+                $dataValues = $plotSeriesValues->getDataValues();
+                if (!empty($dataValues)) {
                     foreach ($dataValues as $plotSeriesKey => $plotSeriesValue) {
                         $objWriter->startElement('c:pt');
                         $objWriter->writeAttribute('idx', $plotSeriesKey);
@@ -1340,21 +1536,26 @@ private function writePlotSeriesValues($plotSeriesValues, XMLWriter $objWriter,
                         $objWriter->endElement();
                     }
                 }
-            }
 
-            $objWriter->endElement();
+                $objWriter->endElement(); // *Cache
+            }
 
-            $objWriter->endElement();
+            $objWriter->endElement(); // *Ref
         }
     }
 
+    private const CUSTOM_COLOR_TYPES = [
+        DataSeries::TYPE_BARCHART,
+        DataSeries::TYPE_BARCHART_3D,
+        DataSeries::TYPE_PIECHART,
+        DataSeries::TYPE_PIECHART_3D,
+        DataSeries::TYPE_DONUTCHART,
+    ];
+
     /**
      * Write Bubble Chart Details.
-     *
-     * @param DataSeriesValues $plotSeriesValues
-     * @param XMLWriter $objWriter XML Writer
      */
-    private function writeBubbles($plotSeriesValues, $objWriter): void
+    private function writeBubbles(?DataSeriesValues $plotSeriesValues, XMLWriter $objWriter): void
     {
         if ($plotSeriesValues === null) {
             return;
@@ -1368,20 +1569,18 @@ private function writeBubbles($plotSeriesValues, $objWriter): void
         $objWriter->endElement();
 
         $objWriter->startElement('c:ptCount');
-        $objWriter->writeAttribute('val', $plotSeriesValues->getPointCount());
+        $objWriter->writeAttribute('val', (string) $plotSeriesValues->getPointCount());
         $objWriter->endElement();
 
         $dataValues = $plotSeriesValues->getDataValues();
         if (!empty($dataValues)) {
-            if (is_array($dataValues)) {
-                foreach ($dataValues as $plotSeriesKey => $plotSeriesValue) {
-                    $objWriter->startElement('c:pt');
-                    $objWriter->writeAttribute('idx', $plotSeriesKey);
-                    $objWriter->startElement('c:v');
-                    $objWriter->writeRawData(1);
-                    $objWriter->endElement();
-                    $objWriter->endElement();
-                }
+            foreach ($dataValues as $plotSeriesKey => $plotSeriesValue) {
+                $objWriter->startElement('c:pt');
+                $objWriter->writeAttribute('idx', $plotSeriesKey);
+                $objWriter->startElement('c:v');
+                $objWriter->writeRawData('1');
+                $objWriter->endElement();
+                $objWriter->endElement();
             }
         }
 
@@ -1389,15 +1588,12 @@ private function writeBubbles($plotSeriesValues, $objWriter): void
         $objWriter->endElement();
 
         $objWriter->startElement('c:bubble3D');
-        $objWriter->writeAttribute('val', 0);
+        $objWriter->writeAttribute('val', $plotSeriesValues->getBubble3D() ? '1' : '0');
         $objWriter->endElement();
     }
 
     /**
      * Write Layout.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param Layout $layout
      */
     private function writeLayout(XMLWriter $objWriter, ?Layout $layout = null): void
     {
@@ -1430,28 +1626,28 @@ private function writeLayout(XMLWriter $objWriter, ?Layout $layout = null): void
             $x = $layout->getXPosition();
             if ($x !== null) {
                 $objWriter->startElement('c:x');
-                $objWriter->writeAttribute('val', $x);
+                $objWriter->writeAttribute('val', "$x");
                 $objWriter->endElement();
             }
 
             $y = $layout->getYPosition();
             if ($y !== null) {
                 $objWriter->startElement('c:y');
-                $objWriter->writeAttribute('val', $y);
+                $objWriter->writeAttribute('val', "$y");
                 $objWriter->endElement();
             }
 
             $w = $layout->getWidth();
             if ($w !== null) {
                 $objWriter->startElement('c:w');
-                $objWriter->writeAttribute('val', $w);
+                $objWriter->writeAttribute('val', "$w");
                 $objWriter->endElement();
             }
 
             $h = $layout->getHeight();
             if ($h !== null) {
                 $objWriter->startElement('c:h');
-                $objWriter->writeAttribute('val', $h);
+                $objWriter->writeAttribute('val', "$h");
                 $objWriter->endElement();
             }
 
@@ -1463,17 +1659,15 @@ private function writeLayout(XMLWriter $objWriter, ?Layout $layout = null): void
 
     /**
      * Write Alternate Content block.
-     *
-     * @param XMLWriter $objWriter XML Writer
      */
-    private function writeAlternateContent($objWriter): void
+    private function writeAlternateContent(XMLWriter $objWriter): void
     {
         $objWriter->startElement('mc:AlternateContent');
-        $objWriter->writeAttribute('xmlns:mc', 'http://schemas.openxmlformats.org/markup-compatibility/2006');
+        $objWriter->writeAttribute('xmlns:mc', Namespaces::COMPATIBILITY);
 
         $objWriter->startElement('mc:Choice');
-        $objWriter->writeAttribute('xmlns:c14', 'http://schemas.microsoft.com/office/drawing/2007/8/2/chart');
         $objWriter->writeAttribute('Requires', 'c14');
+        $objWriter->writeAttribute('xmlns:c14', Namespaces::CHART_ALTERNATE);
 
         $objWriter->startElement('c14:style');
         $objWriter->writeAttribute('val', '102');
@@ -1491,10 +1685,8 @@ private function writeAlternateContent($objWriter): void
 
     /**
      * Write Printer Settings.
-     *
-     * @param XMLWriter $objWriter XML Writer
      */
-    private function writePrintSettings($objWriter): void
+    private function writePrintSettings(XMLWriter $objWriter): void
     {
         $objWriter->startElement('c:printSettings');
 
@@ -1502,12 +1694,12 @@ private function writePrintSettings($objWriter): void
         $objWriter->endElement();
 
         $objWriter->startElement('c:pageMargins');
-        $objWriter->writeAttribute('footer', 0.3);
-        $objWriter->writeAttribute('header', 0.3);
-        $objWriter->writeAttribute('r', 0.7);
-        $objWriter->writeAttribute('l', 0.7);
-        $objWriter->writeAttribute('t', 0.75);
-        $objWriter->writeAttribute('b', 0.75);
+        $objWriter->writeAttribute('footer', '0.3');
+        $objWriter->writeAttribute('header', '0.3');
+        $objWriter->writeAttribute('r', '0.7');
+        $objWriter->writeAttribute('l', '0.7');
+        $objWriter->writeAttribute('t', '0.75');
+        $objWriter->writeAttribute('b', '0.75');
         $objWriter->endElement();
 
         $objWriter->startElement('c:pageSetup');
@@ -1516,4 +1708,228 @@ private function writePrintSettings($objWriter): void
 
         $objWriter->endElement();
     }
+
+    private function writeEffects(XMLWriter $objWriter, Properties $yAxis): void
+    {
+        if (
+            !empty($yAxis->getSoftEdgesSize())
+            || !empty($yAxis->getShadowProperty('effect'))
+            || !empty($yAxis->getGlowProperty('size'))
+        ) {
+            $objWriter->startElement('a:effectLst');
+            $this->writeGlow($objWriter, $yAxis);
+            $this->writeShadow($objWriter, $yAxis);
+            $this->writeSoftEdge($objWriter, $yAxis);
+            $objWriter->endElement(); // effectLst
+        }
+    }
+
+    private function writeShadow(XMLWriter $objWriter, Properties $xAxis): void
+    {
+        if (empty($xAxis->getShadowProperty('effect'))) {
+            return;
+        }
+        /** @var string $effect */
+        $effect = $xAxis->getShadowProperty('effect');
+        $objWriter->startElement("a:$effect");
+
+        if (is_numeric($xAxis->getShadowProperty('blur'))) {
+            $objWriter->writeAttribute('blurRad', Properties::pointsToXml((float) $xAxis->getShadowProperty('blur')));
+        }
+        if (is_numeric($xAxis->getShadowProperty('distance'))) {
+            $objWriter->writeAttribute('dist', Properties::pointsToXml((float) $xAxis->getShadowProperty('distance')));
+        }
+        if (is_numeric($xAxis->getShadowProperty('direction'))) {
+            $objWriter->writeAttribute('dir', Properties::angleToXml((float) $xAxis->getShadowProperty('direction')));
+        }
+        $algn = $xAxis->getShadowProperty('algn');
+        if (is_string($algn) && $algn !== '') {
+            $objWriter->writeAttribute('algn', $algn);
+        }
+        foreach (['sx', 'sy'] as $sizeType) {
+            $sizeValue = $xAxis->getShadowProperty(['size', $sizeType]);
+            if (is_numeric($sizeValue)) {
+                $objWriter->writeAttribute($sizeType, Properties::tenthOfPercentToXml((float) $sizeValue));
+            }
+        }
+        foreach (['kx', 'ky'] as $sizeType) {
+            $sizeValue = $xAxis->getShadowProperty(['size', $sizeType]);
+            if (is_numeric($sizeValue)) {
+                $objWriter->writeAttribute($sizeType, Properties::angleToXml((float) $sizeValue));
+            }
+        }
+        $rotWithShape = $xAxis->getShadowProperty('rotWithShape');
+        if (is_numeric($rotWithShape)) {
+            $objWriter->writeAttribute('rotWithShape', (string) (int) $rotWithShape);
+        }
+
+        $this->writeColor($objWriter, $xAxis->getShadowColorObject(), false);
+
+        $objWriter->endElement();
+    }
+
+    private function writeGlow(XMLWriter $objWriter, Properties $yAxis): void
+    {
+        $size = $yAxis->getGlowProperty('size');
+        if (empty($size)) {
+            return;
+        }
+        $objWriter->startElement('a:glow');
+        $objWriter->writeAttribute('rad', Properties::pointsToXml((float) $size));
+        $this->writeColor($objWriter, $yAxis->getGlowColorObject(), false);
+        $objWriter->endElement(); // glow
+    }
+
+    private function writeSoftEdge(XMLWriter $objWriter, Properties $yAxis): void
+    {
+        $softEdgeSize = $yAxis->getSoftEdgesSize();
+        if (empty($softEdgeSize)) {
+            return;
+        }
+        $objWriter->startElement('a:softEdge');
+        $objWriter->writeAttribute('rad', Properties::pointsToXml((float) $softEdgeSize));
+        $objWriter->endElement(); //end softEdge
+    }
+
+    private function writeLineStyles(XMLWriter $objWriter, Properties $gridlines, bool $noFill = false): void
+    {
+        $objWriter->startElement('a:ln');
+        $widthTemp = $gridlines->getLineStyleProperty('width');
+        if (is_numeric($widthTemp)) {
+            $objWriter->writeAttribute('w', Properties::pointsToXml((float) $widthTemp));
+        }
+        $this->writeNotEmpty($objWriter, 'cap', $gridlines->getLineStyleProperty('cap'));
+        $this->writeNotEmpty($objWriter, 'cmpd', $gridlines->getLineStyleProperty('compound'));
+        if ($noFill) {
+            $objWriter->startElement('a:noFill');
+            $objWriter->endElement();
+        } else {
+            $this->writeColor($objWriter, $gridlines->getLineColor());
+        }
+
+        $dash = $gridlines->getLineStyleProperty('dash');
+        if (!empty($dash)) {
+            $objWriter->startElement('a:prstDash');
+            $this->writeNotEmpty($objWriter, 'val', $dash);
+            $objWriter->endElement();
+        }
+
+        if ($gridlines->getLineStyleProperty('join') === 'miter') {
+            $objWriter->startElement('a:miter');
+            $objWriter->writeAttribute('lim', '800000');
+            $objWriter->endElement();
+        } elseif ($gridlines->getLineStyleProperty('join') === 'bevel') {
+            $objWriter->startElement('a:bevel');
+            $objWriter->endElement();
+        }
+
+        if ($gridlines->getLineStyleProperty(['arrow', 'head', 'type'])) {
+            $objWriter->startElement('a:headEnd');
+            $objWriter->writeAttribute('type', $gridlines->getLineStyleProperty(['arrow', 'head', 'type']));
+            $this->writeNotEmpty($objWriter, 'w', $gridlines->getLineStyleArrowWidth('head'));
+            $this->writeNotEmpty($objWriter, 'len', $gridlines->getLineStyleArrowLength('head'));
+            $objWriter->endElement();
+        }
+
+        if ($gridlines->getLineStyleProperty(['arrow', 'end', 'type'])) {
+            $objWriter->startElement('a:tailEnd');
+            $objWriter->writeAttribute('type', $gridlines->getLineStyleProperty(['arrow', 'end', 'type']));
+            $this->writeNotEmpty($objWriter, 'w', $gridlines->getLineStyleArrowWidth('end'));
+            $this->writeNotEmpty($objWriter, 'len', $gridlines->getLineStyleArrowLength('end'));
+            $objWriter->endElement();
+        }
+        $objWriter->endElement(); //end ln
+    }
+
+    private function writeNotEmpty(XMLWriter $objWriter, string $name, ?string $value): void
+    {
+        if ($value !== null && $value !== '') {
+            $objWriter->writeAttribute($name, $value);
+        }
+    }
+
+    private function writeColor(XMLWriter $objWriter, ChartColor $chartColor, bool $solidFill = true): void
+    {
+        $type = $chartColor->getType();
+        $value = $chartColor->getValue();
+        if (!empty($type) && !empty($value)) {
+            if ($solidFill) {
+                $objWriter->startElement('a:solidFill');
+            }
+            $objWriter->startElement("a:$type");
+            $objWriter->writeAttribute('val', $value);
+            $alpha = $chartColor->getAlpha();
+            if (is_numeric($alpha)) {
+                $objWriter->startElement('a:alpha');
+                $objWriter->writeAttribute('val', ChartColor::alphaToXml((int) $alpha));
+                $objWriter->endElement(); // a:alpha
+            }
+            $brightness = $chartColor->getBrightness();
+            if (is_numeric($brightness)) {
+                $brightness = (int) $brightness;
+                $lumOff = 100 - $brightness;
+                $objWriter->startElement('a:lumMod');
+                $objWriter->writeAttribute('val', ChartColor::alphaToXml($brightness));
+                $objWriter->endElement(); // a:lumMod
+                $objWriter->startElement('a:lumOff');
+                $objWriter->writeAttribute('val', ChartColor::alphaToXml($lumOff));
+                $objWriter->endElement(); // a:lumOff
+            }
+            $objWriter->endElement(); //a:srgbClr/schemeClr/prstClr
+            if ($solidFill) {
+                $objWriter->endElement(); //a:solidFill
+            }
+        }
+    }
+
+    private function writeLabelFont(XMLWriter $objWriter, ?Font $labelFont, ?Properties $axisText): void
+    {
+        $objWriter->startElement('a:p');
+        $objWriter->startElement('a:pPr');
+        $objWriter->startElement('a:defRPr');
+        if ($labelFont !== null) {
+            $fontSize = $labelFont->getSize();
+            if (is_numeric($fontSize)) {
+                $fontSize *= (($fontSize < 100) ? 100 : 1);
+                $objWriter->writeAttribute('sz', (string) $fontSize);
+            }
+            if ($labelFont->getBold() === true) {
+                $objWriter->writeAttribute('b', '1');
+            }
+            if ($labelFont->getItalic() === true) {
+                $objWriter->writeAttribute('i', '1');
+            }
+            $cap = $labelFont->getCap();
+            if ($cap !== null) {
+                $objWriter->writeAttribute('cap', $cap);
+            }
+            $fontColor = $labelFont->getChartColor();
+            if ($fontColor !== null) {
+                $this->writeColor($objWriter, $fontColor);
+            }
+        }
+        if ($axisText !== null) {
+            $this->writeEffects($objWriter, $axisText);
+        }
+        if ($labelFont !== null) {
+            if (!empty($labelFont->getLatin())) {
+                $objWriter->startElement('a:latin');
+                $objWriter->writeAttribute('typeface', $labelFont->getLatin());
+                $objWriter->endElement();
+            }
+            if (!empty($labelFont->getEastAsian())) {
+                $objWriter->startElement('a:eastAsian');
+                $objWriter->writeAttribute('typeface', $labelFont->getEastAsian());
+                $objWriter->endElement();
+            }
+            if (!empty($labelFont->getComplexScript())) {
+                $objWriter->startElement('a:complexScript');
+                $objWriter->writeAttribute('typeface', $labelFont->getComplexScript());
+                $objWriter->endElement();
+            }
+        }
+        $objWriter->endElement(); // a:defRPr
+        $objWriter->endElement(); // a:pPr
+        $objWriter->endElement(); // a:p
+    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Comments.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Comments.php
index 51f4248cfa..f42c2427bd 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Comments.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Comments.php
@@ -4,16 +4,26 @@
 
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Comment;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Namespaces;
 use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
+use PhpOffice\PhpSpreadsheet\Style\Alignment;
 
 class Comments extends WriterPart
 {
+    private const VALID_HORIZONTAL_ALIGNMENT = [
+        Alignment::HORIZONTAL_CENTER,
+        Alignment::HORIZONTAL_DISTRIBUTED,
+        Alignment::HORIZONTAL_JUSTIFY,
+        Alignment::HORIZONTAL_LEFT,
+        Alignment::HORIZONTAL_RIGHT,
+    ];
+
     /**
      * Write comments to XML format.
      *
      * @return string XML Output
      */
-    public function writeComments(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $pWorksheet)
+    public function writeComments(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $worksheet): string
     {
         // Create XML writer
         $objWriter = null;
@@ -27,7 +37,7 @@ public function writeComments(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $pWo
         $objWriter->startDocument('1.0', 'UTF-8', 'yes');
 
         // Comments cache
-        $comments = $pWorksheet->getComments();
+        $comments = $worksheet->getComments();
 
         // Authors cache
         $authors = [];
@@ -40,7 +50,7 @@ public function writeComments(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $pWo
 
         // comments
         $objWriter->startElement('comments');
-        $objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/spreadsheetml/2006/main');
+        $objWriter->writeAttribute('xmlns', Namespaces::MAIN);
 
         // Loop through authors
         $objWriter->startElement('authors');
@@ -65,21 +75,20 @@ public function writeComments(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $pWo
     /**
      * Write comment to XML format.
      *
-     * @param XMLWriter $objWriter XML Writer
-     * @param string $pCellReference Cell reference
-     * @param Comment $pComment Comment
-     * @param array $pAuthors Array of authors
+     * @param string $cellReference Cell reference
+     * @param Comment $comment Comment
+     * @param array $authors Array of authors
      */
-    private function writeComment(XMLWriter $objWriter, $pCellReference, Comment $pComment, array $pAuthors): void
+    private function writeComment(XMLWriter $objWriter, string $cellReference, Comment $comment, array $authors): void
     {
         // comment
         $objWriter->startElement('comment');
-        $objWriter->writeAttribute('ref', $pCellReference);
-        $objWriter->writeAttribute('authorId', $pAuthors[$pComment->getAuthor()]);
+        $objWriter->writeAttribute('ref', $cellReference);
+        $objWriter->writeAttribute('authorId', $authors[$comment->getAuthor()]);
 
         // text
         $objWriter->startElement('text');
-        $this->getParentWriter()->getWriterPartstringtable()->writeRichText($objWriter, $pComment->getText());
+        $this->getParentWriter()->getWriterPartstringtable()->writeRichText($objWriter, $comment->getText());
         $objWriter->endElement();
 
         $objWriter->endElement();
@@ -90,7 +99,7 @@ private function writeComment(XMLWriter $objWriter, $pCellReference, Comment $pC
      *
      * @return string XML Output
      */
-    public function writeVMLComments(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $pWorksheet)
+    public function writeVMLComments(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $worksheet): string
     {
         // Create XML writer
         $objWriter = null;
@@ -104,13 +113,13 @@ public function writeVMLComments(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $
         $objWriter->startDocument('1.0', 'UTF-8', 'yes');
 
         // Comments cache
-        $comments = $pWorksheet->getComments();
+        $comments = $worksheet->getComments();
 
         // xml
         $objWriter->startElement('xml');
-        $objWriter->writeAttribute('xmlns:v', 'urn:schemas-microsoft-com:vml');
-        $objWriter->writeAttribute('xmlns:o', 'urn:schemas-microsoft-com:office:office');
-        $objWriter->writeAttribute('xmlns:x', 'urn:schemas-microsoft-com:office:excel');
+        $objWriter->writeAttribute('xmlns:v', Namespaces::URN_VML);
+        $objWriter->writeAttribute('xmlns:o', Namespaces::URN_MSOFFICE);
+        $objWriter->writeAttribute('xmlns:x', Namespaces::URN_EXCEL);
 
         // o:shapelayout
         $objWriter->startElement('o:shapelayout');
@@ -158,28 +167,33 @@ public function writeVMLComments(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $
     /**
      * Write VML comment to XML format.
      *
-     * @param XMLWriter $objWriter XML Writer
-     * @param string $pCellReference Cell reference, eg: 'A1'
-     * @param Comment $pComment Comment
+     * @param string $cellReference Cell reference, eg: 'A1'
+     * @param Comment $comment Comment
      */
-    private function writeVMLComment(XMLWriter $objWriter, $pCellReference, Comment $pComment): void
+    private function writeVMLComment(XMLWriter $objWriter, string $cellReference, Comment $comment): void
     {
         // Metadata
-        [$column, $row] = Coordinate::indexesFromString($pCellReference);
+        [$column, $row] = Coordinate::indexesFromString($cellReference);
         $id = 1024 + $column + $row;
-        $id = substr($id, 0, 4);
+        $id = substr("$id", 0, 4);
 
         // v:shape
         $objWriter->startElement('v:shape');
         $objWriter->writeAttribute('id', '_x0000_s' . $id);
         $objWriter->writeAttribute('type', '#_x0000_t202');
-        $objWriter->writeAttribute('style', 'position:absolute;margin-left:' . $pComment->getMarginLeft() . ';margin-top:' . $pComment->getMarginTop() . ';width:' . $pComment->getWidth() . ';height:' . $pComment->getHeight() . ';z-index:1;visibility:' . ($pComment->getVisible() ? 'visible' : 'hidden'));
-        $objWriter->writeAttribute('fillcolor', '#' . $pComment->getFillColor()->getRGB());
+        $objWriter->writeAttribute('style', 'position:absolute;margin-left:' . $comment->getMarginLeft() . ';margin-top:' . $comment->getMarginTop() . ';width:' . $comment->getWidth() . ';height:' . $comment->getHeight() . ';z-index:1;visibility:' . ($comment->getVisible() ? 'visible' : 'hidden'));
+        $objWriter->writeAttribute('fillcolor', '#' . $comment->getFillColor()->getRGB());
         $objWriter->writeAttribute('o:insetmode', 'auto');
 
         // v:fill
         $objWriter->startElement('v:fill');
-        $objWriter->writeAttribute('color2', '#' . $pComment->getFillColor()->getRGB());
+        $objWriter->writeAttribute('color2', '#' . $comment->getFillColor()->getRGB());
+        if ($comment->hasBackgroundImage()) {
+            $bgImage = $comment->getBackgroundImage();
+            $objWriter->writeAttribute('o:relid', 'rId' . $bgImage->getImageIndex());
+            $objWriter->writeAttribute('o:title', $bgImage->getName());
+            $objWriter->writeAttribute('type', 'frame');
+        }
         $objWriter->endElement();
 
         // v:shadow
@@ -195,12 +209,14 @@ private function writeVMLComment(XMLWriter $objWriter, $pCellReference, Comment
         $objWriter->endElement();
 
         // v:textbox
+        $textBoxArray = [Comment::TEXTBOX_DIRECTION_RTL => 'rtl', Comment::TEXTBOX_DIRECTION_LTR => 'ltr'];
+        $textboxRtl = $textBoxArray[strtolower($comment->getTextBoxDirection())] ?? 'auto';
         $objWriter->startElement('v:textbox');
-        $objWriter->writeAttribute('style', 'mso-direction-alt:auto');
+        $objWriter->writeAttribute('style', "mso-direction-alt:$textboxRtl");
 
         // div
         $objWriter->startElement('div');
-        $objWriter->writeAttribute('style', 'text-align:left');
+        $objWriter->writeAttribute('style', ($textboxRtl === 'rtl' ? 'text-align:right;direction:rtl' : 'text-align:left'));
         $objWriter->endElement();
 
         $objWriter->endElement();
@@ -218,11 +234,17 @@ private function writeVMLComment(XMLWriter $objWriter, $pCellReference, Comment
         // x:AutoFill
         $objWriter->writeElement('x:AutoFill', 'False');
 
+        // x:TextHAlign horizontal alignment of text
+        $alignment = strtolower($comment->getAlignment());
+        if (in_array($alignment, self::VALID_HORIZONTAL_ALIGNMENT, true)) {
+            $objWriter->writeElement('x:TextHAlign', ucfirst($alignment));
+        }
+
         // x:Row
-        $objWriter->writeElement('x:Row', ($row - 1));
+        $objWriter->writeElement('x:Row', (string) ($row - 1));
 
         // x:Column
-        $objWriter->writeElement('x:Column', ($column - 1));
+        $objWriter->writeElement('x:Column', (string) ($column - 1));
 
         $objWriter->endElement();
 
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/ContentTypes.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/ContentTypes.php
index 2cff1a8f6f..b01746cfcb 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/ContentTypes.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/ContentTypes.php
@@ -2,9 +2,11 @@
 
 namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Namespaces;
 use PhpOffice\PhpSpreadsheet\Shared\File;
 use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\Drawing as WorksheetDrawing;
 use PhpOffice\PhpSpreadsheet\Worksheet\MemoryDrawing;
 use PhpOffice\PhpSpreadsheet\Writer\Exception as WriterException;
 
@@ -17,7 +19,7 @@ class ContentTypes extends WriterPart
      *
      * @return string XML Output
      */
-    public function writeContentTypes(Spreadsheet $spreadsheet, $includeCharts = false)
+    public function writeContentTypes(Spreadsheet $spreadsheet, bool $includeCharts = false): string
     {
         // Create XML writer
         $objWriter = null;
@@ -32,7 +34,7 @@ public function writeContentTypes(Spreadsheet $spreadsheet, $includeCharts = fal
 
         // Types
         $objWriter->startElement('Types');
-        $objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/package/2006/content-types');
+        $objWriter->writeAttribute('xmlns', Namespaces::CONTENT_TYPES);
 
         // Theme
         $this->writeOverrideContentType($objWriter, '/xl/theme/theme1.xml', 'application/vnd.openxmlformats-officedocument.theme+xml');
@@ -85,6 +87,16 @@ public function writeContentTypes(Spreadsheet $spreadsheet, $includeCharts = fal
         // Shared strings
         $this->writeOverrideContentType($objWriter, '/xl/sharedStrings.xml', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml');
 
+        // Table
+        $table = 1;
+        for ($i = 0; $i < $sheetCount; ++$i) {
+            $tableCount = $spreadsheet->getSheet($i)->getTableCollection()->count();
+
+            for ($t = 1; $t <= $tableCount; ++$t) {
+                $this->writeOverrideContentType($objWriter, '/xl/tables/table' . $table++ . '.xml', 'application/vnd.openxmlformats-officedocument.spreadsheetml.table+xml');
+            }
+        }
+
         // Add worksheet relationship content types
         $unparsedLoadedData = $spreadsheet->getUnparsedLoadedData();
         $chart = 1;
@@ -121,18 +133,23 @@ public function writeContentTypes(Spreadsheet $spreadsheet, $includeCharts = fal
             $extension = '';
             $mimeType = '';
 
-            if ($this->getParentWriter()->getDrawingHashTable()->getByIndex($i) instanceof \PhpOffice\PhpSpreadsheet\Worksheet\Drawing) {
-                $extension = strtolower($this->getParentWriter()->getDrawingHashTable()->getByIndex($i)->getExtension());
-                $mimeType = $this->getImageMimeType($this->getParentWriter()->getDrawingHashTable()->getByIndex($i)->getPath());
-            } elseif ($this->getParentWriter()->getDrawingHashTable()->getByIndex($i) instanceof MemoryDrawing) {
-                $extension = strtolower($this->getParentWriter()->getDrawingHashTable()->getByIndex($i)->getMimeType());
+            $drawing = $this->getParentWriter()->getDrawingHashTable()->getByIndex($i);
+            if ($drawing instanceof WorksheetDrawing && $drawing->getPath() !== '') {
+                $extension = strtolower($drawing->getExtension());
+                if ($drawing->getIsUrl()) {
+                    $mimeType = image_type_to_mime_type($drawing->getType());
+                } else {
+                    $mimeType = $this->getImageMimeType($drawing->getPath());
+                }
+            } elseif ($drawing instanceof MemoryDrawing) {
+                $extension = strtolower($drawing->getMimeType());
                 $extension = explode('/', $extension);
                 $extension = $extension[1];
 
-                $mimeType = $this->getParentWriter()->getDrawingHashTable()->getByIndex($i)->getMimeType();
+                $mimeType = $drawing->getMimeType();
             }
 
-            if (!isset($aMediaContentTypes[$extension])) {
+            if ($mimeType !== '' && !isset($aMediaContentTypes[$extension])) {
                 $aMediaContentTypes[$extension] = $mimeType;
 
                 $this->writeDefaultContentType($objWriter, $extension, $mimeType);
@@ -141,7 +158,7 @@ public function writeContentTypes(Spreadsheet $spreadsheet, $includeCharts = fal
         if ($spreadsheet->hasRibbonBinObjects()) {
             // Some additional objects in the ribbon ?
             // we need to write "Extension" but not already write for media content
-            $tabRibbonTypes = array_diff($spreadsheet->getRibbonBinObjects('types'), array_keys($aMediaContentTypes));
+            $tabRibbonTypes = array_diff($spreadsheet->getRibbonBinObjects('types') ?? [], array_keys($aMediaContentTypes));
             foreach ($tabRibbonTypes as $aRibbonType) {
                 $mimeType = 'image/.' . $aRibbonType; //we wrote $mimeType like customUI Editor
                 $this->writeDefaultContentType($objWriter, $aRibbonType, $mimeType);
@@ -151,13 +168,37 @@ public function writeContentTypes(Spreadsheet $spreadsheet, $includeCharts = fal
         for ($i = 0; $i < $sheetCount; ++$i) {
             if (count($spreadsheet->getSheet($i)->getHeaderFooter()->getImages()) > 0) {
                 foreach ($spreadsheet->getSheet($i)->getHeaderFooter()->getImages() as $image) {
-                    if (!isset($aMediaContentTypes[strtolower($image->getExtension())])) {
+                    if ($image->getPath() !== '' && !isset($aMediaContentTypes[strtolower($image->getExtension())])) {
                         $aMediaContentTypes[strtolower($image->getExtension())] = $this->getImageMimeType($image->getPath());
 
                         $this->writeDefaultContentType($objWriter, strtolower($image->getExtension()), $aMediaContentTypes[strtolower($image->getExtension())]);
                     }
                 }
             }
+
+            if (count($spreadsheet->getSheet($i)->getComments()) > 0) {
+                foreach ($spreadsheet->getSheet($i)->getComments() as $comment) {
+                    if (!$comment->hasBackgroundImage()) {
+                        continue;
+                    }
+
+                    $bgImage = $comment->getBackgroundImage();
+                    $bgImageExtentionKey = strtolower($bgImage->getImageFileExtensionForSave(false));
+
+                    if (!isset($aMediaContentTypes[$bgImageExtentionKey])) {
+                        $aMediaContentTypes[$bgImageExtentionKey] = $bgImage->getImageMimeType();
+
+                        $this->writeDefaultContentType($objWriter, $bgImageExtentionKey, $aMediaContentTypes[$bgImageExtentionKey]);
+                    }
+                }
+            }
+
+            $bgImage = $spreadsheet->getSheet($i)->getBackgroundImage();
+            $mimeType = $spreadsheet->getSheet($i)->getBackgroundMime();
+            $extension = $spreadsheet->getSheet($i)->getBackgroundExtension();
+            if ($bgImage !== '' && !isset($aMediaContentTypes[$mimeType])) {
+                $this->writeDefaultContentType($objWriter, $extension, $mimeType);
+            }
         }
 
         // unparsed defaults
@@ -174,44 +215,50 @@ public function writeContentTypes(Spreadsheet $spreadsheet, $includeCharts = fal
             }
         }
 
+        // Metadata needed for Dynamic Arrays
+        if ($this->getParentWriter()->useDynamicArrays()) {
+            $this->writeOverrideContentType($objWriter, '/xl/metadata.xml', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheetMetadata+xml');
+        }
+
         $objWriter->endElement();
 
         // Return
         return $objWriter->getData();
     }
 
+    private static int $three = 3; // phpstan silliness
+
     /**
      * Get image mime type.
      *
-     * @param string $pFile Filename
+     * @param string $filename Filename
      *
      * @return string Mime Type
      */
-    private function getImageMimeType($pFile)
+    private function getImageMimeType(string $filename): string
     {
-        if (File::fileExists($pFile)) {
-            $image = getimagesize($pFile);
+        if (File::fileExists($filename)) {
+            $image = getimagesize($filename);
 
-            return image_type_to_mime_type($image[2]);
+            return image_type_to_mime_type((is_array($image) && count($image) >= self::$three) ? $image[2] : 0);
         }
 
-        throw new WriterException("File $pFile does not exist");
+        throw new WriterException("File $filename does not exist");
     }
 
     /**
      * Write Default content type.
      *
-     * @param XMLWriter $objWriter XML Writer
-     * @param string $pPartname Part name
-     * @param string $pContentType Content type
+     * @param string $partName Part name
+     * @param string $contentType Content type
      */
-    private function writeDefaultContentType(XMLWriter $objWriter, $pPartname, $pContentType): void
+    private function writeDefaultContentType(XMLWriter $objWriter, string $partName, string $contentType): void
     {
-        if ($pPartname != '' && $pContentType != '') {
+        if ($partName != '' && $contentType != '') {
             // Write content type
             $objWriter->startElement('Default');
-            $objWriter->writeAttribute('Extension', $pPartname);
-            $objWriter->writeAttribute('ContentType', $pContentType);
+            $objWriter->writeAttribute('Extension', $partName);
+            $objWriter->writeAttribute('ContentType', $contentType);
             $objWriter->endElement();
         } else {
             throw new WriterException('Invalid parameters passed.');
@@ -221,17 +268,16 @@ private function writeDefaultContentType(XMLWriter $objWriter, $pPartname, $pCon
     /**
      * Write Override content type.
      *
-     * @param XMLWriter $objWriter XML Writer
-     * @param string $pPartname Part name
-     * @param string $pContentType Content type
+     * @param string $partName Part name
+     * @param string $contentType Content type
      */
-    private function writeOverrideContentType(XMLWriter $objWriter, $pPartname, $pContentType): void
+    private function writeOverrideContentType(XMLWriter $objWriter, string $partName, string $contentType): void
     {
-        if ($pPartname != '' && $pContentType != '') {
+        if ($partName != '' && $contentType != '') {
             // Write content type
             $objWriter->startElement('Override');
-            $objWriter->writeAttribute('PartName', $pPartname);
-            $objWriter->writeAttribute('ContentType', $pContentType);
+            $objWriter->writeAttribute('PartName', $partName);
+            $objWriter->writeAttribute('ContentType', $contentType);
             $objWriter->endElement();
         } else {
             throw new WriterException('Invalid parameters passed.');
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/DefinedNames.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/DefinedNames.php
index 4c0929dbb2..4dac1855e8 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/DefinedNames.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/DefinedNames.php
@@ -2,18 +2,19 @@
 
 namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 
+use Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\DefinedName;
 use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
-use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet as ActualWorksheet;
 
 class DefinedNames
 {
-    private $objWriter;
+    private XMLWriter $objWriter;
 
-    private $spreadsheet;
+    private Spreadsheet $spreadsheet;
 
     public function __construct(XMLWriter $objWriter, Spreadsheet $spreadsheet)
     {
@@ -63,19 +64,29 @@ private function writeNamedRangesAndFormulae(): void
     /**
      * Write Defined Name for named range.
      */
-    private function writeDefinedName(DefinedName $pDefinedName): void
+    private function writeDefinedName(DefinedName $definedName): void
     {
         // definedName for named range
+        $local = -1;
+        if ($definedName->getLocalOnly() && $definedName->getScope() !== null) {
+            try {
+                $local = $definedName->getScope()->getParentOrThrow()->getIndex($definedName->getScope());
+            } catch (Exception) {
+                // See issue 2266 - deleting sheet which contains
+                //     defined names will cause Exception above.
+                return;
+            }
+        }
         $this->objWriter->startElement('definedName');
-        $this->objWriter->writeAttribute('name', $pDefinedName->getName());
-        if ($pDefinedName->getLocalOnly() && $pDefinedName->getScope() !== null) {
+        $this->objWriter->writeAttribute('name', $definedName->getName());
+        if ($local >= 0) {
             $this->objWriter->writeAttribute(
                 'localSheetId',
-                $pDefinedName->getScope()->getParent()->getIndex($pDefinedName->getScope())
+                "$local"
             );
         }
 
-        $definedRange = $this->getDefinedRange($pDefinedName);
+        $definedRange = $this->getDefinedRange($definedName);
 
         $this->objWriter->writeRawData($definedRange);
 
@@ -85,27 +96,29 @@ private function writeDefinedName(DefinedName $pDefinedName): void
     /**
      * Write Defined Name for autoFilter.
      */
-    private function writeNamedRangeForAutofilter(Worksheet $pSheet, int $pSheetId = 0): void
+    private function writeNamedRangeForAutofilter(ActualWorksheet $worksheet, int $worksheetId = 0): void
     {
         // NamedRange for autoFilter
-        $autoFilterRange = $pSheet->getAutoFilter()->getRange();
+        $autoFilterRange = $worksheet->getAutoFilter()->getRange();
         if (!empty($autoFilterRange)) {
             $this->objWriter->startElement('definedName');
             $this->objWriter->writeAttribute('name', '_xlnm._FilterDatabase');
-            $this->objWriter->writeAttribute('localSheetId', $pSheetId);
+            $this->objWriter->writeAttribute('localSheetId', "$worksheetId");
             $this->objWriter->writeAttribute('hidden', '1');
 
             // Create absolute coordinate and write as raw text
             $range = Coordinate::splitRange($autoFilterRange);
             $range = $range[0];
             //    Strip any worksheet ref so we can make the cell ref absolute
-            [, $range[0]] = Worksheet::extractSheetTitle($range[0], true);
+            [, $range[0]] = ActualWorksheet::extractSheetTitle($range[0], true);
 
-            $range[0] = Coordinate::absoluteCoordinate($range[0]);
-            $range[1] = Coordinate::absoluteCoordinate($range[1]);
+            $range[0] = Coordinate::absoluteCoordinate($range[0] ?? '');
+            if (count($range) > 1) {
+                $range[1] = Coordinate::absoluteCoordinate($range[1]);
+            }
             $range = implode(':', $range);
 
-            $this->objWriter->writeRawData('\'' . str_replace("'", "''", $pSheet->getTitle()) . '\'!' . $range);
+            $this->objWriter->writeRawData('\'' . str_replace("'", "''", $worksheet->getTitle()) . '\'!' . $range);
 
             $this->objWriter->endElement();
         }
@@ -114,33 +127,33 @@ private function writeNamedRangeForAutofilter(Worksheet $pSheet, int $pSheetId =
     /**
      * Write Defined Name for PrintTitles.
      */
-    private function writeNamedRangeForPrintTitles(Worksheet $pSheet, int $pSheetId = 0): void
+    private function writeNamedRangeForPrintTitles(ActualWorksheet $worksheet, int $worksheetId = 0): void
     {
         // NamedRange for PrintTitles
-        if ($pSheet->getPageSetup()->isColumnsToRepeatAtLeftSet() || $pSheet->getPageSetup()->isRowsToRepeatAtTopSet()) {
+        if ($worksheet->getPageSetup()->isColumnsToRepeatAtLeftSet() || $worksheet->getPageSetup()->isRowsToRepeatAtTopSet()) {
             $this->objWriter->startElement('definedName');
             $this->objWriter->writeAttribute('name', '_xlnm.Print_Titles');
-            $this->objWriter->writeAttribute('localSheetId', $pSheetId);
+            $this->objWriter->writeAttribute('localSheetId', "$worksheetId");
 
             // Setting string
             $settingString = '';
 
             // Columns to repeat
-            if ($pSheet->getPageSetup()->isColumnsToRepeatAtLeftSet()) {
-                $repeat = $pSheet->getPageSetup()->getColumnsToRepeatAtLeft();
+            if ($worksheet->getPageSetup()->isColumnsToRepeatAtLeftSet()) {
+                $repeat = $worksheet->getPageSetup()->getColumnsToRepeatAtLeft();
 
-                $settingString .= '\'' . str_replace("'", "''", $pSheet->getTitle()) . '\'!$' . $repeat[0] . ':$' . $repeat[1];
+                $settingString .= '\'' . str_replace("'", "''", $worksheet->getTitle()) . '\'!$' . $repeat[0] . ':$' . $repeat[1];
             }
 
             // Rows to repeat
-            if ($pSheet->getPageSetup()->isRowsToRepeatAtTopSet()) {
-                if ($pSheet->getPageSetup()->isColumnsToRepeatAtLeftSet()) {
+            if ($worksheet->getPageSetup()->isRowsToRepeatAtTopSet()) {
+                if ($worksheet->getPageSetup()->isColumnsToRepeatAtLeftSet()) {
                     $settingString .= ',';
                 }
 
-                $repeat = $pSheet->getPageSetup()->getRowsToRepeatAtTop();
+                $repeat = $worksheet->getPageSetup()->getRowsToRepeatAtTop();
 
-                $settingString .= '\'' . str_replace("'", "''", $pSheet->getTitle()) . '\'!$' . $repeat[0] . ':$' . $repeat[1];
+                $settingString .= '\'' . str_replace("'", "''", $worksheet->getTitle()) . '\'!$' . $repeat[0] . ':$' . $repeat[1];
             }
 
             $this->objWriter->writeRawData($settingString);
@@ -152,22 +165,22 @@ private function writeNamedRangeForPrintTitles(Worksheet $pSheet, int $pSheetId
     /**
      * Write Defined Name for PrintTitles.
      */
-    private function writeNamedRangeForPrintArea(Worksheet $pSheet, int $pSheetId = 0): void
+    private function writeNamedRangeForPrintArea(ActualWorksheet $worksheet, int $worksheetId = 0): void
     {
         // NamedRange for PrintArea
-        if ($pSheet->getPageSetup()->isPrintAreaSet()) {
+        if ($worksheet->getPageSetup()->isPrintAreaSet()) {
             $this->objWriter->startElement('definedName');
             $this->objWriter->writeAttribute('name', '_xlnm.Print_Area');
-            $this->objWriter->writeAttribute('localSheetId', $pSheetId);
+            $this->objWriter->writeAttribute('localSheetId', "$worksheetId");
 
             // Print area
-            $printArea = Coordinate::splitRange($pSheet->getPageSetup()->getPrintArea());
+            $printArea = Coordinate::splitRange($worksheet->getPageSetup()->getPrintArea());
 
             $chunks = [];
             foreach ($printArea as $printAreaRect) {
                 $printAreaRect[0] = Coordinate::absoluteReference($printAreaRect[0]);
                 $printAreaRect[1] = Coordinate::absoluteReference($printAreaRect[1]);
-                $chunks[] = '\'' . str_replace("'", "''", $pSheet->getTitle()) . '\'!' . implode(':', $printAreaRect);
+                $chunks[] = '\'' . str_replace("'", "''", $worksheet->getTitle()) . '\'!' . implode(':', $printAreaRect);
             }
 
             $this->objWriter->writeRawData(implode(',', $chunks));
@@ -176,9 +189,9 @@ private function writeNamedRangeForPrintArea(Worksheet $pSheet, int $pSheetId =
         }
     }
 
-    private function getDefinedRange(DefinedName $pDefinedName): string
+    private function getDefinedRange(DefinedName $definedName): string
     {
-        $definedRange = $pDefinedName->getValue();
+        $definedRange = $definedName->getValue();
         $splitCount = preg_match_all(
             '/' . Calculation::CALCULATION_REGEXP_CELLREF_RELATIVE . '/mui',
             $definedRange,
@@ -205,7 +218,8 @@ private function getDefinedRange(DefinedName $pDefinedName): string
             if (empty($worksheet)) {
                 if (($offset === 0) || ($definedRange[$offset - 1] !== ':')) {
                     // We should have a worksheet
-                    $worksheet = $pDefinedName->getWorksheet() ? $pDefinedName->getWorksheet()->getTitle() : null;
+                    $ws = $definedName->getWorksheet();
+                    $worksheet = ($ws === null) ? null : $ws->getTitle();
                 }
             } else {
                 $worksheet = str_replace("''", "'", trim($worksheet, "'"));
@@ -219,7 +233,7 @@ private function getDefinedRange(DefinedName $pDefinedName): string
             $definedRange = substr($definedRange, 0, $offset) . $newRange . substr($definedRange, $offset + $length);
         }
 
-        if (substr($definedRange, 0, 1) === '=') {
+        if (str_starts_with($definedRange, '=')) {
             $definedRange = substr($definedRange, 1);
         }
 
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/DocProps.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/DocProps.php
index 43ce442fee..e2c63207fb 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/DocProps.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/DocProps.php
@@ -3,6 +3,7 @@
 namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 
 use PhpOffice\PhpSpreadsheet\Document\Properties;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Namespaces;
 use PhpOffice\PhpSpreadsheet\Shared\Date;
 use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
@@ -14,7 +15,7 @@ class DocProps extends WriterPart
      *
      * @return string XML Output
      */
-    public function writeDocPropsApp(Spreadsheet $spreadsheet)
+    public function writeDocPropsApp(Spreadsheet $spreadsheet): string
     {
         // Create XML writer
         $objWriter = null;
@@ -29,8 +30,8 @@ public function writeDocPropsApp(Spreadsheet $spreadsheet)
 
         // Properties
         $objWriter->startElement('Properties');
-        $objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/officeDocument/2006/extended-properties');
-        $objWriter->writeAttribute('xmlns:vt', 'http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes');
+        $objWriter->writeAttribute('xmlns', Namespaces::EXTENDED_PROPERTIES);
+        $objWriter->writeAttribute('xmlns:vt', Namespaces::PROPERTIES_VTYPES);
 
         // Application
         $objWriter->writeElement('Application', 'Microsoft Excel');
@@ -56,7 +57,7 @@ public function writeDocPropsApp(Spreadsheet $spreadsheet)
 
         // Variant
         $objWriter->startElement('vt:variant');
-        $objWriter->writeElement('vt:i4', $spreadsheet->getSheetCount());
+        $objWriter->writeElement('vt:i4', (string) $spreadsheet->getSheetCount());
         $objWriter->endElement();
 
         $objWriter->endElement();
@@ -68,7 +69,7 @@ public function writeDocPropsApp(Spreadsheet $spreadsheet)
 
         // Vector
         $objWriter->startElement('vt:vector');
-        $objWriter->writeAttribute('size', $spreadsheet->getSheetCount());
+        $objWriter->writeAttribute('size', (string) $spreadsheet->getSheetCount());
         $objWriter->writeAttribute('baseType', 'lpstr');
 
         $sheetCount = $spreadsheet->getSheetCount();
@@ -92,6 +93,9 @@ public function writeDocPropsApp(Spreadsheet $spreadsheet)
         // SharedDoc
         $objWriter->writeElement('SharedDoc', 'false');
 
+        // HyperlinkBase
+        $objWriter->writeElement('HyperlinkBase', $spreadsheet->getProperties()->getHyperlinkBase());
+
         // HyperlinksChanged
         $objWriter->writeElement('HyperlinksChanged', 'false');
 
@@ -109,7 +113,7 @@ public function writeDocPropsApp(Spreadsheet $spreadsheet)
      *
      * @return string XML Output
      */
-    public function writeDocPropsCore(Spreadsheet $spreadsheet)
+    public function writeDocPropsCore(Spreadsheet $spreadsheet): string
     {
         // Create XML writer
         $objWriter = null;
@@ -124,11 +128,11 @@ public function writeDocPropsCore(Spreadsheet $spreadsheet)
 
         // cp:coreProperties
         $objWriter->startElement('cp:coreProperties');
-        $objWriter->writeAttribute('xmlns:cp', 'http://schemas.openxmlformats.org/package/2006/metadata/core-properties');
-        $objWriter->writeAttribute('xmlns:dc', 'http://purl.org/dc/elements/1.1/');
-        $objWriter->writeAttribute('xmlns:dcterms', 'http://purl.org/dc/terms/');
-        $objWriter->writeAttribute('xmlns:dcmitype', 'http://purl.org/dc/dcmitype/');
-        $objWriter->writeAttribute('xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance');
+        $objWriter->writeAttribute('xmlns:cp', Namespaces::CORE_PROPERTIES2);
+        $objWriter->writeAttribute('xmlns:dc', Namespaces::DC_ELEMENTS);
+        $objWriter->writeAttribute('xmlns:dcterms', Namespaces::DC_TERMS);
+        $objWriter->writeAttribute('xmlns:dcmitype', Namespaces::DC_DCMITYPE);
+        $objWriter->writeAttribute('xmlns:xsi', Namespaces::SCHEMA_INSTANCE);
 
         // dc:creator
         $objWriter->writeElement('dc:creator', $spreadsheet->getProperties()->getCreator());
@@ -178,7 +182,7 @@ public function writeDocPropsCore(Spreadsheet $spreadsheet)
      *
      * @return null|string XML Output
      */
-    public function writeDocPropsCustom(Spreadsheet $spreadsheet)
+    public function writeDocPropsCustom(Spreadsheet $spreadsheet): ?string
     {
         $customPropertyList = $spreadsheet->getProperties()->getCustomProperties();
         if (empty($customPropertyList)) {
@@ -198,8 +202,8 @@ public function writeDocPropsCustom(Spreadsheet $spreadsheet)
 
         // cp:coreProperties
         $objWriter->startElement('Properties');
-        $objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/officeDocument/2006/custom-properties');
-        $objWriter->writeAttribute('xmlns:vt', 'http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes');
+        $objWriter->writeAttribute('xmlns', Namespaces::CUSTOM_PROPERTIES);
+        $objWriter->writeAttribute('xmlns:vt', Namespaces::PROPERTIES_VTYPES);
 
         foreach ($customPropertyList as $key => $customProperty) {
             $propertyValue = $spreadsheet->getProperties()->getCustomPropertyValue($customProperty);
@@ -207,16 +211,16 @@ public function writeDocPropsCustom(Spreadsheet $spreadsheet)
 
             $objWriter->startElement('property');
             $objWriter->writeAttribute('fmtid', '{D5CDD505-2E9C-101B-9397-08002B2CF9AE}');
-            $objWriter->writeAttribute('pid', $key + 2);
+            $objWriter->writeAttribute('pid', (string) ($key + 2));
             $objWriter->writeAttribute('name', $customProperty);
 
             switch ($propertyType) {
                 case Properties::PROPERTY_TYPE_INTEGER:
-                    $objWriter->writeElement('vt:i4', $propertyValue);
+                    $objWriter->writeElement('vt:i4', (string) $propertyValue);
 
                     break;
                 case Properties::PROPERTY_TYPE_FLOAT:
-                    $objWriter->writeElement('vt:r8', $propertyValue);
+                    $objWriter->writeElement('vt:r8', sprintf('%F', $propertyValue));
 
                     break;
                 case Properties::PROPERTY_TYPE_BOOLEAN:
@@ -231,7 +235,7 @@ public function writeDocPropsCustom(Spreadsheet $spreadsheet)
 
                     break;
                 default:
-                    $objWriter->writeElement('vt:lpwstr', $propertyValue);
+                    $objWriter->writeElement('vt:lpwstr', (string) $propertyValue);
 
                     break;
             }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Drawing.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Drawing.php
index a4b09d3927..fc84c67e1d 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Drawing.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Drawing.php
@@ -3,6 +3,8 @@
 namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Namespaces;
+use PhpOffice\PhpSpreadsheet\Shared\Drawing as SharedDrawing;
 use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Worksheet\BaseDrawing;
@@ -18,7 +20,7 @@ class Drawing extends WriterPart
      *
      * @return string XML Output
      */
-    public function writeDrawings(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $pWorksheet, $includeCharts = false)
+    public function writeDrawings(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $worksheet, bool $includeCharts = false): string
     {
         // Create XML writer
         $objWriter = null;
@@ -33,12 +35,12 @@ public function writeDrawings(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $pWo
 
         // xdr:wsDr
         $objWriter->startElement('xdr:wsDr');
-        $objWriter->writeAttribute('xmlns:xdr', 'http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing');
-        $objWriter->writeAttribute('xmlns:a', 'http://schemas.openxmlformats.org/drawingml/2006/main');
+        $objWriter->writeAttribute('xmlns:xdr', Namespaces::SPREADSHEET_DRAWING);
+        $objWriter->writeAttribute('xmlns:a', Namespaces::DRAWINGML);
 
         // Loop through images and write drawings
         $i = 1;
-        $iterator = $pWorksheet->getDrawingCollection()->getIterator();
+        $iterator = $worksheet->getDrawingCollection()->getIterator();
         while ($iterator->valid()) {
             /** @var BaseDrawing $pDrawing */
             $pDrawing = $iterator->current();
@@ -52,19 +54,22 @@ public function writeDrawings(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $pWo
         }
 
         if ($includeCharts) {
-            $chartCount = $pWorksheet->getChartCount();
+            $chartCount = $worksheet->getChartCount();
             // Loop through charts and write the chart position
             if ($chartCount > 0) {
                 for ($c = 0; $c < $chartCount; ++$c) {
-                    $this->writeChart($objWriter, $pWorksheet->getChartByIndex($c), $c + $i);
+                    $chart = $worksheet->getChartByIndex((string) $c);
+                    if ($chart !== false) {
+                        $this->writeChart($objWriter, $chart, $c + $i);
+                    }
                 }
             }
         }
 
         // unparsed AlternateContent
-        $unparsedLoadedData = $pWorksheet->getParent()->getUnparsedLoadedData();
-        if (isset($unparsedLoadedData['sheets'][$pWorksheet->getCodeName()]['drawingAlternateContents'])) {
-            foreach ($unparsedLoadedData['sheets'][$pWorksheet->getCodeName()]['drawingAlternateContents'] as $drawingAlternateContent) {
+        $unparsedLoadedData = $worksheet->getParentOrThrow()->getUnparsedLoadedData();
+        if (isset($unparsedLoadedData['sheets'][$worksheet->getCodeName()]['drawingAlternateContents'])) {
+            foreach ($unparsedLoadedData['sheets'][$worksheet->getCodeName()]['drawingAlternateContents'] as $drawingAlternateContent) {
                 $objWriter->writeRaw($drawingAlternateContent);
             }
         }
@@ -77,38 +82,62 @@ public function writeDrawings(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $pWo
 
     /**
      * Write drawings to XML format.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param int $pRelationId
      */
-    public function writeChart(XMLWriter $objWriter, \PhpOffice\PhpSpreadsheet\Chart\Chart $pChart, $pRelationId = -1): void
+    public function writeChart(XMLWriter $objWriter, \PhpOffice\PhpSpreadsheet\Chart\Chart $chart, int $relationId = -1): void
     {
-        $tl = $pChart->getTopLeftPosition();
+        $tl = $chart->getTopLeftPosition();
         $tlColRow = Coordinate::indexesFromString($tl['cell']);
-        $br = $pChart->getBottomRightPosition();
-        $brColRow = Coordinate::indexesFromString($br['cell']);
+        $br = $chart->getBottomRightPosition();
 
-        $objWriter->startElement('xdr:twoCellAnchor');
+        $isTwoCellAnchor = $br['cell'] !== '';
+        if ($isTwoCellAnchor) {
+            $brColRow = Coordinate::indexesFromString($br['cell']);
 
-        $objWriter->startElement('xdr:from');
-        $objWriter->writeElement('xdr:col', $tlColRow[0] - 1);
-        $objWriter->writeElement('xdr:colOff', \PhpOffice\PhpSpreadsheet\Shared\Drawing::pixelsToEMU($tl['xOffset']));
-        $objWriter->writeElement('xdr:row', $tlColRow[1] - 1);
-        $objWriter->writeElement('xdr:rowOff', \PhpOffice\PhpSpreadsheet\Shared\Drawing::pixelsToEMU($tl['yOffset']));
-        $objWriter->endElement();
-        $objWriter->startElement('xdr:to');
-        $objWriter->writeElement('xdr:col', $brColRow[0] - 1);
-        $objWriter->writeElement('xdr:colOff', \PhpOffice\PhpSpreadsheet\Shared\Drawing::pixelsToEMU($br['xOffset']));
-        $objWriter->writeElement('xdr:row', $brColRow[1] - 1);
-        $objWriter->writeElement('xdr:rowOff', \PhpOffice\PhpSpreadsheet\Shared\Drawing::pixelsToEMU($br['yOffset']));
-        $objWriter->endElement();
+            $objWriter->startElement('xdr:twoCellAnchor');
+
+            $objWriter->startElement('xdr:from');
+            $objWriter->writeElement('xdr:col', (string) ($tlColRow[0] - 1));
+            $objWriter->writeElement('xdr:colOff', self::stringEmu($tl['xOffset']));
+            $objWriter->writeElement('xdr:row', (string) ($tlColRow[1] - 1));
+            $objWriter->writeElement('xdr:rowOff', self::stringEmu($tl['yOffset']));
+            $objWriter->endElement();
+            $objWriter->startElement('xdr:to');
+            $objWriter->writeElement('xdr:col', (string) ($brColRow[0] - 1));
+            $objWriter->writeElement('xdr:colOff', self::stringEmu($br['xOffset']));
+            $objWriter->writeElement('xdr:row', (string) ($brColRow[1] - 1));
+            $objWriter->writeElement('xdr:rowOff', self::stringEmu($br['yOffset']));
+            $objWriter->endElement();
+        } elseif ($chart->getOneCellAnchor()) {
+            $objWriter->startElement('xdr:oneCellAnchor');
+
+            $objWriter->startElement('xdr:from');
+            $objWriter->writeElement('xdr:col', (string) ($tlColRow[0] - 1));
+            $objWriter->writeElement('xdr:colOff', self::stringEmu($tl['xOffset']));
+            $objWriter->writeElement('xdr:row', (string) ($tlColRow[1] - 1));
+            $objWriter->writeElement('xdr:rowOff', self::stringEmu($tl['yOffset']));
+            $objWriter->endElement();
+            $objWriter->startElement('xdr:ext');
+            $objWriter->writeAttribute('cx', self::stringEmu($br['xOffset']));
+            $objWriter->writeAttribute('cy', self::stringEmu($br['yOffset']));
+            $objWriter->endElement();
+        } else {
+            $objWriter->startElement('xdr:absoluteAnchor');
+            $objWriter->startElement('xdr:pos');
+            $objWriter->writeAttribute('x', '0');
+            $objWriter->writeAttribute('y', '0');
+            $objWriter->endElement();
+            $objWriter->startElement('xdr:ext');
+            $objWriter->writeAttribute('cx', self::stringEmu($br['xOffset']));
+            $objWriter->writeAttribute('cy', self::stringEmu($br['yOffset']));
+            $objWriter->endElement();
+        }
 
         $objWriter->startElement('xdr:graphicFrame');
         $objWriter->writeAttribute('macro', '');
         $objWriter->startElement('xdr:nvGraphicFramePr');
         $objWriter->startElement('xdr:cNvPr');
-        $objWriter->writeAttribute('name', 'Chart ' . $pRelationId);
-        $objWriter->writeAttribute('id', 1025 * $pRelationId);
+        $objWriter->writeAttribute('name', 'Chart ' . $relationId);
+        $objWriter->writeAttribute('id', (string) (1025 * $relationId));
         $objWriter->endElement();
         $objWriter->startElement('xdr:cNvGraphicFramePr');
         $objWriter->startElement('a:graphicFrameLocks');
@@ -129,11 +158,11 @@ public function writeChart(XMLWriter $objWriter, \PhpOffice\PhpSpreadsheet\Chart
 
         $objWriter->startElement('a:graphic');
         $objWriter->startElement('a:graphicData');
-        $objWriter->writeAttribute('uri', 'http://schemas.openxmlformats.org/drawingml/2006/chart');
+        $objWriter->writeAttribute('uri', Namespaces::CHART);
         $objWriter->startElement('c:chart');
-        $objWriter->writeAttribute('xmlns:c', 'http://schemas.openxmlformats.org/drawingml/2006/chart');
-        $objWriter->writeAttribute('xmlns:r', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships');
-        $objWriter->writeAttribute('r:id', 'rId' . $pRelationId);
+        $objWriter->writeAttribute('xmlns:c', Namespaces::CHART);
+        $objWriter->writeAttribute('xmlns:r', Namespaces::SCHEMA_OFFICE_DOCUMENT);
+        $objWriter->writeAttribute('r:id', 'rId' . $relationId);
         $objWriter->endElement();
         $objWriter->endElement();
         $objWriter->endElement();
@@ -147,32 +176,56 @@ public function writeChart(XMLWriter $objWriter, \PhpOffice\PhpSpreadsheet\Chart
 
     /**
      * Write drawings to XML format.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param int $pRelationId
-     * @param null|int $hlinkClickId
      */
-    public function writeDrawing(XMLWriter $objWriter, BaseDrawing $pDrawing, $pRelationId = -1, $hlinkClickId = null): void
+    public function writeDrawing(XMLWriter $objWriter, BaseDrawing $drawing, int $relationId = -1, ?int $hlinkClickId = null): void
     {
-        if ($pRelationId >= 0) {
-            // xdr:oneCellAnchor
-            $objWriter->startElement('xdr:oneCellAnchor');
-            // Image location
-            $aCoordinates = Coordinate::indexesFromString($pDrawing->getCoordinates());
+        if ($relationId >= 0) {
+            $isTwoCellAnchor = $drawing->getCoordinates2() !== '';
+            if ($isTwoCellAnchor) {
+                // xdr:twoCellAnchor
+                $objWriter->startElement('xdr:twoCellAnchor');
+                if ($drawing->validEditAs()) {
+                    $objWriter->writeAttribute('editAs', $drawing->getEditAs());
+                }
+                // Image location
+                $aCoordinates = Coordinate::indexesFromString($drawing->getCoordinates());
+                $aCoordinates2 = Coordinate::indexesFromString($drawing->getCoordinates2());
+
+                // xdr:from
+                $objWriter->startElement('xdr:from');
+                $objWriter->writeElement('xdr:col', (string) ($aCoordinates[0] - 1));
+                $objWriter->writeElement('xdr:colOff', self::stringEmu($drawing->getOffsetX()));
+                $objWriter->writeElement('xdr:row', (string) ($aCoordinates[1] - 1));
+                $objWriter->writeElement('xdr:rowOff', self::stringEmu($drawing->getOffsetY()));
+                $objWriter->endElement();
 
-            // xdr:from
-            $objWriter->startElement('xdr:from');
-            $objWriter->writeElement('xdr:col', $aCoordinates[0] - 1);
-            $objWriter->writeElement('xdr:colOff', \PhpOffice\PhpSpreadsheet\Shared\Drawing::pixelsToEMU($pDrawing->getOffsetX()));
-            $objWriter->writeElement('xdr:row', $aCoordinates[1] - 1);
-            $objWriter->writeElement('xdr:rowOff', \PhpOffice\PhpSpreadsheet\Shared\Drawing::pixelsToEMU($pDrawing->getOffsetY()));
-            $objWriter->endElement();
+                // xdr:to
+                $objWriter->startElement('xdr:to');
+                $objWriter->writeElement('xdr:col', (string) ($aCoordinates2[0] - 1));
+                $objWriter->writeElement('xdr:colOff', self::stringEmu($drawing->getOffsetX2()));
+                $objWriter->writeElement('xdr:row', (string) ($aCoordinates2[1] - 1));
+                $objWriter->writeElement('xdr:rowOff', self::stringEmu($drawing->getOffsetY2()));
+                $objWriter->endElement();
+            } else {
+                // xdr:oneCellAnchor
+                $objWriter->startElement('xdr:oneCellAnchor');
+                // Image location
+                $aCoordinates = Coordinate::indexesFromString($drawing->getCoordinates());
+
+                // xdr:from
+                $objWriter->startElement('xdr:from');
+                $objWriter->writeElement('xdr:col', (string) ($aCoordinates[0] - 1));
+                $objWriter->writeElement('xdr:colOff', self::stringEmu($drawing->getOffsetX()));
+                $objWriter->writeElement('xdr:row', (string) ($aCoordinates[1] - 1));
+                $objWriter->writeElement('xdr:rowOff', self::stringEmu($drawing->getOffsetY()));
+                $objWriter->endElement();
 
-            // xdr:ext
-            $objWriter->startElement('xdr:ext');
-            $objWriter->writeAttribute('cx', \PhpOffice\PhpSpreadsheet\Shared\Drawing::pixelsToEMU($pDrawing->getWidth()));
-            $objWriter->writeAttribute('cy', \PhpOffice\PhpSpreadsheet\Shared\Drawing::pixelsToEMU($pDrawing->getHeight()));
-            $objWriter->endElement();
+                // xdr:ext
+                $objWriter->startElement('xdr:ext');
+                $objWriter->writeAttribute('cx', self::stringEmu($drawing->getWidth()));
+                $objWriter->writeAttribute('cy', self::stringEmu($drawing->getHeight()));
+                $objWriter->endElement();
+            }
 
             // xdr:pic
             $objWriter->startElement('xdr:pic');
@@ -182,9 +235,9 @@ public function writeDrawing(XMLWriter $objWriter, BaseDrawing $pDrawing, $pRela
 
             // xdr:cNvPr
             $objWriter->startElement('xdr:cNvPr');
-            $objWriter->writeAttribute('id', $pRelationId);
-            $objWriter->writeAttribute('name', $pDrawing->getName());
-            $objWriter->writeAttribute('descr', $pDrawing->getDescription());
+            $objWriter->writeAttribute('id', (string) $relationId);
+            $objWriter->writeAttribute('name', $drawing->getName());
+            $objWriter->writeAttribute('descr', $drawing->getDescription());
 
             //a:hlinkClick
             $this->writeHyperLinkDrawing($objWriter, $hlinkClickId);
@@ -208,14 +261,25 @@ public function writeDrawing(XMLWriter $objWriter, BaseDrawing $pDrawing, $pRela
 
             // a:blip
             $objWriter->startElement('a:blip');
-            $objWriter->writeAttribute('xmlns:r', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships');
-            $objWriter->writeAttribute('r:embed', 'rId' . $pRelationId);
+            $objWriter->writeAttribute('xmlns:r', Namespaces::SCHEMA_OFFICE_DOCUMENT);
+            $objWriter->writeAttribute('r:embed', 'rId' . $relationId);
             $objWriter->endElement();
 
-            // a:stretch
-            $objWriter->startElement('a:stretch');
-            $objWriter->writeElement('a:fillRect', null);
-            $objWriter->endElement();
+            $srcRect = $drawing->getSrcRect();
+            if (!empty($srcRect)) {
+                $objWriter->startElement('a:srcRect');
+                foreach ($srcRect as $key => $value) {
+                    $objWriter->writeAttribute($key, (string) $value);
+                }
+                $objWriter->endElement(); // a:srcRect
+                $objWriter->startElement('a:stretch');
+                $objWriter->endElement(); // a:stretch
+            } else {
+                // a:stretch
+                $objWriter->startElement('a:stretch');
+                $objWriter->writeElement('a:fillRect', null);
+                $objWriter->endElement();
+            }
 
             $objWriter->endElement();
 
@@ -224,7 +288,15 @@ public function writeDrawing(XMLWriter $objWriter, BaseDrawing $pDrawing, $pRela
 
             // a:xfrm
             $objWriter->startElement('a:xfrm');
-            $objWriter->writeAttribute('rot', \PhpOffice\PhpSpreadsheet\Shared\Drawing::degreesToAngle($pDrawing->getRotation()));
+            $objWriter->writeAttribute('rot', (string) SharedDrawing::degreesToAngle($drawing->getRotation()));
+            self::writeAttributeIf($objWriter, $drawing->getFlipVertical(), 'flipV', '1');
+            self::writeAttributeIf($objWriter, $drawing->getFlipHorizontal(), 'flipH', '1');
+            if ($isTwoCellAnchor) {
+                $objWriter->startElement('a:ext');
+                $objWriter->writeAttribute('cx', self::stringEmu($drawing->getWidth()));
+                $objWriter->writeAttribute('cy', self::stringEmu($drawing->getHeight()));
+                $objWriter->endElement();
+            }
             $objWriter->endElement();
 
             // a:prstGeom
@@ -236,25 +308,25 @@ public function writeDrawing(XMLWriter $objWriter, BaseDrawing $pDrawing, $pRela
 
             $objWriter->endElement();
 
-            if ($pDrawing->getShadow()->getVisible()) {
+            if ($drawing->getShadow()->getVisible()) {
                 // a:effectLst
                 $objWriter->startElement('a:effectLst');
 
                 // a:outerShdw
                 $objWriter->startElement('a:outerShdw');
-                $objWriter->writeAttribute('blurRad', \PhpOffice\PhpSpreadsheet\Shared\Drawing::pixelsToEMU($pDrawing->getShadow()->getBlurRadius()));
-                $objWriter->writeAttribute('dist', \PhpOffice\PhpSpreadsheet\Shared\Drawing::pixelsToEMU($pDrawing->getShadow()->getDistance()));
-                $objWriter->writeAttribute('dir', \PhpOffice\PhpSpreadsheet\Shared\Drawing::degreesToAngle($pDrawing->getShadow()->getDirection()));
-                $objWriter->writeAttribute('algn', $pDrawing->getShadow()->getAlignment());
+                $objWriter->writeAttribute('blurRad', self::stringEmu($drawing->getShadow()->getBlurRadius()));
+                $objWriter->writeAttribute('dist', self::stringEmu($drawing->getShadow()->getDistance()));
+                $objWriter->writeAttribute('dir', (string) SharedDrawing::degreesToAngle($drawing->getShadow()->getDirection()));
+                $objWriter->writeAttribute('algn', $drawing->getShadow()->getAlignment());
                 $objWriter->writeAttribute('rotWithShape', '0');
 
                 // a:srgbClr
                 $objWriter->startElement('a:srgbClr');
-                $objWriter->writeAttribute('val', $pDrawing->getShadow()->getColor()->getRGB());
+                $objWriter->writeAttribute('val', $drawing->getShadow()->getColor()->getRGB());
 
                 // a:alpha
                 $objWriter->startElement('a:alpha');
-                $objWriter->writeAttribute('val', $pDrawing->getShadow()->getAlpha() * 1000);
+                $objWriter->writeAttribute('val', (string) ($drawing->getShadow()->getAlpha() * 1000));
                 $objWriter->endElement();
 
                 $objWriter->endElement();
@@ -281,7 +353,7 @@ public function writeDrawing(XMLWriter $objWriter, BaseDrawing $pDrawing, $pRela
      *
      * @return string XML Output
      */
-    public function writeVMLHeaderFooterImages(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $pWorksheet)
+    public function writeVMLHeaderFooterImages(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $worksheet): string
     {
         // Create XML writer
         $objWriter = null;
@@ -295,13 +367,13 @@ public function writeVMLHeaderFooterImages(\PhpOffice\PhpSpreadsheet\Worksheet\W
         $objWriter->startDocument('1.0', 'UTF-8', 'yes');
 
         // Header/footer images
-        $images = $pWorksheet->getHeaderFooter()->getImages();
+        $images = $worksheet->getHeaderFooter()->getImages();
 
         // xml
         $objWriter->startElement('xml');
-        $objWriter->writeAttribute('xmlns:v', 'urn:schemas-microsoft-com:vml');
-        $objWriter->writeAttribute('xmlns:o', 'urn:schemas-microsoft-com:office:office');
-        $objWriter->writeAttribute('xmlns:x', 'urn:schemas-microsoft-com:office:excel');
+        $objWriter->writeAttribute('xmlns:v', Namespaces::URN_VML);
+        $objWriter->writeAttribute('xmlns:o', Namespaces::URN_MSOFFICE);
+        $objWriter->writeAttribute('xmlns:x', Namespaces::URN_EXCEL);
 
         // o:shapelayout
         $objWriter->startElement('o:shapelayout');
@@ -424,33 +496,31 @@ public function writeVMLHeaderFooterImages(\PhpOffice\PhpSpreadsheet\Worksheet\W
     /**
      * Write VML comment to XML format.
      *
-     * @param XMLWriter $objWriter XML Writer
-     * @param string $pReference Reference
-     * @param HeaderFooterDrawing $pImage Image
+     * @param string $reference Reference
      */
-    private function writeVMLHeaderFooterImage(XMLWriter $objWriter, $pReference, HeaderFooterDrawing $pImage): void
+    private function writeVMLHeaderFooterImage(XMLWriter $objWriter, string $reference, HeaderFooterDrawing $image): void
     {
         // Calculate object id
-        preg_match('{(\d+)}', md5($pReference), $m);
+        preg_match('{(\d+)}', md5($reference), $m);
         $id = 1500 + ((int) substr($m[1], 0, 2) * 1);
 
         // Calculate offset
-        $width = $pImage->getWidth();
-        $height = $pImage->getHeight();
-        $marginLeft = $pImage->getOffsetX();
-        $marginTop = $pImage->getOffsetY();
+        $width = $image->getWidth();
+        $height = $image->getHeight();
+        $marginLeft = $image->getOffsetX();
+        $marginTop = $image->getOffsetY();
 
         // v:shape
         $objWriter->startElement('v:shape');
-        $objWriter->writeAttribute('id', $pReference);
+        $objWriter->writeAttribute('id', $reference);
         $objWriter->writeAttribute('o:spid', '_x0000_s' . $id);
         $objWriter->writeAttribute('type', '#_x0000_t75');
         $objWriter->writeAttribute('style', "position:absolute;margin-left:{$marginLeft}px;margin-top:{$marginTop}px;width:{$width}px;height:{$height}px;z-index:1");
 
         // v:imagedata
         $objWriter->startElement('v:imagedata');
-        $objWriter->writeAttribute('o:relid', 'rId' . $pReference);
-        $objWriter->writeAttribute('o:title', $pImage->getName());
+        $objWriter->writeAttribute('o:relid', 'rId' . $reference);
+        $objWriter->writeAttribute('o:title', $image->getName());
         $objWriter->endElement();
 
         // o:lock
@@ -465,9 +535,9 @@ private function writeVMLHeaderFooterImage(XMLWriter $objWriter, $pReference, He
     /**
      * Get an array of all drawings.
      *
-     * @return \PhpOffice\PhpSpreadsheet\Worksheet\Drawing[] All drawings in PhpSpreadsheet
+     * @return BaseDrawing[] All drawings in PhpSpreadsheet
      */
-    public function allDrawings(Spreadsheet $spreadsheet)
+    public function allDrawings(Spreadsheet $spreadsheet): array
     {
         // Get an array of all drawings
         $aDrawings = [];
@@ -487,18 +557,27 @@ public function allDrawings(Spreadsheet $spreadsheet)
         return $aDrawings;
     }
 
-    /**
-     * @param null|int $hlinkClickId
-     */
-    private function writeHyperLinkDrawing(XMLWriter $objWriter, $hlinkClickId): void
+    private function writeHyperLinkDrawing(XMLWriter $objWriter, ?int $hlinkClickId): void
     {
         if ($hlinkClickId === null) {
             return;
         }
 
         $objWriter->startElement('a:hlinkClick');
-        $objWriter->writeAttribute('xmlns:r', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships');
+        $objWriter->writeAttribute('xmlns:r', Namespaces::SCHEMA_OFFICE_DOCUMENT);
         $objWriter->writeAttribute('r:id', 'rId' . $hlinkClickId);
         $objWriter->endElement();
     }
+
+    private static function stringEmu(int $pixelValue): string
+    {
+        return (string) SharedDrawing::pixelsToEMU($pixelValue);
+    }
+
+    private static function writeAttributeIf(XMLWriter $objWriter, ?bool $condition, string $attr, string $val): void
+    {
+        if ($condition) {
+            $objWriter->writeAttribute($attr, $val);
+        }
+    }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Xlfn.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/FunctionPrefix.php
similarity index 65%
rename from vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Xlfn.php
rename to vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/FunctionPrefix.php
index c88ef245b6..9ac7893ddc 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Xlfn.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/FunctionPrefix.php
@@ -2,10 +2,12 @@
 
 namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 
-class Xlfn
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+
+class FunctionPrefix
 {
-    const XLFNREGEXP = '/(?<!_xlfn[.])\\b('
-            // functions added with Excel 2010
+    const XLFNREGEXP = '/(?:_xlfn\.)?((?:_xlws\.)?\b('
+        // functions added with Excel 2010
         . 'beta[.]dist'
         . '|beta[.]inv'
         . '|binom[.]dist'
@@ -125,42 +127,94 @@ class Xlfn
         . '|switch'
         // functions added with Excel 2019
         . '|concat'
-        . '|countifs'
         . '|ifs'
         . '|maxifs'
         . '|minifs'
         . '|sumifs'
         . '|textjoin'
         // functions added with Excel 365
+        . '|anchorarray'
+        . '|arraytotext'
+        . '|bycol'
+        . '|byrow'
+        . '|call'
+        . '|choosecols'
+        . '|chooserows'
+        . '|drop'
+        . '|expand'
         . '|filter'
+        . '|hstack'
+        . '|isomitted'
+        . '|lambda'
+        . '|let'
+        . '|makearray'
+        . '|map'
         . '|randarray'
+        . '|reduce'
+        . '|register[.]id'
+        . '|scan'
         . '|sequence'
+        . '|single'
         . '|sort'
         . '|sortby'
+        . '|take'
+        . '|textafter'
+        . '|textbefore'
+        . '|textjoin'
+        . '|textsplit'
+        . '|tocol'
+        . '|torow'
         . '|unique'
+        . '|valuetotext'
+        . '|vstack'
+        . '|wrapcols'
+        . '|wraprows'
         . '|xlookup'
         . '|xmatch'
-        . '|arraytotext'
-        . '|call'
-        . '|let'
-        . '|register[.]id'
-        . '|valuetotext'
-        . ')(?=\\s*[(])/i';
+        . '))\s*\(/Umui';
+
+    const XLWSREGEXP = '/(?<!_xlws\.)('
+        // functions added with Excel 365
+        . 'filter'
+        . '|sort'
+        . ')\s*\(/mui';
 
     /**
      * Prefix function name in string with _xlfn. where required.
      */
-    public static function addXlfn(string $funcstring): string
+    protected static function addXlfnPrefix(string $functionString): string
     {
-        return preg_replace(self::XLFNREGEXP, '_xlfn.$1', $funcstring);
+        return (string) preg_replace(self::XLFNREGEXP, '_xlfn.$1(', $functionString);
+    }
+
+    /**
+     * Prefix function name in string with _xlws. where required.
+     */
+    protected static function addXlwsPrefix(string $functionString): string
+    {
+        return (string) preg_replace(self::XLWSREGEXP, '_xlws.$1(', $functionString);
+    }
+
+    /**
+     * Prefix function name in string with _xlfn. where required.
+     */
+    public static function addFunctionPrefix(string $functionString): string
+    {
+        $functionString = (string) preg_replace_callback(
+            Calculation::CALCULATION_REGEXP_CELLREF_SPILL,
+            fn (array $matches) => 'ANCHORARRAY(' . substr($matches[0], 0, -1) . ')',
+            $functionString
+        );
+
+        return self::addXlwsPrefix(self::addXlfnPrefix($functionString));
     }
 
     /**
      * Prefix function name in string with _xlfn. where required.
      * Leading character, expected to be equals sign, is stripped.
      */
-    public static function addXlfnStripEquals(string $funcstring): string
+    public static function addFunctionPrefixStripEquals(string $functionString): string
     {
-        return self::addXlfn(substr($funcstring, 1));
+        return self::addFunctionPrefix(substr($functionString, 1));
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Metadata.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Metadata.php
new file mode 100644
index 0000000000..00c15f0003
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Metadata.php
@@ -0,0 +1,129 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Namespaces;
+use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
+
+class Metadata extends WriterPart
+{
+    /**
+     * Write content types to XML format.
+     *
+     * @return string XML Output
+     */
+    public function writeMetadata(): string
+    {
+        if (!$this->getParentWriter()->useDynamicArrays()) {
+            return '';
+        }
+        // Create XML writer
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+        // Types
+        $objWriter->startElement('metadata');
+        $objWriter->writeAttribute('xmlns', Namespaces::MAIN);
+        $objWriter->writeAttribute('xmlns:xlrd', Namespaces::DYNAMIC_ARRAY_RICHDATA);
+        $objWriter->writeAttribute('xmlns:xda', Namespaces::DYNAMIC_ARRAY);
+
+        $objWriter->startElement('metadataTypes');
+        $objWriter->writeAttribute('count', '2');
+
+        $objWriter->startElement('metadataType');
+        $objWriter->writeAttribute('name', 'XLDAPR');
+        $objWriter->writeAttribute('minSupportedVersion', '120000');
+        $objWriter->writeAttribute('copy', '1');
+        $objWriter->writeAttribute('pasteAll', '1');
+        $objWriter->writeAttribute('pasteValues', '1');
+        $objWriter->writeAttribute('merge', '1');
+        $objWriter->writeAttribute('splitFirst', '1');
+        $objWriter->writeAttribute('rowColShift', '1');
+        $objWriter->writeAttribute('clearFormats', '1');
+        $objWriter->writeAttribute('clearComments', '1');
+        $objWriter->writeAttribute('assign', '1');
+        $objWriter->writeAttribute('coerce', '1');
+        $objWriter->writeAttribute('cellMeta', '1');
+        $objWriter->endElement(); // metadataType XLDAPR
+
+        $objWriter->startElement('metadataType');
+        $objWriter->writeAttribute('name', 'XLRICHVALUE');
+        $objWriter->writeAttribute('minSupportedVersion', '120000');
+        $objWriter->writeAttribute('copy', '1');
+        $objWriter->writeAttribute('pasteAll', '1');
+        $objWriter->writeAttribute('pasteValues', '1');
+        $objWriter->writeAttribute('merge', '1');
+        $objWriter->writeAttribute('splitFirst', '1');
+        $objWriter->writeAttribute('rowColShift', '1');
+        $objWriter->writeAttribute('clearFormats', '1');
+        $objWriter->writeAttribute('clearComments', '1');
+        $objWriter->writeAttribute('assign', '1');
+        $objWriter->writeAttribute('coerce', '1');
+        $objWriter->endElement(); // metadataType XLRICHVALUE
+
+        $objWriter->endElement(); // metadataTypes
+
+        $objWriter->startElement('futureMetadata');
+        $objWriter->writeAttribute('name', 'XLDAPR');
+        $objWriter->writeAttribute('count', '1');
+        $objWriter->startElement('bk');
+        $objWriter->startElement('extLst');
+        $objWriter->startElement('ext');
+        $objWriter->writeAttribute('uri', '{bdbb8cdc-fa1e-496e-a857-3c3f30c029c3}');
+        $objWriter->startElement('xda:dynamicArrayProperties');
+        $objWriter->writeAttribute('fDynamic', '1');
+        $objWriter->writeAttribute('fCollapsed', '0');
+        $objWriter->endElement(); // xda:dynamicArrayProperties
+        $objWriter->endElement(); // ext
+        $objWriter->endElement(); // extLst
+        $objWriter->endElement(); // bk
+        $objWriter->endElement(); // futureMetadata XLDAPR
+
+        $objWriter->startElement('futureMetadata');
+        $objWriter->writeAttribute('name', 'XLRICHVALUE');
+        $objWriter->writeAttribute('count', '1');
+        $objWriter->startElement('bk');
+        $objWriter->startElement('extLst');
+        $objWriter->startElement('ext');
+        $objWriter->writeAttribute('uri', '{3e2802c4-a4d2-4d8b-9148-e3be6c30e623}');
+        $objWriter->startElement('xlrd:rvb');
+        $objWriter->writeAttribute('i', '0');
+        $objWriter->endElement(); // xlrd:rvb
+        $objWriter->endElement(); // ext
+        $objWriter->endElement(); // extLst
+        $objWriter->endElement(); // bk
+        $objWriter->endElement(); // futureMetadata XLRICHVALUE
+
+        $objWriter->startElement('cellMetadata');
+        $objWriter->writeAttribute('count', '1');
+        $objWriter->startElement('bk');
+        $objWriter->startElement('rc');
+        $objWriter->writeAttribute('t', '1');
+        $objWriter->writeAttribute('v', '0');
+        $objWriter->endElement(); // rc
+        $objWriter->endElement(); // bk
+        $objWriter->endElement(); // cellMetadata
+
+        $objWriter->startElement('valueMetadata');
+        $objWriter->writeAttribute('count', '1');
+        $objWriter->startElement('bk');
+        $objWriter->startElement('rc');
+        $objWriter->writeAttribute('t', '2');
+        $objWriter->writeAttribute('v', '0');
+        $objWriter->endElement(); // rc
+        $objWriter->endElement(); // bk
+        $objWriter->endElement(); // valueMetadata
+
+        $objWriter->endElement(); // metadata
+
+        // Return
+        return $objWriter->getData();
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Rels.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Rels.php
index a67d3ef8eb..ceb78117c6 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Rels.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Rels.php
@@ -2,8 +2,10 @@
 
 namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Namespaces;
 use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\BaseDrawing;
 use PhpOffice\PhpSpreadsheet\Worksheet\MemoryDrawing;
 use PhpOffice\PhpSpreadsheet\Writer\Exception as WriterException;
 
@@ -14,7 +16,7 @@ class Rels extends WriterPart
      *
      * @return string XML Output
      */
-    public function writeRelationships(Spreadsheet $spreadsheet)
+    public function writeRelationships(Spreadsheet $spreadsheet): string
     {
         // Create XML writer
         $objWriter = null;
@@ -29,7 +31,7 @@ public function writeRelationships(Spreadsheet $spreadsheet)
 
         // Relationships
         $objWriter->startElement('Relationships');
-        $objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/package/2006/relationships');
+        $objWriter->writeAttribute('xmlns', Namespaces::RELATIONSHIPS);
 
         $customPropertyList = $spreadsheet->getProperties()->getCustomProperties();
         if (!empty($customPropertyList)) {
@@ -37,7 +39,7 @@ public function writeRelationships(Spreadsheet $spreadsheet)
             $this->writeRelationship(
                 $objWriter,
                 4,
-                'http://schemas.openxmlformats.org/officeDocument/2006/relationships/custom-properties',
+                Namespaces::RELATIONSHIPS_CUSTOM_PROPERTIES,
                 'docProps/custom.xml'
             );
         }
@@ -46,7 +48,7 @@ public function writeRelationships(Spreadsheet $spreadsheet)
         $this->writeRelationship(
             $objWriter,
             3,
-            'http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties',
+            Namespaces::RELATIONSHIPS_EXTENDED_PROPERTIES,
             'docProps/app.xml'
         );
 
@@ -54,7 +56,7 @@ public function writeRelationships(Spreadsheet $spreadsheet)
         $this->writeRelationship(
             $objWriter,
             2,
-            'http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties',
+            Namespaces::CORE_PROPERTIES,
             'docProps/core.xml'
         );
 
@@ -62,16 +64,17 @@ public function writeRelationships(Spreadsheet $spreadsheet)
         $this->writeRelationship(
             $objWriter,
             1,
-            'http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument',
+            Namespaces::OFFICE_DOCUMENT,
             'xl/workbook.xml'
         );
         // a custom UI in workbook ?
+        $target = $spreadsheet->getRibbonXMLData('target');
         if ($spreadsheet->hasRibbon()) {
             $this->writeRelationShip(
                 $objWriter,
                 5,
-                'http://schemas.microsoft.com/office/2006/relationships/ui/extensibility',
-                $spreadsheet->getRibbonXMLData('target')
+                Namespaces::EXTENSIBILITY,
+                is_string($target) ? $target : ''
             );
         }
 
@@ -85,7 +88,7 @@ public function writeRelationships(Spreadsheet $spreadsheet)
      *
      * @return string XML Output
      */
-    public function writeWorkbookRelationships(Spreadsheet $spreadsheet)
+    public function writeWorkbookRelationships(Spreadsheet $spreadsheet): string
     {
         // Create XML writer
         $objWriter = null;
@@ -100,13 +103,13 @@ public function writeWorkbookRelationships(Spreadsheet $spreadsheet)
 
         // Relationships
         $objWriter->startElement('Relationships');
-        $objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/package/2006/relationships');
+        $objWriter->writeAttribute('xmlns', Namespaces::RELATIONSHIPS);
 
         // Relationship styles.xml
         $this->writeRelationship(
             $objWriter,
             1,
-            'http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles',
+            Namespaces::STYLES,
             'styles.xml'
         );
 
@@ -114,7 +117,7 @@ public function writeWorkbookRelationships(Spreadsheet $spreadsheet)
         $this->writeRelationship(
             $objWriter,
             2,
-            'http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme',
+            Namespaces::THEME2,
             'theme/theme1.xml'
         );
 
@@ -122,7 +125,7 @@ public function writeWorkbookRelationships(Spreadsheet $spreadsheet)
         $this->writeRelationship(
             $objWriter,
             3,
-            'http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings',
+            Namespaces::SHARED_STRINGS,
             'sharedStrings.xml'
         );
 
@@ -132,7 +135,7 @@ public function writeWorkbookRelationships(Spreadsheet $spreadsheet)
             $this->writeRelationship(
                 $objWriter,
                 ($i + 1 + 3),
-                'http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet',
+                Namespaces::WORKSHEET,
                 'worksheets/sheet' . ($i + 1) . '.xml'
             );
         }
@@ -142,12 +145,23 @@ public function writeWorkbookRelationships(Spreadsheet $spreadsheet)
             $this->writeRelationShip(
                 $objWriter,
                 ($i + 1 + 3),
-                'http://schemas.microsoft.com/office/2006/relationships/vbaProject',
+                Namespaces::VBA,
                 'vbaProject.bin'
             );
             ++$i; //increment i if needed for an another relation
         }
 
+        // Metadata needed for Dynamic Arrays
+        if ($this->getParentWriter()->useDynamicArrays()) {
+            $this->writeRelationShip(
+                $objWriter,
+                ($i + 1 + 3),
+                Namespaces::RELATIONSHIPS_METADATA,
+                'metadata.xml'
+            );
+            ++$i; //increment i if needed for an another relation
+        }
+
         $objWriter->endElement();
 
         return $objWriter->getData();
@@ -160,12 +174,12 @@ public function writeWorkbookRelationships(Spreadsheet $spreadsheet)
      *     rId1                 - Drawings
      *  rId_hyperlink_x     - Hyperlinks
      *
-     * @param int $pWorksheetId
      * @param bool $includeCharts Flag indicating if we should write charts
+     * @param int $tableRef Table ID
      *
      * @return string XML Output
      */
-    public function writeWorksheetRelationships(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $pWorksheet, $pWorksheetId = 1, $includeCharts = false)
+    public function writeWorksheetRelationships(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $worksheet, int $worksheetId = 1, bool $includeCharts = false, int $tableRef = 1, array &$zipContent = []): string
     {
         // Create XML writer
         $objWriter = null;
@@ -180,22 +194,22 @@ public function writeWorksheetRelationships(\PhpOffice\PhpSpreadsheet\Worksheet\
 
         // Relationships
         $objWriter->startElement('Relationships');
-        $objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/package/2006/relationships');
+        $objWriter->writeAttribute('xmlns', Namespaces::RELATIONSHIPS);
 
         // Write drawing relationships?
         $drawingOriginalIds = [];
-        $unparsedLoadedData = $pWorksheet->getParent()->getUnparsedLoadedData();
-        if (isset($unparsedLoadedData['sheets'][$pWorksheet->getCodeName()]['drawingOriginalIds'])) {
-            $drawingOriginalIds = $unparsedLoadedData['sheets'][$pWorksheet->getCodeName()]['drawingOriginalIds'];
+        $unparsedLoadedData = $worksheet->getParentOrThrow()->getUnparsedLoadedData();
+        if (isset($unparsedLoadedData['sheets'][$worksheet->getCodeName()]['drawingOriginalIds'])) {
+            $drawingOriginalIds = $unparsedLoadedData['sheets'][$worksheet->getCodeName()]['drawingOriginalIds'];
         }
 
         if ($includeCharts) {
-            $charts = $pWorksheet->getChartCollection();
+            $charts = $worksheet->getChartCollection();
         } else {
             $charts = [];
         }
 
-        if (($pWorksheet->getDrawingCollection()->count() > 0) || (count($charts) > 0) || $drawingOriginalIds) {
+        if (($worksheet->getDrawingCollection()->count() > 0) || (count($charts) > 0) || $drawingOriginalIds) {
             $rId = 1;
 
             // Use original $relPath to get original $rId.
@@ -208,23 +222,37 @@ public function writeWorksheetRelationships(\PhpOffice\PhpSpreadsheet\Worksheet\
             }
 
             // Generate new $relPath to write drawing relationship
-            $relPath = '../drawings/drawing' . $pWorksheetId . '.xml';
+            $relPath = '../drawings/drawing' . $worksheetId . '.xml';
             $this->writeRelationship(
                 $objWriter,
                 $rId,
-                'http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing',
+                Namespaces::RELATIONSHIPS_DRAWING,
                 $relPath
             );
         }
 
+        $backgroundImage = $worksheet->getBackgroundImage();
+        if ($backgroundImage !== '') {
+            $rId = 'Bg';
+            $uniqueName = md5(mt_rand(0, 9999) . time() . mt_rand(0, 9999));
+            $relPath = "../media/$uniqueName." . $worksheet->getBackgroundExtension();
+            $this->writeRelationship(
+                $objWriter,
+                $rId,
+                Namespaces::IMAGE,
+                $relPath
+            );
+            $zipContent["xl/media/$uniqueName." . $worksheet->getBackgroundExtension()] = $backgroundImage;
+        }
+
         // Write hyperlink relationships?
         $i = 1;
-        foreach ($pWorksheet->getHyperlinkCollection() as $hyperlink) {
+        foreach ($worksheet->getHyperlinkCollection() as $hyperlink) {
             if (!$hyperlink->isInternal()) {
                 $this->writeRelationship(
                     $objWriter,
                     '_hyperlink_' . $i,
-                    'http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink',
+                    Namespaces::HYPERLINK,
                     $hyperlink->getUrl(),
                     'External'
                 );
@@ -235,56 +263,71 @@ public function writeWorksheetRelationships(\PhpOffice\PhpSpreadsheet\Worksheet\
 
         // Write comments relationship?
         $i = 1;
-        if (count($pWorksheet->getComments()) > 0) {
+        if (count($worksheet->getComments()) > 0 || isset($unparsedLoadedData['sheets'][$worksheet->getCodeName()]['legacyDrawing'])) {
             $this->writeRelationship(
                 $objWriter,
                 '_comments_vml' . $i,
-                'http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing',
-                '../drawings/vmlDrawing' . $pWorksheetId . '.vml'
+                Namespaces::VML,
+                '../drawings/vmlDrawing' . $worksheetId . '.vml'
             );
+        }
 
+        if (count($worksheet->getComments()) > 0) {
             $this->writeRelationship(
                 $objWriter,
                 '_comments' . $i,
-                'http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments',
-                '../comments' . $pWorksheetId . '.xml'
+                Namespaces::COMMENTS,
+                '../comments' . $worksheetId . '.xml'
+            );
+        }
+
+        // Write Table
+        $tableCount = $worksheet->getTableCollection()->count();
+        for ($i = 1; $i <= $tableCount; ++$i) {
+            $this->writeRelationship(
+                $objWriter,
+                '_table_' . $i,
+                Namespaces::RELATIONSHIPS_TABLE,
+                '../tables/table' . $tableRef++ . '.xml'
             );
         }
 
         // Write header/footer relationship?
         $i = 1;
-        if (count($pWorksheet->getHeaderFooter()->getImages()) > 0) {
+        if (count($worksheet->getHeaderFooter()->getImages()) > 0) {
             $this->writeRelationship(
                 $objWriter,
                 '_headerfooter_vml' . $i,
-                'http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing',
-                '../drawings/vmlDrawingHF' . $pWorksheetId . '.vml'
+                Namespaces::VML,
+                '../drawings/vmlDrawingHF' . $worksheetId . '.vml'
             );
         }
 
-        $this->writeUnparsedRelationship($pWorksheet, $objWriter, 'ctrlProps', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/ctrlProp');
-        $this->writeUnparsedRelationship($pWorksheet, $objWriter, 'vmlDrawings', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing');
-        $this->writeUnparsedRelationship($pWorksheet, $objWriter, 'printerSettings', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/printerSettings');
+        $this->writeUnparsedRelationship($worksheet, $objWriter, 'ctrlProps', Namespaces::RELATIONSHIPS_CTRLPROP);
+        $this->writeUnparsedRelationship($worksheet, $objWriter, 'vmlDrawings', Namespaces::VML);
+        $this->writeUnparsedRelationship($worksheet, $objWriter, 'printerSettings', Namespaces::RELATIONSHIPS_PRINTER_SETTINGS);
 
         $objWriter->endElement();
 
         return $objWriter->getData();
     }
 
-    private function writeUnparsedRelationship(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $pWorksheet, XMLWriter $objWriter, $relationship, $type): void
+    private function writeUnparsedRelationship(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $worksheet, XMLWriter $objWriter, string $relationship, string $type): void
     {
-        $unparsedLoadedData = $pWorksheet->getParent()->getUnparsedLoadedData();
-        if (!isset($unparsedLoadedData['sheets'][$pWorksheet->getCodeName()][$relationship])) {
+        $unparsedLoadedData = $worksheet->getParentOrThrow()->getUnparsedLoadedData();
+        if (!isset($unparsedLoadedData['sheets'][$worksheet->getCodeName()][$relationship])) {
             return;
         }
 
-        foreach ($unparsedLoadedData['sheets'][$pWorksheet->getCodeName()][$relationship] as $rId => $value) {
-            $this->writeRelationship(
-                $objWriter,
-                $rId,
-                $type,
-                $value['relFilePath']
-            );
+        foreach ($unparsedLoadedData['sheets'][$worksheet->getCodeName()][$relationship] as $rId => $value) {
+            if (!str_starts_with($rId, '_headerfooter_vml')) {
+                $this->writeRelationship(
+                    $objWriter,
+                    $rId,
+                    $type,
+                    $value['relFilePath']
+                );
+            }
         }
     }
 
@@ -296,7 +339,7 @@ private function writeUnparsedRelationship(\PhpOffice\PhpSpreadsheet\Worksheet\W
      *
      * @return string XML Output
      */
-    public function writeDrawingRelationships(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $pWorksheet, &$chartRef, $includeCharts = false)
+    public function writeDrawingRelationships(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $worksheet, int &$chartRef, bool $includeCharts = false): string
     {
         // Create XML writer
         $objWriter = null;
@@ -311,24 +354,23 @@ public function writeDrawingRelationships(\PhpOffice\PhpSpreadsheet\Worksheet\Wo
 
         // Relationships
         $objWriter->startElement('Relationships');
-        $objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/package/2006/relationships');
+        $objWriter->writeAttribute('xmlns', Namespaces::RELATIONSHIPS);
 
         // Loop through images and write relationships
         $i = 1;
-        $iterator = $pWorksheet->getDrawingCollection()->getIterator();
+        $iterator = $worksheet->getDrawingCollection()->getIterator();
         while ($iterator->valid()) {
+            $drawing = $iterator->current();
             if (
-                $iterator->current() instanceof \PhpOffice\PhpSpreadsheet\Worksheet\Drawing
-                || $iterator->current() instanceof MemoryDrawing
+                $drawing instanceof \PhpOffice\PhpSpreadsheet\Worksheet\Drawing
+                || $drawing instanceof MemoryDrawing
             ) {
                 // Write relationship for image drawing
-                /** @var \PhpOffice\PhpSpreadsheet\Worksheet\Drawing $drawing */
-                $drawing = $iterator->current();
                 $this->writeRelationship(
                     $objWriter,
                     $i,
-                    'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image',
-                    '../media/' . str_replace(' ', '', $drawing->getIndexedFilename())
+                    Namespaces::IMAGE,
+                    '../media/' . $drawing->getIndexedFilename()
                 );
 
                 $i = $this->writeDrawingHyperLink($objWriter, $drawing, $i);
@@ -340,13 +382,13 @@ public function writeDrawingRelationships(\PhpOffice\PhpSpreadsheet\Worksheet\Wo
 
         if ($includeCharts) {
             // Loop through charts and write relationships
-            $chartCount = $pWorksheet->getChartCount();
+            $chartCount = $worksheet->getChartCount();
             if ($chartCount > 0) {
                 for ($c = 0; $c < $chartCount; ++$c) {
                     $this->writeRelationship(
                         $objWriter,
                         $i++,
-                        'http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart',
+                        Namespaces::RELATIONSHIPS_CHART,
                         '../charts/chart' . ++$chartRef . '.xml'
                     );
                 }
@@ -363,7 +405,7 @@ public function writeDrawingRelationships(\PhpOffice\PhpSpreadsheet\Worksheet\Wo
      *
      * @return string XML Output
      */
-    public function writeHeaderFooterDrawingRelationships(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $pWorksheet)
+    public function writeHeaderFooterDrawingRelationships(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $worksheet): string
     {
         // Create XML writer
         $objWriter = null;
@@ -378,15 +420,15 @@ public function writeHeaderFooterDrawingRelationships(\PhpOffice\PhpSpreadsheet\
 
         // Relationships
         $objWriter->startElement('Relationships');
-        $objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/package/2006/relationships');
+        $objWriter->writeAttribute('xmlns', Namespaces::RELATIONSHIPS);
 
         // Loop through images and write relationships
-        foreach ($pWorksheet->getHeaderFooter()->getImages() as $key => $value) {
+        foreach ($worksheet->getHeaderFooter()->getImages() as $key => $value) {
             // Write relationship for image drawing
             $this->writeRelationship(
                 $objWriter,
                 $key,
-                'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image',
+                Namespaces::IMAGE,
                 '../media/' . $value->getIndexedFilename()
             );
         }
@@ -396,26 +438,62 @@ public function writeHeaderFooterDrawingRelationships(\PhpOffice\PhpSpreadsheet\
         return $objWriter->getData();
     }
 
+    public function writeVMLDrawingRelationships(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $worksheet): string
+    {
+        // Create XML writer
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+        // Relationships
+        $objWriter->startElement('Relationships');
+        $objWriter->writeAttribute('xmlns', Namespaces::RELATIONSHIPS);
+
+        // Loop through images and write relationships
+        foreach ($worksheet->getComments() as $comment) {
+            if (!$comment->hasBackgroundImage()) {
+                continue;
+            }
+
+            $bgImage = $comment->getBackgroundImage();
+            $this->writeRelationship(
+                $objWriter,
+                $bgImage->getImageIndex(),
+                Namespaces::IMAGE,
+                '../media/' . $bgImage->getMediaFilename()
+            );
+        }
+
+        $objWriter->endElement();
+
+        return $objWriter->getData();
+    }
+
     /**
      * Write Override content type.
      *
-     * @param XMLWriter $objWriter XML Writer
-     * @param int $pId Relationship ID. rId will be prepended!
-     * @param string $pType Relationship type
-     * @param string $pTarget Relationship target
-     * @param string $pTargetMode Relationship target mode
+     * @param int|string $id Relationship ID. rId will be prepended!
+     * @param string $type Relationship type
+     * @param string $target Relationship target
+     * @param string $targetMode Relationship target mode
      */
-    private function writeRelationship(XMLWriter $objWriter, $pId, $pType, $pTarget, $pTargetMode = ''): void
+    private function writeRelationship(XMLWriter $objWriter, $id, string $type, string $target, string $targetMode = ''): void
     {
-        if ($pType != '' && $pTarget != '') {
+        if ($type != '' && $target != '') {
             // Write relationship
             $objWriter->startElement('Relationship');
-            $objWriter->writeAttribute('Id', 'rId' . $pId);
-            $objWriter->writeAttribute('Type', $pType);
-            $objWriter->writeAttribute('Target', $pTarget);
+            $objWriter->writeAttribute('Id', 'rId' . $id);
+            $objWriter->writeAttribute('Type', $type);
+            $objWriter->writeAttribute('Target', $target);
 
-            if ($pTargetMode != '') {
-                $objWriter->writeAttribute('TargetMode', $pTargetMode);
+            if ($targetMode != '') {
+                $objWriter->writeAttribute('TargetMode', $targetMode);
             }
 
             $objWriter->endElement();
@@ -424,12 +502,7 @@ private function writeRelationship(XMLWriter $objWriter, $pId, $pType, $pTarget,
         }
     }
 
-    /**
-     * @param \PhpOffice\PhpSpreadsheet\Worksheet\Drawing $drawing
-     *
-     * @return int
-     */
-    private function writeDrawingHyperLink($objWriter, $drawing, $i)
+    private function writeDrawingHyperLink(XMLWriter $objWriter, BaseDrawing $drawing, int $i): int
     {
         if ($drawing->getHyperlink() === null) {
             return $i;
@@ -439,7 +512,7 @@ private function writeDrawingHyperLink($objWriter, $drawing, $i)
         $this->writeRelationship(
             $objWriter,
             $i,
-            'http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink',
+            Namespaces::HYPERLINK,
             $drawing->getHyperlink()->getUrl(),
             $drawing->getHyperlink()->getTypeHyperlink()
         );
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/RelsRibbon.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/RelsRibbon.php
index 8005207cc2..93c977798c 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/RelsRibbon.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/RelsRibbon.php
@@ -2,6 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Namespaces;
 use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 
@@ -12,7 +13,7 @@ class RelsRibbon extends WriterPart
      *
      * @return string XML Output
      */
-    public function writeRibbonRelationships(Spreadsheet $spreadsheet)
+    public function writeRibbonRelationships(Spreadsheet $spreadsheet): string
     {
         // Create XML writer
         $objWriter = null;
@@ -27,13 +28,13 @@ public function writeRibbonRelationships(Spreadsheet $spreadsheet)
 
         // Relationships
         $objWriter->startElement('Relationships');
-        $objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/package/2006/relationships');
+        $objWriter->writeAttribute('xmlns', Namespaces::RELATIONSHIPS);
         $localRels = $spreadsheet->getRibbonBinObjects('names');
         if (is_array($localRels)) {
             foreach ($localRels as $aId => $aTarget) {
                 $objWriter->startElement('Relationship');
                 $objWriter->writeAttribute('Id', $aId);
-                $objWriter->writeAttribute('Type', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image');
+                $objWriter->writeAttribute('Type', Namespaces::IMAGE);
                 $objWriter->writeAttribute('Target', $aTarget);
                 $objWriter->endElement();
             }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/RelsVBA.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/RelsVBA.php
index 55bcd360df..4ec0202588 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/RelsVBA.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/RelsVBA.php
@@ -2,8 +2,8 @@
 
 namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Namespaces;
 use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
-use PhpOffice\PhpSpreadsheet\Spreadsheet;
 
 class RelsVBA extends WriterPart
 {
@@ -12,7 +12,7 @@ class RelsVBA extends WriterPart
      *
      * @return string XML Output
      */
-    public function writeVBARelationships(Spreadsheet $spreadsheet)
+    public function writeVBARelationships(): string
     {
         // Create XML writer
         $objWriter = null;
@@ -27,10 +27,10 @@ public function writeVBARelationships(Spreadsheet $spreadsheet)
 
         // Relationships
         $objWriter->startElement('Relationships');
-        $objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/package/2006/relationships');
+        $objWriter->writeAttribute('xmlns', Namespaces::RELATIONSHIPS);
         $objWriter->startElement('Relationship');
         $objWriter->writeAttribute('Id', 'rId1');
-        $objWriter->writeAttribute('Type', 'http://schemas.microsoft.com/office/2006/relationships/vbaProjectSignature');
+        $objWriter->writeAttribute('Type', Namespaces::VBA_SIGNATURE);
         $objWriter->writeAttribute('Target', 'vbaProjectSignature.bin');
         $objWriter->endElement();
         $objWriter->endElement();
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/StringTable.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
index b0f7d6d417..98b1dddb91 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
@@ -2,55 +2,56 @@
 
 namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
 use PhpOffice\PhpSpreadsheet\Cell\DataType;
+use PhpOffice\PhpSpreadsheet\Chart\ChartColor;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Namespaces;
 use PhpOffice\PhpSpreadsheet\RichText\RichText;
 use PhpOffice\PhpSpreadsheet\RichText\Run;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
-use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet as ActualWorksheet;
 
 class StringTable extends WriterPart
 {
     /**
      * Create worksheet stringtable.
      *
-     * @param Worksheet $pSheet Worksheet
-     * @param string[] $pExistingTable Existing table to eventually merge with
+     * @param string[] $existingTable Existing table to eventually merge with
      *
      * @return string[] String table for worksheet
      */
-    public function createStringTable(Worksheet $pSheet, $pExistingTable = null)
+    public function createStringTable(ActualWorksheet $worksheet, ?array $existingTable = null): array
     {
         // Create string lookup table
         $aStringTable = [];
-        $cellCollection = null;
-        $aFlippedStringTable = null; // For faster lookup
 
         // Is an existing table given?
-        if (($pExistingTable !== null) && is_array($pExistingTable)) {
-            $aStringTable = $pExistingTable;
+        if (($existingTable !== null) && is_array($existingTable)) {
+            $aStringTable = $existingTable;
         }
 
         // Fill index array
         $aFlippedStringTable = $this->flipStringTable($aStringTable);
 
         // Loop through cells
-        foreach ($pSheet->getCoordinates() as $coordinate) {
-            $cell = $pSheet->getCell($coordinate);
+        foreach ($worksheet->getCellCollection()->getCoordinates() as $coordinate) {
+            /** @var Cell $cell */
+            $cell = $worksheet->getCellCollection()->get($coordinate);
             $cellValue = $cell->getValue();
             if (
-                !is_object($cellValue) &&
-                ($cellValue !== null) &&
-                $cellValue !== '' &&
-                !isset($aFlippedStringTable[$cellValue]) &&
-                ($cell->getDataType() == DataType::TYPE_STRING || $cell->getDataType() == DataType::TYPE_STRING2 || $cell->getDataType() == DataType::TYPE_NULL)
+                !is_object($cellValue)
+                && ($cellValue !== null)
+                && $cellValue !== ''
+                && ($cell->getDataType() == DataType::TYPE_STRING || $cell->getDataType() == DataType::TYPE_STRING2 || $cell->getDataType() == DataType::TYPE_NULL)
+                && !isset($aFlippedStringTable[$cellValue])
             ) {
                 $aStringTable[] = $cellValue;
                 $aFlippedStringTable[$cellValue] = true;
             } elseif (
-                $cellValue instanceof RichText &&
-                ($cellValue !== null) &&
-                !isset($aFlippedStringTable[$cellValue->getHashCode()])
+                $cellValue instanceof RichText
+                && ($cellValue !== null)
+                && !isset($aFlippedStringTable[$cellValue->getHashCode()])
             ) {
                 $aStringTable[] = $cellValue;
                 $aFlippedStringTable[$cellValue->getHashCode()] = true;
@@ -63,11 +64,11 @@ public function createStringTable(Worksheet $pSheet, $pExistingTable = null)
     /**
      * Write string table to XML format.
      *
-     * @param string[] $pStringTable
+     * @param (RichText|string)[] $stringTable
      *
      * @return string XML Output
      */
-    public function writeStringTable(array $pStringTable)
+    public function writeStringTable(array $stringTable): string
     {
         // Create XML writer
         $objWriter = null;
@@ -82,14 +83,14 @@ public function writeStringTable(array $pStringTable)
 
         // String table
         $objWriter->startElement('sst');
-        $objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/spreadsheetml/2006/main');
-        $objWriter->writeAttribute('uniqueCount', count($pStringTable));
+        $objWriter->writeAttribute('xmlns', Namespaces::MAIN);
+        $objWriter->writeAttribute('uniqueCount', (string) count($stringTable));
 
         // Loop through string table
-        foreach ($pStringTable as $textElement) {
+        foreach ($stringTable as $textElement) {
             $objWriter->startElement('si');
 
-            if (!$textElement instanceof RichText) {
+            if (!($textElement instanceof RichText)) {
                 $textToWrite = StringHelper::controlCharacterPHP2OOXML($textElement);
                 $objWriter->startElement('t');
                 if ($textToWrite !== trim($textToWrite)) {
@@ -97,7 +98,7 @@ public function writeStringTable(array $pStringTable)
                 }
                 $objWriter->writeRawData($textToWrite);
                 $objWriter->endElement();
-            } elseif ($textElement instanceof RichText) {
+            } else {
                 $this->writeRichText($objWriter, $textElement);
             }
 
@@ -112,31 +113,31 @@ public function writeStringTable(array $pStringTable)
     /**
      * Write Rich Text.
      *
-     * @param XMLWriter $objWriter XML Writer
-     * @param RichText $pRichText Rich text
-     * @param string $prefix Optional Namespace prefix
+     * @param ?string $prefix Optional Namespace prefix
      */
-    public function writeRichText(XMLWriter $objWriter, RichText $pRichText, $prefix = null): void
+    public function writeRichText(XMLWriter $objWriter, RichText $richText, ?string $prefix = null): void
     {
         if ($prefix !== null) {
             $prefix .= ':';
         }
 
         // Loop through rich text elements
-        $elements = $pRichText->getRichTextElements();
+        $elements = $richText->getRichTextElements();
         foreach ($elements as $element) {
             // r
             $objWriter->startElement($prefix . 'r');
 
             // rPr
-            if ($element instanceof Run) {
+            if ($element instanceof Run && $element->getFont() !== null) {
                 // rPr
                 $objWriter->startElement($prefix . 'rPr');
 
                 // rFont
-                $objWriter->startElement($prefix . 'rFont');
-                $objWriter->writeAttribute('val', $element->getFont()->getName());
-                $objWriter->endElement();
+                if ($element->getFont()->getName() !== null) {
+                    $objWriter->startElement($prefix . 'rFont');
+                    $objWriter->writeAttribute('val', $element->getFont()->getName());
+                    $objWriter->endElement();
+                }
 
                 // Bold
                 $objWriter->startElement($prefix . 'b');
@@ -165,19 +166,25 @@ public function writeRichText(XMLWriter $objWriter, RichText $pRichText, $prefix
                 $objWriter->endElement();
 
                 // Color
-                $objWriter->startElement($prefix . 'color');
-                $objWriter->writeAttribute('rgb', $element->getFont()->getColor()->getARGB());
-                $objWriter->endElement();
+                if ($element->getFont()->getColor()->getARGB() !== null) {
+                    $objWriter->startElement($prefix . 'color');
+                    $objWriter->writeAttribute('rgb', $element->getFont()->getColor()->getARGB());
+                    $objWriter->endElement();
+                }
 
                 // Size
-                $objWriter->startElement($prefix . 'sz');
-                $objWriter->writeAttribute('val', $element->getFont()->getSize());
-                $objWriter->endElement();
+                if ($element->getFont()->getSize() !== null) {
+                    $objWriter->startElement($prefix . 'sz');
+                    $objWriter->writeAttribute('val', (string) $element->getFont()->getSize());
+                    $objWriter->endElement();
+                }
 
                 // Underline
-                $objWriter->startElement($prefix . 'u');
-                $objWriter->writeAttribute('val', $element->getFont()->getUnderline());
-                $objWriter->endElement();
+                if ($element->getFont()->getUnderline() !== null) {
+                    $objWriter->startElement($prefix . 'u');
+                    $objWriter->writeAttribute('val', $element->getFont()->getUnderline());
+                    $objWriter->endElement();
+                }
 
                 $objWriter->endElement();
             }
@@ -195,57 +202,87 @@ public function writeRichText(XMLWriter $objWriter, RichText $pRichText, $prefix
     /**
      * Write Rich Text.
      *
-     * @param XMLWriter $objWriter XML Writer
-     * @param RichText|string $pRichText text string or Rich text
+     * @param RichText|string $richText text string or Rich text
      * @param string $prefix Optional Namespace prefix
      */
-    public function writeRichTextForCharts(XMLWriter $objWriter, $pRichText = null, $prefix = null): void
+    public function writeRichTextForCharts(XMLWriter $objWriter, $richText = null, string $prefix = ''): void
     {
-        if (!$pRichText instanceof RichText) {
-            $textRun = $pRichText;
-            $pRichText = new RichText();
-            $pRichText->createTextRun($textRun);
+        if (!($richText instanceof RichText)) {
+            $textRun = $richText;
+            $richText = new RichText();
+            $run = $richText->createTextRun($textRun ?? '');
+            $run->setFont(null);
         }
 
-        if ($prefix !== null) {
+        if ($prefix !== '') {
             $prefix .= ':';
         }
 
         // Loop through rich text elements
-        $elements = $pRichText->getRichTextElements();
+        $elements = $richText->getRichTextElements();
         foreach ($elements as $element) {
             // r
             $objWriter->startElement($prefix . 'r');
+            if ($element->getFont() !== null) {
+                // rPr
+                $objWriter->startElement($prefix . 'rPr');
+                $fontSize = $element->getFont()->getSize();
+                if (is_numeric($fontSize)) {
+                    $fontSize *= (($fontSize < 100) ? 100 : 1);
+                    $objWriter->writeAttribute('sz', (string) $fontSize);
+                }
 
-            // rPr
-            $objWriter->startElement($prefix . 'rPr');
-
-            // Bold
-            $objWriter->writeAttribute('b', ($element->getFont()->getBold() ? 1 : 0));
-            // Italic
-            $objWriter->writeAttribute('i', ($element->getFont()->getItalic() ? 1 : 0));
-            // Underline
-            $underlineType = $element->getFont()->getUnderline();
-            switch ($underlineType) {
-                case 'single':
-                    $underlineType = 'sng';
-
-                    break;
-                case 'double':
-                    $underlineType = 'dbl';
-
-                    break;
-            }
-            $objWriter->writeAttribute('u', $underlineType);
-            // Strikethrough
-            $objWriter->writeAttribute('strike', ($element->getFont()->getStrikethrough() ? 'sngStrike' : 'noStrike'));
+                // Bold
+                $objWriter->writeAttribute('b', ($element->getFont()->getBold() ? '1' : '0'));
+                // Italic
+                $objWriter->writeAttribute('i', ($element->getFont()->getItalic() ? '1' : '0'));
+                // Underline
+                $underlineType = $element->getFont()->getUnderline();
+                switch ($underlineType) {
+                    case 'single':
+                        $underlineType = 'sng';
 
-            // rFont
-            $objWriter->startElement($prefix . 'latin');
-            $objWriter->writeAttribute('typeface', $element->getFont()->getName());
-            $objWriter->endElement();
+                        break;
+                    case 'double':
+                        $underlineType = 'dbl';
 
-            $objWriter->endElement();
+                        break;
+                }
+                if ($underlineType !== null) {
+                    $objWriter->writeAttribute('u', $underlineType);
+                }
+                // Strikethrough
+                $objWriter->writeAttribute('strike', ($element->getFont()->getStriketype() ?: 'noStrike'));
+                // Superscript/subscript
+                if ($element->getFont()->getBaseLine()) {
+                    $objWriter->writeAttribute('baseline', (string) $element->getFont()->getBaseLine());
+                }
+
+                // Color
+                $this->writeChartTextColor($objWriter, $element->getFont()->getChartColor(), $prefix);
+
+                // Underscore Color
+                $this->writeChartTextColor($objWriter, $element->getFont()->getUnderlineColor(), $prefix, 'uFill');
+
+                // fontName
+                if ($element->getFont()->getLatin()) {
+                    $objWriter->startElement($prefix . 'latin');
+                    $objWriter->writeAttribute('typeface', $element->getFont()->getLatin());
+                    $objWriter->endElement();
+                }
+                if ($element->getFont()->getEastAsian()) {
+                    $objWriter->startElement($prefix . 'ea');
+                    $objWriter->writeAttribute('typeface', $element->getFont()->getEastAsian());
+                    $objWriter->endElement();
+                }
+                if ($element->getFont()->getComplexScript()) {
+                    $objWriter->startElement($prefix . 'cs');
+                    $objWriter->writeAttribute('typeface', $element->getFont()->getComplexScript());
+                    $objWriter->endElement();
+                }
+
+                $objWriter->endElement();
+            }
 
             // t
             $objWriter->startElement($prefix . 't');
@@ -256,14 +293,39 @@ public function writeRichTextForCharts(XMLWriter $objWriter, $pRichText = null,
         }
     }
 
+    private function writeChartTextColor(XMLWriter $objWriter, ?ChartColor $underlineColor, string $prefix, ?string $openTag = ''): void
+    {
+        if ($underlineColor !== null) {
+            $type = $underlineColor->getType();
+            $value = $underlineColor->getValue();
+            if (!empty($type) && !empty($value)) {
+                if ($openTag !== '') {
+                    $objWriter->startElement($prefix . $openTag);
+                }
+                $objWriter->startElement($prefix . 'solidFill');
+                $objWriter->startElement($prefix . $type);
+                $objWriter->writeAttribute('val', $value);
+                $alpha = $underlineColor->getAlpha();
+                if (is_numeric($alpha)) {
+                    $objWriter->startElement('a:alpha');
+                    $objWriter->writeAttribute('val', ChartColor::alphaToXml((int) $alpha));
+                    $objWriter->endElement();
+                }
+                $objWriter->endElement(); // srgbClr/schemeClr/prstClr
+                $objWriter->endElement(); // solidFill
+                if ($openTag !== '') {
+                    $objWriter->endElement(); // uFill
+                }
+            }
+        }
+    }
+
     /**
      * Flip string table (for index searching).
      *
      * @param array $stringTable Stringtable
-     *
-     * @return array
      */
-    public function flipStringTable(array $stringTable)
+    public function flipStringTable(array $stringTable): array
     {
         // Return value
         $returnValue = [];
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Style.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Style.php
index 0c43fbf490..daac5d020c 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Style.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Style.php
@@ -2,9 +2,11 @@
 
 namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Namespaces;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Style\Alignment;
 use PhpOffice\PhpSpreadsheet\Style\Border;
 use PhpOffice\PhpSpreadsheet\Style\Borders;
 use PhpOffice\PhpSpreadsheet\Style\Conditional;
@@ -20,7 +22,7 @@ class Style extends WriterPart
      *
      * @return string XML Output
      */
-    public function writeStyles(Spreadsheet $spreadsheet)
+    public function writeStyles(Spreadsheet $spreadsheet): string
     {
         // Create XML writer
         $objWriter = null;
@@ -36,11 +38,11 @@ public function writeStyles(Spreadsheet $spreadsheet)
         // styleSheet
         $objWriter->startElement('styleSheet');
         $objWriter->writeAttribute('xml:space', 'preserve');
-        $objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/spreadsheetml/2006/main');
+        $objWriter->writeAttribute('xmlns', Namespaces::MAIN);
 
         // numFmts
         $objWriter->startElement('numFmts');
-        $objWriter->writeAttribute('count', $this->getParentWriter()->getNumFmtHashTable()->count());
+        $objWriter->writeAttribute('count', (string) $this->getParentWriter()->getNumFmtHashTable()->count());
 
         // numFmt
         for ($i = 0; $i < $this->getParentWriter()->getNumFmtHashTable()->count(); ++$i) {
@@ -51,82 +53,99 @@ public function writeStyles(Spreadsheet $spreadsheet)
 
         // fonts
         $objWriter->startElement('fonts');
-        $objWriter->writeAttribute('count', $this->getParentWriter()->getFontHashTable()->count());
+        $objWriter->writeAttribute('count', (string) $this->getParentWriter()->getFontHashTable()->count());
 
         // font
         for ($i = 0; $i < $this->getParentWriter()->getFontHashTable()->count(); ++$i) {
-            $this->writeFont($objWriter, $this->getParentWriter()->getFontHashTable()->getByIndex($i));
+            $thisfont = $this->getParentWriter()->getFontHashTable()->getByIndex($i);
+            if ($thisfont !== null) {
+                $this->writeFont($objWriter, $thisfont);
+            }
         }
 
         $objWriter->endElement();
 
         // fills
         $objWriter->startElement('fills');
-        $objWriter->writeAttribute('count', $this->getParentWriter()->getFillHashTable()->count());
+        $objWriter->writeAttribute('count', (string) $this->getParentWriter()->getFillHashTable()->count());
 
         // fill
         for ($i = 0; $i < $this->getParentWriter()->getFillHashTable()->count(); ++$i) {
-            $this->writeFill($objWriter, $this->getParentWriter()->getFillHashTable()->getByIndex($i));
+            $thisfill = $this->getParentWriter()->getFillHashTable()->getByIndex($i);
+            if ($thisfill !== null) {
+                $this->writeFill($objWriter, $thisfill);
+            }
         }
 
         $objWriter->endElement();
 
         // borders
         $objWriter->startElement('borders');
-        $objWriter->writeAttribute('count', $this->getParentWriter()->getBordersHashTable()->count());
+        $objWriter->writeAttribute('count', (string) $this->getParentWriter()->getBordersHashTable()->count());
 
         // border
         for ($i = 0; $i < $this->getParentWriter()->getBordersHashTable()->count(); ++$i) {
-            $this->writeBorder($objWriter, $this->getParentWriter()->getBordersHashTable()->getByIndex($i));
+            $thisborder = $this->getParentWriter()->getBordersHashTable()->getByIndex($i);
+            if ($thisborder !== null) {
+                $this->writeBorder($objWriter, $thisborder);
+            }
         }
 
         $objWriter->endElement();
 
         // cellStyleXfs
         $objWriter->startElement('cellStyleXfs');
-        $objWriter->writeAttribute('count', 1);
+        $objWriter->writeAttribute('count', '1');
 
         // xf
         $objWriter->startElement('xf');
-        $objWriter->writeAttribute('numFmtId', 0);
-        $objWriter->writeAttribute('fontId', 0);
-        $objWriter->writeAttribute('fillId', 0);
-        $objWriter->writeAttribute('borderId', 0);
+        $objWriter->writeAttribute('numFmtId', '0');
+        $objWriter->writeAttribute('fontId', '0');
+        $objWriter->writeAttribute('fillId', '0');
+        $objWriter->writeAttribute('borderId', '0');
         $objWriter->endElement();
 
         $objWriter->endElement();
 
         // cellXfs
         $objWriter->startElement('cellXfs');
-        $objWriter->writeAttribute('count', count($spreadsheet->getCellXfCollection()));
+        $objWriter->writeAttribute('count', (string) count($spreadsheet->getCellXfCollection()));
 
         // xf
+        $alignment = new Alignment();
+        $defaultAlignHash = $alignment->getHashCode();
+        if ($defaultAlignHash !== $spreadsheet->getDefaultStyle()->getAlignment()->getHashCode()) {
+            $defaultAlignHash = '';
+        }
         foreach ($spreadsheet->getCellXfCollection() as $cellXf) {
-            $this->writeCellStyleXf($objWriter, $cellXf, $spreadsheet);
+            $this->writeCellStyleXf($objWriter, $cellXf, $spreadsheet, $defaultAlignHash);
         }
 
         $objWriter->endElement();
 
         // cellStyles
         $objWriter->startElement('cellStyles');
-        $objWriter->writeAttribute('count', 1);
+        $objWriter->writeAttribute('count', '1');
 
         // cellStyle
         $objWriter->startElement('cellStyle');
         $objWriter->writeAttribute('name', 'Normal');
-        $objWriter->writeAttribute('xfId', 0);
-        $objWriter->writeAttribute('builtinId', 0);
+        $objWriter->writeAttribute('xfId', '0');
+        $objWriter->writeAttribute('builtinId', '0');
         $objWriter->endElement();
 
         $objWriter->endElement();
 
         // dxfs
         $objWriter->startElement('dxfs');
-        $objWriter->writeAttribute('count', $this->getParentWriter()->getStylesConditionalHashTable()->count());
+        $objWriter->writeAttribute('count', (string) $this->getParentWriter()->getStylesConditionalHashTable()->count());
 
         // dxf
         for ($i = 0; $i < $this->getParentWriter()->getStylesConditionalHashTable()->count(); ++$i) {
-            $this->writeCellStyleDxf($objWriter, $this->getParentWriter()->getStylesConditionalHashTable()->getByIndex($i)->getStyle());
+            $thisstyle = $this->getParentWriter()->getStylesConditionalHashTable()->getByIndex($i);
+            if ($thisstyle !== null) {
+                $this->writeCellStyleDxf($objWriter, $thisstyle->getStyle());
+            }
         }
 
         $objWriter->endElement();
@@ -145,49 +164,45 @@ public function writeStyles(Spreadsheet $spreadsheet)
 
     /**
      * Write Fill.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param Fill $pFill Fill style
      */
-    private function writeFill(XMLWriter $objWriter, Fill $pFill): void
+    private function writeFill(XMLWriter $objWriter, Fill $fill): void
     {
         // Check if this is a pattern type or gradient type
         if (
-            $pFill->getFillType() === Fill::FILL_GRADIENT_LINEAR ||
-            $pFill->getFillType() === Fill::FILL_GRADIENT_PATH
+            $fill->getFillType() === Fill::FILL_GRADIENT_LINEAR
+            || $fill->getFillType() === Fill::FILL_GRADIENT_PATH
         ) {
             // Gradient fill
-            $this->writeGradientFill($objWriter, $pFill);
-        } elseif ($pFill->getFillType() !== null) {
+            $this->writeGradientFill($objWriter, $fill);
+        } elseif ($fill->getFillType() !== null) {
             // Pattern fill
-            $this->writePatternFill($objWriter, $pFill);
+            $this->writePatternFill($objWriter, $fill);
         }
     }
 
     /**
      * Write Gradient Fill.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param Fill $pFill Fill style
      */
-    private function writeGradientFill(XMLWriter $objWriter, Fill $pFill): void
+    private function writeGradientFill(XMLWriter $objWriter, Fill $fill): void
     {
         // fill
         $objWriter->startElement('fill');
 
         // gradientFill
         $objWriter->startElement('gradientFill');
-        $objWriter->writeAttribute('type', $pFill->getFillType());
-        $objWriter->writeAttribute('degree', $pFill->getRotation());
+        $objWriter->writeAttribute('type', (string) $fill->getFillType());
+        $objWriter->writeAttribute('degree', (string) $fill->getRotation());
 
         // stop
         $objWriter->startElement('stop');
         $objWriter->writeAttribute('position', '0');
 
         // color
-        $objWriter->startElement('color');
-        $objWriter->writeAttribute('rgb', $pFill->getStartColor()->getARGB());
-        $objWriter->endElement();
+        if ($fill->getStartColor()->getARGB() !== null) {
+            $objWriter->startElement('color');
+            $objWriter->writeAttribute('rgb', $fill->getStartColor()->getARGB());
+            $objWriter->endElement();
+        }
 
         $objWriter->endElement();
 
@@ -196,9 +211,11 @@ private function writeGradientFill(XMLWriter $objWriter, Fill $pFill): void
         $objWriter->writeAttribute('position', '1');
 
         // color
-        $objWriter->startElement('color');
-        $objWriter->writeAttribute('rgb', $pFill->getEndColor()->getARGB());
-        $objWriter->endElement();
+        if ($fill->getEndColor()->getARGB() !== null) {
+            $objWriter->startElement('color');
+            $objWriter->writeAttribute('rgb', $fill->getEndColor()->getARGB());
+            $objWriter->endElement();
+        }
 
         $objWriter->endElement();
 
@@ -207,34 +224,43 @@ private function writeGradientFill(XMLWriter $objWriter, Fill $pFill): void
         $objWriter->endElement();
     }
 
+    private static function writePatternColors(Fill $fill): bool
+    {
+        if ($fill->getFillType() === Fill::FILL_NONE) {
+            return false;
+        }
+
+        return $fill->getFillType() === Fill::FILL_SOLID || $fill->getColorsChanged();
+    }
+
     /**
      * Write Pattern Fill.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param Fill $pFill Fill style
      */
-    private function writePatternFill(XMLWriter $objWriter, Fill $pFill): void
+    private function writePatternFill(XMLWriter $objWriter, Fill $fill): void
     {
         // fill
         $objWriter->startElement('fill');
 
         // patternFill
         $objWriter->startElement('patternFill');
-        $objWriter->writeAttribute('patternType', $pFill->getFillType());
+        $objWriter->writeAttribute('patternType', (string) $fill->getFillType());
 
-        if ($pFill->getFillType() !== Fill::FILL_NONE) {
+        if (self::writePatternColors($fill)) {
             // fgColor
-            if ($pFill->getStartColor()->getARGB()) {
-                $objWriter->startElement('fgColor');
-                $objWriter->writeAttribute('rgb', $pFill->getStartColor()->getARGB());
+            if ($fill->getStartColor()->getARGB()) {
+                if (!$fill->getEndColor()->getARGB() && $fill->getFillType() === Fill::FILL_SOLID) {
+                    $objWriter->startElement('bgColor');
+                    $objWriter->writeAttribute('rgb', $fill->getStartColor()->getARGB());
+                } else {
+                    $objWriter->startElement('fgColor');
+                    $objWriter->writeAttribute('rgb', $fill->getStartColor()->getARGB());
+                }
                 $objWriter->endElement();
             }
-        }
-        if ($pFill->getFillType() !== Fill::FILL_NONE) {
             // bgColor
-            if ($pFill->getEndColor()->getARGB()) {
+            if ($fill->getEndColor()->getARGB()) {
                 $objWriter->startElement('bgColor');
-                $objWriter->writeAttribute('rgb', $pFill->getEndColor()->getARGB());
+                $objWriter->writeAttribute('rgb', $fill->getEndColor()->getARGB());
                 $objWriter->endElement();
             }
         }
@@ -244,16 +270,21 @@ private function writePatternFill(XMLWriter $objWriter, Fill $pFill): void
         $objWriter->endElement();
     }
 
+    private function startFont(XMLWriter $objWriter, bool &$fontStarted): void
+    {
+        if (!$fontStarted) {
+            $fontStarted = true;
+            $objWriter->startElement('font');
+        }
+    }
+
     /**
      * Write Font.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param Font $pFont Font style
      */
-    private function writeFont(XMLWriter $objWriter, Font $pFont): void
+    private function writeFont(XMLWriter $objWriter, Font $font): void
     {
+        $fontStarted = false;
         // font
-        $objWriter->startElement('font');
         //    Weird! The order of these elements actually makes a difference when opening Xlsx
         //        files in Excel2003 with the compatibility pack. It's not documented behaviour,
         //        and makes for a real WTF!
@@ -261,80 +292,94 @@ private function writeFont(XMLWriter $objWriter, Font $pFont): void
         // Bold. We explicitly write this element also when false (like MS Office Excel 2007 does
         // for conditional formatting). Otherwise it will apparently not be picked up in conditional
         // formatting style dialog
-        if ($pFont->getBold() !== null) {
+        if ($font->getBold() !== null) {
+            $this->startFont($objWriter, $fontStarted);
             $objWriter->startElement('b');
-            $objWriter->writeAttribute('val', $pFont->getBold() ? '1' : '0');
+            $objWriter->writeAttribute('val', $font->getBold() ? '1' : '0');
             $objWriter->endElement();
         }
 
         // Italic
-        if ($pFont->getItalic() !== null) {
+        if ($font->getItalic() !== null) {
+            $this->startFont($objWriter, $fontStarted);
             $objWriter->startElement('i');
-            $objWriter->writeAttribute('val', $pFont->getItalic() ? '1' : '0');
+            $objWriter->writeAttribute('val', $font->getItalic() ? '1' : '0');
             $objWriter->endElement();
         }
 
         // Strikethrough
-        if ($pFont->getStrikethrough() !== null) {
+        if ($font->getStrikethrough() !== null) {
+            $this->startFont($objWriter, $fontStarted);
             $objWriter->startElement('strike');
-            $objWriter->writeAttribute('val', $pFont->getStrikethrough() ? '1' : '0');
+            $objWriter->writeAttribute('val', $font->getStrikethrough() ? '1' : '0');
             $objWriter->endElement();
         }
 
         // Underline
-        if ($pFont->getUnderline() !== null) {
+        if ($font->getUnderline() !== null) {
+            $this->startFont($objWriter, $fontStarted);
             $objWriter->startElement('u');
-            $objWriter->writeAttribute('val', $pFont->getUnderline());
+            $objWriter->writeAttribute('val', $font->getUnderline());
             $objWriter->endElement();
         }
 
         // Superscript / subscript
-        if ($pFont->getSuperscript() === true || $pFont->getSubscript() === true) {
+        if ($font->getSuperscript() === true || $font->getSubscript() === true) {
+            $this->startFont($objWriter, $fontStarted);
             $objWriter->startElement('vertAlign');
-            if ($pFont->getSuperscript() === true) {
+            if ($font->getSuperscript() === true) {
                 $objWriter->writeAttribute('val', 'superscript');
-            } elseif ($pFont->getSubscript() === true) {
+            } elseif ($font->getSubscript() === true) {
                 $objWriter->writeAttribute('val', 'subscript');
             }
             $objWriter->endElement();
         }
 
         // Size
-        if ($pFont->getSize() !== null) {
+        if ($font->getSize() !== null) {
+            $this->startFont($objWriter, $fontStarted);
             $objWriter->startElement('sz');
-            $objWriter->writeAttribute('val', StringHelper::formatNumber($pFont->getSize()));
+            $objWriter->writeAttribute('val', StringHelper::formatNumber($font->getSize()));
             $objWriter->endElement();
         }
 
         // Foreground color
-        if ($pFont->getColor()->getARGB() !== null) {
+        if ($font->getColor()->getARGB() !== null) {
+            $this->startFont($objWriter, $fontStarted);
             $objWriter->startElement('color');
-            $objWriter->writeAttribute('rgb', $pFont->getColor()->getARGB());
+            $objWriter->writeAttribute('rgb', $font->getColor()->getARGB());
             $objWriter->endElement();
         }
 
         // Name
-        if ($pFont->getName() !== null) {
+        if ($font->getName() !== null) {
+            $this->startFont($objWriter, $fontStarted);
             $objWriter->startElement('name');
-            $objWriter->writeAttribute('val', $pFont->getName());
+            $objWriter->writeAttribute('val', $font->getName());
             $objWriter->endElement();
         }
 
-        $objWriter->endElement();
+        if (!empty($font->getScheme())) {
+            $this->startFont($objWriter, $fontStarted);
+            $objWriter->startElement('scheme');
+            $objWriter->writeAttribute('val', $font->getScheme());
+            $objWriter->endElement();
+        }
+
+        if ($fontStarted) {
+            $objWriter->endElement();
+        }
     }
 
     /**
      * Write Border.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param Borders $pBorders Borders style
      */
-    private function writeBorder(XMLWriter $objWriter, Borders $pBorders): void
+    private function writeBorder(XMLWriter $objWriter, Borders $borders): void
     {
         // Write border
         $objWriter->startElement('border');
         // Diagonal?
-        switch ($pBorders->getDiagonalDirection()) {
+        switch ($borders->getDiagonalDirection()) {
             case Borders::DIAGONAL_UP:
                 $objWriter->writeAttribute('diagonalUp', 'true');
                 $objWriter->writeAttribute('diagonalDown', 'false');
@@ -353,82 +398,90 @@ private function writeBorder(XMLWriter $objWriter, Borders $pBorders): void
         }
 
         // BorderPr
-        $this->writeBorderPr($objWriter, 'left', $pBorders->getLeft());
-        $this->writeBorderPr($objWriter, 'right', $pBorders->getRight());
-        $this->writeBorderPr($objWriter, 'top', $pBorders->getTop());
-        $this->writeBorderPr($objWriter, 'bottom', $pBorders->getBottom());
-        $this->writeBorderPr($objWriter, 'diagonal', $pBorders->getDiagonal());
+        $this->writeBorderPr($objWriter, 'left', $borders->getLeft());
+        $this->writeBorderPr($objWriter, 'right', $borders->getRight());
+        $this->writeBorderPr($objWriter, 'top', $borders->getTop());
+        $this->writeBorderPr($objWriter, 'bottom', $borders->getBottom());
+        $this->writeBorderPr($objWriter, 'diagonal', $borders->getDiagonal());
         $objWriter->endElement();
     }
 
     /**
      * Write Cell Style Xf.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param \PhpOffice\PhpSpreadsheet\Style\Style $pStyle Style
-     * @param Spreadsheet $spreadsheet Workbook
      */
-    private function writeCellStyleXf(XMLWriter $objWriter, \PhpOffice\PhpSpreadsheet\Style\Style $pStyle, Spreadsheet $spreadsheet): void
+    private function writeCellStyleXf(XMLWriter $objWriter, \PhpOffice\PhpSpreadsheet\Style\Style $style, Spreadsheet $spreadsheet, string $defaultAlignHash): void
     {
         // xf
         $objWriter->startElement('xf');
-        $objWriter->writeAttribute('xfId', 0);
-        $objWriter->writeAttribute('fontId', (int) $this->getParentWriter()->getFontHashTable()->getIndexForHashCode($pStyle->getFont()->getHashCode()));
-        if ($pStyle->getQuotePrefix()) {
-            $objWriter->writeAttribute('quotePrefix', 1);
+        $objWriter->writeAttribute('xfId', '0');
+        $objWriter->writeAttribute('fontId', (string) (int) $this->getParentWriter()->getFontHashTable()->getIndexForHashCode($style->getFont()->getHashCode()));
+        if ($style->getQuotePrefix()) {
+            $objWriter->writeAttribute('quotePrefix', '1');
         }
 
-        if ($pStyle->getNumberFormat()->getBuiltInFormatCode() === false) {
-            $objWriter->writeAttribute('numFmtId', (int) ($this->getParentWriter()->getNumFmtHashTable()->getIndexForHashCode($pStyle->getNumberFormat()->getHashCode()) + 164));
+        if ($style->getNumberFormat()->getBuiltInFormatCode() === false) {
+            $objWriter->writeAttribute('numFmtId', (string) (int) ($this->getParentWriter()->getNumFmtHashTable()->getIndexForHashCode($style->getNumberFormat()->getHashCode()) + 164));
         } else {
-            $objWriter->writeAttribute('numFmtId', (int) $pStyle->getNumberFormat()->getBuiltInFormatCode());
+            $objWriter->writeAttribute('numFmtId', (string) (int) $style->getNumberFormat()->getBuiltInFormatCode());
         }
 
-        $objWriter->writeAttribute('fillId', (int) $this->getParentWriter()->getFillHashTable()->getIndexForHashCode($pStyle->getFill()->getHashCode()));
-        $objWriter->writeAttribute('borderId', (int) $this->getParentWriter()->getBordersHashTable()->getIndexForHashCode($pStyle->getBorders()->getHashCode()));
+        $objWriter->writeAttribute('fillId', (string) (int) $this->getParentWriter()->getFillHashTable()->getIndexForHashCode($style->getFill()->getHashCode()));
+        $objWriter->writeAttribute('borderId', (string) (int) $this->getParentWriter()->getBordersHashTable()->getIndexForHashCode($style->getBorders()->getHashCode()));
 
         // Apply styles?
-        $objWriter->writeAttribute('applyFont', ($spreadsheet->getDefaultStyle()->getFont()->getHashCode() != $pStyle->getFont()->getHashCode()) ? '1' : '0');
-        $objWriter->writeAttribute('applyNumberFormat', ($spreadsheet->getDefaultStyle()->getNumberFormat()->getHashCode() != $pStyle->getNumberFormat()->getHashCode()) ? '1' : '0');
-        $objWriter->writeAttribute('applyFill', ($spreadsheet->getDefaultStyle()->getFill()->getHashCode() != $pStyle->getFill()->getHashCode()) ? '1' : '0');
-        $objWriter->writeAttribute('applyBorder', ($spreadsheet->getDefaultStyle()->getBorders()->getHashCode() != $pStyle->getBorders()->getHashCode()) ? '1' : '0');
-        $objWriter->writeAttribute('applyAlignment', ($spreadsheet->getDefaultStyle()->getAlignment()->getHashCode() != $pStyle->getAlignment()->getHashCode()) ? '1' : '0');
-        if ($pStyle->getProtection()->getLocked() != Protection::PROTECTION_INHERIT || $pStyle->getProtection()->getHidden() != Protection::PROTECTION_INHERIT) {
+        $objWriter->writeAttribute('applyFont', ($spreadsheet->getDefaultStyle()->getFont()->getHashCode() != $style->getFont()->getHashCode()) ? '1' : '0');
+        $objWriter->writeAttribute('applyNumberFormat', ($spreadsheet->getDefaultStyle()->getNumberFormat()->getHashCode() != $style->getNumberFormat()->getHashCode()) ? '1' : '0');
+        $objWriter->writeAttribute('applyFill', ($spreadsheet->getDefaultStyle()->getFill()->getHashCode() != $style->getFill()->getHashCode()) ? '1' : '0');
+        $objWriter->writeAttribute('applyBorder', ($spreadsheet->getDefaultStyle()->getBorders()->getHashCode() != $style->getBorders()->getHashCode()) ? '1' : '0');
+        if ($defaultAlignHash !== '' && $defaultAlignHash === $style->getAlignment()->getHashCode()) {
+            $applyAlignment = '0';
+        } else {
+            $applyAlignment = '1';
+        }
+        $objWriter->writeAttribute('applyAlignment', $applyAlignment);
+        if ($style->getProtection()->getLocked() != Protection::PROTECTION_INHERIT || $style->getProtection()->getHidden() != Protection::PROTECTION_INHERIT) {
             $objWriter->writeAttribute('applyProtection', 'true');
         }
 
         // alignment
-        $objWriter->startElement('alignment');
-        $objWriter->writeAttribute('horizontal', $pStyle->getAlignment()->getHorizontal());
-        $objWriter->writeAttribute('vertical', $pStyle->getAlignment()->getVertical());
+        if ($applyAlignment === '1') {
+            $objWriter->startElement('alignment');
+            $vertical = Alignment::VERTICAL_ALIGNMENT_FOR_XLSX[$style->getAlignment()->getVertical()] ?? '';
+            $horizontal = Alignment::HORIZONTAL_ALIGNMENT_FOR_XLSX[$style->getAlignment()->getHorizontal()] ?? '';
+            if ($horizontal !== '') {
+                $objWriter->writeAttribute('horizontal', $horizontal);
+            }
+            if ($vertical !== '') {
+                $objWriter->writeAttribute('vertical', $vertical);
+            }
 
-        $textRotation = 0;
-        if ($pStyle->getAlignment()->getTextRotation() >= 0) {
-            $textRotation = $pStyle->getAlignment()->getTextRotation();
-        } elseif ($pStyle->getAlignment()->getTextRotation() < 0) {
-            $textRotation = 90 - $pStyle->getAlignment()->getTextRotation();
-        }
-        $objWriter->writeAttribute('textRotation', $textRotation);
+            if ($style->getAlignment()->getTextRotation() >= 0) {
+                $textRotation = $style->getAlignment()->getTextRotation();
+            } else {
+                $textRotation = 90 - $style->getAlignment()->getTextRotation();
+            }
+            $objWriter->writeAttribute('textRotation', (string) $textRotation);
 
-        $objWriter->writeAttribute('wrapText', ($pStyle->getAlignment()->getWrapText() ? 'true' : 'false'));
-        $objWriter->writeAttribute('shrinkToFit', ($pStyle->getAlignment()->getShrinkToFit() ? 'true' : 'false'));
+            $objWriter->writeAttribute('wrapText', ($style->getAlignment()->getWrapText() ? 'true' : 'false'));
+            $objWriter->writeAttribute('shrinkToFit', ($style->getAlignment()->getShrinkToFit() ? 'true' : 'false'));
 
-        if ($pStyle->getAlignment()->getIndent() > 0) {
-            $objWriter->writeAttribute('indent', $pStyle->getAlignment()->getIndent());
-        }
-        if ($pStyle->getAlignment()->getReadOrder() > 0) {
-            $objWriter->writeAttribute('readingOrder', $pStyle->getAlignment()->getReadOrder());
+            if ($style->getAlignment()->getIndent() > 0) {
+                $objWriter->writeAttribute('indent', (string) $style->getAlignment()->getIndent());
+            }
+            if ($style->getAlignment()->getReadOrder() > 0) {
+                $objWriter->writeAttribute('readingOrder', (string) $style->getAlignment()->getReadOrder());
+            }
+            $objWriter->endElement();
         }
-        $objWriter->endElement();
 
         // protection
-        if ($pStyle->getProtection()->getLocked() != Protection::PROTECTION_INHERIT || $pStyle->getProtection()->getHidden() != Protection::PROTECTION_INHERIT) {
+        if ($style->getProtection()->getLocked() != Protection::PROTECTION_INHERIT || $style->getProtection()->getHidden() != Protection::PROTECTION_INHERIT) {
             $objWriter->startElement('protection');
-            if ($pStyle->getProtection()->getLocked() != Protection::PROTECTION_INHERIT) {
-                $objWriter->writeAttribute('locked', ($pStyle->getProtection()->getLocked() == Protection::PROTECTION_PROTECTED ? 'true' : 'false'));
+            if ($style->getProtection()->getLocked() != Protection::PROTECTION_INHERIT) {
+                $objWriter->writeAttribute('locked', ($style->getProtection()->getLocked() == Protection::PROTECTION_PROTECTED ? 'true' : 'false'));
             }
-            if ($pStyle->getProtection()->getHidden() != Protection::PROTECTION_INHERIT) {
-                $objWriter->writeAttribute('hidden', ($pStyle->getProtection()->getHidden() == Protection::PROTECTION_PROTECTED ? 'true' : 'false'));
+            if ($style->getProtection()->getHidden() != Protection::PROTECTION_INHERIT) {
+                $objWriter->writeAttribute('hidden', ($style->getProtection()->getHidden() == Protection::PROTECTION_PROTECTED ? 'true' : 'false'));
             }
             $objWriter->endElement();
         }
@@ -438,69 +491,23 @@ private function writeCellStyleXf(XMLWriter $objWriter, \PhpOffice\PhpSpreadshee
 
     /**
      * Write Cell Style Dxf.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param \PhpOffice\PhpSpreadsheet\Style\Style $pStyle Style
      */
-    private function writeCellStyleDxf(XMLWriter $objWriter, \PhpOffice\PhpSpreadsheet\Style\Style $pStyle): void
+    private function writeCellStyleDxf(XMLWriter $objWriter, \PhpOffice\PhpSpreadsheet\Style\Style $style): void
     {
         // dxf
         $objWriter->startElement('dxf');
 
         // font
-        $this->writeFont($objWriter, $pStyle->getFont());
+        $this->writeFont($objWriter, $style->getFont());
 
         // numFmt
-        $this->writeNumFmt($objWriter, $pStyle->getNumberFormat());
+        $this->writeNumFmt($objWriter, $style->getNumberFormat());
 
         // fill
-        $this->writeFill($objWriter, $pStyle->getFill());
-
-        // alignment
-        $objWriter->startElement('alignment');
-        if ($pStyle->getAlignment()->getHorizontal() !== null) {
-            $objWriter->writeAttribute('horizontal', $pStyle->getAlignment()->getHorizontal());
-        }
-        if ($pStyle->getAlignment()->getVertical() !== null) {
-            $objWriter->writeAttribute('vertical', $pStyle->getAlignment()->getVertical());
-        }
-
-        if ($pStyle->getAlignment()->getTextRotation() !== null) {
-            $textRotation = 0;
-            if ($pStyle->getAlignment()->getTextRotation() >= 0) {
-                $textRotation = $pStyle->getAlignment()->getTextRotation();
-            } elseif ($pStyle->getAlignment()->getTextRotation() < 0) {
-                $textRotation = 90 - $pStyle->getAlignment()->getTextRotation();
-            }
-            $objWriter->writeAttribute('textRotation', $textRotation);
-        }
-        $objWriter->endElement();
+        $this->writeFill($objWriter, $style->getFill());
 
         // border
-        $this->writeBorder($objWriter, $pStyle->getBorders());
-
-        // protection
-        if (($pStyle->getProtection()->getLocked() !== null) || ($pStyle->getProtection()->getHidden() !== null)) {
-            if (
-                $pStyle->getProtection()->getLocked() !== Protection::PROTECTION_INHERIT ||
-                $pStyle->getProtection()->getHidden() !== Protection::PROTECTION_INHERIT
-            ) {
-                $objWriter->startElement('protection');
-                if (
-                    ($pStyle->getProtection()->getLocked() !== null) &&
-                    ($pStyle->getProtection()->getLocked() !== Protection::PROTECTION_INHERIT)
-                ) {
-                    $objWriter->writeAttribute('locked', ($pStyle->getProtection()->getLocked() == Protection::PROTECTION_PROTECTED ? 'true' : 'false'));
-                }
-                if (
-                    ($pStyle->getProtection()->getHidden() !== null) &&
-                    ($pStyle->getProtection()->getHidden() !== Protection::PROTECTION_INHERIT)
-                ) {
-                    $objWriter->writeAttribute('hidden', ($pStyle->getProtection()->getHidden() == Protection::PROTECTION_PROTECTED ? 'true' : 'false'));
-                }
-                $objWriter->endElement();
-            }
-        }
+        $this->writeBorder($objWriter, $style->getBorders());
 
         $objWriter->endElement();
     }
@@ -508,42 +515,42 @@ private function writeCellStyleDxf(XMLWriter $objWriter, \PhpOffice\PhpSpreadshe
     /**
      * Write BorderPr.
      *
-     * @param XMLWriter $objWriter XML Writer
-     * @param string $pName Element name
-     * @param Border $pBorder Border style
+     * @param string $name Element name
      */
-    private function writeBorderPr(XMLWriter $objWriter, $pName, Border $pBorder): void
+    private function writeBorderPr(XMLWriter $objWriter, string $name, Border $border): void
     {
         // Write BorderPr
-        if ($pBorder->getBorderStyle() != Border::BORDER_NONE) {
-            $objWriter->startElement($pName);
-            $objWriter->writeAttribute('style', $pBorder->getBorderStyle());
+        if ($border->getBorderStyle() === Border::BORDER_OMIT) {
+            return;
+        }
+        $objWriter->startElement($name);
+        if ($border->getBorderStyle() !== Border::BORDER_NONE) {
+            $objWriter->writeAttribute('style', $border->getBorderStyle());
 
             // color
-            $objWriter->startElement('color');
-            $objWriter->writeAttribute('rgb', $pBorder->getColor()->getARGB());
-            $objWriter->endElement();
-
-            $objWriter->endElement();
+            if ($border->getColor()->getARGB() !== null) {
+                $objWriter->startElement('color');
+                $objWriter->writeAttribute('rgb', $border->getColor()->getARGB());
+                $objWriter->endElement();
+            }
         }
+        $objWriter->endElement();
     }
 
     /**
      * Write NumberFormat.
      *
-     * @param XMLWriter $objWriter XML Writer
-     * @param NumberFormat $pNumberFormat Number Format
-     * @param int $pId Number Format identifier
+     * @param int $id Number Format identifier
      */
-    private function writeNumFmt(XMLWriter $objWriter, NumberFormat $pNumberFormat, $pId = 0): void
+    private function writeNumFmt(XMLWriter $objWriter, ?NumberFormat $numberFormat, int $id = 0): void
     {
         // Translate formatcode
-        $formatCode = $pNumberFormat->getFormatCode();
+        $formatCode = ($numberFormat === null) ? null : $numberFormat->getFormatCode();
 
         // numFmt
         if ($formatCode !== null) {
             $objWriter->startElement('numFmt');
-            $objWriter->writeAttribute('numFmtId', ($pId + 164));
+            $objWriter->writeAttribute('numFmtId', (string) ($id + 164));
             $objWriter->writeAttribute('formatCode', $formatCode);
             $objWriter->endElement();
         }
@@ -554,7 +561,7 @@ private function writeNumFmt(XMLWriter $objWriter, NumberFormat $pNumberFormat,
      *
      * @return \PhpOffice\PhpSpreadsheet\Style\Style[] All styles in PhpSpreadsheet
      */
-    public function allStyles(Spreadsheet $spreadsheet)
+    public function allStyles(Spreadsheet $spreadsheet): array
     {
         return $spreadsheet->getCellXfCollection();
     }
@@ -564,7 +571,7 @@ public function allStyles(Spreadsheet $spreadsheet)
      *
      * @return Conditional[] All conditional styles in PhpSpreadsheet
      */
-    public function allConditionalStyles(Spreadsheet $spreadsheet)
+    public function allConditionalStyles(Spreadsheet $spreadsheet): array
     {
         // Get an array of all styles
         $aStyles = [];
@@ -586,7 +593,7 @@ public function allConditionalStyles(Spreadsheet $spreadsheet)
      *
      * @return Fill[] All fills in PhpSpreadsheet
      */
-    public function allFills(Spreadsheet $spreadsheet)
+    public function allFills(Spreadsheet $spreadsheet): array
     {
         // Get an array of unique fills
         $aFills = [];
@@ -601,7 +608,6 @@ public function allFills(Spreadsheet $spreadsheet)
         $aFills[] = $fill1;
         // The remaining fills
         $aStyles = $this->allStyles($spreadsheet);
-        /** @var \PhpOffice\PhpSpreadsheet\Style\Style $style */
         foreach ($aStyles as $style) {
             if (!isset($aFills[$style->getFill()->getHashCode()])) {
                 $aFills[$style->getFill()->getHashCode()] = $style->getFill();
@@ -616,13 +622,12 @@ public function allFills(Spreadsheet $spreadsheet)
      *
      * @return Font[] All fonts in PhpSpreadsheet
      */
-    public function allFonts(Spreadsheet $spreadsheet)
+    public function allFonts(Spreadsheet $spreadsheet): array
     {
         // Get an array of unique fonts
         $aFonts = [];
         $aStyles = $this->allStyles($spreadsheet);
 
-        /** @var \PhpOffice\PhpSpreadsheet\Style\Style $style */
         foreach ($aStyles as $style) {
             if (!isset($aFonts[$style->getFont()->getHashCode()])) {
                 $aFonts[$style->getFont()->getHashCode()] = $style->getFont();
@@ -637,13 +642,12 @@ public function allFonts(Spreadsheet $spreadsheet)
      *
      * @return Borders[] All borders in PhpSpreadsheet
      */
-    public function allBorders(Spreadsheet $spreadsheet)
+    public function allBorders(Spreadsheet $spreadsheet): array
     {
         // Get an array of unique borders
         $aBorders = [];
         $aStyles = $this->allStyles($spreadsheet);
 
-        /** @var \PhpOffice\PhpSpreadsheet\Style\Style $style */
         foreach ($aStyles as $style) {
             if (!isset($aBorders[$style->getBorders()->getHashCode()])) {
                 $aBorders[$style->getBorders()->getHashCode()] = $style->getBorders();
@@ -658,13 +662,12 @@ public function allBorders(Spreadsheet $spreadsheet)
      *
      * @return NumberFormat[] All number formats in PhpSpreadsheet
      */
-    public function allNumberFormats(Spreadsheet $spreadsheet)
+    public function allNumberFormats(Spreadsheet $spreadsheet): array
     {
         // Get an array of unique number formats
         $aNumFmts = [];
         $aStyles = $this->allStyles($spreadsheet);
 
-        /** @var \PhpOffice\PhpSpreadsheet\Style\Style $style */
         foreach ($aStyles as $style) {
             if ($style->getNumberFormat()->getBuiltInFormatCode() === false && !isset($aNumFmts[$style->getNumberFormat()->getHashCode()])) {
                 $aNumFmts[$style->getNumberFormat()->getHashCode()] = $style->getNumberFormat();
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Table.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Table.php
new file mode 100644
index 0000000000..f88b2a0423
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Table.php
@@ -0,0 +1,115 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Namespaces;
+use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
+use PhpOffice\PhpSpreadsheet\Worksheet\Table as WorksheetTable;
+
+class Table extends WriterPart
+{
+    /**
+     * Write Table to XML format.
+     *
+     * @param int $tableRef Table ID
+     *
+     * @return string XML Output
+     */
+    public function writeTable(WorksheetTable $table, int $tableRef): string
+    {
+        // Create XML writer
+        $objWriter = null;
+        if ($this->getParentWriter()->getUseDiskCaching()) {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+        } else {
+            $objWriter = new XMLWriter(XMLWriter::STORAGE_MEMORY);
+        }
+
+        // XML header
+        $objWriter->startDocument('1.0', 'UTF-8', 'yes');
+
+        // Table
+        $name = 'Table' . $tableRef;
+        $range = $table->getRange();
+
+        $objWriter->startElement('table');
+        $objWriter->writeAttribute('xml:space', 'preserve');
+        $objWriter->writeAttribute('xmlns', Namespaces::MAIN);
+        $objWriter->writeAttribute('id', (string) $tableRef);
+        $objWriter->writeAttribute('name', $name);
+        $objWriter->writeAttribute('displayName', $table->getName() ?: $name);
+        $objWriter->writeAttribute('ref', $range);
+        $objWriter->writeAttribute('headerRowCount', $table->getShowHeaderRow() ? '1' : '0');
+        $objWriter->writeAttribute('totalsRowCount', $table->getShowTotalsRow() ? '1' : '0');
+
+        // Table Boundaries
+        [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($table->getRange());
+
+        // Table Auto Filter
+        if ($table->getShowHeaderRow() && $table->getAllowFilter() === true) {
+            $objWriter->startElement('autoFilter');
+            $objWriter->writeAttribute('ref', $range);
+            foreach (range($rangeStart[0], $rangeEnd[0]) as $offset => $columnIndex) {
+                $column = $table->getColumnByOffset($offset);
+
+                if (!$column->getShowFilterButton()) {
+                    $objWriter->startElement('filterColumn');
+                    $objWriter->writeAttribute('colId', (string) $offset);
+                    $objWriter->writeAttribute('hiddenButton', '1');
+                    $objWriter->endElement();
+                } else {
+                    $column = $table->getAutoFilter()->getColumnByOffset($offset);
+                    AutoFilter::writeAutoFilterColumn($objWriter, $column, $offset);
+                }
+            }
+            $objWriter->endElement(); // autoFilter
+        }
+
+        // Table Columns
+        $objWriter->startElement('tableColumns');
+        $objWriter->writeAttribute('count', (string) ($rangeEnd[0] - $rangeStart[0] + 1));
+        foreach (range($rangeStart[0], $rangeEnd[0]) as $offset => $columnIndex) {
+            $worksheet = $table->getWorksheet();
+            if (!$worksheet) {
+                continue;
+            }
+
+            $column = $table->getColumnByOffset($offset);
+            $cell = $worksheet->getCell([$columnIndex, $rangeStart[1]]);
+
+            $objWriter->startElement('tableColumn');
+            $objWriter->writeAttribute('id', (string) ($offset + 1));
+            $objWriter->writeAttribute('name', $table->getShowHeaderRow() ? $cell->getValueString() : ('Column' . ($offset + 1)));
+
+            if ($table->getShowTotalsRow()) {
+                if ($column->getTotalsRowLabel()) {
+                    $objWriter->writeAttribute('totalsRowLabel', $column->getTotalsRowLabel());
+                }
+                if ($column->getTotalsRowFunction()) {
+                    $objWriter->writeAttribute('totalsRowFunction', $column->getTotalsRowFunction());
+                }
+            }
+            if ($column->getColumnFormula()) {
+                $objWriter->writeElement('calculatedColumnFormula', $column->getColumnFormula());
+            }
+
+            $objWriter->endElement();
+        }
+        $objWriter->endElement();
+
+        // Table Styles
+        $objWriter->startElement('tableStyleInfo');
+        $objWriter->writeAttribute('name', $table->getStyle()->getTheme());
+        $objWriter->writeAttribute('showFirstColumn', $table->getStyle()->getShowFirstColumn() ? '1' : '0');
+        $objWriter->writeAttribute('showLastColumn', $table->getStyle()->getShowLastColumn() ? '1' : '0');
+        $objWriter->writeAttribute('showRowStripes', $table->getStyle()->getShowRowStripes() ? '1' : '0');
+        $objWriter->writeAttribute('showColumnStripes', $table->getStyle()->getShowColumnStripes() ? '1' : '0');
+        $objWriter->endElement();
+
+        $objWriter->endElement();
+
+        // Return
+        return $objWriter->getData();
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Theme.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Theme.php
index 991772926c..abacd41106 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Theme.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Theme.php
@@ -2,111 +2,19 @@
 
 namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Namespaces;
 use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Theme as SpreadsheetTheme;
 
 class Theme extends WriterPart
 {
-    /**
-     * Map of Major fonts to write.
-     *
-     * @var string[]
-     */
-    private static $majorFonts = [
-        'Jpan' => 'ＭＳ Ｐゴシック',
-        'Hang' => '맑은 고딕',
-        'Hans' => '宋体',
-        'Hant' => '新細明體',
-        'Arab' => 'Times New Roman',
-        'Hebr' => 'Times New Roman',
-        'Thai' => 'Tahoma',
-        'Ethi' => 'Nyala',
-        'Beng' => 'Vrinda',
-        'Gujr' => 'Shruti',
-        'Khmr' => 'MoolBoran',
-        'Knda' => 'Tunga',
-        'Guru' => 'Raavi',
-        'Cans' => 'Euphemia',
-        'Cher' => 'Plantagenet Cherokee',
-        'Yiii' => 'Microsoft Yi Baiti',
-        'Tibt' => 'Microsoft Himalaya',
-        'Thaa' => 'MV Boli',
-        'Deva' => 'Mangal',
-        'Telu' => 'Gautami',
-        'Taml' => 'Latha',
-        'Syrc' => 'Estrangelo Edessa',
-        'Orya' => 'Kalinga',
-        'Mlym' => 'Kartika',
-        'Laoo' => 'DokChampa',
-        'Sinh' => 'Iskoola Pota',
-        'Mong' => 'Mongolian Baiti',
-        'Viet' => 'Times New Roman',
-        'Uigh' => 'Microsoft Uighur',
-        'Geor' => 'Sylfaen',
-    ];
-
-    /**
-     * Map of Minor fonts to write.
-     *
-     * @var string[]
-     */
-    private static $minorFonts = [
-        'Jpan' => 'ＭＳ Ｐゴシック',
-        'Hang' => '맑은 고딕',
-        'Hans' => '宋体',
-        'Hant' => '新細明體',
-        'Arab' => 'Arial',
-        'Hebr' => 'Arial',
-        'Thai' => 'Tahoma',
-        'Ethi' => 'Nyala',
-        'Beng' => 'Vrinda',
-        'Gujr' => 'Shruti',
-        'Khmr' => 'DaunPenh',
-        'Knda' => 'Tunga',
-        'Guru' => 'Raavi',
-        'Cans' => 'Euphemia',
-        'Cher' => 'Plantagenet Cherokee',
-        'Yiii' => 'Microsoft Yi Baiti',
-        'Tibt' => 'Microsoft Himalaya',
-        'Thaa' => 'MV Boli',
-        'Deva' => 'Mangal',
-        'Telu' => 'Gautami',
-        'Taml' => 'Latha',
-        'Syrc' => 'Estrangelo Edessa',
-        'Orya' => 'Kalinga',
-        'Mlym' => 'Kartika',
-        'Laoo' => 'DokChampa',
-        'Sinh' => 'Iskoola Pota',
-        'Mong' => 'Mongolian Baiti',
-        'Viet' => 'Arial',
-        'Uigh' => 'Microsoft Uighur',
-        'Geor' => 'Sylfaen',
-    ];
-
-    /**
-     * Map of core colours.
-     *
-     * @var string[]
-     */
-    private static $colourScheme = [
-        'dk2' => '1F497D',
-        'lt2' => 'EEECE1',
-        'accent1' => '4F81BD',
-        'accent2' => 'C0504D',
-        'accent3' => '9BBB59',
-        'accent4' => '8064A2',
-        'accent5' => '4BACC6',
-        'accent6' => 'F79646',
-        'hlink' => '0000FF',
-        'folHlink' => '800080',
-    ];
-
     /**
      * Write theme to XML format.
      *
      * @return string XML Output
      */
-    public function writeTheme(Spreadsheet $spreadsheet)
+    public function writeTheme(Spreadsheet $spreadsheet): string
     {
         // Create XML writer
         $objWriter = null;
@@ -115,13 +23,14 @@ public function writeTheme(Spreadsheet $spreadsheet)
         } else {
             $objWriter = new XMLWriter(XMLWriter::STORAGE_MEMORY);
         }
+        $theme = $spreadsheet->getTheme();
 
         // XML header
         $objWriter->startDocument('1.0', 'UTF-8', 'yes');
 
         // a:theme
         $objWriter->startElement('a:theme');
-        $objWriter->writeAttribute('xmlns:a', 'http://schemas.openxmlformats.org/drawingml/2006/main');
+        $objWriter->writeAttribute('xmlns:a', Namespaces::DRAWINGML);
         $objWriter->writeAttribute('name', 'Office Theme');
 
         // a:themeElements
@@ -129,50 +38,39 @@ public function writeTheme(Spreadsheet $spreadsheet)
 
         // a:clrScheme
         $objWriter->startElement('a:clrScheme');
-        $objWriter->writeAttribute('name', 'Office');
-
-        // a:dk1
-        $objWriter->startElement('a:dk1');
-
-        // a:sysClr
-        $objWriter->startElement('a:sysClr');
-        $objWriter->writeAttribute('val', 'windowText');
-        $objWriter->writeAttribute('lastClr', '000000');
-        $objWriter->endElement();
-
-        $objWriter->endElement();
-
-        // a:lt1
-        $objWriter->startElement('a:lt1');
-
-        // a:sysClr
-        $objWriter->startElement('a:sysClr');
-        $objWriter->writeAttribute('val', 'window');
-        $objWriter->writeAttribute('lastClr', 'FFFFFF');
-        $objWriter->endElement();
+        $objWriter->writeAttribute('name', $theme->getThemeColorName());
 
-        $objWriter->endElement();
-
-        // a:dk2
-        $this->writeColourScheme($objWriter);
+        $this->writeColourScheme($objWriter, $theme);
 
         $objWriter->endElement();
 
         // a:fontScheme
         $objWriter->startElement('a:fontScheme');
-        $objWriter->writeAttribute('name', 'Office');
+        $objWriter->writeAttribute('name', $theme->getThemeFontName());
 
         // a:majorFont
         $objWriter->startElement('a:majorFont');
-        $this->writeFonts($objWriter, 'Cambria', self::$majorFonts);
-        $objWriter->endElement();
+        $this->writeFonts(
+            $objWriter,
+            $theme->getMajorFontLatin(),
+            $theme->getMajorFontEastAsian(),
+            $theme->getMajorFontComplexScript(),
+            $theme->getMajorFontSubstitutions()
+        );
+        $objWriter->endElement(); // a:majorFont
 
         // a:minorFont
         $objWriter->startElement('a:minorFont');
-        $this->writeFonts($objWriter, 'Calibri', self::$minorFonts);
-        $objWriter->endElement();
+        $this->writeFonts(
+            $objWriter,
+            $theme->getMinorFontLatin(),
+            $theme->getMinorFontEastAsian(),
+            $theme->getMinorFontComplexScript(),
+            $theme->getMinorFontSubstitutions()
+        );
+        $objWriter->endElement(); // a:minorFont
 
-        $objWriter->endElement();
+        $objWriter->endElement(); // a:fontScheme
 
         // a:fmtScheme
         $objWriter->startElement('a:fmtScheme');
@@ -786,7 +684,7 @@ public function writeTheme(Spreadsheet $spreadsheet)
      *
      * @param string[] $fontSet
      */
-    private function writeFonts(XMLWriter $objWriter, string $latinFont, array $fontSet): void
+    private function writeFonts(XMLWriter $objWriter, string $latinFont, string $eastAsianFont, string $complexScriptFont, array $fontSet): void
     {
         // a:latin
         $objWriter->startElement('a:latin');
@@ -795,12 +693,12 @@ private function writeFonts(XMLWriter $objWriter, string $latinFont, array $font
 
         // a:ea
         $objWriter->startElement('a:ea');
-        $objWriter->writeAttribute('typeface', '');
+        $objWriter->writeAttribute('typeface', $eastAsianFont);
         $objWriter->endElement();
 
         // a:cs
         $objWriter->startElement('a:cs');
-        $objWriter->writeAttribute('typeface', '');
+        $objWriter->writeAttribute('typeface', $complexScriptFont);
         $objWriter->endElement();
 
         foreach ($fontSet as $fontScript => $typeface) {
@@ -814,16 +712,33 @@ private function writeFonts(XMLWriter $objWriter, string $latinFont, array $font
     /**
      * Write colour scheme to XML format.
      */
-    private function writeColourScheme(XMLWriter $objWriter): void
+    private function writeColourScheme(XMLWriter $objWriter, SpreadsheetTheme $theme): void
     {
-        foreach (self::$colourScheme as $colourName => $colourValue) {
-            $objWriter->startElement('a:' . $colourName);
-
-            $objWriter->startElement('a:srgbClr');
-            $objWriter->writeAttribute('val', $colourValue);
-            $objWriter->endElement();
+        $themeArray = $theme->getThemeColors();
+        // a:dk1
+        $objWriter->startElement('a:dk1');
+        $objWriter->startElement('a:sysClr');
+        $objWriter->writeAttribute('val', 'windowText');
+        $objWriter->writeAttribute('lastClr', $themeArray['dk1'] ?? '000000');
+        $objWriter->endElement(); // a:sysClr
+        $objWriter->endElement(); // a:dk1
 
-            $objWriter->endElement();
+        // a:lt1
+        $objWriter->startElement('a:lt1');
+        $objWriter->startElement('a:sysClr');
+        $objWriter->writeAttribute('val', 'window');
+        $objWriter->writeAttribute('lastClr', $themeArray['lt1'] ?? 'FFFFFF');
+        $objWriter->endElement(); // a:sysClr
+        $objWriter->endElement(); // a:lt1
+
+        foreach ($themeArray as $colourName => $colourValue) {
+            if ($colourName !== 'dk1' && $colourName !== 'lt1') {
+                $objWriter->startElement('a:' . $colourName);
+                $objWriter->startElement('a:srgbClr');
+                $objWriter->writeAttribute('val', $colourValue);
+                $objWriter->endElement(); // a:srgbClr
+                $objWriter->endElement(); // a:$colourName
+            }
         }
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Workbook.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Workbook.php
index 0a20ea9d9f..24a2eeb064 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Workbook.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Workbook.php
@@ -2,6 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Namespaces;
 use PhpOffice\PhpSpreadsheet\Shared\Date;
 use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
@@ -13,11 +14,11 @@ class Workbook extends WriterPart
     /**
      * Write workbook to XML format.
      *
-     * @param bool $recalcRequired Indicate whether formulas should be recalculated before writing
+     * @param bool $preCalculateFormulas If true, formulas will be calculated before writing
      *
      * @return string XML Output
      */
-    public function writeWorkbook(Spreadsheet $spreadsheet, $recalcRequired = false)
+    public function writeWorkbook(Spreadsheet $spreadsheet, bool $preCalculateFormulas = false): string
     {
         // Create XML writer
         if ($this->getParentWriter()->getUseDiskCaching()) {
@@ -32,14 +33,14 @@ public function writeWorkbook(Spreadsheet $spreadsheet, $recalcRequired = false)
         // workbook
         $objWriter->startElement('workbook');
         $objWriter->writeAttribute('xml:space', 'preserve');
-        $objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/spreadsheetml/2006/main');
-        $objWriter->writeAttribute('xmlns:r', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships');
+        $objWriter->writeAttribute('xmlns', Namespaces::MAIN);
+        $objWriter->writeAttribute('xmlns:r', Namespaces::SCHEMA_OFFICE_DOCUMENT);
 
         // fileVersion
         $this->writeFileVersion($objWriter);
 
         // workbookPr
-        $this->writeWorkbookPr($objWriter);
+        $this->writeWorkbookPr($objWriter, $spreadsheet);
 
         // workbookProtection
         $this->writeWorkbookProtection($objWriter, $spreadsheet);
@@ -56,7 +57,7 @@ public function writeWorkbook(Spreadsheet $spreadsheet, $recalcRequired = false)
         (new DefinedNamesWriter($objWriter, $spreadsheet))->write();
 
         // calcPr
-        $this->writeCalcPr($objWriter, $recalcRequired);
+        $this->writeCalcPr($objWriter, $preCalculateFormulas);
 
         $objWriter->endElement();
 
@@ -66,8 +67,6 @@ public function writeWorkbook(Spreadsheet $spreadsheet, $recalcRequired = false)
 
     /**
      * Write file version.
-     *
-     * @param XMLWriter $objWriter XML Writer
      */
     private function writeFileVersion(XMLWriter $objWriter): void
     {
@@ -81,14 +80,12 @@ private function writeFileVersion(XMLWriter $objWriter): void
 
     /**
      * Write WorkbookPr.
-     *
-     * @param XMLWriter $objWriter XML Writer
      */
-    private function writeWorkbookPr(XMLWriter $objWriter): void
+    private function writeWorkbookPr(XMLWriter $objWriter, Spreadsheet $spreadsheet): void
     {
         $objWriter->startElement('workbookPr');
 
-        if (Date::getExcelCalendar() === Date::CALENDAR_MAC_1904) {
+        if ($spreadsheet->getExcelCalendar() === Date::CALENDAR_MAC_1904) {
             $objWriter->writeAttribute('date1904', '1');
         }
 
@@ -99,8 +96,6 @@ private function writeWorkbookPr(XMLWriter $objWriter): void
 
     /**
      * Write BookViews.
-     *
-     * @param XMLWriter $objWriter XML Writer
      */
     private function writeBookViews(XMLWriter $objWriter, Spreadsheet $spreadsheet): void
     {
@@ -110,14 +105,14 @@ private function writeBookViews(XMLWriter $objWriter, Spreadsheet $spreadsheet):
         // workbookView
         $objWriter->startElement('workbookView');
 
-        $objWriter->writeAttribute('activeTab', $spreadsheet->getActiveSheetIndex());
+        $objWriter->writeAttribute('activeTab', (string) $spreadsheet->getActiveSheetIndex());
         $objWriter->writeAttribute('autoFilterDateGrouping', ($spreadsheet->getAutoFilterDateGrouping() ? 'true' : 'false'));
-        $objWriter->writeAttribute('firstSheet', $spreadsheet->getFirstSheetIndex());
+        $objWriter->writeAttribute('firstSheet', (string) $spreadsheet->getFirstSheetIndex());
         $objWriter->writeAttribute('minimized', ($spreadsheet->getMinimized() ? 'true' : 'false'));
         $objWriter->writeAttribute('showHorizontalScroll', ($spreadsheet->getShowHorizontalScroll() ? 'true' : 'false'));
         $objWriter->writeAttribute('showSheetTabs', ($spreadsheet->getShowSheetTabs() ? 'true' : 'false'));
         $objWriter->writeAttribute('showVerticalScroll', ($spreadsheet->getShowVerticalScroll() ? 'true' : 'false'));
-        $objWriter->writeAttribute('tabRatio', $spreadsheet->getTabRatio());
+        $objWriter->writeAttribute('tabRatio', (string) $spreadsheet->getTabRatio());
         $objWriter->writeAttribute('visibility', $spreadsheet->getVisibility());
 
         $objWriter->endElement();
@@ -127,8 +122,6 @@ private function writeBookViews(XMLWriter $objWriter, Spreadsheet $spreadsheet):
 
     /**
      * Write WorkbookProtection.
-     *
-     * @param XMLWriter $objWriter XML Writer
      */
     private function writeWorkbookProtection(XMLWriter $objWriter, Spreadsheet $spreadsheet): void
     {
@@ -153,10 +146,9 @@ private function writeWorkbookProtection(XMLWriter $objWriter, Spreadsheet $spre
     /**
      * Write calcPr.
      *
-     * @param XMLWriter $objWriter XML Writer
-     * @param bool $recalcRequired Indicate whether formulas should be recalculated before writing
+     * @param bool $preCalculateFormulas If true, formulas will be calculated before writing
      */
-    private function writeCalcPr(XMLWriter $objWriter, $recalcRequired = true): void
+    private function writeCalcPr(XMLWriter $objWriter, bool $preCalculateFormulas = true): void
     {
         $objWriter->startElement('calcPr');
 
@@ -165,18 +157,16 @@ private function writeCalcPr(XMLWriter $objWriter, $recalcRequired = true): void
         //     because the file has changed
         $objWriter->writeAttribute('calcId', '999999');
         $objWriter->writeAttribute('calcMode', 'auto');
-        //    fullCalcOnLoad isn't needed if we've recalculating for the save
-        $objWriter->writeAttribute('calcCompleted', ($recalcRequired) ? 1 : 0);
-        $objWriter->writeAttribute('fullCalcOnLoad', ($recalcRequired) ? 0 : 1);
-        $objWriter->writeAttribute('forceFullCalc', ($recalcRequired) ? 0 : 1);
+        //    fullCalcOnLoad isn't needed if we will calculate before writing
+        $objWriter->writeAttribute('calcCompleted', ($preCalculateFormulas) ? '1' : '0');
+        $objWriter->writeAttribute('fullCalcOnLoad', ($preCalculateFormulas) ? '0' : '1');
+        $objWriter->writeAttribute('forceFullCalc', ($preCalculateFormulas) ? '0' : '1');
 
         $objWriter->endElement();
     }
 
     /**
      * Write sheets.
-     *
-     * @param XMLWriter $objWriter XML Writer
      */
     private function writeSheets(XMLWriter $objWriter, Spreadsheet $spreadsheet): void
     {
@@ -200,23 +190,22 @@ private function writeSheets(XMLWriter $objWriter, Spreadsheet $spreadsheet): vo
     /**
      * Write sheet.
      *
-     * @param XMLWriter $objWriter XML Writer
-     * @param string $pSheetname Sheet name
-     * @param int $pSheetId Sheet id
-     * @param int $pRelId Relationship ID
+     * @param string $worksheetName Sheet name
+     * @param int $worksheetId Sheet id
+     * @param int $relId Relationship ID
      * @param string $sheetState Sheet state (visible, hidden, veryHidden)
      */
-    private function writeSheet(XMLWriter $objWriter, $pSheetname, $pSheetId = 1, $pRelId = 1, $sheetState = 'visible'): void
+    private function writeSheet(XMLWriter $objWriter, string $worksheetName, int $worksheetId = 1, int $relId = 1, string $sheetState = 'visible'): void
     {
-        if ($pSheetname != '') {
+        if ($worksheetName != '') {
             // Write sheet
             $objWriter->startElement('sheet');
-            $objWriter->writeAttribute('name', $pSheetname);
-            $objWriter->writeAttribute('sheetId', $pSheetId);
+            $objWriter->writeAttribute('name', $worksheetName);
+            $objWriter->writeAttribute('sheetId', (string) $worksheetId);
             if ($sheetState !== 'visible' && $sheetState != '') {
                 $objWriter->writeAttribute('state', $sheetState);
             }
-            $objWriter->writeAttribute('r:id', 'rId' . $pRelId);
+            $objWriter->writeAttribute('r:id', 'rId' . $relId);
             $objWriter->endElement();
         } else {
             throw new WriterException('Invalid parameters passed.');
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
index 38dead4f0d..28a7c0ee8b 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
@@ -2,31 +2,55 @@
 
 namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ErrorValue;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Cell\Cell;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Cell\DataType;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Namespaces;
 use PhpOffice\PhpSpreadsheet\RichText\RichText;
+use PhpOffice\PhpSpreadsheet\Settings;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
 use PhpOffice\PhpSpreadsheet\Style\Conditional;
+use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\ConditionalColorScale;
 use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\ConditionalDataBar;
 use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\ConditionalFormattingRuleExtension;
-use PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter\Column;
-use PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter\Column\Rule;
+use PhpOffice\PhpSpreadsheet\Worksheet\RowDimension;
 use PhpOffice\PhpSpreadsheet\Worksheet\SheetView;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet as PhpspreadsheetWorksheet;
 
 class Worksheet extends WriterPart
 {
+    private string $numberStoredAsText = '';
+
+    private string $formula = '';
+
+    private string $twoDigitTextYear = '';
+
+    private string $evalError = '';
+
+    private bool $explicitStyle0;
+
+    private bool $useDynamicArrays = false;
+
     /**
      * Write worksheet to XML format.
      *
-     * @param string[] $pStringTable
+     * @param string[] $stringTable
      * @param bool $includeCharts Flag indicating if we should write charts
      *
      * @return string XML Output
      */
-    public function writeWorksheet(PhpspreadsheetWorksheet $pSheet, $pStringTable = null, $includeCharts = false)
+    public function writeWorksheet(PhpspreadsheetWorksheet $worksheet, array $stringTable = [], bool $includeCharts = false): string
     {
+        $this->useDynamicArrays = $this->getParentWriter()->useDynamicArrays();
+        $this->explicitStyle0 = $this->getParentWriter()->getExplicitStyle0();
+        $worksheet->calculateArrays($this->getParentWriter()->getPreCalculateFormulas());
+        $this->numberStoredAsText = '';
+        $this->formula = '';
+        $this->twoDigitTextYear = '';
+        $this->evalError = '';
         // Create XML writer
         $objWriter = null;
         if ($this->getParentWriter()->getUseDiskCaching()) {
@@ -41,85 +65,94 @@ public function writeWorksheet(PhpspreadsheetWorksheet $pSheet, $pStringTable =
         // Worksheet
         $objWriter->startElement('worksheet');
         $objWriter->writeAttribute('xml:space', 'preserve');
-        $objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/spreadsheetml/2006/main');
-        $objWriter->writeAttribute('xmlns:r', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships');
+        $objWriter->writeAttribute('xmlns', Namespaces::MAIN);
+        $objWriter->writeAttribute('xmlns:r', Namespaces::SCHEMA_OFFICE_DOCUMENT);
 
-        $objWriter->writeAttribute('xmlns:xdr', 'http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing');
-        $objWriter->writeAttribute('xmlns:x14', 'http://schemas.microsoft.com/office/spreadsheetml/2009/9/main');
-        $objWriter->writeAttribute('xmlns:xm', 'http://schemas.microsoft.com/office/excel/2006/main');
-        $objWriter->writeAttribute('xmlns:mc', 'http://schemas.openxmlformats.org/markup-compatibility/2006');
+        $objWriter->writeAttribute('xmlns:xdr', Namespaces::SPREADSHEET_DRAWING);
+        $objWriter->writeAttribute('xmlns:x14', Namespaces::DATA_VALIDATIONS1);
+        $objWriter->writeAttribute('xmlns:xm', Namespaces::DATA_VALIDATIONS2);
+        $objWriter->writeAttribute('xmlns:mc', Namespaces::COMPATIBILITY);
         $objWriter->writeAttribute('mc:Ignorable', 'x14ac');
-        $objWriter->writeAttribute('xmlns:x14ac', 'http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac');
+        $objWriter->writeAttribute('xmlns:x14ac', Namespaces::SPREADSHEETML_AC);
 
         // sheetPr
-        $this->writeSheetPr($objWriter, $pSheet);
+        $this->writeSheetPr($objWriter, $worksheet);
 
         // Dimension
-        $this->writeDimension($objWriter, $pSheet);
+        $this->writeDimension($objWriter, $worksheet);
 
         // sheetViews
-        $this->writeSheetViews($objWriter, $pSheet);
+        $this->writeSheetViews($objWriter, $worksheet);
 
         // sheetFormatPr
-        $this->writeSheetFormatPr($objWriter, $pSheet);
+        $this->writeSheetFormatPr($objWriter, $worksheet);
 
         // cols
-        $this->writeCols($objWriter, $pSheet);
+        $this->writeCols($objWriter, $worksheet);
 
         // sheetData
-        $this->writeSheetData($objWriter, $pSheet, $pStringTable);
+        $this->writeSheetData($objWriter, $worksheet, $stringTable);
 
         // sheetProtection
-        $this->writeSheetProtection($objWriter, $pSheet);
+        $this->writeSheetProtection($objWriter, $worksheet);
 
         // protectedRanges
-        $this->writeProtectedRanges($objWriter, $pSheet);
+        $this->writeProtectedRanges($objWriter, $worksheet);
 
         // autoFilter
-        $this->writeAutoFilter($objWriter, $pSheet);
+        $this->writeAutoFilter($objWriter, $worksheet);
 
         // mergeCells
-        $this->writeMergeCells($objWriter, $pSheet);
+        $this->writeMergeCells($objWriter, $worksheet);
 
         // conditionalFormatting
-        $this->writeConditionalFormatting($objWriter, $pSheet);
+        $this->writeConditionalFormatting($objWriter, $worksheet);
 
         // dataValidations
-        $this->writeDataValidations($objWriter, $pSheet);
+        $this->writeDataValidations($objWriter, $worksheet);
 
         // hyperlinks
-        $this->writeHyperlinks($objWriter, $pSheet);
+        $this->writeHyperlinks($objWriter, $worksheet);
 
         // Print options
-        $this->writePrintOptions($objWriter, $pSheet);
+        $this->writePrintOptions($objWriter, $worksheet);
 
         // Page margins
-        $this->writePageMargins($objWriter, $pSheet);
+        $this->writePageMargins($objWriter, $worksheet);
 
         // Page setup
-        $this->writePageSetup($objWriter, $pSheet);
+        $this->writePageSetup($objWriter, $worksheet);
 
         // Header / footer
-        $this->writeHeaderFooter($objWriter, $pSheet);
+        $this->writeHeaderFooter($objWriter, $worksheet);
 
         // Breaks
-        $this->writeBreaks($objWriter, $pSheet);
+        $this->writeBreaks($objWriter, $worksheet);
 
         // Drawings and/or Charts
-        $this->writeDrawings($objWriter, $pSheet, $includeCharts);
+        $this->writeDrawings($objWriter, $worksheet, $includeCharts);
 
         // LegacyDrawing
-        $this->writeLegacyDrawing($objWriter, $pSheet);
+        $this->writeLegacyDrawing($objWriter, $worksheet);
 
         // LegacyDrawingHF
-        $this->writeLegacyDrawingHF($objWriter, $pSheet);
+        $this->writeLegacyDrawingHF($objWriter, $worksheet);
 
         // AlternateContent
-        $this->writeAlternateContent($objWriter, $pSheet);
+        $this->writeAlternateContent($objWriter, $worksheet);
+
+        // IgnoredErrors
+        $this->writeIgnoredErrors($objWriter);
+
+        // BackgroundImage must come after ignored, before table
+        $this->writeBackgroundImage($objWriter, $worksheet);
+
+        // Table
+        $this->writeTable($objWriter, $worksheet);
 
         // ConditionalFormattingRuleExtensionList
         // (Must be inserted last. Not insert last, an Excel parse error will occur)
-        $this->writeExtLst($objWriter, $pSheet);
+        $this->writeExtLst($objWriter, $worksheet);
 
         $objWriter->endElement();
 
@@ -127,44 +160,77 @@ public function writeWorksheet(PhpspreadsheetWorksheet $pSheet, $pStringTable =
         return $objWriter->getData();
     }
 
+    private function writeIgnoredError(XMLWriter $objWriter, bool &$started, string $attr, string $cells): void
+    {
+        if ($cells !== '') {
+            if (!$started) {
+                $objWriter->startElement('ignoredErrors');
+                $started = true;
+            }
+            $objWriter->startElement('ignoredError');
+            $objWriter->writeAttribute('sqref', substr($cells, 1));
+            $objWriter->writeAttribute($attr, '1');
+            $objWriter->endElement();
+        }
+    }
+
+    private function writeIgnoredErrors(XMLWriter $objWriter): void
+    {
+        $started = false;
+        $this->writeIgnoredError($objWriter, $started, 'numberStoredAsText', $this->numberStoredAsText);
+        $this->writeIgnoredError($objWriter, $started, 'formula', $this->formula);
+        $this->writeIgnoredError($objWriter, $started, 'twoDigitTextYear', $this->twoDigitTextYear);
+        $this->writeIgnoredError($objWriter, $started, 'evalError', $this->evalError);
+        if ($started) {
+            $objWriter->endElement();
+        }
+    }
+
     /**
      * Write SheetPr.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param PhpspreadsheetWorksheet $pSheet Worksheet
      */
-    private function writeSheetPr(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet): void
+    private function writeSheetPr(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
     {
         // sheetPr
         $objWriter->startElement('sheetPr');
-        if ($pSheet->getParent()->hasMacros()) {
+        if ($worksheet->getParentOrThrow()->hasMacros()) {
             //if the workbook have macros, we need to have codeName for the sheet
-            if (!$pSheet->hasCodeName()) {
-                $pSheet->setCodeName($pSheet->getTitle());
+            if (!$worksheet->hasCodeName()) {
+                $worksheet->setCodeName($worksheet->getTitle());
             }
-            $objWriter->writeAttribute('codeName', $pSheet->getCodeName());
+            self::writeAttributeNotNull($objWriter, 'codeName', $worksheet->getCodeName());
         }
-        $autoFilterRange = $pSheet->getAutoFilter()->getRange();
+        $autoFilterRange = $worksheet->getAutoFilter()->getRange();
         if (!empty($autoFilterRange)) {
-            $objWriter->writeAttribute('filterMode', 1);
-            $pSheet->getAutoFilter()->showHideRows();
+            $objWriter->writeAttribute('filterMode', '1');
+            if (!$worksheet->getAutoFilter()->getEvaluated()) {
+                $worksheet->getAutoFilter()->showHideRows();
+            }
+        }
+        $tables = $worksheet->getTableCollection();
+        if (count($tables)) {
+            foreach ($tables as $table) {
+                if (!$table->getAutoFilter()->getEvaluated()) {
+                    $table->getAutoFilter()->showHideRows();
+                }
+            }
         }
 
         // tabColor
-        if ($pSheet->isTabColorSet()) {
+        if ($worksheet->isTabColorSet()) {
             $objWriter->startElement('tabColor');
-            $objWriter->writeAttribute('rgb', $pSheet->getTabColor()->getARGB());
+            $objWriter->writeAttribute('rgb', $worksheet->getTabColor()->getARGB() ?? '');
             $objWriter->endElement();
         }
 
         // outlinePr
         $objWriter->startElement('outlinePr');
-        $objWriter->writeAttribute('summaryBelow', ($pSheet->getShowSummaryBelow() ? '1' : '0'));
-        $objWriter->writeAttribute('summaryRight', ($pSheet->getShowSummaryRight() ? '1' : '0'));
+        $objWriter->writeAttribute('summaryBelow', ($worksheet->getShowSummaryBelow() ? '1' : '0'));
+        $objWriter->writeAttribute('summaryRight', ($worksheet->getShowSummaryRight() ? '1' : '0'));
         $objWriter->endElement();
 
         // pageSetUpPr
-        if ($pSheet->getPageSetup()->getFitToPage()) {
+        if ($worksheet->getPageSetup()->getFitToPage()) {
             $objWriter->startElement('pageSetUpPr');
             $objWriter->writeAttribute('fitToPage', '1');
             $objWriter->endElement();
@@ -175,32 +241,26 @@ private function writeSheetPr(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSh
 
     /**
      * Write Dimension.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param PhpspreadsheetWorksheet $pSheet Worksheet
      */
-    private function writeDimension(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet): void
+    private function writeDimension(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
     {
         // dimension
         $objWriter->startElement('dimension');
-        $objWriter->writeAttribute('ref', $pSheet->calculateWorksheetDimension());
+        $objWriter->writeAttribute('ref', $worksheet->calculateWorksheetDimension());
         $objWriter->endElement();
     }
 
     /**
      * Write SheetViews.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param PhpspreadsheetWorksheet $pSheet Worksheet
      */
-    private function writeSheetViews(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet): void
+    private function writeSheetViews(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
     {
         // sheetViews
         $objWriter->startElement('sheetViews');
 
         // Sheet selected?
         $sheetSelected = false;
-        if ($this->getParentWriter()->getSpreadsheet()->getIndex($pSheet) == $this->getParentWriter()->getSpreadsheet()->getActiveSheetIndex()) {
+        if ($this->getParentWriter()->getSpreadsheet()->getIndex($worksheet) == $this->getParentWriter()->getSpreadsheet()->getActiveSheetIndex()) {
             $sheetSelected = true;
         }
 
@@ -210,91 +270,138 @@ private function writeSheetViews(XMLWriter $objWriter, PhpspreadsheetWorksheet $
         $objWriter->writeAttribute('workbookViewId', '0');
 
         // Zoom scales
-        if ($pSheet->getSheetView()->getZoomScale() != 100) {
-            $objWriter->writeAttribute('zoomScale', $pSheet->getSheetView()->getZoomScale());
+        $zoomScale = $worksheet->getSheetView()->getZoomScale();
+        if ($zoomScale !== 100 && $zoomScale !== null) {
+            $objWriter->writeAttribute('zoomScale', (string) $zoomScale);
+        }
+        $zoomScale = $worksheet->getSheetView()->getZoomScaleNormal();
+        if ($zoomScale !== 100 && $zoomScale !== null) {
+            $objWriter->writeAttribute('zoomScaleNormal', (string) $zoomScale);
+        }
+        $zoomScale = $worksheet->getSheetView()->getZoomScalePageLayoutView();
+        if ($zoomScale !== 100) {
+            $objWriter->writeAttribute('zoomScalePageLayoutView', (string) $zoomScale);
         }
-        if ($pSheet->getSheetView()->getZoomScaleNormal() != 100) {
-            $objWriter->writeAttribute('zoomScaleNormal', $pSheet->getSheetView()->getZoomScaleNormal());
+        $zoomScale = $worksheet->getSheetView()->getZoomScaleSheetLayoutView();
+        if ($zoomScale !== 100) {
+            $objWriter->writeAttribute('zoomScaleSheetLayoutView', (string) $zoomScale);
         }
 
         // Show zeros (Excel also writes this attribute only if set to false)
-        if ($pSheet->getSheetView()->getShowZeros() === false) {
-            $objWriter->writeAttribute('showZeros', 0);
+        if ($worksheet->getSheetView()->getShowZeros() === false) {
+            $objWriter->writeAttribute('showZeros', '0');
         }
 
         // View Layout Type
-        if ($pSheet->getSheetView()->getView() !== SheetView::SHEETVIEW_NORMAL) {
-            $objWriter->writeAttribute('view', $pSheet->getSheetView()->getView());
+        if ($worksheet->getSheetView()->getView() !== SheetView::SHEETVIEW_NORMAL) {
+            $objWriter->writeAttribute('view', $worksheet->getSheetView()->getView());
         }
 
         // Gridlines
-        if ($pSheet->getShowGridlines()) {
+        if ($worksheet->getShowGridlines()) {
             $objWriter->writeAttribute('showGridLines', 'true');
         } else {
             $objWriter->writeAttribute('showGridLines', 'false');
         }
 
         // Row and column headers
-        if ($pSheet->getShowRowColHeaders()) {
+        if ($worksheet->getShowRowColHeaders()) {
             $objWriter->writeAttribute('showRowColHeaders', '1');
         } else {
             $objWriter->writeAttribute('showRowColHeaders', '0');
         }
 
         // Right-to-left
-        if ($pSheet->getRightToLeft()) {
+        if ($worksheet->getRightToLeft()) {
             $objWriter->writeAttribute('rightToLeft', 'true');
         }
 
-        $activeCell = $pSheet->getActiveCell();
-        $sqref = $pSheet->getSelectedCells();
+        $topLeftCell = $worksheet->getTopLeftCell();
+        if (!empty($topLeftCell) && $worksheet->getPaneState() !== PhpspreadsheetWorksheet::PANE_FROZEN && $worksheet->getPaneState() !== PhpspreadsheetWorksheet::PANE_FROZENSPLIT) {
+            $objWriter->writeAttribute('topLeftCell', $topLeftCell);
+        }
+        $activeCell = $worksheet->getActiveCell();
+        $sqref = $worksheet->getSelectedCells();
 
         // Pane
-        $pane = '';
-        if ($pSheet->getFreezePane()) {
-            [$xSplit, $ySplit] = Coordinate::coordinateFromString($pSheet->getFreezePane());
-            $xSplit = Coordinate::columnIndexFromString($xSplit);
-            --$xSplit;
-            --$ySplit;
-
-            $topLeftCell = $pSheet->getTopLeftCell();
-
-            // pane
-            $pane = 'topRight';
+        if ($worksheet->usesPanes()) {
             $objWriter->startElement('pane');
+            $xSplit = $worksheet->getXSplit();
+            $ySplit = $worksheet->getYSplit();
+            $pane = $worksheet->getActivePane();
+            $paneTopLeftCell = $worksheet->getPaneTopLeftCell();
+            $paneState = $worksheet->getPaneState();
+            $normalFreeze = '';
+            if ($paneState === PhpspreadsheetWorksheet::PANE_FROZEN) {
+                if ($ySplit > 0) {
+                    $normalFreeze = ($xSplit <= 0) ? 'bottomLeft' : 'bottomRight';
+                } else {
+                    $normalFreeze = 'topRight';
+                }
+            }
             if ($xSplit > 0) {
-                $objWriter->writeAttribute('xSplit', $xSplit);
+                $objWriter->writeAttribute('xSplit', "$xSplit");
             }
             if ($ySplit > 0) {
-                $objWriter->writeAttribute('ySplit', $ySplit);
-                $pane = ($xSplit > 0) ? 'bottomRight' : 'bottomLeft';
+                $objWriter->writeAttribute('ySplit', "$ySplit");
             }
-            $objWriter->writeAttribute('topLeftCell', $topLeftCell);
-            $objWriter->writeAttribute('activePane', $pane);
-            $objWriter->writeAttribute('state', 'frozen');
-            $objWriter->endElement();
+            if ($normalFreeze !== '') {
+                $objWriter->writeAttribute('activePane', $normalFreeze);
+            } elseif ($pane !== '') {
+                $objWriter->writeAttribute('activePane', $pane);
+            }
+            if ($paneState !== '') {
+                $objWriter->writeAttribute('state', $paneState);
+            }
+            if ($paneTopLeftCell !== '') {
+                $objWriter->writeAttribute('topLeftCell', $paneTopLeftCell);
+            }
+            $objWriter->endElement(); // pane
 
-            if (($xSplit > 0) && ($ySplit > 0)) {
-                //    Write additional selections if more than two panes (ie both an X and a Y split)
+            if ($normalFreeze !== '') {
                 $objWriter->startElement('selection');
-                $objWriter->writeAttribute('pane', 'topRight');
-                $objWriter->endElement();
-                $objWriter->startElement('selection');
-                $objWriter->writeAttribute('pane', 'bottomLeft');
-                $objWriter->endElement();
+                $objWriter->writeAttribute('pane', $normalFreeze);
+                if ($activeCell !== '') {
+                    $objWriter->writeAttribute('activeCell', $activeCell);
+                }
+                if ($sqref !== '') {
+                    $objWriter->writeAttribute('sqref', $sqref);
+                }
+                $objWriter->endElement(); // selection
+                $sqref = $activeCell = '';
+            } else {
+                foreach ($worksheet->getPanes() as $panex) {
+                    if ($panex !== null) {
+                        $sqref = $activeCell = '';
+                        $objWriter->startElement('selection');
+                        $objWriter->writeAttribute('pane', $panex->getPosition());
+                        $activeCellPane = $panex->getActiveCell();
+                        if ($activeCellPane !== '') {
+                            $objWriter->writeAttribute('activeCell', $activeCellPane);
+                        }
+                        $sqrefPane = $panex->getSqref();
+                        if ($sqrefPane !== '') {
+                            $objWriter->writeAttribute('sqref', $sqrefPane);
+                        }
+                        $objWriter->endElement(); // selection
+                    }
+                }
             }
         }
 
         // Selection
         // Only need to write selection element if we have a split pane
         // We cheat a little by over-riding the active cell selection, setting it to the split cell
-        $objWriter->startElement('selection');
-        if ($pane != '') {
-            $objWriter->writeAttribute('pane', $pane);
+        if (!empty($sqref) || !empty($activeCell)) {
+            $objWriter->startElement('selection');
+            if (!empty($activeCell)) {
+                $objWriter->writeAttribute('activeCell', $activeCell);
+            }
+            if (!empty($sqref)) {
+                $objWriter->writeAttribute('sqref', $sqref);
+            }
+            $objWriter->endElement(); // selection
         }
-        $objWriter->writeAttribute('activeCell', $activeCell);
-        $objWriter->writeAttribute('sqref', $sqref);
-        $objWriter->endElement();
 
         $objWriter->endElement();
 
@@ -303,77 +410,68 @@ private function writeSheetViews(XMLWriter $objWriter, PhpspreadsheetWorksheet $
 
     /**
      * Write SheetFormatPr.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param PhpspreadsheetWorksheet $pSheet Worksheet
      */
-    private function writeSheetFormatPr(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet): void
+    private function writeSheetFormatPr(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
     {
         // sheetFormatPr
         $objWriter->startElement('sheetFormatPr');
 
         // Default row height
-        if ($pSheet->getDefaultRowDimension()->getRowHeight() >= 0) {
+        if ($worksheet->getDefaultRowDimension()->getRowHeight() >= 0) {
             $objWriter->writeAttribute('customHeight', 'true');
-            $objWriter->writeAttribute('defaultRowHeight', StringHelper::formatNumber($pSheet->getDefaultRowDimension()->getRowHeight()));
+            $objWriter->writeAttribute('defaultRowHeight', StringHelper::formatNumber($worksheet->getDefaultRowDimension()->getRowHeight()));
         } else {
             $objWriter->writeAttribute('defaultRowHeight', '14.4');
         }
 
         // Set Zero Height row
-        if (
-            (string) $pSheet->getDefaultRowDimension()->getZeroHeight() === '1' ||
-            strtolower((string) $pSheet->getDefaultRowDimension()->getZeroHeight()) == 'true'
-        ) {
+        if ($worksheet->getDefaultRowDimension()->getZeroHeight()) {
             $objWriter->writeAttribute('zeroHeight', '1');
         }
 
         // Default column width
-        if ($pSheet->getDefaultColumnDimension()->getWidth() >= 0) {
-            $objWriter->writeAttribute('defaultColWidth', StringHelper::formatNumber($pSheet->getDefaultColumnDimension()->getWidth()));
+        if ($worksheet->getDefaultColumnDimension()->getWidth() >= 0) {
+            $objWriter->writeAttribute('defaultColWidth', StringHelper::formatNumber($worksheet->getDefaultColumnDimension()->getWidth()));
         }
 
         // Outline level - row
         $outlineLevelRow = 0;
-        foreach ($pSheet->getRowDimensions() as $dimension) {
+        foreach ($worksheet->getRowDimensions() as $dimension) {
             if ($dimension->getOutlineLevel() > $outlineLevelRow) {
                 $outlineLevelRow = $dimension->getOutlineLevel();
             }
         }
-        $objWriter->writeAttribute('outlineLevelRow', (int) $outlineLevelRow);
+        $objWriter->writeAttribute('outlineLevelRow', (string) (int) $outlineLevelRow);
 
         // Outline level - column
         $outlineLevelCol = 0;
-        foreach ($pSheet->getColumnDimensions() as $dimension) {
+        foreach ($worksheet->getColumnDimensions() as $dimension) {
             if ($dimension->getOutlineLevel() > $outlineLevelCol) {
                 $outlineLevelCol = $dimension->getOutlineLevel();
             }
         }
-        $objWriter->writeAttribute('outlineLevelCol', (int) $outlineLevelCol);
+        $objWriter->writeAttribute('outlineLevelCol', (string) (int) $outlineLevelCol);
 
         $objWriter->endElement();
     }
 
     /**
      * Write Cols.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param PhpspreadsheetWorksheet $pSheet Worksheet
      */
-    private function writeCols(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet): void
+    private function writeCols(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
     {
         // cols
-        if (count($pSheet->getColumnDimensions()) > 0) {
+        if (count($worksheet->getColumnDimensions()) > 0) {
             $objWriter->startElement('cols');
 
-            $pSheet->calculateColumnWidths();
+            $worksheet->calculateColumnWidths();
 
             // Loop through column dimensions
-            foreach ($pSheet->getColumnDimensions() as $colDimension) {
+            foreach ($worksheet->getColumnDimensions() as $colDimension) {
                 // col
                 $objWriter->startElement('col');
-                $objWriter->writeAttribute('min', Coordinate::columnIndexFromString($colDimension->getColumnIndex()));
-                $objWriter->writeAttribute('max', Coordinate::columnIndexFromString($colDimension->getColumnIndex()));
+                $objWriter->writeAttribute('min', (string) Coordinate::columnIndexFromString($colDimension->getColumnIndex()));
+                $objWriter->writeAttribute('max', (string) Coordinate::columnIndexFromString($colDimension->getColumnIndex()));
 
                 if ($colDimension->getWidth() < 0) {
                     // No width set, apply default of 10
@@ -394,7 +492,7 @@ private function writeCols(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet
                 }
 
                 // Custom width?
-                if ($colDimension->getWidth() != $pSheet->getDefaultColumnDimension()->getWidth()) {
+                if ($colDimension->getWidth() != $worksheet->getDefaultColumnDimension()->getWidth()) {
                     $objWriter->writeAttribute('customWidth', 'true');
                 }
 
@@ -405,11 +503,11 @@ private function writeCols(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet
 
                 // Outline level
                 if ($colDimension->getOutlineLevel() > 0) {
-                    $objWriter->writeAttribute('outlineLevel', $colDimension->getOutlineLevel());
+                    $objWriter->writeAttribute('outlineLevel', (string) $colDimension->getOutlineLevel());
                 }
 
                 // Style
-                $objWriter->writeAttribute('style', $colDimension->getXfIndex());
+                $objWriter->writeAttribute('style', (string) $colDimension->getXfIndex());
 
                 $objWriter->endElement();
             }
@@ -420,53 +518,68 @@ private function writeCols(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet
 
     /**
      * Write SheetProtection.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param PhpspreadsheetWorksheet $pSheet Worksheet
      */
-    private function writeSheetProtection(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet): void
+    private function writeSheetProtection(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
     {
+        $protection = $worksheet->getProtection();
+        if (!$protection->isProtectionEnabled()) {
+            return;
+        }
         // sheetProtection
         $objWriter->startElement('sheetProtection');
 
-        $protection = $pSheet->getProtection();
-
         if ($protection->getAlgorithm()) {
             $objWriter->writeAttribute('algorithmName', $protection->getAlgorithm());
             $objWriter->writeAttribute('hashValue', $protection->getPassword());
             $objWriter->writeAttribute('saltValue', $protection->getSalt());
-            $objWriter->writeAttribute('spinCount', $protection->getSpinCount());
+            $objWriter->writeAttribute('spinCount', (string) $protection->getSpinCount());
         } elseif ($protection->getPassword() !== '') {
             $objWriter->writeAttribute('password', $protection->getPassword());
         }
 
-        $objWriter->writeAttribute('sheet', ($protection->getSheet() ? 'true' : 'false'));
-        $objWriter->writeAttribute('objects', ($protection->getObjects() ? 'true' : 'false'));
-        $objWriter->writeAttribute('scenarios', ($protection->getScenarios() ? 'true' : 'false'));
-        $objWriter->writeAttribute('formatCells', ($protection->getFormatCells() ? 'true' : 'false'));
-        $objWriter->writeAttribute('formatColumns', ($protection->getFormatColumns() ? 'true' : 'false'));
-        $objWriter->writeAttribute('formatRows', ($protection->getFormatRows() ? 'true' : 'false'));
-        $objWriter->writeAttribute('insertColumns', ($protection->getInsertColumns() ? 'true' : 'false'));
-        $objWriter->writeAttribute('insertRows', ($protection->getInsertRows() ? 'true' : 'false'));
-        $objWriter->writeAttribute('insertHyperlinks', ($protection->getInsertHyperlinks() ? 'true' : 'false'));
-        $objWriter->writeAttribute('deleteColumns', ($protection->getDeleteColumns() ? 'true' : 'false'));
-        $objWriter->writeAttribute('deleteRows', ($protection->getDeleteRows() ? 'true' : 'false'));
-        $objWriter->writeAttribute('selectLockedCells', ($protection->getSelectLockedCells() ? 'true' : 'false'));
-        $objWriter->writeAttribute('sort', ($protection->getSort() ? 'true' : 'false'));
-        $objWriter->writeAttribute('autoFilter', ($protection->getAutoFilter() ? 'true' : 'false'));
-        $objWriter->writeAttribute('pivotTables', ($protection->getPivotTables() ? 'true' : 'false'));
-        $objWriter->writeAttribute('selectUnlockedCells', ($protection->getSelectUnlockedCells() ? 'true' : 'false'));
+        self::writeProtectionAttribute($objWriter, 'sheet', $protection->getSheet());
+        self::writeProtectionAttribute($objWriter, 'objects', $protection->getObjects());
+        self::writeProtectionAttribute($objWriter, 'scenarios', $protection->getScenarios());
+        self::writeProtectionAttribute($objWriter, 'formatCells', $protection->getFormatCells());
+        self::writeProtectionAttribute($objWriter, 'formatColumns', $protection->getFormatColumns());
+        self::writeProtectionAttribute($objWriter, 'formatRows', $protection->getFormatRows());
+        self::writeProtectionAttribute($objWriter, 'insertColumns', $protection->getInsertColumns());
+        self::writeProtectionAttribute($objWriter, 'insertRows', $protection->getInsertRows());
+        self::writeProtectionAttribute($objWriter, 'insertHyperlinks', $protection->getInsertHyperlinks());
+        self::writeProtectionAttribute($objWriter, 'deleteColumns', $protection->getDeleteColumns());
+        self::writeProtectionAttribute($objWriter, 'deleteRows', $protection->getDeleteRows());
+        self::writeProtectionAttribute($objWriter, 'sort', $protection->getSort());
+        self::writeProtectionAttribute($objWriter, 'autoFilter', $protection->getAutoFilter());
+        self::writeProtectionAttribute($objWriter, 'pivotTables', $protection->getPivotTables());
+        self::writeProtectionAttribute($objWriter, 'selectLockedCells', $protection->getSelectLockedCells());
+        self::writeProtectionAttribute($objWriter, 'selectUnlockedCells', $protection->getSelectUnlockedCells());
         $objWriter->endElement();
     }
 
-    private static function writeAttributeIf(XMLWriter $objWriter, $condition, string $attr, string $val): void
+    private static function writeProtectionAttribute(XMLWriter $objWriter, string $name, ?bool $value): void
+    {
+        if ($value === true) {
+            $objWriter->writeAttribute($name, '1');
+        } elseif ($value === false) {
+            $objWriter->writeAttribute($name, '0');
+        }
+    }
+
+    private static function writeAttributeIf(XMLWriter $objWriter, ?bool $condition, string $attr, string $val): void
     {
         if ($condition) {
             $objWriter->writeAttribute($attr, $val);
         }
     }
 
-    private static function writeElementIf(XMLWriter $objWriter, $condition, string $attr, string $val): void
+    private static function writeAttributeNotNull(XMLWriter $objWriter, string $attr, ?string $val): void
+    {
+        if ($val !== null) {
+            $objWriter->writeAttribute($attr, $val);
+        }
+    }
+
+    private static function writeElementIf(XMLWriter $objWriter, bool $condition, string $attr, string $val): void
     {
         if ($condition) {
             $objWriter->writeElement($attr, $val);
@@ -475,37 +588,86 @@ private static function writeElementIf(XMLWriter $objWriter, $condition, string
 
     private static function writeOtherCondElements(XMLWriter $objWriter, Conditional $conditional, string $cellCoordinate): void
     {
+        $conditions = $conditional->getConditions();
         if (
             $conditional->getConditionType() == Conditional::CONDITION_CELLIS
-            || $conditional->getConditionType() == Conditional::CONDITION_CONTAINSTEXT
             || $conditional->getConditionType() == Conditional::CONDITION_EXPRESSION
+            || !empty($conditions)
         ) {
-            foreach ($conditional->getConditions() as $formula) {
+            foreach ($conditions as $formula) {
                 // Formula
-                $objWriter->writeElement('formula', Xlfn::addXlfn($formula));
+                if (is_bool($formula)) {
+                    $formula = $formula ? 'TRUE' : 'FALSE';
+                }
+                $objWriter->writeElement('formula', FunctionPrefix::addFunctionPrefix("$formula"));
+            }
+        } else {
+            if ($conditional->getConditionType() == Conditional::CONDITION_CONTAINSBLANKS) {
+                // formula copied from ms xlsx xml source file
+                $objWriter->writeElement('formula', 'LEN(TRIM(' . $cellCoordinate . '))=0');
+            } elseif ($conditional->getConditionType() == Conditional::CONDITION_NOTCONTAINSBLANKS) {
+                // formula copied from ms xlsx xml source file
+                $objWriter->writeElement('formula', 'LEN(TRIM(' . $cellCoordinate . '))>0');
+            } elseif ($conditional->getConditionType() == Conditional::CONDITION_CONTAINSERRORS) {
+                // formula copied from ms xlsx xml source file
+                $objWriter->writeElement('formula', 'ISERROR(' . $cellCoordinate . ')');
+            } elseif ($conditional->getConditionType() == Conditional::CONDITION_NOTCONTAINSERRORS) {
+                // formula copied from ms xlsx xml source file
+                $objWriter->writeElement('formula', 'NOT(ISERROR(' . $cellCoordinate . '))');
+            }
+        }
+    }
+
+    private static function writeTimePeriodCondElements(XMLWriter $objWriter, Conditional $conditional, string $cellCoordinate): void
+    {
+        $txt = $conditional->getText();
+        if (!empty($txt)) {
+            $objWriter->writeAttribute('timePeriod', $txt);
+            if (empty($conditional->getConditions())) {
+                if ($conditional->getOperatorType() == Conditional::TIMEPERIOD_TODAY) {
+                    $objWriter->writeElement('formula', 'FLOOR(' . $cellCoordinate . ')=TODAY()');
+                } elseif ($conditional->getOperatorType() == Conditional::TIMEPERIOD_TOMORROW) {
+                    $objWriter->writeElement('formula', 'FLOOR(' . $cellCoordinate . ')=TODAY()+1');
+                } elseif ($conditional->getOperatorType() == Conditional::TIMEPERIOD_YESTERDAY) {
+                    $objWriter->writeElement('formula', 'FLOOR(' . $cellCoordinate . ')=TODAY()-1');
+                } elseif ($conditional->getOperatorType() == Conditional::TIMEPERIOD_LAST_7_DAYS) {
+                    $objWriter->writeElement('formula', 'AND(TODAY()-FLOOR(' . $cellCoordinate . ',1)<=6,FLOOR(' . $cellCoordinate . ',1)<=TODAY())');
+                } elseif ($conditional->getOperatorType() == Conditional::TIMEPERIOD_LAST_WEEK) {
+                    $objWriter->writeElement('formula', 'AND(TODAY()-ROUNDDOWN(' . $cellCoordinate . ',0)>=(WEEKDAY(TODAY())),TODAY()-ROUNDDOWN(' . $cellCoordinate . ',0)<(WEEKDAY(TODAY())+7))');
+                } elseif ($conditional->getOperatorType() == Conditional::TIMEPERIOD_THIS_WEEK) {
+                    $objWriter->writeElement('formula', 'AND(TODAY()-ROUNDDOWN(' . $cellCoordinate . ',0)<=WEEKDAY(TODAY())-1,ROUNDDOWN(' . $cellCoordinate . ',0)-TODAY()<=7-WEEKDAY(TODAY()))');
+                } elseif ($conditional->getOperatorType() == Conditional::TIMEPERIOD_NEXT_WEEK) {
+                    $objWriter->writeElement('formula', 'AND(ROUNDDOWN(' . $cellCoordinate . ',0)-TODAY()>(7-WEEKDAY(TODAY())),ROUNDDOWN(' . $cellCoordinate . ',0)-TODAY()<(15-WEEKDAY(TODAY())))');
+                } elseif ($conditional->getOperatorType() == Conditional::TIMEPERIOD_LAST_MONTH) {
+                    $objWriter->writeElement('formula', 'AND(MONTH(' . $cellCoordinate . ')=MONTH(EDATE(TODAY(),0-1)),YEAR(' . $cellCoordinate . ')=YEAR(EDATE(TODAY(),0-1)))');
+                } elseif ($conditional->getOperatorType() == Conditional::TIMEPERIOD_THIS_MONTH) {
+                    $objWriter->writeElement('formula', 'AND(MONTH(' . $cellCoordinate . ')=MONTH(TODAY()),YEAR(' . $cellCoordinate . ')=YEAR(TODAY()))');
+                } elseif ($conditional->getOperatorType() == Conditional::TIMEPERIOD_NEXT_MONTH) {
+                    $objWriter->writeElement('formula', 'AND(MONTH(' . $cellCoordinate . ')=MONTH(EDATE(TODAY(),0+1)),YEAR(' . $cellCoordinate . ')=YEAR(EDATE(TODAY(),0+1)))');
+                }
+            } else {
+                $objWriter->writeElement('formula', (string) ($conditional->getConditions()[0]));
             }
-        } elseif ($conditional->getConditionType() == Conditional::CONDITION_CONTAINSBLANKS) {
-            // formula copied from ms xlsx xml source file
-            $objWriter->writeElement('formula', 'LEN(TRIM(' . $cellCoordinate . '))=0');
-        } elseif ($conditional->getConditionType() == Conditional::CONDITION_NOTCONTAINSBLANKS) {
-            // formula copied from ms xlsx xml source file
-            $objWriter->writeElement('formula', 'LEN(TRIM(' . $cellCoordinate . '))>0');
         }
     }
 
     private static function writeTextCondElements(XMLWriter $objWriter, Conditional $conditional, string $cellCoordinate): void
     {
         $txt = $conditional->getText();
-        if ($txt !== null) {
+        if (!empty($txt)) {
             $objWriter->writeAttribute('text', $txt);
-            if ($conditional->getOperatorType() == Conditional::OPERATOR_CONTAINSTEXT) {
-                $objWriter->writeElement('formula', 'NOT(ISERROR(SEARCH("' . $txt . '",' . $cellCoordinate . ')))');
-            } elseif ($conditional->getOperatorType() == Conditional::OPERATOR_BEGINSWITH) {
-                $objWriter->writeElement('formula', 'LEFT(' . $cellCoordinate . ',' . strlen($txt) . ')="' . $txt . '"');
-            } elseif ($conditional->getOperatorType() == Conditional::OPERATOR_ENDSWITH) {
-                $objWriter->writeElement('formula', 'RIGHT(' . $cellCoordinate . ',' . strlen($txt) . ')="' . $txt . '"');
-            } elseif ($conditional->getOperatorType() == Conditional::OPERATOR_NOTCONTAINS) {
-                $objWriter->writeElement('formula', 'ISERROR(SEARCH("' . $txt . '",' . $cellCoordinate . '))');
+            if (empty($conditional->getConditions())) {
+                if ($conditional->getOperatorType() == Conditional::OPERATOR_CONTAINSTEXT) {
+                    $objWriter->writeElement('formula', 'NOT(ISERROR(SEARCH("' . $txt . '",' . $cellCoordinate . ')))');
+                } elseif ($conditional->getOperatorType() == Conditional::OPERATOR_BEGINSWITH) {
+                    $objWriter->writeElement('formula', 'LEFT(' . $cellCoordinate . ',LEN("' . $txt . '"))="' . $txt . '"');
+                } elseif ($conditional->getOperatorType() == Conditional::OPERATOR_ENDSWITH) {
+                    $objWriter->writeElement('formula', 'RIGHT(' . $cellCoordinate . ',LEN("' . $txt . '"))="' . $txt . '"');
+                } elseif ($conditional->getOperatorType() == Conditional::OPERATOR_NOTCONTAINS) {
+                    $objWriter->writeElement('formula', 'ISERROR(SEARCH("' . $txt . '",' . $cellCoordinate . '))');
+                }
+            } else {
+                $objWriter->writeElement('formula', (string) ($conditional->getConditions()[0]));
             }
         }
     }
@@ -524,7 +686,7 @@ private static function writeExtConditionalFormattingElements(XMLWriter $objWrit
             $objWriter->writeAttribute($attrKey, $val);
         }
         $minCfvo = $dataBar->getMinimumConditionalFormatValueObject();
-        if ($minCfvo) {
+        if ($minCfvo !== null) {
             $objWriter->startElementNs($prefix, 'cfvo', null);
             $objWriter->writeAttribute('type', $minCfvo->getType());
             if ($minCfvo->getCellFormula()) {
@@ -534,7 +696,7 @@ private static function writeExtConditionalFormattingElements(XMLWriter $objWrit
         }
 
         $maxCfvo = $dataBar->getMaximumConditionalFormatValueObject();
-        if ($maxCfvo) {
+        if ($maxCfvo !== null) {
             $objWriter->startElementNs($prefix, 'cfvo', null);
             $objWriter->writeAttribute('type', $maxCfvo->getType());
             if ($maxCfvo->getCellFormula()) {
@@ -556,9 +718,8 @@ private static function writeExtConditionalFormattingElements(XMLWriter $objWrit
         $objWriter->endElement(); //end conditionalFormatting
     }
 
-    private static function writeDataBarElements(XMLWriter $objWriter, $dataBar): void
+    private static function writeDataBarElements(XMLWriter $objWriter, ?ConditionalDataBar $dataBar): void
     {
-        /** @var ConditionalDataBar $dataBar */
         if ($dataBar) {
             $objWriter->startElement('dataBar');
             self::writeAttributeIf($objWriter, null !== $dataBar->getShowValue(), 'showValue', $dataBar->getShowValue() ? '1' : '0');
@@ -566,15 +727,15 @@ private static function writeDataBarElements(XMLWriter $objWriter, $dataBar): vo
             $minCfvo = $dataBar->getMinimumConditionalFormatValueObject();
             if ($minCfvo) {
                 $objWriter->startElement('cfvo');
-                self::writeAttributeIf($objWriter, $minCfvo->getType(), 'type', (string) $minCfvo->getType());
-                self::writeAttributeIf($objWriter, $minCfvo->getValue(), 'val', (string) $minCfvo->getValue());
+                $objWriter->writeAttribute('type', $minCfvo->getType());
+                self::writeAttributeIf($objWriter, $minCfvo->getValue() !== null, 'val', (string) $minCfvo->getValue());
                 $objWriter->endElement();
             }
             $maxCfvo = $dataBar->getMaximumConditionalFormatValueObject();
             if ($maxCfvo) {
                 $objWriter->startElement('cfvo');
-                self::writeAttributeIf($objWriter, $maxCfvo->getType(), 'type', (string) $maxCfvo->getType());
-                self::writeAttributeIf($objWriter, $maxCfvo->getValue(), 'val', (string) $maxCfvo->getValue());
+                $objWriter->writeAttribute('type', $maxCfvo->getType());
+                self::writeAttributeIf($objWriter, $maxCfvo->getValue() !== null, 'val', (string) $maxCfvo->getValue());
                 $objWriter->endElement();
             }
             if ($dataBar->getColor()) {
@@ -598,89 +759,193 @@ private static function writeDataBarElements(XMLWriter $objWriter, $dataBar): vo
         }
     }
 
+    private static function writeColorScaleElements(XMLWriter $objWriter, ?ConditionalColorScale $colorScale): void
+    {
+        if ($colorScale) {
+            $objWriter->startElement('colorScale');
+
+            $minCfvo = $colorScale->getMinimumConditionalFormatValueObject();
+            $minArgb = $colorScale->getMinimumColor()?->getARGB();
+            $useMin = $minCfvo !== null || $minArgb !== null;
+            if ($useMin) {
+                $objWriter->startElement('cfvo');
+                $type = 'min';
+                $value = null;
+                if ($minCfvo !== null) {
+                    $typex = $minCfvo->getType();
+                    if ($typex === 'formula') {
+                        $value = $minCfvo->getCellFormula();
+                        if ($value !== null) {
+                            $type = $typex;
+                        }
+                    } else {
+                        $type = $typex;
+                        $defaults = ['number' => '0', 'percent' => '0', 'percentile' => '10'];
+                        $value = $minCfvo->getValue() ?? $defaults[$type] ?? null;
+                    }
+                }
+                $objWriter->writeAttribute('type', $type);
+                self::writeAttributeIf($objWriter, $value !== null, 'val', (string) $value);
+                $objWriter->endElement();
+            }
+            $midCfvo = $colorScale->getMidpointConditionalFormatValueObject();
+            $midArgb = $colorScale->getMidpointColor()?->getARGB();
+            $useMid = $midCfvo !== null || $midArgb !== null;
+            if ($useMid) {
+                $objWriter->startElement('cfvo');
+                $type = 'percentile';
+                $value = '50';
+                if ($midCfvo !== null) {
+                    $type = $midCfvo->getType();
+                    if ($type === 'formula') {
+                        $value = $midCfvo->getCellFormula();
+                        if ($value === null) {
+                            $type = 'percentile';
+                            $value = '50';
+                        }
+                    } else {
+                        $defaults = ['number' => '0', 'percent' => '50', 'percentile' => '50'];
+                        $value = $midCfvo->getValue() ?? $defaults[$type] ?? null;
+                    }
+                }
+                $objWriter->writeAttribute('type', $type);
+                self::writeAttributeIf($objWriter, $value !== null, 'val', (string) $value);
+                $objWriter->endElement();
+            }
+            $maxCfvo = $colorScale->getMaximumConditionalFormatValueObject();
+            $maxArgb = $colorScale->getMaximumColor()?->getARGB();
+            $useMax = $maxCfvo !== null || $maxArgb !== null;
+            if ($useMax) {
+                $objWriter->startElement('cfvo');
+                $type = 'max';
+                $value = null;
+                if ($maxCfvo !== null) {
+                    $typex = $maxCfvo->getType();
+                    if ($typex === 'formula') {
+                        $value = $maxCfvo->getCellFormula();
+                        if ($value !== null) {
+                            $type = $typex;
+                        }
+                    } else {
+                        $type = $typex;
+                        $defaults = ['number' => '0', 'percent' => '100', 'percentile' => '90'];
+                        $value = $maxCfvo->getValue() ?? $defaults[$type] ?? null;
+                    }
+                }
+                $objWriter->writeAttribute('type', $type);
+                self::writeAttributeIf($objWriter, $value !== null, 'val', (string) $value);
+                $objWriter->endElement();
+            }
+            if ($useMin) {
+                $objWriter->startElement('color');
+                self::writeAttributeIf($objWriter, $minArgb !== null, 'rgb', "$minArgb");
+                $objWriter->endElement();
+            }
+            if ($useMid) {
+                $objWriter->startElement('color');
+                self::writeAttributeIf($objWriter, $midArgb !== null, 'rgb', "$midArgb");
+                $objWriter->endElement();
+            }
+            if ($useMax) {
+                $objWriter->startElement('color');
+                self::writeAttributeIf($objWriter, $maxArgb !== null, 'rgb', "$maxArgb");
+                $objWriter->endElement();
+            }
+            $objWriter->endElement(); // end colorScale
+        }
+    }
+
     /**
      * Write ConditionalFormatting.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param PhpspreadsheetWorksheet $pSheet Worksheet
      */
-    private function writeConditionalFormatting(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet): void
+    private function writeConditionalFormatting(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
     {
         // Conditional id
         $id = 1;
 
         // Loop through styles in the current worksheet
-        foreach ($pSheet->getConditionalStylesCollection() as $cellCoordinate => $conditionalStyles) {
+        foreach ($worksheet->getConditionalStylesCollection() as $cellCoordinate => $conditionalStyles) {
+            $objWriter->startElement('conditionalFormatting');
+            // N.B. In Excel UI, intersection is space and union is comma.
+            // But in Xml, intersection is comma and union is space.
+            // Anyhow, I don't think Excel handles intersection correctly when reading.
+            $outCoordinate = Coordinate::resolveUnionAndIntersection(str_replace('$', '', $cellCoordinate), ' ');
+            $objWriter->writeAttribute('sqref', $outCoordinate);
+
             foreach ($conditionalStyles as $conditional) {
                 // WHY was this again?
                 // if ($this->getParentWriter()->getStylesConditionalHashTable()->getIndexForHashCode($conditional->getHashCode()) == '') {
                 //    continue;
                 // }
-                if ($conditional->getConditionType() != Conditional::CONDITION_NONE) {
-                    // conditionalFormatting
-                    $objWriter->startElement('conditionalFormatting');
-                    $objWriter->writeAttribute('sqref', $cellCoordinate);
-
-                    // cfRule
-                    $objWriter->startElement('cfRule');
-                    $objWriter->writeAttribute('type', $conditional->getConditionType());
-                    self::writeAttributeIf(
-                        $objWriter,
-                        ($conditional->getConditionType() != Conditional::CONDITION_DATABAR),
-                        'dxfId',
-                        $this->getParentWriter()->getStylesConditionalHashTable()->getIndexForHashCode($conditional->getHashCode())
-                    );
-                    $objWriter->writeAttribute('priority', $id++);
-
-                    self::writeAttributeif(
-                        $objWriter,
-                        (
-                            $conditional->getConditionType() === Conditional::CONDITION_CELLIS
-                            || $conditional->getConditionType() === Conditional::CONDITION_CONTAINSTEXT
-                            || $conditional->getConditionType() === Conditional::CONDITION_NOTCONTAINSTEXT
-                        ) && $conditional->getOperatorType() !== Conditional::OPERATOR_NONE,
-                        'operator',
-                        $conditional->getOperatorType()
-                    );
-
-                    self::writeAttributeIf($objWriter, $conditional->getStopIfTrue(), 'stopIfTrue', '1');
-
-                    if (
-                        $conditional->getConditionType() === Conditional::CONDITION_CONTAINSTEXT
+                // cfRule
+                $objWriter->startElement('cfRule');
+                $objWriter->writeAttribute('type', $conditional->getConditionType());
+                self::writeAttributeIf(
+                    $objWriter,
+                    ($conditional->getConditionType() !== Conditional::CONDITION_COLORSCALE
+                        && $conditional->getConditionType() !== Conditional::CONDITION_DATABAR
+                        && $conditional->getNoFormatSet() === false),
+                    'dxfId',
+                    (string) $this->getParentWriter()->getStylesConditionalHashTable()->getIndexForHashCode($conditional->getHashCode())
+                );
+                $objWriter->writeAttribute('priority', (string) $id++);
+
+                self::writeAttributeif(
+                    $objWriter,
+                    (
+                        $conditional->getConditionType() === Conditional::CONDITION_CELLIS
+                        || $conditional->getConditionType() === Conditional::CONDITION_CONTAINSTEXT
                         || $conditional->getConditionType() === Conditional::CONDITION_NOTCONTAINSTEXT
-                    ) {
-                        self::writeTextCondElements($objWriter, $conditional, $cellCoordinate);
-                    } else {
-                        self::writeOtherCondElements($objWriter, $conditional, $cellCoordinate);
-                    }
-
-                    //<dataBar>
-                    self::writeDataBarElements($objWriter, $conditional->getDataBar());
+                        || $conditional->getConditionType() === Conditional::CONDITION_BEGINSWITH
+                        || $conditional->getConditionType() === Conditional::CONDITION_ENDSWITH
+                    ) && $conditional->getOperatorType() !== Conditional::OPERATOR_NONE,
+                    'operator',
+                    $conditional->getOperatorType()
+                );
+
+                self::writeAttributeIf($objWriter, $conditional->getStopIfTrue(), 'stopIfTrue', '1');
+
+                $cellRange = Coordinate::splitRange(str_replace('$', '', strtoupper($cellCoordinate)));
+                [$topLeftCell] = $cellRange[0];
+
+                if (
+                    $conditional->getConditionType() === Conditional::CONDITION_CONTAINSTEXT
+                    || $conditional->getConditionType() === Conditional::CONDITION_NOTCONTAINSTEXT
+                    || $conditional->getConditionType() === Conditional::CONDITION_BEGINSWITH
+                    || $conditional->getConditionType() === Conditional::CONDITION_ENDSWITH
+                ) {
+                    self::writeTextCondElements($objWriter, $conditional, $topLeftCell);
+                } elseif ($conditional->getConditionType() === Conditional::CONDITION_TIMEPERIOD) {
+                    self::writeTimePeriodCondElements($objWriter, $conditional, $topLeftCell);
+                } elseif ($conditional->getConditionType() === Conditional::CONDITION_COLORSCALE) {
+                    self::writeColorScaleElements($objWriter, $conditional->getColorScale());
+                } else {
+                    self::writeOtherCondElements($objWriter, $conditional, $topLeftCell);
+                }
 
-                    $objWriter->endElement(); //end cfRule
+                //<dataBar>
+                self::writeDataBarElements($objWriter, $conditional->getDataBar());
 
-                    $objWriter->endElement();
-                }
+                $objWriter->endElement(); //end cfRule
             }
+
+            $objWriter->endElement(); //end conditionalFormatting
         }
     }
 
     /**
      * Write DataValidations.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param PhpspreadsheetWorksheet $pSheet Worksheet
      */
-    private function writeDataValidations(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet): void
+    private function writeDataValidations(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
     {
         // Datavalidation collection
-        $dataValidationCollection = $pSheet->getDataValidationCollection();
+        $dataValidationCollection = $worksheet->getDataValidationCollection();
 
         // Write data validations?
         if (!empty($dataValidationCollection)) {
             $dataValidationCollection = Coordinate::mergeRangesInCollection($dataValidationCollection);
             $objWriter->startElement('dataValidations');
-            $objWriter->writeAttribute('count', count($dataValidationCollection));
+            $objWriter->writeAttribute('count', (string) count($dataValidationCollection));
 
             foreach ($dataValidationCollection as $coordinate => $dv) {
                 $objWriter->startElement('dataValidation');
@@ -715,7 +980,7 @@ private function writeDataValidations(XMLWriter $objWriter, PhpspreadsheetWorksh
                     $objWriter->writeAttribute('prompt', $dv->getPrompt());
                 }
 
-                $objWriter->writeAttribute('sqref', $coordinate);
+                $objWriter->writeAttribute('sqref', $dv->getSqref() ?? $coordinate);
 
                 if ($dv->getFormula1() !== '') {
                     $objWriter->writeElement('formula1', $dv->getFormula1());
@@ -733,14 +998,11 @@ private function writeDataValidations(XMLWriter $objWriter, PhpspreadsheetWorksh
 
     /**
      * Write Hyperlinks.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param PhpspreadsheetWorksheet $pSheet Worksheet
      */
-    private function writeHyperlinks(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet): void
+    private function writeHyperlinks(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
     {
         // Hyperlink collection
-        $hyperlinkCollection = $pSheet->getHyperlinkCollection();
+        $hyperlinkCollection = $worksheet->getHyperlinkCollection();
 
         // Relation ID
         $relationId = 1;
@@ -774,25 +1036,23 @@ private function writeHyperlinks(XMLWriter $objWriter, PhpspreadsheetWorksheet $
 
     /**
      * Write ProtectedRanges.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param PhpspreadsheetWorksheet $pSheet Worksheet
      */
-    private function writeProtectedRanges(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet): void
+    private function writeProtectedRanges(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
     {
-        if (count($pSheet->getProtectedCells()) > 0) {
+        if (count($worksheet->getProtectedCellRanges()) > 0) {
             // protectedRanges
             $objWriter->startElement('protectedRanges');
 
             // Loop protectedRanges
-            foreach ($pSheet->getProtectedCells() as $protectedCell => $passwordHash) {
+            foreach ($worksheet->getProtectedCellRanges() as $protectedCell => $protectedRange) {
                 // protectedRange
                 $objWriter->startElement('protectedRange');
-                $objWriter->writeAttribute('name', 'p' . md5($protectedCell));
+                $objWriter->writeAttribute('name', $protectedRange->getName());
                 $objWriter->writeAttribute('sqref', $protectedCell);
-                if (!empty($passwordHash)) {
-                    $objWriter->writeAttribute('password', $passwordHash);
-                }
+                $passwordHash = $protectedRange->getPassword();
+                $this->writeAttributeIf($objWriter, $passwordHash !== '', 'password', $passwordHash);
+                $securityDescriptor = $protectedRange->getSecurityDescriptor();
+                $this->writeAttributeIf($objWriter, $securityDescriptor !== '', 'securityDescriptor', $securityDescriptor);
                 $objWriter->endElement();
             }
 
@@ -802,18 +1062,15 @@ private function writeProtectedRanges(XMLWriter $objWriter, PhpspreadsheetWorksh
 
     /**
      * Write MergeCells.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param PhpspreadsheetWorksheet $pSheet Worksheet
      */
-    private function writeMergeCells(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet): void
+    private function writeMergeCells(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
     {
-        if (count($pSheet->getMergeCells()) > 0) {
+        if (count($worksheet->getMergeCells()) > 0) {
             // mergeCells
             $objWriter->startElement('mergeCells');
 
             // Loop mergeCells
-            foreach ($pSheet->getMergeCells() as $mergeCell) {
+            foreach ($worksheet->getMergeCells() as $mergeCell) {
                 // mergeCell
                 $objWriter->startElement('mergeCell');
                 $objWriter->writeAttribute('ref', $mergeCell);
@@ -826,23 +1083,20 @@ private function writeMergeCells(XMLWriter $objWriter, PhpspreadsheetWorksheet $
 
     /**
      * Write PrintOptions.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param PhpspreadsheetWorksheet $pSheet Worksheet
      */
-    private function writePrintOptions(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet): void
+    private function writePrintOptions(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
     {
         // printOptions
         $objWriter->startElement('printOptions');
 
-        $objWriter->writeAttribute('gridLines', ($pSheet->getPrintGridlines() ? 'true' : 'false'));
+        $objWriter->writeAttribute('gridLines', ($worksheet->getPrintGridlines() ? 'true' : 'false'));
         $objWriter->writeAttribute('gridLinesSet', 'true');
 
-        if ($pSheet->getPageSetup()->getHorizontalCentered()) {
+        if ($worksheet->getPageSetup()->getHorizontalCentered()) {
             $objWriter->writeAttribute('horizontalCentered', 'true');
         }
 
-        if ($pSheet->getPageSetup()->getVerticalCentered()) {
+        if ($worksheet->getPageSetup()->getVerticalCentered()) {
             $objWriter->writeAttribute('verticalCentered', 'true');
         }
 
@@ -851,150 +1105,94 @@ private function writePrintOptions(XMLWriter $objWriter, PhpspreadsheetWorksheet
 
     /**
      * Write PageMargins.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param PhpspreadsheetWorksheet $pSheet Worksheet
      */
-    private function writePageMargins(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet): void
+    private function writePageMargins(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
     {
         // pageMargins
         $objWriter->startElement('pageMargins');
-        $objWriter->writeAttribute('left', StringHelper::formatNumber($pSheet->getPageMargins()->getLeft()));
-        $objWriter->writeAttribute('right', StringHelper::formatNumber($pSheet->getPageMargins()->getRight()));
-        $objWriter->writeAttribute('top', StringHelper::formatNumber($pSheet->getPageMargins()->getTop()));
-        $objWriter->writeAttribute('bottom', StringHelper::formatNumber($pSheet->getPageMargins()->getBottom()));
-        $objWriter->writeAttribute('header', StringHelper::formatNumber($pSheet->getPageMargins()->getHeader()));
-        $objWriter->writeAttribute('footer', StringHelper::formatNumber($pSheet->getPageMargins()->getFooter()));
+        $objWriter->writeAttribute('left', StringHelper::formatNumber($worksheet->getPageMargins()->getLeft()));
+        $objWriter->writeAttribute('right', StringHelper::formatNumber($worksheet->getPageMargins()->getRight()));
+        $objWriter->writeAttribute('top', StringHelper::formatNumber($worksheet->getPageMargins()->getTop()));
+        $objWriter->writeAttribute('bottom', StringHelper::formatNumber($worksheet->getPageMargins()->getBottom()));
+        $objWriter->writeAttribute('header', StringHelper::formatNumber($worksheet->getPageMargins()->getHeader()));
+        $objWriter->writeAttribute('footer', StringHelper::formatNumber($worksheet->getPageMargins()->getFooter()));
         $objWriter->endElement();
     }
 
     /**
      * Write AutoFilter.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param PhpspreadsheetWorksheet $pSheet Worksheet
      */
-    private function writeAutoFilter(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet): void
+    private function writeAutoFilter(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
     {
-        $autoFilterRange = $pSheet->getAutoFilter()->getRange();
-        if (!empty($autoFilterRange)) {
-            // autoFilter
-            $objWriter->startElement('autoFilter');
-
-            // Strip any worksheet reference from the filter coordinates
-            $range = Coordinate::splitRange($autoFilterRange);
-            $range = $range[0];
-            //    Strip any worksheet ref
-            [$ws, $range[0]] = PhpspreadsheetWorksheet::extractSheetTitle($range[0], true);
-            $range = implode(':', $range);
-
-            $objWriter->writeAttribute('ref', str_replace('$', '', $range));
-
-            $columns = $pSheet->getAutoFilter()->getColumns();
-            if (count($columns) > 0) {
-                foreach ($columns as $columnID => $column) {
-                    $rules = $column->getRules();
-                    if (count($rules) > 0) {
-                        $objWriter->startElement('filterColumn');
-                        $objWriter->writeAttribute('colId', $pSheet->getAutoFilter()->getColumnOffset($columnID));
-
-                        $objWriter->startElement($column->getFilterType());
-                        if ($column->getJoin() == Column::AUTOFILTER_COLUMN_JOIN_AND) {
-                            $objWriter->writeAttribute('and', 1);
-                        }
+        AutoFilter::writeAutoFilter($objWriter, $worksheet);
+    }
 
-                        foreach ($rules as $rule) {
-                            if (
-                                ($column->getFilterType() === Column::AUTOFILTER_FILTERTYPE_FILTER) &&
-                                ($rule->getOperator() === Rule::AUTOFILTER_COLUMN_RULE_EQUAL) &&
-                                ($rule->getValue() === '')
-                            ) {
-                                //    Filter rule for Blanks
-                                $objWriter->writeAttribute('blank', 1);
-                            } elseif ($rule->getRuleType() === Rule::AUTOFILTER_RULETYPE_DYNAMICFILTER) {
-                                //    Dynamic Filter Rule
-                                $objWriter->writeAttribute('type', $rule->getGrouping());
-                                $val = $column->getAttribute('val');
-                                if ($val !== null) {
-                                    $objWriter->writeAttribute('val', $val);
-                                }
-                                $maxVal = $column->getAttribute('maxVal');
-                                if ($maxVal !== null) {
-                                    $objWriter->writeAttribute('maxVal', $maxVal);
-                                }
-                            } elseif ($rule->getRuleType() === Rule::AUTOFILTER_RULETYPE_TOPTENFILTER) {
-                                //    Top 10 Filter Rule
-                                $objWriter->writeAttribute('val', $rule->getValue());
-                                $objWriter->writeAttribute('percent', (($rule->getOperator() === Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_PERCENT) ? '1' : '0'));
-                                $objWriter->writeAttribute('top', (($rule->getGrouping() === Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP) ? '1' : '0'));
-                            } else {
-                                //    Filter, DateGroupItem or CustomFilter
-                                $objWriter->startElement($rule->getRuleType());
-
-                                if ($rule->getOperator() !== Rule::AUTOFILTER_COLUMN_RULE_EQUAL) {
-                                    $objWriter->writeAttribute('operator', $rule->getOperator());
-                                }
-                                if ($rule->getRuleType() === Rule::AUTOFILTER_RULETYPE_DATEGROUP) {
-                                    // Date Group filters
-                                    foreach ($rule->getValue() as $key => $value) {
-                                        if ($value > '') {
-                                            $objWriter->writeAttribute($key, $value);
-                                        }
-                                    }
-                                    $objWriter->writeAttribute('dateTimeGrouping', $rule->getGrouping());
-                                } else {
-                                    $objWriter->writeAttribute('val', $rule->getValue());
-                                }
-
-                                $objWriter->endElement();
-                            }
-                        }
+    /**
+     * Write Table.
+     */
+    private function writeTable(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
+    {
+        $tableCount = $worksheet->getTableCollection()->count();
+        if ($tableCount === 0) {
+            return;
+        }
 
-                        $objWriter->endElement();
+        $objWriter->startElement('tableParts');
+        $objWriter->writeAttribute('count', (string) $tableCount);
 
-                        $objWriter->endElement();
-                    }
-                }
-            }
+        for ($t = 1; $t <= $tableCount; ++$t) {
+            $objWriter->startElement('tablePart');
+            $objWriter->writeAttribute('r:id', 'rId_table_' . $t);
+            $objWriter->endElement();
+        }
+
+        $objWriter->endElement();
+    }
+
+    /**
+     * Write Background Image.
+     */
+    private function writeBackgroundImage(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
+    {
+        if ($worksheet->getBackgroundImage() !== '') {
+            $objWriter->startElement('picture');
+            $objWriter->writeAttribute('r:id', 'rIdBg');
             $objWriter->endElement();
         }
     }
 
     /**
      * Write PageSetup.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param PhpspreadsheetWorksheet $pSheet Worksheet
      */
-    private function writePageSetup(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet): void
+    private function writePageSetup(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
     {
         // pageSetup
         $objWriter->startElement('pageSetup');
-        $objWriter->writeAttribute('paperSize', $pSheet->getPageSetup()->getPaperSize());
-        $objWriter->writeAttribute('orientation', $pSheet->getPageSetup()->getOrientation());
+        $objWriter->writeAttribute('paperSize', (string) $worksheet->getPageSetup()->getPaperSize());
+        $objWriter->writeAttribute('orientation', $worksheet->getPageSetup()->getOrientation());
 
-        if ($pSheet->getPageSetup()->getScale() !== null) {
-            $objWriter->writeAttribute('scale', $pSheet->getPageSetup()->getScale());
+        if ($worksheet->getPageSetup()->getScale() !== null) {
+            $objWriter->writeAttribute('scale', (string) $worksheet->getPageSetup()->getScale());
         }
-        if ($pSheet->getPageSetup()->getFitToHeight() !== null) {
-            $objWriter->writeAttribute('fitToHeight', $pSheet->getPageSetup()->getFitToHeight());
+        if ($worksheet->getPageSetup()->getFitToHeight() !== null) {
+            $objWriter->writeAttribute('fitToHeight', (string) $worksheet->getPageSetup()->getFitToHeight());
         } else {
             $objWriter->writeAttribute('fitToHeight', '0');
         }
-        if ($pSheet->getPageSetup()->getFitToWidth() !== null) {
-            $objWriter->writeAttribute('fitToWidth', $pSheet->getPageSetup()->getFitToWidth());
+        if ($worksheet->getPageSetup()->getFitToWidth() !== null) {
+            $objWriter->writeAttribute('fitToWidth', (string) $worksheet->getPageSetup()->getFitToWidth());
         } else {
             $objWriter->writeAttribute('fitToWidth', '0');
         }
-        if ($pSheet->getPageSetup()->getFirstPageNumber() !== null) {
-            $objWriter->writeAttribute('firstPageNumber', $pSheet->getPageSetup()->getFirstPageNumber());
+        if (!empty($worksheet->getPageSetup()->getFirstPageNumber())) {
+            $objWriter->writeAttribute('firstPageNumber', (string) $worksheet->getPageSetup()->getFirstPageNumber());
             $objWriter->writeAttribute('useFirstPageNumber', '1');
         }
-        $objWriter->writeAttribute('pageOrder', $pSheet->getPageSetup()->getPageOrder());
+        $objWriter->writeAttribute('pageOrder', $worksheet->getPageSetup()->getPageOrder());
 
-        $getUnparsedLoadedData = $pSheet->getParent()->getUnparsedLoadedData();
-        if (isset($getUnparsedLoadedData['sheets'][$pSheet->getCodeName()]['pageSetupRelId'])) {
-            $objWriter->writeAttribute('r:id', $getUnparsedLoadedData['sheets'][$pSheet->getCodeName()]['pageSetupRelId']);
+        $getUnparsedLoadedData = $worksheet->getParentOrThrow()->getUnparsedLoadedData();
+        if (isset($getUnparsedLoadedData['sheets'][$worksheet->getCodeName()]['pageSetupRelId'])) {
+            $objWriter->writeAttribute('r:id', $getUnparsedLoadedData['sheets'][$worksheet->getCodeName()]['pageSetupRelId']);
         }
 
         $objWriter->endElement();
@@ -1002,59 +1200,68 @@ private function writePageSetup(XMLWriter $objWriter, PhpspreadsheetWorksheet $p
 
     /**
      * Write Header / Footer.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param PhpspreadsheetWorksheet $pSheet Worksheet
      */
-    private function writeHeaderFooter(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet): void
+    private function writeHeaderFooter(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
     {
         // headerFooter
+        $headerFooter = $worksheet->getHeaderFooter();
+        $oddHeader = $headerFooter->getOddHeader();
+        $oddFooter = $headerFooter->getOddFooter();
+        $evenHeader = $headerFooter->getEvenHeader();
+        $evenFooter = $headerFooter->getEvenFooter();
+        $firstHeader = $headerFooter->getFirstHeader();
+        $firstFooter = $headerFooter->getFirstFooter();
+        if ("$oddHeader$oddFooter$evenHeader$evenFooter$firstHeader$firstFooter" === '') {
+            return;
+        }
+
         $objWriter->startElement('headerFooter');
-        $objWriter->writeAttribute('differentOddEven', ($pSheet->getHeaderFooter()->getDifferentOddEven() ? 'true' : 'false'));
-        $objWriter->writeAttribute('differentFirst', ($pSheet->getHeaderFooter()->getDifferentFirst() ? 'true' : 'false'));
-        $objWriter->writeAttribute('scaleWithDoc', ($pSheet->getHeaderFooter()->getScaleWithDocument() ? 'true' : 'false'));
-        $objWriter->writeAttribute('alignWithMargins', ($pSheet->getHeaderFooter()->getAlignWithMargins() ? 'true' : 'false'));
-
-        $objWriter->writeElement('oddHeader', $pSheet->getHeaderFooter()->getOddHeader());
-        $objWriter->writeElement('oddFooter', $pSheet->getHeaderFooter()->getOddFooter());
-        $objWriter->writeElement('evenHeader', $pSheet->getHeaderFooter()->getEvenHeader());
-        $objWriter->writeElement('evenFooter', $pSheet->getHeaderFooter()->getEvenFooter());
-        $objWriter->writeElement('firstHeader', $pSheet->getHeaderFooter()->getFirstHeader());
-        $objWriter->writeElement('firstFooter', $pSheet->getHeaderFooter()->getFirstFooter());
-        $objWriter->endElement();
+        $objWriter->writeAttribute('differentOddEven', ($worksheet->getHeaderFooter()->getDifferentOddEven() ? 'true' : 'false'));
+        $objWriter->writeAttribute('differentFirst', ($worksheet->getHeaderFooter()->getDifferentFirst() ? 'true' : 'false'));
+        $objWriter->writeAttribute('scaleWithDoc', ($worksheet->getHeaderFooter()->getScaleWithDocument() ? 'true' : 'false'));
+        $objWriter->writeAttribute('alignWithMargins', ($worksheet->getHeaderFooter()->getAlignWithMargins() ? 'true' : 'false'));
+
+        self::writeElementIf($objWriter, $oddHeader !== '', 'oddHeader', $oddHeader);
+        self::writeElementIf($objWriter, $oddFooter !== '', 'oddFooter', $oddFooter);
+        self::writeElementIf($objWriter, $evenHeader !== '', 'evenHeader', $evenHeader);
+        self::writeElementIf($objWriter, $evenFooter !== '', 'evenFooter', $evenFooter);
+        self::writeElementIf($objWriter, $firstHeader !== '', 'firstHeader', $firstHeader);
+        self::writeElementIf($objWriter, $firstFooter !== '', 'firstFooter', $firstFooter);
+
+        $objWriter->endElement(); // headerFooter
     }
 
     /**
      * Write Breaks.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param PhpspreadsheetWorksheet $pSheet Worksheet
      */
-    private function writeBreaks(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet): void
+    private function writeBreaks(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
     {
         // Get row and column breaks
         $aRowBreaks = [];
         $aColumnBreaks = [];
-        foreach ($pSheet->getBreaks() as $cell => $breakType) {
-            if ($breakType == PhpspreadsheetWorksheet::BREAK_ROW) {
-                $aRowBreaks[] = $cell;
-            } elseif ($breakType == PhpspreadsheetWorksheet::BREAK_COLUMN) {
-                $aColumnBreaks[] = $cell;
-            }
+        foreach ($worksheet->getRowBreaks() as $cell => $break) {
+            $aRowBreaks[$cell] = $break;
+        }
+        foreach ($worksheet->getColumnBreaks() as $cell => $break) {
+            $aColumnBreaks[$cell] = $break;
         }
 
         // rowBreaks
         if (!empty($aRowBreaks)) {
             $objWriter->startElement('rowBreaks');
-            $objWriter->writeAttribute('count', count($aRowBreaks));
-            $objWriter->writeAttribute('manualBreakCount', count($aRowBreaks));
+            $objWriter->writeAttribute('count', (string) count($aRowBreaks));
+            $objWriter->writeAttribute('manualBreakCount', (string) count($aRowBreaks));
 
-            foreach ($aRowBreaks as $cell) {
+            foreach ($aRowBreaks as $cell => $break) {
                 $coords = Coordinate::coordinateFromString($cell);
 
                 $objWriter->startElement('brk');
                 $objWriter->writeAttribute('id', $coords[1]);
                 $objWriter->writeAttribute('man', '1');
+                $rowBreakMax = $break->getMaxColOrRow();
+                if ($rowBreakMax >= 0) {
+                    $objWriter->writeAttribute('max', "$rowBreakMax");
+                }
                 $objWriter->endElement();
             }
 
@@ -1064,14 +1271,14 @@ private function writeBreaks(XMLWriter $objWriter, PhpspreadsheetWorksheet $pShe
         // Second, write column breaks
         if (!empty($aColumnBreaks)) {
             $objWriter->startElement('colBreaks');
-            $objWriter->writeAttribute('count', count($aColumnBreaks));
-            $objWriter->writeAttribute('manualBreakCount', count($aColumnBreaks));
+            $objWriter->writeAttribute('count', (string) count($aColumnBreaks));
+            $objWriter->writeAttribute('manualBreakCount', (string) count($aColumnBreaks));
 
-            foreach ($aColumnBreaks as $cell) {
-                $coords = Coordinate::coordinateFromString($cell);
+            foreach ($aColumnBreaks as $cell => $break) {
+                $coords = Coordinate::indexesFromString($cell);
 
                 $objWriter->startElement('brk');
-                $objWriter->writeAttribute('id', Coordinate::columnIndexFromString($coords[0]) - 1);
+                $objWriter->writeAttribute('id', (string) ((int) $coords[0] - 1));
                 $objWriter->writeAttribute('man', '1');
                 $objWriter->endElement();
             }
@@ -1083,97 +1290,121 @@ private function writeBreaks(XMLWriter $objWriter, PhpspreadsheetWorksheet $pShe
     /**
      * Write SheetData.
      *
-     * @param XMLWriter $objWriter XML Writer
-     * @param PhpspreadsheetWorksheet $pSheet Worksheet
-     * @param string[] $pStringTable String table
+     * @param string[] $stringTable String table
      */
-    private function writeSheetData(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet, array $pStringTable): void
+    private function writeSheetData(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet, array $stringTable): void
     {
         // Flipped stringtable, for faster index searching
-        $aFlippedStringTable = $this->getParentWriter()->getWriterPartstringtable()->flipStringTable($pStringTable);
+        $aFlippedStringTable = $this->getParentWriter()->getWriterPartstringtable()->flipStringTable($stringTable);
 
         // sheetData
         $objWriter->startElement('sheetData');
 
         // Get column count
-        $colCount = Coordinate::columnIndexFromString($pSheet->getHighestColumn());
+        $colCount = Coordinate::columnIndexFromString($worksheet->getHighestColumn());
 
         // Highest row number
-        $highestRow = $pSheet->getHighestRow();
+        $highestRow = $worksheet->getHighestRow();
 
-        // Loop through cells
+        // Loop through cells building a comma-separated list of the columns in each row
+        // This is a trade-off between the memory usage that is required for a full array of columns,
+        //      and execution speed
+        /** @var array<int, string> $cellsByRow */
         $cellsByRow = [];
-        foreach ($pSheet->getCoordinates() as $coordinate) {
-            $cellAddress = Coordinate::coordinateFromString($coordinate);
-            $cellsByRow[$cellAddress[1]][] = $coordinate;
+        foreach ($worksheet->getCoordinates() as $coordinate) {
+            [$column, $row] = Coordinate::coordinateFromString($coordinate);
+            $cellsByRow[$row] = $cellsByRow[$row] ?? '';
+            $cellsByRow[$row] .= "{$column},";
         }
 
         $currentRow = 0;
+        $emptyDimension = new RowDimension();
         while ($currentRow++ < $highestRow) {
-            // Get row dimension
-            $rowDimension = $pSheet->getRowDimension($currentRow);
-
-            // Write current row?
-            $writeCurrentRow = isset($cellsByRow[$currentRow]) || $rowDimension->getRowHeight() >= 0 || $rowDimension->getVisible() == false || $rowDimension->getCollapsed() == true || $rowDimension->getOutlineLevel() > 0 || $rowDimension->getXfIndex() !== null;
-
-            if ($writeCurrentRow) {
-                // Start a new row
-                $objWriter->startElement('row');
-                $objWriter->writeAttribute('r', $currentRow);
-                $objWriter->writeAttribute('spans', '1:' . $colCount);
-
-                // Row dimensions
-                if ($rowDimension->getRowHeight() >= 0) {
-                    $objWriter->writeAttribute('customHeight', '1');
-                    $objWriter->writeAttribute('ht', StringHelper::formatNumber($rowDimension->getRowHeight()));
-                }
+            $isRowSet = isset($cellsByRow[$currentRow]);
+            if ($isRowSet || $worksheet->rowDimensionExists($currentRow)) {
+                // Get row dimension
+                $rowDimension = $worksheet->rowDimensionExists($currentRow) ? $worksheet->getRowDimension($currentRow) : $emptyDimension;
+
+                // Write current row?
+                $writeCurrentRow = $isRowSet || $rowDimension->getRowHeight() >= 0 || $rowDimension->getVisible() === false || $rowDimension->getCollapsed() === true || $rowDimension->getOutlineLevel() > 0 || $rowDimension->getXfIndex() !== null;
+
+                if ($writeCurrentRow) {
+                    // Start a new row
+                    $objWriter->startElement('row');
+                    $objWriter->writeAttribute('r', "$currentRow");
+                    $objWriter->writeAttribute('spans', '1:' . $colCount);
+
+                    // Row dimensions
+                    if ($rowDimension->getRowHeight() >= 0) {
+                        $objWriter->writeAttribute('customHeight', '1');
+                        $objWriter->writeAttribute('ht', StringHelper::formatNumber($rowDimension->getRowHeight()));
+                    }
 
-                // Row visibility
-                if (!$rowDimension->getVisible() === true) {
-                    $objWriter->writeAttribute('hidden', 'true');
-                }
+                    // Row visibility
+                    if (!$rowDimension->getVisible() === true) {
+                        $objWriter->writeAttribute('hidden', 'true');
+                    }
 
-                // Collapsed
-                if ($rowDimension->getCollapsed() === true) {
-                    $objWriter->writeAttribute('collapsed', 'true');
-                }
+                    // Collapsed
+                    if ($rowDimension->getCollapsed() === true) {
+                        $objWriter->writeAttribute('collapsed', 'true');
+                    }
 
-                // Outline level
-                if ($rowDimension->getOutlineLevel() > 0) {
-                    $objWriter->writeAttribute('outlineLevel', $rowDimension->getOutlineLevel());
-                }
+                    // Outline level
+                    if ($rowDimension->getOutlineLevel() > 0) {
+                        $objWriter->writeAttribute('outlineLevel', (string) $rowDimension->getOutlineLevel());
+                    }
 
-                // Style
-                if ($rowDimension->getXfIndex() !== null) {
-                    $objWriter->writeAttribute('s', $rowDimension->getXfIndex());
-                    $objWriter->writeAttribute('customFormat', '1');
-                }
+                    // Style
+                    if ($rowDimension->getXfIndex() !== null) {
+                        $objWriter->writeAttribute('s', (string) $rowDimension->getXfIndex());
+                        $objWriter->writeAttribute('customFormat', '1');
+                    }
 
-                // Write cells
-                if (isset($cellsByRow[$currentRow])) {
-                    foreach ($cellsByRow[$currentRow] as $cellAddress) {
-                        // Write cell
-                        $this->writeCell($objWriter, $pSheet, $cellAddress, $aFlippedStringTable);
+                    // Write cells
+                    if (isset($cellsByRow[$currentRow])) {
+                        // We have a comma-separated list of column names (with a trailing entry); split to an array
+                        $columnsInRow = explode(',', $cellsByRow[$currentRow]);
+                        array_pop($columnsInRow);
+                        foreach ($columnsInRow as $column) {
+                            // Write cell
+                            $coord = "$column$currentRow";
+                            if ($worksheet->getCell($coord)->getIgnoredErrors()->getNumberStoredAsText()) {
+                                $this->numberStoredAsText .= " $coord";
+                            }
+                            if ($worksheet->getCell($coord)->getIgnoredErrors()->getFormula()) {
+                                $this->formula .= " $coord";
+                            }
+                            if ($worksheet->getCell($coord)->getIgnoredErrors()->getTwoDigitTextYear()) {
+                                $this->twoDigitTextYear .= " $coord";
+                            }
+                            if ($worksheet->getCell($coord)->getIgnoredErrors()->getEvalError()) {
+                                $this->evalError .= " $coord";
+                            }
+                            $this->writeCell($objWriter, $worksheet, $coord, $aFlippedStringTable);
+                        }
                     }
-                }
 
-                // End row
-                $objWriter->endElement();
+                    // End row
+                    $objWriter->endElement();
+                }
             }
         }
 
         $objWriter->endElement();
     }
 
-    /**
-     * @param RichText|string $cellValue
-     */
-    private function writeCellInlineStr(XMLWriter $objWriter, string $mappedType, $cellValue): void
+    private function writeCellInlineStr(XMLWriter $objWriter, string $mappedType, RichText|string $cellValue): void
     {
         $objWriter->writeAttribute('t', $mappedType);
         if (!$cellValue instanceof RichText) {
-            $objWriter->writeElement('t', StringHelper::controlCharacterPHP2OOXML(htmlspecialchars($cellValue)));
-        } elseif ($cellValue instanceof RichText) {
+            $objWriter->startElement('is');
+            $objWriter->writeElement(
+                't',
+                StringHelper::controlCharacterPHP2OOXML(htmlspecialchars($cellValue, Settings::htmlEntityFlags()))
+            );
+            $objWriter->endElement();
+        } else {
             $objWriter->startElement('is');
             $this->getParentWriter()->getWriterPartstringtable()->writeRichText($objWriter, $cellValue);
             $objWriter->endElement();
@@ -1181,33 +1412,29 @@ private function writeCellInlineStr(XMLWriter $objWriter, string $mappedType, $c
     }
 
     /**
-     * @param RichText|string $cellValue
-     * @param string[] $pFlippedStringTable
+     * @param string[] $flippedStringTable
      */
-    private function writeCellString(XMLWriter $objWriter, string $mappedType, $cellValue, array $pFlippedStringTable): void
+    private function writeCellString(XMLWriter $objWriter, string $mappedType, RichText|string $cellValue, array $flippedStringTable): void
     {
         $objWriter->writeAttribute('t', $mappedType);
         if (!$cellValue instanceof RichText) {
-            self::writeElementIf($objWriter, isset($pFlippedStringTable[$cellValue]), 'v', $pFlippedStringTable[$cellValue] ?? '');
+            self::writeElementIf($objWriter, isset($flippedStringTable[$cellValue]), 'v', $flippedStringTable[$cellValue] ?? '');
         } else {
-            $objWriter->writeElement('v', $pFlippedStringTable[$cellValue->getHashCode()]);
+            $objWriter->writeElement('v', $flippedStringTable[$cellValue->getHashCode()]);
         }
     }
 
-    /**
-     * @param float|int $cellValue
-     */
-    private function writeCellNumeric(XMLWriter $objWriter, $cellValue): void
+    private function writeCellNumeric(XMLWriter $objWriter, float|int $cellValue): void
     {
         //force a decimal to be written if the type is float
         if (is_float($cellValue)) {
             // force point as decimal separator in case current locale uses comma
             $cellValue = str_replace(',', '.', (string) $cellValue);
-            if (strpos($cellValue, '.') === false) {
+            if (!str_contains($cellValue, '.')) {
                 $cellValue = $cellValue . '.0';
             }
         }
-        $objWriter->writeElement('v', $cellValue);
+        $objWriter->writeElement('v', "$cellValue");
     }
 
     private function writeCellBoolean(XMLWriter $objWriter, string $mappedType, bool $cellValue): void
@@ -1219,116 +1446,197 @@ private function writeCellBoolean(XMLWriter $objWriter, string $mappedType, bool
     private function writeCellError(XMLWriter $objWriter, string $mappedType, string $cellValue, string $formulaerr = '#NULL!'): void
     {
         $objWriter->writeAttribute('t', $mappedType);
-        $cellIsFormula = substr($cellValue, 0, 1) === '=';
-        self::writeElementIf($objWriter, $cellIsFormula, 'f', Xlfn::addXlfnStripEquals($cellValue));
+        $cellIsFormula = str_starts_with($cellValue, '=');
+        self::writeElementIf($objWriter, $cellIsFormula, 'f', FunctionPrefix::addFunctionPrefixStripEquals($cellValue));
         $objWriter->writeElement('v', $cellIsFormula ? $formulaerr : $cellValue);
     }
 
-    private function writeCellFormula(XMLWriter $objWriter, string $cellValue, Cell $pCell): void
+    private function writeCellFormula(XMLWriter $objWriter, string $cellValue, Cell $cell): void
     {
-        $calculatedValue = $this->getParentWriter()->getPreCalculateFormulas() ? $pCell->getCalculatedValue() : $cellValue;
-        if (is_string($calculatedValue)) {
-            if (\PhpOffice\PhpSpreadsheet\Calculation\Functions::isError($calculatedValue)) {
-                $this->writeCellError($objWriter, 'e', $cellValue, $calculatedValue);
+        $attributes = $cell->getFormulaAttributes() ?? [];
+        $coordinate = $cell->getCoordinate();
+        $calculatedValue = $this->getParentWriter()->getPreCalculateFormulas() ? $cell->getCalculatedValue() : $cellValue;
+        if ($calculatedValue === ExcelError::SPILL()) {
+            $objWriter->writeAttribute('t', 'e');
+            //$objWriter->writeAttribute('cm', '1'); // already added
+            $objWriter->writeAttribute('vm', '1');
+            $objWriter->startElement('f');
+            $objWriter->writeAttribute('t', 'array');
+            $objWriter->writeAttribute('aca', '1');
+            $objWriter->writeAttribute('ref', $coordinate);
+            $objWriter->writeAttribute('ca', '1');
+            $objWriter->text(FunctionPrefix::addFunctionPrefixStripEquals($cellValue));
+            $objWriter->endElement(); // f
+            $objWriter->writeElement('v', ExcelError::VALUE()); // note #VALUE! in xml even though error is #SPILL!
+
+            return;
+        }
+        $calculatedValueString = $this->getParentWriter()->getPreCalculateFormulas() ? $cell->getCalculatedValueString() : $cellValue;
+        $result = $calculatedValue;
+        while (is_array($result)) {
+            $result = array_shift($result);
+        }
+        if (is_string($result)) {
+            if (ErrorValue::isError($result)) {
+                $this->writeCellError($objWriter, 'e', $cellValue, $result);
 
                 return;
             }
             $objWriter->writeAttribute('t', 'str');
-        } elseif (is_bool($calculatedValue)) {
+            $result = $calculatedValueString = StringHelper::controlCharacterPHP2OOXML($result);
+            if (is_string($calculatedValue)) {
+                $calculatedValue = $calculatedValueString;
+            }
+        } elseif (is_bool($result)) {
             $objWriter->writeAttribute('t', 'b');
-            $calculatedValue = (int) $calculatedValue;
-        }
-        // array values are not yet supported
-        //$attributes = $pCell->getFormulaAttributes();
-        //if (($attributes['t'] ?? null) === 'array') {
-        //    $objWriter->startElement('f');
-        //    $objWriter->writeAttribute('t', 'array');
-        //    $objWriter->writeAttribute('ref', $pCellAddress);
-        //    $objWriter->writeAttribute('aca', '1');
-        //    $objWriter->writeAttribute('ca', '1');
-        //    $objWriter->text(substr($cellValue, 1));
-        //    $objWriter->endElement();
-        //} else {
-        //    $objWriter->writeElement('f', Xlfn::addXlfnStripEquals($cellValue));
-        //}
-        $objWriter->writeElement('f', Xlfn::addXlfnStripEquals($cellValue));
-        self::writeElementIf(
-            $objWriter,
-            $this->getParentWriter()->getOffice2003Compatibility() === false,
-            'v',
-            ($this->getParentWriter()->getPreCalculateFormulas() && !is_array($calculatedValue) && substr($calculatedValue, 0, 1) !== '#')
-                ? StringHelper::formatNumber($calculatedValue) : '0'
-        );
+            if (is_bool($calculatedValue)) {
+                $calculatedValue = $result;
+            }
+            $result = (int) $result;
+            $calculatedValueString = (string) $result;
+        }
+
+        if (isset($attributes['ref'])) {
+            $ref = $this->parseRef($coordinate, $attributes['ref']);
+        } else {
+            $ref = $coordinate;
+        }
+        if (is_array($calculatedValue)) {
+            $attributes['t'] = 'array';
+        }
+        if (($attributes['t'] ?? null) === 'array') {
+            $objWriter->startElement('f');
+            $objWriter->writeAttribute('t', 'array');
+            $objWriter->writeAttribute('ref', $ref);
+            $objWriter->writeAttribute('aca', '1');
+            $objWriter->writeAttribute('ca', '1');
+            $objWriter->text(FunctionPrefix::addFunctionPrefixStripEquals($cellValue));
+            $objWriter->endElement();
+            if (
+                is_scalar($result)
+                && $this->getParentWriter()->getOffice2003Compatibility() === false
+                && $this->getParentWriter()->getPreCalculateFormulas()
+            ) {
+                $objWriter->writeElement('v', (string) $result);
+            }
+        } else {
+            $objWriter->writeElement('f', FunctionPrefix::addFunctionPrefixStripEquals($cellValue));
+            self::writeElementIf(
+                $objWriter,
+                $this->getParentWriter()->getOffice2003Compatibility() === false
+                && $this->getParentWriter()->getPreCalculateFormulas()
+                && $calculatedValue !== null,
+                'v',
+                (!is_array($calculatedValue) && !str_starts_with($calculatedValueString, '#'))
+                    ? StringHelper::formatNumber($calculatedValueString) : '0'
+            );
+        }
+    }
+
+    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) {
+            return $ref;
+        }
+        if (!isset($matches[3])) { // single cell, not range
+            return $coordinate;
+        }
+        $minRow = (int) $matches[2];
+        $maxRow = (int) $matches[5];
+        $rows = $maxRow - $minRow + 1;
+        $minCol = Coordinate::columnIndexFromString($matches[1]);
+        $maxCol = Coordinate::columnIndexFromString($matches[4]);
+        $cols = $maxCol - $minCol + 1;
+        $firstCellArray = Coordinate::indexesFromString($coordinate);
+        $lastRow = $firstCellArray[1] + $rows - 1;
+        $lastColumn = $firstCellArray[0] + $cols - 1;
+        $lastColumnString = Coordinate::stringFromColumnIndex($lastColumn);
+
+        return "$coordinate:$lastColumnString$lastRow";
     }
 
     /**
      * Write Cell.
      *
-     * @param XMLWriter $objWriter XML Writer
-     * @param PhpspreadsheetWorksheet $pSheet Worksheet
-     * @param string $pCellAddress Cell Address
-     * @param string[] $pFlippedStringTable String table (flipped), for faster index searching
+     * @param string $cellAddress Cell Address
+     * @param string[] $flippedStringTable String table (flipped), for faster index searching
      */
-    private function writeCell(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet, string $pCellAddress, array $pFlippedStringTable): void
+    private function writeCell(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet, string $cellAddress, array $flippedStringTable): void
     {
         // Cell
-        $pCell = $pSheet->getCell($pCellAddress);
+        $pCell = $worksheet->getCell($cellAddress);
+        $xfi = $pCell->getXfIndex();
+        $cellValue = $pCell->getValue();
+        $cellValueString = $pCell->getValueString();
+        $writeValue = $cellValue !== '' && $cellValue !== null;
+        if (empty($xfi) && !$writeValue) {
+            return;
+        }
         $objWriter->startElement('c');
-        $objWriter->writeAttribute('r', $pCellAddress);
+        $objWriter->writeAttribute('r', $cellAddress);
+        $mappedType = $pCell->getDataType();
+        if ($mappedType === DataType::TYPE_FORMULA) {
+            if ($this->useDynamicArrays) {
+                $tempCalc = $pCell->getCalculatedValue();
+                if (is_array($tempCalc)) {
+                    $objWriter->writeAttribute('cm', '1');
+                }
+            }
+        }
 
         // Sheet styles
-        $xfi = $pCell->getXfIndex();
-        self::writeAttributeIf($objWriter, $xfi, 's', $xfi);
+        if ($xfi) {
+            $objWriter->writeAttribute('s', "$xfi");
+        } elseif ($this->explicitStyle0) {
+            $objWriter->writeAttribute('s', '0');
+        }
 
         // If cell value is supplied, write cell value
-        $cellValue = $pCell->getValue();
-        if (is_object($cellValue) || $cellValue !== '') {
-            // Map type
-            $mappedType = $pCell->getDataType();
-
+        if ($writeValue) {
             // Write data depending on its type
             switch (strtolower($mappedType)) {
                 case 'inlinestr':    // Inline string
-                    $this->writeCellInlineStr($objWriter, $mappedType, $cellValue);
+                    /** @var RichText|string */
+                    $richText = $cellValue;
+                    $this->writeCellInlineStr($objWriter, $mappedType, $richText);
 
                     break;
                 case 's':            // String
-                    $this->writeCellString($objWriter, $mappedType, $cellValue, $pFlippedStringTable);
+                    $this->writeCellString($objWriter, $mappedType, ($cellValue instanceof RichText) ? $cellValue : $cellValueString, $flippedStringTable);
 
                     break;
                 case 'f':            // Formula
-                    $this->writeCellFormula($objWriter, $cellValue, $pCell);
+                    $this->writeCellFormula($objWriter, $cellValueString, $pCell);
 
                     break;
                 case 'n':            // Numeric
-                    $this->writeCellNumeric($objWriter, $cellValue);
+                    $cellValueNumeric = is_numeric($cellValue) ? ($cellValue + 0) : 0;
+                    $this->writeCellNumeric($objWriter, $cellValueNumeric);
 
                     break;
                 case 'b':            // Boolean
-                    $this->writeCellBoolean($objWriter, $mappedType, $cellValue);
+                    $this->writeCellBoolean($objWriter, $mappedType, (bool) $cellValue);
 
                     break;
                 case 'e':            // Error
-                    $this->writeCellError($objWriter, $mappedType, $cellValue);
+                    $this->writeCellError($objWriter, $mappedType, $cellValueString);
             }
         }
 
-        $objWriter->endElement();
+        $objWriter->endElement(); // c
     }
 
     /**
      * Write Drawings.
      *
-     * @param XMLWriter $objWriter XML Writer
-     * @param PhpspreadsheetWorksheet $pSheet Worksheet
      * @param bool $includeCharts Flag indicating if we should include drawing details for charts
      */
-    private function writeDrawings(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet, $includeCharts = false): void
+    private function writeDrawings(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet, bool $includeCharts = false): void
     {
-        $unparsedLoadedData = $pSheet->getParent()->getUnparsedLoadedData();
-        $hasUnparsedDrawing = isset($unparsedLoadedData['sheets'][$pSheet->getCodeName()]['drawingOriginalIds']);
-        $chartCount = ($includeCharts) ? $pSheet->getChartCollection()->count() : 0;
-        if ($chartCount == 0 && $pSheet->getDrawingCollection()->count() == 0 && !$hasUnparsedDrawing) {
+        $unparsedLoadedData = $worksheet->getParentOrThrow()->getUnparsedLoadedData();
+        $hasUnparsedDrawing = isset($unparsedLoadedData['sheets'][$worksheet->getCodeName()]['drawingOriginalIds']);
+        $chartCount = ($includeCharts) ? $worksheet->getChartCollection()->count() : 0;
+        if ($chartCount == 0 && $worksheet->getDrawingCollection()->count() == 0 && !$hasUnparsedDrawing) {
             return;
         }
 
@@ -1336,8 +1644,8 @@ private function writeDrawings(XMLWriter $objWriter, PhpspreadsheetWorksheet $pS
         $objWriter->startElement('drawing');
 
         $rId = 'rId1';
-        if (isset($unparsedLoadedData['sheets'][$pSheet->getCodeName()]['drawingOriginalIds'])) {
-            $drawingOriginalIds = $unparsedLoadedData['sheets'][$pSheet->getCodeName()]['drawingOriginalIds'];
+        if (isset($unparsedLoadedData['sheets'][$worksheet->getCodeName()]['drawingOriginalIds'])) {
+            $drawingOriginalIds = $unparsedLoadedData['sheets'][$worksheet->getCodeName()]['drawingOriginalIds'];
             // take first. In future can be overriten
             // (! synchronize with \PhpOffice\PhpSpreadsheet\Writer\Xlsx\Rels::writeWorksheetRelationships)
             $rId = reset($drawingOriginalIds);
@@ -1349,14 +1657,12 @@ private function writeDrawings(XMLWriter $objWriter, PhpspreadsheetWorksheet $pS
 
     /**
      * Write LegacyDrawing.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param PhpspreadsheetWorksheet $pSheet Worksheet
      */
-    private function writeLegacyDrawing(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet): void
+    private function writeLegacyDrawing(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
     {
         // If sheet contains comments, add the relationships
-        if (count($pSheet->getComments()) > 0) {
+        $unparsedLoadedData = $worksheet->getParentOrThrow()->getUnparsedLoadedData();
+        if (count($worksheet->getComments()) > 0 || isset($unparsedLoadedData['sheets'][$worksheet->getCodeName()]['legacyDrawing'])) {
             $objWriter->startElement('legacyDrawing');
             $objWriter->writeAttribute('r:id', 'rId_comments_vml1');
             $objWriter->endElement();
@@ -1365,27 +1671,24 @@ private function writeLegacyDrawing(XMLWriter $objWriter, PhpspreadsheetWorkshee
 
     /**
      * Write LegacyDrawingHF.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param PhpspreadsheetWorksheet $pSheet Worksheet
      */
-    private function writeLegacyDrawingHF(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet): void
+    private function writeLegacyDrawingHF(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
     {
         // If sheet contains images, add the relationships
-        if (count($pSheet->getHeaderFooter()->getImages()) > 0) {
+        if (count($worksheet->getHeaderFooter()->getImages()) > 0) {
             $objWriter->startElement('legacyDrawingHF');
             $objWriter->writeAttribute('r:id', 'rId_headerfooter_vml1');
             $objWriter->endElement();
         }
     }
 
-    private function writeAlternateContent(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet): void
+    private function writeAlternateContent(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
     {
-        if (empty($pSheet->getParent()->getUnparsedLoadedData()['sheets'][$pSheet->getCodeName()]['AlternateContents'])) {
+        if (empty($worksheet->getParentOrThrow()->getUnparsedLoadedData()['sheets'][$worksheet->getCodeName()]['AlternateContents'])) {
             return;
         }
 
-        foreach ($pSheet->getParent()->getUnparsedLoadedData()['sheets'][$pSheet->getCodeName()]['AlternateContents'] as $alternateContent) {
+        foreach ($worksheet->getParentOrThrow()->getUnparsedLoadedData()['sheets'][$worksheet->getCodeName()]['AlternateContents'] as $alternateContent) {
             $objWriter->writeRaw($alternateContent);
         }
     }
@@ -1396,10 +1699,10 @@ private function writeAlternateContent(XMLWriter $objWriter, PhpspreadsheetWorks
      *
      * @url https://docs.microsoft.com/en-us/openspecs/office_standards/ms-xlsx/07d607af-5618-4ca2-b683-6a78dc0d9627
      */
-    private function writeExtLst(XMLWriter $objWriter, PhpspreadsheetWorksheet $pSheet): void
+    private function writeExtLst(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksheet): void
     {
         $conditionalFormattingRuleExtList = [];
-        foreach ($pSheet->getConditionalStylesCollection() as $cellCoordinate => $conditionalStyles) {
+        foreach ($worksheet->getConditionalStylesCollection() as $cellCoordinate => $conditionalStyles) {
             /** @var Conditional $conditional */
             foreach ($conditionalStyles as $conditional) {
                 $dataBar = $conditional->getDataBar();
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/WriterPart.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/WriterPart.php
index a9137dfc85..7715a299b1 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/WriterPart.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/Xlsx/WriterPart.php
@@ -8,17 +8,13 @@ abstract class WriterPart
 {
     /**
      * Parent Xlsx object.
-     *
-     * @var Xlsx
      */
-    private $parentWriter;
+    private Xlsx $parentWriter;
 
     /**
      * Get parent Xlsx object.
-     *
-     * @return Xlsx
      */
-    public function getParentWriter()
+    public function getParentWriter(): Xlsx
     {
         return $this->parentWriter;
     }
@@ -26,8 +22,8 @@ public function getParentWriter()
     /**
      * Set parent Xlsx object.
      */
-    public function __construct(Xlsx $pWriter)
+    public function __construct(Xlsx $writer)
     {
-        $this->parentWriter = $pWriter;
+        $this->parentWriter = $writer;
     }
 }
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/ZipStream0.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/ZipStream0.php
new file mode 100644
index 0000000000..886731ca9e
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/ZipStream0.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer;
+
+use ZipStream\Option\Archive;
+use ZipStream\ZipStream;
+
+class ZipStream0
+{
+    /**
+     * @param resource $fileHandle
+     */
+    public static function newZipStream($fileHandle): ZipStream
+    {
+        return class_exists(Archive::class) ? ZipStream2::newZipStream($fileHandle) : ZipStream3::newZipStream($fileHandle);
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/ZipStream2.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/ZipStream2.php
new file mode 100644
index 0000000000..ed21a7e399
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/ZipStream2.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer;
+
+use ZipStream\Option\Archive;
+use ZipStream\ZipStream;
+
+class ZipStream2
+{
+    /**
+     * @param resource $fileHandle
+     */
+    public static function newZipStream($fileHandle): ZipStream
+    {
+        $options = new Archive();
+        $options->setEnableZip64(false);
+        $options->setOutputStream($fileHandle);
+
+        return new ZipStream(null, $options);
+    }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/ZipStream3.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/ZipStream3.php
new file mode 100644
index 0000000000..96e13ecf0e
--- /dev/null
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/ZipStream3.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer;
+
+use ZipStream\ZipStream;
+
+class ZipStream3
+{
+    /**
+     * @param resource $fileHandle
+     */
+    public static function newZipStream($fileHandle): ZipStream
+    {
+        return new ZipStream(
+            enableZip64: false,
+            outputStream: $fileHandle,
+            sendHttpHeaders: false,
+            defaultEnableZeroHeader: false,
+        );
+    }
+}
diff --git a/vendor/phpoffice/phpword/.github/ISSUE_TEMPLATE/bug_report.md b/vendor/phpoffice/phpword/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index fcb3a65db1..0000000000
--- a/vendor/phpoffice/phpword/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,38 +0,0 @@
----
-name: Bug report
-about: Create a report to help improve PHPWord
-labels: Bug Report
-
----
-
-### Describe the Bug
-
-A clear and concise description of what the bug is.
-
-### Steps to Reproduce
-
-Please provide a code sample that reproduces the issue.
-
-```php
-<?php
-require __DIR__ . '/vendor/autoload.php';
-
-$phpWord = new \PhpOffice\PhpWord\PhpWord();
-$section = $phpWord->addSection();
-$section->...
-```
-
-### Expected Behavior
-
-A clear and concise description of what you expected to happen.
-
-### Current Behavior
-
-What is the current behavior?
-
-### Context
-
-Please fill in your environment information:
-
-- PHP Version:
-- PHPWord Version:
diff --git a/vendor/phpoffice/phpword/.github/ISSUE_TEMPLATE/feature_request.md b/vendor/phpoffice/phpword/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 171e8378e1..0000000000
--- a/vendor/phpoffice/phpword/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-labels: Change Request
-
----
-
-### Is your feature request related to a problem? Please describe.
-
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-### Describe the solution you'd like
-
-A clear and concise description of what you want to happen.
-
-### Describe alternatives you've considered
-
-A clear and concise description of any alternative solutions or features you've considered.
-
-### Additional context
-
-Add any other context or screenshots about the feature request here.
diff --git a/vendor/phpoffice/phpword/.github/ISSUE_TEMPLATE/how-to-use.md b/vendor/phpoffice/phpword/.github/ISSUE_TEMPLATE/how-to-use.md
deleted file mode 100644
index 0fef996b19..0000000000
--- a/vendor/phpoffice/phpword/.github/ISSUE_TEMPLATE/how-to-use.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-name: How to Use PHPWord
-about: Find out how to use PHPWord
-labels: WontFix
-
----
-
-***Please do not use the issue tracker to ask how to use PHPWord.***
-
-Documentation is available on [Read the Docs](https://phpword.readthedocs.io/en/latest/).
-
-Sample code is in the [`/samples/` directory](https://github.com/PHPOffice/PHPWord/tree/develop/samples).
-
-Usage questions belong on [Stack Overflow](https://stackoverflow.com/questions/tagged/phpword).
diff --git a/vendor/phpoffice/phpword/.github/PULL_REQUEST_TEMPLATE.md b/vendor/phpoffice/phpword/.github/PULL_REQUEST_TEMPLATE.md
deleted file mode 100644
index 5430a996ec..0000000000
--- a/vendor/phpoffice/phpword/.github/PULL_REQUEST_TEMPLATE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-### Description
-
-Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context.
-
-Fixes # (issue)
-
-### Checklist:
-
-- [ ] I have run `composer run-script check --timeout=0` and no errors were reported
-- [ ] The new code is covered by unit tests (check build/coverage for coverage report)
-- [ ] I have updated the documentation to describe the changes
diff --git a/vendor/phpoffice/phpword/.github/dependabot.yml b/vendor/phpoffice/phpword/.github/dependabot.yml
deleted file mode 100644
index 68ac78ad4c..0000000000
--- a/vendor/phpoffice/phpword/.github/dependabot.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-version: 2
-updates:
-- package-ecosystem: composer
-  directory: "/"
-  schedule:
-    interval: monthly
-    time: "11:00"
-  open-pull-requests-limit: 10
diff --git a/vendor/phpoffice/phpword/.github/support.yml b/vendor/phpoffice/phpword/.github/support.yml
deleted file mode 100644
index c1b039ccac..0000000000
--- a/vendor/phpoffice/phpword/.github/support.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-# Label used to mark issues as support requests
-supportLabel: Question
-# Comment to post on issues marked as support requests. Add a link
-# to a support page, or set to `false` to disable
-supportComment: >
-  This looks like a support question. Please ask your support questions on
-  [StackOverflow](http://stackoverflow.com/questions/tagged/phpword),
-  or [Gitter](https://gitter.im/PHPOffice/PHPWord).
-
-  Thank you for your contributions.
-
-# Whether to close issues marked as support requests
-close: true
-# Whether to lock issues marked as support requests
-lock: false
diff --git a/vendor/phpoffice/phpword/.github/workflows/ci.yml b/vendor/phpoffice/phpword/.github/workflows/ci.yml
deleted file mode 100644
index d8bc57c2a1..0000000000
--- a/vendor/phpoffice/phpword/.github/workflows/ci.yml
+++ /dev/null
@@ -1,170 +0,0 @@
-name: CI
-on:
-  - push
-  - pull_request
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        php-version:
-          - '7.2'
-          - "7.3"
-          - "7.4"
-          - "8.0"
-
-    name: PHP ${{ matrix.php-version }}
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-version }}
-          extensions: ctype, dom, gd, iconv, fileinfo, libxml, mbstring, simplexml, xml, xmlreader, xmlwriter, zip, zlib
-          coverage: none
-
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-      - name: Cache composer dependencies
-        uses: actions/cache@v2
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: ${{ runner.os }}-composer-
-
-      - name: Update PHPUnit version for PHP 8
-        id: composer-lock
-        if: "startsWith(matrix.php-version, '8.')"
-        run: |
-          rm -f composer.lock
-          echo "::set-output name=flags::--ignore-platform-reqs"
-          composer remove phpunit/phpunit --dev --no-update --no-interaction
-          composer require phpunit/phpunit ^8.0 --dev --no-update
-
-      - name: Install dependencies
-        run: composer update --no-progress --prefer-dist --optimize-autoloader ${{ steps.composer-lock.outputs.flags }}
-
-      - name: Update code to make PHPUnit 8 compatible
-        if: "startsWith(matrix.php-version, '8.')"
-        run: |
-          find ./tests/ -name "*.php" -type f -exec sed -i -e 's/function setUpBeforeClass()$/function setUpBeforeClass(): void/' {} \;
-          find ./tests/ -name "*.php" -type f -exec sed -i -e 's/function tearDownAfterClass()$/function tearDownAfterClass(): void/' {} \;
-          find ./tests/ -name "*.php" -type f -exec sed -i -e 's/function setUp()$/function setUp(): void/' {} \;
-          find ./tests/ -name "*.php" -type f -exec sed -i -e 's/function tearDown()$/function tearDown(): void/' {} \;
-          find ./tests/ -name "*.php" -type f -exec sed -i -e 's/->assertContains(/->assertStringContainsString(/' {} \;
-          find ./tests/ -name "*.php" -type f -exec sed -i -e 's/->assertNotContains(/->assertStringNotContainsString(/' {} \;
-          find ./tests/ -name "*.php" -type f -exec sed -i -e "s/->assertInternalType('array', /->assertIsArray(/" {} \;
-          sed -i "s/\$this->addWarning('The @expectedException,/\/\/\$this->addWarning('The @expectedException,/" ./vendor/phpunit/phpunit/src/Framework/TestCase.php
-          sed -i "s/self::createWarning('The optional \$delta/\/\/self::createWarning('The optional \$delta/" ./vendor/phpunit/phpunit/src/Framework/Assert.php
-
-      - name: Setup problem matchers for PHP
-        run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
-
-      - name: Setup problem matchers for PHPUnit
-        run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
-
-      - name: Configure matchers
-        uses: mheap/phpunit-matcher-action@v1
-
-      - name: Test with PHPUnit
-        run: ./vendor/bin/phpunit --teamcity --no-coverage -c ./
-
-  php-cs-fixer:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: 7.4
-          extensions: ctype, dom, gd, iconv, fileinfo, libxml, mbstring, simplexml, xml, xmlreader, xmlwriter, zip, zlib
-          coverage: none
-          tools: cs2pr
-
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-      - name: Cache composer dependencies
-        uses: actions/cache@v2
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: ${{ runner.os }}-composer-
-
-      - name: Install dependencies
-        run: composer install --no-progress --prefer-dist --optimize-autoloader
-
-      - name: Code style with PHP-CS-Fixer
-        run: ./vendor/bin/php-cs-fixer fix --dry-run --show-progress=none --using-cache=no -v --format=checkstyle | cs2pr
-
-  phpcs:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: 7.4
-          extensions: ctype, dom, gd, iconv, fileinfo, libxml, mbstring, simplexml, xml, xmlreader, xmlwriter, zip, zlib
-          coverage: none
-          tools: cs2pr
-
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-      - name: Cache composer dependencies
-        uses: actions/cache@v2
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: ${{ runner.os }}-composer-
-
-      - name: Install dependencies
-        run: composer install --no-progress --prefer-dist --optimize-autoloader
-
-      - name: Code style with PHP_CodeSniffer
-        run: ./vendor/bin/phpcs src/ tests/ --standard=PSR2 -n --ignore=src/PhpWord/Shared/PCLZip --report=checkstyle | cs2pr
-
-  coverage:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: 7.4
-          extensions: ctype, dom, gd, iconv, fileinfo, libxml, mbstring, simplexml, xml, xmlreader, xmlwriter, zip, zlib
-          coverage: xdebug
-
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-      - name: Cache composer dependencies
-        uses: actions/cache@v2
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: ${{ runner.os }}-composer-
-
-      - name: Install dependencies
-        run: composer install --no-progress --prefer-dist --optimize-autoloader
-
-      - name: Coverage
-        run: |
-          ./vendor/bin/phpunit --coverage-clover coverage-clover.xml
-          curl -LO https://scrutinizer-ci.com/ocular.phar
-          php ocular.phar code-coverage:upload --format=php-clover coverage-clover.xml
diff --git a/vendor/phpoffice/phpword/.github/workflows/github-pages.yml b/vendor/phpoffice/phpword/.github/workflows/github-pages.yml
deleted file mode 100644
index a7850833a3..0000000000
--- a/vendor/phpoffice/phpword/.github/workflows/github-pages.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: GithHub Pages
-on:
-  push:
-    tags:
-      - '*'
-
-jobs:
-  github-pages:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: 7.4
-          coverage: none # remove xdebug
-
-      - name: Build API documentation
-        run: |
-          curl -LO https://github.com/phpDocumentor/phpDocumentor/releases/download/v3.0.0/phpDocumentor.phar
-          php phpDocumentor.phar --directory src/ --target docs/api
-
-      - name: Deploy to GithHub Pages
-        uses: peaceiris/actions-gh-pages@v3
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./docs/api
diff --git a/vendor/phpoffice/phpword/.php-cs-fixer.dist.php b/vendor/phpoffice/phpword/.php-cs-fixer.dist.php
new file mode 100644
index 0000000000..cd46cac83e
--- /dev/null
+++ b/vendor/phpoffice/phpword/.php-cs-fixer.dist.php
@@ -0,0 +1,227 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->notName('pclzip.lib.php')
+    ->notName('OLERead.php')
+    ->in('samples')
+    ->in('src')
+    ->in('tests');
+
+$config = new PhpCsFixer\Config();
+$config
+    ->setRiskyAllowed(true)
+    ->setFinder($finder)
+    ->setCacheFile(sys_get_temp_dir() . '/php-cs-fixer' . preg_replace('~\W~', '-', __DIR__))
+    ->setRules([
+        'align_multiline_comment' => true,
+        'array_indentation' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'backtick_to_shell_exec' => true,
+        'binary_operator_spaces' => true,
+        'blank_line_after_namespace' => true,
+        'blank_line_after_opening_tag' => true,
+        'blank_line_before_statement' => true,
+        'braces' => true,
+        'cast_spaces' => true,
+        'class_attributes_separation' => ['elements' => ['method' => 'one', 'property' => 'one']], // const are often grouped with other related const
+        'class_definition' => false,
+        'class_keyword_remove' => false, // ::class keyword gives us better support in IDE
+        'combine_consecutive_issets' => true,
+        'combine_consecutive_unsets' => true,
+        'combine_nested_dirname' => true,
+        'comment_to_phpdoc' => false, // interferes with annotations
+        'compact_nullable_typehint' => true,
+        'concat_space' => ['spacing' => 'one'],
+        'constant_case' => true,
+        'date_time_immutable' => false, // Break our unit tests
+        'declare_equal_normalize' => true,
+        'declare_strict_types' => false, // Too early to adopt strict types
+        'dir_constant' => true,
+        'doctrine_annotation_array_assignment' => true,
+        'doctrine_annotation_braces' => true,
+        'doctrine_annotation_indentation' => true,
+        'doctrine_annotation_spaces' => true,
+        'elseif' => true,
+        'encoding' => true,
+        'ereg_to_preg' => true,
+        'escape_implicit_backslashes' => true,
+        'explicit_indirect_variable' => false, // I feel it makes the code actually harder to read
+        'explicit_string_variable' => false, // I feel it makes the code actually harder to read
+        'final_class' => false, // We need non-final classes
+        'final_internal_class' => true,
+        'final_public_method_for_abstract_class' => false, // We need non-final methods
+        'fopen_flag_order' => true,
+        'fopen_flags' => true,
+        'full_opening_tag' => true,
+        'fully_qualified_strict_types' => true,
+        'function_declaration' => true,
+        'function_to_constant' => true,
+        'function_typehint_space' => true,
+        'general_phpdoc_annotation_remove' => ['annotations' => ['access', 'category', 'copyright', 'throws']],
+        'global_namespace_import' => true,
+        'header_comment' => false, // We don't use common header in all our files
+        'heredoc_indentation' => false, // Requires PHP >= 7.3
+        'heredoc_to_nowdoc' => false, // Not sure about this one
+        'implode_call' => true,
+        'include' => true,
+        'increment_style' => true,
+        'indentation_type' => true,
+        'is_null' => true,
+        'line_ending' => true,
+        'linebreak_after_opening_tag' => true,
+        'list_syntax' => ['syntax' => 'short'],
+        'logical_operators' => true,
+        'lowercase_cast' => true,
+        'lowercase_keywords' => true,
+        'lowercase_static_reference' => true,
+        'magic_constant_casing' => true,
+        'magic_method_casing' => true,
+        'mb_str_functions' => false, // No, too dangerous to change that
+        'method_argument_space' => true,
+        'method_chaining_indentation' => true,
+        'modernize_types_casting' => true,
+        'multiline_comment_opening_closing' => true,
+        'multiline_whitespace_before_semicolons' => true,
+        'native_constant_invocation' => false, // Micro optimization that look messy
+        'native_function_casing' => true,
+        'native_function_invocation' => false, // I suppose this would be best, but I am still unconvinced about the visual aspect of it
+        'native_function_type_declaration_casing' => true,
+        'new_with_braces' => true,
+        'no_alias_functions' => true,
+        'no_alternative_syntax' => true,
+        'no_binary_string' => true,
+        'no_blank_lines_after_class_opening' => true,
+        'no_blank_lines_after_phpdoc' => true,
+        'no_blank_lines_before_namespace' => false, // we want 1 blank line before namespace
+        'no_break_comment' => true,
+        'no_closing_tag' => true,
+        'no_empty_comment' => true,
+        'no_empty_phpdoc' => true,
+        'no_empty_statement' => true,
+        'no_extra_blank_lines' => true,
+        'no_homoglyph_names' => true,
+        'no_leading_import_slash' => true,
+        'no_leading_namespace_whitespace' => true,
+        'no_mixed_echo_print' => true,
+        'no_multiline_whitespace_around_double_arrow' => true,
+        'no_null_property_initialization' => true,
+        'no_php4_constructor' => true,
+        'no_short_bool_cast' => true,
+        'echo_tag_syntax' => ['format' => 'long'],
+        'no_singleline_whitespace_before_semicolons' => true,
+        'no_spaces_after_function_name' => true,
+        'no_spaces_around_offset' => true,
+        'no_spaces_inside_parenthesis' => true,
+        'no_superfluous_elseif' => false, // Might be risky on a huge code base
+        'no_superfluous_phpdoc_tags' => ['allow_mixed' => true],
+        'no_trailing_comma_in_list_call' => true,
+        'no_trailing_comma_in_singleline_array' => true,
+        'no_trailing_whitespace' => true,
+        'no_trailing_whitespace_in_comment' => true,
+        'no_unneeded_control_parentheses' => true,
+        'no_unneeded_curly_braces' => true,
+        'no_unneeded_final_method' => true,
+        'no_unreachable_default_argument_value' => true,
+        'no_unset_cast' => true,
+        'no_unset_on_property' => true,
+        'no_unused_imports' => true,
+        'no_useless_else' => true,
+        'no_useless_return' => true,
+        'no_whitespace_before_comma_in_array' => true,
+        'no_whitespace_in_blank_line' => true,
+        'non_printable_character' => true,
+        'normalize_index_brace' => true,
+        'not_operator_with_space' => false, // No we prefer to keep '!' without spaces
+        'not_operator_with_successor_space' => false, // idem
+        'nullable_type_declaration_for_default_null_value' => true,
+        'object_operator_without_whitespace' => true,
+        'ordered_class_elements' => false, // We prefer to keep some freedom
+        'ordered_imports' => true,
+        'ordered_interfaces' => true,
+        'php_unit_construct' => true,
+        'php_unit_dedicate_assert' => true,
+        'php_unit_dedicate_assert_internal_type' => true,
+        'php_unit_expectation' => true,
+        'php_unit_fqcn_annotation' => true,
+        'php_unit_internal_class' => false, // Because tests are excluded from package
+        'php_unit_method_casing' => true,
+        'php_unit_mock' => true,
+        'php_unit_mock_short_will_return' => true,
+        'php_unit_namespaced' => true,
+        'php_unit_no_expectation_annotation' => true,
+        'phpdoc_order_by_value' => ['annotations' => ['covers']],
+        'php_unit_set_up_tear_down_visibility' => true,
+        'php_unit_size_class' => false, // That seems extra work to maintain for little benefits
+        'php_unit_strict' => false, // We sometime actually need assertEquals
+        'php_unit_test_annotation' => true,
+        'php_unit_test_case_static_method_calls' => ['call_type' => 'self'],
+        'php_unit_test_class_requires_covers' => false, // We don't care as much as we should about coverage
+        'phpdoc_add_missing_param_annotation' => false, // Don't add things that bring no value
+        'phpdoc_align' => false, // Waste of time
+        'phpdoc_annotation_without_dot' => true,
+        'phpdoc_indent' => true,
+        //'phpdoc_inline_tag' => true,
+        'phpdoc_line_span' => false, // Unfortunately our old comments turn even uglier with this
+        'phpdoc_no_access' => true,
+        'phpdoc_no_alias_tag' => true,
+        'phpdoc_no_empty_return' => true,
+        'phpdoc_no_package' => true,
+        'phpdoc_no_useless_inheritdoc' => true,
+        'phpdoc_order' => true,
+        'phpdoc_return_self_reference' => true,
+        'phpdoc_scalar' => true,
+        'phpdoc_separation' => true,
+        'phpdoc_single_line_var_spacing' => true,
+        'phpdoc_summary' => true,
+        'phpdoc_to_comment' => false, // interferes with annotations
+        'phpdoc_to_param_type' => false, // Because experimental, but interesting for one shot use
+        'phpdoc_to_return_type' => false, // idem
+        'phpdoc_trim' => true,
+        'phpdoc_trim_consecutive_blank_line_separation' => true,
+        'phpdoc_types' => true,
+        'phpdoc_types_order' => true,
+        'phpdoc_var_annotation_correct_order' => true,
+        'phpdoc_var_without_name' => true,
+        'pow_to_exponentiation' => true,
+        'protected_to_private' => true,
+        'psr_autoloading' => true,
+        'random_api_migration' => true,
+        'return_assignment' => false, // Sometimes useful for clarity or debug
+        'return_type_declaration' => true,
+        'self_accessor' => true,
+        'self_static_accessor' => true,
+        'semicolon_after_instruction' => false, // Buggy in `samples/index.php`
+        'set_type_to_cast' => true,
+        'short_scalar_cast' => true,
+        'simple_to_complex_string_variable' => false, // Would differ from TypeScript without obvious advantages
+        'simplified_null_return' => false, // Even if technically correct we prefer to be explicit
+        'single_blank_line_at_eof' => true,
+        'single_blank_line_before_namespace' => true,
+        'single_class_element_per_statement' => true,
+        'single_import_per_statement' => true,
+        'single_line_after_imports' => true,
+        'single_line_comment_style' => true,
+        'single_line_throw' => false, // I don't see any reason for having a special case for Exception
+        'single_quote' => true,
+        'single_trait_insert_per_statement' => true,
+        'space_after_semicolon' => true,
+        'standardize_increment' => true,
+        'standardize_not_equals' => true,
+        'static_lambda' => false, // Risky if we can't guarantee nobody use `bindTo()`
+        'strict_comparison' => false, // No, too dangerous to change that
+        'strict_param' => false, // No, too dangerous to change that
+        'string_line_ending' => true,
+        'switch_case_semicolon_to_colon' => true,
+        'switch_case_space' => true,
+        'ternary_operator_spaces' => true,
+        'ternary_to_null_coalescing' => true,
+        'trailing_comma_in_multiline' => true,
+        'trim_array_spaces' => true,
+        'unary_operator_spaces' => true,
+        'visibility_required' => ['elements' => ['property', 'method']], // not const
+        'void_return' => true,
+        'whitespace_after_comma_in_array' => true,
+        'yoda_style' => false,
+    ]);
+
+return $config;
diff --git a/vendor/phpoffice/phpword/.php_cs.dist b/vendor/phpoffice/phpword/.php_cs.dist
deleted file mode 100644
index 895ed80f56..0000000000
--- a/vendor/phpoffice/phpword/.php_cs.dist
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-
-$finder = PhpCsFixer\Finder::create()
-    ->notName('pclzip.lib.php')
-    ->notName('OLERead.php')
-    ->in('samples')
-    ->in('src')
-    ->in('tests');
-
-return PhpCsFixer\Config::create()
-        ->setRiskyAllowed(true)
-        ->setFinder($finder)
-        ->setRules(array(
-            'array_syntax' => array('syntax' => 'long'),
-            'binary_operator_spaces' => array('align_double_arrow' => true),
-            'blank_line_after_namespace' => true,
-            'blank_line_after_opening_tag' => false,
-            'blank_line_before_return' => true,
-            'braces' => true,
-            'cast_spaces' => true,
-            'class_definition' => true,
-            'class_keyword_remove' => false, // ::class keyword gives us beter support in IDE
-            'combine_consecutive_unsets' => true,
-            'concat_space' => array('spacing' => 'one'),
-            'declare_equal_normalize' => true,
-            'declare_strict_types' => false, // Too early to adopt strict types
-            'dir_constant' => true,
-            'elseif' => true,
-            'encoding' => true,
-            'ereg_to_preg' => true,
-            'full_opening_tag' => true,
-            'function_declaration' => true,
-            'function_typehint_space' => true,
-            'general_phpdoc_annotation_remove' => false, // No use for that
-            'hash_to_slash_comment' => true,
-            'header_comment' => false, // We don't use common header in all our files
-            'heredoc_to_nowdoc' => false, // Not sure about this one
-            'is_null' => false, // Risky
-            'include' => true,
-            'indentation_type' => true,
-            'line_ending' => true,
-            'linebreak_after_opening_tag' => true,
-            'lowercase_cast' => true,
-            'lowercase_constants' => true,
-            'lowercase_keywords' => true,
-            'mb_str_functions' => false, // No, too dangerous to change that
-            'method_argument_space' => true,
-            'method_separation' => true,
-            'modernize_types_casting' => true,
-            'native_function_casing' => true,
-            'native_function_invocation'=> false, // This is risky and seems to be micro-optimization that make code uglier so not worth it, at least for now
-            'new_with_braces' => true,
-            'no_alias_functions' => true,
-            'no_blank_lines_after_class_opening' => true,
-            'no_blank_lines_after_phpdoc' => true,
-            'no_blank_lines_before_namespace' => false, // we want 1 blank line before namespace
-            'no_closing_tag' => true,
-            'no_empty_comment' => true,
-            'no_empty_phpdoc' => true,
-            'no_empty_statement' => true,
-            'no_extra_consecutive_blank_lines' => array('break', 'continue', 'extra', 'return', 'throw', 'use', 'useTrait', 'curly_brace_block', 'parenthesis_brace_block', 'square_brace_block'),
-            'no_leading_import_slash' => true,
-            'no_leading_namespace_whitespace' => true,
-            'no_mixed_echo_print' => true,
-            'no_multiline_whitespace_around_double_arrow' => true,
-            'no_multiline_whitespace_before_semicolons' => true,
-            'no_php4_constructor' => true,
-            'no_short_bool_cast' => true,
-            'no_short_echo_tag' => true,
-            'no_singleline_whitespace_before_semicolons' => true,
-            'no_spaces_after_function_name' => true,
-            'no_spaces_around_offset' => true,
-            'no_spaces_inside_parenthesis' => true,
-            'no_trailing_comma_in_list_call' => true,
-            'no_trailing_comma_in_singleline_array' => true,
-            'no_trailing_whitespace' => true,
-            'no_trailing_whitespace_in_comment' => true,
-            'no_unneeded_control_parentheses' => true,
-            'no_unreachable_default_argument_value' => true,
-            'no_unused_imports' => true,
-            'no_useless_else' => true,
-            'no_useless_return' => true,
-            'no_whitespace_before_comma_in_array' => true,
-            'no_whitespace_in_blank_line' => true,
-            'normalize_index_brace' => true,
-            'not_operator_with_space' => false, // No we prefer to keep '!' without spaces
-            'not_operator_with_successor_space' => false, // idem
-            'object_operator_without_whitespace' => true,
-            'ordered_class_elements' => false, // We prefer to keep some freedom
-            'ordered_imports' => true,
-            'php_unit_construct' => true,
-            'php_unit_dedicate_assert' => true,
-            'php_unit_fqcn_annotation' => true,
-            'php_unit_strict' => false, // We sometime actually need assertEquals
-            'phpdoc_add_missing_param_annotation' => true,
-            'phpdoc_align' => false, // Waste of time
-            'phpdoc_annotation_without_dot' => true,
-            'phpdoc_indent' => true,
-            'phpdoc_inline_tag' => true,
-            'phpdoc_no_access' => true,
-            'phpdoc_no_alias_tag' => true,
-            'phpdoc_no_empty_return' => true,
-            'phpdoc_no_package' => true,
-            'phpdoc_no_useless_inheritdoc' => true,
-            'phpdoc_order' => true,
-            'phpdoc_return_self_reference' => true,
-            'phpdoc_scalar' => true,
-            'phpdoc_separation' => false,
-            'phpdoc_single_line_var_spacing' => true,
-            'phpdoc_summary' => false,
-            'phpdoc_to_comment' => true,
-            'phpdoc_trim' => true,
-            'phpdoc_types' => true,
-            'phpdoc_var_without_name' => true,
-            'pow_to_exponentiation' => false,
-            'pre_increment' => false,
-            'protected_to_private' => true,
-            'psr0' => true,
-            'psr4' => true,
-            'random_api_migration' => false, // This breaks our unit tests
-            'return_type_declaration' => true,
-            'self_accessor' => true,
-            'semicolon_after_instruction' => false, // Buggy in `samples/index.php`
-            'short_scalar_cast' => true,
-            'silenced_deprecation_error' => true,
-            'simplified_null_return' => false, // While technically correct we prefer to be explicit when returning null
-            'single_blank_line_at_eof' => true,
-            'single_blank_line_before_namespace' => true,
-            'single_class_element_per_statement' => true,
-            'single_import_per_statement' => true,
-            'single_line_after_imports' => true,
-            'single_quote' => true,
-            'space_after_semicolon' => true,
-            'standardize_not_equals' => true,
-            'strict_comparison' => false, // No, too dangerous to change that
-            'strict_param' =>  false, // No, too dangerous to change that
-            'switch_case_semicolon_to_colon' => true,
-            'switch_case_space' => true,
-            'ternary_operator_spaces' => true,
-            'ternary_to_null_coalescing' => false, // Cannot use that with PHP 5.6
-            'trailing_comma_in_multiline_array' => true,
-            'trim_array_spaces' => false,
-            'unary_operator_spaces' => true,
-            'visibility_required' => true,
-            'whitespace_after_comma_in_array' => true,
-    ));
diff --git a/vendor/phpoffice/phpword/CHANGELOG.md b/vendor/phpoffice/phpword/CHANGELOG.md
deleted file mode 100644
index f9b4ec0af0..0000000000
--- a/vendor/phpoffice/phpword/CHANGELOG.md
+++ /dev/null
@@ -1,623 +0,0 @@
-# Changelog
-All notable changes to this project will be documented in this file.
-This project adheres to [Semantic Versioning](http://semver.org/).
-
-## [0.18.2](https://github.com/PHPOffice/PHPWord/tree/0.18.2) (2021-06-04)
-
-[Full Changelog](https://github.com/PHPOffice/PHPWord/compare/0.18.1...0.18.2)
-
-### Bug fixes
-- when adding image to relationship first check that the generated RID is actually unique [\#2063](https://github.com/PHPOffice/PHPWord/pull/2063) ([tpv-ebben](https://github.com/tpv-ebben))
-- Update chart, don't write 'c:overlap' if grouping is 'clustered' [\#2052](https://github.com/PHPOffice/PHPWord/pull/2052) ([dfsd534](https://github.com/dfsd534))
-- Update Html parser to accept line-height:normal [\#2041](https://github.com/PHPOffice/PHPWord/pull/2041) ([joelgo](https://github.com/joelgo))
-- Fix image border in Word2007 Writer for LibreOffice 7 [\#2021](https://github.com/PHPOffice/PHPWord/pull/2021) ([kamilmmach](https://github.com/kamilmmach))
-
-### Miscellaneous
-- Corrected namespace for Language class in docs. [\#2087](https://github.com/PHPOffice/PHPWord/pull/2087) ([MegaChriz](https://github.com/MegaChriz))
-- Added support for Garamond font [\#2078](https://github.com/PHPOffice/PHPWord/pull/2078) ([artemkolotilkin](https://github.com/artemkolotilkin))
-- Add BorderStyle for Cell Style to documentation [\#2090](https://github.com/PHPOffice/PHPWord/pull/2090) ([DShkrabak](https://github.com/DShkrabak))
-
-## [0.18.1](https://github.com/PHPOffice/PHPWord/tree/0.18.1) (2021-03-08)
-
-[Full Changelog](https://github.com/PHPOffice/PHPWord/compare/0.18.0...0.18.1)
-
-### Bug fixes
-- Fix BC break in #1946. This package does not replace laminas/laminas-zendframework-bridge [\#2032](https://github.com/PHPOffice/PHPWord/pull/2032) ([mussbach](https://github.com/mussbach))
-
-## [0.18.0](https://github.com/PHPOffice/PHPWord/tree/0.18.0) (2021-02-12)
-
-[Full Changelog](https://github.com/PHPOffice/PHPWord/compare/0.17.0...0.18.0)
-
-### Enhancements
-- Add support for charts in template processor [\#2012](https://github.com/PHPOffice/PHPWord/pull/2012) ([dbarzin](https://github.com/dbarzin))
-- add/setting page element border style. [\#1986](https://github.com/PHPOffice/PHPWord/pull/1986) ([emnabs](https://github.com/emnabs))
-- allow to use customized pdf library [\#1983](https://github.com/PHPOffice/PHPWord/pull/1983) ([SailorMax](https://github.com/SailorMax))
-- feat: Update addHtml to handle style inheritance [\#1965](https://github.com/PHPOffice/PHPWord/pull/1965) ([Julien1138](https://github.com/Julien1138))
-- Add parsing of Shape node values [\#1924](https://github.com/PHPOffice/PHPWord/pull/1924) ([sven-ahrens](https://github.com/sven-ahrens))
-- Allow to redefine TCPDF object [\#1907](https://github.com/PHPOffice/PHPWord/pull/1907) ([SailorMax](https://github.com/SailorMax))
-- Enhancements to addHTML parser [\#1902](https://github.com/PHPOffice/PHPWord/pull/1902) ([lubosdz](https://github.com/lubosdz))
-- Make Default Paper Configurable [\#1851](https://github.com/PHPOffice/PHPWord/pull/1851) ([oleibman](https://github.com/oleibman))
-- Implement various missing features for the ODT writer [\#1796](https://github.com/PHPOffice/PHPWord/pull/1796) ([oleibman](https://github.com/oleibman))
-- Added support for "cloudConvert" images [\#1794](https://github.com/PHPOffice/PHPWord/pull/1794) ([ErnestStaug](https://github.com/ErnestStaug))
-- Add support for several features for the RTF writer [\#1775](https://github.com/PHPOffice/PHPWord/pull/1775) ([oleibman](https://github.com/oleibman))
-- Add font style for Field elements [\#1774](https://github.com/PHPOffice/PHPWord/pull/1774) ([oleibman](https://github.com/oleibman))
-- Add support for ListItemRun in HTML writer [\#1766](https://github.com/PHPOffice/PHPWord/pull/1766) ([stefan-91](https://github.com/stefan-91))
-- Improvements in RTF writer [\#1755](https://github.com/PHPOffice/PHPWord/pull/1755) ([oleibman](https://github.com/oleibman))
-- Allow a closure to be passed with image replacement tags [\#1716](https://github.com/PHPOffice/PHPWord/pull/1716) ([mbardelmeijer](https://github.com/mbardelmeijer))
-- Add Option for Dynamic Chart Legend Position [\#1699](https://github.com/PHPOffice/PHPWord/pull/1699) ([Stephan212](https://github.com/Stephan212))
-- Add parsing of HTML checkbox input field [\#1832](https://github.com/PHPOffice/PHPWord/pull/1832) ([Matze2010](https://github.com/Matze2010))
-
-### Bug fixes
-- Fix image stroke in libreoffice 7.x [\#1992](https://github.com/PHPOffice/PHPWord/pull/1992) ([Adizbek](https://github.com/Adizbek))
-- Fix deprecated warning for non-hexadecimal number [\#1988](https://github.com/PHPOffice/PHPWord/pull/1988) ([Ciki](https://github.com/Ciki))
-- Fix limit not taken into account when adding image in template [\#1967](https://github.com/PHPOffice/PHPWord/pull/1967) ([jsochor](https://github.com/jsochor))
-- Add null check when setComplexValue is not found [\#1936](https://github.com/PHPOffice/PHPWord/pull/1936) ([YannikFirre](https://github.com/YannikFirre))
-- Some document have non-standard locale code [\#1824](https://github.com/PHPOffice/PHPWord/pull/1824) ([ErnestStaug](https://github.com/ErnestStaug))
-- Fixes PHPDoc @param and @return types for several Converter methods [\#1818](https://github.com/PHPOffice/PHPWord/pull/1818) ([caugner](https://github.com/caugner))
-- Update the regexp to avoid catastrophic backtracking [\#1809](https://github.com/PHPOffice/PHPWord/pull/1809) ([juzser](https://github.com/juzser))
-- Fix PHPUnit tests on develop branch [\#1771](https://github.com/PHPOffice/PHPWord/pull/1771) ([mdupont](https://github.com/mdupont))
-- TemplateProcessor cloneBlock wrongly clones images [\#1763](https://github.com/PHPOffice/PHPWord/pull/1763) ([alarai](https://github.com/alarai))
-
-### Miscellaneous
-- Compatibility with PHP 7.4, PHP 8.0 and migrate to Laminas Escaper [\#1946](https://github.com/PHPOffice/PHPWord/pull/1946) ([liborm85](https://github.com/liborm85))
-- Remove legacy PHPOffice/Common package, fix PHP 8.0 compatibility [\#1996](https://github.com/PHPOffice/PHPWord/pull/1996) ([liborm85](https://github.com/liborm85))
-- Improve Word2007 Test Coverage [\#1858](https://github.com/PHPOffice/PHPWord/pull/1858) ([oleibman](https://github.com/oleibman))
-- Fix typo in docs. Update templates-processing.rst [\#1952](https://github.com/PHPOffice/PHPWord/pull/1952) ([mnvx](https://github.com/mnvx))
-- Fix documentation and method name for FootnoteProperties [\#1776](https://github.com/PHPOffice/PHPWord/pull/1776) ([mdupont](https://github.com/mdupont))
-- fix: documentation about paragraph indentation [\#1764](https://github.com/PHPOffice/PHPWord/pull/1764) ([mdupont](https://github.com/mdupont))
-- Update templates-processing.rst [\#1745](https://github.com/PHPOffice/PHPWord/pull/1745) ([igronus](https://github.com/igronus))
-- Unused variables $rows, $cols in sample [\#1877](https://github.com/PHPOffice/PHPWord/pull/1877) ([ThanasisMpalatsoukas](https://github.com/ThanasisMpalatsoukas))
-- Add unit test for NumberingStyle [\#1744](https://github.com/PHPOffice/PHPWord/pull/1744) ([Manunchik](https://github.com/Manunchik))
-- Add unit test for PhpWord Settings [\#1743](https://github.com/PHPOffice/PHPWord/pull/1743) ([Manunchik](https://github.com/Manunchik))
-- Add unit test for Media elements [\#1742](https://github.com/PHPOffice/PHPWord/pull/1742) ([Manunchik](https://github.com/Manunchik))
-- Update templates processing docs [\#1729](https://github.com/PHPOffice/PHPWord/pull/1729) ([hcdias](https://github.com/hcdias))
-
-v0.17.0 (01 oct 2019)
-----------------------
-### Added
-- Add methods setValuesFromArray and cloneRowFromArray to the TemplateProcessor @geraldb-nicat #670
-- Set complex type in template @troosan #1565
-- implement support for section vAlign @troosan #1569
-- ParseStyle for border-color @Gllrm0 #1551
-- Html writer auto invert text color @SailorMax #1387
-- Add RightToLeft table presentation. @troosan #1550
-- Add support for page vertical alignment. @troosan #672 #1569
-- Adding setNumId method for ListItem style @eweso #1329
-- Add support for basic fields in RTF writer. @Samuel-BF #1717
-
-### Fixed
-- Fix HTML border-color parsing. @troosan #1551 #1570
-- Language::validateLocale should pass with locale 'zxx'. @efpapado #1558
-- can't align center vertically with the text @ter987 #672
-- fix parsing of border-color and add test @troosan #1570
-- TrackChange doesn't handle all return types of \DateTime::createFromFormat(...) @superhaggis #1584
-- To support PreserveText inside sub container @bhattnishant #1637
-- No nested w:pPr elements in ListItemRun. @waltertamboer #1628
-- Ensure that entity_loader disable variable is re-set back to the original setting @seamuslee001 #1585
-
-### Miscellaneous
-- Use embedded http server to test loading of remote images @troosan #1544
-- Change private to protected to be able extending class Html @SpinyMan #1646
-- Fix apt-get crash in Travis CI for PHP 5.3 @mdupont #1707
-
-v0.16.0 (30 dec 2018)
-----------------------
-### Added
-- Add getVariableCount method in TemplateProcessor. @nicoder #1272
-- Add setting Chart Title and Legend visibility @Tom-Magill #1433
-- Add ability to pass a Style object in Section constructor @ndench #1416
-- Add support for hidden text @Alexmg86 #1527
-- Add support for setting images in TemplateProcessor @SailorMax #1170
-- Add "Plain Text" type to SDT (Structured Document Tags) @morrisdj #1541
-- Added possibility to index variables inside cloned block in TemplateProcessor @JPBetley #817
-- Added possibility to replace variables inside cloned block with values in TemplateProcessor @DIDoS #1392
-
-### Fixed
-- Fix regex in `cloneBlock` function @nicoder #1269
-- HTML Title Writer loses text when Title contains a TextRun instead a string. @begnini #1436
-- Fix regex in fixBrokenMacros, make it less greedy @MuriloSo @brainwood @yurii-sio2 #1502 #1345
-- 240 twips are being added to line spacing, should not happen when using lineRule fixed @troosan #1509 #1505
-- Adding table layout to the generated HTML @aarangara #1441
-- Fix loading of Sharepoint document @Garrcomm #1498
-- RTF writer: Round getPageSizeW and getPageSizeH to avoid decimals @Patrick64 #1493
-- Fix parsing of Office 365 documents @Timanx #1485
-- For RTF writers, sizes should should never have decimals @Samuel-BF #1536
-- Style Name Parsing fails if document generated by a non-english word version @begnini #1434
-
-### Miscellaneous
-- Get rid of duplicated code in TemplateProcessor @abcdmitry #1161
-
-v0.15.0 (14 Jul 2018)
-----------------------
-### Added
-- Parsing of `align` HTML attribute - @troosan #1231
-- Parse formatting inside HTML lists - @troosan @samimussbach #1239 #945 #1215 #508
-- Parsing of CSS `direction` instruction, HTML `lang` attribute, formatting inside table cell - @troosan #1273 #1252 #1254
-- Add support for Track changes @Cip @troosan #354 #1262
-- Add support for fixed Table Layout @aoloe @ekopach @troosan #841 #1276
-- Add support for Cell Spacing @dox07 @troosan #1040
-- Add parsing of formatting inside lists @atomicalnet @troosan #594
-- Added support for Vertically Raised or Lowered Text (w:position) @anrikun @troosan #640
-- Add support for MACROBUTTON field @phryneas @troosan #1021
-- Add support for Hyphenation @Trainmaster #1282 (Document: `autoHyphenation`, `consecutiveHyphenLimit`, `hyphenationZone`, `doNotHyphenateCaps`, Paragraph: `suppressAutoHyphens`)
-- Added support for Floating Table Positioning (tblpPr) @anrikun #639
-- Added support for Image text wrapping distance @troosan #1310
-- Added parsing of CSS line-height and text-indent in HTML reader @troosan #1316
-- Added the ability to enable gridlines and axislabels on charts @FrankMeyer #576
-- Add support for table indent (tblInd) @Trainmaster #1343
-- Added parsing of internal links in HTML reader @lalop #1336
-- Several improvements to charts @JAEK-S #1332
-- Add parsing of html image in base64 format @jgpATs2w #1382
-- Added Support for Indentation & Tabs on RTF Writer. @smaug1985 #1405
-- Allows decimal numbers in HTML line-height style @jgpATs2w #1413
-
-### Fixed
-- Fix reading of docx default style - @troosan #1238
-- Fix the size unit of when parsing html images - @troosan #1254
-- Fixed HTML parsing of nested lists - @troosan #1265
-- Save PNG alpha information when using remote images. @samsullivan #779
-- Fix parsing of `<w:br/>` tag. @troosan #1274
-- Bookmark are not writton as internal link in html writer @troosan #1263
-- It should be possible to add a Footnote in a ListItemRun @troosan #1287 #1287
-- Fix colspan and rowspan for tables in HTML Writer @mattbolt #1292
-- Fix parsing of Heading and Title formating @troosan @gthomas2 #465
-- Fix Dateformat typo, fix hours casing, add Month-Day-Year formats @ComputerTinker #591
-- Support reading of w:drawing for documents produced by word 2011+ @gthomas2 #464 #1324
-- Fix missing column width in ODText writer @potofcoffee #413
-- Disable entity loader before parsing XML to avoid XXE injection @Tom4t0 #1427
-
-### Changed
-- Remove zend-stdlib dependency @Trainmaster #1284
-- The default unit for `\PhpOffice\PhpWord\Style\Image` changed from `px` to `pt`.
-
-### Miscellaneous
-- Drop GitHub pages, switch to coveralls for code coverage analysis @czosel #1360
-
-v0.14.0 (29 Dec 2017)
-----------------------
-This release fixes several bugs and adds some new features.
-This version brings compatibility with PHP 7.0 & 7.1
-
-### Added
-- Possibility to control the footnote numbering - @troosan #1068
-- Image creation from string - @troosan #937
-- Introduced the `\PhpOffice\PhpWord\SimpleType\NumberFormat` simple type. - @troosan
-- Support for ContextualSpacing - @postHawk #1088
-- Possiblity to hide spelling and/or grammatical errors - @troosan #542
-- Possiblity to set default document language as well as changing the language for each text element - @troosan #1108
-- Support for Comments - @troosan #1067
-- Support for paragraph textAlignment - @troosan #1165
-- Add support for HTML underline tag <u> in addHtml - @zNightFalLz #1186
-- Add support for HTML <br> in addHtml - @anrikun @troosan #659
-- Allow to change cell width unit - guillaume-ro-fr #986
-- Allow to change the line height rule @troosan
-- Implement PageBreak for odt writer @cookiekiller #863 #824
-- Allow to force an update of all fields on opening a document - @troosan #951
-- Allow adding a CheckBox in a TextRun - @irond #727
-- Add support for HTML img tag - @srggroup #934
-- Add support for password protection for docx - @mariahaubner #1019
-
-### Fixed
-- Loosen dependency to Zend
-- Images are not being printed when generating PDF - @hubertinio #1074 #431
-- Fixed some PHP 7 warnings - @	likeuntomurphy #927
-- Fixed PHP 7.2 compatibility (renamed `Object` class names to `ObjectElement`) - @SailorMax #1185
-- Fixed Word 97 reader - @alsofronie @Benpxpx @mario-rivera #912 #920 #892
-- Fixed image loading over https - @troosan #988
-- Impossibility to set different even and odd page headers - @troosan #981
-- Fixed Word2007 reader where unnecessary paragraphs were being created - @donghaobo #1043 #620
-- Fixed Word2007 reader where margins were not being read correctly - @slowprog #885 #1008
-- Impossible to add element PreserveText in Section - @rvanlaak #452
-- Added missing options for numbering format - @troosan #1041
-- Fixed impossibility to set a different footer for first page - @ctrlaltca #1116, @aoloe #875
-- Fixed styles not being applied by HTML writer, better pdf output - @sarke #1047 #500 #1139
-- Fixed read docx error when document contains image from remote url - @FBnil #1173 #1176
-- Padded the $args array to remove error - @kaigoh #1150, @reformed #870
-- Fix incorrect image size between windows and mac - @bskrtich #874
-- Fix adding HTML table to document - @mogilvie @arivanbastos #324
-- Fix parsing on/off values (w:val="true|false|1|0|on|off") - @troosan #1221 #1219
-- Fix error on Empty Dropdown Entry - @ComputerTinker #592
-
-### Deprecated
-- PhpWord->getProtection(), get it from the settings instead PhpWord->getSettings()->getDocumentProtection();
-
-
-
-v0.13.0 (31 July 2016)
--------------------
-This release brings several improvements in `TemplateProcessor`, automatic output escaping feature for OOXML, ODF, HTML, and RTF (turned off, by default).
-It also introduces constants for horizontal alignment options, and resolves some issues with PHP 7.
-Manual installation feature has been dropped since the release. Please, use [Composer](https://getcomposer.org/) to install PHPWord.
-
-### Added
-- Introduced the `\PhpOffice\PhpWord\SimpleType\Jc` simple type. - @RomanSyroeshko
-- Introduced the `\PhpOffice\PhpWord\SimpleType\JcTable` simple type. - @RomanSyroeshko
-- Introduced writer for the "Paragraph Alignment" element (see `\PhpOffice\PhpWord\Writer\Word2007\Element\ParagraphAlignment`). - @RomanSyroeshko
-- Introduced writer for the "Table Alignment" element (see `\PhpOffice\PhpWord\Writer\Word2007\Element\TableAlignment`). - @RomanSyroeshko
-- Supported indexed arrays in arguments of `TemplateProcessor::setValue()`. - @RomanSyroeshko #618
-- Introduced automatic output escaping for OOXML, ODF, HTML, and RTF. To turn the feature on use `phpword.ini` or `\PhpOffice\PhpWord\Settings`. - @RomanSyroeshko #483
-- Supported processing of headers and footers in `TemplateProcessor::applyXslStyleSheet()`. - @RomanSyroeshko #335
-
-### Changed
-- Improved error message for the case when `autoload.php` is not found. - @RomanSyroeshko #371
-- Renamed the `align` option of `NumberingLevel`, `Frame`, `Table`, and `Paragraph` styles into `alignment`. - @RomanSyroeshko
-- Improved performance of `TemplateProcessor::setValue()`. - @kazitanvirahsan #614, #617
-- Fixed some HTML tags not rendering any output (p, header & table) - #257, #324 - @twmobius and @garethellis
-
-### Deprecated
-- `getAlign` and `setAlign` methods of `NumberingLevel`, `Frame`, `Table`, and `Paragraph` styles.
-Use the correspondent `getAlignment` and `setAlignment` methods instead. - @RomanSyroeshko
-- `left`, `right`, and `justify` alignment options for paragraphs (now are mapped to `Jc::START`, `Jc::END`, and `Jc::BOTH`). - @RomanSyroeshko
-- `left`, `right`, and `justify` alignment options for tables (now are mapped to `Jc::START`, `Jc::END`, and `Jc::CENTER`). - @RomanSyroeshko
-- `TCPDF` due to its limited HTML support. Use `DomPDF` or `MPDF` writer instead. - @RomanSyroeshko #399
-
-### Removed
-- `\PhpOffice\PhpWord\Style\Alignment`. Style properties, which previously stored instances of this class, now deal with strings.
-In each case set of available string values is defined by the correspondent simple type. - @RomanSyroeshko
-- Manual installation support. Since the release we have dependencies on third party libraries,
-so installation via ZIP-archive download is not an option anymore. To install PHPWord use [Composer](https://getcomposer.org/).
- We also removed `\PhpOffice\PhpWord\Autoloader`, because the latter change made it completely useless.
- Autoloaders provided by Composer are in use now (see `bootstrap.php`). - @RomanSyroeshko
-- `\PhpOffice\PhpWord\Shared\Drawing` replaced by `\PhpOffice\Common\Drawing`. - @Progi1984 #658
-- `\PhpOffice\PhpWord\Shared\Font`. - @Progi1984 #658
-- `\PhpOffice\PhpWord\Shared\String` replaced by `\PhpOffice\Common\Text`. - @Progi1984 @RomanSyroeshko #658
-- `\PhpOffice\PhpWord\Shared\XMLReader` replaced by `\PhpOffice\Common\XMLReader`. - @Progi1984 #658
-- `\PhpOffice\PhpWord\Shared\XMLWriter` replaced by `\PhpOffice\Common\XMLWriter`. - @Progi1984 @RomanSyroeshko #658
-- `AbstractContainer::addMemoryImage()`. Use `AbstractContainer::addImage()` instead.
-
-### Fixed
-- `Undefined property` error while reading MS-DOC documents. - @jaberu #610
-- Corrupted OOXML template issue in case when its names is broken immediately after `$` sign.
-That case wasn't taken into account in implementation of `TemplateProcessor::fixBrokenMacros()`. - @RomanSyroeshko @d-damien #548
-
-
-
-v0.12.1 (30 August 2015)
------------------------
-Maintenance release. This release is focused primarily on `TemplateProcessor`.
-
-### Changes
-- Changed visibility of all private properties and methods of `TemplateProcessor` to `protected`. - @RomanSyroeshko #498
-- Improved performance of `TemplateProcessor::setValue()`. - @RomanSyroeshko @nicoSWD #513
-
-### Bugfixes
-- Fixed issue with "Access denied" message while opening `Sample_07_TemplateCloneRow.docx` and `Sample_23_TemplateBlock.docx` result files on Windows platform. - @RomanSyroeshko @AshSat #532
-- Fixed `PreserveText` element alignment in footer (see `Sample_12_HeaderFooter.php`). - @RomanSyroeshko @SSchwaiger #495
-
-
-
-v0.12.0 (3 January 2015)
------------------------
-This release added form fields (textinput, checkbox, and dropdown), drawing shapes (arc, curve, line, polyline, rect, oval), and basic 2D chart (pie, doughnut, bar, line, area, scatter, radar) elements along with some new styles. Basic MsDoc reader is introduced.
-
-### Features
-- Element: Ability to add drawing shapes (arc, curve, line, polyline, rect, oval) using new `Shape` element - @ivanlanin #123
-- Font: New `scale`, `spacing`, and `kerning` property of font style - @ivanlanin
-- Paragraph:  Added shading to the paragraph style for full width shading - @lrobert #264
-- RTF Writer: Support for sections, margins, and borders - @ivanlanin #249
-- Section: Ability to set paper size, e.g. A4, A3, and Legal - @ivanlanin #249
-- General: New `PhpWord::save()` method to encapsulate `IOFactory` - @ivanlanin
-- General: New `Shared\Converter` static class - @ivanlanin
-- Chart: Basic 2D chart (pie, doughnut, bar, line, area, scatter, radar) - @ivanlanin #278
-- Chart: 3D charts and ability to set width and height - @ivanlanin
-- FormField: Ability to add textinput, checkbox, and dropdown form elements - @ivanlanin #266
-- Setting: Ability to define document protection (readOnly, comments, trackedChanges, forms) - @ivanlanin
-- Setting: Ability to remove [Compatibility Mode] text in the MS Word title bar - @ivanlanin
-- SDT: Ability to add structured document tag elements (comboBox, dropDownList, date) - @ivanlanin
-- Paragraph: Support for paragraph with borders - @ivanlanin #294
-- Word2007 Writer : Support for RTL - @Progi1984 #331
-- MsDOC Reader: Basic MsDOC Reader - @Progi1984 #23, #287
-- "absolute" horizontal and vertical positioning of Frame - @basjan #302
-- Add new-page function for PDF generation. For multiple PDF-backends - @chc88 #426
-- Report style options enumerated when style unknown - @h6w
-
-### Bugfixes
-- Fix rare PclZip/realpath/PHP version problem - @andrew-kzoo #261
-- `addHTML` encoding and ampersand fixes for PHP 5.3 - @bskrtich #270
-- Page breaks on titles and tables - @ivanlanin #274
-- Table inside vertical border does not rendered properly - @ivanlanin #280
-- `add<elementName>` of container should be case insensitive, e.g. `addToc` should be accepted, not only `addTOC` - @ivanlanin #294
-- Fix specific borders (and margins) were not written correctly in word2007 writer - @pscheit #327
-- "HTML is not a valid writer" exception while running "Sample_36_RTL.php" - @RomanSyroeshko #340
-- "addShape()" magic method in AbstractContainer is mistakenly named as "addObject()" - @GMTA #356
-- `Element\Section::setPageSizeW()` and `Element\Section::setPageSizeH()` were mentioned in the docs but not implemented.
-- Special Characters (ampersand) in Title break docx output - @RomanSyroeshko #401
-- `<th>` tag is closed with `</td>` tag: - @franzholz #438
-
-### Deprecated
-- `Element\Link::getTarget()` replaced by `Element\Link::getSource()`
-- `Element\Section::getSettings()` and `Element\Section::setSettings()` replaced by `Element\Section::getStyle()` and `Element\Section::setStyle()`
-- `Shared\Drawing` and `Shared\Font` merged into `Shared\Converter`
-- `DocumentProperties` replaced by `Metadata\DocInfo`
-- `Template` replaced by `TemplateProcessor`
-- `PhpWord->loadTemplate($filename)`
-
-### Miscellaneous
-- Docs: Add known issue on `README` about requirement for temporary folder to be writable and update `samples/index.php` for this requirement check - @ivanlanin #238
-- Docs: Correct elements.rst about Line - @chrissharkman #292
-- PclZip: Remove temporary file after used - @andrew-kzoo #265
-- Autoloader: Add the ability to set the autoloader options - @bskrtich #267
-- Element: Refactor elements to move set relation Id from container to element - @ivanlanin
-- Introduced CreateTemporaryFileException, CopyFileException - @RomanSyroeshko
-- Settings: added method to set user defined temporary directory - @RomanSyroeshko #310
-- Renamed `Template` into `TemplateProcessor` - @RomanSyroeshko #216
-- Reverted #51. All text escaping must be performed out of the library - @RomanSyroeshko #51
-
-
-
-v0.11.1 (2 June 2014)
---------------------
-This is an immediate bugfix release for HTML reader.
-
-- HTML Reader: `<p>` and header tags puts no output - @canyildiz @ivanlanin #257
-
-
-
-v0.11.0 (1 June 2014)
---------------------
-This release marked the change of PHPWord license from LGPL 2.1 to LGPL 3. Four new elements were added: TextBox, ListItemRun, Field, and Line. Relative and absolute positioning for images and textboxes were added. Writer classes were refactored into parts, elements, and styles. ODT and RTF features were enhanced. Ability to add elements to PHPWord object via HTML were implemented. RTF and HTML reader were initiated.
-
-### Features
-- Image: Ability to define relative and absolute positioning - @basjan #217
-- Footer: Conform footer with header by adding firstPage, evenPage and by inheritance - @basjan @ivanlanin #219
-- Element: New `TextBox` element - @basjan @ivanlanin #228, #229, #231
-- HTML: Ability to add elements to PHPWord object via html - @basjan #231
-- Element: New `ListItemRun` element that can add a list item with inline formatting like a textrun - @basjan #235
-- Table: Ability to add table inside a cell (nested table) - @ivanlanin #149
-- RTF Writer: UTF8 support for RTF: Internal UTF8 text is converted to Unicode before writing - @ivanlanin #158
-- Table: Ability to define table width (in percent and twip) and position - @ivanlanin #237
-- RTF Writer: Ability to add links and page breaks in RTF - @ivanlanin #196
-- ListItemRun: Remove fontStyle parameter because ListItemRun is inherited from TextRun and TextRun doesn't have fontStyle - @ivanlanin
-- Config: Ability to use a config file to store various common settings - @ivanlanin #200
-- ODT Writer: Enable inline font style in TextRun - @ivanlanin
-- ODT Writer: Enable underline, strike/doublestrike, smallcaps/allcaps, superscript/subscript font style - @ivanlanin
-- ODT Writer: Enable section and column - @ivanlanin
-- PDF Writer: Add TCPDF and mPDF as optional PDF renderer library - @ivanlanin
-- ODT Writer: Enable title element and custom document properties - @ivanlanin
-- ODT Reader: Ability to read standard and custom document properties - @ivanlanin
-- Word2007 Writer: Enable the missing custom document properties writer - @ivanlanin
-- Image: Enable "image float left" - @ivanlanin #244
-- RTF Writer: Ability to write document properties - @ivanlanin
-- RTF Writer: Ability to write image - @ivanlanin
-- Element: New `Field` element - @basjan #251
-- RTF Reader: Basic RTF reader - @ivanlanin #72, #252
-- Element: New `Line` element - @basjan #253
-- Title: Ability to apply numbering in heading - @ivanlanin #193
-- HTML Reader: Basic HTML reader - @ivanlanin #80, #254
-- RTF Writer: Basic table writing - @ivanlanin #245
-
-### Bugfixes
-- Header: All images added to the second header were assigned to the first header - @basjan #222
-- Conversion: Fix conversion from cm to pixel, pixel to cm, and pixel to point - @basjan #233, #234
-- PageBreak: Page break adds new line in the beginning of the new page - @ivanlanin #150
-- Image: `marginLeft` and `marginTop` cannot accept float value - @ivanlanin #248
-- Title: Orphan `w:fldChar` caused OpenOffice to crash when opening DOCX - @ivanlanin #236
-
-### Deprecated
-- Static classes `Footnotes`, `Endnotes`, and `TOC`
-- `Writer\Word2007\Part`: `Numbering::writeNumbering()`, `Settings::writeSettings()`, `WebSettings::writeWebSettings()`, `ContentTypes::writeContentTypes()`, `Styles::writeStyles()`, `Document::writeDocument()` all changed into `write()`
-- `Writer\Word2007\Part\DocProps`: Split into `Writer\Word2007\Part\DocPropsCore` and `Writer\Word2007\Part\DocPropsApp`
-- `Element\Title::getBookmarkId()` replaced by `Element\Title::getRelationId()`
-- `Writer\HTML::writeDocument`: Replaced by `Writer\HTML::getContent`
-
-### Miscellaneous
-- License: Change the project license from LGPL 2.1 into LGPL 3.0 - #211
-- Word2007 Writer: New `Style\Image` class - @ivanlanin
-- Refactor: Replace static classes `Footnotes`, `Endnotes`, and `TOC` with `Collections` - @ivanlanin #206
-- QA: Reactivate `phpcpd` and `phpmd` on Travis - @ivanlanin
-- Refactor: PHPMD recommendation: Change all `get...` method that returns `boolean` into `is...` or `has...` - @ivanlanin
-- Docs: Create gh-pages branch for API documentation - @Progi1984 #154
-- QA: Add `.scrutinizer.yml` and include `composer.lock` for preparation to Scrutinizer - @ivanlanin #186
-- Writer: Refactor writer parts using composite pattern - @ivanlanin
-- Docs: Show code quality and test code coverage badge on README
-- Style: Change behaviour of `set...` function of boolean properties; when none is defined, assumed true - @ivanlanin
-- Shared: Unify PHP ZipArchive and PCLZip features into PhpWord ZipArchive - @ivanlanin
-- Docs: Create VERSION file - @ivanlanin
-- QA: Improve dan update requirement check in `samples` folder - @ivanlanin
-
-
-
-v0.10.1 (21 May 2014)
---------------------
-This is a bugfix release for `php-zip` requirement in Composer.
-
-- Change Composer requirements for php-zip from `require` to `suggest` - @bskrtich #246
-
-
-
-v0.10.0 (4 May 2014)
--------------------
-This release marked heavy refactorings on internal code structure with the creation of some abstract classes to reduce code duplication. `Element` subnamespace is introduced in this release to replace `Section`. Word2007 reader capability is greatly enhanced. Endnote is introduced. List numbering is now customizable. Basic HTML and PDF writing support is enabled. Basic ODText reader is introduced.
-
-### Features
-- Image: Get image dimensions without EXIF extension - @andrew-kzoo #184
-- Table: Add `tblGrid` element for Libre/Open Office table sizing - @gianis6 #183
-- Footnote: Ability to insert textbreak in footnote `$footnote->addTextBreak()` - @ivanlanin
-- Footnote: Ability to style footnote reference mark by using `FootnoteReference` style - @ivanlanin
-- Font: Add `bgColor` to font style to define background using HEX color - @jcarignan #168
-- Table: Add `exactHeight` to row style to define whether row height should be exact or atLeast - @jcarignan #168
-- Element: New `CheckBox` element for sections and table cells - @ozilion #156
-- Settings: Ability to use PCLZip as alternative to ZipArchive - @bskrtich @ivanlanin #106, #140, #185
-- Template: Ability to find & replace variables in headers & footers - @dgudgeon #190
-- Template: Ability to clone & delete block of text using `cloneBlock` and `deleteBlock` - @diego-vieira #191
-- TOC: Ability to have two or more TOC in one document and to set min and max depth for TOC - @Pyreweb #189
-- Table: Ability to add footnote in table cell - @ivanlanin #187
-- Footnote: Ability to add image in footnote - @ivanlanin #187
-- ListItem: Ability to add list item in header/footer - @ivanlanin #187
-- CheckBox: Ability to add checkbox in header/footer - @ivanlanin #187
-- Link: Ability to add link in header/footer - @ivanlanin #187
-- Object: Ability to add object in header, footer, textrun, and footnote - @ivanlanin #187
-- Media: Add `Media::resetElements()` to reset all media data - @juzi #19
-- General: Add `Style::resetStyles()` - @ivanlanin #187
-- DOCX Reader: Ability to read header, footer, footnotes, link, preservetext, textbreak, pagebreak, table, list, image, and title - @ivanlanin
-- Endnote: Ability to add endnotes - @ivanlanin
-- ListItem: Ability to create custom list and reset list number - @ivanlanin #10, #198
-- ODT Writer: Basic table writing support - @ivanlanin
-- Image: Keep image aspect ratio if only 1 dimension styled - @japonicus #194
-- HTML Writer: Basic HTML writer: text, textrun, link, title, textbreak, table, image (as Base64), footnote, endnote - @ivanlanin #203, #67, #147
-- PDF Writer: Basic PDF writer using DomPDF: All HTML element except image - @ivanlanin #68
-- DOCX Writer: Change `docProps/app.xml` `Application` to `PHPWord` - @ivanlanin
-- DOCX Writer: Create `word/settings.xml` and `word/webSettings.xml` dynamically - @ivanlanin
-- ODT Writer: Basic image writing - @ivanlanin
-- ODT Writer: Link writing - @ivanlanin
-- ODT Reader: Basic ODText Reader - @ivanlanin #71
-- Section: Ability to define gutter and line numbering - @ivanlanin
-- Font: Small caps, all caps, and double strikethrough - @ivanlanin #151
-- Settings: Ability to use measurement unit other than twips with `setMeasurementUnit` - @ivanlanin #199
-- Style: Remove `bgColor` from `Font`, `Table`, and `Cell` and put it into the new `Shading` style - @ivanlanin
-- Style: New `Indentation` and `Spacing` style - @ivanlanin
-- Paragraph: Ability to define first line and right indentation - @ivanlanin
-
-### Bugfixes
-- Footnote: Footnote content doesn't show footnote reference number - @ivanlanin #170
-- Documentation: Error in a function - @theBeerNut #195
-
-### Deprecated
-- `createTextRun` replaced by `addTextRun`
-- `createFootnote` replaced by `addFootnote`
-- `createHeader` replaced by `addHeader`
-- `createFooter` replaced by `addFooter`
-- `createSection` replaced by `addSection`
-- `Element\Footnote::getReferenceId` replaced by `Element\AbstractElement::getRelationId`
-- `Element\Footnote::setReferenceId` replaced by `Element\AbstractElement::setRelationId`
-- `Footnote::addFootnoteLinkElement` replaced by `Media::addElement`
-- `Footnote::getFootnoteLinkElements` replaced by `Media::getElements`
-- All current methods on `Media`
-- `Element\Link::getLinkSrc` replaced by `Element\Link::getTarget`
-- `Element\Link::getLinkName` replaced by `Element\Link::getText`
-- `Style\Cell::getDefaultBorderColor`
-
-### Miscellaneous
-- Documentation: Simplify page level docblock - @ivanlanin #179
-- Writer: Refactor writer classes and create a new `Write\AbstractWriter` abstract class - @ivanlanin #160
-- General: Refactor folders: `Element` and `Exception` - @ivanlanin #187
-- General: Remove legacy `HashTable` and `Shared\ZipStreamWrapper` and all related properties/methods - @ivanlanin #187
-- Element: New `AbstractElement` abstract class - @ivanlanin #187
-- Media: Refactor media class to use one method for all docPart (section, header, footer, footnote) - @ivanlanin #187
-- General: Remove underscore prefix from all private properties name - @ivanlanin #187
-- General: Move Section `Settings` to `Style\Section` - @ivanlanin #187
-- General: Give `Abstract` prefix and `Interface` suffix for all abstract classes and interfaces as per [PHP-FIG recommendation](https://github.com/php-fig/fig-standards/blob/master/bylaws/002-psr-naming-conventions.md) - @ivanlanin #187
-- Style: New `Style\AbstractStyle` abstract class - @ivanlanin #187
-- Writer: New 'ODText\Base` class - @ivanlanin #187
-- General: Rename `Footnote` to `Footnotes` to reflect the nature of collection - @ivanlanin
-- General: Add some unit tests for Shared & Element (100%!) - @Progi1984
-- Test: Add some samples and tests for image wrapping style - @brunocasado #59
-- Refactor: Remove Style\Tabs - @ivanlanin
-- Refactor: Apply composite pattern for writers - @ivanlanin
-- Refactor: Split `AbstractContainer` from `AbstractElement` - @ivanlanin
-- Refactor: Apply composite pattern for Word2007 reader - @ivanlanin
-
-
-
-v0.9.1 (27 Mar 2014)
--------------------
-This is a bugfix release for PSR-4 compatibility.
-
-- Fixed PSR-4 composer autoloader - @AntonTyutin
-
-
-
-v0.9.0 (26 Mar 2014)
--------------------
-This release marked the transformation to namespaces (PHP 5.3+).
-
-### Features
-- Image: Ability to use remote or GD images using `addImage()` on sections, headers, footer, cells, and textruns - @ivanlanin
-- Header: Ability to use remote or GD images using `addWatermark()` - @ivanlanin
-
-### Bugfixes
-- Preserve text doesn't render correctly when the text is not the first word, e.g. 'Page {PAGE}' - @ivanlanin
-
-### Miscellaneous
-- Move documentation to [Read The Docs](http://phpword.readthedocs.org/en/develop/) - @Progi1984 @ivanlanin #82
-- Reorganize and redesign samples folder - @ivanlanin #137
-- Use `PhpOffice\PhpWord` namespace for PSR compliance - @RomanSyroeshko @gabrielbull #159, #58
-- Restructure folders and change folder name `Classes` to `src` and `Tests` to `test` for PSR compliance - @RomanSyroeshko @gabrielbull
-- Compliance to phpDocumentor - @ivanlanin
-- Merge Style\TableFull into Style\Table. Style\TableFull is deprecated - @ivanlanin #160
-- Merge Section\MemoryImage into Section\Image. Section\Image is deprecated - @ivanlanin #160
-
-
-
-v0.8.1 (17 Mar 2014)
--------------------
-This is a bugfix release for image detection functionality.
-
-- Added fallback for computers that do not have exif_imagetype - @bskrtich, @gabrielbull
-
-
-
-v0.8.0 (15 Mar 2014)
--------------------
-This release merged a lot of improvements from the community. Unit tests introduced in this release and has reached 90% code coverage.
-
-### Features
-- Template: Permit to save a template generated as a file (PHPWord_Template::saveAs()) - @RomanSyroeshko #56, #57
-- Word2007: Support sections page numbering - @gabrielbull
-- Word2007: Added line height methods to mirror the line height settings in Word in the paragraph styling - @gabrielbull
-- Word2007: Added support for page header & page footer height - @JillElaine #5
-- General: Add ability to manage line breaks after image insertion - @bskrtich #6, #66, #84
-- Template: Ability to limit number of replacements performed by setValue() method of Template class - @RomanSyroeshko #52, #53, #85
-- Table row: Repeat as header row & allow row to break across pages - @ivanlanin #48, #86
-- Table: Table width in percentage - @ivanlanin #48, #86
-- Font: Superscript and subscript - @ivanlanin #48, #86
-- Paragraph: Hanging paragraph - @ivanlanin #48, #86
-- Section: Multicolumn and section break - @ivanlanin #48, #86
-- Template: Ability to apply XSL style sheet to Template - @RomanSyroeshko #46, #47, #83
-- General: PHPWord_Shared_Font::pointSizeToTwips() converter - @ivanlanin #87
-- Paragraph: Ability to define normal paragraph style with PHPWord::setNormalStyle() - @ivanlanin #87
-- Paragraph: Ability to define parent style (basedOn) and style for following paragraph (next) - @ivanlanin #87
-- Clone table rows on the fly when using a template document - @jeroenmoors #44, #88
-- Initial addition of basic footnote support - @deds #16
-- Paragraph: Ability to define paragraph pagination: widow control, keep next, keep lines, and page break before - @ivanlanin #92
-- General: PHPWord_Style_Font refactoring - @ivanlanin #93
-- Font: Use points instead of halfpoints internally. Conversion to halfpoints done during XML Writing. - @ivanlanin #93
-- Paragraph: setTabs() function - @ivanlanin #92
-- General: Basic support for TextRun on ODT and RTF - @ivanlanin #99
-- Reader: Basic Reader for Word2007 - @ivanlanin #104
-- TextRun: Allow Text Break in Text Run - @bskrtich  #109
-- General: Support for East Asian fontstyle - @jhfangying #111, #118
-- Image: Use exif_imagetype to check image format instead of extension name - @gabrielbull #114
-- General: Setting for XMLWriter Compatibility option - @bskrtich  #103
-- MemoryImage: Allow remote image when allow_url_open = on - @ivanlanin #122
-- TextBreak: Allow font and paragraph style for text break - @ivanlanin #18
-
-### Bugfixes
-- Fixed bug with cell styling - @gabrielbull
-- Fixed bug list items inside of cells - @gabrielbull
-- Adding a value that contains "&" in a template breaks it - @SiebelsTim #51
-- Example in README.md is broken - @Progi1984 #89
-- General: PHPWord_Shared_Drawing::centimetersToPixels() conversion - @ivanlanin #94
-- Footnote: Corrupt DOCX reported by MS Word when sections > 1 and not every sections have footnote - @ivanlanin #125
-
-### Miscellaneous
-- UnitTests - @Progi1984
-
-
-
-v0.7.0 (28 Jan 2014)
--------------------
-This is the first release after a long development hiatus in [CodePlex](https://phpword.codeplex.com/). This release initialized ODT and RTF Writer, along with some other new features for the existing Word2007 Writer, e.g. tab, multiple header, rowspan and colspan. [Composer](https://packagist.org/packages/phpoffice/phpword) and [Travis](https://travis-ci.org/PHPOffice/PHPWord) were added.
-
-### Features
-- Implement RTF Writer - @Progi1984 #1
-- Implement ODT Writer - @Progi1984 #2
-- Word2007: Add rowspan and colspan to cells - @kaystrobach
-- Word2007: Support for tab stops - @RLovelett
-- Word2007: Support Multiple headers - @RLovelett
-- Word2007: Wrapping Styles to Images - @gabrielbull
-- Added support for image wrapping style - @gabrielbull
-
-### Bugfixes
-- "Warning: Invalid error type specified in ...\PHPWord.php on line 226" is thrown when the specified template file is not found - @RomanSyroeshko #32
-- PHPWord_Shared_String.IsUTF8 returns FALSE for Cyrillic UTF-8 input - @RomanSyroeshko #34
-- Temporary files naming logic in PHPWord_Template can lead to a collision - @RomanSyroeshko #38
-
-### Miscellaneous
-- Add superscript/subscript styling in Excel2007 Writer - @MarkBaker
-- add indentation support to paragraphs - @deds
-- Support for Composer - @Progi1984 #27
-- Basic CI with Travis - @Progi1984
-- Added PHPWord_Exception and exception when could not copy the template - @Progi1984
-- IMPROVED: Moved examples out of Classes directory - @Progi1984
-- IMPROVED: Advanced string replace in setValue for Template - @Esmeraldo [#49](http://phpword.codeplex.com/workitem/49)
diff --git a/vendor/phpoffice/phpword/README.md b/vendor/phpoffice/phpword/README.md
index c50ffc6efc..11bcd1525c 100644
--- a/vendor/phpoffice/phpword/README.md
+++ b/vendor/phpoffice/phpword/README.md
@@ -1,23 +1,15 @@
 # ![PHPWord](https://rawgit.com/PHPOffice/PHPWord/develop/docs/images/phpword.svg "PHPWord")
 
-Master: 
 [![Latest Stable Version](https://poser.pugx.org/phpoffice/phpword/v/stable.png)](https://packagist.org/packages/phpoffice/phpword)
-[![Build Status](https://travis-ci.org/PHPOffice/PHPWord.svg?branch=master)](https://travis-ci.org/PHPOffice/PHPWord)
-[![Code Quality](https://scrutinizer-ci.com/g/PHPOffice/PHPWord/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/PHPOffice/PHPWord/)
 [![Coverage Status](https://coveralls.io/repos/github/PHPOffice/PHPWord/badge.svg?branch=master)](https://coveralls.io/github/PHPOffice/PHPWord?branch=master)
 [![Total Downloads](https://poser.pugx.org/phpoffice/phpword/downloads.png)](https://packagist.org/packages/phpoffice/phpword)
 [![License](https://poser.pugx.org/phpoffice/phpword/license.png)](https://packagist.org/packages/phpoffice/phpword)
+[![CI](https://github.com/PHPOffice/PHPWord/actions/workflows/ci.yml/badge.svg)](https://github.com/PHPOffice/PHPWord/actions/workflows/ci.yml)
 [![Join the chat at https://gitter.im/PHPOffice/PHPWord](https://img.shields.io/badge/GITTER-join%20chat-green.svg)](https://gitter.im/PHPOffice/PHPWord)
 
-Develop:
-[![Latest Development Version](https://img.shields.io/badge/unstable-dev--develop-orange.svg)](https://packagist.org/packages/phpoffice/phpword#dev-develop)
-[![Build Status](https://travis-ci.org/PHPOffice/PHPWord.svg?branch=develop)](https://travis-ci.org/PHPOffice/PHPWord/branches)
-[![Code Quality](https://scrutinizer-ci.com/g/PHPOffice/PHPWord/badges/quality-score.png?b=develop)](https://scrutinizer-ci.com/g/PHPOffice/PHPWord/?branch=develop)
-[![Coverage Status](https://coveralls.io/repos/github/PHPOffice/PHPWord/badge.svg?branch=develop)](https://coveralls.io/github/PHPOffice/PHPWord?branch=develop)
-
 PHPWord is a library written in pure PHP that provides a set of classes to write to and read from different document file formats. The current version of PHPWord supports Microsoft [Office Open XML](http://en.wikipedia.org/wiki/Office_Open_XML) (OOXML or OpenXML), OASIS [Open Document Format for Office Applications](http://en.wikipedia.org/wiki/OpenDocument) (OpenDocument or ODF), [Rich Text Format](http://en.wikipedia.org/wiki/Rich_Text_Format) (RTF), HTML, and PDF.
 
-PHPWord is an open source project licensed under the terms of [LGPL version 3](COPYING.LESSER). PHPWord is aimed to be a high quality software product by incorporating [continuous integration](https://travis-ci.org/PHPOffice/PHPWord) and [unit testing](http://phpoffice.github.io/PHPWord/coverage/develop/). You can learn more about PHPWord by reading the [Developers' Documentation](http://phpword.readthedocs.org/).
+PHPWord is an open source project licensed under the terms of [LGPL version 3](COPYING.LESSER). PHPWord is aimed to be a high quality software product by incorporating [continuous integration](https://github.com/PHPOffice/PHPWord/actions) and unit testing. You can learn more about PHPWord by reading the [Developers' Documentation](https://phpoffice.github.io/PHPWord/).
 
 If you have any questions, please ask on [StackOverFlow](https://stackoverflow.com/questions/tagged/phpword)
 
@@ -28,11 +20,11 @@ Read more about PHPWord:
 - [Installation](#installation)
 - [Getting started](#getting-started)
 - [Contributing](#contributing)
-- [Developers' Documentation](http://phpword.readthedocs.org/)
+- [Developers' Documentation](https://phpoffice.github.io/PHPWord/)
 
 ## Features
 
-With PHPWord, you can create OOXML, ODF, or RTF documents dynamically using your PHP 5.3.3+ scripts. Below are some of the things that you can do with PHPWord library:
+With PHPWord, you can create OOXML, ODF, or RTF documents dynamically using your PHP scripts. Below are some of the things that you can do with PHPWord library:
 
 - Set document properties, e.g. title, subject, and creator.
 - Create document sections with different settings, e.g. portrait/landscape, page size, and page numbering
@@ -60,7 +52,7 @@ With PHPWord, you can create OOXML, ODF, or RTF documents dynamically using your
 
 PHPWord requires the following:
 
-- PHP 5.3.3+
+- PHP 7.1+
 - [XML Parser extension](http://www.php.net/manual/en/xml.installation.php)
 - [Laminas Escaper component](https://docs.laminas.dev/laminas-escaper/intro/)
 - [Zip extension](http://php.net/manual/en/book.zip.php) (optional, used to write OOXML and ODF)
@@ -76,20 +68,11 @@ To [add a dependency](https://getcomposer.org/doc/04-schema.md#package-links) to
 
 Run the following to use the latest stable version
 ```sh
-    composer require phpoffice/phpword
+composer require phpoffice/phpword
 ```
-or if you want the latest master version
+or if you want the latest unreleased version
 ```sh
-    composer require phpoffice/phpword:dev-master
-```
-
-You can of course also manually edit your composer.json file
-```json
-{
-    "require": {
-       "phpoffice/phpword": "v0.18.*"
-    }
-}
+composer require phpoffice/phpword:dev-master
 ```
 
 ## Getting started
@@ -167,13 +150,13 @@ $objWriter->save('helloWorld.html');
 ```
 
 More examples are provided in the [samples folder](samples/). For an easy access to those samples launch `php -S localhost:8000` in the samples directory then browse to [http://localhost:8000](http://localhost:8000) to view the samples.
-You can also read the [Developers' Documentation](http://phpword.readthedocs.org/) for more detail.
+You can also read the [Developers' Documentation](https://phpoffice.github.io/PHPWord/) for more detail.
 
 ## Contributing
 
 We welcome everyone to contribute to PHPWord. Below are some of the things that you can do to contribute.
 
 - Read [our contributing guide](CONTRIBUTING.md).
-- [Fork us](https://github.com/PHPOffice/PHPWord/fork) and [request a pull](https://github.com/PHPOffice/PHPWord/pulls) to the [develop](https://github.com/PHPOffice/PHPWord/tree/develop) branch.
+- [Fork us](https://github.com/PHPOffice/PHPWord/fork) and [request a pull](https://github.com/PHPOffice/PHPWord/pulls) to the [master](https://github.com/PHPOffice/PHPWord/tree/master) branch.
 - Submit [bug reports or feature requests](https://github.com/PHPOffice/PHPWord/issues) to GitHub.
-- Follow [@PHPWord](https://twitter.com/PHPWord) and [@PHPOffice](https://twitter.com/PHPOffice) on Twitter.
+- Follow [@PHPOffice](https://twitter.com/PHPOffice) on Twitter.
diff --git a/vendor/phpoffice/phpword/bootstrap.php b/vendor/phpoffice/phpword/bootstrap.php
index b8f5092c68..b41363e8a2 100644
--- a/vendor/phpoffice/phpword/bootstrap.php
+++ b/vendor/phpoffice/phpword/bootstrap.php
@@ -15,9 +15,8 @@
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
-//$vendorDirPath = realpath(__DIR__ . '/vendor');
+// $vendorDirPath = realpath(__DIR__ . '/vendor');
 $vendorDirPath = __DIR__ . "/../..";
-
 if (file_exists($vendorDirPath . '/autoload.php')) {
     require $vendorDirPath . '/autoload.php';
 } else {
diff --git a/vendor/phpoffice/phpword/composer.json b/vendor/phpoffice/phpword/composer.json
index e588ef7bd1..bce0f4b8f4 100644
--- a/vendor/phpoffice/phpword/composer.json
+++ b/vendor/phpoffice/phpword/composer.json
@@ -6,7 +6,7 @@
         "docx", "OOXML", "OpenXML", "Office Open XML", "ISO IEC 29500", "WordprocessingML",
         "RTF", "Rich Text Format", "doc", "odt", "ODF", "OpenDocument", "PDF", "HTML"
     ],
-    "homepage": "http://phpoffice.github.io",
+    "homepage": "https://phpoffice.github.io/PHPWord/",
     "type": "library",
     "license": "LGPL-3.0",
     "authors": [
@@ -45,7 +45,8 @@
             "php-cs-fixer fix --ansi --dry-run --diff",
             "phpcs --report-width=200 --report-summary --report-full samples/ src/ tests/ --ignore=src/PhpWord/Shared/PCLZip --standard=PSR2 -n",
             "phpmd src/,tests/ text ./phpmd.xml.dist --exclude pclzip.lib.php",
-            "@test-no-coverage"
+            "@test-no-coverage",
+            "phpstan analyse --ansi"
         ],
         "fix": [
             "php-cs-fixer fix --ansi"
@@ -57,23 +58,30 @@
         "check": "Runs PHP CheckStyle and PHP Mess detector",
         "fix": "Fixes issues found by PHP-CS"
     },
+    "config": {
+        "platform": {
+            "php": "8.0"
+        }
+    },
     "require": {
-        "php": "^5.3.3 || ^7.0 || ^8.0",
+        "php": "^7.1|^8.0",
+        "ext-dom": "*",
+        "ext-json": "*",
         "ext-xml": "*",
-        "laminas/laminas-escaper": "^2.2"
+        "phpoffice/math": "^0.2"
     },
     "require-dev": {
         "ext-zip": "*",
         "ext-gd": "*",
-        "phpunit/phpunit": "^4.8.36 || ^7.0",
-        "squizlabs/php_codesniffer": "^2.9 || ^3.5",
-        "friendsofphp/php-cs-fixer": "^2.2",
-        "phpmd/phpmd": "2.*",
-        "phploc/phploc": "2.* || 3.* || 4.* || 5.* || 6.* || 7.*",
-        "dompdf/dompdf":"0.8.* || 1.0.*",
-        "tecnickcom/tcpdf": "6.*",
-        "mpdf/mpdf": "5.7.4 || 6.* || 7.* || 8.*",
-        "php-coveralls/php-coveralls": "1.1.0 || ^2.0"
+        "ext-libxml": "*",
+        "dompdf/dompdf": "^2.0",
+        "mpdf/mpdf": "^8.1",
+        "phpmd/phpmd": "^2.13",
+        "phpunit/phpunit": ">=7.0",
+        "tecnickcom/tcpdf": "^6.5",
+        "symfony/process": "^4.4 || ^5.0",
+        "friendsofphp/php-cs-fixer": "^3.3",
+        "phpstan/phpstan-phpunit": "@stable"
     },
     "suggest": {
         "ext-zip": "Allows writing OOXML and ODF",
@@ -87,9 +95,9 @@
             "PhpOffice\\PhpWord\\": "src/PhpWord"
         }
     },
-    "extra": {
-        "branch-alias": {
-            "dev-develop": "0.19-dev"
+    "autoload-dev": {
+        "psr-4": {
+            "PhpOffice\\PhpWordTests\\": "tests/PhpWordTests"
         }
     }
 }
diff --git a/vendor/phpoffice/phpword/mkdocs.yml b/vendor/phpoffice/phpword/mkdocs.yml
new file mode 100644
index 0000000000..dfabbb195a
--- /dev/null
+++ b/vendor/phpoffice/phpword/mkdocs.yml
@@ -0,0 +1,118 @@
+site_name: PHPWord
+site_url: https://phpoffice.github.io/PHPWord
+repo_url: https://github.com/PHPOffice/PHPWord
+repo_name: PHPOffice/PHPWord
+edit_uri: edit/develop/docs/
+
+## Theme
+theme:
+  name: material
+  palette:
+    primary: indigo
+  features:
+    - search.highlight
+    - search.suggest
+
+## Plugins
+plugins:
+  - search
+  - autolink_references:
+      autolinks:
+        - reference_prefix: GP-
+          target_url: https://github.com/<num>
+        - reference_prefix: GH-
+          target_url: https://github.com/PHPOffice/PHPWord/issues/<num>
+        - reference_prefix: CP-
+          target_url: https://archive.codeplex.com/?p=phpword&<num>
+
+## Config
+extra:
+  generator: false
+markdown_extensions:
+  ## Syntax highlighting
+  - pymdownx.highlight
+  - pymdownx.superfences
+  ## Support for emojis
+  - pymdownx.emoji:
+      emoji_index: !!python/name:materialx.emoji.twemoji
+      emoji_generator: !!python/name:materialx.emoji.to_svg
+  ## Support for call-outs
+  - admonition
+  - pymdownx.details
+use_directory_urls: false
+
+## Navigation
+nav:
+  - Introduction: 'index.md'
+  - Install: 'install.md'
+  - Usage:
+    - Introduction: 'usage/introduction.md'
+    - Containers: 'usage/containers.md'
+    - Elements: 
+      - Introduction: 'usage/elements/index.md'
+      - Chart: 'usage/elements/chart.md'
+      - Checkbox: 'usage/elements/checkbox.md'
+      - Comment: 'usage/elements/comment.md'
+      - Field: 'usage/elements/field.md'
+      - Footnote & Endnote: 'usage/elements/note.md'
+      - Formula: 'usage/elements/formula.md'
+      - Image: 'usage/elements/image.md'
+      - Line: 'usage/elements/line.md'
+      - Link: 'usage/elements/link.md'
+      - List: 'usage/elements/list.md'
+      - OLE Object: 'usage/elements/oleobject.md'
+      - Page Break: 'usage/elements/pagebreak.md'
+      - Preserve Text: 'usage/elements/preservetext.md'
+      - Text: 'usage/elements/text.md'
+      - TextBox: 'usage/elements/textbox.md'
+      - Text Break: 'usage/elements/textbreak.md'
+      - Table: 'usage/elements/table.md'
+      - Table of contents: 'usage/elements/toc.md'
+      - Title: 'usage/elements/title.md'
+      - Track Changes: 'usage/elements/trackchanges.md'
+      - Watermark: 'usage/elements/watermark.md'
+    - Styles: 
+      - Chart: 'usage/styles/chart.md'
+      - Font: 'usage/styles/font.md'
+      - Image: 'usage/styles/image.md'
+      - Numbering Level: 'usage/styles/numberinglevel.md'
+      - Paragraph: 'usage/styles/paragraph.md'
+      - Section: 'usage/styles/section.md'
+      - Table: 'usage/styles/table.md'
+    - Template Processing: 'usage/template.md'
+    - Readers: 'usage/readers.md'
+    - Writers: 'usage/writers.md'
+  - FAQ: 'faq.md'
+  - How to: 'howto.md'
+  - Credits: 'credits.md'
+  - Releases:
+    - '1.x':
+      - '1.3.0 (WIP)': 'changes/1.x/1.3.0.md'
+      - '1.2.0': 'changes/1.x/1.2.0.md'
+      - '1.1.0': 'changes/1.x/1.1.0.md'
+      - '1.0.0': 'changes/1.x/1.0.0.md'
+    - '0.x':
+      - '0.18.3': 'changes/0.x/0.18.3.md'
+      - '0.18.2': 'changes/0.x/0.18.2.md'
+      - '0.18.1': 'changes/0.x/0.18.1.md'
+      - '0.18.0': 'changes/0.x/0.18.0.md'
+      - '0.17.0': 'changes/0.x/0.17.0.md'
+      - '0.16.0': 'changes/0.x/0.16.0.md'
+      - '0.15.0': 'changes/0.x/0.15.0.md'
+      - '0.14.0': 'changes/0.x/0.14.0.md'
+      - '0.13.0': 'changes/0.x/0.13.0.md'
+      - '0.12.1': 'changes/0.x/0.12.1.md'
+      - '0.12.0': 'changes/0.x/0.12.0.md'
+      - '0.11.1': 'changes/0.x/0.11.1.md'
+      - '0.11.0': 'changes/0.x/0.11.0.md'
+      - '0.10.1': 'changes/0.x/0.10.1.md'
+      - '0.10.0': 'changes/0.x/0.10.0.md'
+      - '0.9.1': 'changes/0.x/0.9.1.md'
+      - '0.9.0': 'changes/0.x/0.9.0.md'
+      - '0.8.1': 'changes/0.x/0.8.1.md'
+      - '0.8.0': 'changes/0.x/0.8.0.md'
+      - '0.7.0': 'changes/0.x/0.7.0.md'
+  - Developers:
+    - 'Coveralls': 'https://coveralls.io/github/PHPOffice/PHPWord'
+    - 'Code Coverage': 'coverage/index.html'
+    - 'PHPDoc': 'docs/index.html'
diff --git a/vendor/phpoffice/phpword/phpstan-baseline.neon b/vendor/phpoffice/phpword/phpstan-baseline.neon
new file mode 100644
index 0000000000..909718b83b
--- /dev/null
+++ b/vendor/phpoffice/phpword/phpstan-baseline.neon
@@ -0,0 +1,1931 @@
+parameters:
+	ignoreErrors:
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Element\\\\AbstractContainer\\:\\:__call\\(\\) should return PhpOffice\\\\PhpWord\\\\Element\\\\AbstractElement but returns null\\.$#"
+			count: 1
+			path: src/PhpWord/Element/AbstractContainer.php
+
+		-
+			message: "#^Parameter \\#1 \\$objectOrClass of class ReflectionClass constructor expects class\\-string\\<T of object\\>\\|T of object, string given\\.$#"
+			count: 1
+			path: src/PhpWord/Element/AbstractContainer.php
+
+		-
+			message: "#^Parameter \\#1 \\$string of function md5 expects string, int\\<0, max\\> given\\.$#"
+			count: 1
+			path: src/PhpWord/Element/AbstractElement.php
+
+		-
+			message: "#^Parameter \\#2 \\$styleValue of method PhpOffice\\\\PhpWord\\\\Element\\\\AbstractElement\\:\\:setNewStyle\\(\\) expects array\\|PhpOffice\\\\PhpWord\\\\Style\\|string\\|null, array\\|PhpOffice\\\\PhpWord\\\\Style\\\\Cell\\|null given\\.$#"
+			count: 1
+			path: src/PhpWord/Element/Cell.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Element\\\\Field\\:\\:setOptions\\(\\) should return PhpOffice\\\\PhpWord\\\\Element\\\\Field but returns array\\.$#"
+			count: 1
+			path: src/PhpWord/Element/Field.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Element\\\\Field\\:\\:setProperties\\(\\) should return PhpOffice\\\\PhpWord\\\\Element\\\\Field but returns array\\.$#"
+			count: 1
+			path: src/PhpWord/Element/Field.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Element\\\\Field\\:\\:\\$fontStyle \\(PhpOffice\\\\PhpWord\\\\Style\\\\Font\\|string\\) does not accept null\\.$#"
+			count: 1
+			path: src/PhpWord/Element/Field.php
+
+		-
+			message: "#^Result of \\|\\| is always true\\.$#"
+			count: 1
+			path: src/PhpWord/Element/Field.php
+
+		-
+			message: "#^Parameter \\#2 \\$styleValue of method PhpOffice\\\\PhpWord\\\\Element\\\\AbstractElement\\:\\:setNewStyle\\(\\) expects array\\|PhpOffice\\\\PhpWord\\\\Style\\|string\\|null, array\\|PhpOffice\\\\PhpWord\\\\Style\\\\Paragraph\\|string\\|null given\\.$#"
+			count: 1
+			path: src/PhpWord/Element/Footnote.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Element\\\\Image\\:\\:getArchiveImageSize\\(\\) should return array\\|null but returns array<int\\|string, int\\|string>\\|false\\|null\\.$#"
+			count: 1
+			path: src/PhpWord/Element/Image.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Element\\\\Image\\:\\:getImageString\\(\\) should return string\\|null but returns string\\|false\\|null\\.$#"
+			count: 1
+			path: src/PhpWord/Element/Image.php
+
+		-
+			message: "#^Parameter \\#1 \\$callback of function call_user_func expects callable\\(\\)\\: mixed, string given\\.$#"
+			count: 1
+			path: src/PhpWord/Element/Image.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Element\\\\Image\\:\\:\\$source \\(string\\) does not accept string\\|false\\.$#"
+			count: 1
+			path: src/PhpWord/Element/Image.php
+
+		-
+			message: "#^Offset 'extension' does not exist on array\\{dirname\\?\\: string, basename\\: string, extension\\?\\: string, filename\\: string\\}\\.$#"
+			count: 2
+			path: src/PhpWord/Element/OLEObject.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Element\\\\OLEObject\\:\\:\\$icon \\(string\\) does not accept string\\|false\\.$#"
+			count: 1
+			path: src/PhpWord/Element/OLEObject.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Element\\\\Section\\:\\:addHeader\\(\\) should return PhpOffice\\\\PhpWord\\\\Element\\\\Header but returns PhpOffice\\\\PhpWord\\\\Element\\\\Footer\\.$#"
+			count: 1
+			path: src/PhpWord/Element/Section.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Element\\\\Section\\:\\:addHeaderFooter\\(\\) should return PhpOffice\\\\PhpWord\\\\Element\\\\Footer but returns PhpOffice\\\\PhpWord\\\\Element\\\\AbstractContainer\\.$#"
+			count: 1
+			path: src/PhpWord/Element/Section.php
+
+		-
+			message: "#^Parameter \\#2 \\$styleValue of method PhpOffice\\\\PhpWord\\\\Element\\\\AbstractElement\\:\\:setNewStyle\\(\\) expects array\\|PhpOffice\\\\PhpWord\\\\Style\\|string\\|null, array\\|PhpOffice\\\\PhpWord\\\\Style\\|PhpOffice\\\\PhpWord\\\\Style\\\\Section\\|string given\\.$#"
+			count: 1
+			path: src/PhpWord/Element/Section.php
+
+		-
+			message: "#^Parameter \\#3 \\$length of function substr expects int\\|null, int\\|false given\\.$#"
+			count: 1
+			path: src/PhpWord/Element/Section.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Escaper\\\\Rtf\\:\\:escapeAsciiCharacter\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Escaper/Rtf.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Escaper\\\\Rtf\\:\\:escapeAsciiCharacter\\(\\) has parameter \\$code with no type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Escaper/Rtf.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Escaper\\\\Rtf\\:\\:escapeMultibyteCharacter\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Escaper/Rtf.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Escaper\\\\Rtf\\:\\:escapeMultibyteCharacter\\(\\) has parameter \\$code with no type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Escaper/Rtf.php
+
+		-
+			message: "#^Cannot instantiate interface PhpOffice\\\\PhpWord\\\\Writer\\\\WriterInterface\\.$#"
+			count: 1
+			path: src/PhpWord/IOFactory.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\IOFactory\\:\\:createObject\\(\\) should return PhpOffice\\\\PhpWord\\\\Reader\\\\ReaderInterface\\|PhpOffice\\\\PhpWord\\\\Writer\\\\WriterInterface but returns object\\.$#"
+			count: 1
+			path: src/PhpWord/IOFactory.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\IOFactory\\:\\:createReader\\(\\) should return PhpOffice\\\\PhpWord\\\\Reader\\\\ReaderInterface but returns PhpOffice\\\\PhpWord\\\\Reader\\\\ReaderInterface\\|PhpOffice\\\\PhpWord\\\\Writer\\\\WriterInterface\\.$#"
+			count: 1
+			path: src/PhpWord/IOFactory.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\IOFactory\\:\\:createWriter\\(\\) should return PhpOffice\\\\PhpWord\\\\Writer\\\\WriterInterface but returns PhpOffice\\\\PhpWord\\\\Writer\\\\PDF\\|PhpOffice\\\\PhpWord\\\\Writer\\\\WriterInterface\\.$#"
+			count: 1
+			path: src/PhpWord/IOFactory.php
+
+		-
+			message: "#^Parameter \\#1 \\$objectOrClass of class ReflectionClass constructor expects class\\-string\\<T of object\\>\\|T of object, string given\\.$#"
+			count: 1
+			path: src/PhpWord/IOFactory.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\PhpWord\\:\\:getDefaultFontSize\\(\\) should return int but returns float\\|int\\.$#"
+			count: 1
+			path: src/PhpWord/PhpWord.php
+
+		-
+			message: "#^Parameter \\#1 \\$callback of function forward_static_call_array expects callable\\(\\)\\: mixed, array\\{'PhpOffice\\\\\\\\PhpWord…', string\\} given\\.$#"
+			count: 1
+			path: src/PhpWord/PhpWord.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Reader\\\\AbstractReader\\:\\:openFile\\(\\) should return resource but return statement is missing\\.$#"
+			count: 1
+			path: src/PhpWord/Reader/AbstractReader.php
+
+		-
+			message: "#^Parameter \\#2 \\$html of static method PhpOffice\\\\PhpWord\\\\Shared\\\\Html\\:\\:addHtml\\(\\) expects string, string\\|false given\\.$#"
+			count: 1
+			path: src/PhpWord/Reader/HTML.php
+
+		-
+			message: "#^Offset 'textNodes' on array\\{changed\\: PhpOffice\\\\PhpWord\\\\Element\\\\TrackChange, textNodes\\: DOMNodeList\\<DOMElement\\>\\} in isset\\(\\) always exists and is not nullable\\.$#"
+			count: 1
+			path: src/PhpWord/Reader/ODText/Content.php
+
+		-
+			message: "#^Parameter \\#2 \\$contextNode of method PhpOffice\\\\PhpWord\\\\Shared\\\\XMLReader\\:\\:getElements\\(\\) expects DOMElement\\|null, DOMNode\\|null given\\.$#"
+			count: 2
+			path: src/PhpWord/Reader/ODText/Content.php
+
+		-
+			message: "#^Parameter \\#2 \\$depth of method PhpOffice\\\\PhpWord\\\\Element\\\\AbstractContainer\\:\\:addTitle\\(\\) expects int, string\\|null given\\.$#"
+			count: 1
+			path: src/PhpWord/Reader/ODText/Content.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Reader\\\\RTF\\\\Document\\:\\:\\$rtf \\(string\\) does not accept string\\|false\\.$#"
+			count: 1
+			path: src/PhpWord/Reader/RTF.php
+
+		-
+			message: "#^Cannot call method setStyleByArray\\(\\) on PhpOffice\\\\PhpWord\\\\Style\\\\Font\\|string\\.$#"
+			count: 1
+			path: src/PhpWord/Reader/RTF/Document.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Reader\\\\RTF\\\\Document\\:\\:\\$phpWord is never read, only written\\.$#"
+			count: 1
+			path: src/PhpWord/Reader/RTF/Document.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Reader\\\\ReaderInterface\\:\\:load\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Reader/ReaderInterface.php
+
+		-
+			message: "#^Parameter \\#1 \\$string of function substr expects string, string\\|false given\\.$#"
+			count: 2
+			path: src/PhpWord/Reader/Word2007.php
+
+		-
+			message: "#^Parameter \\#2 \\$xmlFile of method PhpOffice\\\\PhpWord\\\\Reader\\\\Word2007\\:\\:getRels\\(\\) expects string, string\\|false given\\.$#"
+			count: 1
+			path: src/PhpWord/Reader/Word2007.php
+
+		-
+			message: "#^Parameter \\#3 \\$subject of function str_replace expects array\\|string, string\\|false given\\.$#"
+			count: 1
+			path: src/PhpWord/Reader/Word2007.php
+
+		-
+			message: "#^Binary operation \"/\" between string\\|null and 2 results in an error\\.$#"
+			count: 1
+			path: src/PhpWord/Reader/Word2007/AbstractPart.php
+
+		-
+			message: "#^Call to an undefined method DOMNode\\:\\:getAttribute\\(\\)\\.$#"
+			count: 2
+			path: src/PhpWord/Reader/Word2007/AbstractPart.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Reader\\\\Word2007\\\\AbstractPart\\:\\:getHeadingDepth\\(\\) never returns float so it can be removed from the return type\\.$#"
+			count: 1
+			path: src/PhpWord/Reader/Word2007/AbstractPart.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Reader\\\\Word2007\\\\AbstractPart\\:\\:getHeadingDepth\\(\\) should return float\\|int\\|null but returns string\\.$#"
+			count: 1
+			path: src/PhpWord/Reader/Word2007/AbstractPart.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Reader\\\\Word2007\\\\AbstractPart\\:\\:read\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Reader/Word2007/AbstractPart.php
+
+		-
+			message: "#^Parameter \\#1 \\$depth of method PhpOffice\\\\PhpWord\\\\Element\\\\AbstractContainer\\:\\:addListItemRun\\(\\) expects int, string\\|null given\\.$#"
+			count: 1
+			path: src/PhpWord/Reader/Word2007/AbstractPart.php
+
+		-
+			message: "#^Parameter \\#1 \\$height of method PhpOffice\\\\PhpWord\\\\Element\\\\Table\\:\\:addRow\\(\\) expects int\\|null, string\\|null given\\.$#"
+			count: 1
+			path: src/PhpWord/Reader/Word2007/AbstractPart.php
+
+		-
+			message: "#^Parameter \\#1 \\$value of method PhpOffice\\\\PhpWord\\\\Element\\\\AbstractElement\\:\\:setRelationId\\(\\) expects int, string\\|null given\\.$#"
+			count: 2
+			path: src/PhpWord/Reader/Word2007/AbstractPart.php
+
+		-
+			message: "#^Parameter \\#1 \\$width of method PhpOffice\\\\PhpWord\\\\Element\\\\Row\\:\\:addCell\\(\\) expects int\\|null, string\\|null given\\.$#"
+			count: 1
+			path: src/PhpWord/Reader/Word2007/AbstractPart.php
+
+		-
+			message: "#^Parameter \\#2 \\$contextNode of method PhpOffice\\\\PhpWord\\\\Shared\\\\XMLReader\\:\\:getAttribute\\(\\) expects DOMElement\\|null, DOMNode\\|null given\\.$#"
+			count: 1
+			path: src/PhpWord/Reader/Word2007/AbstractPart.php
+
+		-
+			message: "#^Parameter \\#2 \\$depth of method PhpOffice\\\\PhpWord\\\\Element\\\\AbstractContainer\\:\\:addTitle\\(\\) expects int, float\\|int given\\.$#"
+			count: 1
+			path: src/PhpWord/Reader/Word2007/AbstractPart.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between null and DOMElement will always evaluate to false\\.$#"
+			count: 1
+			path: src/PhpWord/Reader/Word2007/AbstractPart.php
+
+		-
+			message: "#^Parameter \\#2 \\$relationId of method PhpOffice\\\\PhpWord\\\\Reader\\\\Word2007\\\\Footnotes\\:\\:getElement\\(\\) expects int, string\\|null given\\.$#"
+			count: 1
+			path: src/PhpWord/Reader/Word2007/Footnotes.php
+
+		-
+			message: "#^Parameter \\#3 \\$levelId of method PhpOffice\\\\PhpWord\\\\Reader\\\\Word2007\\\\Numbering\\:\\:readLevel\\(\\) expects int, string\\|null given\\.$#"
+			count: 2
+			path: src/PhpWord/Reader/Word2007/Numbering.php
+
+		-
+			message: "#^Parameter \\#1 \\$comments of method PhpOffice\\\\PhpWord\\\\ComplexType\\\\TrackChangesView\\:\\:setComments\\(\\) expects bool\\|null, string\\|null given\\.$#"
+			count: 1
+			path: src/PhpWord/Reader/Word2007/Settings.php
+
+		-
+			message: "#^Parameter \\#1 \\$consecutiveHyphenLimit of method PhpOffice\\\\PhpWord\\\\Metadata\\\\Settings\\:\\:setConsecutiveHyphenLimit\\(\\) expects int, string given\\.$#"
+			count: 1
+			path: src/PhpWord/Reader/Word2007/Settings.php
+
+		-
+			message: "#^Parameter \\#1 \\$hyphenationZone of method PhpOffice\\\\PhpWord\\\\Metadata\\\\Settings\\:\\:setHyphenationZone\\(\\) expects float\\|int\\|null, string given\\.$#"
+			count: 1
+			path: src/PhpWord/Reader/Word2007/Settings.php
+
+		-
+			message: "#^Parameter \\#1 \\$filename of function parse_ini_file expects string, string\\|false given\\.$#"
+			count: 1
+			path: src/PhpWord/Settings.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Shared\\\\AbstractEnum\\:\\:getConstants\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/AbstractEnum.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Shared\\\\AbstractEnum\\:\\:\\$constCacheArray has no type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/AbstractEnum.php
+
+		-
+			message: "#^Binary operation \"/\" between string and 10 results in an error\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/Converter.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Shared\\\\Converter\\:\\:angleToDegree\\(\\) should return int but returns float\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/Converter.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Shared\\\\Converter\\:\\:cssToPoint\\(\\) should return float\\|null but returns string\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/Converter.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Shared\\\\Converter\\:\\:htmlToRgb\\(\\) should return array but returns false\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/Converter.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Shared\\\\Converter\\:\\:inchToEmu\\(\\) should return int but returns float\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/Converter.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Shared\\\\Converter\\:\\:pixelToEmu\\(\\) should return int but returns float\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/Converter.php
+
+		-
+			message: "#^Parameter \\#1 \\$centimeter of static method PhpOffice\\\\PhpWord\\\\Shared\\\\Converter\\:\\:cmToPoint\\(\\) expects float, string given\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/Converter.php
+
+		-
+			message: "#^Parameter \\#1 \\$inch of static method PhpOffice\\\\PhpWord\\\\Shared\\\\Converter\\:\\:inchToPoint\\(\\) expects float, string given\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/Converter.php
+
+		-
+			message: "#^Parameter \\#1 \\$pica of static method PhpOffice\\\\PhpWord\\\\Shared\\\\Converter\\:\\:picaToPoint\\(\\) expects float, string given\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/Converter.php
+
+		-
+			message: "#^Parameter \\#1 \\$pixel of static method PhpOffice\\\\PhpWord\\\\Shared\\\\Converter\\:\\:pixelToPoint\\(\\) expects float, string given\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/Converter.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Shared\\\\Drawing\\:\\:angleToDegrees\\(\\) should return int but returns float\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/Drawing.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Shared\\\\Drawing\\:\\:emuToPixels\\(\\) should return int but returns float\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/Drawing.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Shared\\\\Drawing\\:\\:pixelsToEmu\\(\\) should return int but returns float\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/Drawing.php
+
+		-
+			message: "#^Binary operation \"\\*\" between string and 50 results in an error\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/Html.php
+
+		-
+			message: "#^Call to an undefined method DOMNode\\:\\:getAttribute\\(\\)\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/Html.php
+
+		-
+			message: "#^Cannot call method setBorderSize\\(\\) on PhpOffice\\\\PhpWord\\\\Style\\\\Table\\|string\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/Html.php
+
+		-
+			message: "#^Cannot call method setStyleName\\(\\) on PhpOffice\\\\PhpWord\\\\Style\\\\Table\\|string\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/Html.php
+
+		-
+			message: "#^If condition is always true\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/Html.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Shared\\\\Html\\:\\:addHtml\\(\\) has parameter \\$options with no type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/Html.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Shared\\\\Html\\:\\:filterOutNonInheritedStyles\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/Html.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Shared\\\\Html\\:\\:mapBorderColor\\(\\) has parameter \\$cssBorderColor with no type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/Html.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Shared\\\\Html\\:\\:mapBorderColor\\(\\) has parameter \\$styles with no type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/Html.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Shared\\\\Html\\:\\:mapListType\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/Html.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Shared\\\\Html\\:\\:parseLink\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/Html.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Shared\\\\Html\\:\\:parseList\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/Html.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Shared\\\\Html\\:\\:parseStyleDeclarations\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/Html.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Shared\\\\Html\\:\\:recursiveParseStylesInHierarchy\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/Html.php
+
+		-
+			message: "#^Parameter \\#1 \\$attribute of static method PhpOffice\\\\PhpWord\\\\Shared\\\\Html\\:\\:parseStyle\\(\\) expects DOMAttr, DOMNode given\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/Html.php
+
+		-
+			message: "#^Parameter \\#2 \\$element of static method PhpOffice\\\\PhpWord\\\\Shared\\\\Html\\:\\:parseNode\\(\\) expects PhpOffice\\\\PhpWord\\\\Element\\\\AbstractContainer, PhpOffice\\\\PhpWord\\\\Element\\\\AbstractContainer\\|PhpOffice\\\\PhpWord\\\\Element\\\\Row\\|PhpOffice\\\\PhpWord\\\\Element\\\\Table given\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/Html.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Shared\\\\Html\\:\\:\\$listIndex has no type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/Html.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Shared\\\\Html\\:\\:\\$options has no type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/Html.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Shared\\\\Html\\:\\:\\$xpath has no type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/Html.php
+
+		-
+			message: "#^Result of \\|\\| is always true\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/Html.php
+
+		-
+			message: "#^Right side of && is always true\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/Html.php
+
+		-
+			message: "#^Variable \\$cNodes in empty\\(\\) always exists and is not falsy\\.$#"
+			count: 2
+			path: src/PhpWord/Shared/Html.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Shared\\\\Microsoft\\\\PasswordEncoder\\:\\:\\$encryptionMatrix has no type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/Microsoft/PasswordEncoder.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Shared\\\\Microsoft\\\\PasswordEncoder\\:\\:\\$initialCodeArray has no type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/Microsoft/PasswordEncoder.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Shared\\\\Microsoft\\\\PasswordEncoder\\:\\:\\$passwordMaxLength has no type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/Microsoft/PasswordEncoder.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Shared\\\\XMLWriter\\:\\:getData\\(\\) should return string but returns string\\|false\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/XMLWriter.php
+
+		-
+			message: "#^Call to method add\\(\\) on an unknown class PclZip\\.$#"
+			count: 2
+			path: src/PhpWord/Shared/ZipArchive.php
+
+		-
+			message: "#^Call to method addFromString\\(\\) on an unknown class PclZip\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/ZipArchive.php
+
+		-
+			message: "#^Call to method close\\(\\) on an unknown class PclZip\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/ZipArchive.php
+
+		-
+			message: "#^Call to method extract\\(\\) on an unknown class PclZip\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/ZipArchive.php
+
+		-
+			message: "#^Call to method extractByIndex\\(\\) on an unknown class PclZip\\.$#"
+			count: 3
+			path: src/PhpWord/Shared/ZipArchive.php
+
+		-
+			message: "#^Call to method extractTo\\(\\) on an unknown class PclZip\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/ZipArchive.php
+
+		-
+			message: "#^Call to method getFromName\\(\\) on an unknown class PclZip\\.$#"
+			count: 2
+			path: src/PhpWord/Shared/ZipArchive.php
+
+		-
+			message: "#^Call to method listContent\\(\\) on an unknown class PclZip\\.$#"
+			count: 3
+			path: src/PhpWord/Shared/ZipArchive.php
+
+		-
+			message: "#^Comparison operation \"\\!\\=\" between array and 0 results in an error\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/ZipArchive.php
+
+		-
+			message: "#^Constant PCLZIP_OPT_ADD_PATH not found\\.$#"
+			count: 2
+			path: src/PhpWord/Shared/ZipArchive.php
+
+		-
+			message: "#^Constant PCLZIP_OPT_EXTRACT_AS_STRING not found\\.$#"
+			count: 2
+			path: src/PhpWord/Shared/ZipArchive.php
+
+		-
+			message: "#^Constant PCLZIP_OPT_PATH not found\\.$#"
+			count: 2
+			path: src/PhpWord/Shared/ZipArchive.php
+
+		-
+			message: "#^Constant PCLZIP_OPT_REMOVE_PATH not found\\.$#"
+			count: 2
+			path: src/PhpWord/Shared/ZipArchive.php
+
+		-
+			message: "#^Instantiated class PclZip not found\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/ZipArchive.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Shared\\\\ZipArchive\\:\\:getFromName\\(\\) should return string but returns string\\|false\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/ZipArchive.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Shared\\\\ZipArchive\\:\\:open\\(\\) should return bool but returns int\\|true\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/ZipArchive.php
+
+		-
+			message: "#^Offset 'dirname' does not exist on array\\{dirname\\?\\: string, basename\\: string, extension\\?\\: string, filename\\: string\\}\\.$#"
+			count: 3
+			path: src/PhpWord/Shared/ZipArchive.php
+
+		-
+			message: "#^PHPDoc tag @var for variable \\$zip contains unknown class PclZip\\.$#"
+			count: 6
+			path: src/PhpWord/Shared/ZipArchive.php
+
+		-
+			message: "#^Parameter \\#1 \\$callback of function call_user_func_array expects callable\\(\\)\\: mixed, array\\{\\$this\\(PhpOffice\\\\PhpWord\\\\Shared\\\\ZipArchive\\)\\|PclZip\\|ZipArchive, mixed\\} given\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/ZipArchive.php
+
+		-
+			message: "#^Parameter \\#1 \\$stream of function fclose expects resource, resource\\|false given\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/ZipArchive.php
+
+		-
+			message: "#^Parameter \\#1 \\$stream of function fwrite expects resource, resource\\|false given\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/ZipArchive.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Shared\\\\ZipArchive\\:\\:\\$zip has unknown class PclZip as its type\\.$#"
+			count: 1
+			path: src/PhpWord/Shared/ZipArchive.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Style\\:\\:addFontStyle\\(\\) should return PhpOffice\\\\PhpWord\\\\Style\\\\Font but returns PhpOffice\\\\PhpWord\\\\Style\\\\AbstractStyle\\.$#"
+			count: 1
+			path: src/PhpWord/Style.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Style\\:\\:addLinkStyle\\(\\) should return PhpOffice\\\\PhpWord\\\\Style\\\\Font but returns PhpOffice\\\\PhpWord\\\\Style\\\\AbstractStyle\\.$#"
+			count: 1
+			path: src/PhpWord/Style.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Style\\:\\:addNumberingStyle\\(\\) should return PhpOffice\\\\PhpWord\\\\Style\\\\Numbering but returns PhpOffice\\\\PhpWord\\\\Style\\\\AbstractStyle\\.$#"
+			count: 1
+			path: src/PhpWord/Style.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Style\\:\\:addParagraphStyle\\(\\) should return PhpOffice\\\\PhpWord\\\\Style\\\\Paragraph but returns PhpOffice\\\\PhpWord\\\\Style\\\\AbstractStyle\\.$#"
+			count: 1
+			path: src/PhpWord/Style.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Style\\:\\:addTableStyle\\(\\) should return PhpOffice\\\\PhpWord\\\\Style\\\\Table but returns PhpOffice\\\\PhpWord\\\\Style\\\\AbstractStyle\\.$#"
+			count: 1
+			path: src/PhpWord/Style.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Style\\:\\:addTitleStyle\\(\\) should return PhpOffice\\\\PhpWord\\\\Style\\\\Font but returns PhpOffice\\\\PhpWord\\\\Style\\\\AbstractStyle\\.$#"
+			count: 1
+			path: src/PhpWord/Style.php
+
+		-
+			message: "#^Call to an undefined method object\\:\\:setStyleByArray\\(\\)\\.$#"
+			count: 1
+			path: src/PhpWord/Style/AbstractStyle.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Style\\\\AbstractStyle\\:\\:setFloatVal\\(\\) should return float\\|null but returns float\\|int\\|string\\|null\\.$#"
+			count: 1
+			path: src/PhpWord/Style/AbstractStyle.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Style\\\\AbstractStyle\\:\\:setNumericVal\\(\\) should return float\\|int\\|null but returns float\\|int\\|string\\|null\\.$#"
+			count: 1
+			path: src/PhpWord/Style/AbstractStyle.php
+
+		-
+			message: "#^Parameter \\#3 \\$length of function substr expects int\\|null, int\\|false given\\.$#"
+			count: 1
+			path: src/PhpWord/Style/AbstractStyle.php
+
+		-
+			message: "#^Unreachable statement \\- code above always terminates\\.$#"
+			count: 1
+			path: src/PhpWord/Style/AbstractStyle.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Style\\\\Border\\:\\:getBorderSize\\(\\) should return array\\<int\\> but returns array\\<int, float\\|int\\>\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Border.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Style\\\\Cell\\:\\:getBgColor\\(\\) should return string but returns null\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Cell.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Style\\\\Cell\\:\\:setUnit\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Cell.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Style\\\\Cell\\:\\:\\$shading is never written, only read\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Cell.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Style\\\\Chart\\:\\:getMajorTickPosition\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Chart.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Style\\\\Chart\\:\\:setCategoryAxisTitle\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Chart.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Style\\\\Chart\\:\\:setValueAxisTitle\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Chart.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Style\\\\Chart\\:\\:setValueLabelPosition\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Chart.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Style\\\\Chart\\:\\:showAxisLabels\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Chart.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Style\\\\Chart\\:\\:showGridY\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Chart.php
+
+		-
+			message: "#^PHPDoc tag @param has invalid value \\(string\\)\\: Unexpected token \"\\\\n     \\* \", expected variable at offset 250$#"
+			count: 1
+			path: src/PhpWord/Style/Chart.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Style\\\\Font\\:\\:setAllCaps\\(\\) should return PhpOffice\\\\PhpWord\\\\Style\\\\Font but returns PhpOffice\\\\PhpWord\\\\Style\\\\AbstractStyle\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Font.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Style\\\\Font\\:\\:setBgColor\\(\\) should return PhpOffice\\\\PhpWord\\\\Style\\\\Table but return statement is missing\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Font.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Style\\\\Font\\:\\:setDoubleStrikethrough\\(\\) should return PhpOffice\\\\PhpWord\\\\Style\\\\Font but returns PhpOffice\\\\PhpWord\\\\Style\\\\AbstractStyle\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Font.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Style\\\\Font\\:\\:setSmallCaps\\(\\) should return PhpOffice\\\\PhpWord\\\\Style\\\\Font but returns PhpOffice\\\\PhpWord\\\\Style\\\\AbstractStyle\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Font.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Style\\\\Font\\:\\:setStrikethrough\\(\\) should return PhpOffice\\\\PhpWord\\\\Style\\\\Font but returns PhpOffice\\\\PhpWord\\\\Style\\\\AbstractStyle\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Font.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Style\\\\Font\\:\\:setSubScript\\(\\) should return PhpOffice\\\\PhpWord\\\\Style\\\\Font but returns PhpOffice\\\\PhpWord\\\\Style\\\\AbstractStyle\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Font.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Style\\\\Font\\:\\:setSuperScript\\(\\) should return PhpOffice\\\\PhpWord\\\\Style\\\\Font but returns PhpOffice\\\\PhpWord\\\\Style\\\\AbstractStyle\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Font.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Style\\\\Font\\:\\:\\$allCaps is never written, only read\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Font.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Style\\\\Font\\:\\:\\$doubleStrikethrough is never written, only read\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Font.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Style\\\\Font\\:\\:\\$lang is never written, only read\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Font.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Style\\\\Font\\:\\:\\$paragraph is never written, only read\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Font.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Style\\\\Font\\:\\:\\$shading is never written, only read\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Font.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Style\\\\Font\\:\\:\\$smallCaps is never written, only read\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Font.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Style\\\\Font\\:\\:\\$strikethrough is never written, only read\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Font.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Style\\\\Line\\:\\:\\$weight \\(int\\) does not accept float\\|int\\|null\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Line.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Style\\\\ListItem\\:\\:getListTypeStyle\\(\\) should return array but empty return statement found\\.$#"
+			count: 1
+			path: src/PhpWord/Style/ListItem.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Style\\\\ListItem\\:\\:getListTypeStyle\\(\\) should return array but return statement is missing\\.$#"
+			count: 1
+			path: src/PhpWord/Style/ListItem.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Style\\\\Paragraph\\:\\:setStyleValue\\(\\) should return PhpOffice\\\\PhpWord\\\\Style\\\\Paragraph but returns PhpOffice\\\\PhpWord\\\\Style\\\\AbstractStyle\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Paragraph.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Style\\\\Paragraph\\:\\:\\$indentation is never written, only read\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Paragraph.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Style\\\\Paragraph\\:\\:\\$shading is never written, only read\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Paragraph.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Style\\\\Paragraph\\:\\:\\$spacing is never written, only read\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Paragraph.php
+
+		-
+			message: "#^Result of && is always false\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Paragraph.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Style\\\\Section\\:\\:setSettingValue\\(\\) should return PhpOffice\\\\PhpWord\\\\Style\\\\Section but returns PhpOffice\\\\PhpWord\\\\Style\\\\AbstractStyle\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Section.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Style\\\\Section\\:\\:\\$lineNumbering is never written, only read\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Section.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Style\\\\Shape\\:\\:\\$extrusion is never written, only read\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Shape.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Style\\\\Shape\\:\\:\\$fill is never written, only read\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Shape.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Style\\\\Shape\\:\\:\\$frame is never written, only read\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Shape.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Style\\\\Shape\\:\\:\\$outline is never written, only read\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Shape.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Style\\\\Shape\\:\\:\\$shadow is never written, only read\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Shape.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Style\\\\TOC\\:\\:setTabLeader\\(\\) should return PhpOffice\\\\PhpWord\\\\Style\\\\TOC but returns PhpOffice\\\\PhpWord\\\\Style\\\\Tab\\.$#"
+			count: 1
+			path: src/PhpWord/Style/TOC.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Style\\\\TOC\\:\\:setTabPos\\(\\) should return PhpOffice\\\\PhpWord\\\\Style\\\\TOC but returns PhpOffice\\\\PhpWord\\\\Style\\\\Tab\\.$#"
+			count: 1
+			path: src/PhpWord/Style/TOC.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Style\\\\Table\\:\\:getBorderInsideHColor\\(\\) should return string but returns int\\|string\\|null\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Table.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Style\\\\Table\\:\\:getBorderInsideHSize\\(\\) should return int but returns int\\|string\\|null\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Table.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Style\\\\Table\\:\\:getBorderInsideVColor\\(\\) should return string but returns int\\|string\\|null\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Table.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Style\\\\Table\\:\\:getBorderInsideVSize\\(\\) should return int but returns int\\|string\\|null\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Table.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Style\\\\Table\\:\\:getBorderSize\\(\\) should return array\\<int\\> but returns array\\<int, float\\|int\\>\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Table.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Style\\\\Table\\:\\:getCellMarginBottom\\(\\) should return int but returns int\\|string\\|null\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Table.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Style\\\\Table\\:\\:getCellMarginLeft\\(\\) should return int but returns int\\|string\\|null\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Table.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Style\\\\Table\\:\\:getCellMarginRight\\(\\) should return int but returns int\\|string\\|null\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Table.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Style\\\\Table\\:\\:getCellMarginTop\\(\\) should return int but returns int\\|string\\|null\\.$#"
+			count: 1
+			path: src/PhpWord/Style/Table.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Style\\\\TablePosition\\:\\:\\$bottomFromText \\(int\\) does not accept float\\|int\\|null\\.$#"
+			count: 1
+			path: src/PhpWord/Style/TablePosition.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Style\\\\TablePosition\\:\\:\\$leftFromText \\(int\\) does not accept float\\|int\\|null\\.$#"
+			count: 1
+			path: src/PhpWord/Style/TablePosition.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Style\\\\TablePosition\\:\\:\\$rightFromText \\(int\\) does not accept float\\|int\\|null\\.$#"
+			count: 1
+			path: src/PhpWord/Style/TablePosition.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Style\\\\TablePosition\\:\\:\\$tblpX \\(int\\) does not accept float\\|int\\|null\\.$#"
+			count: 1
+			path: src/PhpWord/Style/TablePosition.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Style\\\\TablePosition\\:\\:\\$tblpY \\(int\\) does not accept float\\|int\\|null\\.$#"
+			count: 1
+			path: src/PhpWord/Style/TablePosition.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Style\\\\TablePosition\\:\\:\\$topFromText \\(int\\) does not accept float\\|int\\|null\\.$#"
+			count: 1
+			path: src/PhpWord/Style/TablePosition.php
+
+		-
+			message: "#^Call to an undefined method object\\:\\:write\\(\\)\\.$#"
+			count: 1
+			path: src/PhpWord/TemplateProcessor.php
+
+		-
+			message: "#^Cannot access offset 'end' on array\\<int\\>\\|true\\.$#"
+			count: 1
+			path: src/PhpWord/TemplateProcessor.php
+
+		-
+			message: "#^Cannot access offset 'start' on array\\<int\\>\\|true\\.$#"
+			count: 1
+			path: src/PhpWord/TemplateProcessor.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\TemplateProcessor\\:\\:addImageToRelations\\(\\) has parameter \\$imageMimeType with no type specified\\.$#"
+			count: 1
+			path: src/PhpWord/TemplateProcessor.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\TemplateProcessor\\:\\:addImageToRelations\\(\\) has parameter \\$imgPath with no type specified\\.$#"
+			count: 1
+			path: src/PhpWord/TemplateProcessor.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\TemplateProcessor\\:\\:addImageToRelations\\(\\) has parameter \\$partFileName with no type specified\\.$#"
+			count: 1
+			path: src/PhpWord/TemplateProcessor.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\TemplateProcessor\\:\\:addImageToRelations\\(\\) has parameter \\$rid with no type specified\\.$#"
+			count: 1
+			path: src/PhpWord/TemplateProcessor.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\TemplateProcessor\\:\\:chooseImageDimension\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: src/PhpWord/TemplateProcessor.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\TemplateProcessor\\:\\:chooseImageDimension\\(\\) has parameter \\$baseValue with no type specified\\.$#"
+			count: 1
+			path: src/PhpWord/TemplateProcessor.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\TemplateProcessor\\:\\:chooseImageDimension\\(\\) has parameter \\$defaultValue with no type specified\\.$#"
+			count: 1
+			path: src/PhpWord/TemplateProcessor.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\TemplateProcessor\\:\\:chooseImageDimension\\(\\) has parameter \\$inlineValue with no type specified\\.$#"
+			count: 1
+			path: src/PhpWord/TemplateProcessor.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\TemplateProcessor\\:\\:fixImageWidthHeightRatio\\(\\) has parameter \\$actualHeight with no type specified\\.$#"
+			count: 1
+			path: src/PhpWord/TemplateProcessor.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\TemplateProcessor\\:\\:fixImageWidthHeightRatio\\(\\) has parameter \\$actualWidth with no type specified\\.$#"
+			count: 1
+			path: src/PhpWord/TemplateProcessor.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\TemplateProcessor\\:\\:fixImageWidthHeightRatio\\(\\) has parameter \\$height with no type specified\\.$#"
+			count: 1
+			path: src/PhpWord/TemplateProcessor.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\TemplateProcessor\\:\\:fixImageWidthHeightRatio\\(\\) has parameter \\$width with no type specified\\.$#"
+			count: 1
+			path: src/PhpWord/TemplateProcessor.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\TemplateProcessor\\:\\:getImageArgs\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: src/PhpWord/TemplateProcessor.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\TemplateProcessor\\:\\:getImageArgs\\(\\) has parameter \\$varNameWithArgs with no type specified\\.$#"
+			count: 1
+			path: src/PhpWord/TemplateProcessor.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\TemplateProcessor\\:\\:getNextRelationsIndex\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: src/PhpWord/TemplateProcessor.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\TemplateProcessor\\:\\:getNextRelationsIndex\\(\\) has parameter \\$documentPartName with no type specified\\.$#"
+			count: 1
+			path: src/PhpWord/TemplateProcessor.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\TemplateProcessor\\:\\:indexClonedVariables\\(\\) should return string but returns array\\<int\\<0, max\\>, string\\|null\\>\\.$#"
+			count: 1
+			path: src/PhpWord/TemplateProcessor.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\TemplateProcessor\\:\\:prepareImageAttrs\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: src/PhpWord/TemplateProcessor.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\TemplateProcessor\\:\\:prepareImageAttrs\\(\\) has parameter \\$replaceImage with no type specified\\.$#"
+			count: 1
+			path: src/PhpWord/TemplateProcessor.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\TemplateProcessor\\:\\:prepareImageAttrs\\(\\) has parameter \\$varInlineArgs with no type specified\\.$#"
+			count: 1
+			path: src/PhpWord/TemplateProcessor.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\TemplateProcessor\\:\\:setValueForPart\\(\\) should return string but returns array\\<int, string\\>\\|string\\.$#"
+			count: 1
+			path: src/PhpWord/TemplateProcessor.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\TemplateProcessor\\:\\:setValueForPart\\(\\) should return string but returns array\\<int, string\\>\\|string\\|null\\.$#"
+			count: 1
+			path: src/PhpWord/TemplateProcessor.php
+
+		-
+			message: "#^Parameter \\#1 \\$element of method PhpOffice\\\\PhpWord\\\\Writer\\\\Word2007\\\\Part\\\\Chart\\:\\:setElement\\(\\) expects PhpOffice\\\\PhpWord\\\\Element\\\\Chart, PhpOffice\\\\PhpWord\\\\Element\\\\AbstractElement given\\.$#"
+			count: 1
+			path: src/PhpWord/TemplateProcessor.php
+
+		-
+			message: "#^Parameter \\#2 \\$array of function implode expects array\\|null, array\\<string\\>\\|string given\\.$#"
+			count: 1
+			path: src/PhpWord/TemplateProcessor.php
+
+		-
+			message: "#^Parameter \\#2 \\$array of function implode expects array\\|null, string given\\.$#"
+			count: 1
+			path: src/PhpWord/TemplateProcessor.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\TemplateProcessor\\:\\:\\$macroClosingChars has no type specified\\.$#"
+			count: 1
+			path: src/PhpWord/TemplateProcessor.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\TemplateProcessor\\:\\:\\$macroOpeningChars has no type specified\\.$#"
+			count: 1
+			path: src/PhpWord/TemplateProcessor.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\TemplateProcessor\\:\\:\\$tempDocumentFooters \\(array\\<string\\>\\) does not accept string\\.$#"
+			count: 1
+			path: src/PhpWord/TemplateProcessor.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\TemplateProcessor\\:\\:\\$tempDocumentHeaders \\(array\\<string\\>\\) does not accept string\\.$#"
+			count: 1
+			path: src/PhpWord/TemplateProcessor.php
+
+		-
+			message: "#^Argument of an invalid type array\\<int, string\\>\\|false supplied for foreach, only iterables are supported\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/AbstractWriter.php
+
+		-
+			message: "#^PHPDoc tag @param has invalid value \\(\\\\PhpOffice\\\\PhpWord\\\\PhpWord\\)\\: Unexpected token \"\\\\n     \\*\", expected variable at offset 78$#"
+			count: 1
+			path: src/PhpWord/Writer/AbstractWriter.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Writer\\\\HTML\\\\Element\\\\AbstractElement\\:\\:write\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/HTML/Element/AbstractElement.php
+
+		-
+			message: "#^Variable \\$row in PHPDoc tag @var does not match assigned variable \\$rowStyle\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/HTML/Element/Table.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Writer\\\\ODText\\\\Element\\\\Field\\:\\:writeDefault\\(\\) has parameter \\$type with no type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/ODText/Element/Field.php
+
+		-
+			message: "#^Variable \\$row in PHPDoc tag @var does not match any variable in the foreach loop\\: \\$cell$#"
+			count: 1
+			path: src/PhpWord/Writer/ODText/Element/Table.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Writer\\\\ODText\\\\Element\\\\Text\\:\\:replacetabs\\(\\) has parameter \\$text with no type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/ODText/Element/Text.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Writer\\\\ODText\\\\Element\\\\Text\\:\\:replacetabs\\(\\) has parameter \\$xmlWriter with no type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/ODText/Element/Text.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Writer\\\\ODText\\\\Element\\\\Text\\:\\:writeChangeInsertion\\(\\) has parameter \\$start with no type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/ODText/Element/Text.php
+
+		-
+			message: "#^Call to an undefined method PhpOffice\\\\PhpWord\\\\Element\\\\AbstractElement\\:\\:getParagraphStyle\\(\\)\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/ODText/Element/TextRun.php
+
+		-
+			message: "#^Call to an undefined method PhpOffice\\\\PhpWord\\\\Style\\\\AbstractStyle\\:\\:setColumnWidths\\(\\)\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/ODText/Part/Content.php
+
+		-
+			message: "#^Parameter \\#1 \\$container of method PhpOffice\\\\PhpWord\\\\Writer\\\\ODText\\\\Part\\\\Content\\:\\:collectTrackedChanges\\(\\) expects PhpOffice\\\\PhpWord\\\\Element\\\\AbstractContainer, PhpOffice\\\\PhpWord\\\\Element\\\\AbstractElement given\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/ODText/Part/Content.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Writer\\\\ODText\\\\Part\\\\Content\\:\\:\\$imageParagraphStyles has no type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/ODText/Part/Content.php
+
+		-
+			message: "#^Call to an undefined method object\\:\\:write\\(\\)\\.$#"
+			count: 2
+			path: src/PhpWord/Writer/ODText/Part/Styles.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Writer\\\\ODText\\\\Part\\\\Styles\\:\\:cvttwiptostr\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/ODText/Part/Styles.php
+
+		-
+			message: "#^Parameter \\#1 \\$callback of function call_user_func_array expects callable\\(\\)\\: mixed, array\\{PhpOffice\\\\PhpWord\\\\Writer\\\\PDF\\\\AbstractRenderer, string\\} given\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/PDF.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Writer\\\\PDF\\:\\:\\$renderer \\(PhpOffice\\\\PhpWord\\\\Writer\\\\PDF\\\\AbstractRenderer\\) does not accept object\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/PDF.php
+
+		-
+			message: "#^Call to an undefined method PhpOffice\\\\PhpWord\\\\Writer\\\\PDF\\\\DomPDF\\:\\:loadHtml\\(\\)\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/PDF/DomPDF.php
+
+		-
+			message: "#^Call to an undefined method PhpOffice\\\\PhpWord\\\\Writer\\\\PDF\\\\DomPDF\\:\\:output\\(\\)\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/PDF/DomPDF.php
+
+		-
+			message: "#^Call to an undefined method PhpOffice\\\\PhpWord\\\\Writer\\\\PDF\\\\DomPDF\\:\\:render\\(\\)\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/PDF/DomPDF.php
+
+		-
+			message: "#^Call to an undefined method PhpOffice\\\\PhpWord\\\\Writer\\\\PDF\\\\DomPDF\\:\\:setPaper\\(\\)\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/PDF/DomPDF.php
+
+		-
+			message: "#^Class PhpOffice\\\\PhpWord\\\\Writer\\\\PDF\\\\DomPDF referenced with incorrect case\\: PhpOffice\\\\PhpWord\\\\Writer\\\\PDF\\\\Dompdf\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/PDF/DomPDF.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Writer\\\\PDF\\\\DomPDF\\:\\:createExternalWriterInstance\\(\\) should return PhpOffice\\\\PhpWord\\\\Writer\\\\PDF\\\\DomPDF but returns Dompdf\\\\Dompdf\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/PDF/DomPDF.php
+
+		-
+			message: "#^Binary operation \"\\+\" between int\\|string and 1 results in an error\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/RTF/Element/AbstractElement.php
+
+		-
+			message: "#^Parameter \\#1 \\$value of method PhpOffice\\\\PhpWord\\\\Writer\\\\RTF\\\\Style\\\\Font\\:\\:setNameIndex\\(\\) expects int, int\\|string given\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/RTF/Element/AbstractElement.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Writer\\\\RTF\\\\Element\\\\AbstractElement\\:\\:\\$fontStyle \\(PhpOffice\\\\PhpWord\\\\Style\\\\Font\\) does not accept PhpOffice\\\\PhpWord\\\\Style\\\\AbstractStyle\\|null\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/RTF/Element/AbstractElement.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Writer\\\\RTF\\\\Element\\\\AbstractElement\\:\\:\\$fontStyle \\(PhpOffice\\\\PhpWord\\\\Style\\\\Font\\) does not accept PhpOffice\\\\PhpWord\\\\Style\\\\Font\\|string\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/RTF/Element/AbstractElement.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Writer\\\\RTF\\\\Element\\\\AbstractElement\\:\\:\\$paragraphStyle \\(PhpOffice\\\\PhpWord\\\\Style\\\\Paragraph\\) does not accept PhpOffice\\\\PhpWord\\\\Style\\\\AbstractStyle\\|null\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/RTF/Element/AbstractElement.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Writer\\\\RTF\\\\Element\\\\AbstractElement\\:\\:\\$paragraphStyle \\(PhpOffice\\\\PhpWord\\\\Style\\\\Paragraph\\) does not accept PhpOffice\\\\PhpWord\\\\Style\\\\Paragraph\\|string\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/RTF/Element/AbstractElement.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Writer\\\\RTF\\\\Element\\\\AbstractElement\\:\\:\\$paragraphStyle \\(PhpOffice\\\\PhpWord\\\\Style\\\\Paragraph\\) does not accept null\\.$#"
+			count: 2
+			path: src/PhpWord/Writer/RTF/Element/AbstractElement.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Writer\\\\RTF\\\\Element\\\\Field\\:\\:write\\(\\) should return string but empty return statement found\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/RTF/Element/Field.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Writer\\\\RTF\\\\Element\\\\Field\\:\\:writeDate\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/RTF/Element/Field.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Writer\\\\RTF\\\\Element\\\\Field\\:\\:writeNumpages\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/RTF/Element/Field.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Writer\\\\RTF\\\\Element\\\\Field\\:\\:writePage\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/RTF/Element/Field.php
+
+		-
+			message: "#^Call to an undefined method PhpOffice\\\\PhpWord\\\\Element\\\\AbstractElement\\:\\:getImageStringData\\(\\)\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/RTF/Element/Image.php
+
+		-
+			message: "#^Call to an undefined method PhpOffice\\\\PhpWord\\\\Element\\\\AbstractElement\\:\\:getStyle\\(\\)\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/RTF/Element/Image.php
+
+		-
+			message: "#^Call to an undefined method PhpOffice\\\\PhpWord\\\\Element\\\\AbstractElement\\:\\:getSource\\(\\)\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/RTF/Element/Link.php
+
+		-
+			message: "#^Call to an undefined method PhpOffice\\\\PhpWord\\\\Element\\\\AbstractElement\\:\\:getText\\(\\)\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/RTF/Element/Link.php
+
+		-
+			message: "#^Call to an undefined method object\\:\\:write\\(\\)\\.$#"
+			count: 2
+			path: src/PhpWord/Writer/RTF/Part/Document.php
+
+		-
+			message: "#^Binary operation \"\\+\" between int\\|string and 1 results in an error\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/RTF/Style/Border.php
+
+		-
+			message: "#^PHPDoc tag @param has invalid value \\(\\\\PhpOffice\\\\PhpWord\\\\PhpWord\\)\\: Unexpected token \"\\\\n     \", expected variable at offset 86$#"
+			count: 1
+			path: src/PhpWord/Writer/Word2007.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Writer\\\\Word2007\\\\Element\\\\AbstractElement\\:\\:write\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/Word2007/Element/AbstractElement.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Writer\\\\Word2007\\\\Element\\\\Field\\:\\:buildPropertiesAndOptions\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/Word2007/Element/Field.php
+
+		-
+			message: "#^Parameter \\#1 \\$content of method PhpOffice\\\\PhpWord\\\\Writer\\\\Word2007\\\\Element\\\\AbstractElement\\:\\:writeText\\(\\) expects string, bool\\|int\\|string given\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/Word2007/Element/FormField.php
+
+		-
+			message: "#^Parameter \\#3 \\$value of method PhpOffice\\\\PhpWord\\\\Shared\\\\XMLWriter\\:\\:writeElementBlock\\(\\) expects string\\|null, bool\\|int\\|string given\\.$#"
+			count: 3
+			path: src/PhpWord/Writer/Word2007/Element/FormField.php
+
+		-
+			message: "#^Parameter \\#3 \\$value of method PhpOffice\\\\PhpWord\\\\Shared\\\\XMLWriter\\:\\:writeElementBlock\\(\\) expects string\\|null, int given\\.$#"
+			count: 4
+			path: src/PhpWord/Writer/Word2007/Element/FormField.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Writer\\\\Word2007\\\\Element\\\\ParagraphAlignment\\:\\:\\$attributes has no type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/Word2007/Element/ParagraphAlignment.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Writer\\\\Word2007\\\\Element\\\\ParagraphAlignment\\:\\:\\$name has no type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/Word2007/Element/ParagraphAlignment.php
+
+		-
+			message: "#^Parameter \\#2 \\$content of method PhpOffice\\\\PhpWord\\\\Shared\\\\XMLWriter\\:\\:writeElement\\(\\) expects string\\|null, bool\\|int\\|string given\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/Word2007/Element/SDT.php
+
+		-
+			message: "#^Parameter \\#3 \\$value of method PhpOffice\\\\PhpWord\\\\Shared\\\\XMLWriter\\:\\:writeElementBlock\\(\\) expects string\\|null, int\\<100000000, 999999999\\> given\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/Word2007/Element/SDT.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Writer\\\\Word2007\\\\Element\\\\TableAlignment\\:\\:\\$attributes has no type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/Word2007/Element/TableAlignment.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWord\\\\Writer\\\\Word2007\\\\Element\\\\TableAlignment\\:\\:\\$name has no type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/Word2007/Element/TableAlignment.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\PhpWord\\:\\:addBookmark\\(\\) invoked with 0 parameters, 1 required\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/Word2007/Element/Title.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Writer\\\\Word2007\\\\Part\\\\Chart\\:\\:writeAxisTitle\\(\\) has parameter \\$title with no type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/Word2007/Part/Chart.php
+
+		-
+			message: "#^Parameter \\#3 \\$value of method PhpOffice\\\\PhpWord\\\\Shared\\\\XMLWriter\\:\\:writeElementBlock\\(\\) expects string\\|null, int given\\.$#"
+			count: 9
+			path: src/PhpWord/Writer/Word2007/Part/Chart.php
+
+		-
+			message: "#^Parameter \\#3 \\$value of method PhpOffice\\\\PhpWord\\\\Shared\\\\XMLWriter\\:\\:writeElementBlock\\(\\) expects string\\|null, int\\<0, max\\> given\\.$#"
+			count: 4
+			path: src/PhpWord/Writer/Word2007/Part/Chart.php
+
+		-
+			message: "#^Parameter \\#1 \\$string of function md5 expects string, int\\<0, max\\> given\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/Word2007/Part/Numbering.php
+
+		-
+			message: "#^Parameter \\#1 \\$haystack of function strpos expects string, int given\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/Word2007/Part/Rels.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWord\\\\Writer\\\\Word2007\\\\Style\\\\AbstractStyle\\:\\:write\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/Word2007/Style/AbstractStyle.php
+
+		-
+			message: "#^Parameter \\#1 \\$styleName of static method PhpOffice\\\\PhpWord\\\\Style\\:\\:getStyle\\(\\) expects string, PhpOffice\\\\PhpWord\\\\Style\\\\AbstractStyle\\|string given\\.$#"
+			count: 1
+			path: src/PhpWord/Writer/Word2007/Style/Font.php
+
+		-
+			message: "#^Call to an undefined method object\\:\\:read\\(\\)\\.$#"
+			count: 1
+			path: tests/PhpWordTests/AbstractTestReader.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWordTests\\\\AbstractTestReader\\:\\:\\$parts has no type specified\\.$#"
+			count: 1
+			path: tests/PhpWordTests/AbstractTestReader.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWordTests\\\\AbstractWebServerEmbeddedTest\\:\\:getBaseUrl\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: tests/PhpWordTests/AbstractWebServerEmbeddedTest.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWordTests\\\\AbstractWebServerEmbeddedTest\\:\\:getRemoteBmpImageUrl\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: tests/PhpWordTests/AbstractWebServerEmbeddedTest.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWordTests\\\\AbstractWebServerEmbeddedTest\\:\\:getRemoteGifImageUrl\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: tests/PhpWordTests/AbstractWebServerEmbeddedTest.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWordTests\\\\AbstractWebServerEmbeddedTest\\:\\:getRemoteImageUrl\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: tests/PhpWordTests/AbstractWebServerEmbeddedTest.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWordTests\\\\AbstractWebServerEmbeddedTest\\:\\:\\$httpServer has no type specified\\.$#"
+			count: 1
+			path: tests/PhpWordTests/AbstractWebServerEmbeddedTest.php
+
+		-
+			message: "#^Parameter \\#1 \\$width of class PhpOffice\\\\PhpWord\\\\Element\\\\Cell constructor expects int\\|null, string given\\.$#"
+			count: 2
+			path: tests/PhpWordTests/Element/CellTest.php
+
+		-
+			message: "#^Parameter \\#2 \\$style of class PhpOffice\\\\PhpWord\\\\Element\\\\Cell constructor expects array\\|PhpOffice\\\\PhpWord\\\\Style\\\\Cell\\|null, int given\\.$#"
+			count: 2
+			path: tests/PhpWordTests/Element/CellTest.php
+
+		-
+			message: "#^Parameter \\#1 \\$text of method PhpOffice\\\\PhpWord\\\\Element\\\\Field\\:\\:setText\\(\\) expects PhpOffice\\\\PhpWord\\\\Element\\\\TextRun\\|string\\|null, array given\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Element/FieldTest.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWordTests\\\\Element\\\\ImageTest\\:\\:testImages\\(\\) has parameter \\$createFunction with no type specified\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Element/ImageTest.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWordTests\\\\Element\\\\ImageTest\\:\\:testImages\\(\\) has parameter \\$extension with no type specified\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Element/ImageTest.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWordTests\\\\Element\\\\ImageTest\\:\\:testImages\\(\\) has parameter \\$imageFunction with no type specified\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Element/ImageTest.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWordTests\\\\Element\\\\ImageTest\\:\\:testImages\\(\\) has parameter \\$imageQuality with no type specified\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Element/ImageTest.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWordTests\\\\Element\\\\ImageTest\\:\\:testImages\\(\\) has parameter \\$source with no type specified\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Element/ImageTest.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWordTests\\\\Element\\\\ImageTest\\:\\:testImages\\(\\) has parameter \\$type with no type specified\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Element/ImageTest.php
+
+		-
+			message: "#^Parameter \\#1 \\$source of class PhpOffice\\\\PhpWord\\\\Element\\\\Image constructor expects string, string\\|false given\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Element/ImageTest.php
+
+		-
+			message: "#^Parameter \\#1 \\$string of function md5 expects string, string\\|false given\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Element/ImageTest.php
+
+		-
+			message: "#^Parameter \\#1 \\$string of function ucfirst expects string, string\\|false given\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Element/ImageTest.php
+
+		-
+			message: "#^Parameter \\#3 \\$watermark of class PhpOffice\\\\PhpWord\\\\Element\\\\Image constructor expects bool, null given\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Element/ImageTest.php
+
+		-
+			message: "#^Parameter \\#2 \\$style of class PhpOffice\\\\PhpWord\\\\Element\\\\Section constructor expects array\\|PhpOffice\\\\PhpWord\\\\Style\\|string\\|null, PhpOffice\\\\PhpWord\\\\Style\\\\Section given\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Element/SectionTest.php
+
+		-
+			message: "#^Parameter \\#1 \\$text of class PhpOffice\\\\PhpWord\\\\Element\\\\Title constructor expects PhpOffice\\\\PhpWord\\\\Element\\\\TextRun\\|string, PhpOffice\\\\PhpWord\\\\Element\\\\PageBreak given\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Element/TitleTest.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWordTests\\\\Escaper\\\\RtfEscaper2Test\\:\\:escapestring\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Escaper/RtfEscaper2Test.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWordTests\\\\Escaper\\\\RtfEscaper2Test\\:\\:escapestring\\(\\) has parameter \\$str with no type specified\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Escaper/RtfEscaper2Test.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWordTests\\\\Escaper\\\\RtfEscaper2Test\\:\\:expect\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Escaper/RtfEscaper2Test.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWordTests\\\\Escaper\\\\RtfEscaper2Test\\:\\:expect\\(\\) has parameter \\$str with no type specified\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Escaper/RtfEscaper2Test.php
+
+		-
+			message: "#^Parameter \\#1 \\$expected of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertInstanceOf\\(\\) expects class\\-string\\<object\\>, string given\\.$#"
+			count: 1
+			path: tests/PhpWordTests/IOFactoryTest.php
+
+		-
+			message: "#^Parameter \\#2 \\$libraryBaseDir of static method PhpOffice\\\\PhpWord\\\\Settings\\:\\:setPdfRenderer\\(\\) expects string, string\\|false given\\.$#"
+			count: 1
+			path: tests/PhpWordTests/IOFactoryTest.php
+
+		-
+			message: "#^Call to an undefined method PhpOffice\\\\PhpWord\\\\PhpWord\\:\\:undefinedMethod\\(\\)\\.$#"
+			count: 1
+			path: tests/PhpWordTests/PhpWordTest.php
+
+		-
+			message: "#^Call to an undefined method PhpOffice\\\\PhpWord\\\\Element\\\\AbstractElement\\:\\:getRows\\(\\)\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Reader/Word2007/ElementTest.php
+
+		-
+			message: "#^Call to an undefined method PhpOffice\\\\PhpWord\\\\Element\\\\AbstractElement\\:\\:getText\\(\\)\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Reader/Word2007/ElementTest.php
+
+		-
+			message: "#^Cannot access offset 0 on PhpOffice\\\\PhpWord\\\\Element\\\\TextRun\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Reader/Word2007/ElementTest.php
+
+		-
+			message: "#^Call to an undefined method PhpOffice\\\\PhpWord\\\\Element\\\\AbstractElement\\:\\:getElement\\(\\)\\.$#"
+			count: 2
+			path: tests/PhpWordTests/Reader/Word2007/PartTest.php
+
+		-
+			message: "#^Cannot call method getElement\\(\\) on PhpOffice\\\\PhpWord\\\\Element\\\\TextRun\\|string\\.$#"
+			count: 3
+			path: tests/PhpWordTests/Reader/Word2007/PartTest.php
+
+		-
+			message: "#^Cannot call method isBold\\(\\) on PhpOffice\\\\PhpWord\\\\Style\\\\Font\\|string\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Reader/Word2007/PartTest.php
+
+		-
+			message: "#^Variable \\$endnote in PHPDoc tag @var does not match assigned variable \\$documentEndnote\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Reader/Word2007/PartTest.php
+
+		-
+			message: "#^Variable \\$footnote in PHPDoc tag @var does not match assigned variable \\$documentFootnote\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Reader/Word2007/PartTest.php
+
+		-
+			message: "#^Cannot access offset 0 on PhpOffice\\\\PhpWord\\\\Element\\\\TextRun\\.$#"
+			count: 2
+			path: tests/PhpWordTests/Reader/Word2007/StyleTest.php
+
+		-
+			message: "#^Else branch is unreachable because ternary operator condition is always true\\.$#"
+			count: 1
+			path: tests/PhpWordTests/SettingsTest.php
+
+		-
+			message: "#^Parameter \\#2 \\$libraryBaseDir of static method PhpOffice\\\\PhpWord\\\\Settings\\:\\:setPdfRenderer\\(\\) expects string, string\\|false given\\.$#"
+			count: 1
+			path: tests/PhpWordTests/SettingsTest.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWordTests\\\\SettingsTest\\:\\:\\$compatibility has no type specified\\.$#"
+			count: 1
+			path: tests/PhpWordTests/SettingsTest.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWordTests\\\\SettingsTest\\:\\:\\$defaultFontName has no type specified\\.$#"
+			count: 1
+			path: tests/PhpWordTests/SettingsTest.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWordTests\\\\SettingsTest\\:\\:\\$defaultFontSize has no type specified\\.$#"
+			count: 1
+			path: tests/PhpWordTests/SettingsTest.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWordTests\\\\SettingsTest\\:\\:\\$defaultPaper has no type specified\\.$#"
+			count: 1
+			path: tests/PhpWordTests/SettingsTest.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWordTests\\\\SettingsTest\\:\\:\\$measurementUnit has no type specified\\.$#"
+			count: 1
+			path: tests/PhpWordTests/SettingsTest.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWordTests\\\\SettingsTest\\:\\:\\$outputEscapingEnabled has no type specified\\.$#"
+			count: 1
+			path: tests/PhpWordTests/SettingsTest.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWordTests\\\\SettingsTest\\:\\:\\$pdfRendererName has no type specified\\.$#"
+			count: 1
+			path: tests/PhpWordTests/SettingsTest.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWordTests\\\\SettingsTest\\:\\:\\$pdfRendererPath has no type specified\\.$#"
+			count: 1
+			path: tests/PhpWordTests/SettingsTest.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWordTests\\\\SettingsTest\\:\\:\\$tempDir has no type specified\\.$#"
+			count: 1
+			path: tests/PhpWordTests/SettingsTest.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWordTests\\\\SettingsTest\\:\\:\\$zipClass has no type specified\\.$#"
+			count: 1
+			path: tests/PhpWordTests/SettingsTest.php
+
+		-
+			message: "#^Cannot call method getStyleName\\(\\) on PhpOffice\\\\PhpWord\\\\Style\\\\Table\\|string\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Shared/HtmlTest.php
+
+		-
+			message: "#^Parameter \\#1 \\$number of static method PhpOffice\\\\PhpWord\\\\Shared\\\\Text\\:\\:numberFormat\\(\\) expects float, string given\\.$#"
+			count: 2
+			path: tests/PhpWordTests/Shared/TextTest.php
+
+		-
+			message: "#^Parameter \\#2 \\$locale of function setlocale expects array\\|string\\|null, int given\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Shared/XMLWriterTest.php
+
+		-
+			message: "#^Parameter \\#2 \\$locale of function setlocale expects string\\|null, string\\|false given\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Shared/XMLWriterTest.php
+
+		-
+			message: "#^Argument of an invalid type array\\<int, string\\>\\|false supplied for foreach, only iterables are supported\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Shared/ZipArchiveTest.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWordTests\\\\Style\\\\AbstractStyleTest\\:\\:callProtectedMethod\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Style/AbstractStyleTest.php
+
+		-
+			message: "#^Parameter \\#1 \\$objectOrClass of class ReflectionClass constructor expects class\\-string\\<object\\>\\|object, class\\-string\\|false given\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Style/AbstractStyleTest.php
+
+		-
+			message: "#^Cannot call method setLineHeight\\(\\) on PhpOffice\\\\PhpWord\\\\Style\\\\Font\\|string\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Style/FontTest.php
+
+		-
+			message: "#^Parameter \\#1 \\$type of class PhpOffice\\\\PhpWord\\\\Style\\\\Font constructor expects string, null given\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Style/FontTest.php
+
+		-
+			message: "#^Parameter \\#2 \\$value of method PhpOffice\\\\PhpWord\\\\Style\\\\AbstractStyle\\:\\:setStyleValue\\(\\) expects array\\|int\\|string, null given\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Style/FontTest.php
+
+		-
+			message: "#^Cannot call method setLineHeight\\(\\) on PhpOffice\\\\PhpWord\\\\Style\\\\Paragraph\\|string\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Style/ParagraphTest.php
+
+		-
+			message: "#^Parameter \\#2 \\$value of method PhpOffice\\\\PhpWord\\\\Style\\\\AbstractStyle\\:\\:setStyleValue\\(\\) expects array\\|int\\|string, bool given\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Style/RowTest.php
+
+		-
+			message: "#^Parameter \\#2 \\$value of method PhpOffice\\\\PhpWord\\\\Style\\\\Section\\:\\:setSettingValue\\(\\) expects array\\|int\\|string, null given\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Style/SectionTest.php
+
+		-
+			message: "#^Call to an undefined method PhpOffice\\\\PhpWord\\\\Element\\\\AbstractElement\\:\\:getText\\(\\)\\.$#"
+			count: 2
+			path: tests/PhpWordTests/TemplateProcessorTest.php
+
+		-
+			message: "#^Call to an undefined method PhpOffice\\\\PhpWord\\\\Shared\\\\ZipArchive\\:\\:AddFromString\\(\\)\\.$#"
+			count: 1
+			path: tests/PhpWordTests/TemplateProcessorTest.php
+
+		-
+			message: "#^Cannot access offset 'end' on array\\<int\\>\\|bool\\.$#"
+			count: 2
+			path: tests/PhpWordTests/TemplateProcessorTest.php
+
+		-
+			message: "#^Cannot access offset 'start' on array\\<int\\>\\|bool\\.$#"
+			count: 2
+			path: tests/PhpWordTests/TemplateProcessorTest.php
+
+		-
+			message: "#^Parameter \\#2 \\$haystack of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringContainsString\\(\\) expects string, string\\|false given\\.$#"
+			count: 6
+			path: tests/PhpWordTests/TemplateProcessorTest.php
+
+		-
+			message: "#^Parameter \\#2 \\$haystack of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringNotContainsString\\(\\) expects string, string\\|false given\\.$#"
+			count: 4
+			path: tests/PhpWordTests/TemplateProcessorTest.php
+
+		-
+			message: "#^Part \\$documentZip \\(ZipArchive\\) of encapsed string cannot be cast to string\\.$#"
+			count: 1
+			path: tests/PhpWordTests/TemplateProcessorTest.php
+
+		-
+			message: "#^Part \\$templateZip \\(ZipArchive\\) of encapsed string cannot be cast to string\\.$#"
+			count: 1
+			path: tests/PhpWordTests/TemplateProcessorTest.php
+
+		-
+			message: "#^Argument of an invalid type array\\<int, string\\>\\|false supplied for foreach, only iterables are supported\\.$#"
+			count: 1
+			path: tests/PhpWordTests/TestHelperDOCX.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWordTests\\\\TestableTemplateProcesor\\:\\:__construct\\(\\) has parameter \\$mainPart with no type specified\\.$#"
+			count: 1
+			path: tests/PhpWordTests/TestableTemplateProcesor.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWordTests\\\\TestableTemplateProcesor\\:\\:__construct\\(\\) has parameter \\$settingsPart with no type specified\\.$#"
+			count: 1
+			path: tests/PhpWordTests/TestableTemplateProcesor.php
+
+		-
+			message: "#^Cannot access property \\$length on DOMNodeList\\<DOMNode\\>\\|false\\.$#"
+			count: 9
+			path: tests/PhpWordTests/Writer/HTML/ElementTest.php
+
+		-
+			message: "#^Cannot call method item\\(\\) on DOMNodeList\\<DOMNode\\>\\|false\\.$#"
+			count: 11
+			path: tests/PhpWordTests/Writer/HTML/ElementTest.php
+
+		-
+			message: "#^Parameter \\#2 \\$libraryBaseDir of static method PhpOffice\\\\PhpWord\\\\Settings\\:\\:setPdfRenderer\\(\\) expects string, string\\|false given\\.$#"
+			count: 3
+			path: tests/PhpWordTests/Writer/HTML/Element/PageBreakTest.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWordTests\\\\Writer\\\\ODText\\\\Style\\\\FontTest\\:\\:providerAllNamedColors\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Writer/ODText/Style/FontTest.php
+
+		-
+			message: "#^Call to an undefined method PhpOffice\\\\PhpWord\\\\Writer\\\\PDF\\:\\:getFont\\(\\)\\.$#"
+			count: 2
+			path: tests/PhpWordTests/Writer/PDF/DomPDFTest.php
+
+		-
+			message: "#^Call to an undefined method PhpOffice\\\\PhpWord\\\\Writer\\\\PDF\\:\\:getOrientation\\(\\)\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Writer/PDF/DomPDFTest.php
+
+		-
+			message: "#^Call to an undefined method PhpOffice\\\\PhpWord\\\\Writer\\\\PDF\\:\\:getPaperSize\\(\\)\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Writer/PDF/DomPDFTest.php
+
+		-
+			message: "#^Call to an undefined method PhpOffice\\\\PhpWord\\\\Writer\\\\PDF\\:\\:getTempDir\\(\\)\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Writer/PDF/DomPDFTest.php
+
+		-
+			message: "#^Call to an undefined method PhpOffice\\\\PhpWord\\\\Writer\\\\PDF\\:\\:setFont\\(\\)\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Writer/PDF/DomPDFTest.php
+
+		-
+			message: "#^Call to an undefined method PhpOffice\\\\PhpWord\\\\Writer\\\\PDF\\:\\:setOrientation\\(\\)\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Writer/PDF/DomPDFTest.php
+
+		-
+			message: "#^Call to an undefined method PhpOffice\\\\PhpWord\\\\Writer\\\\PDF\\:\\:setPaperSize\\(\\)\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Writer/PDF/DomPDFTest.php
+
+		-
+			message: "#^Call to an undefined method PhpOffice\\\\PhpWord\\\\Writer\\\\PDF\\:\\:setTempDir\\(\\)\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Writer/PDF/DomPDFTest.php
+
+		-
+			message: "#^Parameter \\#2 \\$libraryBaseDir of static method PhpOffice\\\\PhpWord\\\\Settings\\:\\:setPdfRenderer\\(\\) expects string, string\\|false given\\.$#"
+			count: 3
+			path: tests/PhpWordTests/Writer/PDF/DomPDFTest.php
+
+		-
+			message: "#^Call to an undefined method PhpOffice\\\\PhpWord\\\\Writer\\\\PDF\\:\\:getFont\\(\\)\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Writer/PDF/MPDFTest.php
+
+		-
+			message: "#^Parameter \\#2 \\$libraryBaseDir of static method PhpOffice\\\\PhpWord\\\\Settings\\:\\:setPdfRenderer\\(\\) expects string, string\\|false given\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Writer/PDF/MPDFTest.php
+
+		-
+			message: "#^Parameter \\#2 \\$libraryBaseDir of static method PhpOffice\\\\PhpWord\\\\Settings\\:\\:setPdfRenderer\\(\\) expects string, string\\|false given\\.$#"
+			count: 2
+			path: tests/PhpWordTests/Writer/PDF/TCPDFTest.php
+
+		-
+			message: "#^Call to an undefined method PhpOffice\\\\PhpWord\\\\Writer\\\\PDF\\:\\:getFont\\(\\)\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Writer/PDF/TCPDFTest.php
+
+		-
+			message: "#^Parameter \\#2 \\$libraryBaseDir of static method PhpOffice\\\\PhpWord\\\\Settings\\:\\:setPdfRenderer\\(\\) expects string, string\\|false given\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Writer/PDFTest.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWordTests\\\\Writer\\\\RTF\\\\ElementTest\\:\\:removeCr\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Writer/RTF/ElementTest.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWordTests\\\\Writer\\\\RTF\\\\ElementTest\\:\\:removeCr\\(\\) has parameter \\$field with no type specified\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Writer/RTF/ElementTest.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWordTests\\\\Writer\\\\RTF\\\\StyleTest\\:\\:removeCr\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Writer/RTF/StyleTest.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWordTests\\\\Writer\\\\RTF\\\\StyleTest\\:\\:removeCr\\(\\) has parameter \\$field with no type specified\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Writer/RTF/StyleTest.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWordTests\\\\Writer\\\\Word2007\\\\Element\\\\ChartTest\\:\\:\\$outputEscapingEnabled has no type specified\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Writer/Word2007/Element/ChartTest.php
+
+		-
+			message: "#^Call to an undefined method object\\:\\:write\\(\\)\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Writer/Word2007/ElementTest.php
+
+		-
+			message: "#^Call to an undefined method object\\:\\:write\\(\\)\\.$#"
+			count: 1
+			path: tests/PhpWordTests/Writer/Word2007/StyleTest.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWordTests\\\\XmlDocument\\:\\:getElement\\(\\) should return DOMElement\\|null but returns DOMNode\\|null\\.$#"
+			count: 1
+			path: tests/PhpWordTests/XmlDocument.php
+
+		-
+			message: "#^Method PhpOffice\\\\PhpWordTests\\\\XmlDocument\\:\\:getNodeList\\(\\) should return DOMNodeList\\<DOMNode\\> but returns DOMNodeList\\<DOMNode\\>\\|false\\.$#"
+			count: 1
+			path: tests/PhpWordTests/XmlDocument.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWordTests\\\\XmlDocument\\:\\:\\$path \\(string\\) does not accept string\\|false\\.$#"
+			count: 1
+			path: tests/PhpWordTests/XmlDocument.php
+
+		-
+			message: "#^Property PhpOffice\\\\PhpWordTests\\\\XmlDocument\\:\\:\\$xpath \\(DOMXPath\\) does not accept null\\.$#"
+			count: 1
+			path: tests/PhpWordTests/XmlDocument.php
diff --git a/vendor/phpoffice/phpword/sonar-project.properties b/vendor/phpoffice/phpword/sonar-project.properties
deleted file mode 100644
index 7741cfb475..0000000000
--- a/vendor/phpoffice/phpword/sonar-project.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# must be unique in a given SonarQube instance
-sonar.projectKey=phpoffice:phpword
-# this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1.
-sonar.projectName=PHPWord
-sonar.projectVersion=0.16
- 
-# Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
-# This property is optional if sonar.modules is set. 
-sonar.sources=src
-sonar.tests=tests
-sonar.php.coverage.reportPaths=build/logs/clover.xml
-sonar.php.tests.reportPath=build/logs/logfile.xml
-
-# Encoding of the source code. Default is default system encoding
-#sonar.sourceEncoding=UTF-8
-
-sonar.host.url=http://localhost:9000
\ No newline at end of file
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Collection/AbstractCollection.php b/vendor/phpoffice/phpword/src/PhpWord/Collection/AbstractCollection.php
index 899ec28756..646489d886 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Collection/AbstractCollection.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Collection/AbstractCollection.php
@@ -11,43 +11,43 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Collection;
 
 /**
- * Collection abstract class
+ * Collection abstract class.
  *
  * @since 0.10.0
+ * @template T
  */
 abstract class AbstractCollection
 {
     /**
-     * Items
+     * Items.
      *
-     * @var \PhpOffice\PhpWord\Element\AbstractContainer[]
+     * @var T[]
      */
-    private $items = array();
+    private $items = [];
 
     /**
-     * Get items
+     * Get items.
      *
-     * @return \PhpOffice\PhpWord\Element\AbstractContainer[]
+     * @return T[]
      */
-    public function getItems()
+    public function getItems(): array
     {
         return $this->items;
     }
 
     /**
-     * Get item by index
+     * Get item by index.
      *
-     * @param int $index
-     * @return \PhpOffice\PhpWord\Element\AbstractContainer
+     * @return ?T
      */
-    public function getItem($index)
+    public function getItem(int $index)
     {
         if (array_key_exists($index, $this->items)) {
             return $this->items[$index];
@@ -59,10 +59,9 @@ public function getItem($index)
     /**
      * Set item.
      *
-     * @param int $index
-     * @param \PhpOffice\PhpWord\Element\AbstractContainer $item
+     * @param ?T $item
      */
-    public function setItem($index, $item)
+    public function setItem(int $index, $item): void
     {
         if (array_key_exists($index, $this->items)) {
             $this->items[$index] = $item;
@@ -70,25 +69,22 @@ public function setItem($index, $item)
     }
 
     /**
-     * Add new item
+     * Add new item.
      *
-     * @param \PhpOffice\PhpWord\Element\AbstractContainer $item
-     * @return int
+     * @param T $item
      */
-    public function addItem($item)
+    public function addItem($item): int
     {
-        $index = $this->countItems() + 1;
+        $index = $this->countItems();
         $this->items[$index] = $item;
 
         return $index;
     }
 
     /**
-     * Get item count
-     *
-     * @return int
+     * Get item count.
      */
-    public function countItems()
+    public function countItems(): int
     {
         return count($this->items);
     }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Collection/Bookmarks.php b/vendor/phpoffice/phpword/src/PhpWord/Collection/Bookmarks.php
index b5ffd5f40a..71544c9469 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Collection/Bookmarks.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Collection/Bookmarks.php
@@ -11,16 +11,19 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Collection;
 
+use PhpOffice\PhpWord\Element\Bookmark;
+
 /**
- * Bookmarks collection
+ * Bookmarks collection.
  *
  * @since 0.12.0
+ * @extends AbstractCollection<Bookmark>
  */
 class Bookmarks extends AbstractCollection
 {
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Collection/Charts.php b/vendor/phpoffice/phpword/src/PhpWord/Collection/Charts.php
index aa807d1e58..7c2dfbab94 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Collection/Charts.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Collection/Charts.php
@@ -11,16 +11,19 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Collection;
 
+use PhpOffice\PhpWord\Element\Chart;
+
 /**
- * Charts collection
+ * Charts collection.
  *
  * @since 0.12.0
+ * @extends AbstractCollection<Chart>
  */
 class Charts extends AbstractCollection
 {
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Collection/Comments.php b/vendor/phpoffice/phpword/src/PhpWord/Collection/Comments.php
index b6c02d392f..5fa4020a5a 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Collection/Comments.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Collection/Comments.php
@@ -11,16 +11,19 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Collection;
 
+use PhpOffice\PhpWord\Element\Comment;
+
 /**
- * Comments collection
+ * Comments collection.
  *
  * @since 0.12.0
+ * @extends AbstractCollection<Comment>
  */
 class Comments extends AbstractCollection
 {
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Collection/Endnotes.php b/vendor/phpoffice/phpword/src/PhpWord/Collection/Endnotes.php
index db01b408db..09903b1bf6 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Collection/Endnotes.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Collection/Endnotes.php
@@ -11,16 +11,19 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Collection;
 
+use PhpOffice\PhpWord\Element\Endnote;
+
 /**
- * Endnotes collection
+ * Endnotes collection.
  *
  * @since 0.10.0
+ * @extends AbstractCollection<Endnote>
  */
 class Endnotes extends AbstractCollection
 {
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Collection/Footnotes.php b/vendor/phpoffice/phpword/src/PhpWord/Collection/Footnotes.php
index a0a31ca494..0387fce3c7 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Collection/Footnotes.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Collection/Footnotes.php
@@ -11,16 +11,19 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Collection;
 
+use PhpOffice\PhpWord\Element\Footnote;
+
 /**
- * Footnotes collection
+ * Footnotes collection.
  *
  * @since 0.10.0
+ * @extends AbstractCollection<Footnote>
  */
 class Footnotes extends AbstractCollection
 {
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Collection/Titles.php b/vendor/phpoffice/phpword/src/PhpWord/Collection/Titles.php
index 1ea58ec0d6..543aabda1d 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Collection/Titles.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Collection/Titles.php
@@ -11,16 +11,19 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Collection;
 
+use PhpOffice\PhpWord\Element\Title;
+
 /**
- * Titles collection
+ * Titles collection.
  *
  * @since 0.10.0
+ * @extends AbstractCollection<Title>
  */
 class Titles extends AbstractCollection
 {
diff --git a/vendor/phpoffice/phpword/src/PhpWord/ComplexType/FootnoteProperties.php b/vendor/phpoffice/phpword/src/PhpWord/ComplexType/FootnoteProperties.php
index e42c9f9d40..2e7743ca08 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/ComplexType/FootnoteProperties.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/ComplexType/FootnoteProperties.php
@@ -11,16 +11,17 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\ComplexType;
 
+use InvalidArgumentException;
 use PhpOffice\PhpWord\SimpleType\NumberFormat;
 
 /**
- * Footnote properties
+ * Footnote properties.
  *
  * @see http://www.datypic.com/sc/ooxml/e-w_footnotePr-1.html
  */
@@ -36,35 +37,35 @@ final class FootnoteProperties
     const POSITION_DOC_END = 'docEnd';
 
     /**
-     * Footnote Positioning Location
+     * Footnote Positioning Location.
      *
      * @var string
      */
     private $pos;
 
     /**
-     * Footnote Numbering Format w:numFmt, one of PhpOffice\PhpWord\SimpleType\NumberFormat
+     * Footnote Numbering Format w:numFmt, one of PhpOffice\PhpWord\SimpleType\NumberFormat.
      *
      * @var string
      */
     private $numFmt;
 
     /**
-     * Footnote and Endnote Numbering Starting Value
+     * Footnote and Endnote Numbering Starting Value.
      *
      * @var float
      */
     private $numStart;
 
     /**
-     * Footnote and Endnote Numbering Restart Location
+     * Footnote and Endnote Numbering Restart Location.
      *
      * @var string
      */
     private $numRestart;
 
     /**
-     * Get the Footnote Positioning Location
+     * Get the Footnote Positioning Location.
      *
      * @return string
      */
@@ -74,32 +75,32 @@ public function getPos()
     }
 
     /**
-     * Set the Footnote Positioning Location (pageBottom, beneathText, sectEnd, docEnd)
+     * Set the Footnote Positioning Location (pageBottom, beneathText, sectEnd, docEnd).
      *
      * @param string $pos
-     * @throws \InvalidArgumentException
+     *
      * @return self
      */
     public function setPos($pos)
     {
-        $position = array(
+        $position = [
             self::POSITION_PAGE_BOTTOM,
             self::POSITION_BENEATH_TEXT,
             self::POSITION_SECTION_END,
             self::POSITION_DOC_END,
-        );
+        ];
 
         if (in_array($pos, $position)) {
             $this->pos = $pos;
         } else {
-            throw new \InvalidArgumentException('Invalid value, on of ' . implode(', ', $position) . ' possible');
+            throw new InvalidArgumentException('Invalid value, on of ' . implode(', ', $position) . ' possible');
         }
 
         return $this;
     }
 
     /**
-     * Get the Footnote Numbering Format
+     * Get the Footnote Numbering Format.
      *
      * @return string
      */
@@ -109,9 +110,10 @@ public function getNumFmt()
     }
 
     /**
-     * Set the Footnote Numbering Format
+     * Set the Footnote Numbering Format.
      *
      * @param string $numFmt One of NumberFormat
+     *
      * @return self
      */
     public function setNumFmt($numFmt)
@@ -123,7 +125,7 @@ public function setNumFmt($numFmt)
     }
 
     /**
-     * Get the Footnote Numbering Format
+     * Get the Footnote Numbering Format.
      *
      * @return float
      */
@@ -133,9 +135,10 @@ public function getNumStart()
     }
 
     /**
-     * Set the Footnote Numbering Format
+     * Set the Footnote Numbering Format.
      *
      * @param float $numStart
+     *
      * @return self
      */
     public function setNumStart($numStart)
@@ -146,7 +149,7 @@ public function setNumStart($numStart)
     }
 
     /**
-     * Get the Footnote and Endnote Numbering Starting Value
+     * Get the Footnote and Endnote Numbering Starting Value.
      *
      * @return string
      */
@@ -156,24 +159,24 @@ public function getNumRestart()
     }
 
     /**
-     * Set the Footnote and Endnote Numbering Starting Value (continuous, eachSect, eachPage)
+     * Set the Footnote and Endnote Numbering Starting Value (continuous, eachSect, eachPage).
      *
      * @param  string $numRestart
-     * @throws \InvalidArgumentException
+     *
      * @return self
      */
     public function setNumRestart($numRestart)
     {
-        $restartNumbers = array(
+        $restartNumbers = [
             self::RESTART_NUMBER_CONTINUOUS,
             self::RESTART_NUMBER_EACH_SECTION,
             self::RESTART_NUMBER_EACH_PAGE,
-        );
+        ];
 
         if (in_array($numRestart, $restartNumbers)) {
             $this->numRestart = $numRestart;
         } else {
-            throw new \InvalidArgumentException('Invalid value, on of ' . implode(', ', $restartNumbers) . ' possible');
+            throw new InvalidArgumentException('Invalid value, on of ' . implode(', ', $restartNumbers) . ' possible');
         }
 
         return $this;
diff --git a/vendor/phpoffice/phpword/src/PhpWord/ComplexType/ProofState.php b/vendor/phpoffice/phpword/src/PhpWord/ComplexType/ProofState.php
index 4f8dafe3aa..37039cb84e 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/ComplexType/ProofState.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/ComplexType/ProofState.php
@@ -11,48 +11,50 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\ComplexType;
 
+use InvalidArgumentException;
+
 /**
- * Spelling and Grammatical Checking State
+ * Spelling and Grammatical Checking State.
  *
  * @see http://www.datypic.com/sc/ooxml/e-w_proofState-1.html
  */
 final class ProofState
 {
     /**
-     * Check Completed
+     * Check Completed.
      */
     const CLEAN = 'clean';
 
     /**
-     * Check Not Completed
+     * Check Not Completed.
      */
     const DIRTY = 'dirty';
 
     /**
-     * Spell Checking State
+     * Spell Checking State.
      *
      * @var string
      */
     private $spelling;
 
     /**
-     * Grammatical Checking State
+     * Grammatical Checking State.
      *
      * @var string
      */
     private $grammar;
 
     /**
-     * Set the Spell Checking State (dirty or clean)
+     * Set the Spell Checking State (dirty or clean).
      *
      * @param string $spelling
-     * @throws \InvalidArgumentException
+     *
      * @return self
      */
     public function setSpelling($spelling)
@@ -60,14 +62,14 @@ public function setSpelling($spelling)
         if ($spelling == self::CLEAN || $spelling == self::DIRTY) {
             $this->spelling = $spelling;
         } else {
-            throw new \InvalidArgumentException('Invalid value, dirty or clean possible');
+            throw new InvalidArgumentException('Invalid value, dirty or clean possible');
         }
 
         return $this;
     }
 
     /**
-     * Get the Spell Checking State
+     * Get the Spell Checking State.
      *
      * @return string
      */
@@ -77,10 +79,10 @@ public function getSpelling()
     }
 
     /**
-     * Set the Grammatical Checking State (dirty or clean)
+     * Set the Grammatical Checking State (dirty or clean).
      *
      * @param string $grammar
-     * @throws \InvalidArgumentException
+     *
      * @return self
      */
     public function setGrammar($grammar)
@@ -88,14 +90,14 @@ public function setGrammar($grammar)
         if ($grammar == self::CLEAN || $grammar == self::DIRTY) {
             $this->grammar = $grammar;
         } else {
-            throw new \InvalidArgumentException('Invalid value, dirty or clean possible');
+            throw new InvalidArgumentException('Invalid value, dirty or clean possible');
         }
 
         return $this;
     }
 
     /**
-     * Get the Grammatical Checking State
+     * Get the Grammatical Checking State.
      *
      * @return string
      */
diff --git a/vendor/phpoffice/phpword/src/PhpWord/ComplexType/TblWidth.php b/vendor/phpoffice/phpword/src/PhpWord/ComplexType/TblWidth.php
index 0d1a2419a7..6a9368f464 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/ComplexType/TblWidth.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/ComplexType/TblWidth.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/vendor/phpoffice/phpword/src/PhpWord/ComplexType/TrackChangesView.php b/vendor/phpoffice/phpword/src/PhpWord/ComplexType/TrackChangesView.php
index 92ea05eab3..4331047414 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/ComplexType/TrackChangesView.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/ComplexType/TrackChangesView.php
@@ -11,56 +11,56 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\ComplexType;
 
 /**
- * Visibility of Annotation Types
+ * Visibility of Annotation Types.
  *
  * @see http://www.datypic.com/sc/ooxml/e-w_revisionView-1.html
  */
 final class TrackChangesView
 {
     /**
-     * Display Visual Indicator Of Markup Area
+     * Display Visual Indicator Of Markup Area.
      *
      * @var bool
      */
     private $markup;
 
     /**
-     * Display Comments
+     * Display Comments.
      *
      * @var bool
      */
     private $comments;
 
     /**
-     * Display Content Revisions
+     * Display Content Revisions.
      *
      * @var bool
      */
     private $insDel;
 
     /**
-     * Display Formatting Revisions
+     * Display Formatting Revisions.
      *
      * @var bool
      */
     private $formatting;
 
     /**
-     * Display Ink Annotations
+     * Display Ink Annotations.
      *
      * @var bool
      */
     private $inkAnnotations;
 
     /**
-     * Get Display Visual Indicator Of Markup Area
+     * Get Display Visual Indicator Of Markup Area.
      *
      * @return bool True if markup is shown
      */
@@ -70,18 +70,18 @@ public function hasMarkup()
     }
 
     /**
-     * Set Display Visual Indicator Of Markup Area
+     * Set Display Visual Indicator Of Markup Area.
      *
-     * @param bool $markup
+     * @param ?bool $markup
      *            Set to true to show markup
      */
-    public function setMarkup($markup)
+    public function setMarkup($markup): void
     {
         $this->markup = $markup === null ? true : $markup;
     }
 
     /**
-     * Get Display Comments
+     * Get Display Comments.
      *
      * @return bool True if comments are shown
      */
@@ -91,18 +91,18 @@ public function hasComments()
     }
 
     /**
-     * Set Display Comments
+     * Set Display Comments.
      *
-     * @param bool $comments
+     * @param ?bool $comments
      *            Set to true to show comments
      */
-    public function setComments($comments)
+    public function setComments($comments): void
     {
         $this->comments = $comments === null ? true : $comments;
     }
 
     /**
-     * Get Display Content Revisions
+     * Get Display Content Revisions.
      *
      * @return bool True if content revisions are shown
      */
@@ -112,18 +112,18 @@ public function hasInsDel()
     }
 
     /**
-     * Set Display Content Revisions
+     * Set Display Content Revisions.
      *
-     * @param bool $insDel
+     * @param ?bool $insDel
      *            Set to true to show content revisions
      */
-    public function setInsDel($insDel)
+    public function setInsDel($insDel): void
     {
         $this->insDel = $insDel === null ? true : $insDel;
     }
 
     /**
-     * Get Display Formatting Revisions
+     * Get Display Formatting Revisions.
      *
      * @return bool True if formatting revisions are shown
      */
@@ -133,18 +133,18 @@ public function hasFormatting()
     }
 
     /**
-     * Set Display Formatting Revisions
+     * Set Display Formatting Revisions.
      *
-     * @param bool|null $formatting
+     * @param null|bool $formatting
      *            Set to true to show formatting revisions
      */
-    public function setFormatting($formatting = null)
+    public function setFormatting($formatting = null): void
     {
         $this->formatting = $formatting === null ? true : $formatting;
     }
 
     /**
-     * Get Display Ink Annotations
+     * Get Display Ink Annotations.
      *
      * @return bool True if ink annotations are shown
      */
@@ -154,12 +154,12 @@ public function hasInkAnnotations()
     }
 
     /**
-     * Set Display Ink Annotations
+     * Set Display Ink Annotations.
      *
-     * @param bool $inkAnnotations
+     * @param ?bool $inkAnnotations
      *            Set to true to show ink annotations
      */
-    public function setInkAnnotations($inkAnnotations)
+    public function setInkAnnotations($inkAnnotations): void
     {
         $this->inkAnnotations = $inkAnnotations === null ? true : $inkAnnotations;
     }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Element/AbstractContainer.php b/vendor/phpoffice/phpword/src/PhpWord/Element/AbstractContainer.php
index 6a1ed93013..f9b2822a12 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Element/AbstractContainer.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Element/AbstractContainer.php
@@ -11,14 +11,18 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Element;
 
+use BadMethodCallException;
+use PhpOffice\Math\Math;
+use ReflectionClass;
+
 /**
- * Container abstract class
+ * Container abstract class.
  *
  * @method Text addText(string $text, mixed $fStyle = null, mixed $pStyle = null)
  * @method TextRun addTextRun(mixed $pStyle = null)
@@ -31,7 +35,7 @@
  * @method Footnote addFootnote(mixed $pStyle = null)
  * @method Endnote addEndnote(mixed $pStyle = null)
  * @method CheckBox addCheckBox(string $name, $text, mixed $fStyle = null, mixed $pStyle = null)
- * @method Title addTitle(mixed $text, int $depth = 1)
+ * @method Title addTitle(mixed $text, int $depth = 1, int $pageNumber = null)
  * @method TOC addTOC(mixed $fontStyle = null, mixed $tocStyle = null, int $minDepth = 1, int $maxDepth = 9)
  * @method PageBreak addPageBreak()
  * @method Table addTable(mixed $style = null)
@@ -44,7 +48,7 @@
  * @method Chart addChart(string $type, array $categories, array $values, array $style = null, $seriesName = null)
  * @method FormField addFormField(string $type, mixed $fStyle = null, mixed $pStyle = null)
  * @method SDT addSDT(string $type)
- *
+ * @method Formula addFormula(Math $math)
  * @method \PhpOffice\PhpWord\Element\OLEObject addObject(string $source, mixed $style = null) deprecated, use addOLEObject instead
  *
  * @since 0.10.0
@@ -52,21 +56,21 @@
 abstract class AbstractContainer extends AbstractElement
 {
     /**
-     * Elements collection
+     * Elements collection.
      *
      * @var \PhpOffice\PhpWord\Element\AbstractElement[]
      */
-    protected $elements = array();
+    protected $elements = [];
 
     /**
-     * Container type Section|Header|Footer|Footnote|Endnote|Cell|TextRun|TextBox|ListItemRun|TrackChange
+     * Container type Section|Header|Footer|Footnote|Endnote|Cell|TextRun|TextBox|ListItemRun|TrackChange.
      *
      * @var string
      */
     protected $container;
 
     /**
-     * Magic method to catch all 'addElement' variation
+     * Magic method to catch all 'addElement' variation.
      *
      * This removes addText, addTextRun, etc. When adding new element, we have to
      * add the model in the class docblock with `@method`.
@@ -75,18 +79,20 @@ abstract class AbstractContainer extends AbstractElement
      *
      * @param mixed $function
      * @param mixed $args
+     *
      * @return \PhpOffice\PhpWord\Element\AbstractElement
      */
     public function __call($function, $args)
     {
-        $elements = array(
+        $elements = [
             'Text', 'TextRun', 'Bookmark', 'Link', 'PreserveText', 'TextBreak',
             'ListItem', 'ListItemRun', 'Table', 'Image', 'Object', 'OLEObject',
             'Footnote', 'Endnote', 'CheckBox', 'TextBox', 'Field',
             'Line', 'Shape', 'Title', 'TOC', 'PageBreak',
             'Chart', 'FormField', 'SDT', 'Comment',
-        );
-        $functions = array();
+            'Formula',
+        ];
+        $functions = [];
         foreach ($elements as $element) {
             $functions['add' . strtolower($element)] = $element == 'Object' ? 'OLEObject' : $element;
         }
@@ -99,18 +105,18 @@ public function __call($function, $args)
             // Special case for TextBreak
             // @todo Remove the `$count` parameter in 1.0.0 to make this element similiar to other elements?
             if ($element == 'TextBreak') {
-                list($count, $fontStyle, $paragraphStyle) = array_pad($args, 3, null);
+                [$count, $fontStyle, $paragraphStyle] = array_pad($args, 3, null);
                 if ($count === null) {
                     $count = 1;
                 }
-                for ($i = 1; $i <= $count; $i++) {
+                for ($i = 1; $i <= $count; ++$i) {
                     $this->addElement($element, $fontStyle, $paragraphStyle);
                 }
             } else {
                 // All other elements
                 array_unshift($args, $element); // Prepend element name to the beginning of args array
 
-                return call_user_func_array(array($this, 'addElement'), $args);
+                return call_user_func_array([$this, 'addElement'], $args);
             }
         }
 
@@ -118,11 +124,12 @@ public function __call($function, $args)
     }
 
     /**
-     * Add element
+     * Add element.
      *
      * Each element has different number of parameters passed
      *
      * @param string $elementName
+     *
      * @return \PhpOffice\PhpWord\Element\AbstractElement
      */
     protected function addElement($elementName)
@@ -132,13 +139,13 @@ protected function addElement($elementName)
 
         // Get arguments
         $args = func_get_args();
-        $withoutP = in_array($this->container, array('TextRun', 'Footnote', 'Endnote', 'ListItemRun', 'Field'));
+        $withoutP = in_array($this->container, ['TextRun', 'Footnote', 'Endnote', 'ListItemRun', 'Field']);
         if ($withoutP && ($elementName == 'Text' || $elementName == 'PreserveText')) {
             $args[3] = null; // Remove paragraph style for texts in textrun
         }
 
         // Create element using reflection
-        $reflection = new \ReflectionClass($elementClass);
+        $reflection = new ReflectionClass($elementClass);
         $elementArgs = $args;
         array_shift($elementArgs); // Shift the $elementName off the beginning of array
 
@@ -156,7 +163,7 @@ protected function addElement($elementName)
     }
 
     /**
-     * Get all elements
+     * Get all elements.
      *
      * @return \PhpOffice\PhpWord\Element\AbstractElement[]
      */
@@ -166,10 +173,11 @@ public function getElements()
     }
 
     /**
-     * Returns the element at the requested position
+     * Returns the element at the requested position.
      *
      * @param int $index
-     * @return \PhpOffice\PhpWord\Element\AbstractElement|null
+     *
+     * @return null|\PhpOffice\PhpWord\Element\AbstractElement
      */
     public function getElement($index)
     {
@@ -181,11 +189,11 @@ public function getElement($index)
     }
 
     /**
-     * Removes the element at requested index
+     * Removes the element at requested index.
      *
      * @param int|\PhpOffice\PhpWord\Element\AbstractElement $toRemove
      */
-    public function removeElement($toRemove)
+    public function removeElement($toRemove): void
     {
         if (is_int($toRemove) && array_key_exists($toRemove, $this->elements)) {
             unset($this->elements[$toRemove]);
@@ -201,7 +209,7 @@ public function removeElement($toRemove)
     }
 
     /**
-     * Count elements
+     * Count elements.
      *
      * @return int
      */
@@ -211,59 +219,58 @@ public function countElements()
     }
 
     /**
-     * Check if a method is allowed for the current container
+     * Check if a method is allowed for the current container.
      *
      * @param string $method
      *
-     * @throws \BadMethodCallException
      * @return bool
      */
     private function checkValidity($method)
     {
-        $generalContainers = array(
+        $generalContainers = [
             'Section', 'Header', 'Footer', 'Footnote', 'Endnote', 'Cell', 'TextRun', 'TextBox', 'ListItemRun', 'TrackChange',
-        );
+        ];
 
-        $validContainers = array(
-            'Text'          => $generalContainers,
-            'Bookmark'      => $generalContainers,
-            'Link'          => $generalContainers,
-            'TextBreak'     => $generalContainers,
-            'Image'         => $generalContainers,
-            'OLEObject'     => $generalContainers,
-            'Field'         => $generalContainers,
-            'Line'          => $generalContainers,
-            'Shape'         => $generalContainers,
-            'FormField'     => $generalContainers,
-            'SDT'           => $generalContainers,
-            'TrackChange'   => $generalContainers,
-            'TextRun'       => array('Section', 'Header', 'Footer', 'Cell', 'TextBox', 'TrackChange', 'ListItemRun'),
-            'ListItem'      => array('Section', 'Header', 'Footer', 'Cell', 'TextBox'),
-            'ListItemRun'   => array('Section', 'Header', 'Footer', 'Cell', 'TextBox'),
-            'Table'         => array('Section', 'Header', 'Footer', 'Cell', 'TextBox'),
-            'CheckBox'      => array('Section', 'Header', 'Footer', 'Cell', 'TextRun'),
-            'TextBox'       => array('Section', 'Header', 'Footer', 'Cell'),
-            'Footnote'      => array('Section', 'TextRun', 'Cell', 'ListItemRun'),
-            'Endnote'       => array('Section', 'TextRun', 'Cell'),
-            'PreserveText'  => array('Section', 'Header', 'Footer', 'Cell'),
-            'Title'         => array('Section', 'Cell'),
-            'TOC'           => array('Section'),
-            'PageBreak'     => array('Section'),
-            'Chart'         => array('Section', 'Cell'),
-        );
+        $validContainers = [
+            'Text' => $generalContainers,
+            'Bookmark' => $generalContainers,
+            'Link' => $generalContainers,
+            'TextBreak' => $generalContainers,
+            'Image' => $generalContainers,
+            'OLEObject' => $generalContainers,
+            'Field' => $generalContainers,
+            'Line' => $generalContainers,
+            'Shape' => $generalContainers,
+            'FormField' => $generalContainers,
+            'SDT' => $generalContainers,
+            'TrackChange' => $generalContainers,
+            'TextRun' => ['Section', 'Header', 'Footer', 'Cell', 'TextBox', 'TrackChange', 'ListItemRun'],
+            'ListItem' => ['Section', 'Header', 'Footer', 'Cell', 'TextBox'],
+            'ListItemRun' => ['Section', 'Header', 'Footer', 'Cell', 'TextBox'],
+            'Table' => ['Section', 'Header', 'Footer', 'Cell', 'TextBox'],
+            'CheckBox' => ['Section', 'Header', 'Footer', 'Cell', 'TextRun'],
+            'TextBox' => ['Section', 'Header', 'Footer', 'Cell'],
+            'Footnote' => ['Section', 'TextRun', 'Cell', 'ListItemRun'],
+            'Endnote' => ['Section', 'TextRun', 'Cell'],
+            'PreserveText' => ['Section', 'Header', 'Footer', 'Cell'],
+            'Title' => ['Section', 'Cell'],
+            'TOC' => ['Section'],
+            'PageBreak' => ['Section'],
+            'Chart' => ['Section', 'Cell'],
+        ];
 
         // Special condition, e.g. preservetext can only exists in cell when
         // the cell is located in header or footer
-        $validSubcontainers = array(
-            'PreserveText'  => array(array('Cell'), array('Header', 'Footer', 'Section')),
-            'Footnote'      => array(array('Cell', 'TextRun'), array('Section')),
-            'Endnote'       => array(array('Cell', 'TextRun'), array('Section')),
-        );
+        $validSubcontainers = [
+            'PreserveText' => [['Cell'], ['Header', 'Footer', 'Section']],
+            'Footnote' => [['Cell', 'TextRun'], ['Section']],
+            'Endnote' => [['Cell', 'TextRun'], ['Section']],
+        ];
 
         // Check if a method is valid for current container
         if (isset($validContainers[$method])) {
             if (!in_array($this->container, $validContainers[$method])) {
-                throw new \BadMethodCallException("Cannot add {$method} in {$this->container}.");
+                throw new BadMethodCallException("Cannot add {$method} in {$this->container}.");
             }
         }
 
@@ -274,43 +281,11 @@ private function checkValidity($method)
             $allowedDocParts = $rules[1];
             foreach ($containers as $container) {
                 if ($this->container == $container && !in_array($this->getDocPart(), $allowedDocParts)) {
-                    throw new \BadMethodCallException("Cannot add {$method} in {$this->container}.");
+                    throw new BadMethodCallException("Cannot add {$method} in {$this->container}.");
                 }
             }
         }
 
         return true;
     }
-
-    /**
-     * Create textrun element
-     *
-     * @deprecated 0.10.0
-     *
-     * @param mixed $paragraphStyle
-     *
-     * @return \PhpOffice\PhpWord\Element\TextRun
-     *
-     * @codeCoverageIgnore
-     */
-    public function createTextRun($paragraphStyle = null)
-    {
-        return $this->addTextRun($paragraphStyle);
-    }
-
-    /**
-     * Create footnote element
-     *
-     * @deprecated 0.10.0
-     *
-     * @param mixed $paragraphStyle
-     *
-     * @return \PhpOffice\PhpWord\Element\Footnote
-     *
-     * @codeCoverageIgnore
-     */
-    public function createFootnote($paragraphStyle = null)
-    {
-        return $this->addFootnote($paragraphStyle);
-    }
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Element/AbstractElement.php b/vendor/phpoffice/phpword/src/PhpWord/Element/AbstractElement.php
index 46372b71db..385e4d3140 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Element/AbstractElement.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Element/AbstractElement.php
@@ -11,38 +11,42 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Element;
 
+use DateTime;
+use InvalidArgumentException;
+use PhpOffice\PhpWord\Collection\Comments;
 use PhpOffice\PhpWord\Media;
 use PhpOffice\PhpWord\PhpWord;
+use PhpOffice\PhpWord\Style;
 
 /**
- * Element abstract class
+ * Element abstract class.
  *
  * @since 0.10.0
  */
 abstract class AbstractElement
 {
     /**
-     * PhpWord object
+     * PhpWord object.
      *
-     * @var \PhpOffice\PhpWord\PhpWord
+     * @var ?PhpWord
      */
     protected $phpWord;
 
     /**
-     * Section Id
+     * Section Id.
      *
      * @var int
      */
     protected $sectionId;
 
     /**
-     * Document part type: Section|Header|Footer|Footnote|Endnote
+     * Document part type: Section|Header|Footer|Footnote|Endnote.
      *
      * Used by textrun and cell container to determine where the element is
      * located because it will affect the availability of other element,
@@ -53,7 +57,7 @@ abstract class AbstractElement
     protected $docPart = 'Section';
 
     /**
-     * Document part Id
+     * Document part Id.
      *
      * For header and footer, this will be = ($sectionId - 1) * 3 + $index
      * because the max number of header/footer in every page is 3, i.e.
@@ -64,28 +68,28 @@ abstract class AbstractElement
     protected $docPartId = 1;
 
     /**
-     * Index of element in the elements collection (start with 1)
+     * Index of element in the elements collection (start with 1).
      *
      * @var int
      */
     protected $elementIndex = 1;
 
     /**
-     * Unique Id for element
+     * Unique Id for element.
      *
      * @var string
      */
     protected $elementId;
 
     /**
-     * Relation Id
+     * Relation Id.
      *
      * @var int
      */
     protected $relationId;
 
     /**
-     * Depth of table container nested level; Primarily used for RTF writer/reader
+     * Depth of table container nested level; Primarily used for RTF writer/reader.
      *
      * 0 = Not in a table; 1 = in a table; 2 = in a table inside another table, etc.
      *
@@ -94,76 +98,74 @@ abstract class AbstractElement
     private $nestedLevel = 0;
 
     /**
-     * A reference to the parent
+     * A reference to the parent.
      *
-     * @var AbstractElement|null
+     * @var null|AbstractElement
      */
     private $parent;
 
     /**
-     * changed element info
+     * changed element info.
      *
      * @var TrackChange
      */
     private $trackChange;
 
     /**
-     * Parent container type
+     * Parent container type.
      *
      * @var string
      */
     private $parentContainer;
 
     /**
-     * Has media relation flag; true for Link, Image, and Object
+     * Has media relation flag; true for Link, Image, and Object.
      *
      * @var bool
      */
     protected $mediaRelation = false;
 
     /**
-     * Is part of collection; true for Title, Footnote, Endnote, Chart, and Comment
+     * Is part of collection; true for Title, Footnote, Endnote, Chart, and Comment.
      *
      * @var bool
      */
     protected $collectionRelation = false;
 
     /**
-     * The start position for the linked comment
+     * The start position for the linked comments.
      *
-     * @var Comment
+     * @var Comments
      */
-    protected $commentRangeStart;
+    protected $commentsRangeStart;
 
     /**
-     * The end position for the linked comment
+     * The end position for the linked comments.
      *
-     * @var Comment
+     * @var Comments
      */
-    protected $commentRangeEnd;
+    protected $commentsRangeEnd;
 
     /**
-     * Get PhpWord
+     * Get PhpWord.
      *
-     * @return \PhpOffice\PhpWord\PhpWord
+     * @return ?PhpWord
      */
-    public function getPhpWord()
+    public function getPhpWord(): ?PhpWord
     {
         return $this->phpWord;
     }
 
     /**
      * Set PhpWord as reference.
-     *
-     * @param \PhpOffice\PhpWord\PhpWord $phpWord
      */
-    public function setPhpWord(PhpWord $phpWord = null)
+    public function setPhpWord(?PhpWord $phpWord = null): void
     {
         $this->phpWord = $phpWord;
     }
 
     /**
-     * Get section number
+     * Get section number.
      *
      * @return int
      */
@@ -178,14 +180,14 @@ public function getSectionId()
      * @param string $docPart
      * @param int $docPartId
      */
-    public function setDocPart($docPart, $docPartId = 1)
+    public function setDocPart($docPart, $docPartId = 1): void
     {
         $this->docPart = $docPart;
         $this->docPartId = $docPartId;
     }
 
     /**
-     * Get doc part
+     * Get doc part.
      *
      * @return string
      */
@@ -195,7 +197,7 @@ public function getDocPart()
     }
 
     /**
-     * Get doc part Id
+     * Get doc part Id.
      *
      * @return int
      */
@@ -205,7 +207,7 @@ public function getDocPartId()
     }
 
     /**
-     * Return media element (image, object, link) container name
+     * Return media element (image, object, link) container name.
      *
      * @return string section|headerx|footerx|footnote|endnote
      */
@@ -220,7 +222,7 @@ private function getMediaPart()
     }
 
     /**
-     * Get element index
+     * Get element index.
      *
      * @return int
      */
@@ -234,13 +236,13 @@ public function getElementIndex()
      *
      * @param int $value
      */
-    public function setElementIndex($value)
+    public function setElementIndex($value): void
     {
         $this->elementIndex = $value;
     }
 
     /**
-     * Get element unique ID
+     * Get element unique ID.
      *
      * @return string
      */
@@ -252,13 +254,13 @@ public function getElementId()
     /**
      * Set element unique ID from 6 first digit of md5.
      */
-    public function setElementId()
+    public function setElementId(): void
     {
-        $this->elementId = substr(md5(rand()), 0, 6);
+        $this->elementId = substr(md5(mt_rand()), 0, 6);
     }
 
     /**
-     * Get relation Id
+     * Get relation Id.
      *
      * @return int
      */
@@ -272,13 +274,13 @@ public function getRelationId()
      *
      * @param int $value
      */
-    public function setRelationId($value)
+    public function setRelationId($value): void
     {
         $this->relationId = $value;
     }
 
     /**
-     * Get nested level
+     * Get nested level.
      *
      * @return int
      */
@@ -288,57 +290,105 @@ public function getNestedLevel()
     }
 
     /**
-     * Get comment start
+     * Get comments start.
      *
-     * @return Comment
+     * @return Comments
      */
-    public function getCommentRangeStart()
+    public function getCommentsRangeStart(): ?Comments
     {
-        return $this->commentRangeStart;
+        return $this->commentsRangeStart;
     }
 
     /**
-     * Set comment start
+     * Get comment start.
      *
-     * @param Comment $value
+     * @return Comment
      */
-    public function setCommentRangeStart(Comment $value)
+    public function getCommentRangeStart(): ?Comment
+    {
+        if ($this->commentsRangeStart != null) {
+            return $this->commentsRangeStart->getItem($this->commentsRangeStart->countItems());
+        }
+
+        return null;
+    }
+
+    /**
+     * Set comment start.
+     */
+    public function setCommentRangeStart(Comment $value): void
     {
         if ($this instanceof Comment) {
-            throw new \InvalidArgumentException('Cannot set a Comment on a Comment');
+            throw new InvalidArgumentException('Cannot set a Comment on a Comment');
+        }
+        if ($this->commentsRangeStart == null) {
+            $this->commentsRangeStart = new Comments();
         }
-        $this->commentRangeStart = $value;
-        $this->commentRangeStart->setStartElement($this);
+        // Set ID early to avoid duplicates.
+        if ($value->getElementId() == null) {
+            $value->setElementId();
+        }
+        foreach ($this->commentsRangeStart->getItems() as $comment) {
+            if ($value->getElementId() == $comment->getElementId()) {
+                return;
+            }
+        }
+        $idxItem = $this->commentsRangeStart->addItem($value);
+        $this->commentsRangeStart->getItem($idxItem)->setStartElement($this);
     }
 
     /**
-     * Get comment end
+     * Get comments end.
      *
-     * @return Comment
+     * @return Comments
      */
-    public function getCommentRangeEnd()
+    public function getCommentsRangeEnd(): ?Comments
     {
-        return $this->commentRangeEnd;
+        return $this->commentsRangeEnd;
     }
 
     /**
-     * Set comment end
+     * Get comment end.
      *
-     * @param Comment $value
+     * @return Comment
+     */
+    public function getCommentRangeEnd(): ?Comment
+    {
+        if ($this->commentsRangeEnd != null) {
+            return $this->commentsRangeEnd->getItem($this->commentsRangeEnd->countItems());
+        }
+
+        return null;
+    }
+
+    /**
+     * Set comment end.
      */
-    public function setCommentRangeEnd(Comment $value)
+    public function setCommentRangeEnd(Comment $value): void
     {
         if ($this instanceof Comment) {
-            throw new \InvalidArgumentException('Cannot set a Comment on a Comment');
+            throw new InvalidArgumentException('Cannot set a Comment on a Comment');
+        }
+        if ($this->commentsRangeEnd == null) {
+            $this->commentsRangeEnd = new Comments();
+        }
+        // Set ID early to avoid duplicates.
+        if ($value->getElementId() == null) {
+            $value->setElementId();
+        }
+        foreach ($this->commentsRangeEnd->getItems() as $comment) {
+            if ($value->getElementId() == $comment->getElementId()) {
+                return;
+            }
         }
-        $this->commentRangeEnd = $value;
-        $this->commentRangeEnd->setEndElement($this);
+        $idxItem = $this->commentsRangeEnd->addItem($value);
+        $this->commentsRangeEnd->getItem($idxItem)->setEndElement($this);
     }
 
     /**
-     * Get parent element
+     * Get parent element.
      *
-     * @return AbstractElement|null
+     * @return null|AbstractElement
      */
     public function getParent()
     {
@@ -346,13 +396,11 @@ public function getParent()
     }
 
     /**
-     * Set parent container
+     * Set parent container.
      *
      * Passed parameter should be a container, except for Table (contain Row) and Row (contain Cell)
-     *
-     * @param \PhpOffice\PhpWord\Element\AbstractElement $container
      */
-    public function setParentContainer(self $container)
+    public function setParentContainer(self $container): void
     {
         $this->parentContainer = substr(get_class($container), strrpos(get_class($container), '\\') + 1);
         $this->parent = $container;
@@ -360,7 +408,7 @@ public function setParentContainer(self $container)
         // Set nested level
         $this->nestedLevel = $container->getNestedLevel();
         if ($this->parentContainer == 'Cell') {
-            $this->nestedLevel++;
+            ++$this->nestedLevel;
         }
 
         // Set phpword
@@ -376,18 +424,18 @@ public function setParentContainer(self $container)
     }
 
     /**
-     * Set relation Id for media elements (link, image, object; legacy of OOXML)
+     * Set relation Id for media elements (link, image, object; legacy of OOXML).
      *
      * - Image element needs to be passed to Media object
      * - Icon needs to be set for Object element
      */
-    private function setMediaRelation()
+    private function setMediaRelation(): void
     {
         if (!$this instanceof Link && !$this instanceof Image && !$this instanceof OLEObject) {
             return;
         }
 
-        $elementName = substr(get_class($this), strrpos(get_class($this), '\\') + 1);
+        $elementName = substr(static::class, strrpos(static::class, '\\') + 1);
         if ($elementName == 'OLEObject') {
             $elementName = 'Object';
         }
@@ -410,10 +458,10 @@ private function setMediaRelation()
     /**
      * Set relation Id for elements that will be registered in the Collection subnamespaces.
      */
-    private function setCollectionRelation()
+    private function setCollectionRelation(): void
     {
         if ($this->collectionRelation === true && $this->phpWord instanceof PhpWord) {
-            $elementName = substr(get_class($this), strrpos(get_class($this), '\\') + 1);
+            $elementName = substr(static::class, strrpos(static::class, '\\') + 1);
             $addMethod = "add{$elementName}";
             $rId = $this->phpWord->$addMethod($this);
             $this->setRelationId($rId);
@@ -421,7 +469,7 @@ private function setCollectionRelation()
     }
 
     /**
-     * Check if element is located in Section doc part (as opposed to Header/Footer)
+     * Check if element is located in Section doc part (as opposed to Header/Footer).
      *
      * @return bool
      */
@@ -431,16 +479,17 @@ public function isInSection()
     }
 
     /**
-     * Set new style value
+     * Set new style value.
      *
      * @param mixed $styleObject Style object
-     * @param mixed $styleValue Style value
+     * @param null|array|string|Style $styleValue Style value
      * @param bool $returnObject Always return object
+     *
      * @return mixed
      */
     protected function setNewStyle($styleObject, $styleValue = null, $returnObject = false)
     {
-        if (!is_null($styleValue) && is_array($styleValue)) {
+        if (null !== $styleValue && is_array($styleValue)) {
             $styleObject->setStyleByArray($styleValue);
             $style = $styleObject;
         } else {
@@ -451,17 +500,15 @@ protected function setNewStyle($styleObject, $styleValue = null, $returnObject =
     }
 
     /**
-     * Sets the trackChange information
-     *
-     * @param TrackChange $trackChange
+     * Sets the trackChange information.
      */
-    public function setTrackChange(TrackChange $trackChange)
+    public function setTrackChange(TrackChange $trackChange): void
     {
         $this->trackChange = $trackChange;
     }
 
     /**
-     * Gets the trackChange information
+     * Gets the trackChange information.
      *
      * @return TrackChange
      */
@@ -471,33 +518,32 @@ public function getTrackChange()
     }
 
     /**
-     * Set changed
+     * Set changed.
      *
      * @param string $type INSERTED|DELETED
      * @param string $author
-     * @param null|int|\DateTime $date allways in UTC
+     * @param null|DateTime|int $date allways in UTC
      */
-    public function setChangeInfo($type, $author, $date = null)
+    public function setChangeInfo($type, $author, $date = null): void
     {
         $this->trackChange = new TrackChange($type, $author, $date);
     }
 
     /**
-     * Set enum value
+     * Set enum value.
      *
-     * @param string|null $value
+     * @param null|string $value
      * @param string[] $enum
-     * @param string|null $default
+     * @param null|string $default
      *
-     * @throws \InvalidArgumentException
-     * @return string|null
+     * @return null|string
      *
      * @todo Merge with the same method in AbstractStyle
      */
-    protected function setEnumVal($value = null, $enum = array(), $default = null)
+    protected function setEnumVal($value = null, $enum = [], $default = null)
     {
         if ($value !== null && trim($value) != '' && !empty($enum) && !in_array($value, $enum)) {
-            throw new \InvalidArgumentException("Invalid style value: {$value}");
+            throw new InvalidArgumentException("Invalid style value: {$value}");
         } elseif ($value === null || trim($value) == '') {
             $value = $default;
         }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Element/Bookmark.php b/vendor/phpoffice/phpword/src/PhpWord/Element/Bookmark.php
index 856f68600b..4fe3d0f067 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Element/Bookmark.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Element/Bookmark.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,26 +20,26 @@
 use PhpOffice\PhpWord\Shared\Text as SharedText;
 
 /**
- * Bookmark element
+ * Bookmark element.
  */
 class Bookmark extends AbstractElement
 {
     /**
-     * Bookmark Name
+     * Bookmark Name.
      *
      * @var string
      */
     private $name;
 
     /**
-     * Is part of collection
+     * Is part of collection.
      *
      * @var bool
      */
     protected $collectionRelation = true;
 
     /**
-     * Create a new Bookmark Element
+     * Create a new Bookmark Element.
      *
      * @param string $name
      */
@@ -49,7 +49,7 @@ public function __construct($name = '')
     }
 
     /**
-     * Get Bookmark name
+     * Get Bookmark name.
      *
      * @return string
      */
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Element/Cell.php b/vendor/phpoffice/phpword/src/PhpWord/Element/Cell.php
index 68f5df6255..b0aa0c4ed4 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Element/Cell.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Element/Cell.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,7 +20,7 @@
 use PhpOffice\PhpWord\Style\Cell as CellStyle;
 
 /**
- * Table cell element
+ * Table cell element.
  */
 class Cell extends AbstractContainer
 {
@@ -30,23 +30,23 @@ class Cell extends AbstractContainer
     protected $container = 'Cell';
 
     /**
-     * Cell width
+     * Cell width.
      *
-     * @var int
+     * @var ?int
      */
-    private $width = null;
+    private $width;
 
     /**
-     * Cell style
+     * Cell style.
      *
-     * @var \PhpOffice\PhpWord\Style\Cell
+     * @var ?\PhpOffice\PhpWord\Style\Cell
      */
     private $style;
 
     /**
-     * Create new instance
+     * Create new instance.
      *
-     * @param int $width
+     * @param null|int $width
      * @param array|\PhpOffice\PhpWord\Style\Cell $style
      */
     public function __construct($width = null, $style = null)
@@ -56,9 +56,9 @@ public function __construct($width = null, $style = null)
     }
 
     /**
-     * Get cell style
+     * Get cell style.
      *
-     * @return \PhpOffice\PhpWord\Style\Cell
+     * @return ?\PhpOffice\PhpWord\Style\Cell
      */
     public function getStyle()
     {
@@ -66,9 +66,9 @@ public function getStyle()
     }
 
     /**
-     * Get cell width
+     * Get cell width.
      *
-     * @return int
+     * @return ?int
      */
     public function getWidth()
     {
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Element/Chart.php b/vendor/phpoffice/phpword/src/PhpWord/Element/Chart.php
index 92152c877d..4f652f2512 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Element/Chart.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Element/Chart.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,42 +20,42 @@
 use PhpOffice\PhpWord\Style\Chart as ChartStyle;
 
 /**
- * Chart element
+ * Chart element.
  *
  * @since 0.12.0
  */
 class Chart extends AbstractElement
 {
     /**
-     * Is part of collection
+     * Is part of collection.
      *
      * @var bool
      */
     protected $collectionRelation = true;
 
     /**
-     * Type
+     * Type.
      *
      * @var string
      */
     private $type = 'pie';
 
     /**
-     * Series
+     * Series.
      *
      * @var array
      */
-    private $series = array();
+    private $series = [];
 
     /**
-     * Chart style
+     * Chart style.
      *
-     * @var \PhpOffice\PhpWord\Style\Chart
+     * @var ?\PhpOffice\PhpWord\Style\Chart
      */
     private $style;
 
     /**
-     * Create new instance
+     * Create new instance.
      *
      * @param string $type
      * @param array $categories
@@ -71,7 +71,7 @@ public function __construct($type, $categories, $values, $style = null, $seriesN
     }
 
     /**
-     * Get type
+     * Get type.
      *
      * @return string
      */
@@ -85,30 +85,30 @@ public function getType()
      *
      * @param string $value
      */
-    public function setType($value)
+    public function setType($value): void
     {
-        $enum = array('pie', 'doughnut', 'line', 'bar', 'stacked_bar', 'percent_stacked_bar', 'column', 'stacked_column', 'percent_stacked_column', 'area', 'radar', 'scatter');
+        $enum = ['pie', 'doughnut', 'line', 'bar', 'stacked_bar', 'percent_stacked_bar', 'column', 'stacked_column', 'percent_stacked_column', 'area', 'radar', 'scatter'];
         $this->type = $this->setEnumVal($value, $enum, 'pie');
     }
 
     /**
-     * Add series
+     * Add series.
      *
      * @param array $categories
      * @param array $values
      * @param null|mixed $name
      */
-    public function addSeries($categories, $values, $name = null)
+    public function addSeries($categories, $values, $name = null): void
     {
-        $this->series[] = array(
+        $this->series[] = [
             'categories' => $categories,
-            'values'     => $values,
-            'name'       => $name,
-        );
+            'values' => $values,
+            'name' => $name,
+        ];
     }
 
     /**
-     * Get series
+     * Get series.
      *
      * @return array
      */
@@ -118,9 +118,9 @@ public function getSeries()
     }
 
     /**
-     * Get chart style
+     * Get chart style.
      *
-     * @return \PhpOffice\PhpWord\Style\Chart
+     * @return ?\PhpOffice\PhpWord\Style\Chart
      */
     public function getStyle()
     {
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Element/CheckBox.php b/vendor/phpoffice/phpword/src/PhpWord/Element/CheckBox.php
index beabf8a0a8..80b17a87c7 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Element/CheckBox.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Element/CheckBox.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,21 +20,21 @@
 use PhpOffice\PhpWord\Shared\Text as SharedText;
 
 /**
- * Check box element
+ * Check box element.
  *
  * @since 0.10.0
  */
 class CheckBox extends Text
 {
     /**
-     * Name content
+     * Name content.
      *
      * @var string
      */
     private $name;
 
     /**
-     * Create new instance
+     * Create new instance.
      *
      * @param string $name
      * @param string $text
@@ -48,9 +48,10 @@ public function __construct($name = null, $text = null, $fontStyle = null, $para
     }
 
     /**
-     * Set name content
+     * Set name content.
      *
      * @param string $name
+     *
      * @return self
      */
     public function setName($name)
@@ -61,7 +62,7 @@ public function setName($name)
     }
 
     /**
-     * Get name content
+     * Get name content.
      *
      * @return string
      */
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Element/Comment.php b/vendor/phpoffice/phpword/src/PhpWord/Element/Comment.php
index 96ad15ef4e..9173c49148 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Element/Comment.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Element/Comment.php
@@ -11,51 +11,54 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Element;
 
+use DateTime;
+
 /**
- * Comment element
+ * Comment element.
+ *
  * @see http://datypic.com/sc/ooxml/t-w_CT_Comment.html
  */
 class Comment extends TrackChange
 {
     /**
-     * Initials
+     * Initials.
      *
      * @var string
      */
     private $initials;
 
     /**
-     * The Element where this comment starts
+     * The Element where this comment starts.
      *
      * @var AbstractElement
      */
     private $startElement;
 
     /**
-     * The Element where this comment ends
+     * The Element where this comment ends.
      *
      * @var AbstractElement
      */
     private $endElement;
 
     /**
-     * Is part of collection
+     * Is part of collection.
      *
      * @var bool
      */
     protected $collectionRelation = true;
 
     /**
-     * Create a new Comment Element
+     * Create a new Comment Element.
      *
      * @param string $author
-     * @param null|\DateTime $date
+     * @param null|DateTime $date
      * @param string $initials
      */
     public function __construct($author, $date = null, $initials = null)
@@ -65,7 +68,7 @@ public function __construct($author, $date = null, $initials = null)
     }
 
     /**
-     * Get Initials
+     * Get Initials.
      *
      * @return string
      */
@@ -75,20 +78,16 @@ public function getInitials()
     }
 
     /**
-     * Sets the element where this comment starts
-     *
-     * @param \PhpOffice\PhpWord\Element\AbstractElement $value
+     * Sets the element where this comment starts.
      */
-    public function setStartElement(AbstractElement $value)
+    public function setStartElement(AbstractElement $value): void
     {
         $this->startElement = $value;
-        if ($value->getCommentRangeStart() == null) {
-            $value->setCommentRangeStart($this);
-        }
+        $value->setCommentRangeStart($this);
     }
 
     /**
-     * Get the element where this comment starts
+     * Get the element where this comment starts.
      *
      * @return \PhpOffice\PhpWord\Element\AbstractElement
      */
@@ -98,20 +97,16 @@ public function getStartElement()
     }
 
     /**
-     * Sets the element where this comment ends
-     *
-     * @param \PhpOffice\PhpWord\Element\AbstractElement $value
+     * Sets the element where this comment ends.
      */
-    public function setEndElement(AbstractElement $value)
+    public function setEndElement(AbstractElement $value): void
     {
         $this->endElement = $value;
-        if ($value->getCommentRangeEnd() == null) {
-            $value->setCommentRangeEnd($this);
-        }
+        $value->setCommentRangeEnd($this);
     }
 
     /**
-     * Get the element where this comment ends
+     * Get the element where this comment ends.
      *
      * @return \PhpOffice\PhpWord\Element\AbstractElement
      */
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Element/Endnote.php b/vendor/phpoffice/phpword/src/PhpWord/Element/Endnote.php
index b962719502..2888fdebc3 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Element/Endnote.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Element/Endnote.php
@@ -11,14 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Element;
 
 /**
- * Endnote element
+ * Endnote element.
  *
  * @since 0.10.0
  */
@@ -30,9 +30,9 @@ class Endnote extends Footnote
     protected $container = 'Endnote';
 
     /**
-     * Create new instance
+     * Create new instance.
      *
-     * @param string|array|\PhpOffice\PhpWord\Style\Paragraph $paragraphStyle
+     * @param array|\PhpOffice\PhpWord\Style\Paragraph|string $paragraphStyle
      */
     public function __construct($paragraphStyle = null)
     {
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Element/Field.php b/vendor/phpoffice/phpword/src/PhpWord/Element/Field.php
index 3d1503fe22..a828aaa02e 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Element/Field.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Element/Field.php
@@ -11,16 +11,17 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Element;
 
+use InvalidArgumentException;
 use PhpOffice\PhpWord\Style\Font;
 
 /**
- * Field element
+ * Field element.
  *
  * @since 0.11.0
  * @see  http://www.schemacentral.com/sc/ooxml/t-w_CT_SimpleField.html
@@ -29,103 +30,114 @@ class Field extends AbstractElement
 {
     /**
      * Field properties and options. Depending on type, a field can have different properties
-     * and options
+     * and options.
      *
      * @var array
      */
-    protected $fieldsArray = array(
-        'PAGE' => array(
-           'properties' => array(
-               'format' => array('Arabic', 'ArabicDash', 'alphabetic', 'ALPHABETIC', 'roman', 'ROMAN'),
-           ),
-           'options' => array('PreserveFormat'),
-        ),
-        'NUMPAGES' => array(
-           'properties' => array(
-               'format' => array('Arabic', 'ArabicDash', 'CardText', 'DollarText', 'Ordinal', 'OrdText',
-                   'alphabetic', 'ALPHABETIC', 'roman', 'ROMAN', 'Caps', 'FirstCap', 'Lower', 'Upper', ),
-               'numformat' => array('0', '0,00', '#.##0', '#.##0,00', '€ #.##0,00(€ #.##0,00)', '0%', '0,00%'),
-           ),
-           'options' => array('PreserveFormat'),
-        ),
-        'DATE' => array(
-            'properties' => array(
-                'dateformat' => array(
-                    /* Generic formats */
+    protected $fieldsArray = [
+        'PAGE' => [
+            'properties' => [
+                'format' => ['Arabic', 'ArabicDash', 'alphabetic', 'ALPHABETIC', 'roman', 'ROMAN'],
+            ],
+            'options' => ['PreserveFormat'],
+        ],
+        'NUMPAGES' => [
+            'properties' => [
+                'format' => ['Arabic', 'ArabicDash', 'CardText', 'DollarText', 'Ordinal', 'OrdText',
+                    'alphabetic', 'ALPHABETIC', 'roman', 'ROMAN', 'Caps', 'FirstCap', 'Lower', 'Upper', ],
+                'numformat' => ['0', '0,00', '#.##0', '#.##0,00', '€ #.##0,00(€ #.##0,00)', '0%', '0,00%'],
+            ],
+            'options' => ['PreserveFormat'],
+        ],
+        'DATE' => [
+            'properties' => [
+                'dateformat' => [
+                    // Generic formats
                     'yyyy-MM-dd', 'yyyy-MM', 'MMM-yy', 'MMM-yyyy', 'h:mm am/pm', 'h:mm:ss am/pm', 'HH:mm', 'HH:mm:ss',
-                    /* Day-Month-Year formats */
+                    // Day-Month-Year formats
                     'dddd d MMMM yyyy', 'd MMMM yyyy', 'd-MMM-yy', 'd MMM. yy',
                     'd-M-yy', 'd-M-yy h:mm', 'd-M-yy h:mm:ss', 'd-M-yy h:mm am/pm', 'd-M-yy h:mm:ss am/pm', 'd-M-yy HH:mm', 'd-M-yy HH:mm:ss',
                     'd/M/yy', 'd/M/yy h:mm', 'd/M/yy h:mm:ss', 'd/M/yy h:mm am/pm', 'd/M/yy h:mm:ss am/pm', 'd/M/yy HH:mm', 'd/M/yy HH:mm:ss',
                     'd-M-yyyy', 'd-M-yyyy h:mm', 'd-M-yyyy h:mm:ss', 'd-M-yyyy h:mm am/pm', 'd-M-yyyy h:mm:ss am/pm', 'd-M-yyyy HH:mm', 'd-M-yyyy HH:mm:ss',
                     'd/M/yyyy', 'd/M/yyyy h:mm', 'd/M/yyyy h:mm:ss', 'd/M/yyyy h:mm am/pm', 'd/M/yyyy h:mm:ss am/pm', 'd/M/yyyy HH:mm', 'd/M/yyyy HH:mm:ss',
-                    /* Month-Day-Year formats */
+                    // Month-Day-Year formats
                     'dddd, MMMM d yyyy', 'MMMM d yyyy', 'MMM-d-yy', 'MMM. d yy',
                     'M-d-yy', 'M-d-yy h:mm', 'M-d-yy h:mm:ss', 'M-d-yy h:mm am/pm', 'M-d-yy h:mm:ss am/pm', 'M-d-yy HH:mm', 'M-d-yy HH:mm:ss',
                     'M/d/yy', 'M/d/yy h:mm', 'M/d/yy h:mm:ss', 'M/d/yy h:mm am/pm', 'M/d/yy h:mm:ss am/pm', 'M/d/yy HH:mm', 'M/d/yy HH:mm:ss',
                     'M-d-yyyy', 'M-d-yyyy h:mm', 'M-d-yyyy h:mm:ss', 'M-d-yyyy h:mm am/pm', 'M-d-yyyy h:mm:ss am/pm', 'M-d-yyyy HH:mm', 'M-d-yyyy HH:mm:ss',
                     'M/d/yyyy', 'M/d/yyyy h:mm', 'M/d/yyyy h:mm:ss', 'M/d/yyyy h:mm am/pm', 'M/d/yyyy h:mm:ss am/pm', 'M/d/yyyy HH:mm', 'M/d/yyyy HH:mm:ss',
-                ),
-            ),
-            'options' => array('PreserveFormat', 'LunarCalendar', 'SakaEraCalendar', 'LastUsedFormat'),
-        ),
-        'MACROBUTTON' => array(
-            'properties' => array('macroname' => ''),
-        ),
-        'XE' => array(
-            'properties' => array(),
-            'options'    => array('Bold', 'Italic'),
-        ),
-        'INDEX' => array(
-            'properties' => array(),
-            'options'    => array('PreserveFormat'),
-        ),
-        'STYLEREF' => array(
-            'properties' => array('StyleIdentifier' => ''),
-            'options'    => array('PreserveFormat'),
-        ),
-    );
+                ],
+            ],
+            'options' => ['PreserveFormat', 'LunarCalendar', 'SakaEraCalendar', 'LastUsedFormat'],
+        ],
+        'MACROBUTTON' => [
+            'properties' => ['macroname' => ''],
+        ],
+        'XE' => [
+            'properties' => [],
+            'options' => ['Bold', 'Italic'],
+        ],
+        'INDEX' => [
+            'properties' => [],
+            'options' => ['PreserveFormat'],
+        ],
+        'STYLEREF' => [
+            'properties' => ['StyleIdentifier' => ''],
+            'options' => ['PreserveFormat'],
+        ],
+        'FILENAME' => [
+            'properties' => [
+                'format' => ['Upper', 'Lower', 'FirstCap', 'Caps'],
+            ],
+            'options' => ['Path', 'PreserveFormat'],
+        ],
+        'REF' => [
+            'properties' => ['name' => ''],
+            'options' => ['f', 'h', 'n', 'p', 'r', 't', 'w'],
+        ],
+    ];
 
     /**
-     * Field type
+     * Field type.
      *
      * @var string
      */
     protected $type;
 
     /**
-     * Field text
+     * Field text.
      *
-     * @var TextRun|string
+     * @var string|TextRun
      */
     protected $text;
 
     /**
-     * Field properties
+     * Field properties.
      *
      * @var array
      */
-    protected $properties = array();
+    protected $properties = [];
 
     /**
-     * Field options
+     * Field options.
      *
      * @var array
      */
-    protected $options = array();
+    protected $options = [];
 
     /**
-     * Font style
+     * Font style.
      *
-     * @var string|\PhpOffice\PhpWord\Style\Font
+     * @var \PhpOffice\PhpWord\Style\Font|string
      */
     protected $fontStyle;
 
     /**
-     * Set Font style
+     * Set Font style.
+     *
+     * @param array|\PhpOffice\PhpWord\Style\Font|string $style
      *
-     * @param string|array|\PhpOffice\PhpWord\Style\Font $style
-     * @return string|\PhpOffice\PhpWord\Style\Font
+     * @return \PhpOffice\PhpWord\Style\Font|string
      */
     public function setFontStyle($style = null)
     {
@@ -144,9 +156,9 @@ public function setFontStyle($style = null)
     }
 
     /**
-     * Get Font style
+     * Get Font style.
      *
-     * @return string|\PhpOffice\PhpWord\Style\Font
+     * @return \PhpOffice\PhpWord\Style\Font|string
      */
     public function getFontStyle()
     {
@@ -154,15 +166,15 @@ public function getFontStyle()
     }
 
     /**
-     * Create a new Field Element
+     * Create a new Field Element.
      *
      * @param string $type
      * @param array $properties
      * @param array $options
-     * @param TextRun|string|null $text
-     * @param string|array|\PhpOffice\PhpWord\Style\Font $fontStyle
+     * @param null|string|TextRun $text
+     * @param array|\PhpOffice\PhpWord\Style\Font|string $fontStyle
      */
-    public function __construct($type = null, $properties = array(), $options = array(), $text = null, $fontStyle = null)
+    public function __construct($type = null, $properties = [], $options = [], $text = null, $fontStyle = null)
     {
         $this->setType($type);
         $this->setProperties($properties);
@@ -172,11 +184,10 @@ public function __construct($type = null, $properties = array(), $options = arra
     }
 
     /**
-     * Set Field type
+     * Set Field type.
      *
      * @param string $type
      *
-     * @throws \InvalidArgumentException
      * @return string
      */
     public function setType($type = null)
@@ -185,7 +196,7 @@ public function setType($type = null)
             if (isset($this->fieldsArray[$type])) {
                 $this->type = $type;
             } else {
-                throw new \InvalidArgumentException("Invalid type '$type'");
+                throw new InvalidArgumentException("Invalid type '$type'");
             }
         }
 
@@ -193,7 +204,7 @@ public function setType($type = null)
     }
 
     /**
-     * Get Field type
+     * Get Field type.
      *
      * @return string
      */
@@ -203,19 +214,18 @@ public function getType()
     }
 
     /**
-     * Set Field properties
+     * Set Field properties.
      *
      * @param array $properties
      *
-     * @throws \InvalidArgumentException
      * @return self
      */
-    public function setProperties($properties = array())
+    public function setProperties($properties = [])
     {
         if (is_array($properties)) {
             foreach (array_keys($properties) as $propkey) {
                 if (!(isset($this->fieldsArray[$this->type]['properties'][$propkey]))) {
-                    throw new \InvalidArgumentException("Invalid property '$propkey'");
+                    throw new InvalidArgumentException("Invalid property '$propkey'");
                 }
             }
             $this->properties = array_merge($this->properties, $properties);
@@ -225,7 +235,7 @@ public function setProperties($properties = array())
     }
 
     /**
-     * Get Field properties
+     * Get Field properties.
      *
      * @return array
      */
@@ -235,19 +245,18 @@ public function getProperties()
     }
 
     /**
-     * Set Field options
+     * Set Field options.
      *
      * @param array $options
      *
-     * @throws \InvalidArgumentException
      * @return self
      */
-    public function setOptions($options = array())
+    public function setOptions($options = [])
     {
         if (is_array($options)) {
             foreach (array_keys($options) as $optionkey) {
                 if (!(isset($this->fieldsArray[$this->type]['options'][$optionkey])) && substr($optionkey, 0, 1) !== '\\') {
-                    throw new \InvalidArgumentException("Invalid option '$optionkey', possible values are " . implode(', ', $this->fieldsArray[$this->type]['options']));
+                    throw new InvalidArgumentException("Invalid option '$optionkey', possible values are " . implode(', ', $this->fieldsArray[$this->type]['options']));
                 }
             }
             $this->options = array_merge($this->options, $options);
@@ -257,7 +266,7 @@ public function setOptions($options = array())
     }
 
     /**
-     * Get Field properties
+     * Get Field properties.
      *
      * @return array
      */
@@ -267,11 +276,10 @@ public function getOptions()
     }
 
     /**
-     * Set Field text
+     * Set Field text.
      *
-     * @param string|TextRun $text
+     * @param null|string|TextRun $text
      *
-     * @throws \InvalidArgumentException
      * @return null|string|TextRun
      */
     public function setText($text = null)
@@ -280,7 +288,7 @@ public function setText($text = null)
             if (is_string($text) || $text instanceof TextRun) {
                 $this->text = $text;
             } else {
-                throw new \InvalidArgumentException('Invalid text');
+                throw new InvalidArgumentException('Invalid text');
             }
         }
 
@@ -288,7 +296,7 @@ public function setText($text = null)
     }
 
     /**
-     * Get Field text
+     * Get Field text.
      *
      * @return string|TextRun
      */
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Element/Footer.php b/vendor/phpoffice/phpword/src/PhpWord/Element/Footer.php
index 0290d7c1de..a9c48f7714 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Element/Footer.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Element/Footer.php
@@ -11,21 +11,22 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Element;
 
 /**
- * Footer element
+ * Footer element.
  */
 class Footer extends AbstractContainer
 {
     /**
-     * Header/footer types constants
+     * Header/footer types constants.
      *
      * @var string
+     *
      * @see  http://www.datypic.com/sc/ooxml/t-w_ST_HdrFtr.html Header or Footer Type
      */
     const AUTO = 'default';  // default and odd pages
@@ -38,14 +39,14 @@ class Footer extends AbstractContainer
     protected $container = 'Footer';
 
     /**
-     * Header type
+     * Header type.
      *
      * @var string
      */
     protected $type = self::AUTO;
 
     /**
-     * Create new instance
+     * Create new instance.
      *
      * @param int $sectionId
      * @param int $containerId
@@ -65,18 +66,19 @@ public function __construct($sectionId, $containerId = 1, $type = self::AUTO)
      *
      * @param string $value
      */
-    public function setType($value = self::AUTO)
+    public function setType($value = self::AUTO): void
     {
-        if (!in_array($value, array(self::AUTO, self::FIRST, self::EVEN))) {
+        if (!in_array($value, [self::AUTO, self::FIRST, self::EVEN])) {
             $value = self::AUTO;
         }
         $this->type = $value;
     }
 
     /**
-     * Get type
+     * Get type.
      *
      * @return string
+     *
      * @since 0.10.0
      */
     public function getType()
@@ -85,7 +87,7 @@ public function getType()
     }
 
     /**
-     * Reset type to default
+     * Reset type to default.
      *
      * @return string
      */
@@ -95,7 +97,7 @@ public function resetType()
     }
 
     /**
-     * First page only header
+     * First page only header.
      *
      * @return string
      */
@@ -105,7 +107,7 @@ public function firstPage()
     }
 
     /**
-     * Even numbered pages only
+     * Even numbered pages only.
      *
      * @return string
      */
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Element/Footnote.php b/vendor/phpoffice/phpword/src/PhpWord/Element/Footnote.php
index 90aabccca9..7a08091abc 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Element/Footnote.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Element/Footnote.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -27,23 +27,23 @@ class Footnote extends AbstractContainer
     protected $container = 'Footnote';
 
     /**
-     * Paragraph style
+     * Paragraph style.
      *
-     * @var string|\PhpOffice\PhpWord\Style\Paragraph
+     * @var null|\PhpOffice\PhpWord\Style\Paragraph|string
      */
     protected $paragraphStyle;
 
     /**
-     * Is part of collection
+     * Is part of collection.
      *
      * @var bool
      */
     protected $collectionRelation = true;
 
     /**
-     * Create new instance
+     * Create new instance.
      *
-     * @param string|array|\PhpOffice\PhpWord\Style\Paragraph $paragraphStyle
+     * @param array|\PhpOffice\PhpWord\Style\Paragraph|string $paragraphStyle
      */
     public function __construct($paragraphStyle = null)
     {
@@ -52,38 +52,12 @@ public function __construct($paragraphStyle = null)
     }
 
     /**
-     * Get paragraph style
+     * Get paragraph style.
      *
-     * @return string|\PhpOffice\PhpWord\Style\Paragraph
+     * @return null|\PhpOffice\PhpWord\Style\Paragraph|string
      */
     public function getParagraphStyle()
     {
         return $this->paragraphStyle;
     }
-
-    /**
-     * Get Footnote Reference ID
-     *
-     * @deprecated 0.10.0
-     * @codeCoverageIgnore
-     *
-     * @return int
-     */
-    public function getReferenceId()
-    {
-        return $this->getRelationId();
-    }
-
-    /**
-     * Set Footnote Reference ID
-     *
-     * @deprecated 0.10.0
-     * @codeCoverageIgnore
-     *
-     * @param int $rId
-     */
-    public function setReferenceId($rId)
-    {
-        $this->setRelationId($rId);
-    }
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Element/FormField.php b/vendor/phpoffice/phpword/src/PhpWord/Element/FormField.php
index f937df59c4..ef8c22fe47 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Element/FormField.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Element/FormField.php
@@ -11,14 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Element;
 
 /**
- * Form field element
+ * Form field element.
  *
  * @since 0.12.0
  * @see  http://www.datypic.com/sc/ooxml/t-w_CT_FFData.html
@@ -26,46 +26,46 @@
 class FormField extends Text
 {
     /**
-     * Form field type: textinput|checkbox|dropdown
+     * Form field type: textinput|checkbox|dropdown.
      *
      * @var string
      */
     private $type = 'textinput';
 
     /**
-     * Form field name
+     * Form field name.
      *
-     * @var string|bool|int
+     * @var ?string
      */
     private $name;
 
     /**
-     * Default value
+     * Default value.
      *
      * - TextInput: string
      * - CheckBox: bool
      * - DropDown: int Index of entries (zero based)
      *
-     * @var string|bool|int
+     * @var bool|int|string
      */
     private $default;
 
     /**
-     * Value
+     * Value.
      *
-     * @var string|bool|int
+     * @var null|bool|int|string
      */
     private $value;
 
     /**
-     * Dropdown entries
+     * Dropdown entries.
      *
      * @var array
      */
-    private $entries = array();
+    private $entries = [];
 
     /**
-     * Create new instance
+     * Create new instance.
      *
      * @param string $type
      * @param mixed $fontStyle
@@ -78,7 +78,7 @@ public function __construct($type, $fontStyle = null, $paragraphStyle = null)
     }
 
     /**
-     * Get type
+     * Get type.
      *
      * @return string
      */
@@ -88,23 +88,24 @@ public function getType()
     }
 
     /**
-     * Set type
+     * Set type.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setType($value)
     {
-        $enum = array('textinput', 'checkbox', 'dropdown');
+        $enum = ['textinput', 'checkbox', 'dropdown'];
         $this->type = $this->setEnumVal($value, $enum, $this->type);
 
         return $this;
     }
 
     /**
-     * Get name
+     * Get name.
      *
-     * @return string
+     * @return ?string
      */
     public function getName()
     {
@@ -112,9 +113,10 @@ public function getName()
     }
 
     /**
-     * Set name
+     * Set name.
+     *
+     * @param ?string $value
      *
-     * @param string|bool|int $value
      * @return self
      */
     public function setName($value)
@@ -125,9 +127,9 @@ public function setName($value)
     }
 
     /**
-     * Get default
+     * Get default.
      *
-     * @return string|bool|int
+     * @return bool|int|string
      */
     public function getDefault()
     {
@@ -135,9 +137,10 @@ public function getDefault()
     }
 
     /**
-     * Set default
+     * Set default.
+     *
+     * @param bool|int|string $value
      *
-     * @param string|bool|int $value
      * @return self
      */
     public function setDefault($value)
@@ -148,9 +151,9 @@ public function setDefault($value)
     }
 
     /**
-     * Get value
+     * Get value.
      *
-     * @return string|bool|int
+     * @return null|bool|int|string
      */
     public function getValue()
     {
@@ -158,9 +161,10 @@ public function getValue()
     }
 
     /**
-     * Set value
+     * Set value.
+     *
+     * @param null|bool|int|string $value
      *
-     * @param string|bool|int $value
      * @return self
      */
     public function setValue($value)
@@ -171,7 +175,7 @@ public function setValue($value)
     }
 
     /**
-     * Get entries
+     * Get entries.
      *
      * @return array
      */
@@ -181,9 +185,10 @@ public function getEntries()
     }
 
     /**
-     * Set entries
+     * Set entries.
      *
      * @param array $value
+     *
      * @return self
      */
     public function setEntries($value)
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Template.php b/vendor/phpoffice/phpword/src/PhpWord/Element/Formula.php
similarity index 54%
rename from vendor/phpoffice/phpword/src/PhpWord/Template.php
rename to vendor/phpoffice/phpword/src/PhpWord/Element/Formula.php
index c42696f08c..ca9f5d6b4b 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Template.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Element/Formula.php
@@ -11,17 +11,43 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
-namespace PhpOffice\PhpWord;
+declare(strict_types=1);
+
+namespace PhpOffice\PhpWord\Element;
+
+use PhpOffice\Math\Math;
 
 /**
- * @deprecated 0.12.0 Use `\PhpOffice\PhpWord\TemplateProcessor` instead.
- *
- * @codeCoverageIgnore
+ * Formula element.
  */
-class Template extends TemplateProcessor
+class Formula extends AbstractElement
 {
+    /**
+     * @var Math
+     */
+    protected $math;
+
+    /**
+     * Create a new Formula Element.
+     */
+    public function __construct(Math $math)
+    {
+        $this->setMath($math);
+    }
+
+    public function setMath(Math $math): self
+    {
+        $this->math = $math;
+
+        return $this;
+    }
+
+    public function getMath(): Math
+    {
+        return $this->math;
+    }
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Element/Header.php b/vendor/phpoffice/phpword/src/PhpWord/Element/Header.php
index 8a01946ea9..9a87241609 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Element/Header.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Element/Header.php
@@ -11,14 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Element;
 
 /**
- * Header element
+ * Header element.
  */
 class Header extends Footer
 {
@@ -28,10 +28,11 @@ class Header extends Footer
     protected $container = 'Header';
 
     /**
-     * Add a Watermark Element
+     * Add a Watermark Element.
      *
      * @param string $src
      * @param mixed $style
+     *
      * @return Image
      */
     public function addWatermark($src, $style = null)
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Element/Image.php b/vendor/phpoffice/phpword/src/PhpWord/Element/Image.php
index 2e25fd18e5..12d637d7d2 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Element/Image.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Element/Image.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -25,12 +25,12 @@
 use PhpOffice\PhpWord\Style\Image as ImageStyle;
 
 /**
- * Image element
+ * Image element.
  */
 class Image extends AbstractElement
 {
     /**
-     * Image source type constants
+     * Image source type constants.
      */
     const SOURCE_LOCAL = 'local'; // Local images
     const SOURCE_GD = 'gd'; // Generated using GD
@@ -38,106 +38,113 @@ class Image extends AbstractElement
     const SOURCE_STRING = 'string'; // Image from string
 
     /**
-     * Image source
+     * Image source.
      *
      * @var string
      */
     private $source;
 
     /**
-     * Source type: local|gd|archive
+     * Source type: local|gd|archive.
      *
      * @var string
      */
     private $sourceType;
 
     /**
-     * Image style
+     * Image style.
      *
-     * @var ImageStyle
+     * @var ?ImageStyle
      */
     private $style;
 
     /**
-     * Is watermark
+     * Is watermark.
      *
      * @var bool
      */
     private $watermark;
 
     /**
-     * Name of image
+     * Name of image.
      *
      * @var string
      */
     private $name;
 
     /**
-     * Image type
+     * Image type.
      *
      * @var string
      */
     private $imageType;
 
     /**
-     * Image create function
+     * Image create function.
      *
      * @var string
      */
     private $imageCreateFunc;
 
     /**
-     * Image function
+     * Image function.
      *
-     * @var string
+     * @var null|callable(resource): void
      */
     private $imageFunc;
 
     /**
-     * Image extension
+     * Image extension.
      *
      * @var string
      */
     private $imageExtension;
 
     /**
-     * Is memory image
+     * Image quality.
+     *
+     * Functions imagepng() and imagejpeg() have an optional parameter for
+     * quality.
+     *
+     * @var null|int
+     */
+    private $imageQuality;
+
+    /**
+     * Is memory image.
      *
      * @var bool
      */
     private $memoryImage;
 
     /**
-     * Image target file name
+     * Image target file name.
      *
      * @var string
      */
     private $target;
 
     /**
-     * Image media index
+     * Image media index.
      *
      * @var int
      */
     private $mediaIndex;
 
     /**
-     * Has media relation flag; true for Link, Image, and Object
+     * Has media relation flag; true for Link, Image, and Object.
      *
      * @var bool
      */
     protected $mediaRelation = true;
 
     /**
-     * Create new image element
+     * Create new image element.
      *
      * @param string $source
      * @param mixed $style
      * @param bool $watermark
      * @param string $name
-     *
-     * @throws \PhpOffice\PhpWord\Exception\InvalidImageException
-     * @throws \PhpOffice\PhpWord\Exception\UnsupportedImageTypeException
      */
     public function __construct($source, $style = null, $watermark = false, $name = null)
     {
@@ -150,9 +157,9 @@ public function __construct($source, $style = null, $watermark = false, $name =
     }
 
     /**
-     * Get Image style
+     * Get Image style.
      *
-     * @return ImageStyle
+     * @return ?ImageStyle
      */
     public function getStyle()
     {
@@ -160,7 +167,7 @@ public function getStyle()
     }
 
     /**
-     * Get image source
+     * Get image source.
      *
      * @return string
      */
@@ -170,7 +177,7 @@ public function getSource()
     }
 
     /**
-     * Get image source type
+     * Get image source type.
      *
      * @return string
      */
@@ -180,17 +187,17 @@ public function getSourceType()
     }
 
     /**
-     * Sets the image name
+     * Sets the image name.
      *
      * @param string $value
      */
-    public function setName($value)
+    public function setName($value): void
     {
         $this->name = $value;
     }
 
     /**
-     * Get image name
+     * Get image name.
      *
      * @return null|string
      */
@@ -200,7 +207,7 @@ public function getName()
     }
 
     /**
-     * Get image media ID
+     * Get image media ID.
      *
      * @return string
      */
@@ -210,7 +217,7 @@ public function getMediaId()
     }
 
     /**
-     * Get is watermark
+     * Get is watermark.
      *
      * @return bool
      */
@@ -220,17 +227,17 @@ public function isWatermark()
     }
 
     /**
-     * Set is watermark
+     * Set is watermark.
      *
      * @param bool $value
      */
-    public function setIsWatermark($value)
+    public function setIsWatermark($value): void
     {
         $this->watermark = $value;
     }
 
     /**
-     * Get image type
+     * Get image type.
      *
      * @return string
      */
@@ -240,7 +247,7 @@ public function getImageType()
     }
 
     /**
-     * Get image create function
+     * Get image create function.
      *
      * @return string
      */
@@ -250,17 +257,25 @@ public function getImageCreateFunction()
     }
 
     /**
-     * Get image function
+     * Get image function.
      *
-     * @return string
+     * @return null|callable(resource): void
      */
-    public function getImageFunction()
+    public function getImageFunction(): ?callable
     {
         return $this->imageFunc;
     }
 
     /**
-     * Get image extension
+     * Get image quality.
+     */
+    public function getImageQuality(): ?int
+    {
+        return $this->imageQuality;
+    }
+
+    /**
+     * Get image extension.
      *
      * @return string
      */
@@ -270,7 +285,7 @@ public function getImageExtension()
     }
 
     /**
-     * Get is memory image
+     * Get is memory image.
      *
      * @return bool
      */
@@ -280,7 +295,7 @@ public function isMemImage()
     }
 
     /**
-     * Get target file name
+     * Get target file name.
      *
      * @return string
      */
@@ -294,13 +309,13 @@ public function getTarget()
      *
      * @param string $value
      */
-    public function setTarget($value)
+    public function setTarget($value): void
     {
         $this->target = $value;
     }
 
     /**
-     * Get media index
+     * Get media index.
      *
      * @return int
      */
@@ -314,31 +329,26 @@ public function getMediaIndex()
      *
      * @param int $value
      */
-    public function setMediaIndex($value)
+    public function setMediaIndex($value): void
     {
         $this->mediaIndex = $value;
     }
 
     /**
-     * Get image string data
-     *
-     * @param bool $base64
-     * @return string|null
-     * @since 0.11.0
+     * Get image string.
      */
-    public function getImageStringData($base64 = false)
+    public function getImageString(): ?string
     {
         $source = $this->source;
         $actualSource = null;
         $imageBinary = null;
-        $imageData = null;
         $isTemp = false;
 
         // Get actual source from archive image or other source
         // Return null if not found
         if ($this->sourceType == self::SOURCE_ARCHIVE) {
             $source = substr($source, 6);
-            list($zipFilename, $imageFilename) = explode('#', $source);
+            [$zipFilename, $imageFilename] = explode('#', $source);
 
             $zip = new ZipArchive();
             if ($zip->open($zipFilename) !== false) {
@@ -368,41 +378,56 @@ public function getImageStringData($base64 = false)
                 imagesavealpha($imageResource, true);
             }
             ob_start();
-            call_user_func($this->imageFunc, $imageResource);
+            $callback = $this->imageFunc;
+            $callback($imageResource);
             $imageBinary = ob_get_contents();
             ob_end_clean();
         } elseif ($this->sourceType == self::SOURCE_STRING) {
             $imageBinary = $this->source;
         } else {
             $fileHandle = fopen($actualSource, 'rb', false);
-            if ($fileHandle !== false) {
-                $imageBinary = fread($fileHandle, filesize($actualSource));
+            $fileSize = filesize($actualSource);
+            if ($fileHandle !== false && $fileSize > 0) {
+                $imageBinary = fread($fileHandle, $fileSize);
                 fclose($fileHandle);
             }
         }
-        if ($imageBinary !== null) {
-            if ($base64) {
-                $imageData = chunk_split(base64_encode($imageBinary));
-            } else {
-                $imageData = chunk_split(bin2hex($imageBinary));
-            }
-        }
 
         // Delete temporary file if necessary
         if ($isTemp === true) {
             @unlink($actualSource);
         }
 
-        return $imageData;
+        return $imageBinary;
     }
 
     /**
-     * Check memory image, supported type, image functions, and proportional width/height.
+     * Get image string data.
+     *
+     * @param bool $base64
+     *
+     * @return null|string
      *
-     * @throws \PhpOffice\PhpWord\Exception\InvalidImageException
-     * @throws \PhpOffice\PhpWord\Exception\UnsupportedImageTypeException
+     * @since 0.11.0
      */
-    private function checkImage()
+    public function getImageStringData($base64 = false)
+    {
+        $imageBinary = $this->getImageString();
+        if ($imageBinary === null) {
+            return null;
+        }
+
+        if ($base64) {
+            return base64_encode($imageBinary);
+        }
+
+        return bin2hex($imageBinary);
+    }
+
+    /**
+     * Check memory image, supported type, image functions, and proportional width/height.
+     */
+    private function checkImage(): void
     {
         $this->setSourceType();
 
@@ -410,19 +435,19 @@ private function checkImage()
         if ($this->sourceType == self::SOURCE_ARCHIVE) {
             $imageData = $this->getArchiveImageSize($this->source);
         } elseif ($this->sourceType == self::SOURCE_STRING) {
-            $imageData = $this->getStringImageSize($this->source);
+            $imageData = @getimagesizefromstring($this->source);
         } else {
             $imageData = @getimagesize($this->source);
         }
         if (!is_array($imageData)) {
             throw new InvalidImageException(sprintf('Invalid image: %s', $this->source));
         }
-        list($actualWidth, $actualHeight, $imageType) = $imageData;
+        [$actualWidth, $actualHeight, $imageType] = $imageData;
 
         // Check image type support
-        $supportedTypes = array(IMAGETYPE_JPEG, IMAGETYPE_GIF, IMAGETYPE_PNG);
+        $supportedTypes = [IMAGETYPE_JPEG, IMAGETYPE_GIF, IMAGETYPE_PNG];
         if ($this->sourceType != self::SOURCE_GD && $this->sourceType != self::SOURCE_STRING) {
-            $supportedTypes = array_merge($supportedTypes, array(IMAGETYPE_BMP, IMAGETYPE_TIFF_II, IMAGETYPE_TIFF_MM));
+            $supportedTypes = array_merge($supportedTypes, [IMAGETYPE_BMP, IMAGETYPE_TIFF_II, IMAGETYPE_TIFF_MM]);
         }
         if (!in_array($imageType, $supportedTypes)) {
             throw new UnsupportedImageTypeException();
@@ -437,7 +462,7 @@ private function checkImage()
     /**
      * Set source type.
      */
-    private function setSourceType()
+    private function setSourceType(): void
     {
         if (stripos(strrev($this->source), strrev('.php')) === 0) {
             $this->memoryImage = true;
@@ -464,21 +489,19 @@ private function setSourceType()
     }
 
     /**
-     * Get image size from archive
+     * Get image size from archive.
      *
      * @since 0.12.0 Throws CreateTemporaryFileException.
      *
      * @param string $source
      *
-     * @throws \PhpOffice\PhpWord\Exception\CreateTemporaryFileException
-     *
-     * @return array|null
+     * @return null|array
      */
     private function getArchiveImageSize($source)
     {
         $imageData = null;
         $source = substr($source, 6);
-        list($zipFilename, $imageFilename) = explode('#', $source);
+        [$zipFilename, $imageFilename] = explode('#', $source);
 
         $tempFilename = tempnam(Settings::getTempDir(), 'PHPWordImage');
         if (false === $tempFilename) {
@@ -501,55 +524,54 @@ private function getArchiveImageSize($source)
         return $imageData;
     }
 
-    /**
-     * get image size from string
-     *
-     * @param string $source
-     *
-     * @codeCoverageIgnore this method is just a replacement for getimagesizefromstring which exists only as of PHP 5.4
-     */
-    private function getStringImageSize($source)
-    {
-        $result = false;
-        if (!function_exists('getimagesizefromstring')) {
-            $uri = 'data://application/octet-stream;base64,' . base64_encode($source);
-            $result = @getimagesize($uri);
-        } else {
-            $result = @getimagesizefromstring($source);
-        }
-
-        return $result;
-    }
-
     /**
      * Set image functions and extensions.
      */
-    private function setFunctions()
+    private function setFunctions(): void
     {
         switch ($this->imageType) {
             case 'image/png':
                 $this->imageCreateFunc = $this->sourceType == self::SOURCE_STRING ? 'imagecreatefromstring' : 'imagecreatefrompng';
-                $this->imageFunc = 'imagepng';
+                $this->imageFunc = function ($resource): void {
+                    imagepng($resource, null, $this->imageQuality);
+                };
                 $this->imageExtension = 'png';
+                $this->imageQuality = -1;
+
                 break;
             case 'image/gif':
                 $this->imageCreateFunc = $this->sourceType == self::SOURCE_STRING ? 'imagecreatefromstring' : 'imagecreatefromgif';
-                $this->imageFunc = 'imagegif';
+                $this->imageFunc = function ($resource): void {
+                    imagegif($resource);
+                };
                 $this->imageExtension = 'gif';
+                $this->imageQuality = null;
+
                 break;
             case 'image/jpeg':
             case 'image/jpg':
                 $this->imageCreateFunc = $this->sourceType == self::SOURCE_STRING ? 'imagecreatefromstring' : 'imagecreatefromjpeg';
-                $this->imageFunc = 'imagejpeg';
+                $this->imageFunc = function ($resource): void {
+                    imagejpeg($resource, null, $this->imageQuality);
+                };
                 $this->imageExtension = 'jpg';
+                $this->imageQuality = 100;
+
                 break;
             case 'image/bmp':
             case 'image/x-ms-bmp':
                 $this->imageType = 'image/bmp';
+                $this->imageFunc = null;
                 $this->imageExtension = 'bmp';
+                $this->imageQuality = null;
+
                 break;
             case 'image/tiff':
+                $this->imageType = 'image/tiff';
+                $this->imageFunc = null;
                 $this->imageExtension = 'tif';
+                $this->imageQuality = null;
+
                 break;
         }
     }
@@ -560,7 +582,7 @@ private function setFunctions()
      * @param int $actualWidth
      * @param int $actualHeight
      */
-    private function setProportionalSize($actualWidth, $actualHeight)
+    private function setProportionalSize($actualWidth, $actualHeight): void
     {
         $styleWidth = $this->style->getWidth();
         $styleHeight = $this->style->getHeight();
@@ -575,28 +597,4 @@ private function setProportionalSize($actualWidth, $actualHeight)
             }
         }
     }
-
-    /**
-     * Get is watermark
-     *
-     * @deprecated 0.10.0
-     *
-     * @codeCoverageIgnore
-     */
-    public function getIsWatermark()
-    {
-        return $this->isWatermark();
-    }
-
-    /**
-     * Get is memory image
-     *
-     * @deprecated 0.10.0
-     *
-     * @codeCoverageIgnore
-     */
-    public function getIsMemImage()
-    {
-        return $this->isMemImage();
-    }
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Element/Line.php b/vendor/phpoffice/phpword/src/PhpWord/Element/Line.php
index 7e40b9402d..40ad75c799 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Element/Line.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Element/Line.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,19 +20,19 @@
 use PhpOffice\PhpWord\Style\Line as LineStyle;
 
 /**
- * Line element
+ * Line element.
  */
 class Line extends AbstractElement
 {
     /**
-     * Line style
+     * Line style.
      *
-     * @var \PhpOffice\PhpWord\Style\Line
+     * @var ?\PhpOffice\PhpWord\Style\Line
      */
     private $style;
 
     /**
-     * Create new line element
+     * Create new line element.
      *
      * @param mixed $style
      */
@@ -42,9 +42,9 @@ public function __construct($style = null)
     }
 
     /**
-     * Get line style
+     * Get line style.
      *
-     * @return \PhpOffice\PhpWord\Style\Line
+     * @return ?\PhpOffice\PhpWord\Style\Line
      */
     public function getStyle()
     {
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Element/Link.php b/vendor/phpoffice/phpword/src/PhpWord/Element/Link.php
index 25a87feecb..b8acba1d3b 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Element/Link.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Element/Link.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -22,54 +22,54 @@
 use PhpOffice\PhpWord\Style\Paragraph;
 
 /**
- * Link element
+ * Link element.
  */
 class Link extends AbstractElement
 {
     /**
-     * Link source
+     * Link source.
      *
      * @var string
      */
     private $source;
 
     /**
-     * Link text
+     * Link text.
      *
      * @var string
      */
     private $text;
 
     /**
-     * Font style
+     * Font style.
      *
-     * @var string|\PhpOffice\PhpWord\Style\Font
+     * @var null|\PhpOffice\PhpWord\Style\Font|string
      */
     private $fontStyle;
 
     /**
-     * Paragraph style
+     * Paragraph style.
      *
-     * @var string|\PhpOffice\PhpWord\Style\Paragraph
+     * @var null|\PhpOffice\PhpWord\Style\Paragraph|string
      */
     private $paragraphStyle;
 
     /**
-     * Has media relation flag; true for Link, Image, and Object
+     * Has media relation flag; true for Link, Image, and Object.
      *
      * @var bool
      */
     protected $mediaRelation = true;
 
     /**
-     * Has internal flag - anchor to internal bookmark
+     * Has internal flag - anchor to internal bookmark.
      *
      * @var bool
      */
     protected $internal = false;
 
     /**
-     * Create a new Link Element
+     * Create a new Link Element.
      *
      * @param string $source
      * @param string $text
@@ -80,14 +80,14 @@ class Link extends AbstractElement
     public function __construct($source, $text = null, $fontStyle = null, $paragraphStyle = null, $internal = false)
     {
         $this->source = SharedText::toUTF8($source);
-        $this->text = is_null($text) ? $this->source : SharedText::toUTF8($text);
+        $this->text = null === $text ? $this->source : SharedText::toUTF8($text);
         $this->fontStyle = $this->setNewStyle(new Font('text'), $fontStyle);
         $this->paragraphStyle = $this->setNewStyle(new Paragraph(), $paragraphStyle);
         $this->internal = $internal;
     }
 
     /**
-     * Get link source
+     * Get link source.
      *
      * @return string
      */
@@ -97,7 +97,7 @@ public function getSource()
     }
 
     /**
-     * Get link text
+     * Get link text.
      *
      * @return string
      */
@@ -107,9 +107,9 @@ public function getText()
     }
 
     /**
-     * Get Text style
+     * Get Text style.
      *
-     * @return string|\PhpOffice\PhpWord\Style\Font
+     * @return null|\PhpOffice\PhpWord\Style\Font|string
      */
     public function getFontStyle()
     {
@@ -117,9 +117,9 @@ public function getFontStyle()
     }
 
     /**
-     * Get Paragraph style
+     * Get Paragraph style.
      *
-     * @return string|\PhpOffice\PhpWord\Style\Paragraph
+     * @return null|\PhpOffice\PhpWord\Style\Paragraph|string
      */
     public function getParagraphStyle()
     {
@@ -127,49 +127,7 @@ public function getParagraphStyle()
     }
 
     /**
-     * Get link target
-     *
-     * @deprecated 0.12.0
-     *
-     * @return string
-     *
-     * @codeCoverageIgnore
-     */
-    public function getTarget()
-    {
-        return $this->source;
-    }
-
-    /**
-     * Get Link source
-     *
-     * @deprecated 0.10.0
-     *
-     * @return string
-     *
-     * @codeCoverageIgnore
-     */
-    public function getLinkSrc()
-    {
-        return $this->getSource();
-    }
-
-    /**
-     * Get Link name
-     *
-     * @deprecated 0.10.0
-     *
-     * @return string
-     *
-     * @codeCoverageIgnore
-     */
-    public function getLinkName()
-    {
-        return $this->getText();
-    }
-
-    /**
-     * is internal
+     * is internal.
      *
      * @return bool
      */
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Element/ListItem.php b/vendor/phpoffice/phpword/src/PhpWord/Element/ListItem.php
index 40381de0d9..d3f25c29b7 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Element/ListItem.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Element/ListItem.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -21,38 +21,38 @@
 use PhpOffice\PhpWord\Style\ListItem as ListItemStyle;
 
 /**
- * List item element
+ * List item element.
  */
 class ListItem extends AbstractElement
 {
     /**
-     * Element style
+     * Element style.
      *
-     * @var \PhpOffice\PhpWord\Style\ListItem
+     * @var ?\PhpOffice\PhpWord\Style\ListItem
      */
     private $style;
 
     /**
-     * Text object
+     * Text object.
      *
      * @var \PhpOffice\PhpWord\Element\Text
      */
     private $textObject;
 
     /**
-     * Depth
+     * Depth.
      *
      * @var int
      */
     private $depth;
 
     /**
-     * Create a new ListItem
+     * Create a new ListItem.
      *
      * @param string $text
      * @param int $depth
      * @param mixed $fontStyle
-     * @param array|string|null $listStyle
+     * @param null|array|string $listStyle
      * @param mixed $paragraphStyle
      */
     public function __construct($text, $depth = 0, $fontStyle = null, $listStyle = null, $paragraphStyle = null)
@@ -61,7 +61,7 @@ public function __construct($text, $depth = 0, $fontStyle = null, $listStyle = n
         $this->depth = $depth;
 
         // Version >= 0.10.0 will pass numbering style name. Older version will use old method
-        if (!is_null($listStyle) && is_string($listStyle)) {
+        if (null !== $listStyle && is_string($listStyle)) {
             $this->style = new ListItemStyle($listStyle); // @codeCoverageIgnore
         } else {
             $this->style = $this->setNewStyle(new ListItemStyle(), $listStyle, true);
@@ -69,9 +69,9 @@ public function __construct($text, $depth = 0, $fontStyle = null, $listStyle = n
     }
 
     /**
-     * Get style
+     * Get style.
      *
-     * @return \PhpOffice\PhpWord\Style\ListItem
+     * @return ?\PhpOffice\PhpWord\Style\ListItem
      */
     public function getStyle()
     {
@@ -79,7 +79,7 @@ public function getStyle()
     }
 
     /**
-     * Get Text object
+     * Get Text object.
      *
      * @return \PhpOffice\PhpWord\Element\Text
      */
@@ -89,7 +89,7 @@ public function getTextObject()
     }
 
     /**
-     * Get depth
+     * Get depth.
      *
      * @return int
      */
@@ -99,9 +99,10 @@ public function getDepth()
     }
 
     /**
-     * Get text
+     * Get text.
      *
      * @return string
+     *
      * @since 0.11.0
      */
     public function getText()
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Element/ListItemRun.php b/vendor/phpoffice/phpword/src/PhpWord/Element/ListItemRun.php
index 6e48a69012..7a63337093 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Element/ListItemRun.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Element/ListItemRun.php
@@ -1,26 +1,26 @@
 <?php
 /**
  * This file is part of PHPWord - A pure PHP library for reading and writing
-* word processing documents.
-*
-* PHPWord is free software distributed under the terms of the GNU Lesser
-* General Public License version 3 as published by the Free Software Foundation.
-*
-* For the full copyright and license information, please read the LICENSE
-* file that was distributed with this source code. For the full list of
-* contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
-*
-* @see         https://github.com/PHPOffice/PHPWord
-* @copyright   2010-2018 PHPWord contributors
-* @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
-*/
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @see         https://github.com/PHPOffice/PHPWord
+ *
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
 
 namespace PhpOffice\PhpWord\Element;
 
 use PhpOffice\PhpWord\Style\ListItem as ListItemStyle;
 
 /**
- * List item element
+ * List item element.
  */
 class ListItemRun extends TextRun
 {
@@ -30,24 +30,24 @@ class ListItemRun extends TextRun
     protected $container = 'ListItemRun';
 
     /**
-     * ListItem Style
+     * ListItem Style.
      *
-     * @var \PhpOffice\PhpWord\Style\ListItem
+     * @var ?\PhpOffice\PhpWord\Style\ListItem
      */
     private $style;
 
     /**
-     * ListItem Depth
+     * ListItem Depth.
      *
      * @var int
      */
     private $depth;
 
     /**
-     * Create a new ListItem
+     * Create a new ListItem.
      *
      * @param int $depth
-     * @param array|string|null $listStyle
+     * @param null|array|string $listStyle
      * @param mixed $paragraphStyle
      */
     public function __construct($depth = 0, $listStyle = null, $paragraphStyle = null)
@@ -55,7 +55,7 @@ public function __construct($depth = 0, $listStyle = null, $paragraphStyle = nul
         $this->depth = $depth;
 
         // Version >= 0.10.0 will pass numbering style name. Older version will use old method
-        if (!is_null($listStyle) && is_string($listStyle)) {
+        if (null !== $listStyle && is_string($listStyle)) {
             $this->style = new ListItemStyle($listStyle);
         } else {
             $this->style = $this->setNewStyle(new ListItemStyle(), $listStyle, true);
@@ -66,7 +66,7 @@ public function __construct($depth = 0, $listStyle = null, $paragraphStyle = nul
     /**
      * Get ListItem style.
      *
-     * @return \PhpOffice\PhpWord\Style\ListItem
+     * @return ?\PhpOffice\PhpWord\Style\ListItem
      */
     public function getStyle()
     {
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Element/OLEObject.php b/vendor/phpoffice/phpword/src/PhpWord/Element/OLEObject.php
index 1a17b74753..73645e07f2 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Element/OLEObject.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Element/OLEObject.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -21,56 +21,54 @@
 use PhpOffice\PhpWord\Style\Image as ImageStyle;
 
 /**
- * OLEObject element
+ * OLEObject element.
  */
 class OLEObject extends AbstractElement
 {
     /**
-     * Ole-Object Src
+     * Ole-Object Src.
      *
      * @var string
      */
     private $source;
 
     /**
-     * Image Style
+     * Image Style.
      *
-     * @var \PhpOffice\PhpWord\Style\Image
+     * @var ?\PhpOffice\PhpWord\Style\Image
      */
     private $style;
 
     /**
-     * Icon
+     * Icon.
      *
      * @var string
      */
     private $icon;
 
     /**
-     * Image Relation ID
+     * Image Relation ID.
      *
      * @var int
      */
     private $imageRelationId;
 
     /**
-     * Has media relation flag; true for Link, Image, and Object
+     * Has media relation flag; true for Link, Image, and Object.
      *
      * @var bool
      */
     protected $mediaRelation = true;
 
     /**
-     * Create a new Ole-Object Element
+     * Create a new Ole-Object Element.
      *
      * @param string $source
      * @param mixed $style
-     *
-     * @throws \PhpOffice\PhpWord\Exception\InvalidObjectException
      */
     public function __construct($source, $style = null)
     {
-        $supportedTypes = array('xls', 'doc', 'ppt', 'xlsx', 'docx', 'pptx');
+        $supportedTypes = ['xls', 'doc', 'ppt', 'xlsx', 'docx', 'pptx'];
         $pathInfo = pathinfo($source);
 
         if (file_exists($source) && in_array($pathInfo['extension'], $supportedTypes)) {
@@ -90,7 +88,7 @@ public function __construct($source, $style = null)
     }
 
     /**
-     * Get object source
+     * Get object source.
      *
      * @return string
      */
@@ -100,9 +98,9 @@ public function getSource()
     }
 
     /**
-     * Get object style
+     * Get object style.
      *
-     * @return \PhpOffice\PhpWord\Style\Image
+     * @return ?\PhpOffice\PhpWord\Style\Image
      */
     public function getStyle()
     {
@@ -110,7 +108,7 @@ public function getStyle()
     }
 
     /**
-     * Get object icon
+     * Get object icon.
      *
      * @return string
      */
@@ -120,7 +118,7 @@ public function getIcon()
     }
 
     /**
-     * Get image relation ID
+     * Get image relation ID.
      *
      * @return int
      */
@@ -134,36 +132,8 @@ public function getImageRelationId()
      *
      * @param int $rId
      */
-    public function setImageRelationId($rId)
+    public function setImageRelationId($rId): void
     {
         $this->imageRelationId = $rId;
     }
-
-    /**
-     * Get Object ID
-     *
-     * @deprecated 0.10.0
-     *
-     * @return int
-     *
-     * @codeCoverageIgnore
-     */
-    public function getObjectId()
-    {
-        return $this->relationId + 1325353440;
-    }
-
-    /**
-     * Set Object ID
-     *
-     * @deprecated 0.10.0
-     *
-     * @param int $objId
-     *
-     * @codeCoverageIgnore
-     */
-    public function setObjectId($objId)
-    {
-        $this->relationId = $objId;
-    }
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Element/PageBreak.php b/vendor/phpoffice/phpword/src/PhpWord/Element/PageBreak.php
index 1e2ada80ad..02f5989f1d 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Element/PageBreak.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Element/PageBreak.php
@@ -11,19 +11,19 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Element;
 
 /**
- * Page break element
+ * Page break element.
  */
 class PageBreak extends AbstractElement
 {
     /**
-     * Create new page break
+     * Create new page break.
      */
     public function __construct()
     {
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Element/PreserveText.php b/vendor/phpoffice/phpword/src/PhpWord/Element/PreserveText.php
index c0e64268ba..7370b63743 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Element/PreserveText.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Element/PreserveText.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -22,33 +22,33 @@
 use PhpOffice\PhpWord\Style\Paragraph;
 
 /**
- * Preserve text/field element
+ * Preserve text/field element.
  */
 class PreserveText extends AbstractElement
 {
     /**
-     * Text content
+     * Text content.
      *
-     * @var string|array
+     * @var null|array|string
      */
     private $text;
 
     /**
-     * Text style
+     * Text style.
      *
-     * @var string|\PhpOffice\PhpWord\Style\Font
+     * @var null|\PhpOffice\PhpWord\Style\Font|string
      */
     private $fontStyle;
 
     /**
-     * Paragraph style
+     * Paragraph style.
      *
-     * @var string|\PhpOffice\PhpWord\Style\Paragraph
+     * @var null|\PhpOffice\PhpWord\Style\Paragraph|string
      */
     private $paragraphStyle;
 
     /**
-     * Create a new Preserve Text Element
+     * Create a new Preserve Text Element.
      *
      * @param string $text
      * @param mixed $fontStyle
@@ -60,16 +60,16 @@ public function __construct($text = null, $fontStyle = null, $paragraphStyle = n
         $this->paragraphStyle = $this->setNewStyle(new Paragraph(), $paragraphStyle);
 
         $this->text = SharedText::toUTF8($text);
-        $matches = preg_split('/({.*?})/', $this->text, null, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+        $matches = preg_split('/({.*?})/', $this->text ?? '', -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
         if (isset($matches[0])) {
             $this->text = $matches;
         }
     }
 
     /**
-     * Get Text style
+     * Get Text style.
      *
-     * @return string|\PhpOffice\PhpWord\Style\Font
+     * @return null|\PhpOffice\PhpWord\Style\Font|string
      */
     public function getFontStyle()
     {
@@ -77,9 +77,9 @@ public function getFontStyle()
     }
 
     /**
-     * Get Paragraph style
+     * Get Paragraph style.
      *
-     * @return string|\PhpOffice\PhpWord\Style\Paragraph
+     * @return null|\PhpOffice\PhpWord\Style\Paragraph|string
      */
     public function getParagraphStyle()
     {
@@ -87,9 +87,9 @@ public function getParagraphStyle()
     }
 
     /**
-     * Get Text content
+     * Get Text content.
      *
-     * @return string|array
+     * @return null|array|string
      */
     public function getText()
     {
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Element/Row.php b/vendor/phpoffice/phpword/src/PhpWord/Element/Row.php
index da4dfe5d73..f97df595f2 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Element/Row.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Element/Row.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,35 +20,35 @@
 use PhpOffice\PhpWord\Style\Row as RowStyle;
 
 /**
- * Table row element
+ * Table row element.
  *
  * @since 0.8.0
  */
 class Row extends AbstractElement
 {
     /**
-     * Row height
+     * Row height.
      *
-     * @var int
+     * @var ?int
      */
-    private $height = null;
+    private $height;
 
     /**
-     * Row style
+     * Row style.
      *
-     * @var \PhpOffice\PhpWord\Style\Row
+     * @var ?\PhpOffice\PhpWord\Style\Row
      */
     private $style;
 
     /**
-     * Row cells
+     * Row cells.
      *
      * @var \PhpOffice\PhpWord\Element\Cell[]
      */
-    private $cells = array();
+    private $cells = [];
 
     /**
-     * Create a new table row
+     * Create a new table row.
      *
      * @param int $height
      * @param mixed $style
@@ -60,10 +60,11 @@ public function __construct($height = null, $style = null)
     }
 
     /**
-     * Add a cell
+     * Add a cell.
      *
      * @param int $width
      * @param mixed $style
+     *
      * @return \PhpOffice\PhpWord\Element\Cell
      */
     public function addCell($width = null, $style = null)
@@ -76,7 +77,7 @@ public function addCell($width = null, $style = null)
     }
 
     /**
-     * Get all cells
+     * Get all cells.
      *
      * @return \PhpOffice\PhpWord\Element\Cell[]
      */
@@ -86,9 +87,9 @@ public function getCells()
     }
 
     /**
-     * Get row style
+     * Get row style.
      *
-     * @return \PhpOffice\PhpWord\Style\Row
+     * @return ?\PhpOffice\PhpWord\Style\Row
      */
     public function getStyle()
     {
@@ -96,9 +97,9 @@ public function getStyle()
     }
 
     /**
-     * Get row height
+     * Get row height.
      *
-     * @return int
+     * @return ?int
      */
     public function getHeight()
     {
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Element/SDT.php b/vendor/phpoffice/phpword/src/PhpWord/Element/SDT.php
index 5548f768c7..561cb9dd9e 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Element/SDT.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Element/SDT.php
@@ -11,56 +11,56 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Element;
 
 /**
- * Structured document tag (SDT) element
+ * Structured document tag (SDT) element.
  *
  * @since 0.12.0
  */
 class SDT extends Text
 {
     /**
-     * Form field type: comboBox|dropDownList|date
+     * Form field type: comboBox|dropDownList|date.
      *
      * @var string
      */
     private $type;
 
     /**
-     * Value
+     * Value.
      *
-     * @var string|bool|int
+     * @var null|bool|int|string
      */
     private $value;
 
     /**
-     * CheckBox/DropDown list entries
+     * CheckBox/DropDown list entries.
      *
      * @var array
      */
-    private $listItems = array();
+    private $listItems = [];
 
     /**
-     * Alias
+     * Alias.
      *
      * @var string
      */
     private $alias;
 
     /**
-     * Tag
+     * Tag.
      *
      * @var string
      */
     private $tag;
 
     /**
-     * Create new instance
+     * Create new instance.
      *
      * @param string $type
      * @param mixed $fontStyle
@@ -73,7 +73,7 @@ public function __construct($type, $fontStyle = null, $paragraphStyle = null)
     }
 
     /**
-     * Get type
+     * Get type.
      *
      * @return string
      */
@@ -83,23 +83,24 @@ public function getType()
     }
 
     /**
-     * Set type
+     * Set type.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setType($value)
     {
-        $enum = array('plainText', 'comboBox', 'dropDownList', 'date');
+        $enum = ['plainText', 'comboBox', 'dropDownList', 'date'];
         $this->type = $this->setEnumVal($value, $enum, 'comboBox');
 
         return $this;
     }
 
     /**
-     * Get value
+     * Get value.
      *
-     * @return string|bool|int
+     * @return null|bool|int|string
      */
     public function getValue()
     {
@@ -107,9 +108,10 @@ public function getValue()
     }
 
     /**
-     * Set value
+     * Set value.
+     *
+     * @param null|bool|int|string $value
      *
-     * @param string|bool|int $value
      * @return self
      */
     public function setValue($value)
@@ -120,7 +122,7 @@ public function setValue($value)
     }
 
     /**
-     * Get listItems
+     * Get listItems.
      *
      * @return array
      */
@@ -130,9 +132,10 @@ public function getListItems()
     }
 
     /**
-     * Set listItems
+     * Set listItems.
      *
      * @param array $value
+     *
      * @return self
      */
     public function setListItems($value)
@@ -143,7 +146,7 @@ public function setListItems($value)
     }
 
     /**
-     * Get tag
+     * Get tag.
      *
      * @return string
      */
@@ -153,9 +156,10 @@ public function getTag()
     }
 
     /**
-     * Set tag
+     * Set tag.
      *
      * @param string $tag
+     *
      * @return self
      */
     public function setTag($tag)
@@ -166,7 +170,7 @@ public function setTag($tag)
     }
 
     /**
-     * Get alias
+     * Get alias.
      *
      * @return string
      */
@@ -176,9 +180,10 @@ public function getAlias()
     }
 
     /**
-     * Set alias
+     * Set alias.
      *
      * @param string $alias
+     *
      * @return self
      */
     public function setAlias($alias)
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Element/Section.php b/vendor/phpoffice/phpword/src/PhpWord/Element/Section.php
index caf2ca2738..dbba7f5ccb 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Element/Section.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Element/Section.php
@@ -11,12 +11,13 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Element;
 
+use Exception;
 use PhpOffice\PhpWord\ComplexType\FootnoteProperties;
 use PhpOffice\PhpWord\Style\Section as SectionStyle;
 
@@ -28,38 +29,38 @@ class Section extends AbstractContainer
     protected $container = 'Section';
 
     /**
-     * Section style
+     * Section style.
      *
-     * @var \PhpOffice\PhpWord\Style\Section
+     * @var ?\PhpOffice\PhpWord\Style\Section
      */
     private $style;
 
     /**
-     * Section headers, indexed from 1, not zero
+     * Section headers, indexed from 1, not zero.
      *
      * @var Header[]
      */
-    private $headers = array();
+    private $headers = [];
 
     /**
-     * Section footers, indexed from 1, not zero
+     * Section footers, indexed from 1, not zero.
      *
      * @var Footer[]
      */
-    private $footers = array();
+    private $footers = [];
 
     /**
-     * The properties for the footnote of this section
+     * The properties for the footnote of this section.
      *
      * @var FootnoteProperties
      */
     private $footnoteProperties;
 
     /**
-     * Create new instance
+     * Create new instance.
      *
      * @param int $sectionCount
-     * @param null|array|\PhpOffice\PhpWord\Style $style
+     * @param null|array|\PhpOffice\PhpWord\Style|string $style
      */
     public function __construct($sectionCount, $style = null)
     {
@@ -76,17 +77,17 @@ public function __construct($sectionCount, $style = null)
      *
      * @param array $style
      */
-    public function setStyle($style = null)
+    public function setStyle($style = null): void
     {
-        if (!is_null($style) && is_array($style)) {
+        if (null !== $style && is_array($style)) {
             $this->style->setStyleByArray($style);
         }
     }
 
     /**
-     * Get section style
+     * Get section style.
      *
-     * @return \PhpOffice\PhpWord\Style\Section
+     * @return ?\PhpOffice\PhpWord\Style\Section
      */
     public function getStyle()
     {
@@ -94,7 +95,7 @@ public function getStyle()
     }
 
     /**
-     * Add header
+     * Add header.
      *
      * @since 0.10.0
      *
@@ -108,7 +109,7 @@ public function addHeader($type = Header::AUTO)
     }
 
     /**
-     * Add footer
+     * Add footer.
      *
      * @since 0.10.0
      *
@@ -122,7 +123,7 @@ public function addFooter($type = Header::AUTO)
     }
 
     /**
-     * Get header elements
+     * Get header elements.
      *
      * @return Header[]
      */
@@ -132,7 +133,7 @@ public function getHeaders()
     }
 
     /**
-     * Get footer elements
+     * Get footer elements.
      *
      * @return Footer[]
      */
@@ -142,7 +143,7 @@ public function getFooters()
     }
 
     /**
-     * Get the footnote properties
+     * Get the footnote properties.
      *
      * @return FootnoteProperties
      */
@@ -152,25 +153,9 @@ public function getFootnoteProperties()
     }
 
     /**
-     * Get the footnote properties
-     *
-     * @deprecated Use the `getFootnoteProperties` method instead
-     *
-     * @return FootnoteProperties
-     *
-     * @codeCoverageIgnore
+     * Set the footnote properties.
      */
-    public function getFootnotePropoperties()
-    {
-        return $this->footnoteProperties;
-    }
-
-    /**
-     * Set the footnote properties
-     *
-     * @param FootnoteProperties $footnoteProperties
-     */
-    public function setFootnoteProperties(FootnoteProperties $footnoteProperties = null)
+    public function setFootnoteProperties(?FootnoteProperties $footnoteProperties = null): void
     {
         $this->footnoteProperties = $footnoteProperties;
     }
@@ -200,25 +185,23 @@ public function hasDifferentFirstPage()
     }
 
     /**
-     * Add header/footer
+     * Add header/footer.
      *
      * @since 0.10.0
      *
      * @param string $type
      * @param bool $header
      *
-     * @throws \Exception
-     *
-     * @return Header|Footer
+     * @return Footer|Header
      */
     private function addHeaderFooter($type = Header::AUTO, $header = true)
     {
-        $containerClass = substr(get_class($this), 0, strrpos(get_class($this), '\\')) . '\\' .
+        $containerClass = substr(static::class, 0, strrpos(static::class, '\\')) . '\\' .
             ($header ? 'Header' : 'Footer');
         $collectionArray = $header ? 'headers' : 'footers';
         $collection = &$this->$collectionArray;
 
-        if (in_array($type, array(Header::AUTO, Header::FIRST, Header::EVEN))) {
+        if (in_array($type, [Header::AUTO, Header::FIRST, Header::EVEN])) {
             $index = count($collection);
             /** @var \PhpOffice\PhpWord\Element\AbstractContainer $container Type hint */
             $container = new $containerClass($this->sectionId, ++$index, $type);
@@ -228,80 +211,7 @@ private function addHeaderFooter($type = Header::AUTO, $header = true)
 
             return $container;
         }
-        throw new \Exception('Invalid header/footer type.');
-    }
-
-    /**
-     * Set section style
-     *
-     * @deprecated 0.12.0
-     *
-     * @param array $settings
-     *
-     * @codeCoverageIgnore
-     */
-    public function setSettings($settings = null)
-    {
-        $this->setStyle($settings);
-    }
-
-    /**
-     * Get section style
-     *
-     * @deprecated 0.12.0
-     *
-     * @return \PhpOffice\PhpWord\Style\Section
-     *
-     * @codeCoverageIgnore
-     */
-    public function getSettings()
-    {
-        return $this->getStyle();
-    }
-
-    /**
-     * Create header
-     *
-     * @deprecated 0.10.0
-     *
-     * @return Header
-     *
-     * @codeCoverageIgnore
-     */
-    public function createHeader()
-    {
-        return $this->addHeader();
-    }
-
-    /**
-     * Create footer
-     *
-     * @deprecated 0.10.0
-     *
-     * @return Footer
-     *
-     * @codeCoverageIgnore
-     */
-    public function createFooter()
-    {
-        return $this->addFooter();
-    }
-
-    /**
-     * Get footer
-     *
-     * @deprecated 0.10.0
-     *
-     * @return Footer
-     *
-     * @codeCoverageIgnore
-     */
-    public function getFooter()
-    {
-        if (empty($this->footers)) {
-            return null;
-        }
 
-        return $this->footers[1];
+        throw new Exception('Invalid header/footer type.');
     }
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Element/Shape.php b/vendor/phpoffice/phpword/src/PhpWord/Element/Shape.php
index d143c9b694..15161f892e 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Element/Shape.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Element/Shape.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,28 +20,28 @@
 use PhpOffice\PhpWord\Style\Shape as ShapeStyle;
 
 /**
- * Shape element
+ * Shape element.
  *
  * @since 0.12.0
  */
 class Shape extends AbstractElement
 {
     /**
-     * Shape type arc|curve|line|polyline|rect|oval
+     * Shape type arc|curve|line|polyline|rect|oval.
      *
      * @var string
      */
     private $type;
 
     /**
-     * Shape style
+     * Shape style.
      *
-     * @var \PhpOffice\PhpWord\Style\Shape
+     * @var ?\PhpOffice\PhpWord\Style\Shape
      */
     private $style;
 
     /**
-     * Create new instance
+     * Create new instance.
      *
      * @param string $type
      * @param mixed $style
@@ -53,7 +53,7 @@ public function __construct($type, $style = null)
     }
 
     /**
-     * Get type
+     * Get type.
      *
      * @return string
      */
@@ -63,23 +63,24 @@ public function getType()
     }
 
     /**
-     * Set pattern
+     * Set pattern.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setType($value = null)
     {
-        $enum = array('arc', 'curve', 'line', 'polyline', 'rect', 'oval');
+        $enum = ['arc', 'curve', 'line', 'polyline', 'rect', 'oval'];
         $this->type = $this->setEnumVal($value, $enum, null);
 
         return $this;
     }
 
     /**
-     * Get shape style
+     * Get shape style.
      *
-     * @return \PhpOffice\PhpWord\Style\Shape
+     * @return ?\PhpOffice\PhpWord\Style\Shape
      */
     public function getStyle()
     {
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Element/TOC.php b/vendor/phpoffice/phpword/src/PhpWord/Element/TOC.php
index c51d0e6be3..320c3e9975 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Element/TOC.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Element/TOC.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -22,40 +22,40 @@
 use PhpOffice\PhpWord\Style\TOC as TOCStyle;
 
 /**
- * Table of contents
+ * Table of contents.
  */
 class TOC extends AbstractElement
 {
     /**
-     * TOC style
+     * TOC style.
      *
      * @var \PhpOffice\PhpWord\Style\TOC
      */
-    private $TOCStyle;
+    private $tocStyle;
 
     /**
-     * Font style
+     * Font style.
      *
      * @var \PhpOffice\PhpWord\Style\Font|string
      */
     private $fontStyle;
 
     /**
-     * Min title depth to show
+     * Min title depth to show.
      *
      * @var int
      */
     private $minDepth = 1;
 
     /**
-     * Max title depth to show
+     * Max title depth to show.
      *
      * @var int
      */
     private $maxDepth = 9;
 
     /**
-     * Create a new Table-of-Contents Element
+     * Create a new Table-of-Contents Element.
      *
      * @param mixed $fontStyle
      * @param array $tocStyle
@@ -64,13 +64,13 @@ class TOC extends AbstractElement
      */
     public function __construct($fontStyle = null, $tocStyle = null, $minDepth = 1, $maxDepth = 9)
     {
-        $this->TOCStyle = new TOCStyle();
+        $this->tocStyle = new TOCStyle();
 
-        if (!is_null($tocStyle) && is_array($tocStyle)) {
-            $this->TOCStyle->setStyleByArray($tocStyle);
+        if (null !== $tocStyle && is_array($tocStyle)) {
+            $this->tocStyle->setStyleByArray($tocStyle);
         }
 
-        if (!is_null($fontStyle) && is_array($fontStyle)) {
+        if (null !== $fontStyle && is_array($fontStyle)) {
             $this->fontStyle = new Font();
             $this->fontStyle->setStyleByArray($fontStyle);
         } else {
@@ -82,14 +82,14 @@ public function __construct($fontStyle = null, $tocStyle = null, $minDepth = 1,
     }
 
     /**
-     * Get all titles
+     * Get all titles.
      *
      * @return array
      */
     public function getTitles()
     {
         if (!$this->phpWord instanceof PhpWord) {
-            return array();
+            return [];
         }
 
         $titles = $this->phpWord->getTitles()->getItems();
@@ -108,17 +108,17 @@ public function getTitles()
     }
 
     /**
-     * Get TOC Style
+     * Get TOC Style.
      *
      * @return \PhpOffice\PhpWord\Style\TOC
      */
     public function getStyleTOC()
     {
-        return $this->TOCStyle;
+        return $this->tocStyle;
     }
 
     /**
-     * Get Font Style
+     * Get Font Style.
      *
      * @return \PhpOffice\PhpWord\Style\Font|string
      */
@@ -132,13 +132,13 @@ public function getStyleFont()
      *
      * @param int $value
      */
-    public function setMaxDepth($value)
+    public function setMaxDepth($value): void
     {
         $this->maxDepth = $value;
     }
 
     /**
-     * Get Max Depth
+     * Get Max Depth.
      *
      * @return int Max depth of titles
      */
@@ -152,13 +152,13 @@ public function getMaxDepth()
      *
      * @param int $value
      */
-    public function setMinDepth($value)
+    public function setMinDepth($value): void
     {
         $this->minDepth = $value;
     }
 
     /**
-     * Get Min Depth
+     * Get Min Depth.
      *
      * @return int Min depth of titles
      */
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Element/Table.php b/vendor/phpoffice/phpword/src/PhpWord/Element/Table.php
index 44fe3744bd..53a828a9ea 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Element/Table.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Element/Table.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,33 +20,33 @@
 use PhpOffice\PhpWord\Style\Table as TableStyle;
 
 /**
- * Table element
+ * Table element.
  */
 class Table extends AbstractElement
 {
     /**
-     * Table style
+     * Table style.
      *
-     * @var \PhpOffice\PhpWord\Style\Table
+     * @var ?\PhpOffice\PhpWord\Style\Table
      */
     private $style;
 
     /**
-     * Table rows
+     * Table rows.
      *
      * @var \PhpOffice\PhpWord\Element\Row[]
      */
-    private $rows = array();
+    private $rows = [];
 
     /**
-     * Table width
+     * Table width.
      *
-     * @var int
+     * @var ?int
      */
-    private $width = null;
+    private $width;
 
     /**
-     * Create a new table
+     * Create a new table.
      *
      * @param mixed $style
      */
@@ -56,10 +56,11 @@ public function __construct($style = null)
     }
 
     /**
-     * Add a row
+     * Add a row.
      *
      * @param int $height
      * @param mixed $style
+     *
      * @return \PhpOffice\PhpWord\Element\Row
      */
     public function addRow($height = null, $style = null)
@@ -72,10 +73,11 @@ public function addRow($height = null, $style = null)
     }
 
     /**
-     * Add a cell
+     * Add a cell.
      *
      * @param int $width
      * @param mixed $style
+     *
      * @return \PhpOffice\PhpWord\Element\Cell
      */
     public function addCell($width = null, $style = null)
@@ -88,7 +90,7 @@ public function addCell($width = null, $style = null)
     }
 
     /**
-     * Get all rows
+     * Get all rows.
      *
      * @return \PhpOffice\PhpWord\Element\Row[]
      */
@@ -98,9 +100,9 @@ public function getRows()
     }
 
     /**
-     * Get table style
+     * Get table style.
      *
-     * @return \PhpOffice\PhpWord\Style\Table
+     * @return null|\PhpOffice\PhpWord\Style\Table|string
      */
     public function getStyle()
     {
@@ -108,9 +110,9 @@ public function getStyle()
     }
 
     /**
-     * Get table width
+     * Get table width.
      *
-     * @return int
+     * @return ?int
      */
     public function getWidth()
     {
@@ -122,13 +124,13 @@ public function getWidth()
      *
      * @param int $width
      */
-    public function setWidth($width)
+    public function setWidth($width): void
     {
         $this->width = $width;
     }
 
     /**
-     * Get column count
+     * Get column count.
      *
      * @return int
      */
@@ -137,7 +139,7 @@ public function countColumns()
         $columnCount = 0;
 
         $rowCount = count($this->rows);
-        for ($i = 0; $i < $rowCount; $i++) {
+        for ($i = 0; $i < $rowCount; ++$i) {
             /** @var \PhpOffice\PhpWord\Element\Row $row Type hint */
             $row = $this->rows[$i];
             $cellCount = count($row->getCells());
@@ -150,20 +152,20 @@ public function countColumns()
     }
 
     /**
-     * The first declared cell width for each column
+     * The first declared cell width for each column.
      *
      * @return int[]
      */
     public function findFirstDefinedCellWidths()
     {
-        $cellWidths = array();
+        $cellWidths = [];
 
         foreach ($this->rows as $row) {
             $cells = $row->getCells();
             if (count($cells) <= count($cellWidths)) {
                 continue;
             }
-            $cellWidths = array();
+            $cellWidths = [];
             foreach ($cells as $cell) {
                 $cellWidths[] = $cell->getWidth();
             }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Element/Text.php b/vendor/phpoffice/phpword/src/PhpWord/Element/Text.php
index 1ad497b08d..9695395324 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Element/Text.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Element/Text.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -22,33 +22,33 @@
 use PhpOffice\PhpWord\Style\Paragraph;
 
 /**
- * Text element
+ * Text element.
  */
 class Text extends AbstractElement
 {
     /**
-     * Text content
+     * Text content.
      *
-     * @var string
+     * @var ?string
      */
     protected $text;
 
     /**
-     * Text style
+     * Text style.
      *
-     * @var string|\PhpOffice\PhpWord\Style\Font
+     * @var \PhpOffice\PhpWord\Style\Font|string
      */
     protected $fontStyle;
 
     /**
-     * Paragraph style
+     * Paragraph style.
      *
-     * @var string|\PhpOffice\PhpWord\Style\Paragraph
+     * @var \PhpOffice\PhpWord\Style\Paragraph|string
      */
     protected $paragraphStyle;
 
     /**
-     * Create a new Text Element
+     * Create a new Text Element.
      *
      * @param string $text
      * @param mixed $fontStyle
@@ -62,11 +62,12 @@ public function __construct($text = null, $fontStyle = null, $paragraphStyle = n
     }
 
     /**
-     * Set Text style
+     * Set Text style.
+     *
+     * @param array|\PhpOffice\PhpWord\Style\Font|string $style
+     * @param array|\PhpOffice\PhpWord\Style\Paragraph|string $paragraphStyle
      *
-     * @param string|array|\PhpOffice\PhpWord\Style\Font $style
-     * @param string|array|\PhpOffice\PhpWord\Style\Paragraph $paragraphStyle
-     * @return string|\PhpOffice\PhpWord\Style\Font
+     * @return \PhpOffice\PhpWord\Style\Font|string
      */
     public function setFontStyle($style = null, $paragraphStyle = null)
     {
@@ -87,9 +88,9 @@ public function setFontStyle($style = null, $paragraphStyle = null)
     }
 
     /**
-     * Get Text style
+     * Get Text style.
      *
-     * @return string|\PhpOffice\PhpWord\Style\Font
+     * @return \PhpOffice\PhpWord\Style\Font|string
      */
     public function getFontStyle()
     {
@@ -97,10 +98,11 @@ public function getFontStyle()
     }
 
     /**
-     * Set Paragraph style
+     * Set Paragraph style.
      *
-     * @param string|array|\PhpOffice\PhpWord\Style\Paragraph $style
-     * @return string|\PhpOffice\PhpWord\Style\Paragraph
+     * @param array|\PhpOffice\PhpWord\Style\Paragraph|string $style
+     *
+     * @return \PhpOffice\PhpWord\Style\Paragraph|string
      */
     public function setParagraphStyle($style = null)
     {
@@ -119,9 +121,9 @@ public function setParagraphStyle($style = null)
     }
 
     /**
-     * Get Paragraph style
+     * Get Paragraph style.
      *
-     * @return string|\PhpOffice\PhpWord\Style\Paragraph
+     * @return \PhpOffice\PhpWord\Style\Paragraph|string
      */
     public function getParagraphStyle()
     {
@@ -129,9 +131,10 @@ public function getParagraphStyle()
     }
 
     /**
-     * Set text content
+     * Set text content.
      *
      * @param string $text
+     *
      * @return self
      */
     public function setText($text)
@@ -142,9 +145,9 @@ public function setText($text)
     }
 
     /**
-     * Get Text content
+     * Get Text content.
      *
-     * @return string
+     * @return ?string
      */
     public function getText()
     {
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Element/TextBox.php b/vendor/phpoffice/phpword/src/PhpWord/Element/TextBox.php
index b9f274d6b8..af37f65772 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Element/TextBox.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Element/TextBox.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,7 +20,7 @@
 use PhpOffice\PhpWord\Style\TextBox as TextBoxStyle;
 
 /**
- * TextBox element
+ * TextBox element.
  *
  * @since 0.11.0
  */
@@ -32,14 +32,14 @@ class TextBox extends AbstractContainer
     protected $container = 'TextBox';
 
     /**
-     * TextBox style
+     * TextBox style.
      *
-     * @var \PhpOffice\PhpWord\Style\TextBox
+     * @var ?\PhpOffice\PhpWord\Style\TextBox
      */
     private $style;
 
     /**
-     * Create a new textbox
+     * Create a new textbox.
      *
      * @param mixed $style
      */
@@ -49,9 +49,9 @@ public function __construct($style = null)
     }
 
     /**
-     * Get textbox style
+     * Get textbox style.
      *
-     * @return \PhpOffice\PhpWord\Style\TextBox
+     * @return ?\PhpOffice\PhpWord\Style\TextBox
      */
     public function getStyle()
     {
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Element/TextBreak.php b/vendor/phpoffice/phpword/src/PhpWord/Element/TextBreak.php
index 385fec5a84..c3cd087d74 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Element/TextBreak.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Element/TextBreak.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -21,46 +21,47 @@
 use PhpOffice\PhpWord\Style\Paragraph;
 
 /**
- * Text break element
+ * Text break element.
  */
 class TextBreak extends AbstractElement
 {
     /**
-     * Paragraph style
+     * Paragraph style.
      *
-     * @var string|\PhpOffice\PhpWord\Style\Paragraph
+     * @var null|\PhpOffice\PhpWord\Style\Paragraph|string
      */
-    private $paragraphStyle = null;
+    private $paragraphStyle;
 
     /**
-     * Text style
+     * Text style.
      *
-     * @var string|\PhpOffice\PhpWord\Style\Font
+     * @var null|\PhpOffice\PhpWord\Style\Font|string
      */
-    private $fontStyle = null;
+    private $fontStyle;
 
     /**
-     * Create a new TextBreak Element
+     * Create a new TextBreak Element.
      *
      * @param mixed $fontStyle
      * @param mixed $paragraphStyle
      */
     public function __construct($fontStyle = null, $paragraphStyle = null)
     {
-        if (!is_null($paragraphStyle)) {
+        if (null !== $paragraphStyle) {
             $paragraphStyle = $this->setParagraphStyle($paragraphStyle);
         }
-        if (!is_null($fontStyle)) {
+        if (null !== $fontStyle) {
             $this->setFontStyle($fontStyle, $paragraphStyle);
         }
     }
 
     /**
-     * Set Text style
+     * Set Text style.
      *
      * @param mixed $style
      * @param mixed $paragraphStyle
-     * @return string|\PhpOffice\PhpWord\Style\Font
+     *
+     * @return \PhpOffice\PhpWord\Style\Font|string
      */
     public function setFontStyle($style = null, $paragraphStyle = null)
     {
@@ -79,9 +80,9 @@ public function setFontStyle($style = null, $paragraphStyle = null)
     }
 
     /**
-     * Get Text style
+     * Get Text style.
      *
-     * @return string|\PhpOffice\PhpWord\Style\Font
+     * @return null|\PhpOffice\PhpWord\Style\Font|string
      */
     public function getFontStyle()
     {
@@ -89,10 +90,11 @@ public function getFontStyle()
     }
 
     /**
-     * Set Paragraph style
+     * Set Paragraph style.
+     *
+     * @param   array|\PhpOffice\PhpWord\Style\Paragraph|string $style
      *
-     * @param   string|array|\PhpOffice\PhpWord\Style\Paragraph $style
-     * @return  string|\PhpOffice\PhpWord\Style\Paragraph
+     * @return  \PhpOffice\PhpWord\Style\Paragraph|string
      */
     public function setParagraphStyle($style = null)
     {
@@ -109,9 +111,9 @@ public function setParagraphStyle($style = null)
     }
 
     /**
-     * Get Paragraph style
+     * Get Paragraph style.
      *
-     * @return string|\PhpOffice\PhpWord\Style\Paragraph
+     * @return null|\PhpOffice\PhpWord\Style\Paragraph|string
      */
     public function getParagraphStyle()
     {
@@ -119,12 +121,12 @@ public function getParagraphStyle()
     }
 
     /**
-     * Has font/paragraph style defined
+     * Has font/paragraph style defined.
      *
      * @return bool
      */
     public function hasStyle()
     {
-        return !is_null($this->fontStyle) || !is_null($this->paragraphStyle);
+        return null !== $this->fontStyle || null !== $this->paragraphStyle;
     }
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Element/TextRun.php b/vendor/phpoffice/phpword/src/PhpWord/Element/TextRun.php
index 9af55d4687..8ddc9cd7ba 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Element/TextRun.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Element/TextRun.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,7 +20,7 @@
 use PhpOffice\PhpWord\Style\Paragraph;
 
 /**
- * Textrun/paragraph element
+ * Textrun/paragraph element.
  */
 class TextRun extends AbstractContainer
 {
@@ -30,16 +30,16 @@ class TextRun extends AbstractContainer
     protected $container = 'TextRun';
 
     /**
-     * Paragraph style
+     * Paragraph style.
      *
-     * @var string|\PhpOffice\PhpWord\Style\Paragraph
+     * @var Paragraph|string
      */
     protected $paragraphStyle;
 
     /**
-     * Create new instance
+     * Create new instance.
      *
-     * @param string|array|\PhpOffice\PhpWord\Style\Paragraph $paragraphStyle
+     * @param array|Paragraph|string $paragraphStyle
      */
     public function __construct($paragraphStyle = null)
     {
@@ -47,9 +47,9 @@ public function __construct($paragraphStyle = null)
     }
 
     /**
-     * Get Paragraph style
+     * Get Paragraph style.
      *
-     * @return string|\PhpOffice\PhpWord\Style\Paragraph
+     * @return Paragraph|string
      */
     public function getParagraphStyle()
     {
@@ -57,10 +57,11 @@ public function getParagraphStyle()
     }
 
     /**
-     * Set Paragraph style
+     * Set Paragraph style.
+     *
+     * @param array|Paragraph|string $style
      *
-     * @param string|array|\PhpOffice\PhpWord\Style\Paragraph $style
-     * @return string|\PhpOffice\PhpWord\Style\Paragraph
+     * @return Paragraph|string
      */
     public function setParagraphStyle($style = null)
     {
@@ -77,4 +78,16 @@ public function setParagraphStyle($style = null)
 
         return $this->paragraphStyle;
     }
+
+    public function getText(): string
+    {
+        $outstr = '';
+        foreach ($this->getElements() as $element) {
+            if ($element instanceof Text) {
+                $outstr .= $element->getText();
+            }
+        }
+
+        return $outstr;
+    }
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Element/Title.php b/vendor/phpoffice/phpword/src/PhpWord/Element/Title.php
index f061b3d568..8fd5b21b1d 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Element/Title.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Element/Title.php
@@ -11,62 +11,70 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Element;
 
+use InvalidArgumentException;
 use PhpOffice\PhpWord\Shared\Text as SharedText;
 use PhpOffice\PhpWord\Style;
 
 /**
- * Title element
+ * Title element.
  */
 class Title extends AbstractElement
 {
     /**
-     * Title Text content
+     * Title Text content.
      *
      * @var string|TextRun
      */
     private $text;
 
     /**
-     * Title depth
+     * Title depth.
      *
      * @var int
      */
     private $depth = 1;
 
     /**
-     * Name of the heading style, e.g. 'Heading1'
+     * Name of the heading style, e.g. 'Heading1'.
      *
-     * @var string
+     * @var ?string
      */
     private $style;
 
     /**
-     * Is part of collection
+     * Is part of collection.
      *
      * @var bool
      */
     protected $collectionRelation = true;
 
     /**
-     * Create a new Title Element
+     * Page number.
+     *
+     * @var int
+     */
+    private $pageNumber;
+
+    /**
+     * Create a new Title Element.
      *
      * @param string|TextRun $text
      * @param int $depth
      */
-    public function __construct($text, $depth = 1)
+    public function __construct($text, $depth = 1, ?int $pageNumber = null)
     {
         if (is_string($text)) {
             $this->text = SharedText::toUTF8($text);
         } elseif ($text instanceof TextRun) {
             $this->text = $text;
         } else {
-            throw new \InvalidArgumentException('Invalid text, should be a string or a TextRun');
+            throw new InvalidArgumentException('Invalid text, should be a string or a TextRun');
         }
 
         $this->depth = $depth;
@@ -74,12 +82,16 @@ public function __construct($text, $depth = 1)
         if (array_key_exists($styleName, Style::getStyles())) {
             $this->style = str_replace('_', '', $styleName);
         }
+
+        if ($pageNumber !== null) {
+            $this->pageNumber = $pageNumber;
+        }
     }
 
     /**
-     * Get Title Text content
+     * Get Title Text content.
      *
-     * @return string
+     * @return string|TextRun
      */
     public function getText()
     {
@@ -87,7 +99,7 @@ public function getText()
     }
 
     /**
-     * Get depth
+     * Get depth.
      *
      * @return int
      */
@@ -97,12 +109,20 @@ public function getDepth()
     }
 
     /**
-     * Get Title style
+     * Get Title style.
      *
-     * @return string
+     * @return ?string
      */
     public function getStyle()
     {
         return $this->style;
     }
+
+    /**
+     * Get page number.
+     */
+    public function getPageNumber(): ?int
+    {
+        return $this->pageNumber;
+    }
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Element/TrackChange.php b/vendor/phpoffice/phpword/src/PhpWord/Element/TrackChange.php
index 91c221f2a8..064e6380b7 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Element/TrackChange.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Element/TrackChange.php
@@ -11,14 +11,17 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Element;
 
+use DateTime;
+
 /**
- * TrackChange element
+ * TrackChange element.
+ *
  * @see http://datypic.com/sc/ooxml/t-w_CT_TrackChange.html
  * @see http://datypic.com/sc/ooxml/t-w_CT_RunTrackChange.html
  */
@@ -33,44 +36,44 @@ class TrackChange extends AbstractContainer
     protected $container = 'TrackChange';
 
     /**
-     * The type of change, (insert or delete), not applicable for PhpOffice\PhpWord\Element\Comment
+     * The type of change, (insert or delete), not applicable for PhpOffice\PhpWord\Element\Comment.
      *
      * @var string
      */
     private $changeType;
 
     /**
-     * Author
+     * Author.
      *
      * @var string
      */
     private $author;
 
     /**
-     * Date
+     * Date.
      *
-     * @var \DateTime
+     * @var DateTime
      */
     private $date;
 
     /**
-     * Create a new TrackChange Element
+     * Create a new TrackChange Element.
      *
      * @param string $changeType
      * @param string $author
-     * @param null|int|bool|\DateTime $date
+     * @param null|bool|DateTime|int $date
      */
     public function __construct($changeType = null, $author = null, $date = null)
     {
         $this->changeType = $changeType;
         $this->author = $author;
         if ($date !== null && $date !== false) {
-            $this->date = ($date instanceof \DateTime) ? $date : new \DateTime('@' . $date);
+            $this->date = ($date instanceof DateTime) ? $date : new DateTime('@' . $date);
         }
     }
 
     /**
-     * Get TrackChange Author
+     * Get TrackChange Author.
      *
      * @return string
      */
@@ -80,9 +83,9 @@ public function getAuthor()
     }
 
     /**
-     * Get TrackChange Date
+     * Get TrackChange Date.
      *
-     * @return \DateTime
+     * @return DateTime
      */
     public function getDate()
     {
@@ -90,7 +93,7 @@ public function getDate()
     }
 
     /**
-     * Get the Change type
+     * Get the Change type.
      *
      * @return string
      */
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Escaper/AbstractEscaper.php b/vendor/phpoffice/phpword/src/PhpWord/Escaper/AbstractEscaper.php
index 1575c069e2..28e33818a4 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Escaper/AbstractEscaper.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Escaper/AbstractEscaper.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -25,7 +25,7 @@
 abstract class AbstractEscaper implements EscaperInterface
 {
     /**
-     * @param string $input
+     * @param ?string $input
      *
      * @return string
      */
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Escaper/EscaperInterface.php b/vendor/phpoffice/phpword/src/PhpWord/Escaper/EscaperInterface.php
index deb2cfbc0e..ac68058ed2 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Escaper/EscaperInterface.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Escaper/EscaperInterface.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Escaper/RegExp.php b/vendor/phpoffice/phpword/src/PhpWord/Escaper/RegExp.php
index f69aad8217..84f6faee99 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Escaper/RegExp.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Escaper/RegExp.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Escaper/Rtf.php b/vendor/phpoffice/phpword/src/PhpWord/Escaper/Rtf.php
index 42eb22a777..842e3adc91 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Escaper/Rtf.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Escaper/Rtf.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -46,14 +46,15 @@ protected function escapeMultibyteCharacter($code)
 
     /**
      * @see http://www.randomchaos.com/documents/?source=php_and_unicode
-     * @param string $input
+     *
+     * @param ?string $input
      */
     protected function escapeSingleValue($input)
     {
         $escapedValue = '';
 
         $numberOfBytes = 1;
-        $bytes = array();
+        $bytes = [];
         for ($i = 0; $i < strlen($input); ++$i) {
             $character = $input[$i];
             $asciiCode = ord($character);
@@ -87,7 +88,7 @@ protected function escapeSingleValue($input)
                     }
 
                     $numberOfBytes = 1;
-                    $bytes = array();
+                    $bytes = [];
                 }
             }
         }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Escaper/Xml.php b/vendor/phpoffice/phpword/src/PhpWord/Escaper/Xml.php
index a769c5e189..446ea771d0 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Escaper/Xml.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Escaper/Xml.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -26,7 +26,6 @@ class Xml extends AbstractEscaper
 {
     protected function escapeSingleValue($input)
     {
-        // todo: omit encoding parameter after migration onto PHP 5.4
-        return htmlspecialchars($input, ENT_QUOTES, 'UTF-8');
+        return (null !== $input) ? htmlspecialchars($input, ENT_QUOTES) : '';
     }
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Exception/CopyFileException.php b/vendor/phpoffice/phpword/src/PhpWord/Exception/CopyFileException.php
index d1c3bd0123..2ee8187165 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Exception/CopyFileException.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Exception/CopyFileException.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -28,7 +28,7 @@ final class CopyFileException extends Exception
      * @param int $code The user defined exception code
      * @param \Exception $previous The previous exception used for the exception chaining
      */
-    final public function __construct($source, $destination, $code = 0, \Exception $previous = null)
+    public function __construct($source, $destination, $code = 0, ?\Exception $previous = null)
     {
         parent::__construct(
             sprintf('Could not copy \'%s\' file to \'%s\'.', $source, $destination),
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Exception/CreateTemporaryFileException.php b/vendor/phpoffice/phpword/src/PhpWord/Exception/CreateTemporaryFileException.php
index c8a06429d8..7be01d6750 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Exception/CreateTemporaryFileException.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Exception/CreateTemporaryFileException.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -26,7 +26,7 @@ final class CreateTemporaryFileException extends Exception
      * @param int $code The user defined exception code
      * @param \Exception $previous The previous exception used for the exception chaining
      */
-    final public function __construct($code = 0, \Exception $previous = null)
+    public function __construct($code = 0, ?\Exception $previous = null)
     {
         parent::__construct(
             'Could not create a temporary file with unique name in the specified directory.',
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Exception/Exception.php b/vendor/phpoffice/phpword/src/PhpWord/Exception/Exception.php
index d874625cdc..7500dd3b23 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Exception/Exception.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Exception/Exception.php
@@ -11,14 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Exception;
 
 /**
- * General exception
+ * General exception.
  */
 class Exception extends \Exception
 {
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Exception/InvalidImageException.php b/vendor/phpoffice/phpword/src/PhpWord/Exception/InvalidImageException.php
index 07c966815a..359744451c 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Exception/InvalidImageException.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Exception/InvalidImageException.php
@@ -11,14 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Exception;
 
 /**
- * Exception used for when an image is not found
+ * Exception used for when an image is not found.
  */
 class InvalidImageException extends Exception
 {
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Exception/InvalidObjectException.php b/vendor/phpoffice/phpword/src/PhpWord/Exception/InvalidObjectException.php
index d8fef9613e..955b222fd4 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Exception/InvalidObjectException.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Exception/InvalidObjectException.php
@@ -11,14 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Exception;
 
 /**
- * Exception used for when an image is not found
+ * Exception used for when an image is not found.
  */
 class InvalidObjectException extends Exception
 {
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Exception/InvalidStyleException.php b/vendor/phpoffice/phpword/src/PhpWord/Exception/InvalidStyleException.php
index 58c1961ddd..dd4e09a454 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Exception/InvalidStyleException.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Exception/InvalidStyleException.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,7 +20,7 @@
 use InvalidArgumentException;
 
 /**
- * Exception used for when a style value is invalid
+ * Exception used for when a style value is invalid.
  */
 class InvalidStyleException extends InvalidArgumentException
 {
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Exception/UnsupportedImageTypeException.php b/vendor/phpoffice/phpword/src/PhpWord/Exception/UnsupportedImageTypeException.php
index ee27065345..8807fe0d3f 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Exception/UnsupportedImageTypeException.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Exception/UnsupportedImageTypeException.php
@@ -11,14 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Exception;
 
 /**
- * Exception used for when an image type is unsupported
+ * Exception used for when an image type is unsupported.
  */
 class UnsupportedImageTypeException extends Exception
 {
diff --git a/vendor/phpoffice/phpword/src/PhpWord/IOFactory.php b/vendor/phpoffice/phpword/src/PhpWord/IOFactory.php
index 3929f485e4..9ceb7026a3 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/IOFactory.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/IOFactory.php
@@ -11,31 +11,31 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord;
 
+use PhpOffice\PhpWord\Element\Text;
+use PhpOffice\PhpWord\Element\TextRun;
 use PhpOffice\PhpWord\Exception\Exception;
 use PhpOffice\PhpWord\Reader\ReaderInterface;
 use PhpOffice\PhpWord\Writer\WriterInterface;
+use ReflectionClass;
 
 abstract class IOFactory
 {
     /**
-     * Create new writer
+     * Create new writer.
      *
-     * @param PhpWord $phpWord
      * @param string $name
      *
-     * @throws \PhpOffice\PhpWord\Exception\Exception
-     *
      * @return WriterInterface
      */
     public static function createWriter(PhpWord $phpWord, $name = 'Word2007')
     {
-        if ($name !== 'WriterInterface' && !in_array($name, array('ODText', 'RTF', 'Word2007', 'HTML', 'PDF'), true)) {
+        if ($name !== 'WriterInterface' && !in_array($name, ['ODText', 'RTF', 'Word2007', 'HTML', 'PDF'], true)) {
             throw new Exception("\"{$name}\" is not a valid writer.");
         }
 
@@ -45,12 +45,10 @@ public static function createWriter(PhpWord $phpWord, $name = 'Word2007')
     }
 
     /**
-     * Create new reader
+     * Create new reader.
      *
      * @param string $name
      *
-     * @throws Exception
-     *
      * @return ReaderInterface
      */
     public static function createReader($name = 'Word2007')
@@ -59,15 +57,13 @@ public static function createReader($name = 'Word2007')
     }
 
     /**
-     * Create new object
+     * Create new object.
      *
      * @param string $type
      * @param string $name
      * @param \PhpOffice\PhpWord\PhpWord $phpWord
      *
-     * @throws \PhpOffice\PhpWord\Exception\Exception
-     *
-     * @return \PhpOffice\PhpWord\Writer\WriterInterface|\PhpOffice\PhpWord\Reader\ReaderInterface
+     * @return \PhpOffice\PhpWord\Reader\ReaderInterface|\PhpOffice\PhpWord\Writer\WriterInterface
      */
     private static function createObject($type, $name, $phpWord = null)
     {
@@ -75,14 +71,16 @@ private static function createObject($type, $name, $phpWord = null)
         if (class_exists($class) && self::isConcreteClass($class)) {
             return new $class($phpWord);
         }
+
         throw new Exception("\"{$name}\" is not a valid {$type}.");
     }
 
     /**
-     * Loads PhpWord from file
+     * Loads PhpWord from file.
      *
      * @param string $filename The name of the file
      * @param string $readerName
+     *
      * @return \PhpOffice\PhpWord\PhpWord $phpWord
      */
     public static function load($filename, $readerName = 'Word2007')
@@ -94,14 +92,52 @@ public static function load($filename, $readerName = 'Word2007')
     }
 
     /**
-     * Check if it's a concrete class (not abstract nor interface)
+     * Loads PhpWord ${variable} from file.
+     *
+     * @param string $filename The name of the file
+     *
+     * @return array The extracted variables
+     */
+    public static function extractVariables(string $filename, string $readerName = 'Word2007'): array
+    {
+        /** @var \PhpOffice\PhpWord\Reader\ReaderInterface $reader */
+        $reader = self::createReader($readerName);
+        $document = $reader->load($filename);
+        $extractedVariables = [];
+        foreach ($document->getSections() as $section) {
+            $concatenatedText = '';
+            foreach ($section->getElements() as $element) {
+                if ($element instanceof TextRun) {
+                    foreach ($element->getElements() as $textElement) {
+                        if ($textElement instanceof Text) {
+                            $text = $textElement->getText();
+                            $concatenatedText .= $text;
+                        }
+                    }
+                }
+            }
+            preg_match_all('/\$\{([^}]+)\}/', $concatenatedText, $matches);
+            if (!empty($matches[1])) {
+                foreach ($matches[1] as $match) {
+                    $trimmedMatch = trim($match);
+                    $extractedVariables[] = $trimmedMatch;
+                }
+            }
+        }
+
+        return $extractedVariables;
+    }
+
+    /**
+     * Check if it's a concrete class (not abstract nor interface).
      *
      * @param string $class
+     *
      * @return bool
      */
     private static function isConcreteClass($class)
     {
-        $reflection = new \ReflectionClass($class);
+        $reflection = new ReflectionClass($class);
 
         return !$reflection->isAbstract() && !$reflection->isInterface();
     }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Media.php b/vendor/phpoffice/phpword/src/PhpWord/Media.php
index cc1b290312..31487a91fe 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Media.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Media.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -21,19 +21,19 @@
 use PhpOffice\PhpWord\Exception\Exception;
 
 /**
- * Media collection
+ * Media collection.
  */
 class Media
 {
     /**
-     * Media elements
+     * Media elements.
      *
      * @var array
      */
-    private static $elements = array();
+    private static $elements = [];
 
     /**
-     * Add new media element
+     * Add new media element.
      *
      * @since 0.10.0
      * @since 0.9.2
@@ -41,33 +41,30 @@ class Media
      * @param string $container section|headerx|footerx|footnote|endnote
      * @param string $mediaType image|object|link
      * @param string $source
-     * @param \PhpOffice\PhpWord\Element\Image $image
-     *
-     * @throws \PhpOffice\PhpWord\Exception\Exception
      *
      * @return int
      */
-    public static function addElement($container, $mediaType, $source, Image $image = null)
+    public static function addElement($container, $mediaType, $source, ?Image $image = null)
     {
         // Assign unique media Id and initiate media container if none exists
         $mediaId = md5($container . $source);
         if (!isset(self::$elements[$container])) {
-            self::$elements[$container] = array();
+            self::$elements[$container] = [];
         }
 
         // Add media if not exists or point to existing media
         if (!isset(self::$elements[$container][$mediaId])) {
             $mediaCount = self::countElements($container);
             $mediaTypeCount = self::countElements($container, $mediaType);
-            $mediaTypeCount++;
+            ++$mediaTypeCount;
             $rId = ++$mediaCount;
             $target = null;
-            $mediaData = array('mediaIndex' => $mediaTypeCount);
+            $mediaData = ['mediaIndex' => $mediaTypeCount];
 
             switch ($mediaType) {
                 // Images
                 case 'image':
-                    if (is_null($image)) {
+                    if (null === $image) {
                         throw new Exception('Image object not assigned.');
                     }
                     $isMemImage = $image->isMemImage();
@@ -76,20 +73,22 @@ public static function addElement($container, $mediaType, $source, Image $image
                     $mediaData['imageType'] = $image->getImageType();
                     if ($isMemImage) {
                         $mediaData['isMemImage'] = true;
-                        $mediaData['createFunction'] = $image->getImageCreateFunction();
-                        $mediaData['imageFunction'] = $image->getImageFunction();
+                        $mediaData['imageString'] = $image->getImageString();
                     }
                     $target = "{$container}_image{$mediaTypeCount}.{$extension}";
                     $image->setTarget($target);
                     $image->setMediaIndex($mediaTypeCount);
+
                     break;
-                // Objects
+                    // Objects
                 case 'object':
                     $target = "{$container}_oleObject{$mediaTypeCount}.bin";
+
                     break;
-                // Links
+                    // Links
                 case 'link':
                     $target = $source;
+
                     break;
             }
 
@@ -103,7 +102,7 @@ public static function addElement($container, $mediaType, $source, Image $image
         }
 
         $mediaData = self::$elements[$container][$mediaId];
-        if (!is_null($image)) {
+        if (null !== $image) {
             $image->setTarget($mediaData['target']);
             $image->setMediaIndex($mediaData['mediaIndex']);
         }
@@ -112,11 +111,13 @@ public static function addElement($container, $mediaType, $source, Image $image
     }
 
     /**
-     * Get media elements count
+     * Get media elements count.
      *
      * @param string $container section|headerx|footerx|footnote|endnote
      * @param string $mediaType image|object|link
+     *
      * @return int
+     *
      * @since 0.10.0
      */
     public static function countElements($container, $mediaType = null)
@@ -125,12 +126,12 @@ public static function countElements($container, $mediaType = null)
 
         if (isset(self::$elements[$container])) {
             foreach (self::$elements[$container] as $mediaData) {
-                if (!is_null($mediaType)) {
+                if (null !== $mediaType) {
                     if ($mediaType == $mediaData['type']) {
-                        $mediaCount++;
+                        ++$mediaCount;
                     }
                 } else {
-                    $mediaCount++;
+                    ++$mediaCount;
                 }
             }
         }
@@ -139,16 +140,18 @@ public static function countElements($container, $mediaType = null)
     }
 
     /**
-     * Get media elements
+     * Get media elements.
      *
      * @param string $container section|headerx|footerx|footnote|endnote
      * @param string $type image|object|link
+     *
      * @return array
+     *
      * @since 0.10.0
      */
     public static function getElements($container, $type = null)
     {
-        $elements = array();
+        $elements = [];
 
         // If header/footer, search for headerx and footerx where x is number
         if ($container == 'header' || $container == 'footer') {
@@ -169,16 +172,18 @@ public static function getElements($container, $type = null)
     }
 
     /**
-     * Get elements by media type
+     * Get elements by media type.
      *
      * @param string $container section|footnote|endnote
      * @param string $type image|object|link
+     *
      * @return array
+     *
      * @since 0.11.0 Splitted from `getElements` to reduce complexity
      */
     private static function getElementsByType($container, $type = null)
     {
-        $elements = array();
+        $elements = [];
 
         foreach (self::$elements[$container] as $key => $data) {
             if ($type !== null) {
@@ -194,172 +199,10 @@ private static function getElementsByType($container, $type = null)
     }
 
     /**
-     * Reset media elements
-     */
-    public static function resetElements()
-    {
-        self::$elements = array();
-    }
-
-    /**
-     * Add new Section Media Element
-     *
-     * @deprecated 0.10.0
-     *
-     * @param  string $src
-     * @param  string $type
-     * @param  \PhpOffice\PhpWord\Element\Image $image
-     *
-     * @return int
-     *
-     * @codeCoverageIgnore
-     */
-    public static function addSectionMediaElement($src, $type, Image $image = null)
-    {
-        return self::addElement('section', $type, $src, $image);
-    }
-
-    /**
-     * Add new Section Link Element
-     *
-     * @deprecated 0.10.0
-     *
-     * @param string $linkSrc
-     *
-     * @return int
-     *
-     * @codeCoverageIgnore
-     */
-    public static function addSectionLinkElement($linkSrc)
-    {
-        return self::addElement('section', 'link', $linkSrc);
-    }
-
-    /**
-     * Get Section Media Elements
-     *
-     * @deprecated 0.10.0
-     *
-     * @param string $key
-     *
-     * @return array
-     *
-     * @codeCoverageIgnore
-     */
-    public static function getSectionMediaElements($key = null)
-    {
-        return self::getElements('section', $key);
-    }
-
-    /**
-     * Get Section Media Elements Count
-     *
-     * @deprecated 0.10.0
-     *
-     * @param string $key
-     *
-     * @return int
-     *
-     * @codeCoverageIgnore
-     */
-    public static function countSectionMediaElements($key = null)
-    {
-        return self::countElements('section', $key);
-    }
-
-    /**
-     * Add new Header Media Element
-     *
-     * @deprecated 0.10.0
-     *
-     * @param  int $headerCount
-     * @param  string $src
-     * @param  \PhpOffice\PhpWord\Element\Image $image
-     *
-     * @return int
-     *
-     * @codeCoverageIgnore
-     */
-    public static function addHeaderMediaElement($headerCount, $src, Image $image = null)
-    {
-        return self::addElement("header{$headerCount}", 'image', $src, $image);
-    }
-
-    /**
-     * Get Header Media Elements Count
-     *
-     * @deprecated 0.10.0
-     *
-     * @param string $key
-     *
-     * @return int
-     *
-     * @codeCoverageIgnore
-     */
-    public static function countHeaderMediaElements($key)
-    {
-        return self::countElements($key);
-    }
-
-    /**
-     * Get Header Media Elements
-     *
-     * @deprecated 0.10.0
-     *
-     * @return array
-     *
-     * @codeCoverageIgnore
-     */
-    public static function getHeaderMediaElements()
-    {
-        return self::getElements('header');
-    }
-
-    /**
-     * Add new Footer Media Element
-     *
-     * @deprecated 0.10.0
-     *
-     * @param  int $footerCount
-     * @param  string $src
-     * @param  \PhpOffice\PhpWord\Element\Image $image
-     *
-     * @return int
-     *
-     * @codeCoverageIgnore
-     */
-    public static function addFooterMediaElement($footerCount, $src, Image $image = null)
-    {
-        return self::addElement("footer{$footerCount}", 'image', $src, $image);
-    }
-
-    /**
-     * Get Footer Media Elements Count
-     *
-     * @deprecated 0.10.0
-     *
-     * @param string $key
-     *
-     * @return int
-     *
-     * @codeCoverageIgnore
-     */
-    public static function countFooterMediaElements($key)
-    {
-        return self::countElements($key);
-    }
-
-    /**
-     * Get Footer Media Elements
-     *
-     * @deprecated 0.10.0
-     *
-     * @return array
-     *
-     * @codeCoverageIgnore
+     * Reset media elements.
      */
-    public static function getFooterMediaElements()
+    public static function resetElements(): void
     {
-        return self::getElements('footer');
+        self::$elements = [];
     }
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Metadata/Compatibility.php b/vendor/phpoffice/phpword/src/PhpWord/Metadata/Compatibility.php
index bf0363aa1a..b0bf14020d 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Metadata/Compatibility.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Metadata/Compatibility.php
@@ -11,14 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Metadata;
 
 /**
- * Compatibility setting class
+ * Compatibility setting class.
  *
  * @since 0.12.0
  * @see  http://www.datypic.com/sc/ooxml/t-w_CT_Compat.html
@@ -26,19 +26,20 @@
 class Compatibility
 {
     /**
-     * OOXML version
+     * OOXML version.
      *
      * 12 = 2007
      * 14 = 2010
      * 15 = 2013
      *
      * @var int
+     *
      * @see  http://msdn.microsoft.com/en-us/library/dd909048%28v=office.12%29.aspx
      */
     private $ooxmlVersion = 12;
 
     /**
-     * Get OOXML version
+     * Get OOXML version.
      *
      * @return int
      */
@@ -48,9 +49,10 @@ public function getOoxmlVersion()
     }
 
     /**
-     * Set OOXML version
+     * Set OOXML version.
      *
      * @param int $value
+     *
      * @return self
      */
     public function setOoxmlVersion($value)
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Metadata/DocInfo.php b/vendor/phpoffice/phpword/src/PhpWord/Metadata/DocInfo.php
index 8a2f7d31ab..f7229cf0a5 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Metadata/DocInfo.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Metadata/DocInfo.php
@@ -11,14 +11,16 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Metadata;
 
+use DateTime;
+
 /**
- * Document information
+ * Document information.
  */
 class DocInfo
 {
@@ -31,91 +33,91 @@ class DocInfo
     const PROPERTY_TYPE_UNKNOWN = 'u';
 
     /**
-     * Creator
+     * Creator.
      *
      * @var string
      */
     private $creator;
 
     /**
-     * LastModifiedBy
+     * LastModifiedBy.
      *
      * @var string
      */
     private $lastModifiedBy;
 
     /**
-     * Created
+     * Created.
      *
      * @var int
      */
     private $created;
 
     /**
-     * Modified
+     * Modified.
      *
      * @var int
      */
     private $modified;
 
     /**
-     * Title
+     * Title.
      *
      * @var string
      */
     private $title;
 
     /**
-     * Description
+     * Description.
      *
      * @var string
      */
     private $description;
 
     /**
-     * Subject
+     * Subject.
      *
      * @var string
      */
     private $subject;
 
     /**
-     * Keywords
+     * Keywords.
      *
      * @var string
      */
     private $keywords;
 
     /**
-     * Category
+     * Category.
      *
      * @var string
      */
     private $category;
 
     /**
-     * Company
+     * Company.
      *
      * @var string
      */
     private $company;
 
     /**
-     * Manager
+     * Manager.
      *
      * @var string
      */
     private $manager;
 
     /**
-     * Custom Properties
+     * Custom Properties.
      *
      * @var array
      */
-    private $customProperties = array();
+    private $customProperties = [];
 
     /**
-     * Create new instance
+     * Create new instance.
      */
     public function __construct()
     {
@@ -133,7 +135,7 @@ public function __construct()
     }
 
     /**
-     * Get Creator
+     * Get Creator.
      *
      * @return string
      */
@@ -143,9 +145,10 @@ public function getCreator()
     }
 
     /**
-     * Set Creator
+     * Set Creator.
      *
      * @param  string $value
+     *
      * @return self
      */
     public function setCreator($value = '')
@@ -156,7 +159,7 @@ public function setCreator($value = '')
     }
 
     /**
-     * Get Last Modified By
+     * Get Last Modified By.
      *
      * @return string
      */
@@ -166,9 +169,10 @@ public function getLastModifiedBy()
     }
 
     /**
-     * Set Last Modified By
+     * Set Last Modified By.
      *
      * @param  string $value
+     *
      * @return self
      */
     public function setLastModifiedBy($value = '')
@@ -179,7 +183,7 @@ public function setLastModifiedBy($value = '')
     }
 
     /**
-     * Get Created
+     * Get Created.
      *
      * @return int
      */
@@ -189,9 +193,10 @@ public function getCreated()
     }
 
     /**
-     * Set Created
+     * Set Created.
      *
      * @param  int $value
+     *
      * @return self
      */
     public function setCreated($value = null)
@@ -202,7 +207,7 @@ public function setCreated($value = null)
     }
 
     /**
-     * Get Modified
+     * Get Modified.
      *
      * @return int
      */
@@ -212,9 +217,10 @@ public function getModified()
     }
 
     /**
-     * Set Modified
+     * Set Modified.
      *
      * @param  int $value
+     *
      * @return self
      */
     public function setModified($value = null)
@@ -225,7 +231,7 @@ public function setModified($value = null)
     }
 
     /**
-     * Get Title
+     * Get Title.
      *
      * @return string
      */
@@ -235,9 +241,10 @@ public function getTitle()
     }
 
     /**
-     * Set Title
+     * Set Title.
      *
      * @param  string $value
+     *
      * @return self
      */
     public function setTitle($value = '')
@@ -248,7 +255,7 @@ public function setTitle($value = '')
     }
 
     /**
-     * Get Description
+     * Get Description.
      *
      * @return string
      */
@@ -258,9 +265,10 @@ public function getDescription()
     }
 
     /**
-     * Set Description
+     * Set Description.
      *
      * @param  string $value
+     *
      * @return self
      */
     public function setDescription($value = '')
@@ -271,7 +279,7 @@ public function setDescription($value = '')
     }
 
     /**
-     * Get Subject
+     * Get Subject.
      *
      * @return string
      */
@@ -281,9 +289,10 @@ public function getSubject()
     }
 
     /**
-     * Set Subject
+     * Set Subject.
      *
      * @param  string $value
+     *
      * @return self
      */
     public function setSubject($value = '')
@@ -294,7 +303,7 @@ public function setSubject($value = '')
     }
 
     /**
-     * Get Keywords
+     * Get Keywords.
      *
      * @return string
      */
@@ -304,9 +313,10 @@ public function getKeywords()
     }
 
     /**
-     * Set Keywords
+     * Set Keywords.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setKeywords($value = '')
@@ -317,7 +327,7 @@ public function setKeywords($value = '')
     }
 
     /**
-     * Get Category
+     * Get Category.
      *
      * @return string
      */
@@ -327,9 +337,10 @@ public function getCategory()
     }
 
     /**
-     * Set Category
+     * Set Category.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setCategory($value = '')
@@ -340,7 +351,7 @@ public function setCategory($value = '')
     }
 
     /**
-     * Get Company
+     * Get Company.
      *
      * @return string
      */
@@ -350,9 +361,10 @@ public function getCompany()
     }
 
     /**
-     * Set Company
+     * Set Company.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setCompany($value = '')
@@ -363,7 +375,7 @@ public function setCompany($value = '')
     }
 
     /**
-     * Get Manager
+     * Get Manager.
      *
      * @return string
      */
@@ -373,9 +385,10 @@ public function getManager()
     }
 
     /**
-     * Set Manager
+     * Set Manager.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setManager($value = '')
@@ -386,7 +399,7 @@ public function setManager($value = '')
     }
 
     /**
-     * Get a List of Custom Property Names
+     * Get a List of Custom Property Names.
      *
      * @return array of string
      */
@@ -396,9 +409,10 @@ public function getCustomProperties()
     }
 
     /**
-     * Check if a Custom Property is defined
+     * Check if a Custom Property is defined.
      *
      * @param string $propertyName
+     *
      * @return bool
      */
     public function isCustomPropertySet($propertyName)
@@ -407,9 +421,10 @@ public function isCustomPropertySet($propertyName)
     }
 
     /**
-     * Get a Custom Property Value
+     * Get a Custom Property Value.
      *
      * @param string $propertyName
+     *
      * @return mixed
      */
     public function getCustomPropertyValue($propertyName)
@@ -422,10 +437,11 @@ public function getCustomPropertyValue($propertyName)
     }
 
     /**
-     * Get a Custom Property Type
+     * Get a Custom Property Type.
      *
      * @param string $propertyName
-     * @return string
+     *
+     * @return ?string
      */
     public function getCustomPropertyType($propertyName)
     {
@@ -437,7 +453,7 @@ public function getCustomPropertyType($propertyName)
     }
 
     /**
-     * Set a Custom Property
+     * Set a Custom Property.
      *
      * @param string $propertyName
      * @param mixed $propertyValue
@@ -447,17 +463,18 @@ public function getCustomPropertyType($propertyName)
      *   's': String
      *   'd': Date/Time
      *   'b': Boolean
+     *
      * @return self
      */
     public function setCustomProperty($propertyName, $propertyValue = '', $propertyType = null)
     {
-        $propertyTypes = array(
+        $propertyTypes = [
             self::PROPERTY_TYPE_INTEGER,
             self::PROPERTY_TYPE_FLOAT,
             self::PROPERTY_TYPE_STRING,
             self::PROPERTY_TYPE_DATE,
             self::PROPERTY_TYPE_BOOLEAN,
-        );
+        ];
         if (($propertyType === null) || (!in_array($propertyType, $propertyTypes))) {
             if ($propertyValue === null) {
                 $propertyType = self::PROPERTY_TYPE_STRING;
@@ -467,26 +484,27 @@ public function setCustomProperty($propertyName, $propertyValue = '', $propertyT
                 $propertyType = self::PROPERTY_TYPE_INTEGER;
             } elseif (is_bool($propertyValue)) {
                 $propertyType = self::PROPERTY_TYPE_BOOLEAN;
-            } elseif ($propertyValue instanceof \DateTime) {
+            } elseif ($propertyValue instanceof DateTime) {
                 $propertyType = self::PROPERTY_TYPE_DATE;
             } else {
                 $propertyType = self::PROPERTY_TYPE_STRING;
             }
         }
 
-        $this->customProperties[$propertyName] = array(
+        $this->customProperties[$propertyName] = [
             'value' => $propertyValue,
-            'type'  => $propertyType,
-        );
+            'type' => $propertyType,
+        ];
 
         return $this;
     }
 
     /**
-     * Convert document property based on type
+     * Convert document property based on type.
      *
      * @param string $propertyValue
      * @param string $propertyType
+     *
      * @return mixed
      */
     public static function convertProperty($propertyValue, $propertyType)
@@ -514,20 +532,21 @@ public static function convertProperty($propertyValue, $propertyType)
     }
 
     /**
-     * Convert document property type
+     * Convert document property type.
      *
      * @param string $propertyType
+     *
      * @return string
      */
     public static function convertPropertyType($propertyType)
     {
-        $typeGroups = array(
-            self::PROPERTY_TYPE_INTEGER => array('i1', 'i2', 'i4', 'i8', 'int', 'ui1', 'ui2', 'ui4', 'ui8', 'uint'),
-            self::PROPERTY_TYPE_FLOAT   => array('r4', 'r8', 'decimal'),
-            self::PROPERTY_TYPE_STRING  => array('empty', 'null', 'lpstr', 'lpwstr', 'bstr'),
-            self::PROPERTY_TYPE_DATE    => array('date', 'filetime'),
-            self::PROPERTY_TYPE_BOOLEAN => array('bool'),
-        );
+        $typeGroups = [
+            self::PROPERTY_TYPE_INTEGER => ['i1', 'i2', 'i4', 'i8', 'int', 'ui1', 'ui2', 'ui4', 'ui8', 'uint'],
+            self::PROPERTY_TYPE_FLOAT => ['r4', 'r8', 'decimal'],
+            self::PROPERTY_TYPE_STRING => ['empty', 'null', 'lpstr', 'lpwstr', 'bstr'],
+            self::PROPERTY_TYPE_DATE => ['date', 'filetime'],
+            self::PROPERTY_TYPE_BOOLEAN => ['bool'],
+        ];
         foreach ($typeGroups as $groupId => $groupMembers) {
             if (in_array($propertyType, $groupMembers)) {
                 return $groupId;
@@ -538,10 +557,11 @@ public static function convertPropertyType($propertyType)
     }
 
     /**
-     * Set default for null and empty value
+     * Set default for null and empty value.
      *
      * @param mixed $value
      * @param mixed $default
+     *
      * @return mixed
      */
     private function setValue($value, $default)
@@ -554,22 +574,23 @@ private function setValue($value, $default)
     }
 
     /**
-     * Get conversion model depending on property type
+     * Get conversion model depending on property type.
      *
      * @param string $propertyType
+     *
      * @return string
      */
     private static function getConversion($propertyType)
     {
-        $conversions = array(
-            'empty' => array('empty'),
-            'null'  => array('null'),
-            'int'   => array('i1', 'i2', 'i4', 'i8', 'int'),
-            'uint'  => array('ui1', 'ui2', 'ui4', 'ui8', 'uint'),
-            'float' => array('r4', 'r8', 'decimal'),
-            'bool'  => array('bool'),
-            'date'  => array('date', 'filetime'),
-        );
+        $conversions = [
+            'empty' => ['empty'],
+            'null' => ['null'],
+            'int' => ['i1', 'i2', 'i4', 'i8', 'int'],
+            'uint' => ['ui1', 'ui2', 'ui4', 'ui8', 'uint'],
+            'float' => ['r4', 'r8', 'decimal'],
+            'bool' => ['bool'],
+            'date' => ['date', 'filetime'],
+        ];
         foreach ($conversions as $conversion => $types) {
             if (in_array($propertyType, $types)) {
                 return $conversion;
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Metadata/Protection.php b/vendor/phpoffice/phpword/src/PhpWord/Metadata/Protection.php
index a46d43b945..c9b37631d3 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Metadata/Protection.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Metadata/Protection.php
@@ -11,17 +11,18 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Metadata;
 
+use InvalidArgumentException;
 use PhpOffice\PhpWord\Shared\Microsoft\PasswordEncoder;
 use PhpOffice\PhpWord\SimpleType\DocProtect;
 
 /**
- * Document protection class
+ * Document protection class.
  *
  * @since 0.12.0
  * @see http://www.datypic.com/sc/ooxml/t-w_CT_DocProtect.html
@@ -29,43 +30,44 @@
 class Protection
 {
     /**
-     * Editing restriction none|readOnly|comments|trackedChanges|forms
+     * Editing restriction none|readOnly|comments|trackedChanges|forms.
      *
      * @var string
+     *
      * @see  http://www.datypic.com/sc/ooxml/a-w_edit-1.html
      */
     private $editing;
 
     /**
-     * password
+     * password.
      *
      * @var string
      */
     private $password;
 
     /**
-     * Iterations to Run Hashing Algorithm
+     * Iterations to Run Hashing Algorithm.
      *
      * @var int
      */
     private $spinCount = 100000;
 
     /**
-     * Cryptographic Hashing Algorithm (see constants defined in \PhpOffice\PhpWord\Shared\Microsoft\PasswordEncoder)
+     * Cryptographic Hashing Algorithm (see constants defined in \PhpOffice\PhpWord\Shared\Microsoft\PasswordEncoder).
      *
      * @var string
      */
     private $algorithm = PasswordEncoder::ALGORITHM_SHA_1;
 
     /**
-     * Salt for Password Verifier
+     * Salt for Password Verifier.
      *
      * @var string
      */
     private $salt;
 
     /**
-     * Create a new instance
+     * Create a new instance.
      *
      * @param string $editing
      */
@@ -77,7 +79,7 @@ public function __construct($editing = null)
     }
 
     /**
-     * Get editing protection
+     * Get editing protection.
      *
      * @return string
      */
@@ -87,9 +89,10 @@ public function getEditing()
     }
 
     /**
-     * Set editing protection
+     * Set editing protection.
      *
      * @param string $editing Any value of \PhpOffice\PhpWord\SimpleType\DocProtect
+     *
      * @return self
      */
     public function setEditing($editing = null)
@@ -101,7 +104,7 @@ public function setEditing($editing = null)
     }
 
     /**
-     * Get password
+     * Get password.
      *
      * @return string
      */
@@ -111,9 +114,10 @@ public function getPassword()
     }
 
     /**
-     * Set password
+     * Set password.
      *
      * @param string $password
+     *
      * @return self
      */
     public function setPassword($password)
@@ -124,7 +128,7 @@ public function setPassword($password)
     }
 
     /**
-     * Get count for hash iterations
+     * Get count for hash iterations.
      *
      * @return int
      */
@@ -134,9 +138,10 @@ public function getSpinCount()
     }
 
     /**
-     * Set count for hash iterations
+     * Set count for hash iterations.
      *
      * @param int $spinCount
+     *
      * @return self
      */
     public function setSpinCount($spinCount)
@@ -147,7 +152,7 @@ public function setSpinCount($spinCount)
     }
 
     /**
-     * Get algorithm
+     * Get algorithm.
      *
      * @return string
      */
@@ -157,9 +162,10 @@ public function getAlgorithm()
     }
 
     /**
-     * Set algorithm
+     * Set algorithm.
      *
      * @param string $algorithm
+     *
      * @return self
      */
     public function setAlgorithm($algorithm)
@@ -170,7 +176,7 @@ public function setAlgorithm($algorithm)
     }
 
     /**
-     * Get salt
+     * Get salt.
      *
      * @return string
      */
@@ -183,13 +189,13 @@ public function getSalt()
      * Set salt. Salt HAS to be 16 characters, or an exception will be thrown.
      *
      * @param string $salt
-     * @throws \InvalidArgumentException
+     *
      * @return self
      */
     public function setSalt($salt)
     {
         if ($salt !== null && strlen($salt) !== 16) {
-            throw new \InvalidArgumentException('salt has to be of exactly 16 bytes length');
+            throw new InvalidArgumentException('salt has to be of exactly 16 bytes length');
         }
 
         $this->salt = $salt;
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Metadata/Settings.php b/vendor/phpoffice/phpword/src/PhpWord/Metadata/Settings.php
index b1552e0210..2de9ef8959 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Metadata/Settings.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Metadata/Settings.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -23,7 +23,7 @@
 use PhpOffice\PhpWord\Style\Language;
 
 /**
- * Setting class
+ * Setting class.
  *
  * @since 0.14.0
  * @see  http://www.datypic.com/sc/ooxml/t-w_CT_Settings.html
@@ -31,72 +31,74 @@
 class Settings
 {
     /**
-     * Magnification Setting
+     * Magnification Setting.
      *
      * @see  http://www.datypic.com/sc/ooxml/e-w_zoom-1.html
+     *
      * @var mixed either integer, in which case it treated as a percent, or one of PhpOffice\PhpWord\SimpleType\Zoom
      */
     private $zoom = 100;
 
     /**
-     * Mirror Page Margins
+     * Mirror Page Margins.
      *
      * @see http://www.datypic.com/sc/ooxml/e-w_mirrorMargins-1.html
+     *
      * @var bool
      */
     private $mirrorMargins;
 
     /**
-     * Hide spelling errors
+     * Hide spelling errors.
      *
      * @var bool
      */
     private $hideSpellingErrors = false;
 
     /**
-     * Hide grammatical errors
+     * Hide grammatical errors.
      *
      * @var bool
      */
     private $hideGrammaticalErrors = false;
 
     /**
-     * Visibility of Annotation Types
+     * Visibility of Annotation Types.
      *
      * @var TrackChangesView
      */
     private $revisionView;
 
     /**
-     * Track Revisions to Document
+     * Track Revisions to Document.
      *
      * @var bool
      */
     private $trackRevisions = false;
 
     /**
-     * Do Not Use Move Syntax When Tracking Revisions
+     * Do Not Use Move Syntax When Tracking Revisions.
      *
      * @var bool
      */
     private $doNotTrackMoves = false;
 
     /**
-     * Do Not Track Formatting Revisions When Tracking Revisions
+     * Do Not Track Formatting Revisions When Tracking Revisions.
      *
      * @var bool
      */
     private $doNotTrackFormatting = false;
 
     /**
-     * Spelling and Grammatical Checking State
+     * Spelling and Grammatical Checking State.
      *
      * @var \PhpOffice\PhpWord\ComplexType\ProofState
      */
     private $proofState;
 
     /**
-     * Document Editing Restrictions
+     * Document Editing Restrictions.
      *
      * @var \PhpOffice\PhpWord\Metadata\Protection
      */
@@ -110,52 +112,61 @@ class Settings
     private $evenAndOddHeaders = false;
 
     /**
-     * Theme Font Languages
+     * Theme Font Languages.
      *
-     * @var Language
+     * @var ?Language
      */
     private $themeFontLang;
 
     /**
-     * Automatically Recalculate Fields on Open
+     * Automatically Recalculate Fields on Open.
      *
      * @var bool
      */
     private $updateFields = false;
 
     /**
-     * Radix Point for Field Code Evaluation
+     * Radix Point for Field Code Evaluation.
      *
      * @var string
      */
     private $decimalSymbol = '.';
 
     /**
-     * Automatically hyphenate document contents when displayed
+     * Automatically hyphenate document contents when displayed.
      *
-     * @var bool|null
+     * @var null|bool
      */
     private $autoHyphenation;
 
     /**
-     * Maximum number of consecutively hyphenated lines
+     * Maximum number of consecutively hyphenated lines.
      *
-     * @var int|null
+     * @var null|int
      */
     private $consecutiveHyphenLimit;
 
     /**
-     * The allowed amount of whitespace before hyphenation is applied
-     * @var float|null
+     * The allowed amount of whitespace before hyphenation is applied.
+     *
+     * @var null|float|int
      */
     private $hyphenationZone;
 
     /**
-     * Do not hyphenate words in all capital letters
-     * @var bool|null
+     * Do not hyphenate words in all capital letters.
+     *
+     * @var null|bool
      */
     private $doNotHyphenateCaps;
 
+    /**
+     * Enable or disable book-folded printing.
+     *
+     * @var bool
+     */
+    private $bookFoldPrinting = false;
+
     /**
      * @return Protection
      */
@@ -171,7 +182,7 @@ public function getDocumentProtection()
     /**
      * @param Protection $documentProtection
      */
-    public function setDocumentProtection($documentProtection)
+    public function setDocumentProtection($documentProtection): void
     {
         $this->documentProtection = $documentProtection;
     }
@@ -191,13 +202,13 @@ public function getProofState()
     /**
      * @param ProofState $proofState
      */
-    public function setProofState($proofState)
+    public function setProofState($proofState): void
     {
         $this->proofState = $proofState;
     }
 
     /**
-     * Are spelling errors hidden
+     * Are spelling errors hidden.
      *
      * @return bool
      */
@@ -207,17 +218,17 @@ public function hasHideSpellingErrors()
     }
 
     /**
-     * Hide spelling errors
+     * Hide spelling errors.
      *
-     * @param bool $hideSpellingErrors
+     * @param ?bool $hideSpellingErrors
      */
-    public function setHideSpellingErrors($hideSpellingErrors)
+    public function setHideSpellingErrors($hideSpellingErrors): void
     {
         $this->hideSpellingErrors = $hideSpellingErrors === null ? true : $hideSpellingErrors;
     }
 
     /**
-     * Are grammatical errors hidden
+     * Are grammatical errors hidden.
      *
      * @return bool
      */
@@ -227,11 +238,11 @@ public function hasHideGrammaticalErrors()
     }
 
     /**
-     * Hide grammatical errors
+     * Hide grammatical errors.
      *
-     * @param bool $hideGrammaticalErrors
+     * @param ?bool $hideGrammaticalErrors
      */
-    public function setHideGrammaticalErrors($hideGrammaticalErrors)
+    public function setHideGrammaticalErrors($hideGrammaticalErrors): void
     {
         $this->hideGrammaticalErrors = $hideGrammaticalErrors === null ? true : $hideGrammaticalErrors;
     }
@@ -245,15 +256,15 @@ public function hasEvenAndOddHeaders()
     }
 
     /**
-     * @param bool $evenAndOddHeaders
+     * @param ?bool $evenAndOddHeaders
      */
-    public function setEvenAndOddHeaders($evenAndOddHeaders)
+    public function setEvenAndOddHeaders($evenAndOddHeaders): void
     {
         $this->evenAndOddHeaders = $evenAndOddHeaders === null ? true : $evenAndOddHeaders;
     }
 
     /**
-     * Get the Visibility of Annotation Types
+     * Get the Visibility of Annotation Types.
      *
      * @return \PhpOffice\PhpWord\ComplexType\TrackChangesView
      */
@@ -263,11 +274,9 @@ public function getRevisionView()
     }
 
     /**
-     * Set the Visibility of Annotation Types
-     *
-     * @param TrackChangesView $trackChangesView
+     * Set the Visibility of Annotation Types.
      */
-    public function setRevisionView(TrackChangesView $trackChangesView = null)
+    public function setRevisionView(?TrackChangesView $trackChangesView = null): void
     {
         $this->revisionView = $trackChangesView;
     }
@@ -281,9 +290,9 @@ public function hasTrackRevisions()
     }
 
     /**
-     * @param bool $trackRevisions
+     * @param ?bool $trackRevisions
      */
-    public function setTrackRevisions($trackRevisions)
+    public function setTrackRevisions($trackRevisions): void
     {
         $this->trackRevisions = $trackRevisions === null ? true : $trackRevisions;
     }
@@ -297,9 +306,9 @@ public function hasDoNotTrackMoves()
     }
 
     /**
-     * @param bool $doNotTrackMoves
+     * @param ?bool $doNotTrackMoves
      */
-    public function setDoNotTrackMoves($doNotTrackMoves)
+    public function setDoNotTrackMoves($doNotTrackMoves): void
     {
         $this->doNotTrackMoves = $doNotTrackMoves === null ? true : $doNotTrackMoves;
     }
@@ -313,9 +322,9 @@ public function hasDoNotTrackFormatting()
     }
 
     /**
-     * @param bool $doNotTrackFormatting
+     * @param ?bool $doNotTrackFormatting
      */
-    public function setDoNotTrackFormatting($doNotTrackFormatting)
+    public function setDoNotTrackFormatting($doNotTrackFormatting): void
     {
         $this->doNotTrackFormatting = $doNotTrackFormatting === null ? true : $doNotTrackFormatting;
     }
@@ -331,7 +340,7 @@ public function getZoom()
     /**
      * @param mixed $zoom
      */
-    public function setZoom($zoom)
+    public function setZoom($zoom): void
     {
         if (is_numeric($zoom)) {
             // zoom is a percentage
@@ -353,29 +362,27 @@ public function hasMirrorMargins()
     /**
      * @param bool $mirrorMargins
      */
-    public function setMirrorMargins($mirrorMargins)
+    public function setMirrorMargins($mirrorMargins): void
     {
         $this->mirrorMargins = $mirrorMargins;
     }
 
     /**
-     * Returns the Language
-     *
-     * @return Language
+     * Returns the Language.
      */
-    public function getThemeFontLang()
+    public function getThemeFontLang(): ?Language
     {
         return $this->themeFontLang;
     }
 
     /**
-     * sets the Language for this document
-     *
-     * @param Language $themeFontLang
+     * Sets the Language for this document.
      */
-    public function setThemeFontLang($themeFontLang)
+    public function setThemeFontLang(Language $themeFontLang): self
     {
         $this->themeFontLang = $themeFontLang;
+
+        return $this;
     }
 
     /**
@@ -387,15 +394,15 @@ public function hasUpdateFields()
     }
 
     /**
-     * @param bool $updateFields
+     * @param ?bool $updateFields
      */
-    public function setUpdateFields($updateFields)
+    public function setUpdateFields($updateFields): void
     {
         $this->updateFields = $updateFields === null ? false : $updateFields;
     }
 
     /**
-     * Returns the Radix Point for Field Code Evaluation
+     * Returns the Radix Point for Field Code Evaluation.
      *
      * @return string
      */
@@ -405,17 +412,17 @@ public function getDecimalSymbol()
     }
 
     /**
-     * sets the Radix Point for Field Code Evaluation
+     * sets the Radix Point for Field Code Evaluation.
      *
      * @param string $decimalSymbol
      */
-    public function setDecimalSymbol($decimalSymbol)
+    public function setDecimalSymbol($decimalSymbol): void
     {
         $this->decimalSymbol = $decimalSymbol;
     }
 
     /**
-     * @return bool|null
+     * @return null|bool
      */
     public function hasAutoHyphenation()
     {
@@ -425,13 +432,13 @@ public function hasAutoHyphenation()
     /**
      * @param bool $autoHyphenation
      */
-    public function setAutoHyphenation($autoHyphenation)
+    public function setAutoHyphenation($autoHyphenation): void
     {
         $this->autoHyphenation = (bool) $autoHyphenation;
     }
 
     /**
-     * @return int|null
+     * @return null|int
      */
     public function getConsecutiveHyphenLimit()
     {
@@ -441,13 +448,13 @@ public function getConsecutiveHyphenLimit()
     /**
      * @param int $consecutiveHyphenLimit
      */
-    public function setConsecutiveHyphenLimit($consecutiveHyphenLimit)
+    public function setConsecutiveHyphenLimit($consecutiveHyphenLimit): void
     {
         $this->consecutiveHyphenLimit = (int) $consecutiveHyphenLimit;
     }
 
     /**
-     * @return float|null
+     * @return null|float|int
      */
     public function getHyphenationZone()
     {
@@ -455,9 +462,9 @@ public function getHyphenationZone()
     }
 
     /**
-     * @param float $hyphenationZone Measurement unit is twip
+     * @param null|float|int $hyphenationZone Measurement unit is twip
      */
-    public function setHyphenationZone($hyphenationZone)
+    public function setHyphenationZone($hyphenationZone): void
     {
         $this->hyphenationZone = $hyphenationZone;
     }
@@ -473,8 +480,20 @@ public function hasDoNotHyphenateCaps()
     /**
      * @param bool $doNotHyphenateCaps
      */
-    public function setDoNotHyphenateCaps($doNotHyphenateCaps)
+    public function setDoNotHyphenateCaps($doNotHyphenateCaps): void
     {
         $this->doNotHyphenateCaps = (bool) $doNotHyphenateCaps;
     }
+
+    public function hasBookFoldPrinting(): bool
+    {
+        return $this->bookFoldPrinting;
+    }
+
+    public function setBookFoldPrinting(bool $bookFoldPrinting): self
+    {
+        $this->bookFoldPrinting = $bookFoldPrinting;
+
+        return $this;
+    }
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/PhpWord.php b/vendor/phpoffice/phpword/src/PhpWord/PhpWord.php
index a78df2c4e5..cf6f16ae02 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/PhpWord.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/PhpWord.php
@@ -11,17 +11,18 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
-*/
+ */
 
 namespace PhpOffice\PhpWord;
 
+use BadMethodCallException;
 use PhpOffice\PhpWord\Element\Section;
 use PhpOffice\PhpWord\Exception\Exception;
 
 /**
- * PHPWord main class
+ * PHPWord main class.
  *
  * @method Collection\Titles getTitles()
  * @method Collection\Footnotes getFootnotes()
@@ -34,7 +35,6 @@
  * @method int addEndnote(Element\Endnote $endnote)
  * @method int addChart(Element\Chart $chart)
  * @method int addComment(Element\Comment $comment)
- *
  * @method Style\Paragraph addParagraphStyle(string $styleName, mixed $styles)
  * @method Style\Font addFontStyle(string $styleName, mixed $fontStyle, mixed $paragraphStyle = null)
  * @method Style\Font addLinkStyle(string $styleName, mixed $styles)
@@ -45,50 +45,30 @@
 class PhpWord
 {
     /**
-     * Default font settings
-     *
-     * @deprecated 0.11.0 Use Settings constants
-     *
-     * @const string|int
-     */
-    const DEFAULT_FONT_NAME = Settings::DEFAULT_FONT_NAME;
-    /**
-     * @deprecated 0.11.0 Use Settings constants
-     */
-    const DEFAULT_FONT_SIZE = Settings::DEFAULT_FONT_SIZE;
-    /**
-     * @deprecated 0.11.0 Use Settings constants
-     */
-    const DEFAULT_FONT_COLOR = Settings::DEFAULT_FONT_COLOR;
-    /**
-     * @deprecated 0.11.0 Use Settings constants
-     */
-    const DEFAULT_FONT_CONTENT_TYPE = Settings::DEFAULT_FONT_CONTENT_TYPE;
-
-    /**
-     * Collection of sections
+     * Collection of sections.
      *
      * @var \PhpOffice\PhpWord\Element\Section[]
      */
-    private $sections = array();
+    private $sections = [];
 
     /**
-     * Collections
+     * Collections.
      *
      * @var array
      */
-    private $collections = array();
+    private $collections = [];
 
     /**
-     * Metadata
+     * Metadata.
      *
      * @var array
+     *
      * @since 0.12.0
      */
-    private $metadata = array();
+    private $metadata = [];
 
     /**
-     * Create new instance
+     * Create new instance.
      *
      * Collections are created dynamically
      */
@@ -97,16 +77,17 @@ public function __construct()
         // Reset Media and styles
         Media::resetElements();
         Style::resetStyles();
+        Settings::setDefaultRtl(null);
 
         // Collection
-        $collections = array('Bookmarks', 'Titles', 'Footnotes', 'Endnotes', 'Charts', 'Comments');
+        $collections = ['Bookmarks', 'Titles', 'Footnotes', 'Endnotes', 'Charts', 'Comments'];
         foreach ($collections as $collection) {
             $class = 'PhpOffice\\PhpWord\\Collection\\' . $collection;
             $this->collections[$collection] = new $class();
         }
 
         // Metadata
-        $metadata = array('DocInfo', 'Settings', 'Compatibility');
+        $metadata = ['DocInfo', 'Settings', 'Compatibility'];
         foreach ($metadata as $meta) {
             $class = 'PhpOffice\\PhpWord\\Metadata\\' . $meta;
             $this->metadata[$meta] = new $class();
@@ -114,32 +95,30 @@ public function __construct()
     }
 
     /**
-     * Dynamic function call to reduce static dependency
+     * Dynamic function call to reduce static dependency.
      *
      * @since 0.12.0
      *
      * @param mixed $function
      * @param mixed $args
      *
-     * @throws \BadMethodCallException
-     *
      * @return mixed
      */
     public function __call($function, $args)
     {
         $function = strtolower($function);
 
-        $getCollection = array();
-        $addCollection = array();
-        $addStyle = array();
+        $getCollection = [];
+        $addCollection = [];
+        $addStyle = [];
 
-        $collections = array('Bookmark', 'Title', 'Footnote', 'Endnote', 'Chart', 'Comment');
+        $collections = ['Bookmark', 'Title', 'Footnote', 'Endnote', 'Chart', 'Comment'];
         foreach ($collections as $collection) {
             $getCollection[] = strtolower("get{$collection}s");
             $addCollection[] = strtolower("add{$collection}");
         }
 
-        $styles = array('Paragraph', 'Font', 'Table', 'Numbering', 'Link', 'Title');
+        $styles = ['Paragraph', 'Font', 'Table', 'Numbering', 'Link', 'Title'];
         foreach ($styles as $style) {
             $addStyle[] = strtolower("add{$style}Style");
         }
@@ -155,23 +134,22 @@ public function __call($function, $args)
         if (in_array($function, $addCollection)) {
             $key = ucfirst(str_replace('add', '', $function) . 's');
 
-            /** @var \PhpOffice\PhpWord\Collection\AbstractCollection $collectionObject */
             $collectionObject = $this->collections[$key];
 
-            return $collectionObject->addItem(isset($args[0]) ? $args[0] : null);
+            return $collectionObject->addItem($args[0] ?? null);
         }
 
         // Run add style method
         if (in_array($function, $addStyle)) {
-            return forward_static_call_array(array('PhpOffice\\PhpWord\\Style', $function), $args);
+            return forward_static_call_array(['PhpOffice\\PhpWord\\Style', $function], $args);
         }
 
         // Exception
-        throw new \BadMethodCallException("Method $function is not defined.");
+        throw new BadMethodCallException("Method $function is not defined.");
     }
 
     /**
-     * Get document properties object
+     * Get document properties object.
      *
      * @return \PhpOffice\PhpWord\Metadata\DocInfo
      */
@@ -181,22 +159,10 @@ public function getDocInfo()
     }
 
     /**
-     * Get protection
-     *
-     * @return \PhpOffice\PhpWord\Metadata\Protection
-     * @since 0.12.0
-     * @deprecated Get the Document protection from PhpWord->getSettings()->getDocumentProtection();
-     * @codeCoverageIgnore
-     */
-    public function getProtection()
-    {
-        return $this->getSettings()->getDocumentProtection();
-    }
-
-    /**
-     * Get compatibility
+     * Get compatibility.
      *
      * @return \PhpOffice\PhpWord\Metadata\Compatibility
+     *
      * @since 0.12.0
      */
     public function getCompatibility()
@@ -205,9 +171,10 @@ public function getCompatibility()
     }
 
     /**
-     * Get compatibility
+     * Get compatibility.
      *
      * @return \PhpOffice\PhpWord\Metadata\Settings
+     *
      * @since 0.14.0
      */
     public function getSettings()
@@ -216,7 +183,7 @@ public function getSettings()
     }
 
     /**
-     * Get all sections
+     * Get all sections.
      *
      * @return \PhpOffice\PhpWord\Element\Section[]
      */
@@ -226,10 +193,11 @@ public function getSections()
     }
 
     /**
-     * Returns the section at the requested position
+     * Returns the section at the requested position.
      *
      * @param int $index
-     * @return \PhpOffice\PhpWord\Element\Section|null
+     *
+     * @return null|\PhpOffice\PhpWord\Element\Section
      */
     public function getSection($index)
     {
@@ -241,9 +209,10 @@ public function getSection($index)
     }
 
     /**
-     * Create new section
+     * Create new section.
+     *
+     * @param null|array|string $style
      *
-     * @param array $style
      * @return \PhpOffice\PhpWord\Element\Section
      */
     public function addSection($style = null)
@@ -256,18 +225,19 @@ public function addSection($style = null)
     }
 
     /**
-     * Sorts the sections using the callable passed
+     * Sorts the sections using the callable passed.
      *
      * @see http://php.net/manual/en/function.usort.php for usage
+     *
      * @param callable $sorter
      */
-    public function sortSections($sorter)
+    public function sortSections($sorter): void
     {
         usort($this->sections, $sorter);
     }
 
     /**
-     * Get default font name
+     * Get default font name.
      *
      * @return string
      */
@@ -281,13 +251,13 @@ public function getDefaultFontName()
      *
      * @param string $fontName
      */
-    public function setDefaultFontName($fontName)
+    public function setDefaultFontName($fontName): void
     {
         Settings::setDefaultFontName($fontName);
     }
 
     /**
-     * Get default font size
+     * Get default font size.
      *
      * @return int
      */
@@ -301,15 +271,16 @@ public function getDefaultFontSize()
      *
      * @param int $fontSize
      */
-    public function setDefaultFontSize($fontSize)
+    public function setDefaultFontSize($fontSize): void
     {
         Settings::setDefaultFontSize($fontSize);
     }
 
     /**
-     * Set default paragraph style definition to styles.xml
+     * Set default paragraph style definition to styles.xml.
      *
      * @param array $styles Paragraph style definition
+     *
      * @return \PhpOffice\PhpWord\Style\Paragraph
      */
     public function setDefaultParagraphStyle($styles)
@@ -318,45 +289,25 @@ public function setDefaultParagraphStyle($styles)
     }
 
     /**
-     * Load template by filename
-     *
-     * @deprecated 0.12.0 Use `new TemplateProcessor($documentTemplate)` instead.
-     *
-     * @param  string $filename Fully qualified filename
-     *
-     * @throws \PhpOffice\PhpWord\Exception\Exception
-     *
-     * @return TemplateProcessor
-     *
-     * @codeCoverageIgnore
-     */
-    public function loadTemplate($filename)
-    {
-        if (file_exists($filename)) {
-            return new TemplateProcessor($filename);
-        }
-        throw new Exception("Template file {$filename} not found.");
-    }
-
-    /**
-     * Save to file or download
+     * Save to file or download.
      *
      * All exceptions should already been handled by the writers
      *
      * @param string $filename
      * @param string $format
      * @param bool $download
+     *
      * @return bool
      */
     public function save($filename, $format = 'Word2007', $download = false)
     {
-        $mime = array(
-            'Word2007'  => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-            'ODText'    => 'application/vnd.oasis.opendocument.text',
-            'RTF'       => 'application/rtf',
-            'HTML'      => 'text/html',
-            'PDF'       => 'application/pdf',
-        );
+        $mime = [
+            'Word2007' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+            'ODText' => 'application/vnd.oasis.opendocument.text',
+            'RTF' => 'application/rtf',
+            'HTML' => 'text/html',
+            'PDF' => 'application/pdf',
+        ];
 
         $writer = IOFactory::createWriter($this, $format);
 
@@ -376,7 +327,7 @@ public function save($filename, $format = 'Word2007', $download = false)
     }
 
     /**
-     * Create new section
+     * Create new section.
      *
      * @deprecated 0.10.0
      *
@@ -392,7 +343,7 @@ public function createSection($settings = null)
     }
 
     /**
-     * Get document properties object
+     * Get document properties object.
      *
      * @deprecated 0.12.0
      *
@@ -406,7 +357,7 @@ public function getDocumentProperties()
     }
 
     /**
-     * Set document properties object
+     * Set document properties object.
      *
      * @deprecated 0.12.0
      *
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Reader/AbstractReader.php b/vendor/phpoffice/phpword/src/PhpWord/Reader/AbstractReader.php
index 7db285f758..da5e6f6e19 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Reader/AbstractReader.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Reader/AbstractReader.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,7 +20,7 @@
 use PhpOffice\PhpWord\Exception\Exception;
 
 /**
- * Reader abstract class
+ * Reader abstract class.
  *
  * @since 0.8.0
  *
@@ -36,12 +36,19 @@ abstract class AbstractReader implements ReaderInterface
     protected $readDataOnly = true;
 
     /**
-     * File pointer
+     * File pointer.
      *
      * @var bool|resource
      */
     protected $fileHandle;
 
+    /**
+     * Load images.
+     *
+     * @var bool
+     */
+    protected $imageLoading = true;
+
     /**
      * Read data only?
      *
@@ -54,9 +61,10 @@ public function isReadDataOnly()
     }
 
     /**
-     * Set read data only
+     * Set read data only.
      *
      * @param bool $value
+     *
      * @return self
      */
     public function setReadDataOnly($value = true)
@@ -66,13 +74,23 @@ public function setReadDataOnly($value = true)
         return $this;
     }
 
+    public function hasImageLoading(): bool
+    {
+        return $this->imageLoading;
+    }
+
+    public function setImageLoading(bool $value): self
+    {
+        $this->imageLoading = $value;
+
+        return $this;
+    }
+
     /**
-     * Open file for reading
+     * Open file for reading.
      *
      * @param string $filename
      *
-     * @throws \PhpOffice\PhpWord\Exception\Exception
-     *
      * @return resource
      */
     protected function openFile($filename)
@@ -83,7 +101,7 @@ protected function openFile($filename)
         }
 
         // Open file
-        $this->fileHandle = fopen($filename, 'r');
+        $this->fileHandle = fopen($filename, 'rb');
         if ($this->fileHandle === false) {
             throw new Exception("Could not open file $filename for reading.");
         }
@@ -93,6 +111,7 @@ protected function openFile($filename)
      * Can the current ReaderInterface read the file?
      *
      * @param string $filename
+     *
      * @return bool
      */
     public function canRead($filename)
@@ -109,16 +128,4 @@ public function canRead($filename)
 
         return true;
     }
-
-    /**
-     * Read data only?
-     *
-     * @deprecated 0.10.0
-     *
-     * @codeCoverageIgnore
-     */
-    public function getReadDataOnly()
-    {
-        return $this->isReadDataOnly();
-    }
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Reader/HTML.php b/vendor/phpoffice/phpword/src/PhpWord/Reader/HTML.php
index db9f20891c..30257d98cf 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Reader/HTML.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Reader/HTML.php
@@ -11,29 +11,28 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Reader;
 
+use Exception;
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\Shared\Html as HTMLParser;
 
 /**
- * HTML Reader class
+ * HTML Reader class.
  *
  * @since 0.11.0
  */
 class HTML extends AbstractReader implements ReaderInterface
 {
     /**
-     * Loads PhpWord from file
+     * Loads PhpWord from file.
      *
      * @param string $docFile
      *
-     * @throws \Exception
-     *
      * @return \PhpOffice\PhpWord\PhpWord
      */
     public function load($docFile)
@@ -44,7 +43,7 @@ public function load($docFile)
             $section = $phpWord->addSection();
             HTMLParser::addHtml($section, file_get_contents($docFile), true);
         } else {
-            throw new \Exception("Cannot read {$docFile}.");
+            throw new Exception("Cannot read {$docFile}.");
         }
 
         return $phpWord;
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Reader/MsDoc.php b/vendor/phpoffice/phpword/src/PhpWord/Reader/MsDoc.php
index b4c194ca2a..72b9af6c59 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Reader/MsDoc.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Reader/MsDoc.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -21,65 +21,72 @@
 use PhpOffice\PhpWord\Shared\Drawing;
 use PhpOffice\PhpWord\Shared\OLERead;
 use PhpOffice\PhpWord\Style;
+use stdClass;
 
 /**
- * Reader for Word97
+ * Reader for Word97.
  *
  * @since 0.10.0
  */
 class MsDoc extends AbstractReader implements ReaderInterface
 {
     /**
-     * PhpWord object
+     * PhpWord object.
      *
      * @var PhpWord
      */
     private $phpWord;
 
     /**
-     * WordDocument Stream
-     *
-     * @var
+     * WordDocument Stream.
      */
     private $dataWorkDocument;
+
     /**
-     * 1Table Stream
-     *
-     * @var
+     * 1Table Stream.
      */
     private $data1Table;
+
     /**
-     * Data Stream
-     *
-     * @var
+     * Data Stream.
      */
     private $dataData;
+
     /**
-     * Object Pool Stream
-     *
-     * @var
+     * Object Pool Stream.
      */
     private $dataObjectPool;
+
     /**
-     * @var \stdClass[]
+     * @var stdClass[]
      */
-    private $arrayCharacters = array();
+    private $arrayCharacters = [];
+
     /**
      * @var array
      */
-    private $arrayFib = array();
+    private $arrayFib = [];
+
     /**
      * @var string[]
      */
-    private $arrayFonts = array();
+    private $arrayFonts = [];
+
     /**
      * @var string[]
      */
-    private $arrayParagraphs = array();
+    private $arrayParagraphs = [];
+
     /**
-     * @var \stdClass[]
+     * @var stdClass[]
      */
-    private $arraySections = array();
+    private $arraySections = [];
+
+    /** @var string */
+    private $summaryInformation;
+
+    /** @var string */
+    private $documentSummaryInformation;
 
     const VERSION_97 = '97';
     const VERSION_2000 = '2000';
@@ -111,9 +118,10 @@ class MsDoc extends AbstractReader implements ReaderInterface
     const MSOBLIPCMYKJPEG = 0x12;
 
     /**
-     * Loads PhpWord from file
+     * Loads PhpWord from file.
      *
      * @param string $filename
+     *
      * @return PhpWord
      */
     public function load($filename)
@@ -129,10 +137,11 @@ public function load($filename)
     }
 
     /**
-     * Load an OLE Document
+     * Load an OLE Document.
+     *
      * @param string $filename
      */
-    private function loadOLE($filename)
+    private function loadOLE($filename): void
     {
         // OLE reader
         $ole = new OLERead();
@@ -147,9 +156,9 @@ private function loadOLE($filename)
         // Get Data stream
         $this->dataObjectPool = $ole->getStream($ole->wrkObjectPool);
         // Get Summary Information data
-        $this->_SummaryInformation = $ole->getStream($ole->summaryInformation);
+        $this->summaryInformation = $ole->getStream($ole->summaryInformation);
         // Get Document Summary Information data
-        $this->_DocumentSummaryInformation = $ole->getStream($ole->docSummaryInfos);
+        $this->documentSummaryInformation = $ole->getStream($ole->docSummaryInfos);
     }
 
     private function getNumInLcb($lcb, $iSize)
@@ -159,8 +168,8 @@ private function getNumInLcb($lcb, $iSize)
 
     private function getArrayCP($data, $posMem, $iNum)
     {
-        $arrayCP = array();
-        for ($inc = 0; $inc < $iNum; $inc++) {
+        $arrayCP = [];
+        for ($inc = 0; $inc < $iNum; ++$inc) {
             $arrayCP[$inc] = self::getInt4d($data, $posMem);
             $posMem += 4;
         }
@@ -171,6 +180,7 @@ private function getArrayCP($data, $posMem, $iNum)
     /**
      * @see  http://msdn.microsoft.com/en-us/library/dd949344%28v=office.12%29.aspx
      * @see  https://igor.io/2012/09/24/binary-parsing.html
+     *
      * @param string $data
      */
     private function readFib($data)
@@ -208,7 +218,7 @@ private function readFib($data)
         // lKey
         $pos += 4;
         // envr
-        $pos += 1;
+        ++$pos;
 
         // $mem = self::getInt1d($data, $pos);
         // $fMac = ($mem >> 7) & 1;
@@ -217,7 +227,7 @@ private function readFib($data)
         // $reserved1 = ($mem >> 4) & 1;
         // $reserved2 = ($mem >> 3) & 1;
         // $fSpare0 = ($mem >> 0) & bindec('111');
-        $pos += 1;
+        ++$pos;
 
         // reserved3
         $pos += 2;
@@ -317,21 +327,25 @@ private function readFib($data)
         switch ($cbRgFcLcb) {
             case 0x005D:
                 $pos = $this->readBlockFibRgFcLcb($data, $pos, self::VERSION_97);
+
                 break;
             case 0x006C:
                 $pos = $this->readBlockFibRgFcLcb($data, $pos, self::VERSION_97);
                 $pos = $this->readBlockFibRgFcLcb($data, $pos, self::VERSION_2000);
+
                 break;
             case 0x0088:
                 $pos = $this->readBlockFibRgFcLcb($data, $pos, self::VERSION_97);
                 $pos = $this->readBlockFibRgFcLcb($data, $pos, self::VERSION_2000);
                 $pos = $this->readBlockFibRgFcLcb($data, $pos, self::VERSION_2002);
+
                 break;
             case 0x00A4:
                 $pos = $this->readBlockFibRgFcLcb($data, $pos, self::VERSION_97);
                 $pos = $this->readBlockFibRgFcLcb($data, $pos, self::VERSION_2000);
                 $pos = $this->readBlockFibRgFcLcb($data, $pos, self::VERSION_2002);
                 $pos = $this->readBlockFibRgFcLcb($data, $pos, self::VERSION_2003);
+
                 break;
             case 0x00B7:
                 $pos = $this->readBlockFibRgFcLcb($data, $pos, self::VERSION_97);
@@ -339,6 +353,7 @@ private function readFib($data)
                 $pos = $this->readBlockFibRgFcLcb($data, $pos, self::VERSION_2002);
                 $pos = $this->readBlockFibRgFcLcb($data, $pos, self::VERSION_2003);
                 $pos = $this->readBlockFibRgFcLcb($data, $pos, self::VERSION_2007);
+
                 break;
         }
         //----- cswNew
@@ -1100,7 +1115,7 @@ private function readBlockFibRgFcLcb($data, $pos, $version)
         return $pos;
     }
 
-    private function readFibContent()
+    private function readFibContent(): void
     {
         // Informations about Font
         $this->readRecordSttbfFfn();
@@ -1120,25 +1135,26 @@ private function readFibContent()
     }
 
     /**
-     * Section and information about them
-     * @see  : http://msdn.microsoft.com/en-us/library/dd924458%28v=office.12%29.aspx
+     * Section and information about them.
+     *
+     * @see  http://msdn.microsoft.com/en-us/library/dd924458%28v=office.12%29.aspx
      */
-    private function readRecordPlcfSed()
+    private function readRecordPlcfSed(): void
     {
         $posMem = $this->arrayFib['fcPlcfSed'];
         // PlcfSed
         // PlcfSed : aCP
-        $aCP = array();
+        $aCP = [];
         $aCP[0] = self::getInt4d($this->data1Table, $posMem);
         $posMem += 4;
         $aCP[1] = self::getInt4d($this->data1Table, $posMem);
         $posMem += 4;
 
         // PlcfSed : aSed
-        //@see  : http://msdn.microsoft.com/en-us/library/dd950194%28v=office.12%29.aspx
+        //@see  http://msdn.microsoft.com/en-us/library/dd950194%28v=office.12%29.aspx
         $numSed = $this->getNumInLcb($this->arrayFib['lcbPlcfSed'], 12);
 
-        $aSed = array();
+        $aSed = [];
         for ($iInc = 0; $iInc < $numSed; ++$iInc) {
             // Sed : http://msdn.microsoft.com/en-us/library/dd950982%28v=office.12%29.aspx
             // fn
@@ -1165,10 +1181,11 @@ private function readRecordPlcfSed()
     }
 
     /**
-     * Specifies the fonts that are used in the document
-     * @see  : http://msdn.microsoft.com/en-us/library/dd943880%28v=office.12%29.aspx
+     * Specifies the fonts that are used in the document.
+     *
+     * @see  http://msdn.microsoft.com/en-us/library/dd943880%28v=office.12%29.aspx
      */
-    private function readRecordSttbfFfn()
+    private function readRecordSttbfFfn(): void
     {
         $posMem = $this->arrayFib['fcSttbfFfn'];
 
@@ -1178,18 +1195,18 @@ private function readRecordSttbfFfn()
         $posMem += 2;
 
         if ($cData < 0x7FF0 && $cbExtra == 0) {
-            for ($inc = 0; $inc < $cData; $inc++) {
+            for ($inc = 0; $inc < $cData; ++$inc) {
                 // len
-                $posMem += 1;
+                ++$posMem;
                 // ffid
-                $posMem += 1;
+                ++$posMem;
                 // wWeight (400 : Normal - 700 bold)
                 $posMem += 2;
                 // chs
-                $posMem += 1;
+                ++$posMem;
                 // ixchSzAlt
                 $ixchSzAlt = self::getInt1d($this->data1Table, $posMem);
-                $posMem += 1;
+                ++$posMem;
                 // panose
                 $posMem += 10;
                 // fs
@@ -1215,19 +1232,20 @@ private function readRecordSttbfFfn()
                         $xszAlt .= chr($char);
                     } while ($char != 0);
                 }
-                $this->arrayFonts[] = array(
+                $this->arrayFonts[] = [
                     'main' => $xszFfn,
-                    'alt'  => $xszAlt,
-                );
+                    'alt' => $xszAlt,
+                ];
             }
         }
     }
 
     /**
-     * Paragraph and information about them
+     * Paragraph and information about them.
+     *
      * @see  http://msdn.microsoft.com/en-us/library/dd908569%28v=office.12%29.aspx
      */
-    private function readRecordPlcfBtePapx()
+    private function readRecordPlcfBtePapx(): void
     {
         $posMem = $this->arrayFib['fcPlcfBtePapx'];
         $num = $this->getNumInLcb($this->arrayFib['lcbPlcfBtePapx'], 4);
@@ -1242,16 +1260,16 @@ private function readRecordPlcfBtePapx()
             $string = '';
 
             $numRun = self::getInt1d($this->dataWorkDocument, $offset + 511);
-            $arrayRGFC = array();
-            for ($inc = 0; $inc <= $numRun; $inc++) {
+            $arrayRGFC = [];
+            for ($inc = 0; $inc <= $numRun; ++$inc) {
                 $arrayRGFC[$inc] = self::getInt4d($this->dataWorkDocument, $offset);
                 $offset += 4;
             }
-            $arrayRGB = array();
-            for ($inc = 1; $inc <= $numRun; $inc++) {
+            $arrayRGB = [];
+            for ($inc = 1; $inc <= $numRun; ++$inc) {
                 // @see  http://msdn.microsoft.com/en-us/library/dd925804(v=office.12).aspx
                 $arrayRGB[$inc] = self::getInt1d($this->dataWorkDocument, $offset);
-                $offset += 1;
+                ++$offset;
                 // reserved
                 $offset += 12;
             }
@@ -1261,10 +1279,12 @@ private function readRecordPlcfBtePapx()
                     break;
                 }
                 $strLen = $arrayRGFC[$key + 1] - $arrayRGFC[$key] - 1;
-                for ($inc = 0; $inc < $strLen; $inc++) {
-                    $byte = self::getInt1d($this->dataWorkDocument, $arrayRGFC[$key] + $inc);
+                for ($inc = 0; $inc < ($strLen * 2); ++$inc) {
+                    $byte = self::getInt2d($this->dataWorkDocument, $arrayRGFC[$key] + ($inc * 2));
                     if ($byte > 0) {
-                        $string .= chr($byte);
+                        $string .= mb_chr($byte, 'UTF-8');
+                    } else {
+                        break;
                     }
                 }
             }
@@ -1436,15 +1456,16 @@ private function readRecordPlcfBtePapx()
     }
 
     /**
-     * Character formatting properties to text in a document
+     * Character formatting properties to text in a document.
+     *
      * @see  http://msdn.microsoft.com/en-us/library/dd907108%28v=office.12%29.aspx
      */
-    private function readRecordPlcfBteChpx()
+    private function readRecordPlcfBteChpx(): void
     {
         $posMem = $this->arrayFib['fcPlcfBteChpx'];
         $num = $this->getNumInLcb($this->arrayFib['lcbPlcfBteChpx'], 4);
-        $aPnBteChpx = array();
-        for ($inc = 0; $inc <= $num; $inc++) {
+        $aPnBteChpx = [];
+        for ($inc = 0; $inc <= $num; ++$inc) {
             $aPnBteChpx[$inc] = self::getInt4d($this->data1Table, $posMem);
             $posMem += 4;
         }
@@ -1455,34 +1476,34 @@ private function readRecordPlcfBteChpx()
         $offset = $offsetBase;
 
         // ChpxFkp
-        // @see  : http://msdn.microsoft.com/en-us/library/dd910989%28v=office.12%29.aspx
+        // @see  http://msdn.microsoft.com/en-us/library/dd910989%28v=office.12%29.aspx
         $numRGFC = self::getInt1d($this->dataWorkDocument, $offset + 511);
-        $arrayRGFC = array();
-        for ($inc = 0; $inc <= $numRGFC; $inc++) {
+        $arrayRGFC = [];
+        for ($inc = 0; $inc <= $numRGFC; ++$inc) {
             $arrayRGFC[$inc] = self::getInt4d($this->dataWorkDocument, $offset);
             $offset += 4;
         }
 
-        $arrayRGB = array();
-        for ($inc = 1; $inc <= $numRGFC; $inc++) {
+        $arrayRGB = [];
+        for ($inc = 1; $inc <= $numRGFC; ++$inc) {
             $arrayRGB[$inc] = self::getInt1d($this->dataWorkDocument, $offset);
-            $offset += 1;
+            ++$offset;
         }
 
         $start = 0;
         foreach ($arrayRGB as $keyRGB => $rgb) {
-            $oStyle = new \stdClass();
+            $oStyle = new stdClass();
             $oStyle->pos_start = $start;
             $oStyle->pos_len = (int) ceil((($arrayRGFC[$keyRGB] - 1) - $arrayRGFC[$keyRGB - 1]) / 2);
             $start += $oStyle->pos_len;
 
             if ($rgb > 0) {
                 // Chp Structure
-                // @see  : http://msdn.microsoft.com/en-us/library/dd772849%28v=office.12%29.aspx
+                // @see  http://msdn.microsoft.com/en-us/library/dd772849%28v=office.12%29.aspx
                 $posRGB = $offsetBase + $rgb * 2;
 
                 $cb = self::getInt1d($this->dataWorkDocument, $posRGB);
-                $posRGB += 1;
+                ++$posRGB;
 
                 $oStyle->style = $this->readPrl($this->dataWorkDocument, $posRGB, $cb);
                 $posRGB += $oStyle->style->length;
@@ -1492,16 +1513,15 @@ private function readRecordPlcfBteChpx()
     }
 
     /**
-     * @param $sprm
-     * @return \stdClass
+     * @return stdClass
      */
     private function readSprm($sprm)
     {
-        $oSprm = new \stdClass();
+        $oSprm = new stdClass();
         $oSprm->isPmd = $sprm & 0x01FF;
-        $oSprm->f = ($sprm / 512) & 0x0001;
-        $oSprm->sgc = ($sprm / 1024) & 0x0007;
-        $oSprm->spra = ($sprm / 8192);
+        $oSprm->f = (int) ($sprm / 512) & 0x0001;
+        $oSprm->sgc = (int) ($sprm / 1024) & 0x0007;
+        $oSprm->spra = (int) ($sprm / 8192);
 
         return $oSprm;
     }
@@ -1509,7 +1529,8 @@ private function readSprm($sprm)
     /**
      * @param string $data
      * @param int $pos
-     * @param \stdClass $oSprm
+     * @param stdClass $oSprm
+     *
      * @return array
      */
     private function readSprmSpra($data, $pos, $oSprm)
@@ -1524,59 +1545,70 @@ private function readSprmSpra($data, $pos, $oSprm)
                 switch (dechex($operand)) {
                     case 0x00:
                         $operand = false;
+
                         break;
                     case 0x01:
                         $operand = true;
+
                         break;
                     case 0x80:
                         $operand = self::SPRA_VALUE;
+
                         break;
                     case 0x81:
                         $operand = self::SPRA_VALUE_OPPOSITE;
+
                         break;
                 }
+
                 break;
             case 0x1:
                 $operand = self::getInt1d($data, $pos);
                 $length = 1;
+
                 break;
             case 0x2:
             case 0x4:
             case 0x5:
                 $operand = self::getInt2d($data, $pos);
                 $length = 2;
+
                 break;
             case 0x3:
                 if ($oSprm->isPmd != 0x70) {
                     $operand = self::getInt4d($data, $pos);
                     $length = 4;
                 }
+
                 break;
             case 0x7:
                 $operand = self::getInt3d($data, $pos);
                 $length = 3;
+
                 break;
             default:
                 // print_r('YO YO YO : '.PHP_EOL);
         }
 
-        return array(
-            'length'  => $length,
+        return [
+            'length' => $length,
             'operand' => $operand,
-        );
+        ];
     }
 
     /**
      * @param $data int
      * @param $pos int
      * @param $cbNum int
-     * @return \stdClass
+     *
+     * @return stdClass
+     *
      * @see  http://msdn.microsoft.com/en-us/library/dd772849%28v=office.12%29.aspx
      */
     private function readPrl($data, $pos, $cbNum)
     {
         $posStart = $pos;
-        $oStylePrl = new \stdClass();
+        $oStylePrl = new stdClass();
 
         // Variables
         $sprmCPicLocation = null;
@@ -1601,199 +1633,250 @@ private function readPrl($data, $pos, $cbNum)
                 // Paragraph property
                 case 0x01:
                     break;
-                // Character property
+                    // Character property
                 case 0x02:
                     if (!isset($oStylePrl->styleFont)) {
-                        $oStylePrl->styleFont = array();
+                        $oStylePrl->styleFont = [];
                     }
                     switch ($oSprm->isPmd) {
                         // sprmCFRMarkIns
                         case 0x01:
                             break;
-                        // sprmCFFldVanish
+                            // sprmCFFldVanish
                         case 0x02:
                             break;
-                        // sprmCPicLocation
+                            // sprmCPicLocation
                         case 0x03:
                             $sprmCPicLocation = $operand;
+
                             break;
-                        // sprmCFData
+                            // sprmCFData
                         case 0x06:
                             $sprmCFData = dechex($operand) != 0x00;
+
                             break;
-                        // sprmCFItalic
+                            // sprmCFItalic
                         case 0x36:
                             // By default, text is not italicized.
                             switch ($operand) {
                                 case false:
                                 case true:
                                     $oStylePrl->styleFont['italic'] = $operand;
+
                                     break;
                                 case self::SPRA_VALUE:
                                     $oStylePrl->styleFont['italic'] = false;
+
                                     break;
                                 case self::SPRA_VALUE_OPPOSITE:
                                     $oStylePrl->styleFont['italic'] = true;
+
                                     break;
                             }
+
                             break;
-                        // sprmCIstd
+                            // sprmCIstd
                         case 0x30:
                             //print_r('sprmCIstd : '.dechex($operand).PHP_EOL.PHP_EOL);
                             break;
-                        // sprmCFBold
+                            // sprmCFBold
                         case 0x35:
                             // By default, text is not bold.
                             switch ($operand) {
                                 case false:
                                 case true:
                                     $oStylePrl->styleFont['bold'] = $operand;
+
                                     break;
                                 case self::SPRA_VALUE:
                                     $oStylePrl->styleFont['bold'] = false;
+
                                     break;
                                 case self::SPRA_VALUE_OPPOSITE:
                                     $oStylePrl->styleFont['bold'] = true;
+
                                     break;
                             }
+
                             break;
-                        // sprmCFStrike
+                            // sprmCFStrike
                         case 0x37:
                             // By default, text is not struck through.
                             switch ($operand) {
                                 case false:
                                 case true:
                                     $oStylePrl->styleFont['strikethrough'] = $operand;
+
                                     break;
                                 case self::SPRA_VALUE:
                                     $oStylePrl->styleFont['strikethrough'] = false;
+
                                     break;
                                 case self::SPRA_VALUE_OPPOSITE:
                                     $oStylePrl->styleFont['strikethrough'] = true;
+
                                     break;
                             }
+
                             break;
-                        // sprmCKul
+                            // sprmCKul
                         case 0x3E:
                             switch (dechex($operand)) {
                                 case 0x00:
                                     $oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_NONE;
+
                                     break;
                                 case 0x01:
                                     $oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_SINGLE;
+
                                     break;
                                 case 0x02:
                                     $oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_WORDS;
+
                                     break;
                                 case 0x03:
                                     $oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_DOUBLE;
+
                                     break;
                                 case 0x04:
                                     $oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_DOTTED;
+
                                     break;
                                 case 0x06:
                                     $oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_HEAVY;
+
                                     break;
                                 case 0x07:
                                     $oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_DASH;
+
                                     break;
                                 case 0x09:
                                     $oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_DOTDASH;
+
                                     break;
                                 case 0x0A:
                                     $oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_DOTDOTDASH;
+
                                     break;
                                 case 0x0B:
                                     $oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_WAVY;
+
                                     break;
                                 case 0x14:
                                     $oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_DOTTEDHEAVY;
+
                                     break;
                                 case 0x17:
                                     $oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_DASHHEAVY;
+
                                     break;
                                 case 0x19:
                                     $oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_DOTDASHHEAVY;
+
                                     break;
                                 case 0x1A:
                                     $oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_DOTDOTDASHHEAVY;
+
                                     break;
                                 case 0x1B:
                                     $oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_WAVYHEAVY;
+
                                     break;
                                 case 0x27:
                                     $oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_DASHLONG;
+
                                     break;
                                 case 0x2B:
                                     $oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_WAVYDOUBLE;
+
                                     break;
                                 case 0x37:
                                     $oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_DASHLONGHEAVY;
+
                                     break;
                                 default:
                                     $oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_NONE;
+
                                     break;
                             }
+
                             break;
-                        // sprmCIco
-                        //@see  http://msdn.microsoft.com/en-us/library/dd773060%28v=office.12%29.aspx
+                            // sprmCIco
+                            //@see  http://msdn.microsoft.com/en-us/library/dd773060%28v=office.12%29.aspx
                         case 0x42:
                             switch (dechex($operand)) {
                                 case 0x00:
                                 case 0x01:
                                     $oStylePrl->styleFont['color'] = '000000';
+
                                     break;
                                 case 0x02:
                                     $oStylePrl->styleFont['color'] = '0000FF';
+
                                     break;
                                 case 0x03:
                                     $oStylePrl->styleFont['color'] = '00FFFF';
+
                                     break;
                                 case 0x04:
                                     $oStylePrl->styleFont['color'] = '00FF00';
+
                                     break;
                                 case 0x05:
                                     $oStylePrl->styleFont['color'] = 'FF00FF';
+
                                     break;
                                 case 0x06:
                                     $oStylePrl->styleFont['color'] = 'FF0000';
+
                                     break;
                                 case 0x07:
                                     $oStylePrl->styleFont['color'] = 'FFFF00';
+
                                     break;
                                 case 0x08:
                                     $oStylePrl->styleFont['color'] = 'FFFFFF';
+
                                     break;
                                 case 0x09:
                                     $oStylePrl->styleFont['color'] = '000080';
+
                                     break;
                                 case 0x0A:
                                     $oStylePrl->styleFont['color'] = '008080';
+
                                     break;
                                 case 0x0B:
                                     $oStylePrl->styleFont['color'] = '008000';
+
                                     break;
                                 case 0x0C:
                                     $oStylePrl->styleFont['color'] = '800080';
+
                                     break;
                                 case 0x0D:
                                     $oStylePrl->styleFont['color'] = '800080';
+
                                     break;
                                 case 0x0E:
                                     $oStylePrl->styleFont['color'] = '808000';
+
                                     break;
                                 case 0x0F:
                                     $oStylePrl->styleFont['color'] = '808080';
+
                                     break;
                                 case 0x10:
                                     $oStylePrl->styleFont['color'] = 'C0C0C0';
                             }
+
                             break;
-                        // sprmCHps
+                            // sprmCHps
                         case 0x43:
-                            $oStylePrl->styleFont['size'] = dechex($operand / 2);
+                            $oStylePrl->styleFont['size'] = $operand / 2;
+
                             break;
-                        // sprmCIss
+                            // sprmCIss
                         case 0x48:
                             if (!isset($oStylePrl->styleFont['superScript'])) {
                                 $oStylePrl->styleFont['superScript'] = false;
@@ -1807,122 +1890,135 @@ private function readPrl($data, $pos, $cbNum)
                                     break;
                                 case 0x01:
                                     $oStylePrl->styleFont['superScript'] = true;
+
                                     break;
                                 case 0x02:
                                     $oStylePrl->styleFont['subScript'] = true;
+
                                     break;
                             }
+
                             break;
-                        // sprmCRgFtc0
+                            // sprmCRgFtc0
                         case 0x4F:
                             $oStylePrl->styleFont['name'] = '';
                             if (isset($this->arrayFonts[$operand])) {
                                 $oStylePrl->styleFont['name'] = $this->arrayFonts[$operand]['main'];
                             }
+
                             break;
-                        // sprmCRgFtc1
+                            // sprmCRgFtc1
                         case 0x50:
                             // if the language for the text is an East Asian language
                             break;
-                        // sprmCRgFtc2
+                            // sprmCRgFtc2
                         case 0x51:
                             // if the character falls outside the Unicode character range
                             break;
-                        // sprmCFSpec
+                            // sprmCFSpec
                         case 0x55:
                             //$sprmCFSpec = $operand;
                             break;
-                        // sprmCFtcBi
+                            // sprmCFtcBi
                         case 0x5E:
                             break;
-                        // sprmCFItalicBi
+                            // sprmCFItalicBi
                         case 0x5D:
                             break;
-                        // sprmCHpsBi
+                            // sprmCHpsBi
                         case 0x61:
                             break;
-                        // sprmCShd80
-                        //@see  http://msdn.microsoft.com/en-us/library/dd923447%28v=office.12%29.aspx
+                            // sprmCShd80
+                            //@see  http://msdn.microsoft.com/en-us/library/dd923447%28v=office.12%29.aspx
                         case 0x66:
                             // $operand = self::getInt2d($data, $pos);
                             $pos += 2;
                             $cbNum -= 2;
+
                             // $ipat = ($operand >> 0) && bindec('111111');
                             // $icoBack = ($operand >> 6) && bindec('11111');
                             // $icoFore = ($operand >> 11) && bindec('11111');
                             break;
-                        // sprmCCv
-                        //@see  : http://msdn.microsoft.com/en-us/library/dd952824%28v=office.12%29.aspx
+                            // sprmCCv
+                            //@see  http://msdn.microsoft.com/en-us/library/dd952824%28v=office.12%29.aspx
                         case 0x70:
                             $red = str_pad(dechex(self::getInt1d($this->dataWorkDocument, $pos)), 2, '0', STR_PAD_LEFT);
-                            $pos += 1;
+                            ++$pos;
                             $green = str_pad(dechex(self::getInt1d($this->dataWorkDocument, $pos)), 2, '0', STR_PAD_LEFT);
-                            $pos += 1;
+                            ++$pos;
                             $blue = str_pad(dechex(self::getInt1d($this->dataWorkDocument, $pos)), 2, '0', STR_PAD_LEFT);
-                            $pos += 1;
-                            $pos += 1;
+                            ++$pos;
+                            ++$pos;
                             $oStylePrl->styleFont['color'] = $red . $green . $blue;
                             $cbNum -= 4;
+
                             break;
                         default:
                             // print_r('@todo Character : 0x'.dechex($oSprm->isPmd));
                             // print_r(PHP_EOL);
                     }
+
                     break;
-                // Picture property
+                    // Picture property
                 case 0x03:
                     break;
-                // Section property
+                    // Section property
                 case 0x04:
                     if (!isset($oStylePrl->styleSection)) {
-                        $oStylePrl->styleSection = array();
+                        $oStylePrl->styleSection = [];
                     }
                     switch ($oSprm->isPmd) {
                         // sprmSNfcPgn
                         case 0x0E:
                             // numbering format used for page numbers
                             break;
-                        // sprmSXaPage
+                            // sprmSXaPage
                         case 0x1F:
                             $oStylePrl->styleSection['pageSizeW'] = $operand;
+
                             break;
-                        // sprmSYaPage
+                            // sprmSYaPage
                         case 0x20:
                             $oStylePrl->styleSection['pageSizeH'] = $operand;
+
                             break;
-                        // sprmSDxaLeft
+                            // sprmSDxaLeft
                         case 0x21:
                             $oStylePrl->styleSection['marginLeft'] = $operand;
+
                             break;
-                        // sprmSDxaRight
+                            // sprmSDxaRight
                         case 0x22:
                             $oStylePrl->styleSection['marginRight'] = $operand;
+
                             break;
-                        // sprmSDyaTop
+                            // sprmSDyaTop
                         case 0x23:
                             $oStylePrl->styleSection['marginTop'] = $operand;
+
                             break;
-                        // sprmSDyaBottom
+                            // sprmSDyaBottom
                         case 0x24:
                             $oStylePrl->styleSection['marginBottom'] = $operand;
+
                             break;
-                        // sprmSFBiDi
+                            // sprmSFBiDi
                         case 0x28:
                             // RTL layout
                             break;
-                        // sprmSDxtCharSpace
+                            // sprmSDxtCharSpace
                         case 0x30:
                             // characpter pitch
                             break;
-                        // sprmSDyaLinePitch
+                            // sprmSDyaLinePitch
                         case 0x31:
                             // line height
                             break;
-                        // sprmSClm
+                            // sprmSClm
                         case 0x32:
                             // document grid mode
                             break;
-                        // sprmSTextFlow
+                            // sprmSTextFlow
                         case 0x33:
                             // text flow
                             break;
@@ -1930,15 +2026,16 @@ private function readPrl($data, $pos, $cbNum)
                             // print_r('@todo Section : 0x'.dechex($oSprm->isPmd));
                             // print_r(PHP_EOL);
                     }
+
                     break;
-                // Table property
+                    // Table property
                 case 0x05:
                     break;
             }
         } while ($cbNum > 0);
 
-        if (!is_null($sprmCPicLocation)) {
-            if (!is_null($sprmCFData) && $sprmCFData == 0x01) {
+        if (null !== $sprmCPicLocation) {
+            if (null !== $sprmCFData && $sprmCFData == 0x01) {
                 // NilPICFAndBinData
                 //@todo Read Hyperlink structure
                 /*$lcb = self::getInt4d($this->dataData, $sprmCPicLocation);
@@ -1954,7 +2051,7 @@ private function readPrl($data, $pos, $cbNum)
                 // HFD > clsid
                 $sprmCPicLocation += 16;
                 // HFD > hyperlink
-                //@see  : http://msdn.microsoft.com/en-us/library/dd909835%28v=office.12%29.aspx
+                //@see  http://msdn.microsoft.com/en-us/library/dd909835%28v=office.12%29.aspx
                 $streamVersion = self::getInt4d($this->dataData, $sprmCPicLocation);
                 $sprmCPicLocation += 4;
                 $data = self::getInt4d($this->dataData, $sprmCPicLocation);
@@ -2022,8 +2119,8 @@ private function readPrl($data, $pos, $cbNum)
                 }*/
             } else {
                 // Pictures
-                //@see  : http://msdn.microsoft.com/en-us/library/dd925458%28v=office.12%29.aspx
-                //@see  : http://msdn.microsoft.com/en-us/library/dd926136%28v=office.12%29.aspx
+                //@see  http://msdn.microsoft.com/en-us/library/dd925458%28v=office.12%29.aspx
+                //@see  http://msdn.microsoft.com/en-us/library/dd926136%28v=office.12%29.aspx
                 // PICF : lcb
                 $sprmCPicLocation += 4;
                 // PICF : cbHeader
@@ -2070,9 +2167,9 @@ private function readPrl($data, $pos, $cbNum)
                 $picmidDxaCropBottom = self::getInt2d($this->dataData, $sprmCPicLocation);
                 $sprmCPicLocation += 2;
                 // PICF : picmid : fReserved
-                $sprmCPicLocation += 1;
+                ++$sprmCPicLocation;
                 // PICF : picmid : bpp
-                $sprmCPicLocation += 1;
+                ++$sprmCPicLocation;
                 // PICF : picmid : brcTop80
                 $sprmCPicLocation += 4;
                 // PICF : picmid : brcLeft80
@@ -2091,13 +2188,13 @@ private function readPrl($data, $pos, $cbNum)
                 if ($mfpfMm == 0x0066) {
                     // cchPicName
                     $cchPicName = self::getInt1d($this->dataData, $sprmCPicLocation);
-                    $sprmCPicLocation += 1;
+                    ++$sprmCPicLocation;
 
                     // stPicName
                     //$stPicName = '';
-                    for ($inc = 0; $inc <= $cchPicName; $inc++) {
+                    for ($inc = 0; $inc <= $cchPicName; ++$inc) {
                         //$chr = self::getInt1d($this->dataData, $sprmCPicLocation);
-                        $sprmCPicLocation += 1;
+                        ++$sprmCPicLocation;
                         //$stPicName .= chr($chr);
                     }
                 }
@@ -2110,18 +2207,18 @@ private function readPrl($data, $pos, $cbNum)
                     $sprmCPicLocation += $shapeRH['recLen'];
                 }
                 // picture : rgfb
-                //@see  : http://msdn.microsoft.com/en-us/library/dd950560%28v=office.12%29.aspx
+                //@see  http://msdn.microsoft.com/en-us/library/dd950560%28v=office.12%29.aspx
                 $fileBlockRH = $this->loadRecordHeader($this->dataData, $sprmCPicLocation);
                 while ($fileBlockRH['recType'] == 0xF007 || ($fileBlockRH['recType'] >= 0xF018 && $fileBlockRH['recType'] <= 0xF117)) {
                     $sprmCPicLocation += 8;
                     switch ($fileBlockRH['recType']) {
                         // OfficeArtFBSE
-                        //@see  : http://msdn.microsoft.com/en-us/library/dd944923%28v=office.12%29.aspx
+                        //@see  http://msdn.microsoft.com/en-us/library/dd944923%28v=office.12%29.aspx
                         case 0xF007:
                             // btWin32
-                            $sprmCPicLocation += 1;
+                            ++$sprmCPicLocation;
                             // btMacOS
-                            $sprmCPicLocation += 1;
+                            ++$sprmCPicLocation;
                             // rgbUid
                             $sprmCPicLocation += 16;
                             // tag
@@ -2133,31 +2230,31 @@ private function readPrl($data, $pos, $cbNum)
                             // foDelay
                             $sprmCPicLocation += 4;
                             // unused1
-                            $sprmCPicLocation += 1;
+                            ++$sprmCPicLocation;
                             // cbName
                             $cbName = self::getInt1d($this->dataData, $sprmCPicLocation);
-                            $sprmCPicLocation += 1;
+                            ++$sprmCPicLocation;
                             // unused2
-                            $sprmCPicLocation += 1;
+                            ++$sprmCPicLocation;
                             // unused3
-                            $sprmCPicLocation += 1;
+                            ++$sprmCPicLocation;
                             // nameData
                             if ($cbName > 0) {
                                 //$nameData = '';
-                                for ($inc = 0; $inc <= ($cbName / 2); $inc++) {
+                                for ($inc = 0; $inc <= ($cbName / 2); ++$inc) {
                                     //$chr = self::getInt2d($this->dataData, $sprmCPicLocation);
                                     $sprmCPicLocation += 2;
                                     //$nameData .= chr($chr);
                                 }
                             }
                             // embeddedBlip
-                            //@see  : http://msdn.microsoft.com/en-us/library/dd910081%28v=office.12%29.aspx
+                            //@see  http://msdn.microsoft.com/en-us/library/dd910081%28v=office.12%29.aspx
                             $embeddedBlipRH = $this->loadRecordHeader($this->dataData, $sprmCPicLocation);
                             switch ($embeddedBlipRH['recType']) {
                                 case self::OFFICEARTBLIPJPG:
                                 case self::OFFICEARTBLIPJPEG:
                                     if (!isset($oStylePrl->image)) {
-                                        $oStylePrl->image = array();
+                                        $oStylePrl->image = [];
                                     }
                                     $sprmCPicLocation += 8;
                                     // embeddedBlip : rgbUid1
@@ -2167,7 +2264,7 @@ private function readPrl($data, $pos, $cbNum)
                                         $sprmCPicLocation += 16;
                                     }
                                     // embeddedBlip : tag
-                                    $sprmCPicLocation += 1;
+                                    ++$sprmCPicLocation;
                                     // embeddedBlip : BLIPFileData
                                     $oStylePrl->image['data'] = substr($this->dataData, $sprmCPicLocation, $embeddedBlipRH['recLen']);
                                     $oStylePrl->image['format'] = 'jpg';
@@ -2184,12 +2281,14 @@ private function readPrl($data, $pos, $cbNum)
                                     $oStylePrl->image['height'] = Drawing::twipsToPixels($iCropHeight * $picmidMy / 1000);
 
                                     $sprmCPicLocation += $embeddedBlipRH['recLen'];
+
                                     break;
                                 case self::OFFICEARTBLIPPNG:
                                     break;
                                 default:
                                     // print_r(dechex($embeddedBlipRH['recType']));
                             }
+
                             break;
                     }
                     $fileBlockRH = $this->loadRecordHeader($this->dataData, $sprmCPicLocation);
@@ -2203,9 +2302,11 @@ private function readPrl($data, $pos, $cbNum)
     }
 
     /**
-     * Read a record header
+     * Read a record header.
+     *
      * @param string $stream
      * @param int $pos
+     *
      * @return array
      */
     private function loadRecordHeader($stream, $pos)
@@ -2214,15 +2315,15 @@ private function loadRecordHeader($stream, $pos)
         $recType = self::getInt2d($stream, $pos + 2);
         $recLen = self::getInt4d($stream, $pos + 4);
 
-        return array(
-            'recVer'      => ($rec >> 0) & bindec('1111'),
+        return [
+            'recVer' => ($rec >> 0) & bindec('1111'),
             'recInstance' => ($rec >> 4) & bindec('111111111111'),
-            'recType'     => $recType,
-            'recLen'      => $recLen,
-        );
+            'recType' => $recType,
+            'recLen' => $recLen,
+        ];
     }
 
-    private function generatePhpWord()
+    private function generatePhpWord(): void
     {
         foreach ($this->arraySections as $itmSection) {
             $oSection = $this->phpWord->addSection();
@@ -2232,7 +2333,7 @@ private function generatePhpWord()
             foreach ($this->arrayParagraphs as $itmParagraph) {
                 $textPara = $itmParagraph;
                 foreach ($this->arrayCharacters as $oCharacters) {
-                    $subText = substr($textPara, $oCharacters->pos_start, $oCharacters->pos_len);
+                    $subText = mb_substr($textPara, $oCharacters->pos_start, $oCharacters->pos_len);
                     $subText = str_replace(chr(13), PHP_EOL, $subText);
                     $arrayText = explode(PHP_EOL, $subText);
                     if (end($arrayText) == '') {
@@ -2243,7 +2344,7 @@ private function generatePhpWord()
                     }
 
                     // Style Character
-                    $styleFont = array();
+                    $styleFont = [];
                     if (isset($oCharacters->style)) {
                         if (isset($oCharacters->style->styleFont)) {
                             $styleFont = $oCharacters->style->styleFont;
@@ -2283,7 +2384,7 @@ private function generatePhpWord()
                                     if (isset($oCharacters->style->image)) {
                                         $fileImage = tempnam(sys_get_temp_dir(), 'PHPWord_MsDoc') . '.' . $oCharacters->style->image['format'];
                                         file_put_contents($fileImage, $oCharacters->style->image['data']);
-                                        $oSection->addImage($fileImage, array('width' => $oCharacters->style->image['width'], 'height' => $oCharacters->style->image['height']));
+                                        $oSection->addImage($fileImage, ['width' => $oCharacters->style->image['width'], 'height' => $oCharacters->style->image['height']]);
                                         // print_r('>addImage<'.$fileImage.'>'.EOL);
                                     }
                                 }
@@ -2296,10 +2397,11 @@ private function generatePhpWord()
     }
 
     /**
-     * Read 8-bit unsigned integer
+     * Read 8-bit unsigned integer.
      *
      * @param string $data
      * @param int $pos
+     *
      * @return int
      */
     public static function getInt1d($data, $pos)
@@ -2308,10 +2410,11 @@ public static function getInt1d($data, $pos)
     }
 
     /**
-     * Read 16-bit unsigned integer
+     * Read 16-bit unsigned integer.
      *
      * @param string $data
      * @param int $pos
+     *
      * @return int
      */
     public static function getInt2d($data, $pos)
@@ -2320,10 +2423,11 @@ public static function getInt2d($data, $pos)
     }
 
     /**
-     * Read 24-bit signed integer
+     * Read 24-bit signed integer.
      *
      * @param string $data
      * @param int $pos
+     *
      * @return int
      */
     public static function getInt3d($data, $pos)
@@ -2332,10 +2436,11 @@ public static function getInt3d($data, $pos)
     }
 
     /**
-     * Read 32-bit signed integer
+     * Read 32-bit signed integer.
      *
      * @param string $data
      * @param int $pos
+     *
      * @return int
      */
     public static function getInt4d($data, $pos)
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Reader/ODText.php b/vendor/phpoffice/phpword/src/PhpWord/Reader/ODText.php
index d0aa9138fa..d7f8344443 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Reader/ODText.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Reader/ODText.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -21,16 +21,17 @@
 use PhpOffice\PhpWord\Shared\XMLReader;
 
 /**
- * Reader for ODText
+ * Reader for ODText.
  *
  * @since 0.10.0
  */
 class ODText extends AbstractReader implements ReaderInterface
 {
     /**
-     * Loads PhpWord from file
+     * Loads PhpWord from file.
      *
      * @param string $docFile
+     *
      * @return \PhpOffice\PhpWord\PhpWord
      */
     public function load($docFile)
@@ -38,10 +39,10 @@ public function load($docFile)
         $phpWord = new PhpWord();
         $relationships = $this->readRelationships($docFile);
 
-        $readerParts = array(
+        $readerParts = [
             'content.xml' => 'Content',
-            'meta.xml'    => 'Meta',
-        );
+            'meta.xml' => 'Meta',
+        ];
 
         foreach ($readerParts as $xmlFile => $partName) {
             $this->readPart($phpWord, $relationships, $partName, $docFile, $xmlFile);
@@ -52,14 +53,8 @@ public function load($docFile)
 
     /**
      * Read document part.
-     *
-     * @param \PhpOffice\PhpWord\PhpWord $phpWord
-     * @param array $relationships
-     * @param string $partName
-     * @param string $docFile
-     * @param string $xmlFile
      */
-    private function readPart(PhpWord $phpWord, $relationships, $partName, $docFile, $xmlFile)
+    private function readPart(PhpWord $phpWord, array $relationships, string $partName, string $docFile, string $xmlFile): void
     {
         $partClass = "PhpOffice\\PhpWord\\Reader\\ODText\\{$partName}";
         if (class_exists($partClass)) {
@@ -71,14 +66,11 @@ private function readPart(PhpWord $phpWord, $relationships, $partName, $docFile,
     }
 
     /**
-     * Read all relationship files
-     *
-     * @param string $docFile
-     * @return array
+     * Read all relationship files.
      */
-    private function readRelationships($docFile)
+    private function readRelationships(string $docFile): array
     {
-        $rels = array();
+        $rels = [];
         $xmlFile = 'META-INF/manifest.xml';
         $xmlReader = new XMLReader();
         $xmlReader->getDomFromZip($docFile, $xmlFile);
@@ -86,7 +78,7 @@ private function readRelationships($docFile)
         foreach ($nodes as $node) {
             $type = $xmlReader->getAttribute('manifest:media-type', $node);
             $target = $xmlReader->getAttribute('manifest:full-path', $node);
-            $rels[] = array('type' => $type, 'target' => $target);
+            $rels[] = ['type' => $type, 'target' => $target];
         }
 
         return $rels;
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Reader/ODText/AbstractPart.php b/vendor/phpoffice/phpword/src/PhpWord/Reader/ODText/AbstractPart.php
index ff664e01fa..4c89192edd 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Reader/ODText/AbstractPart.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Reader/ODText/AbstractPart.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,9 +20,10 @@
 use PhpOffice\PhpWord\Reader\Word2007\AbstractPart as Word2007AbstractPart;
 
 /**
- * Abstract part reader
+ * Abstract part reader.
  *
  * @since 0.10.0
+ *
  * @codeCoverageIgnore
  */
 abstract class AbstractPart extends Word2007AbstractPart
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Reader/ODText/Content.php b/vendor/phpoffice/phpword/src/PhpWord/Reader/ODText/Content.php
index cec064181f..15c76c27b9 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Reader/ODText/Content.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Reader/ODText/Content.php
@@ -11,84 +11,160 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Reader\ODText;
 
+use DateTime;
+use DOMElement;
+use DOMNodeList;
+use PhpOffice\Math\Reader\MathML;
+use PhpOffice\PhpWord\Element\Section;
 use PhpOffice\PhpWord\Element\TrackChange;
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\Shared\XMLReader;
 
 /**
- * Content reader
+ * Content reader.
  *
  * @since 0.10.0
  */
 class Content extends AbstractPart
 {
+    /** @var ?Section */
+    private $section;
+
     /**
      * Read content.xml.
-     *
-     * @param \PhpOffice\PhpWord\PhpWord $phpWord
      */
-    public function read(PhpWord $phpWord)
+    public function read(PhpWord $phpWord): void
     {
         $xmlReader = new XMLReader();
         $xmlReader->getDomFromZip($this->docFile, $this->xmlFile);
 
-        $trackedChanges = array();
+        $trackedChanges = [];
 
         $nodes = $xmlReader->getElements('office:body/office:text/*');
+        $this->section = null;
+        $this->processNodes($nodes, $xmlReader, $phpWord);
+        $this->section = null;
+    }
+
+    /** @param DOMNodeList<DOMElement> $nodes */
+    public function processNodes(DOMNodeList $nodes, XMLReader $xmlReader, PhpWord $phpWord): void
+    {
         if ($nodes->length > 0) {
-            $section = $phpWord->addSection();
             foreach ($nodes as $node) {
                 // $styleName = $xmlReader->getAttribute('text:style-name', $node);
                 switch ($node->nodeName) {
                     case 'text:h': // Heading
                         $depth = $xmlReader->getAttribute('text:outline-level', $node);
-                        $section->addTitle($node->nodeValue, $depth);
+                        $this->getSection($phpWord)->addTitle($node->nodeValue, $depth);
+
                         break;
                     case 'text:p': // Paragraph
-                        $children = $node->childNodes;
-                        foreach ($children as $child) {
-                            switch ($child->nodeName) {
-                                case 'text:change-start':
-                                    $changeId = $child->getAttribute('text:change-id');
-                                    if (isset($trackedChanges[$changeId])) {
-                                        $changed = $trackedChanges[$changeId];
-                                    }
-                                    break;
-                                case 'text:change-end':
-                                    unset($changed);
-                                    break;
-                                case 'text:change':
-                                    $changeId = $child->getAttribute('text:change-id');
-                                    if (isset($trackedChanges[$changeId])) {
-                                        $changed = $trackedChanges[$changeId];
-                                    }
-                                    break;
-                            }
+                        $styleName = $xmlReader->getAttribute('text:style-name', $node);
+                        if (substr($styleName, 0, 2) === 'SB') {
+                            break;
                         }
+                        $element = $xmlReader->getElement('draw:frame/draw:object', $node);
+                        if ($element) {
+                            $mathFile = str_replace('./', '', $element->getAttribute('xlink:href')) . '/content.xml';
+
+                            $xmlReaderObject = new XMLReader();
+                            $mathElement = $xmlReaderObject->getDomFromZip($this->docFile, $mathFile);
+                            if ($mathElement) {
+                                $mathXML = $mathElement->saveXML($mathElement);
+
+                                if (is_string($mathXML)) {
+                                    $reader = new MathML();
+                                    $math = $reader->read($mathXML);
+
+                                    $this->getSection($phpWord)->addFormula($math);
+                                }
+                            }
+                        } else {
+                            $children = $node->childNodes;
+                            $spans = false;
+                            /** @var DOMElement $child */
+                            foreach ($children as $child) {
+                                switch ($child->nodeName) {
+                                    case 'text:change-start':
+                                        $changeId = $child->getAttribute('text:change-id');
+                                        if (isset($trackedChanges[$changeId])) {
+                                            $changed = $trackedChanges[$changeId];
+                                        }
+
+                                        break;
+                                    case 'text:change-end':
+                                        unset($changed);
+
+                                        break;
+                                    case 'text:change':
+                                        $changeId = $child->getAttribute('text:change-id');
+                                        if (isset($trackedChanges[$changeId])) {
+                                            $changed = $trackedChanges[$changeId];
+                                        }
+
+                                        break;
+                                    case 'text:span':
+                                        $spans = true;
+
+                                        break;
+                                }
+                            }
+
+                            if ($spans) {
+                                $element = $this->getSection($phpWord)->addTextRun();
+                                foreach ($children as $child) {
+                                    switch ($child->nodeName) {
+                                        case 'text:span':
+                                            /** @var DOMElement $child2 */
+                                            foreach ($child->childNodes as $child2) {
+                                                switch ($child2->nodeName) {
+                                                    case '#text':
+                                                        $element->addText($child2->nodeValue);
+
+                                                        break;
+                                                    case 'text:tab':
+                                                        $element->addText("\t");
+
+                                                        break;
+                                                    case 'text:s':
+                                                        $spaces = (int) $child2->getAttribute('text:c') ?: 1;
+                                                        $element->addText(str_repeat(' ', $spaces));
+
+                                                        break;
+                                                }
+                                            }
 
-                        $element = $section->addText($node->nodeValue);
-                        if (isset($changed) && is_array($changed)) {
-                            $element->setTrackChange($changed['changed']);
-                            if (isset($changed['textNodes'])) {
-                                foreach ($changed['textNodes'] as $changedNode) {
-                                    $element = $section->addText($changedNode->nodeValue);
-                                    $element->setTrackChange($changed['changed']);
+                                            break;
+                                    }
+                                }
+                            } else {
+                                $element = $this->getSection($phpWord)->addText($node->nodeValue);
+                            }
+                            if (isset($changed) && is_array($changed)) {
+                                $element->setTrackChange($changed['changed']);
+                                if (isset($changed['textNodes'])) {
+                                    foreach ($changed['textNodes'] as $changedNode) {
+                                        $element = $this->getSection($phpWord)->addText($changedNode->nodeValue);
+                                        $element->setTrackChange($changed['changed']);
+                                    }
                                 }
                             }
                         }
+
                         break;
                     case 'text:list': // List
                         $listItems = $xmlReader->getElements('text:list-item/text:p', $node);
                         foreach ($listItems as $listItem) {
                             // $listStyleName = $xmlReader->getAttribute('text:style-name', $listItem);
-                            $section->addListItem($listItem->nodeValue, 0);
+                            $this->getSection($phpWord)->addListItem($listItem->nodeValue, 0);
                         }
+
                         break;
                     case 'text:tracked-changes':
                         $changedRegions = $xmlReader->getElements('text:changed-region', $node);
@@ -99,14 +175,32 @@ public function read(PhpWord $phpWord)
                             $dateNode = $xmlReader->getElements('office:change-info/dc:date', $changedRegion->firstChild);
                             $date = $dateNode[0]->nodeValue;
                             $date = preg_replace('/\.\d+$/', '', $date);
-                            $date = \DateTime::createFromFormat('Y-m-d\TH:i:s', $date);
+                            $date = DateTime::createFromFormat('Y-m-d\TH:i:s', $date);
                             $changed = new TrackChange($type, $author, $date);
                             $textNodes = $xmlReader->getElements('text:deletion/text:p', $changedRegion);
-                            $trackedChanges[$changedRegion->getAttribute('text:id')] = array('changed'  => $changed, 'textNodes'=> $textNodes);
+                            $trackedChanges[$changedRegion->getAttribute('text:id')] = ['changed' => $changed, 'textNodes' => $textNodes];
                         }
+
+                        break;
+                    case 'text:section': // Section
+                        // $sectionStyleName = $xmlReader->getAttribute('text:style-name', $listItem);
+                        $this->section = $phpWord->addSection();
+                        $children = $node->childNodes;
+                        $this->processNodes($children, $xmlReader, $phpWord);
+
                         break;
                 }
             }
         }
     }
+
+    private function getSection(PhpWord $phpWord): Section
+    {
+        $section = $this->section;
+        if ($section === null) {
+            $section = $this->section = $phpWord->addSection();
+        }
+
+        return $section;
+    }
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Reader/ODText/Meta.php b/vendor/phpoffice/phpword/src/PhpWord/Reader/ODText/Meta.php
index 9a3d83414f..200ee1306f 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Reader/ODText/Meta.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Reader/ODText/Meta.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -21,7 +21,7 @@
 use PhpOffice\PhpWord\Shared\XMLReader;
 
 /**
- * Meta reader
+ * Meta reader.
  *
  * @since 0.11.0
  */
@@ -30,10 +30,9 @@ class Meta extends AbstractPart
     /**
      * Read meta.xml.
      *
-     * @param \PhpOffice\PhpWord\PhpWord $phpWord
      * @todo Process property type
      */
-    public function read(PhpWord $phpWord)
+    public function read(PhpWord $phpWord): void
     {
         $xmlReader = new XMLReader();
         $xmlReader->getDomFromZip($this->docFile, $this->xmlFile);
@@ -42,16 +41,16 @@ public function read(PhpWord $phpWord)
         $metaNode = $xmlReader->getElement('office:meta');
 
         // Standard properties
-        $properties = array(
-            'title'          => 'dc:title',
-            'subject'        => 'dc:subject',
-            'description'    => 'dc:description',
-            'keywords'       => 'meta:keyword',
-            'creator'        => 'meta:initial-creator',
+        $properties = [
+            'title' => 'dc:title',
+            'subject' => 'dc:subject',
+            'description' => 'dc:description',
+            'keywords' => 'meta:keyword',
+            'creator' => 'meta:initial-creator',
             'lastModifiedBy' => 'dc:creator',
             // 'created'        => 'meta:creation-date',
             // 'modified'       => 'dc:date',
-        );
+        ];
         foreach ($properties as $property => $path) {
             $method = "set{$property}";
             $propertyNode = $xmlReader->getElement($path, $metaNode);
@@ -66,7 +65,7 @@ public function read(PhpWord $phpWord)
             $property = $xmlReader->getAttribute('meta:name', $propertyNode);
 
             // Set category, company, and manager property
-            if (in_array($property, array('Category', 'Company', 'Manager'))) {
+            if (in_array($property, ['Category', 'Company', 'Manager'])) {
                 $method = "set{$property}";
                 $docProps->$method($propertyNode->nodeValue);
             } else {
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Reader/RTF.php b/vendor/phpoffice/phpword/src/PhpWord/Reader/RTF.php
index 620252ffd7..2fdfb03839 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Reader/RTF.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Reader/RTF.php
@@ -11,29 +11,28 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Reader;
 
+use Exception;
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\Reader\RTF\Document;
 
 /**
- * RTF Reader class
+ * RTF Reader class.
  *
  * @since 0.11.0
  */
 class RTF extends AbstractReader implements ReaderInterface
 {
     /**
-     * Loads PhpWord from file
+     * Loads PhpWord from file.
      *
      * @param string $docFile
      *
-     * @throws \Exception
-     *
      * @return \PhpOffice\PhpWord\PhpWord
      */
     public function load($docFile)
@@ -45,7 +44,7 @@ public function load($docFile)
             $doc->rtf = file_get_contents($docFile);
             $doc->read($phpWord);
         } else {
-            throw new \Exception("Cannot read {$docFile}.");
+            throw new Exception("Cannot read {$docFile}.");
         }
 
         return $phpWord;
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Reader/RTF/Document.php b/vendor/phpoffice/phpword/src/PhpWord/Reader/RTF/Document.php
index b9509d71fe..21b76cf71f 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Reader/RTF/Document.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Reader/RTF/Document.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -21,7 +21,7 @@
 use PhpOffice\PhpWord\SimpleType\Jc;
 
 /**
- * RTF document reader
+ * RTF document reader.
  *
  * References:
  * - How to Write an RTF Reader http://latex2rtf.sourceforge.net/rtfspec_45.html
@@ -29,6 +29,7 @@
  * - JavaScript RTF-parser by LazyGyu https://github.com/lazygyu/RTF-parser
  *
  * @since 0.11.0
+ *
  * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
  */
 class Document
@@ -39,109 +40,108 @@ class Document
     const SKIP = 'readSkip';
 
     /**
-     * PhpWord object
+     * PhpWord object.
      *
      * @var \PhpOffice\PhpWord\PhpWord
      */
     private $phpWord;
 
     /**
-     * Section object
+     * Section object.
      *
      * @var \PhpOffice\PhpWord\Element\Section
      */
     private $section;
 
     /**
-     * Textrun object
+     * Textrun object.
      *
      * @var \PhpOffice\PhpWord\Element\TextRun
      */
     private $textrun;
 
     /**
-     * RTF content
+     * RTF content.
      *
      * @var string
      */
     public $rtf;
 
     /**
-     * Content length
+     * Content length.
      *
      * @var int
      */
     private $length = 0;
 
     /**
-     * Character index
+     * Character index.
      *
      * @var int
      */
     private $offset = 0;
 
     /**
-     * Current control word
+     * Current control word.
      *
      * @var string
      */
     private $control = '';
 
     /**
-     * Text content
+     * Text content.
      *
      * @var string
      */
     private $text = '';
 
     /**
-     * Parsing a control word flag
+     * Parsing a control word flag.
      *
      * @var bool
      */
     private $isControl = false;
 
     /**
-     * First character flag: watch out for control symbols
+     * First character flag: watch out for control symbols.
      *
      * @var bool
      */
     private $isFirst = false;
 
     /**
-     * Group groups
+     * Group groups.
      *
      * @var array
      */
-    private $groups = array();
+    private $groups = [];
 
     /**
-     * Parser flags; not used
+     * Parser flags; not used.
      *
      * @var array
      */
-    private $flags = array();
+    private $flags = [];
 
     /**
-     * Parse RTF content
+     * Parse RTF content.
      *
      * - Marks controlling characters `{`, `}`, and `\`
      * - Removes line endings
      * - Builds control words and control symbols
      * - Pushes every other character into the text queue
      *
-     * @param \PhpOffice\PhpWord\PhpWord $phpWord
      * @todo Use `fread` stream for scalability
      */
-    public function read(PhpWord $phpWord)
+    public function read(PhpWord $phpWord): void
     {
-        $markers = array(
+        $markers = [
             123 => 'markOpening',   // {
             125 => 'markClosing',   // }
-            92  => 'markBackslash', // \
-            10  => 'markNewline',   // LF
-            13  => 'markNewline',   // CR
-        );
+            92 => 'markBackslash', // \
+            10 => 'markNewline',   // LF
+            13 => 'markNewline',   // CR
+        ];
 
         $this->phpWord = $phpWord;
         $this->section = $phpWord->addSection();
@@ -176,7 +176,7 @@ public function read(PhpWord $phpWord)
                     }
                 }
             }
-            $this->offset++;
+            ++$this->offset;
         }
         $this->flushText();
     }
@@ -184,7 +184,7 @@ public function read(PhpWord $phpWord)
     /**
      * Mark opening braket `{` character.
      */
-    private function markOpening()
+    private function markOpening(): void
     {
         $this->flush(true);
         array_push($this->groups, $this->flags);
@@ -193,7 +193,7 @@ private function markOpening()
     /**
      * Mark closing braket `}` character.
      */
-    private function markClosing()
+    private function markClosing(): void
     {
         $this->flush(true);
         $this->flags = array_pop($this->groups);
@@ -202,7 +202,7 @@ private function markClosing()
     /**
      * Mark backslash `\` character.
      */
-    private function markBackslash()
+    private function markBackslash(): void
     {
         if ($this->isFirst) {
             $this->setControl(false);
@@ -217,7 +217,7 @@ private function markBackslash()
     /**
      * Mark newline character: Flush control word because it's not possible to span multiline.
      */
-    private function markNewline()
+    private function markNewline(): void
     {
         if ($this->isControl) {
             $this->flushControl(true);
@@ -229,7 +229,7 @@ private function markNewline()
      *
      * @param bool $isControl
      */
-    private function flush($isControl = false)
+    private function flush($isControl = false): void
     {
         if ($this->isControl) {
             $this->flushControl($isControl);
@@ -243,10 +243,10 @@ private function flush($isControl = false)
      *
      * @param bool $isControl
      */
-    private function flushControl($isControl = false)
+    private function flushControl($isControl = false): void
     {
         if (1 === preg_match('/^([A-Za-z]+)(-?[0-9]*) ?$/', $this->control, $match)) {
-            list(, $control, $parameter) = $match;
+            [, $control, $parameter] = $match;
             $this->parseControl($control, $parameter);
         }
 
@@ -258,7 +258,7 @@ private function flushControl($isControl = false)
     /**
      * Flush text in queue.
      */
-    private function flushText()
+    private function flushText(): void
     {
         if ($this->text != '') {
             if (isset($this->flags['property'])) { // Set property
@@ -284,7 +284,7 @@ private function flushText()
      *
      * @param bool $value
      */
-    private function setControl($value)
+    private function setControl($value): void
     {
         $this->isControl = $value;
         $this->isFirst = $value;
@@ -295,7 +295,7 @@ private function setControl($value)
      *
      * @param string $char
      */
-    private function pushText($char)
+    private function pushText($char): void
     {
         if ('<' == $char) {
             $this->text .= '&lt;';
@@ -312,32 +312,32 @@ private function pushText($char)
      * @param string $control
      * @param string $parameter
      */
-    private function parseControl($control, $parameter)
+    private function parseControl($control, $parameter): void
     {
-        $controls = array(
-            'par'       => array(self::PARA,    'paragraph',    true),
-            'b'         => array(self::STYL,    'font',         'bold',          true),
-            'i'         => array(self::STYL,    'font',         'italic',        true),
-            'u'         => array(self::STYL,    'font',         'underline',     true),
-            'strike'    => array(self::STYL,    'font',         'strikethrough', true),
-            'fs'        => array(self::STYL,    'font',         'size',          $parameter),
-            'qc'        => array(self::STYL,    'paragraph',    'alignment',     Jc::CENTER),
-            'sa'        => array(self::STYL,    'paragraph',    'spaceAfter',    $parameter),
-            'fonttbl'   => array(self::SKIP,    'fonttbl',      null),
-            'colortbl'  => array(self::SKIP,    'colortbl',     null),
-            'info'      => array(self::SKIP,    'info',         null),
-            'generator' => array(self::SKIP,    'generator',    null),
-            'title'     => array(self::SKIP,    'title',        null),
-            'subject'   => array(self::SKIP,    'subject',      null),
-            'category'  => array(self::SKIP,    'category',     null),
-            'keywords'  => array(self::SKIP,    'keywords',     null),
-            'comment'   => array(self::SKIP,    'comment',      null),
-            'shppict'   => array(self::SKIP,    'pic',          null),
-            'fldinst'   => array(self::SKIP,    'link',         null),
-        );
+        $controls = [
+            'par' => [self::PARA,    'paragraph',    true],
+            'b' => [self::STYL,    'font',         'bold',          true],
+            'i' => [self::STYL,    'font',         'italic',        true],
+            'u' => [self::STYL,    'font',         'underline',     true],
+            'strike' => [self::STYL,    'font',         'strikethrough', true],
+            'fs' => [self::STYL,    'font',         'size',          $parameter],
+            'qc' => [self::STYL,    'paragraph',    'alignment',     Jc::CENTER],
+            'sa' => [self::STYL,    'paragraph',    'spaceAfter',    $parameter],
+            'fonttbl' => [self::SKIP,    'fonttbl',      null],
+            'colortbl' => [self::SKIP,    'colortbl',     null],
+            'info' => [self::SKIP,    'info',         null],
+            'generator' => [self::SKIP,    'generator',    null],
+            'title' => [self::SKIP,    'title',        null],
+            'subject' => [self::SKIP,    'subject',      null],
+            'category' => [self::SKIP,    'category',     null],
+            'keywords' => [self::SKIP,    'keywords',     null],
+            'comment' => [self::SKIP,    'comment',      null],
+            'shppict' => [self::SKIP,    'pic',          null],
+            'fldinst' => [self::SKIP,    'link',         null],
+        ];
 
         if (isset($controls[$control])) {
-            list($function) = $controls[$control];
+            [$function] = $controls[$control];
             if (method_exists($this, $function)) {
                 $directives = $controls[$control];
                 array_shift($directives); // remove the function variable; we won't need it
@@ -351,9 +351,9 @@ private function parseControl($control, $parameter)
      *
      * @param array $directives
      */
-    private function readParagraph($directives)
+    private function readParagraph($directives): void
     {
-        list($property, $value) = $directives;
+        [$property, $value] = $directives;
         $this->textrun = $this->section->addTextRun();
         $this->flags[$property] = $value;
     }
@@ -363,9 +363,9 @@ private function readParagraph($directives)
      *
      * @param array $directives
      */
-    private function readStyle($directives)
+    private function readStyle($directives): void
     {
-        list($style, $property, $value) = $directives;
+        [$style, $property, $value] = $directives;
         $this->flags['styles'][$style][$property] = $value;
     }
 
@@ -374,9 +374,9 @@ private function readStyle($directives)
      *
      * @param array $directives
      */
-    private function readSkip($directives)
+    private function readSkip($directives): void
     {
-        list($property) = $directives;
+        [$property] = $directives;
         $this->flags['property'] = $property;
         $this->flags['skipped'] = true;
     }
@@ -384,7 +384,7 @@ private function readSkip($directives)
     /**
      * Read text.
      */
-    private function readText()
+    private function readText(): void
     {
         $text = $this->textrun->addText($this->text);
         if (isset($this->flags['styles']['font'])) {
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Reader/ReaderInterface.php b/vendor/phpoffice/phpword/src/PhpWord/Reader/ReaderInterface.php
index 4024cdb3d6..83c6993310 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Reader/ReaderInterface.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Reader/ReaderInterface.php
@@ -11,14 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Reader;
 
 /**
- * Reader interface
+ * Reader interface.
  *
  * @since 0.8.0
  */
@@ -28,12 +28,13 @@ interface ReaderInterface
      * Can the current ReaderInterface read the file?
      *
      * @param  string $filename
+     *
      * @return bool
      */
     public function canRead($filename);
 
     /**
-     * Loads PhpWord from file
+     * Loads PhpWord from file.
      *
      * @param string $filename
      */
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007.php b/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007.php
index 699a4eadd1..bb20a8fed2 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007.php
@@ -11,53 +11,69 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Reader;
 
+use Exception;
+use PhpOffice\PhpWord\Element\AbstractElement;
 use PhpOffice\PhpWord\PhpWord;
+use PhpOffice\PhpWord\Reader\Word2007\AbstractPart;
 use PhpOffice\PhpWord\Shared\XMLReader;
 use PhpOffice\PhpWord\Shared\ZipArchive;
 
 /**
- * Reader for Word2007
+ * Reader for Word2007.
  *
  * @since 0.8.0
+ *
  * @todo watermark, checkbox, toc
  * @todo Partly done: image, object
  */
 class Word2007 extends AbstractReader implements ReaderInterface
 {
     /**
-     * Loads PhpWord from file
+     * Loads PhpWord from file.
      *
      * @param string $docFile
+     *
      * @return \PhpOffice\PhpWord\PhpWord
      */
     public function load($docFile)
     {
         $phpWord = new PhpWord();
         $relationships = $this->readRelationships($docFile);
-
-        $steps = array(
-            array('stepPart' => 'document', 'stepItems' => array(
-                'styles'    => 'Styles',
-                'numbering' => 'Numbering',
-            )),
-            array('stepPart' => 'main', 'stepItems' => array(
-                'officeDocument'      => 'Document',
-                'core-properties'     => 'DocPropsCore',
-                'extended-properties' => 'DocPropsApp',
-                'custom-properties'   => 'DocPropsCustom',
-            )),
-            array('stepPart' => 'document', 'stepItems' => array(
-                'endnotes'  => 'Endnotes',
-                'footnotes' => 'Footnotes',
-                'settings'  => 'Settings',
-            )),
-        );
+        $commentRefs = [];
+
+        $steps = [
+            [
+                'stepPart' => 'document',
+                'stepItems' => [
+                    'styles' => 'Styles',
+                    'numbering' => 'Numbering',
+                ],
+            ],
+            [
+                'stepPart' => 'main',
+                'stepItems' => [
+                    'officeDocument' => 'Document',
+                    'core-properties' => 'DocPropsCore',
+                    'extended-properties' => 'DocPropsApp',
+                    'custom-properties' => 'DocPropsCustom',
+                ],
+            ],
+            [
+                'stepPart' => 'document',
+                'stepItems' => [
+                    'endnotes' => 'Endnotes',
+                    'footnotes' => 'Footnotes',
+                    'settings' => 'Settings',
+                    'comments' => 'Comments',
+                ],
+            ],
+        ];
 
         foreach ($steps as $step) {
             $stepPart = $step['stepPart'];
@@ -70,7 +86,8 @@ public function load($docFile)
                 if (isset($stepItems[$relType])) {
                     $partName = $stepItems[$relType];
                     $xmlFile = $relItem['target'];
-                    $this->readPart($phpWord, $relationships, $partName, $docFile, $xmlFile);
+                    $part = $this->readPart($phpWord, $relationships, $commentRefs, $partName, $docFile, $xmlFile);
+                    $commentRefs = $part->getCommentReferences();
                 }
             }
         }
@@ -81,32 +98,35 @@ public function load($docFile)
     /**
      * Read document part.
      *
-     * @param \PhpOffice\PhpWord\PhpWord $phpWord
-     * @param array $relationships
-     * @param string $partName
-     * @param string $docFile
-     * @param string $xmlFile
+     * @param array<string, array<string, null|AbstractElement>> $commentRefs
      */
-    private function readPart(PhpWord $phpWord, $relationships, $partName, $docFile, $xmlFile)
+    private function readPart(PhpWord $phpWord, array $relationships, array $commentRefs, string $partName, string $docFile, string $xmlFile): AbstractPart
     {
         $partClass = "PhpOffice\\PhpWord\\Reader\\Word2007\\{$partName}";
-        if (class_exists($partClass)) {
-            /** @var \PhpOffice\PhpWord\Reader\Word2007\AbstractPart $part Type hint */
-            $part = new $partClass($docFile, $xmlFile);
-            $part->setRels($relationships);
-            $part->read($phpWord);
+        if (!class_exists($partClass)) {
+            throw new Exception(sprintf('The part "%s" doesn\'t exist', $partClass));
         }
+
+        /** @var AbstractPart $part Type hint */
+        $part = new $partClass($docFile, $xmlFile);
+        $part->setImageLoading($this->hasImageLoading());
+        $part->setRels($relationships);
+        $part->setCommentReferences($commentRefs);
+        $part->read($phpWord);
+
+        return $part;
     }
 
     /**
-     * Read all relationship files
+     * Read all relationship files.
      *
      * @param string $docFile
+     *
      * @return array
      */
     private function readRelationships($docFile)
     {
-        $relationships = array();
+        $relationships = [];
 
         // _rels/.rels
         $relationships['main'] = $this->getRels($docFile, '_rels/.rels');
@@ -115,7 +135,7 @@ private function readRelationships($docFile)
         $wordRelsPath = 'word/_rels/';
         $zip = new ZipArchive();
         if ($zip->open($docFile) === true) {
-            for ($i = 0; $i < $zip->numFiles; $i++) {
+            for ($i = 0; $i < $zip->numFiles; ++$i) {
                 $xmlFile = $zip->getNameIndex($i);
                 if ((substr($xmlFile, 0, strlen($wordRelsPath))) == $wordRelsPath && (substr($xmlFile, -1)) != '/') {
                     $docPart = str_replace('.xml.rels', '', str_replace($wordRelsPath, '', $xmlFile));
@@ -129,11 +149,12 @@ private function readRelationships($docFile)
     }
 
     /**
-     * Get relationship array
+     * Get relationship array.
      *
      * @param string $docFile
      * @param string $xmlFile
      * @param string $targetPrefix
+     *
      * @return array
      */
     private function getRels($docFile, $xmlFile, $targetPrefix = '')
@@ -141,7 +162,7 @@ private function getRels($docFile, $xmlFile, $targetPrefix = '')
         $metaPrefix = 'http://schemas.openxmlformats.org/package/2006/relationships/metadata/';
         $officePrefix = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/';
 
-        $rels = array();
+        $rels = [];
 
         $xmlReader = new XMLReader();
         $xmlReader->getDomFromZip($docFile, $xmlFile);
@@ -163,7 +184,7 @@ private function getRels($docFile, $xmlFile, $targetPrefix = '')
             }
 
             // Push to return array
-            $rels[$rId] = array('type' => $type, 'target' => $target, 'docPart' => $docPart, 'targetMode' => $mode);
+            $rels[$rId] = ['type' => $type, 'target' => $target, 'docPart' => $docPart, 'targetMode' => $mode];
         }
         ksort($rels);
 
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007/AbstractPart.php b/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007/AbstractPart.php
index 729c0b95b0..98a74772cd 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007/AbstractPart.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007/AbstractPart.php
@@ -11,21 +11,27 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Reader\Word2007;
 
+use DateTime;
+use DOMElement;
+use InvalidArgumentException;
+use PhpOffice\Math\Reader\OfficeMathML;
 use PhpOffice\PhpWord\ComplexType\TblWidth as TblWidthComplexType;
 use PhpOffice\PhpWord\Element\AbstractContainer;
+use PhpOffice\PhpWord\Element\AbstractElement;
+use PhpOffice\PhpWord\Element\FormField;
 use PhpOffice\PhpWord\Element\TextRun;
 use PhpOffice\PhpWord\Element\TrackChange;
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\Shared\XMLReader;
 
 /**
- * Abstract part reader
+ * Abstract part reader.
  *
  * This class is inherited by ODText reader
  *
@@ -34,7 +40,7 @@
 abstract class AbstractPart
 {
     /**
-     * Conversion method
+     * Conversion method.
      *
      * @const int
      */
@@ -45,25 +51,39 @@ abstract class AbstractPart
     const READ_SIZE = 'attributeMultiplyByTwo';     // Read special attribute value for Font::$size
 
     /**
-     * Document file
+     * Document file.
      *
      * @var string
      */
     protected $docFile;
 
     /**
-     * XML file
+     * XML file.
      *
      * @var string
      */
     protected $xmlFile;
 
     /**
-     * Part relationships
+     * Part relationships.
      *
      * @var array
      */
-    protected $rels = array();
+    protected $rels = [];
+
+    /**
+     * Comment references.
+     *
+     * @var array<string, array<string, AbstractElement>>
+     */
+    protected $commentRefs = [];
+
+    /**
+     * Image Loading.
+     *
+     * @var bool
+     */
+    protected $imageLoading = true;
 
     /**
      * Read part.
@@ -71,7 +91,7 @@ abstract class AbstractPart
     abstract public function read(PhpWord $phpWord);
 
     /**
-     * Create new instance
+     * Create new instance.
      *
      * @param string $docFile
      * @param string $xmlFile
@@ -87,58 +107,177 @@ public function __construct($docFile, $xmlFile)
      *
      * @param array $value
      */
-    public function setRels($value)
+    public function setRels($value): void
     {
         $this->rels = $value;
     }
 
+    public function setImageLoading(bool $value): self
+    {
+        $this->imageLoading = $value;
+
+        return $this;
+    }
+
+    public function hasImageLoading(): bool
+    {
+        return $this->imageLoading;
+    }
+
+    /**
+     * Get comment references.
+     *
+     * @return array<string, array<string, null|AbstractElement>>
+     */
+    public function getCommentReferences(): array
+    {
+        return $this->commentRefs;
+    }
+
+    /**
+     * Set comment references.
+     *
+     * @param array<string, array<string, null|AbstractElement>> $commentRefs
+     */
+    public function setCommentReferences(array $commentRefs): self
+    {
+        $this->commentRefs = $commentRefs;
+
+        return $this;
+    }
+
+    /**
+     * Set comment reference.
+     */
+    private function setCommentReference(string $type, string $id, AbstractElement $element): self
+    {
+        if (!in_array($type, ['start', 'end'])) {
+            throw new InvalidArgumentException('Type must be "start" or "end"');
+        }
+
+        if (!array_key_exists($id, $this->commentRefs)) {
+            $this->commentRefs[$id] = [
+                'start' => null,
+                'end' => null,
+            ];
+        }
+        $this->commentRefs[$id][$type] = $element;
+
+        return $this;
+    }
+
+    /**
+     * Get comment reference.
+     *
+     * @return array<string, null|AbstractElement>
+     */
+    protected function getCommentReference(string $id): array
+    {
+        if (!array_key_exists($id, $this->commentRefs)) {
+            throw new InvalidArgumentException(sprintf('Comment with id %s isn\'t referenced in document', $id));
+        }
+
+        return $this->commentRefs[$id];
+    }
+
     /**
      * Read w:p.
      *
-     * @param \PhpOffice\PhpWord\Shared\XMLReader $xmlReader
-     * @param \DOMElement $domNode
      * @param \PhpOffice\PhpWord\Element\AbstractContainer $parent
      * @param string $docPart
      *
      * @todo Get font style for preserve text
      */
-    protected function readParagraph(XMLReader $xmlReader, \DOMElement $domNode, $parent, $docPart = 'document')
+    protected function readParagraph(XMLReader $xmlReader, DOMElement $domNode, $parent, $docPart = 'document'): void
     {
         // Paragraph style
-        $paragraphStyle = null;
-        $headingDepth = null;
-        if ($xmlReader->elementExists('w:pPr', $domNode)) {
-            $paragraphStyle = $this->readParagraphStyle($xmlReader, $domNode);
-            $headingDepth = $this->getHeadingDepth($paragraphStyle);
-        }
+        $paragraphStyle = $xmlReader->elementExists('w:pPr', $domNode) ? $this->readParagraphStyle($xmlReader, $domNode) : null;
 
-        // PreserveText
-        if ($xmlReader->elementExists('w:r/w:instrText', $domNode)) {
+        if ($xmlReader->elementExists('w:r/w:fldChar/w:ffData', $domNode)) {
+            // FormField
+            $partOfFormField = false;
+            $formNodes = [];
+            $formType = null;
+            $textRunContainers = $xmlReader->countElements('w:r|w:ins|w:del|w:hyperlink|w:smartTag', $domNode);
+            if ($textRunContainers > 0) {
+                $nodes = $xmlReader->getElements('*', $domNode);
+                $paragraph = $parent->addTextRun($paragraphStyle);
+                foreach ($nodes as $node) {
+                    if ($xmlReader->elementExists('w:fldChar/w:ffData', $node)) {
+                        $partOfFormField = true;
+                        $formNodes[] = $node;
+                        if ($xmlReader->elementExists('w:fldChar/w:ffData/w:ddList', $node)) {
+                            $formType = 'dropdown';
+                        } elseif ($xmlReader->elementExists('w:fldChar/w:ffData/w:textInput', $node)) {
+                            $formType = 'textinput';
+                        } elseif ($xmlReader->elementExists('w:fldChar/w:ffData/w:checkBox', $node)) {
+                            $formType = 'checkbox';
+                        }
+                    } elseif ($partOfFormField &&
+                        $xmlReader->elementExists('w:fldChar', $node) &&
+                        'end' == $xmlReader->getAttribute('w:fldCharType', $node, 'w:fldChar')
+                    ) {
+                        $formNodes[] = $node;
+                        $partOfFormField = false;
+                        // Process the form fields
+                        $this->readFormField($xmlReader, $formNodes, $paragraph, $paragraphStyle, $formType);
+                    } elseif ($partOfFormField) {
+                        $formNodes[] = $node;
+                    } else {
+                        // normal runs
+                        $this->readRun($xmlReader, $node, $paragraph, $docPart, $paragraphStyle);
+                    }
+                }
+            }
+        } elseif ($xmlReader->elementExists('w:r/w:instrText', $domNode)) {
+            // PreserveText
             $ignoreText = false;
             $textContent = '';
             $fontStyle = $this->readFontStyle($xmlReader, $domNode);
             $nodes = $xmlReader->getElements('w:r', $domNode);
             foreach ($nodes as $node) {
-                $instrText = $xmlReader->getValue('w:instrText', $node);
-                if ($xmlReader->elementExists('w:fldChar', $node)) {
-                    $fldCharType = $xmlReader->getAttribute('w:fldCharType', $node, 'w:fldChar');
-                    if ('begin' == $fldCharType) {
-                        $ignoreText = true;
-                    } elseif ('end' == $fldCharType) {
-                        $ignoreText = false;
-                    }
+                if ($xmlReader->elementExists('w:lastRenderedPageBreak', $node)) {
+                    $parent->addPageBreak();
                 }
-                if (!is_null($instrText)) {
+                $instrText = $xmlReader->getValue('w:instrText', $node);
+                if (null !== $instrText) {
                     $textContent .= '{' . $instrText . '}';
                 } else {
+                    if ($xmlReader->elementExists('w:fldChar', $node)) {
+                        $fldCharType = $xmlReader->getAttribute('w:fldCharType', $node, 'w:fldChar');
+                        if ('begin' == $fldCharType) {
+                            $ignoreText = true;
+                        } elseif ('end' == $fldCharType) {
+                            $ignoreText = false;
+                        }
+                    }
                     if (false === $ignoreText) {
                         $textContent .= $xmlReader->getValue('w:t', $node);
                     }
                 }
             }
             $parent->addPreserveText(htmlspecialchars($textContent, ENT_QUOTES, 'UTF-8'), $fontStyle, $paragraphStyle);
-        } elseif ($xmlReader->elementExists('w:pPr/w:numPr', $domNode)) {
-            // List item
+
+            return;
+        }
+
+        // Formula
+        $xmlReader->registerNamespace('m', 'http://schemas.openxmlformats.org/officeDocument/2006/math');
+        if ($xmlReader->elementExists('m:oMath', $domNode)) {
+            $mathElement = $xmlReader->getElement('m:oMath', $domNode);
+            $mathXML = $mathElement->ownerDocument->saveXML($mathElement);
+            if (is_string($mathXML)) {
+                $reader = new OfficeMathML();
+                $math = $reader->read($mathXML);
+
+                $parent->addFormula($math);
+            }
+
+            return;
+        }
+
+        // List item
+        if ($xmlReader->elementExists('w:pPr/w:numPr', $domNode)) {
             $numId = $xmlReader->getAttribute('w:val', $domNode, 'w:pPr/w:numPr/w:numId');
             $levelId = $xmlReader->getAttribute('w:val', $domNode, 'w:pPr/w:numPr/w:ilvl');
             $nodes = $xmlReader->getElements('*', $domNode);
@@ -148,10 +287,15 @@ protected function readParagraph(XMLReader $xmlReader, \DOMElement $domNode, $pa
             foreach ($nodes as $node) {
                 $this->readRun($xmlReader, $node, $listItemRun, $docPart, $paragraphStyle);
             }
-        } elseif ($headingDepth !== null) {
-            // Heading or Title
+
+            return;
+        }
+
+        // Heading or Title
+        $headingDepth = $xmlReader->elementExists('w:pPr', $domNode) ? $this->getHeadingDepth($paragraphStyle) : null;
+        if ($headingDepth !== null) {
             $textContent = null;
-            $nodes = $xmlReader->getElements('w:r', $domNode);
+            $nodes = $xmlReader->getElements('w:r|w:hyperlink', $domNode);
             if ($nodes->length === 1) {
                 $textContent = htmlspecialchars($xmlReader->getValue('w:t', $nodes->item(0)), ENT_QUOTES, 'UTF-8');
             } else {
@@ -161,35 +305,139 @@ protected function readParagraph(XMLReader $xmlReader, \DOMElement $domNode, $pa
                 }
             }
             $parent->addTitle($textContent, $headingDepth);
+
+            return;
+        }
+
+        // Text and TextRun
+        $textRunContainers = $xmlReader->countElements('w:r|w:ins|w:del|w:hyperlink|w:smartTag|w:commentReference|w:commentRangeStart|w:commentRangeEnd', $domNode);
+        if (0 === $textRunContainers) {
+            $parent->addTextBreak(1, $paragraphStyle);
         } else {
-            // Text and TextRun
-            $textRunContainers = $xmlReader->countElements('w:r|w:ins|w:del|w:hyperlink|w:smartTag', $domNode);
-            if (0 === $textRunContainers) {
-                $parent->addTextBreak(null, $paragraphStyle);
-            } else {
-                $nodes = $xmlReader->getElements('*', $domNode);
-                $paragraph = $parent->addTextRun($paragraphStyle);
-                foreach ($nodes as $node) {
-                    $this->readRun($xmlReader, $node, $paragraph, $docPart, $paragraphStyle);
+            $nodes = $xmlReader->getElements('*', $domNode);
+            $paragraph = $parent->addTextRun($paragraphStyle);
+            foreach ($nodes as $node) {
+                $this->readRun($xmlReader, $node, $paragraph, $docPart, $paragraphStyle);
+            }
+        }
+    }
+
+    /**
+     * @param DOMElement[] $domNodes
+     * @param AbstractContainer $parent
+     * @param mixed $paragraphStyle
+     * @param string $formType
+     */
+    private function readFormField(XMLReader $xmlReader, array $domNodes, $parent, $paragraphStyle, $formType): void
+    {
+        if (!in_array($formType, ['textinput', 'checkbox', 'dropdown'])) {
+            return;
+        }
+
+        $formField = $parent->addFormField($formType, null, $paragraphStyle);
+        $ffData = $xmlReader->getElement('w:fldChar/w:ffData', $domNodes[0]);
+
+        foreach ($xmlReader->getElements('*', $ffData) as $node) {
+            /** @var DOMElement $node */
+            switch ($node->localName) {
+                case 'name':
+                    $formField->setName($node->getAttribute('w:val'));
+
+                    break;
+                case 'ddList':
+                    $listEntries = [];
+                    foreach ($xmlReader->getElements('*', $node) as $ddListNode) {
+                        switch ($ddListNode->localName) {
+                            case 'result':
+                                $formField->setValue($xmlReader->getAttribute('w:val', $ddListNode));
+
+                                break;
+                            case 'default':
+                                $formField->setDefault($xmlReader->getAttribute('w:val', $ddListNode));
+
+                                break;
+                            case 'listEntry':
+                                $listEntries[] = $xmlReader->getAttribute('w:val', $ddListNode);
+
+                                break;
+                        }
+                    }
+                    $formField->setEntries($listEntries);
+                    if (null !== $formField->getValue()) {
+                        $formField->setText($listEntries[$formField->getValue()]);
+                    }
+
+                    break;
+                case 'textInput':
+                    foreach ($xmlReader->getElements('*', $node) as $ddListNode) {
+                        switch ($ddListNode->localName) {
+                            case 'default':
+                                $formField->setDefault($xmlReader->getAttribute('w:val', $ddListNode));
+
+                                break;
+                            case 'format':
+                            case 'maxLength':
+                                break;
+                        }
+                    }
+
+                    break;
+                case 'checkBox':
+                    foreach ($xmlReader->getElements('*', $node) as $ddListNode) {
+                        switch ($ddListNode->localName) {
+                            case 'default':
+                                $formField->setDefault($xmlReader->getAttribute('w:val', $ddListNode));
+
+                                break;
+                            case 'checked':
+                                $formField->setValue($xmlReader->getAttribute('w:val', $ddListNode));
+
+                                break;
+                            case 'size':
+                            case 'sizeAuto':
+                                break;
+                        }
+                    }
+
+                    break;
+            }
+        }
+
+        if ('textinput' == $formType) {
+            $ignoreText = true;
+            $textContent = '';
+            foreach ($domNodes as $node) {
+                if ($xmlReader->elementExists('w:fldChar', $node)) {
+                    $fldCharType = $xmlReader->getAttribute('w:fldCharType', $node, 'w:fldChar');
+                    if ('separate' == $fldCharType) {
+                        $ignoreText = false;
+                    } elseif ('end' == $fldCharType) {
+                        $ignoreText = true;
+                    }
+                }
+
+                if (false === $ignoreText) {
+                    $textContent .= $xmlReader->getValue('w:t', $node);
                 }
             }
+            $formField->setValue(htmlspecialchars($textContent, ENT_QUOTES, 'UTF-8'));
+            $formField->setText(htmlspecialchars($textContent, ENT_QUOTES, 'UTF-8'));
         }
     }
 
     /**
-     * Returns the depth of the Heading, returns 0 for a Title
+     * Returns the depth of the Heading, returns 0 for a Title.
      *
-     * @param array $paragraphStyle
-     * @return number|null
+     * @return null|number
      */
-    private function getHeadingDepth(array $paragraphStyle = null)
+    private function getHeadingDepth(?array $paragraphStyle = null)
     {
         if (is_array($paragraphStyle) && isset($paragraphStyle['styleName'])) {
             if ('Title' === $paragraphStyle['styleName']) {
                 return 0;
             }
 
-            $headingMatches = array();
+            $headingMatches = [];
             preg_match('/Heading(\d)/', $paragraphStyle['styleName'], $headingMatches);
             if (!empty($headingMatches)) {
                 return $headingMatches[1];
@@ -202,17 +450,15 @@ private function getHeadingDepth(array $paragraphStyle = null)
     /**
      * Read w:r.
      *
-     * @param \PhpOffice\PhpWord\Shared\XMLReader $xmlReader
-     * @param \DOMElement $domNode
      * @param \PhpOffice\PhpWord\Element\AbstractContainer $parent
      * @param string $docPart
      * @param mixed $paragraphStyle
      *
      * @todo Footnote paragraph style
      */
-    protected function readRun(XMLReader $xmlReader, \DOMElement $domNode, $parent, $docPart, $paragraphStyle = null)
+    protected function readRun(XMLReader $xmlReader, DOMElement $domNode, $parent, $docPart, $paragraphStyle = null): void
     {
-        if (in_array($domNode->nodeName, array('w:ins', 'w:del', 'w:smartTag', 'w:hyperlink'))) {
+        if (in_array($domNode->nodeName, ['w:ins', 'w:del', 'w:smartTag', 'w:hyperlink', 'w:commentReference'])) {
             $nodes = $xmlReader->getElements('*', $domNode);
             foreach ($nodes as $node) {
                 $this->readRun($xmlReader, $node, $parent, $docPart, $paragraphStyle);
@@ -224,19 +470,27 @@ protected function readRun(XMLReader $xmlReader, \DOMElement $domNode, $parent,
                 $this->readRunChild($xmlReader, $node, $parent, $docPart, $paragraphStyle, $fontStyle);
             }
         }
+
+        if ($xmlReader->elementExists('.//*["commentReference"=local-name()]', $domNode)) {
+            $node = iterator_to_array($xmlReader->getElements('.//*["commentReference"=local-name()]', $domNode))[0];
+            $attributeIdentifier = $node->attributes->getNamedItem('id');
+            if ($attributeIdentifier) {
+                $id = $attributeIdentifier->nodeValue;
+
+                $this->setCommentReference('start', $id, $parent->getElement($parent->countElements() - 1));
+                $this->setCommentReference('end', $id, $parent->getElement($parent->countElements() - 1));
+            }
+        }
     }
 
     /**
-     * Parses nodes under w:r
+     * Parses nodes under w:r.
      *
-     * @param XMLReader $xmlReader
-     * @param \DOMElement $node
-     * @param AbstractContainer $parent
      * @param string $docPart
      * @param mixed $paragraphStyle
      * @param mixed $fontStyle
      */
-    protected function readRunChild(XMLReader $xmlReader, \DOMElement $node, AbstractContainer $parent, $docPart, $paragraphStyle = null, $fontStyle = null)
+    protected function readRunChild(XMLReader $xmlReader, DOMElement $node, AbstractContainer $parent, $docPart, $paragraphStyle = null, $fontStyle = null): void
     {
         $runParent = $node->parentNode->parentNode;
         if ($node->nodeName == 'w:footnoteReference') {
@@ -253,7 +507,7 @@ protected function readRunChild(XMLReader $xmlReader, \DOMElement $node, Abstrac
             // Image
             $rId = $xmlReader->getAttribute('r:id', $node, 'v:shape/v:imagedata');
             $target = $this->getMediaTarget($docPart, $rId);
-            if (!is_null($target)) {
+            if ($this->hasImageLoading() && null !== $target) {
                 if ('External' == $this->getTargetMode($docPart, $rId)) {
                     $imageSource = $target;
                 } else {
@@ -275,7 +529,7 @@ protected function readRunChild(XMLReader $xmlReader, \DOMElement $node, Abstrac
                 $embedId = $xmlReader->getAttribute('r:embed', $node, 'wp:anchor/a:graphic/a:graphicData/pic:pic/pic:blipFill/a:blip');
             }
             $target = $this->getMediaTarget($docPart, $embedId);
-            if (!is_null($target)) {
+            if ($this->hasImageLoading() && null !== $target) {
                 $imageSource = "zip://{$this->docFile}#{$target}";
                 $parent->addImage($imageSource, null, false, $name);
             }
@@ -284,7 +538,7 @@ protected function readRunChild(XMLReader $xmlReader, \DOMElement $node, Abstrac
             $rId = $xmlReader->getAttribute('r:id', $node, 'o:OLEObject');
             // $rIdIcon = $xmlReader->getAttribute('r:id', $domNode, 'w:object/v:shape/v:imagedata');
             $target = $this->getMediaTarget($docPart, $rId);
-            if (!is_null($target)) {
+            if (null !== $target) {
                 $textContent = "&lt;Object: {$target}>";
                 $parent->addText($textContent, $fontStyle, $paragraphStyle);
             }
@@ -312,7 +566,7 @@ protected function readRunChild(XMLReader $xmlReader, \DOMElement $node, Abstrac
             if ($runParent->nodeName == 'w:hyperlink') {
                 $rId = $xmlReader->getAttribute('r:id', $runParent);
                 $target = $this->getMediaTarget($docPart, $rId);
-                if (!is_null($target)) {
+                if (null !== $target) {
                     $parent->addLink($target, $textContent, $fontStyle, $paragraphStyle);
                 } else {
                     $parent->addText($textContent, $fontStyle, $paragraphStyle);
@@ -320,25 +574,26 @@ protected function readRunChild(XMLReader $xmlReader, \DOMElement $node, Abstrac
             } else {
                 /** @var AbstractElement $element */
                 $element = $parent->addText($textContent, $fontStyle, $paragraphStyle);
-                if (in_array($runParent->nodeName, array('w:ins', 'w:del'))) {
+                if (in_array($runParent->nodeName, ['w:ins', 'w:del'])) {
                     $type = ($runParent->nodeName == 'w:del') ? TrackChange::DELETED : TrackChange::INSERTED;
                     $author = $runParent->getAttribute('w:author');
-                    $date = \DateTime::createFromFormat('Y-m-d\TH:i:s\Z', $runParent->getAttribute('w:date'));
+                    $date = DateTime::createFromFormat('Y-m-d\TH:i:s\Z', $runParent->getAttribute('w:date'));
+                    $date = $date instanceof DateTime ? $date : null;
                     $element->setChangeInfo($type, $author, $date);
                 }
             }
+        } elseif ($node->nodeName == 'w:softHyphen') {
+            $element = $parent->addText("\u{200c}", $fontStyle, $paragraphStyle);
         }
     }
 
     /**
      * Read w:tbl.
      *
-     * @param \PhpOffice\PhpWord\Shared\XMLReader $xmlReader
-     * @param \DOMElement $domNode
      * @param mixed $parent
      * @param string $docPart
      */
-    protected function readTable(XMLReader $xmlReader, \DOMElement $domNode, $parent, $docPart = 'document')
+    protected function readTable(XMLReader $xmlReader, DOMElement $domNode, $parent, $docPart = 'document'): void
     {
         // Table style
         $tblStyle = null;
@@ -356,11 +611,11 @@ protected function readTable(XMLReader $xmlReader, \DOMElement $domNode, $parent
                 $rowHeight = $xmlReader->getAttribute('w:val', $tblNode, 'w:trPr/w:trHeight');
                 $rowHRule = $xmlReader->getAttribute('w:hRule', $tblNode, 'w:trPr/w:trHeight');
                 $rowHRule = $rowHRule == 'exact';
-                $rowStyle = array(
-                    'tblHeader'   => $xmlReader->elementExists('w:trPr/w:tblHeader', $tblNode),
-                    'cantSplit'   => $xmlReader->elementExists('w:trPr/w:cantSplit', $tblNode),
+                $rowStyle = [
+                    'tblHeader' => $xmlReader->elementExists('w:trPr/w:tblHeader', $tblNode),
+                    'cantSplit' => $xmlReader->elementExists('w:trPr/w:cantSplit', $tblNode),
                     'exactHeight' => $rowHRule,
-                );
+                ];
 
                 $row = $table->addRow($rowHeight, $rowStyle);
                 $rowNodes = $xmlReader->getElements('*', $tblNode);
@@ -370,9 +625,8 @@ protected function readTable(XMLReader $xmlReader, \DOMElement $domNode, $parent
                     } elseif ('w:tc' == $rowNode->nodeName) { // Cell
                         $cellWidth = $xmlReader->getAttribute('w:w', $rowNode, 'w:tcPr/w:tcW');
                         $cellStyle = null;
-                        $cellStyleNode = $xmlReader->getElement('w:tcPr', $rowNode);
-                        if (!is_null($cellStyleNode)) {
-                            $cellStyle = $this->readCellStyle($xmlReader, $cellStyleNode);
+                        if ($xmlReader->elementExists('w:tcPr', $rowNode)) {
+                            $cellStyle = $this->readCellStyle($xmlReader, $rowNode);
                         }
 
                         $cell = $row->addCell($cellWidth, $cellStyle);
@@ -380,6 +634,8 @@ protected function readTable(XMLReader $xmlReader, \DOMElement $domNode, $parent
                         foreach ($cellNodes as $cellNode) {
                             if ('w:p' == $cellNode->nodeName) { // Paragraph
                                 $this->readParagraph($xmlReader, $cellNode, $cell, $docPart);
+                            } elseif ($cellNode->nodeName == 'w:tbl') { // Table
+                                $this->readTable($xmlReader, $cellNode, $cell, $docPart);
                             }
                         }
                     }
@@ -391,48 +647,56 @@ protected function readTable(XMLReader $xmlReader, \DOMElement $domNode, $parent
     /**
      * Read w:pPr.
      *
-     * @param \PhpOffice\PhpWord\Shared\XMLReader $xmlReader
-     * @param \DOMElement $domNode
-     * @return array|null
+     * @return null|array
      */
-    protected function readParagraphStyle(XMLReader $xmlReader, \DOMElement $domNode)
+    protected function readParagraphStyle(XMLReader $xmlReader, DOMElement $domNode)
     {
         if (!$xmlReader->elementExists('w:pPr', $domNode)) {
             return null;
         }
 
         $styleNode = $xmlReader->getElement('w:pPr', $domNode);
-        $styleDefs = array(
-            'styleName'           => array(self::READ_VALUE, array('w:pStyle', 'w:name')),
-            'alignment'           => array(self::READ_VALUE, 'w:jc'),
-            'basedOn'             => array(self::READ_VALUE, 'w:basedOn'),
-            'next'                => array(self::READ_VALUE, 'w:next'),
-            'indent'              => array(self::READ_VALUE, 'w:ind', 'w:left'),
-            'hanging'             => array(self::READ_VALUE, 'w:ind', 'w:hanging'),
-            'spaceAfter'          => array(self::READ_VALUE, 'w:spacing', 'w:after'),
-            'spaceBefore'         => array(self::READ_VALUE, 'w:spacing', 'w:before'),
-            'widowControl'        => array(self::READ_FALSE, 'w:widowControl'),
-            'keepNext'            => array(self::READ_TRUE,  'w:keepNext'),
-            'keepLines'           => array(self::READ_TRUE,  'w:keepLines'),
-            'pageBreakBefore'     => array(self::READ_TRUE,  'w:pageBreakBefore'),
-            'contextualSpacing'   => array(self::READ_TRUE,  'w:contextualSpacing'),
-            'bidi'                => array(self::READ_TRUE,  'w:bidi'),
-            'suppressAutoHyphens' => array(self::READ_TRUE,  'w:suppressAutoHyphens'),
-        );
+        $styleDefs = [
+            'styleName' => [self::READ_VALUE, ['w:pStyle', 'w:name']],
+            'alignment' => [self::READ_VALUE, 'w:jc'],
+            'basedOn' => [self::READ_VALUE, 'w:basedOn'],
+            'next' => [self::READ_VALUE, 'w:next'],
+            'indent' => [self::READ_VALUE, 'w:ind', 'w:left'],
+            'hanging' => [self::READ_VALUE, 'w:ind', 'w:hanging'],
+            'spaceAfter' => [self::READ_VALUE, 'w:spacing', 'w:after'],
+            'spaceBefore' => [self::READ_VALUE, 'w:spacing', 'w:before'],
+            'widowControl' => [self::READ_FALSE, 'w:widowControl'],
+            'keepNext' => [self::READ_TRUE,  'w:keepNext'],
+            'keepLines' => [self::READ_TRUE,  'w:keepLines'],
+            'pageBreakBefore' => [self::READ_TRUE,  'w:pageBreakBefore'],
+            'contextualSpacing' => [self::READ_TRUE,  'w:contextualSpacing'],
+            'bidi' => [self::READ_TRUE,  'w:bidi'],
+            'suppressAutoHyphens' => [self::READ_TRUE,  'w:suppressAutoHyphens'],
+            'borderTopStyle' => [self::READ_VALUE, 'w:pBdr/w:top'],
+            'borderTopColor' => [self::READ_VALUE, 'w:pBdr/w:top', 'w:color'],
+            'borderTopSize' => [self::READ_VALUE, 'w:pBdr/w:top', 'w:sz'],
+            'borderRightStyle' => [self::READ_VALUE, 'w:pBdr/w:right'],
+            'borderRightColor' => [self::READ_VALUE, 'w:pBdr/w:right', 'w:color'],
+            'borderRightSize' => [self::READ_VALUE, 'w:pBdr/w:right', 'w:sz'],
+            'borderBottomStyle' => [self::READ_VALUE, 'w:pBdr/w:bottom'],
+            'borderBottomColor' => [self::READ_VALUE, 'w:pBdr/w:bottom', 'w:color'],
+            'borderBottomSize' => [self::READ_VALUE, 'w:pBdr/w:bottom', 'w:sz'],
+            'borderLeftStyle' => [self::READ_VALUE, 'w:pBdr/w:left'],
+            'borderLeftColor' => [self::READ_VALUE, 'w:pBdr/w:left', 'w:color'],
+            'borderLeftSize' => [self::READ_VALUE, 'w:pBdr/w:left', 'w:sz'],
+        ];
 
         return $this->readStyleDefs($xmlReader, $styleNode, $styleDefs);
     }
 
     /**
-     * Read w:rPr
+     * Read w:rPr.
      *
-     * @param \PhpOffice\PhpWord\Shared\XMLReader $xmlReader
-     * @param \DOMElement $domNode
-     * @return array|null
+     * @return null|array
      */
-    protected function readFontStyle(XMLReader $xmlReader, \DOMElement $domNode)
+    protected function readFontStyle(XMLReader $xmlReader, DOMElement $domNode)
     {
-        if (is_null($domNode)) {
+        if (null === $domNode) {
             return null;
         }
         // Hyperlink has an extra w:r child
@@ -444,64 +708,63 @@ protected function readFontStyle(XMLReader $xmlReader, \DOMElement $domNode)
         }
 
         $styleNode = $xmlReader->getElement('w:rPr', $domNode);
-        $styleDefs = array(
-            'styleName'           => array(self::READ_VALUE, 'w:rStyle'),
-            'name'                => array(self::READ_VALUE, 'w:rFonts', array('w:ascii', 'w:hAnsi', 'w:eastAsia', 'w:cs')),
-            'hint'                => array(self::READ_VALUE, 'w:rFonts', 'w:hint'),
-            'size'                => array(self::READ_SIZE,  array('w:sz', 'w:szCs')),
-            'color'               => array(self::READ_VALUE, 'w:color'),
-            'underline'           => array(self::READ_VALUE, 'w:u'),
-            'bold'                => array(self::READ_TRUE,  'w:b'),
-            'italic'              => array(self::READ_TRUE,  'w:i'),
-            'strikethrough'       => array(self::READ_TRUE,  'w:strike'),
-            'doubleStrikethrough' => array(self::READ_TRUE,  'w:dstrike'),
-            'smallCaps'           => array(self::READ_TRUE,  'w:smallCaps'),
-            'allCaps'             => array(self::READ_TRUE,  'w:caps'),
-            'superScript'         => array(self::READ_EQUAL, 'w:vertAlign', 'w:val', 'superscript'),
-            'subScript'           => array(self::READ_EQUAL, 'w:vertAlign', 'w:val', 'subscript'),
-            'fgColor'             => array(self::READ_VALUE, 'w:highlight'),
-            'rtl'                 => array(self::READ_TRUE,  'w:rtl'),
-            'lang'                => array(self::READ_VALUE, 'w:lang'),
-            'position'            => array(self::READ_VALUE, 'w:position'),
-            'hidden'              => array(self::READ_TRUE,  'w:vanish'),
-        );
+        $styleDefs = [
+            'styleName' => [self::READ_VALUE, 'w:rStyle'],
+            'name' => [self::READ_VALUE, 'w:rFonts', ['w:ascii', 'w:hAnsi', 'w:eastAsia', 'w:cs']],
+            'hint' => [self::READ_VALUE, 'w:rFonts', 'w:hint'],
+            'size' => [self::READ_SIZE,  ['w:sz', 'w:szCs']],
+            'color' => [self::READ_VALUE, 'w:color'],
+            'underline' => [self::READ_VALUE, 'w:u'],
+            'bold' => [self::READ_TRUE,  'w:b'],
+            'italic' => [self::READ_TRUE,  'w:i'],
+            'strikethrough' => [self::READ_TRUE,  'w:strike'],
+            'doubleStrikethrough' => [self::READ_TRUE,  'w:dstrike'],
+            'smallCaps' => [self::READ_TRUE,  'w:smallCaps'],
+            'allCaps' => [self::READ_TRUE,  'w:caps'],
+            'superScript' => [self::READ_EQUAL, 'w:vertAlign', 'w:val', 'superscript'],
+            'subScript' => [self::READ_EQUAL, 'w:vertAlign', 'w:val', 'subscript'],
+            'fgColor' => [self::READ_VALUE, 'w:highlight'],
+            'rtl' => [self::READ_TRUE,  'w:rtl'],
+            'lang' => [self::READ_VALUE, 'w:lang'],
+            'position' => [self::READ_VALUE, 'w:position'],
+            'hidden' => [self::READ_TRUE,  'w:vanish'],
+        ];
 
         return $this->readStyleDefs($xmlReader, $styleNode, $styleDefs);
     }
 
     /**
-     * Read w:tblPr
+     * Read w:tblPr.
+     *
+     * @return null|array|string
      *
-     * @param \PhpOffice\PhpWord\Shared\XMLReader $xmlReader
-     * @param \DOMElement $domNode
-     * @return string|array|null
      * @todo Capture w:tblStylePr w:type="firstRow"
      */
-    protected function readTableStyle(XMLReader $xmlReader, \DOMElement $domNode)
+    protected function readTableStyle(XMLReader $xmlReader, DOMElement $domNode)
     {
         $style = null;
-        $margins = array('top', 'left', 'bottom', 'right');
-        $borders = array_merge($margins, array('insideH', 'insideV'));
+        $margins = ['top', 'left', 'bottom', 'right'];
+        $borders = array_merge($margins, ['insideH', 'insideV']);
 
         if ($xmlReader->elementExists('w:tblPr', $domNode)) {
             if ($xmlReader->elementExists('w:tblPr/w:tblStyle', $domNode)) {
                 $style = $xmlReader->getAttribute('w:val', $domNode, 'w:tblPr/w:tblStyle');
             } else {
                 $styleNode = $xmlReader->getElement('w:tblPr', $domNode);
-                $styleDefs = array();
+                $styleDefs = [];
                 foreach ($margins as $side) {
                     $ucfSide = ucfirst($side);
-                    $styleDefs["cellMargin$ucfSide"] = array(self::READ_VALUE, "w:tblCellMar/w:$side", 'w:w');
+                    $styleDefs["cellMargin$ucfSide"] = [self::READ_VALUE, "w:tblCellMar/w:$side", 'w:w'];
                 }
                 foreach ($borders as $side) {
                     $ucfSide = ucfirst($side);
-                    $styleDefs["border{$ucfSide}Size"] = array(self::READ_VALUE, "w:tblBorders/w:$side", 'w:sz');
-                    $styleDefs["border{$ucfSide}Color"] = array(self::READ_VALUE, "w:tblBorders/w:$side", 'w:color');
-                    $styleDefs["border{$ucfSide}Style"] = array(self::READ_VALUE, "w:tblBorders/w:$side", 'w:val');
+                    $styleDefs["border{$ucfSide}Size"] = [self::READ_VALUE, "w:tblBorders/w:$side", 'w:sz'];
+                    $styleDefs["border{$ucfSide}Color"] = [self::READ_VALUE, "w:tblBorders/w:$side", 'w:color'];
+                    $styleDefs["border{$ucfSide}Style"] = [self::READ_VALUE, "w:tblBorders/w:$side", 'w:val'];
                 }
-                $styleDefs['layout'] = array(self::READ_VALUE, 'w:tblLayout', 'w:type');
-                $styleDefs['bidiVisual'] = array(self::READ_TRUE, 'w:bidiVisual');
-                $styleDefs['cellSpacing'] = array(self::READ_VALUE, 'w:tblCellSpacing', 'w:w');
+                $styleDefs['layout'] = [self::READ_VALUE, 'w:tblLayout', 'w:type'];
+                $styleDefs['bidiVisual'] = [self::READ_TRUE, 'w:bidiVisual'];
+                $styleDefs['cellSpacing'] = [self::READ_VALUE, 'w:tblCellSpacing', 'w:w'];
                 $style = $this->readStyleDefs($xmlReader, $styleNode, $styleDefs);
 
                 $tablePositionNode = $xmlReader->getElement('w:tblpPr', $styleNode);
@@ -520,77 +783,87 @@ protected function readTableStyle(XMLReader $xmlReader, \DOMElement $domNode)
     }
 
     /**
-     * Read w:tblpPr
+     * Read w:tblpPr.
      *
-     * @param \PhpOffice\PhpWord\Shared\XMLReader $xmlReader
-     * @param \DOMElement $domNode
      * @return array
      */
-    private function readTablePosition(XMLReader $xmlReader, \DOMElement $domNode)
+    private function readTablePosition(XMLReader $xmlReader, DOMElement $domNode)
     {
-        $styleDefs = array(
-            'leftFromText'   => array(self::READ_VALUE, '.', 'w:leftFromText'),
-            'rightFromText'  => array(self::READ_VALUE, '.', 'w:rightFromText'),
-            'topFromText'    => array(self::READ_VALUE, '.', 'w:topFromText'),
-            'bottomFromText' => array(self::READ_VALUE, '.', 'w:bottomFromText'),
-            'vertAnchor'     => array(self::READ_VALUE, '.', 'w:vertAnchor'),
-            'horzAnchor'     => array(self::READ_VALUE, '.', 'w:horzAnchor'),
-            'tblpXSpec'      => array(self::READ_VALUE, '.', 'w:tblpXSpec'),
-            'tblpX'          => array(self::READ_VALUE, '.', 'w:tblpX'),
-            'tblpYSpec'      => array(self::READ_VALUE, '.', 'w:tblpYSpec'),
-            'tblpY'          => array(self::READ_VALUE, '.', 'w:tblpY'),
-        );
+        $styleDefs = [
+            'leftFromText' => [self::READ_VALUE, '.', 'w:leftFromText'],
+            'rightFromText' => [self::READ_VALUE, '.', 'w:rightFromText'],
+            'topFromText' => [self::READ_VALUE, '.', 'w:topFromText'],
+            'bottomFromText' => [self::READ_VALUE, '.', 'w:bottomFromText'],
+            'vertAnchor' => [self::READ_VALUE, '.', 'w:vertAnchor'],
+            'horzAnchor' => [self::READ_VALUE, '.', 'w:horzAnchor'],
+            'tblpXSpec' => [self::READ_VALUE, '.', 'w:tblpXSpec'],
+            'tblpX' => [self::READ_VALUE, '.', 'w:tblpX'],
+            'tblpYSpec' => [self::READ_VALUE, '.', 'w:tblpYSpec'],
+            'tblpY' => [self::READ_VALUE, '.', 'w:tblpY'],
+        ];
 
         return $this->readStyleDefs($xmlReader, $domNode, $styleDefs);
     }
 
     /**
-     * Read w:tblInd
+     * Read w:tblInd.
      *
-     * @param \PhpOffice\PhpWord\Shared\XMLReader $xmlReader
-     * @param \DOMElement $domNode
      * @return TblWidthComplexType
      */
-    private function readTableIndent(XMLReader $xmlReader, \DOMElement $domNode)
+    private function readTableIndent(XMLReader $xmlReader, DOMElement $domNode)
     {
-        $styleDefs = array(
-            'value' => array(self::READ_VALUE, '.', 'w:w'),
-            'type'  => array(self::READ_VALUE, '.', 'w:type'),
-        );
+        $styleDefs = [
+            'value' => [self::READ_VALUE, '.', 'w:w'],
+            'type' => [self::READ_VALUE, '.', 'w:type'],
+        ];
         $styleDefs = $this->readStyleDefs($xmlReader, $domNode, $styleDefs);
 
         return new TblWidthComplexType((int) $styleDefs['value'], $styleDefs['type']);
     }
 
     /**
-     * Read w:tcPr
+     * Read w:tcPr.
      *
-     * @param \PhpOffice\PhpWord\Shared\XMLReader $xmlReader
-     * @param \DOMElement $domNode
-     * @return array
+     * @return null|array
      */
-    private function readCellStyle(XMLReader $xmlReader, \DOMElement $domNode)
+    private function readCellStyle(XMLReader $xmlReader, DOMElement $domNode)
     {
-        $styleDefs = array(
-            'valign'        => array(self::READ_VALUE, 'w:vAlign'),
-            'textDirection' => array(self::READ_VALUE, 'w:textDirection'),
-            'gridSpan'      => array(self::READ_VALUE, 'w:gridSpan'),
-            'vMerge'        => array(self::READ_VALUE, 'w:vMerge'),
-            'bgColor'       => array(self::READ_VALUE, 'w:shd', 'w:fill'),
-        );
+        $styleDefs = [
+            'valign' => [self::READ_VALUE, 'w:vAlign'],
+            'textDirection' => [self::READ_VALUE, 'w:textDirection'],
+            'gridSpan' => [self::READ_VALUE, 'w:gridSpan'],
+            'vMerge' => [self::READ_VALUE, 'w:vMerge', null, null, 'continue'],
+            'bgColor' => [self::READ_VALUE, 'w:shd', 'w:fill'],
+            'noWrap' => [self::READ_VALUE, 'w:noWrap', null, null, true],
+        ];
+        $style = null;
 
-        return $this->readStyleDefs($xmlReader, $domNode, $styleDefs);
+        if ($xmlReader->elementExists('w:tcPr', $domNode)) {
+            $styleNode = $xmlReader->getElement('w:tcPr', $domNode);
+
+            $borders = ['top', 'left', 'bottom', 'right'];
+            foreach ($borders as $side) {
+                $ucfSide = ucfirst($side);
+
+                $styleDefs['border' . $ucfSide . 'Size'] = [self::READ_VALUE, 'w:tcBorders/w:' . $side, 'w:sz'];
+                $styleDefs['border' . $ucfSide . 'Color'] = [self::READ_VALUE, 'w:tcBorders/w:' . $side, 'w:color'];
+                $styleDefs['border' . $ucfSide . 'Style'] = [self::READ_VALUE, 'w:tcBorders/w:' . $side, 'w:val'];
+            }
+
+            $style = $this->readStyleDefs($xmlReader, $styleNode, $styleDefs);
+        }
+
+        return $style;
     }
 
     /**
-     * Returns the first child element found
+     * Returns the first child element found.
      *
-     * @param XMLReader $xmlReader
-     * @param \DOMElement|null $parentNode
-     * @param string|array|null $elements
-     * @return string|null
+     * @param null|array|string $elements
+     *
+     * @return null|string
      */
-    private function findPossibleElement(XMLReader $xmlReader, \DOMElement $parentNode = null, $elements = null)
+    private function findPossibleElement(XMLReader $xmlReader, ?DOMElement $parentNode = null, $elements = null)
     {
         if (is_array($elements)) {
             //if element is an array, we take the first element that exists in the XML
@@ -607,14 +880,13 @@ private function findPossibleElement(XMLReader $xmlReader, \DOMElement $parentNo
     }
 
     /**
-     * Returns the first attribute found
+     * Returns the first attribute found.
+     *
+     * @param array|string $attributes
      *
-     * @param XMLReader $xmlReader
-     * @param \DOMElement $node
-     * @param string|array $attributes
-     * @return string|null
+     * @return null|string
      */
-    private function findPossibleAttribute(XMLReader $xmlReader, \DOMElement $node, $attributes)
+    private function findPossibleAttribute(XMLReader $xmlReader, DOMElement $node, $attributes)
     {
         //if attribute is an array, we take the first attribute that exists in the XML
         if (is_array($attributes)) {
@@ -631,20 +903,20 @@ private function findPossibleAttribute(XMLReader $xmlReader, \DOMElement $node,
     }
 
     /**
-     * Read style definition
+     * Read style definition.
      *
-     * @param \PhpOffice\PhpWord\Shared\XMLReader $xmlReader
-     * @param \DOMElement $parentNode
      * @param array $styleDefs
+     *
      * @ignoreScrutinizerPatch
+     *
      * @return array
      */
-    protected function readStyleDefs(XMLReader $xmlReader, \DOMElement $parentNode = null, $styleDefs = array())
+    protected function readStyleDefs(XMLReader $xmlReader, ?DOMElement $parentNode = null, $styleDefs = [])
     {
-        $styles = array();
+        $styles = [];
 
         foreach ($styleDefs as $styleProp => $styleVal) {
-            list($method, $element, $attribute, $expected) = array_pad($styleVal, 4, null);
+            [$method, $element, $attribute, $expected, $default] = array_pad($styleVal, 5, null);
 
             $element = $this->findPossibleElement($xmlReader, $parentNode, $element);
             if ($element === null) {
@@ -658,7 +930,7 @@ protected function readStyleDefs(XMLReader $xmlReader, \DOMElement $parentNode =
 
                 // Use w:val as default if no attribute assigned
                 $attribute = ($attribute === null) ? 'w:val' : $attribute;
-                $attributeValue = $xmlReader->getAttribute($attribute, $node);
+                $attributeValue = $xmlReader->getAttribute($attribute, $node) ?? $default;
 
                 $styleValue = $this->readStyleDef($method, $attributeValue, $expected);
                 if ($styleValue !== null) {
@@ -671,12 +943,15 @@ protected function readStyleDefs(XMLReader $xmlReader, \DOMElement $parentNode =
     }
 
     /**
-     * Return style definition based on conversion method
+     * Return style definition based on conversion method.
      *
      * @param string $method
+     *
      * @ignoreScrutinizerPatch
-     * @param string|null $attributeValue
+     *
+     * @param null|string $attributeValue
      * @param mixed $expected
+     *
      * @return mixed
      */
     private function readStyleDef($method, $attributeValue, $expected)
@@ -697,10 +972,12 @@ private function readStyleDef($method, $attributeValue, $expected)
     }
 
     /**
-     * Parses the value of the on/off value, null is considered true as it means the w:val attribute was not present
+     * Parses the value of the on/off value, null is considered true as it means the w:val attribute was not present.
      *
      * @see http://www.datypic.com/sc/ooxml/t-w_ST_OnOff.html
+     *
      * @param string $value
+     *
      * @return bool
      */
     private function isOn($value = null)
@@ -709,17 +986,18 @@ private function isOn($value = null)
     }
 
     /**
-     * Returns the target of image, object, or link as stored in ::readMainRels
+     * Returns the target of image, object, or link as stored in ::readMainRels.
      *
      * @param string $docPart
      * @param string $rId
-     * @return string|null
+     *
+     * @return null|string
      */
     private function getMediaTarget($docPart, $rId)
     {
         $target = null;
 
-        if (isset($this->rels[$docPart]) && isset($this->rels[$docPart][$rId])) {
+        if (isset($this->rels[$docPart], $this->rels[$docPart][$rId])) {
             $target = $this->rels[$docPart][$rId]['target'];
         }
 
@@ -727,17 +1005,18 @@ private function getMediaTarget($docPart, $rId)
     }
 
     /**
-     * Returns the target mode
+     * Returns the target mode.
      *
      * @param string $docPart
      * @param string $rId
-     * @return string|null
+     *
+     * @return null|string
      */
     private function getTargetMode($docPart, $rId)
     {
         $mode = null;
 
-        if (isset($this->rels[$docPart]) && isset($this->rels[$docPart][$rId])) {
+        if (isset($this->rels[$docPart], $this->rels[$docPart][$rId])) {
             $mode = $this->rels[$docPart][$rId]['targetMode'];
         }
 
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007/Comments.php b/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007/Comments.php
new file mode 100644
index 0000000000..61b31713b5
--- /dev/null
+++ b/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007/Comments.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace PhpOffice\PhpWord\Reader\Word2007;
+
+use DateTime;
+use PhpOffice\PhpWord\Element\Comment;
+use PhpOffice\PhpWord\PhpWord;
+use PhpOffice\PhpWord\Shared\XMLReader;
+
+class Comments extends AbstractPart
+{
+    /**
+     * Collection name comments.
+     *
+     * @var string
+     */
+    protected $collection = 'comments';
+
+    /**
+     * Read settings.xml.
+     */
+    public function read(PhpWord $phpWord): void
+    {
+        $xmlReader = new XMLReader();
+        $xmlReader->getDomFromZip($this->docFile, $this->xmlFile);
+
+        $comments = $phpWord->getComments();
+
+        $nodes = $xmlReader->getElements('*');
+
+        foreach ($nodes as $node) {
+            $name = str_replace('w:', '', $node->nodeName);
+
+            $author = $xmlReader->getAttribute('w:author', $node);
+            $date = $xmlReader->getAttribute('w:date', $node);
+            $initials = $xmlReader->getAttribute('w:initials', $node);
+
+            $element = new Comment($author, new DateTime($date), $initials);
+
+            $range = $this->getCommentReference($xmlReader->getAttribute('w:id', $node));
+            if ($range['start']) {
+                $range['start']->setCommentRangeStart($element);
+            }
+            if ($range['end']) {
+                $range['end']->setCommentRangeEnd($element);
+            }
+
+            $pNodes = $xmlReader->getElements('w:p/w:r', $node);
+            foreach ($pNodes as $pNode) {
+                $this->readRun($xmlReader, $pNode, $element, $this->collection);
+            }
+
+            $phpWord->getComments()->addItem($element);
+        }
+    }
+}
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007/DocPropsApp.php b/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007/DocPropsApp.php
index decc510390..9d6f3cbbe9 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007/DocPropsApp.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007/DocPropsApp.php
@@ -11,30 +11,30 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Reader\Word2007;
 
 /**
- * Extended properties reader
+ * Extended properties reader.
  *
  * @since 0.10.0
  */
 class DocPropsApp extends DocPropsCore
 {
     /**
-     * Property mapping
+     * Property mapping.
      *
      * @var array
      */
-    protected $mapping = array('Company' => 'setCompany', 'Manager' => 'setManager');
+    protected $mapping = ['Company' => 'setCompany', 'Manager' => 'setManager'];
 
     /**
-     * Callback functions
+     * Callback functions.
      *
      * @var array
      */
-    protected $callbacks = array();
+    protected $callbacks = [];
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007/DocPropsCore.php b/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007/DocPropsCore.php
index d241df184a..d3eac27de6 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007/DocPropsCore.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007/DocPropsCore.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -21,42 +21,40 @@
 use PhpOffice\PhpWord\Shared\XMLReader;
 
 /**
- * Core properties reader
+ * Core properties reader.
  *
  * @since 0.10.0
  */
 class DocPropsCore extends AbstractPart
 {
     /**
-     * Property mapping
+     * Property mapping.
      *
      * @var array
      */
-    protected $mapping = array(
-        'dc:creator'        => 'setCreator',
-        'dc:title'          => 'setTitle',
-        'dc:description'    => 'setDescription',
-        'dc:subject'        => 'setSubject',
-        'cp:keywords'       => 'setKeywords',
-        'cp:category'       => 'setCategory',
+    protected $mapping = [
+        'dc:creator' => 'setCreator',
+        'dc:title' => 'setTitle',
+        'dc:description' => 'setDescription',
+        'dc:subject' => 'setSubject',
+        'cp:keywords' => 'setKeywords',
+        'cp:category' => 'setCategory',
         'cp:lastModifiedBy' => 'setLastModifiedBy',
-        'dcterms:created'   => 'setCreated',
-        'dcterms:modified'  => 'setModified',
-    );
+        'dcterms:created' => 'setCreated',
+        'dcterms:modified' => 'setModified',
+    ];
 
     /**
-     * Callback functions
+     * Callback functions.
      *
      * @var array
      */
-    protected $callbacks = array('dcterms:created' => 'strtotime', 'dcterms:modified' => 'strtotime');
+    protected $callbacks = ['dcterms:created' => 'strtotime', 'dcterms:modified' => 'strtotime'];
 
     /**
      * Read core/extended document properties.
-     *
-     * @param \PhpOffice\PhpWord\PhpWord $phpWord
      */
-    public function read(PhpWord $phpWord)
+    public function read(PhpWord $phpWord): void
     {
         $xmlReader = new XMLReader();
         $xmlReader->getDomFromZip($this->docFile, $this->xmlFile);
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007/DocPropsCustom.php b/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007/DocPropsCustom.php
index feb41006c9..69cd551c79 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007/DocPropsCustom.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007/DocPropsCustom.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -22,7 +22,7 @@
 use PhpOffice\PhpWord\Shared\XMLReader;
 
 /**
- * Custom properties reader
+ * Custom properties reader.
  *
  * @since 0.11.0
  */
@@ -30,10 +30,8 @@ class DocPropsCustom extends AbstractPart
 {
     /**
      * Read custom document properties.
-     *
-     * @param \PhpOffice\PhpWord\PhpWord $phpWord
      */
-    public function read(PhpWord $phpWord)
+    public function read(PhpWord $phpWord): void
     {
         $xmlReader = new XMLReader();
         $xmlReader->getDomFromZip($this->docFile, $this->xmlFile);
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007/Document.php b/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007/Document.php
index 13a92e4786..87a24f4198 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007/Document.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007/Document.php
@@ -11,26 +11,28 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Reader\Word2007;
 
+use DOMElement;
 use PhpOffice\PhpWord\Element\Section;
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\Shared\XMLReader;
 
 /**
- * Document reader
+ * Document reader.
  *
  * @since 0.10.0
+ *
  * @SuppressWarnings(PHPMD.UnusedPrivateMethod) For readWPNode
  */
 class Document extends AbstractPart
 {
     /**
-     * PhpWord object
+     * PhpWord object.
      *
      * @var \PhpOffice\PhpWord\PhpWord
      */
@@ -38,15 +40,13 @@ class Document extends AbstractPart
 
     /**
      * Read document.xml.
-     *
-     * @param \PhpOffice\PhpWord\PhpWord $phpWord
      */
-    public function read(PhpWord $phpWord)
+    public function read(PhpWord $phpWord): void
     {
         $this->phpWord = $phpWord;
         $xmlReader = new XMLReader();
         $xmlReader->getDomFromZip($this->docFile, $this->xmlFile);
-        $readMethods = array('w:p' => 'readWPNode', 'w:tbl' => 'readTable', 'w:sectPr' => 'readWSectPrNode');
+        $readMethods = ['w:p' => 'readWPNode', 'w:tbl' => 'readTable', 'w:sectPr' => 'readWSectPrNode'];
 
         $nodes = $xmlReader->getElements('w:body/*');
         if ($nodes->length > 0) {
@@ -64,16 +64,15 @@ public function read(PhpWord $phpWord)
      * Read header footer.
      *
      * @param array $settings
-     * @param \PhpOffice\PhpWord\Element\Section &$section
      */
-    private function readHeaderFooter($settings, Section &$section)
+    private function readHeaderFooter($settings, Section &$section): void
     {
-        $readMethods = array('w:p' => 'readParagraph', 'w:tbl' => 'readTable');
+        $readMethods = ['w:p' => 'readParagraph', 'w:tbl' => 'readTable'];
 
         if (is_array($settings) && isset($settings['hf'])) {
             foreach ($settings['hf'] as $rId => $hfSetting) {
                 if (isset($this->rels['document'][$rId])) {
-                    list($hfType, $xmlFile, $docPart) = array_values($this->rels['document'][$rId]);
+                    [$hfType, $xmlFile, $docPart] = array_values($this->rels['document'][$rId]);
                     $addMethod = "add{$hfType}";
                     $hfObject = $section->$addMethod($hfSetting['type']);
 
@@ -95,31 +94,30 @@ private function readHeaderFooter($settings, Section &$section)
     }
 
     /**
-     * Read w:sectPr
+     * Read w:sectPr.
      *
-     * @param \PhpOffice\PhpWord\Shared\XMLReader $xmlReader
-     * @param \DOMElement $domNode
      * @ignoreScrutinizerPatch
+     *
      * @return array
      */
-    private function readSectionStyle(XMLReader $xmlReader, \DOMElement $domNode)
+    private function readSectionStyle(XMLReader $xmlReader, DOMElement $domNode)
     {
-        $styleDefs = array(
-            'breakType'     => array(self::READ_VALUE, 'w:type'),
-            'vAlign'        => array(self::READ_VALUE, 'w:vAlign'),
-            'pageSizeW'     => array(self::READ_VALUE, 'w:pgSz', 'w:w'),
-            'pageSizeH'     => array(self::READ_VALUE, 'w:pgSz', 'w:h'),
-            'orientation'   => array(self::READ_VALUE, 'w:pgSz', 'w:orient'),
-            'colsNum'       => array(self::READ_VALUE, 'w:cols', 'w:num'),
-            'colsSpace'     => array(self::READ_VALUE, 'w:cols', 'w:space'),
-            'marginTop'     => array(self::READ_VALUE, 'w:pgMar', 'w:top'),
-            'marginLeft'    => array(self::READ_VALUE, 'w:pgMar', 'w:left'),
-            'marginBottom'  => array(self::READ_VALUE, 'w:pgMar', 'w:bottom'),
-            'marginRight'   => array(self::READ_VALUE, 'w:pgMar', 'w:right'),
-            'headerHeight'  => array(self::READ_VALUE, 'w:pgMar', 'w:header'),
-            'footerHeight'  => array(self::READ_VALUE, 'w:pgMar', 'w:footer'),
-            'gutter'        => array(self::READ_VALUE, 'w:pgMar', 'w:gutter'),
-        );
+        $styleDefs = [
+            'breakType' => [self::READ_VALUE, 'w:type'],
+            'vAlign' => [self::READ_VALUE, 'w:vAlign'],
+            'pageSizeW' => [self::READ_VALUE, 'w:pgSz', 'w:w'],
+            'pageSizeH' => [self::READ_VALUE, 'w:pgSz', 'w:h'],
+            'orientation' => [self::READ_VALUE, 'w:pgSz', 'w:orient'],
+            'colsNum' => [self::READ_VALUE, 'w:cols', 'w:num'],
+            'colsSpace' => [self::READ_VALUE, 'w:cols', 'w:space'],
+            'marginTop' => [self::READ_VALUE, 'w:pgMar', 'w:top'],
+            'marginLeft' => [self::READ_VALUE, 'w:pgMar', 'w:left'],
+            'marginBottom' => [self::READ_VALUE, 'w:pgMar', 'w:bottom'],
+            'marginRight' => [self::READ_VALUE, 'w:pgMar', 'w:right'],
+            'headerHeight' => [self::READ_VALUE, 'w:pgMar', 'w:header'],
+            'footerHeight' => [self::READ_VALUE, 'w:pgMar', 'w:footer'],
+            'gutter' => [self::READ_VALUE, 'w:pgMar', 'w:gutter'],
+        ];
         $styles = $this->readStyleDefs($xmlReader, $domNode, $styleDefs);
 
         // Header and footer
@@ -128,10 +126,10 @@ private function readSectionStyle(XMLReader $xmlReader, \DOMElement $domNode)
         foreach ($nodes as $node) {
             if ($node->nodeName == 'w:headerReference' || $node->nodeName == 'w:footerReference') {
                 $id = $xmlReader->getAttribute('r:id', $node);
-                $styles['hf'][$id] = array(
+                $styles['hf'][$id] = [
                     'method' => str_replace('w:', '', str_replace('Reference', '', $node->nodeName)),
-                    'type'   => $xmlReader->getAttribute('w:type', $node),
-                );
+                    'type' => $xmlReader->getAttribute('w:type', $node),
+                ];
             }
         }
 
@@ -140,14 +138,8 @@ private function readSectionStyle(XMLReader $xmlReader, \DOMElement $domNode)
 
     /**
      * Read w:p node.
-     *
-     * @param \PhpOffice\PhpWord\Shared\XMLReader $xmlReader
-     * @param \DOMElement $node
-     * @param \PhpOffice\PhpWord\Element\Section &$section
-     *
-     * @todo <w:lastRenderedPageBreak>
      */
-    private function readWPNode(XMLReader $xmlReader, \DOMElement $node, Section &$section)
+    private function readWPNode(XMLReader $xmlReader, DOMElement $node, Section &$section): void
     {
         // Page break
         if ($xmlReader->getAttribute('w:type', $node, 'w:r/w:br') == 'page') {
@@ -169,12 +161,8 @@ private function readWPNode(XMLReader $xmlReader, \DOMElement $node, Section &$s
 
     /**
      * Read w:sectPr node.
-     *
-     * @param \PhpOffice\PhpWord\Shared\XMLReader $xmlReader
-     * @param \DOMElement $node
-     * @param \PhpOffice\PhpWord\Element\Section &$section
      */
-    private function readWSectPrNode(XMLReader $xmlReader, \DOMElement $node, Section &$section)
+    private function readWSectPrNode(XMLReader $xmlReader, DOMElement $node, Section &$section): void
     {
         $style = $this->readSectionStyle($xmlReader, $node);
         $section->setStyle($style);
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007/Endnotes.php b/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007/Endnotes.php
index aa8b65d750..0c6b18db37 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007/Endnotes.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007/Endnotes.php
@@ -11,28 +11,28 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Reader\Word2007;
 
 /**
- * Endnotes reader
+ * Endnotes reader.
  *
  * @since 0.10.0
  */
 class Endnotes extends Footnotes
 {
     /**
-     * Collection name
+     * Collection name.
      *
      * @var string
      */
     protected $collection = 'endnotes';
 
     /**
-     * Element name
+     * Element name.
      *
      * @var string
      */
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007/Footnotes.php b/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007/Footnotes.php
index a8829d0bad..d40af195e3 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007/Footnotes.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007/Footnotes.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -21,21 +21,21 @@
 use PhpOffice\PhpWord\Shared\XMLReader;
 
 /**
- * Footnotes reader
+ * Footnotes reader.
  *
  * @since 0.10.0
  */
 class Footnotes extends AbstractPart
 {
     /**
-     * Collection name footnotes|endnotes
+     * Collection name footnotes|endnotes.
      *
      * @var string
      */
     protected $collection = 'footnotes';
 
     /**
-     * Element name footnote|endnote
+     * Element name footnote|endnote.
      *
      * @var string
      */
@@ -43,10 +43,8 @@ class Footnotes extends AbstractPart
 
     /**
      * Read (footnotes|endnotes).xml.
-     *
-     * @param \PhpOffice\PhpWord\PhpWord $phpWord
      */
-    public function read(PhpWord $phpWord)
+    public function read(PhpWord $phpWord): void
     {
         $xmlReader = new XMLReader();
         $xmlReader->getDomFromZip($this->docFile, $this->xmlFile);
@@ -58,7 +56,7 @@ public function read(PhpWord $phpWord)
 
                 // Avoid w:type "separator" and "continuationSeparator"
                 // Only look for <footnote> or <endnote> without w:type attribute, or with w:type = normal
-                if ((is_null($type) || $type === 'normal')) {
+                if ((null === $type || $type === 'normal')) {
                     $element = $this->getElement($phpWord, $id);
                     if ($element !== null) {
                         $pNodes = $xmlReader->getElements('w:p/*', $node);
@@ -74,11 +72,11 @@ public function read(PhpWord $phpWord)
     }
 
     /**
-     * Searches for the element with the given relationId
+     * Searches for the element with the given relationId.
      *
-     * @param PhpWord $phpWord
      * @param int $relationId
-     * @return \PhpOffice\PhpWord\Element\AbstractContainer|null
+     *
+     * @return null|\PhpOffice\PhpWord\Element\AbstractContainer
      */
     private function getElement(PhpWord $phpWord, $relationId)
     {
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007/Numbering.php b/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007/Numbering.php
index dea8f3ee62..4ae7a828bc 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007/Numbering.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007/Numbering.php
@@ -11,17 +11,18 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Reader\Word2007;
 
+use DOMElement;
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\Shared\XMLReader;
 
 /**
- * Numbering reader
+ * Numbering reader.
  *
  * @since 0.10.0
  */
@@ -29,13 +30,11 @@ class Numbering extends AbstractPart
 {
     /**
      * Read numbering.xml.
-     *
-     * @param \PhpOffice\PhpWord\PhpWord $phpWord
      */
-    public function read(PhpWord $phpWord)
+    public function read(PhpWord $phpWord): void
     {
-        $abstracts = array();
-        $numberings = array();
+        $abstracts = [];
+        $numberings = [];
         $xmlReader = new XMLReader();
         $xmlReader->getDomFromZip($this->docFile, $this->xmlFile);
 
@@ -44,17 +43,19 @@ public function read(PhpWord $phpWord)
         if ($nodes->length > 0) {
             foreach ($nodes as $node) {
                 $abstractId = $xmlReader->getAttribute('w:abstractNumId', $node);
-                $abstracts[$abstractId] = array('levels' => array());
+                $abstracts[$abstractId] = ['levels' => []];
                 $abstract = &$abstracts[$abstractId];
                 $subnodes = $xmlReader->getElements('*', $node);
                 foreach ($subnodes as $subnode) {
                     switch ($subnode->nodeName) {
                         case 'w:multiLevelType':
                             $abstract['type'] = $xmlReader->getAttribute('w:val', $subnode);
+
                             break;
                         case 'w:lvl':
                             $levelId = $xmlReader->getAttribute('w:ilvl', $subnode);
                             $abstract['levels'][$levelId] = $this->readLevel($xmlReader, $subnode, $levelId);
+
                             break;
                     }
                 }
@@ -87,16 +88,15 @@ public function read(PhpWord $phpWord)
     }
 
     /**
-     * Read numbering level definition from w:abstractNum and w:num
+     * Read numbering level definition from w:abstractNum and w:num.
      *
-     * @param \PhpOffice\PhpWord\Shared\XMLReader $xmlReader
-     * @param \DOMElement $subnode
      * @param int $levelId
+     *
      * @return array
      */
-    private function readLevel(XMLReader $xmlReader, \DOMElement $subnode, $levelId)
+    private function readLevel(XMLReader $xmlReader, DOMElement $subnode, $levelId)
     {
-        $level = array();
+        $level = [];
 
         $level['level'] = $levelId;
         $level['start'] = $xmlReader->getAttribute('w:val', $subnode, 'w:start');
@@ -112,7 +112,7 @@ private function readLevel(XMLReader $xmlReader, \DOMElement $subnode, $levelId)
         $level['hint'] = $xmlReader->getAttribute('w:hint', $subnode, 'w:rPr/w:rFonts');
 
         foreach ($level as $key => $value) {
-            if (is_null($value)) {
+            if (null === $value) {
                 unset($level[$key]);
             }
         }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007/Settings.php b/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007/Settings.php
index 0a59e0454d..7466008d49 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007/Settings.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007/Settings.php
@@ -11,25 +11,29 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Reader\Word2007;
 
+use DOMElement;
 use PhpOffice\PhpWord\ComplexType\TrackChangesView;
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\Shared\XMLReader;
 use PhpOffice\PhpWord\Style\Language;
 
 /**
- * Settings reader
+ * Settings reader.
  *
  * @since 0.14.0
  */
 class Settings extends AbstractPart
 {
-    private static $booleanProperties = array(
+    /**
+     * @var array<string>
+     */
+    private $booleanProperties = [
         'mirrorMargins',
         'hideSpellingErrors',
         'hideGrammaticalErrors',
@@ -40,14 +44,13 @@ class Settings extends AbstractPart
         'updateFields',
         'autoHyphenation',
         'doNotHyphenateCaps',
-    );
+        'bookFoldPrinting',
+    ];
 
     /**
      * Read settings.xml.
-     *
-     * @param \PhpOffice\PhpWord\PhpWord $phpWord
      */
-    public function read(PhpWord $phpWord)
+    public function read(PhpWord $phpWord): void
     {
         $xmlReader = new XMLReader();
         $xmlReader->getDomFromZip($this->docFile, $this->xmlFile);
@@ -61,12 +64,8 @@ public function read(PhpWord $phpWord)
                 $value = $xmlReader->getAttribute('w:val', $node);
                 $method = 'set' . $name;
 
-                if (in_array($name, $this::$booleanProperties)) {
-                    if ($value == 'false') {
-                        $docSettings->$method(false);
-                    } else {
-                        $docSettings->$method(true);
-                    }
+                if (in_array($name, $this->booleanProperties)) {
+                    $docSettings->$method($value !== 'false');
                 } elseif (method_exists($this, $method)) {
                     $this->$method($xmlReader, $phpWord, $node);
                 } elseif (method_exists($docSettings, $method)) {
@@ -77,13 +76,9 @@ public function read(PhpWord $phpWord)
     }
 
     /**
-     * Sets the document Language
-     *
-     * @param XMLReader $xmlReader
-     * @param PhpWord $phpWord
-     * @param \DOMElement $node
+     * Sets the document Language.
      */
-    protected function setThemeFontLang(XMLReader $xmlReader, PhpWord $phpWord, \DOMElement $node)
+    protected function setThemeFontLang(XMLReader $xmlReader, PhpWord $phpWord, DOMElement $node): void
     {
         $val = $xmlReader->getAttribute('w:val', $node);
         $eastAsia = $xmlReader->getAttribute('w:eastAsia', $node);
@@ -98,13 +93,9 @@ protected function setThemeFontLang(XMLReader $xmlReader, PhpWord $phpWord, \DOM
     }
 
     /**
-     * Sets the document protection
-     *
-     * @param XMLReader $xmlReader
-     * @param PhpWord $phpWord
-     * @param \DOMElement $node
+     * Sets the document protection.
      */
-    protected function setDocumentProtection(XMLReader $xmlReader, PhpWord $phpWord, \DOMElement $node)
+    protected function setDocumentProtection(XMLReader $xmlReader, PhpWord $phpWord, DOMElement $node): void
     {
         $documentProtection = $phpWord->getSettings()->getDocumentProtection();
 
@@ -115,13 +106,9 @@ protected function setDocumentProtection(XMLReader $xmlReader, PhpWord $phpWord,
     }
 
     /**
-     * Sets the proof state
-     *
-     * @param XMLReader $xmlReader
-     * @param PhpWord $phpWord
-     * @param \DOMElement $node
+     * Sets the proof state.
      */
-    protected function setProofState(XMLReader $xmlReader, PhpWord $phpWord, \DOMElement $node)
+    protected function setProofState(XMLReader $xmlReader, PhpWord $phpWord, DOMElement $node): void
     {
         $proofState = $phpWord->getSettings()->getProofState();
 
@@ -137,13 +124,9 @@ protected function setProofState(XMLReader $xmlReader, PhpWord $phpWord, \DOMEle
     }
 
     /**
-     * Sets the proof state
-     *
-     * @param XMLReader $xmlReader
-     * @param PhpWord $phpWord
-     * @param \DOMElement $node
+     * Sets the proof state.
      */
-    protected function setZoom(XMLReader $xmlReader, PhpWord $phpWord, \DOMElement $node)
+    protected function setZoom(XMLReader $xmlReader, PhpWord $phpWord, DOMElement $node): void
     {
         $percent = $xmlReader->getAttribute('w:percent', $node);
         $val = $xmlReader->getAttribute('w:val', $node);
@@ -154,13 +137,9 @@ protected function setZoom(XMLReader $xmlReader, PhpWord $phpWord, \DOMElement $
     }
 
     /**
-     * Set the Revision view
-     *
-     * @param XMLReader $xmlReader
-     * @param PhpWord $phpWord
-     * @param \DOMElement $node
+     * Set the Revision view.
      */
-    protected function setRevisionView(XMLReader $xmlReader, PhpWord $phpWord, \DOMElement $node)
+    protected function setRevisionView(XMLReader $xmlReader, PhpWord $phpWord, DOMElement $node): void
     {
         $revisionView = new TrackChangesView();
         $revisionView->setMarkup(filter_var($xmlReader->getAttribute('w:markup', $node), FILTER_VALIDATE_BOOLEAN));
@@ -171,12 +150,7 @@ protected function setRevisionView(XMLReader $xmlReader, PhpWord $phpWord, \DOME
         $phpWord->getSettings()->setRevisionView($revisionView);
     }
 
-    /**
-     * @param XMLReader $xmlReader
-     * @param PhpWord $phpWord
-     * @param \DOMElement $node
-     */
-    protected function setConsecutiveHyphenLimit(XMLReader $xmlReader, PhpWord $phpWord, \DOMElement $node)
+    protected function setConsecutiveHyphenLimit(XMLReader $xmlReader, PhpWord $phpWord, DOMElement $node): void
     {
         $value = $xmlReader->getAttribute('w:val', $node);
 
@@ -185,12 +159,7 @@ protected function setConsecutiveHyphenLimit(XMLReader $xmlReader, PhpWord $phpW
         }
     }
 
-    /**
-     * @param XMLReader $xmlReader
-     * @param PhpWord $phpWord
-     * @param \DOMElement $node
-     */
-    protected function setHyphenationZone(XMLReader $xmlReader, PhpWord $phpWord, \DOMElement $node)
+    protected function setHyphenationZone(XMLReader $xmlReader, PhpWord $phpWord, DOMElement $node): void
     {
         $value = $xmlReader->getAttribute('w:val', $node);
 
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007/Styles.php b/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007/Styles.php
index 37ce4909af..760adf9493 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007/Styles.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Reader/Word2007/Styles.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -22,7 +22,7 @@
 use PhpOffice\PhpWord\Style\Language;
 
 /**
- * Styles reader
+ * Styles reader.
  *
  * @since 0.10.0
  */
@@ -30,10 +30,8 @@ class Styles extends AbstractPart
 {
     /**
      * Read styles.xml.
-     *
-     * @param \PhpOffice\PhpWord\PhpWord $phpWord
      */
-    public function read(PhpWord $phpWord)
+    public function read(PhpWord $phpWord): void
     {
         $xmlReader = new XMLReader();
         $xmlReader->getDomFromZip($this->docFile, $this->xmlFile);
@@ -41,14 +39,16 @@ public function read(PhpWord $phpWord)
         $fontDefaults = $xmlReader->getElement('w:docDefaults/w:rPrDefault');
         if ($fontDefaults !== null) {
             $fontDefaultStyle = $this->readFontStyle($xmlReader, $fontDefaults);
-            if (array_key_exists('name', $fontDefaultStyle)) {
-                $phpWord->setDefaultFontName($fontDefaultStyle['name']);
-            }
-            if (array_key_exists('size', $fontDefaultStyle)) {
-                $phpWord->setDefaultFontSize($fontDefaultStyle['size']);
-            }
-            if (array_key_exists('lang', $fontDefaultStyle)) {
-                $phpWord->getSettings()->setThemeFontLang(new Language($fontDefaultStyle['lang']));
+            if ($fontDefaultStyle) {
+                if (array_key_exists('name', $fontDefaultStyle)) {
+                    $phpWord->setDefaultFontName($fontDefaultStyle['name']);
+                }
+                if (array_key_exists('size', $fontDefaultStyle)) {
+                    $phpWord->setDefaultFontSize($fontDefaultStyle['size']);
+                }
+                if (array_key_exists('lang', $fontDefaultStyle)) {
+                    $phpWord->getSettings()->setThemeFontLang(new Language($fontDefaultStyle['lang']));
+                }
             }
         }
 
@@ -65,10 +65,10 @@ public function read(PhpWord $phpWord)
             foreach ($nodes as $node) {
                 $type = $xmlReader->getAttribute('w:type', $node);
                 $name = $xmlReader->getAttribute('w:val', $node, 'w:name');
-                if (is_null($name)) {
+                if (null === $name) {
                     $name = $xmlReader->getAttribute('w:styleId', $node);
                 }
-                $headingMatches = array();
+                $headingMatches = [];
                 preg_match('/Heading\s*(\d)/i', $name, $headingMatches);
                 // $default = ($xmlReader->getAttribute('w:default', $node) == 1);
                 switch ($type) {
@@ -86,18 +86,21 @@ public function read(PhpWord $phpWord)
                                 $phpWord->addFontStyle($name, $fontStyle, $paragraphStyle);
                             }
                         }
+
                         break;
                     case 'character':
                         $fontStyle = $this->readFontStyle($xmlReader, $node);
                         if (!empty($fontStyle)) {
                             $phpWord->addFontStyle($name, $fontStyle);
                         }
+
                         break;
                     case 'table':
                         $tStyle = $this->readTableStyle($xmlReader, $node);
                         if (!empty($tStyle)) {
                             $phpWord->addTableStyle($name, $tStyle);
                         }
+
                         break;
                 }
             }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Settings.php b/vendor/phpoffice/phpword/src/PhpWord/Settings.php
index 80e512d2a7..984486ccfe 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Settings.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Settings.php
@@ -2,130 +2,142 @@
 /**
  * This file is part of PHPWord - A pure PHP library for reading and writing
  * word processing documents.
- *
  * PHPWord is free software distributed under the terms of the GNU Lesser
  * General Public License version 3 as published by the Free Software Foundation.
- *
  * For the full copyright and license information, please read the LICENSE
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord;
 
 /**
- * PHPWord settings class
+ * PHPWord settings class.
  *
  * @since 0.8.0
  */
 class Settings
 {
     /**
-     * Zip libraries
+     * Zip libraries.
      *
      * @const string
      */
-    const ZIPARCHIVE = 'ZipArchive';
-    const PCLZIP = 'PclZip';
-    const OLD_LIB = 'PhpOffice\\PhpWord\\Shared\\ZipArchive'; // @deprecated 0.11
+    public const ZIPARCHIVE = 'ZipArchive';
+    public const PCLZIP = 'PclZip';
+    public const OLD_LIB = \PhpOffice\PhpWord\Shared\ZipArchive::class; // @deprecated 0.11
 
     /**
-     * PDF rendering libraries
+     * PDF rendering libraries.
      *
      * @const string
      */
-    const PDF_RENDERER_DOMPDF = 'DomPDF';
-    const PDF_RENDERER_TCPDF = 'TCPDF';
-    const PDF_RENDERER_MPDF = 'MPDF';
+    public const PDF_RENDERER_DOMPDF = 'DomPDF';
+    public const PDF_RENDERER_TCPDF = 'TCPDF';
+    public const PDF_RENDERER_MPDF = 'MPDF';
 
     /**
-     * Measurement units multiplication factor
-     *
+     * Measurement units multiplication factor.
      * Applied to:
      * - Section: margins, header/footer height, gutter, column spacing
      * - Tab: position
      * - Indentation: left, right, firstLine, hanging
-     * - Spacing: before, after
+     * - Spacing: before, after.
      *
      * @const string
      */
-    const UNIT_TWIP = 'twip'; // = 1/20 point
-    const UNIT_CM = 'cm';
-    const UNIT_MM = 'mm';
-    const UNIT_INCH = 'inch';
-    const UNIT_POINT = 'point'; // = 1/72 inch
-    const UNIT_PICA = 'pica'; // = 1/6 inch = 12 points
+    public const UNIT_TWIP = 'twip'; // = 1/20 point
+    public const UNIT_CM = 'cm';
+    public const UNIT_MM = 'mm';
+    public const UNIT_INCH = 'inch';
+    public const UNIT_POINT = 'point'; // = 1/72 inch
+    public const UNIT_PICA = 'pica'; // = 1/6 inch = 12 points
 
     /**
-     * Default font settings
-     *
+     * Default font settings.
      * OOXML defined font size values in halfpoints, i.e. twice of what PhpWord
      * use, and the conversion will be conducted during XML writing.
      */
-    const DEFAULT_FONT_NAME = 'Arial';
-    const DEFAULT_FONT_SIZE = 10;
-    const DEFAULT_FONT_COLOR = '000000';
-    const DEFAULT_FONT_CONTENT_TYPE = 'default'; // default|eastAsia|cs
-    const DEFAULT_PAPER = 'A4';
+    public const DEFAULT_FONT_NAME = 'Arial';
+    public const DEFAULT_FONT_SIZE = 10;
+    public const DEFAULT_FONT_COLOR = '000000';
+    public const DEFAULT_FONT_CONTENT_TYPE = 'default'; // default|eastAsia|cs
+    public const DEFAULT_PAPER = 'A4';
 
     /**
-     * Compatibility option for XMLWriter
+     * Compatibility option for XMLWriter.
      *
      * @var bool
      */
     private static $xmlWriterCompatibility = true;
 
     /**
-     * Name of the class used for Zip file management
+     * Name of the class used for Zip file management.
      *
      * @var string
      */
     private static $zipClass = self::ZIPARCHIVE;
 
     /**
-     * Name of the external Library used for rendering PDF files
+     * Name of the external Library used for rendering PDF files.
      *
-     * @var string
+     * @var null|string
      */
-    private static $pdfRendererName = null;
+    private static $pdfRendererName;
 
     /**
-     * Directory Path to the external Library used for rendering PDF files
+     * Options used for rendering PDF files.
      *
-     * @var string
+     * @var array
+     */
+    private static $pdfRendererOptions = [];
+
+    /**
+     * Directory Path to the external Library used for rendering PDF files.
+     *
+     * @var null|string
      */
-    private static $pdfRendererPath = null;
+    private static $pdfRendererPath;
 
     /**
-     * Measurement unit
+     * Measurement unit.
      *
-     * @var int|float
+     * @var string
      */
     private static $measurementUnit = self::UNIT_TWIP;
 
     /**
-     * Default font name
+     * Default font name.
      *
      * @var string
      */
     private static $defaultFontName = self::DEFAULT_FONT_NAME;
 
     /**
-     * Default font size
-     * @var int
+     * Default font size.
+     *
+     * @var float|int
      */
     private static $defaultFontSize = self::DEFAULT_FONT_SIZE;
 
     /**
-     * Default paper
+     * Default paper.
+     *
      * @var string
      */
     private static $defaultPaper = self::DEFAULT_PAPER;
 
+    /**
+     * Is RTL by default ?
+     *
+     * @var ?bool
+     */
+    private static $defaultRtl;
+
     /**
      * The user defined temporary directory.
      *
@@ -142,50 +154,40 @@ class Settings
     private static $outputEscapingEnabled = false;
 
     /**
-     * Return the compatibility option used by the XMLWriter
+     * Return the compatibility option used by the XMLWriter.
      *
      * @return bool Compatibility
      */
-    public static function hasCompatibility()
+    public static function hasCompatibility(): bool
     {
         return self::$xmlWriterCompatibility;
     }
 
     /**
-     * Set the compatibility option used by the XMLWriter
-     *
-     * This sets the setIndent and setIndentString for better compatibility
-     *
-     * @param bool $compatibility
-     * @return bool
+     * Set the compatibility option used by the XMLWriter.
+     * This sets the setIndent and setIndentString for better compatibility.
      */
-    public static function setCompatibility($compatibility)
+    public static function setCompatibility(bool $compatibility): bool
     {
-        $compatibility = (bool) $compatibility;
         self::$xmlWriterCompatibility = $compatibility;
 
         return true;
     }
 
     /**
-     * Get zip handler class
-     *
-     * @return string
+     * Get zip handler class.
      */
-    public static function getZipClass()
+    public static function getZipClass(): string
     {
         return self::$zipClass;
     }
 
     /**
-     * Set zip handler class
-     *
-     * @param  string $zipClass
-     * @return bool
+     * Set zip handler class.
      */
-    public static function setZipClass($zipClass)
+    public static function setZipClass(string $zipClass): bool
     {
-        if (in_array($zipClass, array(self::PCLZIP, self::ZIPARCHIVE, self::OLD_LIB))) {
+        if (in_array($zipClass, [self::PCLZIP, self::ZIPARCHIVE, self::OLD_LIB])) {
             self::$zipClass = $zipClass;
 
             return true;
@@ -195,13 +197,11 @@ public static function setZipClass($zipClass)
     }
 
     /**
-     * Set details of the external library for rendering PDF files
+     * Set details of the external library for rendering PDF files.
      *
-     * @param string $libraryName
-     * @param string $libraryBaseDir
      * @return bool Success or failure
      */
-    public static function setPdfRenderer($libraryName, $libraryBaseDir)
+    public static function setPdfRenderer(string $libraryName, string $libraryBaseDir): bool
     {
         if (!self::setPdfRendererName($libraryName)) {
             return false;
@@ -212,23 +212,18 @@ public static function setPdfRenderer($libraryName, $libraryBaseDir)
 
     /**
      * Return the PDF Rendering Library.
-     *
-     * @return string
      */
-    public static function getPdfRendererName()
+    public static function getPdfRendererName(): ?string
     {
         return self::$pdfRendererName;
     }
 
     /**
-     * Identify the external library to use for rendering PDF files
-     *
-     * @param string $libraryName
-     * @return bool
+     * Identify the external library to use for rendering PDF files.
      */
-    public static function setPdfRendererName($libraryName)
+    public static function setPdfRendererName(?string $libraryName): bool
     {
-        $pdfRenderers = array(self::PDF_RENDERER_DOMPDF, self::PDF_RENDERER_TCPDF, self::PDF_RENDERER_MPDF);
+        $pdfRenderers = [self::PDF_RENDERER_DOMPDF, self::PDF_RENDERER_TCPDF, self::PDF_RENDERER_MPDF];
         if (!in_array($libraryName, $pdfRenderers)) {
             return false;
         }
@@ -239,23 +234,38 @@ public static function setPdfRendererName($libraryName)
 
     /**
      * Return the directory path to the PDF Rendering Library.
-     *
-     * @return string
      */
-    public static function getPdfRendererPath()
+    public static function getPdfRendererPath(): ?string
     {
         return self::$pdfRendererPath;
     }
 
     /**
-     * Location of external library to use for rendering PDF files
+     * Set options of the external library for rendering PDF files.
+     */
+    public static function setPdfRendererOptions(array $options): void
+    {
+        self::$pdfRendererOptions = $options;
+    }
+
+    /**
+     * Return the PDF Rendering Options.
+     */
+    public static function getPdfRendererOptions(): array
+    {
+        return self::$pdfRendererOptions;
+    }
+
+    /**
+     * Location of external library to use for rendering PDF files.
+     *
+     * @param null|string $libraryBaseDir Directory path to the library's base folder
      *
-     * @param string $libraryBaseDir Directory path to the library's base folder
      * @return bool Success or failure
      */
-    public static function setPdfRendererPath($libraryBaseDir)
+    public static function setPdfRendererPath(?string $libraryBaseDir): bool
     {
-        if (false === file_exists($libraryBaseDir) || false === is_readable($libraryBaseDir)) {
+        if (!$libraryBaseDir || false === file_exists($libraryBaseDir) || false === is_readable($libraryBaseDir)) {
             return false;
         }
         self::$pdfRendererPath = $libraryBaseDir;
@@ -264,25 +274,26 @@ public static function setPdfRendererPath($libraryBaseDir)
     }
 
     /**
-     * Get measurement unit
-     *
-     * @return string
+     * Get measurement unit.
      */
-    public static function getMeasurementUnit()
+    public static function getMeasurementUnit(): string
     {
         return self::$measurementUnit;
     }
 
     /**
-     * Set measurement unit
-     *
-     * @param string $value
-     * @return bool
+     * Set measurement unit.
      */
-    public static function setMeasurementUnit($value)
+    public static function setMeasurementUnit(string $value): bool
     {
-        $units = array(self::UNIT_TWIP, self::UNIT_CM, self::UNIT_MM, self::UNIT_INCH,
-            self::UNIT_POINT, self::UNIT_PICA, );
+        $units = [
+            self::UNIT_TWIP,
+            self::UNIT_CM,
+            self::UNIT_MM,
+            self::UNIT_INCH,
+            self::UNIT_POINT,
+            self::UNIT_PICA,
+        ];
         if (!in_array($value, $units)) {
             return false;
         }
@@ -294,11 +305,11 @@ public static function setMeasurementUnit($value)
     /**
      * Sets the user defined path to temporary directory.
      *
-     * @since 0.12.0
-     *
      * @param string $tempDir The user defined path to temporary directory
+     *
+     * @since 0.12.0
      */
-    public static function setTempDir($tempDir)
+    public static function setTempDir(string $tempDir): void
     {
         self::$tempDir = $tempDir;
     }
@@ -307,10 +318,8 @@ public static function setTempDir($tempDir)
      * Returns path to temporary directory.
      *
      * @since 0.12.0
-     *
-     * @return string
      */
-    public static function getTempDir()
+    public static function getTempDir(): string
     {
         if (!empty(self::$tempDir)) {
             $tempDir = self::$tempDir;
@@ -323,43 +332,34 @@ public static function getTempDir()
 
     /**
      * @since 0.13.0
-     *
-     * @return bool
      */
-    public static function isOutputEscapingEnabled()
+    public static function isOutputEscapingEnabled(): bool
     {
         return self::$outputEscapingEnabled;
     }
 
     /**
      * @since 0.13.0
-     *
-     * @param bool $outputEscapingEnabled
      */
-    public static function setOutputEscapingEnabled($outputEscapingEnabled)
+    public static function setOutputEscapingEnabled(bool $outputEscapingEnabled): void
     {
         self::$outputEscapingEnabled = $outputEscapingEnabled;
     }
 
     /**
-     * Get default font name
-     *
-     * @return string
+     * Get default font name.
      */
-    public static function getDefaultFontName()
+    public static function getDefaultFontName(): string
     {
         return self::$defaultFontName;
     }
 
     /**
-     * Set default font name
-     *
-     * @param string $value
-     * @return bool
+     * Set default font name.
      */
-    public static function setDefaultFontName($value)
+    public static function setDefaultFontName(string $value): bool
     {
-        if (is_string($value) && trim($value) !== '') {
+        if (trim($value) !== '') {
             self::$defaultFontName = $value;
 
             return true;
@@ -369,9 +369,9 @@ public static function setDefaultFontName($value)
     }
 
     /**
-     * Get default font size
+     * Get default font size.
      *
-     * @return int
+     * @return float|int
      */
     public static function getDefaultFontSize()
     {
@@ -379,15 +379,13 @@ public static function getDefaultFontSize()
     }
 
     /**
-     * Set default font size
+     * Set default font size.
      *
-     * @param int $value
-     * @return bool
+     * @param null|float|int $value
      */
-    public static function setDefaultFontSize($value)
+    public static function setDefaultFontSize($value): bool
     {
-        $value = (int) $value;
-        if ($value > 0) {
+        if ((is_int($value) || is_float($value)) && (int) $value > 0) {
             self::$defaultFontSize = $value;
 
             return true;
@@ -396,68 +394,73 @@ public static function setDefaultFontSize($value)
         return false;
     }
 
+    public static function setDefaultRtl(?bool $defaultRtl): void
+    {
+        self::$defaultRtl = $defaultRtl;
+    }
+
+    public static function isDefaultRtl(): ?bool
+    {
+        return self::$defaultRtl;
+    }
+
     /**
-     * Load setting from phpword.yml or phpword.yml.dist
-     *
-     * @param string $filename
-     * @return array
+     * Load setting from phpword.yml or phpword.yml.dist.
      */
-    public static function loadConfig($filename = null)
+    public static function loadConfig(?string $filename = null): array
     {
         // Get config file
         $configFile = null;
         $configPath = __DIR__ . '/../../';
         if ($filename !== null) {
-            $files = array($filename);
+            $files = [$filename];
         } else {
-            $files = array("{$configPath}phpword.ini", "{$configPath}phpword.ini.dist");
+            $files = ["{$configPath}phpword.ini", "{$configPath}phpword.ini.dist"];
         }
         foreach ($files as $file) {
             if (file_exists($file)) {
                 $configFile = realpath($file);
+
                 break;
             }
         }
 
         // Parse config file
-        $config = array();
+        $config = [];
         if ($configFile !== null) {
             $config = @parse_ini_file($configFile);
             if ($config === false) {
-                return $config;
+                return [];
             }
         }
 
         // Set config value
+        $appliedConfig = [];
         foreach ($config as $key => $value) {
             $method = "set{$key}";
             if (method_exists(__CLASS__, $method)) {
                 self::$method($value);
+                $appliedConfig[$key] = $value;
             }
         }
 
-        return $config;
+        return $appliedConfig;
     }
 
     /**
-     * Get default paper
-     *
-     * @return string
+     * Get default paper.
      */
-    public static function getDefaultPaper()
+    public static function getDefaultPaper(): string
     {
         return self::$defaultPaper;
     }
 
     /**
-     * Set default paper
-     *
-     * @param string $value
-     * @return bool
+     * Set default paper.
      */
-    public static function setDefaultPaper($value)
+    public static function setDefaultPaper(string $value): bool
     {
-        if (is_string($value) && trim($value) !== '') {
+        if (trim($value) !== '') {
             self::$defaultPaper = $value;
 
             return true;
@@ -465,16 +468,4 @@ public static function setDefaultPaper($value)
 
         return false;
     }
-
-    /**
-     * Return the compatibility option used by the XMLWriter
-     *
-     * @deprecated 0.10.0
-     *
-     * @codeCoverageIgnore
-     */
-    public static function getCompatibility()
-    {
-        return self::hasCompatibility();
-    }
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Shared/AbstractEnum.php b/vendor/phpoffice/phpword/src/PhpWord/Shared/AbstractEnum.php
index f2375d876e..e79f4b244e 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Shared/AbstractEnum.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Shared/AbstractEnum.php
@@ -11,24 +11,27 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Shared;
 
+use InvalidArgumentException;
+use ReflectionClass;
+
 abstract class AbstractEnum
 {
-    private static $constCacheArray = null;
+    private static $constCacheArray;
 
     private static function getConstants()
     {
         if (self::$constCacheArray == null) {
-            self::$constCacheArray = array();
+            self::$constCacheArray = [];
         }
-        $calledClass = get_called_class();
+        $calledClass = static::class;
         if (!array_key_exists($calledClass, self::$constCacheArray)) {
-            $reflect = new \ReflectionClass($calledClass);
+            $reflect = new ReflectionClass($calledClass);
             self::$constCacheArray[$calledClass] = $reflect->getConstants();
         }
 
@@ -36,7 +39,7 @@ private static function getConstants()
     }
 
     /**
-     * Returns all values for this enum
+     * Returns all values for this enum.
      *
      * @return array
      */
@@ -46,9 +49,10 @@ public static function values()
     }
 
     /**
-     * Returns true the value is valid for this enum
+     * Returns true the value is valid for this enum.
      *
      * @param string $value
+     *
      * @return bool true if value is valid
      */
     public static function isValid($value)
@@ -59,17 +63,17 @@ public static function isValid($value)
     }
 
     /**
-     * Validates that the value passed is a valid value
+     * Validates that the value passed is a valid value.
      *
      * @param string $value
-     * @throws \InvalidArgumentException if the value passed is not valid for this enum
      */
-    public static function validate($value)
+    public static function validate($value): void
     {
         if (!self::isValid($value)) {
-            $calledClass = get_called_class();
+            $calledClass = static::class;
             $values = array_values(self::getConstants());
-            throw new \InvalidArgumentException("$value is not a valid value for $calledClass, possible values are " . implode(', ', $values));
+
+            throw new InvalidArgumentException("$value is not a valid value for $calledClass, possible values are " . implode(', ', $values));
         }
     }
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Shared/Converter.php b/vendor/phpoffice/phpword/src/PhpWord/Shared/Converter.php
index 05755ef796..365aa141b0 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Shared/Converter.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Shared/Converter.php
@@ -11,14 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Shared;
 
 /**
- * Common converter functions
+ * Common converter functions.
  */
 class Converter
 {
@@ -31,9 +31,10 @@ class Converter
     const DEGREE_TO_ANGLE = 60000;
 
     /**
-     * Convert centimeter to twip
+     * Convert centimeter to twip.
      *
      * @param float $centimeter
+     *
      * @return float
      */
     public static function cmToTwip($centimeter = 1)
@@ -42,9 +43,10 @@ public static function cmToTwip($centimeter = 1)
     }
 
     /**
-     * Convert centimeter to inch
+     * Convert centimeter to inch.
      *
      * @param float $centimeter
+     *
      * @return float
      */
     public static function cmToInch($centimeter = 1)
@@ -53,9 +55,10 @@ public static function cmToInch($centimeter = 1)
     }
 
     /**
-     * Convert centimeter to pixel
+     * Convert centimeter to pixel.
      *
      * @param float $centimeter
+     *
      * @return float
      */
     public static function cmToPixel($centimeter = 1)
@@ -64,9 +67,10 @@ public static function cmToPixel($centimeter = 1)
     }
 
     /**
-     * Convert centimeter to point
+     * Convert centimeter to point.
      *
      * @param float $centimeter
+     *
      * @return float
      */
     public static function cmToPoint($centimeter = 1)
@@ -75,9 +79,10 @@ public static function cmToPoint($centimeter = 1)
     }
 
     /**
-     * Convert centimeter to EMU
+     * Convert centimeter to EMU.
      *
      * @param float $centimeter
+     *
      * @return float
      */
     public static function cmToEmu($centimeter = 1)
@@ -86,9 +91,10 @@ public static function cmToEmu($centimeter = 1)
     }
 
     /**
-     * Convert inch to twip
+     * Convert inch to twip.
      *
      * @param float $inch
+     *
      * @return float
      */
     public static function inchToTwip($inch = 1)
@@ -97,9 +103,10 @@ public static function inchToTwip($inch = 1)
     }
 
     /**
-     * Convert inch to centimeter
+     * Convert inch to centimeter.
      *
      * @param float $inch
+     *
      * @return float
      */
     public static function inchToCm($inch = 1)
@@ -108,9 +115,10 @@ public static function inchToCm($inch = 1)
     }
 
     /**
-     * Convert inch to pixel
+     * Convert inch to pixel.
      *
      * @param float $inch
+     *
      * @return float
      */
     public static function inchToPixel($inch = 1)
@@ -119,9 +127,10 @@ public static function inchToPixel($inch = 1)
     }
 
     /**
-     * Convert inch to point
+     * Convert inch to point.
      *
      * @param float $inch
+     *
      * @return float
      */
     public static function inchToPoint($inch = 1)
@@ -130,9 +139,10 @@ public static function inchToPoint($inch = 1)
     }
 
     /**
-     * Convert inch to EMU
+     * Convert inch to EMU.
      *
      * @param float $inch
+     *
      * @return int
      */
     public static function inchToEmu($inch = 1)
@@ -141,9 +151,10 @@ public static function inchToEmu($inch = 1)
     }
 
     /**
-     * Convert pixel to twip
+     * Convert pixel to twip.
      *
      * @param float $pixel
+     *
      * @return float
      */
     public static function pixelToTwip($pixel = 1)
@@ -152,9 +163,10 @@ public static function pixelToTwip($pixel = 1)
     }
 
     /**
-     * Convert pixel to centimeter
+     * Convert pixel to centimeter.
      *
      * @param float $pixel
+     *
      * @return float
      */
     public static function pixelToCm($pixel = 1)
@@ -163,9 +175,10 @@ public static function pixelToCm($pixel = 1)
     }
 
     /**
-     * Convert pixel to point
+     * Convert pixel to point.
      *
      * @param float $pixel
+     *
      * @return float
      */
     public static function pixelToPoint($pixel = 1)
@@ -174,9 +187,10 @@ public static function pixelToPoint($pixel = 1)
     }
 
     /**
-     * Convert pixel to EMU
+     * Convert pixel to EMU.
      *
      * @param float $pixel
+     *
      * @return int
      */
     public static function pixelToEmu($pixel = 1)
@@ -185,9 +199,10 @@ public static function pixelToEmu($pixel = 1)
     }
 
     /**
-     * Convert point to twip unit
+     * Convert point to twip unit.
      *
      * @param float $point
+     *
      * @return float
      */
     public static function pointToTwip($point = 1)
@@ -196,9 +211,10 @@ public static function pointToTwip($point = 1)
     }
 
     /**
-     * Convert point to pixel
+     * Convert point to pixel.
      *
      * @param float $point
+     *
      * @return float
      */
     public static function pointToPixel($point = 1)
@@ -207,9 +223,10 @@ public static function pointToPixel($point = 1)
     }
 
     /**
-     * Convert point to EMU
+     * Convert point to EMU.
      *
      * @param float $point
+     *
      * @return float
      */
     public static function pointToEmu($point = 1)
@@ -218,9 +235,10 @@ public static function pointToEmu($point = 1)
     }
 
     /**
-     * Convert point to cm
+     * Convert point to cm.
      *
      * @param float $point
+     *
      * @return float
      */
     public static function pointToCm($point = 1)
@@ -229,9 +247,10 @@ public static function pointToCm($point = 1)
     }
 
     /**
-     * Convert EMU to pixel
+     * Convert EMU to pixel.
      *
      * @param float $emu
+     *
      * @return float
      */
     public static function emuToPixel($emu = 1)
@@ -240,9 +259,10 @@ public static function emuToPixel($emu = 1)
     }
 
     /**
-     * Convert pica to point
+     * Convert pica to point.
      *
      * @param float $pica
+     *
      * @return float
      */
     public static function picaToPoint($pica = 1)
@@ -251,9 +271,10 @@ public static function picaToPoint($pica = 1)
     }
 
     /**
-     * Convert degree to angle
+     * Convert degree to angle.
      *
      * @param float $degree
+     *
      * @return int
      */
     public static function degreeToAngle($degree = 1)
@@ -262,9 +283,10 @@ public static function degreeToAngle($degree = 1)
     }
 
     /**
-     * Convert angle to degrees
+     * Convert angle to degrees.
      *
      * @param float $angle
+     *
      * @return int
      */
     public static function angleToDegree($angle = 1)
@@ -273,9 +295,10 @@ public static function angleToDegree($angle = 1)
     }
 
     /**
-     * Convert colorname as string to RGB
+     * Convert colorname as string to RGB.
      *
      * @param string $value color name
+     *
      * @return string color as hex RGB string, or original value if unknown
      */
     public static function stringToRgb($value)
@@ -317,9 +340,10 @@ public static function stringToRgb($value)
     }
 
     /**
-     * Convert HTML hexadecimal to RGB
+     * Convert HTML hexadecimal to RGB.
      *
      * @param string $value HTML Color in hexadecimal
+     *
      * @return array Value in RGB
      */
     public static function htmlToRgb($value)
@@ -331,9 +355,9 @@ public static function htmlToRgb($value)
         }
 
         if (strlen($value) == 6) {
-            list($red, $green, $blue) = array($value[0] . $value[1], $value[2] . $value[3], $value[4] . $value[5]);
+            [$red, $green, $blue] = [$value[0] . $value[1], $value[2] . $value[3], $value[4] . $value[5]];
         } elseif (strlen($value) == 3) {
-            list($red, $green, $blue) = array($value[0] . $value[0], $value[1] . $value[1], $value[2] . $value[2]);
+            [$red, $green, $blue] = [$value[0] . $value[0], $value[1] . $value[1], $value[2] . $value[2]];
         } else {
             return false;
         }
@@ -342,21 +366,22 @@ public static function htmlToRgb($value)
         $green = ctype_xdigit($green) ? hexdec($green) : 0;
         $blue = ctype_xdigit($blue) ? hexdec($blue) : 0;
 
-        return array($red, $green, $blue);
+        return [$red, $green, $blue];
     }
 
     /**
-     * Transforms a size in CSS format (eg. 10px, 10px, ...) to points
+     * Transforms a size in CSS format (eg. 10px, 10px, ...) to points.
      *
      * @param string $value
-     * @return float
+     *
+     * @return ?float
      */
     public static function cssToPoint($value)
     {
         if ($value == '0') {
             return 0;
         }
-        $matches = array();
+        $matches = [];
         if (preg_match('/^[+-]?([0-9]+\.?[0-9]*)?(px|em|ex|%|in|cm|mm|pt|pc)$/i', $value, $matches)) {
             $size = $matches[1];
             $unit = $matches[2];
@@ -381,9 +406,10 @@ public static function cssToPoint($value)
     }
 
     /**
-     * Transforms a size in CSS format (eg. 10px, 10px, ...) to twips
+     * Transforms a size in CSS format (eg. 10px, 10px, ...) to twips.
      *
      * @param string $value
+     *
      * @return float
      */
     public static function cssToTwip($value)
@@ -392,9 +418,10 @@ public static function cssToTwip($value)
     }
 
     /**
-     * Transforms a size in CSS format (eg. 10px, 10px, ...) to pixel
+     * Transforms a size in CSS format (eg. 10px, 10px, ...) to pixel.
      *
      * @param string $value
+     *
      * @return float
      */
     public static function cssToPixel($value)
@@ -403,9 +430,10 @@ public static function cssToPixel($value)
     }
 
     /**
-     * Transforms a size in CSS format (eg. 10px, 10px, ...) to cm
+     * Transforms a size in CSS format (eg. 10px, 10px, ...) to cm.
      *
      * @param string $value
+     *
      * @return float
      */
     public static function cssToCm($value)
@@ -414,9 +442,10 @@ public static function cssToCm($value)
     }
 
     /**
-     * Transforms a size in CSS format (eg. 10px, 10px, ...) to emu
+     * Transforms a size in CSS format (eg. 10px, 10px, ...) to emu.
      *
      * @param string $value
+     *
      * @return float
      */
     public static function cssToEmu($value)
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Shared/Css.php b/vendor/phpoffice/phpword/src/PhpWord/Shared/Css.php
new file mode 100644
index 0000000000..fea3e3d5d6
--- /dev/null
+++ b/vendor/phpoffice/phpword/src/PhpWord/Shared/Css.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @see         https://github.com/PHPOffice/PHPWord
+ *
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+declare(strict_types=1);
+
+namespace PhpOffice\PhpWord\Shared;
+
+class Css
+{
+    /**
+     * @var string
+     */
+    private $cssContent;
+
+    /**
+     * @var array<string, array<string, string>>
+     */
+    private $styles = [];
+
+    public function __construct(string $cssContent)
+    {
+        $this->cssContent = $cssContent;
+    }
+
+    public function process(): void
+    {
+        $cssContent = str_replace(["\r", "\n"], '', $this->cssContent);
+        preg_match_all('/(.+?)\s?\{\s?(.+?)\s?\}/', $cssContent, $cssExtracted);
+        // Check the number of extracted
+        if (count($cssExtracted) != 3) {
+            return;
+        }
+        // Check if there are x selectors and x rules
+        if (count($cssExtracted[1]) != count($cssExtracted[2])) {
+            return;
+        }
+
+        foreach ($cssExtracted[1] as $key => $selector) {
+            $rules = trim($cssExtracted[2][$key]);
+            $rules = explode(';', $rules);
+            foreach ($rules as $rule) {
+                if (empty($rule)) {
+                    continue;
+                }
+                [$key, $value] = explode(':', trim($rule));
+                $this->styles[$this->sanitize($selector)][$this->sanitize($key)] = $this->sanitize($value);
+            }
+        }
+    }
+
+    public function getStyles(): array
+    {
+        return $this->styles;
+    }
+
+    public function getStyle(string $selector): array
+    {
+        $selector = $this->sanitize($selector);
+
+        return $this->styles[$selector] ?? [];
+    }
+
+    private function sanitize(string $value): string
+    {
+        return addslashes(trim($value));
+    }
+}
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Shared/Drawing.php b/vendor/phpoffice/phpword/src/PhpWord/Shared/Drawing.php
index 531ee24544..df218108d9 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Shared/Drawing.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Shared/Drawing.php
@@ -11,23 +11,24 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Shared;
 
 /**
- * Drawing
+ * Drawing.
  */
 class Drawing
 {
     const DPI_96 = 96;
 
     /**
-     * Convert pixels to EMU
+     * Convert pixels to EMU.
      *
      * @param  int $pValue Value in pixels
+     *
      * @return int
      */
     public static function pixelsToEmu($pValue = 0)
@@ -36,9 +37,10 @@ public static function pixelsToEmu($pValue = 0)
     }
 
     /**
-     * Convert EMU to pixels
+     * Convert EMU to pixels.
      *
      * @param  int $pValue Value in EMU
+     *
      * @return int
      */
     public static function emuToPixels($pValue = 0)
@@ -51,9 +53,10 @@ public static function emuToPixels($pValue = 0)
     }
 
     /**
-     * Convert pixels to points
+     * Convert pixels to points.
      *
      * @param  int $pValue Value in pixels
+     *
      * @return float
      */
     public static function pixelsToPoints($pValue = 0)
@@ -62,9 +65,10 @@ public static function pixelsToPoints($pValue = 0)
     }
 
     /**
-     * Convert points width to centimeters
+     * Convert points width to centimeters.
      *
      * @param  int $pValue Value in points
+     *
      * @return float
      */
     public static function pointsToCentimeters($pValue = 0)
@@ -77,9 +81,10 @@ public static function pointsToCentimeters($pValue = 0)
     }
 
     /**
-     * Convert points width to pixels
+     * Convert points width to pixels.
      *
      * @param  int $pValue Value in points
+     *
      * @return float
      */
     public static function pointsToPixels($pValue = 0)
@@ -92,9 +97,10 @@ public static function pointsToPixels($pValue = 0)
     }
 
     /**
-     * Convert pixels to centimeters
+     * Convert pixels to centimeters.
      *
      * @param  int $pValue Value in pixels
+     *
      * @return float
      */
     public static function pixelsToCentimeters($pValue = 0)
@@ -104,9 +110,10 @@ public static function pixelsToCentimeters($pValue = 0)
     }
 
     /**
-     * Convert centimeters width to pixels
+     * Convert centimeters width to pixels.
      *
      * @param  int $pValue Value in centimeters
+     *
      * @return float
      */
     public static function centimetersToPixels($pValue = 0)
@@ -119,9 +126,10 @@ public static function centimetersToPixels($pValue = 0)
     }
 
     /**
-     * Convert degrees to angle
+     * Convert degrees to angle.
      *
      * @param  int $pValue Degrees
+     *
      * @return int
      */
     public static function degreesToAngle($pValue = 0)
@@ -130,9 +138,10 @@ public static function degreesToAngle($pValue = 0)
     }
 
     /**
-     * Convert angle to degrees
+     * Convert angle to degrees.
      *
      * @param  int $pValue Angle
+     *
      * @return int
      */
     public static function angleToDegrees($pValue = 0)
@@ -145,9 +154,10 @@ public static function angleToDegrees($pValue = 0)
     }
 
     /**
-     * Convert centimeters width to twips
+     * Convert centimeters width to twips.
      *
      * @param int $pValue
+     *
      * @return float
      */
     public static function centimetersToTwips($pValue = 0)
@@ -160,9 +170,10 @@ public static function centimetersToTwips($pValue = 0)
     }
 
     /**
-     * Convert twips width to centimeters
+     * Convert twips width to centimeters.
      *
      * @param int $pValue
+     *
      * @return float
      */
     public static function twipsToCentimeters($pValue = 0)
@@ -175,9 +186,10 @@ public static function twipsToCentimeters($pValue = 0)
     }
 
     /**
-     * Convert inches width to twips
+     * Convert inches width to twips.
      *
      * @param int $pValue
+     *
      * @return float
      */
     public static function inchesToTwips($pValue = 0)
@@ -190,9 +202,10 @@ public static function inchesToTwips($pValue = 0)
     }
 
     /**
-     * Convert twips width to inches
+     * Convert twips width to inches.
      *
      * @param int $pValue
+     *
      * @return float
      */
     public static function twipsToInches($pValue = 0)
@@ -205,9 +218,10 @@ public static function twipsToInches($pValue = 0)
     }
 
     /**
-     * Convert twips width to pixels
+     * Convert twips width to pixels.
      *
      * @param int $pValue
+     *
      * @return float
      */
     public static function twipsToPixels($pValue = 0)
@@ -220,9 +234,10 @@ public static function twipsToPixels($pValue = 0)
     }
 
     /**
-     * Convert HTML hexadecimal to RGB
+     * Convert HTML hexadecimal to RGB.
      *
      * @param string $pValue HTML Color in hexadecimal
+     *
      * @return array|false Value in RGB
      */
     public static function htmlToRGB($pValue)
@@ -232,9 +247,9 @@ public static function htmlToRGB($pValue)
         }
 
         if (strlen($pValue) == 6) {
-            list($colorR, $colorG, $colorB) = array($pValue[0] . $pValue[1], $pValue[2] . $pValue[3], $pValue[4] . $pValue[5]);
+            [$colorR, $colorG, $colorB] = [$pValue[0] . $pValue[1], $pValue[2] . $pValue[3], $pValue[4] . $pValue[5]];
         } elseif (strlen($pValue) == 3) {
-            list($colorR, $colorG, $colorB) = array($pValue[0] . $pValue[0], $pValue[1] . $pValue[1], $pValue[2] . $pValue[2]);
+            [$colorR, $colorG, $colorB] = [$pValue[0] . $pValue[0], $pValue[1] . $pValue[1], $pValue[2] . $pValue[2]];
         } else {
             return false;
         }
@@ -243,6 +258,6 @@ public static function htmlToRGB($pValue)
         $colorG = hexdec($colorG);
         $colorB = hexdec($colorB);
 
-        return array($colorR, $colorG, $colorB);
+        return [$colorR, $colorG, $colorB];
     }
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Shared/Html.php b/vendor/phpoffice/phpword/src/PhpWord/Shared/Html.php
index a2ea946524..f65c67435b 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Shared/Html.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Shared/Html.php
@@ -11,12 +11,17 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Shared;
 
+use DOMAttr;
+use DOMDocument;
+use DOMNode;
+use DOMXPath;
+use Exception;
 use PhpOffice\PhpWord\Element\AbstractContainer;
 use PhpOffice\PhpWord\Element\Row;
 use PhpOffice\PhpWord\Element\Table;
@@ -26,16 +31,25 @@
 use PhpOffice\PhpWord\Style\Paragraph;
 
 /**
- * Common Html functions
+ * Common Html functions.
  *
  * @SuppressWarnings(PHPMD.UnusedPrivateMethod) For readWPNode
  */
 class Html
 {
+    private const RGB_REGEXP = '/^\s*rgb\s*[(]\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*[)]\s*$/';
+
     protected static $listIndex = 0;
+
     protected static $xpath;
+
     protected static $options;
 
+    /**
+     * @var Css
+     */
+    protected static $css;
+
     /**
      * Add HTML parts.
      *
@@ -47,25 +61,22 @@ class Html
      * @param string $html The code to parse
      * @param bool $fullHTML If it's a full HTML, no need to add 'body' tag
      * @param bool $preserveWhiteSpace If false, the whitespaces between nodes will be removed
-     * @param array $options:
-     *                + IMG_SRC_SEARCH: optional to speed up images loading from remote url when files can be found locally
-     *                + IMG_SRC_REPLACE: optional to speed up images loading from remote url when files can be found locally
      */
-    public static function addHtml($element, $html, $fullHTML = false, $preserveWhiteSpace = true, $options = null)
+    public static function addHtml($element, $html, $fullHTML = false, $preserveWhiteSpace = true, $options = null): void
     {
         /*
          * @todo parse $stylesheet for default styles.  Should result in an array based on id, class and element,
          * which could be applied when such an element occurs in the parseNode function.
          */
-        self::$options = $options;
+        static::$options = $options;
 
         // Preprocess: remove all line ends, decode HTML entity,
         // fix ampersand and angle brackets and add body tag for HTML fragments
-        $html = str_replace(array("\n", "\r"), '', $html);
-        $html = str_replace(array('&lt;', '&gt;', '&amp;', '&quot;'), array('_lt_', '_gt_', '_amp_', '_quot_'), $html);
+        $html = str_replace(["\n", "\r"], '', $html);
+        $html = str_replace(['&lt;', '&gt;', '&amp;', '&quot;'], ['_lt_', '_gt_', '_amp_', '_quot_'], $html);
         $html = html_entity_decode($html, ENT_QUOTES, 'UTF-8');
         $html = str_replace('&', '&amp;', $html);
-        $html = str_replace(array('_lt_', '_gt_', '_amp_', '_quot_'), array('&lt;', '&gt;', '&amp;', '&quot;'), $html);
+        $html = str_replace(['_lt_', '_gt_', '_amp_', '_quot_'], ['&lt;', '&gt;', '&amp;', '&quot;'], $html);
 
         if (false === $fullHTML) {
             $html = '<body>' . $html . '</body>';
@@ -75,41 +86,44 @@ public static function addHtml($element, $html, $fullHTML = false, $preserveWhit
         if (\PHP_VERSION_ID < 80000) {
             $orignalLibEntityLoader = libxml_disable_entity_loader(true);
         }
-        $dom = new \DOMDocument();
+        $dom = new DOMDocument();
         $dom->preserveWhiteSpace = $preserveWhiteSpace;
         $dom->loadXML($html);
-        self::$xpath = new \DOMXPath($dom);
+        static::$xpath = new DOMXPath($dom);
         $node = $dom->getElementsByTagName('body');
 
-        self::parseNode($node->item(0), $element);
+        static::parseNode($node->item(0), $element);
         if (\PHP_VERSION_ID < 80000) {
             libxml_disable_entity_loader($orignalLibEntityLoader);
         }
     }
 
     /**
-     * parse Inline style of a node
+     * parse Inline style of a node.
+     *
+     * @param DOMNode $node Node to check on attributes and to compile a style array
+     * @param array<string, mixed> $styles is supplied, the inline style attributes are added to the already existing style
      *
-     * @param \DOMNode $node Node to check on attributes and to compile a style array
-     * @param array $styles is supplied, the inline style attributes are added to the already existing style
      * @return array
      */
-    protected static function parseInlineStyle($node, $styles = array())
+    protected static function parseInlineStyle($node, $styles = [])
     {
         if (XML_ELEMENT_NODE == $node->nodeType) {
             $attributes = $node->attributes; // get all the attributes(eg: id, class)
 
+            $attributeDir = $attributes->getNamedItem('dir');
+            $attributeDirValue = $attributeDir ? $attributeDir->nodeValue : '';
+            $bidi = $attributeDirValue === 'rtl';
             foreach ($attributes as $attribute) {
                 $val = $attribute->value;
                 switch (strtolower($attribute->name)) {
-                    case 'style':
-                        $styles = self::parseStyle($attribute, $styles);
-                        break;
                     case 'align':
-                        $styles['alignment'] = self::mapAlign(trim($val));
+                        $styles['alignment'] = self::mapAlign(trim($val), $bidi);
+
                         break;
                     case 'lang':
                         $styles['lang'] = $val;
+
                         break;
                     case 'width':
                         // tables, cells
@@ -122,24 +136,46 @@ protected static function parseInlineStyle($node, $styles = array())
                             $styles['width'] = Converter::pixelToTwip($val);
                             $styles['unit'] = \PhpOffice\PhpWord\SimpleType\TblWidth::TWIP;
                         }
+
                         break;
                     case 'cellspacing':
                         // tables e.g. <table cellspacing="2">,  where "2" = 2px (always pixels)
                         $val = (int) $val . 'px';
                         $styles['cellSpacing'] = Converter::cssToTwip($val);
+
                         break;
                     case 'bgcolor':
                         // tables, rows, cells e.g. <tr bgColor="#FF0000">
-                        $styles['bgColor'] = trim($val, '# ');
+                        $styles['bgColor'] = self::convertRgb($val);
+
                         break;
                     case 'valign':
                         // cells e.g. <td valign="middle">
                         if (preg_match('#(?:top|bottom|middle|baseline)#i', $val, $matches)) {
                             $styles['valign'] = self::mapAlignVertical($matches[0]);
                         }
+
                         break;
                 }
             }
+
+            $attributeIdentifier = $attributes->getNamedItem('id');
+            if ($attributeIdentifier && self::$css) {
+                $styles = self::parseStyleDeclarations(self::$css->getStyle('#' . $attributeIdentifier->nodeValue), $styles);
+            }
+
+            $attributeClass = $attributes->getNamedItem('class');
+            if ($attributeClass) {
+                if (self::$css) {
+                    $styles = self::parseStyleDeclarations(self::$css->getStyle('.' . $attributeClass->nodeValue), $styles);
+                }
+                $styles['className'] = $attributeClass->nodeValue;
+            }
+
+            $attributeStyle = $attributes->getNamedItem('style');
+            if ($attributeStyle) {
+                $styles = self::parseStyle($attributeStyle, $styles);
+            }
         }
 
         return $styles;
@@ -148,71 +184,78 @@ protected static function parseInlineStyle($node, $styles = array())
     /**
      * Parse a node and add a corresponding element to the parent element.
      *
-     * @param \DOMNode $node node to parse
+     * @param DOMNode $node node to parse
      * @param \PhpOffice\PhpWord\Element\AbstractContainer $element object to add an element corresponding with the node
      * @param array $styles Array with all styles
      * @param array $data Array to transport data to a next level in the DOM tree, for example level of listitems
      */
-    protected static function parseNode($node, $element, $styles = array(), $data = array())
+    protected static function parseNode($node, $element, $styles = [], $data = []): void
     {
+        if ($node->nodeName == 'style') {
+            self::$css = new Css($node->textContent);
+            self::$css->process();
+
+            return;
+        }
+
         // Populate styles array
-        $styleTypes = array('font', 'paragraph', 'list', 'table', 'row', 'cell');
+        $styleTypes = ['font', 'paragraph', 'list', 'table', 'row', 'cell'];
         foreach ($styleTypes as $styleType) {
             if (!isset($styles[$styleType])) {
-                $styles[$styleType] = array();
+                $styles[$styleType] = [];
             }
         }
 
         // Node mapping table
-        $nodes = array(
-                              // $method        $node   $element    $styles     $data   $argument1      $argument2
-            'p'         => array('Paragraph',   $node,  $element,   $styles,    null,   null,           null),
-            'h1'        => array('Heading',     null,   $element,   $styles,    null,   'Heading1',     null),
-            'h2'        => array('Heading',     null,   $element,   $styles,    null,   'Heading2',     null),
-            'h3'        => array('Heading',     null,   $element,   $styles,    null,   'Heading3',     null),
-            'h4'        => array('Heading',     null,   $element,   $styles,    null,   'Heading4',     null),
-            'h5'        => array('Heading',     null,   $element,   $styles,    null,   'Heading5',     null),
-            'h6'        => array('Heading',     null,   $element,   $styles,    null,   'Heading6',     null),
-            '#text'     => array('Text',        $node,  $element,   $styles,    null,   null,           null),
-            'strong'    => array('Property',    null,   null,       $styles,    null,   'bold',         true),
-            'b'         => array('Property',    null,   null,       $styles,    null,   'bold',         true),
-            'em'        => array('Property',    null,   null,       $styles,    null,   'italic',       true),
-            'i'         => array('Property',    null,   null,       $styles,    null,   'italic',       true),
-            'u'         => array('Property',    null,   null,       $styles,    null,   'underline',    'single'),
-            'sup'       => array('Property',    null,   null,       $styles,    null,   'superScript',  true),
-            'sub'       => array('Property',    null,   null,       $styles,    null,   'subScript',    true),
-            'span'      => array('Span',        $node,  null,       $styles,    null,   null,           null),
-            'font'      => array('Span',        $node,  null,       $styles,    null,   null,           null),
-            'table'     => array('Table',       $node,  $element,   $styles,    null,   null,           null),
-            'tr'        => array('Row',         $node,  $element,   $styles,    null,   null,           null),
-            'td'        => array('Cell',        $node,  $element,   $styles,    null,   null,           null),
-            'th'        => array('Cell',        $node,  $element,   $styles,    null,   null,           null),
-            'ul'        => array('List',        $node,  $element,   $styles,    $data,  null,           null),
-            'ol'        => array('List',        $node,  $element,   $styles,    $data,  null,           null),
-            'li'        => array('ListItem',    $node,  $element,   $styles,    $data,  null,           null),
-            'img'       => array('Image',       $node,  $element,   $styles,    null,   null,           null),
-            'br'        => array('LineBreak',   null,   $element,   $styles,    null,   null,           null),
-            'a'         => array('Link',        $node,  $element,   $styles,    null,   null,           null),
-            'input'     => array('Input',       $node,  $element,   $styles,    null,   null,           null),
-            'hr'        => array('HorizRule',   $node,  $element,   $styles,    null,   null,           null),
-        );
+        $nodes = [
+            // $method        $node   $element    $styles     $data   $argument1      $argument2
+            'p' => ['Paragraph',   $node,  $element,   $styles,    null,   null,           null],
+            'h1' => ['Heading',     null,   $element,   $styles,    null,   'Heading1',     null],
+            'h2' => ['Heading',     null,   $element,   $styles,    null,   'Heading2',     null],
+            'h3' => ['Heading',     null,   $element,   $styles,    null,   'Heading3',     null],
+            'h4' => ['Heading',     null,   $element,   $styles,    null,   'Heading4',     null],
+            'h5' => ['Heading',     null,   $element,   $styles,    null,   'Heading5',     null],
+            'h6' => ['Heading',     null,   $element,   $styles,    null,   'Heading6',     null],
+            '#text' => ['Text',        $node,  $element,   $styles,    null,   null,           null],
+            'strong' => ['Property',    null,   null,       $styles,    null,   'bold',         true],
+            'b' => ['Property',    null,   null,       $styles,    null,   'bold',         true],
+            'em' => ['Property',    null,   null,       $styles,    null,   'italic',       true],
+            'i' => ['Property',    null,   null,       $styles,    null,   'italic',       true],
+            'u' => ['Property',    null,   null,       $styles,    null,   'underline',    'single'],
+            'sup' => ['Property',    null,   null,       $styles,    null,   'superScript',  true],
+            'sub' => ['Property',    null,   null,       $styles,    null,   'subScript',    true],
+            'span' => ['Span',        $node,  null,       $styles,    null,   null,           null],
+            'font' => ['Span',        $node,  null,       $styles,    null,   null,           null],
+            'table' => ['Table',       $node,  $element,   $styles,    null,   null,           null],
+            'tr' => ['Row',         $node,  $element,   $styles,    null,   null,           null],
+            'td' => ['Cell',        $node,  $element,   $styles,    null,   null,           null],
+            'th' => ['Cell',        $node,  $element,   $styles,    null,   null,           null],
+            'ul' => ['List',        $node,  $element,   $styles,    $data,  null,           null],
+            'ol' => ['List',        $node,  $element,   $styles,    $data,  null,           null],
+            'li' => ['ListItem',    $node,  $element,   $styles,    $data,  null,           null],
+            'img' => ['Image',       $node,  $element,   $styles,    null,   null,           null],
+            'br' => ['LineBreak',   null,   $element,   $styles,    null,   null,           null],
+            'a' => ['Link',        $node,  $element,   $styles,    null,   null,           null],
+            'input' => ['Input',       $node,  $element,   $styles,    null,   null,           null],
+            'hr' => ['HorizRule',   $node,  $element,   $styles,    null,   null,           null],
+        ];
 
         $newElement = null;
-        $keys = array('node', 'element', 'styles', 'data', 'argument1', 'argument2');
+        $keys = ['node', 'element', 'styles', 'data', 'argument1', 'argument2'];
 
         if (isset($nodes[$node->nodeName])) {
             // Execute method based on node mapping table and return $newElement or null
             // Arguments are passed by reference
-            $arguments = array();
-            $args = array();
-            list($method, $args[0], $args[1], $args[2], $args[3], $args[4], $args[5]) = $nodes[$node->nodeName];
-            for ($i = 0; $i <= 5; $i++) {
+            $arguments = [];
+            $args = [];
+            [$method, $args[0], $args[1], $args[2], $args[3], $args[4], $args[5]] = $nodes[$node->nodeName];
+            for ($i = 0; $i <= 5; ++$i) {
                 if ($args[$i] !== null) {
                     $arguments[$keys[$i]] = &$args[$i];
                 }
             }
             $method = "parse{$method}";
-            $newElement = call_user_func_array(array('PhpOffice\PhpWord\Shared\Html', $method), array_values($arguments));
+            $newElement = call_user_func_array(['PhpOffice\PhpWord\Shared\Html', $method], array_values($arguments));
 
             // Retrieve back variables from arguments
             foreach ($keys as $key) {
@@ -232,12 +275,12 @@ protected static function parseNode($node, $element, $styles = array(), $data =
     /**
      * Parse child nodes.
      *
-     * @param \DOMNode $node
-     * @param \PhpOffice\PhpWord\Element\AbstractContainer $element
+     * @param DOMNode $node
+     * @param \PhpOffice\PhpWord\Element\AbstractContainer|Row|Table $element
      * @param array $styles
      * @param array $data
      */
-    protected static function parseChildNodes($node, $element, $styles, $data)
+    protected static function parseChildNodes($node, $element, $styles, $data): void
     {
         if ('li' != $node->nodeName) {
             $cNodes = $node->childNodes;
@@ -252,51 +295,56 @@ protected static function parseChildNodes($node, $element, $styles, $data)
     }
 
     /**
-     * Parse paragraph node
+     * Parse paragraph node.
      *
-     * @param \DOMNode $node
+     * @param DOMNode $node
      * @param \PhpOffice\PhpWord\Element\AbstractContainer $element
      * @param array &$styles
-     * @return \PhpOffice\PhpWord\Element\TextRun
+     *
+     * @return \PhpOffice\PhpWord\Element\PageBreak|\PhpOffice\PhpWord\Element\TextRun
      */
     protected static function parseParagraph($node, $element, &$styles)
     {
         $styles['paragraph'] = self::recursiveParseStylesInHierarchy($node, $styles['paragraph']);
-        $newElement = $element->addTextRun($styles['paragraph']);
+        if (isset($styles['paragraph']['isPageBreak']) && $styles['paragraph']['isPageBreak']) {
+            return $element->addPageBreak();
+        }
 
-        return $newElement;
+        return $element->addTextRun($styles['paragraph']);
     }
 
     /**
-     * Parse input node
+     * Parse input node.
      *
-     * @param \DOMNode $node
+     * @param DOMNode $node
      * @param \PhpOffice\PhpWord\Element\AbstractContainer $element
      * @param array &$styles
      */
-    protected static function parseInput($node, $element, &$styles)
+    protected static function parseInput($node, $element, &$styles): void
     {
         $attributes = $node->attributes;
         if (null === $attributes->getNamedItem('type')) {
             return;
         }
 
-        $inputType = $attributes->getNamedItem('type')->value;
+        $inputType = $attributes->getNamedItem('type')->nodeValue;
         switch ($inputType) {
             case 'checkbox':
-                $checked = ($checked = $attributes->getNamedItem('checked')) && $checked->value === 'true' ? true : false;
+                $checked = ($checked = $attributes->getNamedItem('checked')) && $checked->nodeValue === 'true' ? true : false;
                 $textrun = $element->addTextRun($styles['paragraph']);
                 $textrun->addFormField('checkbox')->setValue($checked);
+
                 break;
         }
     }
 
     /**
-     * Parse heading node
+     * Parse heading node.
      *
      * @param \PhpOffice\PhpWord\Element\AbstractContainer $element
      * @param array &$styles
      * @param string $argument1 Name of heading style
+     *
      * @return \PhpOffice\PhpWord\Element\TextRun
      *
      * @todo Think of a clever way of defining header styles, now it is only based on the assumption, that
@@ -311,13 +359,13 @@ protected static function parseHeading($element, &$styles, $argument1)
     }
 
     /**
-     * Parse text node
+     * Parse text node.
      *
-     * @param \DOMNode $node
+     * @param DOMNode $node
      * @param \PhpOffice\PhpWord\Element\AbstractContainer $element
      * @param array &$styles
      */
-    protected static function parseText($node, $element, &$styles)
+    protected static function parseText($node, $element, &$styles): void
     {
         $styles['font'] = self::recursiveParseStylesInHierarchy($node, $styles['font']);
 
@@ -326,40 +374,41 @@ protected static function parseText($node, $element, &$styles)
             $styles['paragraph']['alignment'] = $styles['font']['alignment'];
         }
 
-        if (is_callable(array($element, 'addText'))) {
+        if (is_callable([$element, 'addText'])) {
             $element->addText($node->nodeValue, $styles['font'], $styles['paragraph']);
         }
     }
 
     /**
-     * Parse property node
+     * Parse property node.
      *
      * @param array &$styles
      * @param string $argument1 Style name
      * @param string $argument2 Style value
      */
-    protected static function parseProperty(&$styles, $argument1, $argument2)
+    protected static function parseProperty(&$styles, $argument1, $argument2): void
     {
         $styles['font'][$argument1] = $argument2;
     }
 
     /**
-     * Parse span node
+     * Parse span node.
      *
-     * @param \DOMNode $node
+     * @param DOMNode $node
      * @param array &$styles
      */
-    protected static function parseSpan($node, &$styles)
+    protected static function parseSpan($node, &$styles): void
     {
         self::parseInlineStyle($node, $styles['font']);
     }
 
     /**
-     * Parse table node
+     * Parse table node.
      *
-     * @param \DOMNode $node
+     * @param DOMNode $node
      * @param \PhpOffice\PhpWord\Element\AbstractContainer $element
      * @param array &$styles
+     *
      * @return Table $element
      *
      * @todo As soon as TableItem, RowItem and CellItem support relative width and height
@@ -370,27 +419,27 @@ protected static function parseTable($node, $element, &$styles)
 
         $newElement = $element->addTable($elementStyles);
 
-        // $attributes = $node->attributes;
-        // if ($attributes->getNamedItem('width') !== null) {
-        // $newElement->setWidth($attributes->getNamedItem('width')->value);
-        // }
+        // Add style name from CSS Class
+        if (isset($elementStyles['className'])) {
+            $newElement->getStyle()->setStyleName($elementStyles['className']);
+        }
 
-        // if ($attributes->getNamedItem('height') !== null) {
-        // $newElement->setHeight($attributes->getNamedItem('height')->value);
-        // }
-        // if ($attributes->getNamedItem('width') !== null) {
-        // $newElement=$element->addCell($width=$attributes->getNamedItem('width')->value);
-        // }
+        $attributes = $node->attributes;
+        if ($attributes->getNamedItem('border')) {
+            $border = (int) $attributes->getNamedItem('border')->nodeValue;
+            $newElement->getStyle()->setBorderSize(Converter::pixelToTwip($border));
+        }
 
         return $newElement;
     }
 
     /**
-     * Parse a table row
+     * Parse a table row.
      *
-     * @param \DOMNode $node
+     * @param DOMNode $node
      * @param \PhpOffice\PhpWord\Element\Table $element
      * @param array &$styles
+     *
      * @return Row $element
      */
     protected static function parseRow($node, $element, &$styles)
@@ -400,15 +449,20 @@ protected static function parseRow($node, $element, &$styles)
             $rowStyles['tblHeader'] = true;
         }
 
-        return $element->addRow(null, $rowStyles);
+        // set cell height to control row heights
+        $height = $rowStyles['height'] ?? null;
+        unset($rowStyles['height']); // would not apply
+
+        return $element->addRow($height, $rowStyles);
     }
 
     /**
-     * Parse table cell
+     * Parse table cell.
      *
-     * @param \DOMNode $node
+     * @param DOMNode $node
      * @param \PhpOffice\PhpWord\Element\Table $element
      * @param array &$styles
+     *
      * @return \PhpOffice\PhpWord\Element\Cell|\PhpOffice\PhpWord\Element\TextRun $element
      */
     protected static function parseCell($node, $element, &$styles)
@@ -421,7 +475,7 @@ protected static function parseCell($node, $element, &$styles)
         }
 
         // set cell width to control column widths
-        $width = isset($cellStyles['width']) ? $cellStyles['width'] : null;
+        $width = $cellStyles['width'] ?? null;
         unset($cellStyles['width']); // would not apply
         $cell = $element->addCell($width, $cellStyles);
 
@@ -433,14 +487,13 @@ protected static function parseCell($node, $element, &$styles)
     }
 
     /**
-     * Checks if $node contains an HTML element that cannot be added to TextRun
+     * Checks if $node contains an HTML element that cannot be added to TextRun.
      *
-     * @param \DOMNode $node
      * @return bool Returns true if the node contains an HTML element that cannot be added to TextRun
      */
-    protected static function shouldAddTextRun(\DOMNode $node)
+    protected static function shouldAddTextRun(DOMNode $node)
     {
-        $containsBlockElement = self::$xpath->query('.//table|./p|./ul|./ol', $node)->length > 0;
+        $containsBlockElement = self::$xpath->query('.//table|./p|./ul|./ol|./h1|./h2|./h3|./h4|./h5|./h6', $node)->length > 0;
         if ($containsBlockElement) {
             return false;
         }
@@ -451,15 +504,12 @@ protected static function shouldAddTextRun(\DOMNode $node)
     /**
      * Recursively parses styles on parent nodes
      * TODO if too slow, add caching of parent nodes, !! everything is static here so watch out for concurrency !!
-     *
-     * @param \DOMNode $node
-     * @param array &$styles
      */
-    protected static function recursiveParseStylesInHierarchy(\DOMNode $node, array $style)
+    protected static function recursiveParseStylesInHierarchy(DOMNode $node, array $style)
     {
-        $parentStyle = array();
+        $parentStyle = [];
         if ($node->parentNode != null && XML_ELEMENT_NODE == $node->parentNode->nodeType) {
-            $parentStyle = self::recursiveParseStylesInHierarchy($node->parentNode, array());
+            $parentStyle = self::recursiveParseStylesInHierarchy($node->parentNode, []);
         }
         if ($node->nodeName === '#text') {
             $parentStyle = array_merge($parentStyle, $style);
@@ -472,13 +522,11 @@ protected static function recursiveParseStylesInHierarchy(\DOMNode $node, array
     }
 
     /**
-     * Removes non-inherited styles from array
-     *
-     * @param array &$styles
+     * Removes non-inherited styles from array.
      */
     protected static function filterOutNonInheritedStyles(array $styles)
     {
-        $nonInheritedStyles = array(
+        $nonInheritedStyles = [
             'borderSize',
             'borderTopSize',
             'borderRightSize',
@@ -495,7 +543,7 @@ protected static function filterOutNonInheritedStyles(array $styles)
             'underline',
             'strikethrough',
             'hidden',
-        );
+        ];
 
         $styles = array_diff_key($styles, array_flip($nonInheritedStyles));
 
@@ -503,9 +551,9 @@ protected static function filterOutNonInheritedStyles(array $styles)
     }
 
     /**
-     * Parse list node
+     * Parse list node.
      *
-     * @param \DOMNode $node
+     * @param DOMNode $node
      * @param \PhpOffice\PhpWord\Element\AbstractContainer $element
      * @param array &$styles
      * @param array &$data
@@ -514,7 +562,7 @@ protected static function parseList($node, $element, &$styles, &$data)
     {
         $isOrderedList = $node->nodeName === 'ol';
         if (isset($data['listdepth'])) {
-            $data['listdepth']++;
+            ++$data['listdepth'];
         } else {
             $data['listdepth'] = 0;
             $styles['list'] = 'listStyle_' . self::$listIndex++;
@@ -527,9 +575,11 @@ protected static function parseList($node, $element, &$styles, &$data)
                 switch ($attribute->name) {
                     case 'start':
                         $start = (int) $attribute->value;
+
                         break;
                     case 'type':
                         $type = $attribute->value;
+
                         break;
                 }
             }
@@ -552,47 +602,48 @@ protected static function parseList($node, $element, &$styles, &$data)
 
     /**
      * @param bool $isOrderedList
+     *
      * @return array
      */
     protected static function getListStyle($isOrderedList)
     {
         if ($isOrderedList) {
-            return array(
-                'type'   => 'multilevel',
-                'levels' => array(
-                    array('format' => NumberFormat::DECIMAL,      'text' => '%1.', 'alignment' => 'left',  'tabPos' => 720,  'left' => 720,  'hanging' => 360),
-                    array('format' => NumberFormat::LOWER_LETTER, 'text' => '%2.', 'alignment' => 'left',  'tabPos' => 1440, 'left' => 1440, 'hanging' => 360),
-                    array('format' => NumberFormat::LOWER_ROMAN,  'text' => '%3.', 'alignment' => 'right', 'tabPos' => 2160, 'left' => 2160, 'hanging' => 180),
-                    array('format' => NumberFormat::DECIMAL,      'text' => '%4.', 'alignment' => 'left',  'tabPos' => 2880, 'left' => 2880, 'hanging' => 360),
-                    array('format' => NumberFormat::LOWER_LETTER, 'text' => '%5.', 'alignment' => 'left',  'tabPos' => 3600, 'left' => 3600, 'hanging' => 360),
-                    array('format' => NumberFormat::LOWER_ROMAN,  'text' => '%6.', 'alignment' => 'right', 'tabPos' => 4320, 'left' => 4320, 'hanging' => 180),
-                    array('format' => NumberFormat::DECIMAL,      'text' => '%7.', 'alignment' => 'left',  'tabPos' => 5040, 'left' => 5040, 'hanging' => 360),
-                    array('format' => NumberFormat::LOWER_LETTER, 'text' => '%8.', 'alignment' => 'left',  'tabPos' => 5760, 'left' => 5760, 'hanging' => 360),
-                    array('format' => NumberFormat::LOWER_ROMAN,  'text' => '%9.', 'alignment' => 'right', 'tabPos' => 6480, 'left' => 6480, 'hanging' => 180),
-                ),
-            );
+            return [
+                'type' => 'multilevel',
+                'levels' => [
+                    ['format' => NumberFormat::DECIMAL,      'text' => '%1.', 'alignment' => 'left',  'tabPos' => 720,  'left' => 720,  'hanging' => 360],
+                    ['format' => NumberFormat::LOWER_LETTER, 'text' => '%2.', 'alignment' => 'left',  'tabPos' => 1440, 'left' => 1440, 'hanging' => 360],
+                    ['format' => NumberFormat::LOWER_ROMAN,  'text' => '%3.', 'alignment' => 'right', 'tabPos' => 2160, 'left' => 2160, 'hanging' => 180],
+                    ['format' => NumberFormat::DECIMAL,      'text' => '%4.', 'alignment' => 'left',  'tabPos' => 2880, 'left' => 2880, 'hanging' => 360],
+                    ['format' => NumberFormat::LOWER_LETTER, 'text' => '%5.', 'alignment' => 'left',  'tabPos' => 3600, 'left' => 3600, 'hanging' => 360],
+                    ['format' => NumberFormat::LOWER_ROMAN,  'text' => '%6.', 'alignment' => 'right', 'tabPos' => 4320, 'left' => 4320, 'hanging' => 180],
+                    ['format' => NumberFormat::DECIMAL,      'text' => '%7.', 'alignment' => 'left',  'tabPos' => 5040, 'left' => 5040, 'hanging' => 360],
+                    ['format' => NumberFormat::LOWER_LETTER, 'text' => '%8.', 'alignment' => 'left',  'tabPos' => 5760, 'left' => 5760, 'hanging' => 360],
+                    ['format' => NumberFormat::LOWER_ROMAN,  'text' => '%9.', 'alignment' => 'right', 'tabPos' => 6480, 'left' => 6480, 'hanging' => 180],
+                ],
+            ];
         }
 
-        return array(
-            'type'   => 'hybridMultilevel',
-            'levels' => array(
-                array('format' => NumberFormat::BULLET, 'text' => '', 'alignment' => 'left', 'tabPos' => 720,  'left' => 720,  'hanging' => 360, 'font' => 'Symbol',      'hint' => 'default'),
-                array('format' => NumberFormat::BULLET, 'text' => 'o',  'alignment' => 'left', 'tabPos' => 1440, 'left' => 1440, 'hanging' => 360, 'font' => 'Courier New', 'hint' => 'default'),
-                array('format' => NumberFormat::BULLET, 'text' => '', 'alignment' => 'left', 'tabPos' => 2160, 'left' => 2160, 'hanging' => 360, 'font' => 'Wingdings',   'hint' => 'default'),
-                array('format' => NumberFormat::BULLET, 'text' => '', 'alignment' => 'left', 'tabPos' => 2880, 'left' => 2880, 'hanging' => 360, 'font' => 'Symbol',      'hint' => 'default'),
-                array('format' => NumberFormat::BULLET, 'text' => 'o',  'alignment' => 'left', 'tabPos' => 3600, 'left' => 3600, 'hanging' => 360, 'font' => 'Courier New', 'hint' => 'default'),
-                array('format' => NumberFormat::BULLET, 'text' => '', 'alignment' => 'left', 'tabPos' => 4320, 'left' => 4320, 'hanging' => 360, 'font' => 'Wingdings',   'hint' => 'default'),
-                array('format' => NumberFormat::BULLET, 'text' => '', 'alignment' => 'left', 'tabPos' => 5040, 'left' => 5040, 'hanging' => 360, 'font' => 'Symbol',      'hint' => 'default'),
-                array('format' => NumberFormat::BULLET, 'text' => 'o',  'alignment' => 'left', 'tabPos' => 5760, 'left' => 5760, 'hanging' => 360, 'font' => 'Courier New', 'hint' => 'default'),
-                array('format' => NumberFormat::BULLET, 'text' => '', 'alignment' => 'left', 'tabPos' => 6480, 'left' => 6480, 'hanging' => 360, 'font' => 'Wingdings',   'hint' => 'default'),
-            ),
-        );
+        return [
+            'type' => 'hybridMultilevel',
+            'levels' => [
+                ['format' => NumberFormat::BULLET, 'text' => '', 'alignment' => 'left', 'tabPos' => 720,  'left' => 720,  'hanging' => 360, 'font' => 'Symbol',      'hint' => 'default'],
+                ['format' => NumberFormat::BULLET, 'text' => 'o',  'alignment' => 'left', 'tabPos' => 1440, 'left' => 1440, 'hanging' => 360, 'font' => 'Courier New', 'hint' => 'default'],
+                ['format' => NumberFormat::BULLET, 'text' => '', 'alignment' => 'left', 'tabPos' => 2160, 'left' => 2160, 'hanging' => 360, 'font' => 'Wingdings',   'hint' => 'default'],
+                ['format' => NumberFormat::BULLET, 'text' => '', 'alignment' => 'left', 'tabPos' => 2880, 'left' => 2880, 'hanging' => 360, 'font' => 'Symbol',      'hint' => 'default'],
+                ['format' => NumberFormat::BULLET, 'text' => 'o',  'alignment' => 'left', 'tabPos' => 3600, 'left' => 3600, 'hanging' => 360, 'font' => 'Courier New', 'hint' => 'default'],
+                ['format' => NumberFormat::BULLET, 'text' => '', 'alignment' => 'left', 'tabPos' => 4320, 'left' => 4320, 'hanging' => 360, 'font' => 'Wingdings',   'hint' => 'default'],
+                ['format' => NumberFormat::BULLET, 'text' => '', 'alignment' => 'left', 'tabPos' => 5040, 'left' => 5040, 'hanging' => 360, 'font' => 'Symbol',      'hint' => 'default'],
+                ['format' => NumberFormat::BULLET, 'text' => 'o',  'alignment' => 'left', 'tabPos' => 5760, 'left' => 5760, 'hanging' => 360, 'font' => 'Courier New', 'hint' => 'default'],
+                ['format' => NumberFormat::BULLET, 'text' => '', 'alignment' => 'left', 'tabPos' => 6480, 'left' => 6480, 'hanging' => 360, 'font' => 'Wingdings',   'hint' => 'default'],
+            ],
+        ];
     }
 
     /**
-     * Parse list item node
+     * Parse list item node.
      *
-     * @param \DOMNode $node
+     * @param DOMNode $node
      * @param \PhpOffice\PhpWord\Element\AbstractContainer $element
      * @param array &$styles
      * @param array $data
@@ -600,7 +651,7 @@ protected static function getListStyle($isOrderedList)
      * @todo This function is almost the same like `parseChildNodes`. Merged?
      * @todo As soon as ListItem inherits from AbstractContainer or TextRun delete parsing part of childNodes
      */
-    protected static function parseListItem($node, $element, &$styles, $data)
+    protected static function parseListItem($node, $element, &$styles, $data): void
     {
         $cNodes = $node->childNodes;
         if (!empty($cNodes)) {
@@ -612,63 +663,84 @@ protected static function parseListItem($node, $element, &$styles, $data)
     }
 
     /**
-     * Parse style
+     * Parse style.
      *
-     * @param \DOMAttr $attribute
+     * @param DOMAttr $attribute
      * @param array $styles
+     *
      * @return array
      */
     protected static function parseStyle($attribute, $styles)
     {
         $properties = explode(';', trim($attribute->value, " \t\n\r\0\x0B;"));
 
+        $selectors = [];
         foreach ($properties as $property) {
-            list($cKey, $cValue) = array_pad(explode(':', $property, 2), 2, null);
-            $cValue = trim($cValue);
-            $cKey = strtolower(trim($cKey));
-            switch ($cKey) {
+            [$cKey, $cValue] = array_pad(explode(':', $property, 2), 2, null);
+            $selectors[strtolower(trim($cKey))] = trim($cValue ?? '');
+        }
+
+        return self::parseStyleDeclarations($selectors, $styles);
+    }
+
+    protected static function parseStyleDeclarations(array $selectors, array $styles)
+    {
+        $bidi = ($selectors['direction'] ?? '') === 'rtl';
+        foreach ($selectors as $property => $value) {
+            switch ($property) {
                 case 'text-decoration':
-                    switch ($cValue) {
+                    switch ($value) {
                         case 'underline':
                             $styles['underline'] = 'single';
+
                             break;
                         case 'line-through':
                             $styles['strikethrough'] = true;
+
                             break;
                     }
+
                     break;
                 case 'text-align':
-                    $styles['alignment'] = self::mapAlign($cValue);
+                    $styles['alignment'] = self::mapAlign($value, $bidi);
+
                     break;
                 case 'display':
-                    $styles['hidden'] = $cValue === 'none' || $cValue === 'hidden';
+                    $styles['hidden'] = $value === 'none' || $value === 'hidden';
+
                     break;
                 case 'direction':
-                    $styles['rtl'] = $cValue === 'rtl';
+                    $styles['rtl'] = $value === 'rtl';
+                    $styles['bidi'] = $value === 'rtl';
+
                     break;
                 case 'font-size':
-                    $styles['size'] = Converter::cssToPoint($cValue);
+                    $styles['size'] = Converter::cssToPoint($value);
+
                     break;
                 case 'font-family':
-                    $cValue = array_map('trim', explode(',', $cValue));
-                    $styles['name'] = ucwords($cValue[0]);
+                    $value = array_map('trim', explode(',', $value));
+                    $styles['name'] = ucwords($value[0]);
+
                     break;
                 case 'color':
-                    $styles['color'] = trim($cValue, '#');
+                    $styles['color'] = self::convertRgb($value);
+
                     break;
                 case 'background-color':
-                    $styles['bgColor'] = trim($cValue, '#');
+                    $styles['bgColor'] = self::convertRgb($value);
+
                     break;
                 case 'line-height':
-                    $matches = array();
-                    if ($cValue === 'normal') {
+                    $matches = [];
+                    if ($value === 'normal') {
                         $spacingLineRule = \PhpOffice\PhpWord\SimpleType\LineSpacingRule::AUTO;
                         $spacing = 0;
-                    } elseif (preg_match('/([0-9]+\.?[0-9]*[a-z]+)/', $cValue, $matches)) {
+                    } elseif (preg_match('/([0-9]+\.?[0-9]*[a-z]+)/', $value, $matches)) {
                         //matches number with a unit, e.g. 12px, 15pt, 20mm, ...
                         $spacingLineRule = \PhpOffice\PhpWord\SimpleType\LineSpacingRule::EXACT;
                         $spacing = Converter::cssToTwip($matches[1]);
-                    } elseif (preg_match('/([0-9]+)%/', $cValue, $matches)) {
+                    } elseif (preg_match('/([0-9]+)%/', $value, $matches)) {
                         //matches percentages
                         $spacingLineRule = \PhpOffice\PhpWord\SimpleType\LineSpacingRule::AUTO;
                         //we are subtracting 1 line height because the Spacing writer is adding one line
@@ -677,64 +749,89 @@ protected static function parseStyle($attribute, $styles)
                         //any other, wich is a multiplier. E.g. 1.2
                         $spacingLineRule = \PhpOffice\PhpWord\SimpleType\LineSpacingRule::AUTO;
                         //we are subtracting 1 line height because the Spacing writer is adding one line
-                        $spacing = ($cValue * Paragraph::LINE_HEIGHT) - Paragraph::LINE_HEIGHT;
+                        $spacing = ($value * Paragraph::LINE_HEIGHT) - Paragraph::LINE_HEIGHT;
                     }
                     $styles['spacingLineRule'] = $spacingLineRule;
                     $styles['line-spacing'] = $spacing;
+
                     break;
                 case 'letter-spacing':
-                    $styles['letter-spacing'] = Converter::cssToTwip($cValue);
+                    $styles['letter-spacing'] = Converter::cssToTwip($value);
+
                     break;
                 case 'text-indent':
-                    $styles['indentation']['firstLine'] = Converter::cssToTwip($cValue);
+                    $styles['indentation']['firstLine'] = Converter::cssToTwip($value);
+
                     break;
                 case 'font-weight':
                     $tValue = false;
-                    if (preg_match('#bold#', $cValue)) {
+                    if (preg_match('#bold#', $value)) {
                         $tValue = true; // also match bolder
                     }
                     $styles['bold'] = $tValue;
+
                     break;
                 case 'font-style':
                     $tValue = false;
-                    if (preg_match('#(?:italic|oblique)#', $cValue)) {
+                    if (preg_match('#(?:italic|oblique)#', $value)) {
                         $tValue = true;
                     }
                     $styles['italic'] = $tValue;
+
+                    break;
+                case 'font-variant':
+                    $tValue = false;
+                    if (preg_match('#small-caps#', $value)) {
+                        $tValue = true;
+                    }
+                    $styles['smallCaps'] = $tValue;
+
                     break;
                 case 'margin':
-                    $cValue = Converter::cssToTwip($cValue);
-                    $styles['spaceBefore'] = $cValue;
-                    $styles['spaceAfter'] = $cValue;
+                    $value = Converter::cssToTwip($value);
+                    $styles['spaceBefore'] = $value;
+                    $styles['spaceAfter'] = $value;
+
                     break;
                 case 'margin-top':
-                    // BC change: up to ver. 0.17.0 incorrectly converted to points - Converter::cssToPoint($cValue)
-                    $styles['spaceBefore'] = Converter::cssToTwip($cValue);
+                    // BC change: up to ver. 0.17.0 incorrectly converted to points - Converter::cssToPoint($value)
+                    $styles['spaceBefore'] = Converter::cssToTwip($value);
+
                     break;
                 case 'margin-bottom':
-                    // BC change: up to ver. 0.17.0 incorrectly converted to points - Converter::cssToPoint($cValue)
-                    $styles['spaceAfter'] = Converter::cssToTwip($cValue);
+                    // BC change: up to ver. 0.17.0 incorrectly converted to points - Converter::cssToPoint($value)
+                    $styles['spaceAfter'] = Converter::cssToTwip($value);
+
                     break;
                 case 'border-color':
-                    self::mapBorderColor($styles, $cValue);
+                    self::mapBorderColor($styles, $value);
+
                     break;
                 case 'border-width':
-                    $styles['borderSize'] = Converter::cssToPoint($cValue);
+                    $styles['borderSize'] = Converter::cssToPoint($value);
+
                     break;
                 case 'border-style':
-                    $styles['borderStyle'] = self::mapBorderStyle($cValue);
+                    $styles['borderStyle'] = self::mapBorderStyle($value);
+
                     break;
                 case 'width':
-                    if (preg_match('/([0-9]+[a-z]+)/', $cValue, $matches)) {
+                    if (preg_match('/([0-9]+[a-z]+)/', $value, $matches)) {
                         $styles['width'] = Converter::cssToTwip($matches[1]);
                         $styles['unit'] = \PhpOffice\PhpWord\SimpleType\TblWidth::TWIP;
-                    } elseif (preg_match('/([0-9]+)%/', $cValue, $matches)) {
+                    } elseif (preg_match('/([0-9]+)%/', $value, $matches)) {
                         $styles['width'] = $matches[1] * 50;
                         $styles['unit'] = \PhpOffice\PhpWord\SimpleType\TblWidth::PERCENT;
-                    } elseif (preg_match('/([0-9]+)/', $cValue, $matches)) {
+                    } elseif (preg_match('/([0-9]+)/', $value, $matches)) {
                         $styles['width'] = $matches[1];
                         $styles['unit'] = \PhpOffice\PhpWord\SimpleType\TblWidth::AUTO;
                     }
+
+                    break;
+                case 'height':
+                    $styles['height'] = Converter::cssToTwip($value);
+                    $styles['exactHeight'] = true;
+
                     break;
                 case 'border':
                 case 'border-top':
@@ -743,9 +840,9 @@ protected static function parseStyle($attribute, $styles)
                 case 'border-left':
                     // must have exact order [width color style], e.g. "1px #0011CC solid" or "2pt green solid"
                     // Word does not accept shortened hex colors e.g. #CCC, only full e.g. #CCCCCC
-                    if (preg_match('/([0-9]+[^0-9]*)\s+(\#[a-fA-F0-9]+|[a-zA-Z]+)\s+([a-z]+)/', $cValue, $matches)) {
-                        if (false !== strpos($cKey, '-')) {
-                            $tmp = explode('-', $cKey);
+                    if (preg_match('/([0-9]+[^0-9]*)\s+(\#[a-fA-F0-9]+|[a-zA-Z]+)\s+([a-z]+)/', $value, $matches)) {
+                        if (false !== strpos($property, '-')) {
+                            $tmp = explode('-', $property);
                             $which = $tmp[1];
                             $which = ucfirst($which); // e.g. bottom -> Bottom
                         } else {
@@ -764,12 +861,20 @@ protected static function parseStyle($attribute, $styles)
                         $styles["border{$which}Color"] = trim($matches[2], '#');
                         $styles["border{$which}Style"] = self::mapBorderStyle($matches[3]);
                     }
+
                     break;
                 case 'vertical-align':
                     // https://developer.mozilla.org/en-US/docs/Web/CSS/vertical-align
-                    if (preg_match('#(?:top|bottom|middle|sub|baseline)#i', $cValue, $matches)) {
+                    if (preg_match('#(?:top|bottom|middle|sub|baseline)#i', $value, $matches)) {
                         $styles['valign'] = self::mapAlignVertical($matches[0]);
                     }
+
+                    break;
+                case 'page-break-after':
+                    if ($value == 'always') {
+                        $styles['isPageBreak'] = true;
+                    }
+
                     break;
             }
         }
@@ -778,37 +883,62 @@ protected static function parseStyle($attribute, $styles)
     }
 
     /**
-     * Parse image node
+     * Parse image node.
      *
-     * @param \DOMNode $node
+     * @param DOMNode $node
      * @param \PhpOffice\PhpWord\Element\AbstractContainer $element
      *
      * @return \PhpOffice\PhpWord\Element\Image
-     **/
+     */
     protected static function parseImage($node, $element)
     {
-        $style = array();
+        $style = [];
         $src = null;
         foreach ($node->attributes as $attribute) {
             switch ($attribute->name) {
                 case 'src':
                     $src = $attribute->value;
+
                     break;
                 case 'width':
                     $width = $attribute->value;
+
+                    // pt
+                    if (false !== strpos($width, 'pt')) {
+                        $width = Converter::pointToPixel((float) str_replace('pt', '', $width));
+                    }
+
+                    // px
+                    if (false !== strpos($width, 'px')) {
+                        $width = str_replace('px', '', $width);
+                    }
+
                     $style['width'] = $width;
                     $style['unit'] = \PhpOffice\PhpWord\Style\Image::UNIT_PX;
+
                     break;
                 case 'height':
                     $height = $attribute->value;
+
+                    // pt
+                    if (false !== strpos($height, 'pt')) {
+                        $height = Converter::pointToPixel((float) str_replace('pt', '', $height));
+                    }
+
+                    // px
+                    if (false !== strpos($height, 'px')) {
+                        $height = str_replace('px', '', $height);
+                    }
+
                     $style['height'] = $height;
                     $style['unit'] = \PhpOffice\PhpWord\Style\Image::UNIT_PX;
+
                     break;
                 case 'style':
                     $styleattr = explode(';', $attribute->value);
                     foreach ($styleattr as $attr) {
                         if (strpos($attr, ':')) {
-                            list($k, $v) = explode(':', $attr);
+                            [$k, $v] = explode(':', $attr);
                             switch ($k) {
                                 case 'float':
                                     if (trim($v) == 'right') {
@@ -825,10 +955,12 @@ protected static function parseImage($node, $element)
                                         $style['wrap'] = \PhpOffice\PhpWord\Style\Image::WRAP_TIGHT;
                                         $style['overlap'] = true;
                                     }
+
                                     break;
                             }
                         }
                     }
+
                     break;
             }
         }
@@ -836,7 +968,7 @@ protected static function parseImage($node, $element)
         if (strpos($src, 'data:image') !== false) {
             $tmpDir = Settings::getTempDir() . '/';
 
-            $match = array();
+            $match = [];
             preg_match('/data:image\/(\w+);base64,(.+)/', $src, $match);
 
             $src = $imgFile = $tmpDir . uniqid() . '.' . $match[1];
@@ -851,18 +983,21 @@ protected static function parseImage($node, $element)
         $src = urldecode($src);
 
         if (!is_file($src)
-            && !is_null(self::$options)
-            && isset(self::$options['IMG_SRC_SEARCH'])
-            && isset(self::$options['IMG_SRC_REPLACE'])) {
+            && null !== self::$options
+            && isset(self::$options['IMG_SRC_SEARCH'], self::$options['IMG_SRC_REPLACE'])
+        ) {
             $src = str_replace(self::$options['IMG_SRC_SEARCH'], self::$options['IMG_SRC_REPLACE'], $src);
         }
 
         if (!is_file($src)) {
             if ($imgBlob = @file_get_contents($src)) {
                 $tmpDir = Settings::getTempDir() . '/';
-                $match = array();
+                $match = [];
                 preg_match('/.+\.(\w+)$/', $src, $match);
-                $src = $tmpDir . uniqid() . '.' . $match[1];
+                $src = $tmpDir . uniqid();
+                if (isset($match[1])) {
+                    $src .= '.' . $match[1];
+                }
 
                 $ifp = fopen($src, 'wb');
 
@@ -876,16 +1011,17 @@ protected static function parseImage($node, $element)
         if (is_file($src)) {
             $newElement = $element->addImage($src, $style);
         } else {
-            throw new \Exception("Could not load image $originSrc");
+            throw new Exception("Could not load image $originSrc");
         }
 
         return $newElement;
     }
 
     /**
-     * Transforms a CSS border style into a word border style
+     * Transforms a CSS border style into a word border style.
      *
      * @param string $cssBorderStyle
+     *
      * @return null|string
      */
     protected static function mapBorderStyle($cssBorderStyle)
@@ -901,45 +1037,48 @@ protected static function mapBorderStyle($cssBorderStyle)
         }
     }
 
-    protected static function mapBorderColor(&$styles, $cssBorderColor)
+    protected static function mapBorderColor(&$styles, $cssBorderColor): void
     {
         $numColors = substr_count($cssBorderColor, '#');
         if ($numColors === 1) {
             $styles['borderColor'] = trim($cssBorderColor, '#');
         } elseif ($numColors > 1) {
             $colors = explode(' ', $cssBorderColor);
-            $borders = array('borderTopColor', 'borderRightColor', 'borderBottomColor', 'borderLeftColor');
-            for ($i = 0; $i < min(4, $numColors, count($colors)); $i++) {
+            $borders = ['borderTopColor', 'borderRightColor', 'borderBottomColor', 'borderLeftColor'];
+            for ($i = 0; $i < min(4, $numColors, count($colors)); ++$i) {
                 $styles[$borders[$i]] = trim($colors[$i], '#');
             }
         }
     }
 
     /**
-     * Transforms a HTML/CSS alignment into a \PhpOffice\PhpWord\SimpleType\Jc
+     * Transforms a HTML/CSS alignment into a \PhpOffice\PhpWord\SimpleType\Jc.
      *
      * @param string $cssAlignment
-     * @return string|null
+     * @param bool $bidi
+     *
+     * @return null|string
      */
-    protected static function mapAlign($cssAlignment)
+    protected static function mapAlign($cssAlignment, $bidi)
     {
         switch ($cssAlignment) {
             case 'right':
-                return Jc::END;
+                return $bidi ? Jc::START : Jc::END;
             case 'center':
                 return Jc::CENTER;
             case 'justify':
                 return Jc::BOTH;
             default:
-                return Jc::START;
+                return $bidi ? Jc::END : Jc::START;
         }
     }
 
     /**
-     * Transforms a HTML/CSS vertical alignment
+     * Transforms a HTML/CSS vertical alignment.
      *
      * @param string $alignment
-     * @return string|null
+     *
+     * @return null|string
      */
     protected static function mapAlignVertical($alignment)
     {
@@ -966,7 +1105,7 @@ protected static function mapAlignVertical($alignment)
     }
 
     /**
-     * Map list style for ordered list
+     * Map list style for ordered list.
      *
      * @param string $cssListType
      */
@@ -988,19 +1127,19 @@ protected static function mapListType($cssListType)
     }
 
     /**
-     * Parse line break
+     * Parse line break.
      *
      * @param \PhpOffice\PhpWord\Element\AbstractContainer $element
      */
-    protected static function parseLineBreak($element)
+    protected static function parseLineBreak($element): void
     {
         $element->addTextBreak();
     }
 
     /**
-     * Parse link node
+     * Parse link node.
      *
-     * @param \DOMNode $node
+     * @param DOMNode $node
      * @param \PhpOffice\PhpWord\Element\AbstractContainer $element
      * @param array $styles
      */
@@ -1011,12 +1150,17 @@ protected static function parseLink($node, $element, &$styles)
             switch ($attribute->name) {
                 case 'href':
                     $target = $attribute->value;
+
                     break;
             }
         }
         $styles['font'] = self::parseInlineStyle($node, $styles['font']);
 
-        if (strpos($target, '#') === 0) {
+        if (empty($target)) {
+            $target = '#';
+        }
+
+        if (strpos($target, '#') === 0 && strlen($target) > 1) {
             return $element->addLink(substr($target, 1), $node->textContent, $styles['font'], $styles['paragraph'], true);
         }
 
@@ -1025,29 +1169,29 @@ protected static function parseLink($node, $element, &$styles)
 
     /**
      * Render horizontal rule
-     * Note: Word rule is not the same as HTML's <hr> since it does not support width and thus neither alignment
+     * Note: Word rule is not the same as HTML's <hr> since it does not support width and thus neither alignment.
      *
-     * @param \DOMNode $node
+     * @param DOMNode $node
      * @param \PhpOffice\PhpWord\Element\AbstractContainer $element
      */
-    protected static function parseHorizRule($node, $element)
+    protected static function parseHorizRule($node, $element): void
     {
         $styles = self::parseInlineStyle($node);
 
         // <hr> is implemented as an empty paragraph - extending 100% inside the section
         // Some properties may be controlled, e.g. <hr style="border-bottom: 3px #DDDDDD solid; margin-bottom: 0;">
 
-        $fontStyle = $styles + array('size' => 3);
+        $fontStyle = $styles + ['size' => 3];
 
-        $paragraphStyle = $styles + array(
-            'lineHeight'        => 0.25, // multiply default line height - e.g. 1, 1.5 etc
-            'spacing'           => 0, // twip
-            'spaceBefore'       => 120, // twip, 240/2 (default line height)
-            'spaceAfter'        => 120, // twip
-            'borderBottomSize'  => empty($styles['line-height']) ? 1 : $styles['line-height'],
+        $paragraphStyle = $styles + [
+            'lineHeight' => 0.25, // multiply default line height - e.g. 1, 1.5 etc
+            'spacing' => 0, // twip
+            'spaceBefore' => 120, // twip, 240/2 (default line height)
+            'spaceAfter' => 120, // twip
+            'borderBottomSize' => empty($styles['line-height']) ? 1 : $styles['line-height'],
             'borderBottomColor' => empty($styles['color']) ? '000000' : $styles['color'],
             'borderBottomStyle' => 'single', // same as "solid"
-        );
+        ];
 
         $element->addText('', $fontStyle, $paragraphStyle);
 
@@ -1056,4 +1200,13 @@ protected static function parseHorizRule($node, $element)
         // - line - that is a shape, has different behaviour
         // - repeated text, e.g. underline "_", because of unpredictable line wrapping
     }
+
+    private static function convertRgb(string $rgb): string
+    {
+        if (preg_match(self::RGB_REGEXP, $rgb, $matches) === 1) {
+            return sprintf('%02X%02X%02X', $matches[1], $matches[2], $matches[3]);
+        }
+
+        return trim($rgb, '# ');
+    }
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Shared/Microsoft/PasswordEncoder.php b/vendor/phpoffice/phpword/src/PhpWord/Shared/Microsoft/PasswordEncoder.php
index fc0c7ecdf8..d6cf69fc6d 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Shared/Microsoft/PasswordEncoder.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Shared/Microsoft/PasswordEncoder.php
@@ -11,14 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Shared\Microsoft;
 
 /**
- * Password encoder for microsoft office applications
+ * Password encoder for microsoft office applications.
  */
 class PasswordEncoder
 {
@@ -34,27 +34,31 @@ class PasswordEncoder
     const ALGORITHM_MAC = 'MAC';
     const ALGORITHM_HMAC = 'HMAC';
 
+    private const ALL_ONE_BITS = (PHP_INT_SIZE > 4) ? 0xFFFFFFFF : -1;
+    private const HIGH_ORDER_BIT = (PHP_INT_SIZE > 4) ? 0x80000000 : PHP_INT_MIN;
+
     /**
-     * Mapping between algorithm name and algorithm ID
+     * Mapping between algorithm name and algorithm ID.
      *
      * @var array
+     *
      * @see https://msdn.microsoft.com/en-us/library/documentformat.openxml.wordprocessing.writeprotection.cryptographicalgorithmsid(v=office.14).aspx
      */
-    private static $algorithmMapping = array(
-        self::ALGORITHM_MD2        => array(1, 'md2'),
-        self::ALGORITHM_MD4        => array(2, 'md4'),
-        self::ALGORITHM_MD5        => array(3, 'md5'),
-        self::ALGORITHM_SHA_1      => array(4, 'sha1'),
-        self::ALGORITHM_MAC        => array(5, ''), // 'mac' -> not possible with hash()
-        self::ALGORITHM_RIPEMD     => array(6, 'ripemd'),
-        self::ALGORITHM_RIPEMD_160 => array(7, 'ripemd160'),
-        self::ALGORITHM_HMAC       => array(9, ''), //'hmac' -> not possible with hash()
-        self::ALGORITHM_SHA_256    => array(12, 'sha256'),
-        self::ALGORITHM_SHA_384    => array(13, 'sha384'),
-        self::ALGORITHM_SHA_512    => array(14, 'sha512'),
-    );
-
-    private static $initialCodeArray = array(
+    private static $algorithmMapping = [
+        self::ALGORITHM_MD2 => [1, 'md2'],
+        self::ALGORITHM_MD4 => [2, 'md4'],
+        self::ALGORITHM_MD5 => [3, 'md5'],
+        self::ALGORITHM_SHA_1 => [4, 'sha1'],
+        self::ALGORITHM_MAC => [5, ''], // 'mac' -> not possible with hash()
+        self::ALGORITHM_RIPEMD => [6, 'ripemd'],
+        self::ALGORITHM_RIPEMD_160 => [7, 'ripemd160'],
+        self::ALGORITHM_HMAC => [9, ''], //'hmac' -> not possible with hash()
+        self::ALGORITHM_SHA_256 => [12, 'sha256'],
+        self::ALGORITHM_SHA_384 => [13, 'sha384'],
+        self::ALGORITHM_SHA_512 => [14, 'sha512'],
+    ];
+
+    private static $initialCodeArray = [
         0xE1F0,
         0x1D0F,
         0xCC9C,
@@ -70,36 +74,38 @@ class PasswordEncoder
         0x280C,
         0xA96A,
         0x4EC3,
-    );
-
-    private static $encryptionMatrix = array(
-        array(0xAEFC, 0x4DD9, 0x9BB2, 0x2745, 0x4E8A, 0x9D14, 0x2A09),
-        array(0x7B61, 0xF6C2, 0xFDA5, 0xEB6B, 0xC6F7, 0x9DCF, 0x2BBF),
-        array(0x4563, 0x8AC6, 0x05AD, 0x0B5A, 0x16B4, 0x2D68, 0x5AD0),
-        array(0x0375, 0x06EA, 0x0DD4, 0x1BA8, 0x3750, 0x6EA0, 0xDD40),
-        array(0xD849, 0xA0B3, 0x5147, 0xA28E, 0x553D, 0xAA7A, 0x44D5),
-        array(0x6F45, 0xDE8A, 0xAD35, 0x4A4B, 0x9496, 0x390D, 0x721A),
-        array(0xEB23, 0xC667, 0x9CEF, 0x29FF, 0x53FE, 0xA7FC, 0x5FD9),
-        array(0x47D3, 0x8FA6, 0x0F6D, 0x1EDA, 0x3DB4, 0x7B68, 0xF6D0),
-        array(0xB861, 0x60E3, 0xC1C6, 0x93AD, 0x377B, 0x6EF6, 0xDDEC),
-        array(0x45A0, 0x8B40, 0x06A1, 0x0D42, 0x1A84, 0x3508, 0x6A10),
-        array(0xAA51, 0x4483, 0x8906, 0x022D, 0x045A, 0x08B4, 0x1168),
-        array(0x76B4, 0xED68, 0xCAF1, 0x85C3, 0x1BA7, 0x374E, 0x6E9C),
-        array(0x3730, 0x6E60, 0xDCC0, 0xA9A1, 0x4363, 0x86C6, 0x1DAD),
-        array(0x3331, 0x6662, 0xCCC4, 0x89A9, 0x0373, 0x06E6, 0x0DCC),
-        array(0x1021, 0x2042, 0x4084, 0x8108, 0x1231, 0x2462, 0x48C4),
-    );
+    ];
+
+    private static $encryptionMatrix = [
+        [0xAEFC, 0x4DD9, 0x9BB2, 0x2745, 0x4E8A, 0x9D14, 0x2A09],
+        [0x7B61, 0xF6C2, 0xFDA5, 0xEB6B, 0xC6F7, 0x9DCF, 0x2BBF],
+        [0x4563, 0x8AC6, 0x05AD, 0x0B5A, 0x16B4, 0x2D68, 0x5AD0],
+        [0x0375, 0x06EA, 0x0DD4, 0x1BA8, 0x3750, 0x6EA0, 0xDD40],
+        [0xD849, 0xA0B3, 0x5147, 0xA28E, 0x553D, 0xAA7A, 0x44D5],
+        [0x6F45, 0xDE8A, 0xAD35, 0x4A4B, 0x9496, 0x390D, 0x721A],
+        [0xEB23, 0xC667, 0x9CEF, 0x29FF, 0x53FE, 0xA7FC, 0x5FD9],
+        [0x47D3, 0x8FA6, 0x0F6D, 0x1EDA, 0x3DB4, 0x7B68, 0xF6D0],
+        [0xB861, 0x60E3, 0xC1C6, 0x93AD, 0x377B, 0x6EF6, 0xDDEC],
+        [0x45A0, 0x8B40, 0x06A1, 0x0D42, 0x1A84, 0x3508, 0x6A10],
+        [0xAA51, 0x4483, 0x8906, 0x022D, 0x045A, 0x08B4, 0x1168],
+        [0x76B4, 0xED68, 0xCAF1, 0x85C3, 0x1BA7, 0x374E, 0x6E9C],
+        [0x3730, 0x6E60, 0xDCC0, 0xA9A1, 0x4363, 0x86C6, 0x1DAD],
+        [0x3331, 0x6662, 0xCCC4, 0x89A9, 0x0373, 0x06E6, 0x0DCC],
+        [0x1021, 0x2042, 0x4084, 0x8108, 0x1231, 0x2462, 0x48C4],
+    ];
 
     private static $passwordMaxLength = 15;
 
     /**
-     * Create a hashed password that MS Word will be able to work with
+     * Create a hashed password that MS Word will be able to work with.
+     *
      * @see https://blogs.msdn.microsoft.com/vsod/2010/04/05/how-to-set-the-editing-restrictions-in-word-using-open-xml-sdk-2-0/
      *
      * @param string $password
      * @param string $algorithmName
      * @param string $salt
      * @param int $spinCount
+     *
      * @return string
      */
     public static function hashPassword($password, $algorithmName = self::ALGORITHM_SHA_1, $salt = null, $spinCount = 10000)
@@ -112,9 +118,9 @@ public static function hashPassword($password, $algorithmName = self::ALGORITHM_
         //   Get the single-byte values by iterating through the Unicode characters of the truncated password.
         //   For each character, if the low byte is not equal to 0, take it. Otherwise, take the high byte.
         $passUtf8 = mb_convert_encoding($password, 'UCS-2LE', 'UTF-8');
-        $byteChars = array();
+        $byteChars = [];
 
-        for ($i = 0; $i < mb_strlen($password); $i++) {
+        for ($i = 0; $i < mb_strlen($password); ++$i) {
             $byteChars[$i] = ord(substr($passUtf8, $i * 2, 1));
 
             if ($byteChars[$i] == 0) {
@@ -125,7 +131,7 @@ public static function hashPassword($password, $algorithmName = self::ALGORITHM_
         // build low-order word and hig-order word and combine them
         $combinedKey = self::buildCombinedKey($byteChars);
         // build reversed hexadecimal string
-        $hex = str_pad(strtoupper(dechex($combinedKey & 0xFFFFFFFF)), 8, '0', \STR_PAD_LEFT);
+        $hex = str_pad(strtoupper(dechex($combinedKey & self::ALL_ONE_BITS)), 8, '0', \STR_PAD_LEFT);
         $reversedHex = $hex[6] . $hex[7] . $hex[4] . $hex[5] . $hex[2] . $hex[3] . $hex[0] . $hex[1];
 
         $generatedKey = mb_convert_encoding($reversedHex, 'UCS-2LE', 'UTF-8');
@@ -136,7 +142,7 @@ public static function hashPassword($password, $algorithmName = self::ALGORITHM_
         $algorithm = self::getAlgorithm($algorithmName);
         $generatedKey = hash($algorithm, $salt . $generatedKey, true);
 
-        for ($i = 0; $i < $spinCount; $i++) {
+        for ($i = 0; $i < $spinCount; ++$i) {
             $generatedKey = hash($algorithm, $generatedKey . pack('CCCC', $i, $i >> 8, $i >> 16, $i >> 24), true);
         }
         $generatedKey = base64_encode($generatedKey);
@@ -147,9 +153,10 @@ public static function hashPassword($password, $algorithmName = self::ALGORITHM_
     }
 
     /**
-     * Get algorithm from self::$algorithmMapping
+     * Get algorithm from self::$algorithmMapping.
      *
      * @param string $algorithmName
+     *
      * @return string
      */
     private static function getAlgorithm($algorithmName)
@@ -163,9 +170,10 @@ private static function getAlgorithm($algorithmName)
     }
 
     /**
-     * Returns the algorithm ID
+     * Returns the algorithm ID.
      *
      * @param string $algorithmName
+     *
      * @return int
      */
     public static function getAlgorithmId($algorithmName)
@@ -174,9 +182,10 @@ public static function getAlgorithmId($algorithmName)
     }
 
     /**
-     * Build combined key from low-order word and high-order word
+     * Build combined key from low-order word and high-order word.
      *
      * @param array $byteChars byte array representation of password
+     *
      * @return int
      */
     private static function buildCombinedKey($byteChars)
@@ -190,10 +199,10 @@ private static function buildCombinedKey($byteChars)
         //   For every bit in the character, starting with the least significant and progressing to (but excluding)
         //   the most significant, if the bit is set, XOR the key’s high-order word with the corresponding word from
         //   the Encryption Matrix
-        for ($i = 0; $i < $byteCharsLength; $i++) {
+        for ($i = 0; $i < $byteCharsLength; ++$i) {
             $tmp = self::$passwordMaxLength - $byteCharsLength + $i;
             $matrixRow = self::$encryptionMatrix[$tmp];
-            for ($intBit = 0; $intBit < 7; $intBit++) {
+            for ($intBit = 0; $intBit < 7; ++$intBit) {
                 if (($byteChars[$i] & (0x0001 << $intBit)) != 0) {
                     $highOrderWord = ($highOrderWord ^ $matrixRow[$intBit]);
                 }
@@ -204,7 +213,7 @@ private static function buildCombinedKey($byteChars)
         // Initialize with 0
         $lowOrderWord = 0;
         // For each character in the password, going backwards
-        for ($i = $byteCharsLength - 1; $i >= 0; $i--) {
+        for ($i = $byteCharsLength - 1; $i >= 0; --$i) {
             // low-order word = (((low-order word SHR 14) AND 0x0001) OR (low-order word SHL 1) AND 0x7FFF)) XOR character
             $lowOrderWord = (((($lowOrderWord >> 14) & 0x0001) | (($lowOrderWord << 1) & 0x7FFF)) ^ $byteChars[$i]);
         }
@@ -216,18 +225,20 @@ private static function buildCombinedKey($byteChars)
     }
 
     /**
-     * Simulate behaviour of (signed) int32
+     * Simulate behaviour of (signed) int32.
      *
      * @codeCoverageIgnore
+     *
      * @param int $value
+     *
      * @return int
      */
     private static function int32($value)
     {
-        $value = ($value & 0xFFFFFFFF);
+        $value = $value & self::ALL_ONE_BITS;
 
-        if ($value & 0x80000000) {
-            $value = -((~$value & 0xFFFFFFFF) + 1);
+        if ($value & self::HIGH_ORDER_BIT) {
+            $value = -((~$value & self::ALL_ONE_BITS) + 1);
         }
 
         return $value;
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Shared/OLERead.php b/vendor/phpoffice/phpword/src/PhpWord/Shared/OLERead.php
index 316e7812e6..d4399d6fb7 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Shared/OLERead.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Shared/OLERead.php
@@ -61,6 +61,17 @@ class OLERead
     public $wrkObjectPool = null;
     public $summaryInformation = null;
     public $docSummaryInfos = null;
+    public $numBigBlockDepotBlocks = null;
+    public $rootStartBlock = null;
+    public $sbdStartBlock = null;
+    public $extensionBlock = null;
+    public $numExtensionBlocks = null;
+    public $bigBlockChain = null;
+    public $smallBlockChain = null;	
+    public $entry = null;	
+    public $rootentry = null;
+    public $wrkObjectPoolelseif = null;
+    public $props = array();	
 
     /**
      * Read the file
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Shared/PCLZip/pclzip.lib.php b/vendor/phpoffice/phpword/src/PhpWord/Shared/PCLZip/pclzip.lib.php
index 3fbc932744..5243b3c3a0 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Shared/PCLZip/pclzip.lib.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Shared/PCLZip/pclzip.lib.php
@@ -1597,7 +1597,7 @@ public function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_
                     if (is_string($p_options_list[$i + 1])) {
 
                         // ----- Remove spaces
-                        $p_options_list[$i + 1] = strtr($p_options_list[$i + 1], ' ', '');
+                        $p_options_list[$i + 1] = str_replace(' ', '', $p_options_list[$i + 1]);
 
                         // ----- Parse items
                         $v_work_list = explode(",", $p_options_list[$i + 1]);
@@ -3258,17 +3258,6 @@ public function privExtractByRule(&$p_file_list, $p_path, $p_remove_path, $p_rem
                         $v_extract = true;
                     }
                 }
-            // ----- Look for extract by ereg rule
-            // ereg() is deprecated with PHP 5.3
-            /*
-            elseif (   (isset($p_options[PCLZIP_OPT_BY_EREG]))
-            && ($p_options[PCLZIP_OPT_BY_EREG] != "")) {
-
-            if (ereg($p_options[PCLZIP_OPT_BY_EREG], $v_header['stored_filename'])) {
-            $v_extract = true;
-            }
-            }
-            */
 
             // ----- Look for extract by preg rule
             } elseif ((isset($p_options[PCLZIP_OPT_BY_PREG])) && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
@@ -4545,18 +4534,6 @@ public function privDeleteByRule(&$p_result_list, &$p_options)
                     }
                 }
 
-            // ----- Look for extract by ereg rule
-            // ereg() is deprecated with PHP 5.3
-            /*
-            elseif (   (isset($p_options[PCLZIP_OPT_BY_EREG]))
-            && ($p_options[PCLZIP_OPT_BY_EREG] != "")) {
-
-            if (ereg($p_options[PCLZIP_OPT_BY_EREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {
-            $v_found = true;
-            }
-            }
-            */
-
             // ----- Look for extract by preg rule
             } elseif ((isset($p_options[PCLZIP_OPT_BY_PREG])) && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
 
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Shared/Text.php b/vendor/phpoffice/phpword/src/PhpWord/Shared/Text.php
index 4ca9c458c3..b9a8831cdd 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Shared/Text.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Shared/Text.php
@@ -11,28 +11,28 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Shared;
 
 /**
- * Text
+ * Text.
  */
 class Text
 {
     /**
-     * Control characters array
+     * Control characters array.
      *
      * @var string[]
      */
-    private static $controlCharacters = array();
+    private static $controlCharacters = [];
 
     /**
-     * Build control characters array
+     * Build control characters array.
      */
-    private static function buildControlCharacters()
+    private static function buildControlCharacters(): void
     {
         for ($i = 0; $i <= 19; ++$i) {
             if ($i != 9 && $i != 10 && $i != 13) {
@@ -44,7 +44,7 @@ private static function buildControlCharacters()
     }
 
     /**
-     * Convert from PHP control character to OpenXML escaped control character
+     * Convert from PHP control character to OpenXML escaped control character.
      *
      * Excel 2007 team:
      * ----------------
@@ -55,6 +55,7 @@ private static function buildControlCharacters()
      * element or in the shared string <t> element.
      *
      * @param  string $value Value to escape
+     *
      * @return string
      */
     public static function controlCharacterPHP2OOXML($value = '')
@@ -67,9 +68,11 @@ public static function controlCharacterPHP2OOXML($value = '')
     }
 
     /**
-     * Return a number formatted for being integrated in xml files
+     * Return a number formatted for being integrated in xml files.
+     *
      * @param float $number
      * @param int $decimals
+     *
      * @return string
      */
     public static function numberFormat($number, $decimals)
@@ -79,8 +82,11 @@ public static function numberFormat($number, $decimals)
 
     /**
      * @param int $dec
+     *
      * @see http://stackoverflow.com/a/7153133/2235790
+     *
      * @author velcrow
+     *
      * @return string
      */
     public static function chr($dec)
@@ -102,9 +108,10 @@ public static function chr($dec)
     }
 
     /**
-     * Convert from OpenXML escaped control character to PHP control character
+     * Convert from OpenXML escaped control character to PHP control character.
      *
      * @param string $value Value to unescape
+     *
      * @return string
      */
     public static function controlCharacterOOXML2PHP($value = '')
@@ -117,9 +124,10 @@ public static function controlCharacterOOXML2PHP($value = '')
     }
 
     /**
-     * Check if a string contains UTF-8 data
+     * Check if a string contains UTF-8 data.
      *
      * @param string $value
+     *
      * @return bool
      */
     public static function isUTF8($value = '')
@@ -128,27 +136,31 @@ public static function isUTF8($value = '')
     }
 
     /**
-     * Return UTF8 encoded value
+     * Return UTF8 encoded value.
      *
-     * @param string $value
-     * @return string
+     * @param null|string $value
+     *
+     * @return ?string
      */
     public static function toUTF8($value = '')
     {
-        if (!is_null($value) && !self::isUTF8($value)) {
-            $value = mb_convert_encoding($value, 'UTF-8', mb_detect_encoding($value));
+        if (null !== $value && !self::isUTF8($value)) {
+            // PHP8.2 : utf8_encode is deprecated, but mb_convert_encoding always usable
+            $value = (function_exists('mb_convert_encoding')) ? mb_convert_encoding($value, 'UTF-8', 'ISO-8859-1') : utf8_encode($value);
         }
 
         return $value;
     }
 
     /**
-     * Returns unicode from UTF8 text
+     * Returns unicode from UTF8 text.
      *
      * The function is splitted to reduce cyclomatic complexity
      *
      * @param string $text UTF8 text
+     *
      * @return string Unicode text
+     *
      * @since 0.11.0
      */
     public static function toUnicode($text)
@@ -157,21 +169,23 @@ public static function toUnicode($text)
     }
 
     /**
-     * Returns unicode array from UTF8 text
+     * Returns unicode array from UTF8 text.
      *
      * @param string $text UTF8 text
+     *
      * @return array
+     *
      * @since 0.11.0
      * @see http://www.randomchaos.com/documents/?source=php_and_unicode
      */
     public static function utf8ToUnicode($text)
     {
-        $unicode = array();
-        $values = array();
+        $unicode = [];
+        $values = [];
         $lookingFor = 1;
 
         // Gets unicode for each character
-        for ($i = 0; $i < strlen($text); $i++) {
+        for ($i = 0; $i < strlen($text); ++$i) {
             $thisValue = ord($text[$i]);
             if ($thisValue < 128) {
                 $unicode[] = $thisValue;
@@ -187,7 +201,7 @@ public static function utf8ToUnicode($text)
                         $number = (($values[0] % 32) * 64) + ($values[1] % 64);
                     }
                     $unicode[] = $number;
-                    $values = array();
+                    $values = [];
                     $lookingFor = 1;
                 }
             }
@@ -197,10 +211,12 @@ public static function utf8ToUnicode($text)
     }
 
     /**
-     * Returns entites from unicode array
+     * Returns entites from unicode array.
      *
      * @param array $unicode
+     *
      * @return string
+     *
      * @since 0.11.0
      * @see http://www.randomchaos.com/documents/?source=php_and_unicode
      */
@@ -218,14 +234,15 @@ private static function unicodeToEntities($unicode)
     }
 
     /**
-     * Return name without underscore for < 0.10.0 variable name compatibility
+     * Return name without underscore for < 0.10.0 variable name compatibility.
      *
      * @param string $value
+     *
      * @return string
      */
     public static function removeUnderscorePrefix($value)
     {
-        if (!is_null($value)) {
+        if (null !== $value) {
             if (substr($value, 0, 1) == '_') {
                 $value = substr($value, 1);
             }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Shared/Validate.php b/vendor/phpoffice/phpword/src/PhpWord/Shared/Validate.php
new file mode 100644
index 0000000000..0967b5693c
--- /dev/null
+++ b/vendor/phpoffice/phpword/src/PhpWord/Shared/Validate.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @see         https://github.com/PHPOffice/PHPWord
+ *
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+declare(strict_types=1);
+
+namespace PhpOffice\PhpWord\Shared;
+
+class Validate
+{
+    public const CSS_WHITESPACE = [
+        'pre-wrap',
+        'normal',
+        'nowrap',
+        'pre',
+        'pre-line',
+        'initial',
+        'inherit',
+    ];
+
+    public const CSS_GENERICFONT = [
+        'serif',
+        'sans-serif',
+        'monospace',
+        'cursive',
+        'fantasy',
+        'system-ui',
+        'math',
+        'emoji',
+        'fangsong',
+    ];
+
+    /**
+     * Validate html css white-space value. It is expected that only pre-wrap and normal (default) are useful.
+     *
+     * @param string $value CSS White space
+     *
+     * @return string value if valid, empty string if not
+     */
+    public static function validateCSSWhiteSpace(?string $value): string
+    {
+        if (in_array($value, self::CSS_WHITESPACE)) {
+            return $value;
+        }
+
+        return '';
+    }
+
+    /**
+     * Validate generic font for fallback for html.
+     *
+     * @param string $value Generic font name
+     *
+     * @return string Value if legitimate, empty string if not
+     */
+    public static function validateCSSGenericFont(?string $value): string
+    {
+        if (in_array($value, self::CSS_GENERICFONT)) {
+            return $value;
+        }
+
+        return '';
+    }
+}
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Shared/XMLReader.php b/vendor/phpoffice/phpword/src/PhpWord/Shared/XMLReader.php
index 3905c52f19..e836607d29 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Shared/XMLReader.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Shared/XMLReader.php
@@ -11,50 +11,66 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Shared;
 
+use DOMDocument;
+use DOMElement;
+use DOMNodeList;
+use DOMXpath;
+use Exception;
+use InvalidArgumentException;
+use ZipArchive;
+
 /**
- * XML Reader wrapper
+ * XML Reader wrapper.
  *
  * @since   0.2.1
  */
 class XMLReader
 {
     /**
-     * DOMDocument object
+     * DOMDocument object.
      *
-     * @var \DOMDocument
+     * @var DOMDocument
      */
-    private $dom = null;
+    private $dom;
 
     /**
-     * DOMXpath object
+     * DOMXpath object.
      *
-     * @var \DOMXpath
+     * @var DOMXpath
      */
-    private $xpath = null;
+    private $xpath;
 
     /**
-     * Get DOMDocument from ZipArchive
+     * Get DOMDocument from ZipArchive.
      *
      * @param string $zipFile
      * @param string $xmlFile
-     * @throws \Exception
-     * @return \DOMDocument|false
+     *
+     * @return DOMDocument|false
      */
     public function getDomFromZip($zipFile, $xmlFile)
     {
         if (file_exists($zipFile) === false) {
-            throw new \Exception('Cannot find archive file.');
+            throw new Exception('Cannot find archive file.');
         }
 
-        $zip = new \ZipArchive();
-        $zip->open($zipFile);
-        $content = $zip->getFromName($xmlFile);
+        $zip = new ZipArchive();
+        $openStatus = $zip->open($zipFile);
+        if ($openStatus !== true) {
+            /**
+             * Throw an exception since making further calls on the ZipArchive would cause a fatal error.
+             * This prevents fatal errors on corrupt archives and attempts to open old "doc" files.
+             */
+            throw new Exception("The archive failed to load with the following error code: $openStatus");
+        }
+
+        $content = $zip->getFromName(ltrim($xmlFile, '/'));
         $zip->close();
 
         if ($content === false) {
@@ -65,17 +81,18 @@ public function getDomFromZip($zipFile, $xmlFile)
     }
 
     /**
-     * Get DOMDocument from content string
+     * Get DOMDocument from content string.
      *
      * @param string $content
-     * @return \DOMDocument
+     *
+     * @return DOMDocument
      */
     public function getDomFromString($content)
     {
         if (\PHP_VERSION_ID < 80000) {
             $originalLibXMLEntityValue = libxml_disable_entity_loader(true);
         }
-        $this->dom = new \DOMDocument();
+        $this->dom = new DOMDocument();
         $this->dom->loadXML($content);
         if (\PHP_VERSION_ID < 80000) {
             libxml_disable_entity_loader($originalLibXMLEntityValue);
@@ -85,56 +102,54 @@ public function getDomFromString($content)
     }
 
     /**
-     * Get elements
+     * Get elements.
      *
      * @param string $path
-     * @param \DOMElement $contextNode
-     * @return \DOMNodeList
+     *
+     * @return DOMNodeList<DOMElement>
      */
-    public function getElements($path, \DOMElement $contextNode = null)
+    public function getElements($path, ?DOMElement $contextNode = null)
     {
         if ($this->dom === null) {
-            return array();
+            return new DOMNodeList(); // @phpstan-ignore-line
         }
         if ($this->xpath === null) {
-            $this->xpath = new \DOMXpath($this->dom);
+            $this->xpath = new DOMXpath($this->dom);
         }
 
-        if (is_null($contextNode)) {
-            return $this->xpath->query($path);
-        }
+        $result = @$this->xpath->query($path, $contextNode);
 
-        return $this->xpath->query($path, $contextNode);
+        return empty($result) ? new DOMNodeList() : $result; // @phpstan-ignore-line
     }
 
     /**
-     * Registers the namespace with the DOMXPath object
+     * Registers the namespace with the DOMXPath object.
      *
      * @param string $prefix The prefix
      * @param string $namespaceURI The URI of the namespace
-     * @throws \InvalidArgumentException If called before having loaded the DOM document
+     *
      * @return bool true on success or false on failure
      */
     public function registerNamespace($prefix, $namespaceURI)
     {
         if ($this->dom === null) {
-            throw new \InvalidArgumentException('Dom needs to be loaded before registering a namespace');
+            throw new InvalidArgumentException('Dom needs to be loaded before registering a namespace');
         }
         if ($this->xpath === null) {
-            $this->xpath = new \DOMXpath($this->dom);
+            $this->xpath = new DOMXpath($this->dom);
         }
 
         return $this->xpath->registerNamespace($prefix, $namespaceURI);
     }
 
     /**
-     * Get element
+     * Get element.
      *
      * @param string $path
-     * @param \DOMElement $contextNode
-     * @return \DOMElement|null
+     *
+     * @return null|DOMElement
      */
-    public function getElement($path, \DOMElement $contextNode = null)
+    public function getElement($path, ?DOMElement $contextNode = null)
     {
         $elements = $this->getElements($path, $contextNode);
         if ($elements->length > 0) {
@@ -145,20 +160,20 @@ public function getElement($path, \DOMElement $contextNode = null)
     }
 
     /**
-     * Get element attribute
+     * Get element attribute.
      *
      * @param string $attribute
-     * @param \DOMElement $contextNode
      * @param string $path
-     * @return string|null
+     *
+     * @return null|string
      */
-    public function getAttribute($attribute, \DOMElement $contextNode = null, $path = null)
+    public function getAttribute($attribute, ?DOMElement $contextNode = null, $path = null)
     {
         $return = null;
         if ($path !== null) {
             $elements = $this->getElements($path, $contextNode);
             if ($elements->length > 0) {
-                /** @var \DOMElement $node Type hint */
+                /** @var DOMElement $node Type hint */
                 $node = $elements->item(0);
                 $return = $node->getAttribute($attribute);
             }
@@ -172,13 +187,13 @@ public function getAttribute($attribute, \DOMElement $contextNode = null, $path
     }
 
     /**
-     * Get element value
+     * Get element value.
      *
      * @param string $path
-     * @param \DOMElement $contextNode
-     * @return string|null
+     *
+     * @return null|string
      */
-    public function getValue($path, \DOMElement $contextNode = null)
+    public function getValue($path, ?DOMElement $contextNode = null)
     {
         $elements = $this->getElements($path, $contextNode);
         if ($elements->length > 0) {
@@ -189,13 +204,13 @@ public function getValue($path, \DOMElement $contextNode = null)
     }
 
     /**
-     * Count elements
+     * Count elements.
      *
      * @param string $path
-     * @param \DOMElement $contextNode
+     *
      * @return int
      */
-    public function countElements($path, \DOMElement $contextNode = null)
+    public function countElements($path, ?DOMElement $contextNode = null)
     {
         $elements = $this->getElements($path, $contextNode);
 
@@ -203,13 +218,13 @@ public function countElements($path, \DOMElement $contextNode = null)
     }
 
     /**
-     * Element exists
+     * Element exists.
      *
      * @param string $path
-     * @param \DOMElement $contextNode
+     *
      * @return bool
      */
-    public function elementExists($path, \DOMElement $contextNode = null)
+    public function elementExists($path, ?DOMElement $contextNode = null)
     {
         return $this->getElements($path, $contextNode)->length > 0;
     }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Shared/XMLWriter.php b/vendor/phpoffice/phpword/src/PhpWord/Shared/XMLWriter.php
index fb2258d9dd..9f51c0e514 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Shared/XMLWriter.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Shared/XMLWriter.php
@@ -11,14 +11,17 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Shared;
 
+use Exception;
+use ReturnTypeWillChange;
+
 /**
- * XMLWriter
+ * XMLWriter.
  *
  * @method bool endElement()
  * @method mixed flush(bool $empty = null)
@@ -40,14 +43,14 @@ class XMLWriter extends \XMLWriter
     const STORAGE_DISK = 2;
 
     /**
-     * Temporary filename
+     * Temporary filename.
      *
      * @var string
      */
     private $tempFileName = '';
 
     /**
-     * Create a new \PhpOffice\PhpWord\Shared\XMLWriter instance
+     * Create a new \PhpOffice\PhpWord\Shared\XMLWriter instance.
      *
      * @param int $pTemporaryStorage Temporary storage location
      * @param string $pTemporaryStorageDir Temporary storage folder
@@ -59,7 +62,7 @@ public function __construct($pTemporaryStorage = self::STORAGE_MEMORY, $pTempora
         if ($pTemporaryStorage == self::STORAGE_MEMORY) {
             $this->openMemory();
         } else {
-            if (!is_dir($pTemporaryStorageDir)) {
+            if (!$pTemporaryStorageDir || !is_dir($pTemporaryStorageDir)) {
                 $pTemporaryStorageDir = sys_get_temp_dir();
             }
             // Create temporary filename
@@ -79,7 +82,7 @@ public function __construct($pTemporaryStorage = self::STORAGE_MEMORY, $pTempora
     }
 
     /**
-     * Destructor
+     * Destructor.
      */
     public function __destruct()
     {
@@ -88,12 +91,12 @@ public function __destruct()
             return;
         }
         if (PHP_OS != 'WINNT' && @unlink($this->tempFileName) === false) {
-            throw new \Exception('The file ' . $this->tempFileName . ' could not be deleted.');
+            throw new Exception('The file ' . $this->tempFileName . ' could not be deleted.');
         }
     }
 
     /**
-     * Get written data
+     * Get written data.
      *
      * @return string
      */
@@ -109,21 +112,21 @@ public function getData()
     }
 
     /**
-     * Write simple element and attribute(s) block
+     * Write simple element and attribute(s) block.
      *
      * There are two options:
      * 1. If the `$attributes` is an array, then it's an associative array of attributes
      * 2. If not, then it's a simple attribute-value pair
      *
      * @param string $element
-     * @param string|array $attributes
+     * @param array|string $attributes
      * @param string $value
      */
-    public function writeElementBlock($element, $attributes, $value = null)
+    public function writeElementBlock($element, $attributes, $value = null): void
     {
         $this->startElement($element);
         if (!is_array($attributes)) {
-            $attributes = array($attributes => $value);
+            $attributes = [$attributes => $value];
         }
         foreach ($attributes as $attribute => $value) {
             $this->writeAttribute($attribute, $value);
@@ -139,10 +142,10 @@ public function writeElementBlock($element, $attributes, $value = null)
      * @param string $attribute
      * @param mixed $value
      */
-    public function writeElementIf($condition, $element, $attribute = null, $value = null)
+    public function writeElementIf($condition, $element, $attribute = null, $value = null): void
     {
         if ($condition == true) {
-            if (is_null($attribute)) {
+            if (null === $attribute) {
                 $this->writeElement($element, $value);
             } else {
                 $this->startElement($element);
@@ -159,7 +162,7 @@ public function writeElementIf($condition, $element, $attribute = null, $value =
      * @param string $attribute
      * @param mixed $value
      */
-    public function writeAttributeIf($condition, $attribute, $value)
+    public function writeAttributeIf($condition, $attribute, $value): void
     {
         if ($condition == true) {
             $this->writeAttribute($attribute, $value);
@@ -169,14 +172,16 @@ public function writeAttributeIf($condition, $attribute, $value)
     /**
      * @param string $name
      * @param mixed $value
+     *
      * @return bool
      */
-    public function writeAttribute($name, $value): bool
+    #[ReturnTypeWillChange]
+    public function writeAttribute($name, $value)
     {
         if (is_float($value)) {
             $value = json_encode($value);
         }
 
-        return parent::writeAttribute($name, $value);
+        return parent::writeAttribute($name, $value ?? '');
     }
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Shared/ZipArchive.php b/vendor/phpoffice/phpword/src/PhpWord/Shared/ZipArchive.php
index bc71e74b17..f120756d8b 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Shared/ZipArchive.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Shared/ZipArchive.php
@@ -11,17 +11,19 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Shared;
 
+use PclZip;
 use PhpOffice\PhpWord\Exception\Exception;
 use PhpOffice\PhpWord\Settings;
+use Throwable;
 
 /**
- * ZipArchive wrapper
+ * ZipArchive wrapper.
  *
  * Wraps zip archive functionality of PHP ZipArchive and PCLZip. PHP ZipArchive
  * properties and methods are bypassed and used as the model for the PCLZip
@@ -29,8 +31,8 @@
  *
  * @method  bool addFile(string $filename, string $localname = null)
  * @method  bool addFromString(string $localname, string $contents)
- * @method  string getNameIndex(int $index)
- * @method  int locateName(string $name)
+ * @method  false|string getNameIndex(int $index)
+ * @method  false|int locateName(string $name)
  *
  * @since   0.10.0
  */
@@ -41,42 +43,42 @@ class ZipArchive
     const OVERWRITE = 8; // Emulate \ZipArchive::OVERWRITE
 
     /**
-     * Number of files (emulate ZipArchive::$numFiles)
+     * Number of files (emulate ZipArchive::$numFiles).
      *
      * @var int
      */
     public $numFiles = 0;
 
     /**
-     * Archive filename (emulate ZipArchive::$filename)
+     * Archive filename (emulate ZipArchive::$filename).
      *
      * @var string
      */
     public $filename;
 
     /**
-     * Temporary storage directory
+     * Temporary storage directory.
      *
      * @var string
      */
     private $tempDir;
 
     /**
-     * Internal zip archive object
+     * Internal zip archive object.
      *
-     * @var \ZipArchive|\PclZip
+     * @var PclZip|\ZipArchive
      */
     private $zip;
 
     /**
-     * Use PCLZip (default behaviour)
+     * Use PCLZip (default behaviour).
      *
      * @var bool
      */
     private $usePclzip = true;
 
     /**
-     * Create new instance
+     * Create new instance.
      */
     public function __construct()
     {
@@ -90,12 +92,13 @@ public function __construct()
     }
 
     /**
-     * Catch function calls: pass to ZipArchive or PCLZip
+     * Catch function calls: pass to ZipArchive or PCLZip.
      *
      * `call_user_func_array` can only used for public function, hence the `public` in all `pcl...` methods
      *
      * @param mixed $function
      * @param mixed $args
+     *
      * @return mixed
      */
     public function __call($function, $args)
@@ -112,17 +115,18 @@ public function __call($function, $args)
         // Run function
         $result = false;
         if (method_exists($zipObject, $zipFunction)) {
-            $result = @call_user_func_array(array($zipObject, $zipFunction), $args);
+            $result = @call_user_func_array([$zipObject, $zipFunction], $args);
         }
 
         return $result;
     }
 
     /**
-     * Open a new zip archive
+     * Open a new zip archive.
      *
      * @param string $filename The file name of the ZIP archive to open
      * @param int $flags The mode to use to open the archive
+     *
      * @return bool
      */
     public function open($filename, $flags = null)
@@ -133,13 +137,20 @@ public function open($filename, $flags = null)
 
         if (!$this->usePclzip) {
             $zip = new \ZipArchive();
+
+            // PHP 8.1 compat - passing null as second arg to \ZipArchive::open() is deprecated
+            // passing 0 achieves the same behaviour
+            if ($flags === null) {
+                $flags = 0;
+            }
+
             $result = $zip->open($this->filename, $flags);
 
             // Scrutizer will report the property numFiles does not exist
             // See https://github.com/scrutinizer-ci/php-analyzer/issues/190
             $this->numFiles = $zip->numFiles;
         } else {
-            $zip = new \PclZip($this->filename);
+            $zip = new PclZip($this->filename);
             $zipContent = $zip->listContent();
             $this->numFiles = is_array($zipContent) ? count($zipContent) : 0;
         }
@@ -149,18 +160,19 @@ public function open($filename, $flags = null)
     }
 
     /**
-     * Close the active archive
-     *
-     * @throws \PhpOffice\PhpWord\Exception\Exception
+     * Close the active archive.
      *
      * @return bool
-     *
-     * @codeCoverageIgnore Can't find any test case. Uncomment when found.
      */
     public function close()
     {
         if (!$this->usePclzip) {
-            if ($this->zip->close() === false) {
+            try {
+                $result = @$this->zip->close();
+            } catch (Throwable $e) {
+                $result = false;
+            }
+            if ($result === false) {
                 throw new Exception("Could not close zip file {$this->filename}: ");
             }
         }
@@ -169,11 +181,13 @@ public function close()
     }
 
     /**
-     * Extract the archive contents (emulate \ZipArchive)
+     * Extract the archive contents (emulate \ZipArchive).
      *
      * @param string $destination
-     * @param string|array $entries
+     * @param array|string $entries
+     *
      * @return bool
+     *
      * @since 0.10.0
      */
     public function extractTo($destination, $entries = null)
@@ -190,9 +204,10 @@ public function extractTo($destination, $entries = null)
     }
 
     /**
-     * Extract file from archive by given file name (emulate \ZipArchive)
+     * Extract file from archive by given file name (emulate \ZipArchive).
      *
      * @param  string $filename Filename for the file in zip archive
+     *
      * @return string $contents File string contents
      */
     public function getFromName($filename)
@@ -211,15 +226,16 @@ public function getFromName($filename)
     }
 
     /**
-     * Add a new file to the zip archive (emulate \ZipArchive)
+     * Add a new file to the zip archive (emulate \ZipArchive).
      *
      * @param string $filename Directory/Name of the file to add to the zip archive
      * @param string $localname Directory/Name of the file added to the zip
+     *
      * @return bool
      */
     public function pclzipAddFile($filename, $localname = null)
     {
-        /** @var \PclZip $zip Type hint */
+        /** @var PclZip $zip Type hint */
         $zip = $this->zip;
 
         // Bugfix GH-261 https://github.com/PHPOffice/PHPWord/pull/261
@@ -262,15 +278,16 @@ public function pclzipAddFile($filename, $localname = null)
     }
 
     /**
-     * Add a new file to the zip archive from a string of raw data (emulate \ZipArchive)
+     * Add a new file to the zip archive from a string of raw data (emulate \ZipArchive).
      *
      * @param string $localname Directory/Name of the file to add to the zip archive
      * @param string $contents String of data to add to the zip archive
+     *
      * @return bool
      */
     public function pclzipAddFromString($localname, $contents)
     {
-        /** @var \PclZip $zip Type hint */
+        /** @var PclZip $zip Type hint */
         $zip = $this->zip;
         $filenameParts = pathinfo($localname);
 
@@ -293,20 +310,22 @@ public function pclzipAddFromString($localname, $contents)
     }
 
     /**
-     * Extract the archive contents (emulate \ZipArchive)
+     * Extract the archive contents (emulate \ZipArchive).
      *
      * @param string $destination
-     * @param string|array $entries
+     * @param array|string $entries
+     *
      * @return bool
+     *
      * @since 0.10.0
      */
     public function pclzipExtractTo($destination, $entries = null)
     {
-        /** @var \PclZip $zip Type hint */
+        /** @var PclZip $zip Type hint */
         $zip = $this->zip;
 
         // Extract all files
-        if (is_null($entries)) {
+        if (null === $entries) {
             $result = $zip->extract(PCLZIP_OPT_PATH, $destination);
 
             return $result > 0;
@@ -314,7 +333,7 @@ public function pclzipExtractTo($destination, $entries = null)
 
         // Extract by entries
         if (!is_array($entries)) {
-            $entries = array($entries);
+            $entries = [$entries];
         }
         foreach ($entries as $entry) {
             $entryIndex = $this->locateName($entry);
@@ -328,14 +347,15 @@ public function pclzipExtractTo($destination, $entries = null)
     }
 
     /**
-     * Extract file from archive by given file name (emulate \ZipArchive)
+     * Extract file from archive by given file name (emulate \ZipArchive).
      *
      * @param  string $filename Filename for the file in zip archive
+     *
      * @return string $contents File string contents
      */
     public function pclzipGetFromName($filename)
     {
-        /** @var \PclZip $zip Type hint */
+        /** @var PclZip $zip Type hint */
         $zip = $this->zip;
         $listIndex = $this->pclzipLocateName($filename);
         $contents = false;
@@ -355,15 +375,17 @@ public function pclzipGetFromName($filename)
     }
 
     /**
-     * Returns the name of an entry using its index (emulate \ZipArchive)
+     * Returns the name of an entry using its index (emulate \ZipArchive).
      *
      * @param int $index
-     * @return string|bool
+     *
+     * @return bool|string
+     *
      * @since 0.10.0
      */
     public function pclzipGetNameIndex($index)
     {
-        /** @var \PclZip $zip Type hint */
+        /** @var PclZip $zip Type hint */
         $zip = $this->zip;
         $list = $zip->listContent();
         if (isset($list[$index])) {
@@ -374,14 +396,15 @@ public function pclzipGetNameIndex($index)
     }
 
     /**
-     * Returns the index of the entry in the archive (emulate \ZipArchive)
+     * Returns the index of the entry in the archive (emulate \ZipArchive).
      *
      * @param string $filename Filename for the file in zip archive
-     * @return int
+     *
+     * @return false|int
      */
     public function pclzipLocateName($filename)
     {
-        /** @var \PclZip $zip Type hint */
+        /** @var PclZip $zip Type hint */
         $zip = $this->zip;
         $list = $zip->listContent();
         $listCount = count($list);
@@ -390,6 +413,7 @@ public function pclzipLocateName($filename)
             if (strtolower($list[$i]['filename']) == strtolower($filename) ||
                 strtolower($list[$i]['stored_filename']) == strtolower($filename)) {
                 $listIndex = $i;
+
                 break;
             }
         }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/SimpleType/Border.php b/vendor/phpoffice/phpword/src/PhpWord/SimpleType/Border.php
index a73c7b4a67..6cb42f0467 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/SimpleType/Border.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/SimpleType/Border.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -23,7 +23,6 @@
  * Border Styles.
  *
  * @since 0.18.0
- *
  * @see  http://www.datypic.com/sc/ooxml/t-w_ST_Border.html
  */
 final class Border extends AbstractEnum
diff --git a/vendor/phpoffice/phpword/src/PhpWord/SimpleType/DocProtect.php b/vendor/phpoffice/phpword/src/PhpWord/SimpleType/DocProtect.php
index e386913d53..2d13485493 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/SimpleType/DocProtect.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/SimpleType/DocProtect.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,36 +20,35 @@
 use PhpOffice\PhpWord\Shared\AbstractEnum;
 
 /**
- * Document Protection Types
+ * Document Protection Types.
  *
  * @since 0.14.0
- *
  * @see http://www.datypic.com/sc/ooxml/t-w_ST_DocProtect.html
  */
 final class DocProtect extends AbstractEnum
 {
     /**
-     * No Editing Restrictions
+     * No Editing Restrictions.
      */
     const NONE = 'none';
 
     /**
-     * Allow No Editing
+     * Allow No Editing.
      */
     const READ_ONLY = 'readOnly';
 
     /**
-     * Allow Editing of Comments
+     * Allow Editing of Comments.
      */
     const COMMENTS = 'comments';
 
     /**
-     * Allow Editing With Revision Tracking
+     * Allow Editing With Revision Tracking.
      */
     const TRACKED_CHANGES = 'trackedChanges';
 
     /**
-     * Allow Editing of Form Fields
+     * Allow Editing of Form Fields.
      */
     const FORMS = 'forms';
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/SimpleType/Jc.php b/vendor/phpoffice/phpword/src/PhpWord/SimpleType/Jc.php
index e55f824d14..ab665822c4 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/SimpleType/Jc.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/SimpleType/Jc.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -26,7 +26,6 @@
  * Since ISO/IEC-29500:2008 the type must not be used for table alignment.
  *
  * @since 0.13.0
- *
  * @see \PhpOffice\PhpWord\SimpleType\JcTable For table alignment modes available since ISO/IEC-29500:2008.
  * @see  http://www.datypic.com/sc/ooxml/t-w_ST_Jc.html
  */
diff --git a/vendor/phpoffice/phpword/src/PhpWord/SimpleType/JcTable.php b/vendor/phpoffice/phpword/src/PhpWord/SimpleType/JcTable.php
index 924a4f2014..86a1b03462 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/SimpleType/JcTable.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/SimpleType/JcTable.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/vendor/phpoffice/phpword/src/PhpWord/SimpleType/LineSpacingRule.php b/vendor/phpoffice/phpword/src/PhpWord/SimpleType/LineSpacingRule.php
index 8fd8340c43..833b626953 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/SimpleType/LineSpacingRule.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/SimpleType/LineSpacingRule.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,26 +20,25 @@
 use PhpOffice\PhpWord\Shared\AbstractEnum;
 
 /**
- * Line Spacing Rule
+ * Line Spacing Rule.
  *
  * @since 0.14.0
- *
  * @see http://www.datypic.com/sc/ooxml/t-w_ST_LineSpacingRule.html
  */
 final class LineSpacingRule extends AbstractEnum
 {
     /**
-     * Automatically Determined Line Height
+     * Automatically Determined Line Height.
      */
     const AUTO = 'auto';
 
     /**
-     * Exact Line Height
+     * Exact Line Height.
      */
     const EXACT = 'exact';
 
     /**
-     * Minimum Line Height
+     * Minimum Line Height.
      */
     const AT_LEAST = 'atLeast';
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/SimpleType/NumberFormat.php b/vendor/phpoffice/phpword/src/PhpWord/SimpleType/NumberFormat.php
index 83da66fa3f..36a678e8ce 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/SimpleType/NumberFormat.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/SimpleType/NumberFormat.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -23,7 +23,6 @@
  * Numbering Format.
  *
  * @since 0.14.0
- *
  * @see http://www.datypic.com/sc/ooxml/t-w_ST_NumberFormat.html.
  */
 final class NumberFormat extends AbstractEnum
diff --git a/vendor/phpoffice/phpword/src/PhpWord/SimpleType/TblWidth.php b/vendor/phpoffice/phpword/src/PhpWord/SimpleType/TblWidth.php
index 7fd753deb0..28ba0db2d1 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/SimpleType/TblWidth.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/SimpleType/TblWidth.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,10 +20,9 @@
 use PhpOffice\PhpWord\Shared\AbstractEnum;
 
 /**
- * Table Width Units
+ * Table Width Units.
  *
  * @since 0.15.0
- *
  * @see http://www.datypic.com/sc/ooxml/t-w_ST_TblWidth.html
  */
 final class TblWidth extends AbstractEnum
diff --git a/vendor/phpoffice/phpword/src/PhpWord/SimpleType/TextAlignment.php b/vendor/phpoffice/phpword/src/PhpWord/SimpleType/TextAlignment.php
index 838b0c5e0e..1f2af0fd89 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/SimpleType/TextAlignment.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/SimpleType/TextAlignment.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,10 +20,9 @@
 use PhpOffice\PhpWord\Shared\AbstractEnum;
 
 /**
- * Magnification Preset Values
+ * Magnification Preset Values.
  *
  * @since 0.14.0
- *
  * @see http://www.datypic.com/sc/ooxml/t-w_ST_TextAlignment.html
  */
 final class TextAlignment extends AbstractEnum
diff --git a/vendor/phpoffice/phpword/src/PhpWord/SimpleType/VerticalJc.php b/vendor/phpoffice/phpword/src/PhpWord/SimpleType/VerticalJc.php
index 2a37de417d..147cd20910 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/SimpleType/VerticalJc.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/SimpleType/VerticalJc.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/vendor/phpoffice/phpword/src/PhpWord/SimpleType/Zoom.php b/vendor/phpoffice/phpword/src/PhpWord/SimpleType/Zoom.php
index 02c38fdb6a..fc53ec8ff3 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/SimpleType/Zoom.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/SimpleType/Zoom.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,10 +20,9 @@
 use PhpOffice\PhpWord\Shared\AbstractEnum;
 
 /**
- * Magnification Preset Values
+ * Magnification Preset Values.
  *
  * @since 0.14.0
- *
  * @see http://www.datypic.com/sc/ooxml/t-w_ST_Zoom.html
  */
 final class Zoom extends AbstractEnum
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Style.php b/vendor/phpoffice/phpword/src/PhpWord/Style.php
index 62783b6301..ea039622df 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Style.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Style.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -24,22 +24,23 @@
 use PhpOffice\PhpWord\Style\Table;
 
 /**
- * Style collection
+ * Style collection.
  */
 class Style
 {
     /**
-     * Style register
+     * Style register.
      *
      * @var array
      */
-    private static $styles = array();
+    private static $styles = [];
 
     /**
-     * Add paragraph style
+     * Add paragraph style.
      *
      * @param string $styleName
-     * @param array|\PhpOffice\PhpWord\Style\AbstractStyle $styles
+     * @param AbstractStyle|array $styles
+     *
      * @return \PhpOffice\PhpWord\Style\Paragraph
      */
     public static function addParagraphStyle($styleName, $styles)
@@ -48,11 +49,12 @@ public static function addParagraphStyle($styleName, $styles)
     }
 
     /**
-     * Add font style
+     * Add font style.
      *
      * @param string $styleName
-     * @param array|\PhpOffice\PhpWord\Style\AbstractStyle $fontStyle
-     * @param array|\PhpOffice\PhpWord\Style\AbstractStyle $paragraphStyle
+     * @param AbstractStyle|array $fontStyle
+     * @param AbstractStyle|array $paragraphStyle
+     *
      * @return \PhpOffice\PhpWord\Style\Font
      */
     public static function addFontStyle($styleName, $fontStyle, $paragraphStyle = null)
@@ -61,10 +63,11 @@ public static function addFontStyle($styleName, $fontStyle, $paragraphStyle = nu
     }
 
     /**
-     * Add link style
+     * Add link style.
      *
      * @param string $styleName
-     * @param array|\PhpOffice\PhpWord\Style\AbstractStyle $styles
+     * @param AbstractStyle|array $styles
+     *
      * @return \PhpOffice\PhpWord\Style\Font
      */
     public static function addLinkStyle($styleName, $styles)
@@ -73,11 +76,13 @@ public static function addLinkStyle($styleName, $styles)
     }
 
     /**
-     * Add numbering style
+     * Add numbering style.
      *
      * @param string $styleName
-     * @param array|\PhpOffice\PhpWord\Style\AbstractStyle $styleValues
+     * @param AbstractStyle|array $styleValues
+     *
      * @return \PhpOffice\PhpWord\Style\Numbering
+     *
      * @since 0.10.0
      */
     public static function addNumberingStyle($styleName, $styleValues)
@@ -86,11 +91,12 @@ public static function addNumberingStyle($styleName, $styleValues)
     }
 
     /**
-     * Add title style
+     * Add title style.
+     *
+     * @param null|int $depth Provide null to set title font
+     * @param AbstractStyle|array $fontStyle
+     * @param AbstractStyle|array $paragraphStyle
      *
-     * @param int|null $depth Provide null to set title font
-     * @param array|\PhpOffice\PhpWord\Style\AbstractStyle $fontStyle
-     * @param array|\PhpOffice\PhpWord\Style\AbstractStyle $paragraphStyle
      * @return \PhpOffice\PhpWord\Style\Font
      */
     public static function addTitleStyle($depth, $fontStyle, $paragraphStyle = null)
@@ -105,11 +111,12 @@ public static function addTitleStyle($depth, $fontStyle, $paragraphStyle = null)
     }
 
     /**
-     * Add table style
+     * Add table style.
      *
      * @param string $styleName
      * @param array $styleTable
-     * @param array|null $styleFirstRow
+     * @param null|array $styleFirstRow
+     *
      * @return \PhpOffice\PhpWord\Style\Table
      */
     public static function addTableStyle($styleName, $styleTable, $styleFirstRow = null)
@@ -118,9 +125,10 @@ public static function addTableStyle($styleName, $styleTable, $styleFirstRow = n
     }
 
     /**
-     * Count styles
+     * Count styles.
      *
      * @return int
+     *
      * @since 0.10.0
      */
     public static function countStyles()
@@ -133,15 +141,16 @@ public static function countStyles()
      *
      * @since 0.10.0
      */
-    public static function resetStyles()
+    public static function resetStyles(): void
     {
-        self::$styles = array();
+        self::$styles = [];
     }
 
     /**
-     * Set default paragraph style
+     * Set default paragraph style.
+     *
+     * @param AbstractStyle|array $styles Paragraph style definition
      *
-     * @param array|\PhpOffice\PhpWord\Style\AbstractStyle $styles Paragraph style definition
      * @return \PhpOffice\PhpWord\Style\Paragraph
      */
     public static function setDefaultParagraphStyle($styles)
@@ -150,9 +159,9 @@ public static function setDefaultParagraphStyle($styles)
     }
 
     /**
-     * Get all styles
+     * Get all styles.
      *
-     * @return \PhpOffice\PhpWord\Style\AbstractStyle[]
+     * @return AbstractStyle[]
      */
     public static function getStyles()
     {
@@ -160,10 +169,11 @@ public static function getStyles()
     }
 
     /**
-     * Get style by name
+     * Get style by name.
      *
      * @param string $styleName
-     * @return \PhpOffice\PhpWord\Style\AbstractStyle Paragraph|Font|Table|Numbering
+     *
+     * @return ?AbstractStyle Paragraph|Font|Table|Numbering
      */
     public static function getStyle($styleName)
     {
@@ -175,14 +185,15 @@ public static function getStyle($styleName)
     }
 
     /**
-     * Set style values and put it to static style collection
+     * Set style values and put it to static style collection.
      *
      * The $styleValues could be an array or object
      *
      * @param string $name
-     * @param \PhpOffice\PhpWord\Style\AbstractStyle $style
-     * @param array|\PhpOffice\PhpWord\Style\AbstractStyle $value
-     * @return \PhpOffice\PhpWord\Style\AbstractStyle
+     * @param AbstractStyle $style
+     * @param AbstractStyle|array $value
+     *
+     * @return AbstractStyle
      */
     private static function setStyleValues($name, $style, $value = null)
     {
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Style/AbstractStyle.php b/vendor/phpoffice/phpword/src/PhpWord/Style/AbstractStyle.php
index aca6635faa..4e5def618d 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Style/AbstractStyle.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Style/AbstractStyle.php
@@ -11,56 +11,58 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Style;
 
+use InvalidArgumentException;
 use PhpOffice\PhpWord\Shared\Text;
 
 /**
- * Abstract style class
+ * Abstract style class.
  *
  * @since 0.10.0
  */
 abstract class AbstractStyle
 {
     /**
-     * Style name
+     * Style name.
      *
-     * @var string
+     * @var ?string
      */
     protected $styleName;
 
     /**
-     * Index number in Style collection for named style
+     * Index number in Style collection for named style.
      *
      * This number starts from one and defined in Style::setStyleValues()
      *
-     * @var int|null
+     * @var null|int
      */
     protected $index;
 
     /**
-     * Aliases
+     * Aliases.
      *
      * @var array
      */
-    protected $aliases = array();
+    protected $aliases = [];
 
     /**
-     * Is this an automatic style? (Used primarily in OpenDocument driver)
+     * Is this an automatic style? (Used primarily in OpenDocument driver).
      *
      * @var bool
+     *
      * @since 0.11.0
      */
     private $isAuto = false;
 
     /**
-     * Get style name
+     * Get style name.
      *
-     * @return string
+     * @return ?string
      */
     public function getStyleName()
     {
@@ -68,9 +70,10 @@ public function getStyleName()
     }
 
     /**
-     * Set style name
+     * Set style name.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setStyleName($value)
@@ -81,9 +84,9 @@ public function setStyleName($value)
     }
 
     /**
-     * Get index number
+     * Get index number.
      *
-     * @return int|null
+     * @return null|int
      */
     public function getIndex()
     {
@@ -91,9 +94,10 @@ public function getIndex()
     }
 
     /**
-     * Set index number
+     * Set index number.
+     *
+     * @param null|int $value
      *
-     * @param int|null $value
      * @return self
      */
     public function setIndex($value = null)
@@ -104,7 +108,7 @@ public function setIndex($value = null)
     }
 
     /**
-     * Get is automatic style flag
+     * Get is automatic style flag.
      *
      * @return bool
      */
@@ -114,9 +118,10 @@ public function isAuto()
     }
 
     /**
-     * Set is automatic style flag
+     * Set is automatic style flag.
      *
      * @param bool $value
+     *
      * @return self
      */
     public function setAuto($value = true)
@@ -127,11 +132,13 @@ public function setAuto($value = true)
     }
 
     /**
-     * Return style value of child style object, e.g. `left` from `Indentation` child style of `Paragraph`
+     * Return style value of child style object, e.g. `left` from `Indentation` child style of `Paragraph`.
      *
      * @param \PhpOffice\PhpWord\Style\AbstractStyle $substyleObject
      * @param string $substyleProperty
+     *
      * @return mixed
+     *
      * @since 0.12.0
      */
     public function getChildStyleValue($substyleObject, $substyleProperty)
@@ -146,7 +153,7 @@ public function getChildStyleValue($substyleObject, $substyleProperty)
     }
 
     /**
-     * Set style value template method
+     * Set style value template method.
      *
      * Some child classes have their own specific overrides.
      * Backward compability check for versions < 0.10.0 which use underscore
@@ -154,7 +161,8 @@ public function getChildStyleValue($substyleObject, $substyleProperty)
      * Check if the set method is exists. Throws an exception?
      *
      * @param string $key
-     * @param string $value
+     * @param array|int|string $value
+     *
      * @return self
      */
     public function setStyleValue($key, $value)
@@ -162,6 +170,11 @@ public function setStyleValue($key, $value)
         if (isset($this->aliases[$key])) {
             $key = $this->aliases[$key];
         }
+
+        if ($key === 'align') {
+            $key = 'alignment';
+        }
+
         $method = 'set' . Text::removeUnderscorePrefix($key);
         if (method_exists($this, $method)) {
             $this->$method($value);
@@ -171,12 +184,13 @@ public function setStyleValue($key, $value)
     }
 
     /**
-     * Set style by using associative array
+     * Set style by using associative array.
      *
      * @param array $values
+     *
      * @return self
      */
-    public function setStyleByArray($values = array())
+    public function setStyleByArray($values = [])
     {
         foreach ($values as $key => $value) {
             $this->setStyleValue($key, $value);
@@ -186,11 +200,12 @@ public function setStyleByArray($values = array())
     }
 
     /**
-     * Set default for null and empty value
+     * Set default for null and empty value.
      *
-     * @param string $value (was: mixed)
-     * @param string $default (was: mixed)
-     * @return string (was: mixed)
+     * @param ?string $value
+     * @param string $default
+     *
+     * @return string
      */
     protected function setNonEmptyVal($value, $default)
     {
@@ -202,10 +217,11 @@ protected function setNonEmptyVal($value, $default)
     }
 
     /**
-     * Set bool value
+     * Set bool value.
      *
      * @param bool $value
      * @param bool $default
+     *
      * @return bool
      */
     protected function setBoolVal($value, $default)
@@ -218,11 +234,12 @@ protected function setBoolVal($value, $default)
     }
 
     /**
-     * Set numeric value
+     * Set numeric value.
      *
      * @param mixed $value
-     * @param int|float|null $default
-     * @return int|float|null
+     * @param null|float|int $default
+     *
+     * @return null|float|int
      */
     protected function setNumericVal($value, $default = null)
     {
@@ -234,11 +251,12 @@ protected function setNumericVal($value, $default = null)
     }
 
     /**
-     * Set integer value: Convert string that contains only numeric into integer
+     * Set integer value: Convert string that contains only numeric into integer.
      *
-     * @param int|null $value
-     * @param int|null $default
-     * @return int|null
+     * @param null|float|int|string $value
+     * @param null|int $default
+     *
+     * @return null|int
      */
     protected function setIntVal($value, $default = null)
     {
@@ -255,11 +273,12 @@ protected function setIntVal($value, $default = null)
     }
 
     /**
-     * Set float value: Convert string that contains only numeric into float
+     * Set float value: Convert string that contains only numeric into float.
      *
      * @param mixed $value
-     * @param float|null $default
-     * @return float|null
+     * @param null|float $default
+     *
+     * @return null|float
      */
     protected function setFloatVal($value, $default = null)
     {
@@ -274,19 +293,18 @@ protected function setFloatVal($value, $default = null)
     }
 
     /**
-     * Set enum value
+     * Set enum value.
      *
      * @param mixed $value
      * @param array $enum
      * @param mixed $default
      *
-     * @throws \InvalidArgumentException
      * @return mixed
      */
-    protected function setEnumVal($value = null, $enum = array(), $default = null)
+    protected function setEnumVal($value = null, $enum = [], $default = null)
     {
         if ($value != null && trim($value) != '' && !empty($enum) && !in_array($value, $enum)) {
-            throw new \InvalidArgumentException("Invalid style value: {$value} Options:" . implode(',', $enum));
+            throw new InvalidArgumentException("Invalid style value: {$value} Options:" . implode(',', $enum));
         } elseif ($value === null || trim($value) == '') {
             $value = $default;
         }
@@ -295,16 +313,17 @@ protected function setEnumVal($value = null, $enum = array(), $default = null)
     }
 
     /**
-     * Set object value
+     * Set object value.
      *
      * @param mixed $value
      * @param string $styleName
      * @param mixed &$style
+     *
      * @return mixed
      */
     protected function setObjectVal($value, $styleName, &$style)
     {
-        $styleClass = substr(get_class($this), 0, strrpos(get_class($this), '\\')) . '\\' . $styleName;
+        $styleClass = substr(static::class, 0, strrpos(static::class, '\\')) . '\\' . $styleName;
         if (is_array($value)) {
             /** @var \PhpOffice\PhpWord\Style\AbstractStyle $style Type hint */
             if (!$style instanceof $styleClass) {
@@ -319,11 +338,12 @@ protected function setObjectVal($value, $styleName, &$style)
     }
 
     /**
-     * Set $property value and set $pairProperty = false when $value = true
+     * Set $property value and set $pairProperty = false when $value = true.
      *
      * @param bool &$property
      * @param bool &$pairProperty
      * @param bool $value
+     *
      * @return self
      */
     protected function setPairedVal(&$property, &$pairProperty, $value)
@@ -335,20 +355,4 @@ protected function setPairedVal(&$property, &$pairProperty, $value)
 
         return $this;
     }
-
-    /**
-     * Set style using associative array
-     *
-     * @deprecated 0.11.0
-     *
-     * @param array $style
-     *
-     * @return self
-     *
-     * @codeCoverageIgnore
-     */
-    public function setArrayStyle(array $style = array())
-    {
-        return $this->setStyleByArray($style);
-    }
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Style/Border.php b/vendor/phpoffice/phpword/src/PhpWord/Style/Border.php
index d032d07faa..e2a56c5d21 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Style/Border.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Style/Border.php
@@ -11,120 +11,151 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Style;
 
 /**
- * Border style
+ * Border style.
  */
 class Border extends AbstractStyle
 {
+    const DEFAULT_MARGIN = 1440;           // In twips.
+
     /**
-     * Border Top Size
+     * Border Top Size.
      *
-     * @var int|float
+     * @var float|int
      */
     protected $borderTopSize;
 
     /**
-     * Border Top Color
+     * Border Top Color.
      *
-     * @var string
+     * @var null|string
      */
     protected $borderTopColor;
 
     /**
-     * Border Top Style
+     * Border Top Style.
      *
      * @var string
      */
     protected $borderTopStyle;
 
     /**
-     * Border Left Size
+     * Border Left Size.
      *
-     * @var int|float
+     * @var float|int
      */
     protected $borderLeftSize;
 
     /**
-     * Border Left Color
+     * Border Left Color.
      *
-     * @var string
+     * @var null|string
      */
     protected $borderLeftColor;
 
     /**
-     * Border Left Style
+     * Border Left Style.
      *
      * @var string
      */
     protected $borderLeftStyle;
 
     /**
-     * Border Right Size
+     * Border Right Size.
      *
-     * @var int|float
+     * @var float|int
      */
     protected $borderRightSize;
 
     /**
-     * Border Right Color
+     * Border Right Color.
      *
-     * @var string
+     * @var null|string
      */
     protected $borderRightColor;
 
     /**
-     * Border Right Style
+     * Border Right Style.
      *
      * @var string
      */
     protected $borderRightStyle;
 
     /**
-     * Border Bottom Size
+     * Border Bottom Size.
      *
-     * @var int|float
+     * @var float|int
      */
     protected $borderBottomSize;
 
     /**
-     * Border Bottom Color
+     * Border Bottom Color.
      *
-     * @var string
+     * @var null|string
      */
     protected $borderBottomColor;
 
     /**
-     * Border Bottom Style
+     * Border Bottom Style.
      *
      * @var string
      */
     protected $borderBottomStyle;
 
     /**
-     * Get border size
+     * Top margin spacing.
+     *
+     * @var float|int
+     */
+    protected $marginTop = self::DEFAULT_MARGIN;
+
+    /**
+     * Left margin spacing.
+     *
+     * @var float|int
+     */
+    protected $marginLeft = self::DEFAULT_MARGIN;
+
+    /**
+     * Right margin spacing.
+     *
+     * @var float|int
+     */
+    protected $marginRight = self::DEFAULT_MARGIN;
+
+    /**
+     * Bottom margin spacing.
+     *
+     * @var float|int
+     */
+    protected $marginBottom = self::DEFAULT_MARGIN;
+
+    /**
+     * Get border size.
      *
      * @return int[]
      */
     public function getBorderSize()
     {
-        return array(
+        return [
             $this->getBorderTopSize(),
             $this->getBorderLeftSize(),
             $this->getBorderRightSize(),
             $this->getBorderBottomSize(),
-        );
+        ];
     }
 
     /**
-     * Set border size
+     * Set border size.
+     *
+     * @param float|int $value
      *
-     * @param int|float $value
      * @return self
      */
     public function setBorderSize($value = null)
@@ -138,24 +169,25 @@ public function setBorderSize($value = null)
     }
 
     /**
-     * Get border color
+     * Get border color.
      *
-     * @return string[]
+     * @return array<null|string>
      */
     public function getBorderColor()
     {
-        return array(
+        return [
             $this->getBorderTopColor(),
             $this->getBorderLeftColor(),
             $this->getBorderRightColor(),
             $this->getBorderBottomColor(),
-        );
+        ];
     }
 
     /**
-     * Set border color
+     * Set border color.
+     *
+     * @param null|string $value
      *
-     * @param string $value
      * @return self
      */
     public function setBorderColor($value = null)
@@ -169,24 +201,25 @@ public function setBorderColor($value = null)
     }
 
     /**
-     * Get border style
+     * Get border style.
      *
      * @return string[]
      */
     public function getBorderStyle()
     {
-        return array(
+        return [
             $this->getBorderTopStyle(),
             $this->getBorderLeftStyle(),
             $this->getBorderRightStyle(),
             $this->getBorderBottomStyle(),
-        );
+        ];
     }
 
     /**
-     * Set border style
+     * Set border style.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setBorderStyle($value = null)
@@ -200,9 +233,9 @@ public function setBorderStyle($value = null)
     }
 
     /**
-     * Get border top size
+     * Get border top size.
      *
-     * @return int|float
+     * @return float|int
      */
     public function getBorderTopSize()
     {
@@ -210,9 +243,10 @@ public function getBorderTopSize()
     }
 
     /**
-     * Set border top size
+     * Set border top size.
+     *
+     * @param float|int $value
      *
-     * @param int|float $value
      * @return self
      */
     public function setBorderTopSize($value = null)
@@ -223,9 +257,9 @@ public function setBorderTopSize($value = null)
     }
 
     /**
-     * Get border top color
+     * Get border top color.
      *
-     * @return string
+     * @return null|string
      */
     public function getBorderTopColor()
     {
@@ -233,9 +267,10 @@ public function getBorderTopColor()
     }
 
     /**
-     * Set border top color
+     * Set border top color.
+     *
+     * @param null|string $value
      *
-     * @param string $value
      * @return self
      */
     public function setBorderTopColor($value = null)
@@ -246,7 +281,7 @@ public function setBorderTopColor($value = null)
     }
 
     /**
-     * Get border top style
+     * Get border top style.
      *
      * @return string
      */
@@ -256,9 +291,10 @@ public function getBorderTopStyle()
     }
 
     /**
-     * Set border top Style
+     * Set border top Style.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setBorderTopStyle($value = null)
@@ -269,9 +305,9 @@ public function setBorderTopStyle($value = null)
     }
 
     /**
-     * Get border left size
+     * Get border left size.
      *
-     * @return int|float
+     * @return float|int
      */
     public function getBorderLeftSize()
     {
@@ -279,9 +315,10 @@ public function getBorderLeftSize()
     }
 
     /**
-     * Set border left size
+     * Set border left size.
+     *
+     * @param float|int $value
      *
-     * @param int|float $value
      * @return self
      */
     public function setBorderLeftSize($value = null)
@@ -292,9 +329,9 @@ public function setBorderLeftSize($value = null)
     }
 
     /**
-     * Get border left color
+     * Get border left color.
      *
-     * @return string
+     * @return null|string
      */
     public function getBorderLeftColor()
     {
@@ -302,9 +339,10 @@ public function getBorderLeftColor()
     }
 
     /**
-     * Set border left color
+     * Set border left color.
+     *
+     * @param null|string $value
      *
-     * @param string $value
      * @return self
      */
     public function setBorderLeftColor($value = null)
@@ -315,7 +353,7 @@ public function setBorderLeftColor($value = null)
     }
 
     /**
-     * Get border left style
+     * Get border left style.
      *
      * @return string
      */
@@ -325,9 +363,10 @@ public function getBorderLeftStyle()
     }
 
     /**
-     * Set border left style
+     * Set border left style.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setBorderLeftStyle($value = null)
@@ -338,9 +377,9 @@ public function setBorderLeftStyle($value = null)
     }
 
     /**
-     * Get border right size
+     * Get border right size.
      *
-     * @return int|float
+     * @return float|int
      */
     public function getBorderRightSize()
     {
@@ -348,9 +387,10 @@ public function getBorderRightSize()
     }
 
     /**
-     * Set border right size
+     * Set border right size.
+     *
+     * @param float|int $value
      *
-     * @param int|float $value
      * @return self
      */
     public function setBorderRightSize($value = null)
@@ -361,9 +401,9 @@ public function setBorderRightSize($value = null)
     }
 
     /**
-     * Get border right color
+     * Get border right color.
      *
-     * @return string
+     * @return null|string
      */
     public function getBorderRightColor()
     {
@@ -371,9 +411,10 @@ public function getBorderRightColor()
     }
 
     /**
-     * Set border right color
+     * Set border right color.
+     *
+     * @param null|string $value
      *
-     * @param string $value
      * @return self
      */
     public function setBorderRightColor($value = null)
@@ -384,7 +425,7 @@ public function setBorderRightColor($value = null)
     }
 
     /**
-     * Get border right style
+     * Get border right style.
      *
      * @return string
      */
@@ -394,9 +435,10 @@ public function getBorderRightStyle()
     }
 
     /**
-     * Set border right style
+     * Set border right style.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setBorderRightStyle($value = null)
@@ -407,9 +449,9 @@ public function setBorderRightStyle($value = null)
     }
 
     /**
-     * Get border bottom size
+     * Get border bottom size.
      *
-     * @return int|float
+     * @return float|int
      */
     public function getBorderBottomSize()
     {
@@ -417,9 +459,10 @@ public function getBorderBottomSize()
     }
 
     /**
-     * Set border bottom size
+     * Set border bottom size.
+     *
+     * @param float|int $value
      *
-     * @param int|float $value
      * @return self
      */
     public function setBorderBottomSize($value = null)
@@ -430,9 +473,9 @@ public function setBorderBottomSize($value = null)
     }
 
     /**
-     * Get border bottom color
+     * Get border bottom color.
      *
-     * @return string
+     * @return null|string
      */
     public function getBorderBottomColor()
     {
@@ -440,9 +483,10 @@ public function getBorderBottomColor()
     }
 
     /**
-     * Set border bottom color
+     * Set border bottom color.
+     *
+     * @param null|string $value
      *
-     * @param string $value
      * @return self
      */
     public function setBorderBottomColor($value = null)
@@ -453,7 +497,7 @@ public function setBorderBottomColor($value = null)
     }
 
     /**
-     * Get border bottom style
+     * Get border bottom style.
      *
      * @return string
      */
@@ -463,9 +507,10 @@ public function getBorderBottomStyle()
     }
 
     /**
-     * Set border bottom style
+     * Set border bottom style.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setBorderBottomStyle($value = null)
@@ -476,7 +521,7 @@ public function setBorderBottomStyle($value = null)
     }
 
     /**
-     * Check if any of the border is not null
+     * Check if any of the border is not null.
      *
      * @return bool
      */
@@ -486,4 +531,100 @@ public function hasBorder()
 
         return $borders !== array_filter($borders, 'is_null');
     }
+
+    /**
+     * Get Margin Top.
+     *
+     * @return float|int
+     */
+    public function getMarginTop()
+    {
+        return $this->marginTop;
+    }
+
+    /**
+     * Set Margin Top.
+     *
+     * @param float|int $value
+     *
+     * @return self
+     */
+    public function setMarginTop($value = null)
+    {
+        $this->marginTop = $this->setNumericVal($value, self::DEFAULT_MARGIN);
+
+        return $this;
+    }
+
+    /**
+     * Get Margin Left.
+     *
+     * @return float|int
+     */
+    public function getMarginLeft()
+    {
+        return $this->marginLeft;
+    }
+
+    /**
+     * Set Margin Left.
+     *
+     * @param float|int $value
+     *
+     * @return self
+     */
+    public function setMarginLeft($value = null)
+    {
+        $this->marginLeft = $this->setNumericVal($value, self::DEFAULT_MARGIN);
+
+        return $this;
+    }
+
+    /**
+     * Get Margin Right.
+     *
+     * @return float|int
+     */
+    public function getMarginRight()
+    {
+        return $this->marginRight;
+    }
+
+    /**
+     * Set Margin Right.
+     *
+     * @param float|int $value
+     *
+     * @return self
+     */
+    public function setMarginRight($value = null)
+    {
+        $this->marginRight = $this->setNumericVal($value, self::DEFAULT_MARGIN);
+
+        return $this;
+    }
+
+    /**
+     * Get Margin Bottom.
+     *
+     * @return float|int
+     */
+    public function getMarginBottom()
+    {
+        return $this->marginBottom;
+    }
+
+    /**
+     * Set Margin Bottom.
+     *
+     * @param float|int $value
+     *
+     * @return self
+     */
+    public function setMarginBottom($value = null)
+    {
+        $this->marginBottom = $this->setNumericVal($value, self::DEFAULT_MARGIN);
+
+        return $this;
+    }
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Style/Cell.php b/vendor/phpoffice/phpword/src/PhpWord/Style/Cell.php
index 1276b5b59a..3246471fd5 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Style/Cell.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Style/Cell.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -21,58 +21,38 @@
 use PhpOffice\PhpWord\SimpleType\VerticalJc;
 
 /**
- * Table cell style
+ * Table cell style.
  */
 class Cell extends Border
 {
-    /**
-     * Vertical alignment constants
-     *
-     * @const string
-     * @deprecated Use \PhpOffice\PhpWord\SimpleType\VerticalJc::TOP instead
-     */
-    const VALIGN_TOP = 'top';
-    /**
-     * @deprecated Use \PhpOffice\PhpWord\SimpleType\VerticalJc::CENTER instead
-     */
-    const VALIGN_CENTER = 'center';
-    /**
-     * @deprecated Use \PhpOffice\PhpWord\SimpleType\VerticalJc::BOTTOM instead
-     */
-    const VALIGN_BOTTOM = 'bottom';
-    /**
-     * @deprecated Use \PhpOffice\PhpWord\SimpleType\VerticalJc::BOTH instead
-     */
-    const VALIGN_BOTH = 'both';
-
     //Text direction constants
     /**
-     * Left to Right, Top to Bottom
+     * Left to Right, Top to Bottom.
      */
     const TEXT_DIR_LRTB = 'lrTb';
     /**
-     * Top to Bottom, Right to Left
+     * Top to Bottom, Right to Left.
      */
     const TEXT_DIR_TBRL = 'tbRl';
     /**
-     * Bottom to Top, Left to Right
+     * Bottom to Top, Left to Right.
      */
     const TEXT_DIR_BTLR = 'btLr';
     /**
-     * Left to Right, Top to Bottom Rotated
+     * Left to Right, Top to Bottom Rotated.
      */
     const TEXT_DIR_LRTBV = 'lrTbV';
     /**
-     * Top to Bottom, Right to Left Rotated
+     * Top to Bottom, Right to Left Rotated.
      */
     const TEXT_DIR_TBRLV = 'tbRlV';
     /**
-     * Top to Bottom, Left to Right Rotated
+     * Top to Bottom, Left to Right Rotated.
      */
     const TEXT_DIR_TBLRV = 'tbLrV';
 
     /**
-     * Vertical merge (rowspan) constants
+     * Vertical merge (rowspan) constants.
      *
      * @const string
      */
@@ -80,35 +60,35 @@ class Cell extends Border
     const VMERGE_CONTINUE = 'continue';
 
     /**
-     * Default border color
+     * Default border color.
      *
      * @const string
      */
     const DEFAULT_BORDER_COLOR = '000000';
 
     /**
-     * Vertical align (top, center, both, bottom)
+     * Vertical align (top, center, both, bottom).
      *
      * @var string
      */
     private $vAlign;
 
     /**
-     * Text Direction
+     * Text Direction.
      *
      * @var string
      */
     private $textDirection;
 
     /**
-     * colspan
+     * colspan.
      *
      * @var int
      */
     private $gridSpan;
 
     /**
-     * rowspan (restart, continue)
+     * rowspan (restart, continue).
      *
      * - restart: Start/restart merged region
      * - continue: Continue merged region
@@ -118,26 +98,33 @@ class Cell extends Border
     private $vMerge;
 
     /**
-     * Shading
+     * Shading.
      *
      * @var \PhpOffice\PhpWord\Style\Shading
      */
     private $shading;
 
     /**
-     * Width
+     * Width.
      *
-     * @var int
+     * @var ?int
      */
     private $width;
 
     /**
-     * Width unit
+     * Width unit.
      *
      * @var string
      */
     private $unit = TblWidth::TWIP;
 
+    /**
+     * Prevent text from wrapping in the cell.
+     *
+     * @var bool
+     */
+    private $noWrap = true;
+
     /**
      * Get vertical align.
      *
@@ -149,9 +136,10 @@ public function getVAlign()
     }
 
     /**
-     * Set vertical align
+     * Set vertical align.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setVAlign($value = null)
@@ -173,21 +161,29 @@ public function getTextDirection()
     }
 
     /**
-     * Set text direction
+     * Set text direction.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setTextDirection($value = null)
     {
-        $enum = array(self::TEXT_DIR_BTLR, self::TEXT_DIR_TBRL);
+        $enum = [
+            self::TEXT_DIR_BTLR,
+            self::TEXT_DIR_TBRL,
+            self::TEXT_DIR_LRTB,
+            self::TEXT_DIR_LRTBV,
+            self::TEXT_DIR_TBRLV,
+            self::TEXT_DIR_TBLRV,
+        ];
         $this->textDirection = $this->setEnumVal($value, $enum, $this->textDirection);
 
         return $this;
     }
 
     /**
-     * Get background
+     * Get background.
      *
      * @return string
      */
@@ -201,14 +197,15 @@ public function getBgColor()
     }
 
     /**
-     * Set background
+     * Set background.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setBgColor($value = null)
     {
-        return $this->setShading(array('fill' => $value));
+        return $this->setShading(['fill' => $value]);
     }
 
     /**
@@ -222,9 +219,10 @@ public function getGridSpan()
     }
 
     /**
-     * Set grid span (colspan)
+     * Set grid span (colspan).
      *
      * @param int $value
+     *
      * @return self
      */
     public function setGridSpan($value = null)
@@ -245,21 +243,22 @@ public function getVMerge()
     }
 
     /**
-     * Set vertical merge (rowspan)
+     * Set vertical merge (rowspan).
      *
      * @param string $value
+     *
      * @return self
      */
     public function setVMerge($value = null)
     {
-        $enum = array(self::VMERGE_RESTART, self::VMERGE_CONTINUE);
+        $enum = [self::VMERGE_RESTART, self::VMERGE_CONTINUE];
         $this->vMerge = $this->setEnumVal($value, $enum, $this->vMerge);
 
         return $this;
     }
 
     /**
-     * Get shading
+     * Get shading.
      *
      * @return \PhpOffice\PhpWord\Style\Shading
      */
@@ -269,9 +268,10 @@ public function getShading()
     }
 
     /**
-     * Set shading
+     * Set shading.
      *
      * @param mixed $value
+     *
      * @return self
      */
     public function setShading($value = null)
@@ -282,9 +282,9 @@ public function setShading($value = null)
     }
 
     /**
-     * Get cell width
+     * Get cell width.
      *
-     * @return int
+     * @return ?int
      */
     public function getWidth()
     {
@@ -292,20 +292,21 @@ public function getWidth()
     }
 
     /**
-     * Set cell width
+     * Set cell width.
      *
      * @param int $value
+     *
      * @return self
      */
     public function setWidth($value)
     {
-        $this->setIntVal($value);
+        $this->width = $this->setIntVal($value);
 
         return $this;
     }
 
     /**
-     * Get width unit
+     * Get width unit.
      *
      * @return string
      */
@@ -315,26 +316,32 @@ public function getUnit()
     }
 
     /**
-     * Set width unit
+     * Set width unit.
      *
      * @param string $value
      */
     public function setUnit($value)
     {
-        $this->unit = $this->setEnumVal($value, array(TblWidth::AUTO, TblWidth::PERCENT, TblWidth::TWIP), TblWidth::TWIP);
+        $this->unit = $this->setEnumVal($value, [TblWidth::AUTO, TblWidth::PERCENT, TblWidth::TWIP], TblWidth::TWIP);
 
         return $this;
     }
 
     /**
-     * Get default border color
-     *
-     * @deprecated 0.10.0
-     *
-     * @codeCoverageIgnore
+     * Set noWrap.
+     */
+    public function setNoWrap(bool $value): self
+    {
+        $this->noWrap = $this->setBoolVal($value, true);
+
+        return $this;
+    }
+
+    /**
+     * Get noWrap.
      */
-    public function getDefaultBorderColor()
+    public function getNoWrap(): bool
     {
-        return self::DEFAULT_BORDER_COLOR;
+        return $this->noWrap;
     }
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Style/Chart.php b/vendor/phpoffice/phpword/src/PhpWord/Style/Chart.php
index c02c0af4d8..9dbc8db0a6 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Style/Chart.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Style/Chart.php
@@ -11,56 +11,56 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Style;
 
 /**
- * Chart style
+ * Chart style.
  *
  * @since 0.12.0
  */
 class Chart extends AbstractStyle
 {
     /**
-     * Width (in EMU)
+     * Width (in EMU).
      *
      * @var int
      */
     private $width = 1000000;
 
     /**
-     * Height (in EMU)
+     * Height (in EMU).
      *
      * @var int
      */
     private $height = 1000000;
 
     /**
-     * Is 3D; applies to pie, bar, line, area
+     * Is 3D; applies to pie, bar, line, area.
      *
      * @var bool
      */
     private $is3d = false;
 
     /**
-     * A list of colors to use in the chart
+     * A list of colors to use in the chart.
      *
      * @var array
      */
-    private $colors = array();
+    private $colors = [];
 
     /**
-     * Chart title
+     * Chart title.
      *
      * @var string
      */
-    private $title = null;
+    private $title;
 
     /**
-     * Chart legend visibility
+     * Chart legend visibility.
      *
      * @var bool
      */
@@ -68,32 +68,32 @@ class Chart extends AbstractStyle
 
     /**
      * Chart legend Position.
-     * Possible values are 'r', 't', 'b', 'l', 'tr'
+     * Possible values are 'r', 't', 'b', 'l', 'tr'.
      *
      * @var string
      */
     private $legendPosition = 'r';
 
     /**
-     * A list of display options for data labels
+     * A list of display options for data labels.
      *
      * @var array
      */
-    private $dataLabelOptions = array(
-        'showVal'          => true, // value
-        'showCatName'      => true, // category name
-        'showLegendKey'    => false, //show the cart legend
-        'showSerName'      => false, // series name
-        'showPercent'      => false,
-        'showLeaderLines'  => false,
-        'showBubbleSize'   => false,
-    );
+    private $dataLabelOptions = [
+        'showVal' => true, // value
+        'showCatName' => true, // category name
+        'showLegendKey' => false, //show the cart legend
+        'showSerName' => false, // series name
+        'showPercent' => false,
+        'showLeaderLines' => false,
+        'showBubbleSize' => false,
+    ];
 
     /**
      * A string that tells the writer where to write chart labels or to skip
      * "nextTo" - sets labels next to the axis (bar graphs on the left) (default)
      * "low" - labels on the left side of the graph
-     * "high" - labels on the right side of the graph
+     * "high" - labels on the right side of the graph.
      *
      * @var string
      */
@@ -103,7 +103,7 @@ class Chart extends AbstractStyle
      * A string that tells the writer where to write chart labels or to skip
      * "nextTo" - sets labels next to the axis (bar graphs on the bottom) (default)
      * "low" - labels are below the graph
-     * "high" - labels above the graph
+     * "high" - labels above the graph.
      *
      * @var string
      */
@@ -121,45 +121,45 @@ class Chart extends AbstractStyle
 
     /**
      * The position for major tick marks
-     * Possible values are 'in', 'out', 'cross', 'none'
+     * Possible values are 'in', 'out', 'cross', 'none'.
      *
      * @var string
      */
     private $majorTickMarkPos = 'none';
 
     /**
-     * Show labels for axis
+     * Show labels for axis.
      *
      * @var bool
      */
     private $showAxisLabels = false;
 
     /**
-     * Show Gridlines for Y-Axis
+     * Show Gridlines for Y-Axis.
      *
      * @var bool
      */
     private $gridY = false;
 
     /**
-     * Show Gridlines for X-Axis
+     * Show Gridlines for X-Axis.
      *
      * @var bool
      */
     private $gridX = false;
 
     /**
-     * Create a new instance
+     * Create a new instance.
      *
      * @param array $style
      */
-    public function __construct($style = array())
+    public function __construct($style = [])
     {
         $this->setStyleByArray($style);
     }
 
     /**
-     * Get width
+     * Get width.
      *
      * @return int
      */
@@ -169,9 +169,10 @@ public function getWidth()
     }
 
     /**
-     * Set width
+     * Set width.
      *
      * @param int $value
+     *
      * @return self
      */
     public function setWidth($value = null)
@@ -182,7 +183,7 @@ public function setWidth($value = null)
     }
 
     /**
-     * Get height
+     * Get height.
      *
      * @return int
      */
@@ -192,9 +193,10 @@ public function getHeight()
     }
 
     /**
-     * Set height
+     * Set height.
      *
      * @param int $value
+     *
      * @return self
      */
     public function setHeight($value = null)
@@ -205,7 +207,7 @@ public function setHeight($value = null)
     }
 
     /**
-     * Is 3D
+     * Is 3D.
      *
      * @return bool
      */
@@ -215,9 +217,10 @@ public function is3d()
     }
 
     /**
-     * Set 3D
+     * Set 3D.
      *
      * @param bool $value
+     *
      * @return self
      */
     public function set3d($value = true)
@@ -241,9 +244,10 @@ public function getColors()
      * Set the colors to use in a chart.
      *
      * @param array $value a list of colors to use in the chart
+     *
      * @return self
      */
-    public function setColors($value = array())
+    public function setColors($value = [])
     {
         $this->colors = $value;
 
@@ -251,7 +255,7 @@ public function setColors($value = array())
     }
 
     /**
-     * Get the chart title
+     * Get the chart title.
      *
      * @return string
      */
@@ -261,9 +265,10 @@ public function getTitle()
     }
 
     /**
-     * Set the chart title
+     * Set the chart title.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setTitle($value = null)
@@ -274,7 +279,7 @@ public function setTitle($value = null)
     }
 
     /**
-     * Get chart legend visibility
+     * Get chart legend visibility.
      *
      * @return bool
      */
@@ -284,9 +289,10 @@ public function isShowLegend()
     }
 
     /**
-     * Set chart legend visibility
+     * Set chart legend visibility.
      *
      * @param bool $value
+     *
      * @return self
      */
     public function setShowLegend($value = false)
@@ -297,7 +303,7 @@ public function setShowLegend($value = false)
     }
 
     /**
-     * Get chart legend position
+     * Get chart legend position.
      *
      * @return string
      */
@@ -312,16 +318,17 @@ public function getLegendPosition()
      * "b" - bottom of chart
      * "t" - top of chart
      * "l" - left of chart
-     * "tr" - top right of chart
+     * "tr" - top right of chart.
      *
      * default: right
      *
      * @param string $legendPosition
+     *
      * @return self
      */
     public function setLegendPosition($legendPosition = 'r')
     {
-        $enum = array('r', 'b', 't', 'l', 'tr');
+        $enum = ['r', 'b', 't', 'l', 'tr'];
         $this->legendPosition = $this->setEnumVal($legendPosition, $enum, $this->legendPosition);
 
         return $this;
@@ -338,9 +345,10 @@ public function showAxisLabels()
     }
 
     /**
-     * Set show Gridlines for Y-Axis
+     * Set show Gridlines for Y-Axis.
      *
      * @param bool $value
+     *
      * @return self
      */
     public function setShowAxisLabels($value = true)
@@ -351,7 +359,7 @@ public function setShowAxisLabels($value = true)
     }
 
     /**
-     * get the list of options for data labels
+     * get the list of options for data labels.
      *
      * @return array
      */
@@ -366,7 +374,7 @@ public function getDataLabelOptions()
      *
      * @param array $values [description]
      */
-    public function setDataLabelOptions($values = array())
+    public function setDataLabelOptions($values = []): void
     {
         foreach (array_keys($this->dataLabelOptions) as $option) {
             if (isset($values[$option])) {
@@ -389,9 +397,10 @@ public function showGridY()
     }
 
     /**
-     * Set show Gridlines for Y-Axis
+     * Set show Gridlines for Y-Axis.
      *
      * @param bool $value
+     *
      * @return self
      */
     public function setShowGridY($value = true)
@@ -402,7 +411,7 @@ public function setShowGridY($value = true)
     }
 
     /**
-     * Get the categoryLabelPosition setting
+     * Get the categoryLabelPosition setting.
      *
      * @return string
      */
@@ -416,21 +425,22 @@ public function getCategoryLabelPosition()
      * "none" - skips writing  labels
      * "nextTo" - sets labels next to the  (bar graphs on the left)
      * "low" - labels on the left side of the graph
-     * "high" - labels on the right side of the graph
+     * "high" - labels on the right side of the graph.
      *
      * @param mixed $labelPosition
+     *
      * @return self
      */
     public function setCategoryLabelPosition($labelPosition)
     {
-        $enum = array('nextTo', 'low', 'high');
+        $enum = ['nextTo', 'low', 'high'];
         $this->categoryLabelPosition = $this->setEnumVal($labelPosition, $enum, $this->categoryLabelPosition);
 
         return $this;
     }
 
     /**
-     * Get the valueAxisLabelPosition setting
+     * Get the valueAxisLabelPosition setting.
      *
      * @return string
      */
@@ -444,21 +454,22 @@ public function getValueLabelPosition()
      * "none" - skips writing labels
      * "nextTo" - sets labels next to the value
      * "low" - sets labels are below the graph
-     * "high" - sets labels above the graph
+     * "high" - sets labels above the graph.
      *
      * @param string
      * @param mixed $labelPosition
      */
     public function setValueLabelPosition($labelPosition)
     {
-        $enum = array('nextTo', 'low', 'high');
+        $enum = ['nextTo', 'low', 'high'];
         $this->valueLabelPosition = $this->setEnumVal($labelPosition, $enum, $this->valueLabelPosition);
 
         return $this;
     }
 
     /**
-     * Get the categoryAxisTitle
+     * Get the categoryAxisTitle.
+     *
      * @return string
      */
     public function getCategoryAxisTitle()
@@ -467,7 +478,8 @@ public function getCategoryAxisTitle()
     }
 
     /**
-     * Set the title that appears on the category side of the chart
+     * Set the title that appears on the category side of the chart.
+     *
      * @param string $axisTitle
      */
     public function setCategoryAxisTitle($axisTitle)
@@ -478,7 +490,8 @@ public function setCategoryAxisTitle($axisTitle)
     }
 
     /**
-     * Get the valueAxisTitle
+     * Get the valueAxisTitle.
+     *
      * @return string
      */
     public function getValueAxisTitle()
@@ -487,7 +500,8 @@ public function getValueAxisTitle()
     }
 
     /**
-     * Set the title that appears on the value side of the chart
+     * Set the title that appears on the value side of the chart.
+     *
      * @param string $axisTitle
      */
     public function setValueAxisTitle($axisTitle)
@@ -503,17 +517,18 @@ public function getMajorTickPosition()
     }
 
     /**
-     * Set the position for major tick marks
+     * Set the position for major tick marks.
+     *
      * @param string $position
      */
-    public function setMajorTickPosition($position)
+    public function setMajorTickPosition($position): void
     {
-        $enum = array('in', 'out', 'cross', 'none');
+        $enum = ['in', 'out', 'cross', 'none'];
         $this->majorTickMarkPos = $this->setEnumVal($position, $enum, $this->majorTickMarkPos);
     }
 
     /**
-     * Show Gridlines for X-Axis
+     * Show Gridlines for X-Axis.
      *
      * @return bool
      */
@@ -523,9 +538,10 @@ public function showGridX()
     }
 
     /**
-     * Set show Gridlines for X-Axis
+     * Set show Gridlines for X-Axis.
      *
      * @param bool $value
+     *
      * @return self
      */
     public function setShowGridX($value = true)
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Style/Extrusion.php b/vendor/phpoffice/phpword/src/PhpWord/Style/Extrusion.php
index 4c860bcd63..dd00231223 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Style/Extrusion.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Style/Extrusion.php
@@ -11,14 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Style;
 
 /**
- * 3D extrusion style
+ * 3D extrusion style.
  *
  * @see  http://www.schemacentral.com/sc/ooxml/t-o_CT_Extrusion.html
  * @since 0.12.0
@@ -26,7 +26,7 @@
 class Extrusion extends AbstractStyle
 {
     /**
-     * Type constants
+     * Type constants.
      *
      * @const string
      */
@@ -34,31 +34,31 @@ class Extrusion extends AbstractStyle
     const EXTRUSION_PERSPECTIVE = 'perspective';
 
     /**
-     * Type: parallel|perspective
+     * Type: parallel|perspective.
      *
      * @var string
      */
     private $type;
 
     /**
-     * Color
+     * Color.
      *
      * @var string
      */
     private $color;
 
     /**
-     * Create a new instance
+     * Create a new instance.
      *
      * @param array $style
      */
-    public function __construct($style = array())
+    public function __construct($style = [])
     {
         $this->setStyleByArray($style);
     }
 
     /**
-     * Get type
+     * Get type.
      *
      * @return string
      */
@@ -68,21 +68,22 @@ public function getType()
     }
 
     /**
-     * Set pattern
+     * Set pattern.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setType($value = null)
     {
-        $enum = array(self::EXTRUSION_PARALLEL, self::EXTRUSION_PERSPECTIVE);
+        $enum = [self::EXTRUSION_PARALLEL, self::EXTRUSION_PERSPECTIVE];
         $this->type = $this->setEnumVal($value, $enum, null);
 
         return $this;
     }
 
     /**
-     * Get color
+     * Get color.
      *
      * @return string
      */
@@ -92,9 +93,10 @@ public function getColor()
     }
 
     /**
-     * Set color
+     * Set color.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setColor($value = null)
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Style/Fill.php b/vendor/phpoffice/phpword/src/PhpWord/Style/Fill.php
index 360bcf3f0c..af0149d0fe 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Style/Fill.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Style/Fill.php
@@ -11,14 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Style;
 
 /**
- * Fill style
+ * Fill style.
  *
  * There are still lot of interesting things for this style that can be added, including gradient. See @see .
  *
@@ -28,24 +28,24 @@
 class Fill extends AbstractStyle
 {
     /**
-     * Color
+     * Color.
      *
      * @var string
      */
     private $color;
 
     /**
-     * Create a new instance
+     * Create a new instance.
      *
      * @param array $style
      */
-    public function __construct($style = array())
+    public function __construct($style = [])
     {
         $this->setStyleByArray($style);
     }
 
     /**
-     * Get color
+     * Get color.
      *
      * @return string
      */
@@ -55,9 +55,10 @@ public function getColor()
     }
 
     /**
-     * Set color
+     * Set color.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setColor($value = null)
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Style/Font.php b/vendor/phpoffice/phpword/src/PhpWord/Style/Font.php
index 09e6f1a2f3..a4580bc87b 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Style/Font.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Style/Font.php
@@ -11,19 +11,22 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Style;
 
+use PhpOffice\PhpWord\Settings;
+use PhpOffice\PhpWord\Shared\Validate;
+
 /**
- * Font style
+ * Font style.
  */
 class Font extends AbstractStyle
 {
     /**
-     * Underline types
+     * Underline types.
      *
      * @const string
      */
@@ -33,14 +36,6 @@ class Font extends AbstractStyle
     const UNDERLINE_DASHLONG = 'dashLong';
     const UNDERLINE_DASHLONGHEAVY = 'dashLongHeavy';
     const UNDERLINE_DOUBLE = 'dbl';
-    /**
-     * @deprecated use UNDERLINE_DOTHASH instead, TODO remove in version 1.0
-     */
-    const UNDERLINE_DOTHASH = 'dotDash';  // Incorrect spelling, for backwards compatibility
-    /**
-     * @deprecated use UNDERLINE_DOTDASHHEAVY instead, TODO remove in version 1.0
-     */
-    const UNDERLINE_DOTHASHHEAVY = 'dotDashHeavy';  // Incorrect spelling, for backwards compatibility
     const UNDERLINE_DOTDASH = 'dotDash';
     const UNDERLINE_DOTDASHHEAVY = 'dotDashHeavy';
     const UNDERLINE_DOTDOTDASH = 'dotDotDash';
@@ -55,7 +50,7 @@ class Font extends AbstractStyle
     const UNDERLINE_WORDS = 'words';
 
     /**
-     * Foreground colors
+     * Foreground colors.
      *
      * @const string
      */
@@ -76,169 +71,174 @@ class Font extends AbstractStyle
     const FGCOLOR_BLACK = 'black';
 
     /**
-     * Aliases
+     * Aliases.
      *
      * @var array
      */
-    protected $aliases = array('line-height' => 'lineHeight', 'letter-spacing' => 'spacing');
+    protected $aliases = ['line-height' => 'lineHeight', 'letter-spacing' => 'spacing'];
 
     /**
-     * Font style type
+     * Font style type.
      *
      * @var string
      */
     private $type;
 
     /**
-     * Font name
+     * Font name.
      *
      * @var string
      */
     private $name;
 
     /**
-     * Font Content Type
+     * Font Content Type.
      *
      * @var string
      */
     private $hint;
 
     /**
-     * Font size
+     * Font size.
      *
-     * @var int|float
+     * @var float|int
      */
     private $size;
 
     /**
-     * Font color
+     * Font color.
      *
      * @var string
      */
     private $color;
 
     /**
-     * Bold
+     * Bold.
      *
      * @var bool
      */
     private $bold;
 
     /**
-     * Italic
+     * Italic.
      *
      * @var bool
      */
     private $italic;
 
     /**
-     * Undeline
+     * Undeline.
      *
      * @var string
      */
     private $underline = self::UNDERLINE_NONE;
 
     /**
-     * Superscript
+     * Superscript.
      *
      * @var bool
      */
     private $superScript = false;
 
     /**
-     * Subscript
+     * Subscript.
      *
      * @var bool
      */
     private $subScript = false;
 
     /**
-     * Strikethrough
+     * Strikethrough.
      *
      * @var bool
      */
     private $strikethrough;
 
     /**
-     * Double strikethrough
+     * Double strikethrough.
      *
      * @var bool
      */
     private $doubleStrikethrough;
 
     /**
-     * Small caps
+     * Small caps.
      *
      * @var bool
+     *
      * @see  http://www.schemacentral.com/sc/ooxml/e-w_smallCaps-1.html
      */
     private $smallCaps;
 
     /**
-     * All caps
+     * All caps.
      *
      * @var bool
+     *
      * @see  http://www.schemacentral.com/sc/ooxml/e-w_caps-1.html
      */
     private $allCaps;
 
     /**
-     * Foreground/highlight
+     * Foreground/highlight.
      *
      * @var string
      */
     private $fgColor;
 
     /**
-     * Expanded/compressed text: 0-600 (percent)
+     * Expanded/compressed text: 0-600 (percent).
      *
      * @var int
+     *
      * @since 0.12.0
      * @see  http://www.schemacentral.com/sc/ooxml/e-w_w-1.html
      */
     private $scale;
 
     /**
-     * Character spacing adjustment: twip
+     * Character spacing adjustment: twip.
+     *
+     * @var float|int
      *
-     * @var int|float
      * @since 0.12.0
      * @see  http://www.schemacentral.com/sc/ooxml/e-w_spacing-2.html
      */
     private $spacing;
 
     /**
-     * Font kerning: halfpoint
+     * Font kerning: halfpoint.
+     *
+     * @var float|int
      *
-     * @var int|float
      * @since 0.12.0
      * @see  http://www.schemacentral.com/sc/ooxml/e-w_kern-1.html
      */
     private $kerning;
 
     /**
-     * Paragraph style
+     * Paragraph style.
      *
      * @var \PhpOffice\PhpWord\Style\Paragraph
      */
     private $paragraph;
 
     /**
-     * Shading
+     * Shading.
      *
      * @var \PhpOffice\PhpWord\Style\Shading
      */
     private $shading;
 
     /**
-     * Right to left languages
+     * Right to left languages.
      *
-     * @var bool
+     * @var ?bool
      */
     private $rtl;
 
     /**
-     * noProof (disables AutoCorrect)
+     * noProof (disables AutoCorrect).
      *
      * @var bool
      * http://www.datypic.com/sc/ooxml/e-w_noProof-1.html
@@ -246,33 +246,49 @@ class Font extends AbstractStyle
     private $noProof;
 
     /**
-     * Languages
+     * Languages.
      *
-     * @var \PhpOffice\PhpWord\Style\Language
+     * @var null|\PhpOffice\PhpWord\Style\Language
      */
     private $lang;
 
     /**
-     * Hidden text
+     * Hidden text.
      *
      * @var bool
+     *
      * @see  http://www.datypic.com/sc/ooxml/e-w_vanish-1.html
      */
     private $hidden;
 
     /**
-     * Vertically Raised or Lowered Text
+     * Vertically Raised or Lowered Text.
      *
      * @var int Signed Half-Point Measurement
+     *
      * @see http://www.datypic.com/sc/ooxml/e-w_position-1.html
      */
     private $position;
 
     /**
-     * Create new font style
+     * Preservation of white space in html.
+     *
+     * @var string Value used for css white-space
+     */
+    private $whiteSpace = '';
+
+    /**
+     * Generic font as fallback for html.
+     *
+     * @var string generic font name
+     */
+    private $fallbackFont = '';
+
+    /**
+     * Create new font style.
      *
      * @param string $type Type of font
-     * @param array|string|\PhpOffice\PhpWord\Style\AbstractStyle $paragraph Paragraph styles definition
+     * @param array|\PhpOffice\PhpWord\Style\AbstractStyle|string $paragraph Paragraph styles definition
      */
     public function __construct($type = 'text', $paragraph = null)
     {
@@ -281,51 +297,52 @@ public function __construct($type = 'text', $paragraph = null)
     }
 
     /**
-     * Get style values
+     * Get style values.
      *
      * @return array
+     *
      * @since 0.12.0
      */
     public function getStyleValues()
     {
-        $styles = array(
-            'name'          => $this->getStyleName(),
-            'basic'         => array(
-                'name'      => $this->getName(),
-                'size'      => $this->getSize(),
-                'color'     => $this->getColor(),
-                'hint'      => $this->getHint(),
-            ),
-            'style'         => array(
-                'bold'      => $this->isBold(),
-                'italic'    => $this->isItalic(),
+        return [
+            'name' => $this->getStyleName(),
+            'basic' => [
+                'name' => $this->getName(),
+                'size' => $this->getSize(),
+                'color' => $this->getColor(),
+                'hint' => $this->getHint(),
+            ],
+            'style' => [
+                'bold' => $this->isBold(),
+                'italic' => $this->isItalic(),
                 'underline' => $this->getUnderline(),
-                'strike'    => $this->isStrikethrough(),
-                'dStrike'   => $this->isDoubleStrikethrough(),
-                'super'     => $this->isSuperScript(),
-                'sub'       => $this->isSubScript(),
+                'strike' => $this->isStrikethrough(),
+                'dStrike' => $this->isDoubleStrikethrough(),
+                'super' => $this->isSuperScript(),
+                'sub' => $this->isSubScript(),
                 'smallCaps' => $this->isSmallCaps(),
-                'allCaps'   => $this->isAllCaps(),
-                'fgColor'   => $this->getFgColor(),
-                'hidden'    => $this->isHidden(),
-            ),
-            'spacing'       => array(
-                'scale'     => $this->getScale(),
-                'spacing'   => $this->getSpacing(),
-                'kerning'   => $this->getKerning(),
-                'position'  => $this->getPosition(),
-            ),
-            'paragraph'     => $this->getParagraph(),
-            'rtl'           => $this->isRTL(),
-            'shading'       => $this->getShading(),
-            'lang'          => $this->getLang(),
-        );
-
-        return $styles;
-    }
-
-    /**
-     * Get style type
+                'allCaps' => $this->isAllCaps(),
+                'fgColor' => $this->getFgColor(),
+                'hidden' => $this->isHidden(),
+            ],
+            'spacing' => [
+                'scale' => $this->getScale(),
+                'spacing' => $this->getSpacing(),
+                'kerning' => $this->getKerning(),
+                'position' => $this->getPosition(),
+            ],
+            'paragraph' => $this->getParagraph(),
+            'rtl' => $this->isRTL(),
+            'shading' => $this->getShading(),
+            'lang' => $this->getLang(),
+            'whiteSpace' => $this->getWhiteSpace(),
+            'fallbackFont' => $this->getFallbackFont(),
+        ];
+    }
+
+    /**
+     * Get style type.
      *
      * @return string
      */
@@ -335,7 +352,7 @@ public function getStyleType()
     }
 
     /**
-     * Get font name
+     * Get font name.
      *
      * @return string
      */
@@ -345,9 +362,10 @@ public function getName()
     }
 
     /**
-     * Set font name
+     * Set font name.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setName($value = null)
@@ -358,7 +376,7 @@ public function setName($value = null)
     }
 
     /**
-     * Get Font Content Type
+     * Get Font Content Type.
      *
      * @return string
      */
@@ -368,9 +386,10 @@ public function getHint()
     }
 
     /**
-     * Set Font Content Type
+     * Set Font Content Type.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setHint($value = null)
@@ -381,9 +400,9 @@ public function setHint($value = null)
     }
 
     /**
-     * Get font size
+     * Get font size.
      *
-     * @return int|float
+     * @return float|int
      */
     public function getSize()
     {
@@ -391,9 +410,10 @@ public function getSize()
     }
 
     /**
-     * Set font size
+     * Set font size.
+     *
+     * @param float|int $value
      *
-     * @param int|float $value
      * @return self
      */
     public function setSize($value = null)
@@ -404,7 +424,7 @@ public function setSize($value = null)
     }
 
     /**
-     * Get font color
+     * Get font color.
      *
      * @return string
      */
@@ -414,9 +434,10 @@ public function getColor()
     }
 
     /**
-     * Set font color
+     * Set font color.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setColor($value = null)
@@ -427,7 +448,7 @@ public function setColor($value = null)
     }
 
     /**
-     * Get bold
+     * Get bold.
      *
      * @return bool
      */
@@ -437,9 +458,10 @@ public function isBold()
     }
 
     /**
-     * Set bold
+     * Set bold.
      *
      * @param bool $value
+     *
      * @return self
      */
     public function setBold($value = true)
@@ -450,7 +472,7 @@ public function setBold($value = true)
     }
 
     /**
-     * Get italic
+     * Get italic.
      *
      * @return bool
      */
@@ -460,9 +482,10 @@ public function isItalic()
     }
 
     /**
-     * Set italic
+     * Set italic.
      *
      * @param bool $value
+     *
      * @return self
      */
     public function setItalic($value = true)
@@ -473,7 +496,7 @@ public function setItalic($value = true)
     }
 
     /**
-     * Get underline
+     * Get underline.
      *
      * @return string
      */
@@ -483,9 +506,10 @@ public function getUnderline()
     }
 
     /**
-     * Set underline
+     * Set underline.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setUnderline($value = self::UNDERLINE_NONE)
@@ -496,7 +520,7 @@ public function setUnderline($value = self::UNDERLINE_NONE)
     }
 
     /**
-     * Get superscript
+     * Get superscript.
      *
      * @return bool
      */
@@ -506,9 +530,10 @@ public function isSuperScript()
     }
 
     /**
-     * Set superscript
+     * Set superscript.
      *
      * @param bool $value
+     *
      * @return self
      */
     public function setSuperScript($value = true)
@@ -517,7 +542,7 @@ public function setSuperScript($value = true)
     }
 
     /**
-     * Get subscript
+     * Get subscript.
      *
      * @return bool
      */
@@ -527,9 +552,10 @@ public function isSubScript()
     }
 
     /**
-     * Set subscript
+     * Set subscript.
      *
      * @param bool $value
+     *
      * @return self
      */
     public function setSubScript($value = true)
@@ -538,49 +564,43 @@ public function setSubScript($value = true)
     }
 
     /**
-     * Get strikethrough
-     *
-     * @return bool
+     * Get strikethrough.
      */
-    public function isStrikethrough()
+    public function isStrikethrough(): ?bool
     {
         return $this->strikethrough;
     }
 
     /**
-     * Set strikethrough
+     * Set strikethrough.
      *
      * @param bool $value
-     * @return self
      */
-    public function setStrikethrough($value = true)
+    public function setStrikethrough($value = true): self
     {
         return $this->setPairedVal($this->strikethrough, $this->doubleStrikethrough, $value);
     }
 
     /**
-     * Get double strikethrough
-     *
-     * @return bool
+     * Get double strikethrough.
      */
-    public function isDoubleStrikethrough()
+    public function isDoubleStrikethrough(): ?bool
     {
         return $this->doubleStrikethrough;
     }
 
     /**
-     * Set double strikethrough
+     * Set double strikethrough.
      *
      * @param bool $value
-     * @return self
      */
-    public function setDoubleStrikethrough($value = true)
+    public function setDoubleStrikethrough($value = true): self
     {
         return $this->setPairedVal($this->doubleStrikethrough, $this->strikethrough, $value);
     }
 
     /**
-     * Get small caps
+     * Get small caps.
      *
      * @return bool
      */
@@ -590,9 +610,10 @@ public function isSmallCaps()
     }
 
     /**
-     * Set small caps
+     * Set small caps.
      *
      * @param bool $value
+     *
      * @return self
      */
     public function setSmallCaps($value = true)
@@ -601,7 +622,7 @@ public function setSmallCaps($value = true)
     }
 
     /**
-     * Get all caps
+     * Get all caps.
      *
      * @return bool
      */
@@ -611,9 +632,10 @@ public function isAllCaps()
     }
 
     /**
-     * Set all caps
+     * Set all caps.
      *
      * @param bool $value
+     *
      * @return self
      */
     public function setAllCaps($value = true)
@@ -622,7 +644,7 @@ public function setAllCaps($value = true)
     }
 
     /**
-     * Get foreground/highlight color
+     * Get foreground/highlight color.
      *
      * @return string
      */
@@ -632,9 +654,10 @@ public function getFgColor()
     }
 
     /**
-     * Set foreground/highlight color
+     * Set foreground/highlight color.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setFgColor($value = null)
@@ -645,7 +668,7 @@ public function setFgColor($value = null)
     }
 
     /**
-     * Get background
+     * Get background.
      *
      * @return string
      */
@@ -655,18 +678,19 @@ public function getBgColor()
     }
 
     /**
-     * Set background
+     * Set background.
      *
      * @param string $value
+     *
      * @return \PhpOffice\PhpWord\Style\Table
      */
     public function setBgColor($value = null)
     {
-        $this->setShading(array('fill' => $value));
+        $this->setShading(['fill' => $value]);
     }
 
     /**
-     * Get scale
+     * Get scale.
      *
      * @return int
      */
@@ -676,9 +700,10 @@ public function getScale()
     }
 
     /**
-     * Set scale
+     * Set scale.
      *
      * @param int $value
+     *
      * @return self
      */
     public function setScale($value = null)
@@ -689,9 +714,9 @@ public function setScale($value = null)
     }
 
     /**
-     * Get font spacing
+     * Get font spacing.
      *
-     * @return int|float
+     * @return float|int
      */
     public function getSpacing()
     {
@@ -699,9 +724,10 @@ public function getSpacing()
     }
 
     /**
-     * Set font spacing
+     * Set font spacing.
+     *
+     * @param float|int $value
      *
-     * @param int|float $value
      * @return self
      */
     public function setSpacing($value = null)
@@ -712,9 +738,9 @@ public function setSpacing($value = null)
     }
 
     /**
-     * Get font kerning
+     * Get font kerning.
      *
-     * @return int|float
+     * @return float|int
      */
     public function getKerning()
     {
@@ -722,9 +748,10 @@ public function getKerning()
     }
 
     /**
-     * Set font kerning
+     * Set font kerning.
+     *
+     * @param float|int $value
      *
-     * @param int|float $value
      * @return self
      */
     public function setKerning($value = null)
@@ -735,7 +762,7 @@ public function setKerning($value = null)
     }
 
     /**
-     * Get noProof (disables autocorrect)
+     * Get noProof (disables autocorrect).
      *
      * @return bool
      */
@@ -745,9 +772,10 @@ public function isNoProof()
     }
 
     /**
-     * Set noProof (disables autocorrect)
+     * Set noProof (disables autocorrect).
      *
      * @param bool $value
+     *
      * @return $this
      */
     public function setNoProof($value = false)
@@ -758,9 +786,9 @@ public function setNoProof($value = false)
     }
 
     /**
-     * Get line height
+     * Get line height.
      *
-     * @return int|float
+     * @return float|int
      */
     public function getLineHeight()
     {
@@ -768,20 +796,21 @@ public function getLineHeight()
     }
 
     /**
-     * Set lineheight
+     * Set lineheight.
+     *
+     * @param float|int|string $value
      *
-     * @param int|float|string $value
      * @return self
      */
     public function setLineHeight($value)
     {
-        $this->setParagraph(array('lineHeight' => $value));
+        $this->setParagraph(['lineHeight' => $value]);
 
         return $this;
     }
 
     /**
-     * Get paragraph style
+     * Get paragraph style.
      *
      * @return \PhpOffice\PhpWord\Style\Paragraph
      */
@@ -791,9 +820,10 @@ public function getParagraph()
     }
 
     /**
-     * Set Paragraph
+     * Set Paragraph.
      *
      * @param mixed $value
+     *
      * @return self
      */
     public function setParagraph($value = null)
@@ -804,19 +834,20 @@ public function setParagraph($value = null)
     }
 
     /**
-     * Get rtl
+     * Get rtl.
      *
-     * @return bool
+     * @return ?bool
      */
     public function isRTL()
     {
-        return $this->rtl;
+        return $this->rtl ?? Settings::isDefaultRtl();
     }
 
     /**
-     * Set rtl
+     * Set rtl.
+     *
+     * @param ?bool $value
      *
-     * @param bool $value
      * @return self
      */
     public function setRTL($value = true)
@@ -827,7 +858,7 @@ public function setRTL($value = true)
     }
 
     /**
-     * Get shading
+     * Get shading.
      *
      * @return \PhpOffice\PhpWord\Style\Shading
      */
@@ -837,9 +868,10 @@ public function getShading()
     }
 
     /**
-     * Set shading
+     * Set shading.
      *
      * @param mixed $value
+     *
      * @return self
      */
     public function setShading($value = null)
@@ -850,9 +882,9 @@ public function setShading($value = null)
     }
 
     /**
-     * Get language
+     * Get language.
      *
-     * @return \PhpOffice\PhpWord\Style\Language
+     * @return null|\PhpOffice\PhpWord\Style\Language
      */
     public function getLang()
     {
@@ -860,9 +892,10 @@ public function getLang()
     }
 
     /**
-     * Set language
+     * Set language.
      *
      * @param mixed $value
+     *
      * @return self
      */
     public function setLang($value = null)
@@ -876,120 +909,90 @@ public function setLang($value = null)
     }
 
     /**
-     * Get bold
+     * Get hidden text.
      *
-     * @deprecated 0.10.0
-     *
-     * @codeCoverageIgnore
+     * @return bool
      */
-    public function getBold()
+    public function isHidden()
     {
-        return $this->isBold();
+        return $this->hidden;
     }
 
     /**
-     * Get italic
+     * Set hidden text.
      *
-     * @deprecated 0.10.0
+     * @param bool $value
      *
-     * @codeCoverageIgnore
+     * @return self
      */
-    public function getItalic()
+    public function setHidden($value = true)
     {
-        return $this->isItalic();
-    }
+        $this->hidden = $this->setBoolVal($value, $this->hidden);
 
-    /**
-     * Get superscript
-     *
-     * @deprecated 0.10.0
-     *
-     * @codeCoverageIgnore
-     */
-    public function getSuperScript()
-    {
-        return $this->isSuperScript();
+        return $this;
     }
 
     /**
-     * Get subscript
-     *
-     * @deprecated 0.10.0
+     * Get position.
      *
-     * @codeCoverageIgnore
+     * @return int
      */
-    public function getSubScript()
+    public function getPosition()
     {
-        return $this->isSubScript();
+        return $this->position;
     }
 
     /**
-     * Get strikethrough
+     * Set position.
      *
-     * @deprecated 0.10.0
+     * @param int $value
      *
-     * @codeCoverageIgnore
+     * @return self
      */
-    public function getStrikethrough()
+    public function setPosition($value = null)
     {
-        return $this->isStrikethrough();
+        $this->position = $this->setIntVal($value, null);
+
+        return $this;
     }
 
     /**
-     * Get paragraph style
+     * Set html css white-space value. It is expected that only pre-wrap and normal (default) are useful.
      *
-     * @deprecated 0.11.0
-     *
-     * @codeCoverageIgnore
+     * @param null|string $value Should be one of pre-wrap, normal, nowrap, pre, pre-line, initial, inherit
      */
-    public function getParagraphStyle()
+    public function setWhiteSpace(?string $value): self
     {
-        return $this->getParagraph();
+        $this->whiteSpace = Validate::validateCSSWhiteSpace($value);
+
+        return $this;
     }
 
     /**
-     * Get hidden text
-     *
-     * @return bool
+     * Get html css white-space value.
      */
-    public function isHidden()
+    public function getWhiteSpace(): string
     {
-        return $this->hidden;
+        return $this->whiteSpace;
     }
 
     /**
-     * Set hidden text
+     * Set generic font for fallback for html.
      *
-     * @param bool $value
-     * @return self
+     * @param string $value generic font name
      */
-    public function setHidden($value = true)
+    public function setFallbackFont(?string $value): self
     {
-        $this->hidden = $this->setBoolVal($value, $this->hidden);
+        $this->fallbackFont = Validate::validateCSSGenericFont($value);
 
         return $this;
     }
 
     /**
-     * Get position
-     *
-     * @return int
+     * Get html fallback generic font.
      */
-    public function getPosition()
+    public function getFallbackFont(): string
     {
-        return $this->position;
-    }
-
-    /**
-     * Set position
-     *
-     * @param int $value
-     * @return self
-     */
-    public function setPosition($value = null)
-    {
-        $this->position = $this->setIntVal($value, null);
-
-        return $this;
+        return $this->fallbackFont;
     }
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Style/Frame.php b/vendor/phpoffice/phpword/src/PhpWord/Style/Frame.php
index e87b7a803a..45fc583ed1 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Style/Frame.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Style/Frame.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,17 +20,18 @@
 use PhpOffice\PhpWord\SimpleType\Jc;
 
 /**
- * Frame defines the size and position of an object
+ * Frame defines the size and position of an object.
  *
  * Width, height, left/hpos, top/vpos, hrel, vrel, wrap, zindex
  *
  * @since 0.12.0
+ *
  * @todo Make existing style (image, textbox, etc) use this style
  */
 class Frame extends AbstractStyle
 {
     /**
-     * Length unit
+     * Length unit.
      *
      * @const string
      */
@@ -46,7 +47,7 @@ class Frame extends AbstractStyle
     const POS_RELATIVE = 'relative';
 
     /**
-     * Horizontal/vertical value
+     * Horizontal/vertical value.
      *
      * @const string
      */
@@ -59,7 +60,7 @@ class Frame extends AbstractStyle
     const POS_OUTSIDE = 'outside';
 
     /**
-     * Position relative to
+     * Position relative to.
      *
      * @const string
      */
@@ -77,7 +78,7 @@ class Frame extends AbstractStyle
     const POS_RELTO_OMARGIN = 'outer-margin-area';
 
     /**
-     * Wrap type
+     * Wrap type.
      *
      * @const string
      */
@@ -95,124 +96,125 @@ class Frame extends AbstractStyle
     private $alignment = '';
 
     /**
-     * Unit
+     * Unit.
      *
      * @var string
      */
     private $unit = 'pt';
 
     /**
-     * Width
+     * Width.
      *
-     * @var int|float
+     * @var float|int
      */
     private $width;
 
     /**
-     * Height
+     * Height.
      *
-     * @var int|float
+     * @var float|int
      */
     private $height;
 
     /**
-     * Leftmost (horizontal) position
+     * Leftmost (horizontal) position.
      *
-     * @var int|float
+     * @var float|int
      */
     private $left = 0;
 
     /**
-     * Topmost (vertical) position
+     * Topmost (vertical) position.
      *
-     * @var int|float
+     * @var float|int
      */
     private $top = 0;
 
     /**
-     * Position type: absolute|relative
+     * Position type: absolute|relative.
      *
      * @var string
      */
     private $pos;
 
     /**
-     * Horizontal position
+     * Horizontal position.
      *
      * @var string
      */
     private $hPos;
 
     /**
-     * Horizontal position relative to
+     * Horizontal position relative to.
      *
      * @var string
      */
     private $hPosRelTo;
 
     /**
-     * Vertical position
+     * Vertical position.
      *
      * @var string
      */
     private $vPos;
 
     /**
-     * Vertical position relative to
+     * Vertical position relative to.
      *
      * @var string
      */
     private $vPosRelTo;
 
     /**
-     * Wrap type
+     * Wrap type.
      *
      * @var string
      */
     private $wrap;
 
     /**
-     * Top wrap distance
+     * Top wrap distance.
      *
      * @var float
      */
     private $wrapDistanceTop;
 
     /**
-     * Bottom wrap distance
+     * Bottom wrap distance.
      *
      * @var float
      */
     private $wrapDistanceBottom;
 
     /**
-     * Left wrap distance
+     * Left wrap distance.
      *
      * @var float
      */
     private $wrapDistanceLeft;
 
     /**
-     * Right wrap distance
+     * Right wrap distance.
      *
      * @var float
      */
     private $wrapDistanceRight;
 
     /**
-     * Vertically raised or lowered text
+     * Vertically raised or lowered text.
      *
      * @var int
+     *
      * @see http://www.datypic.com/sc/ooxml/e-w_position-1.html
      */
     private $position;
 
     /**
-     * Create a new instance
+     * Create a new instance.
      *
      * @param array $style
      */
-    public function __construct($style = array())
+    public function __construct($style = [])
     {
         $this->setStyleByArray($style);
     }
@@ -244,33 +246,7 @@ public function setAlignment($value)
     }
 
     /**
-     * @deprecated 0.13.0 Use the `getAlignment` method instead.
-     *
-     * @return string
-     *
-     * @codeCoverageIgnore
-     */
-    public function getAlign()
-    {
-        return $this->getAlignment();
-    }
-
-    /**
-     * @deprecated 0.13.0 Use the `setAlignment` method instead.
-     *
-     * @param string $value
-     *
-     * @return self
-     *
-     * @codeCoverageIgnore
-     */
-    public function setAlign($value = null)
-    {
-        return $this->setAlignment($value);
-    }
-
-    /**
-     * Get unit
+     * Get unit.
      *
      * @return string
      */
@@ -280,9 +256,10 @@ public function getUnit()
     }
 
     /**
-     * Set unit
+     * Set unit.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setUnit($value)
@@ -293,9 +270,9 @@ public function setUnit($value)
     }
 
     /**
-     * Get width
+     * Get width.
      *
-     * @return int|float
+     * @return float|int
      */
     public function getWidth()
     {
@@ -303,9 +280,10 @@ public function getWidth()
     }
 
     /**
-     * Set width
+     * Set width.
+     *
+     * @param float|int $value
      *
-     * @param int|float $value
      * @return self
      */
     public function setWidth($value = null)
@@ -316,9 +294,9 @@ public function setWidth($value = null)
     }
 
     /**
-     * Get height
+     * Get height.
      *
-     * @return int|float
+     * @return float|int
      */
     public function getHeight()
     {
@@ -326,9 +304,10 @@ public function getHeight()
     }
 
     /**
-     * Set height
+     * Set height.
+     *
+     * @param float|int $value
      *
-     * @param int|float $value
      * @return self
      */
     public function setHeight($value = null)
@@ -339,9 +318,9 @@ public function setHeight($value = null)
     }
 
     /**
-     * Get left
+     * Get left.
      *
-     * @return int|float
+     * @return float|int
      */
     public function getLeft()
     {
@@ -349,9 +328,10 @@ public function getLeft()
     }
 
     /**
-     * Set left
+     * Set left.
+     *
+     * @param float|int $value
      *
-     * @param int|float $value
      * @return self
      */
     public function setLeft($value = 0)
@@ -362,9 +342,9 @@ public function setLeft($value = 0)
     }
 
     /**
-     * Get topmost position
+     * Get topmost position.
      *
-     * @return int|float
+     * @return float|int
      */
     public function getTop()
     {
@@ -372,9 +352,10 @@ public function getTop()
     }
 
     /**
-     * Set topmost position
+     * Set topmost position.
+     *
+     * @param float|int $value
      *
-     * @param int|float $value
      * @return self
      */
     public function setTop($value = 0)
@@ -385,7 +366,7 @@ public function setTop($value = 0)
     }
 
     /**
-     * Get position type
+     * Get position type.
      *
      * @return string
      */
@@ -395,24 +376,25 @@ public function getPos()
     }
 
     /**
-     * Set position type
+     * Set position type.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setPos($value)
     {
-        $enum = array(
+        $enum = [
             self::POS_ABSOLUTE,
             self::POS_RELATIVE,
-        );
+        ];
         $this->pos = $this->setEnumVal($value, $enum, $this->pos);
 
         return $this;
     }
 
     /**
-     * Get horizontal position
+     * Get horizontal position.
      *
      * @return string
      */
@@ -422,30 +404,31 @@ public function getHPos()
     }
 
     /**
-     * Set horizontal position
+     * Set horizontal position.
      *
      * @since 0.12.0 "absolute" option is available.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setHPos($value)
     {
-        $enum = array(
+        $enum = [
             self::POS_ABSOLUTE,
             self::POS_LEFT,
             self::POS_CENTER,
             self::POS_RIGHT,
             self::POS_INSIDE,
             self::POS_OUTSIDE,
-        );
+        ];
         $this->hPos = $this->setEnumVal($value, $enum, $this->hPos);
 
         return $this;
     }
 
     /**
-     * Get vertical position
+     * Get vertical position.
      *
      * @return string
      */
@@ -455,30 +438,31 @@ public function getVPos()
     }
 
     /**
-     * Set vertical position
+     * Set vertical position.
      *
      * @since 0.12.0 "absolute" option is available.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setVPos($value)
     {
-        $enum = array(
+        $enum = [
             self::POS_ABSOLUTE,
             self::POS_TOP,
             self::POS_CENTER,
             self::POS_BOTTOM,
             self::POS_INSIDE,
             self::POS_OUTSIDE,
-        );
+        ];
         $this->vPos = $this->setEnumVal($value, $enum, $this->vPos);
 
         return $this;
     }
 
     /**
-     * Get horizontal position relative to
+     * Get horizontal position relative to.
      *
      * @return string
      */
@@ -488,14 +472,15 @@ public function getHPosRelTo()
     }
 
     /**
-     * Set horizontal position relative to
+     * Set horizontal position relative to.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setHPosRelTo($value)
     {
-        $enum = array(
+        $enum = [
             self::POS_RELTO_MARGIN,
             self::POS_RELTO_PAGE,
             self::POS_RELTO_COLUMN,
@@ -504,14 +489,14 @@ public function setHPosRelTo($value)
             self::POS_RELTO_RMARGIN,
             self::POS_RELTO_IMARGIN,
             self::POS_RELTO_OMARGIN,
-        );
+        ];
         $this->hPosRelTo = $this->setEnumVal($value, $enum, $this->hPosRelTo);
 
         return $this;
     }
 
     /**
-     * Get vertical position relative to
+     * Get vertical position relative to.
      *
      * @return string
      */
@@ -521,14 +506,15 @@ public function getVPosRelTo()
     }
 
     /**
-     * Set vertical position relative to
+     * Set vertical position relative to.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setVPosRelTo($value)
     {
-        $enum = array(
+        $enum = [
             self::POS_RELTO_MARGIN,
             self::POS_RELTO_PAGE,
             self::POS_RELTO_TEXT,
@@ -537,14 +523,14 @@ public function setVPosRelTo($value)
             self::POS_RELTO_BMARGIN,
             self::POS_RELTO_IMARGIN,
             self::POS_RELTO_OMARGIN,
-        );
+        ];
         $this->vPosRelTo = $this->setEnumVal($value, $enum, $this->vPosRelTo);
 
         return $this;
     }
 
     /**
-     * Get wrap type
+     * Get wrap type.
      *
      * @return string
      */
@@ -554,14 +540,15 @@ public function getWrap()
     }
 
     /**
-     * Set wrap type
+     * Set wrap type.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setWrap($value)
     {
-        $enum = array(
+        $enum = [
             self::WRAP_INLINE,
             self::WRAP_SQUARE,
             self::WRAP_TIGHT,
@@ -569,14 +556,14 @@ public function setWrap($value)
             self::WRAP_TOPBOTTOM,
             self::WRAP_BEHIND,
             self::WRAP_INFRONT,
-        );
+        ];
         $this->wrap = $this->setEnumVal($value, $enum, $this->wrap);
 
         return $this;
     }
 
     /**
-     * Get top distance from text wrap
+     * Get top distance from text wrap.
      *
      * @return float
      */
@@ -586,9 +573,10 @@ public function getWrapDistanceTop()
     }
 
     /**
-     * Set top distance from text wrap
+     * Set top distance from text wrap.
      *
      * @param int $value
+     *
      * @return self
      */
     public function setWrapDistanceTop($value = null)
@@ -599,7 +587,7 @@ public function setWrapDistanceTop($value = null)
     }
 
     /**
-     * Get bottom distance from text wrap
+     * Get bottom distance from text wrap.
      *
      * @return float
      */
@@ -609,9 +597,10 @@ public function getWrapDistanceBottom()
     }
 
     /**
-     * Set bottom distance from text wrap
+     * Set bottom distance from text wrap.
      *
      * @param float $value
+     *
      * @return self
      */
     public function setWrapDistanceBottom($value = null)
@@ -622,7 +611,7 @@ public function setWrapDistanceBottom($value = null)
     }
 
     /**
-     * Get left distance from text wrap
+     * Get left distance from text wrap.
      *
      * @return float
      */
@@ -632,9 +621,10 @@ public function getWrapDistanceLeft()
     }
 
     /**
-     * Set left distance from text wrap
+     * Set left distance from text wrap.
      *
      * @param float $value
+     *
      * @return self
      */
     public function setWrapDistanceLeft($value = null)
@@ -645,7 +635,7 @@ public function setWrapDistanceLeft($value = null)
     }
 
     /**
-     * Get right distance from text wrap
+     * Get right distance from text wrap.
      *
      * @return float
      */
@@ -655,9 +645,10 @@ public function getWrapDistanceRight()
     }
 
     /**
-     * Set right distance from text wrap
+     * Set right distance from text wrap.
      *
      * @param float $value
+     *
      * @return self
      */
     public function setWrapDistanceRight($value = null)
@@ -668,7 +659,7 @@ public function setWrapDistanceRight($value = null)
     }
 
     /**
-     * Get position
+     * Get position.
      *
      * @return int
      */
@@ -678,9 +669,10 @@ public function getPosition()
     }
 
     /**
-     * Set position
+     * Set position.
      *
      * @param int $value
+     *
      * @return self
      */
     public function setPosition($value = null)
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Style/Image.php b/vendor/phpoffice/phpword/src/PhpWord/Style/Image.php
index 70aafe12cd..dbb8572f99 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Style/Image.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Style/Image.php
@@ -11,19 +11,19 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Style;
 
 /**
- * Image and memory image style
+ * Image and memory image style.
  */
 class Image extends Frame
 {
     /**
-     * Backward compatibility constants
+     * Backward compatibility constants.
      *
      * @const string
      */
@@ -56,7 +56,7 @@ class Image extends Frame
     const POSITION_RELATIVE = self::POS_RELATIVE;
 
     /**
-     * Create new instance
+     * Create new instance.
      */
     public function __construct()
     {
@@ -73,9 +73,9 @@ public function __construct()
     }
 
     /**
-     * Get margin top
+     * Get margin top.
      *
-     * @return int|float
+     * @return float|int
      */
     public function getMarginTop()
     {
@@ -83,10 +83,12 @@ public function getMarginTop()
     }
 
     /**
-     * Set margin top
+     * Set margin top.
      *
      * @ignoreScrutinizerPatch
-     * @param int|float $value
+     *
+     * @param float|int $value
+     *
      * @return self
      */
     public function setMarginTop($value = 0)
@@ -97,9 +99,9 @@ public function setMarginTop($value = 0)
     }
 
     /**
-     * Get margin left
+     * Get margin left.
      *
-     * @return int|float
+     * @return float|int
      */
     public function getMarginLeft()
     {
@@ -107,10 +109,12 @@ public function getMarginLeft()
     }
 
     /**
-     * Set margin left
+     * Set margin left.
      *
      * @ignoreScrutinizerPatch
-     * @param int|float $value
+     *
+     * @param float|int $value
+     *
      * @return self
      */
     public function setMarginLeft($value = 0)
@@ -121,7 +125,7 @@ public function setMarginLeft($value = 0)
     }
 
     /**
-     * Get wrapping style
+     * Get wrapping style.
      *
      * @return string
      */
@@ -131,12 +135,10 @@ public function getWrappingStyle()
     }
 
     /**
-     * Set wrapping style
+     * Set wrapping style.
      *
      * @param string $wrappingStyle
      *
-     * @throws \InvalidArgumentException
-     *
      * @return self
      */
     public function setWrappingStyle($wrappingStyle)
@@ -147,7 +149,7 @@ public function setWrappingStyle($wrappingStyle)
     }
 
     /**
-     * Get positioning type
+     * Get positioning type.
      *
      * @return string
      */
@@ -157,12 +159,10 @@ public function getPositioning()
     }
 
     /**
-     * Set positioning type
+     * Set positioning type.
      *
      * @param string $positioning
      *
-     * @throws \InvalidArgumentException
-     *
      * @return self
      */
     public function setPositioning($positioning)
@@ -173,7 +173,7 @@ public function setPositioning($positioning)
     }
 
     /**
-     * Get horizontal alignment
+     * Get horizontal alignment.
      *
      * @return string
      */
@@ -183,12 +183,10 @@ public function getPosHorizontal()
     }
 
     /**
-     * Set horizontal alignment
+     * Set horizontal alignment.
      *
      * @param string $alignment
      *
-     * @throws \InvalidArgumentException
-     *
      * @return self
      */
     public function setPosHorizontal($alignment)
@@ -199,7 +197,7 @@ public function setPosHorizontal($alignment)
     }
 
     /**
-     * Get vertical alignment
+     * Get vertical alignment.
      *
      * @return string
      */
@@ -209,12 +207,10 @@ public function getPosVertical()
     }
 
     /**
-     * Set vertical alignment
+     * Set vertical alignment.
      *
      * @param string $alignment
      *
-     * @throws \InvalidArgumentException
-     *
      * @return self
      */
     public function setPosVertical($alignment)
@@ -225,7 +221,7 @@ public function setPosVertical($alignment)
     }
 
     /**
-     * Get horizontal relation
+     * Get horizontal relation.
      *
      * @return string
      */
@@ -235,12 +231,10 @@ public function getPosHorizontalRel()
     }
 
     /**
-     * Set horizontal relation
+     * Set horizontal relation.
      *
      * @param string $relto
      *
-     * @throws \InvalidArgumentException
-     *
      * @return self
      */
     public function setPosHorizontalRel($relto)
@@ -251,7 +245,7 @@ public function setPosHorizontalRel($relto)
     }
 
     /**
-     * Get vertical relation
+     * Get vertical relation.
      *
      * @return string
      */
@@ -261,12 +255,10 @@ public function getPosVerticalRel()
     }
 
     /**
-     * Set vertical relation
+     * Set vertical relation.
      *
      * @param string $relto
      *
-     * @throws \InvalidArgumentException
-     *
      * @return self
      */
     public function setPosVerticalRel($relto)
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Style/Indentation.php b/vendor/phpoffice/phpword/src/PhpWord/Style/Indentation.php
index e422395c80..42c6e11845 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Style/Indentation.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Style/Indentation.php
@@ -11,14 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Style;
 
 /**
- * Paragraph indentation style
+ * Paragraph indentation style.
  *
  * @see  http://www.schemacentral.com/sc/ooxml/t-w_CT_Ind.html
  * @since 0.10.0
@@ -26,47 +26,47 @@
 class Indentation extends AbstractStyle
 {
     /**
-     * Left indentation (twip)
+     * Left indentation (twip).
      *
-     * @var int|float
+     * @var float|int
      */
     private $left = 0;
 
     /**
-     * Right indentation (twip)
+     * Right indentation (twip).
      *
-     * @var int|float
+     * @var float|int
      */
     private $right = 0;
 
     /**
-     * Additional first line indentation (twip)
+     * Additional first line indentation (twip).
      *
-     * @var int|float
+     * @var float|int
      */
-    private $firstLine;
+    private $firstLine = 0;
 
     /**
-     * Indentation removed from first line (twip)
+     * Indentation removed from first line (twip).
      *
-     * @var int|float
+     * @var float|int
      */
     private $hanging;
 
     /**
-     * Create a new instance
+     * Create a new instance.
      *
      * @param array $style
      */
-    public function __construct($style = array())
+    public function __construct($style = [])
     {
         $this->setStyleByArray($style);
     }
 
     /**
-     * Get left
+     * Get left.
      *
-     * @return int|float
+     * @return float|int
      */
     public function getLeft()
     {
@@ -74,12 +74,13 @@ public function getLeft()
     }
 
     /**
-     * Set left
+     * Set left.
+     *
+     * @param float|int $value
      *
-     * @param int|float $value
      * @return self
      */
-    public function setLeft($value = null)
+    public function setLeft($value)
     {
         $this->left = $this->setNumericVal($value, $this->left);
 
@@ -87,9 +88,9 @@ public function setLeft($value = null)
     }
 
     /**
-     * Get right
+     * Get right.
      *
-     * @return int|float
+     * @return float|int
      */
     public function getRight()
     {
@@ -97,12 +98,13 @@ public function getRight()
     }
 
     /**
-     * Set right
+     * Set right.
+     *
+     * @param float|int $value
      *
-     * @param int|float $value
      * @return self
      */
-    public function setRight($value = null)
+    public function setRight($value)
     {
         $this->right = $this->setNumericVal($value, $this->right);
 
@@ -110,9 +112,9 @@ public function setRight($value = null)
     }
 
     /**
-     * Get first line
+     * Get first line.
      *
-     * @return int|float
+     * @return float|int
      */
     public function getFirstLine()
     {
@@ -120,12 +122,13 @@ public function getFirstLine()
     }
 
     /**
-     * Set first line
+     * Set first line.
+     *
+     * @param float|int $value
      *
-     * @param int|float $value
      * @return self
      */
-    public function setFirstLine($value = null)
+    public function setFirstLine($value)
     {
         $this->firstLine = $this->setNumericVal($value, $this->firstLine);
 
@@ -133,9 +136,9 @@ public function setFirstLine($value = null)
     }
 
     /**
-     * Get hanging
+     * Get hanging.
      *
-     * @return int|float
+     * @return float|int
      */
     public function getHanging()
     {
@@ -143,9 +146,10 @@ public function getHanging()
     }
 
     /**
-     * Set hanging
+     * Set hanging.
+     *
+     * @param float|int $value
      *
-     * @param int|float $value
      * @return self
      */
     public function setHanging($value = null)
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Style/Language.php b/vendor/phpoffice/phpword/src/PhpWord/Style/Language.php
index 7b2de51e07..18e7f76e77 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Style/Language.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Style/Language.php
@@ -11,15 +11,17 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Style;
 
+use InvalidArgumentException;
+
 /**
  * Language
- * A couple of predefined values are defined here, see the websites below for more values
+ * A couple of predefined values are defined here, see the websites below for more values.
  *
  * @see http://www.datypic.com/sc/ooxml/t-w_CT_Language.html
  * @see https://technet.microsoft.com/en-us/library/cc287874(v=office.12).aspx
@@ -38,18 +40,27 @@ final class Language extends AbstractStyle
     const FR_BE = 'fr-BE';
     const FR_BE_ID = 2060;
 
+    const FR_CH = 'fr-CH';
+    const FR_CH_ID = 4108;
+
     const ES_ES = 'es-ES';
     const ES_ES_ID = 3082;
 
     const DE_DE = 'de-DE';
     const DE_DE_ID = 1031;
 
+    const DE_CH = 'de-CH';
+    const DE_CH_ID = 2055;
+
     const HE_IL = 'he-IL';
     const HE_IL_ID = 1037;
 
     const IT_IT = 'it-IT';
     const IT_IT_ID = 1040;
 
+    const IT_CH = 'it-CH';
+    const IT_CH_ID = 2064;
+
     const JA_JP = 'ja-JP';
     const JA_JP_ID = 1041;
 
@@ -68,6 +79,9 @@ final class Language extends AbstractStyle
     const NL_NL = 'nl-NL';
     const NL_NL_ID = 1043;
 
+    const SV_SE = 'sv-SE';
+    const SV_SE_ID = 1053;
+
     const UK_UA = 'uk-UA';
     const UK_UA_ID = 1058;
 
@@ -75,40 +89,41 @@ final class Language extends AbstractStyle
     const RU_RU_ID = 1049;
 
     /**
-     * Language ID, used for RTF document generation
+     * Language ID, used for RTF document generation.
      *
      * @var int
+     *
      * @see https://technet.microsoft.com/en-us/library/cc179219.aspx
      */
     private $langId;
 
     /**
-     * Latin Language
+     * Latin Language.
      *
      * @var string
      */
     private $latin;
 
     /**
-     * East Asian Language
+     * East Asian Language.
      *
      * @var string
      */
     private $eastAsia;
 
     /**
-     * Complex Script Language
+     * Complex Script Language.
      *
      * @var string
      */
     private $bidirectional;
 
     /**
-     * Constructor
+     * Constructor.
      *
-     * @param string|null $latin
-     * @param string|null $eastAsia
-     * @param string|null $bidirectional
+     * @param null|string $latin
+     * @param null|string $eastAsia
+     * @param null|string $bidirectional
      */
     public function __construct($latin = null, $eastAsia = null, $bidirectional = null)
     {
@@ -124,10 +139,11 @@ public function __construct($latin = null, $eastAsia = null, $bidirectional = nu
     }
 
     /**
-     * Set the Latin Language
+     * Set the Latin Language.
      *
      * @param string $latin
      *            The value for the latin language
+     *
      * @return self
      */
     public function setLatin($latin)
@@ -138,9 +154,9 @@ public function setLatin($latin)
     }
 
     /**
-     * Get the Latin Language
+     * Get the Latin Language.
      *
-     * @return string|null
+     * @return null|string
      */
     public function getLatin()
     {
@@ -148,11 +164,13 @@ public function getLatin()
     }
 
     /**
-     * Set the Language ID
+     * Set the Language ID.
      *
      * @param int $langId
      *            The value for the language ID
+     *
      * @return self
+     *
      * @see https://technet.microsoft.com/en-us/library/cc287874(v=office.12).aspx
      */
     public function setLangId($langId)
@@ -163,7 +181,7 @@ public function setLangId($langId)
     }
 
     /**
-     * Get the Language ID
+     * Get the Language ID.
      *
      * @return int
      */
@@ -173,10 +191,11 @@ public function getLangId()
     }
 
     /**
-     * Set the East Asian Language
+     * Set the East Asian Language.
      *
      * @param string $eastAsia
      *            The value for the east asian language
+     *
      * @return self
      */
     public function setEastAsia($eastAsia)
@@ -187,9 +206,9 @@ public function setEastAsia($eastAsia)
     }
 
     /**
-     * Get the East Asian Language
+     * Get the East Asian Language.
      *
-     * @return string|null
+     * @return null|string
      */
     public function getEastAsia()
     {
@@ -197,10 +216,11 @@ public function getEastAsia()
     }
 
     /**
-     * Set the Complex Script Language
+     * Set the Complex Script Language.
      *
      * @param string $bidirectional
      *            The value for the complex script language
+     *
      * @return self
      */
     public function setBidirectional($bidirectional)
@@ -211,9 +231,9 @@ public function setBidirectional($bidirectional)
     }
 
     /**
-     * Get the Complex Script Language
+     * Get the Complex Script Language.
      *
-     * @return string|null
+     * @return null|string
      */
     public function getBidirectional()
     {
@@ -221,9 +241,10 @@ public function getBidirectional()
     }
 
     /**
-     * Validates that the language passed is in the format xx-xx
+     * Validates that the language passed is in the format xx-xx.
      *
      * @param string $locale
+     *
      * @return string
      */
     private function validateLocale($locale)
@@ -232,12 +253,14 @@ private function validateLocale($locale)
             $locale = str_replace('_', '-', $locale);
         }
 
-        if (strlen($locale) === 2) {
+        if ($locale !== null && strlen($locale) === 2) {
             return strtolower($locale) . '-' . strtoupper($locale);
         }
-
+        if ($locale === 'und') {
+            return 'en-EN';
+        }
         if ($locale !== null && $locale !== 'zxx' && strstr($locale, '-') === false) {
-            throw new \InvalidArgumentException($locale . ' is not a valid language code');
+            throw new InvalidArgumentException($locale . ' is not a valid language code');
         }
 
         return $locale;
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Style/Line.php b/vendor/phpoffice/phpword/src/PhpWord/Style/Line.php
index a9952eec0b..2aeefa5ae5 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Style/Line.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Style/Line.php
@@ -11,26 +11,26 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Style;
 
 /**
- * Line style
+ * Line style.
  */
 class Line extends Image
 {
     /**
-     * Connector types
+     * Connector types.
      *
      * @const string
      */
     const CONNECTOR_TYPE_STRAIGHT = 'straight';
 
     /**
-     * Arrow styles
+     * Arrow styles.
      *
      * @const string
      */
@@ -41,7 +41,7 @@ class Line extends Image
     const ARROW_STYLE_OVAL = 'oval';
 
     /**
-     * Dash styles
+     * Dash styles.
      *
      * @const string
      */
@@ -54,56 +54,56 @@ class Line extends Image
     const DASH_STYLE_LONG_DASH_DOT_DOT = 'longdashdotdot';
 
     /**
-     * flip Line
+     * flip Line.
      *
      * @var bool
      */
     private $flip = false;
 
     /**
-     * connectorType
+     * connectorType.
      *
      * @var string
      */
     private $connectorType = self::CONNECTOR_TYPE_STRAIGHT;
 
     /**
-     * Line Weight
+     * Line Weight.
      *
      * @var int
      */
     private $weight;
 
     /**
-     * Line color
+     * Line color.
      *
      * @var string
      */
     private $color;
 
     /**
-     * Dash style
+     * Dash style.
      *
      * @var string
      */
     private $dash;
 
     /**
-     * Begin arrow
+     * Begin arrow.
      *
      * @var string
      */
     private $beginArrow;
 
     /**
-     * End arrow
+     * End arrow.
      *
      * @var string
      */
     private $endArrow;
 
     /**
-     * Get flip
+     * Get flip.
      *
      * @return bool
      */
@@ -113,9 +113,10 @@ public function isFlip()
     }
 
     /**
-     * Set flip
+     * Set flip.
      *
      * @param bool $value
+     *
      * @return self
      */
     public function setFlip($value = false)
@@ -126,7 +127,7 @@ public function setFlip($value = false)
     }
 
     /**
-     * Get connectorType
+     * Get connectorType.
      *
      * @return string
      */
@@ -136,23 +137,24 @@ public function getConnectorType()
     }
 
     /**
-     * Set connectorType
+     * Set connectorType.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setConnectorType($value = null)
     {
-        $enum = array(
+        $enum = [
             self::CONNECTOR_TYPE_STRAIGHT,
-        );
+        ];
         $this->connectorType = $this->setEnumVal($value, $enum, $this->connectorType);
 
         return $this;
     }
 
     /**
-     * Get weight
+     * Get weight.
      *
      * @return int
      */
@@ -162,9 +164,10 @@ public function getWeight()
     }
 
     /**
-     * Set weight
+     * Set weight.
      *
      * @param int $value Weight in points
+     *
      * @return self
      */
     public function setWeight($value = null)
@@ -175,7 +178,7 @@ public function setWeight($value = null)
     }
 
     /**
-     * Get color
+     * Get color.
      *
      * @return string
      */
@@ -185,9 +188,10 @@ public function getColor()
     }
 
     /**
-     * Set color
+     * Set color.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setColor($value = null)
@@ -198,7 +202,7 @@ public function setColor($value = null)
     }
 
     /**
-     * Get beginArrow
+     * Get beginArrow.
      *
      * @return string
      */
@@ -208,24 +212,25 @@ public function getBeginArrow()
     }
 
     /**
-     * Set beginArrow
+     * Set beginArrow.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setBeginArrow($value = null)
     {
-        $enum = array(
+        $enum = [
             self::ARROW_STYLE_BLOCK, self::ARROW_STYLE_CLASSIC, self::ARROW_STYLE_DIAMOND,
             self::ARROW_STYLE_OPEN, self::ARROW_STYLE_OVAL,
-        );
+        ];
         $this->beginArrow = $this->setEnumVal($value, $enum, $this->beginArrow);
 
         return $this;
     }
 
     /**
-     * Get endArrow
+     * Get endArrow.
      *
      * @return string
      */
@@ -235,24 +240,25 @@ public function getEndArrow()
     }
 
     /**
-     * Set endArrow
+     * Set endArrow.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setEndArrow($value = null)
     {
-        $enum = array(
+        $enum = [
             self::ARROW_STYLE_BLOCK, self::ARROW_STYLE_CLASSIC, self::ARROW_STYLE_DIAMOND,
             self::ARROW_STYLE_OPEN, self::ARROW_STYLE_OVAL,
-        );
+        ];
         $this->endArrow = $this->setEnumVal($value, $enum, $this->endArrow);
 
         return $this;
     }
 
     /**
-     * Get Dash
+     * Get Dash.
      *
      * @return string
      */
@@ -262,18 +268,19 @@ public function getDash()
     }
 
     /**
-     * Set Dash
+     * Set Dash.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setDash($value = null)
     {
-        $enum = array(
+        $enum = [
             self::DASH_STYLE_DASH, self::DASH_STYLE_DASH_DOT, self::DASH_STYLE_LONG_DASH,
             self::DASH_STYLE_LONG_DASH_DOT, self::DASH_STYLE_LONG_DASH_DOT_DOT, self::DASH_STYLE_ROUND_DOT,
             self::DASH_STYLE_SQUARE_DOT,
-        );
+        ];
         $this->dash = $this->setEnumVal($value, $enum, $this->dash);
 
         return $this;
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Style/LineNumbering.php b/vendor/phpoffice/phpword/src/PhpWord/Style/LineNumbering.php
index 451252d87a..61a98dc8e1 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Style/LineNumbering.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Style/LineNumbering.php
@@ -11,14 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Style;
 
 /**
- * Line numbering style
+ * Line numbering style.
  *
  * @see  http://www.schemacentral.com/sc/ooxml/t-w_CT_LineNumber.html
  * @since 0.10.0
@@ -31,46 +31,47 @@ class LineNumbering extends AbstractStyle
     const LINE_NUMBERING_NEW_SECTION = 'newSection';
 
     /**
-     * Line numbering starting value
+     * Line numbering starting value.
      *
      * @var int
      */
     private $start = 1;
 
     /**
-     * Line number increments
+     * Line number increments.
      *
      * @var int
      */
     private $increment = 1;
 
     /**
-     * Distance between text and line numbering in twip
+     * Distance between text and line numbering in twip.
      *
-     * @var int|float
+     * @var float|int
      */
     private $distance;
 
     /**
-     * Line numbering restart setting continuous|newPage|newSection
+     * Line numbering restart setting continuous|newPage|newSection.
      *
      * @var string
+     *
      * @see  http://www.schemacentral.com/sc/ooxml/a-w_restart-1.html
      */
     private $restart;
 
     /**
-     * Create a new instance
+     * Create a new instance.
      *
      * @param array $style
      */
-    public function __construct($style = array())
+    public function __construct($style = [])
     {
         $this->setStyleByArray($style);
     }
 
     /**
-     * Get start
+     * Get start.
      *
      * @return int
      */
@@ -80,9 +81,10 @@ public function getStart()
     }
 
     /**
-     * Set start
+     * Set start.
      *
      * @param int $value
+     *
      * @return self
      */
     public function setStart($value = null)
@@ -93,7 +95,7 @@ public function setStart($value = null)
     }
 
     /**
-     * Get increment
+     * Get increment.
      *
      * @return int
      */
@@ -103,9 +105,10 @@ public function getIncrement()
     }
 
     /**
-     * Set increment
+     * Set increment.
      *
      * @param int $value
+     *
      * @return self
      */
     public function setIncrement($value = null)
@@ -116,9 +119,9 @@ public function setIncrement($value = null)
     }
 
     /**
-     * Get distance
+     * Get distance.
      *
-     * @return int|float
+     * @return float|int
      */
     public function getDistance()
     {
@@ -126,9 +129,10 @@ public function getDistance()
     }
 
     /**
-     * Set distance
+     * Set distance.
+     *
+     * @param float|int $value
      *
-     * @param int|float $value
      * @return self
      */
     public function setDistance($value = null)
@@ -139,7 +143,7 @@ public function setDistance($value = null)
     }
 
     /**
-     * Get restart
+     * Get restart.
      *
      * @return string
      */
@@ -149,14 +153,15 @@ public function getRestart()
     }
 
     /**
-     * Set distance
+     * Set distance.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setRestart($value = null)
     {
-        $enum = array(self::LINE_NUMBERING_CONTINUOUS, self::LINE_NUMBERING_NEW_PAGE, self::LINE_NUMBERING_NEW_SECTION);
+        $enum = [self::LINE_NUMBERING_CONTINUOUS, self::LINE_NUMBERING_NEW_PAGE, self::LINE_NUMBERING_NEW_SECTION];
         $this->restart = $this->setEnumVal($value, $enum, $this->restart);
 
         return $this;
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Style/ListItem.php b/vendor/phpoffice/phpword/src/PhpWord/Style/ListItem.php
index 4293940fd2..28d3fb1b66 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Style/ListItem.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Style/ListItem.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,7 +20,7 @@
 use PhpOffice\PhpWord\Style;
 
 /**
- * List item style
+ * List item style.
  *
  * Before version 0.10.0, numbering style is defined statically with $listType.
  * After version 0.10.0, numbering style is defined by using Numbering and
@@ -36,30 +36,32 @@ class ListItem extends AbstractStyle
     const TYPE_ALPHANUM = 9;
 
     /**
-     * Legacy list type
+     * Legacy list type.
      *
      * @var int
      */
     private $listType;
 
     /**
-     * Numbering style name
+     * Numbering style name.
      *
      * @var string
+     *
      * @since 0.10.0
      */
     private $numStyle;
 
     /**
-     * Numbering definition instance ID
+     * Numbering definition instance ID.
      *
      * @var int
+     *
      * @since 0.10.0
      */
     private $numId;
 
     /**
-     * Create new instance
+     * Create new instance.
      *
      * @param string $numStyle
      */
@@ -73,7 +75,7 @@ public function __construct($numStyle = null)
     }
 
     /**
-     * Get List Type
+     * Get List Type.
      *
      * @return int
      */
@@ -83,18 +85,19 @@ public function getListType()
     }
 
     /**
-     * Set legacy list type for version < 0.10.0
+     * Set legacy list type for version < 0.10.0.
      *
      * @param int $value
+     *
      * @return self
      */
     public function setListType($value = self::TYPE_BULLET_FILLED)
     {
-        $enum = array(
+        $enum = [
             self::TYPE_SQUARE_FILLED, self::TYPE_BULLET_FILLED,
             self::TYPE_BULLET_EMPTY, self::TYPE_NUMBER,
             self::TYPE_NUMBER_NESTED, self::TYPE_ALPHANUM,
-        );
+        ];
         $this->listType = $this->setEnumVal($value, $enum, $this->listType);
         $this->getListTypeStyle();
 
@@ -102,7 +105,7 @@ public function setListType($value = self::TYPE_BULLET_FILLED)
     }
 
     /**
-     * Get numbering style name
+     * Get numbering style name.
      *
      * @return string
      */
@@ -112,9 +115,10 @@ public function getNumStyle()
     }
 
     /**
-     * Set numbering style name
+     * Set numbering style name.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setNumStyle($value)
@@ -130,7 +134,7 @@ public function setNumStyle($value)
     }
 
     /**
-     * Get numbering Id
+     * Get numbering Id.
      *
      * @return int
      */
@@ -140,19 +144,21 @@ public function getNumId()
     }
 
     /**
-     * Set numbering Id. Same numId means same list
+     * Set numbering Id. Same numId means same list.
+     *
      * @param mixed $numInt
      */
-    public function setNumId($numInt)
+    public function setNumId($numInt): void
     {
         $this->numId = $numInt;
         $this->getListTypeStyle();
     }
 
     /**
-     * Get legacy numbering definition
+     * Get legacy numbering definition.
      *
      * @return array
+     *
      * @since 0.10.0
      */
     private function getListTypeStyle()
@@ -171,13 +177,13 @@ private function getListTypeStyle()
         }
 
         // Property mapping for numbering level information
-        $properties = array('start', 'format', 'text', 'alignment', 'tabPos', 'left', 'hanging', 'font', 'hint');
+        $properties = ['start', 'format', 'text', 'alignment', 'tabPos', 'left', 'hanging', 'font', 'hint'];
 
         // Legacy level information
-        $listTypeStyles = array(
-            self::TYPE_SQUARE_FILLED => array(
-                'type'   => 'hybridMultilevel',
-                'levels' => array(
+        $listTypeStyles = [
+            self::TYPE_SQUARE_FILLED => [
+                'type' => 'hybridMultilevel',
+                'levels' => [
                     0 => '1, bullet, , left, 720, 720, 360, Wingdings, default',
                     1 => '1, bullet, o, left, 1440, 1440, 360, Courier New, default',
                     2 => '1, bullet, , left, 2160, 2160, 360, Wingdings, default',
@@ -187,11 +193,11 @@ private function getListTypeStyle()
                     6 => '1, bullet, , left, 5040, 5040, 360, Symbol, default',
                     7 => '1, bullet, o, left, 5760, 5760, 360, Courier New, default',
                     8 => '1, bullet, , left, 6480, 6480, 360, Wingdings, default',
-                ),
-            ),
-            self::TYPE_BULLET_FILLED => array(
-                'type'   => 'hybridMultilevel',
-                'levels' => array(
+                ],
+            ],
+            self::TYPE_BULLET_FILLED => [
+                'type' => 'hybridMultilevel',
+                'levels' => [
                     0 => '1, bullet, , left, 720, 720, 360, Symbol, default',
                     1 => '1, bullet, o, left, 1440, 1440, 360, Courier New, default',
                     2 => '1, bullet, , left, 2160, 2160, 360, Wingdings, default',
@@ -201,11 +207,11 @@ private function getListTypeStyle()
                     6 => '1, bullet, , left, 5040, 5040, 360, Symbol, default',
                     7 => '1, bullet, o, left, 5760, 5760, 360, Courier New, default',
                     8 => '1, bullet, , left, 6480, 6480, 360, Wingdings, default',
-                ),
-            ),
-            self::TYPE_BULLET_EMPTY => array(
-                'type'   => 'hybridMultilevel',
-                'levels' => array(
+                ],
+            ],
+            self::TYPE_BULLET_EMPTY => [
+                'type' => 'hybridMultilevel',
+                'levels' => [
                     0 => '1, bullet, o, left, 720, 720, 360, Courier New, default',
                     1 => '1, bullet, o, left, 1440, 1440, 360, Courier New, default',
                     2 => '1, bullet, , left, 2160, 2160, 360, Wingdings, default',
@@ -215,11 +221,11 @@ private function getListTypeStyle()
                     6 => '1, bullet, , left, 5040, 5040, 360, Symbol, default',
                     7 => '1, bullet, o, left, 5760, 5760, 360, Courier New, default',
                     8 => '1, bullet, , left, 6480, 6480, 360, Wingdings, default',
-                ),
-            ),
-            self::TYPE_NUMBER => array(
-                'type'   => 'hybridMultilevel',
-                'levels' => array(
+                ],
+            ],
+            self::TYPE_NUMBER => [
+                'type' => 'hybridMultilevel',
+                'levels' => [
                     0 => '1, decimal, %1., left, 720, 720, 360, , default',
                     1 => '1, bullet, o, left, 1440, 1440, 360, Courier New, default',
                     2 => '1, bullet, , left, 2160, 2160, 360, Wingdings, default',
@@ -229,11 +235,11 @@ private function getListTypeStyle()
                     6 => '1, bullet, , left, 5040, 5040, 360, Symbol, default',
                     7 => '1, bullet, o, left, 5760, 5760, 360, Courier New, default',
                     8 => '1, bullet, , left, 6480, 6480, 360, Wingdings, default',
-                ),
-            ),
-            self::TYPE_NUMBER_NESTED => array(
-                'type'   => 'multilevel',
-                'levels' => array(
+                ],
+            ],
+            self::TYPE_NUMBER_NESTED => [
+                'type' => 'multilevel',
+                'levels' => [
                     0 => '1, decimal, %1., left, 360, 360, 360, , ',
                     1 => '1, decimal, %1.%2., left, 792, 792, 432, , ',
                     2 => '1, decimal, %1.%2.%3., left, 1224, 1224, 504, , ',
@@ -243,11 +249,11 @@ private function getListTypeStyle()
                     6 => '1, decimal, %1.%2.%3.%4.%5.%6.%7., left, 3600, 3240, 1080, , ',
                     7 => '1, decimal, %1.%2.%3.%4.%5.%6.%7.%8., left, 3960, 3744, 1224, , ',
                     8 => '1, decimal, %1.%2.%3.%4.%5.%6.%7.%8.%9., left, 4680, 4320, 1440, , ',
-                ),
-            ),
-            self::TYPE_ALPHANUM => array(
-                'type'   => 'multilevel',
-                'levels' => array(
+                ],
+            ],
+            self::TYPE_ALPHANUM => [
+                'type' => 'multilevel',
+                'levels' => [
                     0 => '1, decimal, %1., left, 720, 720, 360, , ',
                     1 => '1, lowerLetter, %2., left, 1440, 1440, 360, , ',
                     2 => '1, lowerRoman, %3., right, 2160, 2160, 180, , ',
@@ -257,18 +263,18 @@ private function getListTypeStyle()
                     6 => '1, decimal, %7., left, 5040, 5040, 360, , ',
                     7 => '1, lowerLetter, %8., left, 5760, 5760, 360, , ',
                     8 => '1, lowerRoman, %9., right, 6480, 6480, 180, , ',
-                ),
-            ),
-        );
+                ],
+            ],
+        ];
 
         // Populate style and register to global Style register
         $style = $listTypeStyles[$this->listType];
         $numProperties = count($properties);
         foreach ($style['levels'] as $key => $value) {
-            $level = array();
+            $level = [];
             $levelProperties = explode(', ', $value);
             $level['level'] = $key;
-            for ($i = 0; $i < $numProperties; $i++) {
+            for ($i = 0; $i < $numProperties; ++$i) {
                 $property = $properties[$i];
                 $level[$property] = $levelProperties[$i];
             }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Style/Numbering.php b/vendor/phpoffice/phpword/src/PhpWord/Style/Numbering.php
index f7855cfa20..0efb088dd4 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Style/Numbering.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Style/Numbering.php
@@ -11,14 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Style;
 
 /**
- * Numbering style
+ * Numbering style.
  *
  * @see  http://www.schemacentral.com/sc/ooxml/e-w_numbering.html
  * @see  http://www.schemacentral.com/sc/ooxml/e-w_abstractNum-1.html
@@ -28,30 +28,32 @@
 class Numbering extends AbstractStyle
 {
     /**
-     * Numbering definition instance ID
+     * Numbering definition instance ID.
      *
      * @var int
+     *
      * @see  http://www.schemacentral.com/sc/ooxml/e-w_num-1.html
      */
     private $numId;
 
     /**
-     * Multilevel type singleLevel|multilevel|hybridMultilevel
+     * Multilevel type singleLevel|multilevel|hybridMultilevel.
      *
      * @var string
+     *
      * @see  http://www.schemacentral.com/sc/ooxml/a-w_val-67.html
      */
     private $type;
 
     /**
-     * Numbering levels
+     * Numbering levels.
      *
      * @var NumberingLevel[]
      */
-    private $levels = array();
+    private $levels = [];
 
     /**
-     * Get Id
+     * Get Id.
      *
      * @return int
      */
@@ -61,9 +63,10 @@ public function getNumId()
     }
 
     /**
-     * Set Id
+     * Set Id.
      *
      * @param int $value
+     *
      * @return self
      */
     public function setNumId($value)
@@ -74,7 +77,7 @@ public function setNumId($value)
     }
 
     /**
-     * Get multilevel type
+     * Get multilevel type.
      *
      * @return string
      */
@@ -84,21 +87,22 @@ public function getType()
     }
 
     /**
-     * Set multilevel type
+     * Set multilevel type.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setType($value)
     {
-        $enum = array('singleLevel', 'multilevel', 'hybridMultilevel');
+        $enum = ['singleLevel', 'multilevel', 'hybridMultilevel'];
         $this->type = $this->setEnumVal($value, $enum, $this->type);
 
         return $this;
     }
 
     /**
-     * Get levels
+     * Get levels.
      *
      * @return NumberingLevel[]
      */
@@ -108,9 +112,10 @@ public function getLevels()
     }
 
     /**
-     * Set multilevel type
+     * Set multilevel type.
      *
      * @param array $values
+     *
      * @return self
      */
     public function setLevels($values)
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Style/NumberingLevel.php b/vendor/phpoffice/phpword/src/PhpWord/Style/NumberingLevel.php
index e9b32f0135..39c0d839d6 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Style/NumberingLevel.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Style/NumberingLevel.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -21,7 +21,7 @@
 use PhpOffice\PhpWord\SimpleType\NumberFormat;
 
 /**
- * Numbering level definition
+ * Numbering level definition.
  *
  * @see  http://www.schemacentral.com/sc/ooxml/e-w_lvl-1.html
  * @since 0.10.0
@@ -29,105 +29,112 @@
 class NumberingLevel extends AbstractStyle
 {
     /**
-     * Level number, 0 to 8 (total 9 levels)
+     * Level number, 0 to 8 (total 9 levels).
      *
      * @var int
      */
     private $level = 0;
 
     /**
-     * Starting value w:start
+     * Starting value w:start.
      *
      * @var int
+     *
      * @see  http://www.schemacentral.com/sc/ooxml/e-w_start-1.html
      */
     private $start = 1;
 
     /**
-     * Numbering format w:numFmt, one of PhpOffice\PhpWord\SimpleType\NumberFormat
+     * Numbering format w:numFmt, one of PhpOffice\PhpWord\SimpleType\NumberFormat.
      *
      * @var string
+     *
      * @see  http://www.schemacentral.com/sc/ooxml/t-w_ST_NumberFormat.html
      */
     private $format;
 
     /**
-     * Restart numbering level symbol w:lvlRestart
+     * Restart numbering level symbol w:lvlRestart.
      *
      * @var int
+     *
      * @see  http://www.schemacentral.com/sc/ooxml/e-w_lvlRestart-1.html
      */
     private $restart;
 
     /**
-     * Related paragraph style
+     * Related paragraph style.
      *
      * @var string
+     *
      * @see  http://www.schemacentral.com/sc/ooxml/e-w_pStyle-2.html
      */
     private $pStyle;
 
     /**
-     * Content between numbering symbol and paragraph text w:suff
+     * Content between numbering symbol and paragraph text w:suff.
      *
      * @var string tab|space|nothing
+     *
      * @see  http://www.schemacentral.com/sc/ooxml/e-w_suff-1.html
      */
     private $suffix = 'tab';
 
     /**
-     * Numbering level text e.g. %1 for nonbullet or bullet character
+     * Numbering level text e.g. %1 for nonbullet or bullet character.
      *
      * @var string
+     *
      * @see  http://www.schemacentral.com/sc/ooxml/e-w_lvlText-1.html
      */
     private $text;
 
     /**
-     * Justification, w:lvlJc
+     * Justification, w:lvlJc.
      *
      * @var string, one of PhpOffice\PhpWord\SimpleType\Jc
      */
     private $alignment = '';
 
     /**
-     * Left
+     * Left.
      *
      * @var int
      */
     private $left;
 
     /**
-     * Hanging
+     * Hanging.
      *
      * @var int
      */
     private $hanging;
 
     /**
-     * Tab position
+     * Tab position.
      *
      * @var int
      */
     private $tabPos;
 
     /**
-     * Font family
+     * Font family.
      *
      * @var string
      */
     private $font;
 
     /**
-     * Hint default|eastAsia|cs
+     * Hint default|eastAsia|cs.
      *
      * @var string
+     *
      * @see  http://www.schemacentral.com/sc/ooxml/a-w_hint-1.html
      */
     private $hint;
 
     /**
-     * Get level
+     * Get level.
      *
      * @return int
      */
@@ -137,9 +144,10 @@ public function getLevel()
     }
 
     /**
-     * Set level
+     * Set level.
      *
      * @param int $value
+     *
      * @return self
      */
     public function setLevel($value)
@@ -150,7 +158,7 @@ public function setLevel($value)
     }
 
     /**
-     * Get start
+     * Get start.
      *
      * @return int
      */
@@ -160,9 +168,10 @@ public function getStart()
     }
 
     /**
-     * Set start
+     * Set start.
      *
      * @param int $value
+     *
      * @return self
      */
     public function setStart($value)
@@ -173,7 +182,7 @@ public function setStart($value)
     }
 
     /**
-     * Get format
+     * Get format.
      *
      * @return string
      */
@@ -183,9 +192,10 @@ public function getFormat()
     }
 
     /**
-     * Set format
+     * Set format.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setFormat($value)
@@ -196,7 +206,7 @@ public function setFormat($value)
     }
 
     /**
-     * Get restart
+     * Get restart.
      *
      * @return int
      */
@@ -206,9 +216,10 @@ public function getRestart()
     }
 
     /**
-     * Set restart
+     * Set restart.
      *
      * @param int $value
+     *
      * @return self
      */
     public function setRestart($value)
@@ -219,7 +230,7 @@ public function setRestart($value)
     }
 
     /**
-     * Get related paragraph style
+     * Get related paragraph style.
      *
      * @return string
      */
@@ -229,9 +240,10 @@ public function getPStyle()
     }
 
     /**
-     * Set  related paragraph style
+     * Set  related paragraph style.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setPStyle($value)
@@ -242,7 +254,7 @@ public function setPStyle($value)
     }
 
     /**
-     * Get suffix
+     * Get suffix.
      *
      * @return string
      */
@@ -252,21 +264,22 @@ public function getSuffix()
     }
 
     /**
-     * Set suffix
+     * Set suffix.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setSuffix($value)
     {
-        $enum = array('tab', 'space', 'nothing');
+        $enum = ['tab', 'space', 'nothing'];
         $this->suffix = $this->setEnumVal($value, $enum, $this->suffix);
 
         return $this;
     }
 
     /**
-     * Get text
+     * Get text.
      *
      * @return string
      */
@@ -276,9 +289,10 @@ public function getText()
     }
 
     /**
-     * Set text
+     * Set text.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setText($value)
@@ -315,33 +329,7 @@ public function setAlignment($value)
     }
 
     /**
-     * @deprecated 0.13.0 Use the `getAlignment` method instead.
-     *
-     * @return string
-     *
-     * @codeCoverageIgnore
-     */
-    public function getAlign()
-    {
-        return $this->getAlignment();
-    }
-
-    /**
-     * @deprecated 0.13.0 Use the `setAlignment` method instead.
-     *
-     * @param string $value
-     *
-     * @return self
-     *
-     * @codeCoverageIgnore
-     */
-    public function setAlign($value)
-    {
-        return $this->setAlignment($value);
-    }
-
-    /**
-     * Get left
+     * Get left.
      *
      * @return int
      */
@@ -351,9 +339,10 @@ public function getLeft()
     }
 
     /**
-     * Set left
+     * Set left.
      *
      * @param int $value
+     *
      * @return self
      */
     public function setLeft($value)
@@ -364,7 +353,7 @@ public function setLeft($value)
     }
 
     /**
-     * Get hanging
+     * Get hanging.
      *
      * @return int
      */
@@ -374,9 +363,10 @@ public function getHanging()
     }
 
     /**
-     * Set hanging
+     * Set hanging.
      *
      * @param int $value
+     *
      * @return self
      */
     public function setHanging($value)
@@ -387,7 +377,7 @@ public function setHanging($value)
     }
 
     /**
-     * Get tab
+     * Get tab.
      *
      * @return int
      */
@@ -397,9 +387,10 @@ public function getTabPos()
     }
 
     /**
-     * Set tab
+     * Set tab.
      *
      * @param int $value
+     *
      * @return self
      */
     public function setTabPos($value)
@@ -410,7 +401,7 @@ public function setTabPos($value)
     }
 
     /**
-     * Get font
+     * Get font.
      *
      * @return string
      */
@@ -420,9 +411,10 @@ public function getFont()
     }
 
     /**
-     * Set font
+     * Set font.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setFont($value)
@@ -433,7 +425,7 @@ public function setFont($value)
     }
 
     /**
-     * Get hint
+     * Get hint.
      *
      * @return string
      */
@@ -443,14 +435,15 @@ public function getHint()
     }
 
     /**
-     * Set hint
+     * Set hint.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setHint($value = null)
     {
-        $enum = array('default', 'eastAsia', 'cs');
+        $enum = ['default', 'eastAsia', 'cs'];
         $this->hint = $this->setEnumVal($value, $enum, $this->hint);
 
         return $this;
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Style/Outline.php b/vendor/phpoffice/phpword/src/PhpWord/Style/Outline.php
index a04ad974c0..6d83f0378d 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Style/Outline.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Style/Outline.php
@@ -11,14 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Style;
 
 /**
- * Outline defines the line/border of the object
+ * Outline defines the line/border of the object.
  *
  * @see  http://www.schemacentral.com/sc/ooxml/t-v_CT_Stroke.html
  * @see  http://www.w3.org/TR/1998/NOTE-VML-19980513#_Toc416858395
@@ -27,9 +27,10 @@
 class Outline extends AbstractStyle
 {
     /**
-     * Line style constants
+     * Line style constants.
      *
      * @see  http://www.schemacentral.com/sc/ooxml/t-v_ST_StrokeLineStyle.html
+     *
      * @const string
      */
     const LINE_SINGLE = 'single';
@@ -39,9 +40,10 @@ class Outline extends AbstractStyle
     const LINE_THICK_BETWEEN_THIN = 'thickBetweenThin';
 
     /**
-     * Line style constants
+     * Line style constants.
      *
      * @see  http://www.schemacentral.com/sc/ooxml/t-v_ST_StrokeEndCap.html
+     *
      * @const string
      */
     const ENDCAP_FLAT = 'flat';
@@ -49,9 +51,10 @@ class Outline extends AbstractStyle
     const ENDCAP_ROUND = 'round';
 
     /**
-     * Arrowhead type constants
+     * Arrowhead type constants.
      *
      * @see  http://www.schemacentral.com/sc/ooxml/t-v_ST_StrokeArrowType.html
+     *
      * @const string
      */
     const ARROW_NONE = 'none';
@@ -62,74 +65,75 @@ class Outline extends AbstractStyle
     const ARROW_OPEN = 'open';
 
     /**
-     * Unit; No set method for now
+     * Unit; No set method for now.
      *
      * @var string
      */
     private $unit = 'pt';
 
     /**
-     * Outline weight
+     * Outline weight.
      *
-     * @var int|float
+     * @var float|int
      */
     private $weight;
 
     /**
-     * Outline color
+     * Outline color.
      *
      * @var string
      */
     private $color;
 
     /**
-     * Dash type
+     * Dash type.
      *
      * @var string
      */
     private $dash;
 
     /**
-     * Line style
+     * Line style.
      *
      * @var string
      */
     private $line;
 
     /**
-     * End cap
+     * End cap.
      *
      * @var string
+     *
      * @see  http://www.schemacentral.com/sc/ooxml/t-v_ST_StrokeEndCap.html
      */
     private $endCap;
 
     /**
-     * Start arrow type
+     * Start arrow type.
      *
      * @var string
      */
     private $startArrow;
 
     /**
-     * End arrow type
+     * End arrow type.
      *
      * @var string
      */
     private $endArrow;
 
     /**
-     * Create a new instance
+     * Create a new instance.
      *
      * @param array $style
      */
-    public function __construct($style = array())
+    public function __construct($style = [])
     {
         $this->setStyleByArray($style);
     }
 
     /**
-     * Get unit
+     * Get unit.
      *
      * @return string
      */
@@ -139,9 +143,9 @@ public function getUnit()
     }
 
     /**
-     * Get weight
+     * Get weight.
      *
-     * @return int|float
+     * @return float|int
      */
     public function getWeight()
     {
@@ -149,9 +153,10 @@ public function getWeight()
     }
 
     /**
-     * Set weight
+     * Set weight.
+     *
+     * @param float|int $value
      *
-     * @param int|float $value
      * @return self
      */
     public function setWeight($value = null)
@@ -162,7 +167,7 @@ public function setWeight($value = null)
     }
 
     /**
-     * Get color
+     * Get color.
      *
      * @return string
      */
@@ -172,9 +177,10 @@ public function getColor()
     }
 
     /**
-     * Set color
+     * Set color.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setColor($value = null)
@@ -185,7 +191,7 @@ public function setColor($value = null)
     }
 
     /**
-     * Get dash type
+     * Get dash type.
      *
      * @return string
      */
@@ -195,9 +201,10 @@ public function getDash()
     }
 
     /**
-     * Set dash type
+     * Set dash type.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setDash($value = null)
@@ -208,7 +215,7 @@ public function setDash($value = null)
     }
 
     /**
-     * Get line style
+     * Get line style.
      *
      * @return string
      */
@@ -218,22 +225,23 @@ public function getLine()
     }
 
     /**
-     * Set line style
+     * Set line style.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setLine($value = null)
     {
-        $enum = array(self::LINE_SINGLE, self::LINE_THIN_THIN, self::LINE_THIN_THICK,
-            self::LINE_THICK_THIN, self::LINE_THICK_BETWEEN_THIN, );
+        $enum = [self::LINE_SINGLE, self::LINE_THIN_THIN, self::LINE_THIN_THICK,
+            self::LINE_THICK_THIN, self::LINE_THICK_BETWEEN_THIN, ];
         $this->line = $this->setEnumVal($value, $enum, null);
 
         return $this;
     }
 
     /**
-     * Get endCap style
+     * Get endCap style.
      *
      * @return string
      */
@@ -243,21 +251,22 @@ public function getEndCap()
     }
 
     /**
-     * Set endCap style
+     * Set endCap style.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setEndCap($value = null)
     {
-        $enum = array(self::ENDCAP_FLAT, self::ENDCAP_SQUARE, self::ENDCAP_ROUND);
+        $enum = [self::ENDCAP_FLAT, self::ENDCAP_SQUARE, self::ENDCAP_ROUND];
         $this->endCap = $this->setEnumVal($value, $enum, null);
 
         return $this;
     }
 
     /**
-     * Get startArrow
+     * Get startArrow.
      *
      * @return string
      */
@@ -267,22 +276,23 @@ public function getStartArrow()
     }
 
     /**
-     * Set pattern
+     * Set pattern.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setStartArrow($value = null)
     {
-        $enum = array(self::ARROW_NONE, self::ARROW_BLOCK, self::ARROW_CLASSIC,
-            self::ARROW_OVAL, self::ARROW_DIAMOND, self::ARROW_OPEN, );
+        $enum = [self::ARROW_NONE, self::ARROW_BLOCK, self::ARROW_CLASSIC,
+            self::ARROW_OVAL, self::ARROW_DIAMOND, self::ARROW_OPEN, ];
         $this->startArrow = $this->setEnumVal($value, $enum, null);
 
         return $this;
     }
 
     /**
-     * Get endArrow
+     * Get endArrow.
      *
      * @return string
      */
@@ -292,15 +302,16 @@ public function getEndArrow()
     }
 
     /**
-     * Set pattern
+     * Set pattern.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setEndArrow($value = null)
     {
-        $enum = array(self::ARROW_NONE, self::ARROW_BLOCK, self::ARROW_CLASSIC,
-            self::ARROW_OVAL, self::ARROW_DIAMOND, self::ARROW_OPEN, );
+        $enum = [self::ARROW_NONE, self::ARROW_BLOCK, self::ARROW_CLASSIC,
+            self::ARROW_OVAL, self::ARROW_DIAMOND, self::ARROW_OPEN, ];
         $this->endArrow = $this->setEnumVal($value, $enum, null);
 
         return $this;
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Style/Paper.php b/vendor/phpoffice/phpword/src/PhpWord/Style/Paper.php
index 3c93ed8f2f..3a340bda9d 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Style/Paper.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Style/Paper.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,7 +20,7 @@
 use PhpOffice\PhpWord\Shared\Converter;
 
 /**
- * Paper size from ISO/IEC 29500-1:2012 pg. 1656-1657
+ * Paper size from ISO/IEC 29500-1:2012 pg. 1656-1657.
  *
  * 1 = Letter paper (8.5 in. by 11 in.)
  * 2 = Letter small paper (8.5 in. by 11 in.)
@@ -94,43 +94,43 @@
 class Paper extends AbstractStyle
 {
     /**
-     * Paper sizes
+     * Paper sizes.
      *
      * @var array
      */
-    private $sizes = array(
-        'A3'        => array(297, 420, 'mm'),
-        'A4'        => array(210, 297, 'mm'),
-        'A5'        => array(148, 210, 'mm'),
-        'B5'        => array(176, 250, 'mm'),
-        'Folio'     => array(8.5, 13, 'in'),
-        'Legal'     => array(8.5, 14, 'in'),
-        'Letter'    => array(8.5, 11, 'in'),
-    );
+    private $sizes = [
+        'A3' => [297, 420, 'mm'],
+        'A4' => [210, 297, 'mm'],
+        'A5' => [148, 210, 'mm'],
+        'B5' => [176, 250, 'mm'],
+        'Folio' => [8.5, 13, 'in'],
+        'Legal' => [8.5, 14, 'in'],
+        'Letter' => [8.5, 11, 'in'],
+    ];
 
     /**
-     * Paper size
+     * Paper size.
      *
      * @var string
      */
     private $size = 'A4';
 
     /**
-     * Width
+     * Width.
      *
      * @var float (twip)
      */
     private $width;
 
     /**
-     * Height
+     * Height.
      *
      * @var float (twip)
      */
     private $height;
 
     /**
-     * Create a new instance
+     * Create a new instance.
      *
      * @param string $size
      */
@@ -140,7 +140,7 @@ public function __construct($size = 'A4')
     }
 
     /**
-     * Get size
+     * Get size.
      *
      * @return string
      */
@@ -150,16 +150,17 @@ public function getSize()
     }
 
     /**
-     * Set size
+     * Set size.
      *
      * @param string $size
+     *
      * @return self
      */
     public function setSize($size)
     {
         $this->size = $this->setEnumVal($size, array_keys($this->sizes), $this->size);
 
-        list($width, $height, $unit) = $this->sizes[$this->size];
+        [$width, $height, $unit] = $this->sizes[$this->size];
 
         if ($unit == 'mm') {
             $this->width = Converter::cmToTwip($width / 10);
@@ -173,7 +174,7 @@ public function setSize($size)
     }
 
     /**
-     * Get width
+     * Get width.
      *
      * @return float
      */
@@ -183,7 +184,7 @@ public function getWidth()
     }
 
     /**
-     * Get height
+     * Get height.
      *
      * @return float
      */
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Style/Paragraph.php b/vendor/phpoffice/phpword/src/PhpWord/Style/Paragraph.php
index 522dea9baf..c77617403d 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Style/Paragraph.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Style/Paragraph.php
@@ -11,19 +11,20 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Style;
 
 use PhpOffice\PhpWord\Exception\InvalidStyleException;
+use PhpOffice\PhpWord\Settings;
 use PhpOffice\PhpWord\Shared\Text;
 use PhpOffice\PhpWord\SimpleType\Jc;
 use PhpOffice\PhpWord\SimpleType\TextAlignment;
 
 /**
- * Paragraph style
+ * Paragraph style.
  *
  * OOXML:
  * - General: alignment, outline level
@@ -57,21 +58,21 @@ class Paragraph extends Border
     const LINE_HEIGHT = 240;
 
     /**
-     * Aliases
+     * Aliases.
      *
      * @var array
      */
-    protected $aliases = array('line-height' => 'lineHeight', 'line-spacing' => 'spacing');
+    protected $aliases = ['line-height' => 'lineHeight', 'line-spacing' => 'spacing'];
 
     /**
-     * Parent style
+     * Parent style.
      *
      * @var string
      */
     private $basedOn = 'Normal';
 
     /**
-     * Style for next paragraph
+     * Style for next paragraph.
      *
      * @var string
      */
@@ -83,115 +84,116 @@ class Paragraph extends Border
     private $alignment = '';
 
     /**
-     * Indentation
+     * Indentation.
      *
-     * @var \PhpOffice\PhpWord\Style\Indentation|null
+     * @var null|\PhpOffice\PhpWord\Style\Indentation
      */
     private $indentation;
 
     /**
-     * Spacing
+     * Spacing.
      *
      * @var \PhpOffice\PhpWord\Style\Spacing
      */
     private $spacing;
 
     /**
-     * Text line height
+     * Text line height.
      *
-     * @var int
+     * @var null|float|int
      */
     private $lineHeight;
 
     /**
-     * Allow first/last line to display on a separate page
+     * Allow first/last line to display on a separate page.
      *
      * @var bool
      */
     private $widowControl = true;
 
     /**
-     * Keep paragraph with next paragraph
+     * Keep paragraph with next paragraph.
      *
      * @var bool
      */
     private $keepNext = false;
 
     /**
-     * Keep all lines on one page
+     * Keep all lines on one page.
      *
      * @var bool
      */
     private $keepLines = false;
 
     /**
-     * Start paragraph on next page
+     * Start paragraph on next page.
      *
      * @var bool
      */
     private $pageBreakBefore = false;
 
     /**
-     * Numbering style name
+     * Numbering style name.
      *
      * @var string
      */
     private $numStyle;
 
     /**
-     * Numbering level
+     * Numbering level.
      *
      * @var int
      */
     private $numLevel = 0;
 
     /**
-     * Set of Custom Tab Stops
+     * Set of Custom Tab Stops.
      *
      * @var \PhpOffice\PhpWord\Style\Tab[]
      */
-    private $tabs = array();
+    private $tabs = [];
 
     /**
-     * Shading
+     * Shading.
      *
      * @var \PhpOffice\PhpWord\Style\Shading
      */
     private $shading;
 
     /**
-     * Ignore Spacing Above and Below When Using Identical Styles
+     * Ignore Spacing Above and Below When Using Identical Styles.
      *
      * @var bool
      */
     private $contextualSpacing = false;
 
     /**
-     * Right to Left Paragraph Layout
+     * Right to Left Paragraph Layout.
      *
-     * @var bool
+     * @var ?bool
      */
-    private $bidi = false;
+    private $bidi;
 
     /**
-     * Vertical Character Alignment on Line
+     * Vertical Character Alignment on Line.
      *
      * @var string
      */
     private $textAlignment;
 
     /**
-     * Suppress hyphenation for paragraph
+     * Suppress hyphenation for paragraph.
      *
      * @var bool
      */
     private $suppressAutoHyphens = false;
 
     /**
-     * Set Style value
+     * Set Style value.
      *
      * @param string $key
      * @param mixed $value
+     *
      * @return self
      */
     public function setStyleValue($key, $value)
@@ -205,41 +207,42 @@ public function setStyleValue($key, $value)
     }
 
     /**
-     * Get style values
+     * Get style values.
      *
      * An experiment to retrieve all style values in one function. This will
      * reduce function call and increase cohesion between functions. Should be
      * implemented in all styles.
      *
      * @ignoreScrutinizerPatch
+     *
      * @return array
      */
     public function getStyleValues()
     {
-        $styles = array(
-            'name'                => $this->getStyleName(),
-            'basedOn'             => $this->getBasedOn(),
-            'next'                => $this->getNext(),
-            'alignment'           => $this->getAlignment(),
-            'indentation'         => $this->getIndentation(),
-            'spacing'             => $this->getSpace(),
-            'pagination'          => array(
-                'widowControl'    => $this->hasWidowControl(),
-                'keepNext'        => $this->isKeepNext(),
-                'keepLines'       => $this->isKeepLines(),
-                'pageBreak'       => $this->hasPageBreakBefore(),
-            ),
-            'numbering'           => array(
-                'style'           => $this->getNumStyle(),
-                'level'           => $this->getNumLevel(),
-            ),
-            'tabs'                => $this->getTabs(),
-            'shading'             => $this->getShading(),
-            'contextualSpacing'   => $this->hasContextualSpacing(),
-            'bidi'                => $this->isBidi(),
-            'textAlignment'       => $this->getTextAlignment(),
+        $styles = [
+            'name' => $this->getStyleName(),
+            'basedOn' => $this->getBasedOn(),
+            'next' => $this->getNext(),
+            'alignment' => $this->getAlignment(),
+            'indentation' => $this->getIndentation(),
+            'spacing' => $this->getSpace(),
+            'pagination' => [
+                'widowControl' => $this->hasWidowControl(),
+                'keepNext' => $this->isKeepNext(),
+                'keepLines' => $this->isKeepLines(),
+                'pageBreak' => $this->hasPageBreakBefore(),
+            ],
+            'numbering' => [
+                'style' => $this->getNumStyle(),
+                'level' => $this->getNumLevel(),
+            ],
+            'tabs' => $this->getTabs(),
+            'shading' => $this->getShading(),
+            'contextualSpacing' => $this->hasContextualSpacing(),
+            'bidi' => $this->isBidi(),
+            'textAlignment' => $this->getTextAlignment(),
             'suppressAutoHyphens' => $this->hasSuppressAutoHyphens(),
-        );
+        ];
 
         return $styles;
     }
@@ -271,33 +274,7 @@ public function setAlignment($value)
     }
 
     /**
-     * @deprecated 0.13.0 Use the `getAlignment` method instead.
-     *
-     * @return string
-     *
-     * @codeCoverageIgnore
-     */
-    public function getAlign()
-    {
-        return $this->getAlignment();
-    }
-
-    /**
-     * @deprecated 0.13.0 Use the `setAlignment` method instead.
-     *
-     * @param string $value
-     *
-     * @return self
-     *
-     * @codeCoverageIgnore
-     */
-    public function setAlign($value = null)
-    {
-        return $this->setAlignment($value);
-    }
-
-    /**
-     * Get parent style ID
+     * Get parent style ID.
      *
      * @return string
      */
@@ -307,9 +284,10 @@ public function getBasedOn()
     }
 
     /**
-     * Set parent style ID
+     * Set parent style ID.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setBasedOn($value = 'Normal')
@@ -320,7 +298,7 @@ public function setBasedOn($value = 'Normal')
     }
 
     /**
-     * Get style for next paragraph
+     * Get style for next paragraph.
      *
      * @return string
      */
@@ -330,9 +308,10 @@ public function getNext()
     }
 
     /**
-     * Set style for next paragraph
+     * Set style for next paragraph.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setNext($value = null)
@@ -343,9 +322,9 @@ public function setNext($value = null)
     }
 
     /**
-     * Get shading
+     * Get indentation.
      *
-     * @return \PhpOffice\PhpWord\Style\Indentation
+     * @return null|\PhpOffice\PhpWord\Style\Indentation
      */
     public function getIndentation()
     {
@@ -353,9 +332,10 @@ public function getIndentation()
     }
 
     /**
-     * Set shading
+     * Set shading.
      *
      * @param mixed $value
+     *
      * @return self
      */
     public function setIndentation($value = null)
@@ -366,7 +346,7 @@ public function setIndentation($value = null)
     }
 
     /**
-     * Get indentation
+     * Get indentation.
      *
      * @return int
      */
@@ -376,18 +356,19 @@ public function getIndent()
     }
 
     /**
-     * Set indentation
+     * Set indentation.
      *
      * @param int $value
+     *
      * @return self
      */
     public function setIndent($value = null)
     {
-        return $this->setIndentation(array('left' => $value));
+        return $this->setIndentation(['left' => $value]);
     }
 
     /**
-     * Get hanging
+     * Get hanging.
      *
      * @return int
      */
@@ -397,20 +378,22 @@ public function getHanging()
     }
 
     /**
-     * Set hanging
+     * Set hanging.
      *
      * @param int $value
+     *
      * @return self
      */
     public function setHanging($value = null)
     {
-        return $this->setIndentation(array('hanging' => $value));
+        return $this->setIndentation(['hanging' => $value]);
     }
 
     /**
-     * Get spacing
+     * Get spacing.
      *
      * @return \PhpOffice\PhpWord\Style\Spacing
+     *
      * @todo Rename to getSpacing in 1.0
      */
     public function getSpace()
@@ -419,10 +402,12 @@ public function getSpace()
     }
 
     /**
-     * Set spacing
+     * Set spacing.
      *
      * @param mixed $value
+     *
      * @return self
+     *
      * @todo Rename to setSpacing in 1.0
      */
     public function setSpace($value = null)
@@ -433,9 +418,9 @@ public function setSpace($value = null)
     }
 
     /**
-     * Get space before paragraph
+     * Get space before paragraph.
      *
-     * @return int
+     * @return null|float|int
      */
     public function getSpaceBefore()
     {
@@ -443,20 +428,21 @@ public function getSpaceBefore()
     }
 
     /**
-     * Set space before paragraph
+     * Set space before paragraph.
+     *
+     * @param null|float|int $value
      *
-     * @param int $value
      * @return self
      */
     public function setSpaceBefore($value = null)
     {
-        return $this->setSpace(array('before' => $value));
+        return $this->setSpace(['before' => $value]);
     }
 
     /**
-     * Get space after paragraph
+     * Get space after paragraph.
      *
-     * @return int
+     * @return null|float|int
      */
     public function getSpaceAfter()
     {
@@ -464,20 +450,21 @@ public function getSpaceAfter()
     }
 
     /**
-     * Set space after paragraph
+     * Set space after paragraph.
+     *
+     * @param null|float|int $value
      *
-     * @param int $value
      * @return self
      */
     public function setSpaceAfter($value = null)
     {
-        return $this->setSpace(array('after' => $value));
+        return $this->setSpace(['after' => $value]);
     }
 
     /**
-     * Get spacing between lines
+     * Get spacing between lines.
      *
-     * @return int|float
+     * @return null|float|int
      */
     public function getSpacing()
     {
@@ -485,18 +472,19 @@ public function getSpacing()
     }
 
     /**
-     * Set spacing between lines
+     * Set spacing between lines.
+     *
+     * @param null|float|int $value
      *
-     * @param int|float $value
      * @return self
      */
     public function setSpacing($value = null)
     {
-        return $this->setSpace(array('line' => $value));
+        return $this->setSpace(['line' => $value]);
     }
 
     /**
-     * Get spacing line rule
+     * Get spacing line rule.
      *
      * @return string
      */
@@ -506,20 +494,21 @@ public function getSpacingLineRule()
     }
 
     /**
-     * Set the spacing line rule
+     * Set the spacing line rule.
      *
      * @param string $value Possible values are defined in LineSpacingRule
+     *
      * @return \PhpOffice\PhpWord\Style\Paragraph
      */
     public function setSpacingLineRule($value)
     {
-        return $this->setSpace(array('lineRule' => $value));
+        return $this->setSpace(['lineRule' => $value]);
     }
 
     /**
-     * Get line height
+     * Get line height.
      *
-     * @return int|float
+     * @return null|float|int
      */
     public function getLineHeight()
     {
@@ -527,11 +516,10 @@ public function getLineHeight()
     }
 
     /**
-     * Set the line height
+     * Set the line height.
      *
-     * @param int|float|string $lineHeight
+     * @param float|int|string $lineHeight
      *
-     * @throws \PhpOffice\PhpWord\Exception\InvalidStyleException
      * @return self
      */
     public function setLineHeight($lineHeight)
@@ -552,7 +540,7 @@ public function setLineHeight($lineHeight)
     }
 
     /**
-     * Get allow first/last line to display on a separate page setting
+     * Get allow first/last line to display on a separate page setting.
      *
      * @return bool
      */
@@ -562,9 +550,10 @@ public function hasWidowControl()
     }
 
     /**
-     * Set keep paragraph with next paragraph setting
+     * Set keep paragraph with next paragraph setting.
      *
      * @param bool $value
+     *
      * @return self
      */
     public function setWidowControl($value = true)
@@ -575,7 +564,7 @@ public function setWidowControl($value = true)
     }
 
     /**
-     * Get keep paragraph with next paragraph setting
+     * Get keep paragraph with next paragraph setting.
      *
      * @return bool
      */
@@ -585,9 +574,10 @@ public function isKeepNext()
     }
 
     /**
-     * Set keep paragraph with next paragraph setting
+     * Set keep paragraph with next paragraph setting.
      *
      * @param bool $value
+     *
      * @return self
      */
     public function setKeepNext($value = true)
@@ -598,7 +588,7 @@ public function setKeepNext($value = true)
     }
 
     /**
-     * Get keep all lines on one page setting
+     * Get keep all lines on one page setting.
      *
      * @return bool
      */
@@ -608,9 +598,10 @@ public function isKeepLines()
     }
 
     /**
-     * Set keep all lines on one page setting
+     * Set keep all lines on one page setting.
      *
      * @param bool $value
+     *
      * @return self
      */
     public function setKeepLines($value = true)
@@ -621,7 +612,7 @@ public function setKeepLines($value = true)
     }
 
     /**
-     * Get start paragraph on next page setting
+     * Get start paragraph on next page setting.
      *
      * @return bool
      */
@@ -631,9 +622,10 @@ public function hasPageBreakBefore()
     }
 
     /**
-     * Set start paragraph on next page setting
+     * Set start paragraph on next page setting.
      *
      * @param bool $value
+     *
      * @return self
      */
     public function setPageBreakBefore($value = true)
@@ -644,7 +636,7 @@ public function setPageBreakBefore($value = true)
     }
 
     /**
-     * Get numbering style name
+     * Get numbering style name.
      *
      * @return string
      */
@@ -654,9 +646,10 @@ public function getNumStyle()
     }
 
     /**
-     * Set numbering style name
+     * Set numbering style name.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setNumStyle($value)
@@ -667,7 +660,7 @@ public function setNumStyle($value)
     }
 
     /**
-     * Get numbering level
+     * Get numbering level.
      *
      * @return int
      */
@@ -677,9 +670,10 @@ public function getNumLevel()
     }
 
     /**
-     * Set numbering level
+     * Set numbering level.
      *
      * @param int $value
+     *
      * @return self
      */
     public function setNumLevel($value = 0)
@@ -690,7 +684,7 @@ public function setNumLevel($value = 0)
     }
 
     /**
-     * Get tabs
+     * Get tabs.
      *
      * @return \PhpOffice\PhpWord\Style\Tab[]
      */
@@ -700,9 +694,10 @@ public function getTabs()
     }
 
     /**
-     * Set tabs
+     * Set tabs.
      *
      * @param array $value
+     *
      * @return self
      */
     public function setTabs($value = null)
@@ -715,55 +710,7 @@ public function setTabs($value = null)
     }
 
     /**
-     * Get allow first/last line to display on a separate page setting
-     *
-     * @deprecated 0.10.0
-     *
-     * @codeCoverageIgnore
-     */
-    public function getWidowControl()
-    {
-        return $this->hasWidowControl();
-    }
-
-    /**
-     * Get keep paragraph with next paragraph setting
-     *
-     * @deprecated 0.10.0
-     *
-     * @codeCoverageIgnore
-     */
-    public function getKeepNext()
-    {
-        return $this->isKeepNext();
-    }
-
-    /**
-     * Get keep all lines on one page setting
-     *
-     * @deprecated 0.10.0
-     *
-     * @codeCoverageIgnore
-     */
-    public function getKeepLines()
-    {
-        return $this->isKeepLines();
-    }
-
-    /**
-     * Get start paragraph on next page setting
-     *
-     * @deprecated 0.10.0
-     *
-     * @codeCoverageIgnore
-     */
-    public function getPageBreakBefore()
-    {
-        return $this->hasPageBreakBefore();
-    }
-
-    /**
-     * Get shading
+     * Get shading.
      *
      * @return \PhpOffice\PhpWord\Style\Shading
      */
@@ -773,9 +720,10 @@ public function getShading()
     }
 
     /**
-     * Set shading
+     * Set shading.
      *
      * @param mixed $value
+     *
      * @return self
      */
     public function setShading($value = null)
@@ -786,7 +734,7 @@ public function setShading($value = null)
     }
 
     /**
-     * Get contextualSpacing
+     * Get contextualSpacing.
      *
      * @return bool
      */
@@ -796,9 +744,10 @@ public function hasContextualSpacing()
     }
 
     /**
-     * Set contextualSpacing
+     * Set contextualSpacing.
      *
      * @param bool $contextualSpacing
+     *
      * @return self
      */
     public function setContextualSpacing($contextualSpacing)
@@ -809,20 +758,21 @@ public function setContextualSpacing($contextualSpacing)
     }
 
     /**
-     * Get bidirectional
+     * Get bidirectional.
      *
-     * @return bool
+     * @return ?bool
      */
     public function isBidi()
     {
-        return $this->bidi;
+        return $this->bidi ?? Settings::isDefaultRtl();
     }
 
     /**
-     * Set bidi
+     * Set bidi.
      *
-     * @param bool $bidi
+     * @param ?bool $bidi
      *            Set to true to write from right to left
+     *
      * @return self
      */
     public function setBidi($bidi)
@@ -833,7 +783,7 @@ public function setBidi($bidi)
     }
 
     /**
-     * Get textAlignment
+     * Get textAlignment.
      *
      * @return string
      */
@@ -843,9 +793,10 @@ public function getTextAlignment()
     }
 
     /**
-     * Set textAlignment
+     * Set textAlignment.
      *
      * @param string $textAlignment
+     *
      * @return self
      */
     public function setTextAlignment($textAlignment)
@@ -867,7 +818,7 @@ public function hasSuppressAutoHyphens()
     /**
      * @param bool $suppressAutoHyphens
      */
-    public function setSuppressAutoHyphens($suppressAutoHyphens)
+    public function setSuppressAutoHyphens($suppressAutoHyphens): void
     {
         $this->suppressAutoHyphens = (bool) $suppressAutoHyphens;
     }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Style/Row.php b/vendor/phpoffice/phpword/src/PhpWord/Style/Row.php
index ad801af6e2..765c54f80e 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Style/Row.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Style/Row.php
@@ -11,49 +11,49 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Style;
 
 /**
- * Table row style
+ * Table row style.
  *
  * @since 0.8.0
  */
 class Row extends AbstractStyle
 {
     /**
-     * Repeat table row on every new page
+     * Repeat table row on every new page.
      *
      * @var bool
      */
     private $tblHeader = false;
 
     /**
-     * Table row cannot break across pages
+     * Table row cannot break across pages.
      *
      * @var bool
      */
     private $cantSplit = false;
 
     /**
-     * Table row exact height
+     * Table row exact height.
      *
      * @var bool
      */
     private $exactHeight = false;
 
     /**
-     * Create a new row style
+     * Create a new row style.
      */
     public function __construct()
     {
     }
 
     /**
-     * Is tblHeader
+     * Is tblHeader.
      *
      * @return bool
      */
@@ -63,9 +63,10 @@ public function isTblHeader()
     }
 
     /**
-     * Is tblHeader
+     * Is tblHeader.
      *
      * @param bool $value
+     *
      * @return self
      */
     public function setTblHeader($value = true)
@@ -76,7 +77,7 @@ public function setTblHeader($value = true)
     }
 
     /**
-     * Is cantSplit
+     * Is cantSplit.
      *
      * @return bool
      */
@@ -86,9 +87,10 @@ public function isCantSplit()
     }
 
     /**
-     * Is cantSplit
+     * Is cantSplit.
      *
      * @param bool $value
+     *
      * @return self
      */
     public function setCantSplit($value = true)
@@ -99,7 +101,7 @@ public function setCantSplit($value = true)
     }
 
     /**
-     * Is exactHeight
+     * Is exactHeight.
      *
      * @return bool
      */
@@ -109,9 +111,10 @@ public function isExactHeight()
     }
 
     /**
-     * Set exactHeight
+     * Set exactHeight.
      *
      * @param bool $value
+     *
      * @return self
      */
     public function setExactHeight($value = true)
@@ -120,40 +123,4 @@ public function setExactHeight($value = true)
 
         return $this;
     }
-
-    /**
-     * Get tblHeader
-     *
-     * @deprecated 0.10.0
-     *
-     * @codeCoverageIgnore
-     */
-    public function getTblHeader()
-    {
-        return $this->isTblHeader();
-    }
-
-    /**
-     * Get cantSplit
-     *
-     * @deprecated 0.10.0
-     *
-     * @codeCoverageIgnore
-     */
-    public function getCantSplit()
-    {
-        return $this->isCantSplit();
-    }
-
-    /**
-     * Get exactHeight
-     *
-     * @deprecated 0.10.0
-     *
-     * @codeCoverageIgnore
-     */
-    public function getExactHeight()
-    {
-        return $this->isExactHeight();
-    }
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Style/Section.php b/vendor/phpoffice/phpword/src/PhpWord/Style/Section.php
index 697add7456..3b08aa5f38 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Style/Section.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Style/Section.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -21,12 +21,12 @@
 use PhpOffice\PhpWord\SimpleType\VerticalJc;
 
 /**
- * Section settings
+ * Section settings.
  */
 class Section extends Border
 {
     /**
-     * Page orientation
+     * Page orientation.
      *
      * @const string
      */
@@ -34,13 +34,12 @@ class Section extends Border
     const ORIENTATION_LANDSCAPE = 'landscape';
 
     /**
-     * Page default constants
+     * Page default constants.
      *
      * @const int|float
      */
     const DEFAULT_WIDTH = 11905.511811024; // In twips.
     const DEFAULT_HEIGHT = 16837.79527559; // In twips.
-    const DEFAULT_MARGIN = 1440;           // In twips.
     const DEFAULT_GUTTER = 0;              // In twips.
     const DEFAULT_HEADER_HEIGHT = 720;     // In twips.
     const DEFAULT_FOOTER_HEIGHT = 720;     // In twips.
@@ -48,107 +47,81 @@ class Section extends Border
     const DEFAULT_COLUMN_SPACING = 720;    // In twips.
 
     /**
-     * Page Orientation
+     * Page Orientation.
      *
      * @var string
+     *
      * @see  http://www.schemacentral.com/sc/ooxml/a-w_orient-1.html
      */
     private $orientation = self::ORIENTATION_PORTRAIT;
 
     /**
-     * Paper size
+     * Paper size.
      *
      * @var \PhpOffice\PhpWord\Style\Paper
      */
     private $paper;
 
     /**
-     * Page Size Width
+     * Page Size Width.
      *
-     * @var int|float
+     * @var float|int
      */
     private $pageSizeW = self::DEFAULT_WIDTH;
 
     /**
-     * Page Size Height
+     * Page Size Height.
      *
-     * @var int|float
+     * @var float|int
      */
     private $pageSizeH = self::DEFAULT_HEIGHT;
 
     /**
-     * Top margin spacing
-     *
-     * @var int|float
-     */
-    private $marginTop = self::DEFAULT_MARGIN;
-
-    /**
-     * Left margin spacing
-     *
-     * @var int|float
-     */
-    private $marginLeft = self::DEFAULT_MARGIN;
-
-    /**
-     * Right margin spacing
-     *
-     * @var int|float
-     */
-    private $marginRight = self::DEFAULT_MARGIN;
-
-    /**
-     * Bottom margin spacing
+     * Page gutter spacing.
      *
-     * @var int|float
-     */
-    private $marginBottom = self::DEFAULT_MARGIN;
-
-    /**
-     * Page gutter spacing
+     * @var float|int
      *
-     * @var int|float
      * @see  http://www.schemacentral.com/sc/ooxml/e-w_pgMar-1.html
      */
     private $gutter = self::DEFAULT_GUTTER;
 
     /**
-     * Header height
+     * Header height.
      *
-     * @var int|float
+     * @var float|int
      */
     private $headerHeight = self::DEFAULT_HEADER_HEIGHT;
 
     /**
-     * Footer height
+     * Footer height.
      *
-     * @var int|float
+     * @var float|int
      */
     private $footerHeight = self::DEFAULT_FOOTER_HEIGHT;
 
     /**
-     * Page Numbering Start
+     * Page Numbering Start.
      *
      * @var int
      */
     private $pageNumberingStart;
 
     /**
-     * Section columns count
+     * Section columns count.
      *
      * @var int
      */
     private $colsNum = self::DEFAULT_COLUMN_COUNT;
 
     /**
-     * Section spacing between columns
+     * Section spacing between columns.
      *
-     * @var int|float
+     * @var float|int
      */
     private $colsSpace = self::DEFAULT_COLUMN_SPACING;
 
     /**
-     * Section break type
+     * Section break type.
      *
      * Options:
      * - nextPage: Next page section break
@@ -157,28 +130,29 @@ class Section extends Border
      * - evenPage: Even page section break
      * - oddPage: Odd page section break
      *
-     * @var string
+     * @var ?string
      */
     private $breakType;
 
     /**
-     * Line numbering
+     * Line numbering.
      *
      * @var \PhpOffice\PhpWord\Style\LineNumbering
+     *
      * @see  http://www.schemacentral.com/sc/ooxml/e-w_lnNumType-1.html
      */
     private $lineNumbering;
 
     /**
      * Vertical Text Alignment on Page
-     * One of \PhpOffice\PhpWord\SimpleType\VerticalJc
+     * One of \PhpOffice\PhpWord\SimpleType\VerticalJc.
      *
-     * @var string
+     * @var ?string
      */
     private $vAlign;
 
     /**
-     * Create new instance
+     * Create new instance.
      */
     public function __construct()
     {
@@ -186,7 +160,7 @@ public function __construct()
     }
 
     /**
-     * Get paper size
+     * Get paper size.
      *
      * @return string
      */
@@ -196,9 +170,10 @@ public function getPaperSize()
     }
 
     /**
-     * Set paper size
+     * Set paper size.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setPaperSize($value = '')
@@ -217,10 +192,11 @@ public function setPaperSize($value = '')
     }
 
     /**
-     * Set Setting Value
+     * Set Setting Value.
      *
      * @param string $key
-     * @param string $value
+     * @param array|int|string $value
+     *
      * @return self
      */
     public function setSettingValue($key, $value)
@@ -229,20 +205,21 @@ public function setSettingValue($key, $value)
     }
 
     /**
-     * Set orientation
+     * Set orientation.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setOrientation($value = null)
     {
-        $enum = array(self::ORIENTATION_PORTRAIT, self::ORIENTATION_LANDSCAPE);
+        $enum = [self::ORIENTATION_PORTRAIT, self::ORIENTATION_LANDSCAPE];
         $this->orientation = $this->setEnumVal($value, $enum, $this->orientation);
 
-        /** @var int|float $longSide Type hint */
+        /** @var float|int $longSide Type hint */
         $longSide = $this->pageSizeW >= $this->pageSizeH ? $this->pageSizeW : $this->pageSizeH;
 
-        /** @var int|float $shortSide Type hint */
+        /** @var float|int $shortSide Type hint */
         $shortSide = $this->pageSizeW < $this->pageSizeH ? $this->pageSizeW : $this->pageSizeH;
 
         if ($this->orientation == self::ORIENTATION_PORTRAIT) {
@@ -257,7 +234,7 @@ public function setOrientation($value = null)
     }
 
     /**
-     * Get Page Orientation
+     * Get Page Orientation.
      *
      * @return string
      */
@@ -267,7 +244,7 @@ public function getOrientation()
     }
 
     /**
-     * Set Portrait Orientation
+     * Set Portrait Orientation.
      *
      * @return self
      */
@@ -277,7 +254,7 @@ public function setPortrait()
     }
 
     /**
-     * Set Landscape Orientation
+     * Set Landscape Orientation.
      *
      * @return self
      */
@@ -287,9 +264,9 @@ public function setLandscape()
     }
 
     /**
-     * Get Page Size Width
+     * Get Page Size Width.
      *
-     * @return int|float|null
+     * @return null|float|int
      *
      * @since 0.12.0
      */
@@ -299,7 +276,7 @@ public function getPageSizeW()
     }
 
     /**
-     * @param int|float|null $value
+     * @param null|float|int $value
      *
      * @return \PhpOffice\PhpWord\Style\Section
      *
@@ -313,9 +290,9 @@ public function setPageSizeW($value = null)
     }
 
     /**
-     * Get Page Size Height
+     * Get Page Size Height.
      *
-     * @return int|float|null
+     * @return null|float|int
      *
      * @since 0.12.0
      */
@@ -325,7 +302,7 @@ public function getPageSizeH()
     }
 
     /**
-     * @param int|float|null $value
+     * @param null|float|int $value
      *
      * @return \PhpOffice\PhpWord\Style\Section
      *
@@ -339,101 +316,9 @@ public function setPageSizeH($value = null)
     }
 
     /**
-     * Get Margin Top
+     * Get gutter.
      *
-     * @return int|float
-     */
-    public function getMarginTop()
-    {
-        return $this->marginTop;
-    }
-
-    /**
-     * Set Margin Top
-     *
-     * @param int|float $value
-     * @return self
-     */
-    public function setMarginTop($value = null)
-    {
-        $this->marginTop = $this->setNumericVal($value, self::DEFAULT_MARGIN);
-
-        return $this;
-    }
-
-    /**
-     * Get Margin Left
-     *
-     * @return int|float
-     */
-    public function getMarginLeft()
-    {
-        return $this->marginLeft;
-    }
-
-    /**
-     * Set Margin Left
-     *
-     * @param int|float $value
-     * @return self
-     */
-    public function setMarginLeft($value = null)
-    {
-        $this->marginLeft = $this->setNumericVal($value, self::DEFAULT_MARGIN);
-
-        return $this;
-    }
-
-    /**
-     * Get Margin Right
-     *
-     * @return int|float
-     */
-    public function getMarginRight()
-    {
-        return $this->marginRight;
-    }
-
-    /**
-     * Set Margin Right
-     *
-     * @param int|float $value
-     * @return self
-     */
-    public function setMarginRight($value = null)
-    {
-        $this->marginRight = $this->setNumericVal($value, self::DEFAULT_MARGIN);
-
-        return $this;
-    }
-
-    /**
-     * Get Margin Bottom
-     *
-     * @return int|float
-     */
-    public function getMarginBottom()
-    {
-        return $this->marginBottom;
-    }
-
-    /**
-     * Set Margin Bottom
-     *
-     * @param int|float $value
-     * @return self
-     */
-    public function setMarginBottom($value = null)
-    {
-        $this->marginBottom = $this->setNumericVal($value, self::DEFAULT_MARGIN);
-
-        return $this;
-    }
-
-    /**
-     * Get gutter
-     *
-     * @return int|float
+     * @return float|int
      */
     public function getGutter()
     {
@@ -441,9 +326,10 @@ public function getGutter()
     }
 
     /**
-     * Set gutter
+     * Set gutter.
+     *
+     * @param float|int $value
      *
-     * @param int|float $value
      * @return self
      */
     public function setGutter($value = null)
@@ -454,9 +340,9 @@ public function setGutter($value = null)
     }
 
     /**
-     * Get Header Height
+     * Get Header Height.
      *
-     * @return int|float
+     * @return float|int
      */
     public function getHeaderHeight()
     {
@@ -464,9 +350,10 @@ public function getHeaderHeight()
     }
 
     /**
-     * Set Header Height
+     * Set Header Height.
+     *
+     * @param float|int $value
      *
-     * @param int|float $value
      * @return self
      */
     public function setHeaderHeight($value = null)
@@ -477,9 +364,9 @@ public function setHeaderHeight($value = null)
     }
 
     /**
-     * Get Footer Height
+     * Get Footer Height.
      *
-     * @return int|float
+     * @return float|int
      */
     public function getFooterHeight()
     {
@@ -487,9 +374,10 @@ public function getFooterHeight()
     }
 
     /**
-     * Set Footer Height
+     * Set Footer Height.
+     *
+     * @param float|int $value
      *
-     * @param int|float $value
      * @return self
      */
     public function setFooterHeight($value = null)
@@ -500,7 +388,7 @@ public function setFooterHeight($value = null)
     }
 
     /**
-     * Get page numbering start
+     * Get page numbering start.
      *
      * @return null|int
      */
@@ -510,9 +398,10 @@ public function getPageNumberingStart()
     }
 
     /**
-     * Set page numbering start
+     * Set page numbering start.
      *
      * @param null|int $pageNumberingStart
+     *
      * @return self
      */
     public function setPageNumberingStart($pageNumberingStart = null)
@@ -523,7 +412,7 @@ public function setPageNumberingStart($pageNumberingStart = null)
     }
 
     /**
-     * Get Section Columns Count
+     * Get Section Columns Count.
      *
      * @return int
      */
@@ -533,9 +422,10 @@ public function getColsNum()
     }
 
     /**
-     * Set Section Columns Count
+     * Set Section Columns Count.
      *
      * @param int $value
+     *
      * @return self
      */
     public function setColsNum($value = null)
@@ -546,9 +436,9 @@ public function setColsNum($value = null)
     }
 
     /**
-     * Get Section Space Between Columns
+     * Get Section Space Between Columns.
      *
-     * @return int|float
+     * @return float|int
      */
     public function getColsSpace()
     {
@@ -556,9 +446,10 @@ public function getColsSpace()
     }
 
     /**
-     * Set Section Space Between Columns
+     * Set Section Space Between Columns.
+     *
+     * @param float|int $value
      *
-     * @param int|float $value
      * @return self
      */
     public function setColsSpace($value = null)
@@ -569,9 +460,9 @@ public function setColsSpace($value = null)
     }
 
     /**
-     * Get Break Type
+     * Get Break Type.
      *
-     * @return string
+     * @return ?string
      */
     public function getBreakType()
     {
@@ -579,9 +470,10 @@ public function getBreakType()
     }
 
     /**
-     * Set Break Type
+     * Set Break Type.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setBreakType($value = null)
@@ -592,7 +484,7 @@ public function setBreakType($value = null)
     }
 
     /**
-     * Get line numbering
+     * Get line numbering.
      *
      * @return \PhpOffice\PhpWord\Style\LineNumbering
      */
@@ -602,9 +494,10 @@ public function getLineNumbering()
     }
 
     /**
-     * Set line numbering
+     * Set line numbering.
      *
      * @param mixed $value
+     *
      * @return self
      */
     public function setLineNumbering($value = null)
@@ -615,9 +508,9 @@ public function setLineNumbering($value = null)
     }
 
     /**
-     * Get vertical alignment
+     * Get vertical alignment.
      *
-     * @return string
+     * @return ?string
      */
     public function getVAlign()
     {
@@ -625,9 +518,10 @@ public function getVAlign()
     }
 
     /**
-     * Set vertical alignment
+     * Set vertical alignment.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setVAlign($value = null)
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Style/Shading.php b/vendor/phpoffice/phpword/src/PhpWord/Style/Shading.php
index 154df26c7a..81d69e313d 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Style/Shading.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Style/Shading.php
@@ -11,14 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Style;
 
 /**
- * Shading style
+ * Shading style.
  *
  * @see  http://www.schemacentral.com/sc/ooxml/t-w_CT_Shd.html
  * @since 0.10.0
@@ -26,9 +26,10 @@
 class Shading extends AbstractStyle
 {
     /**
-     * Pattern constants (partly)
+     * Pattern constants (partly).
      *
      * @const string
+     *
      * @see  http://www.schemacentral.com/sc/ooxml/t-w_ST_Shd.html
      */
     const PATTERN_CLEAR = 'clear'; // No pattern
@@ -40,39 +41,40 @@ class Shading extends AbstractStyle
     const PATTERN_DCROSS = 'diagCross'; // Diagonal cross pattern
 
     /**
-     * Shading pattern
+     * Shading pattern.
      *
      * @var string
+     *
      * @see  http://www.schemacentral.com/sc/ooxml/t-w_ST_Shd.html
      */
     private $pattern = self::PATTERN_CLEAR;
 
     /**
-     * Shading pattern color
+     * Shading pattern color.
      *
      * @var string
      */
     private $color;
 
     /**
-     * Shading background color
+     * Shading background color.
      *
      * @var string
      */
     private $fill;
 
     /**
-     * Create a new instance
+     * Create a new instance.
      *
      * @param array $style
      */
-    public function __construct($style = array())
+    public function __construct($style = [])
     {
         $this->setStyleByArray($style);
     }
 
     /**
-     * Get pattern
+     * Get pattern.
      *
      * @return string
      */
@@ -82,24 +84,25 @@ public function getPattern()
     }
 
     /**
-     * Set pattern
+     * Set pattern.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setPattern($value = null)
     {
-        $enum = array(
+        $enum = [
             self::PATTERN_CLEAR, self::PATTERN_SOLID, self::PATTERN_HSTRIPE,
             self::PATTERN_VSTRIPE, self::PATTERN_DSTRIPE, self::PATTERN_HCROSS, self::PATTERN_DCROSS,
-        );
+        ];
         $this->pattern = $this->setEnumVal($value, $enum, $this->pattern);
 
         return $this;
     }
 
     /**
-     * Get color
+     * Get color.
      *
      * @return string
      */
@@ -109,9 +112,10 @@ public function getColor()
     }
 
     /**
-     * Set pattern
+     * Set pattern.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setColor($value = null)
@@ -122,7 +126,7 @@ public function setColor($value = null)
     }
 
     /**
-     * Get fill
+     * Get fill.
      *
      * @return string
      */
@@ -132,9 +136,10 @@ public function getFill()
     }
 
     /**
-     * Set fill
+     * Set fill.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setFill($value = null)
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Style/Shadow.php b/vendor/phpoffice/phpword/src/PhpWord/Style/Shadow.php
index 1379a32096..3f6252d439 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Style/Shadow.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Style/Shadow.php
@@ -11,14 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Style;
 
 /**
- * Shadow style
+ * Shadow style.
  *
  * @see  http://www.schemacentral.com/sc/ooxml/t-v_CT_Shadow.html
  * @since 0.12.0
@@ -26,31 +26,31 @@
 class Shadow extends AbstractStyle
 {
     /**
-     * Color
+     * Color.
      *
      * @var string
      */
     private $color;
 
     /**
-     * Offset; Format: 3pt,3pt
+     * Offset; Format: 3pt,3pt.
      *
      * @var string
      */
     private $offset;
 
     /**
-     * Create a new instance
+     * Create a new instance.
      *
      * @param array $style
      */
-    public function __construct($style = array())
+    public function __construct($style = [])
     {
         $this->setStyleByArray($style);
     }
 
     /**
-     * Get color
+     * Get color.
      *
      * @return string
      */
@@ -60,9 +60,10 @@ public function getColor()
     }
 
     /**
-     * Set color
+     * Set color.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setColor($value = null)
@@ -73,7 +74,7 @@ public function setColor($value = null)
     }
 
     /**
-     * Get offset
+     * Get offset.
      *
      * @return string
      */
@@ -83,9 +84,10 @@ public function getOffset()
     }
 
     /**
-     * Set offset
+     * Set offset.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setOffset($value = null)
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Style/Shape.php b/vendor/phpoffice/phpword/src/PhpWord/Style/Shape.php
index 0c3f817982..7dd62a1f71 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Style/Shape.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Style/Shape.php
@@ -11,22 +11,23 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Style;
 
 /**
- * Shape style
+ * Shape style.
  *
  * @since 0.12.0
+ *
  * @todo Skew http://www.schemacentral.com/sc/ooxml/t-o_CT_Skew.html
  */
 class Shape extends AbstractStyle
 {
     /**
-     * Points
+     * Points.
      *
      * - Arc: startAngle endAngle; 0 = top center, moving clockwise
      * - Curve: from-x1,from-y1 to-x2,to-y2 control1-x,control1-y control2-x,control2-y
@@ -39,61 +40,61 @@ class Shape extends AbstractStyle
     private $points;
 
     /**
-     * Roundness measure of corners; 0 = straightest (rectangular); 1 = roundest (circle/oval)
+     * Roundness measure of corners; 0 = straightest (rectangular); 1 = roundest (circle/oval).
      *
      * Only for rect
      *
-     * @var int|float
+     * @var float|int
      */
     private $roundness;
 
     /**
-     * Frame
+     * Frame.
      *
      * @var \PhpOffice\PhpWord\Style\Frame
      */
     private $frame;
 
     /**
-     * Fill
+     * Fill.
      *
      * @var \PhpOffice\PhpWord\Style\Fill
      */
     private $fill;
 
     /**
-     * Outline
+     * Outline.
      *
      * @var \PhpOffice\PhpWord\Style\Outline
      */
     private $outline;
 
     /**
-     * Shadow
+     * Shadow.
      *
      * @var \PhpOffice\PhpWord\Style\Shadow
      */
     private $shadow;
 
     /**
-     * 3D extrusion
+     * 3D extrusion.
      *
      * @var \PhpOffice\PhpWord\Style\Extrusion
      */
     private $extrusion;
 
     /**
-     * Create a new instance
+     * Create a new instance.
      *
      * @param array $style
      */
-    public function __construct($style = array())
+    public function __construct($style = [])
     {
         $this->setStyleByArray($style);
     }
 
     /**
-     * Get points
+     * Get points.
      *
      * @return string
      */
@@ -103,9 +104,10 @@ public function getPoints()
     }
 
     /**
-     * Set points
+     * Set points.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setPoints($value = null)
@@ -116,9 +118,9 @@ public function setPoints($value = null)
     }
 
     /**
-     * Get roundness
+     * Get roundness.
      *
-     * @return int|float
+     * @return float|int
      */
     public function getRoundness()
     {
@@ -126,9 +128,10 @@ public function getRoundness()
     }
 
     /**
-     * Set roundness
+     * Set roundness.
+     *
+     * @param float|int $value
      *
-     * @param int|float $value
      * @return self
      */
     public function setRoundness($value = null)
@@ -139,7 +142,7 @@ public function setRoundness($value = null)
     }
 
     /**
-     * Get frame
+     * Get frame.
      *
      * @return \PhpOffice\PhpWord\Style\Frame
      */
@@ -149,9 +152,10 @@ public function getFrame()
     }
 
     /**
-     * Set frame
+     * Set frame.
      *
      * @param mixed $value
+     *
      * @return self
      */
     public function setFrame($value = null)
@@ -162,7 +166,7 @@ public function setFrame($value = null)
     }
 
     /**
-     * Get fill
+     * Get fill.
      *
      * @return \PhpOffice\PhpWord\Style\Fill
      */
@@ -172,9 +176,10 @@ public function getFill()
     }
 
     /**
-     * Set fill
+     * Set fill.
      *
      * @param mixed $value
+     *
      * @return self
      */
     public function setFill($value = null)
@@ -185,7 +190,7 @@ public function setFill($value = null)
     }
 
     /**
-     * Get outline
+     * Get outline.
      *
      * @return \PhpOffice\PhpWord\Style\Outline
      */
@@ -195,9 +200,10 @@ public function getOutline()
     }
 
     /**
-     * Set outline
+     * Set outline.
      *
      * @param mixed $value
+     *
      * @return self
      */
     public function setOutline($value = null)
@@ -208,7 +214,7 @@ public function setOutline($value = null)
     }
 
     /**
-     * Get shadow
+     * Get shadow.
      *
      * @return \PhpOffice\PhpWord\Style\Shadow
      */
@@ -218,9 +224,10 @@ public function getShadow()
     }
 
     /**
-     * Set shadow
+     * Set shadow.
      *
      * @param mixed $value
+     *
      * @return self
      */
     public function setShadow($value = null)
@@ -231,7 +238,7 @@ public function setShadow($value = null)
     }
 
     /**
-     * Get 3D extrusion
+     * Get 3D extrusion.
      *
      * @return \PhpOffice\PhpWord\Style\Extrusion
      */
@@ -241,9 +248,10 @@ public function getExtrusion()
     }
 
     /**
-     * Set 3D extrusion
+     * Set 3D extrusion.
      *
      * @param mixed $value
+     *
      * @return self
      */
     public function setExtrusion($value = null)
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Style/Spacing.php b/vendor/phpoffice/phpword/src/PhpWord/Style/Spacing.php
index 9bfb22822b..196ad8daa1 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Style/Spacing.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Style/Spacing.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,7 +20,7 @@
 use PhpOffice\PhpWord\SimpleType\LineSpacingRule;
 
 /**
- * Spacing between lines and above/below paragraph style
+ * Spacing between lines and above/below paragraph style.
  *
  * @see  http://www.datypic.com/sc/ooxml/t-w_CT_Spacing.html
  * @since 0.10.0
@@ -28,47 +28,47 @@
 class Spacing extends AbstractStyle
 {
     /**
-     * Spacing above paragraph (twip)
+     * Spacing above paragraph (twip).
      *
-     * @var int|float
+     * @var null|float|int
      */
     private $before;
 
     /**
-     * Spacing below paragraph (twip)
+     * Spacing below paragraph (twip).
      *
-     * @var int|float
+     * @var null|float|int
      */
     private $after;
 
     /**
-     * Spacing between lines in paragraph (twip)
+     * Spacing between lines in paragraph (twip).
      *
-     * @var int|float
+     * @var null|float|int
      */
     private $line;
 
     /**
-     * Type of spacing between lines
+     * Type of spacing between lines.
      *
      * @var string
      */
     private $lineRule = LineSpacingRule::AUTO;
 
     /**
-     * Create a new instance
+     * Create a new instance.
      *
      * @param array $style
      */
-    public function __construct($style = array())
+    public function __construct($style = [])
     {
         $this->setStyleByArray($style);
     }
 
     /**
-     * Get before
+     * Get before.
      *
-     * @return int|float
+     * @return null|float|int
      */
     public function getBefore()
     {
@@ -76,9 +76,10 @@ public function getBefore()
     }
 
     /**
-     * Set before
+     * Set before.
+     *
+     * @param null|float|int $value
      *
-     * @param int|float $value
      * @return self
      */
     public function setBefore($value = null)
@@ -89,9 +90,9 @@ public function setBefore($value = null)
     }
 
     /**
-     * Get after
+     * Get after.
      *
-     * @return int|float
+     * @return null|float|int
      */
     public function getAfter()
     {
@@ -99,9 +100,10 @@ public function getAfter()
     }
 
     /**
-     * Set after
+     * Set after.
+     *
+     * @param null|float|int $value
      *
-     * @param int|float $value
      * @return self
      */
     public function setAfter($value = null)
@@ -112,9 +114,9 @@ public function setAfter($value = null)
     }
 
     /**
-     * Get line
+     * Get line.
      *
-     * @return int|float
+     * @return null|float|int
      */
     public function getLine()
     {
@@ -122,9 +124,10 @@ public function getLine()
     }
 
     /**
-     * Set distance
+     * Set distance.
+     *
+     * @param null|float|int $value
      *
-     * @param int|float $value
      * @return self
      */
     public function setLine($value = null)
@@ -135,7 +138,7 @@ public function setLine($value = null)
     }
 
     /**
-     * Get line rule
+     * Get line rule.
      *
      * @return string
      */
@@ -145,9 +148,10 @@ public function getLineRule()
     }
 
     /**
-     * Set line rule
+     * Set line rule.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setLineRule($value = null)
@@ -157,31 +161,4 @@ public function setLineRule($value = null)
 
         return $this;
     }
-
-    /**
-     * Get line rule
-     *
-     * @return string
-     * @deprecated Use getLineRule() instead
-     * @codeCoverageIgnore
-     */
-    public function getRule()
-    {
-        return $this->lineRule;
-    }
-
-    /**
-     * Set line rule
-     *
-     * @param string $value
-     * @return self
-     * @deprecated Use setLineRule() instead
-     * @codeCoverageIgnore
-     */
-    public function setRule($value = null)
-    {
-        $this->lineRule = $value;
-
-        return $this;
-    }
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Style/TOC.php b/vendor/phpoffice/phpword/src/PhpWord/Style/TOC.php
index 2efd54a4a4..bd0d906907 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Style/TOC.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Style/TOC.php
@@ -11,38 +11,26 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Style;
 
 /**
- * TOC style
+ * TOC style.
  */
 class TOC extends Tab
 {
     /**
-     * Tab leader types for backward compatibility
-     *
-     * @deprecated 0.11.0
+     * Indent.
      *
-     * @const string
-     */
-    const TABLEADER_DOT = self::TAB_LEADER_DOT;
-    const TABLEADER_UNDERSCORE = self::TAB_LEADER_UNDERSCORE;
-    const TABLEADER_LINE = self::TAB_LEADER_HYPHEN;
-    const TABLEADER_NONE = self::TAB_LEADER_NONE;
-
-    /**
-     * Indent
-     *
-     * @var int|float (twip)
+     * @var float|int (twip)
      */
     private $indent = 200;
 
     /**
-     * Create a new TOC Style
+     * Create a new TOC Style.
      */
     public function __construct()
     {
@@ -50,9 +38,9 @@ public function __construct()
     }
 
     /**
-     * Get Tab Position
+     * Get Tab Position.
      *
-     * @return int|float
+     * @return float|int
      */
     public function getTabPos()
     {
@@ -60,9 +48,10 @@ public function getTabPos()
     }
 
     /**
-     * Set Tab Position
+     * Set Tab Position.
+     *
+     * @param float|int $value
      *
-     * @param int|float $value
      * @return self
      */
     public function setTabPos($value)
@@ -71,7 +60,7 @@ public function setTabPos($value)
     }
 
     /**
-     * Get Tab Leader
+     * Get Tab Leader.
      *
      * @return string
      */
@@ -81,9 +70,10 @@ public function getTabLeader()
     }
 
     /**
-     * Set Tab Leader
+     * Set Tab Leader.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setTabLeader($value = self::TAB_LEADER_DOT)
@@ -92,9 +82,9 @@ public function setTabLeader($value = self::TAB_LEADER_DOT)
     }
 
     /**
-     * Get Indent
+     * Get Indent.
      *
-     * @return int|float
+     * @return float|int
      */
     public function getIndent()
     {
@@ -102,9 +92,10 @@ public function getIndent()
     }
 
     /**
-     * Set Indent
+     * Set Indent.
+     *
+     * @param float|int $value
      *
-     * @param int|float $value
      * @return self
      */
     public function setIndent($value)
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Style/Tab.php b/vendor/phpoffice/phpword/src/PhpWord/Style/Tab.php
index d3cf5bd7f4..02158fd498 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Style/Tab.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Style/Tab.php
@@ -11,19 +11,19 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Style;
 
 /**
- * Tab style
+ * Tab style.
  */
 class Tab extends AbstractStyle
 {
     /**
-     * Tab stop types
+     * Tab stop types.
      *
      * @const string
      */
@@ -36,7 +36,7 @@ class Tab extends AbstractStyle
     const TAB_STOP_NUM = 'num';
 
     /**
-     * Tab leader types
+     * Tab leader types.
      *
      * @const string
      */
@@ -48,23 +48,23 @@ class Tab extends AbstractStyle
     const TAB_LEADER_MIDDLEDOT = 'middleDot';
 
     /**
-     * Tab stop type
+     * Tab stop type.
      *
      * @var string
      */
     private $type = self::TAB_STOP_CLEAR;
 
     /**
-     * Tab leader character
+     * Tab leader character.
      *
      * @var string
      */
     private $leader = self::TAB_LEADER_NONE;
 
     /**
-     * Tab stop position (twip)
+     * Tab stop position (twip).
      *
-     * @var int|float
+     * @var float|int
      */
     private $position = 0;
 
@@ -79,14 +79,14 @@ class Tab extends AbstractStyle
      */
     public function __construct($type = null, $position = 0, $leader = null)
     {
-        $stopTypes = array(
+        $stopTypes = [
             self::TAB_STOP_CLEAR, self::TAB_STOP_LEFT, self::TAB_STOP_CENTER,
             self::TAB_STOP_RIGHT, self::TAB_STOP_DECIMAL, self::TAB_STOP_BAR, self::TAB_STOP_NUM,
-        );
-        $leaderTypes = array(
+        ];
+        $leaderTypes = [
             self::TAB_LEADER_NONE, self::TAB_LEADER_DOT, self::TAB_LEADER_HYPHEN,
             self::TAB_LEADER_UNDERSCORE, self::TAB_LEADER_HEAVY, self::TAB_LEADER_MIDDLEDOT,
-        );
+        ];
 
         $this->type = $this->setEnumVal($type, $stopTypes, $this->type);
         $this->position = $this->setNumericVal($position, $this->position);
@@ -94,7 +94,7 @@ public function __construct($type = null, $position = 0, $leader = null)
     }
 
     /**
-     * Get stop type
+     * Get stop type.
      *
      * @return string
      */
@@ -104,25 +104,26 @@ public function getType()
     }
 
     /**
-     * Set stop type
+     * Set stop type.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setType($value)
     {
-        $enum = array(
+        $enum = [
             self::TAB_STOP_CLEAR, self::TAB_STOP_LEFT, self::TAB_STOP_CENTER,
             self::TAB_STOP_RIGHT, self::TAB_STOP_DECIMAL, self::TAB_STOP_BAR,
             self::TAB_STOP_NUM,
-        );
+        ];
         $this->type = $this->setEnumVal($value, $enum, $this->type);
 
         return $this;
     }
 
     /**
-     * Get leader
+     * Get leader.
      *
      * @return string
      */
@@ -132,26 +133,27 @@ public function getLeader()
     }
 
     /**
-     * Set leader
+     * Set leader.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setLeader($value)
     {
-        $enum = array(
+        $enum = [
             self::TAB_LEADER_NONE, self::TAB_LEADER_DOT, self::TAB_LEADER_HYPHEN,
             self::TAB_LEADER_UNDERSCORE, self::TAB_LEADER_HEAVY, self::TAB_LEADER_MIDDLEDOT,
-        );
+        ];
         $this->leader = $this->setEnumVal($value, $enum, $this->leader);
 
         return $this;
     }
 
     /**
-     * Get position
+     * Get position.
      *
-     * @return int|float
+     * @return float|int
      */
     public function getPosition()
     {
@@ -159,9 +161,10 @@ public function getPosition()
     }
 
     /**
-     * Set position
+     * Set position.
+     *
+     * @param float|int $value
      *
-     * @param int|float $value
      * @return self
      */
     public function setPosition($value)
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Style/Table.php b/vendor/phpoffice/phpword/src/PhpWord/Style/Table.php
index f777ac671f..3adb1a38f5 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Style/Table.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Style/Table.php
@@ -11,41 +11,30 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Style;
 
 use PhpOffice\PhpWord\ComplexType\TblWidth as TblWidthComplexType;
+use PhpOffice\PhpWord\Settings;
 use PhpOffice\PhpWord\SimpleType\Jc;
 use PhpOffice\PhpWord\SimpleType\JcTable;
 use PhpOffice\PhpWord\SimpleType\TblWidth;
+use PhpOffice\PhpWord\Style;
 
 class Table extends Border
 {
-    /**
-     * @deprecated Use \PhpOffice\PhpWord\SimpleType\TblWidth::AUTO instead
-     */
-    const WIDTH_AUTO = 'auto'; // Automatically determined width
-    /**
-     * @deprecated Use \PhpOffice\PhpWord\SimpleType\TblWidth::PERCENT instead
-     */
-    const WIDTH_PERCENT = 'pct'; // Width in fiftieths (1/50) of a percent (1% = 50 unit)
-    /**
-     * @deprecated Use \PhpOffice\PhpWord\SimpleType\TblWidth::TWIP instead
-     */
-    const WIDTH_TWIP = 'dxa'; // Width in twentieths (1/20) of a point (twip)
-
     //values for http://www.datypic.com/sc/ooxml/t-w_ST_TblLayoutType.html
     /**
-     * AutoFit Table Layout
+     * AutoFit Table Layout.
      *
      * @var string
      */
     const LAYOUT_AUTO = 'autofit';
     /**
-     * Fixed Width Table Layout
+     * Fixed Width Table Layout.
      *
      * @var string
      */
@@ -59,70 +48,70 @@ class Table extends Border
     private $isFirstRow = false;
 
     /**
-     * Style for first row
+     * Style for first row.
      *
      * @var \PhpOffice\PhpWord\Style\Table
      */
     private $firstRowStyle;
 
     /**
-     * Cell margin top
+     * Cell margin top.
      *
      * @var int
      */
     private $cellMarginTop;
 
     /**
-     * Cell margin left
+     * Cell margin left.
      *
      * @var int
      */
     private $cellMarginLeft;
 
     /**
-     * Cell margin right
+     * Cell margin right.
      *
      * @var int
      */
     private $cellMarginRight;
 
     /**
-     * Cell margin bottom
+     * Cell margin bottom.
      *
      * @var int
      */
     private $cellMarginBottom;
 
     /**
-     * Border size inside horizontal
+     * Border size inside horizontal.
      *
      * @var int
      */
     private $borderInsideHSize;
 
     /**
-     * Border color inside horizontal
+     * Border color inside horizontal.
      *
      * @var string
      */
     private $borderInsideHColor;
 
     /**
-     * Border size inside vertical
+     * Border size inside vertical.
      *
      * @var int
      */
     private $borderInsideVSize;
 
     /**
-     * Border color inside vertical
+     * Border color inside vertical.
      *
      * @var string
      */
     private $borderInsideVColor;
 
     /**
-     * Shading
+     * Shading.
      *
      * @var \PhpOffice\PhpWord\Style\Shading
      */
@@ -134,7 +123,7 @@ class Table extends Border
     private $alignment = '';
 
     /**
-     * @var int|float Width value
+     * @var float|int Width value
      */
     private $width = 0;
 
@@ -144,9 +133,9 @@ class Table extends Border
     private $unit = TblWidth::AUTO;
 
     /**
-     * @var int|float cell spacing value
+     * @var null|float|int cell spacing value
      */
-    protected $cellSpacing = null;
+    protected $cellSpacing;
 
     /**
      * @var string Table Layout
@@ -154,32 +143,33 @@ class Table extends Border
     private $layout = self::LAYOUT_AUTO;
 
     /**
-     * Position
+     * Position.
      *
-     * @var \PhpOffice\PhpWord\Style\TablePosition
+     * @var ?\PhpOffice\PhpWord\Style\TablePosition
      */
     private $position;
 
-    /** @var TblWidthComplexType|null */
+    /** @var null|TblWidthComplexType */
     private $indent;
 
     /**
-     * The width of each column, computed based on the max cell width of each column
+     * The width of each column, computed based on the max cell width of each column.
      *
      * @var int[]
      */
     private $columnWidths;
 
     /**
-     * Visually Right to Left Table
+     * Visually Right to Left Table.
      *
      * @see  http://www.datypic.com/sc/ooxml/e-w_bidiVisual-1.html
-     * @var bool
+     *
+     * @var ?bool
      */
-    private $bidiVisual = false;
+    private $bidiVisual;
 
     /**
-     * Create new table style
+     * Create new table style.
      *
      * @param mixed $tableStyle
      * @param mixed $firstRowStyle
@@ -200,15 +190,15 @@ public function __construct($tableStyle = null, $firstRowStyle = null)
     }
 
     /**
-     * @param float|int $cellSpacing
+     * @param null|float|int $cellSpacing
      */
-    public function setCellSpacing($cellSpacing = null)
+    public function setCellSpacing($cellSpacing = null): void
     {
         $this->cellSpacing = $cellSpacing;
     }
 
     /**
-     * @return float|int
+     * @return null|float|int
      */
     public function getCellSpacing()
     {
@@ -216,7 +206,7 @@ public function getCellSpacing()
     }
 
     /**
-     * Set first row
+     * Set first row.
      *
      * @return \PhpOffice\PhpWord\Style\Table
      */
@@ -226,9 +216,9 @@ public function getFirstRow()
     }
 
     /**
-     * Get background
+     * Get background.
      *
-     * @return string
+     * @return ?string
      */
     public function getBgColor()
     {
@@ -240,39 +230,41 @@ public function getBgColor()
     }
 
     /**
-     * Set background
+     * Set background.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setBgColor($value = null)
     {
-        $this->setShading(array('fill' => $value));
+        $this->setShading(['fill' => $value]);
 
         return $this;
     }
 
     /**
-     * Get TLRBHV Border Size
+     * Get TLRBHV Border Size.
      *
      * @return int[]
      */
     public function getBorderSize()
     {
-        return array(
+        return [
             $this->getBorderTopSize(),
             $this->getBorderLeftSize(),
             $this->getBorderRightSize(),
             $this->getBorderBottomSize(),
             $this->getBorderInsideHSize(),
             $this->getBorderInsideVSize(),
-        );
+        ];
     }
 
     /**
-     * Set TLRBHV Border Size
+     * Set TLRBHV Border Size.
      *
      * @param int $value Border size in eighths of a point (1/8 point)
+     *
      * @return self
      */
     public function setBorderSize($value = null)
@@ -288,26 +280,27 @@ public function setBorderSize($value = null)
     }
 
     /**
-     * Get TLRBHV Border Color
+     * Get TLRBHV Border Color.
      *
      * @return string[]
      */
     public function getBorderColor()
     {
-        return array(
+        return [
             $this->getBorderTopColor(),
             $this->getBorderLeftColor(),
             $this->getBorderRightColor(),
             $this->getBorderBottomColor(),
             $this->getBorderInsideHColor(),
             $this->getBorderInsideVColor(),
-        );
+        ];
     }
 
     /**
-     * Set TLRBHV Border Color
+     * Set TLRBHV Border Color.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setBorderColor($value = null)
@@ -323,7 +316,7 @@ public function setBorderColor($value = null)
     }
 
     /**
-     * Get border size inside horizontal
+     * Get border size inside horizontal.
      *
      * @return int
      */
@@ -333,9 +326,10 @@ public function getBorderInsideHSize()
     }
 
     /**
-     * Set border size inside horizontal
+     * Set border size inside horizontal.
      *
      * @param int $value
+     *
      * @return self
      */
     public function setBorderInsideHSize($value = null)
@@ -344,7 +338,7 @@ public function setBorderInsideHSize($value = null)
     }
 
     /**
-     * Get border color inside horizontal
+     * Get border color inside horizontal.
      *
      * @return string
      */
@@ -354,9 +348,10 @@ public function getBorderInsideHColor()
     }
 
     /**
-     * Set border color inside horizontal
+     * Set border color inside horizontal.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setBorderInsideHColor($value = null)
@@ -365,7 +360,7 @@ public function setBorderInsideHColor($value = null)
     }
 
     /**
-     * Get border size inside vertical
+     * Get border size inside vertical.
      *
      * @return int
      */
@@ -375,9 +370,10 @@ public function getBorderInsideVSize()
     }
 
     /**
-     * Set border size inside vertical
+     * Set border size inside vertical.
      *
      * @param int $value
+     *
      * @return self
      */
     public function setBorderInsideVSize($value = null)
@@ -386,7 +382,7 @@ public function setBorderInsideVSize($value = null)
     }
 
     /**
-     * Get border color inside vertical
+     * Get border color inside vertical.
      *
      * @return string
      */
@@ -396,9 +392,10 @@ public function getBorderInsideVColor()
     }
 
     /**
-     * Set border color inside vertical
+     * Set border color inside vertical.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setBorderInsideVColor($value = null)
@@ -407,7 +404,7 @@ public function setBorderInsideVColor($value = null)
     }
 
     /**
-     * Get cell margin top
+     * Get cell margin top.
      *
      * @return int
      */
@@ -417,9 +414,10 @@ public function getCellMarginTop()
     }
 
     /**
-     * Set cell margin top
+     * Set cell margin top.
      *
      * @param int $value
+     *
      * @return self
      */
     public function setCellMarginTop($value = null)
@@ -428,7 +426,7 @@ public function setCellMarginTop($value = null)
     }
 
     /**
-     * Get cell margin left
+     * Get cell margin left.
      *
      * @return int
      */
@@ -438,9 +436,10 @@ public function getCellMarginLeft()
     }
 
     /**
-     * Set cell margin left
+     * Set cell margin left.
      *
      * @param int $value
+     *
      * @return self
      */
     public function setCellMarginLeft($value = null)
@@ -449,7 +448,7 @@ public function setCellMarginLeft($value = null)
     }
 
     /**
-     * Get cell margin right
+     * Get cell margin right.
      *
      * @return int
      */
@@ -459,9 +458,10 @@ public function getCellMarginRight()
     }
 
     /**
-     * Set cell margin right
+     * Set cell margin right.
      *
      * @param int $value
+     *
      * @return self
      */
     public function setCellMarginRight($value = null)
@@ -470,7 +470,7 @@ public function setCellMarginRight($value = null)
     }
 
     /**
-     * Get cell margin bottom
+     * Get cell margin bottom.
      *
      * @return int
      */
@@ -480,9 +480,10 @@ public function getCellMarginBottom()
     }
 
     /**
-     * Set cell margin bottom
+     * Set cell margin bottom.
      *
      * @param int $value
+     *
      * @return self
      */
     public function setCellMarginBottom($value = null)
@@ -491,24 +492,25 @@ public function setCellMarginBottom($value = null)
     }
 
     /**
-     * Get cell margin
+     * Get cell margin.
      *
      * @return int[]
      */
     public function getCellMargin()
     {
-        return array(
+        return [
             $this->cellMarginTop,
             $this->cellMarginLeft,
             $this->cellMarginRight,
             $this->cellMarginBottom,
-        );
+        ];
     }
 
     /**
-     * Set TLRB cell margin
+     * Set TLRB cell margin.
      *
      * @param int $value Margin in twips
+     *
      * @return self
      */
     public function setCellMargin($value = null)
@@ -522,7 +524,7 @@ public function setCellMargin($value = null)
     }
 
     /**
-     * Check if any of the margin is not null
+     * Check if any of the margin is not null.
      *
      * @return bool
      */
@@ -534,7 +536,7 @@ public function hasMargin()
     }
 
     /**
-     * Get shading
+     * Get shading.
      *
      * @return \PhpOffice\PhpWord\Style\Shading
      */
@@ -544,9 +546,10 @@ public function getShading()
     }
 
     /**
-     * Set shading
+     * Set shading.
      *
      * @param mixed $value
+     *
      * @return self
      */
     public function setShading($value = null)
@@ -583,35 +586,9 @@ public function setAlignment($value)
     }
 
     /**
-     * @deprecated 0.13.0 Use the `getAlignment` method instead.
-     *
-     * @return string
+     * Get width.
      *
-     * @codeCoverageIgnore
-     */
-    public function getAlign()
-    {
-        return $this->getAlignment();
-    }
-
-    /**
-     * @deprecated 0.13.0 Use the `setAlignment` method instead.
-     *
-     * @param string $value
-     *
-     * @return self
-     *
-     * @codeCoverageIgnore
-     */
-    public function setAlign($value = null)
-    {
-        return $this->setAlignment($value);
-    }
-
-    /**
-     * Get width
-     *
-     * @return int|float
+     * @return float|int
      */
     public function getWidth()
     {
@@ -619,9 +596,10 @@ public function getWidth()
     }
 
     /**
-     * Set width
+     * Set width.
+     *
+     * @param float|int $value
      *
-     * @param int|float $value
      * @return self
      */
     public function setWidth($value = null)
@@ -632,7 +610,7 @@ public function setWidth($value = null)
     }
 
     /**
-     * Get width unit
+     * Get width unit.
      *
      * @return string
      */
@@ -642,9 +620,10 @@ public function getUnit()
     }
 
     /**
-     * Set width unit
+     * Set width unit.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setUnit($value = null)
@@ -656,7 +635,7 @@ public function setUnit($value = null)
     }
 
     /**
-     * Get layout
+     * Get layout.
      *
      * @return string
      */
@@ -666,27 +645,29 @@ public function getLayout()
     }
 
     /**
-     * Set layout
+     * Set layout.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setLayout($value = null)
     {
-        $enum = array(self::LAYOUT_AUTO, self::LAYOUT_FIXED);
+        $enum = [self::LAYOUT_AUTO, self::LAYOUT_FIXED];
         $this->layout = $this->setEnumVal($value, $enum, $this->layout);
 
         return $this;
     }
 
     /**
-     * Get table style only property by checking if it's a firstRow
+     * Get table style only property by checking if it's a firstRow.
      *
      * This is necessary since firstRow style is cloned from table style but
      * without certain properties activated, e.g. margins
      *
      * @param string $property
-     * @return int|string|null
+     *
+     * @return null|int|string
      */
     private function getTableOnlyProperty($property)
     {
@@ -698,7 +679,7 @@ private function getTableOnlyProperty($property)
     }
 
     /**
-     * Set table style only property by checking if it's a firstRow
+     * Set table style only property by checking if it's a firstRow.
      *
      * This is necessary since firstRow style is cloned from table style but
      * without certain properties activated, e.g. margins
@@ -706,6 +687,7 @@ private function getTableOnlyProperty($property)
      * @param string $property
      * @param int|string $value
      * @param bool $isNumeric
+     *
      * @return self
      */
     private function setTableOnlyProperty($property, $value, $isNumeric = true)
@@ -722,9 +704,9 @@ private function setTableOnlyProperty($property, $value, $isNumeric = true)
     }
 
     /**
-     * Get position
+     * Get position.
      *
-     * @return \PhpOffice\PhpWord\Style\TablePosition
+     * @return ?\PhpOffice\PhpWord\Style\TablePosition
      */
     public function getPosition()
     {
@@ -732,9 +714,10 @@ public function getPosition()
     }
 
     /**
-     * Set position
+     * Set position.
      *
      * @param mixed $value
+     *
      * @return self
      */
     public function setPosition($value = null)
@@ -745,7 +728,7 @@ public function setPosition($value = null)
     }
 
     /**
-     * @return TblWidthComplexType
+     * @return ?TblWidthComplexType
      */
     public function getIndent()
     {
@@ -753,8 +736,8 @@ public function getIndent()
     }
 
     /**
-     * @param TblWidthComplexType $indent
      * @return self
+     *
      * @see http://www.datypic.com/sc/ooxml/e-w_tblInd-1.html
      */
     public function setIndent(TblWidthComplexType $indent)
@@ -765,7 +748,7 @@ public function setIndent(TblWidthComplexType $indent)
     }
 
     /**
-     * Get the columnWidths
+     * Get the columnWidths.
      *
      * @return null|int[]
      */
@@ -775,30 +758,31 @@ public function getColumnWidths()
     }
 
     /**
-     * The column widths
+     * The column widths.
      *
      * @param int[] $value
      */
-    public function setColumnWidths(array $value = null)
+    public function setColumnWidths(?array $value = null): void
     {
         $this->columnWidths = $value;
     }
 
     /**
-     * Get bidiVisual
+     * Get bidiVisual.
      *
-     * @return bool
+     * @return ?bool
      */
     public function isBidiVisual()
     {
-        return $this->bidiVisual;
+        return $this->bidiVisual ?? Settings::isDefaultRtl();
     }
 
     /**
-     * Set bidiVisual
+     * Set bidiVisual.
      *
-     * @param bool $bidi
+     * @param ?bool $bidi
      *            Set to true to visually present table as Right to Left
+     *
      * @return self
      */
     public function setBidiVisual($bidi)
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Style/TablePosition.php b/vendor/phpoffice/phpword/src/PhpWord/Style/TablePosition.php
index d4b7083102..a61926b83c 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Style/TablePosition.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Style/TablePosition.php
@@ -11,23 +11,24 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Style;
 
 /**
- * TablePosition style
+ * TablePosition style.
  *
  * @see http://www.datypic.com/sc/ooxml/e-w_tblpPr-1.html
  */
 class TablePosition extends AbstractStyle
 {
     /**
-     * Vertical anchor constants
+     * Vertical anchor constants.
      *
      * @const string
+     *
      * @see http://www.datypic.com/sc/ooxml/t-w_ST_VAnchor.html
      */
     const VANCHOR_TEXT = 'text'; // Relative to vertical text extents
@@ -35,9 +36,10 @@ class TablePosition extends AbstractStyle
     const VANCHOR_PAGE = 'page'; // Relative to page
 
     /**
-     * Horizontal anchor constants
+     * Horizontal anchor constants.
      *
      * @const string
+     *
      * @see http://www.datypic.com/sc/ooxml/t-w_ST_HAnchor.html
      */
     const HANCHOR_TEXT = 'text'; // Relative to text extents
@@ -45,9 +47,10 @@ class TablePosition extends AbstractStyle
     const HANCHOR_PAGE = 'page'; // Relative to page
 
     /**
-     * Horizontal alignment constants
+     * Horizontal alignment constants.
      *
      * @const string
+     *
      * @see http://www.datypic.com/sc/ooxml/t-w_ST_XAlign.html
      */
     const XALIGN_LEFT = 'left'; // Left aligned horizontally
@@ -57,9 +60,10 @@ class TablePosition extends AbstractStyle
     const XALIGN_OUTSIDE = 'outside'; // Outside
 
     /**
-     * Vertical alignment constants
+     * Vertical alignment constants.
      *
      * @const string
+     *
      * @see http://www.datypic.com/sc/ooxml/t-w_ST_YAlign.html
      */
     const YALIGN_INLINE = 'inline'; // In line with text
@@ -70,91 +74,95 @@ class TablePosition extends AbstractStyle
     const YALIGN_OUTSIDE = 'outside'; // Centered vertically
 
     /**
-     * Distance from left of table to text
+     * Distance from left of table to text.
      *
      * @var int
      */
     private $leftFromText;
 
     /**
-     * Distance from right of table to text
+     * Distance from right of table to text.
      *
      * @var int
      */
     private $rightFromText;
 
     /**
-     * Distance from top of table to text
+     * Distance from top of table to text.
      *
      * @var int
      */
     private $topFromText;
 
     /**
-     * Distance from bottom of table to text
+     * Distance from bottom of table to text.
      *
      * @var int
      */
     private $bottomFromText;
 
     /**
-     * Table vertical anchor
+     * Table vertical anchor.
      *
      * @var string
+     *
      * @see http://www.datypic.com/sc/ooxml/t-w_ST_VAnchor.html
      */
     private $vertAnchor;
 
     /**
-     * Table horizontal anchor
+     * Table horizontal anchor.
      *
      * @var string
+     *
      * @see http://www.datypic.com/sc/ooxml/t-w_ST_HAnchor.html
      */
     private $horzAnchor;
 
     /**
-     * Relative horizontal alignment from anchor
+     * Relative horizontal alignment from anchor.
      *
      * @var string
+     *
      * @see http://www.datypic.com/sc/ooxml/t-w_ST_XAlign.html
      */
     private $tblpXSpec;
 
     /**
-     * Absolute horizontal distance from anchor
+     * Absolute horizontal distance from anchor.
      *
      * @var int
      */
     private $tblpX;
 
     /**
-     * Relative vertical alignment from anchor
+     * Relative vertical alignment from anchor.
      *
      * @var string
+     *
      * @see http://www.datypic.com/sc/ooxml/t-w_ST_YAlign.html
      */
     private $tblpYSpec;
 
     /**
-     * Absolute vertical distance from anchor
+     * Absolute vertical distance from anchor.
      *
      * @var int
      */
     private $tblpY;
 
     /**
-     * Create a new instance
+     * Create a new instance.
      *
      * @param array $style
      */
-    public function __construct($style = array())
+    public function __construct($style = [])
     {
         $this->setStyleByArray($style);
     }
 
     /**
-     * Get distance from left of table to text
+     * Get distance from left of table to text.
      *
      * @return int
      */
@@ -164,9 +172,10 @@ public function getLeftFromText()
     }
 
     /**
-     * Set distance from left of table to text
+     * Set distance from left of table to text.
      *
      * @param int $value
+     *
      * @return self
      */
     public function setLeftFromText($value = null)
@@ -177,7 +186,7 @@ public function setLeftFromText($value = null)
     }
 
     /**
-     * Get distance from right of table to text
+     * Get distance from right of table to text.
      *
      * @return int
      */
@@ -187,9 +196,10 @@ public function getRightFromText()
     }
 
     /**
-     * Set distance from right of table to text
+     * Set distance from right of table to text.
      *
      * @param int $value
+     *
      * @return self
      */
     public function setRightFromText($value = null)
@@ -200,7 +210,7 @@ public function setRightFromText($value = null)
     }
 
     /**
-     * Get distance from top of table to text
+     * Get distance from top of table to text.
      *
      * @return int
      */
@@ -210,9 +220,10 @@ public function getTopFromText()
     }
 
     /**
-     * Set distance from top of table to text
+     * Set distance from top of table to text.
      *
      * @param int $value
+     *
      * @return self
      */
     public function setTopFromText($value = null)
@@ -223,7 +234,7 @@ public function setTopFromText($value = null)
     }
 
     /**
-     * Get distance from bottom of table to text
+     * Get distance from bottom of table to text.
      *
      * @return int
      */
@@ -233,9 +244,10 @@ public function getBottomFromText()
     }
 
     /**
-     * Set distance from bottom of table to text
+     * Set distance from bottom of table to text.
      *
      * @param int $value
+     *
      * @return self
      */
     public function setBottomFromText($value = null)
@@ -246,7 +258,7 @@ public function setBottomFromText($value = null)
     }
 
     /**
-     * Get table vertical anchor
+     * Get table vertical anchor.
      *
      * @return string
      */
@@ -256,25 +268,26 @@ public function getVertAnchor()
     }
 
     /**
-     * Set table vertical anchor
+     * Set table vertical anchor.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setVertAnchor($value = null)
     {
-        $enum = array(
-          self::VANCHOR_TEXT,
-          self::VANCHOR_MARGIN,
-          self::VANCHOR_PAGE,
-        );
+        $enum = [
+            self::VANCHOR_TEXT,
+            self::VANCHOR_MARGIN,
+            self::VANCHOR_PAGE,
+        ];
         $this->vertAnchor = $this->setEnumVal($value, $enum, $this->vertAnchor);
 
         return $this;
     }
 
     /**
-     * Get table horizontal anchor
+     * Get table horizontal anchor.
      *
      * @return string
      */
@@ -284,25 +297,26 @@ public function getHorzAnchor()
     }
 
     /**
-     * Set table horizontal anchor
+     * Set table horizontal anchor.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setHorzAnchor($value = null)
     {
-        $enum = array(
-          self::HANCHOR_TEXT,
-          self::HANCHOR_MARGIN,
-          self::HANCHOR_PAGE,
-        );
+        $enum = [
+            self::HANCHOR_TEXT,
+            self::HANCHOR_MARGIN,
+            self::HANCHOR_PAGE,
+        ];
         $this->horzAnchor = $this->setEnumVal($value, $enum, $this->horzAnchor);
 
         return $this;
     }
 
     /**
-     * Get relative horizontal alignment from anchor
+     * Get relative horizontal alignment from anchor.
      *
      * @return string
      */
@@ -312,27 +326,28 @@ public function getTblpXSpec()
     }
 
     /**
-     * Set relative horizontal alignment from anchor
+     * Set relative horizontal alignment from anchor.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setTblpXSpec($value = null)
     {
-        $enum = array(
+        $enum = [
             self::XALIGN_LEFT,
             self::XALIGN_CENTER,
             self::XALIGN_RIGHT,
             self::XALIGN_INSIDE,
             self::XALIGN_OUTSIDE,
-        );
+        ];
         $this->tblpXSpec = $this->setEnumVal($value, $enum, $this->tblpXSpec);
 
         return $this;
     }
 
     /**
-     * Get absolute horizontal distance from anchor
+     * Get absolute horizontal distance from anchor.
      *
      * @return int
      */
@@ -342,9 +357,10 @@ public function getTblpX()
     }
 
     /**
-     * Set absolute horizontal distance from anchor
+     * Set absolute horizontal distance from anchor.
      *
      * @param int $value
+     *
      * @return self
      */
     public function setTblpX($value = null)
@@ -355,7 +371,7 @@ public function setTblpX($value = null)
     }
 
     /**
-     * Get relative vertical alignment from anchor
+     * Get relative vertical alignment from anchor.
      *
      * @return string
      */
@@ -365,28 +381,29 @@ public function getTblpYSpec()
     }
 
     /**
-     * Set relative vertical alignment from anchor
+     * Set relative vertical alignment from anchor.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setTblpYSpec($value = null)
     {
-        $enum = array(
+        $enum = [
             self::YALIGN_INLINE,
             self::YALIGN_TOP,
             self::YALIGN_CENTER,
             self::YALIGN_BOTTOM,
             self::YALIGN_INSIDE,
             self::YALIGN_OUTSIDE,
-        );
+        ];
         $this->tblpYSpec = $this->setEnumVal($value, $enum, $this->tblpYSpec);
 
         return $this;
     }
 
     /**
-     * Get absolute vertical distance from anchor
+     * Get absolute vertical distance from anchor.
      *
      * @return int
      */
@@ -396,9 +413,10 @@ public function getTblpY()
     }
 
     /**
-     * Set absolute vertical distance from anchor
+     * Set absolute vertical distance from anchor.
      *
      * @param int $value
+     *
      * @return self
      */
     public function setTblpY($value = null)
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Style/TextBox.php b/vendor/phpoffice/phpword/src/PhpWord/Style/TextBox.php
index e9c0f0c064..341d93068f 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Style/TextBox.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Style/TextBox.php
@@ -2,146 +2,151 @@
 /**
  * This file is part of PHPWord - A pure PHP library for reading and writing
  * word processing documents.
- *
  * PHPWord is free software distributed under the terms of the GNU Lesser
  * General Public License version 3 as published by the Free Software Foundation.
- *
  * For the full copyright and license information, please read the LICENSE
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Style;
 
 /**
- * TextBox style
+ * TextBox style.
  *
  * @since 0.11.0
  */
 class TextBox extends Image
 {
     /**
-     * margin top
+     * margin top.
      *
-     * @var int
+     * @var null|int
      */
-    private $innerMarginTop = null;
+    private $innerMarginTop;
 
     /**
-     * margin left
+     * margin left.
      *
-     * @var int
+     * @var null|int
      */
-    private $innerMarginLeft = null;
+    private $innerMarginLeft;
 
     /**
-     * margin right
+     * margin right.
      *
-     * @var int
+     * @var null|int
      */
-    private $innerMarginRight = null;
+    private $innerMarginRight;
 
     /**
-     * Cell margin bottom
+     * Cell margin bottom.
      *
-     * @var int
+     * @var null|int
      */
-    private $innerMarginBottom = null;
+    private $innerMarginBottom;
 
     /**
-     * border size
+     * border size.
      *
-     * @var int
+     * @var null|int
      */
-    private $borderSize = null;
+    private $borderSize;
 
     /**
-     * border color
+     * border color.
      *
-     * @var string
+     * @var null|string
      */
     private $borderColor;
 
     /**
-     * Set margin top.
+     * background color.
      *
-     * @param int $value
+     * @var null|string
      */
-    public function setInnerMarginTop($value = null)
+    private $bgColor;
+
+    /**
+     * Set background color.
+     */
+    public function setBgColor(?string $value = null): void
+    {
+        $this->bgColor = $value;
+    }
+
+    /**
+     * Get background color.
+     */
+    public function getBgColor(): ?string
+    {
+        return $this->bgColor;
+    }
+
+    /**
+     * Set margin top.
+     */
+    public function setInnerMarginTop(?int $value = null): void
     {
         $this->innerMarginTop = $value;
     }
 
     /**
-     * Get margin top
-     *
-     * @return int
+     * Get margin top.
      */
-    public function getInnerMarginTop()
+    public function getInnerMarginTop(): ?int
     {
         return $this->innerMarginTop;
     }
 
     /**
      * Set margin left.
-     *
-     * @param int $value
      */
-    public function setInnerMarginLeft($value = null)
+    public function setInnerMarginLeft(?int $value = null): void
     {
         $this->innerMarginLeft = $value;
     }
 
     /**
-     * Get margin left
-     *
-     * @return int
+     * Get margin left.
      */
-    public function getInnerMarginLeft()
+    public function getInnerMarginLeft(): ?int
     {
         return $this->innerMarginLeft;
     }
 
     /**
      * Set margin right.
-     *
-     * @param int $value
      */
-    public function setInnerMarginRight($value = null)
+    public function setInnerMarginRight(?int $value = null): void
     {
         $this->innerMarginRight = $value;
     }
 
     /**
-     * Get margin right
-     *
-     * @return int
+     * Get margin right.
      */
-    public function getInnerMarginRight()
+    public function getInnerMarginRight(): ?int
     {
         return $this->innerMarginRight;
     }
 
     /**
      * Set margin bottom.
-     *
-     * @param int $value
      */
-    public function setInnerMarginBottom($value = null)
+    public function setInnerMarginBottom(?int $value = null): void
     {
         $this->innerMarginBottom = $value;
     }
 
     /**
-     * Get margin bottom
-     *
-     * @return int
+     * Get margin bottom.
      */
-    public function getInnerMarginBottom()
+    public function getInnerMarginBottom(): ?int
     {
         return $this->innerMarginBottom;
     }
@@ -149,9 +154,9 @@ public function getInnerMarginBottom()
     /**
      * Set TLRB cell margin.
      *
-     * @param int $value Margin in twips
+     * @param null|int $value Margin in twips
      */
-    public function setInnerMargin($value = null)
+    public function setInnerMargin(?int $value = null): void
     {
         $this->setInnerMarginTop($value);
         $this->setInnerMarginLeft($value);
@@ -160,26 +165,24 @@ public function setInnerMargin($value = null)
     }
 
     /**
-     * Get cell margin
+     * Get cell margin.
      *
      * @return int[]
      */
-    public function getInnerMargin()
+    public function getInnerMargin(): array
     {
-        return array($this->innerMarginLeft, $this->innerMarginTop, $this->innerMarginRight, $this->innerMarginBottom);
+        return [$this->innerMarginLeft, $this->innerMarginTop, $this->innerMarginRight, $this->innerMarginBottom];
     }
 
     /**
      * Has inner margin?
-     *
-     * @return bool
      */
-    public function hasInnerMargins()
+    public function hasInnerMargins(): bool
     {
         $hasInnerMargins = false;
         $margins = $this->getInnerMargin();
         $numMargins = count($margins);
-        for ($i = 0; $i < $numMargins; $i++) {
+        for ($i = 0; $i < $numMargins; ++$i) {
             if ($margins[$i] !== null) {
                 $hasInnerMargins = true;
             }
@@ -191,39 +194,33 @@ public function hasInnerMargins()
     /**
      * Set border size.
      *
-     * @param int $value Size in points
+     * @param null|int $value Size in points
      */
-    public function setBorderSize($value = null)
+    public function setBorderSize(?int $value = null): void
     {
         $this->borderSize = $value;
     }
 
     /**
-     * Get border size
-     *
-     * @return int
+     * Get border size.
      */
-    public function getBorderSize()
+    public function getBorderSize(): ?int
     {
         return $this->borderSize;
     }
 
     /**
      * Set border color.
-     *
-     * @param string $value
      */
-    public function setBorderColor($value = null)
+    public function setBorderColor(?string $value = null): void
     {
         $this->borderColor = $value;
     }
 
     /**
-     * Get border color
-     *
-     * @return string
+     * Get border color.
      */
-    public function getBorderColor()
+    public function getBorderColor(): ?string
     {
         return $this->borderColor;
     }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/TemplateProcessor.php b/vendor/phpoffice/phpword/src/PhpWord/TemplateProcessor.php
index 3f7770d3d7..f6fe1d8887 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/TemplateProcessor.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/TemplateProcessor.php
@@ -12,12 +12,13 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord;
 
+use DOMDocument;
 use PhpOffice\PhpWord\Escaper\RegExp;
 use PhpOffice\PhpWord\Escaper\Xml;
 use PhpOffice\PhpWord\Exception\CopyFileException;
@@ -26,6 +27,8 @@
 use PhpOffice\PhpWord\Shared\Text;
 use PhpOffice\PhpWord\Shared\XMLWriter;
 use PhpOffice\PhpWord\Shared\ZipArchive;
+use Throwable;
+use XSLTProcessor;
 
 class TemplateProcessor
 {
@@ -44,39 +47,39 @@ class TemplateProcessor
     protected $tempDocumentFilename;
 
     /**
-     * Content of main document part (in XML format) of the temporary document
+     * Content of main document part (in XML format) of the temporary document.
      *
      * @var string
      */
     protected $tempDocumentMainPart;
 
     /**
-     * Content of settings part (in XML format) of the temporary document
+     * Content of settings part (in XML format) of the temporary document.
      *
      * @var string
      */
     protected $tempDocumentSettingsPart;
 
     /**
-     * Content of headers (in XML format) of the temporary document
+     * Content of headers (in XML format) of the temporary document.
      *
      * @var string[]
      */
-    protected $tempDocumentHeaders = array();
+    protected $tempDocumentHeaders = [];
 
     /**
-     * Content of footers (in XML format) of the temporary document
+     * Content of footers (in XML format) of the temporary document.
      *
      * @var string[]
      */
-    protected $tempDocumentFooters = array();
+    protected $tempDocumentFooters = [];
 
     /**
      * Document relations (in XML format) of the temporary document.
      *
      * @var string[]
      */
-    protected $tempDocumentRelations = array();
+    protected $tempDocumentRelations = [];
 
     /**
      * Document content types (in XML format) of the temporary document.
@@ -86,19 +89,20 @@ class TemplateProcessor
     protected $tempDocumentContentTypes = '';
 
     /**
-     * new inserted images list
+     * new inserted images list.
      *
      * @var string[]
      */
-    protected $tempDocumentNewImages = array();
+    protected $tempDocumentNewImages = [];
+
+    protected static $macroOpeningChars = '${';
+
+    protected static $macroClosingChars = '}';
 
     /**
      * @since 0.12.0 Throws CreateTemporaryFileException and CopyFileException instead of Exception
      *
      * @param string $documentTemplate The fully qualified template filename
-     *
-     * @throws \PhpOffice\PhpWord\Exception\CreateTemporaryFileException
-     * @throws \PhpOffice\PhpWord\Exception\CopyFileException
      */
     public function __construct($documentTemplate)
     {
@@ -119,12 +123,12 @@ public function __construct($documentTemplate)
         $index = 1;
         while (false !== $this->zipClass->locateName($this->getHeaderName($index))) {
             $this->tempDocumentHeaders[$index] = $this->readPartWithRels($this->getHeaderName($index));
-            $index++;
+            ++$index;
         }
         $index = 1;
         while (false !== $this->zipClass->locateName($this->getFooterName($index))) {
             $this->tempDocumentFooters[$index] = $this->readPartWithRels($this->getFooterName($index));
-            $index++;
+            ++$index;
         }
 
         $this->tempDocumentMainPart = $this->readPartWithRels($this->getMainPartName());
@@ -132,8 +136,20 @@ public function __construct($documentTemplate)
         $this->tempDocumentContentTypes = $this->zipClass->getFromName($this->getDocumentContentTypesName());
     }
 
+    public function __destruct()
+    {
+        // ZipClass
+        if ($this->zipClass) {
+            try {
+                $this->zipClass->close();
+            } catch (Throwable $e) {
+                // Nothing to do here.
+            }
+        }
+    }
+
     /**
-     * Expose zip class
+     * Expose zip class.
      *
      * To replace an image: $templateProcessor->zip()->AddFromString("word/media/image1.jpg", file_get_contents($file));<br>
      * To read a file: $templateProcessor->zip()->getFromName("word/media/image1.jpg");
@@ -163,9 +179,7 @@ protected function readPartWithRels($fileName)
 
     /**
      * @param string $xml
-     * @param \XSLTProcessor $xsltProcessor
-     *
-     * @throws \PhpOffice\PhpWord\Exception\Exception
+     * @param XSLTProcessor $xsltProcessor
      *
      * @return string
      */
@@ -174,7 +188,7 @@ protected function transformSingleXml($xml, $xsltProcessor)
         if (\PHP_VERSION_ID < 80000) {
             $orignalLibEntityLoader = libxml_disable_entity_loader(true);
         }
-        $domDocument = new \DOMDocument();
+        $domDocument = new DOMDocument();
         if (false === $domDocument->loadXML($xml)) {
             throw new Exception('Could not load the given XML document.');
         }
@@ -192,7 +206,7 @@ protected function transformSingleXml($xml, $xsltProcessor)
 
     /**
      * @param mixed $xml
-     * @param \XSLTProcessor $xsltProcessor
+     * @param XSLTProcessor $xsltProcessor
      *
      * @return mixed
      */
@@ -216,15 +230,13 @@ protected function transformXml($xml, $xsltProcessor)
      * Note: since the method doesn't make any guess on logic of the provided XSL style sheet,
      * make sure that output is correctly escaped. Otherwise you may get broken document.
      *
-     * @param \DOMDocument $xslDomDocument
+     * @param DOMDocument $xslDomDocument
      * @param array $xslOptions
      * @param string $xslOptionsUri
-     *
-     * @throws \PhpOffice\PhpWord\Exception\Exception
      */
-    public function applyXslStyleSheet($xslDomDocument, $xslOptions = array(), $xslOptionsUri = '')
+    public function applyXslStyleSheet($xslDomDocument, $xslOptions = [], $xslOptionsUri = ''): void
     {
-        $xsltProcessor = new \XSLTProcessor();
+        $xsltProcessor = new XSLTProcessor();
 
         $xsltProcessor->importStylesheet($xslDomDocument);
         if (false === $xsltProcessor->setParameter($xslOptionsUri, $xslOptions)) {
@@ -243,32 +255,27 @@ public function applyXslStyleSheet($xslDomDocument, $xslOptions = array(), $xslO
      */
     protected static function ensureMacroCompleted($macro)
     {
-        if (substr($macro, 0, 2) !== '${' && substr($macro, -1) !== '}') {
-            $macro = '${' . $macro . '}';
+        if (substr($macro, 0, 2) !== self::$macroOpeningChars && substr($macro, -1) !== self::$macroClosingChars) {
+            $macro = self::$macroOpeningChars . $macro . self::$macroClosingChars;
         }
 
         return $macro;
     }
 
     /**
-     * @param string $subject
+     * @param ?string $subject
      *
      * @return string
      */
     protected static function ensureUtf8Encoded($subject)
     {
-        if (!Text::isUTF8($subject)) {
-            $subject = utf8_encode($subject);
-        }
-
-        return $subject;
+        return $subject ? Text::toUTF8($subject) : '';
     }
 
     /**
      * @param string $search
-     * @param \PhpOffice\PhpWord\Element\AbstractElement $complexType
      */
-    public function setComplexValue($search, \PhpOffice\PhpWord\Element\AbstractElement $complexType)
+    public function setComplexValue($search, Element\AbstractElement $complexType): void
     {
         $elementName = substr(get_class($complexType), strrpos(get_class($complexType), '\\') + 1);
         $objectClass = 'PhpOffice\\PhpWord\\Writer\\Word2007\\Element\\' . $elementName;
@@ -294,9 +301,8 @@ public function setComplexValue($search, \PhpOffice\PhpWord\Element\AbstractElem
 
     /**
      * @param string $search
-     * @param \PhpOffice\PhpWord\Element\AbstractElement $complexType
      */
-    public function setComplexBlock($search, \PhpOffice\PhpWord\Element\AbstractElement $complexType)
+    public function setComplexBlock($search, Element\AbstractElement $complexType): void
     {
         $elementName = substr(get_class($complexType), strrpos(get_class($complexType), '\\') + 1);
         $objectClass = 'PhpOffice\\PhpWord\\Writer\\Word2007\\Element\\' . $elementName;
@@ -314,7 +320,7 @@ public function setComplexBlock($search, \PhpOffice\PhpWord\Element\AbstractElem
      * @param mixed $replace
      * @param int $limit
      */
-    public function setValue($search, $replace, $limit = self::MAXIMUM_REPLACEMENTS_DEFAULT)
+    public function setValue($search, $replace, $limit = self::MAXIMUM_REPLACEMENTS_DEFAULT): void
     {
         if (is_array($search)) {
             foreach ($search as &$item) {
@@ -339,6 +345,15 @@ public function setValue($search, $replace, $limit = self::MAXIMUM_REPLACEMENTS_
             $replace = $xmlEscaper->escape($replace);
         }
 
+        // convert carriage returns
+        if (is_array($replace)) {
+            foreach ($replace as &$item) {
+                $item = $this->replaceCarriageReturns($item);
+            }
+        } else {
+            $replace = $this->replaceCarriageReturns($replace);
+        }
+
         $this->tempDocumentHeaders = $this->setValueForPart($search, $replace, $this->tempDocumentHeaders, $limit);
         $this->tempDocumentMainPart = $this->setValueForPart($search, $replace, $this->tempDocumentMainPart, $limit);
         $this->tempDocumentFooters = $this->setValueForPart($search, $replace, $this->tempDocumentFooters, $limit);
@@ -346,21 +361,39 @@ public function setValue($search, $replace, $limit = self::MAXIMUM_REPLACEMENTS_
 
     /**
      * Set values from a one-dimensional array of "variable => value"-pairs.
-     *
-     * @param array $values
      */
-    public function setValues(array $values)
+    public function setValues(array $values): void
     {
         foreach ($values as $macro => $replace) {
             $this->setValue($macro, $replace);
         }
     }
 
+    public function setCheckbox(string $search, bool $checked): void
+    {
+        $search = static::ensureMacroCompleted($search);
+        $blockType = 'w:sdt';
+
+        $where = $this->findContainingXmlBlockForMacro($search, $blockType);
+        if (!is_array($where)) {
+            return;
+        }
+
+        $block = $this->getSlice($where['start'], $where['end']);
+
+        $val = $checked ? '1' : '0';
+        $block = preg_replace('/(<w14:checked w14:val=)".*?"(\/>)/', '$1"' . $val . '"$2', $block);
+
+        $text = $checked ? '☒' : '☐';
+        $block = preg_replace('/(<w:t>).*?(<\/w:t>)/', '$1' . $text . '$2', $block);
+
+        $this->replaceXmlBlock($search, $block, $blockType);
+    }
+
     /**
      * @param string $search
-     * @param \PhpOffice\PhpWord\Element\AbstractElement $complexType
      */
-    public function setChart($search, \PhpOffice\PhpWord\Element\AbstractElement $chart)
+    public function setChart($search, Element\AbstractElement $chart): void
     {
         $elementName = substr(get_class($chart), strrpos(get_class($chart), '\\') + 1);
         $objectClass = 'PhpOffice\\PhpWord\\Writer\\Word2007\\Element\\' . $elementName;
@@ -401,29 +434,32 @@ private function getImageArgs($varNameWithArgs)
         $varElements = explode(':', $varNameWithArgs);
         array_shift($varElements); // first element is name of variable => remove it
 
-        $varInlineArgs = array();
+        $varInlineArgs = [];
         // size format documentation: https://msdn.microsoft.com/en-us/library/documentformat.openxml.vml.shape%28v=office.14%29.aspx?f=255&MSPPError=-2147217396
         foreach ($varElements as $argIdx => $varArg) {
             if (strpos($varArg, '=')) { // arg=value
-                list($argName, $argValue) = explode('=', $varArg, 2);
+                [$argName, $argValue] = explode('=', $varArg, 2);
                 $argName = strtolower($argName);
                 if ($argName == 'size') {
-                    list($varInlineArgs['width'], $varInlineArgs['height']) = explode('x', $argValue, 2);
+                    [$varInlineArgs['width'], $varInlineArgs['height']] = explode('x', $argValue, 2);
                 } else {
                     $varInlineArgs[strtolower($argName)] = $argValue;
                 }
             } elseif (preg_match('/^([0-9]*[a-z%]{0,2}|auto)x([0-9]*[a-z%]{0,2}|auto)$/i', $varArg)) { // 60x40
-                list($varInlineArgs['width'], $varInlineArgs['height']) = explode('x', $varArg, 2);
+                [$varInlineArgs['width'], $varInlineArgs['height']] = explode('x', $varArg, 2);
             } else { // :60:40:f
                 switch ($argIdx) {
                     case 0:
                         $varInlineArgs['width'] = $varArg;
+
                         break;
                     case 1:
                         $varInlineArgs['height'] = $varArg;
+
                         break;
                     case 2:
                         $varInlineArgs['ratio'] = $varArg;
+
                         break;
                 }
             }
@@ -435,13 +471,13 @@ private function getImageArgs($varNameWithArgs)
     private function chooseImageDimension($baseValue, $inlineValue, $defaultValue)
     {
         $value = $baseValue;
-        if (is_null($value) && isset($inlineValue)) {
+        if (null === $value && isset($inlineValue)) {
             $value = $inlineValue;
         }
-        if (!preg_match('/^([0-9]*(cm|mm|in|pt|pc|px|%|em|ex|)|auto)$/i', $value)) {
+        if (!preg_match('/^([0-9\.]*(cm|mm|in|pt|pc|px|%|em|ex|)|auto)$/i', $value ?? '')) {
             $value = null;
         }
-        if (is_null($value)) {
+        if (null === $value) {
             $value = $defaultValue;
         }
         if (is_numeric($value)) {
@@ -451,7 +487,7 @@ private function chooseImageDimension($baseValue, $inlineValue, $defaultValue)
         return $value;
     }
 
-    private function fixImageWidthHeightRatio(&$width, &$height, $actualWidth, $actualHeight)
+    private function fixImageWidthHeightRatio(&$width, &$height, $actualWidth, $actualHeight): void
     {
         $imageRatio = $actualWidth / $actualHeight;
 
@@ -461,20 +497,20 @@ private function fixImageWidthHeightRatio(&$width, &$height, $actualWidth, $actu
         } elseif ($width === '') { // defined width is empty
             $heightFloat = (float) $height;
             $widthFloat = $heightFloat * $imageRatio;
-            $matches = array();
-            preg_match("/\d([a-z%]+)$/", $height, $matches);
+            $matches = [];
+            preg_match('/\\d([a-z%]+)$/', $height, $matches);
             $width = $widthFloat . $matches[1];
         } elseif ($height === '') { // defined height is empty
             $widthFloat = (float) $width;
             $heightFloat = $widthFloat / $imageRatio;
-            $matches = array();
-            preg_match("/\d([a-z%]+)$/", $width, $matches);
+            $matches = [];
+            preg_match('/\\d([a-z%]+)$/', $width, $matches);
             $height = $heightFloat . $matches[1];
         } else { // we have defined size, but we need also check it aspect ratio
-            $widthMatches = array();
-            preg_match("/\d([a-z%]+)$/", $width, $widthMatches);
-            $heightMatches = array();
-            preg_match("/\d([a-z%]+)$/", $height, $heightMatches);
+            $widthMatches = [];
+            preg_match('/\\d([a-z%]+)$/', $width, $widthMatches);
+            $heightMatches = [];
+            preg_match('/\\d([a-z%]+)$/', $height, $heightMatches);
             // try to fix only if dimensions are same
             if ($widthMatches[1] == $heightMatches[1]) {
                 $dimention = $widthMatches[1];
@@ -519,46 +555,46 @@ private function prepareImageAttrs($replaceImage, $varInlineArgs)
             $imgPath = $replaceImage;
         }
 
-        $width = $this->chooseImageDimension($width, isset($varInlineArgs['width']) ? $varInlineArgs['width'] : null, 115);
-        $height = $this->chooseImageDimension($height, isset($varInlineArgs['height']) ? $varInlineArgs['height'] : null, 70);
+        $width = $this->chooseImageDimension($width, $varInlineArgs['width'] ?? null, 115);
+        $height = $this->chooseImageDimension($height, $varInlineArgs['height'] ?? null, 70);
 
         $imageData = @getimagesize($imgPath);
         if (!is_array($imageData)) {
             throw new Exception(sprintf('Invalid image: %s', $imgPath));
         }
-        list($actualWidth, $actualHeight, $imageType) = $imageData;
+        [$actualWidth, $actualHeight, $imageType] = $imageData;
 
         // fix aspect ratio (by default)
-        if (is_null($ratio) && isset($varInlineArgs['ratio'])) {
+        if (null === $ratio && isset($varInlineArgs['ratio'])) {
             $ratio = $varInlineArgs['ratio'];
         }
-        if (is_null($ratio) || !in_array(strtolower($ratio), array('', '-', 'f', 'false'))) {
+        if (null === $ratio || !in_array(strtolower($ratio), ['', '-', 'f', 'false'])) {
             $this->fixImageWidthHeightRatio($width, $height, $actualWidth, $actualHeight);
         }
 
-        $imageAttrs = array(
-            'src'    => $imgPath,
-            'mime'   => image_type_to_mime_type($imageType),
-            'width'  => $width,
+        $imageAttrs = [
+            'src' => $imgPath,
+            'mime' => image_type_to_mime_type($imageType),
+            'width' => $width,
             'height' => $height,
-        );
+        ];
 
         return $imageAttrs;
     }
 
-    private function addImageToRelations($partFileName, $rid, $imgPath, $imageMimeType)
+    private function addImageToRelations($partFileName, $rid, $imgPath, $imageMimeType): void
     {
         // define templates
         $typeTpl = '<Override PartName="/word/media/{IMG}" ContentType="image/{EXT}"/>';
         $relationTpl = '<Relationship Id="{RID}" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image" Target="media/{IMG}"/>';
         $newRelationsTpl = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' . "\n" . '<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"></Relationships>';
         $newRelationsTypeTpl = '<Override PartName="/{RELS}" ContentType="application/vnd.openxmlformats-package.relationships+xml"/>';
-        $extTransform = array(
+        $extTransform = [
             'image/jpeg' => 'jpeg',
-            'image/png'  => 'png',
-            'image/bmp'  => 'bmp',
-            'image/gif'  => 'gif',
-        );
+            'image/png' => 'png',
+            'image/bmp' => 'bmp',
+            'image/gif' => 'gif',
+        ];
 
         // get image embed name
         if (isset($this->tempDocumentNewImages[$imgPath])) {
@@ -577,11 +613,11 @@ private function addImageToRelations($partFileName, $rid, $imgPath, $imageMimeTy
             $this->tempDocumentNewImages[$imgPath] = $imgName;
 
             // setup type for image
-            $xmlImageType = str_replace(array('{IMG}', '{EXT}'), array($imgName, $imgExt), $typeTpl);
+            $xmlImageType = str_replace(['{IMG}', '{EXT}'], [$imgName, $imgExt], $typeTpl);
             $this->tempDocumentContentTypes = str_replace('</Types>', $xmlImageType, $this->tempDocumentContentTypes) . '</Types>';
         }
 
-        $xmlImageRelation = str_replace(array('{RID}', '{IMG}'), array($rid, $imgName), $relationTpl);
+        $xmlImageRelation = str_replace(['{RID}', '{IMG}'], [$rid, $imgName], $relationTpl);
 
         if (!isset($this->tempDocumentRelations[$partFileName])) {
             // create new relations file
@@ -600,39 +636,39 @@ private function addImageToRelations($partFileName, $rid, $imgPath, $imageMimeTy
      * @param mixed $replace Path to image, or array("path" => xx, "width" => yy, "height" => zz)
      * @param int $limit
      */
-    public function setImageValue($search, $replace, $limit = self::MAXIMUM_REPLACEMENTS_DEFAULT)
+    public function setImageValue($search, $replace, $limit = self::MAXIMUM_REPLACEMENTS_DEFAULT): void
     {
         // prepare $search_replace
         if (!is_array($search)) {
-            $search = array($search);
+            $search = [$search];
         }
 
-        $replacesList = array();
+        $replacesList = [];
         if (!is_array($replace) || isset($replace['path'])) {
             $replacesList[] = $replace;
         } else {
             $replacesList = array_values($replace);
         }
 
-        $searchReplace = array();
+        $searchReplace = [];
         foreach ($search as $searchIdx => $searchString) {
-            $searchReplace[$searchString] = isset($replacesList[$searchIdx]) ? $replacesList[$searchIdx] : $replacesList[0];
+            $searchReplace[$searchString] = $replacesList[$searchIdx] ?? $replacesList[0];
         }
 
         // collect document parts
-        $searchParts = array(
+        $searchParts = [
             $this->getMainPartName() => &$this->tempDocumentMainPart,
-        );
+        ];
         foreach (array_keys($this->tempDocumentHeaders) as $headerIndex) {
             $searchParts[$this->getHeaderName($headerIndex)] = &$this->tempDocumentHeaders[$headerIndex];
         }
-        foreach (array_keys($this->tempDocumentFooters) as $headerIndex) {
-            $searchParts[$this->getFooterName($headerIndex)] = &$this->tempDocumentFooters[$headerIndex];
+        foreach (array_keys($this->tempDocumentFooters) as $footerIndex) {
+            $searchParts[$this->getFooterName($footerIndex)] = &$this->tempDocumentFooters[$footerIndex];
         }
 
         // define templates
         // result can be verified via "Open XML SDK 2.5 Productivity Tool" (http://www.microsoft.com/en-us/download/details.aspx?id=30425)
-        $imgTpl = '<w:pict><v:shape type="#_x0000_t75" style="width:{WIDTH};height:{HEIGHT}" stroked="f"><v:imagedata r:id="{RID}" o:title=""/></v:shape></w:pict>';
+        $imgTpl = '<w:pict><v:shape type="#_x0000_t75" style="width:{WIDTH};height:{HEIGHT}" stroked="f" filled="f"><v:imagedata r:id="{RID}" o:title=""/></v:shape></w:pict>';
 
         $i = 0;
         foreach ($searchParts as $partFileName => &$partContent) {
@@ -654,15 +690,15 @@ public function setImageValue($search, $replace, $limit = self::MAXIMUM_REPLACEM
 
                     // replace preparations
                     $this->addImageToRelations($partFileName, $rid, $imgPath, $preparedImageAttrs['mime']);
-                    $xmlImage = str_replace(array('{RID}', '{WIDTH}', '{HEIGHT}'), array($rid, $preparedImageAttrs['width'], $preparedImageAttrs['height']), $imgTpl);
+                    $xmlImage = str_replace(['{RID}', '{WIDTH}', '{HEIGHT}'], [$rid, $preparedImageAttrs['width'], $preparedImageAttrs['height']], $imgTpl);
 
                     // replace variable
                     $varNameWithArgsFixed = static::ensureMacroCompleted($varNameWithArgs);
-                    $matches = array();
+                    $matches = [];
                     if (preg_match('/(<[^<]+>)([^<]*)(' . preg_quote($varNameWithArgsFixed) . ')([^>]*)(<[^>]+>)/Uu', $partContent, $matches)) {
                         $wholeTag = $matches[0];
                         array_shift($matches);
-                        list($openTag, $prefix, , $postfix, $closeTag) = $matches;
+                        [$openTag, $prefix, , $postfix, $closeTag] = $matches;
                         $replaceXml = $openTag . $prefix . $closeTag . $xmlImage . $openTag . $postfix . $closeTag;
                         // replace on each iteration, because in one tag we can have 2+ inline variables => before proceed next variable we need to change $partContent
                         $partContent = $this->setValueForPart($wholeTag, $replaceXml, $partContent, $limit);
@@ -717,10 +753,8 @@ public function getVariables()
      *
      * @param string $search
      * @param int $numberOfClones
-     *
-     * @throws \PhpOffice\PhpWord\Exception\Exception
      */
-    public function cloneRow($search, $numberOfClones)
+    public function cloneRow($search, $numberOfClones): void
     {
         $search = static::ensureMacroCompleted($search);
 
@@ -760,19 +794,83 @@ public function cloneRow($search, $numberOfClones)
         }
 
         $result = $this->getSlice(0, $rowStart);
-        $result .= implode($this->indexClonedVariables($numberOfClones, $xmlRow));
+        $result .= implode('', $this->indexClonedVariables($numberOfClones, $xmlRow));
         $result .= $this->getSlice($rowEnd);
 
         $this->tempDocumentMainPart = $result;
     }
 
+    /**
+     * Delete a table row in a template document.
+     */
+    public function deleteRow(string $search): void
+    {
+        if (self::$macroOpeningChars !== substr($search, 0, 2) && self::$macroClosingChars !== substr($search, -1)) {
+            $search = self::$macroOpeningChars . $search . self::$macroClosingChars;
+        }
+
+        $tagPos = strpos($this->tempDocumentMainPart, $search);
+        if (!$tagPos) {
+            throw new Exception(sprintf('Can not delete row %s, template variable not found or variable contains markup.', $search));
+        }
+
+        $tableStart = $this->findTableStart($tagPos);
+        $tableEnd = $this->findTableEnd($tagPos);
+        $xmlTable = $this->getSlice($tableStart, $tableEnd);
+
+        if (substr_count($xmlTable, '<w:tr') === 1) {
+            $this->tempDocumentMainPart = $this->getSlice(0, $tableStart) . $this->getSlice($tableEnd);
+
+            return;
+        }
+
+        $rowStart = $this->findRowStart($tagPos);
+        $rowEnd = $this->findRowEnd($tagPos);
+        $xmlRow = $this->getSlice($rowStart, $rowEnd);
+
+        $this->tempDocumentMainPart = $this->getSlice(0, $rowStart) . $this->getSlice($rowEnd);
+
+        // Check if there's a cell spanning multiple rows.
+        if (preg_match('#<w:vMerge w:val="restart"/>#', $xmlRow)) {
+            $extraRowStart = $rowStart;
+            while (true) {
+                $extraRowStart = $this->findRowStart($extraRowStart + 1);
+                $extraRowEnd = $this->findRowEnd($extraRowStart + 1);
+
+                // If extraRowEnd is lower then 7, there was no next row found.
+                if ($extraRowEnd < 7) {
+                    break;
+                }
+
+                // If tmpXmlRow doesn't contain continue, this row is no longer part of the spanned row.
+                $tmpXmlRow = $this->getSlice($extraRowStart, $extraRowEnd);
+                if (!preg_match('#<w:vMerge/>#', $tmpXmlRow) &&
+                    !preg_match('#<w:vMerge w:val="continue" />#', $tmpXmlRow)
+                ) {
+                    break;
+                }
+
+                $tableStart = $this->findTableStart($extraRowEnd + 1);
+                $tableEnd = $this->findTableEnd($extraRowEnd + 1);
+                $xmlTable = $this->getSlice($tableStart, $tableEnd);
+                if (substr_count($xmlTable, '<w:tr') === 1) {
+                    $this->tempDocumentMainPart = $this->getSlice(0, $tableStart) . $this->getSlice($tableEnd);
+
+                    return;
+                }
+
+                $this->tempDocumentMainPart = $this->getSlice(0, $extraRowStart) . $this->getSlice($extraRowEnd);
+            }
+        }
+    }
+
     /**
      * Clones a table row and populates it's values from a two-dimensional array in a template document.
      *
      * @param string $search
      * @param array $values
      */
-    public function cloneRowAndSetValues($search, $values)
+    public function cloneRowAndSetValues($search, $values): void
     {
         $this->cloneRow($search, count($values));
 
@@ -793,14 +891,18 @@ public function cloneRowAndSetValues($search, $values)
      * @param bool $indexVariables If true, any variables inside the block will be indexed (postfixed with #1, #2, ...)
      * @param array $variableReplacements Array containing replacements for macros found inside the block to clone
      *
-     * @return string|null
+     * @return null|string
      */
     public function cloneBlock($blockname, $clones = 1, $replace = true, $indexVariables = false, $variableReplacements = null)
     {
         $xmlBlock = null;
-        $matches = array();
+        $matches = [];
+        $escapedMacroOpeningChars = self::$macroOpeningChars;
+        $escapedMacroClosingChars = self::$macroClosingChars;
         preg_match(
-            '/(.*((?s)<w:p\b(?:(?!<w:p\b).)*?\${' . $blockname . '}<\/w:.*?p>))(.*)((?s)<w:p\b(?:(?!<w:p\b).)[^$]*?\${\/' . $blockname . '}<\/w:.*?p>)/is',
+            //'/(.*((?s)<w:p\b(?:(?!<w:p\b).)*?\{{' . $blockname . '}<\/w:.*?p>))(.*)((?s)<w:p\b(?:(?!<w:p\b).)[^$]*?\{{\/' . $blockname . '}<\/w:.*?p>)/is',
+            '/(.*((?s)<w:p\b(?:(?!<w:p\b).)*?\\' . $escapedMacroOpeningChars . $blockname . $escapedMacroClosingChars . '<\/w:.*?p>))(.*)((?s)<w:p\b(?:(?!<w:p\b).)[^$]*?\\' . $escapedMacroOpeningChars . '\/' . $blockname . $escapedMacroClosingChars . '<\/w:.*?p>)/is',
+            //'/(.*((?s)<w:p\b(?:(?!<w:p\b).)*?\\'. $escapedMacroOpeningChars . $blockname . '}<\/w:.*?p>))(.*)((?s)<w:p\b(?:(?!<w:p\b).)[^$]*?\\'.$escapedMacroOpeningChars.'\/' . $blockname . '}<\/w:.*?p>)/is',
             $this->tempDocumentMainPart,
             $matches
         );
@@ -812,8 +914,8 @@ public function cloneBlock($blockname, $clones = 1, $replace = true, $indexVaria
             } elseif ($variableReplacements !== null && is_array($variableReplacements)) {
                 $cloned = $this->replaceClonedVariables($variableReplacements, $xmlBlock);
             } else {
-                $cloned = array();
-                for ($i = 1; $i <= $clones; $i++) {
+                $cloned = [];
+                for ($i = 1; $i <= $clones; ++$i) {
                     $cloned[] = $xmlBlock;
                 }
             }
@@ -836,11 +938,13 @@ public function cloneBlock($blockname, $clones = 1, $replace = true, $indexVaria
      * @param string $blockname
      * @param string $replacement
      */
-    public function replaceBlock($blockname, $replacement)
+    public function replaceBlock($blockname, $replacement): void
     {
-        $matches = array();
+        $matches = [];
+        $escapedMacroOpeningChars = preg_quote(self::$macroOpeningChars);
+        $escapedMacroClosingChars = preg_quote(self::$macroClosingChars);
         preg_match(
-            '/(<\?xml.*)(<w:p.*>\${' . $blockname . '}<\/w:.*?p>)(.*)(<w:p.*\${\/' . $blockname . '}<\/w:.*?p>)/is',
+            '/(<\?xml.*)(<w:p.*>' . $escapedMacroOpeningChars . $blockname . $escapedMacroClosingChars . '<\/w:.*?p>)(.*)(<w:p.*' . $escapedMacroOpeningChars . '\/' . $blockname . $escapedMacroClosingChars . '<\/w:.*?p>)/is',
             $this->tempDocumentMainPart,
             $matches
         );
@@ -859,20 +963,20 @@ public function replaceBlock($blockname, $replacement)
      *
      * @param string $blockname
      */
-    public function deleteBlock($blockname)
+    public function deleteBlock($blockname): void
     {
         $this->replaceBlock($blockname, '');
     }
 
     /**
-     * Automatically Recalculate Fields on Open
+     * Automatically Recalculate Fields on Open.
      *
      * @param bool $update
      */
-    public function setUpdateFields($update = true)
+    public function setUpdateFields($update = true): void
     {
         $string = $update ? 'true' : 'false';
-        $matches = array();
+        $matches = [];
         if (preg_match('/<w:updateFields w:val=\"(true|false|1|0|on|off)\"\/>/', $this->tempDocumentSettingsPart, $matches)) {
             $this->tempDocumentSettingsPart = str_replace($matches[0], '<w:updateFields w:val="' . $string . '"/>', $this->tempDocumentSettingsPart);
         } else {
@@ -883,8 +987,6 @@ public function setUpdateFields($update = true)
     /**
      * Saves the result document.
      *
-     * @throws \PhpOffice\PhpWord\Exception\Exception
-     *
      * @return string
      */
     public function save()
@@ -914,7 +1016,7 @@ public function save()
      * @param string $fileName
      * @param string $xml
      */
-    protected function savePartWithRels($fileName, $xml)
+    protected function savePartWithRels($fileName, $xml): void
     {
         $this->zipClass->addFromString($fileName, $xml);
         if (isset($this->tempDocumentRelations[$fileName])) {
@@ -930,7 +1032,7 @@ protected function savePartWithRels($fileName, $xml)
      *
      * @param string $fileName
      */
-    public function saveAs($fileName)
+    public function saveAs($fileName): void
     {
         $tempFileName = $this->save();
 
@@ -958,8 +1060,12 @@ public function saveAs($fileName)
      */
     protected function fixBrokenMacros($documentPart)
     {
+        $brokenMacroOpeningChars = substr(self::$macroOpeningChars, 0, 1);
+        $endMacroOpeningChars = substr(self::$macroOpeningChars, 1);
+        $macroClosingChars = self::$macroClosingChars;
+
         return preg_replace_callback(
-            '/\$(?:\{|[^{$]*\>\{)[^}$]*\}/U',
+            '/\\' . $brokenMacroOpeningChars . '(?:\\' . $endMacroOpeningChars . '|[^{$]*\>\{)[^' . $macroClosingChars . '$]*\}/U',
             function ($match) {
                 return strip_tags($match[0]);
             },
@@ -972,7 +1078,7 @@ function ($match) {
      *
      * @param mixed $search
      * @param mixed $replace
-     * @param string $documentPartXML
+     * @param array<int, string>|string $documentPartXML
      * @param int $limit
      *
      * @return string
@@ -997,8 +1103,11 @@ protected function setValueForPart($search, $replace, $documentPartXML, $limit)
      */
     protected function getVariablesForPart($documentPartXML)
     {
-        $matches = array();
-        preg_match_all('/\$\{(.*?)}/i', $documentPartXML, $matches);
+        $matches = [];
+        $escapedMacroOpeningChars = preg_quote(self::$macroOpeningChars);
+        $escapedMacroClosingChars = preg_quote(self::$macroClosingChars);
+
+        preg_match_all("/$escapedMacroOpeningChars(.*?)$escapedMacroClosingChars/i", $documentPartXML, $matches);
 
         return $matches[1];
     }
@@ -1026,14 +1135,14 @@ protected function getMainPartName()
 
         $pattern = '~PartName="\/(word\/document.*?\.xml)" ContentType="application\/vnd\.openxmlformats-officedocument\.wordprocessingml\.document\.main\+xml"~';
 
-        $matches = array();
+        $matches = [];
         preg_match($pattern, $contentTypes, $matches);
 
         return array_key_exists(1, $matches) ? $matches[1] : 'word/document.xml';
     }
 
     /**
-     * The name of the file containing the Settings part
+     * The name of the file containing the Settings part.
      *
      * @return string
      */
@@ -1071,7 +1180,7 @@ protected function getNextRelationsIndex($documentPartName)
         if (isset($this->tempDocumentRelations[$documentPartName])) {
             $candidate = substr_count($this->tempDocumentRelations[$documentPartName], '<Relationship');
             while (strpos($this->tempDocumentRelations[$documentPartName], 'Id="rId' . $candidate . '"') !== false) {
-                $candidate++;
+                ++$candidate;
             }
 
             return $candidate;
@@ -1088,13 +1197,44 @@ protected function getDocumentContentTypesName()
         return '[Content_Types].xml';
     }
 
+    /**
+     * Find the start position of the nearest table before $offset.
+     */
+    private function findTableStart(int $offset): int
+    {
+        $rowStart = strrpos(
+            $this->tempDocumentMainPart,
+            '<w:tbl ',
+            ((strlen($this->tempDocumentMainPart) - $offset) * -1)
+        );
+
+        if (!$rowStart) {
+            $rowStart = strrpos(
+                $this->tempDocumentMainPart,
+                '<w:tbl>',
+                ((strlen($this->tempDocumentMainPart) - $offset) * -1)
+            );
+        }
+        if (!$rowStart) {
+            throw new Exception('Can not find the start position of the table.');
+        }
+
+        return $rowStart;
+    }
+
+    /**
+     * Find the end position of the nearest table row after $offset.
+     */
+    private function findTableEnd(int $offset): int
+    {
+        return strpos($this->tempDocumentMainPart, '</w:tbl>', $offset) + 7;
+    }
+
     /**
      * Find the start position of the nearest table row before $offset.
      *
      * @param int $offset
      *
-     * @throws \PhpOffice\PhpWord\Exception\Exception
-     *
      * @return int
      */
     protected function findRowStart($offset)
@@ -1142,7 +1282,7 @@ protected function getSlice($startPosition, $endPosition = 0)
 
     /**
      * Replaces variable names in cloned
-     * rows/blocks with indexed names
+     * rows/blocks with indexed names.
      *
      * @param int $count
      * @param string $xmlBlock
@@ -1151,16 +1291,27 @@ protected function getSlice($startPosition, $endPosition = 0)
      */
     protected function indexClonedVariables($count, $xmlBlock)
     {
-        $results = array();
-        for ($i = 1; $i <= $count; $i++) {
-            $results[] = preg_replace('/\$\{([^:]*?)(:.*?)?\}/', '\${\1#' . $i . '\2}', $xmlBlock);
+        $results = [];
+        $escapedMacroOpeningChars = preg_quote(self::$macroOpeningChars);
+        $escapedMacroClosingChars = preg_quote(self::$macroClosingChars);
+
+        for ($i = 1; $i <= $count; ++$i) {
+            $results[] = preg_replace("/$escapedMacroOpeningChars([^:]*?)(:.*?)?$escapedMacroClosingChars/", self::$macroOpeningChars . '\1#' . $i . '\2' . self::$macroClosingChars, $xmlBlock);
         }
 
         return $results;
     }
 
     /**
-     * Raplaces variables with values from array, array keys are the variable names
+     * Replace carriage returns with xml.
+     */
+    public function replaceCarriageReturns(string $string): string
+    {
+        return str_replace(["\r\n", "\r", "\n"], '</w:t><w:br/><w:t>', $string);
+    }
+
+    /**
+     * Replaces variables with values from array, array keys are the variable names.
      *
      * @param array $variableReplacements
      * @param string $xmlBlock
@@ -1169,7 +1320,7 @@ protected function indexClonedVariables($count, $xmlBlock)
      */
     protected function replaceClonedVariables($variableReplacements, $xmlBlock)
     {
-        $results = array();
+        $results = [];
         foreach ($variableReplacements as $replacementArray) {
             $localXmlBlock = $xmlBlock;
             foreach ($replacementArray as $search => $replacement) {
@@ -1182,11 +1333,12 @@ protected function replaceClonedVariables($variableReplacements, $xmlBlock)
     }
 
     /**
-     * Replace an XML block surrounding a macro with a new block
+     * Replace an XML block surrounding a macro with a new block.
      *
      * @param string $macro Name of macro
      * @param string $block New block content
      * @param string $blockType XML tag type of block
+     *
      * @return \PhpOffice\PhpWord\TemplateProcessor Fluent interface
      */
     public function replaceXmlBlock($macro, $block, $blockType = 'w:p')
@@ -1201,12 +1353,13 @@ public function replaceXmlBlock($macro, $block, $blockType = 'w:p')
 
     /**
      * Find start and end of XML block containing the given macro
-     * e.g. <w:p>...${macro}...</w:p>
+     * e.g. <w:p>...${macro}...</w:p>.
      *
      * Note that only the first instance of the macro will be found
      *
      * @param string $macro Name of macro
      * @param string $blockType XML tag for block
+     *
      * @return bool|int[] FALSE if not found, otherwise array with start and end
      */
     protected function findContainingXmlBlockForMacro($macro, $blockType = 'w:p')
@@ -1225,11 +1378,11 @@ protected function findContainingXmlBlockForMacro($macro, $blockType = 'w:p')
             return false;
         }
 
-        return array('start' => $start, 'end' => $end);
+        return ['start' => $start, 'end' => $end];
     }
 
     /**
-     * Find the position of (the start of) a macro
+     * Find the position of (the start of) a macro.
      *
      * Returns -1 if not found, otherwise position of opening $
      *
@@ -1237,6 +1390,7 @@ protected function findContainingXmlBlockForMacro($macro, $blockType = 'w:p')
      *
      * @param string $search Macro name
      * @param int $offset Offset from which to start searching
+     *
      * @return int -1 if macro not found
      */
     protected function findMacro($search, $offset = 0)
@@ -1248,10 +1402,11 @@ protected function findMacro($search, $offset = 0)
     }
 
     /**
-     * Find the start position of the nearest XML block start before $offset
+     * Find the start position of the nearest XML block start before $offset.
      *
      * @param int $offset    Search position
      * @param string  $blockType XML Block tag
+     *
      * @return int -1 if block start not found
      */
     protected function findXmlBlockStart($offset, $blockType)
@@ -1269,10 +1424,11 @@ protected function findXmlBlockStart($offset, $blockType)
     }
 
     /**
-     * Find the nearest block end position after $offset
+     * Find the nearest block end position after $offset.
      *
      * @param int $offset    Search position
      * @param string  $blockType XML Block tag
+     *
      * @return int -1 if block end not found
      */
     protected function findXmlBlockEnd($offset, $blockType)
@@ -1284,9 +1440,10 @@ protected function findXmlBlockEnd($offset, $blockType)
     }
 
     /**
-     * Splits a w:r/w:t into a list of w:r where each ${macro} is in a separate w:r
+     * Splits a w:r/w:t into a list of w:r where each ${macro} is in a separate w:r.
      *
      * @param string $text
+     *
      * @return string
      */
     protected function splitTextIntoTexts($text)
@@ -1294,7 +1451,7 @@ protected function splitTextIntoTexts($text)
         if (!$this->textNeedsSplitting($text)) {
             return $text;
         }
-        $matches = array();
+        $matches = [];
         if (preg_match('/(<w:rPr.*<\/w:rPr>)/i', $text, $matches)) {
             $extractedStyle = $matches[0];
         } else {
@@ -1302,19 +1459,44 @@ protected function splitTextIntoTexts($text)
         }
 
         $unformattedText = preg_replace('/>\s+</', '><', $text);
-        $result = str_replace(array('${', '}'), array('</w:t></w:r><w:r>' . $extractedStyle . '<w:t xml:space="preserve">${', '}</w:t></w:r><w:r>' . $extractedStyle . '<w:t xml:space="preserve">'), $unformattedText);
+        $result = str_replace([self::$macroOpeningChars, self::$macroClosingChars], ['</w:t></w:r><w:r>' . $extractedStyle . '<w:t xml:space="preserve">' . self::$macroOpeningChars, self::$macroClosingChars . '</w:t></w:r><w:r>' . $extractedStyle . '<w:t xml:space="preserve">'], $unformattedText);
 
-        return str_replace(array('<w:r>' . $extractedStyle . '<w:t xml:space="preserve"></w:t></w:r>', '<w:r><w:t xml:space="preserve"></w:t></w:r>', '<w:t>'), array('', '', '<w:t xml:space="preserve">'), $result);
+        return str_replace(['<w:r>' . $extractedStyle . '<w:t xml:space="preserve"></w:t></w:r>', '<w:r><w:t xml:space="preserve"></w:t></w:r>', '<w:t>'], ['', '', '<w:t xml:space="preserve">'], $result);
     }
 
     /**
-     * Returns true if string contains a macro that is not in it's own w:r
+     * Returns true if string contains a macro that is not in it's own w:r.
      *
      * @param string $text
+     *
      * @return bool
      */
     protected function textNeedsSplitting($text)
     {
-        return preg_match('/[^>]\${|}[^<]/i', $text) == 1;
+        $escapedMacroOpeningChars = preg_quote(self::$macroOpeningChars);
+        $escapedMacroClosingChars = preg_quote(self::$macroClosingChars);
+
+        return 1 === preg_match('/[^>]' . $escapedMacroOpeningChars . '|' . $escapedMacroClosingChars . '[^<]/i', $text);
+    }
+
+    public function setMacroOpeningChars(string $macroOpeningChars): void
+    {
+        self::$macroOpeningChars = $macroOpeningChars;
+    }
+
+    public function setMacroClosingChars(string $macroClosingChars): void
+    {
+        self::$macroClosingChars = $macroClosingChars;
+    }
+
+    public function setMacroChars(string $macroOpeningChars, string $macroClosingChars): void
+    {
+        self::$macroOpeningChars = $macroOpeningChars;
+        self::$macroClosingChars = $macroClosingChars;
+    }
+
+    public function getTempDocumentFilename(): string
+    {
+        return $this->tempDocumentFilename;
     }
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/AbstractWriter.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/AbstractWriter.php
index 2c1ad29460..8ebf98c7b5 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/AbstractWriter.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/AbstractWriter.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -24,96 +24,97 @@
 use PhpOffice\PhpWord\Shared\ZipArchive;
 
 /**
- * Abstract writer class
+ * Abstract writer class.
  *
  * @since 0.10.0
  */
 abstract class AbstractWriter implements WriterInterface
 {
     /**
-     * PHPWord object
+     * PHPWord object.
      *
      * @var \PhpOffice\PhpWord\PhpWord
      */
-    protected $phpWord = null;
+    protected $phpWord;
 
     /**
-     * Part name and file name pairs
+     * Part name and file name pairs.
      *
      * @var array
      */
-    protected $parts = array();
+    protected $parts = [];
 
     /**
-     * Individual writers
+     * Individual writers.
      *
      * @var array
      */
-    protected $writerParts = array();
+    protected $writerParts = [];
 
     /**
-     * Paths to store media files
+     * Paths to store media files.
      *
      * @var array
      */
-    protected $mediaPaths = array('image' => '', 'object' => '');
+    protected $mediaPaths = ['image' => '', 'object' => ''];
 
     /**
-     * Use disk caching
+     * Use disk caching.
      *
      * @var bool
      */
     private $useDiskCaching = false;
 
     /**
-     * Disk caching directory
+     * Disk caching directory.
      *
      * @var string
      */
     private $diskCachingDirectory = './';
 
     /**
-     * Temporary directory
+     * Temporary directory.
      *
      * @var string
      */
     private $tempDir = '';
 
     /**
-     * Original file name
+     * Original file name.
      *
      * @var string
      */
     private $originalFilename;
 
     /**
-     * Temporary file name
+     * Temporary file name.
      *
      * @var string
      */
     private $tempFilename;
 
     /**
-     * Get PhpWord object
+     * Get PhpWord object.
      *
-     * @throws \PhpOffice\PhpWord\Exception\Exception
      * @return \PhpOffice\PhpWord\PhpWord
      */
     public function getPhpWord()
     {
-        if (!is_null($this->phpWord)) {
+        if (null !== $this->phpWord) {
             return $this->phpWord;
         }
+
         throw new Exception('No PhpWord assigned.');
     }
 
     /**
-     * Set PhpWord object
+     * Set PhpWord object.
      *
      * @param \PhpOffice\PhpWord\PhpWord
+     *
      * @return self
      */
-    public function setPhpWord(PhpWord $phpWord = null)
+    public function setPhpWord(?PhpWord $phpWord = null)
     {
         $this->phpWord = $phpWord;
 
@@ -121,9 +122,10 @@ public function setPhpWord(PhpWord $phpWord = null)
     }
 
     /**
-     * Get writer part
+     * Get writer part.
      *
      * @param string $partName Writer part name
+     *
      * @return mixed
      */
     public function getWriterPart($partName = '')
@@ -136,7 +138,7 @@ public function getWriterPart($partName = '')
     }
 
     /**
-     * Get use disk caching status
+     * Get use disk caching status.
      *
      * @return bool
      */
@@ -146,19 +148,18 @@ public function isUseDiskCaching()
     }
 
     /**
-     * Set use disk caching status
+     * Set use disk caching status.
      *
      * @param bool $value
      * @param string $directory
      *
-     * @throws \PhpOffice\PhpWord\Exception\Exception
      * @return self
      */
     public function setUseDiskCaching($value = false, $directory = null)
     {
         $this->useDiskCaching = $value;
 
-        if (!is_null($directory)) {
+        if (null !== $directory) {
             if (is_dir($directory)) {
                 $this->diskCachingDirectory = $directory;
             } else {
@@ -170,7 +171,7 @@ public function setUseDiskCaching($value = false, $directory = null)
     }
 
     /**
-     * Get disk caching directory
+     * Get disk caching directory.
      *
      * @return string
      */
@@ -180,7 +181,7 @@ public function getDiskCachingDirectory()
     }
 
     /**
-     * Get temporary directory
+     * Get temporary directory.
      *
      * @return string
      */
@@ -190,9 +191,10 @@ public function getTempDir()
     }
 
     /**
-     * Set temporary directory
+     * Set temporary directory.
      *
      * @param string $value
+     *
      * @return self
      */
     public function setTempDir($value)
@@ -206,11 +208,12 @@ public function setTempDir($value)
     }
 
     /**
-     * Get temporary file name
+     * Get temporary file name.
      *
      * If $filename is php://output or php://stdout, make it a temporary file
      *
      * @param string $filename
+     *
      * @return string
      */
     protected function getTempFile($filename)
@@ -233,10 +236,8 @@ protected function getTempFile($filename)
 
     /**
      * Cleanup temporary file.
-     *
-     * @throws \PhpOffice\PhpWord\Exception\CopyFileException
      */
-    protected function cleanupTempFile()
+    protected function cleanupTempFile(): void
     {
         if ($this->originalFilename != $this->tempFilename) {
             // @codeCoverageIgnoreStart
@@ -254,7 +255,7 @@ protected function cleanupTempFile()
     /**
      * Clear temporary directory.
      */
-    protected function clearTempDir()
+    protected function clearTempDir(): void
     {
         if (is_dir($this->tempDir)) {
             $this->deleteDir($this->tempDir);
@@ -262,12 +263,10 @@ protected function clearTempDir()
     }
 
     /**
-     * Get ZipArchive object
+     * Get ZipArchive object.
      *
      * @param string $filename
      *
-     * @throws \Exception
-     *
      * @return \PhpOffice\PhpWord\Shared\ZipArchive
      */
     protected function getZipArchive($filename)
@@ -293,20 +292,18 @@ protected function getZipArchive($filename)
     }
 
     /**
-     * Open file for writing
+     * Open file for writing.
      *
      * @since 0.11.0
      *
      * @param string $filename
      *
-     * @throws \Exception
-     *
      * @return resource
      */
     protected function openFile($filename)
     {
         $filename = $this->getTempFile($filename);
-        $fileHandle = fopen($filename, 'w');
+        $fileHandle = fopen($filename, 'wb');
         // @codeCoverageIgnoreStart
         // Can't find any test case. Uncomment when found.
         if ($fileHandle === false) {
@@ -325,7 +322,7 @@ protected function openFile($filename)
      * @param resource $fileHandle
      * @param string $content
      */
-    protected function writeFile($fileHandle, $content)
+    protected function writeFile($fileHandle, $content): void
     {
         fwrite($fileHandle, $content);
         fclose($fileHandle);
@@ -335,10 +332,9 @@ protected function writeFile($fileHandle, $content)
     /**
      * Add files to package.
      *
-     * @param \PhpOffice\PhpWord\Shared\ZipArchive $zip
      * @param mixed $elements
      */
-    protected function addFilesToPackage(ZipArchive $zip, $elements)
+    protected function addFilesToPackage(ZipArchive $zip, $elements): void
     {
         foreach ($elements as $element) {
             $type = $element['type']; // image|object|link
@@ -351,17 +347,8 @@ protected function addFilesToPackage(ZipArchive $zip, $elements)
 
             // Retrive GD image content or get local media
             if (isset($element['isMemImage']) && $element['isMemImage']) {
-                $image = call_user_func($element['createFunction'], $element['source']);
-                if ($element['imageType'] === 'image/png') {
-                    // PNG images need to preserve alpha channel information
-                    imagesavealpha($image, true);
-                }
-                ob_start();
-                call_user_func($element['imageFunction'], $image);
-                $imageContents = ob_get_contents();
-                ob_end_clean();
+                $imageContents = $element['imageString'];
                 $zip->addFromString($target, $imageContents);
-                imagedestroy($image);
             } else {
                 $this->addFileToPackage($zip, $element['source'], $target);
             }
@@ -377,13 +364,13 @@ protected function addFilesToPackage(ZipArchive $zip, $elements)
      * @param string $source
      * @param string $target
      */
-    protected function addFileToPackage($zipPackage, $source, $target)
+    protected function addFileToPackage($zipPackage, $source, $target): void
     {
         $isArchive = strpos($source, 'zip://') !== false;
         $actualSource = null;
         if ($isArchive) {
             $source = substr($source, 6);
-            list($zipFilename, $imageFilename) = explode('#', $source);
+            [$zipFilename, $imageFilename] = explode('#', $source);
 
             $zip = new ZipArchive();
             if ($zip->open($zipFilename) !== false) {
@@ -397,7 +384,7 @@ protected function addFileToPackage($zipPackage, $source, $target)
             $actualSource = $source;
         }
 
-        if (!is_null($actualSource)) {
+        if (null !== $actualSource) {
             $zipPackage->addFile($actualSource, $target);
         }
     }
@@ -407,7 +394,7 @@ protected function addFileToPackage($zipPackage, $source, $target)
      *
      * @param string $dir
      */
-    private function deleteDir($dir)
+    private function deleteDir($dir): void
     {
         foreach (scandir($dir) as $file) {
             if ($file === '.' || $file === '..') {
@@ -421,16 +408,4 @@ private function deleteDir($dir)
 
         rmdir($dir);
     }
-
-    /**
-     * Get use disk caching status
-     *
-     * @deprecated 0.10.0
-     *
-     * @codeCoverageIgnore
-     */
-    public function getUseDiskCaching()
-    {
-        return $this->isUseDiskCaching();
-    }
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML.php
index 7f55b9d3e6..647890591d 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML.php
@@ -11,18 +11,22 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer;
 
 use PhpOffice\PhpWord\PhpWord;
+use PhpOffice\PhpWord\Settings;
+use PhpOffice\PhpWord\Shared\Validate;
+use PhpOffice\PhpWord\Style\Font;
 
 /**
- * HTML writer
+ * HTML writer.
  *
  * Not supported: PreserveText, PageBreak, Object
+ *
  * @since 0.10.0
  */
 class HTML extends AbstractWriter implements WriterInterface
@@ -35,20 +39,41 @@ class HTML extends AbstractWriter implements WriterInterface
     protected $isPdf = false;
 
     /**
-     * Footnotes and endnotes collection
+     * Footnotes and endnotes collection.
      *
      * @var array
      */
-    protected $notes = array();
+    protected $notes = [];
+
+    /**
+     * Callback for editing generated html.
+     *
+     * @var null|callable
+     */
+    private $editCallback;
+
+    /**
+     * Default generic name for default font for html.
+     *
+     * @var string
+     */
+    private $defaultGenericFont = '';
+
+    /**
+     * Default white space style for html.
+     *
+     * @var string
+     */
+    private $defaultWhiteSpace = '';
 
     /**
-     * Create new instance
+     * Create new instance.
      */
-    public function __construct(PhpWord $phpWord = null)
+    public function __construct(?PhpWord $phpWord = null)
     {
         $this->setPhpWord($phpWord);
 
-        $this->parts = array('Head', 'Body');
+        $this->parts = ['Head', 'Body'];
         foreach ($this->parts as $partName) {
             $partClass = 'PhpOffice\\PhpWord\\Writer\\HTML\\Part\\' . $partName;
             if (class_exists($partClass)) {
@@ -62,20 +87,17 @@ public function __construct(PhpWord $phpWord = null)
 
     /**
      * Save PhpWord to file.
-     *
-     * @param string $filename
-     *
-     * @throws \PhpOffice\PhpWord\Exception\Exception
      */
-    public function save($filename = null)
+    public function save(string $filename): void
     {
         $this->writeFile($this->openFile($filename), $this->getContent());
     }
 
     /**
-     * Get content
+     * Get content.
      *
      * @return string
+     *
      * @since 0.11.0
      */
     public function getContent()
@@ -84,16 +106,58 @@ public function getContent()
 
         $content .= '<!DOCTYPE html>' . PHP_EOL;
         $content .= '<!-- Generated by PHPWord -->' . PHP_EOL;
-        $content .= '<html>' . PHP_EOL;
+        $langtext = '';
+        $phpWord = $this->getPhpWord();
+        $lang = $phpWord->getSettings()->getThemeFontLang();
+        if (!empty($lang)) {
+            $lang2 = $lang->getLatin();
+            if (!$lang2) {
+                $lang2 = $lang->getEastAsia();
+            }
+            if (!$lang2) {
+                $lang2 = $lang->getBidirectional();
+            }
+            if ($lang2) {
+                $langtext = " lang='" . $lang2 . "'";
+            }
+        }
+        $content .= "<html$langtext>" . PHP_EOL;
         $content .= $this->getWriterPart('Head')->write();
         $content .= $this->getWriterPart('Body')->write();
         $content .= '</html>' . PHP_EOL;
 
+        // Trigger a callback for editing the entire HTML
+        $callback = $this->editCallback;
+        if ($callback !== null) {
+            $content = $callback($content);
+        }
+
         return $content;
     }
 
     /**
-     * Get is PDF
+     * Return the callback to edit the entire HTML.
+     */
+    public function getEditCallback(): ?callable
+    {
+        return $this->editCallback;
+    }
+
+    /**
+     * Set a callback to edit the entire HTML.
+     *
+     * The callback must accept the HTML as string as first parameter,
+     * and it must return the edited HTML as string.
+     */
+    public function setEditCallback(?callable $callback): self
+    {
+        $this->editCallback = $callback;
+
+        return $this;
+    }
+
+    /**
+     * Get is PDF.
      *
      * @return bool
      */
@@ -103,7 +167,7 @@ public function isPdf()
     }
 
     /**
-     * Get notes
+     * Get notes.
      *
      * @return array
      */
@@ -118,22 +182,56 @@ public function getNotes()
      * @param int $noteId
      * @param string $noteMark
      */
-    public function addNote($noteId, $noteMark)
+    public function addNote($noteId, $noteMark): void
     {
         $this->notes[$noteId] = $noteMark;
     }
 
     /**
-     * Write document
-     *
-     * @deprecated 0.11.0
-     *
-     * @return string
-     *
-     * @codeCoverageIgnore
+     * Get generic name for default font for html.
+     */
+    public function getDefaultGenericFont(): string
+    {
+        return $this->defaultGenericFont;
+    }
+
+    /**
+     * Set generic name for default font for html.
      */
-    public function writeDocument()
+    public function setDefaultGenericFont(string $value): self
     {
-        return $this->getContent();
+        $this->defaultGenericFont = Validate::validateCSSGenericFont($value);
+
+        return $this;
+    }
+
+    /**
+     * Get default white space style for html.
+     */
+    public function getDefaultWhiteSpace(): string
+    {
+        return $this->defaultWhiteSpace;
+    }
+
+    /**
+     * Set default white space style for html.
+     */
+    public function setDefaultWhiteSpace(string $value): self
+    {
+        $this->defaultWhiteSpace = Validate::validateCSSWhiteSpace($value);
+
+        return $this;
+    }
+
+    /**
+     * Escape string or not depending on setting.
+     */
+    public function escapeHTML(string $txt): string
+    {
+        if (Settings::isOutputEscapingEnabled()) {
+            return htmlspecialchars($txt, ENT_QUOTES | (defined('ENT_SUBSTITUTE') ? ENT_SUBSTITUTE : 0), 'UTF-8');
+        }
+
+        return $txt;
     }
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/AbstractElement.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/AbstractElement.php
index 30d1ccaa4c..7c7bde3189 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/AbstractElement.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/AbstractElement.php
@@ -11,67 +11,58 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\HTML\Element;
 
-use Laminas\Escaper\Escaper;
 use PhpOffice\PhpWord\Element\AbstractElement as Element;
-use PhpOffice\PhpWord\Writer\AbstractWriter;
+use PhpOffice\PhpWord\Writer\HTML;
 
 /**
- * Abstract HTML element writer
+ * Abstract HTML element writer.
  *
  * @since 0.11.0
  */
 abstract class AbstractElement
 {
     /**
-     * Parent writer
+     * Parent writer.
      *
-     * @var \PhpOffice\PhpWord\Writer\AbstractWriter
+     * @var HTML
      */
     protected $parentWriter;
 
     /**
-     * Element
+     * Element.
      *
      * @var \PhpOffice\PhpWord\Element\AbstractElement
      */
     protected $element;
 
     /**
-     * Without paragraph
+     * Without paragraph.
      *
      * @var bool
      */
     protected $withoutP = false;
 
     /**
-     * @var \Laminas\Escaper\Escaper|\PhpOffice\PhpWord\Escaper\AbstractEscaper
-     */
-    protected $escaper;
-
-    /**
-     * Write element
+     * Write element.
      */
     abstract public function write();
 
     /**
-     * Create new instance
+     * Create new instance.
      *
-     * @param \PhpOffice\PhpWord\Writer\AbstractWriter $parentWriter
-     * @param \PhpOffice\PhpWord\Element\AbstractElement $element
      * @param bool $withoutP
      */
-    public function __construct(AbstractWriter $parentWriter, Element $element, $withoutP = false)
+    public function __construct(HTML $parentWriter, Element $element, $withoutP = false)
     {
         $this->parentWriter = $parentWriter;
         $this->element = $element;
         $this->withoutP = $withoutP;
-        $this->escaper = new Escaper();
     }
 
     /**
@@ -79,7 +70,7 @@ public function __construct(AbstractWriter $parentWriter, Element $element, $wit
      *
      * @param bool $value
      */
-    public function setWithoutP($value)
+    public function setWithoutP($value): void
     {
         $this->withoutP = $value;
     }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/Bookmark.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/Bookmark.php
index 082bd76073..521a73db09 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/Bookmark.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/Bookmark.php
@@ -11,21 +11,21 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\HTML\Element;
 
 /**
- * Bookmark element HTML writer
+ * Bookmark element HTML writer.
  *
  * @since 0.15.0
  */
 class Bookmark extends Text
 {
     /**
-     * Write bookmark
+     * Write bookmark.
      *
      * @return string
      */
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/Container.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/Container.php
index 006b588918..7909e73f21 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/Container.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/Container.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,21 +20,21 @@
 use PhpOffice\PhpWord\Element\AbstractContainer as ContainerElement;
 
 /**
- * Container element HTML writer
+ * Container element HTML writer.
  *
  * @since 0.11.0
  */
 class Container extends AbstractElement
 {
     /**
-     * Namespace; Can't use __NAMESPACE__ in inherited class (RTF)
+     * Namespace; Can't use __NAMESPACE__ in inherited class (RTF).
      *
      * @var string
      */
     protected $namespace = 'PhpOffice\\PhpWord\\Writer\\HTML\\Element';
 
     /**
-     * Write container
+     * Write container.
      *
      * @return string
      */
@@ -45,7 +45,7 @@ public function write()
             return '';
         }
         $containerClass = substr(get_class($container), strrpos(get_class($container), '\\') + 1);
-        $withoutP = in_array($containerClass, array('TextRun', 'Footnote', 'Endnote')) ? true : false;
+        $withoutP = in_array($containerClass, ['TextRun', 'Footnote', 'Endnote']) ? true : false;
         $content = '';
 
         $elements = $container->getElements();
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/Endnote.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/Endnote.php
index 2252dc3af8..1c35e8faa8 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/Endnote.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/Endnote.php
@@ -11,21 +11,21 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\HTML\Element;
 
 /**
- * Endnote element HTML writer
+ * Endnote element HTML writer.
  *
  * @since 0.10.0
  */
 class Endnote extends Footnote
 {
     /**
-     * Note type
+     * Note type.
      *
      * @var string
      */
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/Footnote.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/Footnote.php
index ed14db1e04..0cb2ca5fcd 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/Footnote.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/Footnote.php
@@ -11,28 +11,28 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\HTML\Element;
 
 /**
- * Footnote element HTML writer
+ * Footnote element HTML writer.
  *
  * @since 0.10.0
  */
 class Footnote extends AbstractElement
 {
     /**
-     * Note type footnote|endnote
+     * Note type footnote|endnote.
      *
      * @var string
      */
     protected $noteType = 'footnote';
 
     /**
-     * Write footnote/endnote marks; The actual content is written in parent writer (HTML)
+     * Write footnote/endnote marks; The actual content is written in parent writer (HTML).
      *
      * @return string
      */
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/Image.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/Image.php
index 7c22a1663d..40e864e6a4 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/Image.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/Image.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -21,14 +21,14 @@
 use PhpOffice\PhpWord\Writer\HTML\Style\Image as ImageStyleWriter;
 
 /**
- * Image element HTML writer
+ * Image element HTML writer.
  *
  * @since 0.10.0
  */
 class Image extends Text
 {
     /**
-     * Write image
+     * Write image.
      *
      * @return string
      */
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/Link.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/Link.php
index f6dae5cdd3..ac48c865bd 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/Link.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/Link.php
@@ -11,23 +11,23 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\HTML\Element;
 
-use PhpOffice\PhpWord\Settings;
+use PhpOffice\PhpWord\Writer\HTML;
 
 /**
- * Link element HTML writer
+ * Link element HTML writer.
  *
  * @since 0.10.0
  */
 class Link extends Text
 {
     /**
-     * Write link
+     * Write link.
      *
      * @return string
      */
@@ -39,11 +39,11 @@ public function write()
 
         $prefix = $this->element->isInternal() ? '#' : '';
         $content = $this->writeOpening();
-        if (Settings::isOutputEscapingEnabled()) {
-            $content .= "<a href=\"{$prefix}{$this->escaper->escapeHtmlAttr($this->element->getSource())}\">{$this->escaper->escapeHtml($this->element->getText())}</a>";
-        } else {
-            $content .= "<a href=\"{$prefix}{$this->element->getSource()}\">{$this->element->getText()}</a>";
-        }
+        $content .= "<a href=\"{$prefix}"
+            . $this->parentWriter->escapeHTML($this->element->getSource())
+            . '">'
+            . $this->parentWriter->escapeHTML($this->element->getText())
+            . '</a>';
         $content .= $this->writeClosing();
 
         return $content;
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/ListItem.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/ListItem.php
index 384b3ef165..ddc3ecf0fd 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/ListItem.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/ListItem.php
@@ -11,23 +11,23 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\HTML\Element;
 
-use PhpOffice\PhpWord\Settings;
+use PhpOffice\PhpWord\Writer\HTML;
 
 /**
- * ListItem element HTML writer
+ * ListItem element HTML writer.
  *
  * @since 0.10.0
  */
 class ListItem extends AbstractElement
 {
     /**
-     * Write list item
+     * Write list item.
      *
      * @return string
      */
@@ -37,11 +37,7 @@ public function write()
             return '';
         }
 
-        if (Settings::isOutputEscapingEnabled()) {
-            $content = '<p>' . $this->escaper->escapeHtml($this->element->getTextObject()->getText()) . '</p>' . PHP_EOL;
-        } else {
-            $content = '<p>' . $this->element->getTextObject()->getText() . '</p>' . PHP_EOL;
-        }
+        $content = '<p>' . $this->parentWriter->escapeHTML($this->element->getTextObject()->getText()) . '</p>' . PHP_EOL;
 
         return $content;
     }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/ListItemRun.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/ListItemRun.php
index a4d7e46073..5bbe23f0f3 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/ListItemRun.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/ListItemRun.php
@@ -11,21 +11,21 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\HTML\Element;
 
 /**
- * ListItem element HTML writer
+ * ListItem element HTML writer.
  *
  * @since 0.10.0
  */
 class ListItemRun extends TextRun
 {
     /**
-     * Write list item
+     * Write list item.
      *
      * @return string
      */
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/PageBreak.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/PageBreak.php
index f9998e3793..e5c48cc789 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/PageBreak.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/PageBreak.php
@@ -11,21 +11,23 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\HTML\Element;
 
+use PhpOffice\PhpWord\Writer\PDF\TCPDF;
+
 /**
- * PageBreak element HTML writer
+ * PageBreak element HTML writer.
  *
  * @since 0.10.0
  */
 class PageBreak extends TextBreak
 {
     /**
-     * Write page break
+     * Write page break.
      *
      * @since 0.12.0
      *
@@ -35,10 +37,13 @@ public function write()
     {
         /** @var \PhpOffice\PhpWord\Writer\HTML $parentWriter Type hint */
         $parentWriter = $this->parentWriter;
+        if ($parentWriter instanceof TCPDF) {
+            return '<br pagebreak="true"/>';
+        }
         if ($parentWriter->isPdf()) {
             return '<pagebreak style="page-break-before: always;" pagebreak="true"></pagebreak>';
         }
 
-        return '';
+        return '<div style="page-break-before: always; height: 0; margin: 0; padding: 0; overflow: hidden;">&#160;</div>' . PHP_EOL;
     }
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/Table.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/Table.php
index 059574a272..7f8d0bcc3c 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/Table.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/Table.php
@@ -11,21 +11,23 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\HTML\Element;
 
+use PhpOffice\PhpWord\Writer\HTML\Style\Table as TableStyleWriter;
+
 /**
- * Table element HTML writer
+ * Table element HTML writer.
  *
  * @since 0.10.0
  */
 class Table extends AbstractElement
 {
     /**
-     * Write table
+     * Write table.
      *
      * @return string
      */
@@ -39,22 +41,22 @@ public function write()
         $rows = $this->element->getRows();
         $rowCount = count($rows);
         if ($rowCount > 0) {
-            $content .= '<table' . self::getTableStyle($this->element->getStyle()) . '>' . PHP_EOL;
+            $content .= '<table' . $this->getTableStyle($this->element->getStyle()) . '>' . PHP_EOL;
 
-            for ($i = 0; $i < $rowCount; $i++) {
-                /** @var $row \PhpOffice\PhpWord\Element\Row Type hint */
+            for ($i = 0; $i < $rowCount; ++$i) {
+                /** @var \PhpOffice\PhpWord\Element\Row $row Type hint */
                 $rowStyle = $rows[$i]->getStyle();
                 // $height = $row->getHeight();
                 $tblHeader = $rowStyle->isTblHeader();
                 $content .= '<tr>' . PHP_EOL;
                 $rowCells = $rows[$i]->getCells();
                 $rowCellCount = count($rowCells);
-                for ($j = 0; $j < $rowCellCount; $j++) {
+                for ($j = 0; $j < $rowCellCount; ++$j) {
                     $cellStyle = $rowCells[$j]->getStyle();
+                    $cellStyleCss = $this->getTableStyle($cellStyle);
                     $cellBgColor = $cellStyle->getBgColor();
-                    $cellBgColor === 'auto' && $cellBgColor = null; // auto cannot be parsed to hexadecimal number
                     $cellFgColor = null;
-                    if ($cellBgColor) {
+                    if ($cellBgColor && $cellBgColor !== 'auto') {
                         $red = hexdec(substr($cellBgColor, 0, 2));
                         $green = hexdec(substr($cellBgColor, 2, 2));
                         $blue = hexdec(substr($cellBgColor, 4, 2));
@@ -63,42 +65,27 @@ public function write()
                     $cellColSpan = $cellStyle->getGridSpan();
                     $cellRowSpan = 1;
                     $cellVMerge = $cellStyle->getVMerge();
-                    // If this is the first cell of the vertical merge, find out how man rows it spans
+                    // If this is the first cell of the vertical merge, find out how many rows it spans
                     if ($cellVMerge === 'restart') {
-                        for ($k = $i + 1; $k < $rowCount; $k++) {
-                            $kRowCells = $rows[$k]->getCells();
-                            if (isset($kRowCells[$j])) {
-                                if ($kRowCells[$j]->getStyle()->getVMerge() === 'continue') {
-                                    $cellRowSpan++;
-                                } else {
-                                    break;
-                                }
-                            } else {
-                                break;
-                            }
-                        }
+                        $cellRowSpan = $this->calculateCellRowSpan($rows, $i, $j);
                     }
                     // Ignore cells that are merged vertically with previous rows
                     if ($cellVMerge !== 'continue') {
                         $cellTag = $tblHeader ? 'th' : 'td';
                         $cellColSpanAttr = (is_numeric($cellColSpan) && ($cellColSpan > 1) ? " colspan=\"{$cellColSpan}\"" : '');
                         $cellRowSpanAttr = ($cellRowSpan > 1 ? " rowspan=\"{$cellRowSpan}\"" : '');
-                        $cellBgColorAttr = (is_null($cellBgColor) ? '' : " bgcolor=\"#{$cellBgColor}\"");
-                        $cellFgColorAttr = (is_null($cellFgColor) ? '' : " color=\"#{$cellFgColor}\"");
-                        $content .= "<{$cellTag}{$cellColSpanAttr}{$cellRowSpanAttr}{$cellBgColorAttr}{$cellFgColorAttr}>" . PHP_EOL;
+                        $cellBgColorAttr = (empty($cellBgColor) ? '' : " bgcolor=\"#{$cellBgColor}\"");
+                        $cellFgColorAttr = (empty($cellFgColor) ? '' : " color=\"#{$cellFgColor}\"");
+                        $content .= "<{$cellTag}{$cellStyleCss}{$cellColSpanAttr}{$cellRowSpanAttr}{$cellBgColorAttr}{$cellFgColorAttr}>" . PHP_EOL;
                         $writer = new Container($this->parentWriter, $rowCells[$j]);
                         $content .= $writer->write();
                         if ($cellRowSpan > 1) {
                             // There shouldn't be any content in the subsequent merged cells, but lets check anyway
-                            for ($k = $i + 1; $k < $rowCount; $k++) {
+                            for ($k = $i + 1; $k < $rowCount; ++$k) {
                                 $kRowCells = $rows[$k]->getCells();
-                                if (isset($kRowCells[$j])) {
-                                    if ($kRowCells[$j]->getStyle()->getVMerge() === 'continue') {
-                                        $writer = new Container($this->parentWriter, $kRowCells[$j]);
-                                        $content .= $writer->write();
-                                    } else {
-                                        break;
-                                    }
+                                if (isset($kRowCells[$j]) && $kRowCells[$j]->getStyle()->getVMerge() === 'continue') {
+                                    $writer = new Container($this->parentWriter, $kRowCells[$j]);
+                                    $content .= $writer->write();
                                 } else {
                                     break;
                                 }
@@ -116,27 +103,79 @@ public function write()
     }
 
     /**
-     * Translates Table style in CSS equivalent
+     * Translates Table style in CSS equivalent.
      *
-     * @param string|\PhpOffice\PhpWord\Style\Table|null $tableStyle
-     * @return string
+     * @param null|\PhpOffice\PhpWord\Style\Cell|\PhpOffice\PhpWord\Style\Table|string $tableStyle
      */
-    private function getTableStyle($tableStyle = null)
+    private function getTableStyle($tableStyle = null): string
     {
         if ($tableStyle == null) {
             return '';
         }
         if (is_string($tableStyle)) {
-            $style = ' class="' . $tableStyle;
-        } else {
-            $style = ' style="';
-            if ($tableStyle->getLayout() == \PhpOffice\PhpWord\Style\Table::LAYOUT_FIXED) {
-                $style .= 'table-layout: fixed;';
-            } elseif ($tableStyle->getLayout() == \PhpOffice\PhpWord\Style\Table::LAYOUT_AUTO) {
-                $style .= 'table-layout: auto;';
+            return ' class="' . $tableStyle . '"';
+        }
+
+        $styleWriter = new TableStyleWriter($tableStyle);
+        $style = $styleWriter->write();
+        if ($style === '') {
+            return '';
+        }
+
+        return ' style="' . $style . '"';
+    }
+
+    /**
+     * Calculates cell rowspan.
+     *
+     * @param \PhpOffice\PhpWord\Element\Row[] $rows
+     */
+    private function calculateCellRowSpan(array $rows, int $rowIndex, int $colIndex): int
+    {
+        $currentRow = $rows[$rowIndex];
+        $currentRowCells = $currentRow->getCells();
+        $shiftedColIndex = 0;
+
+        foreach ($currentRowCells as $cell) {
+            if ($cell === $currentRowCells[$colIndex]) {
+                break;
+            }
+
+            $colSpan = 1;
+
+            if ($cell->getStyle()->getGridSpan() !== null) {
+                $colSpan = $cell->getStyle()->getGridSpan();
+            }
+
+            $shiftedColIndex += $colSpan;
+        }
+
+        $rowCount = count($rows);
+        $rowSpan = 1;
+
+        for ($i = $rowIndex + 1; $i < $rowCount; ++$i) {
+            $rowCells = $rows[$i]->getCells();
+            $colIndex = 0;
+
+            foreach ($rowCells as $cell) {
+                if ($colIndex === $shiftedColIndex) {
+                    if ($cell->getStyle()->getVMerge() === 'continue') {
+                        ++$rowSpan;
+                    }
+
+                    break;
+                }
+
+                $colSpan = 1;
+
+                if ($cell->getStyle()->getGridSpan() !== null) {
+                    $colSpan = $cell->getStyle()->getGridSpan();
+                }
+
+                $colIndex += $colSpan;
             }
         }
 
-        return $style . '"';
+        return $rowSpan;
     }
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/Text.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/Text.php
index 04d76a8327..5af9f2ab63 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/Text.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/Text.php
@@ -11,74 +11,77 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\HTML\Element;
 
 use PhpOffice\PhpWord\Element\TrackChange;
-use PhpOffice\PhpWord\Settings;
+use PhpOffice\PhpWord\Style;
 use PhpOffice\PhpWord\Style\Font;
 use PhpOffice\PhpWord\Style\Paragraph;
+use PhpOffice\PhpWord\Writer\HTML;
 use PhpOffice\PhpWord\Writer\HTML\Style\Font as FontStyleWriter;
 use PhpOffice\PhpWord\Writer\HTML\Style\Paragraph as ParagraphStyleWriter;
 
 /**
- * Text element HTML writer
+ * Text element HTML writer.
  *
  * @since 0.10.0
  */
 class Text extends AbstractElement
 {
     /**
-     * Text written after opening
+     * Text written after opening.
      *
      * @var string
      */
     private $openingText = '';
 
     /**
-     * Text written before closing
+     * Text written before closing.
      *
      * @var string
      */
     private $closingText = '';
 
     /**
-     * Opening tags
+     * Opening tags.
      *
      * @var string
      */
     private $openingTags = '';
 
     /**
-     * Closing tag
+     * Closing tag.
      *
      * @var string
      */
     private $closingTags = '';
 
     /**
-     * Write text
+     * Write text.
      *
      * @return string
      */
     public function write()
     {
+        $this->processFontStyle();
+
         /** @var \PhpOffice\PhpWord\Element\Text $element Type hint */
         $element = $this->element;
-        $this->getFontStyle();
+
+        $text = $this->parentWriter->escapeHTML($element->getText());
+        if (!$this->withoutP && !trim($text)) {
+            $text = '&nbsp;';
+        }
 
         $content = '';
         $content .= $this->writeOpening();
         $content .= $this->openingText;
         $content .= $this->openingTags;
-        if (Settings::isOutputEscapingEnabled()) {
-            $content .= $this->escaper->escapeHtml($element->getText());
-        } else {
-            $content .= $element->getText();
-        }
+        $content .= $text;
         $content .= $this->closingTags;
         $content .= $this->closingText;
         $content .= $this->writeClosing();
@@ -91,7 +94,7 @@ public function write()
      *
      * @param string $value
      */
-    public function setOpeningText($value)
+    public function setOpeningText($value): void
     {
         $this->openingText = $value;
     }
@@ -101,13 +104,13 @@ public function setOpeningText($value)
      *
      * @param string $value
      */
-    public function setClosingText($value)
+    public function setClosingText($value): void
     {
         $this->closingText = $value;
     }
 
     /**
-     * Write opening
+     * Write opening.
      *
      * @return string
      */
@@ -115,10 +118,7 @@ protected function writeOpening()
     {
         $content = '';
         if (!$this->withoutP) {
-            $style = '';
-            if (method_exists($this->element, 'getParagraphStyle')) {
-                $style = $this->getParagraphStyle();
-            }
+            $style = $this->getParagraphStyle();
             $content .= "<p{$style}>";
         }
 
@@ -129,7 +129,7 @@ protected function writeOpening()
     }
 
     /**
-     * Write ending
+     * Write ending.
      *
      * @return string
      */
@@ -141,12 +141,7 @@ protected function writeClosing()
         $content .= $this->writeTrackChangeClosing();
 
         if (!$this->withoutP) {
-            if (Settings::isOutputEscapingEnabled()) {
-                $content .= $this->escaper->escapeHtml($this->closingText);
-            } else {
-                $content .= $this->closingText;
-            }
-
+            $content .= $this->parentWriter->escapeHTML($this->closingText);
             $content .= '</p>' . PHP_EOL;
         }
 
@@ -154,7 +149,7 @@ protected function writeClosing()
     }
 
     /**
-     * writes the track change opening tag
+     * writes the track change opening tag.
      *
      * @return string the HTML, an empty string if no track change information
      */
@@ -172,7 +167,7 @@ private function writeTrackChangeOpening()
             $content .= '<del data-phpword-prop=\'';
         }
 
-        $changedProp = array('changed' => array('author'=> $changed->getAuthor(), 'id'    => $this->element->getElementId()));
+        $changedProp = ['changed' => ['author' => $changed->getAuthor(), 'id' => $this->element->getElementId()]];
         if ($changed->getDate() != null) {
             $changedProp['changed']['date'] = $changed->getDate()->format('Y-m-d\TH:i:s\Z');
         }
@@ -189,7 +184,7 @@ private function writeTrackChangeOpening()
     }
 
     /**
-     * writes the track change closing tag
+     * writes the track change closing tag.
      *
      * @return string the HTML, an empty string if no track change information
      */
@@ -211,7 +206,7 @@ private function writeTrackChangeClosing()
     }
 
     /**
-     * Write paragraph style
+     * Write paragraph style.
      *
      * @return string
      */
@@ -228,6 +223,7 @@ private function getParagraphStyle()
         $pStyleIsObject = ($paragraphStyle instanceof Paragraph);
         if ($pStyleIsObject) {
             $styleWriter = new ParagraphStyleWriter($paragraphStyle);
+            $styleWriter->setParentWriter($this->parentWriter);
             $style = $styleWriter->write();
         } elseif (is_string($paragraphStyle)) {
             $style = $paragraphStyle;
@@ -243,22 +239,50 @@ private function getParagraphStyle()
     /**
      * Get font style.
      */
-    private function getFontStyle()
+    private function processFontStyle(): void
     {
         /** @var \PhpOffice\PhpWord\Element\Text $element Type hint */
         $element = $this->element;
-        $style = '';
+
+        $attributeStyle = $attributeLang = '';
+        $lang = null;
+
         $fontStyle = $element->getFontStyle();
-        $fStyleIsObject = ($fontStyle instanceof Font);
-        if ($fStyleIsObject) {
+        if ($fontStyle instanceof Font) {
+            // Attribute style
             $styleWriter = new FontStyleWriter($fontStyle);
-            $style = $styleWriter->write();
-        } elseif (is_string($fontStyle)) {
-            $style = $fontStyle;
+            $fontCSS = $styleWriter->write();
+            if ($fontCSS) {
+                $attributeStyle = ' style="' . $fontCSS . '"';
+            }
+            // Attribute Lang
+            $lang = $fontStyle->getLang();
+        } elseif (!empty($fontStyle)) {
+            // Attribute class
+            $attributeStyle = ' class="' . $fontStyle . '"';
+            // Attribute Lang
+            /** @var Font $cssClassStyle */
+            $cssClassStyle = Style::getStyle($fontStyle);
+            if ($cssClassStyle !== null && method_exists($cssClassStyle, 'getLang')) {
+                $lang = $cssClassStyle->getLang();
+            }
         }
-        if ($style) {
-            $attribute = $fStyleIsObject ? 'style' : 'class';
-            $this->openingTags = "<span {$attribute}=\"{$style}\">";
+
+        if ($lang) {
+            $attributeLang = $lang->getLatin();
+            if (!$attributeLang) {
+                $attributeLang = $lang->getEastAsia();
+            }
+            if (!$attributeLang) {
+                $attributeLang = $lang->getBidirectional();
+            }
+            if ($attributeLang) {
+                $attributeLang = " lang='$attributeLang'";
+            }
+        }
+
+        if ($attributeStyle || $attributeLang) {
+            $this->openingTags = "<span$attributeLang$attributeStyle>";
             $this->closingTags = '</span>';
         }
     }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/TextBreak.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/TextBreak.php
index 6ff092dbf7..af73cb4a06 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/TextBreak.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/TextBreak.php
@@ -11,21 +11,21 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\HTML\Element;
 
 /**
- * TextBreak element HTML writer
+ * TextBreak element HTML writer.
  *
  * @since 0.10.0
  */
 class TextBreak extends AbstractElement
 {
     /**
-     * Write text break
+     * Write text break.
      *
      * @return string
      */
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/TextRun.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/TextRun.php
index b2deaf25d8..abae7d303f 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/TextRun.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/TextRun.php
@@ -11,21 +11,21 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\HTML\Element;
 
 /**
- * TextRun element HTML writer
+ * TextRun element HTML writer.
  *
  * @since 0.10.0
  */
 class TextRun extends Text
 {
     /**
-     * Write text run
+     * Write text run.
      *
      * @return string
      */
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/Title.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/Title.php
index 04ed61f57d..65e6cb090b 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/Title.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Element/Title.php
@@ -11,23 +11,23 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\HTML\Element;
 
-use PhpOffice\PhpWord\Settings;
+use PhpOffice\PhpWord\Writer\HTML;
 
 /**
- * TextRun element HTML writer
+ * TextRun element HTML writer.
  *
  * @since 0.10.0
  */
 class Title extends AbstractElement
 {
     /**
-     * Write heading
+     * Write heading.
      *
      * @return string
      */
@@ -41,10 +41,8 @@ public function write()
 
         $text = $this->element->getText();
         if (is_string($text)) {
-            if (Settings::isOutputEscapingEnabled()) {
-                $text = $this->escaper->escapeHtml($text);
-            }
-        } elseif ($text instanceof \PhpOffice\PhpWord\Element\AbstractContainer) {
+            $text = $this->parentWriter->escapeHTML($text);
+        } else {
             $writer = new Container($this->parentWriter, $text);
             $text = $writer->write();
         }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Part/AbstractPart.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Part/AbstractPart.php
index 97c763759a..0fd9a40940 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Part/AbstractPart.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Part/AbstractPart.php
@@ -11,15 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\HTML\Part;
 
-use Laminas\Escaper\Escaper;
 use PhpOffice\PhpWord\Exception\Exception;
-use PhpOffice\PhpWord\Writer\AbstractWriter;
+use PhpOffice\PhpWord\Writer\HTML;
 
 /**
  * @since 0.11.0
@@ -27,43 +26,29 @@
 abstract class AbstractPart
 {
     /**
-     * @var \PhpOffice\PhpWord\Writer\AbstractWriter
+     * @var ?HTML
      */
     private $parentWriter;
 
-    /**
-     * @var \Laminas\Escaper\Escaper
-     */
-    protected $escaper;
-
-    public function __construct()
-    {
-        $this->escaper = new Escaper();
-    }
-
     /**
      * @return string
      */
     abstract public function write();
 
-    /**
-     * @param \PhpOffice\PhpWord\Writer\AbstractWriter $writer
-     */
-    public function setParentWriter(AbstractWriter $writer = null)
+    public function setParentWriter(?HTML $writer = null): void
     {
         $this->parentWriter = $writer;
     }
 
     /**
-     * @throws \PhpOffice\PhpWord\Exception\Exception
-     *
-     * @return \PhpOffice\PhpWord\Writer\AbstractWriter
+     * @return HTML
      */
     public function getParentWriter()
     {
         if ($this->parentWriter !== null) {
             return $this->parentWriter;
         }
+
         throw new Exception('No parent WriterInterface assigned.');
     }
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Part/Body.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Part/Body.php
index a029f96534..e5e2a5b80f 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Part/Body.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Part/Body.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -19,16 +19,17 @@
 
 use PhpOffice\PhpWord\Writer\HTML\Element\Container;
 use PhpOffice\PhpWord\Writer\HTML\Element\TextRun as TextRunWriter;
+use PhpOffice\PhpWord\Writer\PDF\TCPDF;
 
 /**
- * RTF body part writer
+ * RTF body part writer.
  *
  * @since 0.11.0
  */
 class Body extends AbstractPart
 {
     /**
-     * Write part
+     * Write part.
      *
      * @return string
      */
@@ -40,9 +41,18 @@ public function write()
 
         $content .= '<body>' . PHP_EOL;
         $sections = $phpWord->getSections();
+        $secno = 0;
+        $isTCPDFWriter = $this->getParentWriter() instanceof TCPDF;
         foreach ($sections as $section) {
+            ++$secno;
+            if ($isTCPDFWriter && $secno > 1) {
+                $content .= "<div style=\"page: page$secno; page-break-before:always;\">" . PHP_EOL;
+            } else {
+                $content .= "<div style='page: page$secno'>" . PHP_EOL;
+            }
             $writer = new Container($this->getParentWriter(), $section);
             $content .= $writer->write();
+            $content .= '</div>' . PHP_EOL;
         }
 
         $content .= $this->writeNotes();
@@ -52,7 +62,7 @@ public function write()
     }
 
     /**
-     * Write footnote/endnote contents as textruns
+     * Write footnote/endnote contents as textruns.
      *
      * @return string
      */
@@ -68,7 +78,7 @@ private function writeNotes()
         if (!empty($notes)) {
             $content .= '<hr />' . PHP_EOL;
             foreach ($notes as $noteId => $noteMark) {
-                list($noteType, $noteTypeId) = explode('-', $noteMark);
+                [$noteType, $noteTypeId] = explode('-', $noteMark);
                 $method = 'get' . ($noteType == 'endnote' ? 'Endnotes' : 'Footnotes');
                 $collection = $phpWord->$method()->getItems();
 
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Part/Head.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Part/Head.php
index 1107becf84..0f3f86e3d2 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Part/Head.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Part/Head.php
@@ -11,45 +11,48 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\HTML\Part;
 
 use PhpOffice\PhpWord\Settings;
+use PhpOffice\PhpWord\Shared\Converter;
 use PhpOffice\PhpWord\Style;
 use PhpOffice\PhpWord\Style\Font;
 use PhpOffice\PhpWord\Style\Paragraph;
+use PhpOffice\PhpWord\Style\Table;
 use PhpOffice\PhpWord\Writer\HTML\Style\Font as FontStyleWriter;
 use PhpOffice\PhpWord\Writer\HTML\Style\Generic as GenericStyleWriter;
 use PhpOffice\PhpWord\Writer\HTML\Style\Paragraph as ParagraphStyleWriter;
+use PhpOffice\PhpWord\Writer\HTML\Style\Table as TableStyleWriter;
 
 /**
- * RTF head part writer
+ * RTF head part writer.
  *
  * @since 0.11.0
  */
 class Head extends AbstractPart
 {
     /**
-     * Write part
+     * Write part.
      *
      * @return string
      */
     public function write()
     {
         $docProps = $this->getParentWriter()->getPhpWord()->getDocInfo();
-        $propertiesMapping = array(
-            'creator'     => 'author',
-            'title'       => '',
+        $propertiesMapping = [
+            'creator' => 'author',
+            'title' => '',
             'description' => '',
-            'subject'     => '',
-            'keywords'    => '',
-            'category'    => '',
-            'company'     => '',
-            'manager'     => '',
-        );
+            'subject' => '',
+            'keywords' => '',
+            'category' => '',
+            'company' => '',
+            'manager' => '',
+        ];
         $title = $docProps->getTitle();
         $title = ($title != '') ? $title : 'PHPWord';
 
@@ -63,8 +66,10 @@ public function write()
             $method = 'get' . $key;
             if ($docProps->$method() != '') {
                 $content .= '<meta name="' . $value . '"'
-                          . ' content="' . (Settings::isOutputEscapingEnabled() ? $this->escaper->escapeHtmlAttr($docProps->$method()) : $docProps->$method()) . '"'
-                          . ' />' . PHP_EOL;
+                    . ' content="'
+                    . $this->getParentWriter()->escapeHTML($docProps->$method())
+                    . '"'
+                    . ' />' . PHP_EOL;
             }
         }
         $content .= $this->writeStyles();
@@ -74,40 +79,47 @@ public function write()
     }
 
     /**
-     * Get styles
-     *
-     * @return string
+     * Get styles.
      */
-    private function writeStyles()
+    private function writeStyles(): string
     {
         $css = '<style>' . PHP_EOL;
 
         // Default styles
-        $defaultStyles = array(
-            '*' => array(
-                'font-family' => Settings::getDefaultFontName(),
-                'font-size'   => Settings::getDefaultFontSize() . 'pt',
-            ),
-            'a.NoteRef' => array(
+        $astarray = [
+            'font-family' => $this->getFontFamily(Settings::getDefaultFontName(), $this->getParentWriter()->getDefaultGenericFont()),
+            'font-size' => Settings::getDefaultFontSize() . 'pt',
+        ];
+        // Mpdf sometimes needs separate tag for body; doesn't harm others.
+        $bodyarray = $astarray;
+
+        $defaultWhiteSpace = $this->getParentWriter()->getDefaultWhiteSpace();
+        if ($defaultWhiteSpace) {
+            $astarray['white-space'] = $defaultWhiteSpace;
+        }
+
+        foreach ([
+            'body' => $bodyarray,
+            '*' => $astarray,
+            'a.NoteRef' => [
                 'text-decoration' => 'none',
-            ),
-            'hr' => array(
-                'height'     => '1px',
-                'padding'    => '0',
-                'margin'     => '1em 0',
-                'border'     => '0',
+            ],
+            'hr' => [
+                'height' => '1px',
+                'padding' => '0',
+                'margin' => '1em 0',
+                'border' => '0',
                 'border-top' => '1px solid #CCC',
-            ),
-            'table' => array(
-                'border'         => '1px solid black',
+            ],
+            'table' => [
+                'border' => '1px solid black',
                 'border-spacing' => '0px',
-                'width '         => '100%',
-            ),
-            'td' => array(
+                'width ' => '100%',
+            ],
+            'td' => [
                 'border' => '1px solid black',
-            ),
-        );
-        foreach ($defaultStyles as $selector => $style) {
+            ],
+        ] as $selector => $style) {
             $styleWriter = new GenericStyleWriter($style);
             $css .= $selector . ' {' . $styleWriter->write() . '}' . PHP_EOL;
         }
@@ -116,23 +128,81 @@ private function writeStyles()
         $customStyles = Style::getStyles();
         if (is_array($customStyles)) {
             foreach ($customStyles as $name => $style) {
+                $styleParagraph = null;
                 if ($style instanceof Font) {
                     $styleWriter = new FontStyleWriter($style);
                     if ($style->getStyleType() == 'title') {
                         $name = str_replace('Heading_', 'h', $name);
+                        $styleParagraph = $style->getParagraph();
+                        $style = $styleParagraph;
                     } else {
                         $name = '.' . $name;
                     }
                     $css .= "{$name} {" . $styleWriter->write() . '}' . PHP_EOL;
-                } elseif ($style instanceof Paragraph) {
+                }
+                if ($style instanceof Paragraph) {
                     $styleWriter = new ParagraphStyleWriter($style);
-                    $name = '.' . $name;
+                    $styleWriter->setParentWriter($this->getParentWriter());
+                    if (!$styleParagraph) {
+                        $name = '.' . $name;
+                    }
+                    if ($name === '.Normal') {
+                        $name = "p, $name";
+                    }
                     $css .= "{$name} {" . $styleWriter->write() . '}' . PHP_EOL;
                 }
+                if ($style instanceof Table) {
+                    $styleWriter = new TableStyleWriter($style);
+                    $css .= ".{$name} {" . $styleWriter->write() . '}' . PHP_EOL;
+                }
             }
         }
+
+        $css .= 'body > div + div {page-break-before: always;}' . PHP_EOL;
+        $css .= 'div > *:first-child {page-break-before: auto;}' . PHP_EOL;
+
+        $sectionNum = 0;
+        foreach ($this->getParentWriter()->getPhpWord()->getSections() as $section) {
+            ++$sectionNum;
+
+            $css .= "@page page$sectionNum {";
+
+            $paperSize = $section->getStyle()->getPaperSize();
+            $orientation = $section->getStyle()->getOrientation();
+            if ($this->getParentWriter()->isPdf()) {
+                if ($orientation === 'landscape') {
+                    $paperSize .= '-L';
+                }
+                $css .= "sheet-size: $paperSize; ";
+            } else {
+                $css .= "size: $paperSize $orientation; ";
+            }
+
+            $css .= 'margin-right: ' . (string) ($section->getStyle()->getMarginRight() / Converter::INCH_TO_TWIP) . 'in; ';
+            $css .= 'margin-left: ' . (string) ($section->getStyle()->getMarginLeft() / Converter::INCH_TO_TWIP) . 'in; ';
+            $css .= 'margin-top: ' . (string) ($section->getStyle()->getMarginTop() / Converter::INCH_TO_TWIP) . 'in; ';
+            $css .= 'margin-bottom: ' . (string) ($section->getStyle()->getMarginBottom() / Converter::INCH_TO_TWIP) . 'in; ';
+            $css .= '}' . PHP_EOL;
+        }
+
         $css .= '</style>' . PHP_EOL;
 
         return $css;
     }
+
+    /**
+     * Set font and alternates for css font-family.
+     */
+    private function getFontFamily(string $font, string $genericFont): string
+    {
+        if (empty($font)) {
+            return '';
+        }
+        $fontfamily = "'" . htmlspecialchars($font, ENT_QUOTES, 'UTF-8') . "'";
+        if (!empty($genericFont)) {
+            $fontfamily .= ", $genericFont";
+        }
+
+        return $fontfamily;
+    }
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Style/AbstractStyle.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Style/AbstractStyle.php
index cfb54cb8d7..a650786769 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Style/AbstractStyle.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Style/AbstractStyle.php
@@ -11,44 +11,47 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\HTML\Style;
 
-use PhpOffice\PhpWord\Style\AbstractStyle as Style;
+use PhpOffice\PhpWord\Style\AbstractStyle as StyleAbstract;
+use PhpOffice\PhpWord\Writer\HTML;
 
 /**
- * Style writer
+ * Style writer.
  *
  * @since 0.10.0
  */
 abstract class AbstractStyle
 {
     /**
-     * Parent writer
+     * Parent writer.
      *
-     * @var \PhpOffice\PhpWord\Writer\AbstractWriter
+     * @var HTML
      */
     private $parentWriter;
 
     /**
-     * Style
+     * Style.
      *
-     * @var array|\PhpOffice\PhpWord\Style\AbstractStyle
+     * @var null|array|StyleAbstract
      */
     private $style;
 
     /**
-     * Write style
+     * Write style.
+     *
+     * @return mixed
      */
     abstract public function write();
 
     /**
-     * Create new instance
+     * Create new instance.
      *
-     * @param array|\PhpOffice\PhpWord\Style\AbstractStyle $style
+     * @param array|StyleAbstract $style
      */
     public function __construct($style = null)
     {
@@ -58,17 +61,17 @@ public function __construct($style = null)
     /**
      * Set parent writer.
      *
-     * @param \PhpOffice\PhpWord\Writer\AbstractWriter $writer
+     * @param HTML $writer
      */
-    public function setParentWriter($writer)
+    public function setParentWriter($writer): void
     {
         $this->parentWriter = $writer;
     }
 
     /**
-     * Get parent writer
+     * Get parent writer.
      *
-     * @return \PhpOffice\PhpWord\Writer\AbstractWriter
+     * @return HTML
      */
     public function getParentWriter()
     {
@@ -76,13 +79,13 @@ public function getParentWriter()
     }
 
     /**
-     * Get style
+     * Get style.
      *
-     * @return array|\PhpOffice\PhpWord\Style\AbstractStyle $style
+     * @return null|array|string|StyleAbstract
      */
     public function getStyle()
     {
-        if (!$this->style instanceof Style && !is_array($this->style)) {
+        if (!$this->style instanceof StyleAbstract && !is_array($this->style)) {
             return '';
         }
 
@@ -90,14 +93,15 @@ public function getStyle()
     }
 
     /**
-     * Takes array where of CSS properties / values and converts to CSS string
+     * Takes array where of CSS properties / values and converts to CSS string.
      *
      * @param array $css
+     *
      * @return string
      */
     protected function assembleCss($css)
     {
-        $pairs = array();
+        $pairs = [];
         $string = '';
         foreach ($css as $key => $value) {
             if ($value != '') {
@@ -114,8 +118,9 @@ protected function assembleCss($css)
     /**
      * Get value if ...
      *
-     * @param bool|null $condition
+     * @param null|bool $condition
      * @param string $value
+     *
      * @return string
      */
     protected function getValueIf($condition, $value)
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Style/Font.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Style/Font.php
index 75c98b9bdc..eb59d02d1e 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Style/Font.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Style/Font.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,14 +20,14 @@
 use PhpOffice\PhpWord\Style\Font as FontStyle;
 
 /**
- * Font style HTML writer
+ * Font style HTML writer.
  *
  * @since 0.10.0
  */
 class Font extends AbstractStyle
 {
     /**
-     * Write style
+     * Write style.
      *
      * @return string
      */
@@ -37,16 +37,16 @@ public function write()
         if (!$style instanceof FontStyle) {
             return '';
         }
-        $css = array();
+        $css = [];
 
-        $font = $style->getName();
+        $font = $this->getFontFamily($style->getName(), $style->getFallbackFont());
         $size = $style->getSize();
         $color = $style->getColor();
         $fgColor = $style->getFgColor();
         $underline = $style->getUnderline() != FontStyle::UNDERLINE_NONE;
         $lineThrough = $style->isStrikethrough() || $style->isDoubleStrikethrough();
 
-        $css['font-family'] = $this->getValueIf($font !== null, "'{$font}'");
+        $css['font-family'] = $this->getValueIf(!empty($font), $font);
         $css['font-size'] = $this->getValueIf($size !== null, "{$size}pt");
         $css['color'] = $this->getValueIf($color !== null, "#{$color}");
         $css['background'] = $this->getValueIf($fgColor != '', $fgColor);
@@ -61,10 +61,35 @@ public function write()
         $css['text-transform'] = $this->getValueIf($style->isAllCaps(), 'uppercase');
         $css['font-variant'] = $this->getValueIf($style->isSmallCaps(), 'small-caps');
         $css['display'] = $this->getValueIf($style->isHidden(), 'none');
+        $whitespace = $style->getWhiteSpace();
+        if ($whitespace) {
+            $css['white-space'] = $whitespace;
+        }
 
         $spacing = $style->getSpacing();
-        $css['letter-spacing'] = $this->getValueIf(!is_null($spacing), ($spacing / 20) . 'pt');
+        $css['letter-spacing'] = $this->getValueIf(null !== $spacing, ($spacing / 20) . 'pt');
+        if ($style->isRTL()) {
+            $css['direction'] = 'rtl';
+        } elseif ($style->isRTL() === false) {
+            $css['direction'] = 'ltr';
+        }
 
         return $this->assembleCss($css);
     }
+
+    /**
+     * Set font and alternates for css font-family.
+     */
+    private function getFontFamily(?string $font, string $genericFont): string
+    {
+        if (empty($font)) {
+            return '';
+        }
+        $fontfamily = "'" . htmlspecialchars($font, ENT_QUOTES, 'UTF-8') . "'";
+        if (!empty($genericFont)) {
+            $fontfamily .= ", $genericFont";
+        }
+
+        return $fontfamily;
+    }
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Style/Generic.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Style/Generic.php
index ee5d089607..cc81c31996 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Style/Generic.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Style/Generic.php
@@ -11,28 +11,28 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\HTML\Style;
 
 /**
- * Generic style writer
+ * Generic style writer.
  *
  * @since 0.10.0
  */
 class Generic extends AbstractStyle
 {
     /**
-     * Write style
+     * Write style.
      *
      * @return string
      */
     public function write()
     {
         $style = $this->getStyle();
-        $css = array();
+        $css = [];
 
         if (is_array($style) && !empty($style)) {
             $css = $style;
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Style/Image.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Style/Image.php
index 93747b4645..c45a7a8cec 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Style/Image.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Style/Image.php
@@ -11,21 +11,21 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\HTML\Style;
 
 /**
- * Paragraph style HTML writer
+ * Paragraph style HTML writer.
  *
  * @since 0.10.0
  */
 class Image extends AbstractStyle
 {
     /**
-     * Write style
+     * Write style.
      *
      * @return string
      */
@@ -35,7 +35,7 @@ public function write()
         if (!$style instanceof \PhpOffice\PhpWord\Style\Image) {
             return '';
         }
-        $css = array();
+        $css = [];
 
         $width = $style->getWidth();
         $height = $style->getHeight();
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Style/Paragraph.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Style/Paragraph.php
index 863ef93b14..07d91f5487 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Style/Paragraph.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Style/Paragraph.php
@@ -11,23 +11,25 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\HTML\Style;
 
+use PhpOffice\PhpWord\Shared\Converter;
 use PhpOffice\PhpWord\SimpleType\Jc;
+use PhpOffice\PhpWord\Writer\PDF\TCPDF;
 
 /**
- * Paragraph style HTML writer
+ * Paragraph style HTML writer.
  *
  * @since 0.10.0
  */
 class Paragraph extends AbstractStyle
 {
     /**
-     * Write style
+     * Write style.
      *
      * @return string
      */
@@ -37,7 +39,7 @@ public function write()
         if (!$style instanceof \PhpOffice\PhpWord\Style\Paragraph) {
             return '';
         }
-        $css = array();
+        $css = [];
 
         // Alignment
         if ('' !== $style->getAlignment()) {
@@ -46,22 +48,33 @@ public function write()
             switch ($style->getAlignment()) {
                 case Jc::CENTER:
                     $textAlign = 'center';
+
                     break;
                 case Jc::END:
+                    $textAlign = $style->isBidi() ? 'left' : 'right';
+
+                    break;
                 case Jc::MEDIUM_KASHIDA:
                 case Jc::HIGH_KASHIDA:
                 case Jc::LOW_KASHIDA:
                 case Jc::RIGHT:
                     $textAlign = 'right';
+
                     break;
                 case Jc::BOTH:
                 case Jc::DISTRIBUTE:
                 case Jc::THAI_DISTRIBUTE:
                 case Jc::JUSTIFY:
                     $textAlign = 'justify';
+
                     break;
-                default: //all others, align left
+                case Jc::LEFT:
                     $textAlign = 'left';
+
+                    break;
+                default: //all others, including Jc::START
+                    $textAlign = $style->isBidi() ? 'right' : 'left';
+
                     break;
             }
 
@@ -70,14 +83,37 @@ public function write()
 
         // Spacing
         $spacing = $style->getSpace();
-        if (!is_null($spacing)) {
+        if (null !== $spacing) {
             $before = $spacing->getBefore();
             $after = $spacing->getAfter();
-            $css['margin-top'] = $this->getValueIf(!is_null($before), ($before / 20) . 'pt');
-            $css['margin-bottom'] = $this->getValueIf(!is_null($after), ($after / 20) . 'pt');
-        } else {
-            $css['margin-top'] = '0';
-            $css['margin-bottom'] = '0';
+            $css['margin-top'] = $this->getValueIf(null !== $before, ($before / 20) . 'pt');
+            $css['margin-bottom'] = $this->getValueIf(null !== $after, ($after / 20) . 'pt');
+        }
+
+        // Line Height
+        $lineHeight = $style->getLineHeight();
+        if (!empty($lineHeight)) {
+            $css['line-height'] = $lineHeight;
+        }
+
+        // Indentation (Margin)
+        $indentation = $style->getIndentation();
+        if ($indentation) {
+            $inches = $indentation->getLeft() * 1.0 / Converter::INCH_TO_TWIP;
+            $css[$this->getParentWriter() instanceof TCPDF ? 'text-indent' : 'margin-left'] = ((string) $inches) . 'in';
+
+            $inches = $indentation->getRight() * 1.0 / Converter::INCH_TO_TWIP;
+            $css['margin-right'] = ((string) $inches) . 'in';
+        }
+
+        // Page Break Before
+        if ($style->hasPageBreakBefore()) {
+            $css['page-break-before'] = 'always';
+        }
+
+        // Bidirectional
+        if ($style->isBidi()) {
+            $css['direction'] = 'rtl';
         }
 
         return $this->assembleCss($css);
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Style/Table.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Style/Table.php
new file mode 100644
index 0000000000..d2c318a69f
--- /dev/null
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/HTML/Style/Table.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @see         https://github.com/PHPOffice/PHPWord
+ *
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+declare(strict_types=1);
+
+namespace PhpOffice\PhpWord\Writer\HTML\Style;
+
+use PhpOffice\PhpWord\Style\Cell as StyleCell;
+use PhpOffice\PhpWord\Style\Table as StyleTable;
+
+class Table extends AbstractStyle
+{
+    /**
+     * @return string
+     */
+    public function write()
+    {
+        $style = $this->getStyle();
+        if (!$style instanceof StyleTable && !$style instanceof StyleCell) {
+            return '';
+        }
+
+        $css = [];
+        if (is_object($style) && method_exists($style, 'getLayout')) {
+            if ($style->getLayout() == StyleTable::LAYOUT_FIXED) {
+                $css['table-layout'] = 'fixed';
+            } elseif ($style->getLayout() == StyleTable::LAYOUT_AUTO) {
+                $css['table-layout'] = 'auto';
+            }
+        }
+        if (is_object($style) && method_exists($style, 'isBidiVisual')) {
+            if ($style->isBidiVisual()) {
+                $css['direction'] = 'rtl';
+            }
+        }
+
+        foreach (['Top', 'Left', 'Bottom', 'Right'] as $direction) {
+            $method = 'getBorder' . $direction . 'Style';
+            if (method_exists($style, $method)) {
+                $outval = $style->{$method}();
+                if ($outval === 'single') {
+                    $outval = 'solid';
+                }
+                if (is_string($outval) && 1 == preg_match('/^[a-z]+$/', $outval)) {
+                    $css['border-' . lcfirst($direction) . '-style'] = $outval;
+                }
+            }
+
+            $method = 'getBorder' . $direction . 'Color';
+            if (method_exists($style, $method)) {
+                $outval = $style->{$method}();
+                if (is_string($outval) && 1 == preg_match('/^[a-z]+$/', $outval)) {
+                    $css['border-' . lcfirst($direction) . '-color'] = $outval;
+                }
+            }
+
+            $method = 'getBorder' . $direction . 'Size';
+            if (method_exists($style, $method)) {
+                $outval = $style->{$method}();
+                if (is_numeric($outval)) {
+                    // size is in twips - divide by 20 to get points
+                    $css['border-' . lcfirst($direction) . '-width'] = ((string) ($outval / 20)) . 'pt';
+                }
+            }
+        }
+
+        return $this->assembleCss($css);
+    }
+}
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText.php
index efd0d6a923..616119e5cc 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText.php
@@ -11,44 +11,51 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer;
 
+use PhpOffice\Math\Writer\MathML;
+use PhpOffice\PhpWord\Element\AbstractElement;
+use PhpOffice\PhpWord\Element\Formula;
 use PhpOffice\PhpWord\Media;
 use PhpOffice\PhpWord\PhpWord;
+use PhpOffice\PhpWord\Writer\ODText\Part\AbstractPart;
 
 /**
- * ODText writer
+ * ODText writer.
  *
  * @since 0.7.0
  */
 class ODText extends AbstractWriter implements WriterInterface
 {
     /**
-     * Create new ODText writer
-     *
-     * @param \PhpOffice\PhpWord\PhpWord $phpWord
+     * @var AbstractElement[]
+     */
+    protected $objects = [];
+
+    /**
+     * Create new ODText writer.
      */
-    public function __construct(PhpWord $phpWord = null)
+    public function __construct(?PhpWord $phpWord = null)
     {
         // Assign PhpWord
         $this->setPhpWord($phpWord);
 
         // Create parts
-        $this->parts = array(
-            'Mimetype'  => 'mimetype',
-            'Content'   => 'content.xml',
-            'Meta'      => 'meta.xml',
-            'Styles'    => 'styles.xml',
-            'Manifest'  => 'META-INF/manifest.xml',
-        );
+        $this->parts = [
+            'Mimetype' => 'mimetype',
+            'Content' => 'content.xml',
+            'Meta' => 'meta.xml',
+            'Styles' => 'styles.xml',
+            'Manifest' => 'META-INF/manifest.xml',
+        ];
         foreach (array_keys($this->parts) as $partName) {
-            $partClass = get_class($this) . '\\Part\\' . $partName;
+            $partClass = static::class . '\\Part\\' . $partName;
             if (class_exists($partClass)) {
-                /** @var $partObject \PhpOffice\PhpWord\Writer\ODText\Part\AbstractPart Type hint */
+                /** @var \PhpOffice\PhpWord\Writer\ODText\Part\AbstractPart $partObject Type hint */
                 $partObject = new $partClass();
                 $partObject->setParentWriter($this);
                 $this->writerParts[strtolower($partName)] = $partObject;
@@ -56,15 +63,13 @@ public function __construct(PhpWord $phpWord = null)
         }
 
         // Set package paths
-        $this->mediaPaths = array('image' => 'Pictures/');
+        $this->mediaPaths = ['image' => 'Pictures/'];
     }
 
     /**
      * Save PhpWord to file.
-     *
-     * @param string $filename
      */
-    public function save($filename = null)
+    public function save(string $filename): void
     {
         $filename = $this->getTempFile($filename);
         $zip = $this->getZipArchive($filename);
@@ -77,8 +82,28 @@ public function save($filename = null)
 
         // Write parts
         foreach ($this->parts as $partName => $fileName) {
-            if ($fileName != '') {
-                $zip->addFromString($fileName, $this->getWriterPart($partName)->write());
+            if ($fileName === '') {
+                continue;
+            }
+            $part = $this->getWriterPart($partName);
+            if (!$part instanceof AbstractPart) {
+                continue;
+            }
+
+            $part->setObjects($this->objects);
+
+            $zip->addFromString($fileName, $part->write());
+
+            $this->objects = $part->getObjects();
+        }
+
+        // Write objects charts
+        if (!empty($this->objects)) {
+            $writer = new MathML();
+            foreach ($this->objects as $idxObject => $object) {
+                if ($object instanceof Formula) {
+                    $zip->addFromString('Formula' . $idxObject . '/content.xml', $writer->write($object->getMath()));
+                }
             }
         }
 
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/AbstractElement.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/AbstractElement.php
index 9c9fc1c477..5cd396aa51 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/AbstractElement.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/AbstractElement.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,7 +20,7 @@
 use PhpOffice\PhpWord\Writer\Word2007\Element\AbstractElement as Word2007AbstractElement;
 
 /**
- * Abstract element writer
+ * Abstract element writer.
  *
  * @since 0.11.0
  */
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/Container.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/Container.php
index 6ba8124f0f..6e6b88eabc 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/Container.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/Container.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,14 +20,14 @@
 use PhpOffice\PhpWord\Writer\Word2007\Element\Container as Word2007Container;
 
 /**
- * Container element writer (section, textrun, header, footnote, cell, etc.)
+ * Container element writer (section, textrun, header, footnote, cell, etc.).
  *
  * @since 0.11.0
  */
 class Container extends Word2007Container
 {
     /**
-     * Namespace; Can't use __NAMESPACE__ in inherited class (ODText)
+     * Namespace; Can't use __NAMESPACE__ in inherited class (ODText).
      *
      * @var string
      */
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/Field.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/Field.php
index f7a74c1d66..46f62b0f02 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/Field.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/Field.php
@@ -11,11 +11,11 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 // Not fully implemented
-//     - supports only PAGE and NUMPAGES
+//     - supports only PAGE, NUMPAGES, DATE and FILENAME
 //     - supports only default formats and options
 //     - supports style only if specified by name
 //     - spaces before and after field may be dropped
@@ -23,7 +23,7 @@
 namespace PhpOffice\PhpWord\Writer\ODText\Element;
 
 /**
- * Field element writer
+ * Field element writer.
  *
  * @since 0.11.0
  */
@@ -32,7 +32,7 @@ class Field extends Text
     /**
      * Write field element.
      */
-    public function write()
+    public function write(): void
     {
         $element = $this->getElement();
         if (!$element instanceof \PhpOffice\PhpWord\Element\Field) {
@@ -44,12 +44,14 @@ public function write()
             case 'date':
             case 'page':
             case 'numpages':
+            case 'filename':
                 $this->writeDefault($element, $type);
+
                 break;
         }
     }
 
-    private function writeDefault(\PhpOffice\PhpWord\Element\Field $element, $type)
+    private function writeDefault(\PhpOffice\PhpWord\Element\Field $element, $type): void
     {
         $xmlWriter = $this->getXmlWriter();
 
@@ -65,15 +67,30 @@ private function writeDefault(\PhpOffice\PhpWord\Element\Field $element, $type)
                 $xmlWriter->startElement('text:date');
                 $xmlWriter->writeAttribute('text:fixed', 'false');
                 $xmlWriter->endElement();
+
                 break;
             case 'page':
                 $xmlWriter->startElement('text:page-number');
                 $xmlWriter->writeAttribute('text:fixed', 'false');
                 $xmlWriter->endElement();
+
                 break;
             case 'numpages':
                 $xmlWriter->startElement('text:page-count');
                 $xmlWriter->endElement();
+
+                break;
+            case 'filename':
+                $xmlWriter->startElement('text:file-name');
+                $xmlWriter->writeAttribute('text:fixed', 'false');
+                $options = $element->getOptions();
+                if ($options != null && in_array('Path', $options)) {
+                    $xmlWriter->writeAttribute('text:display', 'full');
+                } else {
+                    $xmlWriter->writeAttribute('text:display', 'name');
+                }
+                $xmlWriter->endElement();
+
                 break;
         }
         $xmlWriter->endElement(); // text:span
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/Formula.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/Formula.php
new file mode 100644
index 0000000000..ddb1d81aee
--- /dev/null
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/Formula.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @see         https://github.com/PHPOffice/PHPWord
+ *
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\Writer\ODText\Element;
+
+use PhpOffice\PhpWord\Element\Formula as ElementFormula;
+use PhpOffice\PhpWord\Shared\Converter;
+use PhpOffice\PhpWord\Writer\ODText\Part\AbstractPart;
+
+/**
+ * Formula element writer.
+ *
+ * @since 0.10.0
+ */
+class Formula extends AbstractElement
+{
+    /**
+     * Write element.
+     */
+    public function write(): void
+    {
+        $xmlWriter = $this->getXmlWriter();
+        $element = $this->getElement();
+        if (!$element instanceof ElementFormula) {
+            return;
+        }
+
+        $part = $this->getPart();
+        if (!$part instanceof AbstractPart) {
+            return;
+        }
+
+        $objectIdx = $part->addObject($element);
+
+        //$style = $element->getStyle();
+        //$width = Converter::pixelToCm($style->getWidth());
+        //$height = Converter::pixelToCm($style->getHeight());
+
+        $xmlWriter->startElement('text:p');
+        $xmlWriter->writeAttribute('text:style-name', 'OB' . $objectIdx);
+
+        $xmlWriter->startElement('draw:frame');
+        $xmlWriter->writeAttribute('draw:name', $element->getElementId());
+        $xmlWriter->writeAttribute('text:anchor-type', 'as-char');
+        //$xmlWriter->writeAttribute('svg:width', $width . 'cm');
+        //$xmlWriter->writeAttribute('svg:height', $height . 'cm');
+        //$xmlWriter->writeAttribute('draw:z-index', $mediaIndex);
+
+        $xmlWriter->startElement('draw:object');
+        $xmlWriter->writeAttribute('xlink:href', 'Formula' . $objectIdx);
+        $xmlWriter->writeAttribute('xlink:type', 'simple');
+        $xmlWriter->writeAttribute('xlink:show', 'embed');
+        $xmlWriter->writeAttribute('xlink:actuate', 'onLoad');
+        $xmlWriter->endElement(); // draw:object
+
+        $xmlWriter->endElement(); // draw:frame
+
+        $xmlWriter->endElement(); // text:p
+    }
+}
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/Image.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/Image.php
index 57aa546a4e..051c79ce57 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/Image.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/Image.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,16 +20,16 @@
 use PhpOffice\PhpWord\Shared\Converter;
 
 /**
- * Image element writer
+ * Image element writer.
  *
  * @since 0.10.0
  */
 class Image extends AbstractElement
 {
     /**
-     * Write element
+     * Write element.
      */
-    public function write()
+    public function write(): void
     {
         $xmlWriter = $this->getXmlWriter();
         $element = $this->getElement();
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/Link.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/Link.php
index 23c9804b2d..0375b11bc1 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/Link.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/Link.php
@@ -11,23 +11,23 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\ODText\Element;
 
 /**
- * Text element writer
+ * Text element writer.
  *
  * @since 0.10.0
  */
 class Link extends AbstractElement
 {
     /**
-     * Write element
+     * Write element.
      */
-    public function write()
+    public function write(): void
     {
         $xmlWriter = $this->getXmlWriter();
         $element = $this->getElement();
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/PageBreak.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/PageBreak.php
index 8e4f46950c..367106c0fd 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/PageBreak.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/PageBreak.php
@@ -11,21 +11,21 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\ODText\Element;
 
 /**
- * PageBreak element writer
+ * PageBreak element writer.
  */
 class PageBreak extends AbstractElement
 {
     /**
-     * Write element
+     * Write element.
      */
-    public function write()
+    public function write(): void
     {
         $xmlWriter = $this->getXmlWriter();
 
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/Table.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/Table.php
index adcf8ab4e3..e12ae24b58 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/Table.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/Table.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -22,16 +22,16 @@
 use PhpOffice\PhpWord\Shared\XMLWriter;
 
 /**
- * Table element writer
+ * Table element writer.
  *
  * @since 0.10.0
  */
 class Table extends AbstractElement
 {
     /**
-     * Write element
+     * Write element.
      */
-    public function write()
+    public function write(): void
     {
         $xmlWriter = $this->getXmlWriter();
         $element = $this->getElement();
@@ -44,7 +44,7 @@ public function write()
         if ($rowCount > 0) {
             $xmlWriter->startElement('table:table');
             $xmlWriter->writeAttribute('table:name', $element->getElementId());
-            $xmlWriter->writeAttribute('table:style', $element->getElementId());
+            $xmlWriter->writeAttribute('table:style-name', $element->getElementId());
 
             // Write columns
             $this->writeColumns($xmlWriter, $element);
@@ -59,15 +59,12 @@ public function write()
 
     /**
      * Write column.
-     *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
-     * @param \PhpOffice\PhpWord\Element\Table $element
      */
-    private function writeColumns(XMLWriter $xmlWriter, TableElement $element)
+    private function writeColumns(XMLWriter $xmlWriter, TableElement $element): void
     {
         $colCount = $element->countColumns();
 
-        for ($i = 0; $i < $colCount; $i++) {
+        for ($i = 0; $i < $colCount; ++$i) {
             $xmlWriter->startElement('table:table-column');
             $xmlWriter->writeAttribute('table:style-name', $element->getElementId() . '.' . $i);
             $xmlWriter->endElement();
@@ -76,14 +73,11 @@ private function writeColumns(XMLWriter $xmlWriter, TableElement $element)
 
     /**
      * Write row.
-     *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
-     * @param \PhpOffice\PhpWord\Element\Row $row
      */
-    private function writeRow(XMLWriter $xmlWriter, RowElement $row)
+    private function writeRow(XMLWriter $xmlWriter, RowElement $row): void
     {
         $xmlWriter->startElement('table:table-row');
-        /** @var $row \PhpOffice\PhpWord\Element\Row Type hint */
+        /** @var \PhpOffice\PhpWord\Element\Row $row Type hint */
         foreach ($row->getCells() as $cell) {
             $xmlWriter->startElement('table:table-cell');
             $xmlWriter->writeAttribute('office:value-type', 'string');
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/Text.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/Text.php
index 464d277739..75fb930856 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/Text.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/Text.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -21,16 +21,16 @@
 use PhpOffice\PhpWord\Exception\Exception;
 
 /**
- * Text element writer
+ * Text element writer.
  *
  * @since 0.10.0
  */
 class Text extends AbstractElement
 {
     /**
-     * Write element
+     * Write element.
      */
-    public function write()
+    public function write(): void
     {
         $xmlWriter = $this->getXmlWriter();
         $element = $this->getElement();
@@ -96,7 +96,7 @@ public function write()
         }
     }
 
-    private function replacetabs($text, $xmlWriter)
+    private function replacetabs($text, $xmlWriter): void
     {
         if (preg_match('/^ +/', $text, $matches)) {
             $num = strlen($matches[0]);
@@ -114,6 +114,7 @@ private function replacetabs($text, $xmlWriter)
                 $xmlWriter->writeElement('text:tab');
             } elseif ($match[2] === ' ') {
                 $xmlWriter->writeElement('text:s');
+
                 break;
             } else {
                 $num = strlen($match[2]);
@@ -124,7 +125,7 @@ private function replacetabs($text, $xmlWriter)
         }
     }
 
-    private function writeChangeInsertion($start = true, TrackChange $trackChange = null)
+    private function writeChangeInsertion($start = true, ?TrackChange $trackChange = null): void
     {
         if ($trackChange == null || $trackChange->getChangeType() != TrackChange::INSERTED) {
             return;
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/TextBreak.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/TextBreak.php
index 80cd13870a..1bfe398857 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/TextBreak.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/TextBreak.php
@@ -11,23 +11,23 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\ODText\Element;
 
 /**
- * TextBreak element writer
+ * TextBreak element writer.
  *
  * @since 0.10.0
  */
 class TextBreak extends AbstractElement
 {
     /**
-     * Write element
+     * Write element.
      */
-    public function write()
+    public function write(): void
     {
         $xmlWriter = $this->getXmlWriter();
 
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/TextRun.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/TextRun.php
index 9a00577302..6d1e1a191a 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/TextRun.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/TextRun.php
@@ -11,23 +11,23 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\ODText\Element;
 
 /**
- * TextRun element writer
+ * TextRun element writer.
  *
  * @since 0.10.0
  */
 class TextRun extends Text
 {
     /**
-     * Write element
+     * Write element.
      */
-    public function write()
+    public function write(): void
     {
         $xmlWriter = $this->getXmlWriter();
         $element = $this->getElement();
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/Title.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/Title.php
index 98ddbbf445..ebe7dc4d5f 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/Title.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Element/Title.php
@@ -11,23 +11,23 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\ODText\Element;
 
 /**
- * Title element writer
+ * Title element writer.
  *
  * @since 0.11.0
  */
 class Title extends AbstractElement
 {
     /**
-     * Write element
+     * Write element.
      */
-    public function write()
+    public function write(): void
     {
         $xmlWriter = $this->getXmlWriter();
         $element = $this->getElement();
@@ -55,7 +55,8 @@ public function write()
         $text = $element->getText();
         if (is_string($text)) {
             $this->writeText($text);
-        } elseif ($text instanceof \PhpOffice\PhpWord\Element\AbstractContainer) {
+        }
+        if ($text instanceof \PhpOffice\PhpWord\Element\AbstractContainer) {
             $containerWriter = new Container($xmlWriter, $text);
             $containerWriter->write();
         }
@@ -64,10 +65,9 @@ public function write()
     }
 
     /**
-     * Test if element is same as first element in array
+     * Test if element is same as first element in array.
      *
      * @param \PhpOffice\PhpWord\Element\AbstractElement $elem
-     *
      * @param \PhpOffice\PhpWord\Element\AbstractElement[] $elemarray
      *
      * @return bool
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Part/AbstractPart.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Part/AbstractPart.php
index 4a7ace78ca..59035ff787 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Part/AbstractPart.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Part/AbstractPart.php
@@ -11,12 +11,13 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\ODText\Part;
 
+use PhpOffice\PhpWord\Element\AbstractElement;
 use PhpOffice\PhpWord\Settings;
 use PhpOffice\PhpWord\Shared\XMLWriter;
 use PhpOffice\PhpWord\Style;
@@ -24,10 +25,15 @@
 use PhpOffice\PhpWord\Writer\Word2007\Part\AbstractPart as Word2007AbstractPart;
 
 /**
- * ODText writer part abstract
+ * ODText writer part abstract.
  */
 abstract class AbstractPart extends Word2007AbstractPart
 {
+    /**
+     * @var AbstractElement[]
+     */
+    protected $objects = [];
+
     /**
      * @var string Date format
      */
@@ -35,10 +41,8 @@ abstract class AbstractPart extends Word2007AbstractPart
 
     /**
      * Write common root attributes.
-     *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
      */
-    protected function writeCommonRootAttributes(XMLWriter $xmlWriter)
+    protected function writeCommonRootAttributes(XMLWriter $xmlWriter): void
     {
         $xmlWriter->writeAttribute('office:version', '1.2');
         $xmlWriter->writeAttribute('xmlns:office', 'urn:oasis:names:tc:opendocument:xmlns:office:1.0');
@@ -71,20 +75,18 @@ protected function writeCommonRootAttributes(XMLWriter $xmlWriter)
 
     /**
      * Write font faces declaration.
-     *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
      */
-    protected function writeFontFaces(XMLWriter $xmlWriter)
+    protected function writeFontFaces(XMLWriter $xmlWriter): void
     {
         $xmlWriter->startElement('office:font-face-decls');
-        $fontTable = array();
+        $fontTable = [];
         $styles = Style::getStyles();
         $numFonts = 0;
         if (count($styles) > 0) {
             foreach ($styles as $style) {
                 // Font
                 if ($style instanceof Font) {
-                    $numFonts++;
+                    ++$numFonts;
                     $name = $style->getName();
                     if (!in_array($name, $fontTable)) {
                         $fontTable[] = $name;
@@ -106,4 +108,29 @@ protected function writeFontFaces(XMLWriter $xmlWriter)
         }
         $xmlWriter->endElement();
     }
+
+    public function addObject(AbstractElement $object): int
+    {
+        $this->objects[] = $object;
+
+        return count($this->objects) - 1;
+    }
+
+    /**
+     * @param AbstractElement[] $objects
+     */
+    public function setObjects(array $objects): self
+    {
+        $this->objects = $objects;
+
+        return $this;
+    }
+
+    /**
+     * @return AbstractElement[]
+     */
+    public function getObjects(): array
+    {
+        return $this->objects;
+    }
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Part/Content.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Part/Content.php
index b6a1c95e65..00871d9c52 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Part/Content.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Part/Content.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -34,23 +34,25 @@
 use PhpOffice\PhpWord\Writer\ODText\Style\Paragraph as ParagraphStyleWriter;
 
 /**
- * ODText content part writer: content.xml
+ * ODText content part writer: content.xml.
  */
 class Content extends AbstractPart
 {
     /**
-     * Auto style collection
+     * Auto style collection.
      *
      * Collect inline style information from section, image, and table elements
      *
      * @todo Merge font and paragraph styles
+     *
      * @var array
      */
-    private $autoStyles = array('Section' => array(), 'Image' => array(), 'Table' => array());
-    private $imageParagraphStyles = array();
+    private $autoStyles = ['Section' => [], 'Image' => [], 'Table' => []];
+
+    private $imageParagraphStyles = [];
 
     /**
-     * Write part
+     * Write part.
      *
      * @return string
      */
@@ -79,7 +81,7 @@ public function write()
         $xmlWriter->startElement('office:text');
 
         // Tracked changes declarations
-        $trackedChanges = array();
+        $trackedChanges = [];
         $sections = $phpWord->getSections();
         foreach ($sections as $section) {
             $this->collectTrackedChanges($section, $trackedChanges);
@@ -113,7 +115,7 @@ public function write()
         $xmlWriter->endElement(); // text:tracked-changes
 
         // Sequence declarations
-        $sequences = array('Illustration', 'Table', 'Text', 'Drawing');
+        $sequences = ['Illustration', 'Table', 'Text', 'Drawing'];
         $xmlWriter->startElement('text:sequence-decls');
         foreach ($sequences as $sequence) {
             $xmlWriter->startElement('text:sequence-decl');
@@ -133,8 +135,11 @@ public function write()
             $xmlWriter->startElement('text:p');
             $xmlWriter->writeAttribute('text:style-name', 'SB' . $section->getSectionId());
             $xmlWriter->endElement();
+
             $containerWriter = new Container($xmlWriter, $section);
+            $containerWriter->setPart($this);
             $containerWriter->write();
+
             $xmlWriter->endElement(); // text:section
         }
 
@@ -150,10 +155,8 @@ public function write()
      * Write automatic styles other than fonts and paragraphs.
      *
      * @since 0.11.0
-     *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
      */
-    private function writeAutoStyles(XMLWriter $xmlWriter)
+    private function writeAutoStyles(XMLWriter $xmlWriter): void
     {
         $xmlWriter->startElement('office:automatic-styles');
 
@@ -172,10 +175,8 @@ private function writeAutoStyles(XMLWriter $xmlWriter)
 
     /**
      * Write automatic styles.
-     *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
      */
-    private function writeTextStyles(XMLWriter $xmlWriter)
+    private function writeTextStyles(XMLWriter $xmlWriter): void
     {
         $styles = Style::getStyles();
         $paragraphStyleCount = 0;
@@ -200,7 +201,7 @@ private function writeTextStyles(XMLWriter $xmlWriter)
         }
 
         foreach ($styles as $style) {
-            $sty = $style->getStyleName();
+            $sty = (string) $style->getStyleName();
             if (substr($sty, 0, 8) === 'Heading_') {
                 $style = new Paragraph();
                 $style->setStyleName('HD' . substr($sty, 8));
@@ -224,7 +225,7 @@ private function writeTextStyles(XMLWriter $xmlWriter)
                     $styleWriter->write();
                 }
                 if ($style instanceof Paragraph) {
-                    $paragraphStyleCount++;
+                    ++$paragraphStyleCount;
                 }
             }
         }
@@ -236,10 +237,8 @@ private function writeTextStyles(XMLWriter $xmlWriter)
 
     /**
      * Get automatic styles.
-     *
-     * @param \PhpOffice\PhpWord\PhpWord $phpWord
      */
-    private function getAutoStyles(PhpWord $phpWord)
+    private function getAutoStyles(PhpWord $phpWord): void
     {
         $sections = $phpWord->getSections();
         $paragraphStyleCount = 0;
@@ -253,16 +252,17 @@ private function getAutoStyles(PhpWord $phpWord)
     }
 
     /**
-     * Get all styles of each elements in container recursively
+     * Get all styles of each elements in container recursively.
      *
      * Table style can be null or string of the style name
      *
      * @param \PhpOffice\PhpWord\Element\AbstractContainer $container
      * @param int $paragraphStyleCount
      * @param int $fontStyleCount
+     *
      * @todo Simplify the logic
      */
-    private function getContainerStyle($container, &$paragraphStyleCount, &$fontStyleCount)
+    private function getContainerStyle($container, &$paragraphStyleCount, &$fontStyleCount): void
     {
         $elements = $container->getElements();
         foreach ($elements as $element) {
@@ -283,7 +283,6 @@ private function getContainerStyle($container, &$paragraphStyleCount, &$fontStyl
                 $sty->setAlignment($style->getAlignment());
                 $this->imageParagraphStyles[] = $sty;
             } elseif ($element instanceof Table) {
-                /** @var \PhpOffice\PhpWord\Style\Table $style */
                 $style = $element->getStyle();
                 if (is_string($style)) {
                     $style = Style::getStyle($style);
@@ -299,13 +298,13 @@ private function getContainerStyle($container, &$paragraphStyleCount, &$fontStyl
     }
 
     /**
-     * Get style of individual element
+     * Get style of individual element.
      *
      * @param \PhpOffice\PhpWord\Element\Text $element
      * @param int $paragraphStyleCount
      * @param int $fontStyleCount
      */
-    private function getElementStyle($element, &$paragraphStyleCount, &$fontStyleCount)
+    private function getElementStyle($element, &$paragraphStyleCount, &$fontStyleCount): void
     {
         $fontStyle = $element->getFontStyle();
         $paragraphStyle = $element->getParagraphStyle();
@@ -315,7 +314,7 @@ private function getElementStyle($element, &$paragraphStyleCount, &$fontStyleCou
             // Font
             $name = $fontStyle->getStyleName();
             if (!$name) {
-                $fontStyleCount++;
+                ++$fontStyleCount;
                 $style = $phpWord->addFontStyle("T{$fontStyleCount}", $fontStyle, null);
                 $style->setAuto();
                 $style->setParagraph(null);
@@ -328,7 +327,7 @@ private function getElementStyle($element, &$paragraphStyleCount, &$fontStyleCou
             // Paragraph
             $name = $paragraphStyle->getStyleName();
             if (!$name) {
-                $paragraphStyleCount++;
+                ++$paragraphStyleCount;
                 $style = $phpWord->addParagraphStyle("P{$paragraphStyleCount}", $paragraphStyle);
                 $style->setAuto();
                 $element->setParagraphStyle("P{$paragraphStyleCount}");
@@ -336,7 +335,7 @@ private function getElementStyle($element, &$paragraphStyleCount, &$fontStyleCou
                 $element->setParagraphStyle($name);
             }
         } elseif ($paragraphStyle) {
-            $paragraphStyleCount++;
+            ++$paragraphStyleCount;
             $parstylename = "P$paragraphStyleCount" . "_$paragraphStyle";
             $style = $phpWord->addParagraphStyle($parstylename, $paragraphStyle);
             $style->setAuto();
@@ -345,13 +344,12 @@ private function getElementStyle($element, &$paragraphStyleCount, &$fontStyleCou
     }
 
     /**
-     * Get font style of individual field element
+     * Get font style of individual field element.
      *
      * @param \PhpOffice\PhpWord\Element\Field $element
-     * @param int $paragraphStyleCount
      * @param int $fontStyleCount
      */
-    private function getElementStyleField($element, &$fontStyleCount)
+    private function getElementStyleField($element, &$fontStyleCount): void
     {
         $fontStyle = $element->getFontStyle();
         $phpWord = $this->getParentWriter()->getPhpWord();
@@ -359,7 +357,7 @@ private function getElementStyleField($element, &$fontStyleCount)
         if ($fontStyle instanceof Font) {
             $name = $fontStyle->getStyleName();
             if (!$name) {
-                $fontStyleCount++;
+                ++$fontStyleCount;
                 $style = $phpWord->addFontStyle("T{$fontStyleCount}", $fontStyle, null);
                 $style->setAuto();
                 $style->setParagraph(null);
@@ -371,12 +369,12 @@ private function getElementStyleField($element, &$fontStyleCount)
     }
 
     /**
-     * Get style of individual element
+     * Get style of individual element.
      *
      * @param \PhpOffice\PhpWord\Element\TextRun $element
      * @param int $paragraphStyleCount
      */
-    private function getElementStyleTextRun($element, &$paragraphStyleCount)
+    private function getElementStyleTextRun($element, &$paragraphStyleCount): void
     {
         $paragraphStyle = $element->getParagraphStyle();
         $phpWord = $this->getParentWriter()->getPhpWord();
@@ -385,7 +383,7 @@ private function getElementStyleTextRun($element, &$paragraphStyleCount)
             // Paragraph
             $name = $paragraphStyle->getStyleName();
             if (!$name) {
-                $paragraphStyleCount++;
+                ++$paragraphStyleCount;
                 $style = $phpWord->addParagraphStyle("P{$paragraphStyleCount}", $paragraphStyle);
                 $style->setAuto();
                 $element->setParagraphStyle("P{$paragraphStyleCount}");
@@ -393,7 +391,7 @@ private function getElementStyleTextRun($element, &$paragraphStyleCount)
                 $element->setParagraphStyle($name);
             }
         } elseif ($paragraphStyle) {
-            $paragraphStyleCount++;
+            ++$paragraphStyleCount;
             $parstylename = "P$paragraphStyleCount" . "_$paragraphStyle";
             $style = $phpWord->addParagraphStyle($parstylename, $paragraphStyle);
             $style->setAuto();
@@ -402,19 +400,18 @@ private function getElementStyleTextRun($element, &$paragraphStyleCount)
     }
 
     /**
-     * Finds all tracked changes
+     * Finds all tracked changes.
      *
-     * @param AbstractContainer $container
      * @param \PhpOffice\PhpWord\Element\AbstractElement[] $trackedChanges
      */
-    private function collectTrackedChanges(AbstractContainer $container, &$trackedChanges = array())
+    private function collectTrackedChanges(AbstractContainer $container, &$trackedChanges = []): void
     {
         $elements = $container->getElements();
         foreach ($elements as $element) {
             if ($element->getTrackChange() != null) {
                 $trackedChanges[] = $element;
             }
-            if (is_callable(array($element, 'getElements'))) {
+            if (is_callable([$element, 'getElements'])) {
                 $this->collectTrackedChanges($element, $trackedChanges);
             }
         }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Part/Manifest.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Part/Manifest.php
index f952b4c072..37fb797935 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Part/Manifest.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Part/Manifest.php
@@ -11,27 +11,28 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\ODText\Part;
 
+use PhpOffice\PhpWord\Element\Formula;
 use PhpOffice\PhpWord\Media;
+use PhpOffice\PhpWord\Writer\ODText;
 
 /**
- * ODText manifest part writer: META-INF/manifest.xml
+ * ODText manifest part writer: META-INF/manifest.xml.
  */
 class Manifest extends AbstractPart
 {
     /**
-     * Write part
+     * Write part.
      *
      * @return string
      */
     public function write()
     {
-        $parts = array('content.xml', 'meta.xml', 'styles.xml');
         $xmlWriter = $this->getXmlWriter();
 
         $xmlWriter->startDocument('1.0', 'UTF-8');
@@ -46,7 +47,7 @@ public function write()
         $xmlWriter->endElement();
 
         // Parts
-        foreach ($parts as $part) {
+        foreach (['content.xml', 'meta.xml', 'styles.xml'] as $part) {
             $xmlWriter->startElement('manifest:file-entry');
             $xmlWriter->writeAttribute('manifest:media-type', 'text/xml');
             $xmlWriter->writeAttribute('manifest:full-path', $part);
@@ -64,6 +65,20 @@ public function write()
             }
         }
 
+        foreach ($this->getObjects() as $idxObject => $object) {
+            if ($object instanceof Formula) {
+                $xmlWriter->startElement('manifest:file-entry');
+                $xmlWriter->writeAttribute('manifest:full-path', 'Formula' . $idxObject . '/content.xml');
+                $xmlWriter->writeAttribute('manifest:media-type', 'text/xml');
+                $xmlWriter->endElement();
+                $xmlWriter->startElement('manifest:file-entry');
+                $xmlWriter->writeAttribute('manifest:full-path', 'Formula' . $idxObject . '/');
+                $xmlWriter->writeAttribute('manifest:version', '1.2');
+                $xmlWriter->writeAttribute('manifest:media-type', 'application/vnd.oasis.opendocument.formula');
+                $xmlWriter->endElement();
+            }
+        }
+
         $xmlWriter->endElement(); // manifest:manifest
 
         return $xmlWriter->getData();
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Part/Meta.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Part/Meta.php
index 8f3f1fb969..8a35d02a62 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Part/Meta.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Part/Meta.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,14 +20,14 @@
 use PhpOffice\PhpWord\Shared\XMLWriter;
 
 /**
- * ODText meta part writer: meta.xml
+ * ODText meta part writer: meta.xml.
  *
  * @since 0.11.0
  */
 class Meta extends AbstractPart
 {
     /**
-     * Write part
+     * Write part.
      *
      * @return string
      */
@@ -62,7 +62,7 @@ public function write()
         $xmlWriter->writeElement('meta:keyword', $docProps->getKeywords());
 
         // Category, company, and manager are put in meta namespace
-        $properties = array('Category', 'Company', 'Manager');
+        $properties = ['Category', 'Company', 'Manager'];
         foreach ($properties as $property) {
             $method = "get{$property}";
             if ($docProps->$method() !== null) {
@@ -84,15 +84,14 @@ public function write()
     }
 
     /**
-     * Write individual property
+     * Write individual property.
      *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
      * @param string $property
      * @param string $value
      *
      * @todo Handle other `$type`: double|date|dateTime|duration|boolean (4th arguments)
      */
-    private function writeCustomProperty(XMLWriter $xmlWriter, $property, $value)
+    private function writeCustomProperty(XMLWriter $xmlWriter, $property, $value): void
     {
         $xmlWriter->startElement('meta:user-defined');
         $xmlWriter->writeAttribute('meta:name', $property);
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Part/Mimetype.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Part/Mimetype.php
index 552f54403a..32676660f0 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Part/Mimetype.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Part/Mimetype.php
@@ -11,19 +11,19 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\ODText\Part;
 
 /**
- * ODText mimetype part writer: mimetype
+ * ODText mimetype part writer: mimetype.
  */
 class Mimetype extends AbstractPart
 {
     /**
-     * Write part
+     * Write part.
      *
      * @return string
      */
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Part/Styles.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Part/Styles.php
index befd23a2ac..e1538be67b 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Part/Styles.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Part/Styles.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -23,12 +23,12 @@
 use PhpOffice\PhpWord\Style;
 
 /**
- * ODText styles part writer: styles.xml
+ * ODText styles part writer: styles.xml.
  */
 class Styles extends AbstractPart
 {
     /**
-     * Write part
+     * Write part.
      *
      * @return string
      */
@@ -65,10 +65,8 @@ public function write()
 
     /**
      * Write default styles.
-     *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
      */
-    private function writeDefault(XMLWriter $xmlWriter)
+    private function writeDefault(XMLWriter $xmlWriter): void
     {
         $xmlWriter->startElement('style:default-style');
         $xmlWriter->writeAttribute('style:family', 'paragraph');
@@ -84,11 +82,11 @@ private function writeDefault(XMLWriter $xmlWriter)
         $xmlWriter->endElement(); // style:paragraph-properties
 
         $language = $this->getParentWriter()->getPhpWord()->getSettings()->getThemeFontLang();
-        $latinLang = $language != null && is_string($language->getLatin()) ? explode('-', $language->getLatin()) : array('fr', 'FR');
-        $asianLang = $language != null && is_string($language->getEastAsia()) ? explode('-', $language->getEastAsia()) : array('zh', 'CN');
-        $complexLang = $language != null && is_string($language->getBidirectional()) ? explode('-', $language->getBidirectional()) : array('hi', 'IN');
+        $latinLang = $language != null && is_string($language->getLatin()) ? explode('-', $language->getLatin()) : ['fr', 'FR'];
+        $asianLang = $language != null && is_string($language->getEastAsia()) ? explode('-', $language->getEastAsia()) : ['zh', 'CN'];
+        $complexLang = $language != null && is_string($language->getBidirectional()) ? explode('-', $language->getBidirectional()) : ['hi', 'IN'];
         if ($this->getParentWriter()->getPhpWord()->getSettings()->hasHideGrammaticalErrors()) {
-            $latinLang = $asianLang = $complexLang = array('zxx', 'none');
+            $latinLang = $asianLang = $complexLang = ['zxx', 'none'];
         }
 
         // Font
@@ -117,10 +115,8 @@ private function writeDefault(XMLWriter $xmlWriter)
 
     /**
      * Write named styles.
-     *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
      */
-    private function writeNamed(XMLWriter $xmlWriter)
+    private function writeNamed(XMLWriter $xmlWriter): void
     {
         $styles = Style::getStyles();
         if (count($styles) > 0) {
@@ -128,7 +124,7 @@ private function writeNamed(XMLWriter $xmlWriter)
                 if ($style->isAuto() === false) {
                     $styleClass = str_replace('\\Style\\', '\\Writer\\ODText\\Style\\', get_class($style));
                     if (class_exists($styleClass)) {
-                        /** @var $styleWriter \PhpOffice\PhpWord\Writer\ODText\Style\AbstractStyle Type hint */
+                        /** @var \PhpOffice\PhpWord\Writer\ODText\Style\AbstractStyle $styleWriter Type hint */
                         $styleWriter = new $styleClass($xmlWriter, $style);
                         $styleWriter->write();
                     }
@@ -138,9 +134,9 @@ private function writeNamed(XMLWriter $xmlWriter)
     }
 
     /**
-     * Convert int in twips to inches/cm then to string and append unit
+     * Convert int in twips to inches/cm then to string and append unit.
      *
-     * @param int|float $twips
+     * @param float|int $twips
      * @param float $factor
      * return string
      */
@@ -153,11 +149,9 @@ private static function cvttwiptostr($twips, $factor = 1.0)
     }
 
     /**
-     * call writePageLayoutIndiv to write page layout styles for each page
-     *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
+     * call writePageLayoutIndiv to write page layout styles for each page.
      */
-    private function writePageLayout(XMLWriter $xmlWriter)
+    private function writePageLayout(XMLWriter $xmlWriter): void
     {
         $sections = $this->getParentWriter()->getPhpWord()->getSections();
         $countsects = count($sections);
@@ -169,11 +163,10 @@ private function writePageLayout(XMLWriter $xmlWriter)
     /**
      * Write page layout styles.
      *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Element\Section $section
      * @param int $sectionNbr
      */
-    private function writePageLayoutIndiv(XMLWriter $xmlWriter, $section, $sectionNbr)
+    private function writePageLayoutIndiv(XMLWriter $xmlWriter, $section, $sectionNbr): void
     {
         $sty = $section->getStyle();
         if (count($section->getHeaders()) > 0) {
@@ -254,10 +247,8 @@ private function writePageLayoutIndiv(XMLWriter $xmlWriter, $section, $sectionNb
 
     /**
      * Write master style.
-     *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
      */
-    private function writeMaster(XMLWriter $xmlWriter)
+    private function writeMaster(XMLWriter $xmlWriter): void
     {
         $xmlWriter->startElement('office:master-styles');
 
@@ -282,6 +273,7 @@ private function writeMaster(XMLWriter $xmlWriter)
                     }
                 }
                 $xmlWriter->endElement(); // style:header
+
                 break;
             }
             foreach ($sections[$i]->getFooters() as $hdr) {
@@ -295,6 +287,7 @@ private function writeMaster(XMLWriter $xmlWriter)
                     }
                 }
                 $xmlWriter->endElement(); // style:footer
+
                 break;
             }
             $xmlWriter->endElement(); // style:master-page
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Style/AbstractStyle.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Style/AbstractStyle.php
index f7679ab22c..439434c986 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Style/AbstractStyle.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Style/AbstractStyle.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,7 +20,7 @@
 use PhpOffice\PhpWord\Writer\Word2007\Style\AbstractStyle as Word2007AbstractStyle;
 
 /**
- * Style writer
+ * Style writer.
  *
  * @since 0.10.0
  */
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Style/Font.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Style/Font.php
index ae9c417e9d..1d0d14de97 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Style/Font.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Style/Font.php
@@ -11,14 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\ODText\Style;
 
 /**
- * Font style writer
+ * Font style writer.
  *
  * @since 0.10.0
  */
@@ -27,7 +27,7 @@ class Font extends AbstractStyle
     /**
      * Write style.
      */
-    public function write()
+    public function write(): void
     {
         $style = $this->getStyle();
         if (!$style instanceof \PhpOffice\PhpWord\Style\Font) {
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Style/Image.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Style/Image.php
index 13005a7f03..79ddfc502e 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Style/Image.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Style/Image.php
@@ -11,14 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\ODText\Style;
 
 /**
- * Image style writer
+ * Image style writer.
  *
  * @since 0.11.0
  */
@@ -27,7 +27,7 @@ class Image extends AbstractStyle
     /**
      * Write style.
      */
-    public function write()
+    public function write(): void
     {
         /** @var \PhpOffice\PhpWord\Style\Image $style Type hint */
         $style = $this->getStyle();
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Style/Paragraph.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Style/Paragraph.php
index 9d38de86c5..4459c76c01 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Style/Paragraph.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Style/Paragraph.php
@@ -11,25 +11,38 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\ODText\Style;
 
+use PhpOffice\PhpWord\Settings;
 use PhpOffice\PhpWord\Shared\Converter;
+use PhpOffice\PhpWord\SimpleType\Jc;
+use PhpOffice\PhpWord\Style;
 
 /**
- * Font style writer
+ * Font style writer.
  *
  * @since 0.10.0
  */
 class Paragraph extends AbstractStyle
 {
+    private const BIDI_MAP = [
+        Jc::END => Jc::LEFT,
+        Jc::START => Jc::RIGHT,
+    ];
+
+    private const NON_BIDI_MAP = [
+        Jc::START => Jc::LEFT,
+        Jc::END => Jc::RIGHT,
+    ];
+
     /**
      * Write style.
      */
-    public function write()
+    public function write(): void
     {
         $style = $this->getStyle();
         if (!$style instanceof \PhpOffice\PhpWord\Style\Paragraph) {
@@ -42,7 +55,7 @@ public function write()
 
         $xmlWriter->startElement('style:style');
 
-        $styleName = $style->getStyleName();
+        $styleName = (string) $style->getStyleName();
         $styleAuto = false;
         $mpm = '';
         $psm = '';
@@ -111,8 +124,18 @@ public function write()
             $xmlWriter->writeAttributeIf($marginTop !== null, 'fo:margin-top', ($marginTop / $twipToPoint) . 'pt');
             $xmlWriter->writeAttributeIf($marginBottom !== null, 'fo:margin-bottom', ($marginBottom / $twipToPoint) . 'pt');
         }
-        $temp = $style->getAlignment();
-        $xmlWriter->writeAttributeIf($temp !== '', 'fo:text-align', $temp);
+        $alignment = $style->getAlignment();
+        $bidi = $style->isBidi();
+        $defaultRtl = Settings::isDefaultRtl();
+        if ($alignment === '' && $bidi !== null) {
+            $alignment = Jc::START;
+        }
+        if ($bidi) {
+            $alignment = self::BIDI_MAP[$alignment] ?? $alignment;
+        } elseif ($defaultRtl !== null) {
+            $alignment = self::NON_BIDI_MAP[$alignment] ?? $alignment;
+        }
+        $xmlWriter->writeAttributeIf($alignment !== '', 'fo:text-align', $alignment);
         $temp = $style->getLineHeight();
         $xmlWriter->writeAttributeIf($temp !== null, 'fo:line-height', ((string) ($temp * 100) . '%'));
         $xmlWriter->writeAttributeIf($style->hasPageBreakBefore() === true, 'fo:break-before', 'page');
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Style/Section.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Style/Section.php
index 92d8891170..0a250194fd 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Style/Section.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Style/Section.php
@@ -11,14 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\ODText\Style;
 
 /**
- * Section style writer
+ * Section style writer.
  *
  * @since 0.11.0
  */
@@ -27,7 +27,7 @@ class Section extends AbstractStyle
     /**
      * Write style.
      */
-    public function write()
+    public function write(): void
     {
         /** @var \PhpOffice\PhpWord\Style\Section $style Type hint */
         $style = $this->getStyle();
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Style/Table.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Style/Table.php
index 646f2e44ca..eca6a1a3f3 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Style/Table.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/ODText/Style/Table.php
@@ -11,14 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\ODText\Style;
 
 /**
- * Table style writer
+ * Table style writer.
  *
  * @since 0.11.0
  */
@@ -27,7 +27,7 @@ class Table extends AbstractStyle
     /**
      * Write style.
      */
-    public function write()
+    public function write(): void
     {
         /** @var \PhpOffice\PhpWord\Style\Table $style Type hint */
         $style = $this->getStyle();
@@ -50,7 +50,7 @@ public function write()
         $cellWidths = $style->getColumnWidths();
         $countCellWidths = $cellWidths === null ? 0 : count($cellWidths);
 
-        for ($i = 0; $i < $countCellWidths; $i++) {
+        for ($i = 0; $i < $countCellWidths; ++$i) {
             $width = $cellWidths[$i];
             $xmlWriter->startElement('style:style');
             $xmlWriter->writeAttribute('style:name', $style->getStyleName() . '.' . $i);
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/PDF.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/PDF.php
index 64dcc7898d..f937f599c1 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/PDF.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/PDF.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PhpWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,33 +20,30 @@
 use PhpOffice\PhpWord\Exception\Exception;
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\Settings;
+use PhpOffice\PhpWord\Writer\PDF\AbstractRenderer;
 
 /**
- * PDF Writer
+ * PDF Writer.
  *
  * @since 0.10.0
  */
 class PDF
 {
     /**
-     * The wrapper for the requested PDF rendering engine
+     * The wrapper for the requested PDF rendering engine.
      *
      * @var \PhpOffice\PhpWord\Writer\PDF\AbstractRenderer
      */
-    private $renderer = null;
+    private $renderer;
 
     /**
-     * Instantiate a new renderer of the configured type within this container class
-     *
-     * @param \PhpOffice\PhpWord\PhpWord $phpWord
-     *
-     * @throws \PhpOffice\PhpWord\Exception\Exception
+     * Instantiate a new renderer of the configured type within this container class.
      */
     public function __construct(PhpWord $phpWord)
     {
         $pdfLibraryName = Settings::getPdfRendererName();
         $pdfLibraryPath = Settings::getPdfRendererPath();
-        if (is_null($pdfLibraryName) || is_null($pdfLibraryPath)) {
+        if (null === $pdfLibraryName || null === $pdfLibraryPath) {
             throw new Exception('PDF rendering library or library path has not been defined.');
         }
 
@@ -56,7 +53,7 @@ public function __construct(PhpWord $phpWord)
             set_include_path(get_include_path() . PATH_SEPARATOR . $pdfLibraryPath);
         }
 
-        $rendererName = get_class($this) . '\\' . $pdfLibraryName;
+        $rendererName = static::class . '\\' . $pdfLibraryName;
         $this->renderer = new $rendererName($phpWord);
     }
 
@@ -65,6 +62,7 @@ public function __construct(PhpWord $phpWord)
      *
      * @param string $name Renderer library method name
      * @param mixed[] $arguments Array of arguments to pass to the renderer method
+     *
      * @return mixed Returned data from the PDF renderer wrapper method
      */
     public function __call($name, $arguments)
@@ -74,6 +72,16 @@ public function __call($name, $arguments)
         //     throw new Exception("PDF Rendering library has not been defined.");
         // }
 
-        return call_user_func_array(array($this->renderer, $name), $arguments);
+        return call_user_func_array([$this->getRenderer(), $name], $arguments);
+    }
+
+    public function save(string $filename): void
+    {
+        $this->getRenderer()->save($filename);
+    }
+
+    public function getRenderer(): AbstractRenderer
+    {
+        return $this->renderer;
     }
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/PDF/AbstractRenderer.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/PDF/AbstractRenderer.php
index 5f9e3b3a8c..c143a6cb5c 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/PDF/AbstractRenderer.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/PDF/AbstractRenderer.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PhpWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -23,66 +23,65 @@
 use PhpOffice\PhpWord\Writer\HTML;
 
 /**
- * Abstract PDF renderer
+ * Abstract PDF renderer.
  *
  * @since 0.10.0
  */
 abstract class AbstractRenderer extends HTML
 {
     /**
-     * Name of renderer include file
+     * Name of renderer include file.
      *
      * @var string
      */
     protected $includeFile;
 
     /**
-     * Temporary storage directory
+     * Temporary storage directory.
      *
      * @var string
      */
     protected $tempDir = '';
 
     /**
-     * Font
+     * Font.
      *
      * @var string
      */
     protected $font;
 
     /**
-     * Paper size
+     * Paper size.
      *
      * @var int
      */
     protected $paperSize;
 
     /**
-     * Orientation
+     * Orientation.
      *
      * @var string
      */
     protected $orientation;
 
     /**
-     * Paper Sizes xRef List
+     * Paper Sizes xRef List.
      *
      * @var array
      */
-    protected static $paperSizes = array(
+    protected static $paperSizes = [
         9 => 'A4', // (210 mm by 297 mm)
-    );
+    ];
 
     /**
-     * Create new instance
+     * Create new instance.
      *
      * @param PhpWord $phpWord PhpWord object
-     *
-     * @throws \PhpOffice\PhpWord\Exception\Exception
      */
     public function __construct(PhpWord $phpWord)
     {
         parent::__construct($phpWord);
+        $this->isPdf = true;
         if ($this->includeFile != null) {
             $includeFile = Settings::getPdfRendererPath() . '/' . $this->includeFile;
             if (file_exists($includeFile)) {
@@ -95,10 +94,16 @@ public function __construct(PhpWord $phpWord)
                 // @codeCoverageIgnoreEnd
             }
         }
+
+        // Configuration
+        $options = Settings::getPdfRendererOptions();
+        if (!empty($options['font'])) {
+            $this->setFont($options['font']);
+        }
     }
 
     /**
-     * Get Font
+     * Get Font.
      *
      * @return string
      */
@@ -112,9 +117,10 @@ public function getFont()
      *      'arialunicid0-chinese-simplified'
      *      'arialunicid0-chinese-traditional'
      *      'arialunicid0-korean'
-     *      'arialunicid0-japanese'
+     *      'arialunicid0-japanese'.
      *
      * @param string $fontName
+     *
      * @return self
      */
     public function setFont($fontName)
@@ -125,7 +131,7 @@ public function setFont($fontName)
     }
 
     /**
-     * Get Paper Size
+     * Get Paper Size.
      *
      * @return int
      */
@@ -135,9 +141,10 @@ public function getPaperSize()
     }
 
     /**
-     * Set Paper Size
+     * Set Paper Size.
      *
      * @param int $value Paper size = PAPERSIZE_A4
+     *
      * @return self
      */
     public function setPaperSize($value = 9)
@@ -148,7 +155,7 @@ public function setPaperSize($value = 9)
     }
 
     /**
-     * Get Orientation
+     * Get Orientation.
      *
      * @return string
      */
@@ -158,9 +165,10 @@ public function getOrientation()
     }
 
     /**
-     * Set Orientation
+     * Set Orientation.
      *
      * @param string $value Page orientation ORIENTATION_DEFAULT
+     *
      * @return self
      */
     public function setOrientation($value = 'default')
@@ -171,35 +179,31 @@ public function setOrientation($value = 'default')
     }
 
     /**
-     * Save PhpWord to PDF file, pre-save
+     * Save PhpWord to PDF file, pre-save.
      *
      * @param string $filename Name of the file to save as
      *
-     * @throws \PhpOffice\PhpWord\Exception\Exception
      * @return resource
      */
     protected function prepareForSave($filename = null)
     {
-        $fileHandle = fopen($filename, 'w');
+        $fileHandle = fopen($filename, 'wb');
         // @codeCoverageIgnoreStart
         // Can't find any test case. Uncomment when found.
         if ($fileHandle === false) {
             throw new Exception("Could not open file $filename for writing.");
         }
         // @codeCoverageIgnoreEnd
-        $this->isPdf = true;
 
         return $fileHandle;
     }
 
     /**
-     * Save PhpWord to PDF file, post-save
+     * Save PhpWord to PDF file, post-save.
      *
      * @param resource $fileHandle
-     *
-     * @throws Exception
      */
-    protected function restoreStateAfterSave($fileHandle)
+    protected function restoreStateAfterSave($fileHandle): void
     {
         fclose($fileHandle);
     }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/PDF/DomPDF.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/PDF/DomPDF.php
index 53eea81588..8e5b4054d5 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/PDF/DomPDF.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/PDF/DomPDF.php
@@ -11,17 +11,18 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PhpWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\PDF;
 
 use Dompdf\Dompdf as DompdfLib;
+use Dompdf\Options;
 use PhpOffice\PhpWord\Writer\WriterInterface;
 
 /**
- * DomPDF writer
+ * DomPDF writer.
  *
  * @see  https://github.com/dompdf/dompdf
  * @since 0.10.0
@@ -29,11 +30,11 @@
 class DomPDF extends AbstractRenderer implements WriterInterface
 {
     /**
-     * Name of renderer include file
+     * Name of renderer include file.
      *
      * @var string
      */
-    protected $includeFile = null;
+    protected $includeFile;
 
     /**
      * Gets the implementation of external PDF library that should be used.
@@ -42,15 +43,18 @@ class DomPDF extends AbstractRenderer implements WriterInterface
      */
     protected function createExternalWriterInstance()
     {
-        return new DompdfLib();
+        $options = new Options();
+        if ($this->getFont()) {
+            $options->set('defaultFont', $this->getFont());
+        }
+
+        return new DompdfLib($options);
     }
 
     /**
      * Save PhpWord to file.
-     *
-     * @param string $filename Name of the file to save as
      */
-    public function save($filename = null)
+    public function save(string $filename): void
     {
         $fileHandle = parent::prepareForSave($filename);
 
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/PDF/MPDF.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/PDF/MPDF.php
index 464f156ce5..311f743d6d 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/PDF/MPDF.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/PDF/MPDF.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PhpWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -22,18 +22,20 @@
 use PhpOffice\PhpWord\Writer\WriterInterface;
 
 /**
- * MPDF writer
+ * MPDF writer.
  *
  * @see  http://www.mpdf1.com/
  * @since 0.11.0
  */
 class MPDF extends AbstractRenderer implements WriterInterface
 {
+    public const SIMULATED_BODY_START = '<!-- simulated body start -->';
+    private const BODY_TAG = '<body>';
+
     /**
-     * Overridden to set the correct includefile, only needed for MPDF 5
+     * Overridden to set the correct includefile, only needed for MPDF 5.
      *
      * @codeCoverageIgnore
-     * @param PhpWord $phpWord
      */
     public function __construct(PhpWord $phpWord)
     {
@@ -47,21 +49,24 @@ public function __construct(PhpWord $phpWord)
     /**
      * Gets the implementation of external PDF library that should be used.
      *
-     * @return Mpdf implementation
+     * @return \Mpdf\Mpdf implementation
      */
     protected function createExternalWriterInstance()
     {
         $mPdfClass = $this->getMPdfClassName();
 
-        return new $mPdfClass();
+        $options = [];
+        if ($this->getFont()) {
+            $options['default_font'] = $this->getFont();
+        }
+
+        return new $mPdfClass($options);
     }
 
     /**
      * Save PhpWord to file.
-     *
-     * @param string $filename Name of the file to save as
      */
-    public function save($filename = null)
+    public function save(string $filename): void
     {
         $fileHandle = parent::prepareForSave($filename);
 
@@ -83,7 +88,24 @@ public function save($filename = null)
         $pdf->setKeywords($docProps->getKeywords());
         $pdf->setCreator($docProps->getCreator());
 
-        $pdf->writeHTML($this->getContent());
+        $html = $this->getContent();
+        $bodyLocation = strpos($html, self::SIMULATED_BODY_START);
+        if ($bodyLocation === false) {
+            $bodyLocation = strpos($html, self::BODY_TAG);
+            if ($bodyLocation !== false) {
+                $bodyLocation += strlen(self::BODY_TAG);
+            }
+        }
+        // Make sure first data presented to Mpdf includes body tag
+        //   (and any htmlpageheader/htmlpagefooter tags)
+        //   so that Mpdf doesn't parse it as content. Issue 2432.
+        if ($bodyLocation !== false) {
+            $pdf->WriteHTML(substr($html, 0, $bodyLocation));
+            $html = substr($html, $bodyLocation);
+        }
+        foreach (explode("\n", $html) as $line) {
+            $pdf->WriteHTML("$line\n");
+        }
 
         //  Write to file
         fwrite($fileHandle, $pdf->output($filename, 'S'));
@@ -92,9 +114,10 @@ public function save($filename = null)
     }
 
     /**
-     * Return classname of MPDF to instantiate
+     * Return classname of MPDF to instantiate.
      *
      * @codeCoverageIgnore
+     *
      * @return string
      */
     private function getMPdfClassName()
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/PDF/TCPDF.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/PDF/TCPDF.php
index 3abbbf069d..1bb1974244 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/PDF/TCPDF.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/PDF/TCPDF.php
@@ -11,26 +11,29 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PhpWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\PDF;
 
+use PhpOffice\PhpWord\PhpWord;
+use PhpOffice\PhpWord\Settings;
+use PhpOffice\PhpWord\Style;
 use PhpOffice\PhpWord\Writer\WriterInterface;
+use TCPDF as TCPDFBase;
 
 /**
- * TCPDF writer
+ * TCPDF writer.
  *
  * @deprecated 0.13.0 Use `DomPDF` or `MPDF` instead.
- *
  * @see  http://www.tcpdf.org/
  * @since 0.11.0
  */
 class TCPDF extends AbstractRenderer implements WriterInterface
 {
     /**
-     * Name of renderer include file
+     * Name of renderer include file.
      *
      * @var string
      */
@@ -43,24 +46,56 @@ class TCPDF extends AbstractRenderer implements WriterInterface
      * @param string $unit Unit measure
      * @param string $paperSize Paper size
      *
-     * @return \TCPDF implementation
+     * @return TCPDFBase implementation
      */
     protected function createExternalWriterInstance($orientation, $unit, $paperSize)
     {
-        return new \TCPDF($orientation, $unit, $paperSize);
+        $instance = new TCPDFBase($orientation, $unit, $paperSize);
+
+        if ($this->getFont()) {
+            $instance->setFont($this->getFont(), $instance->getFontStyle(), $instance->getFontSizePt());
+        }
+
+        return $instance;
+    }
+
+    /**
+     * Overwriteable function to allow user to extend TCPDF.
+     * There should always be an AddPage call, preceded or followed
+     *   by code to customize TCPDF configuration.
+     * The customization below sets vertical spacing
+     *   between paragaraphs when the user has
+     *   explicitly set those values to numeric in default style.
+     */
+    protected function prepareToWrite(TCPDFBase $pdf): void
+    {
+        $pdf->AddPage();
+        $customStyles = Style::getStyles();
+        $normal = $customStyles['Normal'] ?? null;
+        if ($normal instanceof Style\Paragraph) {
+            $before = $normal->getSpaceBefore();
+            $after = $normal->getSpaceAfter();
+            if (is_numeric($before) && is_numeric($after)) {
+                $height = $normal->getLineHeight() ?? '';
+                $pdf->setHtmlVSpace([
+                    'p' => [
+                        ['n' => $before, 'h' => $height],
+                        ['n' => $after, 'h' => $height],
+                    ],
+                ]);
+            }
+        }
     }
 
     /**
      * Save PhpWord to file.
-     *
-     * @param string $filename Name of the file to save as
      */
-    public function save($filename = null)
+    public function save(string $filename): void
     {
         $fileHandle = parent::prepareForSave($filename);
 
         //  PDF settings
-        $paperSize = 'A4';
+        $paperSize = strtoupper(Settings::getDefaultPaper());
         $orientation = 'P';
 
         // Create PDF
@@ -68,8 +103,8 @@ public function save($filename = null)
         $pdf->setFontSubsetting(false);
         $pdf->setPrintHeader(false);
         $pdf->setPrintFooter(false);
-        $pdf->AddPage();
         $pdf->SetFont($this->getFont());
+        $this->prepareToWrite($pdf);
         $pdf->writeHTML($this->getContent());
 
         // Write document properties
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF.php
index 0604e8b56b..0a04d4f53e 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,31 +20,29 @@
 use PhpOffice\PhpWord\PhpWord;
 
 /**
- * RTF writer
+ * RTF writer.
  *
  * @since 0.7.0
  */
 class RTF extends AbstractWriter implements WriterInterface
 {
     /**
-     * Last paragraph style
+     * Last paragraph style.
      *
      * @var mixed
      */
     private $lastParagraphStyle;
 
     /**
-     * Create new instance
-     *
-     * @param \PhpOffice\PhpWord\PhpWord $phpWord
+     * Create new instance.
      */
-    public function __construct(PhpWord $phpWord = null)
+    public function __construct(?PhpWord $phpWord = null)
     {
         $this->setPhpWord($phpWord);
 
-        $this->parts = array('Header', 'Document');
+        $this->parts = ['Header', 'Document'];
         foreach ($this->parts as $partName) {
-            $partClass = get_class($this) . '\\Part\\' . $partName;
+            $partClass = static::class . '\\Part\\' . $partName;
             if (class_exists($partClass)) {
                 /** @var \PhpOffice\PhpWord\Writer\RTF\Part\AbstractPart $part Type hint */
                 $part = new $partClass();
@@ -56,19 +54,17 @@ public function __construct(PhpWord $phpWord = null)
 
     /**
      * Save content to file.
-     *
-     * @param string $filename
-     * @throws \PhpOffice\PhpWord\Exception\Exception
      */
-    public function save($filename = null)
+    public function save(string $filename): void
     {
         $this->writeFile($this->openFile($filename), $this->getContent());
     }
 
     /**
-     * Get content
+     * Get content.
      *
      * @return string
+     *
      * @since 0.11.0
      */
     private function getContent()
@@ -119,7 +115,7 @@ public function getLastParagraphStyle()
      *
      * @param mixed $value
      */
-    public function setLastParagraphStyle($value = '')
+    public function setLastParagraphStyle($value = ''): void
     {
         $this->lastParagraphStyle = $value;
     }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/AbstractElement.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/AbstractElement.php
index fa1058bdb0..5c33868a8b 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/AbstractElement.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/AbstractElement.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -24,43 +24,76 @@
 use PhpOffice\PhpWord\Style;
 use PhpOffice\PhpWord\Style\Font as FontStyle;
 use PhpOffice\PhpWord\Style\Paragraph as ParagraphStyle;
-use PhpOffice\PhpWord\Writer\AbstractWriter;
-use PhpOffice\PhpWord\Writer\HTML\Element\AbstractElement as HTMLAbstractElement;
+use PhpOffice\PhpWord\Writer\RTF as WriterRTF;
 use PhpOffice\PhpWord\Writer\RTF\Style\Font as FontStyleWriter;
 use PhpOffice\PhpWord\Writer\RTF\Style\Paragraph as ParagraphStyleWriter;
 
 /**
- * Abstract RTF element writer
+ * Abstract RTF element writer.
  *
  * @since 0.11.0
  */
-abstract class AbstractElement extends HTMLAbstractElement
+abstract class AbstractElement
 {
     /**
-     * Font style
+     * Parent writer.
+     *
+     * @var WriterRTF
+     */
+    protected $parentWriter;
+
+    /**
+     * Element.
+     *
+     * @var \PhpOffice\PhpWord\Element\AbstractElement
+     */
+    protected $element;
+
+    /**
+     * Without paragraph.
+     *
+     * @var bool
+     */
+    protected $withoutP = false;
+
+    /**
+     * Write element.
+     *
+     * @return string
+     */
+    abstract public function write();
+
+    /**
+     * Font style.
      *
      * @var \PhpOffice\PhpWord\Style\Font
      */
     protected $fontStyle;
 
     /**
-     * Paragraph style
+     * Paragraph style.
      *
      * @var \PhpOffice\PhpWord\Style\Paragraph
      */
     protected $paragraphStyle;
 
-    public function __construct(AbstractWriter $parentWriter, Element $element, $withoutP = false)
-    {
-        parent::__construct($parentWriter, $element, $withoutP);
+    /**
+     * @var \PhpOffice\PhpWord\Escaper\EscaperInterface
+     */
+    protected $escaper;
 
+    public function __construct(WriterRTF $parentWriter, Element $element, bool $withoutP = false)
+    {
+        $this->parentWriter = $parentWriter;
+        $this->element = $element;
+        $this->withoutP = $withoutP;
         $this->escaper = new Rtf();
     }
 
     /**
      * Get font and paragraph styles.
      */
-    protected function getStyles()
+    protected function getStyles(): void
     {
         /** @var \PhpOffice\PhpWord\Writer\RTF $parentWriter Type hint */
         $parentWriter = $this->parentWriter;
@@ -98,7 +131,7 @@ protected function getStyles()
     }
 
     /**
-     * Write opening
+     * Write opening.
      *
      * @return string
      */
@@ -115,9 +148,10 @@ protected function writeOpening()
     }
 
     /**
-     * Write text
+     * Write text.
      *
      * @param string $text
+     *
      * @return string
      */
     protected function writeText($text)
@@ -130,7 +164,7 @@ protected function writeText($text)
     }
 
     /**
-     * Write closing
+     * Write closing.
      *
      * @return string
      */
@@ -144,7 +178,7 @@ protected function writeClosing()
     }
 
     /**
-     * Write font style
+     * Write font style.
      *
      * @return string
      */
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/Container.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/Container.php
index 58c19256dc..5e198aec86 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/Container.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/Container.php
@@ -11,25 +11,54 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\RTF\Element;
 
-use PhpOffice\PhpWord\Writer\HTML\Element\Container as HTMLContainer;
+use PhpOffice\PhpWord\Element\AbstractContainer as ContainerElement;
 
 /**
- * Container element RTF writer
+ * Container element RTF writer.
  *
  * @since 0.11.0
  */
-class Container extends HTMLContainer
+class Container extends AbstractElement
 {
     /**
-     * Namespace; Can't use __NAMESPACE__ in inherited class (RTF)
+     * Namespace; Can't use __NAMESPACE__ in inherited class (RTF).
      *
      * @var string
      */
     protected $namespace = 'PhpOffice\\PhpWord\\Writer\\RTF\\Element';
+
+    /**
+     * Write container.
+     *
+     * @return string
+     */
+    public function write()
+    {
+        $container = $this->element;
+        if (!$container instanceof ContainerElement) {
+            return '';
+        }
+        $containerClass = substr(get_class($container), strrpos(get_class($container), '\\') + 1);
+        $withoutP = in_array($containerClass, ['TextRun', 'Footnote', 'Endnote']) ? true : false;
+        $content = '';
+
+        $elements = $container->getElements();
+        foreach ($elements as $element) {
+            $elementClass = get_class($element);
+            $writerClass = str_replace('PhpOffice\\PhpWord\\Element', $this->namespace, $elementClass);
+            if (class_exists($writerClass)) {
+                /** @var AbstractElement $writer Type hint */
+                $writer = new $writerClass($this->parentWriter, $element, $withoutP);
+                $content .= $writer->write();
+            }
+        }
+
+        return $content;
+    }
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/Field.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/Field.php
index e958e9deb1..34024f5e51 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/Field.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/Field.php
@@ -11,16 +11,18 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2019 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\RTF\Element;
 
+use PhpOffice\PhpWord\Element\Field as ElementField;
+
 /**
- * Field element writer
+ * Field element writer.
  *
- * Note: for now, only date, page and numpages fields are implemented for RTF.
+ * Note: for now, only date, page, numpages and filename fields are implemented for RTF.
  */
 class Field extends Text
 {
@@ -30,7 +32,7 @@ class Field extends Text
     public function write()
     {
         $element = $this->element;
-        if (!$element instanceof \PhpOffice\PhpWord\Element\Field) {
+        if (!$element instanceof ElementField) {
             return;
         }
 
@@ -66,7 +68,18 @@ protected function writeNumpages()
         return 'NUMPAGES';
     }
 
-    protected function writeDate(\PhpOffice\PhpWord\Element\Field $element)
+    protected function writeFilename(ElementField $element): string
+    {
+        $content = 'FILENAME';
+        $options = $element->getOptions();
+        if ($options != null && in_array('Path', $options)) {
+            $content .= ' \\\\p';
+        }
+
+        return $content;
+    }
+
+    protected function writeDate(ElementField $element)
     {
         $content = '';
         $content .= 'DATE';
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/Image.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/Image.php
index f1e727007b..bec8e9caa7 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/Image.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/Image.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -21,14 +21,14 @@
 use PhpOffice\PhpWord\Shared\Converter;
 
 /**
- * Image element RTF writer
+ * Image element RTF writer.
  *
  * @since 0.11.0
  */
 class Image extends AbstractElement
 {
     /**
-     * Write element
+     * Write element.
      *
      * @return string
      */
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/Link.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/Link.php
index 25954ed878..76b7ebaa1c 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/Link.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/Link.php
@@ -11,21 +11,21 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\RTF\Element;
 
 /**
- * Link element RTF writer
+ * Link element RTF writer.
  *
  * @since 0.11.0
  */
 class Link extends AbstractElement
 {
     /**
-     * Write element
+     * Write element.
      *
      * @return string
      */
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/ListItem.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/ListItem.php
index 29e7f6607d..6ed6d2bd14 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/ListItem.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/ListItem.php
@@ -11,14 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\RTF\Element;
 
 /**
- * ListItem element RTF writer; extends from text
+ * ListItem element RTF writer; extends from text.
  *
  * @since 0.11.0
  */
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/PageBreak.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/PageBreak.php
index 6b08c9cc44..386c1222c1 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/PageBreak.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/PageBreak.php
@@ -11,21 +11,21 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\RTF\Element;
 
 /**
- * PageBreak element RTF writer
+ * PageBreak element RTF writer.
  *
  * @since 0.11.0
  */
 class PageBreak extends AbstractElement
 {
     /**
-     * Write element
+     * Write element.
      *
      * @return string
      */
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/Table.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/Table.php
index 63c3e6a31f..f2d5f9fb5a 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/Table.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/Table.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,16 +20,26 @@
 use PhpOffice\PhpWord\Element\Cell as CellElement;
 use PhpOffice\PhpWord\Element\Row as RowElement;
 use PhpOffice\PhpWord\Element\Table as TableElement;
+use PhpOffice\PhpWord\Settings;
+use PhpOffice\PhpWord\SimpleType\Border;
+use PhpOffice\PhpWord\Style;
+use PhpOffice\PhpWord\Style\Cell as CellStyle;
+use PhpOffice\PhpWord\Style\Table as TableStyle;
 
 /**
- * Table element RTF writer
+ * Table element RTF writer.
  *
  * @since 0.11.0
  */
 class Table extends AbstractElement
 {
     /**
-     * Write element
+     * @var TableElement
+     */
+    protected $element;
+
+    /**
+     * Write element.
      *
      * @return string
      */
@@ -45,14 +55,17 @@ public function write()
         }
 
         $content = '';
+        $style = $this->element->getStyle();
+        $bidiStyle = (is_object($style) && method_exists($style, 'isBidiVisual')) ? $style->isBidiVisual() : Settings::isDefaultRtl();
+        $bidi = $bidiStyle ? '\rtlrow' : '';
         $rows = $element->getRows();
         $rowCount = count($rows);
 
         if ($rowCount > 0) {
             $content .= '\pard' . PHP_EOL;
 
-            for ($i = 0; $i < $rowCount; $i++) {
-                $content .= '\trowd ';
+            for ($i = 0; $i < $rowCount; ++$i) {
+                $content .= "\\trowd$bidi ";
                 $content .= $this->writeRowDef($rows[$i]);
                 $content .= PHP_EOL;
                 $content .= $this->writeRow($rows[$i]);
@@ -65,33 +78,40 @@ public function write()
     }
 
     /**
-     * Write column
+     * Write column.
      *
-     * @param \PhpOffice\PhpWord\Element\Row $row
      * @return string
      */
     private function writeRowDef(RowElement $row)
     {
         $content = '';
+        $tableStyle = $this->element->getStyle();
+        if (is_string($tableStyle)) {
+            $tableStyle = Style::getStyle($tableStyle);
+            if (!($tableStyle instanceof TableStyle)) {
+                $tableStyle = null;
+            }
+        }
 
         $rightMargin = 0;
         foreach ($row->getCells() as $cell) {
+            $content .= $this->writeCellStyle($cell->getStyle(), $tableStyle);
+
             $width = $cell->getWidth();
             $vMerge = $this->getVMerge($cell->getStyle()->getVMerge());
             if ($width === null) {
                 $width = 720; // Arbitrary default width
             }
             $rightMargin += $width;
-            $content .= "{$vMerge}\cellx{$rightMargin} ";
+            $content .= "{$vMerge}\\cellx{$rightMargin} ";
         }
 
         return $content;
     }
 
     /**
-     * Write row
+     * Write row.
      *
-     * @param \PhpOffice\PhpWord\Element\Row $row
      * @return string
      */
     private function writeRow(RowElement $row)
@@ -107,9 +127,8 @@ private function writeRow(RowElement $row)
     }
 
     /**
-     * Write cell
+     * Write cell.
      *
-     * @param \PhpOffice\PhpWord\Element\Cell $cell
      * @return string
      */
     private function writeCell(CellElement $cell)
@@ -125,11 +144,110 @@ private function writeCell(CellElement $cell)
         return $content;
     }
 
+    private function writeCellStyle(CellStyle $cell, ?TableStyle $table): string
+    {
+        $content = $this->writeCellBorder(
+            't',
+            $cell->getBorderTopStyle() ?: ($table ? $table->getBorderTopStyle() : null),
+            (int) round($cell->getBorderTopSize() ?: ($table ? ($table->getBorderTopSize() ?: 0) : 0)),
+            $cell->getBorderTopColor() ?? ($table ? $table->getBorderTopColor() : null)
+        );
+        $content .= $this->writeCellBorder(
+            'l',
+            $cell->getBorderLeftStyle() ?: ($table ? $table->getBorderLeftStyle() : null),
+            (int) round($cell->getBorderLeftSize() ?: ($table ? ($table->getBorderLeftSize() ?: 0) : 0)),
+            $cell->getBorderLeftColor() ?? ($table ? $table->getBorderLeftColor() : null)
+        );
+        $content .= $this->writeCellBorder(
+            'b',
+            $cell->getBorderBottomStyle() ?: ($table ? $table->getBorderBottomStyle() : null),
+            (int) round($cell->getBorderBottomSize() ?: ($table ? ($table->getBorderBottomSize() ?: 0) : 0)),
+            $cell->getBorderBottomColor() ?? ($table ? $table->getBorderBottomColor() : null)
+        );
+        $content .= $this->writeCellBorder(
+            'r',
+            $cell->getBorderRightStyle() ?: ($table ? $table->getBorderRightStyle() : null),
+            (int) round($cell->getBorderRightSize() ?: ($table ? ($table->getBorderRightSize() ?: 0) : 0)),
+            $cell->getBorderRightColor() ?? ($table ? $table->getBorderRightColor() : null)
+        );
+
+        return $content;
+    }
+
+    private function writeCellBorder(string $prefix, ?string $borderStyle, int $borderSize, ?string $borderColor): string
+    {
+        if ($borderSize == 0) {
+            return '';
+        }
+
+        $content = '\clbrdr' . $prefix;
+        /**
+         * \brdrs 	Single-thickness border.
+         * \brdrth 	Double-thickness border.
+         * \brdrsh 	Shadowed border.
+         * \brdrdb 	Double border.
+         * \brdrdot 	Dotted border.
+         * \brdrdash 	Dashed border.
+         * \brdrhair 	Hairline border.
+         * \brdrinset 	Inset border.
+         * \brdrdashsm 	Dash border (small).
+         * \brdrdashd 	Dot dash border.
+         * \brdrdashdd 	Dot dot dash border.
+         * \brdroutset 	Outset border.
+         * \brdrtriple 	Triple border.
+         * \brdrtnthsg 	Thick thin border (small).
+         * \brdrthtnsg 	Thin thick border (small).
+         * \brdrtnthtnsg 	Thin thick thin border (small).
+         * \brdrtnthmg 	Thick thin border (medium).
+         * \brdrthtnmg 	Thin thick border (medium).
+         * \brdrtnthtnmg 	Thin thick thin border (medium).
+         * \brdrtnthlg 	Thick thin border (large).
+         * \brdrthtnlg 	Thin thick border (large).
+         * \brdrtnthtnlg 	Thin thick thin border (large).
+         * \brdrwavy 	Wavy border.
+         * \brdrwavydb 	Double wavy border.
+         * \brdrdashdotstr 	Striped border.
+         * \brdremboss 	Emboss border.
+         * \brdrengrave 	Engrave border.
+         */
+        switch ($borderStyle) {
+            case Border::DOTTED:
+                $content .= '\brdrdot';
+
+                break;
+            case Border::SINGLE:
+            default:
+                $content .= '\brdrs';
+
+                break;
+        }
+
+        // \brdrwN 	N is the width in twips (1/20 pt) of the pen used to draw the paragraph border line.
+        //          N cannot be greater than 75.
+        //          To obtain a larger border width, the \brdth control word can be used to obtain a width double that of N.
+        // $borderSize is in eights of a point, i.e. 4 / 8 = .5pt
+        // 1/20 pt => 1/8 / 2.5
+        $content .= '\brdrw' . (int) ($borderSize / 2.5);
+
+        // \brdrcfN 	N is the color of the paragraph border, specified as an index into the color table in the RTF header.
+        $colorIndex = 0;
+        $index = array_search($borderColor, $this->parentWriter->getColorTable());
+        if ($index !== false) {
+            $colorIndex = (int) $index + 1;
+        }
+        $content .= '\brdrcf' . $colorIndex;
+        $content .= PHP_EOL;
+
+        return $content;
+    }
+
     /**
-     * Get vertical merge style
+     * Get vertical merge style.
      *
      * @param string $value
+     *
      * @return string
+     *
      * @todo Move to style
      */
     private function getVMerge($value)
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/Text.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/Text.php
index b9e56e890b..bd8cbae5ca 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/Text.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/Text.php
@@ -11,21 +11,21 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\RTF\Element;
 
 /**
- * Text element RTF writer
+ * Text element RTF writer.
  *
  * @since 0.10.0
  */
 class Text extends AbstractElement
 {
     /**
-     * Write element
+     * Write element.
      *
      * @return string
      */
@@ -33,7 +33,7 @@ public function write()
     {
         /** @var \PhpOffice\PhpWord\Element\Text $element Type hint */
         $element = $this->element;
-        $elementClass = str_replace('\\Writer\\RTF', '', get_class($this));
+        $elementClass = str_replace('\\Writer\\RTF', '', static::class);
         if (!$element instanceof $elementClass || !is_string($element->getText())) {
             return '';
         }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/TextBreak.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/TextBreak.php
index 4aab27677a..0c470f407d 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/TextBreak.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/TextBreak.php
@@ -11,21 +11,21 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\RTF\Element;
 
 /**
- * TextBreak element RTF writer
+ * TextBreak element RTF writer.
  *
  * @since 0.10.0
  */
 class TextBreak extends AbstractElement
 {
     /**
-     * Write element
+     * Write element.
      *
      * @return string
      */
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/TextRun.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/TextRun.php
index e2865d827e..f2b70ad525 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/TextRun.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/TextRun.php
@@ -11,21 +11,21 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\RTF\Element;
 
 /**
- * TextRun element RTF writer
+ * TextRun element RTF writer.
  *
  * @since 0.10.0
  */
 class TextRun extends AbstractElement
 {
     /**
-     * Write element
+     * Write element.
      *
      * @return string
      */
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/Title.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/Title.php
index 77ebff1769..fb11da7849 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/Title.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Element/Title.php
@@ -11,25 +11,25 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\RTF\Element;
 
 /**
- * Title element RTF writer; extends from text
+ * Title element RTF writer; extends from text.
  *
  * @since 0.11.0
  */
 class Title extends Text
 {
-    protected function getStyles()
+    protected function getStyles(): void
     {
         /** @var \PhpOffice\PhpWord\Element\Title $element Type hint */
         $element = $this->element;
         $style = $element->getStyle();
-        $style = str_replace('Heading', 'Heading_', $style);
+        $style = str_replace('Heading', 'Heading_', $style ?? '');
         $style = \PhpOffice\PhpWord\Style::getStyle($style);
         if ($style instanceof \PhpOffice\PhpWord\Style\Font) {
             $this->fontStyle = $style;
@@ -49,7 +49,7 @@ protected function getStyles()
     }
 
     /**
-     * Write element
+     * Write element.
      *
      * @return string
      */
@@ -57,7 +57,7 @@ public function write()
     {
         /** @var \PhpOffice\PhpWord\Element\Title $element Type hint */
         $element = $this->element;
-        $elementClass = str_replace('\\Writer\\RTF', '', get_class($this));
+        $elementClass = str_replace('\\Writer\\RTF', '', static::class);
         if (!$element instanceof $elementClass || !is_string($element->getText())) {
             return '';
         }
@@ -71,7 +71,7 @@ public function write()
         $style = $element->getStyle();
         if (is_string($style)) {
             $style = str_replace('Heading', '', $style);
-            if (is_numeric($style)) {
+            if ("$style" !== '') {
                 $style = (int) $style - 1;
                 if ($style >= 0 && $style <= 8) {
                     $content .= '{\\outlinelevel' . $style;
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Part/AbstractPart.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Part/AbstractPart.php
index 8171b0d228..be772b93a0 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Part/AbstractPart.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Part/AbstractPart.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -27,7 +27,7 @@
 abstract class AbstractPart
 {
     /**
-     * @var \PhpOffice\PhpWord\Writer\AbstractWriter
+     * @var \PhpOffice\PhpWord\Writer\RTF
      */
     private $parentWriter;
 
@@ -47,22 +47,22 @@ public function __construct()
     abstract public function write();
 
     /**
-     * @param \PhpOffice\PhpWord\Writer\AbstractWriter $writer
+     * @param \PhpOffice\PhpWord\Writer\RTF $writer
      */
-    public function setParentWriter(AbstractWriter $writer = null)
+    public function setParentWriter(?AbstractWriter $writer = null): void
     {
         $this->parentWriter = $writer;
     }
 
     /**
-     * @throws \PhpOffice\PhpWord\Exception\Exception
-     * @return \PhpOffice\PhpWord\Writer\AbstractWriter
+     * @return \PhpOffice\PhpWord\Writer\RTF
      */
     public function getParentWriter()
     {
         if ($this->parentWriter !== null) {
             return $this->parentWriter;
         }
+
         throw new Exception('No parent WriterInterface assigned.');
     }
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Part/Document.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Part/Document.php
index 14d900944e..a0002583a9 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Part/Document.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Part/Document.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -23,7 +23,7 @@
 use PhpOffice\PhpWord\Writer\RTF\Style\Section as SectionStyleWriter;
 
 /**
- * RTF document part writer
+ * RTF document part writer.
  *
  * @since 0.11.0
  * @see  http://www.biblioscape.com/rtf15_spec.htm#Heading24
@@ -31,7 +31,7 @@
 class Document extends AbstractPart
 {
     /**
-     * Write part
+     * Write part.
      *
      * @return string
      */
@@ -47,29 +47,29 @@ public function write()
     }
 
     /**
-     * Write document information
+     * Write document information.
      *
      * @return string
      */
     private function writeInfo()
     {
         $docProps = $this->getParentWriter()->getPhpWord()->getDocInfo();
-        $properties = array('title', 'subject', 'category', 'keywords', 'comment',
-            'author', 'operator', 'creatim', 'revtim', 'company', 'manager', );
-        $mapping = array(
-            'comment'  => 'description',
-            'author'   => 'creator',
+        $properties = ['title', 'subject', 'category', 'keywords', 'comment',
+            'author', 'operator', 'creatim', 'revtim', 'company', 'manager', ];
+        $mapping = [
+            'comment' => 'description',
+            'author' => 'creator',
             'operator' => 'lastModifiedBy',
-            'creatim'  => 'created',
-            'revtim'   => 'modified', );
-        $dateFields = array('creatim', 'revtim');
+            'creatim' => 'created',
+            'revtim' => 'modified', ];
+        $dateFields = ['creatim', 'revtim'];
 
         $content = '';
 
         $content .= '{';
         $content .= '\info';
         foreach ($properties as $property) {
-            $method = 'get' . (isset($mapping[$property]) ? $mapping[$property] : $property);
+            $method = 'get' . ($mapping[$property] ?? $property);
             if (!in_array($property, $dateFields) && Settings::isOutputEscapingEnabled()) {
                 $value = $this->escaper->escape($docProps->$method());
             } else {
@@ -85,7 +85,7 @@ private function writeInfo()
     }
 
     /**
-     * Write document formatting properties
+     * Write document formatting properties.
      *
      * @return string
      */
@@ -115,9 +115,10 @@ private function writeFormatting()
     }
 
     /**
-     * Write titlepg directive if any "f" headers or footers
+     * Write titlepg directive if any "f" headers or footers.
      *
      * @param \PhpOffice\PhpWord\Element\Section $section
+     *
      * @return string
      */
     private static function writeTitlepg($section)
@@ -137,7 +138,7 @@ private static function writeTitlepg($section)
     }
 
     /**
-     * Write sections
+     * Write sections.
      *
      * @return string
      */
@@ -147,7 +148,13 @@ private function writeSections()
 
         $sections = $this->getParentWriter()->getPhpWord()->getSections();
         $evenOdd = $this->getParentWriter()->getPhpWord()->getSettings()->hasEvenAndOddHeaders();
+        $sectOwed = false;
         foreach ($sections as $section) {
+            if ($sectOwed) {
+                $content .= '\sect' . PHP_EOL;
+            } else {
+                $sectOwed = true;
+            }
             $styleWriter = new SectionStyleWriter($section->getStyle());
             $styleWriter->setParentWriter($this->getParentWriter());
             $content .= $styleWriter->write();
@@ -196,31 +203,30 @@ private function writeSections()
 
             $elementWriter = new Container($this->getParentWriter(), $section);
             $content .= $elementWriter->write();
-
-            $content .= '\sect' . PHP_EOL;
         }
 
         return $content;
     }
 
     /**
-     * Get date value
+     * Get date value.
      *
      * The format of date value is `\yr?\mo?\dy?\hr?\min?\sec?`
      *
      * @param int $value
+     *
      * @return string
      */
     private function getDateValue($value)
     {
-        $dateParts = array(
+        $dateParts = [
             'Y' => 'yr',
             'm' => 'mo',
             'd' => 'dy',
             'H' => 'hr',
             'i' => 'min',
             's' => 'sec',
-        );
+        ];
         $result = '';
         foreach ($dateParts as $dateFormat => $controlWord) {
             $result .= '\\' . $controlWord . date($dateFormat, $value);
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Part/Header.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Part/Header.php
index 01439bc6ad..7f8cc84b97 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Part/Header.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Part/Header.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -21,9 +21,10 @@
 use PhpOffice\PhpWord\Shared\Converter;
 use PhpOffice\PhpWord\Style;
 use PhpOffice\PhpWord\Style\Font;
+use PhpOffice\PhpWord\Style\Table;
 
 /**
- * RTF header part writer
+ * RTF header part writer.
  *
  * - Character set
  * - Font table
@@ -38,18 +39,18 @@
 class Header extends AbstractPart
 {
     /**
-     * Font table
+     * Font table.
      *
      * @var array
      */
-    private $fontTable = array();
+    private $fontTable = [];
 
     /**
-     * Color table
+     * Color table.
      *
      * @var array
      */
-    private $colorTable = array();
+    private $colorTable = [];
 
     /**
      * Get font table.
@@ -72,7 +73,7 @@ public function getColorTable()
     }
 
     /**
-     * Write part
+     * Write part.
      *
      * @return string
      */
@@ -93,7 +94,7 @@ public function write()
     }
 
     /**
-     * Write character set
+     * Write character set.
      *
      * @return string
      */
@@ -109,7 +110,7 @@ private function writeCharset()
     }
 
     /**
-     * Write header defaults
+     * Write header defaults.
      *
      * @return string
      */
@@ -124,7 +125,7 @@ private function writeDefaults()
     }
 
     /**
-     * Write font table
+     * Write font table.
      *
      * @return string
      */
@@ -144,7 +145,7 @@ private function writeFontTable()
     }
 
     /**
-     * Write color table
+     * Write color table.
      *
      * @return string
      */
@@ -155,7 +156,7 @@ private function writeColorTable()
         $content .= '{';
         $content .= '\colortbl;';
         foreach ($this->colorTable as $color) {
-            list($red, $green, $blue) = Converter::htmlToRgb($color);
+            [$red, $green, $blue] = Converter::htmlToRgb($color);
             $content .= "\\red{$red}\\green{$green}\\blue{$blue};";
         }
         $content .= '}';
@@ -165,7 +166,7 @@ private function writeColorTable()
     }
 
     /**
-     * Write
+     * Write.
      *
      * @return string
      */
@@ -182,7 +183,7 @@ private function writeGenerator()
     /**
      * Register all fonts and colors in both named and inline styles to appropriate header table.
      */
-    private function registerFont()
+    private function registerFont(): void
     {
         $phpWord = $this->getParentWriter()->getPhpWord();
         $this->fontTable[] = Settings::getDefaultFontName();
@@ -212,7 +213,7 @@ private function registerFont()
      *
      * @param \PhpOffice\PhpWord\Style\Border $style
      */
-    private function registerBorderColor($style)
+    private function registerBorderColor($style): void
     {
         $colors = $style->getBorderColor();
         foreach ($colors as $color) {
@@ -227,7 +228,7 @@ private function registerBorderColor($style)
      *
      * @param \PhpOffice\PhpWord\Style\AbstractStyle $style
      */
-    private function registerFontItems($style)
+    private function registerFontItems($style): void
     {
         $defaultFont = Settings::getDefaultFontName();
         $defaultColor = Settings::DEFAULT_FONT_COLOR;
@@ -236,6 +237,14 @@ private function registerFontItems($style)
             $this->registerTableItem($this->fontTable, $style->getName(), $defaultFont);
             $this->registerTableItem($this->colorTable, $style->getColor(), $defaultColor);
             $this->registerTableItem($this->colorTable, $style->getFgColor(), $defaultColor);
+
+            return;
+        }
+        if ($style instanceof Table) {
+            $this->registerTableItem($this->colorTable, $style->getBorderTopColor(), $defaultColor);
+            $this->registerTableItem($this->colorTable, $style->getBorderRightColor(), $defaultColor);
+            $this->registerTableItem($this->colorTable, $style->getBorderLeftColor(), $defaultColor);
+            $this->registerTableItem($this->colorTable, $style->getBorderBottomColor(), $defaultColor);
         }
     }
 
@@ -246,7 +255,7 @@ private function registerFontItems($style)
      * @param string $value
      * @param string $default
      */
-    private function registerTableItem(&$table, $value, $default = null)
+    private function registerTableItem(&$table, $value, $default = null): void
     {
         if (in_array($value, $table) === false && $value !== null && $value != $default) {
             $table[] = $value;
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Style/AbstractStyle.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Style/AbstractStyle.php
index 57aa6bb9f7..355e384440 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Style/AbstractStyle.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Style/AbstractStyle.php
@@ -11,19 +11,97 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\RTF\Style;
 
-use PhpOffice\PhpWord\Writer\HTML\Style\AbstractStyle as HTMLAbstractStyle;
+use PhpOffice\PhpWord\Style\AbstractStyle as StyleAbstract;
+use PhpOffice\PhpWord\Writer\RTF;
 
 /**
- * Abstract RTF style writer
+ * Abstract RTF style writer.
  *
  * @since 0.11.0
  */
-abstract class AbstractStyle extends HTMLAbstractStyle
+abstract class AbstractStyle
 {
+    /**
+     * Parent writer.
+     *
+     * @var RTF
+     */
+    private $parentWriter;
+
+    /**
+     * Style.
+     *
+     * @var null|array|StyleAbstract
+     */
+    private $style;
+
+    /**
+     * Write style.
+     *
+     * @return mixed
+     */
+    abstract public function write();
+
+    /**
+     * Create new instance.
+     *
+     * @param array|StyleAbstract $style
+     */
+    public function __construct($style = null)
+    {
+        $this->style = $style;
+    }
+
+    /**
+     * Set parent writer.
+     *
+     * @param RTF $writer
+     */
+    public function setParentWriter($writer): void
+    {
+        $this->parentWriter = $writer;
+    }
+
+    /**
+     * Get parent writer.
+     *
+     * @return RTF
+     */
+    public function getParentWriter()
+    {
+        return $this->parentWriter;
+    }
+
+    /**
+     * Get style.
+     *
+     * @return null|array|string|StyleAbstract
+     */
+    public function getStyle()
+    {
+        if (!$this->style instanceof StyleAbstract && !is_array($this->style)) {
+            return '';
+        }
+
+        return $this->style;
+    }
+
+    /**
+     * Get value if ...
+     *
+     * @param null|bool $condition
+     * @param string $value
+     *
+     * @return string
+     */
+    protected function getValueIf($condition, $value)
+    {
+        return $condition == true ? $value : '';
+    }
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Style/Border.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Style/Border.php
index db97c28d00..c674170d8b 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Style/Border.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Style/Border.php
@@ -11,35 +11,35 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\RTF\Style;
 
 /**
- * Border style writer
+ * Border style writer.
  *
  * @since 0.12.0
  */
 class Border extends AbstractStyle
 {
     /**
-     * Sizes
+     * Sizes.
      *
      * @var array
      */
-    private $sizes = array();
+    private $sizes = [];
 
     /**
-     * Colors
+     * Colors.
      *
      * @var array
      */
-    private $colors = array();
+    private $colors = [];
 
     /**
-     * Write style
+     * Write style.
      *
      * @return string
      */
@@ -47,14 +47,14 @@ public function write()
     {
         $content = '';
 
-        $sides = array('top', 'left', 'right', 'bottom');
+        $sides = ['top', 'left', 'right', 'bottom'];
         $sizeCount = count($this->sizes);
 
         // Page border measure
         // 8 = from text, infront off; 32 = from edge, infront on; 40 = from edge, infront off
         $content .= '\pgbrdropt32';
 
-        for ($i = 0; $i < $sizeCount; $i++) {
+        for ($i = 0; $i < $sizeCount; ++$i) {
             if ($this->sizes[$i] !== null) {
                 $color = null;
                 if (isset($this->colors[$i])) {
@@ -68,11 +68,12 @@ public function write()
     }
 
     /**
-     * Write side
+     * Write side.
      *
      * @param string $side
      * @param int $width
      * @param string $color
+     *
      * @return string
      */
     private function writeSide($side, $width, $color = '')
@@ -105,7 +106,7 @@ private function writeSide($side, $width, $color = '')
      *
      * @param int[] $value
      */
-    public function setSizes($value)
+    public function setSizes($value): void
     {
         $this->sizes = $value;
     }
@@ -115,7 +116,7 @@ public function setSizes($value)
      *
      * @param string[] $value
      */
-    public function setColors($value)
+    public function setColors($value): void
     {
         $this->colors = $value;
     }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Style/Font.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Style/Font.php
index 34f6c1afae..5980c100b4 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Style/Font.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Style/Font.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,7 +20,7 @@
 use PhpOffice\PhpWord\Style\Font as FontStyle;
 
 /**
- * RTF font style writer
+ * RTF font style writer.
  *
  * @since 0.11.0
  */
@@ -37,7 +37,7 @@ class Font extends AbstractStyle
     private $colorIndex = 0;
 
     /**
-     * Write style
+     * Write style.
      *
      * @return string
      */
@@ -69,10 +69,9 @@ public function write()
     /**
      * Set font name index.
      *
-     *
      * @param int $value
      */
-    public function setNameIndex($value = 0)
+    public function setNameIndex($value = 0): void
     {
         $this->nameIndex = $value;
     }
@@ -82,7 +81,7 @@ public function setNameIndex($value = 0)
      *
      * @param int $value
      */
-    public function setColorIndex($value = 0)
+    public function setColorIndex($value = 0): void
     {
         $this->colorIndex = $value;
     }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Style/Indentation.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Style/Indentation.php
index 50e8ad9940..fc33a8514a 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Style/Indentation.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Style/Indentation.php
@@ -11,21 +11,21 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\RTF\Style;
 
 /**
- * RTF indentation style writer
+ * RTF indentation style writer.
  *
  * @since 0.11.0
  */
 class Indentation extends AbstractStyle
 {
     /**
-     * Write style
+     * Write style.
      *
      * @return string
      */
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Style/Paragraph.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Style/Paragraph.php
index 9f8cf9dff0..e19d24bbad 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Style/Paragraph.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Style/Paragraph.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,14 +20,14 @@
 use PhpOffice\PhpWord\SimpleType\Jc;
 
 /**
- * RTF paragraph style writer
+ * RTF paragraph style writer.
  *
  * @since 0.11.0
  */
 class Paragraph extends AbstractStyle
 {
     /**
-     * Depth of table container nested level; Primarily used for RTF writer/reader
+     * Depth of table container nested level; Primarily used for RTF writer/reader.
      *
      * 0 = Not in a table; 1 = in a table; 2 = in a table inside another table, etc.
      *
@@ -35,8 +35,12 @@ class Paragraph extends AbstractStyle
      */
     private $nestedLevel = 0;
 
+    private const LEFT = Jc::LEFT;
+    private const RIGHT = Jc::RIGHT;
+    private const JUSTIFY = Jc::JUSTIFY;
+
     /**
-     * Write style
+     * Write style.
      *
      * @return string
      */
@@ -47,12 +51,24 @@ public function write()
             return '';
         }
 
-        $alignments = array(
-            Jc::START  => '\ql',
-            Jc::END    => '\qr',
+        $alignments = [
+            Jc::START => '\ql',
+            Jc::END => '\qr',
+            Jc::CENTER => '\qc',
+            Jc::BOTH => '\qj',
+            self::LEFT => '\ql',
+            self::RIGHT => '\qr',
+            self::JUSTIFY => '\qj',
+        ];
+        $bidiAlignments = [
+            Jc::START => '\qr',
+            Jc::END => '\ql',
             Jc::CENTER => '\qc',
-            Jc::BOTH   => '\qj',
-        );
+            Jc::BOTH => '\qj',
+            self::LEFT => '\ql',
+            self::RIGHT => '\qr',
+            self::JUSTIFY => '\qj',
+        ];
 
         $spaceAfter = $style->getSpaceAfter();
         $spaceBefore = $style->getSpaceBefore();
@@ -61,12 +77,17 @@ public function write()
         if ($this->nestedLevel == 0) {
             $content .= '\pard\nowidctlpar ';
         }
-        if (isset($alignments[$style->getAlignment()])) {
-            $content .= $alignments[$style->getAlignment()];
+        $alignment = $style->getAlignment();
+        $bidi = $style->isBidi();
+        if ($alignment === '' && $bidi !== null) {
+            $alignment = Jc::START;
+        }
+        if (isset($alignments[$alignment])) {
+            $content .= $bidi ? $bidiAlignments[$alignment] : $alignments[$alignment];
         }
         $content .= $this->writeIndentation($style->getIndentation());
-        $content .= $this->getValueIf($spaceBefore !== null, '\sb' . round($spaceBefore));
-        $content .= $this->getValueIf($spaceAfter !== null, '\sa' . round($spaceAfter));
+        $content .= $this->getValueIf($spaceBefore !== null, '\sb' . round($spaceBefore ?? 0));
+        $content .= $this->getValueIf($spaceAfter !== null, '\sa' . round($spaceAfter ?? 0));
         $lineHeight = $style->getLineHeight();
         if ($lineHeight) {
             $lineHeightAdjusted = (int) ($lineHeight * 240);
@@ -83,9 +104,10 @@ public function write()
     }
 
     /**
-     * Writes an \PhpOffice\PhpWord\Style\Indentation
+     * Writes an \PhpOffice\PhpWord\Style\Indentation.
      *
      * @param null|\PhpOffice\PhpWord\Style\Indentation $indent
+     *
      * @return string
      */
     private function writeIndentation($indent = null)
@@ -100,9 +122,10 @@ private function writeIndentation($indent = null)
     }
 
     /**
-     * Writes tabs
+     * Writes tabs.
      *
      * @param \PhpOffice\PhpWord\Style\Tab[] $tabs
+     *
      * @return string
      */
     private function writeTabs($tabs = null)
@@ -123,7 +146,7 @@ private function writeTabs($tabs = null)
      *
      * @param int $value
      */
-    public function setNestedLevel($value)
+    public function setNestedLevel($value): void
     {
         $this->nestedLevel = $value;
     }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Style/Section.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Style/Section.php
index c680194763..9c6a60ad6a 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Style/Section.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Style/Section.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,14 +20,14 @@
 use PhpOffice\PhpWord\Style\Section as SectionStyle;
 
 /**
- * RTF section style writer
+ * RTF section style writer.
  *
  * @since 0.12.0
  */
 class Section extends AbstractStyle
 {
     /**
-     * Write style
+     * Write style.
      *
      * @return string
      */
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Style/Tab.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Style/Tab.php
index a21b13d39d..bb885e16c0 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Style/Tab.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/RTF/Style/Tab.php
@@ -11,14 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\RTF\Style;
 
 /**
- * Line numbering style writer
+ * Line numbering style writer.
  *
  * @since 0.10.0
  */
@@ -33,11 +33,11 @@ public function write()
         if (!$style instanceof \PhpOffice\PhpWord\Style\Tab) {
             return;
         }
-        $tabs = array(
-            \PhpOffice\PhpWord\Style\Tab::TAB_STOP_RIGHT   => '\tqr',
-            \PhpOffice\PhpWord\Style\Tab::TAB_STOP_CENTER  => '\tqc',
+        $tabs = [
+            \PhpOffice\PhpWord\Style\Tab::TAB_STOP_RIGHT => '\tqr',
+            \PhpOffice\PhpWord\Style\Tab::TAB_STOP_CENTER => '\tqc',
             \PhpOffice\PhpWord\Style\Tab::TAB_STOP_DECIMAL => '\tqdec',
-        );
+        ];
         $content = '';
         if (isset($tabs[$style->getType()])) {
             $content .= $tabs[$style->getType()];
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007.php
index eee215bef0..e7801c04c2 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -23,59 +23,60 @@
 use PhpOffice\PhpWord\Shared\ZipArchive;
 
 /**
- * Word2007 writer
+ * Word2007 writer.
  */
 class Word2007 extends AbstractWriter implements WriterInterface
 {
     /**
-     * Content types values
+     * Content types values.
      *
      * @var array
      */
-    private $contentTypes = array('default' => array(), 'override' => array());
+    private $contentTypes = ['default' => [], 'override' => []];
 
     /**
-     * Document relationship
+     * Document relationship.
      *
      * @var array
      */
-    private $relationships = array();
+    private $relationships = [];
 
     /**
-     * Create new Word2007 writer
+     * Create new Word2007 writer.
      *
      * @param \PhpOffice\PhpWord\PhpWord
      */
-    public function __construct(PhpWord $phpWord = null)
+    public function __construct(?PhpWord $phpWord = null)
     {
         // Assign PhpWord
         $this->setPhpWord($phpWord);
 
         // Create parts
-        $this->parts = array(
-            'ContentTypes'   => '[Content_Types].xml',
-            'Rels'           => '_rels/.rels',
-            'DocPropsApp'    => 'docProps/app.xml',
-            'DocPropsCore'   => 'docProps/core.xml',
+        // The first four files need to be in this order for Mimetype detection to work
+        $this->parts = [
+            'ContentTypes' => '[Content_Types].xml',
+            'Rels' => '_rels/.rels',
+            'RelsDocument' => 'word/_rels/document.xml.rels',
+            'Document' => 'word/document.xml',
+            'DocPropsApp' => 'docProps/app.xml',
+            'DocPropsCore' => 'docProps/core.xml',
             'DocPropsCustom' => 'docProps/custom.xml',
-            'RelsDocument'   => 'word/_rels/document.xml.rels',
-            'Document'       => 'word/document.xml',
-            'Comments'       => 'word/comments.xml',
-            'Styles'         => 'word/styles.xml',
-            'Numbering'      => 'word/numbering.xml',
-            'Settings'       => 'word/settings.xml',
-            'WebSettings'    => 'word/webSettings.xml',
-            'FontTable'      => 'word/fontTable.xml',
-            'Theme'          => 'word/theme/theme1.xml',
-            'RelsPart'       => '',
-            'Header'         => '',
-            'Footer'         => '',
-            'Footnotes'      => '',
-            'Endnotes'       => '',
-            'Chart'          => '',
-        );
+            'Comments' => 'word/comments.xml',
+            'Styles' => 'word/styles.xml',
+            'Numbering' => 'word/numbering.xml',
+            'Settings' => 'word/settings.xml',
+            'WebSettings' => 'word/webSettings.xml',
+            'FontTable' => 'word/fontTable.xml',
+            'Theme' => 'word/theme/theme1.xml',
+            'RelsPart' => '',
+            'Header' => '',
+            'Footer' => '',
+            'Footnotes' => '',
+            'Endnotes' => '',
+            'Chart' => '',
+        ];
         foreach (array_keys($this->parts) as $partName) {
-            $partClass = get_class($this) . '\\Part\\' . $partName;
+            $partClass = static::class . '\\Part\\' . $partName;
             if (class_exists($partClass)) {
                 /** @var \PhpOffice\PhpWord\Writer\Word2007\Part\AbstractPart $part Type hint */
                 $part = new $partClass();
@@ -85,25 +86,23 @@ public function __construct(PhpWord $phpWord = null)
         }
 
         // Set package paths
-        $this->mediaPaths = array('image' => 'word/media/', 'object' => 'word/embeddings/');
+        $this->mediaPaths = ['image' => 'word/media/', 'object' => 'word/embeddings/'];
     }
 
     /**
      * Save document by name.
-     *
-     * @param string $filename
      */
-    public function save($filename = null)
+    public function save(string $filename): void
     {
         $filename = $this->getTempFile($filename);
         $zip = $this->getZipArchive($filename);
         $phpWord = $this->getPhpWord();
 
         // Content types
-        $this->contentTypes['default'] = array(
+        $this->contentTypes['default'] = [
             'rels' => 'application/vnd.openxmlformats-package.relationships+xml',
-            'xml'  => 'application/xml',
-        );
+            'xml' => 'application/xml',
+        ];
 
         // Add section media files
         $sectionMedia = Media::getElements('section');
@@ -120,7 +119,7 @@ public function save($filename = null)
         $this->addHeaderFooterMedia($zip, 'footer');
 
         // Add header/footer contents
-        $rId = Media::countElements('section') + 6; // @see Rels::writeDocRels for 6 first elements
+        $rId = Media::countElements('section') + 6; //@see Rels::writeDocRels for 6 first elements
         $sections = $phpWord->getSections();
         foreach ($sections as $section) {
             $this->addHeaderFooterContent($section, $zip, 'header', $rId);
@@ -145,7 +144,7 @@ public function save($filename = null)
     }
 
     /**
-     * Get content types
+     * Get content types.
      *
      * @return array
      */
@@ -155,7 +154,7 @@ public function getContentTypes()
     }
 
     /**
-     * Get content types
+     * Get content types.
      *
      * @return array
      */
@@ -167,10 +166,9 @@ public function getRelationships()
     /**
      * Add header/footer media files, e.g. footer1.xml.rels.
      *
-     * @param \PhpOffice\PhpWord\Shared\ZipArchive $zip
      * @param string $docPart
      */
-    private function addHeaderFooterMedia(ZipArchive $zip, $docPart)
+    private function addHeaderFooterMedia(ZipArchive $zip, $docPart): void
     {
         $elements = Media::getElements($docPart);
         if (!empty($elements)) {
@@ -192,23 +190,21 @@ private function addHeaderFooterMedia(ZipArchive $zip, $docPart)
     /**
      * Add header/footer content.
      *
-     * @param \PhpOffice\PhpWord\Element\Section &$section
-     * @param \PhpOffice\PhpWord\Shared\ZipArchive $zip
      * @param string $elmType header|footer
      * @param int &$rId
      */
-    private function addHeaderFooterContent(Section &$section, ZipArchive $zip, $elmType, &$rId)
+    private function addHeaderFooterContent(Section &$section, ZipArchive $zip, $elmType, &$rId): void
     {
         $getFunction = $elmType == 'header' ? 'getHeaders' : 'getFooters';
         $elmCount = ($section->getSectionId() - 1) * 3;
         $elements = $section->$getFunction();
         /** @var \PhpOffice\PhpWord\Element\AbstractElement $element Type hint */
         foreach ($elements as &$element) {
-            $elmCount++;
+            ++$elmCount;
             $element->setRelationId(++$rId);
             $elmFile = "{$elmType}{$elmCount}.xml"; // e.g. footer1.xml
             $this->contentTypes['override']["/word/$elmFile"] = $elmType;
-            $this->relationships[] = array('target' => $elmFile, 'type' => $elmType, 'rID' => $rId);
+            $this->relationships[] = ['target' => $elmFile, 'type' => $elmType, 'rID' => $rId];
 
             /** @var \PhpOffice\PhpWord\Writer\Word2007\Part\AbstractPart $writerPart Type hint */
             $writerPart = $this->getWriterPart($elmType)->setElement($element);
@@ -217,13 +213,12 @@ private function addHeaderFooterContent(Section &$section, ZipArchive $zip, $elm
     }
 
     /**
-     * Add footnotes/endnotes
+     * Add footnotes/endnotes.
      *
-     * @param \PhpOffice\PhpWord\Shared\ZipArchive $zip
      * @param int &$rId
      * @param string $noteType
      */
-    private function addNotes(ZipArchive $zip, &$rId, $noteType = 'footnote')
+    private function addNotes(ZipArchive $zip, &$rId, $noteType = 'footnote'): void
     {
         $phpWord = $this->getPhpWord();
         $noteType = ($noteType == 'endnote') ? 'endnote' : 'footnote';
@@ -232,13 +227,12 @@ private function addNotes(ZipArchive $zip, &$rId, $noteType = 'footnote')
         $collection = $phpWord->$method();
 
         // Add footnotes media files, relations, and contents
-        /** @var \PhpOffice\PhpWord\Collection\AbstractCollection $collection Type hint */
         if ($collection->countItems() > 0) {
             $media = Media::getElements($noteType);
             $this->addFilesToPackage($zip, $media);
             $this->registerContentTypes($media);
             $this->contentTypes['override']["/word/{$partName}.xml"] = $partName;
-            $this->relationships[] = array('target' => "{$partName}.xml", 'type' => $partName, 'rID' => ++$rId);
+            $this->relationships[] = ['target' => "{$partName}.xml", 'type' => $partName, 'rID' => ++$rId];
 
             // Write relationships file, e.g. word/_rels/footnotes.xml
             if (!empty($media)) {
@@ -254,21 +248,19 @@ private function addNotes(ZipArchive $zip, &$rId, $noteType = 'footnote')
     }
 
     /**
-     * Add comments
+     * Add comments.
      *
-     * @param \PhpOffice\PhpWord\Shared\ZipArchive $zip
      * @param int &$rId
      */
-    private function addComments(ZipArchive $zip, &$rId)
+    private function addComments(ZipArchive $zip, &$rId): void
     {
         $phpWord = $this->getPhpWord();
         $collection = $phpWord->getComments();
         $partName = 'comments';
 
         // Add comment relations and contents
-        /** @var \PhpOffice\PhpWord\Collection\AbstractCollection $collection Type hint */
         if ($collection->countItems() > 0) {
-            $this->relationships[] = array('target' => "{$partName}.xml", 'type' => $partName, 'rID' => ++$rId);
+            $this->relationships[] = ['target' => "{$partName}.xml", 'type' => $partName, 'rID' => ++$rId];
 
             // Write content file, e.g. word/comments.xml
             $writerPart = $this->getWriterPart($partName)->setElements($collection->getItems());
@@ -279,10 +271,9 @@ private function addComments(ZipArchive $zip, &$rId)
     /**
      * Add chart.
      *
-     * @param \PhpOffice\PhpWord\Shared\ZipArchive $zip
      * @param int &$rId
      */
-    private function addChart(ZipArchive $zip, &$rId)
+    private function addChart(ZipArchive $zip, &$rId): void
     {
         $phpWord = $this->getPhpWord();
 
@@ -291,15 +282,15 @@ private function addChart(ZipArchive $zip, &$rId)
         if ($collection->countItems() > 0) {
             /** @var \PhpOffice\PhpWord\Element\Chart $chart */
             foreach ($collection->getItems() as $chart) {
-                $index++;
-                $rId++;
+                ++$index;
+                ++$rId;
                 $filename = "charts/chart{$index}.xml";
 
                 // ContentTypes.xml
                 $this->contentTypes['override']["/word/{$filename}"] = 'chart';
 
                 // word/_rels/document.xml.rel
-                $this->relationships[] = array('target' => $filename, 'type' => 'chart', 'rID' => $rId);
+                $this->relationships[] = ['target' => $filename, 'type' => 'chart', 'rID' => $rId];
 
                 // word/charts/chartN.xml
                 $chart->setRelationId($rId);
@@ -315,7 +306,7 @@ private function addChart(ZipArchive $zip, &$rId)
      *
      * @param array $media
      */
-    private function registerContentTypes($media)
+    private function registerContentTypes($media): void
     {
         foreach ($media as $medium) {
             $mediumType = $medium['type'];
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/AbstractElement.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/AbstractElement.php
index ee0fb2f901..b677556d62 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/AbstractElement.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/AbstractElement.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -21,45 +21,49 @@
 use PhpOffice\PhpWord\Settings;
 use PhpOffice\PhpWord\Shared\Text as SharedText;
 use PhpOffice\PhpWord\Shared\XMLWriter;
+use PhpOffice\PhpWord\Writer\Word2007\Part\AbstractPart;
 
 /**
- * Abstract element writer
+ * Abstract element writer.
  *
  * @since 0.11.0
  */
 abstract class AbstractElement
 {
     /**
-     * XML writer
+     * XML writer.
      *
      * @var \PhpOffice\PhpWord\Shared\XMLWriter
      */
     private $xmlWriter;
 
     /**
-     * Element
+     * Element.
      *
      * @var \PhpOffice\PhpWord\Element\AbstractElement
      */
     private $element;
 
     /**
-     * Without paragraph
+     * Without paragraph.
      *
      * @var bool
      */
     protected $withoutP = false;
 
     /**
-     * Write element
+     * @var null|AbstractPart
+     */
+    protected $part;
+
+    /**
+     * Write element.
      */
     abstract public function write();
 
     /**
-     * Create new instance
+     * Create new instance.
      *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
-     * @param \PhpOffice\PhpWord\Element\AbstractElement $element
      * @param bool $withoutP
      */
     public function __construct(XMLWriter $xmlWriter, Element $element, $withoutP = false)
@@ -70,7 +74,7 @@ public function __construct(XMLWriter $xmlWriter, Element $element, $withoutP =
     }
 
     /**
-     * Get XML Writer
+     * Get XML Writer.
      *
      * @return \PhpOffice\PhpWord\Shared\XMLWriter
      */
@@ -80,7 +84,7 @@ protected function getXmlWriter()
     }
 
     /**
-     * Get element
+     * Get element.
      *
      * @return \PhpOffice\PhpWord\Element\AbstractElement
      */
@@ -94,7 +98,7 @@ protected function getElement()
      *
      * @uses \PhpOffice\PhpWord\Writer\Word2007\Element\PageBreak::write()
      */
-    protected function startElementP()
+    protected function startElementP(): void
     {
         if (!$this->withoutP) {
             $this->xmlWriter->startElement('w:p');
@@ -109,7 +113,7 @@ protected function startElementP()
     /**
      * End w:p DOM element.
      */
-    protected function endElementP()
+    protected function endElementP(): void
     {
         $this->writeCommentRangeEnd();
         if (!$this->withoutP) {
@@ -118,55 +122,46 @@ protected function endElementP()
     }
 
     /**
-     * Writes the w:commentRangeStart DOM element
+     * Writes the w:commentRangeStart DOM element.
      */
-    protected function writeCommentRangeStart()
+    protected function writeCommentRangeStart(): void
     {
-        if ($this->element->getCommentRangeStart() != null) {
-            $comment = $this->element->getCommentRangeStart();
-            //only set the ID if it is not yet set, otherwise it will overwrite it
-            if ($comment->getElementId() == null) {
-                $comment->setElementId();
+        if ($this->element->getCommentsRangeStart() != null) {
+            foreach ($this->element->getCommentsRangeStart()->getItems() as $comment) {
+                $this->xmlWriter->writeElementBlock('w:commentRangeStart', ['w:id' => $comment->getElementId()]);
             }
-
-            $this->xmlWriter->writeElementBlock('w:commentRangeStart', array('w:id' => $comment->getElementId()));
         }
     }
 
     /**
-     * Writes the w:commentRangeEnd DOM element
+     * Writes the w:commentRangeEnd DOM element.
      */
-    protected function writeCommentRangeEnd()
+    protected function writeCommentRangeEnd(): void
     {
-        if ($this->element->getCommentRangeEnd() != null) {
-            $comment = $this->element->getCommentRangeEnd();
-            //only set the ID if it is not yet set, otherwise it will overwrite it, this should normally not happen
-            if ($comment->getElementId() == null) {
-                $comment->setElementId(); // @codeCoverageIgnore
-            } // @codeCoverageIgnore
-
-            $this->xmlWriter->writeElementBlock('w:commentRangeEnd', array('w:id' => $comment->getElementId()));
-            $this->xmlWriter->startElement('w:r');
-            $this->xmlWriter->writeElementBlock('w:commentReference', array('w:id' => $comment->getElementId()));
-            $this->xmlWriter->endElement();
-        } elseif ($this->element->getCommentRangeStart() != null && $this->element->getCommentRangeStart()->getEndElement() == null) {
-            $comment = $this->element->getCommentRangeStart();
-            //only set the ID if it is not yet set, otherwise it will overwrite it, this should normally not happen
-            if ($comment->getElementId() == null) {
-                $comment->setElementId(); // @codeCoverageIgnore
-            } // @codeCoverageIgnore
-
-            $this->xmlWriter->writeElementBlock('w:commentRangeEnd', array('w:id' => $comment->getElementId()));
-            $this->xmlWriter->startElement('w:r');
-            $this->xmlWriter->writeElementBlock('w:commentReference', array('w:id' => $comment->getElementId()));
-            $this->xmlWriter->endElement();
+        if ($this->element->getCommentsRangeEnd() != null) {
+            foreach ($this->element->getCommentsRangeEnd()->getItems() as $comment) {
+                $this->xmlWriter->writeElementBlock('w:commentRangeEnd', ['w:id' => $comment->getElementId()]);
+                $this->xmlWriter->startElement('w:r');
+                $this->xmlWriter->writeElementBlock('w:commentReference', ['w:id' => $comment->getElementId()]);
+                $this->xmlWriter->endElement();
+            }
+        }
+        if ($this->element->getCommentsRangeStart() != null) {
+            foreach ($this->element->getCommentsRangeStart()->getItems() as $comment) {
+                if ($comment->getEndElement() == null) {
+                    $this->xmlWriter->writeElementBlock('w:commentRangeEnd', ['w:id' => $comment->getElementId()]);
+                    $this->xmlWriter->startElement('w:r');
+                    $this->xmlWriter->writeElementBlock('w:commentReference', ['w:id' => $comment->getElementId()]);
+                    $this->xmlWriter->endElement();
+                }
+            }
         }
     }
 
     /**
      * Write ending.
      */
-    protected function writeParagraphStyle()
+    protected function writeParagraphStyle(): void
     {
         $this->writeTextStyle('Paragraph');
     }
@@ -174,7 +169,7 @@ protected function writeParagraphStyle()
     /**
      * Write ending.
      */
-    protected function writeFontStyle()
+    protected function writeFontStyle(): void
     {
         $this->writeTextStyle('Font');
     }
@@ -184,7 +179,7 @@ protected function writeFontStyle()
      *
      * @param string $styleType Font|Paragraph
      */
-    private function writeTextStyle($styleType)
+    private function writeTextStyle($styleType): void
     {
         $method = "get{$styleType}Style";
         $class = "PhpOffice\\PhpWord\\Writer\\Word2007\\Style\\{$styleType}";
@@ -200,9 +195,10 @@ private function writeTextStyle($styleType)
     }
 
     /**
-     * Convert text to valid format
+     * Convert text to valid format.
      *
      * @param string $text
+     *
      * @return string
      */
     protected function getText($text)
@@ -211,9 +207,10 @@ protected function getText($text)
     }
 
     /**
-     * Write an XML text, this will call text() or writeRaw() depending on the value of Settings::isOutputEscapingEnabled()
+     * Write an XML text, this will call text() or writeRaw() depending on the value of Settings::isOutputEscapingEnabled().
      *
      * @param string $content The text string to write
+     *
      * @return bool Returns true on success or false on failure
      */
     protected function writeText($content)
@@ -224,4 +221,16 @@ protected function writeText($content)
 
         return $this->getXmlWriter()->writeRaw($content);
     }
+
+    public function setPart(?AbstractPart $part): self
+    {
+        $this->part = $part;
+
+        return $this;
+    }
+
+    public function getPart(): ?AbstractPart
+    {
+        return $this->part;
+    }
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Bookmark.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Bookmark.php
index 04eaacf37c..1e618af987 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Bookmark.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Bookmark.php
@@ -11,23 +11,23 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
 /**
- * Bookmark element writer
+ * Bookmark element writer.
  *
  * @since 0.12.0
  */
 class Bookmark extends AbstractElement
 {
     /**
-     * Write bookmark element
+     * Write bookmark element.
      */
-    public function write()
+    public function write(): void
     {
         $xmlWriter = $this->getXmlWriter();
         $element = $this->getElement();
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Chart.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Chart.php
index f88ca2d252..9721384fd3 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Chart.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Chart.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,7 +20,7 @@
 use PhpOffice\PhpWord\Element\Chart as ChartElement;
 
 /**
- * Chart element writer
+ * Chart element writer.
  *
  * @since 0.12.0
  */
@@ -29,7 +29,7 @@ class Chart extends AbstractElement
     /**
      * Write element.
      */
-    public function write()
+    public function write(): void
     {
         $xmlWriter = $this->getXmlWriter();
         $element = $this->getElement();
@@ -50,8 +50,8 @@ public function write()
         $xmlWriter->startElement('wp:inline');
 
         // EMU
-        $xmlWriter->writeElementBlock('wp:extent', array('cx' => $style->getWidth(), 'cy' => $style->getHeight()));
-        $xmlWriter->writeElementBlock('wp:docPr', array('id' => $rId, 'name' => "Chart{$rId}"));
+        $xmlWriter->writeElementBlock('wp:extent', ['cx' => $style->getWidth(), 'cy' => $style->getHeight()]);
+        $xmlWriter->writeElementBlock('wp:docPr', ['id' => $rId, 'name' => "Chart{$rId}"]);
 
         $xmlWriter->startElement('a:graphic');
         $xmlWriter->writeAttribute('xmlns:a', 'http://schemas.openxmlformats.org/drawingml/2006/main');
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/CheckBox.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/CheckBox.php
index 05692a074d..3d7fdab1fa 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/CheckBox.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/CheckBox.php
@@ -11,14 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
 /**
- * CheckBox element writer
+ * CheckBox element writer.
  *
  * @since 0.10.0
  */
@@ -27,7 +27,7 @@ class CheckBox extends Text
     /**
      * Write element.
      */
-    public function write()
+    public function write(): void
     {
         $xmlWriter = $this->getXmlWriter();
         $element = $this->getElement();
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Container.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Container.php
index 0a39403d67..491e813c9e 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Container.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Container.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -23,14 +23,14 @@
 use PhpOffice\PhpWord\Shared\XMLWriter;
 
 /**
- * Container element writer (section, textrun, header, footnote, cell, etc.)
+ * Container element writer (section, textrun, header, footnote, cell, etc.).
  *
  * @since 0.11.0
  */
 class Container extends AbstractElement
 {
     /**
-     * Namespace; Can't use __NAMESPACE__ in inherited class (ODText)
+     * Namespace; Can't use __NAMESPACE__ in inherited class (ODText).
      *
      * @var string
      */
@@ -39,14 +39,14 @@ class Container extends AbstractElement
     /**
      * Write element.
      */
-    public function write()
+    public function write(): void
     {
         $container = $this->getElement();
         if (!$container instanceof ContainerElement) {
             return;
         }
         $containerClass = substr(get_class($container), strrpos(get_class($container), '\\') + 1);
-        $withoutP = in_array($containerClass, array('TextRun', 'Footnote', 'Endnote', 'ListItemRun'));
+        $withoutP = in_array($containerClass, ['TextRun', 'Footnote', 'Endnote', 'ListItemRun']);
         $xmlWriter = $this->getXmlWriter();
 
         // Loop through elements
@@ -69,11 +69,10 @@ public function write()
     }
 
     /**
-     * Write individual element
+     * Write individual element.
      *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
-     * @param \PhpOffice\PhpWord\Element\AbstractElement $element
      * @param bool $withoutP
+     *
      * @return string
      */
     private function writeElement(XMLWriter $xmlWriter, Element $element, $withoutP)
@@ -84,6 +83,7 @@ private function writeElement(XMLWriter $xmlWriter, Element $element, $withoutP)
         if (class_exists($writerClass)) {
             /** @var \PhpOffice\PhpWord\Writer\Word2007\Element\AbstractElement $writer Type hint */
             $writer = new $writerClass($xmlWriter, $element, $withoutP);
+            $writer->setPart($this->getPart());
             $writer->write();
         }
 
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Endnote.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Endnote.php
index 9a2eb3ffab..f96ac7977f 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Endnote.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Endnote.php
@@ -11,21 +11,21 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
 /**
- * Endnote element writer
+ * Endnote element writer.
  *
  * @since 0.10.0
  */
 class Endnote extends Footnote
 {
     /**
-     * Reference type
+     * Reference type.
      *
      * @var string
      */
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Field.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Field.php
index b800fbddc3..2977c01626 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Field.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Field.php
@@ -11,14 +11,17 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
+use PhpOffice\PhpWord\Element\Field as ElementField;
+use PhpOffice\PhpWord\Element\TextRun;
+
 /**
- * Field element writer
+ * Field element writer.
  *
  * @since 0.11.0
  */
@@ -27,10 +30,10 @@ class Field extends Text
     /**
      * Write field element.
      */
-    public function write()
+    public function write(): void
     {
         $element = $this->getElement();
-        if (!$element instanceof \PhpOffice\PhpWord\Element\Field) {
+        if (!$element instanceof ElementField) {
             return;
         }
 
@@ -42,7 +45,7 @@ public function write()
         }
     }
 
-    private function writeDefault(\PhpOffice\PhpWord\Element\Field $element)
+    private function writeDefault(ElementField $element): void
     {
         $xmlWriter = $this->getXmlWriter();
         $this->startElementP();
@@ -73,7 +76,7 @@ private function writeDefault(\PhpOffice\PhpWord\Element\Field $element)
         $xmlWriter->endElement(); // w:r
 
         if ($element->getText() != null) {
-            if ($element->getText() instanceof \PhpOffice\PhpWord\Element\TextRun) {
+            if ($element->getText() instanceof TextRun) {
                 $containerWriter = new Container($xmlWriter, $element->getText(), true);
                 $containerWriter->write();
 
@@ -116,12 +119,11 @@ private function writeDefault(\PhpOffice\PhpWord\Element\Field $element)
     }
 
     /**
-     * Writes a macrobutton field
+     * Writes a macrobutton field.
      *
      * //TODO A lot of code duplication with general method, should maybe be refactored
-     * @param \PhpOffice\PhpWord\Element\Field $element
      */
-    protected function writeMacrobutton(\PhpOffice\PhpWord\Element\Field $element)
+    protected function writeMacrobutton(ElementField $element): void
     {
         $xmlWriter = $this->getXmlWriter();
         $this->startElementP();
@@ -160,26 +162,31 @@ protected function writeMacrobutton(\PhpOffice\PhpWord\Element\Field $element)
         $this->endElementP(); // w:p
     }
 
-    private function buildPropertiesAndOptions(\PhpOffice\PhpWord\Element\Field $element)
+    private function buildPropertiesAndOptions(ElementField $element)
     {
         $propertiesAndOptions = '';
         $properties = $element->getProperties();
         foreach ($properties as $propkey => $propval) {
             switch ($propkey) {
                 case 'format':
-                    $propertiesAndOptions .= '\* ' . $propval . ' ';
+                    $propertiesAndOptions .= '\\* ' . $propval . ' ';
+
                     break;
                 case 'numformat':
-                    $propertiesAndOptions .= '\# ' . $propval . ' ';
+                    $propertiesAndOptions .= '\\# ' . $propval . ' ';
+
                     break;
                 case 'dateformat':
-                    $propertiesAndOptions .= '\@ "' . $propval . '" ';
+                    $propertiesAndOptions .= '\\@ "' . $propval . '" ';
+
                     break;
                 case 'macroname':
                     $propertiesAndOptions .= $propval . ' ';
+
                     break;
                 default:
                     $propertiesAndOptions .= '"' . $propval . '" ';
+
                     break;
             }
         }
@@ -188,22 +195,32 @@ private function buildPropertiesAndOptions(\PhpOffice\PhpWord\Element\Field $ele
         foreach ($options as $option) {
             switch ($option) {
                 case 'PreserveFormat':
-                    $propertiesAndOptions .= '\* MERGEFORMAT ';
+                    $propertiesAndOptions .= '\\* MERGEFORMAT ';
+
                     break;
                 case 'LunarCalendar':
-                    $propertiesAndOptions .= '\h ';
+                    $propertiesAndOptions .= '\\h ';
+
                     break;
                 case 'SakaEraCalendar':
-                    $propertiesAndOptions .= '\s ';
+                    $propertiesAndOptions .= '\\s ';
+
                     break;
                 case 'LastUsedFormat':
-                    $propertiesAndOptions .= '\l ';
+                    $propertiesAndOptions .= '\\l ';
+
                     break;
                 case 'Bold':
-                    $propertiesAndOptions .= '\b ';
+                    $propertiesAndOptions .= '\\b ';
+
                     break;
                 case 'Italic':
-                    $propertiesAndOptions .= '\i ';
+                    $propertiesAndOptions .= '\\i ';
+
+                    break;
+                case 'Path':
+                    $propertiesAndOptions .= '\\p ';
+
                     break;
                 default:
                     $propertiesAndOptions .= $option . ' ';
@@ -212,4 +229,104 @@ private function buildPropertiesAndOptions(\PhpOffice\PhpWord\Element\Field $ele
 
         return $propertiesAndOptions;
     }
+
+    /**
+     * Writes a REF field.
+     */
+    protected function writeRef(ElementField $element): void
+    {
+        $xmlWriter = $this->getXmlWriter();
+        $this->startElementP();
+
+        $xmlWriter->startElement('w:r');
+        $xmlWriter->startElement('w:fldChar');
+        $xmlWriter->writeAttribute('w:fldCharType', 'begin');
+        $xmlWriter->endElement(); // w:fldChar
+        $xmlWriter->endElement(); // w:r
+
+        $instruction = ' ' . $element->getType() . ' ';
+
+        foreach ($element->getProperties() as $property) {
+            $instruction .= $property . ' ';
+        }
+        foreach ($element->getOptions() as $optionKey => $optionValue) {
+            $instruction .= $this->convertRefOption($optionKey, $optionValue) . ' ';
+        }
+
+        $xmlWriter->startElement('w:r');
+        $this->writeFontStyle();
+        $xmlWriter->startElement('w:instrText');
+        $xmlWriter->writeAttribute('xml:space', 'preserve');
+        $xmlWriter->text($instruction);
+        $xmlWriter->endElement(); // w:instrText
+        $xmlWriter->endElement(); // w:r
+
+        if ($element->getText() != null) {
+            if ($element->getText() instanceof \PhpOffice\PhpWord\Element\TextRun) {
+                $containerWriter = new Container($xmlWriter, $element->getText(), true);
+                $containerWriter->write();
+
+                $xmlWriter->startElement('w:r');
+                $xmlWriter->startElement('w:instrText');
+                $xmlWriter->text('"' . $this->buildPropertiesAndOptions($element));
+                $xmlWriter->endElement(); // w:instrText
+                $xmlWriter->endElement(); // w:r
+
+                $xmlWriter->startElement('w:r');
+                $xmlWriter->startElement('w:instrText');
+                $xmlWriter->writeAttribute('xml:space', 'preserve');
+                $xmlWriter->text(' ');
+                $xmlWriter->endElement(); // w:instrText
+                $xmlWriter->endElement(); // w:r
+            }
+        }
+
+        $xmlWriter->startElement('w:r');
+        $xmlWriter->startElement('w:fldChar');
+        $xmlWriter->writeAttribute('w:fldCharType', 'separate');
+        $xmlWriter->endElement(); // w:fldChar
+        $xmlWriter->endElement(); // w:r
+
+        $xmlWriter->startElement('w:r');
+        $xmlWriter->startElement('w:rPr');
+        $xmlWriter->startElement('w:noProof');
+        $xmlWriter->endElement(); // w:noProof
+        $xmlWriter->endElement(); // w:rPr
+        $xmlWriter->writeElement('w:t', $element->getText() != null && is_string($element->getText()) ? $element->getText() : '1');
+        $xmlWriter->endElement(); // w:r
+
+        $xmlWriter->startElement('w:r');
+        $xmlWriter->startElement('w:fldChar');
+        $xmlWriter->writeAttribute('w:fldCharType', 'end');
+        $xmlWriter->endElement(); // w:fldChar
+        $xmlWriter->endElement(); // w:r
+
+        $this->endElementP(); // w:p
+    }
+
+    private function convertRefOption(string $optionKey, string $optionValue): string
+    {
+        if ($optionKey === 'NumberSeperatorSequence') {
+            return '\\d ' . $optionValue;
+        }
+
+        switch ($optionValue) {
+            case 'IncrementAndInsertText':
+                return '\\f';
+            case 'CreateHyperLink':
+                return '\\h';
+            case 'NoTrailingPeriod':
+                return '\\n';
+            case 'IncludeAboveOrBelow':
+                return '\\p';
+            case 'InsertParagraphNumberRelativeContext':
+                return '\\r';
+            case 'SuppressNonDelimiterNonNumericalText':
+                return '\\t';
+            case 'InsertParagraphNumberFullContext':
+                return '\\w';
+            default:
+                return '';
+        }
+    }
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Footnote.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Footnote.php
index 56a5332f07..77073a239d 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Footnote.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Footnote.php
@@ -11,21 +11,21 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
 /**
- * Footnote element writer
+ * Footnote element writer.
  *
  * @since 0.10.0
  */
 class Footnote extends Text
 {
     /**
-     * Reference type footnoteReference|endnoteReference
+     * Reference type footnoteReference|endnoteReference.
      *
      * @var string
      */
@@ -34,7 +34,7 @@ class Footnote extends Text
     /**
      * Write element.
      */
-    public function write()
+    public function write(): void
     {
         $xmlWriter = $this->getXmlWriter();
         $element = $this->getElement();
@@ -51,7 +51,7 @@ public function write()
         $xmlWriter->endElement(); // w:rStyle
         $xmlWriter->endElement(); // w:rPr
         $xmlWriter->startElement("w:{$this->referenceType}");
-        $xmlWriter->writeAttribute('w:id', $element->getRelationId());
+        $xmlWriter->writeAttribute('w:id', $element->getRelationId() + 1);
         $xmlWriter->endElement(); // w:$referenceType
         $xmlWriter->endElement(); // w:r
 
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/FormField.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/FormField.php
index 7206386431..5bfc8cab45 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/FormField.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/FormField.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -21,12 +21,13 @@
 use PhpOffice\PhpWord\Shared\XMLWriter;
 
 /**
- * FormField element writer
+ * FormField element writer.
  *
  * Note: DropDown is active when document protection is set to `forms`
  *
  * @since 0.12.0
  * @see  http://www.datypic.com/sc/ooxml/t-w_CT_FFData.html
+ *
  * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
  */
 class FormField extends Text
@@ -37,7 +38,7 @@ class FormField extends Text
     /**
      * Write element.
      */
-    public function write()
+    public function write(): void
     {
         $xmlWriter = $this->getXmlWriter();
         $element = $this->getElement();
@@ -46,7 +47,7 @@ public function write()
         }
 
         $type = $element->getType();
-        $instructions = array('textinput' => 'FORMTEXT', 'checkbox' => 'FORMCHECKBOX', 'dropdown' => 'FORMDROPDOWN');
+        $instructions = ['textinput' => 'FORMTEXT', 'checkbox' => 'FORMCHECKBOX', 'dropdown' => 'FORMDROPDOWN'];
         $instruction = $instructions[$type];
         $writeFormField = "write{$type}";
         $name = $element->getName();
@@ -105,10 +106,8 @@ public function write()
      * Write textinput.
      *
      * @see  http://www.datypic.com/sc/ooxml/t-w_CT_FFTextInput.html
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
-     * @param \PhpOffice\PhpWord\Element\FormField $element
      */
-    private function writeTextInput(XMLWriter $xmlWriter, FormFieldElement $element)
+    private function writeTextInput(XMLWriter $xmlWriter, FormFieldElement $element): void
     {
         $default = $element->getDefault();
 
@@ -121,10 +120,8 @@ private function writeTextInput(XMLWriter $xmlWriter, FormFieldElement $element)
      * Write checkbox.
      *
      * @see  http://www.datypic.com/sc/ooxml/t-w_CT_FFCheckBox.html
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
-     * @param \PhpOffice\PhpWord\Element\FormField $element
      */
-    private function writeCheckBox(XMLWriter $xmlWriter, FormFieldElement $element)
+    private function writeCheckBox(XMLWriter $xmlWriter, FormFieldElement $element): void
     {
         $default = $element->getDefault() ? 1 : 0;
         $value = $element->getValue();
@@ -144,10 +141,8 @@ private function writeCheckBox(XMLWriter $xmlWriter, FormFieldElement $element)
      * Write dropdown.
      *
      * @see  http://www.datypic.com/sc/ooxml/t-w_CT_FFDDList.html
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
-     * @param \PhpOffice\PhpWord\Element\FormField $element
      */
-    private function writeDropDown(XMLWriter $xmlWriter, FormFieldElement $element)
+    private function writeDropDown(XMLWriter $xmlWriter, FormFieldElement $element): void
     {
         $default = $element->getDefault();
         $value = $element->getValue();
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Formula.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Formula.php
new file mode 100644
index 0000000000..6abb74b782
--- /dev/null
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Formula.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @see         https://github.com/PHPOffice/PHPWord
+ *
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\Writer\Word2007\Element;
+
+use PhpOffice\Math\Writer\OfficeMathML;
+use PhpOffice\PhpWord\Element\Formula as FormulaElement;
+
+/**
+ * Formula element writer.
+ */
+class Formula extends AbstractElement
+{
+    /**
+     * Write element.
+     */
+    public function write(): void
+    {
+        $element = $this->getElement();
+        if (!$element instanceof FormulaElement) {
+            return;
+        }
+
+        $this->startElementP();
+
+        $xmlWriter = $this->getXmlWriter();
+
+        $xmlWriter->startElement('w:r');
+        $xmlWriter->writeElement('w:rPr');
+        $xmlWriter->endElement();
+
+        $xmlWriter->writeRaw((new OfficeMathML())->write($element->getMath()));
+
+        $this->endElementP();
+    }
+}
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Image.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Image.php
index 9b084cce4b..d33a5776dd 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Image.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Image.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -25,7 +25,7 @@
 use PhpOffice\PhpWord\Writer\Word2007\Style\Image as ImageStyleWriter;
 
 /**
- * Image element writer
+ * Image element writer.
  *
  * @since 0.10.0
  */
@@ -34,7 +34,7 @@ class Image extends AbstractElement
     /**
      * Write element.
      */
-    public function write()
+    public function write(): void
     {
         $xmlWriter = $this->getXmlWriter();
         $element = $this->getElement();
@@ -52,7 +52,7 @@ public function write()
     /**
      * Write image element.
      */
-    private function writeImage(XMLWriter $xmlWriter, ImageElement $element)
+    private function writeImage(XMLWriter $xmlWriter, ImageElement $element): void
     {
         $rId = $element->getRelationId() + ($element->isInSection() ? 6 : 0);
         $style = $element->getStyle();
@@ -97,7 +97,7 @@ private function writeImage(XMLWriter $xmlWriter, ImageElement $element)
     /**
      * Write watermark element.
      */
-    private function writeWatermark(XMLWriter $xmlWriter, ImageElement $element)
+    private function writeWatermark(XMLWriter $xmlWriter, ImageElement $element): void
     {
         $rId = $element->getRelationId();
         $style = $element->getStyle();
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Line.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Line.php
index a114be6006..f01386b408 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Line.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Line.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -21,14 +21,14 @@
 use PhpOffice\PhpWord\Writer\Word2007\Style\Line as LineStyleWriter;
 
 /**
- * Line element writer
+ * Line element writer.
  */
 class Line extends AbstractElement
 {
     /**
      * Write element.
      */
-    public function write()
+    public function write(): void
     {
         $xmlWriter = $this->getXmlWriter();
         $element = $this->getElement();
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Link.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Link.php
index f0adf851e3..a8686e82a5 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Link.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Link.php
@@ -11,14 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
 /**
- * Link element writer
+ * Link element writer.
  *
  * @since 0.10.0
  */
@@ -27,7 +27,7 @@ class Link extends Text
     /**
      * Write link element.
      */
-    public function write()
+    public function write(): void
     {
         $xmlWriter = $this->getXmlWriter();
         $element = $this->getElement();
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/ListItem.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/ListItem.php
index ef738e10d7..e254fb1459 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/ListItem.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/ListItem.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,7 +20,7 @@
 use PhpOffice\PhpWord\Writer\Word2007\Style\Paragraph as ParagraphStyleWriter;
 
 /**
- * ListItem element writer
+ * ListItem element writer.
  *
  * @since 0.10.0
  */
@@ -29,7 +29,7 @@ class ListItem extends AbstractElement
     /**
      * Write list item element.
      */
-    public function write()
+    public function write(): void
     {
         $xmlWriter = $this->getXmlWriter();
         $element = $this->getElement();
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/ListItemRun.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/ListItemRun.php
index fda2b078c8..daa2fc1d0f 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/ListItemRun.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/ListItemRun.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -21,7 +21,7 @@
 use PhpOffice\PhpWord\Writer\Word2007\Style\Paragraph as ParagraphStyleWriter;
 
 /**
- * ListItemRun element writer
+ * ListItemRun element writer.
  *
  * @since 0.10.0
  */
@@ -30,7 +30,7 @@ class ListItemRun extends AbstractElement
     /**
      * Write list item element.
      */
-    public function write()
+    public function write(): void
     {
         $element = $this->getElement();
 
@@ -41,7 +41,7 @@ public function write()
         $this->writeParagraph($element);
     }
 
-    private function writeParagraph(ListItemRunElement $element)
+    private function writeParagraph(ListItemRunElement $element): void
     {
         $xmlWriter = $this->getXmlWriter();
         $xmlWriter->startElement('w:p');
@@ -54,7 +54,7 @@ private function writeParagraph(ListItemRunElement $element)
         $xmlWriter->endElement(); // w:p
     }
 
-    private function writeParagraphProperties(ListItemRunElement $element)
+    private function writeParagraphProperties(ListItemRunElement $element): void
     {
         $xmlWriter = $this->getXmlWriter();
         $xmlWriter->startElement('w:pPr');
@@ -69,18 +69,18 @@ private function writeParagraphProperties(ListItemRunElement $element)
         $xmlWriter->endElement(); // w:pPr
     }
 
-    private function writeParagraphPropertiesNumbering(ListItemRunElement $element)
+    private function writeParagraphPropertiesNumbering(ListItemRunElement $element): void
     {
         $xmlWriter = $this->getXmlWriter();
         $xmlWriter->startElement('w:numPr');
 
-        $xmlWriter->writeElementBlock('w:ilvl', array(
+        $xmlWriter->writeElementBlock('w:ilvl', [
             'w:val' => $element->getDepth(),
-        ));
+        ]);
 
-        $xmlWriter->writeElementBlock('w:numId', array(
+        $xmlWriter->writeElementBlock('w:numId', [
             'w:val' => $element->getStyle()->getNumId(),
-        ));
+        ]);
 
         $xmlWriter->endElement(); // w:numPr
     }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/OLEObject.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/OLEObject.php
index c55ff6cd8c..94c2472908 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/OLEObject.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/OLEObject.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,7 +20,7 @@
 use PhpOffice\PhpWord\Writer\Word2007\Style\Image as ImageStyleWriter;
 
 /**
- * OLEObject element writer
+ * OLEObject element writer.
  *
  * @since 0.10.0
  */
@@ -29,7 +29,7 @@ class OLEObject extends AbstractElement
     /**
      * Write object element.
      */
-    public function write()
+    public function write(): void
     {
         $xmlWriter = $this->getXmlWriter();
         $element = $this->getElement();
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/PageBreak.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/PageBreak.php
index 0801e4d3c4..b9c3e79a7e 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/PageBreak.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/PageBreak.php
@@ -11,14 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
 /**
- * PageBreak element writer
+ * PageBreak element writer.
  *
  * @since 0.10.0
  */
@@ -29,7 +29,7 @@ class PageBreak extends AbstractElement
      *
      * @usedby \PhpOffice\PhpWord\Writer\Word2007\Element\AbstractElement::startElementP()
      */
-    public function write()
+    public function write(): void
     {
         $xmlWriter = $this->getXmlWriter();
 
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/ParagraphAlignment.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/ParagraphAlignment.php
index 5563f6075d..0f3e65e7b1 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/ParagraphAlignment.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/ParagraphAlignment.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -24,7 +24,7 @@ class ParagraphAlignment
 {
     private $name = 'w:jc';
 
-    private $attributes = array();
+    private $attributes = [];
 
     /**
      * @since 0.13.0
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/PreserveText.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/PreserveText.php
index 94ce6eded7..3a3768e717 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/PreserveText.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/PreserveText.php
@@ -11,14 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
 /**
- * PreserveText element writer
+ * PreserveText element writer.
  *
  * @since 0.10.0
  */
@@ -27,7 +27,7 @@ class PreserveText extends Text
     /**
      * Write preserve text element.
      */
-    public function write()
+    public function write(): void
     {
         $xmlWriter = $this->getXmlWriter();
         $element = $this->getElement();
@@ -37,7 +37,7 @@ public function write()
 
         $texts = $element->getText();
         if (!is_array($texts)) {
-            $texts = array($texts);
+            $texts = [$texts];
         }
 
         $this->startElementP();
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/SDT.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/SDT.php
index e496424253..f007dc790f 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/SDT.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/SDT.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -21,10 +21,11 @@
 use PhpOffice\PhpWord\Shared\XMLWriter;
 
 /**
- * Structured document tag element writer
+ * Structured document tag element writer.
  *
  * @since 0.12.0
  * @see  http://www.datypic.com/sc/ooxml/t-w_CT_SdtBlock.html
+ *
  * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
  */
 class SDT extends Text
@@ -32,7 +33,7 @@ class SDT extends Text
     /**
      * Write element.
      */
-    public function write()
+    public function write(): void
     {
         $xmlWriter = $this->getXmlWriter();
         $element = $this->getElement();
@@ -56,7 +57,7 @@ public function write()
         $xmlWriter->startElement('w:sdtPr');
         $xmlWriter->writeElementIf($alias != null, 'w:alias', 'w:val', $alias);
         $xmlWriter->writeElementBlock('w:lock', 'w:val', 'sdtLocked');
-        $xmlWriter->writeElementBlock('w:id', 'w:val', rand(100000000, 999999999));
+        $xmlWriter->writeElementBlock('w:id', 'w:val', mt_rand(100000000, 999999999));
         $xmlWriter->writeElementIf($tag != null, 'w:tag', 'w:val', $tag);
         $this->$writeFormField($xmlWriter, $element);
         $xmlWriter->endElement(); // w:sdtPr
@@ -77,9 +78,8 @@ public function write()
      * Write text.
      *
      * @see  http://www.datypic.com/sc/ooxml/t-w_CT_SdtText.html
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
      */
-    private function writePlainText(XMLWriter $xmlWriter)
+    private function writePlainText(XMLWriter $xmlWriter): void
     {
         $xmlWriter->startElement('w:text');
         $xmlWriter->endElement(); // w:text
@@ -89,17 +89,15 @@ private function writePlainText(XMLWriter $xmlWriter)
      * Write combo box.
      *
      * @see  http://www.datypic.com/sc/ooxml/t-w_CT_SdtComboBox.html
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
-     * @param \PhpOffice\PhpWord\Element\SDT $element
      */
-    private function writeComboBox(XMLWriter $xmlWriter, SDTElement $element)
+    private function writeComboBox(XMLWriter $xmlWriter, SDTElement $element): void
     {
         $type = $element->getType();
         $listItems = $element->getListItems();
 
         $xmlWriter->startElement("w:{$type}");
         foreach ($listItems as $key => $val) {
-            $xmlWriter->writeElementBlock('w:listItem', array('w:value' => $key, 'w:displayText' => $val));
+            $xmlWriter->writeElementBlock('w:listItem', ['w:value' => $key, 'w:displayText' => $val]);
         }
         $xmlWriter->endElement(); // w:{$type}
     }
@@ -108,10 +106,8 @@ private function writeComboBox(XMLWriter $xmlWriter, SDTElement $element)
      * Write drop down list.
      *
      * @see  http://www.datypic.com/sc/ooxml/t-w_CT_SdtDropDownList.html
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
-     * @param \PhpOffice\PhpWord\Element\SDT $element
      */
-    private function writeDropDownList(XMLWriter $xmlWriter, SDTElement $element)
+    private function writeDropDownList(XMLWriter $xmlWriter, SDTElement $element): void
     {
         $this->writeComboBox($xmlWriter, $element);
     }
@@ -120,10 +116,8 @@ private function writeDropDownList(XMLWriter $xmlWriter, SDTElement $element)
      * Write date.
      *
      * @see  http://www.datypic.com/sc/ooxml/t-w_CT_SdtDate.html
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
-     * @param \PhpOffice\PhpWord\Element\SDT $element
      */
-    private function writeDate(XMLWriter $xmlWriter, SDTElement $element)
+    private function writeDate(XMLWriter $xmlWriter, SDTElement $element): void
     {
         $type = $element->getType();
 
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Shape.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Shape.php
index ef30c48436..0fe4e6dba7 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Shape.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Shape.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -23,9 +23,10 @@
 use PhpOffice\PhpWord\Writer\Word2007\Style\Shape as ShapeStyleWriter;
 
 /**
- * Shape element writer
+ * Shape element writer.
  *
  * @since 0.12.0
+ *
  * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
  */
 class Shape extends AbstractElement
@@ -33,7 +34,7 @@ class Shape extends AbstractElement
     /**
      * Write element.
      */
-    public function write()
+    public function write(): void
     {
         $xmlWriter = $this->getXmlWriter();
         $element = $this->getElement();
@@ -76,11 +77,8 @@ public function write()
 
     /**
      * Write arc.
-     *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
-     * @param \PhpOffice\PhpWord\Style\Shape $style
      */
-    private function writeArc(XMLWriter $xmlWriter, ShapeStyle $style)
+    private function writeArc(XMLWriter $xmlWriter, ShapeStyle $style): void
     {
         $points = $this->getPoints('arc', $style->getPoints());
 
@@ -90,11 +88,8 @@ private function writeArc(XMLWriter $xmlWriter, ShapeStyle $style)
 
     /**
      * Write curve.
-     *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
-     * @param \PhpOffice\PhpWord\Style\Shape $style
      */
-    private function writeCurve(XMLWriter $xmlWriter, ShapeStyle $style)
+    private function writeCurve(XMLWriter $xmlWriter, ShapeStyle $style): void
     {
         $points = $this->getPoints('curve', $style->getPoints());
 
@@ -105,11 +100,8 @@ private function writeCurve(XMLWriter $xmlWriter, ShapeStyle $style)
 
     /**
      * Write line.
-     *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
-     * @param \PhpOffice\PhpWord\Style\Shape $style
      */
-    private function writeLine(XMLWriter $xmlWriter, ShapeStyle $style)
+    private function writeLine(XMLWriter $xmlWriter, ShapeStyle $style): void
     {
         $points = $this->getPoints('line', $style->getPoints());
 
@@ -119,48 +111,45 @@ private function writeLine(XMLWriter $xmlWriter, ShapeStyle $style)
 
     /**
      * Write polyline.
-     *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
-     * @param \PhpOffice\PhpWord\Style\Shape $style
      */
-    private function writePolyline(XMLWriter $xmlWriter, ShapeStyle $style)
+    private function writePolyline(XMLWriter $xmlWriter, ShapeStyle $style): void
     {
         $xmlWriter->writeAttributeIf($style->getPoints() !== null, 'points', $style->getPoints());
     }
 
     /**
      * Write rectangle.
-     *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
-     * @param \PhpOffice\PhpWord\Style\Shape $style
      */
-    private function writeRoundRect(XMLWriter $xmlWriter, ShapeStyle $style)
+    private function writeRoundRect(XMLWriter $xmlWriter, ShapeStyle $style): void
     {
         $xmlWriter->writeAttribute('arcsize', $style->getRoundness());
     }
 
     /**
-     * Set points
+     * Set points.
      *
      * @param string $type
      * @param string $value
+     *
      * @return array
      */
     private function getPoints($type, $value)
     {
-        $points = array();
+        $points = [];
 
         switch ($type) {
             case 'arc':
             case 'line':
                 $points = explode(' ', $value);
-                list($start, $end) = array_pad($points, 2, null);
-                $points = array('start' => $start, 'end' => $end);
+                [$start, $end] = array_pad($points, 2, null);
+                $points = ['start' => $start, 'end' => $end];
+
                 break;
             case 'curve':
                 $points = explode(' ', $value);
-                list($start, $end, $point1, $point2) = array_pad($points, 4, null);
-                $points = array('start' => $start, 'end' => $end, 'point1' => $point1, 'point2' => $point2);
+                [$start, $end, $point1, $point2] = array_pad($points, 4, null);
+                $points = ['start' => $start, 'end' => $end, 'point1' => $point1, 'point2' => $point2];
+
                 break;
         }
 
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/TOC.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/TOC.php
index 3dac76fb4d..2cf76155e4 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/TOC.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/TOC.php
@@ -11,12 +11,13 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
+use PhpOffice\PhpWord\Element\Title;
 use PhpOffice\PhpWord\Element\TOC as TOCElement;
 use PhpOffice\PhpWord\Shared\XMLWriter;
 use PhpOffice\PhpWord\Style\Font;
@@ -25,7 +26,7 @@
 use PhpOffice\PhpWord\Writer\Word2007\Style\Tab as TabStyleWriter;
 
 /**
- * TOC element writer
+ * TOC element writer.
  *
  * @since 0.10.0
  */
@@ -34,7 +35,7 @@ class TOC extends AbstractElement
     /**
      * Write element.
      */
-    public function write()
+    public function write(): void
     {
         $xmlWriter = $this->getXmlWriter();
         $element = $this->getElement();
@@ -62,20 +63,15 @@ public function write()
     }
 
     /**
-     * Write title
-     *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
-     * @param \PhpOffice\PhpWord\Element\TOC $element
-     * @param \PhpOffice\PhpWord\Element\Title $title
-     * @param bool $writeFieldMark
+     * Write title.
      */
-    private function writeTitle(XMLWriter $xmlWriter, TOCElement $element, $title, $writeFieldMark)
+    private function writeTitle(XMLWriter $xmlWriter, TOCElement $element, Title $title, bool $writeFieldMark): void
     {
         $tocStyle = $element->getStyleTOC();
         $fontStyle = $element->getStyleFont();
         $isObject = ($fontStyle instanceof Font) ? true : false;
         $rId = $title->getRelationId();
-        $indent = ($title->getDepth() - 1) * $tocStyle->getIndent();
+        $indent = (int) (($title->getDepth() - 1) * $tocStyle->getIndent());
 
         $xmlWriter->startElement('w:p');
 
@@ -97,7 +93,10 @@ private function writeTitle(XMLWriter $xmlWriter, TOCElement $element, $title, $
             $styleWriter->write();
         }
         $xmlWriter->startElement('w:t');
-        $this->writeText($title->getText());
+
+        $titleText = $title->getText();
+        $this->writeText(is_string($titleText) ? $titleText : '');
+
         $xmlWriter->endElement(); // w:t
         $xmlWriter->endElement(); // w:r
 
@@ -114,10 +113,24 @@ private function writeTitle(XMLWriter $xmlWriter, TOCElement $element, $title, $
         $xmlWriter->startElement('w:r');
         $xmlWriter->startElement('w:instrText');
         $xmlWriter->writeAttribute('xml:space', 'preserve');
-        $xmlWriter->text("PAGEREF _Toc{$rId} \h");
+        $xmlWriter->text("PAGEREF _Toc{$rId} \\h");
         $xmlWriter->endElement();
         $xmlWriter->endElement();
 
+        if ($title->getPageNumber() !== null) {
+            $xmlWriter->startElement('w:r');
+            $xmlWriter->startElement('w:fldChar');
+            $xmlWriter->writeAttribute('w:fldCharType', 'separate');
+            $xmlWriter->endElement();
+            $xmlWriter->endElement();
+
+            $xmlWriter->startElement('w:r');
+            $xmlWriter->startElement('w:t');
+            $xmlWriter->text((string) $title->getPageNumber());
+            $xmlWriter->endElement();
+            $xmlWriter->endElement();
+        }
+
         $xmlWriter->startElement('w:r');
         $xmlWriter->startElement('w:fldChar');
         $xmlWriter->writeAttribute('w:fldCharType', 'end');
@@ -130,13 +143,9 @@ private function writeTitle(XMLWriter $xmlWriter, TOCElement $element, $title, $
     }
 
     /**
-     * Write style
-     *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
-     * @param \PhpOffice\PhpWord\Element\TOC $element
-     * @param int $indent
+     * Write style.
      */
-    private function writeStyle(XMLWriter $xmlWriter, TOCElement $element, $indent)
+    private function writeStyle(XMLWriter $xmlWriter, TOCElement $element, int $indent): void
     {
         $tocStyle = $element->getStyleTOC();
         $fontStyle = $element->getStyleFont();
@@ -145,7 +154,7 @@ private function writeStyle(XMLWriter $xmlWriter, TOCElement $element, $indent)
         $xmlWriter->startElement('w:pPr');
 
         // Paragraph
-        if ($isObject && !is_null($fontStyle->getParagraph())) {
+        if ($isObject && null !== $fontStyle->getParagraph()) {
             $styleWriter = new ParagraphStyleWriter($xmlWriter, $fontStyle->getParagraph());
             $styleWriter->write();
         }
@@ -177,11 +186,8 @@ private function writeStyle(XMLWriter $xmlWriter, TOCElement $element, $indent)
 
     /**
      * Write TOC Field.
-     *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
-     * @param \PhpOffice\PhpWord\Element\TOC $element
      */
-    private function writeFieldMark(XMLWriter $xmlWriter, TOCElement $element)
+    private function writeFieldMark(XMLWriter $xmlWriter, TOCElement $element): void
     {
         $minDepth = $element->getMinDepth();
         $maxDepth = $element->getMaxDepth();
@@ -195,7 +201,7 @@ private function writeFieldMark(XMLWriter $xmlWriter, TOCElement $element)
         $xmlWriter->startElement('w:r');
         $xmlWriter->startElement('w:instrText');
         $xmlWriter->writeAttribute('xml:space', 'preserve');
-        $xmlWriter->text("TOC \o {$minDepth}-{$maxDepth} \h \z \u");
+        $xmlWriter->text("TOC \\o {$minDepth}-{$maxDepth} \\h \\z \\u");
         $xmlWriter->endElement();
         $xmlWriter->endElement();
 
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Table.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Table.php
index 25a44fb11a..a32cc19639 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Table.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Table.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -28,7 +28,7 @@
 use PhpOffice\PhpWord\Writer\Word2007\Style\Table as TableStyleWriter;
 
 /**
- * Table element writer
+ * Table element writer.
  *
  * @since 0.10.0
  */
@@ -37,7 +37,7 @@ class Table extends AbstractElement
     /**
      * Write element.
      */
-    public function write()
+    public function write(): void
     {
         $xmlWriter = $this->getXmlWriter();
         $element = $this->getElement();
@@ -60,7 +60,7 @@ public function write()
             $styleWriter->write();
 
             // Write rows
-            for ($i = 0; $i < $rowCount; $i++) {
+            for ($i = 0; $i < $rowCount; ++$i) {
                 $this->writeRow($xmlWriter, $rows[$i]);
             }
 
@@ -70,11 +70,8 @@ public function write()
 
     /**
      * Write column.
-     *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
-     * @param \PhpOffice\PhpWord\Element\Table $element
      */
-    private function writeColumns(XMLWriter $xmlWriter, TableElement $element)
+    private function writeColumns(XMLWriter $xmlWriter, TableElement $element): void
     {
         $cellWidths = $element->findFirstDefinedCellWidths();
 
@@ -92,11 +89,8 @@ private function writeColumns(XMLWriter $xmlWriter, TableElement $element)
 
     /**
      * Write row.
-     *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
-     * @param \PhpOffice\PhpWord\Element\Row $row
      */
-    private function writeRow(XMLWriter $xmlWriter, RowElement $row)
+    private function writeRow(XMLWriter $xmlWriter, RowElement $row): void
     {
         $xmlWriter->startElement('w:tr');
 
@@ -109,8 +103,14 @@ private function writeRow(XMLWriter $xmlWriter, RowElement $row)
         }
 
         // Write cells
-        foreach ($row->getCells() as $cell) {
-            $this->writeCell($xmlWriter, $cell);
+        $cells = $row->getCells();
+        if (count($cells) === 0) {
+            // issue 2505 - Word treats doc as corrupt if row without cell
+            $this->writeCell($xmlWriter, new CellElement());
+        } else {
+            foreach ($cells as $cell) {
+                $this->writeCell($xmlWriter, $cell);
+            }
         }
 
         $xmlWriter->endElement(); // w:tr
@@ -118,11 +118,8 @@ private function writeRow(XMLWriter $xmlWriter, RowElement $row)
 
     /**
      * Write cell.
-     *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
-     * @param \PhpOffice\PhpWord\Element\Cell $cell
      */
-    private function writeCell(XMLWriter $xmlWriter, CellElement $cell)
+    private function writeCell(XMLWriter $xmlWriter, CellElement $cell): void
     {
         $xmlWriter->startElement('w:tc');
 
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/TableAlignment.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/TableAlignment.php
index f44e9ebe42..c8b48644da 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/TableAlignment.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/TableAlignment.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -24,7 +24,7 @@ class TableAlignment
 {
     private $name = 'w:jc';
 
-    private $attributes = array();
+    private $attributes = [];
 
     /**
      * @since 0.13.0
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Text.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Text.php
index f421c1afe8..d61dd66800 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Text.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Text.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,7 +20,7 @@
 use PhpOffice\PhpWord\Element\TrackChange;
 
 /**
- * Text element writer
+ * Text element writer.
  *
  * @since 0.10.0
  */
@@ -29,7 +29,7 @@ class Text extends AbstractElement
     /**
      * Write text element.
      */
-    public function write()
+    public function write(): void
     {
         $xmlWriter = $this->getXmlWriter();
         $element = $this->getElement();
@@ -64,9 +64,9 @@ public function write()
     }
 
     /**
-     * Write opening of changed element
+     * Write opening of changed element.
      */
-    protected function writeOpeningTrackChange()
+    protected function writeOpeningTrackChange(): void
     {
         $changed = $this->getElement()->getTrackChange();
         if ($changed == null) {
@@ -88,9 +88,9 @@ protected function writeOpeningTrackChange()
     }
 
     /**
-     * Write ending
+     * Write ending.
      */
-    protected function writeClosingTrackChange()
+    protected function writeClosingTrackChange(): void
     {
         $changed = $this->getElement()->getTrackChange();
         if ($changed == null) {
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/TextBox.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/TextBox.php
index 9dd4bc3e57..ff94094de7 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/TextBox.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/TextBox.php
@@ -2,16 +2,14 @@
 /**
  * This file is part of PHPWord - A pure PHP library for reading and writing
  * word processing documents.
- *
  * PHPWord is free software distributed under the terms of the GNU Lesser
  * General Public License version 3 as published by the Free Software Foundation.
- *
  * For the full copyright and license information, please read the LICENSE
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,7 +18,7 @@
 use PhpOffice\PhpWord\Writer\Word2007\Style\TextBox as TextBoxStyleWriter;
 
 /**
- * TextBox element writer
+ * TextBox element writer.
  *
  * @since 0.11.0
  */
@@ -29,7 +27,7 @@ class TextBox extends Image
     /**
      * Write element.
      */
-    public function write()
+    public function write(): void
     {
         $xmlWriter = $this->getXmlWriter();
         $element = $this->getElement();
@@ -50,6 +48,10 @@ public function write()
         $xmlWriter->startElement('v:shape');
         $xmlWriter->writeAttribute('type', '#_x0000_t0202');
 
+        if ($style->getBgColor()) {
+            $xmlWriter->writeAttribute('fillcolor', $style->getBgColor());
+        }
+
         $styleWriter->write();
         $styleWriter->writeBorder();
 
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/TextBreak.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/TextBreak.php
index 7b3d999706..bcae3b2e1e 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/TextBreak.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/TextBreak.php
@@ -11,14 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
 /**
- * TextBreak element writer
+ * TextBreak element writer.
  *
  * @since 0.10.0
  */
@@ -27,7 +27,7 @@ class TextBreak extends Text
     /**
      * Write text break element.
      */
-    public function write()
+    public function write(): void
     {
         $xmlWriter = $this->getXmlWriter();
         $element = $this->getElement();
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/TextRun.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/TextRun.php
index e46ad3f527..8a5870777b 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/TextRun.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/TextRun.php
@@ -11,14 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
 /**
- * TextRun element writer
+ * TextRun element writer.
  *
  * @since 0.10.0
  */
@@ -27,7 +27,7 @@ class TextRun extends Text
     /**
      * Write textrun element.
      */
-    public function write()
+    public function write(): void
     {
         $xmlWriter = $this->getXmlWriter();
         $element = $this->getElement();
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Title.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Title.php
index 6a05a34d6f..072dcc8d84 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Title.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Element/Title.php
@@ -11,14 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
 /**
- * TextRun element writer
+ * TextRun element writer.
  *
  * @since 0.10.0
  */
@@ -27,7 +27,7 @@ class Title extends AbstractElement
     /**
      * Write title element.
      */
-    public function write()
+    public function write(): void
     {
         $xmlWriter = $this->getXmlWriter();
         $element = $this->getElement();
@@ -67,7 +67,8 @@ public function write()
             $this->writeText($text);
             $xmlWriter->endElement(); // w:t
             $xmlWriter->endElement(); // w:r
-        } elseif ($text instanceof \PhpOffice\PhpWord\Element\AbstractContainer) {
+        }
+        if ($text instanceof \PhpOffice\PhpWord\Element\AbstractContainer) {
             $containerWriter = new Container($xmlWriter, $text);
             $containerWriter->write();
         }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/AbstractPart.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/AbstractPart.php
index 4bee5c542a..ef823f104d 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/AbstractPart.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/AbstractPart.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -23,12 +23,12 @@
 use PhpOffice\PhpWord\Writer\AbstractWriter;
 
 /**
- * Word2007 writer part abstract class
+ * Word2007 writer part abstract class.
  */
 abstract class AbstractPart
 {
     /**
-     * Parent writer
+     * Parent writer.
      *
      * @var \PhpOffice\PhpWord\Writer\AbstractWriter
      */
@@ -40,7 +40,7 @@ abstract class AbstractPart
     protected $dateFormat = 'Y-m-d\TH:i:sP';
 
     /**
-     * Write part
+     * Write part.
      *
      * @return string
      */
@@ -48,37 +48,35 @@ abstract public function write();
 
     /**
      * Set parent writer.
-     *
-     * @param \PhpOffice\PhpWord\Writer\AbstractWriter $writer
      */
-    public function setParentWriter(AbstractWriter $writer = null)
+    public function setParentWriter(?AbstractWriter $writer = null): void
     {
         $this->parentWriter = $writer;
     }
 
     /**
-     * Get parent writer
+     * Get parent writer.
      *
-     * @throws \PhpOffice\PhpWord\Exception\Exception
      * @return \PhpOffice\PhpWord\Writer\AbstractWriter
      */
     public function getParentWriter()
     {
-        if (!is_null($this->parentWriter)) {
+        if (null !== $this->parentWriter) {
             return $this->parentWriter;
         }
+
         throw new Exception('No parent WriterInterface assigned.');
     }
 
     /**
-     * Get XML Writer
+     * Get XML Writer.
      *
      * @return \PhpOffice\PhpWord\Shared\XMLWriter
      */
     protected function getXmlWriter()
     {
         $useDiskCaching = false;
-        if (!is_null($this->parentWriter)) {
+        if (null !== $this->parentWriter) {
             if ($this->parentWriter->isUseDiskCaching()) {
                 $useDiskCaching = true;
             }
@@ -91,9 +89,10 @@ protected function getXmlWriter()
     }
 
     /**
-     * Write an XML text, this will call text() or writeRaw() depending on the value of Settings::isOutputEscapingEnabled()
+     * Write an XML text, this will call text() or writeRaw() depending on the value of Settings::isOutputEscapingEnabled().
      *
      * @param string $content The text string to write
+     *
      * @return bool Returns true on success or false on failure
      */
     protected function writeText($content)
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Chart.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Chart.php
index 5e9043ca00..314b6453f3 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Chart.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Chart.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -21,7 +21,7 @@
 use PhpOffice\PhpWord\Shared\XMLWriter;
 
 /**
- * Word2007 chart part writer: word/charts/chartx.xml
+ * Word2007 chart part writer: word/charts/chartx.xml.
  *
  * @since 0.12.0
  * @see  http://www.datypic.com/sc/ooxml/e-draw-chart_chartSpace.html
@@ -29,51 +29,49 @@
 class Chart extends AbstractPart
 {
     /**
-     * Chart element
+     * Chart element.
      *
      * @var \PhpOffice\PhpWord\Element\Chart
      */
     private $element;
 
     /**
-     * Type definition
+     * Type definition.
      *
      * @var array
      */
-    private $types = array(
-        'pie'                    => array('type' => 'pie', 'colors' => 1),
-        'doughnut'               => array('type' => 'doughnut', 'colors' => 1, 'hole' => 75, 'no3d' => true),
-        'bar'                    => array('type' => 'bar', 'colors' => 0, 'axes' => true, 'bar' => 'bar', 'grouping' => 'clustered'),
-        'stacked_bar'            => array('type' => 'bar', 'colors' => 0, 'axes' => true, 'bar' => 'bar', 'grouping' => 'stacked'),
-        'percent_stacked_bar'    => array('type' => 'bar', 'colors' => 0, 'axes' => true, 'bar' => 'bar', 'grouping' => 'percentStacked'),
-        'column'                 => array('type' => 'bar', 'colors' => 0, 'axes' => true, 'bar' => 'col', 'grouping' => 'clustered'),
-        'stacked_column'         => array('type' => 'bar', 'colors' => 0, 'axes' => true, 'bar' => 'col', 'grouping' => 'stacked'),
-        'percent_stacked_column' => array('type' => 'bar', 'colors' => 0, 'axes' => true, 'bar' => 'col', 'grouping' => 'percentStacked'),
-        'line'                   => array('type' => 'line', 'colors' => 0, 'axes' => true),
-        'area'                   => array('type' => 'area', 'colors' => 0, 'axes' => true),
-        'radar'                  => array('type' => 'radar', 'colors' => 0, 'axes' => true, 'radar' => 'standard', 'no3d' => true),
-        'scatter'                => array('type' => 'scatter', 'colors' => 0, 'axes' => true, 'scatter' => 'marker', 'no3d' => true),
-    );
+    private $types = [
+        'pie' => ['type' => 'pie', 'colors' => 1],
+        'doughnut' => ['type' => 'doughnut', 'colors' => 1, 'hole' => 75, 'no3d' => true],
+        'bar' => ['type' => 'bar', 'colors' => 0, 'axes' => true, 'bar' => 'bar', 'grouping' => 'clustered'],
+        'stacked_bar' => ['type' => 'bar', 'colors' => 0, 'axes' => true, 'bar' => 'bar', 'grouping' => 'stacked'],
+        'percent_stacked_bar' => ['type' => 'bar', 'colors' => 0, 'axes' => true, 'bar' => 'bar', 'grouping' => 'percentStacked'],
+        'column' => ['type' => 'bar', 'colors' => 0, 'axes' => true, 'bar' => 'col', 'grouping' => 'clustered'],
+        'stacked_column' => ['type' => 'bar', 'colors' => 0, 'axes' => true, 'bar' => 'col', 'grouping' => 'stacked'],
+        'percent_stacked_column' => ['type' => 'bar', 'colors' => 0, 'axes' => true, 'bar' => 'col', 'grouping' => 'percentStacked'],
+        'line' => ['type' => 'line', 'colors' => 0, 'axes' => true],
+        'area' => ['type' => 'area', 'colors' => 0, 'axes' => true],
+        'radar' => ['type' => 'radar', 'colors' => 0, 'axes' => true, 'radar' => 'standard', 'no3d' => true],
+        'scatter' => ['type' => 'scatter', 'colors' => 0, 'axes' => true, 'scatter' => 'marker', 'no3d' => true],
+    ];
 
     /**
-     * Chart options
+     * Chart options.
      *
      * @var array
      */
-    private $options = array();
+    private $options = [];
 
     /**
      * Set chart element.
-     *
-     * @param \PhpOffice\PhpWord\Element\Chart $element
      */
-    public function setElement(ChartElement $element)
+    public function setElement(ChartElement $element): void
     {
         $this->element = $element;
     }
 
     /**
-     * Write part
+     * Write part.
      *
      * @return string
      */
@@ -96,12 +94,11 @@ public function write()
     }
 
     /**
-     * Write chart
+     * Write chart.
      *
      * @see  http://www.datypic.com/sc/ooxml/t-draw-chart_CT_Chart.html
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
      */
-    private function writeChart(XMLWriter $xmlWriter)
+    private function writeChart(XMLWriter $xmlWriter): void
     {
         $xmlWriter->startElement('c:chart');
 
@@ -121,9 +118,8 @@ private function writeChart(XMLWriter $xmlWriter)
      * @see  http://www.datypic.com/sc/ooxml/t-draw-chart_CT_AreaChart.html
      * @see  http://www.datypic.com/sc/ooxml/t-draw-chart_CT_RadarChart.html
      * @see  http://www.datypic.com/sc/ooxml/t-draw-chart_CT_ScatterChart.html
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
      */
-    private function writePlotArea(XMLWriter $xmlWriter)
+    private function writePlotArea(XMLWriter $xmlWriter): void
     {
         $type = $this->element->getType();
         $style = $this->element->getStyle();
@@ -213,10 +209,9 @@ private function writePlotArea(XMLWriter $xmlWriter)
     /**
      * Write series.
      *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
      * @param bool $scatter
      */
-    private function writeSeries(XMLWriter $xmlWriter, $scatter = false)
+    private function writeSeries(XMLWriter $xmlWriter, $scatter = false): void
     {
         $series = $this->element->getSeries();
         $style = $this->element->getStyle();
@@ -233,7 +228,7 @@ private function writeSeries(XMLWriter $xmlWriter, $scatter = false)
             $xmlWriter->writeElementBlock('c:idx', 'val', $index);
             $xmlWriter->writeElementBlock('c:order', 'val', $index);
 
-            if (!is_null($seriesItem['name']) && $seriesItem['name'] != '') {
+            if (null !== $seriesItem['name'] && $seriesItem['name'] != '') {
                 $xmlWriter->startElement('c:tx');
                 $xmlWriter->startElement('c:strRef');
                 $xmlWriter->startElement('c:strCache');
@@ -274,7 +269,7 @@ private function writeSeries(XMLWriter $xmlWriter, $scatter = false)
                 if (is_array($colors) && count($colors) > 0) {
                     // assign a color to each value
                     $valueIndex = 0;
-                    for ($i = 0; $i < count($values); $i++) {
+                    for ($i = 0; $i < count($values); ++$i) {
                         // check that there are still enought colors
                         $xmlWriter->startElement('c:dPt');
                         $xmlWriter->writeElementBlock('c:idx', 'val', $valueIndex);
@@ -284,32 +279,31 @@ private function writeSeries(XMLWriter $xmlWriter, $scatter = false)
                         $xmlWriter->endElement(); // a:solidFill
                         $xmlWriter->endElement(); // c:spPr
                         $xmlWriter->endElement(); // c:dPt
-                        $valueIndex++;
+                        ++$valueIndex;
                     }
                 }
             }
 
             $xmlWriter->endElement(); // c:ser
-            $index++;
+            ++$index;
         }
     }
 
     /**
      * Write series items.
      *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
      * @param string $type
      * @param array $values
      */
-    private function writeSeriesItem(XMLWriter $xmlWriter, $type, $values)
+    private function writeSeriesItem(XMLWriter $xmlWriter, $type, $values): void
     {
-        $types = array(
-            'cat'  => array('c:cat', 'c:strLit'),
-            'val'  => array('c:val', 'c:numLit'),
-            'xVal' => array('c:xVal', 'c:strLit'),
-            'yVal' => array('c:yVal', 'c:numLit'),
-        );
-        list($itemType, $itemLit) = $types[$type];
+        $types = [
+            'cat' => ['c:cat', 'c:strLit'],
+            'val' => ['c:val', 'c:numLit'],
+            'xVal' => ['c:xVal', 'c:strLit'],
+            'yVal' => ['c:yVal', 'c:numLit'],
+        ];
+        [$itemType, $itemLit] = $types[$type];
 
         $xmlWriter->startElement($itemType);
         $xmlWriter->startElement($itemLit);
@@ -327,7 +321,7 @@ private function writeSeriesItem(XMLWriter $xmlWriter, $type, $values)
                 $xmlWriter->endElement(); // c:v
             }
             $xmlWriter->endElement(); // c:pt
-            $index++;
+            ++$index;
         }
 
         $xmlWriter->endElement(); // $itemLit
@@ -335,20 +329,20 @@ private function writeSeriesItem(XMLWriter $xmlWriter, $type, $values)
     }
 
     /**
-     * Write axis
+     * Write axis.
      *
      * @see  http://www.datypic.com/sc/ooxml/t-draw-chart_CT_CatAx.html
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
+     *
      * @param string $type
      */
-    private function writeAxis(XMLWriter $xmlWriter, $type)
+    private function writeAxis(XMLWriter $xmlWriter, $type): void
     {
         $style = $this->element->getStyle();
-        $types = array(
-            'cat' => array('c:catAx', 1, 'b', 2),
-            'val' => array('c:valAx', 2, 'l', 1),
-        );
-        list($axisType, $axisId, $axisPos, $axisCross) = $types[$type];
+        $types = [
+            'cat' => ['c:catAx', 1, 'b', 2],
+            'val' => ['c:valAx', 2, 'l', 1],
+        ];
+        [$axisType, $axisId, $axisPos, $axisCross] = $types[$type];
 
         $xmlWriter->startElement($axisType);
 
@@ -359,11 +353,11 @@ private function writeAxis(XMLWriter $xmlWriter, $type)
         $valueAxisTitle = $style->getValueAxisTitle();
 
         if ($axisType == 'c:catAx') {
-            if (!is_null($categoryAxisTitle)) {
+            if (null !== $categoryAxisTitle) {
                 $this->writeAxisTitle($xmlWriter, $categoryAxisTitle);
             }
         } elseif ($axisType == 'c:valAx') {
-            if (!is_null($valueAxisTitle)) {
+            if (null !== $valueAxisTitle) {
                 $this->writeAxisTitle($xmlWriter, $valueAxisTitle);
             }
         }
@@ -400,13 +394,13 @@ private function writeAxis(XMLWriter $xmlWriter, $type)
     }
 
     /**
-     * Write shape
+     * Write shape.
      *
      * @see  http://www.datypic.com/sc/ooxml/t-a_CT_ShapeProperties.html
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
+     *
      * @param bool $line
      */
-    private function writeShape(XMLWriter $xmlWriter, $line = false)
+    private function writeShape(XMLWriter $xmlWriter, $line = false): void
     {
         $xmlWriter->startElement('c:spPr');
         $xmlWriter->startElement('a:ln');
@@ -419,7 +413,7 @@ private function writeShape(XMLWriter $xmlWriter, $line = false)
         $xmlWriter->endElement(); // c:spPr
     }
 
-    private function writeAxisTitle(XMLWriter $xmlWriter, $title)
+    private function writeAxisTitle(XMLWriter $xmlWriter, $title): void
     {
         $xmlWriter->startElement('c:title'); //start c:title
         $xmlWriter->startElement('c:tx'); //start c:tx
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Comments.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Comments.php
index 5b867324cb..93dd4e1ce5 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Comments.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Comments.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -22,19 +22,19 @@
 use PhpOffice\PhpWord\Writer\Word2007\Element\Container;
 
 /**
- * Word2007 comments part writer: word/comments.xml
+ * Word2007 comments part writer: word/comments.xml.
  */
 class Comments extends AbstractPart
 {
     /**
-     * Comments collection to be written
+     * Comments collection to be written.
      *
      * @var \PhpOffice\PhpWord\Element\Comment[]
      */
     protected $elements;
 
     /**
-     * Write part
+     * Write part.
      *
      * @return string
      */
@@ -69,11 +69,8 @@ public function write()
 
     /**
      * Write comment item.
-     *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
-     * @param \PhpOffice\PhpWord\Element\Comment $comment
      */
-    protected function writeComment(XMLWriter $xmlWriter, Comment $comment)
+    protected function writeComment(XMLWriter $xmlWriter, Comment $comment): void
     {
         $xmlWriter->startElement('w:comment');
         $xmlWriter->writeAttribute('w:id', $comment->getElementId());
@@ -90,9 +87,10 @@ protected function writeComment(XMLWriter $xmlWriter, Comment $comment)
     }
 
     /**
-     * Set element
+     * Set element.
      *
      * @param \PhpOffice\PhpWord\Element\Comment[] $elements
+     *
      * @return self
      */
     public function setElements($elements)
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/ContentTypes.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/ContentTypes.php
index 14fc585334..c1da573e12 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/ContentTypes.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/ContentTypes.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,12 +20,12 @@
 use PhpOffice\PhpWord\Shared\XMLWriter;
 
 /**
- * Word2007 contenttypes part writer: [Content_Types].xml
+ * Word2007 contenttypes part writer: [Content_Types].xml.
  */
 class ContentTypes extends AbstractPart
 {
     /**
-     * Write part
+     * Write part.
      *
      * @return string
      */
@@ -38,19 +38,19 @@ public function write()
         $openXMLPrefix = 'application/vnd.openxmlformats-';
         $wordMLPrefix = $openXMLPrefix . 'officedocument.wordprocessingml.';
         $drawingMLPrefix = $openXMLPrefix . 'officedocument.drawingml.';
-        $overrides = array(
-            '/docProps/core.xml'     => $openXMLPrefix . 'package.core-properties+xml',
-            '/docProps/app.xml'      => $openXMLPrefix . 'officedocument.extended-properties+xml',
-            '/docProps/custom.xml'   => $openXMLPrefix . 'officedocument.custom-properties+xml',
-            '/word/document.xml'     => $wordMLPrefix . 'document.main+xml',
-            '/word/styles.xml'       => $wordMLPrefix . 'styles+xml',
-            '/word/numbering.xml'    => $wordMLPrefix . 'numbering+xml',
-            '/word/settings.xml'     => $wordMLPrefix . 'settings+xml',
+        $overrides = [
+            '/docProps/core.xml' => $openXMLPrefix . 'package.core-properties+xml',
+            '/docProps/app.xml' => $openXMLPrefix . 'officedocument.extended-properties+xml',
+            '/docProps/custom.xml' => $openXMLPrefix . 'officedocument.custom-properties+xml',
+            '/word/document.xml' => $wordMLPrefix . 'document.main+xml',
+            '/word/styles.xml' => $wordMLPrefix . 'styles+xml',
+            '/word/numbering.xml' => $wordMLPrefix . 'numbering+xml',
+            '/word/settings.xml' => $wordMLPrefix . 'settings+xml',
             '/word/theme/theme1.xml' => $openXMLPrefix . 'officedocument.theme+xml',
-            '/word/webSettings.xml'  => $wordMLPrefix . 'webSettings+xml',
-            '/word/fontTable.xml'    => $wordMLPrefix . 'fontTable+xml',
-            '/word/comments.xml'     => $wordMLPrefix . 'comments+xml',
-        );
+            '/word/webSettings.xml' => $wordMLPrefix . 'webSettings+xml',
+            '/word/fontTable.xml' => $wordMLPrefix . 'fontTable+xml',
+            '/word/comments.xml' => $wordMLPrefix . 'comments+xml',
+        ];
 
         $defaults = $contentTypes['default'];
         if (!empty($contentTypes['override'])) {
@@ -78,13 +78,13 @@ public function write()
     }
 
     /**
-     * Write content types element
+     * Write content types element.
      *
      * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter XML Writer
      * @param array $parts
      * @param bool $isDefault
      */
-    private function writeContentType(XMLWriter $xmlWriter, $parts, $isDefault)
+    private function writeContentType(XMLWriter $xmlWriter, $parts, $isDefault): void
     {
         foreach ($parts as $partName => $contentType) {
             $partType = $isDefault ? 'Default' : 'Override';
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/DocPropsApp.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/DocPropsApp.php
index 3452d86496..cc7d7ea26e 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/DocPropsApp.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/DocPropsApp.php
@@ -11,21 +11,21 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 /**
- * Word2007 extended document properties part writer: docProps/app.xml
+ * Word2007 extended document properties part writer: docProps/app.xml.
  *
  * @since 0.11.0
  */
 class DocPropsApp extends AbstractPart
 {
     /**
-     * Write part
+     * Write part.
      *
      * @return string
      */
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/DocPropsCore.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/DocPropsCore.php
index caefbd8625..92f19fbc41 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/DocPropsCore.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/DocPropsCore.php
@@ -11,21 +11,21 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 /**
- * Word2007 core document properties part writer: docProps/core.xml
+ * Word2007 core document properties part writer: docProps/core.xml.
  *
  * @since 0.11.0
  */
 class DocPropsCore extends AbstractPart
 {
     /**
-     * Write part
+     * Write part.
      *
      * @return string
      */
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/DocPropsCustom.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/DocPropsCustom.php
index 478075d30e..08da912e84 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/DocPropsCustom.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/DocPropsCustom.php
@@ -11,21 +11,23 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
+use DateTime;
+
 /**
- * Word2007 custom document properties part writer: docProps/custom.xml
+ * Word2007 custom document properties part writer: docProps/custom.xml.
  *
  * @since 0.11.0
  */
 class DocPropsCustom extends AbstractPart
 {
     /**
-     * Write part
+     * Write part.
      *
      * @return string
      */
@@ -52,22 +54,27 @@ public function write()
             switch ($propertyType) {
                 case 'i':
                     $xmlWriter->writeElement('vt:i4', $propertyValue);
+
                     break;
                 case 'f':
                     $xmlWriter->writeElement('vt:r8', $propertyValue);
+
                     break;
                 case 'b':
                     $xmlWriter->writeElement('vt:bool', ($propertyValue) ? 'true' : 'false');
+
                     break;
                 case 'd':
-                    if ($propertyValue instanceof \DateTime) {
+                    if ($propertyValue instanceof DateTime) {
                         $xmlWriter->writeElement('vt:filetime', $propertyValue->format($this->dateFormat));
                     } else {
                         $xmlWriter->writeElement('vt:filetime', date($this->dateFormat, $propertyValue));
                     }
+
                     break;
                 default:
                     $xmlWriter->writeElement('vt:lpwstr', $propertyValue);
+
                     break;
             }
             $xmlWriter->endElement(); // property
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Document.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Document.php
index d2ab836b7e..6eca90e730 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Document.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Document.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -23,12 +23,12 @@
 use PhpOffice\PhpWord\Writer\Word2007\Style\Section as SectionStyleWriter;
 
 /**
- * Word2007 document part writer: word/document.xml
+ * Word2007 document part writer: word/document.xml.
  */
 class Document extends AbstractPart
 {
     /**
-     * Write part
+     * Write part.
      *
      * @return string
      */
@@ -58,7 +58,7 @@ public function write()
 
         if ($sectionCount > 0) {
             foreach ($sections as $section) {
-                $currentSection++;
+                ++$currentSection;
 
                 $containerWriter = new Container($xmlWriter, $section);
                 $containerWriter->write();
@@ -79,11 +79,8 @@ public function write()
 
     /**
      * Write begin section.
-     *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
-     * @param \PhpOffice\PhpWord\Element\Section $section
      */
-    private function writeSection(XMLWriter $xmlWriter, Section $section)
+    private function writeSection(XMLWriter $xmlWriter, Section $section): void
     {
         $xmlWriter->startElement('w:p');
         $xmlWriter->startElement('w:pPr');
@@ -94,11 +91,8 @@ private function writeSection(XMLWriter $xmlWriter, Section $section)
 
     /**
      * Write end section.
-     *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
-     * @param \PhpOffice\PhpWord\Element\Section $section
      */
-    private function writeSectionSettings(XMLWriter $xmlWriter, Section $section)
+    private function writeSectionSettings(XMLWriter $xmlWriter, Section $section): void
     {
         $xmlWriter->startElement('w:sectPr');
 
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Endnotes.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Endnotes.php
index ce3a46bfb7..423482b27f 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Endnotes.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Endnotes.php
@@ -11,40 +11,40 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 /**
- * Word2007 endnotes part writer: word/endnotes.xml
+ * Word2007 endnotes part writer: word/endnotes.xml.
  */
 class Endnotes extends Footnotes
 {
     /**
-     * Name of XML root element
+     * Name of XML root element.
      *
      * @var string
      */
     protected $rootNode = 'w:endnotes';
 
     /**
-     * Name of XML node element
+     * Name of XML node element.
      *
      * @var string
      */
     protected $elementNode = 'w:endnote';
 
     /**
-     * Name of XML reference element
+     * Name of XML reference element.
      *
      * @var string
      */
     protected $refNode = 'w:endnoteRef';
 
     /**
-     * Reference style name
+     * Reference style name.
      *
      * @var string
      */
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/FontTable.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/FontTable.php
index 40e414e01d..f979ca5a6c 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/FontTable.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/FontTable.php
@@ -11,16 +11,17 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 /**
- * Word2007 font table writer: word/fontTable.xml
+ * Word2007 font table writer: word/fontTable.xml.
  *
  * @todo Generate content dynamically
+ *
  * @since 0.10.0
  */
 class FontTable extends AbstractPart
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Footer.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Footer.php
index 97b4779042..fd62c8941f 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Footer.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Footer.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,26 +20,26 @@
 use PhpOffice\PhpWord\Writer\Word2007\Element\Container;
 
 /**
- * Word2007 footer part writer: word/footerx.xml
+ * Word2007 footer part writer: word/footerx.xml.
  */
 class Footer extends AbstractPart
 {
     /**
-     * Root element name
+     * Root element name.
      *
      * @var string
      */
     protected $rootElement = 'w:ftr';
 
     /**
-     * Footer/header element to be written
+     * Footer/header element to be written.
      *
      * @var \PhpOffice\PhpWord\Element\Footer
      */
     protected $element;
 
     /**
-     * Write part
+     * Write part.
      *
      * @return string
      */
@@ -69,9 +69,10 @@ public function write()
     }
 
     /**
-     * Set element
+     * Set element.
      *
      * @param \PhpOffice\PhpWord\Element\Footer|\PhpOffice\PhpWord\Element\Header $element
+     *
      * @return self
      */
     public function setElement($element)
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Footnotes.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Footnotes.php
index 58c2e9b170..e284c674b5 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Footnotes.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Footnotes.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -23,47 +23,47 @@
 use PhpOffice\PhpWord\Writer\Word2007\Style\Paragraph as ParagraphStyleWriter;
 
 /**
- * Word2007 footnotes part writer: word/(footnotes|endnotes).xml
+ * Word2007 footnotes part writer: word/(footnotes|endnotes).xml.
  */
 class Footnotes extends AbstractPart
 {
     /**
-     * Name of XML root element
+     * Name of XML root element.
      *
      * @var string
      */
     protected $rootNode = 'w:footnotes';
 
     /**
-     * Name of XML node element
+     * Name of XML node element.
      *
      * @var string
      */
     protected $elementNode = 'w:footnote';
 
     /**
-     * Name of XML reference element
+     * Name of XML reference element.
      *
      * @var string
      */
     protected $refNode = 'w:footnoteRef';
 
     /**
-     * Reference style name
+     * Reference style name.
      *
      * @var string
      */
     protected $refStyle = 'FootnoteReference';
 
     /**
-     * Footnotes/endnotes collection to be written
+     * Footnotes/endnotes collection to be written.
      *
-     * @var \PhpOffice\PhpWord\Collection\Footnotes|\PhpOffice\PhpWord\Collection\Endnotes
+     * @var \PhpOffice\PhpWord\Collection\Endnotes|\PhpOffice\PhpWord\Collection\Footnotes
      */
     protected $elements;
 
     /**
-     * Write part
+     * Write part.
      *
      * @return string
      */
@@ -120,9 +120,10 @@ public function write()
     }
 
     /**
-     * Set element
+     * Set element.
+     *
+     * @param \PhpOffice\PhpWord\Collection\Endnotes|\PhpOffice\PhpWord\Collection\Footnotes $elements
      *
-     * @param \PhpOffice\PhpWord\Collection\Footnotes|\PhpOffice\PhpWord\Collection\Endnotes $elements
      * @return self
      */
     public function setElements($elements)
@@ -135,13 +136,12 @@ public function setElements($elements)
     /**
      * Write note item.
      *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
-     * @param \PhpOffice\PhpWord\Element\Footnote|\PhpOffice\PhpWord\Element\Endnote $element
+     * @param \PhpOffice\PhpWord\Element\Endnote|\PhpOffice\PhpWord\Element\Footnote $element
      */
-    protected function writeNote(XMLWriter $xmlWriter, $element)
+    protected function writeNote(XMLWriter $xmlWriter, $element): void
     {
         $xmlWriter->startElement($this->elementNode);
-        $xmlWriter->writeAttribute('w:id', $element->getRelationId());
+        $xmlWriter->writeAttribute('w:id', $element->getRelationId() + 1);
         $xmlWriter->startElement('w:p');
 
         // Paragraph style
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Header.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Header.php
index b58df1f9df..36abd06040 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Header.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Header.php
@@ -11,19 +11,19 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 /**
- * Word2007 header part writer: word/headerx.xml
+ * Word2007 header part writer: word/headerx.xml.
  */
 class Header extends Footer
 {
     /**
-     * Root element name
+     * Root element name.
      *
      * @var string
      */
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Numbering.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Numbering.php
index 1b4f01a647..3f50de08d4 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Numbering.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Numbering.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -23,14 +23,14 @@
 use PhpOffice\PhpWord\Style\NumberingLevel;
 
 /**
- * Word2007 numbering part writer: word/numbering.xml
+ * Word2007 numbering part writer: word/numbering.xml.
  *
  * @since 0.10.0
  */
 class Numbering extends AbstractPart
 {
     /**
-     * Write part
+     * Write part.
      *
      * @return string
      */
@@ -96,29 +96,26 @@ public function write()
 
     /**
      * Write level.
-     *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
-     * @param \PhpOffice\PhpWord\Style\NumberingLevel $level
      */
-    private function writeLevel(XMLWriter $xmlWriter, NumberingLevel $level)
+    private function writeLevel(XMLWriter $xmlWriter, NumberingLevel $level): void
     {
         $xmlWriter->startElement('w:lvl');
         $xmlWriter->writeAttribute('w:ilvl', $level->getLevel());
 
         // Numbering level properties
-        $properties = array(
-            'start'     => 'start',
-            'format'    => 'numFmt',
-            'restart'   => 'lvlRestart',
-            'pStyle'    => 'pStyle',
-            'suffix'    => 'suff',
-            'text'      => 'lvlText',
+        $properties = [
+            'start' => 'start',
+            'format' => 'numFmt',
+            'restart' => 'lvlRestart',
+            'pStyle' => 'pStyle',
+            'suffix' => 'suff',
+            'text' => 'lvlText',
             'alignment' => 'lvlJc',
-        );
+        ];
         foreach ($properties as $property => $nodeName) {
             $getMethod = "get{$property}";
             if ('' !== $level->$getMethod()         // this condition is now supported by `alignment` only
-                && !is_null($level->$getMethod())) {
+                && null !== $level->$getMethod()) {
                 $xmlWriter->startElement("w:{$nodeName}");
                 $xmlWriter->writeAttribute('w:val', $level->$getMethod());
                 $xmlWriter->endElement(); // w:start
@@ -137,11 +134,9 @@ private function writeLevel(XMLWriter $xmlWriter, NumberingLevel $level)
      *
      * @since 0.11.0
      *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
-     * @param \PhpOffice\PhpWord\Style\NumberingLevel $level
      * @todo Use paragraph style writer
      */
-    private function writeParagraph(XMLWriter $xmlWriter, NumberingLevel $level)
+    private function writeParagraph(XMLWriter $xmlWriter, NumberingLevel $level): void
     {
         $tabPos = $level->getTabPos();
         $left = $level->getLeft();
@@ -169,11 +164,9 @@ private function writeParagraph(XMLWriter $xmlWriter, NumberingLevel $level)
      *
      * @since 0.11.0
      *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
-     * @param \PhpOffice\PhpWord\Style\NumberingLevel $level
      * @todo Use font style writer
      */
-    private function writeFont(XMLWriter $xmlWriter, NumberingLevel $level)
+    private function writeFont(XMLWriter $xmlWriter, NumberingLevel $level): void
     {
         $font = $level->getFont();
         $hint = $level->getHint();
@@ -189,13 +182,14 @@ private function writeFont(XMLWriter $xmlWriter, NumberingLevel $level)
     }
 
     /**
-     * Get random hexadecimal number value
+     * Get random hexadecimal number value.
      *
      * @param int $length
+     *
      * @return string
      */
     private function getRandomHexNumber($length = 8)
     {
-        return strtoupper(substr(md5(rand()), 0, $length));
+        return strtoupper(substr(md5(mt_rand()), 0, $length));
     }
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Rels.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Rels.php
index 70f632f7f3..2dd9cce1de 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Rels.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Rels.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -21,25 +21,25 @@
 use PhpOffice\PhpWord\Shared\XMLWriter;
 
 /**
- * Word2007 main relationship writer: _rels/.rels
+ * Word2007 main relationship writer: _rels/.rels.
  *
  * @since 0.10.0
  */
 class Rels extends AbstractPart
 {
     /**
-     * Write part
+     * Write part.
      *
      * @return string
      */
     public function write()
     {
-        $xmlRels = array(
-            'docProps/core.xml'   => 'package/2006/relationships/metadata/core-properties',
-            'docProps/app.xml'    => 'officeDocument/2006/relationships/extended-properties',
+        $xmlRels = [
+            'docProps/core.xml' => 'package/2006/relationships/metadata/core-properties',
+            'docProps/app.xml' => 'officeDocument/2006/relationships/extended-properties',
             'docProps/custom.xml' => 'officeDocument/2006/relationships/custom-properties',
-            'word/document.xml'   => 'officeDocument/2006/relationships/officeDocument',
-        );
+            'word/document.xml' => 'officeDocument/2006/relationships/officeDocument',
+        ];
         $xmlWriter = $this->getXmlWriter();
         $this->writeRels($xmlWriter, $xmlRels);
 
@@ -49,12 +49,11 @@ public function write()
     /**
      * Write relationships.
      *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
      * @param array $xmlRels
      * @param array $mediaRels
      * @param int $relId
      */
-    protected function writeRels(XMLWriter $xmlWriter, $xmlRels = array(), $mediaRels = array(), $relId = 1)
+    protected function writeRels(XMLWriter $xmlWriter, $xmlRels = [], $mediaRels = [], $relId = 1): void
     {
         $xmlWriter->startDocument('1.0', 'UTF-8', 'yes');
         $xmlWriter->startElement('Relationships');
@@ -76,19 +75,18 @@ protected function writeRels(XMLWriter $xmlWriter, $xmlRels = array(), $mediaRel
     /**
      * Write media relationships.
      *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
      * @param int $relId
      * @param array $mediaRel
      */
-    private function writeMediaRel(XMLWriter $xmlWriter, $relId, $mediaRel)
+    private function writeMediaRel(XMLWriter $xmlWriter, $relId, $mediaRel): void
     {
         $typePrefix = 'officeDocument/2006/relationships/';
-        $typeMapping = array('image' => 'image', 'object' => 'oleObject', 'link' => 'hyperlink');
-        $targetMapping = array('image' => 'media/', 'object' => 'embeddings/');
+        $typeMapping = ['image' => 'image', 'object' => 'oleObject', 'link' => 'hyperlink'];
+        $targetMapping = ['image' => 'media/', 'object' => 'embeddings/'];
 
         $mediaType = $mediaRel['type'];
-        $type = isset($typeMapping[$mediaType]) ? $typeMapping[$mediaType] : $mediaType;
-        $targetPrefix = isset($targetMapping[$mediaType]) ? $targetMapping[$mediaType] : '';
+        $type = $typeMapping[$mediaType] ?? $mediaType;
+        $targetPrefix = $targetMapping[$mediaType] ?? '';
         $target = $mediaRel['target'];
         $targetMode = ($type == 'hyperlink') ? 'External' : '';
 
@@ -101,15 +99,12 @@ private function writeMediaRel(XMLWriter $xmlWriter, $relId, $mediaRel)
      * Format:
      * <Relationship Id="rId..." Type="http://..." Target="....xml" TargetMode="..." />
      *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
      * @param int $relId Relationship ID
      * @param string $type Relationship type
      * @param string $target Relationship target
      * @param string $targetMode Relationship target mode
-     *
-     * @throws \PhpOffice\PhpWord\Exception\Exception
      */
-    private function writeRel(XMLWriter $xmlWriter, $relId, $type, $target, $targetMode = '')
+    private function writeRel(XMLWriter $xmlWriter, $relId, $type, $target, $targetMode = ''): void
     {
         if ($type != '' && $target != '') {
             if (strpos($relId, 'rId') === false) {
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/RelsDocument.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/RelsDocument.php
index 2a0c5e1117..1d6ad7b2f3 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/RelsDocument.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/RelsDocument.php
@@ -11,34 +11,34 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 /**
- * Word2007 document relationship writer: word/_rels/document.xml.rels
+ * Word2007 document relationship writer: word/_rels/document.xml.rels.
  *
  * @since 0.11.0
  */
 class RelsDocument extends Rels
 {
     /**
-     * Write part
+     * Write part.
      *
      * @return string
      */
     public function write()
     {
-        $xmlRels = array(
-            'styles.xml'       => 'officeDocument/2006/relationships/styles',
-            'numbering.xml'    => 'officeDocument/2006/relationships/numbering',
-            'settings.xml'     => 'officeDocument/2006/relationships/settings',
+        $xmlRels = [
+            'styles.xml' => 'officeDocument/2006/relationships/styles',
+            'numbering.xml' => 'officeDocument/2006/relationships/numbering',
+            'settings.xml' => 'officeDocument/2006/relationships/settings',
             'theme/theme1.xml' => 'officeDocument/2006/relationships/theme',
-            'webSettings.xml'  => 'officeDocument/2006/relationships/webSettings',
-            'fontTable.xml'    => 'officeDocument/2006/relationships/fontTable',
-        );
+            'webSettings.xml' => 'officeDocument/2006/relationships/webSettings',
+            'fontTable.xml' => 'officeDocument/2006/relationships/fontTable',
+        ];
         $xmlWriter = $this->getXmlWriter();
 
         /** @var \PhpOffice\PhpWord\Writer\Word2007 $parentWriter Type hint */
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/RelsPart.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/RelsPart.php
index ac61a0c2c7..375fadc433 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/RelsPart.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/RelsPart.php
@@ -11,43 +11,44 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 /**
- * Word2007 part relationship writer: word/_rels/(header|footer|footnotes|endnotes)*.xml.rels
+ * Word2007 part relationship writer: word/_rels/(header|footer|footnotes|endnotes)*.xml.rels.
  *
  * @since 0.11.0
  */
 class RelsPart extends Rels
 {
     /**
-     * Media relationships
+     * Media relationships.
      *
      * @var array
      */
-    private $media = array();
+    private $media = [];
 
     /**
-     * Write part
+     * Write part.
      *
      * @return string
      */
     public function write()
     {
         $xmlWriter = $this->getXmlWriter();
-        $this->writeRels($xmlWriter, array(), $this->media);
+        $this->writeRels($xmlWriter, [], $this->media);
 
         return $xmlWriter->getData();
     }
 
     /**
-     * Set media
+     * Set media.
      *
      * @param array $media
+     *
      * @return self
      */
     public function setMedia($media)
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Settings.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Settings.php
index 4dd8b8bedf..85a7fe2c50 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Settings.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Settings.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -23,21 +23,21 @@
 use PhpOffice\PhpWord\Style\Language;
 
 /**
- * Word2007 settings part writer: word/settings.xml
+ * Word2007 settings part writer: word/settings.xml.
  *
  * @see  http://www.schemacentral.com/sc/ooxml/t-w_CT_Settings.html
  */
 class Settings extends AbstractPart
 {
     /**
-     * Settings value
+     * Settings value.
      *
      * @var array
      */
-    private $settings = array();
+    private $settings = [];
 
     /**
-     * Write part
+     * Write part.
      *
      * @return string
      */
@@ -73,7 +73,7 @@ public function write()
      * @param string $settingKey
      * @param array|string $settingValue
      */
-    protected function writeSetting($xmlWriter, $settingKey, $settingValue)
+    protected function writeSetting($xmlWriter, $settingKey, $settingValue): void
     {
         if ($settingValue == '') {
             $xmlWriter->writeElement($settingKey);
@@ -97,49 +97,49 @@ protected function writeSetting($xmlWriter, $settingKey, $settingValue)
     /**
      * Get settings.
      */
-    private function getSettings()
+    private function getSettings(): void
     {
         /** @var \PhpOffice\PhpWord\Metadata\Settings $documentSettings */
         $documentSettings = $this->getParentWriter()->getPhpWord()->getSettings();
 
         // Default settings
-        $this->settings = array(
-            'w:defaultTabStop'          => array('@attributes' => array('w:val' => '708')),
-            'w:hyphenationZone'         => array('@attributes' => array('w:val' => '425')),
-            'w:characterSpacingControl' => array('@attributes' => array('w:val' => 'doNotCompress')),
-            'w:decimalSymbol'           => array('@attributes' => array('w:val' => $documentSettings->getDecimalSymbol())),
-            'w:listSeparator'           => array('@attributes' => array('w:val' => ';')),
-            'w:compat'                  => array(),
-            'm:mathPr'                  => array(
-                'm:mathFont'   => array('@attributes' => array('m:val' => 'Cambria Math')),
-                'm:brkBin'     => array('@attributes' => array('m:val' => 'before')),
-                'm:brkBinSub'  => array('@attributes' => array('m:val' => '--')),
-                'm:smallFrac'  => array('@attributes' => array('m:val' => 'off')),
-                'm:dispDef'    => '',
-                'm:lMargin'    => array('@attributes' => array('m:val' => '0')),
-                'm:rMargin'    => array('@attributes' => array('m:val' => '0')),
-                'm:defJc'      => array('@attributes' => array('m:val' => 'centerGroup')),
-                'm:wrapIndent' => array('@attributes' => array('m:val' => '1440')),
-                'm:intLim'     => array('@attributes' => array('m:val' => 'subSup')),
-                'm:naryLim'    => array('@attributes' => array('m:val' => 'undOvr')),
-            ),
-            'w:clrSchemeMapping' => array(
-                '@attributes' => array(
-                    'w:bg1'               => 'light1',
-                    'w:t1'                => 'dark1',
-                    'w:bg2'               => 'light2',
-                    'w:t2'                => 'dark2',
-                    'w:accent1'           => 'accent1',
-                    'w:accent2'           => 'accent2',
-                    'w:accent3'           => 'accent3',
-                    'w:accent4'           => 'accent4',
-                    'w:accent5'           => 'accent5',
-                    'w:accent6'           => 'accent6',
-                    'w:hyperlink'         => 'hyperlink',
+        $this->settings = [
+            'w:defaultTabStop' => ['@attributes' => ['w:val' => '708']],
+            'w:hyphenationZone' => ['@attributes' => ['w:val' => '425']],
+            'w:characterSpacingControl' => ['@attributes' => ['w:val' => 'doNotCompress']],
+            'w:decimalSymbol' => ['@attributes' => ['w:val' => $documentSettings->getDecimalSymbol()]],
+            'w:listSeparator' => ['@attributes' => ['w:val' => ';']],
+            'w:compat' => [],
+            'm:mathPr' => [
+                'm:mathFont' => ['@attributes' => ['m:val' => 'Cambria Math']],
+                'm:brkBin' => ['@attributes' => ['m:val' => 'before']],
+                'm:brkBinSub' => ['@attributes' => ['m:val' => '--']],
+                'm:smallFrac' => ['@attributes' => ['m:val' => 'off']],
+                'm:dispDef' => '',
+                'm:lMargin' => ['@attributes' => ['m:val' => '0']],
+                'm:rMargin' => ['@attributes' => ['m:val' => '0']],
+                'm:defJc' => ['@attributes' => ['m:val' => 'centerGroup']],
+                'm:wrapIndent' => ['@attributes' => ['m:val' => '1440']],
+                'm:intLim' => ['@attributes' => ['m:val' => 'subSup']],
+                'm:naryLim' => ['@attributes' => ['m:val' => 'undOvr']],
+            ],
+            'w:clrSchemeMapping' => [
+                '@attributes' => [
+                    'w:bg1' => 'light1',
+                    'w:t1' => 'dark1',
+                    'w:bg2' => 'light2',
+                    'w:t2' => 'dark2',
+                    'w:accent1' => 'accent1',
+                    'w:accent2' => 'accent2',
+                    'w:accent3' => 'accent3',
+                    'w:accent4' => 'accent4',
+                    'w:accent5' => 'accent5',
+                    'w:accent6' => 'accent6',
+                    'w:hyperlink' => 'hyperlink',
                     'w:followedHyperlink' => 'followedHyperlink',
-                ),
-            ),
-        );
+                ],
+            ],
+        ];
 
         $this->setOnOffValue('w:mirrorMargins', $documentSettings->hasMirrorMargins());
         $this->setOnOffValue('w:hideSpellingErrors', $documentSettings->hasHideSpellingErrors());
@@ -151,6 +151,7 @@ private function getSettings()
         $this->setOnOffValue('w:updateFields', $documentSettings->hasUpdateFields());
         $this->setOnOffValue('w:autoHyphenation', $documentSettings->hasAutoHyphenation());
         $this->setOnOffValue('w:doNotHyphenateCaps', $documentSettings->hasDoNotHyphenateCaps());
+        $this->setOnOffValue('w:bookFoldPrinting', $documentSettings->hasBookFoldPrinting());
 
         $this->setThemeFontLang($documentSettings->getThemeFontLang());
         $this->setRevisionView($documentSettings->getRevisionView());
@@ -163,19 +164,19 @@ private function getSettings()
     }
 
     /**
-     * Adds a boolean attribute to the settings array
+     * Adds a boolean attribute to the settings array.
      *
      * @param string $settingName
-     * @param bool|null $booleanValue
+     * @param null|bool $booleanValue
      */
-    private function setOnOffValue($settingName, $booleanValue)
+    private function setOnOffValue($settingName, $booleanValue): void
     {
         if (!is_bool($booleanValue)) {
             return;
         }
 
         $value = $booleanValue ? 'true' : 'false';
-        $this->settings[$settingName] = array('@attributes' => array('w:val' => $value));
+        $this->settings[$settingName] = ['@attributes' => ['w:val' => $value]];
     }
 
     /**
@@ -183,146 +184,140 @@ private function setOnOffValue($settingName, $booleanValue)
      *
      * @param \PhpOffice\PhpWord\Metadata\Protection $documentProtection
      */
-    private function setDocumentProtection($documentProtection)
+    private function setDocumentProtection($documentProtection): void
     {
         if ($documentProtection->getEditing() !== null) {
             if ($documentProtection->getPassword() == null) {
-                $this->settings['w:documentProtection'] = array(
-                    '@attributes' => array(
+                $this->settings['w:documentProtection'] = [
+                    '@attributes' => [
                         'w:enforcement' => 1,
-                        'w:edit'        => $documentProtection->getEditing(),
-                    ),
-                );
+                        'w:edit' => $documentProtection->getEditing(),
+                    ],
+                ];
             } else {
                 if ($documentProtection->getSalt() == null) {
                     $documentProtection->setSalt(openssl_random_pseudo_bytes(16));
                 }
                 $passwordHash = PasswordEncoder::hashPassword($documentProtection->getPassword(), $documentProtection->getAlgorithm(), $documentProtection->getSalt(), $documentProtection->getSpinCount());
-                $this->settings['w:documentProtection'] = array(
-                    '@attributes' => array(
-                        'w:enforcement'         => 1,
-                        'w:edit'                => $documentProtection->getEditing(),
-                        'w:cryptProviderType'   => 'rsaFull',
+                $this->settings['w:documentProtection'] = [
+                    '@attributes' => [
+                        'w:enforcement' => 1,
+                        'w:edit' => $documentProtection->getEditing(),
+                        'w:cryptProviderType' => 'rsaFull',
                         'w:cryptAlgorithmClass' => 'hash',
-                        'w:cryptAlgorithmType'  => 'typeAny',
-                        'w:cryptAlgorithmSid'   => PasswordEncoder::getAlgorithmId($documentProtection->getAlgorithm()),
-                        'w:cryptSpinCount'      => $documentProtection->getSpinCount(),
-                        'w:hash'                => $passwordHash,
-                        'w:salt'                => base64_encode($documentProtection->getSalt()),
-                    ),
-                );
+                        'w:cryptAlgorithmType' => 'typeAny',
+                        'w:cryptAlgorithmSid' => PasswordEncoder::getAlgorithmId($documentProtection->getAlgorithm()),
+                        'w:cryptSpinCount' => $documentProtection->getSpinCount(),
+                        'w:hash' => $passwordHash,
+                        'w:salt' => base64_encode($documentProtection->getSalt()),
+                    ],
+                ];
             }
         }
     }
 
     /**
-     * Set the Proof state
-     *
-     * @param ProofState $proofState
+     * Set the Proof state.
      */
-    private function setProofState(ProofState $proofState = null)
+    private function setProofState(?ProofState $proofState = null): void
     {
         if ($proofState != null && $proofState->getGrammar() !== null && $proofState->getSpelling() !== null) {
-            $this->settings['w:proofState'] = array(
-                '@attributes' => array(
+            $this->settings['w:proofState'] = [
+                '@attributes' => [
                     'w:spelling' => $proofState->getSpelling(),
-                    'w:grammar'  => $proofState->getGrammar(),
-                ),
-            );
+                    'w:grammar' => $proofState->getGrammar(),
+                ],
+            ];
         }
     }
 
     /**
-     * Set the Revision View
-     *
-     * @param TrackChangesView $trackChangesView
+     * Set the Revision View.
      */
-    private function setRevisionView(TrackChangesView $trackChangesView = null)
+    private function setRevisionView(?TrackChangesView $trackChangesView = null): void
     {
         if ($trackChangesView != null) {
-            $revisionView = array();
+            $revisionView = [];
             $revisionView['w:markup'] = $trackChangesView->hasMarkup() ? 'true' : 'false';
             $revisionView['w:comments'] = $trackChangesView->hasComments() ? 'true' : 'false';
             $revisionView['w:insDel'] = $trackChangesView->hasInsDel() ? 'true' : 'false';
             $revisionView['w:formatting'] = $trackChangesView->hasFormatting() ? 'true' : 'false';
             $revisionView['w:inkAnnotations'] = $trackChangesView->hasInkAnnotations() ? 'true' : 'false';
 
-            $this->settings['w:revisionView'] = array('@attributes' => $revisionView);
+            $this->settings['w:revisionView'] = ['@attributes' => $revisionView];
         }
     }
 
     /**
-     * Sets the language
-     *
-     * @param Language $language
+     * Sets the language.
      */
-    private function setThemeFontLang(Language $language = null)
+    private function setThemeFontLang(?Language $language = null): void
     {
         $latinLanguage = ($language == null || $language->getLatin() === null) ? 'en-US' : $language->getLatin();
-        $lang = array();
+        $lang = [];
         $lang['w:val'] = $latinLanguage;
         if ($language != null) {
             $lang['w:eastAsia'] = $language->getEastAsia() === null ? 'x-none' : $language->getEastAsia();
             $lang['w:bidi'] = $language->getBidirectional() === null ? 'x-none' : $language->getBidirectional();
         }
-        $this->settings['w:themeFontLang'] = array('@attributes' => $lang);
+        $this->settings['w:themeFontLang'] = ['@attributes' => $lang];
     }
 
     /**
-     * Set the magnification
+     * Set the magnification.
      *
      * @param mixed $zoom
      */
-    private function setZoom($zoom = null)
+    private function setZoom($zoom = null): void
     {
         if ($zoom !== null) {
             $attr = is_int($zoom) ? 'w:percent' : 'w:val';
-            $this->settings['w:zoom'] = array('@attributes' => array($attr => $zoom));
+            $this->settings['w:zoom'] = ['@attributes' => [$attr => $zoom]];
         }
     }
 
     /**
-     * @param int|null $consecutiveHyphenLimit
+     * @param null|int $consecutiveHyphenLimit
      */
-    private function setConsecutiveHyphenLimit($consecutiveHyphenLimit)
+    private function setConsecutiveHyphenLimit($consecutiveHyphenLimit): void
     {
         if ($consecutiveHyphenLimit === null) {
             return;
         }
 
-        $this->settings['w:consecutiveHyphenLimit'] = array(
-            '@attributes' => array('w:val' => $consecutiveHyphenLimit),
-        );
+        $this->settings['w:consecutiveHyphenLimit'] = [
+            '@attributes' => ['w:val' => $consecutiveHyphenLimit],
+        ];
     }
 
     /**
-     * @param float|null $hyphenationZone
+     * @param null|float $hyphenationZone
      */
-    private function setHyphenationZone($hyphenationZone)
+    private function setHyphenationZone($hyphenationZone): void
     {
         if ($hyphenationZone === null) {
             return;
         }
 
-        $this->settings['w:hyphenationZone'] = array(
-            '@attributes' => array('w:val' => $hyphenationZone),
-        );
+        $this->settings['w:hyphenationZone'] = [
+            '@attributes' => ['w:val' => $hyphenationZone],
+        ];
     }
 
     /**
      * Get compatibility setting.
      */
-    private function setCompatibility()
+    private function setCompatibility(): void
     {
         $compatibility = $this->getParentWriter()->getPhpWord()->getCompatibility();
         if ($compatibility->getOoxmlVersion() !== null) {
-            $this->settings['w:compat']['w:compatSetting'] = array(
-                '@attributes' => array(
+            $this->settings['w:compat']['w:compatSetting'] = [
+                '@attributes' => [
                     'w:name' => 'compatibilityMode',
-                    'w:uri'  => 'http://schemas.microsoft.com/office/word',
-                    'w:val'  => $compatibility->getOoxmlVersion(),
-                ),
-            );
+                    'w:uri' => 'http://schemas.microsoft.com/office/word',
+                    'w:val' => $compatibility->getOoxmlVersion(),
+                ],
+            ];
         }
     }
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Styles.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Styles.php
index 4d8f60c23a..2112fd3ce6 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Styles.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Styles.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -27,15 +27,16 @@
 use PhpOffice\PhpWord\Writer\Word2007\Style\Table as TableStyleWriter;
 
 /**
- * Word2007 styles part writer: word/styles.xml
+ * Word2007 styles part writer: word/styles.xml.
  *
  * @todo Do something with the numbering style introduced in 0.10.0
+ *
  * @SuppressWarnings(PHPMD.UnusedPrivateMethod) For writeFontStyle, writeParagraphStyle, and writeTableStyle
  */
 class Styles extends AbstractPart
 {
     /**
-     * Write part
+     * Write part.
      *
      * @return string
      */
@@ -76,10 +77,9 @@ public function write()
     /**
      * Write default font and other default styles.
      *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Style\AbstractStyle[] $styles
      */
-    private function writeDefaultStyles(XMLWriter $xmlWriter, $styles)
+    private function writeDefaultStyles(XMLWriter $xmlWriter, $styles): void
     {
         $phpWord = $this->getParentWriter()->getPhpWord();
         $fontName = $phpWord->getDefaultFontName();
@@ -161,16 +161,14 @@ private function writeDefaultStyles(XMLWriter $xmlWriter, $styles)
     /**
      * Write font style.
      *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
      * @param string $styleName
-     * @param \PhpOffice\PhpWord\Style\Font $style
      */
-    private function writeFontStyle(XMLWriter $xmlWriter, $styleName, FontStyle $style)
+    private function writeFontStyle(XMLWriter $xmlWriter, $styleName, FontStyle $style): void
     {
         $paragraphStyle = $style->getParagraph();
         $styleType = $style->getStyleType();
         $type = ($styleType == 'title') ? 'paragraph' : 'character';
-        if (!is_null($paragraphStyle)) {
+        if (null !== $paragraphStyle) {
             $type = 'paragraph';
         }
 
@@ -194,7 +192,7 @@ private function writeFontStyle(XMLWriter $xmlWriter, $styleName, FontStyle $sty
             $xmlWriter->startElement('w:link');
             $xmlWriter->writeAttribute('w:val', $styleLink);
             $xmlWriter->endElement();
-        } elseif (!is_null($paragraphStyle)) {
+        } elseif (null !== $paragraphStyle) {
             // if type is 'paragraph' it should have a styleId
             $xmlWriter->writeAttribute('w:styleId', $styleName);
         }
@@ -205,7 +203,7 @@ private function writeFontStyle(XMLWriter $xmlWriter, $styleName, FontStyle $sty
         $xmlWriter->endElement();
 
         // Parent style
-        if (!is_null($paragraphStyle)) {
+        if (null !== $paragraphStyle) {
             if ($paragraphStyle->getStyleName() != null) {
                 $xmlWriter->writeElementBlock('w:basedOn', 'w:val', $paragraphStyle->getStyleName());
             } elseif ($paragraphStyle->getBasedOn() != null) {
@@ -214,7 +212,7 @@ private function writeFontStyle(XMLWriter $xmlWriter, $styleName, FontStyle $sty
         }
 
         // w:pPr
-        if (!is_null($paragraphStyle)) {
+        if (null !== $paragraphStyle) {
             $styleWriter = new ParagraphStyleWriter($xmlWriter, $paragraphStyle);
             $styleWriter->write();
         }
@@ -229,11 +227,9 @@ private function writeFontStyle(XMLWriter $xmlWriter, $styleName, FontStyle $sty
     /**
      * Write paragraph style.
      *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
      * @param string $styleName
-     * @param \PhpOffice\PhpWord\Style\Paragraph $style
      */
-    private function writeParagraphStyle(XMLWriter $xmlWriter, $styleName, ParagraphStyle $style)
+    private function writeParagraphStyle(XMLWriter $xmlWriter, $styleName, ParagraphStyle $style): void
     {
         $xmlWriter->startElement('w:style');
         $xmlWriter->writeAttribute('w:type', 'paragraph');
@@ -245,11 +241,11 @@ private function writeParagraphStyle(XMLWriter $xmlWriter, $styleName, Paragraph
 
         // Parent style
         $basedOn = $style->getBasedOn();
-        $xmlWriter->writeElementIf(!is_null($basedOn), 'w:basedOn', 'w:val', $basedOn);
+        $xmlWriter->writeElementIf(null !== $basedOn, 'w:basedOn', 'w:val', $basedOn);
 
         // Next paragraph style
         $next = $style->getNext();
-        $xmlWriter->writeElementIf(!is_null($next), 'w:next', 'w:val', $next);
+        $xmlWriter->writeElementIf(null !== $next, 'w:next', 'w:val', $next);
 
         // w:pPr
         $styleWriter = new ParagraphStyleWriter($xmlWriter, $style);
@@ -261,11 +257,9 @@ private function writeParagraphStyle(XMLWriter $xmlWriter, $styleName, Paragraph
     /**
      * Write table style.
      *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
      * @param string $styleName
-     * @param \PhpOffice\PhpWord\Style\Table $style
      */
-    private function writeTableStyle(XMLWriter $xmlWriter, $styleName, TableStyle $style)
+    private function writeTableStyle(XMLWriter $xmlWriter, $styleName, TableStyle $style): void
     {
         $xmlWriter->startElement('w:style');
         $xmlWriter->writeAttribute('w:type', 'table');
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Theme.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Theme.php
index f4ef478ebf..ad57d66493 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Theme.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/Theme.php
@@ -11,22 +11,23 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 /**
- * Word2007 theme writer: word/theme/theme1.xml
+ * Word2007 theme writer: word/theme/theme1.xml.
  *
  * @todo Generate content dynamically
+ *
  * @since 0.10.0
  */
 class Theme extends AbstractPart
 {
     /**
-     * Write part
+     * Write part.
      *
      * @return string
      */
@@ -49,7 +50,7 @@ public function write()
     }
 
     /**
-     * Write color scheme
+     * Write color scheme.
      *
      * @return string
      */
@@ -100,7 +101,7 @@ private function writeColorScheme()
     }
 
     /**
-     * Write font scheme
+     * Write font scheme.
      *
      * @return string
      */
@@ -186,7 +187,7 @@ private function writeFontScheme()
     }
 
     /**
-     * Write format scheme
+     * Write format scheme.
      *
      * @return string
      */
@@ -205,7 +206,7 @@ private function writeFormatScheme()
     }
 
     /**
-     * Write fill format scheme
+     * Write fill format scheme.
      *
      * @return string
      */
@@ -269,7 +270,7 @@ private function writeFormatFill()
     }
 
     /**
-     * Write line format scheme
+     * Write line format scheme.
      *
      * @return string
      */
@@ -305,7 +306,7 @@ private function writeFormatLine()
     }
 
     /**
-     * Write effect format scheme
+     * Write effect format scheme.
      *
      * @return string
      */
@@ -358,7 +359,7 @@ private function writeFormatEffect()
     }
 
     /**
-     * Write background format scheme
+     * Write background format scheme.
      *
      * @return string
      */
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/WebSettings.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/WebSettings.php
index 46252e8701..36bea059ea 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/WebSettings.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Part/WebSettings.php
@@ -11,27 +11,27 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 /**
- * Word2007 web settings part writer: word/webSettings.xml
+ * Word2007 web settings part writer: word/webSettings.xml.
  */
 class WebSettings extends Settings
 {
     /**
-     * Write part
+     * Write part.
      *
      * @return string
      */
     public function write()
     {
-        $settings = array(
+        $settings = [
             'w:optimizeForBrowser' => '',
-        );
+        ];
 
         $xmlWriter = $this->getXmlWriter();
 
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/AbstractStyle.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/AbstractStyle.php
index 3624a7bef2..dc4eccd2ce 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/AbstractStyle.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/AbstractStyle.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -21,36 +21,35 @@
 use PhpOffice\PhpWord\Shared\XMLWriter;
 
 /**
- * Style writer
+ * Style writer.
  *
  * @since 0.10.0
  */
 abstract class AbstractStyle
 {
     /**
-     * XML writer
+     * XML writer.
      *
      * @var \PhpOffice\PhpWord\Shared\XMLWriter
      */
     private $xmlWriter;
 
     /**
-     * Style; set protected for a while
+     * Style; set protected for a while.
      *
-     * @var string|\PhpOffice\PhpWord\Style\AbstractStyle
+     * @var \PhpOffice\PhpWord\Style\AbstractStyle|string
      */
     protected $style;
 
     /**
-     * Write style
+     * Write style.
      */
     abstract public function write();
 
     /**
      * Create new instance.
      *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
-     * @param string|\PhpOffice\PhpWord\Style\AbstractStyle $style
+     * @param \PhpOffice\PhpWord\Style\AbstractStyle|string $style
      */
     public function __construct(XMLWriter $xmlWriter, $style = null)
     {
@@ -59,7 +58,7 @@ public function __construct(XMLWriter $xmlWriter, $style = null)
     }
 
     /**
-     * Get XML Writer
+     * Get XML Writer.
      *
      * @return \PhpOffice\PhpWord\Shared\XMLWriter
      */
@@ -69,9 +68,9 @@ protected function getXmlWriter()
     }
 
     /**
-     * Get Style
+     * Get Style.
      *
-     * @return string|\PhpOffice\PhpWord\Style\AbstractStyle
+     * @return \PhpOffice\PhpWord\Style\AbstractStyle|string
      */
     protected function getStyle()
     {
@@ -79,21 +78,22 @@ protected function getStyle()
     }
 
     /**
-     * Convert twip value
+     * Convert twip value.
      *
-     * @param int|float $value
+     * @param float|int $value
      * @param int $default (int|float)
-     * @return int|float
+     *
+     * @return float|int
      */
     protected function convertTwip($value, $default = 0)
     {
-        $factors = array(
-            Settings::UNIT_CM    => 567,
-            Settings::UNIT_MM    => 56.7,
-            Settings::UNIT_INCH  => 1440,
+        $factors = [
+            Settings::UNIT_CM => 567,
+            Settings::UNIT_MM => 56.7,
+            Settings::UNIT_INCH => 1440,
             Settings::UNIT_POINT => 20,
-            Settings::UNIT_PICA  => 240,
-        );
+            Settings::UNIT_PICA => 240,
+        ];
         $unit = Settings::getMeasurementUnit();
         $factor = 1;
         if (array_key_exists($unit, $factors) && $value != $default) {
@@ -106,11 +106,10 @@ protected function convertTwip($value, $default = 0)
     /**
      * Write child style.
      *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
      * @param string $name
      * @param mixed $value
      */
-    protected function writeChildStyle(XMLWriter $xmlWriter, $name, $value)
+    protected function writeChildStyle(XMLWriter $xmlWriter, $name, $value): void
     {
         if ($value !== null) {
             $class = 'PhpOffice\\PhpWord\\Writer\\Word2007\\Style\\' . $name;
@@ -122,9 +121,10 @@ protected function writeChildStyle(XMLWriter $xmlWriter, $name, $value)
     }
 
     /**
-     * Writes boolean as 0 or 1
+     * Writes boolean as 0 or 1.
      *
      * @param bool $value
+     *
      * @return null|string
      */
     protected function writeOnOf($value = null)
@@ -137,16 +137,17 @@ protected function writeOnOf($value = null)
     }
 
     /**
-     * Assemble style array into style string
+     * Assemble style array into style string.
      *
      * @param array $styles
+     *
      * @return string
      */
-    protected function assembleStyle($styles = array())
+    protected function assembleStyle($styles = [])
     {
         $style = '';
         foreach ($styles as $key => $value) {
-            if (!is_null($value) && $value != '') {
+            if (null !== $value && $value != '') {
                 $style .= "{$key}:{$value}; ";
             }
         }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Cell.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Cell.php
index 733b7b434e..6e22597dd3 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Cell.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Cell.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,7 +20,7 @@
 use PhpOffice\PhpWord\Style\Cell as CellStyle;
 
 /**
- * Cell style writer
+ * Cell style writer.
  *
  * @since 0.10.0
  */
@@ -34,7 +34,7 @@ class Cell extends AbstractStyle
     /**
      * Write style.
      */
-    public function write()
+    public function write(): void
     {
         $style = $this->getStyle();
         if (!$style instanceof CellStyle) {
@@ -45,8 +45,8 @@ public function write()
         $xmlWriter->startElement('w:tcPr');
 
         // Width
-        if (!is_null($this->width) || !is_null($style->getWidth())) {
-            $width = is_null($this->width) ? $style->getWidth() : $this->width;
+        if (null !== $this->width || null !== $style->getWidth()) {
+            $width = null === $this->width ? $style->getWidth() : $this->width;
 
             $xmlWriter->startElement('w:tcW');
             $xmlWriter->writeAttribute('w:w', $width);
@@ -56,11 +56,11 @@ public function write()
 
         // Text direction
         $textDir = $style->getTextDirection();
-        $xmlWriter->writeElementIf(!is_null($textDir), 'w:textDirection', 'w:val', $textDir);
+        $xmlWriter->writeElementIf(null !== $textDir, 'w:textDirection', 'w:val', $textDir);
 
         // Vertical alignment
         $vAlign = $style->getVAlign();
-        $xmlWriter->writeElementIf(!is_null($vAlign), 'w:vAlign', 'w:val', $vAlign);
+        $xmlWriter->writeElementIf(null !== $vAlign, 'w:vAlign', 'w:val', $vAlign);
 
         // Border
         if ($style->hasBorder()) {
@@ -70,7 +70,7 @@ public function write()
             $styleWriter->setSizes($style->getBorderSize());
             $styleWriter->setColors($style->getBorderColor());
             $styleWriter->setStyles($style->getBorderStyle());
-            $styleWriter->setAttributes(array('defaultColor' => CellStyle::DEFAULT_BORDER_COLOR));
+            $styleWriter->setAttributes(['defaultColor' => CellStyle::DEFAULT_BORDER_COLOR]);
             $styleWriter->write();
 
             $xmlWriter->endElement();
@@ -78,7 +78,7 @@ public function write()
 
         // Shading
         $shading = $style->getShading();
-        if (!is_null($shading)) {
+        if (null !== $shading) {
             $styleWriter = new Shading($xmlWriter, $shading);
             $styleWriter->write();
         }
@@ -86,8 +86,9 @@ public function write()
         // Colspan & rowspan
         $gridSpan = $style->getGridSpan();
         $vMerge = $style->getVMerge();
-        $xmlWriter->writeElementIf(!is_null($gridSpan), 'w:gridSpan', 'w:val', $gridSpan);
-        $xmlWriter->writeElementIf(!is_null($vMerge), 'w:vMerge', 'w:val', $vMerge);
+        $xmlWriter->writeElementIf(null !== $gridSpan, 'w:gridSpan', 'w:val', $gridSpan);
+        $xmlWriter->writeElementIf(null !== $vMerge, 'w:vMerge', 'w:val', $vMerge);
+        $xmlWriter->writeElementIf($style->getNoWrap(), 'w:noWrap');
 
         $xmlWriter->endElement(); // w:tcPr
     }
@@ -97,7 +98,7 @@ public function write()
      *
      * @param int $value
      */
-    public function setWidth($value = null)
+    public function setWidth($value = null): void
     {
         $this->width = $value;
     }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Extrusion.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Extrusion.php
index 193993485d..f6ad622191 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Extrusion.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Extrusion.php
@@ -11,14 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Style;
 
 /**
- * 3D extrusion style writer
+ * 3D extrusion style writer.
  *
  * @since 0.12.0
  */
@@ -27,7 +27,7 @@ class Extrusion extends AbstractStyle
     /**
      * Write style.
      */
-    public function write()
+    public function write(): void
     {
         $style = $this->getStyle();
         if (!$style instanceof \PhpOffice\PhpWord\Style\Extrusion) {
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Fill.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Fill.php
index 53d039742b..ec3800482f 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Fill.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Fill.php
@@ -11,14 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Style;
 
 /**
- * Fill style writer
+ * Fill style writer.
  *
  * @since 0.12.0
  */
@@ -27,7 +27,7 @@ class Fill extends AbstractStyle
     /**
      * Write style.
      */
-    public function write()
+    public function write(): void
     {
         $style = $this->getStyle();
         if (!$style instanceof \PhpOffice\PhpWord\Style\Fill) {
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Font.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Font.php
index 2f2218fa57..1f6db009e4 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Font.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Font.php
@@ -11,21 +11,21 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Style;
 
 /**
- * Font style writer
+ * Font style writer.
  *
  * @since 0.10.0
  */
 class Font extends AbstractStyle
 {
     /**
-     * Is inline in element
+     * Is inline in element.
      *
      * @var bool
      */
@@ -34,11 +34,11 @@ class Font extends AbstractStyle
     /**
      * Write style.
      */
-    public function write()
+    public function write(): void
     {
         $xmlWriter = $this->getXmlWriter();
 
-        $isStyleName = $this->isInline && !is_null($this->style) && is_string($this->style);
+        $isStyleName = $this->isInline && null !== $this->style && is_string($this->style);
         if ($isStyleName) {
             $xmlWriter->startElement('w:rPr');
             $xmlWriter->startElement('w:rStyle');
@@ -57,7 +57,7 @@ public function write()
     /**
      * Write full style.
      */
-    private function writeStyle()
+    private function writeStyle(): void
     {
         $style = $this->getStyle();
         if (!$style instanceof \PhpOffice\PhpWord\Style\Font) {
@@ -117,8 +117,8 @@ private function writeStyle()
         $xmlWriter->writeElementIf($style->isItalic() !== null, 'w:iCs', 'w:val', $this->writeOnOf($style->isItalic()));
 
         // Strikethrough, double strikethrough
-        $xmlWriter->writeElementIf($style->isStrikethrough() !== null, 'w:strike', 'w:val', $this->writeOnOf($style->isStrikethrough()));
-        $xmlWriter->writeElementIf($style->isDoubleStrikethrough() !== null, 'w:dstrike', 'w:val', $this->writeOnOf($style->isDoubleStrikethrough()));
+        $xmlWriter->writeElementIf($style->isStrikethrough(), 'w:strike', 'w:val', $this->writeOnOf($style->isStrikethrough()));
+        $xmlWriter->writeElementIf($style->isDoubleStrikethrough(), 'w:dstrike', 'w:val', $this->writeOnOf($style->isDoubleStrikethrough()));
 
         // Small caps, all caps
         $xmlWriter->writeElementIf($style->isSmallCaps() !== null, 'w:smallCaps', 'w:val', $this->writeOnOf($style->isSmallCaps()));
@@ -147,7 +147,7 @@ private function writeStyle()
 
         // Background-Color
         $shading = $style->getShading();
-        if (!is_null($shading)) {
+        if (null !== $shading) {
             $styleWriter = new Shading($xmlWriter, $shading);
             $styleWriter->write();
         }
@@ -169,7 +169,7 @@ private function writeStyle()
      *
      * @param bool $value
      */
-    public function setIsInline($value)
+    public function setIsInline($value): void
     {
         $this->isInline = $value;
     }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Frame.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Frame.php
index 782bce5219..0ba52ec5ab 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Frame.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Frame.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -22,7 +22,7 @@
 use PhpOffice\PhpWord\Writer\Word2007\Element\ParagraphAlignment;
 
 /**
- * Frame style writer
+ * Frame style writer.
  *
  * @since 0.12.0
  */
@@ -33,7 +33,7 @@ class Frame extends AbstractStyle
     /**
      * Write style.
      */
-    public function write()
+    public function write(): void
     {
         $style = $this->getStyle();
         if (!$style instanceof FrameStyle) {
@@ -42,27 +42,27 @@ public function write()
         $xmlWriter = $this->getXmlWriter();
 
         $maxZIndex = min(PHP_INT_MAX, self::PHP_32BIT_INT_MAX);
-        $zIndices = array(FrameStyle::WRAP_INFRONT => $maxZIndex, FrameStyle::WRAP_BEHIND => -$maxZIndex);
-
-        $properties = array(
-            'width'              => 'width',
-            'height'             => 'height',
-            'left'               => 'margin-left',
-            'top'                => 'margin-top',
-            'wrapDistanceTop'    => 'mso-wrap-distance-top',
+        $zIndices = [FrameStyle::WRAP_INFRONT => $maxZIndex, FrameStyle::WRAP_BEHIND => -$maxZIndex];
+
+        $properties = [
+            'width' => 'width',
+            'height' => 'height',
+            'left' => 'margin-left',
+            'top' => 'margin-top',
+            'wrapDistanceTop' => 'mso-wrap-distance-top',
             'wrapDistanceBottom' => 'mso-wrap-distance-bottom',
-            'wrapDistanceLeft'   => 'mso-wrap-distance-left',
-            'wrapDistanceRight'  => 'mso-wrap-distance-right',
-        );
+            'wrapDistanceLeft' => 'mso-wrap-distance-left',
+            'wrapDistanceRight' => 'mso-wrap-distance-right',
+        ];
         $sizeStyles = $this->getStyles($style, $properties, $style->getUnit());
 
-        $properties = array(
-            'pos'       => 'position',
-            'hPos'      => 'mso-position-horizontal',
-            'vPos'      => 'mso-position-vertical',
+        $properties = [
+            'pos' => 'position',
+            'hPos' => 'mso-position-horizontal',
+            'vPos' => 'mso-position-vertical',
             'hPosRelTo' => 'mso-position-horizontal-relative',
             'vPosRelTo' => 'mso-position-vertical-relative',
-        );
+        ];
         $posStyles = $this->getStyles($style, $properties);
 
         $styles = array_merge($sizeStyles, $posStyles);
@@ -83,7 +83,7 @@ public function write()
     /**
      * Write alignment.
      */
-    public function writeAlignment()
+    public function writeAlignment(): void
     {
         $style = $this->getStyle();
         if (!$style instanceof FrameStyle) {
@@ -108,24 +108,22 @@ public function writeAlignment()
     /**
      * Write wrap.
      *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
-     * @param \PhpOffice\PhpWord\Style\Frame $style
      * @param string $wrap
      */
-    private function writeWrap(XMLWriter $xmlWriter, FrameStyle $style, $wrap)
+    private function writeWrap(XMLWriter $xmlWriter, FrameStyle $style, $wrap): void
     {
         if ($wrap !== null) {
             $xmlWriter->startElement('w10:wrap');
             $xmlWriter->writeAttribute('type', $wrap);
 
-            $relativePositions = array(
-                FrameStyle::POS_RELTO_MARGIN  => 'margin',
-                FrameStyle::POS_RELTO_PAGE    => 'page',
+            $relativePositions = [
+                FrameStyle::POS_RELTO_MARGIN => 'margin',
+                FrameStyle::POS_RELTO_PAGE => 'page',
                 FrameStyle::POS_RELTO_TMARGIN => 'margin',
                 FrameStyle::POS_RELTO_BMARGIN => 'page',
                 FrameStyle::POS_RELTO_LMARGIN => 'margin',
                 FrameStyle::POS_RELTO_RMARGIN => 'page',
-            );
+            ];
             $pos = $style->getPos();
             $hPos = $style->getHPosRelTo();
             $vPos = $style->getVPosRelTo();
@@ -147,16 +145,16 @@ private function writeWrap(XMLWriter $xmlWriter, FrameStyle $style, $wrap)
     }
 
     /**
-     * Get style values in associative array
+     * Get style values in associative array.
      *
-     * @param \PhpOffice\PhpWord\Style\Frame $style
      * @param array $properties
      * @param string $suffix
+     *
      * @return array
      */
     private function getStyles(FrameStyle $style, $properties, $suffix = '')
     {
-        $styles = array();
+        $styles = [];
 
         foreach ($properties as $key => $property) {
             $method = "get{$key}";
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Image.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Image.php
index ef23ed103c..18d924fd3d 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Image.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Image.php
@@ -11,14 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Style;
 
 /**
- * Image style writer
+ * Image style writer.
  *
  * @since 0.10.0
  */
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Indentation.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Indentation.php
index 961e770fbd..63ffb6323a 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Indentation.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Indentation.php
@@ -11,14 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Style;
 
 /**
- * Paragraph indentation style writer
+ * Paragraph indentation style writer.
  *
  * @since 0.10.0
  */
@@ -27,7 +27,7 @@ class Indentation extends AbstractStyle
     /**
      * Write style.
      */
-    public function write()
+    public function write(): void
     {
         $style = $this->getStyle();
         if (!$style instanceof \PhpOffice\PhpWord\Style\Indentation) {
@@ -41,10 +41,10 @@ public function write()
         $xmlWriter->writeAttribute('w:right', $this->convertTwip($style->getRight()));
 
         $firstLine = $style->getFirstLine();
-        $xmlWriter->writeAttributeIf(!is_null($firstLine), 'w:firstLine', $this->convertTwip($firstLine));
+        $xmlWriter->writeAttributeIf(null !== $firstLine, 'w:firstLine', $this->convertTwip($firstLine));
 
         $hanging = $style->getHanging();
-        $xmlWriter->writeAttributeIf(!is_null($hanging), 'w:hanging', $this->convertTwip($hanging));
+        $xmlWriter->writeAttributeIf(null !== $hanging, 'w:hanging', $this->convertTwip($hanging));
 
         $xmlWriter->endElement();
     }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Line.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Line.php
index 154a42c13d..90107f8ea2 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Line.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Line.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,15 +20,16 @@
 use PhpOffice\PhpWord\Style\Line as LineStyle;
 
 /**
- * Line style writer
+ * Line style writer.
  */
 class Line extends Frame
 {
     /**
      * Write Line stroke.
+     *
      * @todo Merge with `Stroke` style
      */
-    public function writeStroke()
+    public function writeStroke(): void
     {
         $xmlWriter = $this->getXmlWriter();
         $style = $this->getStyle();
@@ -37,15 +38,15 @@ public function writeStroke()
         }
 
         $dash = $style->getDash();
-        $dashStyles = array(
-            LineStyle::DASH_STYLE_DASH              => 'dash',
-            LineStyle::DASH_STYLE_ROUND_DOT         => '1 1',
-            LineStyle::DASH_STYLE_SQUARE_DOT        => '1 1',
-            LineStyle::DASH_STYLE_DASH_DOT          => 'dashDot',
-            LineStyle::DASH_STYLE_LONG_DASH         => 'longDash',
-            LineStyle::DASH_STYLE_LONG_DASH_DOT     => 'longDashDot',
+        $dashStyles = [
+            LineStyle::DASH_STYLE_DASH => 'dash',
+            LineStyle::DASH_STYLE_ROUND_DOT => '1 1',
+            LineStyle::DASH_STYLE_SQUARE_DOT => '1 1',
+            LineStyle::DASH_STYLE_DASH_DOT => 'dashDot',
+            LineStyle::DASH_STYLE_LONG_DASH => 'longDash',
+            LineStyle::DASH_STYLE_LONG_DASH_DOT => 'longDashDot',
             LineStyle::DASH_STYLE_LONG_DASH_DOT_DOT => 'longDashDotDot',
-        );
+        ];
 
         $xmlWriter->startElement('v:stroke');
 
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/LineNumbering.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/LineNumbering.php
index 4bf08b65ab..62e577a4d8 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/LineNumbering.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/LineNumbering.php
@@ -11,14 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Style;
 
 /**
- * Line numbering style writer
+ * Line numbering style writer.
  *
  * @since 0.10.0
  */
@@ -26,9 +26,9 @@ class LineNumbering extends AbstractStyle
 {
     /**
      * Write style.
-     * The w:start seems to be zero based so we have to decrement by one
+     * The w:start seems to be zero based so we have to decrement by one.
      */
-    public function write()
+    public function write(): void
     {
         $style = $this->getStyle();
         if (!$style instanceof \PhpOffice\PhpWord\Style\LineNumbering) {
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/MarginBorder.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/MarginBorder.php
index a992956359..ce250e54d4 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/MarginBorder.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/MarginBorder.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,48 +20,48 @@
 use PhpOffice\PhpWord\Shared\XMLWriter;
 
 /**
- * Margin border style writer
+ * Margin border style writer.
  *
  * @since 0.10.0
  */
 class MarginBorder extends AbstractStyle
 {
     /**
-     * Sizes
+     * Sizes.
      *
      * @var int[]
      */
-    private $sizes = array();
+    private $sizes = [];
 
     /**
-     * Colors
+     * Colors.
      *
      * @var string[]
      */
-    private $colors = array();
+    private $colors = [];
 
     /**
-     * Border styles
+     * Border styles.
      *
      * @var string[]
      */
-    private $styles = array();
+    private $styles = [];
 
     /**
-     * Other attributes
+     * Other attributes.
      *
      * @var array
      */
-    private $attributes = array();
+    private $attributes = [];
 
     /**
      * Write style.
      */
-    public function write()
+    public function write(): void
     {
         $xmlWriter = $this->getXmlWriter();
 
-        $sides = array('top', 'left', 'right', 'bottom', 'insideH', 'insideV');
+        $sides = ['top', 'left', 'right', 'bottom', 'insideH', 'insideV'];
 
         foreach ($this->sizes as $i => $size) {
             if ($size !== null) {
@@ -69,7 +69,7 @@ public function write()
                 if (isset($this->colors[$i])) {
                     $color = $this->colors[$i];
                 }
-                $style = isset($this->styles[$i]) ? $this->styles[$i] : 'single';
+                $style = $this->styles[$i] ?? 'single';
                 $this->writeSide($xmlWriter, $sides[$i], $this->sizes[$i], $color, $style);
             }
         }
@@ -78,13 +78,12 @@ public function write()
     /**
      * Write side.
      *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
      * @param string $side
      * @param int $width
      * @param string $color
      * @param string $borderStyle
      */
-    private function writeSide(XMLWriter $xmlWriter, $side, $width, $color = null, $borderStyle = 'solid')
+    private function writeSide(XMLWriter $xmlWriter, $side, $width, $color = null, $borderStyle = 'solid'): void
     {
         $xmlWriter->startElement('w:' . $side);
         if (!empty($this->colors)) {
@@ -113,7 +112,7 @@ private function writeSide(XMLWriter $xmlWriter, $side, $width, $color = null, $
      *
      * @param int[] $value
      */
-    public function setSizes($value)
+    public function setSizes($value): void
     {
         $this->sizes = $value;
     }
@@ -121,9 +120,9 @@ public function setSizes($value)
     /**
      * Set colors.
      *
-     * @param string[] $value
+     * @param array<null|string> $value
      */
-    public function setColors($value)
+    public function setColors($value): void
     {
         $this->colors = $value;
     }
@@ -133,7 +132,7 @@ public function setColors($value)
      *
      * @param string[] $value
      */
-    public function setStyles($value)
+    public function setStyles($value): void
     {
         $this->styles = $value;
     }
@@ -143,7 +142,7 @@ public function setStyles($value)
      *
      * @param array $value
      */
-    public function setAttributes($value)
+    public function setAttributes($value): void
     {
         $this->attributes = $value;
     }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Outline.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Outline.php
index ae4c1da386..63ea6dee78 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Outline.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Outline.php
@@ -11,14 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Style;
 
 /**
- * Outline style writer
+ * Outline style writer.
  *
  * @since 0.12.0
  */
@@ -27,7 +27,7 @@ class Outline extends AbstractStyle
     /**
      * Write style.
      */
-    public function write()
+    public function write(): void
     {
         $style = $this->getStyle();
         if (!$style instanceof \PhpOffice\PhpWord\Style\Outline) {
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Paragraph.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Paragraph.php
index 8d113216cd..d4ec87a1ab 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Paragraph.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Paragraph.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -23,21 +23,21 @@
 use PhpOffice\PhpWord\Writer\Word2007\Element\ParagraphAlignment;
 
 /**
- * Paragraph style writer
+ * Paragraph style writer.
  *
  * @since 0.10.0
  */
 class Paragraph extends AbstractStyle
 {
     /**
-     * Without w:pPr
+     * Without w:pPr.
      *
      * @var bool
      */
     private $withoutPPR = false;
 
     /**
-     * Is inline in element
+     * Is inline in element.
      *
      * @var bool
      */
@@ -46,11 +46,11 @@ class Paragraph extends AbstractStyle
     /**
      * Write style.
      */
-    public function write()
+    public function write(): void
     {
         $xmlWriter = $this->getXmlWriter();
 
-        $isStyleName = $this->isInline && !is_null($this->style) && is_string($this->style);
+        $isStyleName = $this->isInline && null !== $this->style && is_string($this->style);
         if ($isStyleName) {
             if (!$this->withoutPPR) {
                 $xmlWriter->startElement('w:pPr');
@@ -69,7 +69,7 @@ public function write()
     /**
      * Write full style.
      */
-    private function writeStyle()
+    private function writeStyle(): void
     {
         $style = $this->getStyle();
         if (!$style instanceof ParagraphStyle) {
@@ -147,10 +147,9 @@ private function writeStyle()
     /**
      * Write tabs.
      *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Style\Tab[] $tabs
      */
-    private function writeTabs(XMLWriter $xmlWriter, $tabs)
+    private function writeTabs(XMLWriter $xmlWriter, $tabs): void
     {
         if (!empty($tabs)) {
             $xmlWriter->startElement('w:tabs');
@@ -165,10 +164,9 @@ private function writeTabs(XMLWriter $xmlWriter, $tabs)
     /**
      * Write numbering.
      *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
      * @param array $numbering
      */
-    private function writeNumbering(XMLWriter $xmlWriter, $numbering)
+    private function writeNumbering(XMLWriter $xmlWriter, $numbering): void
     {
         $numStyle = $numbering['style'];
         $numLevel = $numbering['level'];
@@ -196,7 +194,7 @@ private function writeNumbering(XMLWriter $xmlWriter, $numbering)
      *
      * @param bool $value
      */
-    public function setWithoutPPR($value)
+    public function setWithoutPPR($value): void
     {
         $this->withoutPPR = $value;
     }
@@ -206,7 +204,7 @@ public function setWithoutPPR($value)
      *
      * @param bool $value
      */
-    public function setIsInline($value)
+    public function setIsInline($value): void
     {
         $this->isInline = $value;
     }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Row.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Row.php
index 82028d24c4..7e1468e87b 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Row.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Row.php
@@ -11,14 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Style;
 
 /**
- * Row style writer
+ * Row style writer.
  *
  * @since 0.11.0
  */
@@ -32,7 +32,7 @@ class Row extends AbstractStyle
     /**
      * Write style.
      */
-    public function write()
+    public function write(): void
     {
         $style = $this->getStyle();
         if (!$style instanceof \PhpOffice\PhpWord\Style\Row) {
@@ -59,7 +59,7 @@ public function write()
      *
      * @param int $value
      */
-    public function setHeight($value = null)
+    public function setHeight($value = null): void
     {
         $this->height = $value;
     }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Section.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Section.php
index 1122b6ff76..3bdeafa4ab 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Section.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Section.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,7 +20,7 @@
 use PhpOffice\PhpWord\Style\Section as SectionStyle;
 
 /**
- * Section style writer
+ * Section style writer.
  *
  * @since 0.10.0
  */
@@ -29,7 +29,7 @@ class Section extends AbstractStyle
     /**
      * Write style.
      */
-    public function write()
+    public function write(): void
     {
         $style = $this->getStyle();
         if (!$style instanceof SectionStyle) {
@@ -39,7 +39,7 @@ public function write()
 
         // Break type
         $breakType = $style->getBreakType();
-        $xmlWriter->writeElementIf(!is_null($breakType), 'w:type', 'w:val', $breakType);
+        $xmlWriter->writeElementIf(null !== $breakType, 'w:type', 'w:val', $breakType);
 
         // Page size & orientation
         $xmlWriter->startElement('w:pgSz');
@@ -50,21 +50,21 @@ public function write()
 
         // Vertical alignment
         $vAlign = $style->getVAlign();
-        $xmlWriter->writeElementIf(!is_null($vAlign), 'w:vAlign', 'w:val', $vAlign);
+        $xmlWriter->writeElementIf(null !== $vAlign, 'w:vAlign', 'w:val', $vAlign);
 
         // Margins
-        $margins = array(
-            'w:top'    => array('getMarginTop', SectionStyle::DEFAULT_MARGIN),
-            'w:right'  => array('getMarginRight', SectionStyle::DEFAULT_MARGIN),
-            'w:bottom' => array('getMarginBottom', SectionStyle::DEFAULT_MARGIN),
-            'w:left'   => array('getMarginLeft', SectionStyle::DEFAULT_MARGIN),
-            'w:header' => array('getHeaderHeight', SectionStyle::DEFAULT_HEADER_HEIGHT),
-            'w:footer' => array('getFooterHeight', SectionStyle::DEFAULT_FOOTER_HEIGHT),
-            'w:gutter' => array('getGutter', SectionStyle::DEFAULT_GUTTER),
-        );
+        $margins = [
+            'w:top' => ['getMarginTop', SectionStyle::DEFAULT_MARGIN],
+            'w:right' => ['getMarginRight', SectionStyle::DEFAULT_MARGIN],
+            'w:bottom' => ['getMarginBottom', SectionStyle::DEFAULT_MARGIN],
+            'w:left' => ['getMarginLeft', SectionStyle::DEFAULT_MARGIN],
+            'w:header' => ['getHeaderHeight', SectionStyle::DEFAULT_HEADER_HEIGHT],
+            'w:footer' => ['getFooterHeight', SectionStyle::DEFAULT_FOOTER_HEIGHT],
+            'w:gutter' => ['getGutter', SectionStyle::DEFAULT_GUTTER],
+        ];
         $xmlWriter->startElement('w:pgMar');
         foreach ($margins as $attribute => $value) {
-            list($method, $default) = $value;
+            [$method, $default] = $value;
             $xmlWriter->writeAttribute($attribute, $this->convertTwip($style->$method(), $default));
         }
         $xmlWriter->endElement();
@@ -77,7 +77,7 @@ public function write()
             $styleWriter = new MarginBorder($xmlWriter);
             $styleWriter->setSizes($style->getBorderSize());
             $styleWriter->setColors($style->getBorderColor());
-            $styleWriter->setAttributes(array('space' => '24'));
+            $styleWriter->setAttributes(['space' => '24']);
             $styleWriter->write();
 
             $xmlWriter->endElement();
@@ -92,7 +92,7 @@ public function write()
 
         // Page numbering start
         $pageNum = $style->getPageNumberingStart();
-        $xmlWriter->writeElementIf(!is_null($pageNum), 'w:pgNumType', 'w:start', $pageNum);
+        $xmlWriter->writeElementIf(null !== $pageNum, 'w:pgNumType', 'w:start', $pageNum);
 
         // Line numbering
         $styleWriter = new LineNumbering($xmlWriter, $style->getLineNumbering());
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Shading.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Shading.php
index 0f9d6ccc08..97dbeeed0d 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Shading.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Shading.php
@@ -11,14 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Style;
 
 /**
- * Shading style writer
+ * Shading style writer.
  *
  * @since 0.10.0
  */
@@ -27,7 +27,7 @@ class Shading extends AbstractStyle
     /**
      * Write style.
      */
-    public function write()
+    public function write(): void
     {
         $style = $this->getStyle();
         if (!$style instanceof \PhpOffice\PhpWord\Style\Shading) {
@@ -36,9 +36,9 @@ public function write()
         $xmlWriter = $this->getXmlWriter();
 
         $xmlWriter->startElement('w:shd');
-        $xmlWriter->writeAttributeIf(!is_null($style->getPattern()), 'w:val', $style->getPattern());
-        $xmlWriter->writeAttributeIf(!is_null($style->getColor()), 'w:color', $style->getColor());
-        $xmlWriter->writeAttributeIf(!is_null($style->getFill()), 'w:fill', $style->getFill());
+        $xmlWriter->writeAttributeIf(null !== $style->getPattern(), 'w:val', $style->getPattern());
+        $xmlWriter->writeAttributeIf(null !== $style->getColor(), 'w:color', $style->getColor());
+        $xmlWriter->writeAttributeIf(null !== $style->getFill(), 'w:fill', $style->getFill());
         $xmlWriter->endElement();
     }
 }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Shadow.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Shadow.php
index 7fcb12a960..85ddab3b89 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Shadow.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Shadow.php
@@ -11,14 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Style;
 
 /**
- * Shadow style writer
+ * Shadow style writer.
  *
  * @since 0.12.0
  */
@@ -27,7 +27,7 @@ class Shadow extends AbstractStyle
     /**
      * Write style.
      */
-    public function write()
+    public function write(): void
     {
         $style = $this->getStyle();
         if (!$style instanceof \PhpOffice\PhpWord\Style\Shadow) {
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Shape.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Shape.php
index 2def6842a9..6e2a880eaf 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Shape.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Shape.php
@@ -11,14 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Style;
 
 /**
- * Shape style writer
+ * Shape style writer.
  *
  * @since 0.12.0
  */
@@ -27,7 +27,7 @@ class Shape extends AbstractStyle
     /**
      * Write style.
      */
-    public function write()
+    public function write(): void
     {
         $style = $this->getStyle();
         if (!$style instanceof \PhpOffice\PhpWord\Style\Shape) {
@@ -36,7 +36,7 @@ public function write()
 
         $xmlWriter = $this->getXmlWriter();
 
-        $childStyles = array('Frame', 'Fill', 'Outline', 'Shadow', 'Extrusion');
+        $childStyles = ['Frame', 'Fill', 'Outline', 'Shadow', 'Extrusion'];
         foreach ($childStyles as $childStyle) {
             $method = "get{$childStyle}";
             $this->writeChildStyle($xmlWriter, $childStyle, $style->$method());
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Spacing.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Spacing.php
index fdfb89ab87..3f4c632caa 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Spacing.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Spacing.php
@@ -11,14 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Style;
 
 /**
- * Spacing between lines and above/below paragraph style writer
+ * Spacing between lines and above/below paragraph style writer.
  *
  * @since 0.10.0
  */
@@ -27,7 +27,7 @@ class Spacing extends AbstractStyle
     /**
      * Write style.
      */
-    public function write()
+    public function write(): void
     {
         $style = $this->getStyle();
         if (!$style instanceof \PhpOffice\PhpWord\Style\Spacing) {
@@ -38,19 +38,19 @@ public function write()
         $xmlWriter->startElement('w:spacing');
 
         $before = $style->getBefore();
-        $xmlWriter->writeAttributeIf(!is_null($before), 'w:before', $this->convertTwip($before));
+        $xmlWriter->writeAttributeIf(null !== $before, 'w:before', $this->convertTwip($before));
 
         $after = $style->getAfter();
-        $xmlWriter->writeAttributeIf(!is_null($after), 'w:after', $this->convertTwip($after));
+        $xmlWriter->writeAttributeIf(null !== $after, 'w:after', $this->convertTwip($after));
 
         $line = $style->getLine();
         //if linerule is auto, the spacing is supposed to include the height of the line itself, which is 240 twips
         if (null !== $line && 'auto' === $style->getLineRule()) {
             $line += \PhpOffice\PhpWord\Style\Paragraph::LINE_HEIGHT;
         }
-        $xmlWriter->writeAttributeIf(!is_null($line), 'w:line', $line);
+        $xmlWriter->writeAttributeIf(null !== $line, 'w:line', $line);
 
-        $xmlWriter->writeAttributeIf(!is_null($line), 'w:lineRule', $style->getLineRule());
+        $xmlWriter->writeAttributeIf(null !== $line, 'w:lineRule', $style->getLineRule());
 
         $xmlWriter->endElement();
     }
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Tab.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Tab.php
index b41653f6c4..8e7b3e3559 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Tab.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Tab.php
@@ -11,14 +11,14 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Style;
 
 /**
- * Line numbering style writer
+ * Line numbering style writer.
  *
  * @since 0.10.0
  */
@@ -27,7 +27,7 @@ class Tab extends AbstractStyle
     /**
      * Write style.
      */
-    public function write()
+    public function write(): void
     {
         $style = $this->getStyle();
         if (!$style instanceof \PhpOffice\PhpWord\Style\Tab) {
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Table.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Table.php
index eb040e019e..05cec492ca 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Table.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/Table.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -23,7 +23,7 @@
 use PhpOffice\PhpWord\Writer\Word2007\Element\TableAlignment;
 
 /**
- * Table style writer
+ * Table style writer.
  *
  * @since 0.10.0
  */
@@ -37,7 +37,7 @@ class Table extends AbstractStyle
     /**
      * Write style.
      */
-    public function write()
+    public function write(): void
     {
         $style = $this->getStyle();
         $xmlWriter = $this->getXmlWriter();
@@ -58,11 +58,8 @@ public function write()
 
     /**
      * Write full style.
-     *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
-     * @param \PhpOffice\PhpWord\Style\Table $style
      */
-    private function writeStyle(XMLWriter $xmlWriter, TableStyle $style)
+    private function writeStyle(XMLWriter $xmlWriter, TableStyle $style): void
     {
         // w:tblPr
         $xmlWriter->startElement('w:tblPr');
@@ -104,12 +101,11 @@ private function writeStyle(XMLWriter $xmlWriter, TableStyle $style)
     }
 
     /**
-     * Enable/Disable automatic resizing of the table
+     * Enable/Disable automatic resizing of the table.
      *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
      * @param string $layout autofit / fixed
      */
-    private function writeLayout(XMLWriter $xmlWriter, $layout)
+    private function writeLayout(XMLWriter $xmlWriter, $layout): void
     {
         $xmlWriter->startElement('w:tblLayout');
         $xmlWriter->writeAttribute('w:type', $layout);
@@ -118,11 +114,8 @@ private function writeLayout(XMLWriter $xmlWriter, $layout)
 
     /**
      * Write margin.
-     *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
-     * @param \PhpOffice\PhpWord\Style\Table $style
      */
-    private function writeMargin(XMLWriter $xmlWriter, TableStyle $style)
+    private function writeMargin(XMLWriter $xmlWriter, TableStyle $style): void
     {
         if ($style->hasMargin()) {
             $xmlWriter->startElement('w:tblCellMar');
@@ -137,11 +130,8 @@ private function writeMargin(XMLWriter $xmlWriter, TableStyle $style)
 
     /**
      * Write border.
-     *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
-     * @param \PhpOffice\PhpWord\Style\Table $style
      */
-    private function writeBorder(XMLWriter $xmlWriter, TableStyle $style)
+    private function writeBorder(XMLWriter $xmlWriter, TableStyle $style): void
     {
         if ($style->hasBorder()) {
             $xmlWriter->startElement('w:tblBorders');
@@ -156,14 +146,13 @@ private function writeBorder(XMLWriter $xmlWriter, TableStyle $style)
     }
 
     /**
-     * Writes a table width
+     * Writes a table width.
      *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
      * @param string $elementName
      * @param string $unit
-     * @param int|float $width
+     * @param float|int $width
      */
-    private function writeTblWidth(XMLWriter $xmlWriter, $elementName, $unit, $width = null)
+    private function writeTblWidth(XMLWriter $xmlWriter, $elementName, $unit, $width = null): void
     {
         if (null === $width) {
             return;
@@ -176,11 +165,8 @@ private function writeTblWidth(XMLWriter $xmlWriter, $elementName, $unit, $width
 
     /**
      * Write row style.
-     *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
-     * @param \PhpOffice\PhpWord\Style\Table $style
      */
-    private function writeFirstRow(XMLWriter $xmlWriter, TableStyle $style)
+    private function writeFirstRow(XMLWriter $xmlWriter, TableStyle $style): void
     {
         $xmlWriter->startElement('w:tblStylePr');
         $xmlWriter->writeAttribute('w:type', 'firstRow');
@@ -195,11 +181,8 @@ private function writeFirstRow(XMLWriter $xmlWriter, TableStyle $style)
 
     /**
      * Write shading.
-     *
-     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
-     * @param \PhpOffice\PhpWord\Style\Table $style
      */
-    private function writeShading(XMLWriter $xmlWriter, TableStyle $style)
+    private function writeShading(XMLWriter $xmlWriter, TableStyle $style): void
     {
         if (null !== $style->getShading()) {
             $xmlWriter->startElement('w:tcPr');
@@ -216,16 +199,12 @@ private function writeShading(XMLWriter $xmlWriter, TableStyle $style)
      *
      * @param int $value
      */
-    public function setWidth($value = null)
+    public function setWidth($value = null): void
     {
         $this->width = $value;
     }
 
-    /**
-     * @param XMLWriter $xmlWriter
-     * @param TableStyle $style
-     */
-    private function writeIndent(XMLWriter $xmlWriter, TableStyle $style)
+    private function writeIndent(XMLWriter $xmlWriter, TableStyle $style): void
     {
         $indent = $style->getIndent();
 
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/TablePosition.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/TablePosition.php
index fa57b93c2f..f96bab58ba 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/TablePosition.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/TablePosition.php
@@ -11,40 +11,40 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Style;
 
 /**
- * TablePosition style writer
+ * TablePosition style writer.
  */
 class TablePosition extends AbstractStyle
 {
     /**
      * Write style.
      */
-    public function write()
+    public function write(): void
     {
         $style = $this->getStyle();
         if (!$style instanceof \PhpOffice\PhpWord\Style\TablePosition) {
             return;
         }
 
-        $values = array();
-        $properties = array(
-          'leftFromText',
-          'rightFromText',
-          'topFromText',
-          'bottomFromText',
-          'vertAnchor',
-          'horzAnchor',
-          'tblpXSpec',
-          'tblpX',
-          'tblpYSpec',
-          'tblpY',
-        );
+        $values = [];
+        $properties = [
+            'leftFromText',
+            'rightFromText',
+            'topFromText',
+            'bottomFromText',
+            'vertAnchor',
+            'horzAnchor',
+            'tblpXSpec',
+            'tblpX',
+            'tblpYSpec',
+            'tblpY',
+        ];
         foreach ($properties as $property) {
             $method = 'get' . $property;
             if (method_exists($style, $method)) {
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/TextBox.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/TextBox.php
index 627d0c86e5..d5ccf7a83b 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/TextBox.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/Word2007/Style/TextBox.php
@@ -2,16 +2,14 @@
 /**
  * This file is part of PHPWord - A pure PHP library for reading and writing
  * word processing documents.
- *
  * PHPWord is free software distributed under the terms of the GNU Lesser
  * General Public License version 3 as published by the Free Software Foundation.
- *
  * For the full copyright and license information, please read the LICENSE
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,7 +18,7 @@
 use PhpOffice\PhpWord\Style\TextBox as TextBoxStyle;
 
 /**
- * TextBox style writer
+ * TextBox style writer.
  *
  * @since 0.11.0
  */
@@ -29,7 +27,7 @@ class TextBox extends Frame
     /**
      * Writer inner margin.
      */
-    public function writeInnerMargin()
+    public function writeInnerMargin(): void
     {
         $style = $this->getStyle();
         if (!$style instanceof TextBoxStyle || !$style->hasInnerMargins()) {
@@ -45,7 +43,7 @@ public function writeInnerMargin()
     /**
      * Writer border.
      */
-    public function writeBorder()
+    public function writeBorder(): void
     {
         $style = $this->getStyle();
         if (!$style instanceof TextBoxStyle) {
diff --git a/vendor/phpoffice/phpword/src/PhpWord/Writer/WriterInterface.php b/vendor/phpoffice/phpword/src/PhpWord/Writer/WriterInterface.php
index 499cde3bb1..f205eed019 100644
--- a/vendor/phpoffice/phpword/src/PhpWord/Writer/WriterInterface.php
+++ b/vendor/phpoffice/phpword/src/PhpWord/Writer/WriterInterface.php
@@ -11,21 +11,19 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
+ *
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer;
 
 /**
- * Writer interface
+ * Writer interface.
  */
 interface WriterInterface
 {
     /**
-     * Save PhpWord to file
-     *
-     * @param string $filename
+     * Save PhpWord to file.
      */
-    public function save($filename = null);
+    public function save(string $filename): void;
 }
diff --git a/vendor/phpseclib/phpseclib/BACKERS.md b/vendor/phpseclib/phpseclib/BACKERS.md
index 4ee6a4f9b4..946b8f5f04 100644
--- a/vendor/phpseclib/phpseclib/BACKERS.md
+++ b/vendor/phpseclib/phpseclib/BACKERS.md
@@ -13,4 +13,6 @@ phpseclib ongoing development is made possible by [Tidelift](https://tidelift.co
 - [Rachel Fish](https://github.com/itsrachelfish)
 - Tharyrok
 - [cjhaas](https://github.com/cjhaas)
-- [istiak-tridip](https://github.com/istiak-tridip)
\ No newline at end of file
+- [istiak-tridip](https://github.com/istiak-tridip)
+- [Anna Filina](https://github.com/afilina)
+- [blakemckeeby](https://github.com/blakemckeeby)
\ No newline at end of file
diff --git a/vendor/phpseclib/phpseclib/README.md b/vendor/phpseclib/phpseclib/README.md
index bbb1e9f063..37cbcb9d56 100644
--- a/vendor/phpseclib/phpseclib/README.md
+++ b/vendor/phpseclib/phpseclib/README.md
@@ -51,7 +51,7 @@ SSH-2, SFTP, X.509, an arbitrary-precision integer arithmetic library, Ed25519 /
 * PHP4 compatible
 * Composer compatible (PSR-0 autoloading)
 * Install using Composer: `composer require phpseclib/phpseclib:~1.0`
-* [Download 1.0.21 as ZIP](http://sourceforge.net/projects/phpseclib/files/phpseclib1.0.21.zip/download)
+* [Download 1.0.23 as ZIP](http://sourceforge.net/projects/phpseclib/files/phpseclib1.0.23.zip/download)
 
 ## Security contact information
 
diff --git a/vendor/phpseclib/phpseclib/composer.json b/vendor/phpseclib/phpseclib/composer.json
index 5052d5fb2c..d996700e2b 100644
--- a/vendor/phpseclib/phpseclib/composer.json
+++ b/vendor/phpseclib/phpseclib/composer.json
@@ -52,7 +52,7 @@
     ],
     "require": {
         "php": ">=5.6.1",
-        "paragonie/constant_time_encoding": "^1|^2",
+        "paragonie/constant_time_encoding": "^1|^2|^3",
         "paragonie/random_compat": "^1.4|^2.0|^9.99.99"
     },
     "require-dev": {
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Common/Functions/Strings.php b/vendor/phpseclib/phpseclib/phpseclib/Common/Functions/Strings.php
index eac793a694..fa750ba28d 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Common/Functions/Strings.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Common/Functions/Strings.php
@@ -473,7 +473,7 @@ public static function base64url_encode($data)
         // return str_replace(['+', '/'], ['-', '_'], self::base64_encode($data));
 
         return function_exists('sodium_bin2base64') ?
-            sodium_bin2base64($data, SODIUM_BASE64_VARIANT_URLSAFE) :
+            sodium_bin2base64($data, SODIUM_BASE64_VARIANT_URLSAFE_NO_PADDING) :
             Base64UrlSafe::encode($data);
     }
 
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/Blowfish.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/Blowfish.php
index 1225070894..3cb2b3055e 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/Blowfish.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/Blowfish.php
@@ -151,13 +151,13 @@ class Blowfish extends BlockCipher
     protected $cfb_init_len = 500;
 
     /**
-     * The fixed subkeys boxes ($sbox0 - $sbox3) with 256 entries each
+     * The fixed subkeys boxes
      *
-     * S-Box 0
+     * S-Box
      *
      * @var    array
      */
-    private static $sbox0 = [
+    private static $sbox = [
         0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7, 0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
         0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16, 0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
         0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee, 0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
@@ -189,15 +189,8 @@ class Blowfish extends BlockCipher
         0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa, 0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5,
         0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41, 0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
         0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400, 0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915,
-        0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664, 0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a
-    ];
+        0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664, 0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a,
 
-    /**
-     * S-Box 1
-     *
-     * @var    array
-     */
-    private static $sbox1 = [
         0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623, 0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266,
         0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1, 0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e,
         0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6, 0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
@@ -229,15 +222,8 @@ class Blowfish extends BlockCipher
         0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb, 0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e,
         0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735, 0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
         0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9, 0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340,
-        0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20, 0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7
-    ];
+        0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20, 0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7,
 
-    /**
-     * S-Box 2
-     *
-     * @var    array
-     */
-    private static $sbox2 = [
         0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934, 0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
         0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af, 0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840,
         0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45, 0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,
@@ -269,15 +255,8 @@ class Blowfish extends BlockCipher
         0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634, 0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76,
         0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24, 0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc,
         0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4, 0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,
-        0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837, 0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0
-    ];
+        0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837, 0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0,
 
-    /**
-     * S-Box 3
-     *
-     * @var    array
-     */
-    private static $sbox3 = [
         0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b, 0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe,
         0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b, 0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4,
         0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8, 0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,
@@ -428,12 +407,7 @@ protected function setupKey()
         /* key-expanding p[] and S-Box building sb[] */
         $this->bctx = [
             'p'  => [],
-            'sb' => [
-                self::$sbox0,
-                self::$sbox1,
-                self::$sbox2,
-                self::$sbox3
-            ]
+            'sb' => self::$sbox
         ];
 
         // unpack binary string in unsigned chars
@@ -459,11 +433,11 @@ protected function setupKey()
             $this->bctx['p'][$i    ] = $l;
             $this->bctx['p'][$i + 1] = $r;
         }
-        for ($i = 0; $i < 4; ++$i) {
+        for ($i = 0; $i < 0x400; $i += 0x100) {
             for ($j = 0; $j < 256; $j += 2) {
                 list($l, $r) = array_values(unpack('N*', $data = $this->encryptBlock($data)));
-                $this->bctx['sb'][$i][$j    ] = $l;
-                $this->bctx['sb'][$i][$j + 1] = $r;
+                $this->bctx['sb'][$i | $j] = $l;
+                $this->bctx['sb'][$i | ($j + 1)] = $r;
             }
         }
     }
@@ -473,11 +447,8 @@ protected function setupKey()
      */
     protected static function initialize_static_variables()
     {
-        if (is_float(self::$sbox2[0])) {
-            self::$sbox0 = array_map('intval', self::$sbox0);
-            self::$sbox1 = array_map('intval', self::$sbox1);
-            self::$sbox2 = array_map('intval', self::$sbox2);
-            self::$sbox3 = array_map('intval', self::$sbox3);
+        if (is_float(self::$sbox[0x200])) {
+            self::$sbox = array_map('intval', self::$sbox);
             self::$parray = array_map('intval', self::$parray);
         }
 
@@ -495,28 +466,25 @@ protected static function initialize_static_variables()
     private static function bcrypt_hash($sha2pass, $sha2salt)
     {
         $p = self::$parray;
-        $sbox0 = self::$sbox0;
-        $sbox1 = self::$sbox1;
-        $sbox2 = self::$sbox2;
-        $sbox3 = self::$sbox3;
+        $sbox = self::$sbox;
 
         $cdata = array_values(unpack('N*', 'OxychromaticBlowfishSwatDynamite'));
         $sha2pass = array_values(unpack('N*', $sha2pass));
         $sha2salt = array_values(unpack('N*', $sha2salt));
 
-        self::expandstate($sha2salt, $sha2pass, $sbox0, $sbox1, $sbox2, $sbox3, $p);
+        self::expandstate($sha2salt, $sha2pass, $sbox, $p);
         for ($i = 0; $i < 64; $i++) {
-            self::expand0state($sha2salt, $sbox0, $sbox1, $sbox2, $sbox3, $p);
-            self::expand0state($sha2pass, $sbox0, $sbox1, $sbox2, $sbox3, $p);
+            self::expand0state($sha2salt, $sbox, $p);
+            self::expand0state($sha2pass, $sbox, $p);
         }
 
         for ($i = 0; $i < 64; $i++) {
             for ($j = 0; $j < 8; $j += 2) { // count($cdata) == 8
-                list($cdata[$j], $cdata[$j + 1]) = self::encryptBlockHelperFast($cdata[$j], $cdata[$j + 1], $sbox0, $sbox1, $sbox2, $sbox3, $p);
+                list($cdata[$j], $cdata[$j + 1]) = self::encryptBlockHelperFast($cdata[$j], $cdata[$j + 1], $sbox, $p);
             }
         }
 
-        return pack('L*', ...$cdata);
+        return pack('V*', ...$cdata);
     }
 
     /**
@@ -565,14 +533,11 @@ public static function bcrypt_pbkdf($pass, $salt, $keylen, $rounds)
      *
      * @access private
      * @param int[] $key
-     * @param int[] $sbox0
-     * @param int[] $sbox1
-     * @param int[] $sbox2
-     * @param int[] $sbox3
+     * @param int[] $sbox
      * @param int[] $p
      * @see self::_bcrypt_hash()
      */
-    private static function expand0state(array $key, array &$sbox0, array &$sbox1, array &$sbox2, array &$sbox3, array &$p)
+    private static function expand0state(array $key, array &$sbox, array &$p)
     {
         // expand0state is basically the same thing as this:
         //return self::expandstate(array_fill(0, 16, 0), $key);
@@ -600,35 +565,20 @@ private static function expand0state(array $key, array &$sbox0, array &$sbox1, a
         ];
 
         // @codingStandardsIgnoreStart
-        list( $p[0],  $p[1]) = self::encryptBlockHelperFast(     0,      0, $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        list( $p[2],  $p[3]) = self::encryptBlockHelperFast($p[ 0], $p[ 1], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        list( $p[4],  $p[5]) = self::encryptBlockHelperFast($p[ 2], $p[ 3], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        list( $p[6],  $p[7]) = self::encryptBlockHelperFast($p[ 4], $p[ 5], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        list( $p[8],  $p[9]) = self::encryptBlockHelperFast($p[ 6], $p[ 7], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        list($p[10], $p[11]) = self::encryptBlockHelperFast($p[ 8], $p[ 9], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        list($p[12], $p[13]) = self::encryptBlockHelperFast($p[10], $p[11], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        list($p[14], $p[15]) = self::encryptBlockHelperFast($p[12], $p[13], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        list($p[16], $p[17]) = self::encryptBlockHelperFast($p[14], $p[15], $sbox0, $sbox1, $sbox2, $sbox3, $p);
+        list( $p[0],  $p[1]) = self::encryptBlockHelperFast(     0,      0, $sbox, $p);
+        list( $p[2],  $p[3]) = self::encryptBlockHelperFast($p[ 0], $p[ 1], $sbox, $p);
+        list( $p[4],  $p[5]) = self::encryptBlockHelperFast($p[ 2], $p[ 3], $sbox, $p);
+        list( $p[6],  $p[7]) = self::encryptBlockHelperFast($p[ 4], $p[ 5], $sbox, $p);
+        list( $p[8],  $p[9]) = self::encryptBlockHelperFast($p[ 6], $p[ 7], $sbox, $p);
+        list($p[10], $p[11]) = self::encryptBlockHelperFast($p[ 8], $p[ 9], $sbox, $p);
+        list($p[12], $p[13]) = self::encryptBlockHelperFast($p[10], $p[11], $sbox, $p);
+        list($p[14], $p[15]) = self::encryptBlockHelperFast($p[12], $p[13], $sbox, $p);
+        list($p[16], $p[17]) = self::encryptBlockHelperFast($p[14], $p[15], $sbox, $p);
         // @codingStandardsIgnoreEnd
 
-        list($sbox0[0], $sbox0[1]) = self::encryptBlockHelperFast($p[16], $p[17], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        for ($i = 2; $i < 256; $i += 2) {
-            list($sbox0[$i], $sbox0[$i + 1]) = self::encryptBlockHelperFast($sbox0[$i - 2], $sbox0[$i - 1], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        }
-
-        list($sbox1[0], $sbox1[1]) = self::encryptBlockHelperFast($sbox0[254], $sbox0[255], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        for ($i = 2; $i < 256; $i += 2) {
-            list($sbox1[$i], $sbox1[$i + 1]) = self::encryptBlockHelperFast($sbox1[$i - 2], $sbox1[$i - 1], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        }
-
-        list($sbox2[0], $sbox2[1]) = self::encryptBlockHelperFast($sbox1[254], $sbox1[255], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        for ($i = 2; $i < 256; $i += 2) {
-            list($sbox2[$i], $sbox2[$i + 1]) = self::encryptBlockHelperFast($sbox2[$i - 2], $sbox2[$i - 1], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        }
-
-        list($sbox3[0], $sbox3[1]) = self::encryptBlockHelperFast($sbox2[254], $sbox2[255], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        for ($i = 2; $i < 256; $i += 2) {
-            list($sbox3[$i], $sbox3[$i + 1]) = self::encryptBlockHelperFast($sbox3[$i - 2], $sbox3[$i - 1], $sbox0, $sbox1, $sbox2, $sbox3, $p);
+        list($sbox[0], $sbox[1]) = self::encryptBlockHelperFast($p[16], $p[17], $sbox, $p);
+        for ($i = 2; $i < 1024; $i += 2) {
+            list($sbox[$i], $sbox[$i + 1]) = self::encryptBlockHelperFast($sbox[$i - 2], $sbox[$i - 1], $sbox, $p);
         }
     }
 
@@ -638,14 +588,11 @@ private static function expand0state(array $key, array &$sbox0, array &$sbox1, a
      * @access private
      * @param int[] $data
      * @param int[] $key
-     * @param int[] $sbox0
-     * @param int[] $sbox1
-     * @param int[] $sbox2
-     * @param int[] $sbox3
+     * @param int[] $sbox
      * @param int[] $p
      * @see self::_bcrypt_hash()
      */
-    private static function expandstate(array $data, array $key, array &$sbox0, array &$sbox1, array &$sbox2, array &$sbox3, array &$p)
+    private static function expandstate(array $data, array $key, array &$sbox, array &$p)
     {
         $p = [
             $p[0] ^ $key[0],
@@ -669,35 +616,20 @@ private static function expandstate(array $data, array $key, array &$sbox0, arra
         ];
 
         // @codingStandardsIgnoreStart
-        list( $p[0],  $p[1]) = self::encryptBlockHelperFast($data[ 0]         , $data[ 1]         , $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        list( $p[2],  $p[3]) = self::encryptBlockHelperFast($data[ 2] ^ $p[ 0], $data[ 3] ^ $p[ 1], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        list( $p[4],  $p[5]) = self::encryptBlockHelperFast($data[ 4] ^ $p[ 2], $data[ 5] ^ $p[ 3], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        list( $p[6],  $p[7]) = self::encryptBlockHelperFast($data[ 6] ^ $p[ 4], $data[ 7] ^ $p[ 5], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        list( $p[8],  $p[9]) = self::encryptBlockHelperFast($data[ 8] ^ $p[ 6], $data[ 9] ^ $p[ 7], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        list($p[10], $p[11]) = self::encryptBlockHelperFast($data[10] ^ $p[ 8], $data[11] ^ $p[ 9], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        list($p[12], $p[13]) = self::encryptBlockHelperFast($data[12] ^ $p[10], $data[13] ^ $p[11], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        list($p[14], $p[15]) = self::encryptBlockHelperFast($data[14] ^ $p[12], $data[15] ^ $p[13], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        list($p[16], $p[17]) = self::encryptBlockHelperFast($data[ 0] ^ $p[14], $data[ 1] ^ $p[15], $sbox0, $sbox1, $sbox2, $sbox3, $p);
+        list( $p[0],  $p[1]) = self::encryptBlockHelperFast($data[ 0]         , $data[ 1]         , $sbox, $p);
+        list( $p[2],  $p[3]) = self::encryptBlockHelperFast($data[ 2] ^ $p[ 0], $data[ 3] ^ $p[ 1], $sbox, $p);
+        list( $p[4],  $p[5]) = self::encryptBlockHelperFast($data[ 4] ^ $p[ 2], $data[ 5] ^ $p[ 3], $sbox, $p);
+        list( $p[6],  $p[7]) = self::encryptBlockHelperFast($data[ 6] ^ $p[ 4], $data[ 7] ^ $p[ 5], $sbox, $p);
+        list( $p[8],  $p[9]) = self::encryptBlockHelperFast($data[ 8] ^ $p[ 6], $data[ 9] ^ $p[ 7], $sbox, $p);
+        list($p[10], $p[11]) = self::encryptBlockHelperFast($data[10] ^ $p[ 8], $data[11] ^ $p[ 9], $sbox, $p);
+        list($p[12], $p[13]) = self::encryptBlockHelperFast($data[12] ^ $p[10], $data[13] ^ $p[11], $sbox, $p);
+        list($p[14], $p[15]) = self::encryptBlockHelperFast($data[14] ^ $p[12], $data[15] ^ $p[13], $sbox, $p);
+        list($p[16], $p[17]) = self::encryptBlockHelperFast($data[ 0] ^ $p[14], $data[ 1] ^ $p[15], $sbox, $p);
         // @codingStandardsIgnoreEnd
 
-        list($sbox0[0], $sbox0[1]) = self::encryptBlockHelperFast($data[2] ^ $p[16], $data[3] ^ $p[17], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        for ($i = 2, $j = 4; $i < 256; $i += 2, $j = ($j + 2) % 16) { // instead of 16 maybe count($data) would be better?
-            list($sbox0[$i], $sbox0[$i + 1]) = self::encryptBlockHelperFast($data[$j] ^ $sbox0[$i - 2], $data[$j + 1] ^ $sbox0[$i - 1], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        }
-
-        list($sbox1[0], $sbox1[1]) = self::encryptBlockHelperFast($data[2] ^ $sbox0[254], $data[3] ^ $sbox0[255], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        for ($i = 2, $j = 4; $i < 256; $i += 2, $j = ($j + 2) % 16) {
-            list($sbox1[$i], $sbox1[$i + 1]) = self::encryptBlockHelperFast($data[$j] ^ $sbox1[$i - 2], $data[$j + 1] ^ $sbox1[$i - 1], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        }
-
-        list($sbox2[0], $sbox2[1]) = self::encryptBlockHelperFast($data[2] ^ $sbox1[254], $data[3] ^ $sbox1[255], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        for ($i = 2, $j = 4; $i < 256; $i += 2, $j = ($j + 2) % 16) {
-            list($sbox2[$i], $sbox2[$i + 1]) = self::encryptBlockHelperFast($data[$j] ^ $sbox2[$i - 2], $data[$j + 1] ^ $sbox2[$i - 1], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        }
-
-        list($sbox3[0], $sbox3[1]) = self::encryptBlockHelperFast($data[2] ^ $sbox2[254], $data[3] ^ $sbox2[255], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        for ($i = 2, $j = 4; $i < 256; $i += 2, $j = ($j + 2) % 16) {
-            list($sbox3[$i], $sbox3[$i + 1]) = self::encryptBlockHelperFast($data[$j] ^ $sbox3[$i - 2], $data[$j + 1] ^ $sbox3[$i - 1], $sbox0, $sbox1, $sbox2, $sbox3, $p);
+        list($sbox[0], $sbox[1]) = self::encryptBlockHelperFast($data[2] ^ $p[16], $data[3] ^ $p[17], $sbox, $p);
+        for ($i = 2, $j = 4; $i < 1024; $i += 2, $j = ($j + 2) % 16) { // instead of 16 maybe count($data) would be better?
+            list($sbox[$i], $sbox[$i + 1]) = self::encryptBlockHelperFast($data[$j] ^ $sbox[$i - 2], $data[$j + 1] ^ $sbox[$i - 1], $sbox, $p);
         }
     }
 
@@ -711,18 +643,15 @@ protected function encryptBlock($in)
     {
         $p = $this->bctx['p'];
         // extract($this->bctx['sb'], EXTR_PREFIX_ALL, 'sb'); // slower
-        $sb_0 = $this->bctx['sb'][0];
-        $sb_1 = $this->bctx['sb'][1];
-        $sb_2 = $this->bctx['sb'][2];
-        $sb_3 = $this->bctx['sb'][3];
+        $sb = $this->bctx['sb'];
 
         $in = unpack('N*', $in);
         $l = $in[1];
         $r = $in[2];
 
         list($r, $l) = PHP_INT_SIZE == 4 ?
-            self::encryptBlockHelperSlow($l, $r, $sb_0, $sb_1, $sb_2, $sb_3, $p) :
-            self::encryptBlockHelperFast($l, $r, $sb_0, $sb_1, $sb_2, $sb_3, $p);
+            self::encryptBlockHelperSlow($l, $r, $sb, $p) :
+            self::encryptBlockHelperFast($l, $r, $sb, $p);
 
         return pack("N*", $r, $l);
     }
@@ -733,32 +662,29 @@ protected function encryptBlock($in)
      * @access private
      * @param int $x0
      * @param int $x1
-     * @param int[] $sbox0
-     * @param int[] $sbox1
-     * @param int[] $sbox2
-     * @param int[] $sbox3
+     * @param int[] $sbox
      * @param int[] $p
      * @return int[]
      */
-    private static function encryptBlockHelperFast($x0, $x1, array $sbox0, array $sbox1, array $sbox2, array $sbox3, array $p)
+    private static function encryptBlockHelperFast($x0, $x1, array $sbox, array $p)
     {
         $x0 ^= $p[0];
-        $x1 ^= ((($sbox0[($x0 & 0xFF000000) >> 24] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[1];
-        $x0 ^= ((($sbox0[($x1 & 0xFF000000) >> 24] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[2];
-        $x1 ^= ((($sbox0[($x0 & 0xFF000000) >> 24] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[3];
-        $x0 ^= ((($sbox0[($x1 & 0xFF000000) >> 24] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[4];
-        $x1 ^= ((($sbox0[($x0 & 0xFF000000) >> 24] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[5];
-        $x0 ^= ((($sbox0[($x1 & 0xFF000000) >> 24] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[6];
-        $x1 ^= ((($sbox0[($x0 & 0xFF000000) >> 24] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[7];
-        $x0 ^= ((($sbox0[($x1 & 0xFF000000) >> 24] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[8];
-        $x1 ^= ((($sbox0[($x0 & 0xFF000000) >> 24] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[9];
-        $x0 ^= ((($sbox0[($x1 & 0xFF000000) >> 24] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[10];
-        $x1 ^= ((($sbox0[($x0 & 0xFF000000) >> 24] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[11];
-        $x0 ^= ((($sbox0[($x1 & 0xFF000000) >> 24] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[12];
-        $x1 ^= ((($sbox0[($x0 & 0xFF000000) >> 24] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[13];
-        $x0 ^= ((($sbox0[($x1 & 0xFF000000) >> 24] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[14];
-        $x1 ^= ((($sbox0[($x0 & 0xFF000000) >> 24] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[15];
-        $x0 ^= ((($sbox0[($x1 & 0xFF000000) >> 24] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[16];
+        $x1 ^= ((($sbox[($x0 & 0xFF000000) >> 24] + $sbox[0x100 | (($x0 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x0 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x0 & 0xFF)]) ^ $p[1];
+        $x0 ^= ((($sbox[($x1 & 0xFF000000) >> 24] + $sbox[0x100 | (($x1 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x1 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x1 & 0xFF)]) ^ $p[2];
+        $x1 ^= ((($sbox[($x0 & 0xFF000000) >> 24] + $sbox[0x100 | (($x0 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x0 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x0 & 0xFF)]) ^ $p[3];
+        $x0 ^= ((($sbox[($x1 & 0xFF000000) >> 24] + $sbox[0x100 | (($x1 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x1 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x1 & 0xFF)]) ^ $p[4];
+        $x1 ^= ((($sbox[($x0 & 0xFF000000) >> 24] + $sbox[0x100 | (($x0 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x0 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x0 & 0xFF)]) ^ $p[5];
+        $x0 ^= ((($sbox[($x1 & 0xFF000000) >> 24] + $sbox[0x100 | (($x1 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x1 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x1 & 0xFF)]) ^ $p[6];
+        $x1 ^= ((($sbox[($x0 & 0xFF000000) >> 24] + $sbox[0x100 | (($x0 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x0 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x0 & 0xFF)]) ^ $p[7];
+        $x0 ^= ((($sbox[($x1 & 0xFF000000) >> 24] + $sbox[0x100 | (($x1 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x1 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x1 & 0xFF)]) ^ $p[8];
+        $x1 ^= ((($sbox[($x0 & 0xFF000000) >> 24] + $sbox[0x100 | (($x0 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x0 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x0 & 0xFF)]) ^ $p[9];
+        $x0 ^= ((($sbox[($x1 & 0xFF000000) >> 24] + $sbox[0x100 | (($x1 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x1 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x1 & 0xFF)]) ^ $p[10];
+        $x1 ^= ((($sbox[($x0 & 0xFF000000) >> 24] + $sbox[0x100 | (($x0 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x0 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x0 & 0xFF)]) ^ $p[11];
+        $x0 ^= ((($sbox[($x1 & 0xFF000000) >> 24] + $sbox[0x100 | (($x1 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x1 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x1 & 0xFF)]) ^ $p[12];
+        $x1 ^= ((($sbox[($x0 & 0xFF000000) >> 24] + $sbox[0x100 | (($x0 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x0 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x0 & 0xFF)]) ^ $p[13];
+        $x0 ^= ((($sbox[($x1 & 0xFF000000) >> 24] + $sbox[0x100 | (($x1 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x1 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x1 & 0xFF)]) ^ $p[14];
+        $x1 ^= ((($sbox[($x0 & 0xFF000000) >> 24] + $sbox[0x100 | (($x0 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x0 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x0 & 0xFF)]) ^ $p[15];
+        $x0 ^= ((($sbox[($x1 & 0xFF000000) >> 24] + $sbox[0x100 | (($x1 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x1 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x1 & 0xFF)]) ^ $p[16];
 
         return [$x1 & 0xFFFFFFFF ^ $p[17], $x0 & 0xFFFFFFFF];
     }
@@ -769,33 +695,30 @@ private static function encryptBlockHelperFast($x0, $x1, array $sbox0, array $sb
      * @access private
      * @param int $x0
      * @param int $x1
-     * @param int[] $sbox0
-     * @param int[] $sbox1
-     * @param int[] $sbox2
-     * @param int[] $sbox3
+     * @param int[] $sbox
      * @param int[] $p
      * @return int[]
      */
-    private static function encryptBlockHelperSlow($x0, $x1, array $sbox0, array $sbox1, array $sbox2, array $sbox3, array $p)
+    private static function encryptBlockHelperSlow($x0, $x1, array $sbox, array $p)
     {
         // -16777216 == intval(0xFF000000) on 32-bit PHP installs
         $x0 ^= $p[0];
-        $x1 ^= self::safe_intval((self::safe_intval($sbox0[(($x0 & -16777216) >> 24) & 0xFF] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[1];
-        $x0 ^= self::safe_intval((self::safe_intval($sbox0[(($x1 & -16777216) >> 24) & 0xFF] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[2];
-        $x1 ^= self::safe_intval((self::safe_intval($sbox0[(($x0 & -16777216) >> 24) & 0xFF] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[3];
-        $x0 ^= self::safe_intval((self::safe_intval($sbox0[(($x1 & -16777216) >> 24) & 0xFF] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[4];
-        $x1 ^= self::safe_intval((self::safe_intval($sbox0[(($x0 & -16777216) >> 24) & 0xFF] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[5];
-        $x0 ^= self::safe_intval((self::safe_intval($sbox0[(($x1 & -16777216) >> 24) & 0xFF] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[6];
-        $x1 ^= self::safe_intval((self::safe_intval($sbox0[(($x0 & -16777216) >> 24) & 0xFF] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[7];
-        $x0 ^= self::safe_intval((self::safe_intval($sbox0[(($x1 & -16777216) >> 24) & 0xFF] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[8];
-        $x1 ^= self::safe_intval((self::safe_intval($sbox0[(($x0 & -16777216) >> 24) & 0xFF] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[9];
-        $x0 ^= self::safe_intval((self::safe_intval($sbox0[(($x1 & -16777216) >> 24) & 0xFF] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[10];
-        $x1 ^= self::safe_intval((self::safe_intval($sbox0[(($x0 & -16777216) >> 24) & 0xFF] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[11];
-        $x0 ^= self::safe_intval((self::safe_intval($sbox0[(($x1 & -16777216) >> 24) & 0xFF] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[12];
-        $x1 ^= self::safe_intval((self::safe_intval($sbox0[(($x0 & -16777216) >> 24) & 0xFF] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[13];
-        $x0 ^= self::safe_intval((self::safe_intval($sbox0[(($x1 & -16777216) >> 24) & 0xFF] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[14];
-        $x1 ^= self::safe_intval((self::safe_intval($sbox0[(($x0 & -16777216) >> 24) & 0xFF] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[15];
-        $x0 ^= self::safe_intval((self::safe_intval($sbox0[(($x1 & -16777216) >> 24) & 0xFF] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[16];
+        $x1 ^= self::safe_intval((self::safe_intval($sbox[(($x0 & -16777216) >> 24) & 0xFF] + $sbox[0x100 | (($x0 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x0 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x0 & 0xFF)]) ^ $p[1];
+        $x0 ^= self::safe_intval((self::safe_intval($sbox[(($x1 & -16777216) >> 24) & 0xFF] + $sbox[0x100 | (($x1 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x1 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x1 & 0xFF)]) ^ $p[2];
+        $x1 ^= self::safe_intval((self::safe_intval($sbox[(($x0 & -16777216) >> 24) & 0xFF] + $sbox[0x100 | (($x0 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x0 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x0 & 0xFF)]) ^ $p[3];
+        $x0 ^= self::safe_intval((self::safe_intval($sbox[(($x1 & -16777216) >> 24) & 0xFF] + $sbox[0x100 | (($x1 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x1 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x1 & 0xFF)]) ^ $p[4];
+        $x1 ^= self::safe_intval((self::safe_intval($sbox[(($x0 & -16777216) >> 24) & 0xFF] + $sbox[0x100 | (($x0 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x0 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x0 & 0xFF)]) ^ $p[5];
+        $x0 ^= self::safe_intval((self::safe_intval($sbox[(($x1 & -16777216) >> 24) & 0xFF] + $sbox[0x100 | (($x1 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x1 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x1 & 0xFF)]) ^ $p[6];
+        $x1 ^= self::safe_intval((self::safe_intval($sbox[(($x0 & -16777216) >> 24) & 0xFF] + $sbox[0x100 | (($x0 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x0 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x0 & 0xFF)]) ^ $p[7];
+        $x0 ^= self::safe_intval((self::safe_intval($sbox[(($x1 & -16777216) >> 24) & 0xFF] + $sbox[0x100 | (($x1 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x1 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x1 & 0xFF)]) ^ $p[8];
+        $x1 ^= self::safe_intval((self::safe_intval($sbox[(($x0 & -16777216) >> 24) & 0xFF] + $sbox[0x100 | (($x0 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x0 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x0 & 0xFF)]) ^ $p[9];
+        $x0 ^= self::safe_intval((self::safe_intval($sbox[(($x1 & -16777216) >> 24) & 0xFF] + $sbox[0x100 | (($x1 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x1 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x1 & 0xFF)]) ^ $p[10];
+        $x1 ^= self::safe_intval((self::safe_intval($sbox[(($x0 & -16777216) >> 24) & 0xFF] + $sbox[0x100 | (($x0 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x0 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x0 & 0xFF)]) ^ $p[11];
+        $x0 ^= self::safe_intval((self::safe_intval($sbox[(($x1 & -16777216) >> 24) & 0xFF] + $sbox[0x100 | (($x1 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x1 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x1 & 0xFF)]) ^ $p[12];
+        $x1 ^= self::safe_intval((self::safe_intval($sbox[(($x0 & -16777216) >> 24) & 0xFF] + $sbox[0x100 | (($x0 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x0 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x0 & 0xFF)]) ^ $p[13];
+        $x0 ^= self::safe_intval((self::safe_intval($sbox[(($x1 & -16777216) >> 24) & 0xFF] + $sbox[0x100 | (($x1 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x1 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x1 & 0xFF)]) ^ $p[14];
+        $x1 ^= self::safe_intval((self::safe_intval($sbox[(($x0 & -16777216) >> 24) & 0xFF] + $sbox[0x100 | (($x0 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x0 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x0 & 0xFF)]) ^ $p[15];
+        $x0 ^= self::safe_intval((self::safe_intval($sbox[(($x1 & -16777216) >> 24) & 0xFF] + $sbox[0x100 | (($x1 & 0xFF0000) >> 16)]) ^ $sbox[0x200 | (($x1 & 0xFF00) >> 8)]) + $sbox[0x300 | ($x1 & 0xFF)]) ^ $p[16];
 
         return [$x1 ^ $p[17], $x0];
     }
@@ -809,10 +732,7 @@ private static function encryptBlockHelperSlow($x0, $x1, array $sbox0, array $sb
     protected function decryptBlock($in)
     {
         $p = $this->bctx['p'];
-        $sb_0 = $this->bctx['sb'][0];
-        $sb_1 = $this->bctx['sb'][1];
-        $sb_2 = $this->bctx['sb'][2];
-        $sb_3 = $this->bctx['sb'][3];
+        $sb = $this->bctx['sb'];
 
         $in = unpack('N*', $in);
         $l = $in[1];
@@ -820,14 +740,14 @@ protected function decryptBlock($in)
 
         for ($i = 17; $i > 2; $i -= 2) {
             $l ^= $p[$i];
-            $r ^= self::safe_intval((self::safe_intval($sb_0[$l >> 24 & 0xff] + $sb_1[$l >> 16 & 0xff]) ^
-                  $sb_2[$l >>  8 & 0xff]) +
-                  $sb_3[$l       & 0xff]);
+            $r ^= self::safe_intval((self::safe_intval($sb[$l >> 24 & 0xff] + $sb[0x100 + ($l >> 16 & 0xff)]) ^
+                  $sb[0x200 + ($l >>  8 & 0xff)]) +
+                  $sb[0x300 + ($l       & 0xff)]);
 
             $r ^= $p[$i - 1];
-            $l ^= self::safe_intval((self::safe_intval($sb_0[$r >> 24 & 0xff] + $sb_1[$r >> 16 & 0xff]) ^
-                  $sb_2[$r >>  8 & 0xff]) +
-                  $sb_3[$r       & 0xff]);
+            $l ^= self::safe_intval((self::safe_intval($sb[$r >> 24 & 0xff] + $sb[0x100 + ($r >> 16 & 0xff)]) ^
+                  $sb[0x200 + ($r >>  8 & 0xff)]) +
+                  $sb[0x300 + ($r       & 0xff)]);
         }
         return pack('N*', $r ^ $p[0], $l ^ $p[1]);
     }
@@ -841,12 +761,9 @@ protected function setupInlineCrypt()
     {
         $p = $this->bctx['p'];
         $init_crypt = '
-            static $sb_0, $sb_1, $sb_2, $sb_3;
-            if (!$sb_0) {
-                $sb_0 = $this->bctx["sb"][0];
-                $sb_1 = $this->bctx["sb"][1];
-                $sb_2 = $this->bctx["sb"][2];
-                $sb_3 = $this->bctx["sb"][3];
+            static $sb;
+            if (!$sb) {
+                $sb = $this->bctx["sb"];
             }
         ';
 
@@ -861,14 +778,14 @@ protected function setupInlineCrypt()
         for ($i = 0; $i < 16; $i += 2) {
             $encrypt_block .= '
                 $l^= ' . $p[$i] . ';
-                $r^= ' . sprintf($safeint, '(' . sprintf($safeint, '$sb_0[$l >> 24 & 0xff] + $sb_1[$l >> 16 & 0xff]') . ' ^
-                      $sb_2[$l >>  8 & 0xff]) +
-                      $sb_3[$l       & 0xff]') . ';
+                $r^= ' . sprintf($safeint, '(' . sprintf($safeint, '$sb[$l >> 24 & 0xff] + $sb[0x100 + ($l >> 16 & 0xff)]') . ' ^
+                      $sb[0x200 + ($l >>  8 & 0xff)]) +
+                      $sb[0x300 + ($l       & 0xff)]') . ';
 
                 $r^= ' . $p[$i + 1] . ';
-                $l^= ' . sprintf($safeint, '(' . sprintf($safeint, '$sb_0[$r >> 24 & 0xff] + $sb_1[$r >> 16 & 0xff]') . '  ^
-                      $sb_2[$r >>  8 & 0xff]) +
-                      $sb_3[$r       & 0xff]') . ';
+                $l^= ' . sprintf($safeint, '(' . sprintf($safeint, '$sb[$r >> 24 & 0xff] + $sb[0x100 + ($r >> 16 & 0xff)]') . '  ^
+                      $sb[0x200 + ($r >>  8 & 0xff)]) +
+                      $sb[0x300 + ($r       & 0xff)]') . ';
             ';
         }
         $encrypt_block .= '
@@ -887,14 +804,14 @@ protected function setupInlineCrypt()
         for ($i = 17; $i > 2; $i -= 2) {
             $decrypt_block .= '
                 $l^= ' . $p[$i] . ';
-                $r^= ' . sprintf($safeint, '(' . sprintf($safeint, '$sb_0[$l >> 24 & 0xff] + $sb_1[$l >> 16 & 0xff]') . ' ^
-                      $sb_2[$l >>  8 & 0xff]) +
-                      $sb_3[$l       & 0xff]') . ';
+                $r^= ' . sprintf($safeint, '(' . sprintf($safeint, '$sb[$l >> 24 & 0xff] + $sb[0x100 + ($l >> 16 & 0xff)]') . ' ^
+                      $sb[0x200 + ($l >>  8 & 0xff)]) +
+                      $sb[0x300 + ($l       & 0xff)]') . ';
 
                 $r^= ' . $p[$i - 1] . ';
-                $l^= ' . sprintf($safeint, '(' . sprintf($safeint, '$sb_0[$r >> 24 & 0xff] + $sb_1[$r >> 16 & 0xff]') . ' ^
-                      $sb_2[$r >>  8 & 0xff]) +
-                      $sb_3[$r       & 0xff]') . ';
+                $l^= ' . sprintf($safeint, '(' . sprintf($safeint, '$sb[$r >> 24 & 0xff] + $sb[0x100 + ($r >> 16 & 0xff)]') . ' ^
+                      $sb[0x200 + ($r >>  8 & 0xff)]) +
+                      $sb[0x300 + ($r       & 0xff)]') . ';
             ';
         }
 
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/AsymmetricKey.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/AsymmetricKey.php
index 256c869069..a380e43d78 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/AsymmetricKey.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/AsymmetricKey.php
@@ -30,14 +30,14 @@ abstract class AsymmetricKey
     /**
      * Precomputed Zero
      *
-     * @var \phpseclib3\Math\BigInteger
+     * @var BigInteger
      */
     protected static $zero;
 
     /**
      * Precomputed One
      *
-     * @var \phpseclib3\Math\BigInteger
+     * @var BigInteger
      */
     protected static $one;
 
@@ -51,14 +51,14 @@ abstract class AsymmetricKey
     /**
      * Hash function
      *
-     * @var \phpseclib3\Crypt\Hash
+     * @var Hash
      */
     protected $hash;
 
     /**
      * HMAC function
      *
-     * @var \phpseclib3\Crypt\Hash
+     * @var Hash
      */
     private $hmac;
 
@@ -94,7 +94,7 @@ abstract class AsymmetricKey
 
     /**
      * @param string $type
-     * @return string
+     * @return array|string
      */
     abstract public function toString($type, array $options = []);
 
@@ -130,7 +130,7 @@ protected static function initialize_static_variables()
      *
      * @param string $key
      * @param string $password optional
-     * @return \phpseclib3\Crypt\Common\PublicKey|\phpseclib3\Crypt\Common\PrivateKey
+     * @return PublicKey|PrivateKey
      */
     public static function load($key, $password = false)
     {
@@ -382,7 +382,7 @@ public static function addFileFormat($fullname)
             $shortname = $meta->getShortName();
             self::$plugins[static::ALGORITHM]['Keys'][strtolower($shortname)] = $fullname;
             if ($meta->hasConstant('IS_INVISIBLE')) {
-                self::$invisiblePlugins[static::ALGORITHM] = strtolower($name);
+                self::$invisiblePlugins[static::ALGORITHM][] = strtolower($shortname);
             }
         }
     }
@@ -531,7 +531,7 @@ protected function computek($h1)
     /**
      * Integer to Octet String
      *
-     * @param \phpseclib3\Math\BigInteger $v
+     * @param BigInteger $v
      * @return string
      */
     private function int2octets($v)
@@ -551,7 +551,7 @@ private function int2octets($v)
      * Bit String to Integer
      *
      * @param string $in
-     * @return \phpseclib3\Math\BigInteger
+     * @return BigInteger
      */
     protected function bits2int($in)
     {
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/Formats/Keys/OpenSSH.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/Formats/Keys/OpenSSH.php
index fe3d85bd6b..ab7f050451 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/Formats/Keys/OpenSSH.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/Formats/Keys/OpenSSH.php
@@ -18,6 +18,7 @@
 use phpseclib3\Common\Functions\Strings;
 use phpseclib3\Crypt\AES;
 use phpseclib3\Crypt\Random;
+use phpseclib3\Exception\BadDecryptionException;
 
 /**
  * OpenSSH Formatted RSA Key Handler
@@ -96,7 +97,7 @@ public static function load($key, $password = '')
                     $crypto->setPassword($password, 'bcrypt', $salt, $rounds, 32);
                     break;
                 default:
-                    throw new \RuntimeException('The only supported cipherse are: none, aes256-ctr (' . $ciphername . ' is being used)');
+                    throw new \RuntimeException('The only supported ciphers are: none, aes256-ctr (' . $ciphername . ' is being used)');
             }
 
             list($publicKey, $paddedKey) = Strings::unpackSSH2('ss', $key);
@@ -107,7 +108,10 @@ public static function load($key, $password = '')
             list($checkint1, $checkint2) = Strings::unpackSSH2('NN', $paddedKey);
             // any leftover bytes in $paddedKey are for padding? but they should be sequential bytes. eg. 1, 2, 3, etc.
             if ($checkint1 != $checkint2) {
-                throw new \RuntimeException('The two checkints do not match');
+                if (isset($crypto)) {
+                    throw new BadDecryptionException('Unable to decrypt key - please verify the password you are using');
+                }
+                throw new \RuntimeException("The two checkints do not match ($checkint1 vs. $checkint2)");
             }
             self::checkType($type);
 
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/Formats/Keys/PKCS8.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/Formats/Keys/PKCS8.php
index 4638a53931..732ac5df71 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/Formats/Keys/PKCS8.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/Formats/Keys/PKCS8.php
@@ -141,6 +141,7 @@ private static function getPBES1EncryptionObject($algo)
                 break;
             case 'RC2':
                 $cipher = new RC2('cbc');
+                $cipher->setKeyLength(64);
                 break;
             case '3-KeyTripleDES':
                 $cipher = new TripleDES('cbc');
@@ -218,7 +219,7 @@ private static function getPBES2EncryptionObject($algo)
     {
         switch ($algo) {
             case 'desCBC':
-                $cipher = new TripleDES('cbc');
+                $cipher = new DES('cbc');
                 break;
             case 'des-EDE3-CBC':
                 $cipher = new TripleDES('cbc');
@@ -696,7 +697,7 @@ public static function extractEncryptionAlgorithm($key)
 
         $decoded = self::preParse($key);
 
-        $r = ASN1::asn1map($decoded[0], ASN1\Maps\EncryptedPrivateKeyInfo::MAP);
+        $r = ASN1::asn1map($decoded[0], Maps\EncryptedPrivateKeyInfo::MAP);
         if (!is_array($r)) {
             throw new \RuntimeException('Unable to parse using EncryptedPrivateKeyInfo map');
         }
@@ -706,7 +707,7 @@ public static function extractEncryptionAlgorithm($key)
             if (!$decoded) {
                 throw new \RuntimeException('Unable to decode BER');
             }
-            $r['encryptionAlgorithm']['parameters'] = ASN1::asn1map($decoded[0], ASN1\Maps\PBES2params::MAP);
+            $r['encryptionAlgorithm']['parameters'] = ASN1::asn1map($decoded[0], Maps\PBES2params::MAP);
 
             $kdf = &$r['encryptionAlgorithm']['parameters']['keyDerivationFunc'];
             switch ($kdf['algorithm']) {
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/Formats/Signature/Raw.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/Formats/Signature/Raw.php
index ab8e7e4609..42a65afa47 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/Formats/Signature/Raw.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/Formats/Signature/Raw.php
@@ -49,8 +49,8 @@ public static function load($sig)
     /**
      * Returns a signature in the appropriate format
      *
-     * @param \phpseclib3\Math\BigInteger $r
-     * @param \phpseclib3\Math\BigInteger $s
+     * @param BigInteger $r
+     * @param BigInteger $s
      * @return string
      */
     public static function save(BigInteger $r, BigInteger $s)
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/StreamCipher.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/StreamCipher.php
index 0e2d6f0c33..0d9690822f 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/StreamCipher.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/StreamCipher.php
@@ -35,7 +35,7 @@ abstract class StreamCipher extends SymmetricKey
      * Default Constructor.
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::__construct()
-     * @return \phpseclib3\Crypt\Common\StreamCipher
+     * @return StreamCipher
      */
     public function __construct()
     {
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/SymmetricKey.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/SymmetricKey.php
index 00bfdd45cc..35d7a7d7a0 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/SymmetricKey.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/SymmetricKey.php
@@ -668,11 +668,13 @@ protected static function initialize_static_variables()
             switch (true) {
                 // PHP_OS & "\xDF\xDF\xDF" == strtoupper(substr(PHP_OS, 0, 3)), but a lot faster
                 case (PHP_OS & "\xDF\xDF\xDF") === 'WIN':
-                case !(is_string(php_uname('m')) && (php_uname('m') & "\xDF\xDF\xDF") == 'ARM'):
+                case !function_exists('php_uname'):
+                case !is_string(php_uname('m')):
+                case (php_uname('m') & "\xDF\xDF\xDF") != 'ARM':
                 case defined('PHP_INT_SIZE') && PHP_INT_SIZE == 8:
                     self::$use_reg_intval = true;
                     break;
-                case is_string(php_uname('m')) && (php_uname('m') & "\xDF\xDF\xDF") == 'ARM':
+                case (php_uname('m') & "\xDF\xDF\xDF") == 'ARM':
                     switch (true) {
                         /* PHP 7.0.0 introduced a bug that affected 32-bit ARM processors:
 
@@ -1077,7 +1079,7 @@ public function setPassword($password, $method = 'pbkdf2', ...$func_args)
      *
      * @see self::setPassword()
      * @param int $n
-     * @param \phpseclib3\Crypt\Hash $hashObj
+     * @param Hash $hashObj
      * @param string $i
      * @param string $d
      * @param int $count
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/DH.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/DH.php
index e1deaf0861..b2301986f6 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/DH.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/DH.php
@@ -49,7 +49,7 @@ abstract class DH extends AsymmetricKey
     /**
      * DH prime
      *
-     * @var \phpseclib3\Math\BigInteger
+     * @var BigInteger
      */
     protected $prime;
 
@@ -58,14 +58,14 @@ abstract class DH extends AsymmetricKey
      *
      * Prime divisor of p-1
      *
-     * @var \phpseclib3\Math\BigInteger
+     * @var BigInteger
      */
     protected $base;
 
     /**
      * Public Key
      *
-     * @var \phpseclib3\Math\BigInteger
+     * @var BigInteger
      */
     protected $publicKey;
 
@@ -243,7 +243,7 @@ public static function createParameters(...$args)
      *
      * @param Parameters $params
      * @param int $length optional
-     * @return DH\PrivateKey
+     * @return PrivateKey
      */
     public static function createKey(Parameters $params, $length = 0)
     {
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/DH/Formats/Keys/PKCS8.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/DH/Formats/Keys/PKCS8.php
index c330a3c762..7d02e5f337 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/DH/Formats/Keys/PKCS8.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/DH/Formats/Keys/PKCS8.php
@@ -89,10 +89,10 @@ public static function load($key, $password = '')
     /**
      * Convert a private key to the appropriate format.
      *
-     * @param \phpseclib3\Math\BigInteger $prime
-     * @param \phpseclib3\Math\BigInteger $base
-     * @param \phpseclib3\Math\BigInteger $privateKey
-     * @param \phpseclib3\Math\BigInteger $publicKey
+     * @param BigInteger $prime
+     * @param BigInteger $base
+     * @param BigInteger $privateKey
+     * @param BigInteger $publicKey
      * @param string $password optional
      * @param array $options optional
      * @return string
@@ -112,9 +112,9 @@ public static function savePrivateKey(BigInteger $prime, BigInteger $base, BigIn
     /**
      * Convert a public key to the appropriate format
      *
-     * @param \phpseclib3\Math\BigInteger $prime
-     * @param \phpseclib3\Math\BigInteger $base
-     * @param \phpseclib3\Math\BigInteger $publicKey
+     * @param BigInteger $prime
+     * @param BigInteger $base
+     * @param BigInteger $publicKey
      * @param array $options optional
      * @return string
      */
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/DH/PrivateKey.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/DH/PrivateKey.php
index 737781f879..e2407e35e3 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/DH/PrivateKey.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/DH/PrivateKey.php
@@ -40,7 +40,7 @@ final class PrivateKey extends DH
     /**
      * Returns the public key
      *
-     * @return DH\PublicKey
+     * @return PublicKey
      */
     public function getPublicKey()
     {
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA.php
index 0123c66c56..92c777d6af 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA.php
@@ -53,7 +53,7 @@ abstract class DSA extends AsymmetricKey
     /**
      * DSA Prime P
      *
-     * @var \phpseclib3\Math\BigInteger
+     * @var BigInteger
      */
     protected $p;
 
@@ -62,21 +62,21 @@ abstract class DSA extends AsymmetricKey
      *
      * Prime divisor of p-1
      *
-     * @var \phpseclib3\Math\BigInteger
+     * @var BigInteger
      */
     protected $q;
 
     /**
      * DSA Group Generator G
      *
-     * @var \phpseclib3\Math\BigInteger
+     * @var BigInteger
      */
     protected $g;
 
     /**
      * DSA public key value y
      *
-     * @var \phpseclib3\Math\BigInteger
+     * @var BigInteger
      */
     protected $y;
 
@@ -99,7 +99,7 @@ abstract class DSA extends AsymmetricKey
      *
      * @param int $L
      * @param int $N
-     * @return \phpseclib3\Crypt\DSA|bool
+     * @return DSA|bool
      */
     public static function createParameters($L = 2048, $N = 224)
     {
@@ -179,7 +179,7 @@ public static function createParameters($L = 2048, $N = 224)
      * Returns the private key, from which the publickey can be extracted
      *
      * @param int[] ...$args
-     * @return DSA\PrivateKey
+     * @return PrivateKey
      */
     public static function createKey(...$args)
     {
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Keys/OpenSSH.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Keys/OpenSSH.php
index cc204fa945..bc41fcf5ea 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Keys/OpenSSH.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Keys/OpenSSH.php
@@ -65,10 +65,10 @@ public static function load($key, $password = '')
     /**
      * Convert a public key to the appropriate format
      *
-     * @param \phpseclib3\Math\BigInteger $p
-     * @param \phpseclib3\Math\BigInteger $q
-     * @param \phpseclib3\Math\BigInteger $g
-     * @param \phpseclib3\Math\BigInteger $y
+     * @param BigInteger $p
+     * @param BigInteger $q
+     * @param BigInteger $g
+     * @param BigInteger $y
      * @param array $options optional
      * @return string
      */
@@ -99,11 +99,11 @@ public static function savePublicKey(BigInteger $p, BigInteger $q, BigInteger $g
     /**
      * Convert a private key to the appropriate format.
      *
-     * @param \phpseclib3\Math\BigInteger $p
-     * @param \phpseclib3\Math\BigInteger $q
-     * @param \phpseclib3\Math\BigInteger $g
-     * @param \phpseclib3\Math\BigInteger $y
-     * @param \phpseclib3\Math\BigInteger $x
+     * @param BigInteger $p
+     * @param BigInteger $q
+     * @param BigInteger $g
+     * @param BigInteger $y
+     * @param BigInteger $x
      * @param string $password optional
      * @param array $options optional
      * @return string
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Keys/PKCS1.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Keys/PKCS1.php
index 52a0499288..800cfb38c4 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Keys/PKCS1.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Keys/PKCS1.php
@@ -77,9 +77,9 @@ public static function load($key, $password = '')
     /**
      * Convert DSA parameters to the appropriate format
      *
-     * @param \phpseclib3\Math\BigInteger $p
-     * @param \phpseclib3\Math\BigInteger $q
-     * @param \phpseclib3\Math\BigInteger $g
+     * @param BigInteger $p
+     * @param BigInteger $q
+     * @param BigInteger $g
      * @return string
      */
     public static function saveParameters(BigInteger $p, BigInteger $q, BigInteger $g)
@@ -100,11 +100,11 @@ public static function saveParameters(BigInteger $p, BigInteger $q, BigInteger $
     /**
      * Convert a private key to the appropriate format.
      *
-     * @param \phpseclib3\Math\BigInteger $p
-     * @param \phpseclib3\Math\BigInteger $q
-     * @param \phpseclib3\Math\BigInteger $g
-     * @param \phpseclib3\Math\BigInteger $y
-     * @param \phpseclib3\Math\BigInteger $x
+     * @param BigInteger $p
+     * @param BigInteger $q
+     * @param BigInteger $g
+     * @param BigInteger $y
+     * @param BigInteger $x
      * @param string $password optional
      * @param array $options optional
      * @return string
@@ -128,10 +128,10 @@ public static function savePrivateKey(BigInteger $p, BigInteger $q, BigInteger $
     /**
      * Convert a public key to the appropriate format
      *
-     * @param \phpseclib3\Math\BigInteger $p
-     * @param \phpseclib3\Math\BigInteger $q
-     * @param \phpseclib3\Math\BigInteger $g
-     * @param \phpseclib3\Math\BigInteger $y
+     * @param BigInteger $p
+     * @param BigInteger $q
+     * @param BigInteger $g
+     * @param BigInteger $y
      * @return string
      */
     public static function savePublicKey(BigInteger $p, BigInteger $q, BigInteger $g, BigInteger $y)
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Keys/PKCS8.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Keys/PKCS8.php
index 004881e8c7..238f42c25f 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Keys/PKCS8.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Keys/PKCS8.php
@@ -99,11 +99,11 @@ public static function load($key, $password = '')
     /**
      * Convert a private key to the appropriate format.
      *
-     * @param \phpseclib3\Math\BigInteger $p
-     * @param \phpseclib3\Math\BigInteger $q
-     * @param \phpseclib3\Math\BigInteger $g
-     * @param \phpseclib3\Math\BigInteger $y
-     * @param \phpseclib3\Math\BigInteger $x
+     * @param BigInteger $p
+     * @param BigInteger $q
+     * @param BigInteger $g
+     * @param BigInteger $y
+     * @param BigInteger $x
      * @param string $password optional
      * @param array $options optional
      * @return string
@@ -124,10 +124,10 @@ public static function savePrivateKey(BigInteger $p, BigInteger $q, BigInteger $
     /**
      * Convert a public key to the appropriate format
      *
-     * @param \phpseclib3\Math\BigInteger $p
-     * @param \phpseclib3\Math\BigInteger $q
-     * @param \phpseclib3\Math\BigInteger $g
-     * @param \phpseclib3\Math\BigInteger $y
+     * @param BigInteger $p
+     * @param BigInteger $q
+     * @param BigInteger $g
+     * @param BigInteger $y
      * @param array $options optional
      * @return string
      */
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Keys/PuTTY.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Keys/PuTTY.php
index 177bfdd4f4..f6177f4627 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Keys/PuTTY.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Keys/PuTTY.php
@@ -68,11 +68,11 @@ public static function load($key, $password = '')
     /**
      * Convert a private key to the appropriate format.
      *
-     * @param \phpseclib3\Math\BigInteger $p
-     * @param \phpseclib3\Math\BigInteger $q
-     * @param \phpseclib3\Math\BigInteger $g
-     * @param \phpseclib3\Math\BigInteger $y
-     * @param \phpseclib3\Math\BigInteger $x
+     * @param BigInteger $p
+     * @param BigInteger $q
+     * @param BigInteger $g
+     * @param BigInteger $y
+     * @param BigInteger $x
      * @param string $password optional
      * @param array $options optional
      * @return string
@@ -92,10 +92,10 @@ public static function savePrivateKey(BigInteger $p, BigInteger $q, BigInteger $
     /**
      * Convert a public key to the appropriate format
      *
-     * @param \phpseclib3\Math\BigInteger $p
-     * @param \phpseclib3\Math\BigInteger $q
-     * @param \phpseclib3\Math\BigInteger $g
-     * @param \phpseclib3\Math\BigInteger $y
+     * @param BigInteger $p
+     * @param BigInteger $q
+     * @param BigInteger $g
+     * @param BigInteger $y
      * @return string
      */
     public static function savePublicKey(BigInteger $p, BigInteger $q, BigInteger $g, BigInteger $y)
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Keys/Raw.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Keys/Raw.php
index 201aa6f95a..8e2ef01f1f 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Keys/Raw.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Keys/Raw.php
@@ -56,11 +56,11 @@ public static function load($key, $password = '')
     /**
      * Convert a private key to the appropriate format.
      *
-     * @param \phpseclib3\Math\BigInteger $p
-     * @param \phpseclib3\Math\BigInteger $q
-     * @param \phpseclib3\Math\BigInteger $g
-     * @param \phpseclib3\Math\BigInteger $y
-     * @param \phpseclib3\Math\BigInteger $x
+     * @param BigInteger $p
+     * @param BigInteger $q
+     * @param BigInteger $g
+     * @param BigInteger $y
+     * @param BigInteger $x
      * @param string $password optional
      * @return string
      */
@@ -72,10 +72,10 @@ public static function savePrivateKey(BigInteger $p, BigInteger $q, BigInteger $
     /**
      * Convert a public key to the appropriate format
      *
-     * @param \phpseclib3\Math\BigInteger $p
-     * @param \phpseclib3\Math\BigInteger $q
-     * @param \phpseclib3\Math\BigInteger $g
-     * @param \phpseclib3\Math\BigInteger $y
+     * @param BigInteger $p
+     * @param BigInteger $q
+     * @param BigInteger $g
+     * @param BigInteger $y
      * @return string
      */
     public static function savePublicKey(BigInteger $p, BigInteger $q, BigInteger $g, BigInteger $y)
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Keys/XML.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Keys/XML.php
index fc36367713..f77cbf20d8 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Keys/XML.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Keys/XML.php
@@ -114,10 +114,10 @@ public static function load($key, $password = '')
      *
      * See https://www.w3.org/TR/xmldsig-core/#sec-DSAKeyValue
      *
-     * @param \phpseclib3\Math\BigInteger $p
-     * @param \phpseclib3\Math\BigInteger $q
-     * @param \phpseclib3\Math\BigInteger $g
-     * @param \phpseclib3\Math\BigInteger $y
+     * @param BigInteger $p
+     * @param BigInteger $q
+     * @param BigInteger $g
+     * @param BigInteger $y
      * @return string
      */
     public static function savePublicKey(BigInteger $p, BigInteger $q, BigInteger $g, BigInteger $y)
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Signature/ASN1.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Signature/ASN1.php
index df52beed45..f800602869 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Signature/ASN1.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Signature/ASN1.php
@@ -51,8 +51,8 @@ public static function load($sig)
     /**
      * Returns a signature in the appropriate format
      *
-     * @param \phpseclib3\Math\BigInteger $r
-     * @param \phpseclib3\Math\BigInteger $s
+     * @param BigInteger $r
+     * @param BigInteger $s
      * @return string
      */
     public static function save(BigInteger $r, BigInteger $s)
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Signature/SSH2.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Signature/SSH2.php
index dbfceabba8..88807b5b82 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Signature/SSH2.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Signature/SSH2.php
@@ -55,8 +55,8 @@ public static function load($sig)
     /**
      * Returns a signature in the appropriate format
      *
-     * @param \phpseclib3\Math\BigInteger $r
-     * @param \phpseclib3\Math\BigInteger $s
+     * @param BigInteger $r
+     * @param BigInteger $s
      * @return string
      */
     public static function save(BigInteger $r, BigInteger $s)
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/PrivateKey.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/PrivateKey.php
index 74d3e69e38..87cd77a7ab 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/PrivateKey.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/PrivateKey.php
@@ -28,7 +28,7 @@ final class PrivateKey extends DSA implements Common\PrivateKey
     /**
      * DSA secret exponent x
      *
-     * @var \phpseclib3\Math\BigInteger
+     * @var BigInteger
      */
     protected $x;
 
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC.php
index 10b38254a9..dc82dd0496 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC.php
@@ -70,7 +70,7 @@ abstract class EC extends AsymmetricKey
     /**
      * Curve
      *
-     * @var \phpseclib3\Crypt\EC\BaseCurves\Base
+     * @var EC\BaseCurves\Base
      */
     protected $curve;
 
@@ -100,7 +100,7 @@ abstract class EC extends AsymmetricKey
      *
      * Used for deterministic ECDSA
      *
-     * @var \phpseclib3\Math\BigInteger
+     * @var BigInteger
      */
     protected $q;
 
@@ -112,7 +112,7 @@ abstract class EC extends AsymmetricKey
      * public key. But the x is different depending on which side of the equal sign
      * you're on. It's less ambiguous if you do dA * base point = (x, y)-coordinate.
      *
-     * @var \phpseclib3\Math\BigInteger
+     * @var BigInteger
      */
     protected $x;
 
@@ -134,7 +134,7 @@ abstract class EC extends AsymmetricKey
      * Create public / private key pair.
      *
      * @param string $curve
-     * @return \phpseclib3\Crypt\EC\PrivateKey
+     * @return PrivateKey
      */
     public static function createKey($curve)
     {
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/BaseCurves/Base.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/BaseCurves/Base.php
index dbc914be6f..d76562d0d0 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/BaseCurves/Base.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/BaseCurves/Base.php
@@ -32,7 +32,7 @@ abstract class Base
     /**
      * Finite Field Integer factory
      *
-     * @var \phpseclib3\Math\FiniteField\Integer
+     * @var FiniteField\Integer
      */
     protected $factory;
 
@@ -47,7 +47,7 @@ public function randomInteger()
     }
 
     /**
-     * Converts a BigInteger to a \phpseclib3\Math\FiniteField\Integer integer
+     * Converts a BigInteger to a FiniteField\Integer integer
      *
      * @return object
      */
@@ -147,7 +147,7 @@ public function setOrder(BigInteger $order)
     /**
      * Returns the Order
      *
-     * @return \phpseclib3\Math\BigInteger
+     * @return BigInteger
      */
     public function getOrder()
     {
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/BaseCurves/Binary.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/BaseCurves/Binary.php
index 4fc6c70c01..66da11da72 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/BaseCurves/Binary.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/BaseCurves/Binary.php
@@ -35,7 +35,7 @@ class Binary extends Base
     /**
      * Binary Field Integer factory
      *
-     * @var \phpseclib3\Math\BinaryField
+     * @var BinaryField
      */
     protected $factory;
 
@@ -305,7 +305,7 @@ public function verifyPoint(array $p)
     /**
      * Returns the modulo
      *
-     * @return \phpseclib3\Math\BigInteger
+     * @return BigInteger
      */
     public function getModulo()
     {
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/BaseCurves/Montgomery.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/BaseCurves/Montgomery.php
index e3fa50b337..bf02569dc4 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/BaseCurves/Montgomery.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/BaseCurves/Montgomery.php
@@ -39,7 +39,7 @@ class Montgomery extends Base
     /**
      * Prime Field Integer factory
      *
-     * @var \phpseclib3\Math\PrimeField
+     * @var PrimeField
      */
     protected $factory;
 
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/BaseCurves/Prime.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/BaseCurves/Prime.php
index 6250dfb0fb..6200401704 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/BaseCurves/Prime.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/BaseCurves/Prime.php
@@ -483,7 +483,7 @@ public function verifyPoint(array $p)
     /**
      * Returns the modulo
      *
-     * @return \phpseclib3\Math\BigInteger
+     * @return BigInteger
      */
     public function getModulo()
     {
@@ -493,7 +493,7 @@ public function getModulo()
     /**
      * Returns the a coefficient
      *
-     * @return \phpseclib3\Math\PrimeField\Integer
+     * @return PrimeInteger
      */
     public function getA()
     {
@@ -503,7 +503,7 @@ public function getA()
     /**
      * Returns the a coefficient
      *
-     * @return \phpseclib3\Math\PrimeField\Integer
+     * @return PrimeInteger
      */
     public function getB()
     {
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/BaseCurves/TwistedEdwards.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/BaseCurves/TwistedEdwards.php
index 2521a4c0e6..004406acf1 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/BaseCurves/TwistedEdwards.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/BaseCurves/TwistedEdwards.php
@@ -133,7 +133,7 @@ public function setBasePoint($x, $y)
     /**
      * Returns the a coefficient
      *
-     * @return \phpseclib3\Math\PrimeField\Integer
+     * @return PrimeInteger
      */
     public function getA()
     {
@@ -143,7 +143,7 @@ public function getA()
     /**
      * Returns the a coefficient
      *
-     * @return \phpseclib3\Math\PrimeField\Integer
+     * @return PrimeInteger
      */
     public function getD()
     {
@@ -171,7 +171,7 @@ public function getBasePoint()
     /**
      * Returns the affine point
      *
-     * @return \phpseclib3\Math\PrimeField\Integer[]
+     * @return PrimeField\Integer[]
      */
     public function convertToAffine(array $p)
     {
@@ -189,7 +189,7 @@ public function convertToAffine(array $p)
     /**
      * Returns the modulo
      *
-     * @return \phpseclib3\Math\BigInteger
+     * @return BigInteger
      */
     public function getModulo()
     {
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/Common.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/Common.php
index 63402b4a8d..743c07c3ec 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/Common.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/Common.php
@@ -183,7 +183,7 @@ private static function initialize_static_variables()
      * If the key contains an implicit curve phpseclib needs the curve
      * to be explicitly provided
      *
-     * @param \phpseclib3\Crypt\EC\BaseCurves\Base $curve
+     * @param BaseCurve $curve
      */
     public static function setImplicitCurve(BaseCurve $curve)
     {
@@ -195,7 +195,7 @@ public static function setImplicitCurve(BaseCurve $curve)
      * on the curve parameters
      *
      * @param array $params
-     * @return \phpseclib3\Crypt\EC\BaseCurves\Base|false
+     * @return BaseCurve|false
      */
     protected static function loadCurveByParam(array $params)
     {
@@ -269,7 +269,7 @@ protected static function loadCurveByParam(array $params)
      * Supports both compressed and uncompressed points
      *
      * @param string $str
-     * @param \phpseclib3\Crypt\EC\BaseCurves\Base $curve
+     * @param BaseCurve $curve
      * @return object[]
      */
     public static function extractPoint($str, BaseCurve $curve)
@@ -335,7 +335,7 @@ public static function extractPoint($str, BaseCurve $curve)
      * Encode Parameters
      *
      * @todo Maybe at some point this could be moved to __toString() for each of the curves?
-     * @param \phpseclib3\Crypt\EC\BaseCurves\Base $curve
+     * @param BaseCurve $curve
      * @param bool $returnArray optional
      * @param array $options optional
      * @return string|false
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/JWK.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/JWK.php
index fd18a9815b..5bc5184f79 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/JWK.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/JWK.php
@@ -130,7 +130,7 @@ private static function getAlias(BaseCurve $curve)
     /**
      * Return the array superstructure for an EC public key
      *
-     * @param \phpseclib3\Crypt\EC\BaseCurves\Base $curve
+     * @param BaseCurve $curve
      * @param \phpseclib3\Math\Common\FiniteField\Integer[] $publicKey
      * @return array
      */
@@ -155,7 +155,7 @@ private static function savePublicKeyHelper(BaseCurve $curve, array $publicKey)
     /**
      * Convert an EC public key to the appropriate format
      *
-     * @param \phpseclib3\Crypt\EC\BaseCurves\Base $curve
+     * @param BaseCurve $curve
      * @param \phpseclib3\Math\Common\FiniteField\Integer[] $publicKey
      * @param array $options optional
      * @return string
@@ -170,8 +170,8 @@ public static function savePublicKey(BaseCurve $curve, array $publicKey, array $
     /**
      * Convert a private key to the appropriate format.
      *
-     * @param \phpseclib3\Math\BigInteger $privateKey
-     * @param \phpseclib3\Crypt\EC\Curves\Ed25519 $curve
+     * @param BigInteger $privateKey
+     * @param Ed25519 $curve
      * @param \phpseclib3\Math\Common\FiniteField\Integer[] $publicKey
      * @param string $secret optional
      * @param string $password optional
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/MontgomeryPrivate.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/MontgomeryPrivate.php
index 5741b05ad1..aa64f79abe 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/MontgomeryPrivate.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/MontgomeryPrivate.php
@@ -71,7 +71,7 @@ public static function load($key, $password = '')
     /**
      * Convert an EC public key to the appropriate format
      *
-     * @param \phpseclib3\Crypt\EC\BaseCurves\Montgomery $curve
+     * @param MontgomeryCurve $curve
      * @param \phpseclib3\Math\Common\FiniteField\Integer[] $publicKey
      * @return string
      */
@@ -83,8 +83,8 @@ public static function savePublicKey(MontgomeryCurve $curve, array $publicKey)
     /**
      * Convert a private key to the appropriate format.
      *
-     * @param \phpseclib3\Math\BigInteger $privateKey
-     * @param \phpseclib3\Crypt\EC\BaseCurves\Montgomery $curve
+     * @param BigInteger $privateKey
+     * @param MontgomeryCurve $curve
      * @param \phpseclib3\Math\Common\FiniteField\Integer[] $publicKey
      * @param string $secret optional
      * @param string $password optional
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/MontgomeryPublic.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/MontgomeryPublic.php
index d1ad48a5be..257c26e878 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/MontgomeryPublic.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/MontgomeryPublic.php
@@ -60,7 +60,7 @@ public static function load($key, $password = '')
     /**
      * Convert an EC public key to the appropriate format
      *
-     * @param \phpseclib3\Crypt\EC\BaseCurves\Montgomery $curve
+     * @param MontgomeryCurve $curve
      * @param \phpseclib3\Math\Common\FiniteField\Integer[] $publicKey
      * @return string
      */
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/OpenSSH.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/OpenSSH.php
index 2cd3e19d0e..0ef1160441 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/OpenSSH.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/OpenSSH.php
@@ -134,7 +134,7 @@ private static function getAlias(BaseCurve $curve)
     /**
      * Convert an EC public key to the appropriate format
      *
-     * @param \phpseclib3\Crypt\EC\BaseCurves\Base $curve
+     * @param BaseCurve $curve
      * @param \phpseclib3\Math\Common\FiniteField\Integer[] $publicKey
      * @param array $options optional
      * @return string
@@ -171,8 +171,8 @@ public static function savePublicKey(BaseCurve $curve, array $publicKey, array $
     /**
      * Convert a private key to the appropriate format.
      *
-     * @param \phpseclib3\Math\BigInteger $privateKey
-     * @param \phpseclib3\Crypt\EC\Curves\Ed25519 $curve
+     * @param BigInteger $privateKey
+     * @param Ed25519 $curve
      * @param \phpseclib3\Math\Common\FiniteField\Integer[] $publicKey
      * @param string $secret optional
      * @param string $password optional
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/PKCS1.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/PKCS1.php
index 9f4b33003e..756ffb957b 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/PKCS1.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/PKCS1.php
@@ -162,8 +162,8 @@ public static function saveParameters(BaseCurve $curve, array $options = [])
     /**
      * Convert a private key to the appropriate format.
      *
-     * @param \phpseclib3\Math\BigInteger $privateKey
-     * @param \phpseclib3\Crypt\EC\BaseCurves\Base $curve
+     * @param BigInteger $privateKey
+     * @param BaseCurve $curve
      * @param \phpseclib3\Math\Common\FiniteField\Integer[] $publicKey
      * @param string $secret optional
      * @param string $password optional
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/PKCS8.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/PKCS8.php
index 0ec7742fc2..66ec0308c1 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/PKCS8.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/PKCS8.php
@@ -130,11 +130,13 @@ private static function loadEdDSA(array $key)
 
         if (isset($key['privateKey'])) {
             $components['curve'] = $key['privateKeyAlgorithm']['algorithm'] == 'id-Ed25519' ? new Ed25519() : new Ed448();
-
-            // 0x04 == octet string
-            // 0x20 == length (32 bytes)
-            if (substr($key['privateKey'], 0, 2) != "\x04\x20") {
-                throw new \RuntimeException('The first two bytes of the private key field should be 0x0420');
+            $expected = chr(ASN1::TYPE_OCTET_STRING) . ASN1::encodeLength($components['curve']::SIZE);
+            if (substr($key['privateKey'], 0, 2) != $expected) {
+                throw new \RuntimeException(
+                    'The first two bytes of the ' .
+                    $key['privateKeyAlgorithm']['algorithm'] .
+                    ' private key field should be 0x' . bin2hex($expected)
+                );
             }
             $arr = $components['curve']->extractSecret(substr($key['privateKey'], 2));
             $components['dA'] = $arr['dA'];
@@ -159,7 +161,7 @@ private static function loadEdDSA(array $key)
     /**
      * Convert an EC public key to the appropriate format
      *
-     * @param \phpseclib3\Crypt\EC\BaseCurves\Base $curve
+     * @param BaseCurve $curve
      * @param \phpseclib3\Math\Common\FiniteField\Integer[] $publicKey
      * @param array $options optional
      * @return string
@@ -190,8 +192,8 @@ public static function savePublicKey(BaseCurve $curve, array $publicKey, array $
     /**
      * Convert a private key to the appropriate format.
      *
-     * @param \phpseclib3\Math\BigInteger $privateKey
-     * @param \phpseclib3\Crypt\EC\BaseCurves\Base $curve
+     * @param BigInteger $privateKey
+     * @param BaseCurve $curve
      * @param \phpseclib3\Math\Common\FiniteField\Integer[] $publicKey
      * @param string $secret optional
      * @param string $password optional
@@ -208,7 +210,7 @@ public static function savePrivateKey(BigInteger $privateKey, BaseCurve $curve,
 
         if ($curve instanceof TwistedEdwardsCurve) {
             return self::wrapPrivateKey(
-                "\x04\x20" . $secret,
+                chr(ASN1::TYPE_OCTET_STRING) . ASN1::encodeLength($curve::SIZE) . $secret,
                 [],
                 null,
                 $password,
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/PuTTY.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/PuTTY.php
index 866c883fba..7e1e9170f5 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/PuTTY.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/PuTTY.php
@@ -84,8 +84,8 @@ public static function load($key, $password = '')
     /**
      * Convert a private key to the appropriate format.
      *
-     * @param \phpseclib3\Math\BigInteger $privateKey
-     * @param \phpseclib3\Crypt\EC\BaseCurves\Base $curve
+     * @param BigInteger $privateKey
+     * @param BaseCurve $curve
      * @param \phpseclib3\Math\Common\FiniteField\Integer[] $publicKey
      * @param string $secret optional
      * @param string $password optional
@@ -121,7 +121,7 @@ public static function savePrivateKey(BigInteger $privateKey, BaseCurve $curve,
     /**
      * Convert an EC public key to the appropriate format
      *
-     * @param \phpseclib3\Crypt\EC\BaseCurves\Base $curve
+     * @param BaseCurve $curve
      * @param \phpseclib3\Math\Common\FiniteField[] $publicKey
      * @return string
      */
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/XML.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/XML.php
index 27d9218fb8..b0cb12650a 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/XML.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/XML.php
@@ -171,7 +171,7 @@ private static function decodeValue($value)
      * Extract points from an XML document
      *
      * @param \DOMXPath $xpath
-     * @param \phpseclib3\Crypt\EC\BaseCurves\Base $curve
+     * @param BaseCurve $curve
      * @return object[]
      */
     private static function extractPointRFC4050(\DOMXPath $xpath, BaseCurve $curve)
@@ -199,7 +199,7 @@ private static function extractPointRFC4050(\DOMXPath $xpath, BaseCurve $curve)
      * on the curve parameters
      *
      * @param \DomXPath $xpath
-     * @return \phpseclib3\Crypt\EC\BaseCurves\Base|false
+     * @return BaseCurve|false
      */
     private static function loadCurveByParam(\DOMXPath $xpath)
     {
@@ -279,7 +279,7 @@ private static function loadCurveByParam(\DOMXPath $xpath)
      * on the curve parameters
      *
      * @param \DomXPath $xpath
-     * @return \phpseclib3\Crypt\EC\BaseCurves\Base|false
+     * @return BaseCurve|false
      */
     private static function loadCurveByParamRFC4050(\DOMXPath $xpath)
     {
@@ -366,7 +366,7 @@ public static function disableRFC4050Syntax()
     /**
      * Convert a public key to the appropriate format
      *
-     * @param \phpseclib3\Crypt\EC\BaseCurves\Base $curve
+     * @param BaseCurve $curve
      * @param \phpseclib3\Math\Common\FiniteField\Integer[] $publicKey
      * @param array $options optional
      * @return string
@@ -407,7 +407,7 @@ public static function savePublicKey(BaseCurve $curve, array $publicKey, array $
     /**
      * Encode Parameters
      *
-     * @param \phpseclib3\Crypt\EC\BaseCurves\Base $curve
+     * @param BaseCurve $curve
      * @param string $pre
      * @param array $options optional
      * @return string|false
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/libsodium.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/libsodium.php
index 2be6ba59bb..cce37bab4e 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/libsodium.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/libsodium.php
@@ -81,7 +81,7 @@ public static function load($key, $password = '')
     /**
      * Convert an EC public key to the appropriate format
      *
-     * @param \phpseclib3\Crypt\EC\Curves\Ed25519 $curve
+     * @param Ed25519 $curve
      * @param \phpseclib3\Math\Common\FiniteField\Integer[] $publicKey
      * @return string
      */
@@ -93,8 +93,8 @@ public static function savePublicKey(Ed25519 $curve, array $publicKey)
     /**
      * Convert a private key to the appropriate format.
      *
-     * @param \phpseclib3\Math\BigInteger $privateKey
-     * @param \phpseclib3\Crypt\EC\Curves\Ed25519 $curve
+     * @param BigInteger $privateKey
+     * @param Ed25519 $curve
      * @param \phpseclib3\Math\Common\FiniteField\Integer[] $publicKey
      * @param string $secret optional
      * @param string $password optional
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Signature/ASN1.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Signature/ASN1.php
index d2a80a14f5..385028b3aa 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Signature/ASN1.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Signature/ASN1.php
@@ -51,8 +51,8 @@ public static function load($sig)
     /**
      * Returns a signature in the appropriate format
      *
-     * @param \phpseclib3\Math\BigInteger $r
-     * @param \phpseclib3\Math\BigInteger $s
+     * @param BigInteger $r
+     * @param BigInteger $s
      * @return string
      */
     public static function save(BigInteger $r, BigInteger $s)
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Signature/IEEE.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Signature/IEEE.php
new file mode 100644
index 0000000000..c5e622a12d
--- /dev/null
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Signature/IEEE.php
@@ -0,0 +1,68 @@
+<?php
+
+/**
+ * IEEE P1363 Signature Handler
+ *
+ * PHP version 5
+ *
+ * Handles signatures in the format described in
+ * https://standards.ieee.org/ieee/1363/2049/ and
+ * https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/sign#ecdsa
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+namespace phpseclib3\Crypt\EC\Formats\Signature;
+
+use phpseclib3\Math\BigInteger;
+
+/**
+ * ASN1 Signature Handler
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class IEEE
+{
+    /**
+     * Loads a signature
+     *
+     * @param string $sig
+     * @return array
+     */
+    public static function load($sig)
+    {
+        if (!is_string($sig)) {
+            return false;
+        }
+
+        $len = strlen($sig);
+        if ($len & 1) {
+            return false;
+        }
+
+        $r = new BigInteger(substr($sig, 0, $len >> 1), 256);
+        $s = new BigInteger(substr($sig, $len >> 1), 256);
+
+        return compact('r', 's');
+    }
+
+    /**
+     * Returns a signature in the appropriate format
+     *
+     * @param BigInteger $r
+     * @param BigInteger $s
+     * @param string $curve
+     * @param int $length
+     * @return string
+     */
+    public static function save(BigInteger $r, BigInteger $s, $curve, $length)
+    {
+        $r = $r->toBytes();
+        $s = $s->toBytes();
+        $length = (int) ceil($length / 8);
+        return str_pad($r, $length, "\0", STR_PAD_LEFT) . str_pad($s, $length, "\0", STR_PAD_LEFT);
+    }
+}
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Signature/SSH2.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Signature/SSH2.php
index e064442124..698c8e4cec 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Signature/SSH2.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Signature/SSH2.php
@@ -66,8 +66,8 @@ public static function load($sig)
     /**
      * Returns a signature in the appropriate format
      *
-     * @param \phpseclib3\Math\BigInteger $r
-     * @param \phpseclib3\Math\BigInteger $s
+     * @param BigInteger $r
+     * @param BigInteger $s
      * @param string $curve
      * @return string
      */
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/PrivateKey.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/PrivateKey.php
index 462ea1a336..91253b8fda 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/PrivateKey.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/PrivateKey.php
@@ -150,7 +150,7 @@ public function sign($message)
             // we use specified curves to avoid issues with OpenSSL possibly not supporting a given named curve;
             // doing this may mean some curve-specific optimizations can't be used but idk if OpenSSL even
             // has curve-specific optimizations
-            $result = openssl_sign($message, $signature, $this->toString('PKCS8', ['namedCurve' => false]), $this->hash->getHash());
+            $result = openssl_sign($message, $signature, $this->withPassword()->toString('PKCS8', ['namedCurve' => false]), $this->hash->getHash());
 
             if ($result) {
                 if ($shortFormat == 'ASN1') {
@@ -159,7 +159,7 @@ public function sign($message)
 
                 extract(ASN1Signature::load($signature));
 
-                return $shortFormat == 'SSH2' ? $format::save($r, $s, $this->getCurve()) : $format::save($r, $s);
+                return $this->formatSignature($r, $s);
             }
         }
 
@@ -208,7 +208,7 @@ public function sign($message)
         list(, $s) = $temp->divide($this->q);
         */
 
-        return $shortFormat == 'SSH2' ? $format::save($r, $s, $this->getCurve()) : $format::save($r, $s);
+        return $this->formatSignature($r, $s);
     }
 
     /**
@@ -253,4 +253,28 @@ public function getPublicKey()
         }
         return $key;
     }
+
+    /**
+     * Returns a signature in the appropriate format
+     *
+     * @return string
+     */
+    private function formatSignature(BigInteger $r, BigInteger $s)
+    {
+        $format = $this->sigFormat;
+
+        $temp = new \ReflectionMethod($format, 'save');
+        $paramCount = $temp->getNumberOfRequiredParameters();
+
+        // @codingStandardsIgnoreStart
+        switch ($paramCount) {
+            case 2: return $format::save($r, $s);
+            case 3: return $format::save($r, $s, $this->getCurve());
+            case 4: return $format::save($r, $s, $this->getCurve(), $this->getLength());
+        }
+        // @codingStandardsIgnoreEnd
+
+        // presumably the only way you could get to this is if you were using a custom plugin
+        throw new UnsupportedOperationException("$format::save() has $paramCount parameters - the only valid parameter counts are 2 or 3");
+    }
 }
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/Hash.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/Hash.php
index 0e02544eb8..09e48f960c 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/Hash.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/Hash.php
@@ -128,7 +128,7 @@ class Hash
     /**
      * Outer XOR (Internal HMAC)
      *
-     * Used only for sha512/*
+     * Used only for sha512
      *
      * @see self::hash()
      * @var string
@@ -138,7 +138,7 @@ class Hash
     /**
      * Inner XOR (Internal HMAC)
      *
-     * Used only for sha512/*
+     * Used only for sha512
      *
      * @see self::hash()
      * @var string
@@ -159,7 +159,7 @@ class Hash
      * umac cipher object
      *
      * @see self::hash()
-     * @var \phpseclib3\Crypt\AES
+     * @var AES
      */
     private $c;
 
@@ -285,12 +285,16 @@ public function getHash()
      */
     public function setHash($hash)
     {
+        $oldHash = $this->hashParam;
         $this->hashParam = $hash = strtolower($hash);
         switch ($hash) {
             case 'umac-32':
             case 'umac-64':
             case 'umac-96':
             case 'umac-128':
+                if ($oldHash != $this->hashParam) {
+                    $this->recomputeAESKey = true;
+                }
                 $this->blockSize = 128;
                 $this->length = abs(substr($hash, -3)) >> 3;
                 $this->algo = 'umac';
@@ -418,13 +422,17 @@ public function setHash($hash)
                         '0F6D2B697BD44DA8', '77E36F7304C48942', '3F9D85A86A1D36C8', '1112E6AD91D692A1'
                     ];
                 for ($i = 0; $i < 8; $i++) {
-                    $initial[$i] = new BigInteger($initial[$i], 16);
-                    $initial[$i]->setPrecision(64);
+                    if (PHP_INT_SIZE == 8) {
+                        list(, $initial[$i]) = unpack('J', pack('H*', $initial[$i]));
+                    } else {
+                        $initial[$i] = new BigInteger($initial[$i], 16);
+                        $initial[$i]->setPrecision(64);
+                    }
                 }
 
                 $this->parameters = compact('initial');
 
-                $hash = ['phpseclib3\Crypt\Hash', 'sha512'];
+                $hash = ['phpseclib3\Crypt\Hash', PHP_INT_SIZE == 8 ? 'sha512_64' : 'sha512'];
             }
         }
 
@@ -564,11 +572,14 @@ private static function L1Hash($k, $m)
         // For each chunk, except the last: endian-adjust, NH hash
         // and add bit-length.  Use results to build Y.
         //
-        $length = new BigInteger(1024 * 8);
+        $length = 1024 * 8;
         $y = '';
+
         for ($i = 0; $i < count($m) - 1; $i++) {
             $m[$i] = pack('N*', ...unpack('V*', $m[$i])); // ENDIAN-SWAP
-            $y .= static::nh($k, $m[$i], $length);
+            $y .= PHP_INT_SIZE == 8 ?
+                static::nh64($k, $m[$i], $length) :
+                static::nh32($k, $m[$i], $length);
         }
 
         //
@@ -581,70 +592,256 @@ private static function L1Hash($k, $m)
         $m[$i] = str_pad(isset($m[$i]) ? $m[$i] : '', $pad, "\0"); // zeropad
         $m[$i] = pack('N*', ...unpack('V*', $m[$i])); // ENDIAN-SWAP
 
-        $y .= static::nh($k, $m[$i], new BigInteger($length * 8));
+        $y .= PHP_INT_SIZE == 8 ?
+            static::nh64($k, $m[$i], $length * 8) :
+            static::nh32($k, $m[$i], $length * 8);
 
         return $y;
     }
 
     /**
-     * NH Algorithm
+     * 32-bit safe 64-bit Multiply with 2x 32-bit ints
+     *
+     * @param int $x
+     * @param int $y
+     * @return string $x * $y
+     */
+    private static function mul32_64($x, $y)
+    {
+        // see mul64() for a more detailed explanation of how this works
+
+        $x1 = ($x >> 16) & 0xFFFF;
+        $x0 = $x & 0xFFFF;
+
+        $y1 = ($y >> 16) & 0xFFFF;
+        $y0 = $y & 0xFFFF;
+
+        // the following 3x lines will possibly yield floats
+        $z2 = $x1 * $y1;
+        $z0 = $x0 * $y0;
+        $z1 = $x1 * $y0 + $x0 * $y1;
+
+        $a = intval(fmod($z0, 65536));
+        $b = intval($z0 / 65536) + intval(fmod($z1, 65536));
+        $c = intval($z1 / 65536) + intval(fmod($z2, 65536)) + intval($b / 65536);
+        $b = intval(fmod($b, 65536));
+        $d = intval($z2 / 65536) + intval($c / 65536);
+        $c = intval(fmod($c, 65536));
+        $d = intval(fmod($d, 65536));
+
+        return pack('n4', $d, $c, $b, $a);
+    }
+
+    /**
+     * 32-bit safe 64-bit Addition with 2x 64-bit strings
+     *
+     * @param int $x
+     * @param int $y
+     * @return int $x * $y
+     */
+    private static function add32_64($x, $y)
+    {
+        list(, $x1, $x2, $x3, $x4) = unpack('n4', $x);
+        list(, $y1, $y2, $y3, $y4) = unpack('n4', $y);
+        $a = $x4 + $y4;
+        $b = $x3 + $y3 + ($a >> 16);
+        $c = $x2 + $y2 + ($b >> 16);
+        $d = $x1 + $y1 + ($c >> 16);
+        return pack('n4', $d, $c, $b, $a);
+    }
+
+    /**
+     * 32-bit safe 32-bit Addition with 2x 32-bit strings
+     *
+     * @param int $x
+     * @param int $y
+     * @return int $x * $y
+     */
+    private static function add32($x, $y)
+    {
+        // see add64() for a more detailed explanation of how this works
+
+        $x1 = $x & 0xFFFF;
+        $x2 = ($x >> 16) & 0xFFFF;
+        $y1 = $y & 0xFFFF;
+        $y2 = ($y >> 16) & 0xFFFF;
+
+        $a = $x1 + $y1;
+        $b = ($x2 + $y2 + ($a >> 16)) << 16;
+        $a &= 0xFFFF;
+
+        return $a | $b;
+    }
+
+    /**
+     * NH Algorithm / 32-bit safe
      *
      * @param string $k string of length 1024 bytes.
      * @param string $m string with length divisible by 32 bytes.
      * @return string string of length 8 bytes.
      */
-    private static function nh($k, $m, $length)
+    private static function nh32($k, $m, $length)
     {
-        $toUInt32 = function ($x) {
-            $x = new BigInteger($x, 256);
-            $x->setPrecision(32);
-            return $x;
-        };
-
         //
         // Break M and K into 4-byte chunks
         //
-        //$t = strlen($m) >> 2;
-        $m = str_split($m, 4);
+        $k = unpack('N*', $k);
+        $m = unpack('N*', $m);
         $t = count($m);
-        $k = str_split($k, 4);
-        $k = array_pad(array_slice($k, 0, $t), $t, 0);
 
-        $m = array_map($toUInt32, $m);
-        $k = array_map($toUInt32, $k);
+        //
+        // Perform NH hash on the chunks, pairing words for multiplication
+        // which are 4 apart to accommodate vector-parallelism.
+        //
+        $i = 1;
+        $y = "\0\0\0\0\0\0\0\0";
+        while ($i <= $t) {
+            $temp  = self::add32($m[$i], $k[$i]);
+            $temp2 = self::add32($m[$i + 4], $k[$i + 4]);
+            $y = self::add32_64($y, self::mul32_64($temp, $temp2));
+
+            $temp  = self::add32($m[$i + 1], $k[$i + 1]);
+            $temp2 = self::add32($m[$i + 5], $k[$i + 5]);
+            $y = self::add32_64($y, self::mul32_64($temp, $temp2));
+
+            $temp  = self::add32($m[$i + 2], $k[$i + 2]);
+            $temp2 = self::add32($m[$i + 6], $k[$i + 6]);
+            $y = self::add32_64($y, self::mul32_64($temp, $temp2));
+
+            $temp  = self::add32($m[$i + 3], $k[$i + 3]);
+            $temp2 = self::add32($m[$i + 7], $k[$i + 7]);
+            $y = self::add32_64($y, self::mul32_64($temp, $temp2));
+
+            $i += 8;
+        }
+
+        return self::add32_64($y, pack('N2', 0, $length));
+    }
+
+    /**
+     * 64-bit Multiply with 2x 32-bit ints
+     *
+     * @param int $x
+     * @param int $y
+     * @return int $x * $y
+     */
+    private static function mul64($x, $y)
+    {
+        // since PHP doesn't implement unsigned integers we'll implement them with signed integers
+        // to do this we'll use karatsuba multiplication
+
+        $x1 = $x >> 16;
+        $x0 = $x & 0xFFFF;
+
+        $y1 = $y >> 16;
+        $y0 = $y & 0xFFFF;
+
+        $z2 = $x1 * $y1; // up to 32 bits long
+        $z0 = $x0 * $y0; // up to 32 bits long
+        $z1 = $x1 * $y0 + $x0 * $y1; // up to 33 bit long
+        // normally karatsuba multiplication calculates $z1 thusly:
+        //$z1 = ($x1 + $x0) * ($y0 + $y1) - $z2 - $z0;
+        // the idea being to eliminate one extra multiplication. for arbitrary precision math that makes sense
+        // but not for this purpose
+
+        // at this point karatsuba would normally return this:
+        //return ($z2 << 64) + ($z1 << 32) + $z0;
+        // the problem is that the output could be out of range for signed 64-bit ints,
+        // which would cause PHP to switch to floats, which would risk losing the lower few bits
+        // as such we'll OR 4x 16-bit blocks together like so:
+        /*
+          ........  |  ........  |  ........  |  ........
+          upper $z2 |  lower $z2 |  lower $z1 |  lower $z0
+                    | +upper $z1 | +upper $z0 |
+         +   $carry | +   $carry |            |
+        */
+        // technically upper $z1 is 17 bit - not 16 - but the most significant digit of that will
+        // just get added to $carry
+
+        $a = $z0 & 0xFFFF;
+        $b = ($z0 >> 16) + ($z1 & 0xFFFF);
+        $c = ($z1 >> 16) + ($z2 & 0xFFFF) + ($b >> 16);
+        $b = ($b & 0xFFFF) << 16;
+        $d = ($z2 >> 16) + ($c >> 16);
+        $c = ($c & 0xFFFF) << 32;
+        $d = ($d & 0xFFFF) << 48;
+
+        return $a | $b | $c | $d;
+    }
+
+    /**
+     * 64-bit Addition with 2x 64-bit ints
+     *
+     * @param int $x
+     * @param int $y
+     * @return int $x + $y
+     */
+    private static function add64($x, $y)
+    {
+        // doing $x + $y risks returning a result that's out of range for signed 64-bit ints
+        // in that event PHP would convert the result to a float and precision would be lost
+        // so we'll just add 2x 32-bit ints together like so:
+        /*
+           ........ | ........
+           upper $x | lower $x
+          +upper $y |+lower $y
+          +  $carry |
+        */
+        $x1 = $x & 0xFFFFFFFF;
+        $x2 = ($x >> 32) & 0xFFFFFFFF;
+        $y1 = $y & 0xFFFFFFFF;
+        $y2 = ($y >> 32) & 0xFFFFFFFF;
+
+        $a = $x1 + $y1;
+        $b = ($x2 + $y2 + ($a >> 32)) << 32;
+        $a &= 0xFFFFFFFF;
+
+        return $a | $b;
+    }
+
+    /**
+     * NH Algorithm / 64-bit safe
+     *
+     * @param string $k string of length 1024 bytes.
+     * @param string $m string with length divisible by 32 bytes.
+     * @return string string of length 8 bytes.
+     */
+    private static function nh64($k, $m, $length)
+    {
+        //
+        // Break M and K into 4-byte chunks
+        //
+        $k = unpack('N*', $k);
+        $m = unpack('N*', $m);
+        $t = count($m);
 
         //
         // Perform NH hash on the chunks, pairing words for multiplication
         // which are 4 apart to accommodate vector-parallelism.
         //
-        $y = new BigInteger();
-        $y->setPrecision(64);
-        $i = 0;
-        while ($i < $t) {
-            $temp = $m[$i]->add($k[$i]);
-            $temp->setPrecision(64);
-            $temp = $temp->multiply($m[$i + 4]->add($k[$i + 4]));
-            $y = $y->add($temp);
-
-            $temp = $m[$i + 1]->add($k[$i + 1]);
-            $temp->setPrecision(64);
-            $temp = $temp->multiply($m[$i + 5]->add($k[$i + 5]));
-            $y = $y->add($temp);
-
-            $temp = $m[$i + 2]->add($k[$i + 2]);
-            $temp->setPrecision(64);
-            $temp = $temp->multiply($m[$i + 6]->add($k[$i + 6]));
-            $y = $y->add($temp);
-
-            $temp = $m[$i + 3]->add($k[$i + 3]);
-            $temp->setPrecision(64);
-            $temp = $temp->multiply($m[$i + 7]->add($k[$i + 7]));
-            $y = $y->add($temp);
+        $i = 1;
+        $y = 0;
+        while ($i <= $t) {
+            $temp  = ($m[$i] + $k[$i]) & 0xFFFFFFFF;
+            $temp2 = ($m[$i + 4] + $k[$i + 4]) & 0xFFFFFFFF;
+            $y = self::add64($y, self::mul64($temp, $temp2));
+
+            $temp  = ($m[$i + 1] + $k[$i + 1]) & 0xFFFFFFFF;
+            $temp2 = ($m[$i + 5] + $k[$i + 5]) & 0xFFFFFFFF;
+            $y = self::add64($y, self::mul64($temp, $temp2));
+
+            $temp  = ($m[$i + 2] + $k[$i + 2]) & 0xFFFFFFFF;
+            $temp2 = ($m[$i + 6] + $k[$i + 6]) & 0xFFFFFFFF;
+            $y = self::add64($y, self::mul64($temp, $temp2));
+
+            $temp  = ($m[$i + 3] + $k[$i + 3]) & 0xFFFFFFFF;
+            $temp2 = ($m[$i + 7] + $k[$i + 7]) & 0xFFFFFFFF;
+            $y = self::add64($y, self::mul64($temp, $temp2));
 
             $i += 8;
         }
 
-        return $y->add($length)->toBytes();
+        return pack('J', self::add64($y, $length));
     }
 
     /**
@@ -1125,9 +1322,10 @@ private static function rotateLeft32($x, $shift)
             list($lo, $hi) = $x;
         }
 
+        $mask = -1 ^ (-1 << $shift);
         return [
-            ($hi << $shift) | (($lo >> (32 - $shift)) & (1 << $shift) - 1),
-            ($lo << $shift) | (($hi >> (32 - $shift)) & (1 << $shift) - 1)
+            ($hi << $shift) | (($lo >> (32 - $shift)) & $mask),
+            ($lo << $shift) | (($hi >> (32 - $shift)) & $mask)
         ];
     }
 
@@ -1277,14 +1475,27 @@ private static function processSHA3Block64(&$s)
     }
 
     /**
-     * Rotate 64-bit int
+     * Left rotate 64-bit int
      *
      * @param int $x
      * @param int $shift
      */
     private static function rotateLeft64($x, $shift)
     {
-        return ($x << $shift) | (($x >> (64 - $shift)) & ((1 << $shift) - 1));
+        $mask = -1 ^ (-1 << $shift);
+        return ($x << $shift) | (($x >> (64 - $shift)) & $mask);
+    }
+
+    /**
+     * Right rotate 64-bit int
+     *
+     * @param int $x
+     * @param int $shift
+     */
+    private static function rotateRight64($x, $shift)
+    {
+        $mask = -1 ^ (-1 << (64 - $shift));
+        return (($x >> $shift) & $mask) | ($x << (64 - $shift));
     }
 
     /**
@@ -1445,6 +1656,140 @@ private static function sha512($m, $hash)
         return $temp;
     }
 
+    /**
+     * Pure-PHP implementation of SHA512
+     *
+     * @param string $m
+     * @param array $hash
+     * @return string
+     */
+    private static function sha512_64($m, $hash)
+    {
+        static $k;
+
+        if (!isset($k)) {
+            // Initialize table of round constants
+            // (first 64 bits of the fractional parts of the cube roots of the first 80 primes 2..409)
+            $k = [
+                '428a2f98d728ae22', '7137449123ef65cd', 'b5c0fbcfec4d3b2f', 'e9b5dba58189dbbc',
+                '3956c25bf348b538', '59f111f1b605d019', '923f82a4af194f9b', 'ab1c5ed5da6d8118',
+                'd807aa98a3030242', '12835b0145706fbe', '243185be4ee4b28c', '550c7dc3d5ffb4e2',
+                '72be5d74f27b896f', '80deb1fe3b1696b1', '9bdc06a725c71235', 'c19bf174cf692694',
+                'e49b69c19ef14ad2', 'efbe4786384f25e3', '0fc19dc68b8cd5b5', '240ca1cc77ac9c65',
+                '2de92c6f592b0275', '4a7484aa6ea6e483', '5cb0a9dcbd41fbd4', '76f988da831153b5',
+                '983e5152ee66dfab', 'a831c66d2db43210', 'b00327c898fb213f', 'bf597fc7beef0ee4',
+                'c6e00bf33da88fc2', 'd5a79147930aa725', '06ca6351e003826f', '142929670a0e6e70',
+                '27b70a8546d22ffc', '2e1b21385c26c926', '4d2c6dfc5ac42aed', '53380d139d95b3df',
+                '650a73548baf63de', '766a0abb3c77b2a8', '81c2c92e47edaee6', '92722c851482353b',
+                'a2bfe8a14cf10364', 'a81a664bbc423001', 'c24b8b70d0f89791', 'c76c51a30654be30',
+                'd192e819d6ef5218', 'd69906245565a910', 'f40e35855771202a', '106aa07032bbd1b8',
+                '19a4c116b8d2d0c8', '1e376c085141ab53', '2748774cdf8eeb99', '34b0bcb5e19b48a8',
+                '391c0cb3c5c95a63', '4ed8aa4ae3418acb', '5b9cca4f7763e373', '682e6ff3d6b2b8a3',
+                '748f82ee5defb2fc', '78a5636f43172f60', '84c87814a1f0ab72', '8cc702081a6439ec',
+                '90befffa23631e28', 'a4506cebde82bde9', 'bef9a3f7b2c67915', 'c67178f2e372532b',
+                'ca273eceea26619c', 'd186b8c721c0c207', 'eada7dd6cde0eb1e', 'f57d4f7fee6ed178',
+                '06f067aa72176fba', '0a637dc5a2c898a6', '113f9804bef90dae', '1b710b35131c471b',
+                '28db77f523047d84', '32caab7b40c72493', '3c9ebe0a15c9bebc', '431d67c49c100d4c',
+                '4cc5d4becb3e42b6', '597f299cfc657e2a', '5fcb6fab3ad6faec', '6c44198c4a475817'
+            ];
+
+            for ($i = 0; $i < 80; $i++) {
+                list(, $k[$i]) = unpack('J', pack('H*', $k[$i]));
+            }
+        }
+
+        // Pre-processing
+        $length = strlen($m);
+        // to round to nearest 112 mod 128, we'll add 128 - (length + (128 - 112)) % 128
+        $m .= str_repeat(chr(0), 128 - (($length + 16) & 0x7F));
+        $m[$length] = chr(0x80);
+        // we don't support hashing strings 512MB long
+        $m .= pack('N4', 0, 0, 0, $length << 3);
+
+        // Process the message in successive 1024-bit chunks
+        $chunks = str_split($m, 128);
+        foreach ($chunks as $chunk) {
+            $w = [];
+            for ($i = 0; $i < 16; $i++) {
+                list(, $w[]) = unpack('J', Strings::shift($chunk, 8));
+            }
+
+            // Extend the sixteen 32-bit words into eighty 32-bit words
+            for ($i = 16; $i < 80; $i++) {
+                $temp = [
+                    self::rotateRight64($w[$i - 15], 1),
+                    self::rotateRight64($w[$i - 15], 8),
+                    ($w[$i - 15] >> 7) & 0x01FFFFFFFFFFFFFF,
+                ];
+                $s0 = $temp[0] ^ $temp[1] ^ $temp[2];
+                $temp = [
+                    self::rotateRight64($w[$i - 2], 19),
+                    self::rotateRight64($w[$i - 2], 61),
+                    ($w[$i - 2] >> 6) & 0x03FFFFFFFFFFFFFF,
+                ];
+                $s1 = $temp[0] ^ $temp[1] ^ $temp[2];
+
+                $w[$i] = $w[$i - 16];
+                $w[$i] = self::add64($w[$i], $s0);
+                $w[$i] = self::add64($w[$i], $w[$i - 7]);
+                $w[$i] = self::add64($w[$i], $s1);
+            }
+
+            // Initialize hash value for this chunk
+            list($a, $b, $c, $d, $e, $f, $g, $h) = $hash;
+
+            // Main loop
+            for ($i = 0; $i < 80; $i++) {
+                $temp = [
+                    self::rotateRight64($a, 28),
+                    self::rotateRight64($a, 34),
+                    self::rotateRight64($a, 39),
+                ];
+                $s0 = $temp[0] ^ $temp[1] ^ $temp[2];
+                $temp = [$a & $b, $a & $c, $b & $c];
+                $maj = $temp[0] ^ $temp[1] ^ $temp[2];
+                $t2 = self::add64($s0, $maj);
+
+                $temp = [
+                    self::rotateRight64($e, 14),
+                    self::rotateRight64($e, 18),
+                    self::rotateRight64($e, 41),
+                ];
+                $s1 = $temp[0] ^ $temp[1] ^ $temp[2];
+                $ch = ($e & $f) ^ ($g & ~$e);
+                $t1 = self::add64($h, $s1);
+                $t1 = self::add64($t1, $ch);
+                $t1 = self::add64($t1, $k[$i]);
+                $t1 = self::add64($t1, $w[$i]);
+
+                $h = $g;
+                $g = $f;
+                $f = $e;
+                $e = self::add64($d, $t1);
+                $d = $c;
+                $c = $b;
+                $b = $a;
+                $a = self::add64($t1, $t2);
+            }
+
+            // Add this chunk's hash to result so far
+            $hash = [
+                self::add64($hash[0], $a),
+                self::add64($hash[1], $b),
+                self::add64($hash[2], $c),
+                self::add64($hash[3], $d),
+                self::add64($hash[4], $e),
+                self::add64($hash[5], $f),
+                self::add64($hash[6], $g),
+                self::add64($hash[7], $h),
+            ];
+        }
+
+        // Produce the final hash value (big-endian)
+        // (\phpseclib3\Crypt\Hash::hash() trims the output for hashes but not for HMACs.  as such, we trim the output here)
+        return pack('J*', ...$hash);
+    }
+
     /**
      *  __toString() magic method
      */
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA.php
index 1357199790..9cbe6bfc75 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA.php
@@ -10,7 +10,7 @@
  * <?php
  * include 'vendor/autoload.php';
  *
- * $private = \phpseclib3\Crypt\RSA::createKey();
+ * $private = Crypt\RSA::createKey();
  * $public = $private->getPublicKey();
  *
  * $plaintext = 'terrafrost';
@@ -26,7 +26,7 @@
  * <?php
  * include 'vendor/autoload.php';
  *
- * $private = \phpseclib3\Crypt\RSA::createKey();
+ * $private = Crypt\RSA::createKey();
  * $public = $private->getPublicKey();
  *
  * $plaintext = 'terrafrost';
@@ -180,7 +180,7 @@ abstract class RSA extends AsymmetricKey
     /**
      * Hash function for the Mask Generation Function
      *
-     * @var \phpseclib3\Crypt\Hash
+     * @var Hash
      */
     protected $mgfHash;
 
@@ -194,21 +194,21 @@ abstract class RSA extends AsymmetricKey
     /**
      * Modulus (ie. n)
      *
-     * @var \phpseclib3\Math\BigInteger
+     * @var Math\BigInteger
      */
     protected $modulus;
 
     /**
      * Modulus length
      *
-     * @var \phpseclib3\Math\BigInteger
+     * @var Math\BigInteger
      */
     protected $k;
 
     /**
      * Exponent (ie. e or d)
      *
-     * @var \phpseclib3\Math\BigInteger
+     * @var Math\BigInteger
      */
     protected $exponent;
 
@@ -252,7 +252,7 @@ abstract class RSA extends AsymmetricKey
     /**
      * Public Exponent
      *
-     * @var \phpseclib3\Math\BigInteger
+     * @var Math\BigInteger
      */
     protected $publicExponent;
 
@@ -297,7 +297,7 @@ public static function setOpenSSLConfigPath($val)
      *
      * The public key can be extracted from the private key
      *
-     * @return RSA\PrivateKey
+     * @return PrivateKey
      * @param int $bits
      */
     public static function createKey($bits = 2048)
@@ -332,6 +332,7 @@ public static function createKey($bits = 2048)
                 openssl_pkey_export($rsa, $privatekeystr, null, $config);
 
                 // clear the buffer of error strings stemming from a minimalistic openssl.cnf
+                // https://github.com/php/php-src/issues/11054 talks about other errors this'll pick up
                 while (openssl_error_string() !== false) {
                 }
 
@@ -509,7 +510,7 @@ protected function __construct()
      *
      * See {@link http://tools.ietf.org/html/rfc3447#section-4.1 RFC3447#section-4.1}.
      *
-     * @param bool|\phpseclib3\Math\BigInteger $x
+     * @param bool|Math\BigInteger $x
      * @param int $xLen
      * @return bool|string
      */
@@ -531,7 +532,7 @@ protected function i2osp($x, $xLen)
      * See {@link http://tools.ietf.org/html/rfc3447#section-4.2 RFC3447#section-4.2}.
      *
      * @param string $x
-     * @return \phpseclib3\Math\BigInteger
+     * @return Math\BigInteger
      */
     protected function os2ip($x)
     {
@@ -702,7 +703,7 @@ public function withHash($hash)
     {
         $new = clone $this;
 
-        // \phpseclib3\Crypt\Hash supports algorithms that PKCS#1 doesn't support.  md5-96 and sha1-96, for example.
+        // Crypt\Hash supports algorithms that PKCS#1 doesn't support.  md5-96 and sha1-96, for example.
         switch (strtolower($hash)) {
             case 'md2':
             case 'md5':
@@ -737,7 +738,7 @@ public function withMGFHash($hash)
     {
         $new = clone $this;
 
-        // \phpseclib3\Crypt\Hash supports algorithms that PKCS#1 doesn't support.  md5-96 and sha1-96, for example.
+        // Crypt\Hash supports algorithms that PKCS#1 doesn't support.  md5-96 and sha1-96, for example.
         switch (strtolower($hash)) {
             case 'md2':
             case 'md5':
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/JWK.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/JWK.php
index 87f543de95..6dcf1cb03d 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/JWK.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/JWK.php
@@ -90,9 +90,9 @@ public static function load($key, $password = '')
     /**
      * Convert a private key to the appropriate format.
      *
-     * @param \phpseclib3\Math\BigInteger $n
-     * @param \phpseclib3\Math\BigInteger $e
-     * @param \phpseclib3\Math\BigInteger $d
+     * @param BigInteger $n
+     * @param BigInteger $e
+     * @param BigInteger $d
      * @param array $primes
      * @param array $exponents
      * @param array $coefficients
@@ -124,8 +124,8 @@ public static function savePrivateKey(BigInteger $n, BigInteger $e, BigInteger $
     /**
      * Convert a public key to the appropriate format
      *
-     * @param \phpseclib3\Math\BigInteger $n
-     * @param \phpseclib3\Math\BigInteger $e
+     * @param BigInteger $n
+     * @param BigInteger $e
      * @param array $options optional
      * @return string
      */
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/MSBLOB.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/MSBLOB.php
index e9a0c4f3c0..b60e48ea5d 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/MSBLOB.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/MSBLOB.php
@@ -174,9 +174,9 @@ public static function load($key, $password = '')
     /**
      * Convert a private key to the appropriate format.
      *
-     * @param \phpseclib3\Math\BigInteger $n
-     * @param \phpseclib3\Math\BigInteger $e
-     * @param \phpseclib3\Math\BigInteger $d
+     * @param BigInteger $n
+     * @param BigInteger $e
+     * @param BigInteger $d
      * @param array $primes
      * @param array $exponents
      * @param array $coefficients
@@ -211,8 +211,8 @@ public static function savePrivateKey(BigInteger $n, BigInteger $e, BigInteger $
     /**
      * Convert a public key to the appropriate format
      *
-     * @param \phpseclib3\Math\BigInteger $n
-     * @param \phpseclib3\Math\BigInteger $e
+     * @param BigInteger $n
+     * @param BigInteger $e
      * @return string
      */
     public static function savePublicKey(BigInteger $n, BigInteger $e)
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/OpenSSH.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/OpenSSH.php
index 2367810a7e..ca74ea481a 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/OpenSSH.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/OpenSSH.php
@@ -90,8 +90,8 @@ public static function load($key, $password = '')
     /**
      * Convert a public key to the appropriate format
      *
-     * @param \phpseclib3\Math\BigInteger $n
-     * @param \phpseclib3\Math\BigInteger $e
+     * @param BigInteger $n
+     * @param BigInteger $e
      * @param array $options optional
      * @return string
      */
@@ -112,9 +112,9 @@ public static function savePublicKey(BigInteger $n, BigInteger $e, array $option
     /**
      * Convert a private key to the appropriate format.
      *
-     * @param \phpseclib3\Math\BigInteger $n
-     * @param \phpseclib3\Math\BigInteger $e
-     * @param \phpseclib3\Math\BigInteger $d
+     * @param BigInteger $n
+     * @param BigInteger $e
+     * @param BigInteger $d
      * @param array $primes
      * @param array $exponents
      * @param array $coefficients
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/PKCS1.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/PKCS1.php
index 276c6024fc..76335567fc 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/PKCS1.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/PKCS1.php
@@ -102,9 +102,9 @@ public static function load($key, $password = '')
     /**
      * Convert a private key to the appropriate format.
      *
-     * @param \phpseclib3\Math\BigInteger $n
-     * @param \phpseclib3\Math\BigInteger $e
-     * @param \phpseclib3\Math\BigInteger $d
+     * @param BigInteger $n
+     * @param BigInteger $e
+     * @param BigInteger $d
      * @param array $primes
      * @param array $exponents
      * @param array $coefficients
@@ -142,8 +142,8 @@ public static function savePrivateKey(BigInteger $n, BigInteger $e, BigInteger $
     /**
      * Convert a public key to the appropriate format
      *
-     * @param \phpseclib3\Math\BigInteger $n
-     * @param \phpseclib3\Math\BigInteger $e
+     * @param BigInteger $n
+     * @param BigInteger $e
      * @return string
      */
     public static function savePublicKey(BigInteger $n, BigInteger $e)
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/PKCS8.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/PKCS8.php
index 1eaac6ef85..53918bc0d4 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/PKCS8.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/PKCS8.php
@@ -88,9 +88,9 @@ public static function load($key, $password = '')
     /**
      * Convert a private key to the appropriate format.
      *
-     * @param \phpseclib3\Math\BigInteger $n
-     * @param \phpseclib3\Math\BigInteger $e
-     * @param \phpseclib3\Math\BigInteger $d
+     * @param BigInteger $n
+     * @param BigInteger $e
+     * @param BigInteger $d
      * @param array $primes
      * @param array $exponents
      * @param array $coefficients
@@ -108,8 +108,8 @@ public static function savePrivateKey(BigInteger $n, BigInteger $e, BigInteger $
     /**
      * Convert a public key to the appropriate format
      *
-     * @param \phpseclib3\Math\BigInteger $n
-     * @param \phpseclib3\Math\BigInteger $e
+     * @param BigInteger $n
+     * @param BigInteger $e
      * @param array $options optional
      * @return string
      */
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/PSS.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/PSS.php
index ed75b9b7ac..bf51bcf769 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/PSS.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/PSS.php
@@ -154,9 +154,9 @@ public static function load($key, $password = '')
     /**
      * Convert a private key to the appropriate format.
      *
-     * @param \phpseclib3\Math\BigInteger $n
-     * @param \phpseclib3\Math\BigInteger $e
-     * @param \phpseclib3\Math\BigInteger $d
+     * @param BigInteger $n
+     * @param BigInteger $e
+     * @param BigInteger $d
      * @param array $primes
      * @param array $exponents
      * @param array $coefficients
@@ -177,8 +177,8 @@ public static function savePrivateKey(BigInteger $n, BigInteger $e, BigInteger $
     /**
      * Convert a public key to the appropriate format
      *
-     * @param \phpseclib3\Math\BigInteger $n
-     * @param \phpseclib3\Math\BigInteger $e
+     * @param BigInteger $n
+     * @param BigInteger $e
      * @param array $options optional
      * @return string
      */
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/PuTTY.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/PuTTY.php
index fe35717bbd..293903cef1 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/PuTTY.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/PuTTY.php
@@ -85,9 +85,9 @@ public static function load($key, $password = '')
     /**
      * Convert a private key to the appropriate format.
      *
-     * @param \phpseclib3\Math\BigInteger $n
-     * @param \phpseclib3\Math\BigInteger $e
-     * @param \phpseclib3\Math\BigInteger $d
+     * @param BigInteger $n
+     * @param BigInteger $e
+     * @param BigInteger $d
      * @param array $primes
      * @param array $exponents
      * @param array $coefficients
@@ -110,8 +110,8 @@ public static function savePrivateKey(BigInteger $n, BigInteger $e, BigInteger $
     /**
      * Convert a public key to the appropriate format
      *
-     * @param \phpseclib3\Math\BigInteger $n
-     * @param \phpseclib3\Math\BigInteger $e
+     * @param BigInteger $n
+     * @param BigInteger $e
      * @return string
      */
     public static function savePublicKey(BigInteger $n, BigInteger $e)
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/Raw.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/Raw.php
index db72878403..55c7ccd7aa 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/Raw.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/Raw.php
@@ -138,9 +138,9 @@ public static function load($key, $password = '')
     /**
      * Convert a private key to the appropriate format.
      *
-     * @param \phpseclib3\Math\BigInteger $n
-     * @param \phpseclib3\Math\BigInteger $e
-     * @param \phpseclib3\Math\BigInteger $d
+     * @param BigInteger $n
+     * @param BigInteger $e
+     * @param BigInteger $d
      * @param array $primes
      * @param array $exponents
      * @param array $coefficients
@@ -173,8 +173,8 @@ public static function savePrivateKey(BigInteger $n, BigInteger $e, BigInteger $
     /**
      * Convert a public key to the appropriate format
      *
-     * @param \phpseclib3\Math\BigInteger $n
-     * @param \phpseclib3\Math\BigInteger $e
+     * @param BigInteger $n
+     * @param BigInteger $e
      * @return array
      */
     public static function savePublicKey(BigInteger $n, BigInteger $e)
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/XML.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/XML.php
index 280048cc0a..d569dea6da 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/XML.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/XML.php
@@ -123,9 +123,9 @@ public static function load($key, $password = '')
     /**
      * Convert a private key to the appropriate format.
      *
-     * @param \phpseclib3\Math\BigInteger $n
-     * @param \phpseclib3\Math\BigInteger $e
-     * @param \phpseclib3\Math\BigInteger $d
+     * @param BigInteger $n
+     * @param BigInteger $e
+     * @param BigInteger $d
      * @param array $primes
      * @param array $exponents
      * @param array $coefficients
@@ -157,8 +157,8 @@ public static function savePrivateKey(BigInteger $n, BigInteger $e, BigInteger $
     /**
      * Convert a public key to the appropriate format
      *
-     * @param \phpseclib3\Math\BigInteger $n
-     * @param \phpseclib3\Math\BigInteger $e
+     * @param BigInteger $n
+     * @param BigInteger $e
      * @return string
      */
     public static function savePublicKey(BigInteger $n, BigInteger $e)
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/PrivateKey.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/PrivateKey.php
index 37dd09a45b..8c828b316f 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/PrivateKey.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/PrivateKey.php
@@ -51,7 +51,7 @@ final class PrivateKey extends RSA implements Common\PrivateKey
     /**
      * Private Exponent
      *
-     * @var \phpseclib3\Math\BigInteger
+     * @var BigInteger
      */
     protected $privateExponent;
 
@@ -60,7 +60,7 @@ final class PrivateKey extends RSA implements Common\PrivateKey
      *
      * See {@link http://tools.ietf.org/html/rfc3447#section-5.1.2 RFC3447#section-5.1.2}.
      *
-     * @return bool|\phpseclib3\Math\BigInteger
+     * @return bool|BigInteger
      */
     private function rsadp(BigInteger $c)
     {
@@ -75,7 +75,7 @@ private function rsadp(BigInteger $c)
      *
      * See {@link http://tools.ietf.org/html/rfc3447#section-5.2.1 RFC3447#section-5.2.1}.
      *
-     * @return bool|\phpseclib3\Math\BigInteger
+     * @return bool|BigInteger
      */
     private function rsasp1(BigInteger $m)
     {
@@ -88,8 +88,8 @@ private function rsasp1(BigInteger $m)
     /**
      * Exponentiate
      *
-     * @param \phpseclib3\Math\BigInteger $x
-     * @return \phpseclib3\Math\BigInteger
+     * @param BigInteger $x
+     * @return BigInteger
      */
     protected function exponentiate(BigInteger $x)
     {
@@ -169,10 +169,10 @@ protected function exponentiate(BigInteger $x)
      * Protects against timing attacks by employing RSA Blinding.
      * Returns $x->modPow($this->exponents[$i], $this->primes[$i])
      *
-     * @param \phpseclib3\Math\BigInteger $x
-     * @param \phpseclib3\Math\BigInteger $r
+     * @param BigInteger $x
+     * @param BigInteger $r
      * @param int $i
-     * @return \phpseclib3\Math\BigInteger
+     * @return BigInteger
      */
     private function blind(BigInteger $x, BigInteger $r, $i)
     {
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/PublicKey.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/PublicKey.php
index 58939a9f66..ff80ae79c1 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/PublicKey.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/PublicKey.php
@@ -35,8 +35,8 @@ final class PublicKey extends RSA implements Common\PublicKey
     /**
      * Exponentiate
      *
-     * @param \phpseclib3\Math\BigInteger $x
-     * @return \phpseclib3\Math\BigInteger
+     * @param BigInteger $x
+     * @return BigInteger
      */
     private function exponentiate(BigInteger $x)
     {
@@ -48,8 +48,8 @@ private function exponentiate(BigInteger $x)
      *
      * See {@link http://tools.ietf.org/html/rfc3447#section-5.2.2 RFC3447#section-5.2.2}.
      *
-     * @param \phpseclib3\Math\BigInteger $s
-     * @return bool|\phpseclib3\Math\BigInteger
+     * @param BigInteger $s
+     * @return bool|BigInteger
      */
     private function rsavp1($s)
     {
@@ -405,8 +405,8 @@ private function rsaes_oaep_encrypt($m)
      *
      * See {@link http://tools.ietf.org/html/rfc3447#section-5.1.1 RFC3447#section-5.1.1}.
      *
-     * @param \phpseclib3\Math\BigInteger $m
-     * @return bool|\phpseclib3\Math\BigInteger
+     * @param BigInteger $m
+     * @return bool|BigInteger
      */
     private function rsaep($m)
     {
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Exception/InvalidPacketLengthException.php b/vendor/phpseclib/phpseclib/phpseclib/Exception/InvalidPacketLengthException.php
new file mode 100644
index 0000000000..b96ead1e36
--- /dev/null
+++ b/vendor/phpseclib/phpseclib/phpseclib/Exception/InvalidPacketLengthException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace phpseclib3\Exception;
+
+/**
+ * Indicates an absent or malformed packet length header
+ */
+class InvalidPacketLengthException extends ConnectionClosedException
+{
+}
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Exception/TimeoutException.php b/vendor/phpseclib/phpseclib/phpseclib/Exception/TimeoutException.php
new file mode 100644
index 0000000000..8701f8d761
--- /dev/null
+++ b/vendor/phpseclib/phpseclib/phpseclib/Exception/TimeoutException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace phpseclib3\Exception;
+
+/**
+ * Indicates a timeout awaiting server response
+ */
+class TimeoutException extends \RuntimeException
+{
+}
diff --git a/vendor/phpseclib/phpseclib/phpseclib/File/ANSI.php b/vendor/phpseclib/phpseclib/phpseclib/File/ANSI.php
index 5803a372da..41477ba5dd 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/File/ANSI.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/File/ANSI.php
@@ -140,7 +140,7 @@ class ANSI
     /**
      * Default Constructor.
      *
-     * @return \phpseclib3\File\ANSI
+     * @return ANSI
      */
     public function __construct()
     {
diff --git a/vendor/phpseclib/phpseclib/phpseclib/File/ASN1.php b/vendor/phpseclib/phpseclib/phpseclib/File/ASN1.php
index 3096ff1a1b..c4b06a5609 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/File/ASN1.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/File/ASN1.php
@@ -1148,6 +1148,11 @@ public static function decodeOID($content)
         $oid = [];
         $pos = 0;
         $len = strlen($content);
+        // see https://github.com/openjdk/jdk/blob/2deb318c9f047ec5a4b160d66a4b52f93688ec42/src/java.base/share/classes/sun/security/util/ObjectIdentifier.java#L55
+        if ($len > 4096) {
+            //throw new \RuntimeException("Object identifier size is limited to 4096 bytes ($len bytes present)");
+            return false;
+        }
 
         if (ord($content[$len - 1]) & 0x80) {
             return false;
diff --git a/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Element.php b/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Element.php
index 6540b4210c..ae4b764b09 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Element.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Element.php
@@ -34,7 +34,7 @@ class Element
      * Constructor
      *
      * @param string $encoded
-     * @return \phpseclib3\File\ASN1\Element
+     * @return Element
      */
     public function __construct($encoded)
     {
diff --git a/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/TBSCertList.php b/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/TBSCertList.php
index 49b3cfc57e..8e00f4d859 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/TBSCertList.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/TBSCertList.php
@@ -27,9 +27,9 @@ abstract class TBSCertList
         'children' => [
             'version' => [
                 'type' => ASN1::TYPE_INTEGER,
-                'mapping' => ['v1', 'v2', 'v3'],
+                'mapping' => ['v1', 'v2'],
                 'optional' => true,
-                'default' => 'v2'
+                'default' => 'v1'
             ],
             'signature' => AlgorithmIdentifier::MAP,
             'issuer' => Name::MAP,
diff --git a/vendor/phpseclib/phpseclib/phpseclib/File/X509.php b/vendor/phpseclib/phpseclib/phpseclib/File/X509.php
index 5e2f073f4a..f4d96a26e9 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/File/X509.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/File/X509.php
@@ -272,7 +272,7 @@ class X509
     /**
      * Default Constructor.
      *
-     * @return \phpseclib3\File\X509
+     * @return X509
      */
     public function __construct()
     {
@@ -1390,7 +1390,7 @@ private function validateSignatureCountable($caonly, $count)
      * @param string $signatureAlgorithm
      * @param string $signature
      * @param string $signatureSubject
-     * @throws \phpseclib3\Exception\UnsupportedAlgorithmException if the algorithm is unsupported
+     * @throws UnsupportedAlgorithmException if the algorithm is unsupported
      * @return bool
      */
     private function validateSignatureHelper($publicKeyAlgorithm, $publicKey, $signatureAlgorithm, $signature, $signatureSubject)
@@ -2904,11 +2904,11 @@ public function signCRL(X509 $issuer, X509 $crl)
         $version = isset($tbsCertList['version']) ? $tbsCertList['version'] : 0;
         if (!$version) {
             if (!empty($tbsCertList['crlExtensions'])) {
-                $version = 1; // v2.
+                $version = 'v2'; // v2.
             } elseif (!empty($tbsCertList['revokedCertificates'])) {
                 foreach ($tbsCertList['revokedCertificates'] as $cert) {
                     if (!empty($cert['crlEntryExtensions'])) {
-                        $version = 1; // v2.
+                        $version = 'v2'; // v2.
                     }
                 }
             }
@@ -2972,7 +2972,7 @@ public function signCRL(X509 $issuer, X509 $crl)
      * Identify signature algorithm from key settings
      *
      * @param PrivateKey $key
-     * @throws \phpseclib3\Exception\UnsupportedAlgorithmException if the algorithm is unsupported
+     * @throws UnsupportedAlgorithmException if the algorithm is unsupported
      * @return array
      */
     private static function identifySignatureAlgorithm(PrivateKey $key)
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger.php b/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger.php
index 3f4dc2ed77..2a9cc0b43d 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger.php
@@ -29,7 +29,6 @@
 
 use phpseclib3\Exception\BadConfigurationException;
 use phpseclib3\Math\BigInteger\Engines\Engine;
-use UnexpectedValueException;
 
 /**
  * Pure-PHP arbitrary precision integer arithmetic library. Supports base-2, base-10, base-16, and base-256
@@ -153,7 +152,7 @@ private static function initialize_static_variables()
                 }
             }
 
-            throw new UnexpectedValueException('No valid BigInteger found. This is only possible when JIT is enabled on Windows and neither the GMP or BCMath extensions are available so either disable JIT or install GMP / BCMath');
+            throw new \UnexpectedValueException('No valid BigInteger found. This is only possible when JIT is enabled on Windows and neither the GMP or BCMath extensions are available so either disable JIT or install GMP / BCMath');
         }
     }
 
@@ -163,7 +162,7 @@ private static function initialize_static_variables()
      * If the second parameter - $base - is negative, then it will be assumed that the number's are encoded using
      * two's compliment.  The sole exception to this is -10, which is treated the same as 10 is.
      *
-     * @param string|int|BigInteger\Engines\Engine $x Base-10 number or base-$base number if $base set.
+     * @param string|int|Engine $x Base-10 number or base-$base number if $base set.
      * @param int $base
      */
     public function __construct($x = 0, $base = 10)
@@ -172,7 +171,7 @@ public function __construct($x = 0, $base = 10)
 
         if ($x instanceof self::$mainEngine) {
             $this->value = clone $x;
-        } elseif ($x instanceof BigInteger\Engines\Engine) {
+        } elseif ($x instanceof Engine) {
             $this->value = new static("$x");
             $this->value->setPrecision($x->getPrecision());
         } else {
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/BCMath.php b/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/BCMath.php
index 7c5ca9fb30..e3a49906bf 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/BCMath.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/BCMath.php
@@ -336,7 +336,7 @@ public function bitwise_and(BCMath $x)
      */
     public function bitwise_or(BCMath $x)
     {
-        return $this->bitwiseXorHelper($x);
+        return $this->bitwiseOrHelper($x);
     }
 
     /**
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/BCMath/Reductions/Barrett.php b/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/BCMath/Reductions/Barrett.php
index 0fb7eaebaa..ec1d5caa74 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/BCMath/Reductions/Barrett.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/BCMath/Reductions/Barrett.php
@@ -66,7 +66,7 @@ protected static function reduce($n, $m)
 
         $m_length = strlen($m);
 
-        if (strlen($n) > 2 * $m_length) {
+        if (strlen($n) >= 2 * $m_length) {
             return bcmod($n, $m);
         }
 
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/Engine.php b/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/Engine.php
index abdf3b4752..474abe105b 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/Engine.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/Engine.php
@@ -619,7 +619,7 @@ public function getLength()
      */
     public function getLengthInBytes()
     {
-        return strlen($this->toBytes());
+        return (int) ceil($this->getLength() / 8);
     }
 
     /**
@@ -786,6 +786,11 @@ protected static function randomRangePrimeOuter(Engine $min, Engine $max)
             $min = $temp;
         }
 
+        $length = $max->getLength();
+        if ($length > 8196) {
+            throw new \RuntimeException("Generation of random prime numbers larger than 8196 has been disabled ($length)");
+        }
+
         $x = static::randomRange($min, $max);
 
         return static::randomRangePrimeInner($x, $min, $max);
@@ -990,6 +995,15 @@ protected function testPrimality($t)
      */
     public function isPrime($t = false)
     {
+        // OpenSSL limits RSA keys to 16384 bits. The length of an RSA key is equal to the length of the modulo, which is
+        // produced by multiplying the primes p and q by one another. The largest number two 8196 bit primes can produce is
+        // a 16384 bit number so, basically, 8196 bit primes are the largest OpenSSL will generate and if that's the largest
+        // that it'll generate it also stands to reason that that's the largest you'll be able to test primality on
+        $length = $this->getLength();
+        if ($length > 8196) {
+            throw new \RuntimeException("Primality testing is not supported for numbers larger than 8196 bits ($length)");
+        }
+
         if (!$t) {
             $t = $this->setupIsPrime();
         }
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP.php b/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP.php
index 4c30da564b..2d89595225 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP.php
@@ -1332,7 +1332,8 @@ private function bitwise_small_split($split)
      */
     protected static function testJITOnWindows()
     {
-        if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN' && function_exists('opcache_get_status') && !defined('PHPSECLIB_ALLOW_JIT')) {
+        // see https://github.com/php/php-src/issues/11917
+        if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN' && function_exists('opcache_get_status') && PHP_VERSION_ID < 80213 && !defined('PHPSECLIB_ALLOW_JIT')) {
             $status = opcache_get_status();
             if ($status && isset($status['jit']) && $status['jit']['enabled'] && $status['jit']['on']) {
                 return true;
@@ -1340,4 +1341,17 @@ protected static function testJITOnWindows()
         }
         return false;
     }
+
+    /**
+     * Return the size of a BigInteger in bits
+     *
+     * @return int
+     */
+    public function getLength()
+    {
+        $max = count($this->value) - 1;
+        return $max != -1 ?
+            $max * static::BASE + intval(ceil(log($this->value[$max] + 1, 2))) :
+            0;
+    }
 }
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP/Reductions/Barrett.php b/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP/Reductions/Barrett.php
index 3518d76f31..8493741936 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP/Reductions/Barrett.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP/Reductions/Barrett.php
@@ -56,7 +56,7 @@ protected static function reduce(array $n, array $m, $class)
         $m_length = count($m);
 
         // if (self::compareHelper($n, $static::square($m)) >= 0) {
-        if (count($n) > 2 * $m_length) {
+        if (count($n) >= 2 * $m_length) {
             $lhs = new $class();
             $rhs = new $class();
             $lhs->value = $n;
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP/Reductions/EvalBarrett.php b/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP/Reductions/EvalBarrett.php
index 2f9433172f..2cf69f2e81 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP/Reductions/EvalBarrett.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP/Reductions/EvalBarrett.php
@@ -100,7 +100,7 @@ protected static function generateCustomReduction(PHP $m, $class)
         $cutoff = count($m) + (count($m) >> 1);
 
         $code = '
-            if (count($n) > ' . (2 * count($m)) . ') {
+            if (count($n) >= ' . (2 * count($m)) . ') {
                 $lhs = new ' . $class . '();
                 $rhs = new ' . $class . '();
                 $lhs->value = $n;
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Math/BinaryField.php b/vendor/phpseclib/phpseclib/phpseclib/Math/BinaryField.php
index 3e21a67ad6..5da8c937e2 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Math/BinaryField.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Math/BinaryField.php
@@ -48,6 +48,15 @@ class BinaryField extends FiniteField
     public function __construct(...$indices)
     {
         $m = array_shift($indices);
+        if ($m > 571) {
+            /* sect571r1 and sect571k1 are the largest binary curves that https://www.secg.org/sec2-v2.pdf defines
+               altho theoretically there may be legit reasons to use binary finite fields with larger degrees
+               imposing a limit on the maximum size is both reasonable and precedented. in particular,
+               http://tools.ietf.org/html/rfc4253#section-6.1 (The Secure Shell (SSH) Transport Layer Protocol) says
+               "implementations SHOULD check that the packet length is reasonable in order for the implementation to
+                avoid denial of service and/or buffer overflow attacks" */
+            throw new \OutOfBoundsException('Degrees larger than 571 are not supported');
+        }
         $val = str_repeat('0', $m) . '1';
         foreach ($indices as $index) {
             $val[$index] = '1';
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Math/PrimeField/Integer.php b/vendor/phpseclib/phpseclib/phpseclib/Math/PrimeField/Integer.php
index ddb04912db..1bd7aaf0f2 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Math/PrimeField/Integer.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Math/PrimeField/Integer.php
@@ -263,7 +263,7 @@ public function squareRoot()
         $r = $this->value->powMod($temp, static::$modulo[$this->instanceID]);
 
         while (!$t->equals($one)) {
-            for ($i == clone $one; $i->compare($m) < 0; $i = $i->add($one)) {
+            for ($i = clone $one; $i->compare($m) < 0; $i = $i->add($one)) {
                 if ($t->powMod($two->pow($i), static::$modulo[$this->instanceID])->equals($one)) {
                     break;
                 }
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Net/SFTP.php b/vendor/phpseclib/phpseclib/phpseclib/Net/SFTP.php
index cdf0bec695..1e61e0bb39 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Net/SFTP.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Net/SFTP.php
@@ -391,7 +391,8 @@ public function __construct($host, $port = 22, $timeout = 10)
                 104 => 'NET_SFTP_NAME',
                 105 => 'NET_SFTP_ATTRS',
 
-                200 => 'NET_SFTP_EXTENDED'
+                200 => 'NET_SFTP_EXTENDED',
+                201 => 'NET_SFTP_EXTENDED_REPLY'
             ];
             self::$status_codes = [
                 0 => 'NET_SFTP_STATUS_OK',
@@ -547,7 +548,7 @@ private function precheck()
      */
     private function partial_init_sftp_connection()
     {
-        $response = $this->openChannel(self::CHANNEL, true);
+        $response = $this->open_channel(self::CHANNEL, true);
         if ($response === true && $this->isTimeout()) {
             return false;
         }
@@ -705,7 +706,8 @@ private function init_sftp_connection()
                 throw $e;
             }
             $this->canonicalize_paths = false;
-            $this->reset_connection(NET_SSH2_DISCONNECT_CONNECTION_LOST);
+            $this->reset_sftp();
+            return $this->init_sftp_connection();
         }
 
         $this->update_stat_cache($this->pwd, []);
@@ -2100,7 +2102,7 @@ public function rmdir($dir)
      * @param callable|null $progressCallback
      * @throws \UnexpectedValueException on receipt of unexpected packets
      * @throws \BadFunctionCallException if you're uploading via a callback and the callback function is invalid
-     * @throws \phpseclib3\Exception\FileNotFoundException if you're uploading via a file and the file doesn't exist
+     * @throws FileNotFoundException if you're uploading via a file and the file doesn't exist
      * @return bool
      */
     public function put($remote_file, $data, $mode = self::SOURCE_STRING, $start = -1, $local_start = -1, $progressCallback = null)
@@ -2129,8 +2131,8 @@ public function put($remote_file, $data, $mode = self::SOURCE_STRING, $start = -
             $offset = $start;
         } elseif ($mode & (self::RESUME | self::RESUME_START)) {
             // if NET_SFTP_OPEN_APPEND worked as it should _size() wouldn't need to be called
-            $size = $this->stat($remote_file)['size'];
-            $offset = $size !== false ? $size : 0;
+            $stat = $this->stat($remote_file);
+            $offset = $stat !== false && $stat['size'] ? $stat['size'] : 0;
         } else {
             $offset = 0;
             if ($this->version >= 5) {
@@ -3268,6 +3270,7 @@ private function send_sftp_packet($type, $data, $request_id = 1)
         // in SSH2.php the timeout is cumulative per function call. eg. exec() will
         // timeout after 10s. but for SFTP.php it's cumulative per packet
         $this->curTimeout = $this->timeout;
+        $this->is_timeout = false;
 
         $packet = $this->use_request_id ?
             pack('NCNa*', strlen($data) + 5, $type, $request_id, $data) :
@@ -3285,16 +3288,23 @@ private function send_sftp_packet($type, $data, $request_id = 1)
     }
 
     /**
-     * Resets a connection for re-use
-     *
-     * @param int $reason
+     * Resets the SFTP channel for re-use
      */
-    protected function reset_connection($reason)
+    private function reset_sftp()
     {
-        parent::reset_connection($reason);
         $this->use_request_id = false;
         $this->pwd = false;
         $this->requestBuffer = [];
+        $this->partial_init = false;
+    }
+
+    /**
+     * Resets a connection for re-use
+     */
+    protected function reset_connection()
+    {
+        parent::reset_connection();
+        $this->reset_sftp();
     }
 
     /**
@@ -3323,6 +3333,7 @@ private function get_sftp_packet($request_id = null)
         // in SSH2.php the timeout is cumulative per function call. eg. exec() will
         // timeout after 10s. but for SFTP.php it's cumulative per packet
         $this->curTimeout = $this->timeout;
+        $this->is_timeout = false;
 
         $start = microtime(true);
 
@@ -3445,7 +3456,7 @@ public function getSFTPLog()
     }
 
     /**
-     * Returns all errors
+     * Returns all errors on the SFTP layer
      *
      * @return array
      */
@@ -3455,7 +3466,7 @@ public function getSFTPErrors()
     }
 
     /**
-     * Returns the last error
+     * Returns the last error on the SFTP layer
      *
      * @return string
      */
@@ -3486,6 +3497,24 @@ public function getSupportedVersions()
         return $temp;
     }
 
+    /**
+     * Get supported SFTP extensions
+     *
+     * @return array
+     */
+    public function getSupportedExtensions()
+    {
+        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
+            return false;
+        }
+
+        if (!$this->partial_init) {
+            $this->partial_init_sftp_connection();
+        }
+
+        return $this->extensions;
+    }
+
     /**
      * Get supported SFTP versions
      *
@@ -3543,4 +3572,124 @@ public function disableDatePreservation()
     {
         $this->preserveTime = false;
     }
+
+    /**
+     * POSIX Rename
+     *
+     * Where rename() fails "if there already exists a file with the name specified by newpath"
+     * (draft-ietf-secsh-filexfer-02#section-6.5), posix_rename() overwrites the existing file in an atomic fashion.
+     * ie. "there is no observable instant in time where the name does not refer to either the old or the new file"
+     * (draft-ietf-secsh-filexfer-13#page-39).
+     *
+     * @param string $oldname
+     * @param string $newname
+     * @return bool
+     */
+    public function posix_rename($oldname, $newname)
+    {
+        if (!$this->precheck()) {
+            return false;
+        }
+
+        $oldname = $this->realpath($oldname);
+        $newname = $this->realpath($newname);
+        if ($oldname === false || $newname === false) {
+            return false;
+        }
+
+        if ($this->version >= 5) {
+            $packet = Strings::packSSH2('ssN', $oldname, $newname, 2); // 2 = SSH_FXP_RENAME_ATOMIC
+            $this->send_sftp_packet(NET_SFTP_RENAME, $packet);
+        } elseif (isset($this->extensions['posix-rename@openssh.com']) && $this->extensions['posix-rename@openssh.com'] === '1') {
+            $packet = Strings::packSSH2('sss', 'posix-rename@openssh.com', $oldname, $newname);
+            $this->send_sftp_packet(NET_SFTP_EXTENDED, $packet);
+        } else {
+            throw new \RuntimeException(
+                "Extension 'posix-rename@openssh.com' is not supported by the server. " .
+                "Call getSupportedVersions() to see a list of supported extension"
+            );
+        }
+
+        $response = $this->get_sftp_packet();
+        if ($this->packet_type != NET_SFTP_STATUS) {
+            throw new \UnexpectedValueException('Expected NET_SFTP_STATUS. '
+                                              . 'Got packet type: ' . $this->packet_type);
+        }
+
+        // if $status isn't SSH_FX_OK it's probably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED
+        list($status) = Strings::unpackSSH2('N', $response);
+        if ($status != NET_SFTP_STATUS_OK) {
+            $this->logError($response, $status);
+            return false;
+        }
+
+        // don't move the stat cache entry over since this operation could very well change the
+        // atime and mtime attributes
+        //$this->update_stat_cache($newname, $this->query_stat_cache($oldname));
+        $this->remove_from_stat_cache($oldname);
+        $this->remove_from_stat_cache($newname);
+
+        return true;
+    }
+
+    /**
+     * Returns general information about a file system.
+     *
+     * The function statvfs() returns information about a mounted filesystem.
+     * @see https://man7.org/linux/man-pages/man3/statvfs.3.html
+     *
+     * @param string $path
+     * @return false|array{bsize: int, frsize: int, blocks: int, bfree: int, bavail: int, files: int, ffree: int, favail: int, fsid: int, flag: int, namemax: int}
+     */
+    public function statvfs($path)
+    {
+        if (!$this->precheck()) {
+            return false;
+        }
+
+        if (!isset($this->extensions['statvfs@openssh.com']) || $this->extensions['statvfs@openssh.com'] !== '2') {
+            throw new \RuntimeException(
+                "Extension 'statvfs@openssh.com' is not supported by the server. " .
+                "Call getSupportedVersions() to see a list of supported extension"
+            );
+        }
+
+        $realpath = $this->realpath($path);
+        if ($realpath === false) {
+            return false;
+        }
+
+        $packet = Strings::packSSH2('ss', 'statvfs@openssh.com', $realpath);
+        $this->send_sftp_packet(NET_SFTP_EXTENDED, $packet);
+
+        $response = $this->get_sftp_packet();
+        if ($this->packet_type !== NET_SFTP_EXTENDED_REPLY) {
+            throw new \UnexpectedValueException(
+                'Expected SSH_FXP_EXTENDED_REPLY. '
+                . 'Got packet type: ' . $this->packet_type
+            );
+        }
+
+        /**
+         * These requests return a SSH_FXP_STATUS reply on failure. On success they
+         * return the following SSH_FXP_EXTENDED_REPLY reply:
+         *
+         * uint32        id
+         * uint64        f_bsize     file system block size
+         * uint64        f_frsize     fundamental fs block size
+         * uint64        f_blocks     number of blocks (unit f_frsize)
+         * uint64        f_bfree      free blocks in file system
+         * uint64        f_bavail     free blocks for non-root
+         * uint64        f_files      total file inodes
+         * uint64        f_ffree      free file inodes
+         * uint64        f_favail     free file inodes for to non-root
+         * uint64        f_fsid       file system id
+         * uint64        f_flag       bit mask of f_flag values
+         * uint64        f_namemax    maximum filename length
+         */
+        return array_combine(
+            ['bsize', 'frsize', 'blocks', 'bfree', 'bavail', 'files', 'ffree', 'favail', 'fsid', 'flag', 'namemax'],
+            Strings::unpackSSH2('QQQQQQQQQQQ', $response)
+        );
+    }
 }
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Net/SSH2.php b/vendor/phpseclib/phpseclib/phpseclib/Net/SSH2.php
index 581b05966b..43ddbccd69 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Net/SSH2.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Net/SSH2.php
@@ -64,7 +64,9 @@
 use phpseclib3\Crypt\Twofish;
 use phpseclib3\Exception\ConnectionClosedException;
 use phpseclib3\Exception\InsufficientSetupException;
+use phpseclib3\Exception\InvalidPacketLengthException;
 use phpseclib3\Exception\NoSupportedAlgorithmsException;
+use phpseclib3\Exception\TimeoutException;
 use phpseclib3\Exception\UnableToConnectException;
 use phpseclib3\Exception\UnsupportedAlgorithmException;
 use phpseclib3\Exception\UnsupportedCurveException;
@@ -102,7 +104,7 @@ class SSH2
     const MASK_LOGIN_REQ     = 0x00000004;
     const MASK_LOGIN         = 0x00000008;
     const MASK_SHELL         = 0x00000010;
-    const MASK_WINDOW_ADJUST = 0x00000020;
+    const MASK_DISCONNECT    = 0x00000020;
 
     /*
      * Channel constants
@@ -625,7 +627,7 @@ class SSH2
     protected $server_channels = [];
 
     /**
-     * Channel Buffers
+     * Channel Read Buffers
      *
      * If a client requests a packet from one channel but receives two packets from another those packets should
      * be placed in a buffer
@@ -636,6 +638,17 @@ class SSH2
      */
     private $channel_buffers = [];
 
+    /**
+     * Channel Write Buffers
+     *
+     * If a client sends a packet and receives a timeout error mid-transmission, buffer the data written so it
+     * can be de-duplicated upon resuming write
+     *
+     * @see self::send_channel_packet()
+     * @var array
+     */
+    private $channel_buffers_write = [];
+
     /**
      * Channel Status
      *
@@ -824,11 +837,11 @@ class SSH2
     private $quiet_mode = false;
 
     /**
-     * Time of first network activity
+     * Time of last read/write network activity
      *
      * @var float
      */
-    private $last_packet;
+    private $last_packet = null;
 
     /**
      * Exit status returned from ssh if any
@@ -886,7 +899,7 @@ class SSH2
      * @see self::isTimeout()
      * @var bool
      */
-    private $is_timeout = false;
+    protected $is_timeout = false;
 
     /**
      * Log Boundary
@@ -1000,14 +1013,14 @@ class SSH2
      *
      * @var bool
      */
-    private $retry_connect = false;
+    private $login_credentials_finalized = false;
 
     /**
      * Binary Packet Buffer
      *
-     * @var string|false
+     * @var object|null
      */
-    private $binary_packet_buffer = false;
+    private $binary_packet_buffer = null;
 
     /**
      * Preferred Signature Format
@@ -1102,10 +1115,22 @@ class SSH2
      */
     private $errorOnMultipleChannels;
 
+    /**
+     * Terrapin Countermeasure
+     *
+     * "During initial KEX, terminate the connection if any unexpected or out-of-sequence packet is received"
+     * -- https://github.com/openssh/openssh-portable/commit/1edb00c58f8a6875fad6a497aa2bacf37f9e6cd5
+     *
+     * @var int
+     */
+    private $extra_packets;
+
     /**
      * Default Constructor.
      *
      * $host can either be a string, representing the host, or a stream resource.
+     * If $host is a stream resource then $port doesn't do anything, altho $timeout
+     * still will be used
      *
      * @param mixed $host
      * @param int $port
@@ -1122,6 +1147,7 @@ public function __construct($host, $port = 22, $timeout = 10)
                 4 => 'NET_SSH2_MSG_DEBUG',
                 5 => 'NET_SSH2_MSG_SERVICE_REQUEST',
                 6 => 'NET_SSH2_MSG_SERVICE_ACCEPT',
+                7 => 'NET_SSH2_MSG_EXT_INFO', // RFC 8308
                 20 => 'NET_SSH2_MSG_KEXINIT',
                 21 => 'NET_SSH2_MSG_NEWKEYS',
                 30 => 'NET_SSH2_MSG_KEXDH_INIT',
@@ -1203,6 +1229,8 @@ public function __construct($host, $port = 22, $timeout = 10)
             ? \WeakReference::create($this)
             : $this;
 
+        $this->timeout = $timeout;
+
         if (is_resource($host)) {
             $this->fsock = $host;
             return;
@@ -1211,7 +1239,6 @@ public function __construct($host, $port = 22, $timeout = 10)
         if (Strings::is_stringable($host)) {
             $this->host = $host;
             $this->port = $port;
-            $this->timeout = $timeout;
         }
     }
 
@@ -1322,8 +1349,6 @@ private function connect()
 
         $this->curTimeout = $this->timeout;
 
-        $this->last_packet = microtime(true);
-
         if (!is_resource($this->fsock)) {
             $start = microtime(true);
             // with stream_select a timeout of 0 means that no timeout takes place;
@@ -1342,12 +1367,21 @@ private function connect()
                     throw new \RuntimeException('Connection timed out whilst attempting to open socket connection');
                 }
             }
+
+            if (defined('NET_SSH2_LOGGING')) {
+                $this->append_log('(fsockopen took ' . round($elapsed, 4) . 's)', '');
+            }
         }
 
         $this->identifier = $this->generate_identifier();
 
         if ($this->send_id_string_first) {
+            $start = microtime(true);
             fputs($this->fsock, $this->identifier . "\r\n");
+            $elapsed = round(microtime(true) - $start, 4);
+            if (defined('NET_SSH2_LOGGING')) {
+                $this->append_log("-> (network: $elapsed)", $this->identifier . "\r\n");
+            }
         }
 
         /* According to the SSH2 specs,
@@ -1358,6 +1392,7 @@ private function connect()
            in ISO-10646 UTF-8 [RFC3629] (language is not specified).  Clients
            MUST be able to process such lines." */
         $data = '';
+        $totalElapsed = 0;
         while (!feof($this->fsock) && !preg_match('#(.*)^(SSH-(\d\.\d+).*)#ms', $data, $matches)) {
             $line = '';
             while (true) {
@@ -1374,28 +1409,21 @@ private function connect()
                         throw new \RuntimeException('Connection timed out whilst receiving server identification string');
                     }
                     $elapsed = microtime(true) - $start;
+                    $totalElapsed += $elapsed;
                     $this->curTimeout -= $elapsed;
                 }
 
                 $temp = stream_get_line($this->fsock, 255, "\n");
                 if ($temp === false) {
-                    throw new \RuntimeException('Error reading from socket');
+                    throw new \RuntimeException('Error reading SSH identification string; are you sure you\'re connecting to an SSH server?');
                 }
+
+                $line .= $temp;
                 if (strlen($temp) == 255) {
                     continue;
                 }
 
-                $line .= "$temp\n";
-
-                // quoting RFC4253, "Implementers who wish to maintain
-                // compatibility with older, undocumented versions of this protocol may
-                // want to process the identification string without expecting the
-                // presence of the carriage return character for reasons described in
-                // Section 5 of this document."
-
-                //if (substr($line, -2) == "\r\n") {
-                //    break;
-                //}
+                $line .= "\n";
 
                 break;
             }
@@ -1403,19 +1431,18 @@ private function connect()
             $data .= $line;
         }
 
+        if (defined('NET_SSH2_LOGGING')) {
+            $this->append_log('<- (network: ' . round($totalElapsed, 4) . ')', $line);
+        }
+
         if (feof($this->fsock)) {
             $this->bitmap = 0;
-            throw new ConnectionClosedException('Connection closed by server');
+            throw new ConnectionClosedException('Connection closed by server; are you sure you\'re connected to an SSH server?');
         }
 
         $extra = $matches[1];
 
-        if (defined('NET_SSH2_LOGGING')) {
-            $this->append_log('<-', $matches[0]);
-            $this->append_log('->', $this->identifier . "\r\n");
-        }
-
-        $this->server_identifier = trim($temp, "\r\n");
+        $this->server_identifier = trim($data, "\r\n");
         if (strlen($extra)) {
             $this->errors[] = $data;
         }
@@ -1438,17 +1465,18 @@ private function connect()
         $this->errorOnMultipleChannels = $match;
 
         if (!$this->send_id_string_first) {
+            $start = microtime(true);
             fputs($this->fsock, $this->identifier . "\r\n");
+            $elapsed = round(microtime(true) - $start, 4);
+            if (defined('NET_SSH2_LOGGING')) {
+                $this->append_log("-> (network: $elapsed)", $this->identifier . "\r\n");
+            }
         }
 
-        if (!$this->send_kex_first) {
-            $response = $this->get_binary_packet();
-
-            if (is_bool($response) || !strlen($response) || ord($response[0]) != NET_SSH2_MSG_KEXINIT) {
-                $this->bitmap = 0;
-                throw new \UnexpectedValueException('Expected SSH_MSG_KEXINIT');
-            }
+        $this->last_packet = microtime(true);
 
+        if (!$this->send_kex_first) {
+            $response = $this->get_binary_packet_or_close(NET_SSH2_MSG_KEXINIT);
             $this->key_exchange($response);
         }
 
@@ -1503,7 +1531,7 @@ private function generate_identifier()
      * @param string|bool $kexinit_payload_server optional
      * @throws \UnexpectedValueException on receipt of unexpected packets
      * @throws \RuntimeException on other errors
-     * @throws \phpseclib3\Exception\NoSupportedAlgorithmsException when none of the algorithms phpseclib has loaded are compatible
+     * @throws NoSupportedAlgorithmsException when none of the algorithms phpseclib has loaded are compatible
      */
     private function key_exchange($kexinit_payload_server = false)
     {
@@ -1535,6 +1563,8 @@ private function key_exchange($kexinit_payload_server = false)
             $preferred['client_to_server']['comp'] :
             SSH2::getSupportedCompressionAlgorithms();
 
+        $kex_algorithms = array_merge($kex_algorithms, ['ext-info-c', 'kex-strict-c-v00@openssh.com']);
+
         // some SSH servers have buggy implementations of some of the above algorithms
         switch (true) {
             case $this->server_identifier == 'SSH-2.0-SSHD':
@@ -1551,6 +1581,20 @@ private function key_exchange($kexinit_payload_server = false)
                         ['hmac-sha1-96', 'hmac-md5-96']
                     ));
                 }
+                break;
+            case substr($this->server_identifier, 0, 24) == 'SSH-2.0-TurboFTP_SERVER_':
+                if (!isset($preferred['server_to_client']['crypt'])) {
+                    $s2c_encryption_algorithms = array_values(array_diff(
+                        $s2c_encryption_algorithms,
+                        ['aes128-gcm@openssh.com', 'aes256-gcm@openssh.com']
+                    ));
+                }
+                if (!isset($preferred['client_to_server']['crypt'])) {
+                    $c2s_encryption_algorithms = array_values(array_diff(
+                        $c2s_encryption_algorithms,
+                        ['aes128-gcm@openssh.com', 'aes256-gcm@openssh.com']
+                    ));
+                }
         }
 
         $client_cookie = Random::string(16);
@@ -1575,17 +1619,8 @@ private function key_exchange($kexinit_payload_server = false)
         if ($kexinit_payload_server === false) {
             $this->send_binary_packet($kexinit_payload_client);
 
-            $kexinit_payload_server = $this->get_binary_packet();
-
-            if (
-                is_bool($kexinit_payload_server)
-                || !strlen($kexinit_payload_server)
-                || ord($kexinit_payload_server[0]) != NET_SSH2_MSG_KEXINIT
-            ) {
-                $this->disconnect_helper(NET_SSH2_DISCONNECT_PROTOCOL_ERROR);
-                throw new \UnexpectedValueException('Expected SSH_MSG_KEXINIT');
-            }
-
+            $this->extra_packets = 0;
+            $kexinit_payload_server = $this->get_binary_packet_or_close(NET_SSH2_MSG_KEXINIT);
             $send_kex = false;
         }
 
@@ -1606,6 +1641,11 @@ private function key_exchange($kexinit_payload_server = false)
             $this->languages_server_to_client,
             $first_kex_packet_follows
         ) = Strings::unpackSSH2('L10C', $response);
+        if (in_array('kex-strict-s-v00@openssh.com', $this->kex_algorithms)) {
+            if ($this->session_id === false && $this->extra_packets) {
+                throw new \UnexpectedValueException('Possible Terrapin Attack detected');
+            }
+        }
 
         $this->supported_private_key_algorithms = $this->server_host_key_algorithms;
 
@@ -1618,15 +1658,13 @@ private function key_exchange($kexinit_payload_server = false)
         // we don't initialize any crypto-objects, yet - we do that, later. for now, we need the lengths to make the
         // diffie-hellman key exchange as fast as possible
         $decrypt = self::array_intersect_first($s2c_encryption_algorithms, $this->encryption_algorithms_server_to_client);
-        $decryptKeyLength = $this->encryption_algorithm_to_key_size($decrypt);
-        if ($decryptKeyLength === null) {
+        if (!$decrypt || ($decryptKeyLength = $this->encryption_algorithm_to_key_size($decrypt)) === null) {
             $this->disconnect_helper(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
             throw new NoSupportedAlgorithmsException('No compatible server to client encryption algorithms found');
         }
 
         $encrypt = self::array_intersect_first($c2s_encryption_algorithms, $this->encryption_algorithms_client_to_server);
-        $encryptKeyLength = $this->encryption_algorithm_to_key_size($encrypt);
-        if ($encryptKeyLength === null) {
+        if (!$encrypt || ($encryptKeyLength = $this->encryption_algorithm_to_key_size($encrypt)) === null) {
             $this->disconnect_helper(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
             throw new NoSupportedAlgorithmsException('No compatible client to server encryption algorithms found');
         }
@@ -1726,13 +1764,8 @@ private function key_exchange($kexinit_payload_server = false)
                 $this->send_binary_packet($packet);
                 $this->updateLogHistory('UNKNOWN (34)', 'NET_SSH2_MSG_KEXDH_GEX_REQUEST');
 
-                $response = $this->get_binary_packet();
-
+                $response = $this->get_binary_packet_or_close(NET_SSH2_MSG_KEXDH_GEX_GROUP);
                 list($type, $primeBytes, $gBytes) = Strings::unpackSSH2('Css', $response);
-                if ($type != NET_SSH2_MSG_KEXDH_GEX_GROUP) {
-                    $this->disconnect_helper(NET_SSH2_DISCONNECT_PROTOCOL_ERROR);
-                    throw new \UnexpectedValueException('Expected SSH_MSG_KEX_DH_GEX_GROUP');
-                }
                 $this->updateLogHistory('NET_SSH2_MSG_KEXDH_REPLY', 'NET_SSH2_MSG_KEXDH_GEX_GROUP');
                 $prime = new BigInteger($primeBytes, -256);
                 $g = new BigInteger($gBytes, -256);
@@ -1771,7 +1804,7 @@ private function key_exchange($kexinit_payload_server = false)
                 $this->updateLogHistory('UNKNOWN (32)', 'NET_SSH2_MSG_KEXDH_GEX_INIT');
         }
 
-        $response = $this->get_binary_packet();
+        $response = $this->get_binary_packet_or_close(constant($serverKexReplyMessage));
 
         list(
             $type,
@@ -1780,10 +1813,6 @@ private function key_exchange($kexinit_payload_server = false)
             $this->signature
         ) = Strings::unpackSSH2('Csss', $response);
 
-        if ($type != constant($serverKexReplyMessage)) {
-            $this->disconnect_helper(NET_SSH2_DISCONNECT_PROTOCOL_ERROR);
-            throw new \UnexpectedValueException("Expected $serverKexReplyMessage");
-        }
         switch ($serverKexReplyMessage) {
             case 'NET_SSH2_MSG_KEX_ECDH_REPLY':
                 $this->updateLogHistory('NET_SSH2_MSG_KEXDH_REPLY', 'NET_SSH2_MSG_KEX_ECDH_REPLY');
@@ -1850,18 +1879,10 @@ private function key_exchange($kexinit_payload_server = false)
 
         $packet = pack('C', NET_SSH2_MSG_NEWKEYS);
         $this->send_binary_packet($packet);
+        $response = $this->get_binary_packet_or_close(NET_SSH2_MSG_NEWKEYS);
 
-        $response = $this->get_binary_packet();
-
-        if ($response === false) {
-            $this->disconnect_helper(NET_SSH2_DISCONNECT_CONNECTION_LOST);
-            throw new ConnectionClosedException('Connection closed by server');
-        }
-
-        list($type) = Strings::unpackSSH2('C', $response);
-        if ($type != NET_SSH2_MSG_NEWKEYS) {
-            $this->disconnect_helper(NET_SSH2_DISCONNECT_PROTOCOL_ERROR);
-            throw new \UnexpectedValueException('Expected SSH_MSG_NEWKEYS');
+        if (in_array('kex-strict-s-v00@openssh.com', $this->kex_algorithms)) {
+            $this->get_seq_no = $this->send_seq_no = 0;
         }
 
         $keyBytes = pack('Na*', strlen($keyBytes), $keyBytes);
@@ -2144,7 +2165,7 @@ private static function mac_algorithm_to_hash_instance($algorithm)
         }
     }
 
-    /*
+    /**
      * Tests whether or not proposed algorithm has a potential for issues
      *
      * @link https://www.chiark.greenend.org.uk/~sgtatham/putty/wishlist/ssh2-aesctr-openssh.html
@@ -2176,7 +2197,9 @@ private static function bad_algorithm_candidate($algorithm)
      */
     public function login($username, ...$args)
     {
-        $this->auth[] = func_get_args();
+        if (!$this->login_credentials_finalized) {
+            $this->auth[] = func_get_args();
+        }
 
         // try logging with 'none' as an authentication method first since that's what
         // PuTTY does
@@ -2277,6 +2300,7 @@ protected function sublogin($username, ...$args)
 
             foreach ($newargs as $arg) {
                 if ($this->login_helper($username, $arg)) {
+                    $this->login_credentials_finalized = true;
                     return true;
                 }
             }
@@ -2307,19 +2331,23 @@ private function login_helper($username, $password = null)
             $this->send_binary_packet($packet);
 
             try {
-                $response = $this->get_binary_packet();
-            } catch (\Exception $e) {
-                if ($this->retry_connect) {
-                    $this->retry_connect = false;
-                    $this->connect();
-                    return $this->login_helper($username, $password);
+                $response = $this->get_binary_packet_or_close(NET_SSH2_MSG_SERVICE_ACCEPT);
+            } catch (InvalidPacketLengthException $e) {
+                // the first opportunity to encounter the "bad key size" error
+                if (!$this->bad_key_size_fix && $this->decryptName != null && self::bad_algorithm_candidate($this->decryptName)) {
+                    // bad_key_size_fix is only ever re-assigned to true here
+                    // retry the connection with that new setting but we'll
+                    // only try it once.
+                    $this->bad_key_size_fix = true;
+                    return $this->reconnect();
                 }
-                $this->disconnect_helper(NET_SSH2_DISCONNECT_CONNECTION_LOST);
-                throw new ConnectionClosedException('Connection closed by server');
+                throw $e;
             }
 
-            list($type, $service) = Strings::unpackSSH2('Cs', $response);
-            if ($type != NET_SSH2_MSG_SERVICE_ACCEPT || $service != 'ssh-userauth') {
+            list($type) = Strings::unpackSSH2('C', $response);
+            list($service) = Strings::unpackSSH2('s', $response);
+
+            if ($service != 'ssh-userauth') {
                 $this->disconnect_helper(NET_SSH2_DISCONNECT_PROTOCOL_ERROR);
                 throw new \UnexpectedValueException('Expected SSH_MSG_SERVICE_ACCEPT');
             }
@@ -2357,7 +2385,7 @@ private function login_helper($username, $password = null)
 
             $this->send_binary_packet($packet);
 
-            $response = $this->get_binary_packet();
+            $response = $this->get_binary_packet_or_close();
 
             list($type) = Strings::unpackSSH2('C', $response);
             switch ($type) {
@@ -2400,10 +2428,7 @@ private function login_helper($username, $password = null)
 
         $this->send_binary_packet($packet, $logged);
 
-        $response = $this->get_binary_packet();
-        if ($response === false) {
-            return false;
-        }
+        $response = $this->get_binary_packet_or_close();
         list($type) = Strings::unpackSSH2('C', $response);
         switch ($type) {
             case NET_SSH2_MSG_USERAUTH_PASSWD_CHANGEREQ: // in theory, the password can be changed
@@ -2471,7 +2496,7 @@ private function keyboard_interactive_process(...$responses)
         if (strlen($this->last_interactive_response)) {
             $response = $this->last_interactive_response;
         } else {
-            $orig = $response = $this->get_binary_packet();
+            $orig = $response = $this->get_binary_packet_or_close();
         }
 
         list($type) = Strings::unpackSSH2('C', $response);
@@ -2559,17 +2584,19 @@ private function keyboard_interactive_process(...$responses)
      * Login with an ssh-agent provided key
      *
      * @param string $username
-     * @param \phpseclib3\System\SSH\Agent $agent
+     * @param Agent $agent
      * @return bool
      */
     private function ssh_agent_login($username, Agent $agent)
     {
         $this->agent = $agent;
         $keys = $agent->requestIdentities();
+        $orig_algorithms = $this->supported_private_key_algorithms;
         foreach ($keys as $key) {
             if ($this->privatekey_login($username, $key)) {
                 return true;
             }
+            $this->supported_private_key_algorithms = $orig_algorithms;
         }
 
         return false;
@@ -2582,7 +2609,7 @@ private function ssh_agent_login($username, Agent $agent)
      *           by sending dummy SSH_MSG_IGNORE messages.}
      *
      * @param string $username
-     * @param \phpseclib3\Crypt\Common\PrivateKey $privatekey
+     * @param PrivateKey $privatekey
      * @return bool
      * @throws \RuntimeException on connection error
      */
@@ -2594,7 +2621,7 @@ private function privatekey_login($username, PrivateKey $privatekey)
             $privatekey = $privatekey->withPadding(RSA::SIGNATURE_PKCS1);
             $algos = ['rsa-sha2-256', 'rsa-sha2-512', 'ssh-rsa'];
             if (isset($this->preferred['hostkey'])) {
-                $algos = array_intersect($this->preferred['hostkey'], $algos);
+                $algos = array_intersect($algos, $this->preferred['hostkey']);
             }
             $algo = self::array_intersect_first($algos, $this->supported_private_key_algorithms);
             switch ($algo) {
@@ -2659,7 +2686,11 @@ private function privatekey_login($username, PrivateKey $privatekey)
         $packet = $part1 . chr(0) . $part2;
         $this->send_binary_packet($packet);
 
-        $response = $this->get_binary_packet();
+        $response = $this->get_binary_packet_or_close(
+            NET_SSH2_MSG_USERAUTH_SUCCESS,
+            NET_SSH2_MSG_USERAUTH_FAILURE,
+            NET_SSH2_MSG_USERAUTH_PK_OK
+        );
 
         list($type) = Strings::unpackSSH2('C', $response);
         switch ($type) {
@@ -2680,9 +2711,6 @@ private function privatekey_login($username, PrivateKey $privatekey)
             case NET_SSH2_MSG_USERAUTH_SUCCESS:
                 $this->bitmap |= self::MASK_LOGIN;
                 return true;
-            default:
-                $this->disconnect_helper(NET_SSH2_DISCONNECT_BY_APPLICATION);
-                throw new ConnectionClosedException('Unexpected response to publickey authentication pt 1');
         }
 
         $packet = $part1 . chr(1) . $part2;
@@ -2695,7 +2723,10 @@ private function privatekey_login($username, PrivateKey $privatekey)
 
         $this->send_binary_packet($packet);
 
-        $response = $this->get_binary_packet();
+        $response = $this->get_binary_packet_or_close(
+            NET_SSH2_MSG_USERAUTH_SUCCESS,
+            NET_SSH2_MSG_USERAUTH_FAILURE
+        );
 
         list($type) = Strings::unpackSSH2('C', $response);
         switch ($type) {
@@ -2708,9 +2739,6 @@ private function privatekey_login($username, PrivateKey $privatekey)
                 $this->bitmap |= self::MASK_LOGIN;
                 return true;
         }
-
-        $this->disconnect_helper(NET_SSH2_DISCONNECT_BY_APPLICATION);
-        throw new ConnectionClosedException('Unexpected response to publickey authentication pt 2');
     }
 
     /**
@@ -2727,7 +2755,7 @@ public function getTimeout()
      * Set Timeout
      *
      * $ssh->exec('ping 127.0.0.1'); on a Linux host will never return and will run indefinitely.  setTimeout() makes it so it'll timeout.
-     * Setting $timeout to false or 0 will mean there is no timeout.
+     * Setting $timeout to false or 0 will revert to the default socket timeout.
      *
      * @param mixed $timeout
      */
@@ -2782,7 +2810,7 @@ public function exec($command, callable $callback = null)
         //    throw new \RuntimeException('If you want to run multiple exec()\'s you will need to disable (and re-enable if appropriate) a PTY for each one.');
         //}
 
-        $this->openChannel(self::CHANNEL_EXEC);
+        $this->open_channel(self::CHANNEL_EXEC);
 
         if ($this->request_pty === true) {
             $terminal_modes = pack('C', NET_SSH2_TTY_OP_END);
@@ -2879,7 +2907,7 @@ public function getOpenChannelCount()
      * @param bool $skip_extended
      * @return bool
      */
-    protected function openChannel($channel, $skip_extended = false)
+    protected function open_channel($channel, $skip_extended = false)
     {
         if (isset($this->channel_status[$channel]) && $this->channel_status[$channel] != NET_SSH2_MSG_CHANNEL_CLOSE) {
             throw new \RuntimeException('Please close the channel (' . $channel . ') before trying to open it again');
@@ -2936,7 +2964,7 @@ public function openShell()
             throw new InsufficientSetupException('Operation disallowed prior to login()');
         }
 
-        $this->openChannel(self::CHANNEL_SHELL);
+        $this->open_channel(self::CHANNEL_SHELL);
 
         $terminal_modes = pack('C', NET_SSH2_TTY_OP_END);
         $packet = Strings::packSSH2(
@@ -3147,6 +3175,7 @@ public function read($expect = '', $mode = self::READ_SIMPLE, $channel = null)
      * @return void
      * @throws \RuntimeException on connection error
      * @throws InsufficientSetupException on unexpected channel status, possibly due to closure
+     * @throws TimeoutException if the write could not be completed within the requested self::setTimeout()
      */
     public function write($cmd, $channel = null)
     {
@@ -3166,6 +3195,8 @@ public function write($cmd, $channel = null)
             }
         }
 
+        $this->curTimeout = $this->timeout;
+        $this->is_timeout = false;
         $this->send_channel_packet($channel, $cmd);
     }
 
@@ -3184,7 +3215,7 @@ public function write($cmd, $channel = null)
      */
     public function startSubsystem($subsystem)
     {
-        $this->openChannel(self::CHANNEL_SUBSYSTEM);
+        $this->open_channel(self::CHANNEL_SUBSYSTEM);
 
         $packet = Strings::packSSH2(
             'CNsCs',
@@ -3286,11 +3317,38 @@ public function __destruct()
     /**
      * Is the connection still active?
      *
+     * $level has 3x possible values:
+     * 0 (default): phpseclib takes a passive approach to see if the connection is still active by calling feof()
+     *    on the socket
+     * 1: phpseclib takes an active approach to see if the connection is still active by sending an SSH_MSG_IGNORE
+     *    packet that doesn't require a response
+     * 2: phpseclib takes an active approach to see if the connection is still active by sending an SSH_MSG_CHANNEL_OPEN
+     *    packet and imediately trying to close that channel. some routers, in particular, however, will only let you
+     *    open one channel, so this approach could yield false positives
+     *
+     * @param int $level
      * @return bool
      */
-    public function isConnected()
+    public function isConnected($level = 0)
     {
-        return ($this->bitmap & self::MASK_CONNECTED) && is_resource($this->fsock) && !feof($this->fsock);
+        if (!is_int($level) || $level < 0 || $level > 2) {
+            throw new \InvalidArgumentException('$level must be 0, 1 or 2');
+        }
+
+        if ($level == 0) {
+            return ($this->bitmap & self::MASK_CONNECTED) && is_resource($this->fsock) && !feof($this->fsock);
+        }
+        try {
+            if ($level == 1) {
+                $this->send_binary_packet(pack('CN', NET_SSH2_MSG_IGNORE, 0));
+            } else {
+                $this->open_channel(self::CHANNEL_KEEP_ALIVE);
+                $this->close_channel(self::CHANNEL_KEEP_ALIVE);
+            }
+            return true;
+        } catch (\Exception $e) {
+            return false;
+        }
     }
 
     /**
@@ -3363,7 +3421,7 @@ public function ping()
         }
 
         try {
-            $this->openChannel(self::CHANNEL_KEEP_ALIVE);
+            $this->open_channel(self::CHANNEL_KEEP_ALIVE);
         } catch (\RuntimeException $e) {
             return $this->reconnect();
         }
@@ -3379,8 +3437,7 @@ public function ping()
      */
     private function reconnect()
     {
-        $this->reset_connection(NET_SSH2_DISCONNECT_CONNECTION_LOST);
-        $this->retry_connect = true;
+        $this->disconnect_helper(NET_SSH2_DISCONNECT_BY_APPLICATION);
         $this->connect();
         foreach ($this->auth as $auth) {
             $result = $this->login(...$auth);
@@ -3390,19 +3447,71 @@ private function reconnect()
 
     /**
      * Resets a connection for re-use
-     *
-     * @param int $reason
      */
-    protected function reset_connection($reason)
+    protected function reset_connection()
     {
-        $this->disconnect_helper($reason);
+        if (is_resource($this->fsock) && get_resource_type($this->fsock) === 'stream') {
+            fclose($this->fsock);
+        }
+        $this->fsock = null;
+        $this->bitmap = 0;
+        $this->binary_packet_buffer = null;
         $this->decrypt = $this->encrypt = false;
         $this->decrypt_block_size = $this->encrypt_block_size = 8;
         $this->hmac_check = $this->hmac_create = false;
         $this->hmac_size = false;
         $this->session_id = false;
-        $this->retry_connect = true;
+        $this->last_packet = null;
         $this->get_seq_no = $this->send_seq_no = 0;
+        $this->channel_status = [];
+        $this->channel_id_last_interactive = 0;
+        $this->channel_buffers = [];
+        $this->channel_buffers_write = [];
+    }
+
+    /**
+     * @return int[] second and microsecond stream timeout options based on user-requested timeout and keep-alive, or the default socket timeout by default, which mirrors PHP socket streams.
+     */
+    private function get_stream_timeout()
+    {
+        $sec = ini_get('default_socket_timeout');
+        $usec = 0;
+        if ($this->curTimeout > 0) {
+            $sec = (int) floor($this->curTimeout);
+            $usec = (int) (1000000 * ($this->curTimeout - $sec));
+        }
+        if ($this->keepAlive > 0) {
+            $elapsed = microtime(true) - $this->last_packet;
+            $timeout = max($this->keepAlive - $elapsed, 0);
+            if (!$this->curTimeout || $timeout < $this->curTimeout) {
+                $sec = (int) floor($timeout);
+                $usec = (int) (1000000 * ($timeout - $sec));
+            }
+        }
+        return [$sec, $usec];
+    }
+
+    /**
+     * Retrieves the next packet with added timeout and type handling
+     *
+     * @param string $message_types Message types to enforce in response, closing if not met
+     * @return string
+     * @throws ConnectionClosedException If an error has occurred preventing read of the next packet
+     */
+    private function get_binary_packet_or_close(...$message_types)
+    {
+        try {
+            $packet = $this->get_binary_packet();
+            if (count($message_types) > 0 && !in_array(ord($packet[0]), $message_types)) {
+                $this->disconnect_helper(NET_SSH2_DISCONNECT_PROTOCOL_ERROR);
+                throw new ConnectionClosedException('Bad message type. Expected: #'
+                    . implode(', #', $message_types) . '. Got: #' . ord($packet[0]));
+            }
+            return $packet;
+        } catch (TimeoutException $e) {
+            $this->disconnect_helper(NET_SSH2_DISCONNECT_BY_APPLICATION);
+            throw new ConnectionClosedException('Connection closed due to timeout');
+        }
     }
 
     /**
@@ -3411,76 +3520,70 @@ protected function reset_connection($reason)
      * See '6. Binary Packet Protocol' of rfc4253 for more info.
      *
      * @see self::_send_binary_packet()
-     * @param bool $skip_channel_filter
-     * @return bool|string
+     * @return string
+     * @throws TimeoutException If user requested timeout was reached while waiting for next packet
+     * @throws ConnectionClosedException If an error has occurred preventing read of the next packet
      */
-    private function get_binary_packet($skip_channel_filter = false)
+    private function get_binary_packet()
     {
-        if ($skip_channel_filter) {
-            if (!is_resource($this->fsock)) {
-                throw new \InvalidArgumentException('fsock is not a resource.');
+        if (!is_resource($this->fsock)) {
+            throw new \InvalidArgumentException('fsock is not a resource.');
+        }
+        if ($this->binary_packet_buffer == null) {
+            // buffer the packet to permit continued reads across timeouts
+            $this->binary_packet_buffer = (object) [
+                'read_time' => 0, // the time to read the packet from the socket
+                'raw' => '', // the raw payload read from the socket
+                'plain' => '', // the packet in plain text, excluding packet_length header
+                'packet_length' => null, // the packet_length value pulled from the payload
+                'size' => $this->decrypt_block_size, // the total size of this packet to be read from the socket
+                                                     // initialize to read single block until packet_length is available
+            ];
+        }
+        $packet = $this->binary_packet_buffer;
+        while (strlen($packet->raw) < $packet->size) {
+            if (feof($this->fsock)) {
+                $this->disconnect_helper(NET_SSH2_DISCONNECT_CONNECTION_LOST);
+                throw new ConnectionClosedException('Connection closed by server');
             }
-            $read = [$this->fsock];
-            $write = $except = null;
-
-            if (!$this->curTimeout) {
-                if ($this->keepAlive <= 0) {
-                    static::stream_select($read, $write, $except, null);
-                } else {
-                    if (!static::stream_select($read, $write, $except, $this->keepAlive)) {
-                        $this->send_binary_packet(pack('CN', NET_SSH2_MSG_IGNORE, 0));
-                        return $this->get_binary_packet(true);
-                    }
-                }
-            } else {
-                if ($this->curTimeout < 0) {
-                    $this->is_timeout = true;
-                    return true;
-                }
-
-                $start = microtime(true);
-
-                if ($this->keepAlive > 0 && $this->keepAlive < $this->curTimeout) {
-                    if (!static::stream_select($read, $write, $except, $this->keepAlive)) {
-                        $this->send_binary_packet(pack('CN', NET_SSH2_MSG_IGNORE, 0));
-                        $elapsed = microtime(true) - $start;
-                        $this->curTimeout -= $elapsed;
-                        return $this->get_binary_packet(true);
-                    }
-                    $elapsed = microtime(true) - $start;
-                    $this->curTimeout -= $elapsed;
-                }
-
-                $sec = (int) floor($this->curTimeout);
-                $usec = (int) (1000000 * ($this->curTimeout - $sec));
+            if ($this->curTimeout < 0) {
+                $this->is_timeout = true;
+                throw new TimeoutException('Timed out waiting for server');
+            }
+            $this->send_keep_alive();
 
-                // this can return a "stream_select(): unable to select [4]: Interrupted system call" error
-                if (!static::stream_select($read, $write, $except, $sec, $usec)) {
-                    $this->is_timeout = true;
-                    return true;
-                }
-                $elapsed = microtime(true) - $start;
+            list($sec, $usec) = $this->get_stream_timeout();
+            stream_set_timeout($this->fsock, $sec, $usec);
+            $start = microtime(true);
+            $raw = stream_get_contents($this->fsock, $packet->size - strlen($packet->raw));
+            $elapsed = microtime(true) - $start;
+            $packet->read_time += $elapsed;
+            if ($this->curTimeout > 0) {
                 $this->curTimeout -= $elapsed;
             }
-        }
-
-        if (!is_resource($this->fsock) || feof($this->fsock)) {
-            $this->bitmap = 0;
-            $str = 'Connection closed (by server) prematurely';
-            if (isset($elapsed)) {
-                $str .= ' ' . $elapsed . 's';
+            if ($raw === false) {
+                $this->disconnect_helper(NET_SSH2_DISCONNECT_CONNECTION_LOST);
+                throw new ConnectionClosedException('Connection closed by server');
+            } elseif (!strlen($raw)) {
+                continue;
+            }
+            $packet->raw .= $raw;
+            if (!$packet->packet_length) {
+                $this->get_binary_packet_size($packet);
             }
-            throw new ConnectionClosedException($str);
         }
 
-        $start = microtime(true);
-        $raw = stream_get_contents($this->fsock, $this->decrypt_block_size);
-
-        if (!strlen($raw)) {
-            $this->bitmap = 0;
-            throw new ConnectionClosedException('No data received from server');
+        if (strlen($packet->raw) != $packet->size) {
+            throw new \RuntimeException('Size of packet was not expected length');
         }
-
+        // destroy buffer as packet represents the entire payload and should be processed in full
+        $this->binary_packet_buffer = null;
+        // copy the raw payload, so as not to destroy original
+        $raw = $packet->raw;
+        if ($this->hmac_check instanceof Hash) {
+            $hmac = Strings::pop($raw, $this->hmac_size);
+        }
+        $packet_length_header_size = 4;
         if ($this->decrypt) {
             switch ($this->decryptName) {
                 case 'aes128-gcm@openssh.com':
@@ -3490,40 +3593,16 @@ private function get_binary_packet($skip_channel_filter = false)
                         $this->decryptInvocationCounter
                     );
                     Strings::increment_str($this->decryptInvocationCounter);
-                    $this->decrypt->setAAD($temp = Strings::shift($raw, 4));
-                    extract(unpack('Npacket_length', $temp));
-                    /**
-                     * @var integer $packet_length
-                     */
-
-                    $raw .= $this->read_remaining_bytes($packet_length - $this->decrypt_block_size + 4);
-                    $stop = microtime(true);
-                    $tag = stream_get_contents($this->fsock, $this->decrypt_block_size);
-                    $this->decrypt->setTag($tag);
-                    $raw = $this->decrypt->decrypt($raw);
-                    $raw = $temp . $raw;
-                    $remaining_length = 0;
+                    $this->decrypt->setAAD(Strings::shift($raw, $packet_length_header_size));
+                    $this->decrypt->setTag(Strings::pop($raw, $this->decrypt_block_size));
+                    $packet->plain = $this->decrypt->decrypt($raw);
                     break;
                 case 'chacha20-poly1305@openssh.com':
                     // This should be impossible, but we are checking anyway to narrow the type for Psalm.
                     if (!($this->decrypt instanceof ChaCha20)) {
                         throw new \LogicException('$this->decrypt is not a ' . ChaCha20::class);
                     }
-
-                    $nonce = pack('N2', 0, $this->get_seq_no);
-
-                    $this->lengthDecrypt->setNonce($nonce);
-                    $temp = $this->lengthDecrypt->decrypt($aad = Strings::shift($raw, 4));
-                    extract(unpack('Npacket_length', $temp));
-                    /**
-                     * @var integer $packet_length
-                     */
-
-                    $raw .= $this->read_remaining_bytes($packet_length - $this->decrypt_block_size + 4);
-                    $stop = microtime(true);
-                    $tag = stream_get_contents($this->fsock, 16);
-
-                    $this->decrypt->setNonce($nonce);
+                    $this->decrypt->setNonce(pack('N2', 0, $this->get_seq_no));
                     $this->decrypt->setCounter(0);
                     // this is the same approach that's implemented in Salsa20::createPoly1305Key()
                     // but we don't want to use the same AEAD construction that RFC8439 describes
@@ -3531,79 +3610,55 @@ private function get_binary_packet($skip_channel_filter = false)
                     $this->decrypt->setPoly1305Key(
                         $this->decrypt->encrypt(str_repeat("\0", 32))
                     );
-                    $this->decrypt->setAAD($aad);
+                    $this->decrypt->setAAD(Strings::shift($raw, $packet_length_header_size));
                     $this->decrypt->setCounter(1);
-                    $this->decrypt->setTag($tag);
-                    $raw = $this->decrypt->decrypt($raw);
-                    $raw = $temp . $raw;
-                    $remaining_length = 0;
+                    $this->decrypt->setTag(Strings::pop($raw, 16));
+                    $packet->plain = $this->decrypt->decrypt($raw);
                     break;
                 default:
                     if (!$this->hmac_check instanceof Hash || !$this->hmac_check_etm) {
-                        $raw = $this->decrypt->decrypt($raw);
-                        break;
+                        // first block was already decrypted for contained packet_length header
+                        Strings::shift($raw, $this->decrypt_block_size);
+                        if (strlen($raw) > 0) {
+                            $packet->plain .= $this->decrypt->decrypt($raw);
+                        }
+                    } else {
+                        Strings::shift($raw, $packet_length_header_size);
+                        $packet->plain = $this->decrypt->decrypt($raw);
                     }
-                    extract(unpack('Npacket_length', $temp = Strings::shift($raw, 4)));
-                    /**
-                     * @var integer $packet_length
-                     */
-                    $raw .= $this->read_remaining_bytes($packet_length - $this->decrypt_block_size + 4);
-                    $stop = microtime(true);
-                    $encrypted = $temp . $raw;
-                    $raw = $temp . $this->decrypt->decrypt($raw);
-                    $remaining_length = 0;
+                    break;
             }
+        } else {
+            Strings::shift($raw, $packet_length_header_size);
+            $packet->plain = $raw;
         }
-
-        if (strlen($raw) < 5) {
-            $this->bitmap = 0;
-            throw new \RuntimeException('Plaintext is too short');
-        }
-        extract(unpack('Npacket_length/Cpadding_length', Strings::shift($raw, 5)));
-        /**
-         * @var integer $packet_length
-         * @var integer $padding_length
-         */
-
-        if (!isset($remaining_length)) {
-            $remaining_length = $packet_length + 4 - $this->decrypt_block_size;
-        }
-
-        $buffer = $this->read_remaining_bytes($remaining_length);
-
-        if (!isset($stop)) {
-            $stop = microtime(true);
-        }
-        if (strlen($buffer)) {
-            $raw .= $this->decrypt ? $this->decrypt->decrypt($buffer) : $buffer;
-        }
-
-        $payload = Strings::shift($raw, $packet_length - $padding_length - 1);
-        $padding = Strings::shift($raw, $padding_length); // should leave $raw empty
-
         if ($this->hmac_check instanceof Hash) {
-            $hmac = stream_get_contents($this->fsock, $this->hmac_size);
-            if ($hmac === false || strlen($hmac) != $this->hmac_size) {
-                $this->disconnect_helper(NET_SSH2_DISCONNECT_MAC_ERROR);
-                throw new \RuntimeException('Error reading socket');
-            }
-
             $reconstructed = !$this->hmac_check_etm ?
-                pack('NCa*', $packet_length, $padding_length, $payload . $padding) :
-                $encrypted;
+                pack('Na*', $packet->packet_length, $packet->plain) :
+                substr($packet->raw, 0, -$this->hmac_size);
             if (($this->hmac_check->getHash() & "\xFF\xFF\xFF\xFF") == 'umac') {
                 $this->hmac_check->setNonce("\0\0\0\0" . pack('N', $this->get_seq_no));
                 if ($hmac != $this->hmac_check->hash($reconstructed)) {
                     $this->disconnect_helper(NET_SSH2_DISCONNECT_MAC_ERROR);
-                    throw new \RuntimeException('Invalid UMAC');
+                    throw new ConnectionClosedException('Invalid UMAC');
                 }
             } else {
                 if ($hmac != $this->hmac_check->hash(pack('Na*', $this->get_seq_no, $reconstructed))) {
                     $this->disconnect_helper(NET_SSH2_DISCONNECT_MAC_ERROR);
-                    throw new \RuntimeException('Invalid HMAC');
+                    throw new ConnectionClosedException('Invalid HMAC');
                 }
             }
         }
+        $padding_length = 0;
+        $payload = $packet->plain;
+        extract(unpack('Cpadding_length', Strings::shift($payload, 1)));
+        if ($padding_length > 0) {
+            Strings::pop($payload, $padding_length);
+        }
+        if (empty($payload)) {
+            $this->disconnect_helper(NET_SSH2_DISCONNECT_PROTOCOL_ERROR);
+            throw new ConnectionClosedException('Plaintext is too short');
+        }
 
         switch ($this->decompress) {
             case self::NET_SSH2_COMPRESSION_ZLIB_AT_OPENSSH:
@@ -3648,68 +3703,74 @@ private function get_binary_packet($skip_channel_filter = false)
             $current = microtime(true);
             $message_number = isset(self::$message_numbers[ord($payload[0])]) ? self::$message_numbers[ord($payload[0])] : 'UNKNOWN (' . ord($payload[0]) . ')';
             $message_number = '<- ' . $message_number .
-                              ' (since last: ' . round($current - $this->last_packet, 4) . ', network: ' . round($stop - $start, 4) . 's)';
+                              ' (since last: ' . round($current - $this->last_packet, 4) . ', network: ' . round($packet->read_time, 4) . 's)';
             $this->append_log($message_number, $payload);
-            $this->last_packet = $current;
         }
+        $this->last_packet = microtime(true);
 
-        return $this->filter($payload, $skip_channel_filter);
+        return $this->filter($payload);
     }
 
     /**
-     * Read Remaining Bytes
-     *
-     * @see self::get_binary_packet()
-     * @param int $remaining_length
-     * @return string
+     * @param object $packet The packet object being constructed, passed by reference
+     *        The size, packet_length, and plain properties of this object may be modified in processing
+     * @throws InvalidPacketLengthException if the packet length header is invalid
      */
-    private function read_remaining_bytes($remaining_length)
+    private function get_binary_packet_size(&$packet)
     {
-        if (!$remaining_length) {
-            return '';
+        $packet_length_header_size = 4;
+        if (strlen($packet->raw) < $packet_length_header_size) {
+            return;
         }
-
-        $adjustLength = false;
+        $packet_length = 0;
+        $added_validation_length = 0; // indicates when the packet length header is included when validating packet length against block size
         if ($this->decrypt) {
-            switch (true) {
-                case $this->decryptName == 'aes128-gcm@openssh.com':
-                case $this->decryptName == 'aes256-gcm@openssh.com':
-                case $this->decryptName == 'chacha20-poly1305@openssh.com':
-                case $this->hmac_check instanceof Hash && $this->hmac_check_etm:
-                    $remaining_length += $this->decrypt_block_size - 4;
-                    $adjustLength = true;
+            switch ($this->decryptName) {
+                case 'aes128-gcm@openssh.com':
+                case 'aes256-gcm@openssh.com':
+                    extract(unpack('Npacket_length', substr($packet->raw, 0, $packet_length_header_size)));
+                    $packet->size = $packet_length_header_size + $packet_length + $this->decrypt_block_size; // expect tag
+                    break;
+                case 'chacha20-poly1305@openssh.com':
+                    $this->lengthDecrypt->setNonce(pack('N2', 0, $this->get_seq_no));
+                    $packet_length_header = $this->lengthDecrypt->decrypt(substr($packet->raw, 0, $packet_length_header_size));
+                    extract(unpack('Npacket_length', $packet_length_header));
+                    $packet->size = $packet_length_header_size + $packet_length + 16; // expect tag
+                    break;
+                default:
+                    if (!$this->hmac_check instanceof Hash || !$this->hmac_check_etm) {
+                        if (strlen($packet->raw) < $this->decrypt_block_size) {
+                            return;
+                        }
+                        $packet->plain = $this->decrypt->decrypt(substr($packet->raw, 0, $this->decrypt_block_size));
+                        extract(unpack('Npacket_length', Strings::shift($packet->plain, $packet_length_header_size)));
+                        $packet->size = $packet_length_header_size + $packet_length;
+                        $added_validation_length = $packet_length_header_size;
+                    } else {
+                        extract(unpack('Npacket_length', substr($packet->raw, 0, $packet_length_header_size)));
+                        $packet->size = $packet_length_header_size + $packet_length;
+                    }
+                    break;
             }
+        } else {
+            extract(unpack('Npacket_length', substr($packet->raw, 0, $packet_length_header_size)));
+            $packet->size = $packet_length_header_size + $packet_length;
+            $added_validation_length = $packet_length_header_size;
         }
-
         // quoting <http://tools.ietf.org/html/rfc4253#section-6.1>,
         // "implementations SHOULD check that the packet length is reasonable"
         // PuTTY uses 0x9000 as the actual max packet size and so to shall we
-        // don't do this when GCM mode is used since GCM mode doesn't encrypt the length
-        if ($remaining_length < -$this->decrypt_block_size || $remaining_length > 0x9000 || $remaining_length % $this->decrypt_block_size != 0) {
-            if (!$this->bad_key_size_fix && self::bad_algorithm_candidate($this->decrypt ? $this->decryptName : '') && !($this->bitmap & SSH2::MASK_LOGIN)) {
-                $this->bad_key_size_fix = true;
-                $this->reset_connection(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-                return false;
-            }
-            throw new \RuntimeException('Invalid size');
-        }
-
-        if ($adjustLength) {
-            $remaining_length -= $this->decrypt_block_size - 4;
+        if (
+            $packet_length <= 0 || $packet_length > 0x9000
+            || ($packet_length + $added_validation_length) % $this->decrypt_block_size != 0
+        ) {
+            $this->disconnect_helper(NET_SSH2_DISCONNECT_PROTOCOL_ERROR);
+            throw new InvalidPacketLengthException('Invalid packet length');
         }
-
-        $buffer = '';
-        while ($remaining_length > 0) {
-            $temp = stream_get_contents($this->fsock, $remaining_length);
-            if ($temp === false || feof($this->fsock)) {
-                $this->disconnect_helper(NET_SSH2_DISCONNECT_CONNECTION_LOST);
-                throw new \RuntimeException('Error reading from socket');
-            }
-            $buffer .= $temp;
-            $remaining_length -= strlen($temp);
+        if ($this->hmac_check instanceof Hash) {
+            $packet->size += $this->hmac_size;
         }
-
-        return $buffer;
+        $packet->packet_length = $packet_length;
     }
 
     /**
@@ -3719,41 +3780,54 @@ private function read_remaining_bytes($remaining_length)
      *
      * @see self::_get_binary_packet()
      * @param string $payload
-     * @param bool $skip_channel_filter
-     * @return string|bool
+     * @return string
      */
-    private function filter($payload, $skip_channel_filter)
+    private function filter($payload)
     {
         switch (ord($payload[0])) {
             case NET_SSH2_MSG_DISCONNECT:
                 Strings::shift($payload, 1);
                 list($reason_code, $message) = Strings::unpackSSH2('Ns', $payload);
                 $this->errors[] = 'SSH_MSG_DISCONNECT: ' . self::$disconnect_reasons[$reason_code] . "\r\n$message";
-                $this->bitmap = 0;
-                return false;
+                $this->disconnect_helper(NET_SSH2_DISCONNECT_CONNECTION_LOST);
+                throw new ConnectionClosedException('Connection closed by server');
             case NET_SSH2_MSG_IGNORE:
-                $payload = $this->get_binary_packet($skip_channel_filter);
+                $this->extra_packets++;
+                $payload = $this->get_binary_packet();
                 break;
             case NET_SSH2_MSG_DEBUG:
+                $this->extra_packets++;
                 Strings::shift($payload, 2); // second byte is "always_display"
                 list($message) = Strings::unpackSSH2('s', $payload);
                 $this->errors[] = "SSH_MSG_DEBUG: $message";
-                $payload = $this->get_binary_packet($skip_channel_filter);
+                $payload = $this->get_binary_packet();
                 break;
             case NET_SSH2_MSG_UNIMPLEMENTED:
-                return false;
+                break; // return payload
             case NET_SSH2_MSG_KEXINIT:
+                // this is here for key re-exchanges after the initial key exchange
                 if ($this->session_id !== false) {
                     if (!$this->key_exchange($payload)) {
-                        $this->bitmap = 0;
-                        return false;
+                        $this->disconnect_helper(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
+                        throw new ConnectionClosedException('Key exchange failed');
                     }
-                    $payload = $this->get_binary_packet($skip_channel_filter);
+                    $payload = $this->get_binary_packet();
                 }
+                break;
+            case NET_SSH2_MSG_EXT_INFO:
+                Strings::shift($payload, 1);
+                list($nr_extensions) = Strings::unpackSSH2('N', $payload);
+                for ($i = 0; $i < $nr_extensions; $i++) {
+                    list($extension_name, $extension_value) = Strings::unpackSSH2('ss', $payload);
+                    if ($extension_name == 'server-sig-algs') {
+                        $this->supported_private_key_algorithms = explode(',', $extension_value);
+                    }
+                }
+                $payload = $this->get_binary_packet();
         }
 
         // see http://tools.ietf.org/html/rfc4252#section-5.4; only called when the encryption has been activated and when we haven't already logged in
-        if (($this->bitmap & self::MASK_CONNECTED) && !$this->isAuthenticated() && !is_bool($payload) && ord($payload[0]) == NET_SSH2_MSG_USERAUTH_BANNER) {
+        if (($this->bitmap & self::MASK_CONNECTED) && !$this->isAuthenticated() && ord($payload[0]) == NET_SSH2_MSG_USERAUTH_BANNER) {
             Strings::shift($payload, 1);
             list($this->banner_message) = Strings::unpackSSH2('s', $payload);
             $payload = $this->get_binary_packet();
@@ -3761,10 +3835,6 @@ private function filter($payload, $skip_channel_filter)
 
         // only called when we've already logged in
         if (($this->bitmap & self::MASK_CONNECTED) && $this->isAuthenticated()) {
-            if (is_bool($payload)) {
-                return $payload;
-            }
-
             switch (ord($payload[0])) {
                 case NET_SSH2_MSG_CHANNEL_REQUEST:
                     if (strlen($payload) == 31) {
@@ -3773,32 +3843,16 @@ private function filter($payload, $skip_channel_filter)
                             if (ord(substr($payload, 9 + $length))) { // want reply
                                 $this->send_binary_packet(pack('CN', NET_SSH2_MSG_CHANNEL_SUCCESS, $this->server_channels[$channel]));
                             }
-                            $payload = $this->get_binary_packet($skip_channel_filter);
+                            $payload = $this->get_binary_packet();
                         }
                     }
                     break;
-                case NET_SSH2_MSG_CHANNEL_DATA:
-                case NET_SSH2_MSG_CHANNEL_EXTENDED_DATA:
-                case NET_SSH2_MSG_CHANNEL_CLOSE:
-                case NET_SSH2_MSG_CHANNEL_EOF:
-                    if (!$skip_channel_filter && !empty($this->server_channels)) {
-                        $this->binary_packet_buffer = $payload;
-                        $this->get_channel_packet(true);
-                        $payload = $this->get_binary_packet();
-                    }
-                    break;
                 case NET_SSH2_MSG_GLOBAL_REQUEST: // see http://tools.ietf.org/html/rfc4254#section-4
                     Strings::shift($payload, 1);
                     list($request_name) = Strings::unpackSSH2('s', $payload);
                     $this->errors[] = "SSH_MSG_GLOBAL_REQUEST: $request_name";
-
-                    try {
-                        $this->send_binary_packet(pack('C', NET_SSH2_MSG_REQUEST_FAILURE));
-                    } catch (\RuntimeException $e) {
-                        return $this->disconnect_helper(NET_SSH2_DISCONNECT_BY_APPLICATION);
-                    }
-
-                    $payload = $this->get_binary_packet($skip_channel_filter);
+                    $this->send_binary_packet(pack('C', NET_SSH2_MSG_REQUEST_FAILURE));
+                    $payload = $this->get_binary_packet();
                     break;
                 case NET_SSH2_MSG_CHANNEL_OPEN: // see http://tools.ietf.org/html/rfc4254#section-5.1
                     Strings::shift($payload, 1);
@@ -3843,23 +3897,11 @@ private function filter($payload, $skip_channel_filter)
                                 '', // description
                                 '' // language tag
                             );
-
-                            try {
-                                $this->send_binary_packet($packet);
-                            } catch (\RuntimeException $e) {
-                                return $this->disconnect_helper(NET_SSH2_DISCONNECT_BY_APPLICATION);
-                            }
+                            $this->send_binary_packet($packet);
                     }
 
-                    $payload = $this->get_binary_packet($skip_channel_filter);
+                    $payload = $this->get_binary_packet();
                     break;
-                case NET_SSH2_MSG_CHANNEL_WINDOW_ADJUST:
-                    Strings::shift($payload, 1);
-                    list($channel, $window_size) = Strings::unpackSSH2('NN', $payload);
-
-                    $this->window_size_client_to_server[$channel] += $window_size;
-
-                    $payload = ($this->bitmap & self::MASK_WINDOW_ADJUST) ? true : $this->get_binary_packet($skip_channel_filter);
             }
         }
 
@@ -3940,6 +3982,7 @@ public function isPTYEnabled()
      *
      * - the server closes the channel
      * - if the connection times out
+     * - if a window adjust packet is received on the given negated client channel
      * - if the channel status is CHANNEL_OPEN and the response was CHANNEL_OPEN_CONFIRMATION
      * - if the channel status is CHANNEL_REQUEST and the response was CHANNEL_SUCCESS
      * - if the channel status is CHANNEL_CLOSE and the response was CHANNEL_CLOSE
@@ -3948,7 +3991,10 @@ public function isPTYEnabled()
      *
      * - if the channel status is CHANNEL_REQUEST and the response was CHANNEL_FAILURE
      *
-     * @param int $client_channel
+     * @param int $client_channel Specifies the channel to return data for, and data received
+     *        on other channels is buffered. The respective negative value of a channel is
+     *        also supported for the case that the caller is awaiting adjustment of the data
+     *        window, and where data received on that respective channel is also buffered.
      * @param bool $skip_extended
      * @return mixed
      * @throws \RuntimeException on connection error
@@ -3973,27 +4019,15 @@ protected function get_channel_packet($client_channel, $skip_extended = false)
         }
 
         while (true) {
-            if ($this->binary_packet_buffer !== false) {
-                $response = $this->binary_packet_buffer;
-                $this->binary_packet_buffer = false;
-            } else {
-                $response = $this->get_binary_packet(true);
-                if ($response === true && $this->is_timeout) {
-                    if ($client_channel == self::CHANNEL_EXEC && !$this->request_pty) {
-                        $this->close_channel($client_channel);
-                    }
-                    return true;
-                }
-                if ($response === false) {
-                    $this->disconnect_helper(NET_SSH2_DISCONNECT_CONNECTION_LOST);
-                    throw new ConnectionClosedException('Connection closed by server');
-                }
-            }
-
-            if ($client_channel == -1 && $response === true) {
+            try {
+                $response = $this->get_binary_packet();
+            } catch (TimeoutException $e) {
                 return true;
             }
-            list($type, $channel) = Strings::unpackSSH2('CN', $response);
+            list($type) = Strings::unpackSSH2('C', $response);
+            if (strlen($response) >= 4) {
+                list($channel) = Strings::unpackSSH2('N', $response);
+            }
 
             // will not be setup yet on incoming channel open request
             if (isset($channel) && isset($this->channel_status[$channel]) && isset($this->window_size_server_to_client[$channel])) {
@@ -4009,6 +4043,14 @@ protected function get_channel_packet($client_channel, $skip_extended = false)
                 }
 
                 switch ($type) {
+                    case NET_SSH2_MSG_CHANNEL_WINDOW_ADJUST:
+                        list($window_size) = Strings::unpackSSH2('N', $response);
+                        $this->window_size_client_to_server[$channel] += $window_size;
+                        if ($channel == -$client_channel) {
+                            return true;
+                        }
+
+                        continue 2;
                     case NET_SSH2_MSG_CHANNEL_EXTENDED_DATA:
                         /*
                         if ($client_channel == self::CHANNEL_EXEC) {
@@ -4183,7 +4225,7 @@ protected function get_channel_packet($client_channel, $skip_extended = false)
     protected function send_binary_packet($data, $logged = null)
     {
         if (!is_resource($this->fsock) || feof($this->fsock)) {
-            $this->bitmap = 0;
+            $this->disconnect_helper(NET_SSH2_DISCONNECT_CONNECTION_LOST);
             throw new ConnectionClosedException('Connection closed prematurely');
         }
 
@@ -4307,11 +4349,11 @@ protected function send_binary_packet($data, $logged = null)
             $message_number = '-> ' . $message_number .
                               ' (since last: ' . round($current - $this->last_packet, 4) . ', network: ' . round($stop - $start, 4) . 's)';
             $this->append_log($message_number, $logged);
-            $this->last_packet = $current;
         }
+        $this->last_packet = microtime(true);
 
         if (strlen($packet) != $sent) {
-            $this->bitmap = 0;
+            $this->disconnect_helper(NET_SSH2_DISCONNECT_BY_APPLICATION);
             $message = $sent === false ?
                 'Unable to write ' . strlen($packet) . ' bytes' :
                 "Only $sent of " . strlen($packet) . " bytes were sent";
@@ -4319,6 +4361,19 @@ protected function send_binary_packet($data, $logged = null)
         }
     }
 
+    /**
+     * Sends a keep-alive message, if keep-alive is enabled and interval is met
+     */
+    private function send_keep_alive()
+    {
+        if ($this->bitmap & self::MASK_CONNECTED) {
+            $elapsed = microtime(true) - $this->last_packet;
+            if ($this->keepAlive > 0 && $elapsed >= $this->keepAlive) {
+                $this->send_binary_packet(pack('CN', NET_SSH2_MSG_IGNORE, 0));
+            }
+        }
+    }
+
     /**
      * Logs data packets
      *
@@ -4440,12 +4495,24 @@ protected function append_log_helper($constant, $message_number, $message, array
      */
     protected function send_channel_packet($client_channel, $data)
     {
+        if (
+            isset($this->channel_buffers_write[$client_channel])
+            && strpos($data, $this->channel_buffers_write[$client_channel]) === 0
+        ) {
+            // if buffer holds identical initial data content, resume send from the unmatched data portion
+            $data = substr($data, strlen($this->channel_buffers_write[$client_channel]));
+        } else {
+            $this->channel_buffers_write[$client_channel] = '';
+        }
         while (strlen($data)) {
             if (!$this->window_size_client_to_server[$client_channel]) {
-                $this->bitmap ^= self::MASK_WINDOW_ADJUST;
                 // using an invalid channel will let the buffers be built up for the valid channels
-                $this->get_channel_packet(-1);
-                $this->bitmap ^= self::MASK_WINDOW_ADJUST;
+                $this->get_channel_packet(-$client_channel);
+                if ($this->isTimeout()) {
+                    throw new TimeoutException('Timed out waiting for server');
+                } elseif (!$this->window_size_client_to_server[$client_channel]) {
+                    throw new \RuntimeException('Data window was not adjusted');
+                }
             }
 
             /* The maximum amount of data allowed is determined by the maximum
@@ -4466,7 +4533,9 @@ protected function send_channel_packet($client_channel, $data)
             );
             $this->window_size_client_to_server[$client_channel] -= strlen($temp);
             $this->send_binary_packet($packet);
+            $this->channel_buffers_write[$client_channel] .= $temp;
         }
+        unset($this->channel_buffers_write[$client_channel]);
     }
 
     /**
@@ -4532,7 +4601,12 @@ private function close_channel_bitmap($client_channel)
      */
     protected function disconnect_helper($reason)
     {
-        if ($this->bitmap & self::MASK_CONNECTED) {
+        if ($this->bitmap & self::MASK_DISCONNECT) {
+            // Disregard subsequent disconnect requests
+            return false;
+        }
+        $this->bitmap |= self::MASK_DISCONNECT;
+        if ($this->isConnected()) {
             $data = Strings::packSSH2('CNss', NET_SSH2_MSG_DISCONNECT, $reason, '', '');
             try {
                 $this->send_binary_packet($data);
@@ -4540,10 +4614,7 @@ protected function disconnect_helper($reason)
             }
         }
 
-        $this->bitmap = 0;
-        if (is_resource($this->fsock) && get_resource_type($this->fsock) === 'stream') {
-            fclose($this->fsock);
-        }
+        $this->reset_connection();
 
         return false;
     }
@@ -4606,9 +4677,12 @@ protected function format_log(array $message_log, array $message_number_log)
     {
         $output = '';
         for ($i = 0; $i < count($message_log); $i++) {
-            $output .= $message_number_log[$i] . "\r\n";
+            $output .= $message_number_log[$i];
             $current_log = $message_log[$i];
             $j = 0;
+            if (strlen($current_log)) {
+                $output .= "\r\n";
+            }
             do {
                 if (strlen($current_log)) {
                     $output .= str_pad(dechex($j), 7, '0', STR_PAD_LEFT) . '0  ';
@@ -4664,7 +4738,9 @@ private static function array_intersect_first(array $array1, array $array2)
     }
 
     /**
-     * Returns all errors
+     * Returns all errors / debug messages on the SSH layer
+     *
+     * If you are looking for messages from the SFTP layer, please see SFTP::getSFTPErrors()
      *
      * @return string[]
      */
@@ -4674,7 +4750,9 @@ public function getErrors()
     }
 
     /**
-     * Returns the last error
+     * Returns the last error received on the SSH layer
+     *
+     * If you are looking for messages from the SFTP layer, please see SFTP::getLastSFTPError()
      *
      * @return string
      */
@@ -4861,10 +4939,30 @@ public static function getSupportedEncryptionAlgorithms()
                     $obj->setKeyLength(preg_replace('#[^\d]#', '', $algo));
                 }
                 switch ($algo) {
+                    // Eval engines do not exist for ChaCha20 or RC4 because they would not benefit from one.
+                    // to benefit from an Eval engine they'd need to loop a variable amount of times, they'd
+                    // need to do table lookups (eg. sbox subsitutions). ChaCha20 doesn't do either because
+                    // it's a so-called ARX cipher, meaning that the only operations it does are add (A), rotate (R)
+                    // and XOR (X). RC4 does do table lookups but being a stream cipher it works differently than
+                    // block ciphers. with RC4 you XOR the plaintext against a keystream and the keystream changes
+                    // as you encrypt stuff. the only table lookups are made against this keystream and thus table
+                    // lookups are kinda unavoidable. with AES and DES, however, the table lookups that are done
+                    // are done against substitution boxes (sboxes), which are invariant.
+
+                    // OpenSSL can't be used as an engine, either, because OpenSSL doesn't support continuous buffers
+                    // as SSH2 uses and altho you can emulate a continuous buffer with block ciphers you can't do so
+                    // with stream ciphers. As for ChaCha20...  for the ChaCha20 part OpenSSL could prob be used but
+                    // the big slow down isn't with ChaCha20 - it's with Poly1305. SSH constructs the key for that
+                    // differently than how OpenSSL does it (OpenSSL does it as the RFC describes, SSH doesn't).
+
+                    // libsodium can't be used because it doesn't support RC4 and it doesn't construct the Poly1305
+                    // keys in the same way that SSH does
+
+                    // mcrypt could prob be used for RC4 but mcrypt hasn't been included in PHP core for yearss
                     case 'chacha20-poly1305@openssh.com':
                     case 'arcfour128':
                     case 'arcfour256':
-                        if ($engine != 'Eval') {
+                        if ($engine != 'PHP') {
                             continue 2;
                         }
                         break;
@@ -4895,22 +4993,24 @@ public static function getSupportedMACAlgorithms()
         return [
             'hmac-sha2-256-etm@openssh.com',
             'hmac-sha2-512-etm@openssh.com',
-            'umac-64-etm@openssh.com',
-            'umac-128-etm@openssh.com',
             'hmac-sha1-etm@openssh.com',
 
             // from <http://www.ietf.org/rfc/rfc6668.txt>:
             'hmac-sha2-256',// RECOMMENDED     HMAC-SHA256 (digest length = key length = 32)
             'hmac-sha2-512',// OPTIONAL        HMAC-SHA512 (digest length = key length = 64)
 
-            // from <https://tools.ietf.org/html/draft-miller-secsh-umac-01>:
-            'umac-64@openssh.com',
-            'umac-128@openssh.com',
-
             'hmac-sha1-96', // RECOMMENDED     first 96 bits of HMAC-SHA1 (digest length = 12, key length = 20)
             'hmac-sha1',    // REQUIRED        HMAC-SHA1 (digest length = key length = 20)
             'hmac-md5-96',  // OPTIONAL        first 96 bits of HMAC-MD5 (digest length = 12, key length = 16)
             'hmac-md5',     // OPTIONAL        HMAC-MD5 (digest length = key length = 16)
+
+            'umac-64-etm@openssh.com',
+            'umac-128-etm@openssh.com',
+
+            // from <https://tools.ietf.org/html/draft-miller-secsh-umac-01>:
+            'umac-64@openssh.com',
+            'umac-128@openssh.com',
+
             //'none'          // OPTIONAL        no MAC; NOT RECOMMENDED
         ];
     }
@@ -4993,14 +5093,14 @@ public function setPreferredAlgorithms(array $methods)
 
         if (isset($preferred['kex'])) {
             $preferred['kex'] = array_intersect(
-                $preferred['kex'],
+                is_string($preferred['kex']) ? [$preferred['kex']] : $preferred['kex'],
                 static::getSupportedKEXAlgorithms()
             );
         }
 
         if (isset($preferred['hostkey'])) {
             $preferred['hostkey'] = array_intersect(
-                $preferred['hostkey'],
+                is_string($preferred['hostkey']) ? [$preferred['hostkey']] : $preferred['hostkey'],
                 static::getSupportedHostKeyAlgorithms()
             );
         }
@@ -5011,19 +5111,19 @@ public function setPreferredAlgorithms(array $methods)
                 $a = &$preferred[$key];
                 if (isset($a['crypt'])) {
                     $a['crypt'] = array_intersect(
-                        $a['crypt'],
+                        is_string($a['crypt']) ? [$a['crypt']] : $a['crypt'],
                         static::getSupportedEncryptionAlgorithms()
                     );
                 }
                 if (isset($a['comp'])) {
                     $a['comp'] = array_intersect(
-                        $a['comp'],
+                        is_string($a['comp']) ? [$a['comp']] : $a['comp'],
                         static::getSupportedCompressionAlgorithms()
                     );
                 }
                 if (isset($a['mac'])) {
                     $a['mac'] = array_intersect(
-                        $a['mac'],
+                        is_string($a['mac']) ? [$a['mac']] : $a['mac'],
                         static::getSupportedMACAlgorithms()
                     );
                 }
@@ -5086,7 +5186,7 @@ public function getBannerMessage()
      *
      * @return string|false
      * @throws \RuntimeException on badly formatted keys
-     * @throws \phpseclib3\Exception\NoSupportedAlgorithmsException when the key isn't in a supported format
+     * @throws NoSupportedAlgorithmsException when the key isn't in a supported format
      */
     public function getServerPublicHostKey()
     {
diff --git a/vendor/phpseclib/phpseclib/phpseclib/System/SSH/Agent.php b/vendor/phpseclib/phpseclib/phpseclib/System/SSH/Agent.php
index 26ca322756..376d77bfe4 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/System/SSH/Agent.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/System/SSH/Agent.php
@@ -33,6 +33,7 @@
 namespace phpseclib3\System\SSH;
 
 use phpseclib3\Common\Functions\Strings;
+use phpseclib3\Crypt\Common\PublicKey;
 use phpseclib3\Crypt\PublicKeyLoader;
 use phpseclib3\Crypt\RSA;
 use phpseclib3\Exception\BadConfigurationException;
@@ -110,8 +111,8 @@ class Agent
     /**
      * Default Constructor
      *
-     * @return \phpseclib3\System\SSH\Agent
-     * @throws \phpseclib3\Exception\BadConfigurationException if SSH_AUTH_SOCK cannot be found
+     * @return Agent
+     * @throws BadConfigurationException if SSH_AUTH_SOCK cannot be found
      * @throws \RuntimeException on connection errors
      */
     public function __construct($address = null)
@@ -192,7 +193,8 @@ public function requestIdentities()
             if (isset($key)) {
                 $identity = (new Identity($this->fsock))
                     ->withPublicKey($key)
-                    ->withPublicKeyBlob($key_blob);
+                    ->withPublicKeyBlob($key_blob)
+                    ->withComment($comment);
                 $identities[] = $identity;
                 unset($key);
             }
@@ -201,6 +203,24 @@ public function requestIdentities()
         return $identities;
     }
 
+    /**
+     * Returns the SSH Agent identity matching a given public key or null if no identity is found
+     *
+     * @return ?Identity
+     */
+    public function findIdentityByPublicKey(PublicKey $key)
+    {
+        $identities = $this->requestIdentities();
+        $key = (string) $key;
+        foreach ($identities as $identity) {
+            if (((string) $identity->getPublicKey()) == $key) {
+                return $identity;
+            }
+        }
+
+        return null;
+    }
+
     /**
      * Signal that agent forwarding should
      * be requested when a channel is opened
@@ -217,7 +237,7 @@ public function startSSHForwarding()
     /**
      * Request agent forwarding of remote server
      *
-     * @param \phpseclib3\Net\SSH2 $ssh
+     * @param SSH2 $ssh
      * @return bool
      */
     private function request_forwarding(SSH2 $ssh)
@@ -238,7 +258,7 @@ private function request_forwarding(SSH2 $ssh)
      * open to give the SSH Agent an opportunity
      * to take further action. i.e. request agent forwarding
      *
-     * @param \phpseclib3\Net\SSH2 $ssh
+     * @param SSH2 $ssh
      */
     public function registerChannelOpen(SSH2 $ssh)
     {
diff --git a/vendor/phpseclib/phpseclib/phpseclib/System/SSH/Agent/Identity.php b/vendor/phpseclib/phpseclib/phpseclib/System/SSH/Agent/Identity.php
index 653e8ea5de..06a4bafd14 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/System/SSH/Agent/Identity.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/System/SSH/Agent/Identity.php
@@ -79,6 +79,13 @@ class Identity implements PrivateKey
      */
     private $flags = 0;
 
+    /**
+     * Comment
+     *
+     * @var null|string
+     */
+    private $comment;
+
     /**
      * Curve Aliases
      *
@@ -106,7 +113,7 @@ public function __construct($fsock)
      *
      * Called by \phpseclib3\System\SSH\Agent::requestIdentities()
      *
-     * @param \phpseclib3\Crypt\Common\PublicKey $key
+     * @param PublicKey $key
      */
     public function withPublicKey(PublicKey $key)
     {
@@ -141,10 +148,9 @@ public function withPublicKeyBlob($key_blob)
      *
      * Wrapper for $this->key->getPublicKey()
      *
-     * @param string $type optional
      * @return mixed
      */
-    public function getPublicKey($type = 'PKCS8')
+    public function getPublicKey()
     {
         return $this->key;
     }
@@ -261,7 +267,7 @@ public function getCurve()
      * @param string $message
      * @return string
      * @throws \RuntimeException on connection errors
-     * @throws \phpseclib3\Exception\UnsupportedAlgorithmException if the algorithm is unsupported
+     * @throws UnsupportedAlgorithmException if the algorithm is unsupported
      */
     public function sign($message)
     {
@@ -317,4 +323,24 @@ public function withPassword($password = false)
     {
         throw new \RuntimeException('ssh-agent does not provide a mechanism to get the private key');
     }
+
+    /**
+     * Sets the comment
+     */
+    public function withComment($comment = null)
+    {
+        $new = clone $this;
+        $new->comment = $comment;
+        return $new;
+    }
+
+    /**
+     * Returns the comment
+     *
+     * @return null|string
+     */
+    public function getComment()
+    {
+        return $this->comment;
+    }
 }
diff --git a/vendor/psr/http-client/CHANGELOG.md b/vendor/psr/http-client/CHANGELOG.md
index e2dc25f519..babba7c7b2 100644
--- a/vendor/psr/http-client/CHANGELOG.md
+++ b/vendor/psr/http-client/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 1.0.3
+
+Add `source` link in composer.json. No code changes.
+
+## 1.0.2
+
+Allow PSR-7 (psr/http-message) 2.0. No code changes.
+
 ## 1.0.1
 
 Allow installation with PHP 8. No code changes.
diff --git a/vendor/psr/http-client/README.md b/vendor/psr/http-client/README.md
index 6876b84036..84af5c55d5 100644
--- a/vendor/psr/http-client/README.md
+++ b/vendor/psr/http-client/README.md
@@ -7,6 +7,6 @@ Note that this is not a HTTP Client implementation of its own. It is merely abst
 
 The installable [package][package-url] and [implementations][implementation-url] are listed on Packagist.
 
-[psr-url]: http://www.php-fig.org/psr/psr-18
+[psr-url]: https://www.php-fig.org/psr/psr-18
 [package-url]: https://packagist.org/packages/psr/http-client
 [implementation-url]: https://packagist.org/providers/psr/http-client-implementation
diff --git a/vendor/psr/http-client/composer.json b/vendor/psr/http-client/composer.json
index c195f8ff15..6fed350beb 100644
--- a/vendor/psr/http-client/composer.json
+++ b/vendor/psr/http-client/composer.json
@@ -7,12 +7,15 @@
     "authors": [
         {
             "name": "PHP-FIG",
-            "homepage": "http://www.php-fig.org/"
+            "homepage": "https://www.php-fig.org/"
         }
     ],
+    "support": {
+        "source": "https://github.com/php-fig/http-client"
+    },
     "require": {
         "php": "^7.0 || ^8.0",
-        "psr/http-message": "^1.0"
+        "psr/http-message": "^1.0 || ^2.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/vendor/psr/http-factory/.gitignore b/vendor/psr/http-factory/.gitignore
deleted file mode 100644
index d8a7996ab3..0000000000
--- a/vendor/psr/http-factory/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-composer.lock
-vendor/
diff --git a/vendor/psr/http-factory/.pullapprove.yml b/vendor/psr/http-factory/.pullapprove.yml
deleted file mode 100644
index 8cf081942c..0000000000
--- a/vendor/psr/http-factory/.pullapprove.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-extends: default
-reviewers:
-    -
-        name: contributors
-        required: 1
-        teams:
-            - http-factory-contributors
diff --git a/vendor/psr/http-factory/README.md b/vendor/psr/http-factory/README.md
index 41d362a625..bf8913b576 100644
--- a/vendor/psr/http-factory/README.md
+++ b/vendor/psr/http-factory/README.md
@@ -1,10 +1,12 @@
 HTTP Factories
 ==============
 
-This repository holds all interfaces related to [PSR-17 (HTTP Message Factories)][psr-17]. 
-Please refer to the specification for a description.
+This repository holds all interfaces related to [PSR-17 (HTTP Factories)][psr-url].
 
-You can find implementations of the specification by looking for packages providing the 
-[psr/http-factory-implementation](https://packagist.org/providers/psr/http-factory-implementation) virtual package.
+Note that this is not a HTTP Factory implementation of its own. It is merely interfaces that describe the components of a HTTP Factory.
 
-[psr-17]: https://www.php-fig.org/psr/psr-17/
+The installable [package][package-url] and [implementations][implementation-url] are listed on Packagist.
+
+[psr-url]: https://www.php-fig.org/psr/psr-17/
+[package-url]: https://packagist.org/packages/psr/http-factory
+[implementation-url]: https://packagist.org/providers/psr/http-factory-implementation
diff --git a/vendor/psr/http-factory/composer.json b/vendor/psr/http-factory/composer.json
index af62b290f9..82a1d3266b 100644
--- a/vendor/psr/http-factory/composer.json
+++ b/vendor/psr/http-factory/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "psr/http-factory",
-    "description": "Common interfaces for PSR-7 HTTP message factories",
+    "description": "PSR-17: Common interfaces for PSR-7 HTTP message factories",
     "keywords": [
         "psr",
         "psr-7",
@@ -15,12 +15,15 @@
     "authors": [
         {
             "name": "PHP-FIG",
-            "homepage": "http://www.php-fig.org/"
+            "homepage": "https://www.php-fig.org/"
         }
     ],
+    "support": {
+        "source": "https://github.com/php-fig/http-factory"
+    },
     "require": {
-        "php": ">=7.0.0",
-        "psr/http-message": "^1.0"
+        "php": ">=7.1",
+        "psr/http-message": "^1.0 || ^2.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/vendor/psr/http-factory/src/UploadedFileFactoryInterface.php b/vendor/psr/http-factory/src/UploadedFileFactoryInterface.php
index 7db4e30af7..d7adbf0e26 100644
--- a/vendor/psr/http-factory/src/UploadedFileFactoryInterface.php
+++ b/vendor/psr/http-factory/src/UploadedFileFactoryInterface.php
@@ -15,10 +15,10 @@ interface UploadedFileFactoryInterface
      *
      * @param StreamInterface $stream Underlying stream representing the
      *     uploaded file content.
-     * @param int $size in bytes
+     * @param int|null $size in bytes
      * @param int $error PHP file upload error
-     * @param string $clientFilename Filename as provided by the client, if any.
-     * @param string $clientMediaType Media type as provided by the client, if any.
+     * @param string|null $clientFilename Filename as provided by the client, if any.
+     * @param string|null $clientMediaType Media type as provided by the client, if any.
      *
      * @return UploadedFileInterface
      *
@@ -26,9 +26,9 @@ interface UploadedFileFactoryInterface
      */
     public function createUploadedFile(
         StreamInterface $stream,
-        int $size = null,
+        ?int $size = null,
         int $error = \UPLOAD_ERR_OK,
-        string $clientFilename = null,
-        string $clientMediaType = null
+        ?string $clientFilename = null,
+        ?string $clientMediaType = null
     ): UploadedFileInterface;
 }
diff --git a/vendor/psr/http-message/README.md b/vendor/psr/http-message/README.md
index 28185338f7..2668be6c30 100644
--- a/vendor/psr/http-message/README.md
+++ b/vendor/psr/http-message/README.md
@@ -10,4 +10,7 @@ interface that describes a HTTP message. See the specification for more details.
 Usage
 -----
 
-We'll certainly need some stuff in here.
\ No newline at end of file
+Before reading the usage guide we recommend reading the PSR-7 interfaces method list:
+
+* [`PSR-7 Interfaces Method List`](docs/PSR7-Interfaces.md)
+* [`PSR-7 Usage Guide`](docs/PSR7-Usage.md)
\ No newline at end of file
diff --git a/vendor/psr/http-message/composer.json b/vendor/psr/http-message/composer.json
index b0d2937a03..c66e5aba40 100644
--- a/vendor/psr/http-message/composer.json
+++ b/vendor/psr/http-message/composer.json
@@ -7,11 +7,11 @@
     "authors": [
         {
             "name": "PHP-FIG",
-            "homepage": "http://www.php-fig.org/"
+            "homepage": "https://www.php-fig.org/"
         }
     ],
     "require": {
-        "php": ">=5.3.0"
+        "php": "^7.2 || ^8.0"
     },
     "autoload": {
         "psr-4": {
@@ -20,7 +20,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0.x-dev"
+            "dev-master": "2.0.x-dev"
         }
     }
 }
diff --git a/vendor/psr/http-message/docs/PSR7-Interfaces.md b/vendor/psr/http-message/docs/PSR7-Interfaces.md
new file mode 100644
index 0000000000..3a7e7dda69
--- /dev/null
+++ b/vendor/psr/http-message/docs/PSR7-Interfaces.md
@@ -0,0 +1,130 @@
+# Interfaces
+
+The purpose of this list is to help in finding the methods when working with PSR-7. This can be considered as a cheatsheet for PSR-7 interfaces.
+
+The interfaces defined in PSR-7 are the following:
+
+| Class Name | Description |
+|---|---|
+| [Psr\Http\Message\MessageInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessagemessageinterface) | Representation of a HTTP message |
+| [Psr\Http\Message\RequestInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessagerequestinterface) | Representation of an outgoing, client-side request. |
+| [Psr\Http\Message\ServerRequestInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessageserverrequestinterface) | Representation of an incoming, server-side HTTP request. | 
+| [Psr\Http\Message\ResponseInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessageresponseinterface) | Representation of an outgoing, server-side response. |
+| [Psr\Http\Message\StreamInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessagestreaminterface) | Describes a data stream |
+| [Psr\Http\Message\UriInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessageuriinterface) | Value object representing a URI. |
+| [Psr\Http\Message\UploadedFileInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessageuploadedfileinterface) | Value object representing a file uploaded through an HTTP request. |
+
+## `Psr\Http\Message\MessageInterface` Methods
+
+| Method Name                        | Description | Notes |
+|------------------------------------| ----------- | ----- |
+| `getProtocolVersion()`             | Retrieve HTTP protocol version          |  1.0 or 1.1 |
+| `withProtocolVersion($version)`    | Returns new message instance with given HTTP protocol version          |      |
+| `getHeaders()`                     | Retrieve all HTTP Headers               | [Request Header List](https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#Request_fields), [Response Header List](https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#Response_fields)      |
+| `hasHeader($name)`                 | Checks if HTTP Header with given name exists  | |
+| `getHeader($name)`                 | Retrieves a array with the values for a single header | |
+| `getHeaderLine($name)`             | Retrieves a comma-separated string of the values for a single header |  |
+| `withHeader($name, $value)`        | Returns new message instance with given HTTP Header | if the header existed in the original instance, replaces the header value from the original message with the value provided when creating the new instance. |
+| `withAddedHeader($name, $value)`   | Returns new message instance with appended value to given header | If header already exists value will be appended, if not a new header will be created |
+| `withoutHeader($name)`             | Removes HTTP Header with given name| |
+| `getBody()`                        | Retrieves the HTTP Message Body | Returns object implementing `StreamInterface`|
+| `withBody(StreamInterface $body)`  | Returns new message instance with given HTTP Message Body | |
+
+
+## `Psr\Http\Message\RequestInterface` Methods
+
+Same methods as `Psr\Http\Message\MessageInterface`  + the following methods:
+
+| Method Name                        | Description | Notes |
+|------------------------------------| ----------- | ----- |
+| `getRequestTarget()`                | Retrieves the message's request target              | origin-form, absolute-form, authority-form, asterisk-form ([RFC7230](https://www.rfc-editor.org/rfc/rfc7230.txt)) |
+| `withRequestTarget($requestTarget)` | Return a new message instance with the specific request-target |      |
+| `getMethod()`                       | Retrieves the HTTP method of the request.  |  GET, HEAD, POST, PUT, DELETE, CONNECT, OPTIONS, TRACE (defined in [RFC7231](https://tools.ietf.org/html/rfc7231)), PATCH (defined in [RFC5789](https://tools.ietf.org/html/rfc5789)) |
+| `withMethod($method)`               | Returns a new message instance with the provided HTTP method  | |
+| `getUri()`                 | Retrieves the URI instance | |
+| `withUri(UriInterface $uri, $preserveHost = false)` | Returns a new message instance with the provided URI |  |
+
+
+## `Psr\Http\Message\ServerRequestInterface` Methods
+
+Same methods as `Psr\Http\Message\RequestInterface`  + the following methods:
+
+| Method Name                        | Description | Notes |
+|------------------------------------| ----------- | ----- |
+| `getServerParams() `               | Retrieve server parameters  | Typically derived from `$_SERVER`  |
+| `getCookieParams()`                | Retrieves cookies sent by the client to the server. | Typically derived from `$_COOKIES` |
+| `withCookieParams(array $cookies)` |  Returns a new request instance with the specified cookies      |   | 
+| `withQueryParams(array $query)` | Returns a new request instance with the specified query string arguments  |  |
+| `getUploadedFiles()` | Retrieve normalized file upload data  |  |
+| `withUploadedFiles(array $uploadedFiles)` | Returns a new request instance with the specified uploaded files  |  |
+| `getParsedBody()` | Retrieve any parameters provided in the request body  |  |
+| `withParsedBody($data)` | Returns a new request instance with the specified body parameters  |  |
+| `getAttributes()` | Retrieve attributes derived from the request  |  |
+| `getAttribute($name, $default = null)` | Retrieve a single derived request attribute  |  |
+| `withAttribute($name, $value)` | Returns a new request instance with the specified derived request attribute  |  |
+| `withoutAttribute($name)` | Returns a new request instance that without the specified derived request attribute  |  |
+
+## `Psr\Http\Message\ResponseInterface` Methods:
+
+Same methods as `Psr\Http\Message\MessageInterface`  + the following methods:
+
+| Method Name                        | Description | Notes |
+|------------------------------------| ----------- | ----- |
+| `getStatusCode()` | Gets the response status code. | |
+| `withStatus($code, $reasonPhrase = '')` | Returns a new response instance with the specified status code and, optionally, reason phrase. | |
+| `getReasonPhrase()` | Gets the response reason phrase associated with the status code. | |
+
+##  `Psr\Http\Message\StreamInterface` Methods
+
+| Method Name                        | Description | Notes |
+|------------------------------------| ----------- | ----- |
+| `__toString()` | Reads all data from the stream into a string, from the beginning to end. | |
+| `close()` | Closes the stream and any underlying resources. | |
+| `detach()` | Separates any underlying resources from the stream. | |
+| `getSize()` | Get the size of the stream if known. | |
+| `eof()` | Returns true if the stream is at the end of the stream.| |
+| `isSeekable()` |  Returns whether or not the stream is seekable. | |
+| `seek($offset, $whence = SEEK_SET)` | Seek to a position in the stream. | |
+| `rewind()` | Seek to the beginning of the stream. | |
+| `isWritable()` | Returns whether or not the stream is writable. | |
+| `write($string)` | Write data to the stream. | |
+| `isReadable()` | Returns whether or not the stream is readable. | |
+| `read($length)` | Read data from the stream. | |
+| `getContents()` | Returns the remaining contents in a string | |
+| `getMetadata($key = null)()` | Get stream metadata as an associative array or retrieve a specific key. | |
+
+## `Psr\Http\Message\UriInterface` Methods
+
+| Method Name                        | Description | Notes |
+|------------------------------------| ----------- | ----- |
+| `getScheme()` | Retrieve the scheme component of the URI. | |
+| `getAuthority()` | Retrieve the authority component of the URI. | |
+| `getUserInfo()` | Retrieve the user information component of the URI. | |
+| `getHost()` | Retrieve the host component of the URI. | |
+| `getPort()` | Retrieve the port component of the URI. | |
+| `getPath()` | Retrieve the path component of the URI. | |
+| `getQuery()` | Retrieve the query string of the URI. | |
+| `getFragment()` | Retrieve the fragment component of the URI. | |
+| `withScheme($scheme)` | Return an instance with the specified scheme. | |
+| `withUserInfo($user, $password = null)` | Return an instance with the specified user information. | |
+| `withHost($host)` | Return an instance with the specified host. | |
+| `withPort($port)` | Return an instance with the specified port. | |
+| `withPath($path)` | Return an instance with the specified path. | |
+| `withQuery($query)` | Return an instance with the specified query string. | |
+| `withFragment($fragment)` | Return an instance with the specified URI fragment. | |
+| `__toString()` | Return the string representation as a URI reference. | |
+
+## `Psr\Http\Message\UploadedFileInterface` Methods
+
+| Method Name                        | Description | Notes |
+|------------------------------------| ----------- | ----- |
+| `getStream()` | Retrieve a stream representing the uploaded file. | |
+| `moveTo($targetPath)` | Move the uploaded file to a new location. | |
+| `getSize()` | Retrieve the file size. | |
+| `getError()` | Retrieve the error associated with the uploaded file. | |
+| `getClientFilename()` | Retrieve the filename sent by the client. | |
+| `getClientMediaType()` | Retrieve the media type sent by the client. | |
+
+> `RequestInterface`, `ServerRequestInterface`, `ResponseInterface` extend `MessageInterface`  because the `Request` and the `Response` are `HTTP Messages`.
+> When using `ServerRequestInterface`, both `RequestInterface` and `Psr\Http\Message\MessageInterface` methods are considered.
+
diff --git a/vendor/psr/http-message/docs/PSR7-Usage.md b/vendor/psr/http-message/docs/PSR7-Usage.md
new file mode 100644
index 0000000000..b6d048a341
--- /dev/null
+++ b/vendor/psr/http-message/docs/PSR7-Usage.md
@@ -0,0 +1,159 @@
+### PSR-7 Usage
+
+All PSR-7 applications comply with these interfaces 
+They were created to establish a standard between middleware implementations.
+
+> `RequestInterface`, `ServerRequestInterface`, `ResponseInterface` extend `MessageInterface`  because the `Request` and the `Response` are `HTTP Messages`.
+> When using `ServerRequestInterface`, both `RequestInterface` and `Psr\Http\Message\MessageInterface` methods are considered.
+
+
+The following examples will illustrate how basic operations are done in PSR-7.
+
+##### Examples
+
+
+For this examples to work (at least) a PSR-7 implementation package is required. (eg: zendframework/zend-diactoros, guzzlehttp/psr7, slim/slim, etc)
+All PSR-7 implementations should have the same behaviour.
+
+The following will be assumed: 
+`$request` is an object of `Psr\Http\Message\RequestInterface` and
+
+`$response` is an object implementing `Psr\Http\Message\RequestInterface`
+
+
+### Working with HTTP Headers
+
+#### Adding headers to response:
+
+```php
+$response->withHeader('My-Custom-Header', 'My Custom Message');
+```
+
+#### Appending values to headers
+
+```php
+$response->withAddedHeader('My-Custom-Header', 'The second message');
+```
+
+#### Checking if header exists:
+
+```php
+$request->hasHeader('My-Custom-Header'); // will return false
+$response->hasHeader('My-Custom-Header'); // will return true
+```
+
+> Note: My-Custom-Header was only added in the Response
+
+#### Getting comma-separated values from a header (also applies to request)
+
+```php
+// getting value from request headers
+$request->getHeaderLine('Content-Type'); // will return: "text/html; charset=UTF-8"
+// getting value from response headers
+$response->getHeaderLine('My-Custom-Header'); // will return:  "My Custom Message; The second message"
+```
+
+#### Getting array of value from a header (also applies to request)
+```php
+// getting value from request headers
+$request->getHeader('Content-Type'); // will return: ["text/html", "charset=UTF-8"]
+// getting value from response headers
+$response->getHeader('My-Custom-Header'); // will return:  ["My Custom Message",  "The second message"]
+```
+
+#### Removing headers from HTTP Messages
+```php
+// removing a header from Request, removing deprecated "Content-MD5" header
+$request->withoutHeader('Content-MD5'); 
+
+// removing a header from Response
+// effect: the browser won't know the size of the stream
+// the browser will download the stream till it ends
+$response->withoutHeader('Content-Length');
+```
+
+### Working with HTTP Message Body
+
+When working with the PSR-7 there are two methods of implementation:
+#### 1. Getting the body separately
+
+> This method makes the body handling easier to understand and is useful when repeatedly calling body methods. (You only call `getBody()` once). Using this method mistakes like `$response->write()` are also prevented.
+
+```php
+$body = $response->getBody();
+// operations on body, eg. read, write, seek
+// ...
+// replacing the old body
+$response->withBody($body); 
+// this last statement is optional as we working with objects
+// in this case the "new" body is same with the "old" one
+// the $body variable has the same value as the one in $request, only the reference is passed
+```
+
+#### 2. Working directly on response
+
+> This method is useful when only performing few operations as the `$request->getBody()` statement fragment is required
+
+```php
+$response->getBody()->write('hello');
+```
+
+### Getting the body contents
+
+The following snippet gets the contents of a stream contents.
+> Note: Streams must be rewinded, if content was written into streams, it will be ignored when calling `getContents()` because the stream pointer is set to the last character, which is `\0` - meaning end of stream.
+```php 
+$body = $response->getBody();
+$body->rewind(); // or $body->seek(0);
+$bodyText = $body->getContents();
+```
+> Note: If `$body->seek(1)` is called before `$body->getContents()`, the first character will be ommited as the starting pointer is set to `1`, not `0`. This is why using `$body->rewind()` is recommended.
+
+### Append to body
+
+```php
+$response->getBody()->write('Hello'); // writing directly
+$body = $request->getBody(); // which is a `StreamInterface`
+$body->write('xxxxx');
+```
+
+### Prepend to body
+Prepending is different when it comes to streams. The content must be copied before writing the content to be prepended.
+The following example will explain the behaviour of streams.
+
+```php
+// assuming our response is initially empty
+$body = $repsonse->getBody();
+// writing the string "abcd"
+$body->write('abcd');
+
+// seeking to start of stream
+$body->seek(0);
+// writing 'ef'
+$body->write('ef'); // at this point the stream contains "efcd"
+```
+
+#### Prepending by rewriting separately
+
+```php
+// assuming our response body stream only contains: "abcd"
+$body = $response->getBody();
+$body->rewind();
+$contents = $body->getContents(); // abcd
+// seeking the stream to beginning
+$body->rewind();
+$body->write('ef'); // stream contains "efcd"
+$body->write($contents); // stream contains "efabcd"
+```
+
+> Note: `getContents()` seeks the stream while reading it, therefore if the second `rewind()` method call was not present the stream would have resulted in `abcdefabcd` because the `write()` method appends to stream if not preceeded by `rewind()` or `seek(0)`.
+
+#### Prepending by using contents as a string
+```php
+$body = $response->getBody();
+$body->rewind();
+$contents = $body->getContents(); // efabcd
+$contents = 'ef'.$contents;
+$body->rewind();
+$body->write($contents);
+```
diff --git a/vendor/psr/http-message/src/MessageInterface.php b/vendor/psr/http-message/src/MessageInterface.php
index dd46e5ec81..a83c98518d 100644
--- a/vendor/psr/http-message/src/MessageInterface.php
+++ b/vendor/psr/http-message/src/MessageInterface.php
@@ -23,7 +23,7 @@ interface MessageInterface
      *
      * @return string HTTP protocol version.
      */
-    public function getProtocolVersion();
+    public function getProtocolVersion(): string;
 
     /**
      * Return an instance with the specified HTTP protocol version.
@@ -38,7 +38,7 @@ public function getProtocolVersion();
      * @param string $version HTTP protocol version
      * @return static
      */
-    public function withProtocolVersion($version);
+    public function withProtocolVersion(string $version): MessageInterface;
 
     /**
      * Retrieves all message header values.
@@ -65,7 +65,7 @@ public function withProtocolVersion($version);
      *     key MUST be a header name, and each value MUST be an array of strings
      *     for that header.
      */
-    public function getHeaders();
+    public function getHeaders(): array;
 
     /**
      * Checks if a header exists by the given case-insensitive name.
@@ -75,7 +75,7 @@ public function getHeaders();
      *     name using a case-insensitive string comparison. Returns false if
      *     no matching header name is found in the message.
      */
-    public function hasHeader($name);
+    public function hasHeader(string $name): bool;
 
     /**
      * Retrieves a message header value by the given case-insensitive name.
@@ -91,7 +91,7 @@ public function hasHeader($name);
      *    header. If the header does not appear in the message, this method MUST
      *    return an empty array.
      */
-    public function getHeader($name);
+    public function getHeader(string $name): array;
 
     /**
      * Retrieves a comma-separated string of the values for a single header.
@@ -112,7 +112,7 @@ public function getHeader($name);
      *    concatenated together using a comma. If the header does not appear in
      *    the message, this method MUST return an empty string.
      */
-    public function getHeaderLine($name);
+    public function getHeaderLine(string $name): string;
 
     /**
      * Return an instance with the provided value replacing the specified header.
@@ -129,7 +129,7 @@ public function getHeaderLine($name);
      * @return static
      * @throws \InvalidArgumentException for invalid header names or values.
      */
-    public function withHeader($name, $value);
+    public function withHeader(string $name, $value): MessageInterface;
 
     /**
      * Return an instance with the specified header appended with the given value.
@@ -147,7 +147,7 @@ public function withHeader($name, $value);
      * @return static
      * @throws \InvalidArgumentException for invalid header names or values.
      */
-    public function withAddedHeader($name, $value);
+    public function withAddedHeader(string $name, $value): MessageInterface;
 
     /**
      * Return an instance without the specified header.
@@ -161,14 +161,14 @@ public function withAddedHeader($name, $value);
      * @param string $name Case-insensitive header field name to remove.
      * @return static
      */
-    public function withoutHeader($name);
+    public function withoutHeader(string $name): MessageInterface;
 
     /**
      * Gets the body of the message.
      *
      * @return StreamInterface Returns the body as a stream.
      */
-    public function getBody();
+    public function getBody(): StreamInterface;
 
     /**
      * Return an instance with the specified message body.
@@ -183,5 +183,5 @@ public function getBody();
      * @return static
      * @throws \InvalidArgumentException When the body is not valid.
      */
-    public function withBody(StreamInterface $body);
+    public function withBody(StreamInterface $body): MessageInterface;
 }
diff --git a/vendor/psr/http-message/src/RequestInterface.php b/vendor/psr/http-message/src/RequestInterface.php
index a96d4fd636..33f85e559d 100644
--- a/vendor/psr/http-message/src/RequestInterface.php
+++ b/vendor/psr/http-message/src/RequestInterface.php
@@ -39,7 +39,7 @@ interface RequestInterface extends MessageInterface
      *
      * @return string
      */
-    public function getRequestTarget();
+    public function getRequestTarget(): string;
 
     /**
      * Return an instance with the specific request-target.
@@ -55,17 +55,18 @@ public function getRequestTarget();
      *
      * @link http://tools.ietf.org/html/rfc7230#section-5.3 (for the various
      *     request-target forms allowed in request messages)
-     * @param mixed $requestTarget
+     * @param string $requestTarget
      * @return static
      */
-    public function withRequestTarget($requestTarget);
+    public function withRequestTarget(string $requestTarget): RequestInterface;
+
 
     /**
      * Retrieves the HTTP method of the request.
      *
      * @return string Returns the request method.
      */
-    public function getMethod();
+    public function getMethod(): string;
 
     /**
      * Return an instance with the provided HTTP method.
@@ -82,7 +83,7 @@ public function getMethod();
      * @return static
      * @throws \InvalidArgumentException for invalid HTTP methods.
      */
-    public function withMethod($method);
+    public function withMethod(string $method): RequestInterface;
 
     /**
      * Retrieves the URI instance.
@@ -93,7 +94,7 @@ public function withMethod($method);
      * @return UriInterface Returns a UriInterface instance
      *     representing the URI of the request.
      */
-    public function getUri();
+    public function getUri(): UriInterface;
 
     /**
      * Returns an instance with the provided URI.
@@ -125,5 +126,5 @@ public function getUri();
      * @param bool $preserveHost Preserve the original state of the Host header.
      * @return static
      */
-    public function withUri(UriInterface $uri, $preserveHost = false);
+    public function withUri(UriInterface $uri, bool $preserveHost = false): RequestInterface;
 }
diff --git a/vendor/psr/http-message/src/ResponseInterface.php b/vendor/psr/http-message/src/ResponseInterface.php
index c306514e6b..e9299a9144 100644
--- a/vendor/psr/http-message/src/ResponseInterface.php
+++ b/vendor/psr/http-message/src/ResponseInterface.php
@@ -27,7 +27,7 @@ interface ResponseInterface extends MessageInterface
      *
      * @return int Status code.
      */
-    public function getStatusCode();
+    public function getStatusCode(): int;
 
     /**
      * Return an instance with the specified status code and, optionally, reason phrase.
@@ -49,7 +49,7 @@ public function getStatusCode();
      * @return static
      * @throws \InvalidArgumentException For invalid status code arguments.
      */
-    public function withStatus($code, $reasonPhrase = '');
+    public function withStatus(int $code, string $reasonPhrase = ''): ResponseInterface;
 
     /**
      * Gets the response reason phrase associated with the status code.
@@ -64,5 +64,5 @@ public function withStatus($code, $reasonPhrase = '');
      * @link http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
      * @return string Reason phrase; must return an empty string if none present.
      */
-    public function getReasonPhrase();
+    public function getReasonPhrase(): string;
 }
diff --git a/vendor/psr/http-message/src/ServerRequestInterface.php b/vendor/psr/http-message/src/ServerRequestInterface.php
index 02512340ad..8625d0e100 100644
--- a/vendor/psr/http-message/src/ServerRequestInterface.php
+++ b/vendor/psr/http-message/src/ServerRequestInterface.php
@@ -51,7 +51,7 @@ interface ServerRequestInterface extends RequestInterface
      *
      * @return array
      */
-    public function getServerParams();
+    public function getServerParams(): array;
 
     /**
      * Retrieve cookies.
@@ -63,7 +63,7 @@ public function getServerParams();
      *
      * @return array
      */
-    public function getCookieParams();
+    public function getCookieParams(): array;
 
     /**
      * Return an instance with the specified cookies.
@@ -82,7 +82,7 @@ public function getCookieParams();
      * @param array $cookies Array of key/value pairs representing cookies.
      * @return static
      */
-    public function withCookieParams(array $cookies);
+    public function withCookieParams(array $cookies): ServerRequestInterface;
 
     /**
      * Retrieve query string arguments.
@@ -96,7 +96,7 @@ public function withCookieParams(array $cookies);
      *
      * @return array
      */
-    public function getQueryParams();
+    public function getQueryParams(): array;
 
     /**
      * Return an instance with the specified query string arguments.
@@ -120,7 +120,7 @@ public function getQueryParams();
      *     $_GET.
      * @return static
      */
-    public function withQueryParams(array $query);
+    public function withQueryParams(array $query): ServerRequestInterface;
 
     /**
      * Retrieve normalized file upload data.
@@ -134,7 +134,7 @@ public function withQueryParams(array $query);
      * @return array An array tree of UploadedFileInterface instances; an empty
      *     array MUST be returned if no data is present.
      */
-    public function getUploadedFiles();
+    public function getUploadedFiles(): array;
 
     /**
      * Create a new instance with the specified uploaded files.
@@ -147,7 +147,7 @@ public function getUploadedFiles();
      * @return static
      * @throws \InvalidArgumentException if an invalid structure is provided.
      */
-    public function withUploadedFiles(array $uploadedFiles);
+    public function withUploadedFiles(array $uploadedFiles): ServerRequestInterface;
 
     /**
      * Retrieve any parameters provided in the request body.
@@ -194,7 +194,7 @@ public function getParsedBody();
      * @throws \InvalidArgumentException if an unsupported argument type is
      *     provided.
      */
-    public function withParsedBody($data);
+    public function withParsedBody($data): ServerRequestInterface;
 
     /**
      * Retrieve attributes derived from the request.
@@ -207,7 +207,7 @@ public function withParsedBody($data);
      *
      * @return array Attributes derived from the request.
      */
-    public function getAttributes();
+    public function getAttributes(): array;
 
     /**
      * Retrieve a single derived request attribute.
@@ -224,7 +224,7 @@ public function getAttributes();
      * @param mixed $default Default value to return if the attribute does not exist.
      * @return mixed
      */
-    public function getAttribute($name, $default = null);
+    public function getAttribute(string $name, $default = null);
 
     /**
      * Return an instance with the specified derived request attribute.
@@ -241,7 +241,7 @@ public function getAttribute($name, $default = null);
      * @param mixed $value The value of the attribute.
      * @return static
      */
-    public function withAttribute($name, $value);
+    public function withAttribute(string $name, $value): ServerRequestInterface;
 
     /**
      * Return an instance that removes the specified derived request attribute.
@@ -257,5 +257,5 @@ public function withAttribute($name, $value);
      * @param string $name The attribute name.
      * @return static
      */
-    public function withoutAttribute($name);
+    public function withoutAttribute(string $name): ServerRequestInterface;
 }
diff --git a/vendor/psr/http-message/src/StreamInterface.php b/vendor/psr/http-message/src/StreamInterface.php
index f68f391269..a62aabb828 100644
--- a/vendor/psr/http-message/src/StreamInterface.php
+++ b/vendor/psr/http-message/src/StreamInterface.php
@@ -25,14 +25,14 @@ interface StreamInterface
      * @see http://php.net/manual/en/language.oop5.magic.php#object.tostring
      * @return string
      */
-    public function __toString();
+    public function __toString(): string;
 
     /**
      * Closes the stream and any underlying resources.
      *
      * @return void
      */
-    public function close();
+    public function close(): void;
 
     /**
      * Separates any underlying resources from the stream.
@@ -48,7 +48,7 @@ public function detach();
      *
      * @return int|null Returns the size in bytes if known, or null if unknown.
      */
-    public function getSize();
+    public function getSize(): ?int;
 
     /**
      * Returns the current position of the file read/write pointer
@@ -56,21 +56,21 @@ public function getSize();
      * @return int Position of the file pointer
      * @throws \RuntimeException on error.
      */
-    public function tell();
+    public function tell(): int;
 
     /**
      * Returns true if the stream is at the end of the stream.
      *
      * @return bool
      */
-    public function eof();
+    public function eof(): bool;
 
     /**
      * Returns whether or not the stream is seekable.
      *
      * @return bool
      */
-    public function isSeekable();
+    public function isSeekable(): bool;
 
     /**
      * Seek to a position in the stream.
@@ -84,7 +84,7 @@ public function isSeekable();
      *     SEEK_END: Set position to end-of-stream plus offset.
      * @throws \RuntimeException on failure.
      */
-    public function seek($offset, $whence = SEEK_SET);
+    public function seek(int $offset, int $whence = SEEK_SET): void;
 
     /**
      * Seek to the beginning of the stream.
@@ -96,14 +96,14 @@ public function seek($offset, $whence = SEEK_SET);
      * @link http://www.php.net/manual/en/function.fseek.php
      * @throws \RuntimeException on failure.
      */
-    public function rewind();
+    public function rewind(): void;
 
     /**
      * Returns whether or not the stream is writable.
      *
      * @return bool
      */
-    public function isWritable();
+    public function isWritable(): bool;
 
     /**
      * Write data to the stream.
@@ -112,14 +112,14 @@ public function isWritable();
      * @return int Returns the number of bytes written to the stream.
      * @throws \RuntimeException on failure.
      */
-    public function write($string);
+    public function write(string $string): int;
 
     /**
      * Returns whether or not the stream is readable.
      *
      * @return bool
      */
-    public function isReadable();
+    public function isReadable(): bool;
 
     /**
      * Read data from the stream.
@@ -131,7 +131,7 @@ public function isReadable();
      *     if no bytes are available.
      * @throws \RuntimeException if an error occurs.
      */
-    public function read($length);
+    public function read(int $length): string;
 
     /**
      * Returns the remaining contents in a string
@@ -140,7 +140,7 @@ public function read($length);
      * @throws \RuntimeException if unable to read or an error occurs while
      *     reading.
      */
-    public function getContents();
+    public function getContents(): string;
 
     /**
      * Get stream metadata as an associative array or retrieve a specific key.
@@ -149,10 +149,10 @@ public function getContents();
      * stream_get_meta_data() function.
      *
      * @link http://php.net/manual/en/function.stream-get-meta-data.php
-     * @param string $key Specific metadata to retrieve.
+     * @param string|null $key Specific metadata to retrieve.
      * @return array|mixed|null Returns an associative array if no key is
      *     provided. Returns a specific key value if a key is provided and the
      *     value is found, or null if the key is not found.
      */
-    public function getMetadata($key = null);
+    public function getMetadata(?string $key = null);
 }
diff --git a/vendor/psr/http-message/src/UploadedFileInterface.php b/vendor/psr/http-message/src/UploadedFileInterface.php
index f8a6901e01..dd19d65381 100644
--- a/vendor/psr/http-message/src/UploadedFileInterface.php
+++ b/vendor/psr/http-message/src/UploadedFileInterface.php
@@ -28,7 +28,7 @@ interface UploadedFileInterface
      * @throws \RuntimeException in cases when no stream is available or can be
      *     created.
      */
-    public function getStream();
+    public function getStream(): StreamInterface;
 
     /**
      * Move the uploaded file to a new location.
@@ -62,7 +62,7 @@ public function getStream();
      * @throws \RuntimeException on any error during the move operation, or on
      *     the second or subsequent call to the method.
      */
-    public function moveTo($targetPath);
+    public function moveTo(string $targetPath): void;
     
     /**
      * Retrieve the file size.
@@ -73,7 +73,7 @@ public function moveTo($targetPath);
      *
      * @return int|null The file size in bytes or null if unknown.
      */
-    public function getSize();
+    public function getSize(): ?int;
     
     /**
      * Retrieve the error associated with the uploaded file.
@@ -89,7 +89,7 @@ public function getSize();
      * @see http://php.net/manual/en/features.file-upload.errors.php
      * @return int One of PHP's UPLOAD_ERR_XXX constants.
      */
-    public function getError();
+    public function getError(): int;
     
     /**
      * Retrieve the filename sent by the client.
@@ -104,7 +104,7 @@ public function getError();
      * @return string|null The filename sent by the client or null if none
      *     was provided.
      */
-    public function getClientFilename();
+    public function getClientFilename(): ?string;
     
     /**
      * Retrieve the media type sent by the client.
@@ -119,5 +119,5 @@ public function getClientFilename();
      * @return string|null The media type sent by the client or null if none
      *     was provided.
      */
-    public function getClientMediaType();
+    public function getClientMediaType(): ?string;
 }
diff --git a/vendor/psr/http-message/src/UriInterface.php b/vendor/psr/http-message/src/UriInterface.php
index 9d7ab9eae8..15e2cf2862 100644
--- a/vendor/psr/http-message/src/UriInterface.php
+++ b/vendor/psr/http-message/src/UriInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Psr\Http\Message;
 
 /**
@@ -37,7 +38,7 @@ interface UriInterface
      * @see https://tools.ietf.org/html/rfc3986#section-3.1
      * @return string The URI scheme.
      */
-    public function getScheme();
+    public function getScheme(): string;
 
     /**
      * Retrieve the authority component of the URI.
@@ -57,7 +58,7 @@ public function getScheme();
      * @see https://tools.ietf.org/html/rfc3986#section-3.2
      * @return string The URI authority, in "[user-info@]host[:port]" format.
      */
-    public function getAuthority();
+    public function getAuthority(): string;
 
     /**
      * Retrieve the user information component of the URI.
@@ -74,7 +75,7 @@ public function getAuthority();
      *
      * @return string The URI user information, in "username[:password]" format.
      */
-    public function getUserInfo();
+    public function getUserInfo(): string;
 
     /**
      * Retrieve the host component of the URI.
@@ -87,7 +88,7 @@ public function getUserInfo();
      * @see http://tools.ietf.org/html/rfc3986#section-3.2.2
      * @return string The URI host.
      */
-    public function getHost();
+    public function getHost(): string;
 
     /**
      * Retrieve the port component of the URI.
@@ -104,7 +105,7 @@ public function getHost();
      *
      * @return null|int The URI port.
      */
-    public function getPort();
+    public function getPort(): ?int;
 
     /**
      * Retrieve the path component of the URI.
@@ -131,7 +132,7 @@ public function getPort();
      * @see https://tools.ietf.org/html/rfc3986#section-3.3
      * @return string The URI path.
      */
-    public function getPath();
+    public function getPath(): string;
 
     /**
      * Retrieve the query string of the URI.
@@ -153,7 +154,7 @@ public function getPath();
      * @see https://tools.ietf.org/html/rfc3986#section-3.4
      * @return string The URI query string.
      */
-    public function getQuery();
+    public function getQuery(): string;
 
     /**
      * Retrieve the fragment component of the URI.
@@ -171,7 +172,7 @@ public function getQuery();
      * @see https://tools.ietf.org/html/rfc3986#section-3.5
      * @return string The URI fragment.
      */
-    public function getFragment();
+    public function getFragment(): string;
 
     /**
      * Return an instance with the specified scheme.
@@ -188,7 +189,7 @@ public function getFragment();
      * @return static A new instance with the specified scheme.
      * @throws \InvalidArgumentException for invalid or unsupported schemes.
      */
-    public function withScheme($scheme);
+    public function withScheme(string $scheme): UriInterface;
 
     /**
      * Return an instance with the specified user information.
@@ -204,7 +205,7 @@ public function withScheme($scheme);
      * @param null|string $password The password associated with $user.
      * @return static A new instance with the specified user information.
      */
-    public function withUserInfo($user, $password = null);
+    public function withUserInfo(string $user, ?string $password = null): UriInterface;
 
     /**
      * Return an instance with the specified host.
@@ -218,7 +219,7 @@ public function withUserInfo($user, $password = null);
      * @return static A new instance with the specified host.
      * @throws \InvalidArgumentException for invalid hostnames.
      */
-    public function withHost($host);
+    public function withHost(string $host): UriInterface;
 
     /**
      * Return an instance with the specified port.
@@ -237,7 +238,7 @@ public function withHost($host);
      * @return static A new instance with the specified port.
      * @throws \InvalidArgumentException for invalid ports.
      */
-    public function withPort($port);
+    public function withPort(?int $port): UriInterface;
 
     /**
      * Return an instance with the specified path.
@@ -261,7 +262,7 @@ public function withPort($port);
      * @return static A new instance with the specified path.
      * @throws \InvalidArgumentException for invalid paths.
      */
-    public function withPath($path);
+    public function withPath(string $path): UriInterface;
 
     /**
      * Return an instance with the specified query string.
@@ -278,7 +279,7 @@ public function withPath($path);
      * @return static A new instance with the specified query string.
      * @throws \InvalidArgumentException for invalid query strings.
      */
-    public function withQuery($query);
+    public function withQuery(string $query): UriInterface;
 
     /**
      * Return an instance with the specified URI fragment.
@@ -294,7 +295,7 @@ public function withQuery($query);
      * @param string $fragment The fragment to use with the new instance.
      * @return static A new instance with the specified fragment.
      */
-    public function withFragment($fragment);
+    public function withFragment(string $fragment): UriInterface;
 
     /**
      * Return the string representation as a URI reference.
@@ -319,5 +320,5 @@ public function withFragment($fragment);
      * @see http://tools.ietf.org/html/rfc3986#section-4.1
      * @return string
      */
-    public function __toString();
+    public function __toString(): string;
 }
diff --git a/vendor/psr/simple-cache/composer.json b/vendor/psr/simple-cache/composer.json
index 2978fa559a..f307a84568 100644
--- a/vendor/psr/simple-cache/composer.json
+++ b/vendor/psr/simple-cache/composer.json
@@ -6,11 +6,11 @@
     "authors": [
         {
             "name": "PHP-FIG",
-            "homepage": "http://www.php-fig.org/"
+            "homepage": "https://www.php-fig.org/"
         }
     ],
     "require": {
-        "php": ">=5.3.0"
+        "php": ">=8.0.0"
     },
     "autoload": {
         "psr-4": {
@@ -19,7 +19,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0.x-dev"
+            "dev-master": "3.0.x-dev"
         }
     }
 }
diff --git a/vendor/psr/simple-cache/src/CacheException.php b/vendor/psr/simple-cache/src/CacheException.php
index eba53815c0..f61b24c2b4 100644
--- a/vendor/psr/simple-cache/src/CacheException.php
+++ b/vendor/psr/simple-cache/src/CacheException.php
@@ -5,6 +5,6 @@
 /**
  * Interface used for all types of exceptions thrown by the implementing library.
  */
-interface CacheException
+interface CacheException extends \Throwable
 {
 }
diff --git a/vendor/psr/simple-cache/src/CacheInterface.php b/vendor/psr/simple-cache/src/CacheInterface.php
index 99e8d95748..671e340c57 100644
--- a/vendor/psr/simple-cache/src/CacheInterface.php
+++ b/vendor/psr/simple-cache/src/CacheInterface.php
@@ -15,7 +15,7 @@ interface CacheInterface
      * @throws \Psr\SimpleCache\InvalidArgumentException
      *   MUST be thrown if the $key string is not a legal value.
      */
-    public function get($key, $default = null);
+    public function get(string $key, mixed $default = null): mixed;
 
     /**
      * Persists data in the cache, uniquely referenced by a key with an optional expiration TTL time.
@@ -31,7 +31,7 @@ public function get($key, $default = null);
      * @throws \Psr\SimpleCache\InvalidArgumentException
      *   MUST be thrown if the $key string is not a legal value.
      */
-    public function set($key, $value, $ttl = null);
+    public function set(string $key, mixed $value, null|int|\DateInterval $ttl = null): bool;
 
     /**
      * Delete an item from the cache by its unique key.
@@ -43,28 +43,28 @@ public function set($key, $value, $ttl = null);
      * @throws \Psr\SimpleCache\InvalidArgumentException
      *   MUST be thrown if the $key string is not a legal value.
      */
-    public function delete($key);
+    public function delete(string $key): bool;
 
     /**
      * Wipes clean the entire cache's keys.
      *
      * @return bool True on success and false on failure.
      */
-    public function clear();
+    public function clear(): bool;
 
     /**
      * Obtains multiple cache items by their unique keys.
      *
-     * @param iterable $keys    A list of keys that can obtained in a single operation.
-     * @param mixed    $default Default value to return for keys that do not exist.
+     * @param iterable<string> $keys    A list of keys that can be obtained in a single operation.
+     * @param mixed            $default Default value to return for keys that do not exist.
      *
-     * @return iterable A list of key => value pairs. Cache keys that do not exist or are stale will have $default as value.
+     * @return iterable<string, mixed> A list of key => value pairs. Cache keys that do not exist or are stale will have $default as value.
      *
      * @throws \Psr\SimpleCache\InvalidArgumentException
      *   MUST be thrown if $keys is neither an array nor a Traversable,
      *   or if any of the $keys are not a legal value.
      */
-    public function getMultiple($keys, $default = null);
+    public function getMultiple(iterable $keys, mixed $default = null): iterable;
 
     /**
      * Persists a set of key => value pairs in the cache, with an optional TTL.
@@ -80,12 +80,12 @@ public function getMultiple($keys, $default = null);
      *   MUST be thrown if $values is neither an array nor a Traversable,
      *   or if any of the $values are not a legal value.
      */
-    public function setMultiple($values, $ttl = null);
+    public function setMultiple(iterable $values, null|int|\DateInterval $ttl = null): bool;
 
     /**
      * Deletes multiple cache items in a single operation.
      *
-     * @param iterable $keys A list of string-based keys to be deleted.
+     * @param iterable<string> $keys A list of string-based keys to be deleted.
      *
      * @return bool True if the items were successfully removed. False if there was an error.
      *
@@ -93,7 +93,7 @@ public function setMultiple($values, $ttl = null);
      *   MUST be thrown if $keys is neither an array nor a Traversable,
      *   or if any of the $keys are not a legal value.
      */
-    public function deleteMultiple($keys);
+    public function deleteMultiple(iterable $keys): bool;
 
     /**
      * Determines whether an item is present in the cache.
@@ -110,5 +110,5 @@ public function deleteMultiple($keys);
      * @throws \Psr\SimpleCache\InvalidArgumentException
      *   MUST be thrown if the $key string is not a legal value.
      */
-    public function has($key);
+    public function has(string $key): bool;
 }
diff --git a/vendor/symfony/polyfill-mbstring/Mbstring.php b/vendor/symfony/polyfill-mbstring/Mbstring.php
deleted file mode 100644
index c31611fb83..0000000000
--- a/vendor/symfony/polyfill-mbstring/Mbstring.php
+++ /dev/null
@@ -1,869 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Polyfill\Mbstring;
-
-/**
- * Partial mbstring implementation in PHP, iconv based, UTF-8 centric.
- *
- * Implemented:
- * - mb_chr                  - Returns a specific character from its Unicode code point
- * - mb_convert_encoding     - Convert character encoding
- * - mb_convert_variables    - Convert character code in variable(s)
- * - mb_decode_mimeheader    - Decode string in MIME header field
- * - mb_encode_mimeheader    - Encode string for MIME header XXX NATIVE IMPLEMENTATION IS REALLY BUGGED
- * - mb_decode_numericentity - Decode HTML numeric string reference to character
- * - mb_encode_numericentity - Encode character to HTML numeric string reference
- * - mb_convert_case         - Perform case folding on a string
- * - mb_detect_encoding      - Detect character encoding
- * - mb_get_info             - Get internal settings of mbstring
- * - mb_http_input           - Detect HTTP input character encoding
- * - mb_http_output          - Set/Get HTTP output character encoding
- * - mb_internal_encoding    - Set/Get internal character encoding
- * - mb_list_encodings       - Returns an array of all supported encodings
- * - mb_ord                  - Returns the Unicode code point of a character
- * - mb_output_handler       - Callback function converts character encoding in output buffer
- * - mb_scrub                - Replaces ill-formed byte sequences with substitute characters
- * - mb_strlen               - Get string length
- * - mb_strpos               - Find position of first occurrence of string in a string
- * - mb_strrpos              - Find position of last occurrence of a string in a string
- * - mb_str_split            - Convert a string to an array
- * - mb_strtolower           - Make a string lowercase
- * - mb_strtoupper           - Make a string uppercase
- * - mb_substitute_character - Set/Get substitution character
- * - mb_substr               - Get part of string
- * - mb_stripos              - Finds position of first occurrence of a string within another, case insensitive
- * - mb_stristr              - Finds first occurrence of a string within another, case insensitive
- * - mb_strrchr              - Finds the last occurrence of a character in a string within another
- * - mb_strrichr             - Finds the last occurrence of a character in a string within another, case insensitive
- * - mb_strripos             - Finds position of last occurrence of a string within another, case insensitive
- * - mb_strstr               - Finds first occurrence of a string within another
- * - mb_strwidth             - Return width of string
- * - mb_substr_count         - Count the number of substring occurrences
- *
- * Not implemented:
- * - mb_convert_kana         - Convert "kana" one from another ("zen-kaku", "han-kaku" and more)
- * - mb_ereg_*               - Regular expression with multibyte support
- * - mb_parse_str            - Parse GET/POST/COOKIE data and set global variable
- * - mb_preferred_mime_name  - Get MIME charset string
- * - mb_regex_encoding       - Returns current encoding for multibyte regex as string
- * - mb_regex_set_options    - Set/Get the default options for mbregex functions
- * - mb_send_mail            - Send encoded mail
- * - mb_split                - Split multibyte string using regular expression
- * - mb_strcut               - Get part of string
- * - mb_strimwidth           - Get truncated string with specified width
- *
- * @author Nicolas Grekas <p@tchwork.com>
- *
- * @internal
- */
-final class Mbstring
-{
-    public const MB_CASE_FOLD = \PHP_INT_MAX;
-
-    private static $encodingList = ['ASCII', 'UTF-8'];
-    private static $language = 'neutral';
-    private static $internalEncoding = 'UTF-8';
-    private static $caseFold = [
-        ['µ', 'ſ', "\xCD\x85", 'ς', "\xCF\x90", "\xCF\x91", "\xCF\x95", "\xCF\x96", "\xCF\xB0", "\xCF\xB1", "\xCF\xB5", "\xE1\xBA\x9B", "\xE1\xBE\xBE"],
-        ['μ', 's', 'ι',        'σ', 'β',        'θ',        'φ',        'π',        'κ',        'ρ',        'ε',        "\xE1\xB9\xA1", 'ι'],
-    ];
-
-    public static function mb_convert_encoding($s, $toEncoding, $fromEncoding = null)
-    {
-        if (\is_array($fromEncoding) || false !== strpos($fromEncoding, ',')) {
-            $fromEncoding = self::mb_detect_encoding($s, $fromEncoding);
-        } else {
-            $fromEncoding = self::getEncoding($fromEncoding);
-        }
-
-        $toEncoding = self::getEncoding($toEncoding);
-
-        if ('BASE64' === $fromEncoding) {
-            $s = base64_decode($s);
-            $fromEncoding = $toEncoding;
-        }
-
-        if ('BASE64' === $toEncoding) {
-            return base64_encode($s);
-        }
-
-        if ('HTML-ENTITIES' === $toEncoding || 'HTML' === $toEncoding) {
-            if ('HTML-ENTITIES' === $fromEncoding || 'HTML' === $fromEncoding) {
-                $fromEncoding = 'Windows-1252';
-            }
-            if ('UTF-8' !== $fromEncoding) {
-                $s = \iconv($fromEncoding, 'UTF-8//IGNORE', $s);
-            }
-
-            return preg_replace_callback('/[\x80-\xFF]+/', [__CLASS__, 'html_encoding_callback'], $s);
-        }
-
-        if ('HTML-ENTITIES' === $fromEncoding) {
-            $s = html_entity_decode($s, \ENT_COMPAT, 'UTF-8');
-            $fromEncoding = 'UTF-8';
-        }
-
-        return \iconv($fromEncoding, $toEncoding.'//IGNORE', $s);
-    }
-
-    public static function mb_convert_variables($toEncoding, $fromEncoding, &...$vars)
-    {
-        $ok = true;
-        array_walk_recursive($vars, function (&$v) use (&$ok, $toEncoding, $fromEncoding) {
-            if (false === $v = self::mb_convert_encoding($v, $toEncoding, $fromEncoding)) {
-                $ok = false;
-            }
-        });
-
-        return $ok ? $fromEncoding : false;
-    }
-
-    public static function mb_decode_mimeheader($s)
-    {
-        return \iconv_mime_decode($s, 2, self::$internalEncoding);
-    }
-
-    public static function mb_encode_mimeheader($s, $charset = null, $transferEncoding = null, $linefeed = null, $indent = null)
-    {
-        trigger_error('mb_encode_mimeheader() is bugged. Please use iconv_mime_encode() instead', \E_USER_WARNING);
-    }
-
-    public static function mb_decode_numericentity($s, $convmap, $encoding = null)
-    {
-        if (null !== $s && !is_scalar($s) && !(\is_object($s) && method_exists($s, '__toString'))) {
-            trigger_error('mb_decode_numericentity() expects parameter 1 to be string, '.\gettype($s).' given', \E_USER_WARNING);
-
-            return null;
-        }
-
-        if (!\is_array($convmap) || (80000 > \PHP_VERSION_ID && !$convmap)) {
-            return false;
-        }
-
-        if (null !== $encoding && !is_scalar($encoding)) {
-            trigger_error('mb_decode_numericentity() expects parameter 3 to be string, '.\gettype($s).' given', \E_USER_WARNING);
-
-            return '';  // Instead of null (cf. mb_encode_numericentity).
-        }
-
-        $s = (string) $s;
-        if ('' === $s) {
-            return '';
-        }
-
-        $encoding = self::getEncoding($encoding);
-
-        if ('UTF-8' === $encoding) {
-            $encoding = null;
-            if (!preg_match('//u', $s)) {
-                $s = @\iconv('UTF-8', 'UTF-8//IGNORE', $s);
-            }
-        } else {
-            $s = \iconv($encoding, 'UTF-8//IGNORE', $s);
-        }
-
-        $cnt = floor(\count($convmap) / 4) * 4;
-
-        for ($i = 0; $i < $cnt; $i += 4) {
-            // collector_decode_htmlnumericentity ignores $convmap[$i + 3]
-            $convmap[$i] += $convmap[$i + 2];
-            $convmap[$i + 1] += $convmap[$i + 2];
-        }
-
-        $s = preg_replace_callback('/&#(?:0*([0-9]+)|x0*([0-9a-fA-F]+))(?!&);?/', function (array $m) use ($cnt, $convmap) {
-            $c = isset($m[2]) ? (int) hexdec($m[2]) : $m[1];
-            for ($i = 0; $i < $cnt; $i += 4) {
-                if ($c >= $convmap[$i] && $c <= $convmap[$i + 1]) {
-                    return self::mb_chr($c - $convmap[$i + 2]);
-                }
-            }
-
-            return $m[0];
-        }, $s);
-
-        if (null === $encoding) {
-            return $s;
-        }
-
-        return \iconv('UTF-8', $encoding.'//IGNORE', $s);
-    }
-
-    public static function mb_encode_numericentity($s, $convmap, $encoding = null, $is_hex = false)
-    {
-        if (null !== $s && !is_scalar($s) && !(\is_object($s) && method_exists($s, '__toString'))) {
-            trigger_error('mb_encode_numericentity() expects parameter 1 to be string, '.\gettype($s).' given', \E_USER_WARNING);
-
-            return null;
-        }
-
-        if (!\is_array($convmap) || (80000 > \PHP_VERSION_ID && !$convmap)) {
-            return false;
-        }
-
-        if (null !== $encoding && !is_scalar($encoding)) {
-            trigger_error('mb_encode_numericentity() expects parameter 3 to be string, '.\gettype($s).' given', \E_USER_WARNING);
-
-            return null;  // Instead of '' (cf. mb_decode_numericentity).
-        }
-
-        if (null !== $is_hex && !is_scalar($is_hex)) {
-            trigger_error('mb_encode_numericentity() expects parameter 4 to be boolean, '.\gettype($s).' given', \E_USER_WARNING);
-
-            return null;
-        }
-
-        $s = (string) $s;
-        if ('' === $s) {
-            return '';
-        }
-
-        $encoding = self::getEncoding($encoding);
-
-        if ('UTF-8' === $encoding) {
-            $encoding = null;
-            if (!preg_match('//u', $s)) {
-                $s = @\iconv('UTF-8', 'UTF-8//IGNORE', $s);
-            }
-        } else {
-            $s = \iconv($encoding, 'UTF-8//IGNORE', $s);
-        }
-
-        static $ulenMask = ["\xC0" => 2, "\xD0" => 2, "\xE0" => 3, "\xF0" => 4];
-
-        $cnt = floor(\count($convmap) / 4) * 4;
-        $i = 0;
-        $len = \strlen($s);
-        $result = '';
-
-        while ($i < $len) {
-            $ulen = $s[$i] < "\x80" ? 1 : $ulenMask[$s[$i] & "\xF0"];
-            $uchr = substr($s, $i, $ulen);
-            $i += $ulen;
-            $c = self::mb_ord($uchr);
-
-            for ($j = 0; $j < $cnt; $j += 4) {
-                if ($c >= $convmap[$j] && $c <= $convmap[$j + 1]) {
-                    $cOffset = ($c + $convmap[$j + 2]) & $convmap[$j + 3];
-                    $result .= $is_hex ? sprintf('&#x%X;', $cOffset) : '&#'.$cOffset.';';
-                    continue 2;
-                }
-            }
-            $result .= $uchr;
-        }
-
-        if (null === $encoding) {
-            return $result;
-        }
-
-        return \iconv('UTF-8', $encoding.'//IGNORE', $result);
-    }
-
-    public static function mb_convert_case($s, $mode, $encoding = null)
-    {
-        $s = (string) $s;
-        if ('' === $s) {
-            return '';
-        }
-
-        $encoding = self::getEncoding($encoding);
-
-        if ('UTF-8' === $encoding) {
-            $encoding = null;
-            if (!preg_match('//u', $s)) {
-                $s = @\iconv('UTF-8', 'UTF-8//IGNORE', $s);
-            }
-        } else {
-            $s = \iconv($encoding, 'UTF-8//IGNORE', $s);
-        }
-
-        if (\MB_CASE_TITLE == $mode) {
-            static $titleRegexp = null;
-            if (null === $titleRegexp) {
-                $titleRegexp = self::getData('titleCaseRegexp');
-            }
-            $s = preg_replace_callback($titleRegexp, [__CLASS__, 'title_case'], $s);
-        } else {
-            if (\MB_CASE_UPPER == $mode) {
-                static $upper = null;
-                if (null === $upper) {
-                    $upper = self::getData('upperCase');
-                }
-                $map = $upper;
-            } else {
-                if (self::MB_CASE_FOLD === $mode) {
-                    $s = str_replace(self::$caseFold[0], self::$caseFold[1], $s);
-                }
-
-                static $lower = null;
-                if (null === $lower) {
-                    $lower = self::getData('lowerCase');
-                }
-                $map = $lower;
-            }
-
-            static $ulenMask = ["\xC0" => 2, "\xD0" => 2, "\xE0" => 3, "\xF0" => 4];
-
-            $i = 0;
-            $len = \strlen($s);
-
-            while ($i < $len) {
-                $ulen = $s[$i] < "\x80" ? 1 : $ulenMask[$s[$i] & "\xF0"];
-                $uchr = substr($s, $i, $ulen);
-                $i += $ulen;
-
-                if (isset($map[$uchr])) {
-                    $uchr = $map[$uchr];
-                    $nlen = \strlen($uchr);
-
-                    if ($nlen == $ulen) {
-                        $nlen = $i;
-                        do {
-                            $s[--$nlen] = $uchr[--$ulen];
-                        } while ($ulen);
-                    } else {
-                        $s = substr_replace($s, $uchr, $i - $ulen, $ulen);
-                        $len += $nlen - $ulen;
-                        $i += $nlen - $ulen;
-                    }
-                }
-            }
-        }
-
-        if (null === $encoding) {
-            return $s;
-        }
-
-        return \iconv('UTF-8', $encoding.'//IGNORE', $s);
-    }
-
-    public static function mb_internal_encoding($encoding = null)
-    {
-        if (null === $encoding) {
-            return self::$internalEncoding;
-        }
-
-        $normalizedEncoding = self::getEncoding($encoding);
-
-        if ('UTF-8' === $normalizedEncoding || false !== @\iconv($normalizedEncoding, $normalizedEncoding, ' ')) {
-            self::$internalEncoding = $normalizedEncoding;
-
-            return true;
-        }
-
-        if (80000 > \PHP_VERSION_ID) {
-            return false;
-        }
-
-        throw new \ValueError(sprintf('Argument #1 ($encoding) must be a valid encoding, "%s" given', $encoding));
-    }
-
-    public static function mb_language($lang = null)
-    {
-        if (null === $lang) {
-            return self::$language;
-        }
-
-        switch ($normalizedLang = strtolower($lang)) {
-            case 'uni':
-            case 'neutral':
-                self::$language = $normalizedLang;
-
-                return true;
-        }
-
-        if (80000 > \PHP_VERSION_ID) {
-            return false;
-        }
-
-        throw new \ValueError(sprintf('Argument #1 ($language) must be a valid language, "%s" given', $lang));
-    }
-
-    public static function mb_list_encodings()
-    {
-        return ['UTF-8'];
-    }
-
-    public static function mb_encoding_aliases($encoding)
-    {
-        switch (strtoupper($encoding)) {
-            case 'UTF8':
-            case 'UTF-8':
-                return ['utf8'];
-        }
-
-        return false;
-    }
-
-    public static function mb_check_encoding($var = null, $encoding = null)
-    {
-        if (null === $encoding) {
-            if (null === $var) {
-                return false;
-            }
-            $encoding = self::$internalEncoding;
-        }
-
-        return self::mb_detect_encoding($var, [$encoding]) || false !== @\iconv($encoding, $encoding, $var);
-    }
-
-    public static function mb_detect_encoding($str, $encodingList = null, $strict = false)
-    {
-        if (null === $encodingList) {
-            $encodingList = self::$encodingList;
-        } else {
-            if (!\is_array($encodingList)) {
-                $encodingList = array_map('trim', explode(',', $encodingList));
-            }
-            $encodingList = array_map('strtoupper', $encodingList);
-        }
-
-        foreach ($encodingList as $enc) {
-            switch ($enc) {
-                case 'ASCII':
-                    if (!preg_match('/[\x80-\xFF]/', $str)) {
-                        return $enc;
-                    }
-                    break;
-
-                case 'UTF8':
-                case 'UTF-8':
-                    if (preg_match('//u', $str)) {
-                        return 'UTF-8';
-                    }
-                    break;
-
-                default:
-                    if (0 === strncmp($enc, 'ISO-8859-', 9)) {
-                        return $enc;
-                    }
-            }
-        }
-
-        return false;
-    }
-
-    public static function mb_detect_order($encodingList = null)
-    {
-        if (null === $encodingList) {
-            return self::$encodingList;
-        }
-
-        if (!\is_array($encodingList)) {
-            $encodingList = array_map('trim', explode(',', $encodingList));
-        }
-        $encodingList = array_map('strtoupper', $encodingList);
-
-        foreach ($encodingList as $enc) {
-            switch ($enc) {
-                default:
-                    if (strncmp($enc, 'ISO-8859-', 9)) {
-                        return false;
-                    }
-                    // no break
-                case 'ASCII':
-                case 'UTF8':
-                case 'UTF-8':
-            }
-        }
-
-        self::$encodingList = $encodingList;
-
-        return true;
-    }
-
-    public static function mb_strlen($s, $encoding = null)
-    {
-        $encoding = self::getEncoding($encoding);
-        if ('CP850' === $encoding || 'ASCII' === $encoding) {
-            return \strlen($s);
-        }
-
-        return @\iconv_strlen($s, $encoding);
-    }
-
-    public static function mb_strpos($haystack, $needle, $offset = 0, $encoding = null)
-    {
-        $encoding = self::getEncoding($encoding);
-        if ('CP850' === $encoding || 'ASCII' === $encoding) {
-            return strpos($haystack, $needle, $offset);
-        }
-
-        $needle = (string) $needle;
-        if ('' === $needle) {
-            if (80000 > \PHP_VERSION_ID) {
-                trigger_error(__METHOD__.': Empty delimiter', \E_USER_WARNING);
-
-                return false;
-            }
-
-            return 0;
-        }
-
-        return \iconv_strpos($haystack, $needle, $offset, $encoding);
-    }
-
-    public static function mb_strrpos($haystack, $needle, $offset = 0, $encoding = null)
-    {
-        $encoding = self::getEncoding($encoding);
-        if ('CP850' === $encoding || 'ASCII' === $encoding) {
-            return strrpos($haystack, $needle, $offset);
-        }
-
-        if ($offset != (int) $offset) {
-            $offset = 0;
-        } elseif ($offset = (int) $offset) {
-            if ($offset < 0) {
-                if (0 > $offset += self::mb_strlen($needle)) {
-                    $haystack = self::mb_substr($haystack, 0, $offset, $encoding);
-                }
-                $offset = 0;
-            } else {
-                $haystack = self::mb_substr($haystack, $offset, 2147483647, $encoding);
-            }
-        }
-
-        $pos = '' !== $needle || 80000 > \PHP_VERSION_ID
-            ? \iconv_strrpos($haystack, $needle, $encoding)
-            : self::mb_strlen($haystack, $encoding);
-
-        return false !== $pos ? $offset + $pos : false;
-    }
-
-    public static function mb_str_split($string, $split_length = 1, $encoding = null)
-    {
-        if (null !== $string && !is_scalar($string) && !(\is_object($string) && method_exists($string, '__toString'))) {
-            trigger_error('mb_str_split() expects parameter 1 to be string, '.\gettype($string).' given', \E_USER_WARNING);
-
-            return null;
-        }
-
-        if (1 > $split_length = (int) $split_length) {
-            if (80000 > \PHP_VERSION_ID) {
-                trigger_error('The length of each segment must be greater than zero', \E_USER_WARNING);
-                return false;
-            }
-
-            throw new \ValueError('Argument #2 ($length) must be greater than 0');
-        }
-
-        if (null === $encoding) {
-            $encoding = mb_internal_encoding();
-        }
-
-        if ('UTF-8' === $encoding = self::getEncoding($encoding)) {
-            $rx = '/(';
-            while (65535 < $split_length) {
-                $rx .= '.{65535}';
-                $split_length -= 65535;
-            }
-            $rx .= '.{'.$split_length.'})/us';
-
-            return preg_split($rx, $string, null, \PREG_SPLIT_DELIM_CAPTURE | \PREG_SPLIT_NO_EMPTY);
-        }
-
-        $result = [];
-        $length = mb_strlen($string, $encoding);
-
-        for ($i = 0; $i < $length; $i += $split_length) {
-            $result[] = mb_substr($string, $i, $split_length, $encoding);
-        }
-
-        return $result;
-    }
-
-    public static function mb_strtolower($s, $encoding = null)
-    {
-        return self::mb_convert_case($s, \MB_CASE_LOWER, $encoding);
-    }
-
-    public static function mb_strtoupper($s, $encoding = null)
-    {
-        return self::mb_convert_case($s, \MB_CASE_UPPER, $encoding);
-    }
-
-    public static function mb_substitute_character($c = null)
-    {
-        if (null === $c) {
-            return 'none';
-        }
-        if (0 === strcasecmp($c, 'none')) {
-            return true;
-        }
-        if (80000 > \PHP_VERSION_ID) {
-            return false;
-        }
-
-        throw new \ValueError('Argument #1 ($substitute_character) must be "none", "long", "entity" or a valid codepoint');
-    }
-
-    public static function mb_substr($s, $start, $length = null, $encoding = null)
-    {
-        $encoding = self::getEncoding($encoding);
-        if ('CP850' === $encoding || 'ASCII' === $encoding) {
-            return (string) substr($s, $start, null === $length ? 2147483647 : $length);
-        }
-
-        if ($start < 0) {
-            $start = \iconv_strlen($s, $encoding) + $start;
-            if ($start < 0) {
-                $start = 0;
-            }
-        }
-
-        if (null === $length) {
-            $length = 2147483647;
-        } elseif ($length < 0) {
-            $length = \iconv_strlen($s, $encoding) + $length - $start;
-            if ($length < 0) {
-                return '';
-            }
-        }
-
-        return (string) \iconv_substr($s, $start, $length, $encoding);
-    }
-
-    public static function mb_stripos($haystack, $needle, $offset = 0, $encoding = null)
-    {
-        $haystack = self::mb_convert_case($haystack, self::MB_CASE_FOLD, $encoding);
-        $needle = self::mb_convert_case($needle, self::MB_CASE_FOLD, $encoding);
-
-        return self::mb_strpos($haystack, $needle, $offset, $encoding);
-    }
-
-    public static function mb_stristr($haystack, $needle, $part = false, $encoding = null)
-    {
-        $pos = self::mb_stripos($haystack, $needle, 0, $encoding);
-
-        return self::getSubpart($pos, $part, $haystack, $encoding);
-    }
-
-    public static function mb_strrchr($haystack, $needle, $part = false, $encoding = null)
-    {
-        $encoding = self::getEncoding($encoding);
-        if ('CP850' === $encoding || 'ASCII' === $encoding) {
-            $pos = strrpos($haystack, $needle);
-        } else {
-            $needle = self::mb_substr($needle, 0, 1, $encoding);
-            $pos = \iconv_strrpos($haystack, $needle, $encoding);
-        }
-
-        return self::getSubpart($pos, $part, $haystack, $encoding);
-    }
-
-    public static function mb_strrichr($haystack, $needle, $part = false, $encoding = null)
-    {
-        $needle = self::mb_substr($needle, 0, 1, $encoding);
-        $pos = self::mb_strripos($haystack, $needle, $encoding);
-
-        return self::getSubpart($pos, $part, $haystack, $encoding);
-    }
-
-    public static function mb_strripos($haystack, $needle, $offset = 0, $encoding = null)
-    {
-        $haystack = self::mb_convert_case($haystack, self::MB_CASE_FOLD, $encoding);
-        $needle = self::mb_convert_case($needle, self::MB_CASE_FOLD, $encoding);
-
-        return self::mb_strrpos($haystack, $needle, $offset, $encoding);
-    }
-
-    public static function mb_strstr($haystack, $needle, $part = false, $encoding = null)
-    {
-        $pos = strpos($haystack, $needle);
-        if (false === $pos) {
-            return false;
-        }
-        if ($part) {
-            return substr($haystack, 0, $pos);
-        }
-
-        return substr($haystack, $pos);
-    }
-
-    public static function mb_get_info($type = 'all')
-    {
-        $info = [
-            'internal_encoding' => self::$internalEncoding,
-            'http_output' => 'pass',
-            'http_output_conv_mimetypes' => '^(text/|application/xhtml\+xml)',
-            'func_overload' => 0,
-            'func_overload_list' => 'no overload',
-            'mail_charset' => 'UTF-8',
-            'mail_header_encoding' => 'BASE64',
-            'mail_body_encoding' => 'BASE64',
-            'illegal_chars' => 0,
-            'encoding_translation' => 'Off',
-            'language' => self::$language,
-            'detect_order' => self::$encodingList,
-            'substitute_character' => 'none',
-            'strict_detection' => 'Off',
-        ];
-
-        if ('all' === $type) {
-            return $info;
-        }
-        if (isset($info[$type])) {
-            return $info[$type];
-        }
-
-        return false;
-    }
-
-    public static function mb_http_input($type = '')
-    {
-        return false;
-    }
-
-    public static function mb_http_output($encoding = null)
-    {
-        return null !== $encoding ? 'pass' === $encoding : 'pass';
-    }
-
-    public static function mb_strwidth($s, $encoding = null)
-    {
-        $encoding = self::getEncoding($encoding);
-
-        if ('UTF-8' !== $encoding) {
-            $s = \iconv($encoding, 'UTF-8//IGNORE', $s);
-        }
-
-        $s = preg_replace('/[\x{1100}-\x{115F}\x{2329}\x{232A}\x{2E80}-\x{303E}\x{3040}-\x{A4CF}\x{AC00}-\x{D7A3}\x{F900}-\x{FAFF}\x{FE10}-\x{FE19}\x{FE30}-\x{FE6F}\x{FF00}-\x{FF60}\x{FFE0}-\x{FFE6}\x{20000}-\x{2FFFD}\x{30000}-\x{3FFFD}]/u', '', $s, -1, $wide);
-
-        return ($wide << 1) + \iconv_strlen($s, 'UTF-8');
-    }
-
-    public static function mb_substr_count($haystack, $needle, $encoding = null)
-    {
-        return substr_count($haystack, $needle);
-    }
-
-    public static function mb_output_handler($contents, $status)
-    {
-        return $contents;
-    }
-
-    public static function mb_chr($code, $encoding = null)
-    {
-        if (0x80 > $code %= 0x200000) {
-            $s = \chr($code);
-        } elseif (0x800 > $code) {
-            $s = \chr(0xC0 | $code >> 6).\chr(0x80 | $code & 0x3F);
-        } elseif (0x10000 > $code) {
-            $s = \chr(0xE0 | $code >> 12).\chr(0x80 | $code >> 6 & 0x3F).\chr(0x80 | $code & 0x3F);
-        } else {
-            $s = \chr(0xF0 | $code >> 18).\chr(0x80 | $code >> 12 & 0x3F).\chr(0x80 | $code >> 6 & 0x3F).\chr(0x80 | $code & 0x3F);
-        }
-
-        if ('UTF-8' !== $encoding = self::getEncoding($encoding)) {
-            $s = mb_convert_encoding($s, $encoding, 'UTF-8');
-        }
-
-        return $s;
-    }
-
-    public static function mb_ord($s, $encoding = null)
-    {
-        if ('UTF-8' !== $encoding = self::getEncoding($encoding)) {
-            $s = mb_convert_encoding($s, 'UTF-8', $encoding);
-        }
-
-        if (1 === \strlen($s)) {
-            return \ord($s);
-        }
-
-        $code = ($s = unpack('C*', substr($s, 0, 4))) ? $s[1] : 0;
-        if (0xF0 <= $code) {
-            return (($code - 0xF0) << 18) + (($s[2] - 0x80) << 12) + (($s[3] - 0x80) << 6) + $s[4] - 0x80;
-        }
-        if (0xE0 <= $code) {
-            return (($code - 0xE0) << 12) + (($s[2] - 0x80) << 6) + $s[3] - 0x80;
-        }
-        if (0xC0 <= $code) {
-            return (($code - 0xC0) << 6) + $s[2] - 0x80;
-        }
-
-        return $code;
-    }
-
-    private static function getSubpart($pos, $part, $haystack, $encoding)
-    {
-        if (false === $pos) {
-            return false;
-        }
-        if ($part) {
-            return self::mb_substr($haystack, 0, $pos, $encoding);
-        }
-
-        return self::mb_substr($haystack, $pos, null, $encoding);
-    }
-
-    private static function html_encoding_callback(array $m)
-    {
-        $i = 1;
-        $entities = '';
-        $m = unpack('C*', htmlentities($m[0], \ENT_COMPAT, 'UTF-8'));
-
-        while (isset($m[$i])) {
-            if (0x80 > $m[$i]) {
-                $entities .= \chr($m[$i++]);
-                continue;
-            }
-            if (0xF0 <= $m[$i]) {
-                $c = (($m[$i++] - 0xF0) << 18) + (($m[$i++] - 0x80) << 12) + (($m[$i++] - 0x80) << 6) + $m[$i++] - 0x80;
-            } elseif (0xE0 <= $m[$i]) {
-                $c = (($m[$i++] - 0xE0) << 12) + (($m[$i++] - 0x80) << 6) + $m[$i++] - 0x80;
-            } else {
-                $c = (($m[$i++] - 0xC0) << 6) + $m[$i++] - 0x80;
-            }
-
-            $entities .= '&#'.$c.';';
-        }
-
-        return $entities;
-    }
-
-    private static function title_case(array $s)
-    {
-        return self::mb_convert_case($s[1], \MB_CASE_UPPER, 'UTF-8').self::mb_convert_case($s[2], \MB_CASE_LOWER, 'UTF-8');
-    }
-
-    private static function getData($file)
-    {
-        if (file_exists($file = __DIR__.'/Resources/unidata/'.$file.'.php')) {
-            return require $file;
-        }
-
-        return false;
-    }
-
-    private static function getEncoding($encoding)
-    {
-        if (null === $encoding) {
-            return self::$internalEncoding;
-        }
-
-        if ('UTF-8' === $encoding) {
-            return 'UTF-8';
-        }
-
-        $encoding = strtoupper($encoding);
-
-        if ('8BIT' === $encoding || 'BINARY' === $encoding) {
-            return 'CP850';
-        }
-
-        if ('UTF8' === $encoding) {
-            return 'UTF-8';
-        }
-
-        return $encoding;
-    }
-}
diff --git a/vendor/symfony/polyfill-mbstring/README.md b/vendor/symfony/polyfill-mbstring/README.md
deleted file mode 100644
index 4efb599d81..0000000000
--- a/vendor/symfony/polyfill-mbstring/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-Symfony Polyfill / Mbstring
-===========================
-
-This component provides a partial, native PHP implementation for the
-[Mbstring](https://php.net/mbstring) extension.
-
-More information can be found in the
-[main Polyfill README](https://github.com/symfony/polyfill/blob/master/README.md).
-
-License
-=======
-
-This library is released under the [MIT license](LICENSE).
diff --git a/vendor/symfony/polyfill-mbstring/Resources/unidata/lowerCase.php b/vendor/symfony/polyfill-mbstring/Resources/unidata/lowerCase.php
deleted file mode 100644
index fac60b081a..0000000000
--- a/vendor/symfony/polyfill-mbstring/Resources/unidata/lowerCase.php
+++ /dev/null
@@ -1,1397 +0,0 @@
-<?php
-
-return array (
-  'A' => 'a',
-  'B' => 'b',
-  'C' => 'c',
-  'D' => 'd',
-  'E' => 'e',
-  'F' => 'f',
-  'G' => 'g',
-  'H' => 'h',
-  'I' => 'i',
-  'J' => 'j',
-  'K' => 'k',
-  'L' => 'l',
-  'M' => 'm',
-  'N' => 'n',
-  'O' => 'o',
-  'P' => 'p',
-  'Q' => 'q',
-  'R' => 'r',
-  'S' => 's',
-  'T' => 't',
-  'U' => 'u',
-  'V' => 'v',
-  'W' => 'w',
-  'X' => 'x',
-  'Y' => 'y',
-  'Z' => 'z',
-  'À' => 'à',
-  'Á' => 'á',
-  'Â' => 'â',
-  'Ã' => 'ã',
-  'Ä' => 'ä',
-  'Å' => 'å',
-  'Æ' => 'æ',
-  'Ç' => 'ç',
-  'È' => 'è',
-  'É' => 'é',
-  'Ê' => 'ê',
-  'Ë' => 'ë',
-  'Ì' => 'ì',
-  'Í' => 'í',
-  'Î' => 'î',
-  'Ï' => 'ï',
-  'Ð' => 'ð',
-  'Ñ' => 'ñ',
-  'Ò' => 'ò',
-  'Ó' => 'ó',
-  'Ô' => 'ô',
-  'Õ' => 'õ',
-  'Ö' => 'ö',
-  'Ø' => 'ø',
-  'Ù' => 'ù',
-  'Ú' => 'ú',
-  'Û' => 'û',
-  'Ü' => 'ü',
-  'Ý' => 'ý',
-  'Þ' => 'þ',
-  'Ā' => 'ā',
-  'Ă' => 'ă',
-  'Ą' => 'ą',
-  'Ć' => 'ć',
-  'Ĉ' => 'ĉ',
-  'Ċ' => 'ċ',
-  'Č' => 'č',
-  'Ď' => 'ď',
-  'Đ' => 'đ',
-  'Ē' => 'ē',
-  'Ĕ' => 'ĕ',
-  'Ė' => 'ė',
-  'Ę' => 'ę',
-  'Ě' => 'ě',
-  'Ĝ' => 'ĝ',
-  'Ğ' => 'ğ',
-  'Ġ' => 'ġ',
-  'Ģ' => 'ģ',
-  'Ĥ' => 'ĥ',
-  'Ħ' => 'ħ',
-  'Ĩ' => 'ĩ',
-  'Ī' => 'ī',
-  'Ĭ' => 'ĭ',
-  'Į' => 'į',
-  'İ' => 'i̇',
-  'IJ' => 'ij',
-  'Ĵ' => 'ĵ',
-  'Ķ' => 'ķ',
-  'Ĺ' => 'ĺ',
-  'Ļ' => 'ļ',
-  'Ľ' => 'ľ',
-  'Ŀ' => 'ŀ',
-  'Ł' => 'ł',
-  'Ń' => 'ń',
-  'Ņ' => 'ņ',
-  'Ň' => 'ň',
-  'Ŋ' => 'ŋ',
-  'Ō' => 'ō',
-  'Ŏ' => 'ŏ',
-  'Ő' => 'ő',
-  'Œ' => 'œ',
-  'Ŕ' => 'ŕ',
-  'Ŗ' => 'ŗ',
-  'Ř' => 'ř',
-  'Ś' => 'ś',
-  'Ŝ' => 'ŝ',
-  'Ş' => 'ş',
-  'Š' => 'š',
-  'Ţ' => 'ţ',
-  'Ť' => 'ť',
-  'Ŧ' => 'ŧ',
-  'Ũ' => 'ũ',
-  'Ū' => 'ū',
-  'Ŭ' => 'ŭ',
-  'Ů' => 'ů',
-  'Ű' => 'ű',
-  'Ų' => 'ų',
-  'Ŵ' => 'ŵ',
-  'Ŷ' => 'ŷ',
-  'Ÿ' => 'ÿ',
-  'Ź' => 'ź',
-  'Ż' => 'ż',
-  'Ž' => 'ž',
-  'Ɓ' => 'ɓ',
-  'Ƃ' => 'ƃ',
-  'Ƅ' => 'ƅ',
-  'Ɔ' => 'ɔ',
-  'Ƈ' => 'ƈ',
-  'Ɖ' => 'ɖ',
-  'Ɗ' => 'ɗ',
-  'Ƌ' => 'ƌ',
-  'Ǝ' => 'ǝ',
-  'Ə' => 'ə',
-  'Ɛ' => 'ɛ',
-  'Ƒ' => 'ƒ',
-  'Ɠ' => 'ɠ',
-  'Ɣ' => 'ɣ',
-  'Ɩ' => 'ɩ',
-  'Ɨ' => 'ɨ',
-  'Ƙ' => 'ƙ',
-  'Ɯ' => 'ɯ',
-  'Ɲ' => 'ɲ',
-  'Ɵ' => 'ɵ',
-  'Ơ' => 'ơ',
-  'Ƣ' => 'ƣ',
-  'Ƥ' => 'ƥ',
-  'Ʀ' => 'ʀ',
-  'Ƨ' => 'ƨ',
-  'Ʃ' => 'ʃ',
-  'Ƭ' => 'ƭ',
-  'Ʈ' => 'ʈ',
-  'Ư' => 'ư',
-  'Ʊ' => 'ʊ',
-  'Ʋ' => 'ʋ',
-  'Ƴ' => 'ƴ',
-  'Ƶ' => 'ƶ',
-  'Ʒ' => 'ʒ',
-  'Ƹ' => 'ƹ',
-  'Ƽ' => 'ƽ',
-  'DŽ' => 'dž',
-  'Dž' => 'dž',
-  'LJ' => 'lj',
-  'Lj' => 'lj',
-  'NJ' => 'nj',
-  'Nj' => 'nj',
-  'Ǎ' => 'ǎ',
-  'Ǐ' => 'ǐ',
-  'Ǒ' => 'ǒ',
-  'Ǔ' => 'ǔ',
-  'Ǖ' => 'ǖ',
-  'Ǘ' => 'ǘ',
-  'Ǚ' => 'ǚ',
-  'Ǜ' => 'ǜ',
-  'Ǟ' => 'ǟ',
-  'Ǡ' => 'ǡ',
-  'Ǣ' => 'ǣ',
-  'Ǥ' => 'ǥ',
-  'Ǧ' => 'ǧ',
-  'Ǩ' => 'ǩ',
-  'Ǫ' => 'ǫ',
-  'Ǭ' => 'ǭ',
-  'Ǯ' => 'ǯ',
-  'DZ' => 'dz',
-  'Dz' => 'dz',
-  'Ǵ' => 'ǵ',
-  'Ƕ' => 'ƕ',
-  'Ƿ' => 'ƿ',
-  'Ǹ' => 'ǹ',
-  'Ǻ' => 'ǻ',
-  'Ǽ' => 'ǽ',
-  'Ǿ' => 'ǿ',
-  'Ȁ' => 'ȁ',
-  'Ȃ' => 'ȃ',
-  'Ȅ' => 'ȅ',
-  'Ȇ' => 'ȇ',
-  'Ȉ' => 'ȉ',
-  'Ȋ' => 'ȋ',
-  'Ȍ' => 'ȍ',
-  'Ȏ' => 'ȏ',
-  'Ȑ' => 'ȑ',
-  'Ȓ' => 'ȓ',
-  'Ȕ' => 'ȕ',
-  'Ȗ' => 'ȗ',
-  'Ș' => 'ș',
-  'Ț' => 'ț',
-  'Ȝ' => 'ȝ',
-  'Ȟ' => 'ȟ',
-  'Ƞ' => 'ƞ',
-  'Ȣ' => 'ȣ',
-  'Ȥ' => 'ȥ',
-  'Ȧ' => 'ȧ',
-  'Ȩ' => 'ȩ',
-  'Ȫ' => 'ȫ',
-  'Ȭ' => 'ȭ',
-  'Ȯ' => 'ȯ',
-  'Ȱ' => 'ȱ',
-  'Ȳ' => 'ȳ',
-  'Ⱥ' => 'ⱥ',
-  'Ȼ' => 'ȼ',
-  'Ƚ' => 'ƚ',
-  'Ⱦ' => 'ⱦ',
-  'Ɂ' => 'ɂ',
-  'Ƀ' => 'ƀ',
-  'Ʉ' => 'ʉ',
-  'Ʌ' => 'ʌ',
-  'Ɇ' => 'ɇ',
-  'Ɉ' => 'ɉ',
-  'Ɋ' => 'ɋ',
-  'Ɍ' => 'ɍ',
-  'Ɏ' => 'ɏ',
-  'Ͱ' => 'ͱ',
-  'Ͳ' => 'ͳ',
-  'Ͷ' => 'ͷ',
-  'Ϳ' => 'ϳ',
-  'Ά' => 'ά',
-  'Έ' => 'έ',
-  'Ή' => 'ή',
-  'Ί' => 'ί',
-  'Ό' => 'ό',
-  'Ύ' => 'ύ',
-  'Ώ' => 'ώ',
-  'Α' => 'α',
-  'Β' => 'β',
-  'Γ' => 'γ',
-  'Δ' => 'δ',
-  'Ε' => 'ε',
-  'Ζ' => 'ζ',
-  'Η' => 'η',
-  'Θ' => 'θ',
-  'Ι' => 'ι',
-  'Κ' => 'κ',
-  'Λ' => 'λ',
-  'Μ' => 'μ',
-  'Ν' => 'ν',
-  'Ξ' => 'ξ',
-  'Ο' => 'ο',
-  'Π' => 'π',
-  'Ρ' => 'ρ',
-  'Σ' => 'σ',
-  'Τ' => 'τ',
-  'Υ' => 'υ',
-  'Φ' => 'φ',
-  'Χ' => 'χ',
-  'Ψ' => 'ψ',
-  'Ω' => 'ω',
-  'Ϊ' => 'ϊ',
-  'Ϋ' => 'ϋ',
-  'Ϗ' => 'ϗ',
-  'Ϙ' => 'ϙ',
-  'Ϛ' => 'ϛ',
-  'Ϝ' => 'ϝ',
-  'Ϟ' => 'ϟ',
-  'Ϡ' => 'ϡ',
-  'Ϣ' => 'ϣ',
-  'Ϥ' => 'ϥ',
-  'Ϧ' => 'ϧ',
-  'Ϩ' => 'ϩ',
-  'Ϫ' => 'ϫ',
-  'Ϭ' => 'ϭ',
-  'Ϯ' => 'ϯ',
-  'ϴ' => 'θ',
-  'Ϸ' => 'ϸ',
-  'Ϲ' => 'ϲ',
-  'Ϻ' => 'ϻ',
-  'Ͻ' => 'ͻ',
-  'Ͼ' => 'ͼ',
-  'Ͽ' => 'ͽ',
-  'Ѐ' => 'ѐ',
-  'Ё' => 'ё',
-  'Ђ' => 'ђ',
-  'Ѓ' => 'ѓ',
-  'Є' => 'є',
-  'Ѕ' => 'ѕ',
-  'І' => 'і',
-  'Ї' => 'ї',
-  'Ј' => 'ј',
-  'Љ' => 'љ',
-  'Њ' => 'њ',
-  'Ћ' => 'ћ',
-  'Ќ' => 'ќ',
-  'Ѝ' => 'ѝ',
-  'Ў' => 'ў',
-  'Џ' => 'џ',
-  'А' => 'а',
-  'Б' => 'б',
-  'В' => 'в',
-  'Г' => 'г',
-  'Д' => 'д',
-  'Е' => 'е',
-  'Ж' => 'ж',
-  'З' => 'з',
-  'И' => 'и',
-  'Й' => 'й',
-  'К' => 'к',
-  'Л' => 'л',
-  'М' => 'м',
-  'Н' => 'н',
-  'О' => 'о',
-  'П' => 'п',
-  'Р' => 'р',
-  'С' => 'с',
-  'Т' => 'т',
-  'У' => 'у',
-  'Ф' => 'ф',
-  'Х' => 'х',
-  'Ц' => 'ц',
-  'Ч' => 'ч',
-  'Ш' => 'ш',
-  'Щ' => 'щ',
-  'Ъ' => 'ъ',
-  'Ы' => 'ы',
-  'Ь' => 'ь',
-  'Э' => 'э',
-  'Ю' => 'ю',
-  'Я' => 'я',
-  'Ѡ' => 'ѡ',
-  'Ѣ' => 'ѣ',
-  'Ѥ' => 'ѥ',
-  'Ѧ' => 'ѧ',
-  'Ѩ' => 'ѩ',
-  'Ѫ' => 'ѫ',
-  'Ѭ' => 'ѭ',
-  'Ѯ' => 'ѯ',
-  'Ѱ' => 'ѱ',
-  'Ѳ' => 'ѳ',
-  'Ѵ' => 'ѵ',
-  'Ѷ' => 'ѷ',
-  'Ѹ' => 'ѹ',
-  'Ѻ' => 'ѻ',
-  'Ѽ' => 'ѽ',
-  'Ѿ' => 'ѿ',
-  'Ҁ' => 'ҁ',
-  'Ҋ' => 'ҋ',
-  'Ҍ' => 'ҍ',
-  'Ҏ' => 'ҏ',
-  'Ґ' => 'ґ',
-  'Ғ' => 'ғ',
-  'Ҕ' => 'ҕ',
-  'Җ' => 'җ',
-  'Ҙ' => 'ҙ',
-  'Қ' => 'қ',
-  'Ҝ' => 'ҝ',
-  'Ҟ' => 'ҟ',
-  'Ҡ' => 'ҡ',
-  'Ң' => 'ң',
-  'Ҥ' => 'ҥ',
-  'Ҧ' => 'ҧ',
-  'Ҩ' => 'ҩ',
-  'Ҫ' => 'ҫ',
-  'Ҭ' => 'ҭ',
-  'Ү' => 'ү',
-  'Ұ' => 'ұ',
-  'Ҳ' => 'ҳ',
-  'Ҵ' => 'ҵ',
-  'Ҷ' => 'ҷ',
-  'Ҹ' => 'ҹ',
-  'Һ' => 'һ',
-  'Ҽ' => 'ҽ',
-  'Ҿ' => 'ҿ',
-  'Ӏ' => 'ӏ',
-  'Ӂ' => 'ӂ',
-  'Ӄ' => 'ӄ',
-  'Ӆ' => 'ӆ',
-  'Ӈ' => 'ӈ',
-  'Ӊ' => 'ӊ',
-  'Ӌ' => 'ӌ',
-  'Ӎ' => 'ӎ',
-  'Ӑ' => 'ӑ',
-  'Ӓ' => 'ӓ',
-  'Ӕ' => 'ӕ',
-  'Ӗ' => 'ӗ',
-  'Ә' => 'ә',
-  'Ӛ' => 'ӛ',
-  'Ӝ' => 'ӝ',
-  'Ӟ' => 'ӟ',
-  'Ӡ' => 'ӡ',
-  'Ӣ' => 'ӣ',
-  'Ӥ' => 'ӥ',
-  'Ӧ' => 'ӧ',
-  'Ө' => 'ө',
-  'Ӫ' => 'ӫ',
-  'Ӭ' => 'ӭ',
-  'Ӯ' => 'ӯ',
-  'Ӱ' => 'ӱ',
-  'Ӳ' => 'ӳ',
-  'Ӵ' => 'ӵ',
-  'Ӷ' => 'ӷ',
-  'Ӹ' => 'ӹ',
-  'Ӻ' => 'ӻ',
-  'Ӽ' => 'ӽ',
-  'Ӿ' => 'ӿ',
-  'Ԁ' => 'ԁ',
-  'Ԃ' => 'ԃ',
-  'Ԅ' => 'ԅ',
-  'Ԇ' => 'ԇ',
-  'Ԉ' => 'ԉ',
-  'Ԋ' => 'ԋ',
-  'Ԍ' => 'ԍ',
-  'Ԏ' => 'ԏ',
-  'Ԑ' => 'ԑ',
-  'Ԓ' => 'ԓ',
-  'Ԕ' => 'ԕ',
-  'Ԗ' => 'ԗ',
-  'Ԙ' => 'ԙ',
-  'Ԛ' => 'ԛ',
-  'Ԝ' => 'ԝ',
-  'Ԟ' => 'ԟ',
-  'Ԡ' => 'ԡ',
-  'Ԣ' => 'ԣ',
-  'Ԥ' => 'ԥ',
-  'Ԧ' => 'ԧ',
-  'Ԩ' => 'ԩ',
-  'Ԫ' => 'ԫ',
-  'Ԭ' => 'ԭ',
-  'Ԯ' => 'ԯ',
-  'Ա' => 'ա',
-  'Բ' => 'բ',
-  'Գ' => 'գ',
-  'Դ' => 'դ',
-  'Ե' => 'ե',
-  'Զ' => 'զ',
-  'Է' => 'է',
-  'Ը' => 'ը',
-  'Թ' => 'թ',
-  'Ժ' => 'ժ',
-  'Ի' => 'ի',
-  'Լ' => 'լ',
-  'Խ' => 'խ',
-  'Ծ' => 'ծ',
-  'Կ' => 'կ',
-  'Հ' => 'հ',
-  'Ձ' => 'ձ',
-  'Ղ' => 'ղ',
-  'Ճ' => 'ճ',
-  'Մ' => 'մ',
-  'Յ' => 'յ',
-  'Ն' => 'ն',
-  'Շ' => 'շ',
-  'Ո' => 'ո',
-  'Չ' => 'չ',
-  'Պ' => 'պ',
-  'Ջ' => 'ջ',
-  'Ռ' => 'ռ',
-  'Ս' => 'ս',
-  'Վ' => 'վ',
-  'Տ' => 'տ',
-  'Ր' => 'ր',
-  'Ց' => 'ց',
-  'Ւ' => 'ւ',
-  'Փ' => 'փ',
-  'Ք' => 'ք',
-  'Օ' => 'օ',
-  'Ֆ' => 'ֆ',
-  'Ⴀ' => 'ⴀ',
-  'Ⴁ' => 'ⴁ',
-  'Ⴂ' => 'ⴂ',
-  'Ⴃ' => 'ⴃ',
-  'Ⴄ' => 'ⴄ',
-  'Ⴅ' => 'ⴅ',
-  'Ⴆ' => 'ⴆ',
-  'Ⴇ' => 'ⴇ',
-  'Ⴈ' => 'ⴈ',
-  'Ⴉ' => 'ⴉ',
-  'Ⴊ' => 'ⴊ',
-  'Ⴋ' => 'ⴋ',
-  'Ⴌ' => 'ⴌ',
-  'Ⴍ' => 'ⴍ',
-  'Ⴎ' => 'ⴎ',
-  'Ⴏ' => 'ⴏ',
-  'Ⴐ' => 'ⴐ',
-  'Ⴑ' => 'ⴑ',
-  'Ⴒ' => 'ⴒ',
-  'Ⴓ' => 'ⴓ',
-  'Ⴔ' => 'ⴔ',
-  'Ⴕ' => 'ⴕ',
-  'Ⴖ' => 'ⴖ',
-  'Ⴗ' => 'ⴗ',
-  'Ⴘ' => 'ⴘ',
-  'Ⴙ' => 'ⴙ',
-  'Ⴚ' => 'ⴚ',
-  'Ⴛ' => 'ⴛ',
-  'Ⴜ' => 'ⴜ',
-  'Ⴝ' => 'ⴝ',
-  'Ⴞ' => 'ⴞ',
-  'Ⴟ' => 'ⴟ',
-  'Ⴠ' => 'ⴠ',
-  'Ⴡ' => 'ⴡ',
-  'Ⴢ' => 'ⴢ',
-  'Ⴣ' => 'ⴣ',
-  'Ⴤ' => 'ⴤ',
-  'Ⴥ' => 'ⴥ',
-  'Ⴧ' => 'ⴧ',
-  'Ⴭ' => 'ⴭ',
-  'Ꭰ' => 'ꭰ',
-  'Ꭱ' => 'ꭱ',
-  'Ꭲ' => 'ꭲ',
-  'Ꭳ' => 'ꭳ',
-  'Ꭴ' => 'ꭴ',
-  'Ꭵ' => 'ꭵ',
-  'Ꭶ' => 'ꭶ',
-  'Ꭷ' => 'ꭷ',
-  'Ꭸ' => 'ꭸ',
-  'Ꭹ' => 'ꭹ',
-  'Ꭺ' => 'ꭺ',
-  'Ꭻ' => 'ꭻ',
-  'Ꭼ' => 'ꭼ',
-  'Ꭽ' => 'ꭽ',
-  'Ꭾ' => 'ꭾ',
-  'Ꭿ' => 'ꭿ',
-  'Ꮀ' => 'ꮀ',
-  'Ꮁ' => 'ꮁ',
-  'Ꮂ' => 'ꮂ',
-  'Ꮃ' => 'ꮃ',
-  'Ꮄ' => 'ꮄ',
-  'Ꮅ' => 'ꮅ',
-  'Ꮆ' => 'ꮆ',
-  'Ꮇ' => 'ꮇ',
-  'Ꮈ' => 'ꮈ',
-  'Ꮉ' => 'ꮉ',
-  'Ꮊ' => 'ꮊ',
-  'Ꮋ' => 'ꮋ',
-  'Ꮌ' => 'ꮌ',
-  'Ꮍ' => 'ꮍ',
-  'Ꮎ' => 'ꮎ',
-  'Ꮏ' => 'ꮏ',
-  'Ꮐ' => 'ꮐ',
-  'Ꮑ' => 'ꮑ',
-  'Ꮒ' => 'ꮒ',
-  'Ꮓ' => 'ꮓ',
-  'Ꮔ' => 'ꮔ',
-  'Ꮕ' => 'ꮕ',
-  'Ꮖ' => 'ꮖ',
-  'Ꮗ' => 'ꮗ',
-  'Ꮘ' => 'ꮘ',
-  'Ꮙ' => 'ꮙ',
-  'Ꮚ' => 'ꮚ',
-  'Ꮛ' => 'ꮛ',
-  'Ꮜ' => 'ꮜ',
-  'Ꮝ' => 'ꮝ',
-  'Ꮞ' => 'ꮞ',
-  'Ꮟ' => 'ꮟ',
-  'Ꮠ' => 'ꮠ',
-  'Ꮡ' => 'ꮡ',
-  'Ꮢ' => 'ꮢ',
-  'Ꮣ' => 'ꮣ',
-  'Ꮤ' => 'ꮤ',
-  'Ꮥ' => 'ꮥ',
-  'Ꮦ' => 'ꮦ',
-  'Ꮧ' => 'ꮧ',
-  'Ꮨ' => 'ꮨ',
-  'Ꮩ' => 'ꮩ',
-  'Ꮪ' => 'ꮪ',
-  'Ꮫ' => 'ꮫ',
-  'Ꮬ' => 'ꮬ',
-  'Ꮭ' => 'ꮭ',
-  'Ꮮ' => 'ꮮ',
-  'Ꮯ' => 'ꮯ',
-  'Ꮰ' => 'ꮰ',
-  'Ꮱ' => 'ꮱ',
-  'Ꮲ' => 'ꮲ',
-  'Ꮳ' => 'ꮳ',
-  'Ꮴ' => 'ꮴ',
-  'Ꮵ' => 'ꮵ',
-  'Ꮶ' => 'ꮶ',
-  'Ꮷ' => 'ꮷ',
-  'Ꮸ' => 'ꮸ',
-  'Ꮹ' => 'ꮹ',
-  'Ꮺ' => 'ꮺ',
-  'Ꮻ' => 'ꮻ',
-  'Ꮼ' => 'ꮼ',
-  'Ꮽ' => 'ꮽ',
-  'Ꮾ' => 'ꮾ',
-  'Ꮿ' => 'ꮿ',
-  'Ᏸ' => 'ᏸ',
-  'Ᏹ' => 'ᏹ',
-  'Ᏺ' => 'ᏺ',
-  'Ᏻ' => 'ᏻ',
-  'Ᏼ' => 'ᏼ',
-  'Ᏽ' => 'ᏽ',
-  'Ა' => 'ა',
-  'Ბ' => 'ბ',
-  'Გ' => 'გ',
-  'Დ' => 'დ',
-  'Ე' => 'ე',
-  'Ვ' => 'ვ',
-  'Ზ' => 'ზ',
-  'Თ' => 'თ',
-  'Ი' => 'ი',
-  'Კ' => 'კ',
-  'Ლ' => 'ლ',
-  'Მ' => 'მ',
-  'Ნ' => 'ნ',
-  'Ო' => 'ო',
-  'Პ' => 'პ',
-  'Ჟ' => 'ჟ',
-  'Რ' => 'რ',
-  'Ს' => 'ს',
-  'Ტ' => 'ტ',
-  'Უ' => 'უ',
-  'Ფ' => 'ფ',
-  'Ქ' => 'ქ',
-  'Ღ' => 'ღ',
-  'Ყ' => 'ყ',
-  'Შ' => 'შ',
-  'Ჩ' => 'ჩ',
-  'Ც' => 'ც',
-  'Ძ' => 'ძ',
-  'Წ' => 'წ',
-  'Ჭ' => 'ჭ',
-  'Ხ' => 'ხ',
-  'Ჯ' => 'ჯ',
-  'Ჰ' => 'ჰ',
-  'Ჱ' => 'ჱ',
-  'Ჲ' => 'ჲ',
-  'Ჳ' => 'ჳ',
-  'Ჴ' => 'ჴ',
-  'Ჵ' => 'ჵ',
-  'Ჶ' => 'ჶ',
-  'Ჷ' => 'ჷ',
-  'Ჸ' => 'ჸ',
-  'Ჹ' => 'ჹ',
-  'Ჺ' => 'ჺ',
-  'Ჽ' => 'ჽ',
-  'Ჾ' => 'ჾ',
-  'Ჿ' => 'ჿ',
-  'Ḁ' => 'ḁ',
-  'Ḃ' => 'ḃ',
-  'Ḅ' => 'ḅ',
-  'Ḇ' => 'ḇ',
-  'Ḉ' => 'ḉ',
-  'Ḋ' => 'ḋ',
-  'Ḍ' => 'ḍ',
-  'Ḏ' => 'ḏ',
-  'Ḑ' => 'ḑ',
-  'Ḓ' => 'ḓ',
-  'Ḕ' => 'ḕ',
-  'Ḗ' => 'ḗ',
-  'Ḙ' => 'ḙ',
-  'Ḛ' => 'ḛ',
-  'Ḝ' => 'ḝ',
-  'Ḟ' => 'ḟ',
-  'Ḡ' => 'ḡ',
-  'Ḣ' => 'ḣ',
-  'Ḥ' => 'ḥ',
-  'Ḧ' => 'ḧ',
-  'Ḩ' => 'ḩ',
-  'Ḫ' => 'ḫ',
-  'Ḭ' => 'ḭ',
-  'Ḯ' => 'ḯ',
-  'Ḱ' => 'ḱ',
-  'Ḳ' => 'ḳ',
-  'Ḵ' => 'ḵ',
-  'Ḷ' => 'ḷ',
-  'Ḹ' => 'ḹ',
-  'Ḻ' => 'ḻ',
-  'Ḽ' => 'ḽ',
-  'Ḿ' => 'ḿ',
-  'Ṁ' => 'ṁ',
-  'Ṃ' => 'ṃ',
-  'Ṅ' => 'ṅ',
-  'Ṇ' => 'ṇ',
-  'Ṉ' => 'ṉ',
-  'Ṋ' => 'ṋ',
-  'Ṍ' => 'ṍ',
-  'Ṏ' => 'ṏ',
-  'Ṑ' => 'ṑ',
-  'Ṓ' => 'ṓ',
-  'Ṕ' => 'ṕ',
-  'Ṗ' => 'ṗ',
-  'Ṙ' => 'ṙ',
-  'Ṛ' => 'ṛ',
-  'Ṝ' => 'ṝ',
-  'Ṟ' => 'ṟ',
-  'Ṡ' => 'ṡ',
-  'Ṣ' => 'ṣ',
-  'Ṥ' => 'ṥ',
-  'Ṧ' => 'ṧ',
-  'Ṩ' => 'ṩ',
-  'Ṫ' => 'ṫ',
-  'Ṭ' => 'ṭ',
-  'Ṯ' => 'ṯ',
-  'Ṱ' => 'ṱ',
-  'Ṳ' => 'ṳ',
-  'Ṵ' => 'ṵ',
-  'Ṷ' => 'ṷ',
-  'Ṹ' => 'ṹ',
-  'Ṻ' => 'ṻ',
-  'Ṽ' => 'ṽ',
-  'Ṿ' => 'ṿ',
-  'Ẁ' => 'ẁ',
-  'Ẃ' => 'ẃ',
-  'Ẅ' => 'ẅ',
-  'Ẇ' => 'ẇ',
-  'Ẉ' => 'ẉ',
-  'Ẋ' => 'ẋ',
-  'Ẍ' => 'ẍ',
-  'Ẏ' => 'ẏ',
-  'Ẑ' => 'ẑ',
-  'Ẓ' => 'ẓ',
-  'Ẕ' => 'ẕ',
-  'ẞ' => 'ß',
-  'Ạ' => 'ạ',
-  'Ả' => 'ả',
-  'Ấ' => 'ấ',
-  'Ầ' => 'ầ',
-  'Ẩ' => 'ẩ',
-  'Ẫ' => 'ẫ',
-  'Ậ' => 'ậ',
-  'Ắ' => 'ắ',
-  'Ằ' => 'ằ',
-  'Ẳ' => 'ẳ',
-  'Ẵ' => 'ẵ',
-  'Ặ' => 'ặ',
-  'Ẹ' => 'ẹ',
-  'Ẻ' => 'ẻ',
-  'Ẽ' => 'ẽ',
-  'Ế' => 'ế',
-  'Ề' => 'ề',
-  'Ể' => 'ể',
-  'Ễ' => 'ễ',
-  'Ệ' => 'ệ',
-  'Ỉ' => 'ỉ',
-  'Ị' => 'ị',
-  'Ọ' => 'ọ',
-  'Ỏ' => 'ỏ',
-  'Ố' => 'ố',
-  'Ồ' => 'ồ',
-  'Ổ' => 'ổ',
-  'Ỗ' => 'ỗ',
-  'Ộ' => 'ộ',
-  'Ớ' => 'ớ',
-  'Ờ' => 'ờ',
-  'Ở' => 'ở',
-  'Ỡ' => 'ỡ',
-  'Ợ' => 'ợ',
-  'Ụ' => 'ụ',
-  'Ủ' => 'ủ',
-  'Ứ' => 'ứ',
-  'Ừ' => 'ừ',
-  'Ử' => 'ử',
-  'Ữ' => 'ữ',
-  'Ự' => 'ự',
-  'Ỳ' => 'ỳ',
-  'Ỵ' => 'ỵ',
-  'Ỷ' => 'ỷ',
-  'Ỹ' => 'ỹ',
-  'Ỻ' => 'ỻ',
-  'Ỽ' => 'ỽ',
-  'Ỿ' => 'ỿ',
-  'Ἀ' => 'ἀ',
-  'Ἁ' => 'ἁ',
-  'Ἂ' => 'ἂ',
-  'Ἃ' => 'ἃ',
-  'Ἄ' => 'ἄ',
-  'Ἅ' => 'ἅ',
-  'Ἆ' => 'ἆ',
-  'Ἇ' => 'ἇ',
-  'Ἐ' => 'ἐ',
-  'Ἑ' => 'ἑ',
-  'Ἒ' => 'ἒ',
-  'Ἓ' => 'ἓ',
-  'Ἔ' => 'ἔ',
-  'Ἕ' => 'ἕ',
-  'Ἠ' => 'ἠ',
-  'Ἡ' => 'ἡ',
-  'Ἢ' => 'ἢ',
-  'Ἣ' => 'ἣ',
-  'Ἤ' => 'ἤ',
-  'Ἥ' => 'ἥ',
-  'Ἦ' => 'ἦ',
-  'Ἧ' => 'ἧ',
-  'Ἰ' => 'ἰ',
-  'Ἱ' => 'ἱ',
-  'Ἲ' => 'ἲ',
-  'Ἳ' => 'ἳ',
-  'Ἴ' => 'ἴ',
-  'Ἵ' => 'ἵ',
-  'Ἶ' => 'ἶ',
-  'Ἷ' => 'ἷ',
-  'Ὀ' => 'ὀ',
-  'Ὁ' => 'ὁ',
-  'Ὂ' => 'ὂ',
-  'Ὃ' => 'ὃ',
-  'Ὄ' => 'ὄ',
-  'Ὅ' => 'ὅ',
-  'Ὑ' => 'ὑ',
-  'Ὓ' => 'ὓ',
-  'Ὕ' => 'ὕ',
-  'Ὗ' => 'ὗ',
-  'Ὠ' => 'ὠ',
-  'Ὡ' => 'ὡ',
-  'Ὢ' => 'ὢ',
-  'Ὣ' => 'ὣ',
-  'Ὤ' => 'ὤ',
-  'Ὥ' => 'ὥ',
-  'Ὦ' => 'ὦ',
-  'Ὧ' => 'ὧ',
-  'ᾈ' => 'ᾀ',
-  'ᾉ' => 'ᾁ',
-  'ᾊ' => 'ᾂ',
-  'ᾋ' => 'ᾃ',
-  'ᾌ' => 'ᾄ',
-  'ᾍ' => 'ᾅ',
-  'ᾎ' => 'ᾆ',
-  'ᾏ' => 'ᾇ',
-  'ᾘ' => 'ᾐ',
-  'ᾙ' => 'ᾑ',
-  'ᾚ' => 'ᾒ',
-  'ᾛ' => 'ᾓ',
-  'ᾜ' => 'ᾔ',
-  'ᾝ' => 'ᾕ',
-  'ᾞ' => 'ᾖ',
-  'ᾟ' => 'ᾗ',
-  'ᾨ' => 'ᾠ',
-  'ᾩ' => 'ᾡ',
-  'ᾪ' => 'ᾢ',
-  'ᾫ' => 'ᾣ',
-  'ᾬ' => 'ᾤ',
-  'ᾭ' => 'ᾥ',
-  'ᾮ' => 'ᾦ',
-  'ᾯ' => 'ᾧ',
-  'Ᾰ' => 'ᾰ',
-  'Ᾱ' => 'ᾱ',
-  'Ὰ' => 'ὰ',
-  'Ά' => 'ά',
-  'ᾼ' => 'ᾳ',
-  'Ὲ' => 'ὲ',
-  'Έ' => 'έ',
-  'Ὴ' => 'ὴ',
-  'Ή' => 'ή',
-  'ῌ' => 'ῃ',
-  'Ῐ' => 'ῐ',
-  'Ῑ' => 'ῑ',
-  'Ὶ' => 'ὶ',
-  'Ί' => 'ί',
-  'Ῠ' => 'ῠ',
-  'Ῡ' => 'ῡ',
-  'Ὺ' => 'ὺ',
-  'Ύ' => 'ύ',
-  'Ῥ' => 'ῥ',
-  'Ὸ' => 'ὸ',
-  'Ό' => 'ό',
-  'Ὼ' => 'ὼ',
-  'Ώ' => 'ώ',
-  'ῼ' => 'ῳ',
-  'Ω' => 'ω',
-  'K' => 'k',
-  'Å' => 'å',
-  'Ⅎ' => 'ⅎ',
-  'Ⅰ' => 'ⅰ',
-  'Ⅱ' => 'ⅱ',
-  'Ⅲ' => 'ⅲ',
-  'Ⅳ' => 'ⅳ',
-  'Ⅴ' => 'ⅴ',
-  'Ⅵ' => 'ⅵ',
-  'Ⅶ' => 'ⅶ',
-  'Ⅷ' => 'ⅷ',
-  'Ⅸ' => 'ⅸ',
-  'Ⅹ' => 'ⅹ',
-  'Ⅺ' => 'ⅺ',
-  'Ⅻ' => 'ⅻ',
-  'Ⅼ' => 'ⅼ',
-  'Ⅽ' => 'ⅽ',
-  'Ⅾ' => 'ⅾ',
-  'Ⅿ' => 'ⅿ',
-  'Ↄ' => 'ↄ',
-  'Ⓐ' => 'ⓐ',
-  'Ⓑ' => 'ⓑ',
-  'Ⓒ' => 'ⓒ',
-  'Ⓓ' => 'ⓓ',
-  'Ⓔ' => 'ⓔ',
-  'Ⓕ' => 'ⓕ',
-  'Ⓖ' => 'ⓖ',
-  'Ⓗ' => 'ⓗ',
-  'Ⓘ' => 'ⓘ',
-  'Ⓙ' => 'ⓙ',
-  'Ⓚ' => 'ⓚ',
-  'Ⓛ' => 'ⓛ',
-  'Ⓜ' => 'ⓜ',
-  'Ⓝ' => 'ⓝ',
-  'Ⓞ' => 'ⓞ',
-  'Ⓟ' => 'ⓟ',
-  'Ⓠ' => 'ⓠ',
-  'Ⓡ' => 'ⓡ',
-  'Ⓢ' => 'ⓢ',
-  'Ⓣ' => 'ⓣ',
-  'Ⓤ' => 'ⓤ',
-  'Ⓥ' => 'ⓥ',
-  'Ⓦ' => 'ⓦ',
-  'Ⓧ' => 'ⓧ',
-  'Ⓨ' => 'ⓨ',
-  'Ⓩ' => 'ⓩ',
-  'Ⰰ' => 'ⰰ',
-  'Ⰱ' => 'ⰱ',
-  'Ⰲ' => 'ⰲ',
-  'Ⰳ' => 'ⰳ',
-  'Ⰴ' => 'ⰴ',
-  'Ⰵ' => 'ⰵ',
-  'Ⰶ' => 'ⰶ',
-  'Ⰷ' => 'ⰷ',
-  'Ⰸ' => 'ⰸ',
-  'Ⰹ' => 'ⰹ',
-  'Ⰺ' => 'ⰺ',
-  'Ⰻ' => 'ⰻ',
-  'Ⰼ' => 'ⰼ',
-  'Ⰽ' => 'ⰽ',
-  'Ⰾ' => 'ⰾ',
-  'Ⰿ' => 'ⰿ',
-  'Ⱀ' => 'ⱀ',
-  'Ⱁ' => 'ⱁ',
-  'Ⱂ' => 'ⱂ',
-  'Ⱃ' => 'ⱃ',
-  'Ⱄ' => 'ⱄ',
-  'Ⱅ' => 'ⱅ',
-  'Ⱆ' => 'ⱆ',
-  'Ⱇ' => 'ⱇ',
-  'Ⱈ' => 'ⱈ',
-  'Ⱉ' => 'ⱉ',
-  'Ⱊ' => 'ⱊ',
-  'Ⱋ' => 'ⱋ',
-  'Ⱌ' => 'ⱌ',
-  'Ⱍ' => 'ⱍ',
-  'Ⱎ' => 'ⱎ',
-  'Ⱏ' => 'ⱏ',
-  'Ⱐ' => 'ⱐ',
-  'Ⱑ' => 'ⱑ',
-  'Ⱒ' => 'ⱒ',
-  'Ⱓ' => 'ⱓ',
-  'Ⱔ' => 'ⱔ',
-  'Ⱕ' => 'ⱕ',
-  'Ⱖ' => 'ⱖ',
-  'Ⱗ' => 'ⱗ',
-  'Ⱘ' => 'ⱘ',
-  'Ⱙ' => 'ⱙ',
-  'Ⱚ' => 'ⱚ',
-  'Ⱛ' => 'ⱛ',
-  'Ⱜ' => 'ⱜ',
-  'Ⱝ' => 'ⱝ',
-  'Ⱞ' => 'ⱞ',
-  'Ⱡ' => 'ⱡ',
-  'Ɫ' => 'ɫ',
-  'Ᵽ' => 'ᵽ',
-  'Ɽ' => 'ɽ',
-  'Ⱨ' => 'ⱨ',
-  'Ⱪ' => 'ⱪ',
-  'Ⱬ' => 'ⱬ',
-  'Ɑ' => 'ɑ',
-  'Ɱ' => 'ɱ',
-  'Ɐ' => 'ɐ',
-  'Ɒ' => 'ɒ',
-  'Ⱳ' => 'ⱳ',
-  'Ⱶ' => 'ⱶ',
-  'Ȿ' => 'ȿ',
-  'Ɀ' => 'ɀ',
-  'Ⲁ' => 'ⲁ',
-  'Ⲃ' => 'ⲃ',
-  'Ⲅ' => 'ⲅ',
-  'Ⲇ' => 'ⲇ',
-  'Ⲉ' => 'ⲉ',
-  'Ⲋ' => 'ⲋ',
-  'Ⲍ' => 'ⲍ',
-  'Ⲏ' => 'ⲏ',
-  'Ⲑ' => 'ⲑ',
-  'Ⲓ' => 'ⲓ',
-  'Ⲕ' => 'ⲕ',
-  'Ⲗ' => 'ⲗ',
-  'Ⲙ' => 'ⲙ',
-  'Ⲛ' => 'ⲛ',
-  'Ⲝ' => 'ⲝ',
-  'Ⲟ' => 'ⲟ',
-  'Ⲡ' => 'ⲡ',
-  'Ⲣ' => 'ⲣ',
-  'Ⲥ' => 'ⲥ',
-  'Ⲧ' => 'ⲧ',
-  'Ⲩ' => 'ⲩ',
-  'Ⲫ' => 'ⲫ',
-  'Ⲭ' => 'ⲭ',
-  'Ⲯ' => 'ⲯ',
-  'Ⲱ' => 'ⲱ',
-  'Ⲳ' => 'ⲳ',
-  'Ⲵ' => 'ⲵ',
-  'Ⲷ' => 'ⲷ',
-  'Ⲹ' => 'ⲹ',
-  'Ⲻ' => 'ⲻ',
-  'Ⲽ' => 'ⲽ',
-  'Ⲿ' => 'ⲿ',
-  'Ⳁ' => 'ⳁ',
-  'Ⳃ' => 'ⳃ',
-  'Ⳅ' => 'ⳅ',
-  'Ⳇ' => 'ⳇ',
-  'Ⳉ' => 'ⳉ',
-  'Ⳋ' => 'ⳋ',
-  'Ⳍ' => 'ⳍ',
-  'Ⳏ' => 'ⳏ',
-  'Ⳑ' => 'ⳑ',
-  'Ⳓ' => 'ⳓ',
-  'Ⳕ' => 'ⳕ',
-  'Ⳗ' => 'ⳗ',
-  'Ⳙ' => 'ⳙ',
-  'Ⳛ' => 'ⳛ',
-  'Ⳝ' => 'ⳝ',
-  'Ⳟ' => 'ⳟ',
-  'Ⳡ' => 'ⳡ',
-  'Ⳣ' => 'ⳣ',
-  'Ⳬ' => 'ⳬ',
-  'Ⳮ' => 'ⳮ',
-  'Ⳳ' => 'ⳳ',
-  'Ꙁ' => 'ꙁ',
-  'Ꙃ' => 'ꙃ',
-  'Ꙅ' => 'ꙅ',
-  'Ꙇ' => 'ꙇ',
-  'Ꙉ' => 'ꙉ',
-  'Ꙋ' => 'ꙋ',
-  'Ꙍ' => 'ꙍ',
-  'Ꙏ' => 'ꙏ',
-  'Ꙑ' => 'ꙑ',
-  'Ꙓ' => 'ꙓ',
-  'Ꙕ' => 'ꙕ',
-  'Ꙗ' => 'ꙗ',
-  'Ꙙ' => 'ꙙ',
-  'Ꙛ' => 'ꙛ',
-  'Ꙝ' => 'ꙝ',
-  'Ꙟ' => 'ꙟ',
-  'Ꙡ' => 'ꙡ',
-  'Ꙣ' => 'ꙣ',
-  'Ꙥ' => 'ꙥ',
-  'Ꙧ' => 'ꙧ',
-  'Ꙩ' => 'ꙩ',
-  'Ꙫ' => 'ꙫ',
-  'Ꙭ' => 'ꙭ',
-  'Ꚁ' => 'ꚁ',
-  'Ꚃ' => 'ꚃ',
-  'Ꚅ' => 'ꚅ',
-  'Ꚇ' => 'ꚇ',
-  'Ꚉ' => 'ꚉ',
-  'Ꚋ' => 'ꚋ',
-  'Ꚍ' => 'ꚍ',
-  'Ꚏ' => 'ꚏ',
-  'Ꚑ' => 'ꚑ',
-  'Ꚓ' => 'ꚓ',
-  'Ꚕ' => 'ꚕ',
-  'Ꚗ' => 'ꚗ',
-  'Ꚙ' => 'ꚙ',
-  'Ꚛ' => 'ꚛ',
-  'Ꜣ' => 'ꜣ',
-  'Ꜥ' => 'ꜥ',
-  'Ꜧ' => 'ꜧ',
-  'Ꜩ' => 'ꜩ',
-  'Ꜫ' => 'ꜫ',
-  'Ꜭ' => 'ꜭ',
-  'Ꜯ' => 'ꜯ',
-  'Ꜳ' => 'ꜳ',
-  'Ꜵ' => 'ꜵ',
-  'Ꜷ' => 'ꜷ',
-  'Ꜹ' => 'ꜹ',
-  'Ꜻ' => 'ꜻ',
-  'Ꜽ' => 'ꜽ',
-  'Ꜿ' => 'ꜿ',
-  'Ꝁ' => 'ꝁ',
-  'Ꝃ' => 'ꝃ',
-  'Ꝅ' => 'ꝅ',
-  'Ꝇ' => 'ꝇ',
-  'Ꝉ' => 'ꝉ',
-  'Ꝋ' => 'ꝋ',
-  'Ꝍ' => 'ꝍ',
-  'Ꝏ' => 'ꝏ',
-  'Ꝑ' => 'ꝑ',
-  'Ꝓ' => 'ꝓ',
-  'Ꝕ' => 'ꝕ',
-  'Ꝗ' => 'ꝗ',
-  'Ꝙ' => 'ꝙ',
-  'Ꝛ' => 'ꝛ',
-  'Ꝝ' => 'ꝝ',
-  'Ꝟ' => 'ꝟ',
-  'Ꝡ' => 'ꝡ',
-  'Ꝣ' => 'ꝣ',
-  'Ꝥ' => 'ꝥ',
-  'Ꝧ' => 'ꝧ',
-  'Ꝩ' => 'ꝩ',
-  'Ꝫ' => 'ꝫ',
-  'Ꝭ' => 'ꝭ',
-  'Ꝯ' => 'ꝯ',
-  'Ꝺ' => 'ꝺ',
-  'Ꝼ' => 'ꝼ',
-  'Ᵹ' => 'ᵹ',
-  'Ꝿ' => 'ꝿ',
-  'Ꞁ' => 'ꞁ',
-  'Ꞃ' => 'ꞃ',
-  'Ꞅ' => 'ꞅ',
-  'Ꞇ' => 'ꞇ',
-  'Ꞌ' => 'ꞌ',
-  'Ɥ' => 'ɥ',
-  'Ꞑ' => 'ꞑ',
-  'Ꞓ' => 'ꞓ',
-  'Ꞗ' => 'ꞗ',
-  'Ꞙ' => 'ꞙ',
-  'Ꞛ' => 'ꞛ',
-  'Ꞝ' => 'ꞝ',
-  'Ꞟ' => 'ꞟ',
-  'Ꞡ' => 'ꞡ',
-  'Ꞣ' => 'ꞣ',
-  'Ꞥ' => 'ꞥ',
-  'Ꞧ' => 'ꞧ',
-  'Ꞩ' => 'ꞩ',
-  'Ɦ' => 'ɦ',
-  'Ɜ' => 'ɜ',
-  'Ɡ' => 'ɡ',
-  'Ɬ' => 'ɬ',
-  'Ɪ' => 'ɪ',
-  'Ʞ' => 'ʞ',
-  'Ʇ' => 'ʇ',
-  'Ʝ' => 'ʝ',
-  'Ꭓ' => 'ꭓ',
-  'Ꞵ' => 'ꞵ',
-  'Ꞷ' => 'ꞷ',
-  'Ꞹ' => 'ꞹ',
-  'Ꞻ' => 'ꞻ',
-  'Ꞽ' => 'ꞽ',
-  'Ꞿ' => 'ꞿ',
-  'Ꟃ' => 'ꟃ',
-  'Ꞔ' => 'ꞔ',
-  'Ʂ' => 'ʂ',
-  'Ᶎ' => 'ᶎ',
-  'Ꟈ' => 'ꟈ',
-  'Ꟊ' => 'ꟊ',
-  'Ꟶ' => 'ꟶ',
-  'Ａ' => 'ａ',
-  'Ｂ' => 'ｂ',
-  'Ｃ' => 'ｃ',
-  'Ｄ' => 'ｄ',
-  'Ｅ' => 'ｅ',
-  'Ｆ' => 'ｆ',
-  'Ｇ' => 'ｇ',
-  'Ｈ' => 'ｈ',
-  'Ｉ' => 'ｉ',
-  'Ｊ' => 'ｊ',
-  'Ｋ' => 'ｋ',
-  'Ｌ' => 'ｌ',
-  'Ｍ' => 'ｍ',
-  'Ｎ' => 'ｎ',
-  'Ｏ' => 'ｏ',
-  'Ｐ' => 'ｐ',
-  'Ｑ' => 'ｑ',
-  'Ｒ' => 'ｒ',
-  'Ｓ' => 'ｓ',
-  'Ｔ' => 'ｔ',
-  'Ｕ' => 'ｕ',
-  'Ｖ' => 'ｖ',
-  'Ｗ' => 'ｗ',
-  'Ｘ' => 'ｘ',
-  'Ｙ' => 'ｙ',
-  'Ｚ' => 'ｚ',
-  '𐐀' => '𐐨',
-  '𐐁' => '𐐩',
-  '𐐂' => '𐐪',
-  '𐐃' => '𐐫',
-  '𐐄' => '𐐬',
-  '𐐅' => '𐐭',
-  '𐐆' => '𐐮',
-  '𐐇' => '𐐯',
-  '𐐈' => '𐐰',
-  '𐐉' => '𐐱',
-  '𐐊' => '𐐲',
-  '𐐋' => '𐐳',
-  '𐐌' => '𐐴',
-  '𐐍' => '𐐵',
-  '𐐎' => '𐐶',
-  '𐐏' => '𐐷',
-  '𐐐' => '𐐸',
-  '𐐑' => '𐐹',
-  '𐐒' => '𐐺',
-  '𐐓' => '𐐻',
-  '𐐔' => '𐐼',
-  '𐐕' => '𐐽',
-  '𐐖' => '𐐾',
-  '𐐗' => '𐐿',
-  '𐐘' => '𐑀',
-  '𐐙' => '𐑁',
-  '𐐚' => '𐑂',
-  '𐐛' => '𐑃',
-  '𐐜' => '𐑄',
-  '𐐝' => '𐑅',
-  '𐐞' => '𐑆',
-  '𐐟' => '𐑇',
-  '𐐠' => '𐑈',
-  '𐐡' => '𐑉',
-  '𐐢' => '𐑊',
-  '𐐣' => '𐑋',
-  '𐐤' => '𐑌',
-  '𐐥' => '𐑍',
-  '𐐦' => '𐑎',
-  '𐐧' => '𐑏',
-  '𐒰' => '𐓘',
-  '𐒱' => '𐓙',
-  '𐒲' => '𐓚',
-  '𐒳' => '𐓛',
-  '𐒴' => '𐓜',
-  '𐒵' => '𐓝',
-  '𐒶' => '𐓞',
-  '𐒷' => '𐓟',
-  '𐒸' => '𐓠',
-  '𐒹' => '𐓡',
-  '𐒺' => '𐓢',
-  '𐒻' => '𐓣',
-  '𐒼' => '𐓤',
-  '𐒽' => '𐓥',
-  '𐒾' => '𐓦',
-  '𐒿' => '𐓧',
-  '𐓀' => '𐓨',
-  '𐓁' => '𐓩',
-  '𐓂' => '𐓪',
-  '𐓃' => '𐓫',
-  '𐓄' => '𐓬',
-  '𐓅' => '𐓭',
-  '𐓆' => '𐓮',
-  '𐓇' => '𐓯',
-  '𐓈' => '𐓰',
-  '𐓉' => '𐓱',
-  '𐓊' => '𐓲',
-  '𐓋' => '𐓳',
-  '𐓌' => '𐓴',
-  '𐓍' => '𐓵',
-  '𐓎' => '𐓶',
-  '𐓏' => '𐓷',
-  '𐓐' => '𐓸',
-  '𐓑' => '𐓹',
-  '𐓒' => '𐓺',
-  '𐓓' => '𐓻',
-  '𐲀' => '𐳀',
-  '𐲁' => '𐳁',
-  '𐲂' => '𐳂',
-  '𐲃' => '𐳃',
-  '𐲄' => '𐳄',
-  '𐲅' => '𐳅',
-  '𐲆' => '𐳆',
-  '𐲇' => '𐳇',
-  '𐲈' => '𐳈',
-  '𐲉' => '𐳉',
-  '𐲊' => '𐳊',
-  '𐲋' => '𐳋',
-  '𐲌' => '𐳌',
-  '𐲍' => '𐳍',
-  '𐲎' => '𐳎',
-  '𐲏' => '𐳏',
-  '𐲐' => '𐳐',
-  '𐲑' => '𐳑',
-  '𐲒' => '𐳒',
-  '𐲓' => '𐳓',
-  '𐲔' => '𐳔',
-  '𐲕' => '𐳕',
-  '𐲖' => '𐳖',
-  '𐲗' => '𐳗',
-  '𐲘' => '𐳘',
-  '𐲙' => '𐳙',
-  '𐲚' => '𐳚',
-  '𐲛' => '𐳛',
-  '𐲜' => '𐳜',
-  '𐲝' => '𐳝',
-  '𐲞' => '𐳞',
-  '𐲟' => '𐳟',
-  '𐲠' => '𐳠',
-  '𐲡' => '𐳡',
-  '𐲢' => '𐳢',
-  '𐲣' => '𐳣',
-  '𐲤' => '𐳤',
-  '𐲥' => '𐳥',
-  '𐲦' => '𐳦',
-  '𐲧' => '𐳧',
-  '𐲨' => '𐳨',
-  '𐲩' => '𐳩',
-  '𐲪' => '𐳪',
-  '𐲫' => '𐳫',
-  '𐲬' => '𐳬',
-  '𐲭' => '𐳭',
-  '𐲮' => '𐳮',
-  '𐲯' => '𐳯',
-  '𐲰' => '𐳰',
-  '𐲱' => '𐳱',
-  '𐲲' => '𐳲',
-  '𑢠' => '𑣀',
-  '𑢡' => '𑣁',
-  '𑢢' => '𑣂',
-  '𑢣' => '𑣃',
-  '𑢤' => '𑣄',
-  '𑢥' => '𑣅',
-  '𑢦' => '𑣆',
-  '𑢧' => '𑣇',
-  '𑢨' => '𑣈',
-  '𑢩' => '𑣉',
-  '𑢪' => '𑣊',
-  '𑢫' => '𑣋',
-  '𑢬' => '𑣌',
-  '𑢭' => '𑣍',
-  '𑢮' => '𑣎',
-  '𑢯' => '𑣏',
-  '𑢰' => '𑣐',
-  '𑢱' => '𑣑',
-  '𑢲' => '𑣒',
-  '𑢳' => '𑣓',
-  '𑢴' => '𑣔',
-  '𑢵' => '𑣕',
-  '𑢶' => '𑣖',
-  '𑢷' => '𑣗',
-  '𑢸' => '𑣘',
-  '𑢹' => '𑣙',
-  '𑢺' => '𑣚',
-  '𑢻' => '𑣛',
-  '𑢼' => '𑣜',
-  '𑢽' => '𑣝',
-  '𑢾' => '𑣞',
-  '𑢿' => '𑣟',
-  '𖹀' => '𖹠',
-  '𖹁' => '𖹡',
-  '𖹂' => '𖹢',
-  '𖹃' => '𖹣',
-  '𖹄' => '𖹤',
-  '𖹅' => '𖹥',
-  '𖹆' => '𖹦',
-  '𖹇' => '𖹧',
-  '𖹈' => '𖹨',
-  '𖹉' => '𖹩',
-  '𖹊' => '𖹪',
-  '𖹋' => '𖹫',
-  '𖹌' => '𖹬',
-  '𖹍' => '𖹭',
-  '𖹎' => '𖹮',
-  '𖹏' => '𖹯',
-  '𖹐' => '𖹰',
-  '𖹑' => '𖹱',
-  '𖹒' => '𖹲',
-  '𖹓' => '𖹳',
-  '𖹔' => '𖹴',
-  '𖹕' => '𖹵',
-  '𖹖' => '𖹶',
-  '𖹗' => '𖹷',
-  '𖹘' => '𖹸',
-  '𖹙' => '𖹹',
-  '𖹚' => '𖹺',
-  '𖹛' => '𖹻',
-  '𖹜' => '𖹼',
-  '𖹝' => '𖹽',
-  '𖹞' => '𖹾',
-  '𖹟' => '𖹿',
-  '𞤀' => '𞤢',
-  '𞤁' => '𞤣',
-  '𞤂' => '𞤤',
-  '𞤃' => '𞤥',
-  '𞤄' => '𞤦',
-  '𞤅' => '𞤧',
-  '𞤆' => '𞤨',
-  '𞤇' => '𞤩',
-  '𞤈' => '𞤪',
-  '𞤉' => '𞤫',
-  '𞤊' => '𞤬',
-  '𞤋' => '𞤭',
-  '𞤌' => '𞤮',
-  '𞤍' => '𞤯',
-  '𞤎' => '𞤰',
-  '𞤏' => '𞤱',
-  '𞤐' => '𞤲',
-  '𞤑' => '𞤳',
-  '𞤒' => '𞤴',
-  '𞤓' => '𞤵',
-  '𞤔' => '𞤶',
-  '𞤕' => '𞤷',
-  '𞤖' => '𞤸',
-  '𞤗' => '𞤹',
-  '𞤘' => '𞤺',
-  '𞤙' => '𞤻',
-  '𞤚' => '𞤼',
-  '𞤛' => '𞤽',
-  '𞤜' => '𞤾',
-  '𞤝' => '𞤿',
-  '𞤞' => '𞥀',
-  '𞤟' => '𞥁',
-  '𞤠' => '𞥂',
-  '𞤡' => '𞥃',
-);
diff --git a/vendor/symfony/polyfill-mbstring/Resources/unidata/titleCaseRegexp.php b/vendor/symfony/polyfill-mbstring/Resources/unidata/titleCaseRegexp.php
deleted file mode 100644
index 2a8f6e73b9..0000000000
--- a/vendor/symfony/polyfill-mbstring/Resources/unidata/titleCaseRegexp.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-// from Case_Ignorable in https://unicode.org/Public/UNIDATA/DerivedCoreProperties.txt
-
-return '/(?<![\x{0027}\x{002E}\x{003A}\x{005E}\x{0060}\x{00A8}\x{00AD}\x{00AF}\x{00B4}\x{00B7}\x{00B8}\x{02B0}-\x{02C1}\x{02C2}-\x{02C5}\x{02C6}-\x{02D1}\x{02D2}-\x{02DF}\x{02E0}-\x{02E4}\x{02E5}-\x{02EB}\x{02EC}\x{02ED}\x{02EE}\x{02EF}-\x{02FF}\x{0300}-\x{036F}\x{0374}\x{0375}\x{037A}\x{0384}-\x{0385}\x{0387}\x{0483}-\x{0487}\x{0488}-\x{0489}\x{0559}\x{0591}-\x{05BD}\x{05BF}\x{05C1}-\x{05C2}\x{05C4}-\x{05C5}\x{05C7}\x{05F4}\x{0600}-\x{0605}\x{0610}-\x{061A}\x{061C}\x{0640}\x{064B}-\x{065F}\x{0670}\x{06D6}-\x{06DC}\x{06DD}\x{06DF}-\x{06E4}\x{06E5}-\x{06E6}\x{06E7}-\x{06E8}\x{06EA}-\x{06ED}\x{070F}\x{0711}\x{0730}-\x{074A}\x{07A6}-\x{07B0}\x{07EB}-\x{07F3}\x{07F4}-\x{07F5}\x{07FA}\x{07FD}\x{0816}-\x{0819}\x{081A}\x{081B}-\x{0823}\x{0824}\x{0825}-\x{0827}\x{0828}\x{0829}-\x{082D}\x{0859}-\x{085B}\x{08D3}-\x{08E1}\x{08E2}\x{08E3}-\x{0902}\x{093A}\x{093C}\x{0941}-\x{0948}\x{094D}\x{0951}-\x{0957}\x{0962}-\x{0963}\x{0971}\x{0981}\x{09BC}\x{09C1}-\x{09C4}\x{09CD}\x{09E2}-\x{09E3}\x{09FE}\x{0A01}-\x{0A02}\x{0A3C}\x{0A41}-\x{0A42}\x{0A47}-\x{0A48}\x{0A4B}-\x{0A4D}\x{0A51}\x{0A70}-\x{0A71}\x{0A75}\x{0A81}-\x{0A82}\x{0ABC}\x{0AC1}-\x{0AC5}\x{0AC7}-\x{0AC8}\x{0ACD}\x{0AE2}-\x{0AE3}\x{0AFA}-\x{0AFF}\x{0B01}\x{0B3C}\x{0B3F}\x{0B41}-\x{0B44}\x{0B4D}\x{0B56}\x{0B62}-\x{0B63}\x{0B82}\x{0BC0}\x{0BCD}\x{0C00}\x{0C04}\x{0C3E}-\x{0C40}\x{0C46}-\x{0C48}\x{0C4A}-\x{0C4D}\x{0C55}-\x{0C56}\x{0C62}-\x{0C63}\x{0C81}\x{0CBC}\x{0CBF}\x{0CC6}\x{0CCC}-\x{0CCD}\x{0CE2}-\x{0CE3}\x{0D00}-\x{0D01}\x{0D3B}-\x{0D3C}\x{0D41}-\x{0D44}\x{0D4D}\x{0D62}-\x{0D63}\x{0DCA}\x{0DD2}-\x{0DD4}\x{0DD6}\x{0E31}\x{0E34}-\x{0E3A}\x{0E46}\x{0E47}-\x{0E4E}\x{0EB1}\x{0EB4}-\x{0EB9}\x{0EBB}-\x{0EBC}\x{0EC6}\x{0EC8}-\x{0ECD}\x{0F18}-\x{0F19}\x{0F35}\x{0F37}\x{0F39}\x{0F71}-\x{0F7E}\x{0F80}-\x{0F84}\x{0F86}-\x{0F87}\x{0F8D}-\x{0F97}\x{0F99}-\x{0FBC}\x{0FC6}\x{102D}-\x{1030}\x{1032}-\x{1037}\x{1039}-\x{103A}\x{103D}-\x{103E}\x{1058}-\x{1059}\x{105E}-\x{1060}\x{1071}-\x{1074}\x{1082}\x{1085}-\x{1086}\x{108D}\x{109D}\x{10FC}\x{135D}-\x{135F}\x{1712}-\x{1714}\x{1732}-\x{1734}\x{1752}-\x{1753}\x{1772}-\x{1773}\x{17B4}-\x{17B5}\x{17B7}-\x{17BD}\x{17C6}\x{17C9}-\x{17D3}\x{17D7}\x{17DD}\x{180B}-\x{180D}\x{180E}\x{1843}\x{1885}-\x{1886}\x{18A9}\x{1920}-\x{1922}\x{1927}-\x{1928}\x{1932}\x{1939}-\x{193B}\x{1A17}-\x{1A18}\x{1A1B}\x{1A56}\x{1A58}-\x{1A5E}\x{1A60}\x{1A62}\x{1A65}-\x{1A6C}\x{1A73}-\x{1A7C}\x{1A7F}\x{1AA7}\x{1AB0}-\x{1ABD}\x{1ABE}\x{1B00}-\x{1B03}\x{1B34}\x{1B36}-\x{1B3A}\x{1B3C}\x{1B42}\x{1B6B}-\x{1B73}\x{1B80}-\x{1B81}\x{1BA2}-\x{1BA5}\x{1BA8}-\x{1BA9}\x{1BAB}-\x{1BAD}\x{1BE6}\x{1BE8}-\x{1BE9}\x{1BED}\x{1BEF}-\x{1BF1}\x{1C2C}-\x{1C33}\x{1C36}-\x{1C37}\x{1C78}-\x{1C7D}\x{1CD0}-\x{1CD2}\x{1CD4}-\x{1CE0}\x{1CE2}-\x{1CE8}\x{1CED}\x{1CF4}\x{1CF8}-\x{1CF9}\x{1D2C}-\x{1D6A}\x{1D78}\x{1D9B}-\x{1DBF}\x{1DC0}-\x{1DF9}\x{1DFB}-\x{1DFF}\x{1FBD}\x{1FBF}-\x{1FC1}\x{1FCD}-\x{1FCF}\x{1FDD}-\x{1FDF}\x{1FED}-\x{1FEF}\x{1FFD}-\x{1FFE}\x{200B}-\x{200F}\x{2018}\x{2019}\x{2024}\x{2027}\x{202A}-\x{202E}\x{2060}-\x{2064}\x{2066}-\x{206F}\x{2071}\x{207F}\x{2090}-\x{209C}\x{20D0}-\x{20DC}\x{20DD}-\x{20E0}\x{20E1}\x{20E2}-\x{20E4}\x{20E5}-\x{20F0}\x{2C7C}-\x{2C7D}\x{2CEF}-\x{2CF1}\x{2D6F}\x{2D7F}\x{2DE0}-\x{2DFF}\x{2E2F}\x{3005}\x{302A}-\x{302D}\x{3031}-\x{3035}\x{303B}\x{3099}-\x{309A}\x{309B}-\x{309C}\x{309D}-\x{309E}\x{30FC}-\x{30FE}\x{A015}\x{A4F8}-\x{A4FD}\x{A60C}\x{A66F}\x{A670}-\x{A672}\x{A674}-\x{A67D}\x{A67F}\x{A69C}-\x{A69D}\x{A69E}-\x{A69F}\x{A6F0}-\x{A6F1}\x{A700}-\x{A716}\x{A717}-\x{A71F}\x{A720}-\x{A721}\x{A770}\x{A788}\x{A789}-\x{A78A}\x{A7F8}-\x{A7F9}\x{A802}\x{A806}\x{A80B}\x{A825}-\x{A826}\x{A8C4}-\x{A8C5}\x{A8E0}-\x{A8F1}\x{A8FF}\x{A926}-\x{A92D}\x{A947}-\x{A951}\x{A980}-\x{A982}\x{A9B3}\x{A9B6}-\x{A9B9}\x{A9BC}\x{A9CF}\x{A9E5}\x{A9E6}\x{AA29}-\x{AA2E}\x{AA31}-\x{AA32}\x{AA35}-\x{AA36}\x{AA43}\x{AA4C}\x{AA70}\x{AA7C}\x{AAB0}\x{AAB2}-\x{AAB4}\x{AAB7}-\x{AAB8}\x{AABE}-\x{AABF}\x{AAC1}\x{AADD}\x{AAEC}-\x{AAED}\x{AAF3}-\x{AAF4}\x{AAF6}\x{AB5B}\x{AB5C}-\x{AB5F}\x{ABE5}\x{ABE8}\x{ABED}\x{FB1E}\x{FBB2}-\x{FBC1}\x{FE00}-\x{FE0F}\x{FE13}\x{FE20}-\x{FE2F}\x{FE52}\x{FE55}\x{FEFF}\x{FF07}\x{FF0E}\x{FF1A}\x{FF3E}\x{FF40}\x{FF70}\x{FF9E}-\x{FF9F}\x{FFE3}\x{FFF9}-\x{FFFB}\x{101FD}\x{102E0}\x{10376}-\x{1037A}\x{10A01}-\x{10A03}\x{10A05}-\x{10A06}\x{10A0C}-\x{10A0F}\x{10A38}-\x{10A3A}\x{10A3F}\x{10AE5}-\x{10AE6}\x{10D24}-\x{10D27}\x{10F46}-\x{10F50}\x{11001}\x{11038}-\x{11046}\x{1107F}-\x{11081}\x{110B3}-\x{110B6}\x{110B9}-\x{110BA}\x{110BD}\x{110CD}\x{11100}-\x{11102}\x{11127}-\x{1112B}\x{1112D}-\x{11134}\x{11173}\x{11180}-\x{11181}\x{111B6}-\x{111BE}\x{111C9}-\x{111CC}\x{1122F}-\x{11231}\x{11234}\x{11236}-\x{11237}\x{1123E}\x{112DF}\x{112E3}-\x{112EA}\x{11300}-\x{11301}\x{1133B}-\x{1133C}\x{11340}\x{11366}-\x{1136C}\x{11370}-\x{11374}\x{11438}-\x{1143F}\x{11442}-\x{11444}\x{11446}\x{1145E}\x{114B3}-\x{114B8}\x{114BA}\x{114BF}-\x{114C0}\x{114C2}-\x{114C3}\x{115B2}-\x{115B5}\x{115BC}-\x{115BD}\x{115BF}-\x{115C0}\x{115DC}-\x{115DD}\x{11633}-\x{1163A}\x{1163D}\x{1163F}-\x{11640}\x{116AB}\x{116AD}\x{116B0}-\x{116B5}\x{116B7}\x{1171D}-\x{1171F}\x{11722}-\x{11725}\x{11727}-\x{1172B}\x{1182F}-\x{11837}\x{11839}-\x{1183A}\x{11A01}-\x{11A0A}\x{11A33}-\x{11A38}\x{11A3B}-\x{11A3E}\x{11A47}\x{11A51}-\x{11A56}\x{11A59}-\x{11A5B}\x{11A8A}-\x{11A96}\x{11A98}-\x{11A99}\x{11C30}-\x{11C36}\x{11C38}-\x{11C3D}\x{11C3F}\x{11C92}-\x{11CA7}\x{11CAA}-\x{11CB0}\x{11CB2}-\x{11CB3}\x{11CB5}-\x{11CB6}\x{11D31}-\x{11D36}\x{11D3A}\x{11D3C}-\x{11D3D}\x{11D3F}-\x{11D45}\x{11D47}\x{11D90}-\x{11D91}\x{11D95}\x{11D97}\x{11EF3}-\x{11EF4}\x{16AF0}-\x{16AF4}\x{16B30}-\x{16B36}\x{16B40}-\x{16B43}\x{16F8F}-\x{16F92}\x{16F93}-\x{16F9F}\x{16FE0}-\x{16FE1}\x{1BC9D}-\x{1BC9E}\x{1BCA0}-\x{1BCA3}\x{1D167}-\x{1D169}\x{1D173}-\x{1D17A}\x{1D17B}-\x{1D182}\x{1D185}-\x{1D18B}\x{1D1AA}-\x{1D1AD}\x{1D242}-\x{1D244}\x{1DA00}-\x{1DA36}\x{1DA3B}-\x{1DA6C}\x{1DA75}\x{1DA84}\x{1DA9B}-\x{1DA9F}\x{1DAA1}-\x{1DAAF}\x{1E000}-\x{1E006}\x{1E008}-\x{1E018}\x{1E01B}-\x{1E021}\x{1E023}-\x{1E024}\x{1E026}-\x{1E02A}\x{1E8D0}-\x{1E8D6}\x{1E944}-\x{1E94A}\x{1F3FB}-\x{1F3FF}\x{E0001}\x{E0020}-\x{E007F}\x{E0100}-\x{E01EF}])(\pL)(\pL*+)/u';
diff --git a/vendor/symfony/polyfill-mbstring/Resources/unidata/upperCase.php b/vendor/symfony/polyfill-mbstring/Resources/unidata/upperCase.php
deleted file mode 100644
index 56b9cb8520..0000000000
--- a/vendor/symfony/polyfill-mbstring/Resources/unidata/upperCase.php
+++ /dev/null
@@ -1,1489 +0,0 @@
-<?php
-
-return array (
-  'a' => 'A',
-  'b' => 'B',
-  'c' => 'C',
-  'd' => 'D',
-  'e' => 'E',
-  'f' => 'F',
-  'g' => 'G',
-  'h' => 'H',
-  'i' => 'I',
-  'j' => 'J',
-  'k' => 'K',
-  'l' => 'L',
-  'm' => 'M',
-  'n' => 'N',
-  'o' => 'O',
-  'p' => 'P',
-  'q' => 'Q',
-  'r' => 'R',
-  's' => 'S',
-  't' => 'T',
-  'u' => 'U',
-  'v' => 'V',
-  'w' => 'W',
-  'x' => 'X',
-  'y' => 'Y',
-  'z' => 'Z',
-  'µ' => 'Μ',
-  'à' => 'À',
-  'á' => 'Á',
-  'â' => 'Â',
-  'ã' => 'Ã',
-  'ä' => 'Ä',
-  'å' => 'Å',
-  'æ' => 'Æ',
-  'ç' => 'Ç',
-  'è' => 'È',
-  'é' => 'É',
-  'ê' => 'Ê',
-  'ë' => 'Ë',
-  'ì' => 'Ì',
-  'í' => 'Í',
-  'î' => 'Î',
-  'ï' => 'Ï',
-  'ð' => 'Ð',
-  'ñ' => 'Ñ',
-  'ò' => 'Ò',
-  'ó' => 'Ó',
-  'ô' => 'Ô',
-  'õ' => 'Õ',
-  'ö' => 'Ö',
-  'ø' => 'Ø',
-  'ù' => 'Ù',
-  'ú' => 'Ú',
-  'û' => 'Û',
-  'ü' => 'Ü',
-  'ý' => 'Ý',
-  'þ' => 'Þ',
-  'ÿ' => 'Ÿ',
-  'ā' => 'Ā',
-  'ă' => 'Ă',
-  'ą' => 'Ą',
-  'ć' => 'Ć',
-  'ĉ' => 'Ĉ',
-  'ċ' => 'Ċ',
-  'č' => 'Č',
-  'ď' => 'Ď',
-  'đ' => 'Đ',
-  'ē' => 'Ē',
-  'ĕ' => 'Ĕ',
-  'ė' => 'Ė',
-  'ę' => 'Ę',
-  'ě' => 'Ě',
-  'ĝ' => 'Ĝ',
-  'ğ' => 'Ğ',
-  'ġ' => 'Ġ',
-  'ģ' => 'Ģ',
-  'ĥ' => 'Ĥ',
-  'ħ' => 'Ħ',
-  'ĩ' => 'Ĩ',
-  'ī' => 'Ī',
-  'ĭ' => 'Ĭ',
-  'į' => 'Į',
-  'ı' => 'I',
-  'ij' => 'IJ',
-  'ĵ' => 'Ĵ',
-  'ķ' => 'Ķ',
-  'ĺ' => 'Ĺ',
-  'ļ' => 'Ļ',
-  'ľ' => 'Ľ',
-  'ŀ' => 'Ŀ',
-  'ł' => 'Ł',
-  'ń' => 'Ń',
-  'ņ' => 'Ņ',
-  'ň' => 'Ň',
-  'ŋ' => 'Ŋ',
-  'ō' => 'Ō',
-  'ŏ' => 'Ŏ',
-  'ő' => 'Ő',
-  'œ' => 'Œ',
-  'ŕ' => 'Ŕ',
-  'ŗ' => 'Ŗ',
-  'ř' => 'Ř',
-  'ś' => 'Ś',
-  'ŝ' => 'Ŝ',
-  'ş' => 'Ş',
-  'š' => 'Š',
-  'ţ' => 'Ţ',
-  'ť' => 'Ť',
-  'ŧ' => 'Ŧ',
-  'ũ' => 'Ũ',
-  'ū' => 'Ū',
-  'ŭ' => 'Ŭ',
-  'ů' => 'Ů',
-  'ű' => 'Ű',
-  'ų' => 'Ų',
-  'ŵ' => 'Ŵ',
-  'ŷ' => 'Ŷ',
-  'ź' => 'Ź',
-  'ż' => 'Ż',
-  'ž' => 'Ž',
-  'ſ' => 'S',
-  'ƀ' => 'Ƀ',
-  'ƃ' => 'Ƃ',
-  'ƅ' => 'Ƅ',
-  'ƈ' => 'Ƈ',
-  'ƌ' => 'Ƌ',
-  'ƒ' => 'Ƒ',
-  'ƕ' => 'Ƕ',
-  'ƙ' => 'Ƙ',
-  'ƚ' => 'Ƚ',
-  'ƞ' => 'Ƞ',
-  'ơ' => 'Ơ',
-  'ƣ' => 'Ƣ',
-  'ƥ' => 'Ƥ',
-  'ƨ' => 'Ƨ',
-  'ƭ' => 'Ƭ',
-  'ư' => 'Ư',
-  'ƴ' => 'Ƴ',
-  'ƶ' => 'Ƶ',
-  'ƹ' => 'Ƹ',
-  'ƽ' => 'Ƽ',
-  'ƿ' => 'Ƿ',
-  'Dž' => 'DŽ',
-  'dž' => 'DŽ',
-  'Lj' => 'LJ',
-  'lj' => 'LJ',
-  'Nj' => 'NJ',
-  'nj' => 'NJ',
-  'ǎ' => 'Ǎ',
-  'ǐ' => 'Ǐ',
-  'ǒ' => 'Ǒ',
-  'ǔ' => 'Ǔ',
-  'ǖ' => 'Ǖ',
-  'ǘ' => 'Ǘ',
-  'ǚ' => 'Ǚ',
-  'ǜ' => 'Ǜ',
-  'ǝ' => 'Ǝ',
-  'ǟ' => 'Ǟ',
-  'ǡ' => 'Ǡ',
-  'ǣ' => 'Ǣ',
-  'ǥ' => 'Ǥ',
-  'ǧ' => 'Ǧ',
-  'ǩ' => 'Ǩ',
-  'ǫ' => 'Ǫ',
-  'ǭ' => 'Ǭ',
-  'ǯ' => 'Ǯ',
-  'Dz' => 'DZ',
-  'dz' => 'DZ',
-  'ǵ' => 'Ǵ',
-  'ǹ' => 'Ǹ',
-  'ǻ' => 'Ǻ',
-  'ǽ' => 'Ǽ',
-  'ǿ' => 'Ǿ',
-  'ȁ' => 'Ȁ',
-  'ȃ' => 'Ȃ',
-  'ȅ' => 'Ȅ',
-  'ȇ' => 'Ȇ',
-  'ȉ' => 'Ȉ',
-  'ȋ' => 'Ȋ',
-  'ȍ' => 'Ȍ',
-  'ȏ' => 'Ȏ',
-  'ȑ' => 'Ȑ',
-  'ȓ' => 'Ȓ',
-  'ȕ' => 'Ȕ',
-  'ȗ' => 'Ȗ',
-  'ș' => 'Ș',
-  'ț' => 'Ț',
-  'ȝ' => 'Ȝ',
-  'ȟ' => 'Ȟ',
-  'ȣ' => 'Ȣ',
-  'ȥ' => 'Ȥ',
-  'ȧ' => 'Ȧ',
-  'ȩ' => 'Ȩ',
-  'ȫ' => 'Ȫ',
-  'ȭ' => 'Ȭ',
-  'ȯ' => 'Ȯ',
-  'ȱ' => 'Ȱ',
-  'ȳ' => 'Ȳ',
-  'ȼ' => 'Ȼ',
-  'ȿ' => 'Ȿ',
-  'ɀ' => 'Ɀ',
-  'ɂ' => 'Ɂ',
-  'ɇ' => 'Ɇ',
-  'ɉ' => 'Ɉ',
-  'ɋ' => 'Ɋ',
-  'ɍ' => 'Ɍ',
-  'ɏ' => 'Ɏ',
-  'ɐ' => 'Ɐ',
-  'ɑ' => 'Ɑ',
-  'ɒ' => 'Ɒ',
-  'ɓ' => 'Ɓ',
-  'ɔ' => 'Ɔ',
-  'ɖ' => 'Ɖ',
-  'ɗ' => 'Ɗ',
-  'ə' => 'Ə',
-  'ɛ' => 'Ɛ',
-  'ɜ' => 'Ɜ',
-  'ɠ' => 'Ɠ',
-  'ɡ' => 'Ɡ',
-  'ɣ' => 'Ɣ',
-  'ɥ' => 'Ɥ',
-  'ɦ' => 'Ɦ',
-  'ɨ' => 'Ɨ',
-  'ɩ' => 'Ɩ',
-  'ɪ' => 'Ɪ',
-  'ɫ' => 'Ɫ',
-  'ɬ' => 'Ɬ',
-  'ɯ' => 'Ɯ',
-  'ɱ' => 'Ɱ',
-  'ɲ' => 'Ɲ',
-  'ɵ' => 'Ɵ',
-  'ɽ' => 'Ɽ',
-  'ʀ' => 'Ʀ',
-  'ʂ' => 'Ʂ',
-  'ʃ' => 'Ʃ',
-  'ʇ' => 'Ʇ',
-  'ʈ' => 'Ʈ',
-  'ʉ' => 'Ʉ',
-  'ʊ' => 'Ʊ',
-  'ʋ' => 'Ʋ',
-  'ʌ' => 'Ʌ',
-  'ʒ' => 'Ʒ',
-  'ʝ' => 'Ʝ',
-  'ʞ' => 'Ʞ',
-  'ͅ' => 'Ι',
-  'ͱ' => 'Ͱ',
-  'ͳ' => 'Ͳ',
-  'ͷ' => 'Ͷ',
-  'ͻ' => 'Ͻ',
-  'ͼ' => 'Ͼ',
-  'ͽ' => 'Ͽ',
-  'ά' => 'Ά',
-  'έ' => 'Έ',
-  'ή' => 'Ή',
-  'ί' => 'Ί',
-  'α' => 'Α',
-  'β' => 'Β',
-  'γ' => 'Γ',
-  'δ' => 'Δ',
-  'ε' => 'Ε',
-  'ζ' => 'Ζ',
-  'η' => 'Η',
-  'θ' => 'Θ',
-  'ι' => 'Ι',
-  'κ' => 'Κ',
-  'λ' => 'Λ',
-  'μ' => 'Μ',
-  'ν' => 'Ν',
-  'ξ' => 'Ξ',
-  'ο' => 'Ο',
-  'π' => 'Π',
-  'ρ' => 'Ρ',
-  'ς' => 'Σ',
-  'σ' => 'Σ',
-  'τ' => 'Τ',
-  'υ' => 'Υ',
-  'φ' => 'Φ',
-  'χ' => 'Χ',
-  'ψ' => 'Ψ',
-  'ω' => 'Ω',
-  'ϊ' => 'Ϊ',
-  'ϋ' => 'Ϋ',
-  'ό' => 'Ό',
-  'ύ' => 'Ύ',
-  'ώ' => 'Ώ',
-  'ϐ' => 'Β',
-  'ϑ' => 'Θ',
-  'ϕ' => 'Φ',
-  'ϖ' => 'Π',
-  'ϗ' => 'Ϗ',
-  'ϙ' => 'Ϙ',
-  'ϛ' => 'Ϛ',
-  'ϝ' => 'Ϝ',
-  'ϟ' => 'Ϟ',
-  'ϡ' => 'Ϡ',
-  'ϣ' => 'Ϣ',
-  'ϥ' => 'Ϥ',
-  'ϧ' => 'Ϧ',
-  'ϩ' => 'Ϩ',
-  'ϫ' => 'Ϫ',
-  'ϭ' => 'Ϭ',
-  'ϯ' => 'Ϯ',
-  'ϰ' => 'Κ',
-  'ϱ' => 'Ρ',
-  'ϲ' => 'Ϲ',
-  'ϳ' => 'Ϳ',
-  'ϵ' => 'Ε',
-  'ϸ' => 'Ϸ',
-  'ϻ' => 'Ϻ',
-  'а' => 'А',
-  'б' => 'Б',
-  'в' => 'В',
-  'г' => 'Г',
-  'д' => 'Д',
-  'е' => 'Е',
-  'ж' => 'Ж',
-  'з' => 'З',
-  'и' => 'И',
-  'й' => 'Й',
-  'к' => 'К',
-  'л' => 'Л',
-  'м' => 'М',
-  'н' => 'Н',
-  'о' => 'О',
-  'п' => 'П',
-  'р' => 'Р',
-  'с' => 'С',
-  'т' => 'Т',
-  'у' => 'У',
-  'ф' => 'Ф',
-  'х' => 'Х',
-  'ц' => 'Ц',
-  'ч' => 'Ч',
-  'ш' => 'Ш',
-  'щ' => 'Щ',
-  'ъ' => 'Ъ',
-  'ы' => 'Ы',
-  'ь' => 'Ь',
-  'э' => 'Э',
-  'ю' => 'Ю',
-  'я' => 'Я',
-  'ѐ' => 'Ѐ',
-  'ё' => 'Ё',
-  'ђ' => 'Ђ',
-  'ѓ' => 'Ѓ',
-  'є' => 'Є',
-  'ѕ' => 'Ѕ',
-  'і' => 'І',
-  'ї' => 'Ї',
-  'ј' => 'Ј',
-  'љ' => 'Љ',
-  'њ' => 'Њ',
-  'ћ' => 'Ћ',
-  'ќ' => 'Ќ',
-  'ѝ' => 'Ѝ',
-  'ў' => 'Ў',
-  'џ' => 'Џ',
-  'ѡ' => 'Ѡ',
-  'ѣ' => 'Ѣ',
-  'ѥ' => 'Ѥ',
-  'ѧ' => 'Ѧ',
-  'ѩ' => 'Ѩ',
-  'ѫ' => 'Ѫ',
-  'ѭ' => 'Ѭ',
-  'ѯ' => 'Ѯ',
-  'ѱ' => 'Ѱ',
-  'ѳ' => 'Ѳ',
-  'ѵ' => 'Ѵ',
-  'ѷ' => 'Ѷ',
-  'ѹ' => 'Ѹ',
-  'ѻ' => 'Ѻ',
-  'ѽ' => 'Ѽ',
-  'ѿ' => 'Ѿ',
-  'ҁ' => 'Ҁ',
-  'ҋ' => 'Ҋ',
-  'ҍ' => 'Ҍ',
-  'ҏ' => 'Ҏ',
-  'ґ' => 'Ґ',
-  'ғ' => 'Ғ',
-  'ҕ' => 'Ҕ',
-  'җ' => 'Җ',
-  'ҙ' => 'Ҙ',
-  'қ' => 'Қ',
-  'ҝ' => 'Ҝ',
-  'ҟ' => 'Ҟ',
-  'ҡ' => 'Ҡ',
-  'ң' => 'Ң',
-  'ҥ' => 'Ҥ',
-  'ҧ' => 'Ҧ',
-  'ҩ' => 'Ҩ',
-  'ҫ' => 'Ҫ',
-  'ҭ' => 'Ҭ',
-  'ү' => 'Ү',
-  'ұ' => 'Ұ',
-  'ҳ' => 'Ҳ',
-  'ҵ' => 'Ҵ',
-  'ҷ' => 'Ҷ',
-  'ҹ' => 'Ҹ',
-  'һ' => 'Һ',
-  'ҽ' => 'Ҽ',
-  'ҿ' => 'Ҿ',
-  'ӂ' => 'Ӂ',
-  'ӄ' => 'Ӄ',
-  'ӆ' => 'Ӆ',
-  'ӈ' => 'Ӈ',
-  'ӊ' => 'Ӊ',
-  'ӌ' => 'Ӌ',
-  'ӎ' => 'Ӎ',
-  'ӏ' => 'Ӏ',
-  'ӑ' => 'Ӑ',
-  'ӓ' => 'Ӓ',
-  'ӕ' => 'Ӕ',
-  'ӗ' => 'Ӗ',
-  'ә' => 'Ә',
-  'ӛ' => 'Ӛ',
-  'ӝ' => 'Ӝ',
-  'ӟ' => 'Ӟ',
-  'ӡ' => 'Ӡ',
-  'ӣ' => 'Ӣ',
-  'ӥ' => 'Ӥ',
-  'ӧ' => 'Ӧ',
-  'ө' => 'Ө',
-  'ӫ' => 'Ӫ',
-  'ӭ' => 'Ӭ',
-  'ӯ' => 'Ӯ',
-  'ӱ' => 'Ӱ',
-  'ӳ' => 'Ӳ',
-  'ӵ' => 'Ӵ',
-  'ӷ' => 'Ӷ',
-  'ӹ' => 'Ӹ',
-  'ӻ' => 'Ӻ',
-  'ӽ' => 'Ӽ',
-  'ӿ' => 'Ӿ',
-  'ԁ' => 'Ԁ',
-  'ԃ' => 'Ԃ',
-  'ԅ' => 'Ԅ',
-  'ԇ' => 'Ԇ',
-  'ԉ' => 'Ԉ',
-  'ԋ' => 'Ԋ',
-  'ԍ' => 'Ԍ',
-  'ԏ' => 'Ԏ',
-  'ԑ' => 'Ԑ',
-  'ԓ' => 'Ԓ',
-  'ԕ' => 'Ԕ',
-  'ԗ' => 'Ԗ',
-  'ԙ' => 'Ԙ',
-  'ԛ' => 'Ԛ',
-  'ԝ' => 'Ԝ',
-  'ԟ' => 'Ԟ',
-  'ԡ' => 'Ԡ',
-  'ԣ' => 'Ԣ',
-  'ԥ' => 'Ԥ',
-  'ԧ' => 'Ԧ',
-  'ԩ' => 'Ԩ',
-  'ԫ' => 'Ԫ',
-  'ԭ' => 'Ԭ',
-  'ԯ' => 'Ԯ',
-  'ա' => 'Ա',
-  'բ' => 'Բ',
-  'գ' => 'Գ',
-  'դ' => 'Դ',
-  'ե' => 'Ե',
-  'զ' => 'Զ',
-  'է' => 'Է',
-  'ը' => 'Ը',
-  'թ' => 'Թ',
-  'ժ' => 'Ժ',
-  'ի' => 'Ի',
-  'լ' => 'Լ',
-  'խ' => 'Խ',
-  'ծ' => 'Ծ',
-  'կ' => 'Կ',
-  'հ' => 'Հ',
-  'ձ' => 'Ձ',
-  'ղ' => 'Ղ',
-  'ճ' => 'Ճ',
-  'մ' => 'Մ',
-  'յ' => 'Յ',
-  'ն' => 'Ն',
-  'շ' => 'Շ',
-  'ո' => 'Ո',
-  'չ' => 'Չ',
-  'պ' => 'Պ',
-  'ջ' => 'Ջ',
-  'ռ' => 'Ռ',
-  'ս' => 'Ս',
-  'վ' => 'Վ',
-  'տ' => 'Տ',
-  'ր' => 'Ր',
-  'ց' => 'Ց',
-  'ւ' => 'Ւ',
-  'փ' => 'Փ',
-  'ք' => 'Ք',
-  'օ' => 'Օ',
-  'ֆ' => 'Ֆ',
-  'ა' => 'Ა',
-  'ბ' => 'Ბ',
-  'გ' => 'Გ',
-  'დ' => 'Დ',
-  'ე' => 'Ე',
-  'ვ' => 'Ვ',
-  'ზ' => 'Ზ',
-  'თ' => 'Თ',
-  'ი' => 'Ი',
-  'კ' => 'Კ',
-  'ლ' => 'Ლ',
-  'მ' => 'Მ',
-  'ნ' => 'Ნ',
-  'ო' => 'Ო',
-  'პ' => 'Პ',
-  'ჟ' => 'Ჟ',
-  'რ' => 'Რ',
-  'ს' => 'Ს',
-  'ტ' => 'Ტ',
-  'უ' => 'Უ',
-  'ფ' => 'Ფ',
-  'ქ' => 'Ქ',
-  'ღ' => 'Ღ',
-  'ყ' => 'Ყ',
-  'შ' => 'Შ',
-  'ჩ' => 'Ჩ',
-  'ც' => 'Ც',
-  'ძ' => 'Ძ',
-  'წ' => 'Წ',
-  'ჭ' => 'Ჭ',
-  'ხ' => 'Ხ',
-  'ჯ' => 'Ჯ',
-  'ჰ' => 'Ჰ',
-  'ჱ' => 'Ჱ',
-  'ჲ' => 'Ჲ',
-  'ჳ' => 'Ჳ',
-  'ჴ' => 'Ჴ',
-  'ჵ' => 'Ჵ',
-  'ჶ' => 'Ჶ',
-  'ჷ' => 'Ჷ',
-  'ჸ' => 'Ჸ',
-  'ჹ' => 'Ჹ',
-  'ჺ' => 'Ჺ',
-  'ჽ' => 'Ჽ',
-  'ჾ' => 'Ჾ',
-  'ჿ' => 'Ჿ',
-  'ᏸ' => 'Ᏸ',
-  'ᏹ' => 'Ᏹ',
-  'ᏺ' => 'Ᏺ',
-  'ᏻ' => 'Ᏻ',
-  'ᏼ' => 'Ᏼ',
-  'ᏽ' => 'Ᏽ',
-  'ᲀ' => 'В',
-  'ᲁ' => 'Д',
-  'ᲂ' => 'О',
-  'ᲃ' => 'С',
-  'ᲄ' => 'Т',
-  'ᲅ' => 'Т',
-  'ᲆ' => 'Ъ',
-  'ᲇ' => 'Ѣ',
-  'ᲈ' => 'Ꙋ',
-  'ᵹ' => 'Ᵹ',
-  'ᵽ' => 'Ᵽ',
-  'ᶎ' => 'Ᶎ',
-  'ḁ' => 'Ḁ',
-  'ḃ' => 'Ḃ',
-  'ḅ' => 'Ḅ',
-  'ḇ' => 'Ḇ',
-  'ḉ' => 'Ḉ',
-  'ḋ' => 'Ḋ',
-  'ḍ' => 'Ḍ',
-  'ḏ' => 'Ḏ',
-  'ḑ' => 'Ḑ',
-  'ḓ' => 'Ḓ',
-  'ḕ' => 'Ḕ',
-  'ḗ' => 'Ḗ',
-  'ḙ' => 'Ḙ',
-  'ḛ' => 'Ḛ',
-  'ḝ' => 'Ḝ',
-  'ḟ' => 'Ḟ',
-  'ḡ' => 'Ḡ',
-  'ḣ' => 'Ḣ',
-  'ḥ' => 'Ḥ',
-  'ḧ' => 'Ḧ',
-  'ḩ' => 'Ḩ',
-  'ḫ' => 'Ḫ',
-  'ḭ' => 'Ḭ',
-  'ḯ' => 'Ḯ',
-  'ḱ' => 'Ḱ',
-  'ḳ' => 'Ḳ',
-  'ḵ' => 'Ḵ',
-  'ḷ' => 'Ḷ',
-  'ḹ' => 'Ḹ',
-  'ḻ' => 'Ḻ',
-  'ḽ' => 'Ḽ',
-  'ḿ' => 'Ḿ',
-  'ṁ' => 'Ṁ',
-  'ṃ' => 'Ṃ',
-  'ṅ' => 'Ṅ',
-  'ṇ' => 'Ṇ',
-  'ṉ' => 'Ṉ',
-  'ṋ' => 'Ṋ',
-  'ṍ' => 'Ṍ',
-  'ṏ' => 'Ṏ',
-  'ṑ' => 'Ṑ',
-  'ṓ' => 'Ṓ',
-  'ṕ' => 'Ṕ',
-  'ṗ' => 'Ṗ',
-  'ṙ' => 'Ṙ',
-  'ṛ' => 'Ṛ',
-  'ṝ' => 'Ṝ',
-  'ṟ' => 'Ṟ',
-  'ṡ' => 'Ṡ',
-  'ṣ' => 'Ṣ',
-  'ṥ' => 'Ṥ',
-  'ṧ' => 'Ṧ',
-  'ṩ' => 'Ṩ',
-  'ṫ' => 'Ṫ',
-  'ṭ' => 'Ṭ',
-  'ṯ' => 'Ṯ',
-  'ṱ' => 'Ṱ',
-  'ṳ' => 'Ṳ',
-  'ṵ' => 'Ṵ',
-  'ṷ' => 'Ṷ',
-  'ṹ' => 'Ṹ',
-  'ṻ' => 'Ṻ',
-  'ṽ' => 'Ṽ',
-  'ṿ' => 'Ṿ',
-  'ẁ' => 'Ẁ',
-  'ẃ' => 'Ẃ',
-  'ẅ' => 'Ẅ',
-  'ẇ' => 'Ẇ',
-  'ẉ' => 'Ẉ',
-  'ẋ' => 'Ẋ',
-  'ẍ' => 'Ẍ',
-  'ẏ' => 'Ẏ',
-  'ẑ' => 'Ẑ',
-  'ẓ' => 'Ẓ',
-  'ẕ' => 'Ẕ',
-  'ẛ' => 'Ṡ',
-  'ạ' => 'Ạ',
-  'ả' => 'Ả',
-  'ấ' => 'Ấ',
-  'ầ' => 'Ầ',
-  'ẩ' => 'Ẩ',
-  'ẫ' => 'Ẫ',
-  'ậ' => 'Ậ',
-  'ắ' => 'Ắ',
-  'ằ' => 'Ằ',
-  'ẳ' => 'Ẳ',
-  'ẵ' => 'Ẵ',
-  'ặ' => 'Ặ',
-  'ẹ' => 'Ẹ',
-  'ẻ' => 'Ẻ',
-  'ẽ' => 'Ẽ',
-  'ế' => 'Ế',
-  'ề' => 'Ề',
-  'ể' => 'Ể',
-  'ễ' => 'Ễ',
-  'ệ' => 'Ệ',
-  'ỉ' => 'Ỉ',
-  'ị' => 'Ị',
-  'ọ' => 'Ọ',
-  'ỏ' => 'Ỏ',
-  'ố' => 'Ố',
-  'ồ' => 'Ồ',
-  'ổ' => 'Ổ',
-  'ỗ' => 'Ỗ',
-  'ộ' => 'Ộ',
-  'ớ' => 'Ớ',
-  'ờ' => 'Ờ',
-  'ở' => 'Ở',
-  'ỡ' => 'Ỡ',
-  'ợ' => 'Ợ',
-  'ụ' => 'Ụ',
-  'ủ' => 'Ủ',
-  'ứ' => 'Ứ',
-  'ừ' => 'Ừ',
-  'ử' => 'Ử',
-  'ữ' => 'Ữ',
-  'ự' => 'Ự',
-  'ỳ' => 'Ỳ',
-  'ỵ' => 'Ỵ',
-  'ỷ' => 'Ỷ',
-  'ỹ' => 'Ỹ',
-  'ỻ' => 'Ỻ',
-  'ỽ' => 'Ỽ',
-  'ỿ' => 'Ỿ',
-  'ἀ' => 'Ἀ',
-  'ἁ' => 'Ἁ',
-  'ἂ' => 'Ἂ',
-  'ἃ' => 'Ἃ',
-  'ἄ' => 'Ἄ',
-  'ἅ' => 'Ἅ',
-  'ἆ' => 'Ἆ',
-  'ἇ' => 'Ἇ',
-  'ἐ' => 'Ἐ',
-  'ἑ' => 'Ἑ',
-  'ἒ' => 'Ἒ',
-  'ἓ' => 'Ἓ',
-  'ἔ' => 'Ἔ',
-  'ἕ' => 'Ἕ',
-  'ἠ' => 'Ἠ',
-  'ἡ' => 'Ἡ',
-  'ἢ' => 'Ἢ',
-  'ἣ' => 'Ἣ',
-  'ἤ' => 'Ἤ',
-  'ἥ' => 'Ἥ',
-  'ἦ' => 'Ἦ',
-  'ἧ' => 'Ἧ',
-  'ἰ' => 'Ἰ',
-  'ἱ' => 'Ἱ',
-  'ἲ' => 'Ἲ',
-  'ἳ' => 'Ἳ',
-  'ἴ' => 'Ἴ',
-  'ἵ' => 'Ἵ',
-  'ἶ' => 'Ἶ',
-  'ἷ' => 'Ἷ',
-  'ὀ' => 'Ὀ',
-  'ὁ' => 'Ὁ',
-  'ὂ' => 'Ὂ',
-  'ὃ' => 'Ὃ',
-  'ὄ' => 'Ὄ',
-  'ὅ' => 'Ὅ',
-  'ὑ' => 'Ὑ',
-  'ὓ' => 'Ὓ',
-  'ὕ' => 'Ὕ',
-  'ὗ' => 'Ὗ',
-  'ὠ' => 'Ὠ',
-  'ὡ' => 'Ὡ',
-  'ὢ' => 'Ὢ',
-  'ὣ' => 'Ὣ',
-  'ὤ' => 'Ὤ',
-  'ὥ' => 'Ὥ',
-  'ὦ' => 'Ὦ',
-  'ὧ' => 'Ὧ',
-  'ὰ' => 'Ὰ',
-  'ά' => 'Ά',
-  'ὲ' => 'Ὲ',
-  'έ' => 'Έ',
-  'ὴ' => 'Ὴ',
-  'ή' => 'Ή',
-  'ὶ' => 'Ὶ',
-  'ί' => 'Ί',
-  'ὸ' => 'Ὸ',
-  'ό' => 'Ό',
-  'ὺ' => 'Ὺ',
-  'ύ' => 'Ύ',
-  'ὼ' => 'Ὼ',
-  'ώ' => 'Ώ',
-  'ᾀ' => 'ἈΙ',
-  'ᾁ' => 'ἉΙ',
-  'ᾂ' => 'ἊΙ',
-  'ᾃ' => 'ἋΙ',
-  'ᾄ' => 'ἌΙ',
-  'ᾅ' => 'ἍΙ',
-  'ᾆ' => 'ἎΙ',
-  'ᾇ' => 'ἏΙ',
-  'ᾐ' => 'ἨΙ',
-  'ᾑ' => 'ἩΙ',
-  'ᾒ' => 'ἪΙ',
-  'ᾓ' => 'ἫΙ',
-  'ᾔ' => 'ἬΙ',
-  'ᾕ' => 'ἭΙ',
-  'ᾖ' => 'ἮΙ',
-  'ᾗ' => 'ἯΙ',
-  'ᾠ' => 'ὨΙ',
-  'ᾡ' => 'ὩΙ',
-  'ᾢ' => 'ὪΙ',
-  'ᾣ' => 'ὫΙ',
-  'ᾤ' => 'ὬΙ',
-  'ᾥ' => 'ὭΙ',
-  'ᾦ' => 'ὮΙ',
-  'ᾧ' => 'ὯΙ',
-  'ᾰ' => 'Ᾰ',
-  'ᾱ' => 'Ᾱ',
-  'ᾳ' => 'ΑΙ',
-  'ι' => 'Ι',
-  'ῃ' => 'ΗΙ',
-  'ῐ' => 'Ῐ',
-  'ῑ' => 'Ῑ',
-  'ῠ' => 'Ῠ',
-  'ῡ' => 'Ῡ',
-  'ῥ' => 'Ῥ',
-  'ῳ' => 'ΩΙ',
-  'ⅎ' => 'Ⅎ',
-  'ⅰ' => 'Ⅰ',
-  'ⅱ' => 'Ⅱ',
-  'ⅲ' => 'Ⅲ',
-  'ⅳ' => 'Ⅳ',
-  'ⅴ' => 'Ⅴ',
-  'ⅵ' => 'Ⅵ',
-  'ⅶ' => 'Ⅶ',
-  'ⅷ' => 'Ⅷ',
-  'ⅸ' => 'Ⅸ',
-  'ⅹ' => 'Ⅹ',
-  'ⅺ' => 'Ⅺ',
-  'ⅻ' => 'Ⅻ',
-  'ⅼ' => 'Ⅼ',
-  'ⅽ' => 'Ⅽ',
-  'ⅾ' => 'Ⅾ',
-  'ⅿ' => 'Ⅿ',
-  'ↄ' => 'Ↄ',
-  'ⓐ' => 'Ⓐ',
-  'ⓑ' => 'Ⓑ',
-  'ⓒ' => 'Ⓒ',
-  'ⓓ' => 'Ⓓ',
-  'ⓔ' => 'Ⓔ',
-  'ⓕ' => 'Ⓕ',
-  'ⓖ' => 'Ⓖ',
-  'ⓗ' => 'Ⓗ',
-  'ⓘ' => 'Ⓘ',
-  'ⓙ' => 'Ⓙ',
-  'ⓚ' => 'Ⓚ',
-  'ⓛ' => 'Ⓛ',
-  'ⓜ' => 'Ⓜ',
-  'ⓝ' => 'Ⓝ',
-  'ⓞ' => 'Ⓞ',
-  'ⓟ' => 'Ⓟ',
-  'ⓠ' => 'Ⓠ',
-  'ⓡ' => 'Ⓡ',
-  'ⓢ' => 'Ⓢ',
-  'ⓣ' => 'Ⓣ',
-  'ⓤ' => 'Ⓤ',
-  'ⓥ' => 'Ⓥ',
-  'ⓦ' => 'Ⓦ',
-  'ⓧ' => 'Ⓧ',
-  'ⓨ' => 'Ⓨ',
-  'ⓩ' => 'Ⓩ',
-  'ⰰ' => 'Ⰰ',
-  'ⰱ' => 'Ⰱ',
-  'ⰲ' => 'Ⰲ',
-  'ⰳ' => 'Ⰳ',
-  'ⰴ' => 'Ⰴ',
-  'ⰵ' => 'Ⰵ',
-  'ⰶ' => 'Ⰶ',
-  'ⰷ' => 'Ⰷ',
-  'ⰸ' => 'Ⰸ',
-  'ⰹ' => 'Ⰹ',
-  'ⰺ' => 'Ⰺ',
-  'ⰻ' => 'Ⰻ',
-  'ⰼ' => 'Ⰼ',
-  'ⰽ' => 'Ⰽ',
-  'ⰾ' => 'Ⰾ',
-  'ⰿ' => 'Ⰿ',
-  'ⱀ' => 'Ⱀ',
-  'ⱁ' => 'Ⱁ',
-  'ⱂ' => 'Ⱂ',
-  'ⱃ' => 'Ⱃ',
-  'ⱄ' => 'Ⱄ',
-  'ⱅ' => 'Ⱅ',
-  'ⱆ' => 'Ⱆ',
-  'ⱇ' => 'Ⱇ',
-  'ⱈ' => 'Ⱈ',
-  'ⱉ' => 'Ⱉ',
-  'ⱊ' => 'Ⱊ',
-  'ⱋ' => 'Ⱋ',
-  'ⱌ' => 'Ⱌ',
-  'ⱍ' => 'Ⱍ',
-  'ⱎ' => 'Ⱎ',
-  'ⱏ' => 'Ⱏ',
-  'ⱐ' => 'Ⱐ',
-  'ⱑ' => 'Ⱑ',
-  'ⱒ' => 'Ⱒ',
-  'ⱓ' => 'Ⱓ',
-  'ⱔ' => 'Ⱔ',
-  'ⱕ' => 'Ⱕ',
-  'ⱖ' => 'Ⱖ',
-  'ⱗ' => 'Ⱗ',
-  'ⱘ' => 'Ⱘ',
-  'ⱙ' => 'Ⱙ',
-  'ⱚ' => 'Ⱚ',
-  'ⱛ' => 'Ⱛ',
-  'ⱜ' => 'Ⱜ',
-  'ⱝ' => 'Ⱝ',
-  'ⱞ' => 'Ⱞ',
-  'ⱡ' => 'Ⱡ',
-  'ⱥ' => 'Ⱥ',
-  'ⱦ' => 'Ⱦ',
-  'ⱨ' => 'Ⱨ',
-  'ⱪ' => 'Ⱪ',
-  'ⱬ' => 'Ⱬ',
-  'ⱳ' => 'Ⱳ',
-  'ⱶ' => 'Ⱶ',
-  'ⲁ' => 'Ⲁ',
-  'ⲃ' => 'Ⲃ',
-  'ⲅ' => 'Ⲅ',
-  'ⲇ' => 'Ⲇ',
-  'ⲉ' => 'Ⲉ',
-  'ⲋ' => 'Ⲋ',
-  'ⲍ' => 'Ⲍ',
-  'ⲏ' => 'Ⲏ',
-  'ⲑ' => 'Ⲑ',
-  'ⲓ' => 'Ⲓ',
-  'ⲕ' => 'Ⲕ',
-  'ⲗ' => 'Ⲗ',
-  'ⲙ' => 'Ⲙ',
-  'ⲛ' => 'Ⲛ',
-  'ⲝ' => 'Ⲝ',
-  'ⲟ' => 'Ⲟ',
-  'ⲡ' => 'Ⲡ',
-  'ⲣ' => 'Ⲣ',
-  'ⲥ' => 'Ⲥ',
-  'ⲧ' => 'Ⲧ',
-  'ⲩ' => 'Ⲩ',
-  'ⲫ' => 'Ⲫ',
-  'ⲭ' => 'Ⲭ',
-  'ⲯ' => 'Ⲯ',
-  'ⲱ' => 'Ⲱ',
-  'ⲳ' => 'Ⲳ',
-  'ⲵ' => 'Ⲵ',
-  'ⲷ' => 'Ⲷ',
-  'ⲹ' => 'Ⲹ',
-  'ⲻ' => 'Ⲻ',
-  'ⲽ' => 'Ⲽ',
-  'ⲿ' => 'Ⲿ',
-  'ⳁ' => 'Ⳁ',
-  'ⳃ' => 'Ⳃ',
-  'ⳅ' => 'Ⳅ',
-  'ⳇ' => 'Ⳇ',
-  'ⳉ' => 'Ⳉ',
-  'ⳋ' => 'Ⳋ',
-  'ⳍ' => 'Ⳍ',
-  'ⳏ' => 'Ⳏ',
-  'ⳑ' => 'Ⳑ',
-  'ⳓ' => 'Ⳓ',
-  'ⳕ' => 'Ⳕ',
-  'ⳗ' => 'Ⳗ',
-  'ⳙ' => 'Ⳙ',
-  'ⳛ' => 'Ⳛ',
-  'ⳝ' => 'Ⳝ',
-  'ⳟ' => 'Ⳟ',
-  'ⳡ' => 'Ⳡ',
-  'ⳣ' => 'Ⳣ',
-  'ⳬ' => 'Ⳬ',
-  'ⳮ' => 'Ⳮ',
-  'ⳳ' => 'Ⳳ',
-  'ⴀ' => 'Ⴀ',
-  'ⴁ' => 'Ⴁ',
-  'ⴂ' => 'Ⴂ',
-  'ⴃ' => 'Ⴃ',
-  'ⴄ' => 'Ⴄ',
-  'ⴅ' => 'Ⴅ',
-  'ⴆ' => 'Ⴆ',
-  'ⴇ' => 'Ⴇ',
-  'ⴈ' => 'Ⴈ',
-  'ⴉ' => 'Ⴉ',
-  'ⴊ' => 'Ⴊ',
-  'ⴋ' => 'Ⴋ',
-  'ⴌ' => 'Ⴌ',
-  'ⴍ' => 'Ⴍ',
-  'ⴎ' => 'Ⴎ',
-  'ⴏ' => 'Ⴏ',
-  'ⴐ' => 'Ⴐ',
-  'ⴑ' => 'Ⴑ',
-  'ⴒ' => 'Ⴒ',
-  'ⴓ' => 'Ⴓ',
-  'ⴔ' => 'Ⴔ',
-  'ⴕ' => 'Ⴕ',
-  'ⴖ' => 'Ⴖ',
-  'ⴗ' => 'Ⴗ',
-  'ⴘ' => 'Ⴘ',
-  'ⴙ' => 'Ⴙ',
-  'ⴚ' => 'Ⴚ',
-  'ⴛ' => 'Ⴛ',
-  'ⴜ' => 'Ⴜ',
-  'ⴝ' => 'Ⴝ',
-  'ⴞ' => 'Ⴞ',
-  'ⴟ' => 'Ⴟ',
-  'ⴠ' => 'Ⴠ',
-  'ⴡ' => 'Ⴡ',
-  'ⴢ' => 'Ⴢ',
-  'ⴣ' => 'Ⴣ',
-  'ⴤ' => 'Ⴤ',
-  'ⴥ' => 'Ⴥ',
-  'ⴧ' => 'Ⴧ',
-  'ⴭ' => 'Ⴭ',
-  'ꙁ' => 'Ꙁ',
-  'ꙃ' => 'Ꙃ',
-  'ꙅ' => 'Ꙅ',
-  'ꙇ' => 'Ꙇ',
-  'ꙉ' => 'Ꙉ',
-  'ꙋ' => 'Ꙋ',
-  'ꙍ' => 'Ꙍ',
-  'ꙏ' => 'Ꙏ',
-  'ꙑ' => 'Ꙑ',
-  'ꙓ' => 'Ꙓ',
-  'ꙕ' => 'Ꙕ',
-  'ꙗ' => 'Ꙗ',
-  'ꙙ' => 'Ꙙ',
-  'ꙛ' => 'Ꙛ',
-  'ꙝ' => 'Ꙝ',
-  'ꙟ' => 'Ꙟ',
-  'ꙡ' => 'Ꙡ',
-  'ꙣ' => 'Ꙣ',
-  'ꙥ' => 'Ꙥ',
-  'ꙧ' => 'Ꙧ',
-  'ꙩ' => 'Ꙩ',
-  'ꙫ' => 'Ꙫ',
-  'ꙭ' => 'Ꙭ',
-  'ꚁ' => 'Ꚁ',
-  'ꚃ' => 'Ꚃ',
-  'ꚅ' => 'Ꚅ',
-  'ꚇ' => 'Ꚇ',
-  'ꚉ' => 'Ꚉ',
-  'ꚋ' => 'Ꚋ',
-  'ꚍ' => 'Ꚍ',
-  'ꚏ' => 'Ꚏ',
-  'ꚑ' => 'Ꚑ',
-  'ꚓ' => 'Ꚓ',
-  'ꚕ' => 'Ꚕ',
-  'ꚗ' => 'Ꚗ',
-  'ꚙ' => 'Ꚙ',
-  'ꚛ' => 'Ꚛ',
-  'ꜣ' => 'Ꜣ',
-  'ꜥ' => 'Ꜥ',
-  'ꜧ' => 'Ꜧ',
-  'ꜩ' => 'Ꜩ',
-  'ꜫ' => 'Ꜫ',
-  'ꜭ' => 'Ꜭ',
-  'ꜯ' => 'Ꜯ',
-  'ꜳ' => 'Ꜳ',
-  'ꜵ' => 'Ꜵ',
-  'ꜷ' => 'Ꜷ',
-  'ꜹ' => 'Ꜹ',
-  'ꜻ' => 'Ꜻ',
-  'ꜽ' => 'Ꜽ',
-  'ꜿ' => 'Ꜿ',
-  'ꝁ' => 'Ꝁ',
-  'ꝃ' => 'Ꝃ',
-  'ꝅ' => 'Ꝅ',
-  'ꝇ' => 'Ꝇ',
-  'ꝉ' => 'Ꝉ',
-  'ꝋ' => 'Ꝋ',
-  'ꝍ' => 'Ꝍ',
-  'ꝏ' => 'Ꝏ',
-  'ꝑ' => 'Ꝑ',
-  'ꝓ' => 'Ꝓ',
-  'ꝕ' => 'Ꝕ',
-  'ꝗ' => 'Ꝗ',
-  'ꝙ' => 'Ꝙ',
-  'ꝛ' => 'Ꝛ',
-  'ꝝ' => 'Ꝝ',
-  'ꝟ' => 'Ꝟ',
-  'ꝡ' => 'Ꝡ',
-  'ꝣ' => 'Ꝣ',
-  'ꝥ' => 'Ꝥ',
-  'ꝧ' => 'Ꝧ',
-  'ꝩ' => 'Ꝩ',
-  'ꝫ' => 'Ꝫ',
-  'ꝭ' => 'Ꝭ',
-  'ꝯ' => 'Ꝯ',
-  'ꝺ' => 'Ꝺ',
-  'ꝼ' => 'Ꝼ',
-  'ꝿ' => 'Ꝿ',
-  'ꞁ' => 'Ꞁ',
-  'ꞃ' => 'Ꞃ',
-  'ꞅ' => 'Ꞅ',
-  'ꞇ' => 'Ꞇ',
-  'ꞌ' => 'Ꞌ',
-  'ꞑ' => 'Ꞑ',
-  'ꞓ' => 'Ꞓ',
-  'ꞔ' => 'Ꞔ',
-  'ꞗ' => 'Ꞗ',
-  'ꞙ' => 'Ꞙ',
-  'ꞛ' => 'Ꞛ',
-  'ꞝ' => 'Ꞝ',
-  'ꞟ' => 'Ꞟ',
-  'ꞡ' => 'Ꞡ',
-  'ꞣ' => 'Ꞣ',
-  'ꞥ' => 'Ꞥ',
-  'ꞧ' => 'Ꞧ',
-  'ꞩ' => 'Ꞩ',
-  'ꞵ' => 'Ꞵ',
-  'ꞷ' => 'Ꞷ',
-  'ꞹ' => 'Ꞹ',
-  'ꞻ' => 'Ꞻ',
-  'ꞽ' => 'Ꞽ',
-  'ꞿ' => 'Ꞿ',
-  'ꟃ' => 'Ꟃ',
-  'ꟈ' => 'Ꟈ',
-  'ꟊ' => 'Ꟊ',
-  'ꟶ' => 'Ꟶ',
-  'ꭓ' => 'Ꭓ',
-  'ꭰ' => 'Ꭰ',
-  'ꭱ' => 'Ꭱ',
-  'ꭲ' => 'Ꭲ',
-  'ꭳ' => 'Ꭳ',
-  'ꭴ' => 'Ꭴ',
-  'ꭵ' => 'Ꭵ',
-  'ꭶ' => 'Ꭶ',
-  'ꭷ' => 'Ꭷ',
-  'ꭸ' => 'Ꭸ',
-  'ꭹ' => 'Ꭹ',
-  'ꭺ' => 'Ꭺ',
-  'ꭻ' => 'Ꭻ',
-  'ꭼ' => 'Ꭼ',
-  'ꭽ' => 'Ꭽ',
-  'ꭾ' => 'Ꭾ',
-  'ꭿ' => 'Ꭿ',
-  'ꮀ' => 'Ꮀ',
-  'ꮁ' => 'Ꮁ',
-  'ꮂ' => 'Ꮂ',
-  'ꮃ' => 'Ꮃ',
-  'ꮄ' => 'Ꮄ',
-  'ꮅ' => 'Ꮅ',
-  'ꮆ' => 'Ꮆ',
-  'ꮇ' => 'Ꮇ',
-  'ꮈ' => 'Ꮈ',
-  'ꮉ' => 'Ꮉ',
-  'ꮊ' => 'Ꮊ',
-  'ꮋ' => 'Ꮋ',
-  'ꮌ' => 'Ꮌ',
-  'ꮍ' => 'Ꮍ',
-  'ꮎ' => 'Ꮎ',
-  'ꮏ' => 'Ꮏ',
-  'ꮐ' => 'Ꮐ',
-  'ꮑ' => 'Ꮑ',
-  'ꮒ' => 'Ꮒ',
-  'ꮓ' => 'Ꮓ',
-  'ꮔ' => 'Ꮔ',
-  'ꮕ' => 'Ꮕ',
-  'ꮖ' => 'Ꮖ',
-  'ꮗ' => 'Ꮗ',
-  'ꮘ' => 'Ꮘ',
-  'ꮙ' => 'Ꮙ',
-  'ꮚ' => 'Ꮚ',
-  'ꮛ' => 'Ꮛ',
-  'ꮜ' => 'Ꮜ',
-  'ꮝ' => 'Ꮝ',
-  'ꮞ' => 'Ꮞ',
-  'ꮟ' => 'Ꮟ',
-  'ꮠ' => 'Ꮠ',
-  'ꮡ' => 'Ꮡ',
-  'ꮢ' => 'Ꮢ',
-  'ꮣ' => 'Ꮣ',
-  'ꮤ' => 'Ꮤ',
-  'ꮥ' => 'Ꮥ',
-  'ꮦ' => 'Ꮦ',
-  'ꮧ' => 'Ꮧ',
-  'ꮨ' => 'Ꮨ',
-  'ꮩ' => 'Ꮩ',
-  'ꮪ' => 'Ꮪ',
-  'ꮫ' => 'Ꮫ',
-  'ꮬ' => 'Ꮬ',
-  'ꮭ' => 'Ꮭ',
-  'ꮮ' => 'Ꮮ',
-  'ꮯ' => 'Ꮯ',
-  'ꮰ' => 'Ꮰ',
-  'ꮱ' => 'Ꮱ',
-  'ꮲ' => 'Ꮲ',
-  'ꮳ' => 'Ꮳ',
-  'ꮴ' => 'Ꮴ',
-  'ꮵ' => 'Ꮵ',
-  'ꮶ' => 'Ꮶ',
-  'ꮷ' => 'Ꮷ',
-  'ꮸ' => 'Ꮸ',
-  'ꮹ' => 'Ꮹ',
-  'ꮺ' => 'Ꮺ',
-  'ꮻ' => 'Ꮻ',
-  'ꮼ' => 'Ꮼ',
-  'ꮽ' => 'Ꮽ',
-  'ꮾ' => 'Ꮾ',
-  'ꮿ' => 'Ꮿ',
-  'ａ' => 'Ａ',
-  'ｂ' => 'Ｂ',
-  'ｃ' => 'Ｃ',
-  'ｄ' => 'Ｄ',
-  'ｅ' => 'Ｅ',
-  'ｆ' => 'Ｆ',
-  'ｇ' => 'Ｇ',
-  'ｈ' => 'Ｈ',
-  'ｉ' => 'Ｉ',
-  'ｊ' => 'Ｊ',
-  'ｋ' => 'Ｋ',
-  'ｌ' => 'Ｌ',
-  'ｍ' => 'Ｍ',
-  'ｎ' => 'Ｎ',
-  'ｏ' => 'Ｏ',
-  'ｐ' => 'Ｐ',
-  'ｑ' => 'Ｑ',
-  'ｒ' => 'Ｒ',
-  'ｓ' => 'Ｓ',
-  'ｔ' => 'Ｔ',
-  'ｕ' => 'Ｕ',
-  'ｖ' => 'Ｖ',
-  'ｗ' => 'Ｗ',
-  'ｘ' => 'Ｘ',
-  'ｙ' => 'Ｙ',
-  'ｚ' => 'Ｚ',
-  '𐐨' => '𐐀',
-  '𐐩' => '𐐁',
-  '𐐪' => '𐐂',
-  '𐐫' => '𐐃',
-  '𐐬' => '𐐄',
-  '𐐭' => '𐐅',
-  '𐐮' => '𐐆',
-  '𐐯' => '𐐇',
-  '𐐰' => '𐐈',
-  '𐐱' => '𐐉',
-  '𐐲' => '𐐊',
-  '𐐳' => '𐐋',
-  '𐐴' => '𐐌',
-  '𐐵' => '𐐍',
-  '𐐶' => '𐐎',
-  '𐐷' => '𐐏',
-  '𐐸' => '𐐐',
-  '𐐹' => '𐐑',
-  '𐐺' => '𐐒',
-  '𐐻' => '𐐓',
-  '𐐼' => '𐐔',
-  '𐐽' => '𐐕',
-  '𐐾' => '𐐖',
-  '𐐿' => '𐐗',
-  '𐑀' => '𐐘',
-  '𐑁' => '𐐙',
-  '𐑂' => '𐐚',
-  '𐑃' => '𐐛',
-  '𐑄' => '𐐜',
-  '𐑅' => '𐐝',
-  '𐑆' => '𐐞',
-  '𐑇' => '𐐟',
-  '𐑈' => '𐐠',
-  '𐑉' => '𐐡',
-  '𐑊' => '𐐢',
-  '𐑋' => '𐐣',
-  '𐑌' => '𐐤',
-  '𐑍' => '𐐥',
-  '𐑎' => '𐐦',
-  '𐑏' => '𐐧',
-  '𐓘' => '𐒰',
-  '𐓙' => '𐒱',
-  '𐓚' => '𐒲',
-  '𐓛' => '𐒳',
-  '𐓜' => '𐒴',
-  '𐓝' => '𐒵',
-  '𐓞' => '𐒶',
-  '𐓟' => '𐒷',
-  '𐓠' => '𐒸',
-  '𐓡' => '𐒹',
-  '𐓢' => '𐒺',
-  '𐓣' => '𐒻',
-  '𐓤' => '𐒼',
-  '𐓥' => '𐒽',
-  '𐓦' => '𐒾',
-  '𐓧' => '𐒿',
-  '𐓨' => '𐓀',
-  '𐓩' => '𐓁',
-  '𐓪' => '𐓂',
-  '𐓫' => '𐓃',
-  '𐓬' => '𐓄',
-  '𐓭' => '𐓅',
-  '𐓮' => '𐓆',
-  '𐓯' => '𐓇',
-  '𐓰' => '𐓈',
-  '𐓱' => '𐓉',
-  '𐓲' => '𐓊',
-  '𐓳' => '𐓋',
-  '𐓴' => '𐓌',
-  '𐓵' => '𐓍',
-  '𐓶' => '𐓎',
-  '𐓷' => '𐓏',
-  '𐓸' => '𐓐',
-  '𐓹' => '𐓑',
-  '𐓺' => '𐓒',
-  '𐓻' => '𐓓',
-  '𐳀' => '𐲀',
-  '𐳁' => '𐲁',
-  '𐳂' => '𐲂',
-  '𐳃' => '𐲃',
-  '𐳄' => '𐲄',
-  '𐳅' => '𐲅',
-  '𐳆' => '𐲆',
-  '𐳇' => '𐲇',
-  '𐳈' => '𐲈',
-  '𐳉' => '𐲉',
-  '𐳊' => '𐲊',
-  '𐳋' => '𐲋',
-  '𐳌' => '𐲌',
-  '𐳍' => '𐲍',
-  '𐳎' => '𐲎',
-  '𐳏' => '𐲏',
-  '𐳐' => '𐲐',
-  '𐳑' => '𐲑',
-  '𐳒' => '𐲒',
-  '𐳓' => '𐲓',
-  '𐳔' => '𐲔',
-  '𐳕' => '𐲕',
-  '𐳖' => '𐲖',
-  '𐳗' => '𐲗',
-  '𐳘' => '𐲘',
-  '𐳙' => '𐲙',
-  '𐳚' => '𐲚',
-  '𐳛' => '𐲛',
-  '𐳜' => '𐲜',
-  '𐳝' => '𐲝',
-  '𐳞' => '𐲞',
-  '𐳟' => '𐲟',
-  '𐳠' => '𐲠',
-  '𐳡' => '𐲡',
-  '𐳢' => '𐲢',
-  '𐳣' => '𐲣',
-  '𐳤' => '𐲤',
-  '𐳥' => '𐲥',
-  '𐳦' => '𐲦',
-  '𐳧' => '𐲧',
-  '𐳨' => '𐲨',
-  '𐳩' => '𐲩',
-  '𐳪' => '𐲪',
-  '𐳫' => '𐲫',
-  '𐳬' => '𐲬',
-  '𐳭' => '𐲭',
-  '𐳮' => '𐲮',
-  '𐳯' => '𐲯',
-  '𐳰' => '𐲰',
-  '𐳱' => '𐲱',
-  '𐳲' => '𐲲',
-  '𑣀' => '𑢠',
-  '𑣁' => '𑢡',
-  '𑣂' => '𑢢',
-  '𑣃' => '𑢣',
-  '𑣄' => '𑢤',
-  '𑣅' => '𑢥',
-  '𑣆' => '𑢦',
-  '𑣇' => '𑢧',
-  '𑣈' => '𑢨',
-  '𑣉' => '𑢩',
-  '𑣊' => '𑢪',
-  '𑣋' => '𑢫',
-  '𑣌' => '𑢬',
-  '𑣍' => '𑢭',
-  '𑣎' => '𑢮',
-  '𑣏' => '𑢯',
-  '𑣐' => '𑢰',
-  '𑣑' => '𑢱',
-  '𑣒' => '𑢲',
-  '𑣓' => '𑢳',
-  '𑣔' => '𑢴',
-  '𑣕' => '𑢵',
-  '𑣖' => '𑢶',
-  '𑣗' => '𑢷',
-  '𑣘' => '𑢸',
-  '𑣙' => '𑢹',
-  '𑣚' => '𑢺',
-  '𑣛' => '𑢻',
-  '𑣜' => '𑢼',
-  '𑣝' => '𑢽',
-  '𑣞' => '𑢾',
-  '𑣟' => '𑢿',
-  '𖹠' => '𖹀',
-  '𖹡' => '𖹁',
-  '𖹢' => '𖹂',
-  '𖹣' => '𖹃',
-  '𖹤' => '𖹄',
-  '𖹥' => '𖹅',
-  '𖹦' => '𖹆',
-  '𖹧' => '𖹇',
-  '𖹨' => '𖹈',
-  '𖹩' => '𖹉',
-  '𖹪' => '𖹊',
-  '𖹫' => '𖹋',
-  '𖹬' => '𖹌',
-  '𖹭' => '𖹍',
-  '𖹮' => '𖹎',
-  '𖹯' => '𖹏',
-  '𖹰' => '𖹐',
-  '𖹱' => '𖹑',
-  '𖹲' => '𖹒',
-  '𖹳' => '𖹓',
-  '𖹴' => '𖹔',
-  '𖹵' => '𖹕',
-  '𖹶' => '𖹖',
-  '𖹷' => '𖹗',
-  '𖹸' => '𖹘',
-  '𖹹' => '𖹙',
-  '𖹺' => '𖹚',
-  '𖹻' => '𖹛',
-  '𖹼' => '𖹜',
-  '𖹽' => '𖹝',
-  '𖹾' => '𖹞',
-  '𖹿' => '𖹟',
-  '𞤢' => '𞤀',
-  '𞤣' => '𞤁',
-  '𞤤' => '𞤂',
-  '𞤥' => '𞤃',
-  '𞤦' => '𞤄',
-  '𞤧' => '𞤅',
-  '𞤨' => '𞤆',
-  '𞤩' => '𞤇',
-  '𞤪' => '𞤈',
-  '𞤫' => '𞤉',
-  '𞤬' => '𞤊',
-  '𞤭' => '𞤋',
-  '𞤮' => '𞤌',
-  '𞤯' => '𞤍',
-  '𞤰' => '𞤎',
-  '𞤱' => '𞤏',
-  '𞤲' => '𞤐',
-  '𞤳' => '𞤑',
-  '𞤴' => '𞤒',
-  '𞤵' => '𞤓',
-  '𞤶' => '𞤔',
-  '𞤷' => '𞤕',
-  '𞤸' => '𞤖',
-  '𞤹' => '𞤗',
-  '𞤺' => '𞤘',
-  '𞤻' => '𞤙',
-  '𞤼' => '𞤚',
-  '𞤽' => '𞤛',
-  '𞤾' => '𞤜',
-  '𞤿' => '𞤝',
-  '𞥀' => '𞤞',
-  '𞥁' => '𞤟',
-  '𞥂' => '𞤠',
-  '𞥃' => '𞤡',
-  'ß' => 'SS',
-  'ff' => 'FF',
-  'fi' => 'FI',
-  'fl' => 'FL',
-  'ffi' => 'FFI',
-  'ffl' => 'FFL',
-  'ſt' => 'ST',
-  'st' => 'ST',
-  'և' => 'ԵՒ',
-  'ﬓ' => 'ՄՆ',
-  'ﬔ' => 'ՄԵ',
-  'ﬕ' => 'ՄԻ',
-  'ﬖ' => 'ՎՆ',
-  'ﬗ' => 'ՄԽ',
-  'ʼn' => 'ʼN',
-  'ΐ' => 'Ϊ́',
-  'ΰ' => 'Ϋ́',
-  'ǰ' => 'J̌',
-  'ẖ' => 'H̱',
-  'ẗ' => 'T̈',
-  'ẘ' => 'W̊',
-  'ẙ' => 'Y̊',
-  'ẚ' => 'Aʾ',
-  'ὐ' => 'Υ̓',
-  'ὒ' => 'Υ̓̀',
-  'ὔ' => 'Υ̓́',
-  'ὖ' => 'Υ̓͂',
-  'ᾶ' => 'Α͂',
-  'ῆ' => 'Η͂',
-  'ῒ' => 'Ϊ̀',
-  'ΐ' => 'Ϊ́',
-  'ῖ' => 'Ι͂',
-  'ῗ' => 'Ϊ͂',
-  'ῢ' => 'Ϋ̀',
-  'ΰ' => 'Ϋ́',
-  'ῤ' => 'Ρ̓',
-  'ῦ' => 'Υ͂',
-  'ῧ' => 'Ϋ͂',
-  'ῶ' => 'Ω͂',
-  'ᾈ' => 'ἈΙ',
-  'ᾉ' => 'ἉΙ',
-  'ᾊ' => 'ἊΙ',
-  'ᾋ' => 'ἋΙ',
-  'ᾌ' => 'ἌΙ',
-  'ᾍ' => 'ἍΙ',
-  'ᾎ' => 'ἎΙ',
-  'ᾏ' => 'ἏΙ',
-  'ᾘ' => 'ἨΙ',
-  'ᾙ' => 'ἩΙ',
-  'ᾚ' => 'ἪΙ',
-  'ᾛ' => 'ἫΙ',
-  'ᾜ' => 'ἬΙ',
-  'ᾝ' => 'ἭΙ',
-  'ᾞ' => 'ἮΙ',
-  'ᾟ' => 'ἯΙ',
-  'ᾨ' => 'ὨΙ',
-  'ᾩ' => 'ὩΙ',
-  'ᾪ' => 'ὪΙ',
-  'ᾫ' => 'ὫΙ',
-  'ᾬ' => 'ὬΙ',
-  'ᾭ' => 'ὭΙ',
-  'ᾮ' => 'ὮΙ',
-  'ᾯ' => 'ὯΙ',
-  'ᾼ' => 'ΑΙ',
-  'ῌ' => 'ΗΙ',
-  'ῼ' => 'ΩΙ',
-  'ᾲ' => 'ᾺΙ',
-  'ᾴ' => 'ΆΙ',
-  'ῂ' => 'ῊΙ',
-  'ῄ' => 'ΉΙ',
-  'ῲ' => 'ῺΙ',
-  'ῴ' => 'ΏΙ',
-  'ᾷ' => 'Α͂Ι',
-  'ῇ' => 'Η͂Ι',
-  'ῷ' => 'Ω͂Ι',
-);
diff --git a/vendor/symfony/polyfill-mbstring/bootstrap.php b/vendor/symfony/polyfill-mbstring/bootstrap.php
deleted file mode 100644
index 1fedd1f7c8..0000000000
--- a/vendor/symfony/polyfill-mbstring/bootstrap.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Symfony\Polyfill\Mbstring as p;
-
-if (\PHP_VERSION_ID >= 80000) {
-    return require __DIR__.'/bootstrap80.php';
-}
-
-if (!function_exists('mb_convert_encoding')) {
-    function mb_convert_encoding($string, $to_encoding, $from_encoding = null) { return p\Mbstring::mb_convert_encoding($string, $to_encoding, $from_encoding); }
-}
-if (!function_exists('mb_decode_mimeheader')) {
-    function mb_decode_mimeheader($string) { return p\Mbstring::mb_decode_mimeheader($string); }
-}
-if (!function_exists('mb_encode_mimeheader')) {
-    function mb_encode_mimeheader($string, $charset = null, $transfer_encoding = null, $newline = "\r\n", $indent = 0) { return p\Mbstring::mb_encode_mimeheader($string, $charset, $transfer_encoding, $newline, $indent); }
-}
-if (!function_exists('mb_decode_numericentity')) {
-    function mb_decode_numericentity($string, $map, $encoding = null) { return p\Mbstring::mb_decode_numericentity($string, $map, $encoding); }
-}
-if (!function_exists('mb_encode_numericentity')) {
-    function mb_encode_numericentity($string, $map, $encoding = null, $hex = false) { return p\Mbstring::mb_encode_numericentity($string, $map, $encoding, $hex); }
-}
-if (!function_exists('mb_convert_case')) {
-    function mb_convert_case($string, $mode, $encoding = null) { return p\Mbstring::mb_convert_case($string, $mode, $encoding); }
-}
-if (!function_exists('mb_internal_encoding')) {
-    function mb_internal_encoding($encoding = null) { return p\Mbstring::mb_internal_encoding($encoding); }
-}
-if (!function_exists('mb_language')) {
-    function mb_language($language = null) { return p\Mbstring::mb_language($language); }
-}
-if (!function_exists('mb_list_encodings')) {
-    function mb_list_encodings() { return p\Mbstring::mb_list_encodings(); }
-}
-if (!function_exists('mb_encoding_aliases')) {
-    function mb_encoding_aliases($encoding) { return p\Mbstring::mb_encoding_aliases($encoding); }
-}
-if (!function_exists('mb_check_encoding')) {
-    function mb_check_encoding($value = null, $encoding = null) { return p\Mbstring::mb_check_encoding($value, $encoding); }
-}
-if (!function_exists('mb_detect_encoding')) {
-    function mb_detect_encoding($string, $encodings = null, $strict = false) { return p\Mbstring::mb_detect_encoding($string, $encodings, $strict); }
-}
-if (!function_exists('mb_detect_order')) {
-    function mb_detect_order($encoding = null) { return p\Mbstring::mb_detect_order($encoding); }
-}
-if (!function_exists('mb_parse_str')) {
-    function mb_parse_str($string, &$result = []) { parse_str($string, $result); return (bool) $result; }
-}
-if (!function_exists('mb_strlen')) {
-    function mb_strlen($string, $encoding = null) { return p\Mbstring::mb_strlen($string, $encoding); }
-}
-if (!function_exists('mb_strpos')) {
-    function mb_strpos($haystack, $needle, $offset = 0, $encoding = null) { return p\Mbstring::mb_strpos($haystack, $needle, $offset, $encoding); }
-}
-if (!function_exists('mb_strtolower')) {
-    function mb_strtolower($string, $encoding = null) { return p\Mbstring::mb_strtolower($string, $encoding); }
-}
-if (!function_exists('mb_strtoupper')) {
-    function mb_strtoupper($string, $encoding = null) { return p\Mbstring::mb_strtoupper($string, $encoding); }
-}
-if (!function_exists('mb_substitute_character')) {
-    function mb_substitute_character($substitute_character = null) { return p\Mbstring::mb_substitute_character($substitute_character); }
-}
-if (!function_exists('mb_substr')) {
-    function mb_substr($string, $start, $length = 2147483647, $encoding = null) { return p\Mbstring::mb_substr($string, $start, $length, $encoding); }
-}
-if (!function_exists('mb_stripos')) {
-    function mb_stripos($haystack, $needle, $offset = 0, $encoding = null) { return p\Mbstring::mb_stripos($haystack, $needle, $offset, $encoding); }
-}
-if (!function_exists('mb_stristr')) {
-    function mb_stristr($haystack, $needle, $before_needle = false, $encoding = null) { return p\Mbstring::mb_stristr($haystack, $needle, $before_needle, $encoding); }
-}
-if (!function_exists('mb_strrchr')) {
-    function mb_strrchr($haystack, $needle, $before_needle = false, $encoding = null) { return p\Mbstring::mb_strrchr($haystack, $needle, $before_needle, $encoding); }
-}
-if (!function_exists('mb_strrichr')) {
-    function mb_strrichr($haystack, $needle, $before_needle = false, $encoding = null) { return p\Mbstring::mb_strrichr($haystack, $needle, $before_needle, $encoding); }
-}
-if (!function_exists('mb_strripos')) {
-    function mb_strripos($haystack, $needle, $offset = 0, $encoding = null) { return p\Mbstring::mb_strripos($haystack, $needle, $offset, $encoding); }
-}
-if (!function_exists('mb_strrpos')) {
-    function mb_strrpos($haystack, $needle, $offset = 0, $encoding = null) { return p\Mbstring::mb_strrpos($haystack, $needle, $offset, $encoding); }
-}
-if (!function_exists('mb_strstr')) {
-    function mb_strstr($haystack, $needle, $before_needle = false, $encoding = null) { return p\Mbstring::mb_strstr($haystack, $needle, $before_needle, $encoding); }
-}
-if (!function_exists('mb_get_info')) {
-    function mb_get_info($type = 'all') { return p\Mbstring::mb_get_info($type); }
-}
-if (!function_exists('mb_http_output')) {
-    function mb_http_output($encoding = null) { return p\Mbstring::mb_http_output($encoding); }
-}
-if (!function_exists('mb_strwidth')) {
-    function mb_strwidth($string, $encoding = null) { return p\Mbstring::mb_strwidth($string, $encoding); }
-}
-if (!function_exists('mb_substr_count')) {
-    function mb_substr_count($haystack, $needle, $encoding = null) { return p\Mbstring::mb_substr_count($haystack, $needle, $encoding); }
-}
-if (!function_exists('mb_output_handler')) {
-    function mb_output_handler($string, $status) { return p\Mbstring::mb_output_handler($string, $status); }
-}
-if (!function_exists('mb_http_input')) {
-    function mb_http_input($type = null) { return p\Mbstring::mb_http_input($type); }
-}
-
-if (!function_exists('mb_convert_variables')) {
-    function mb_convert_variables($to_encoding, $from_encoding, &...$vars) { return p\Mbstring::mb_convert_variables($to_encoding, $from_encoding, ...$vars); }
-}
-
-if (!function_exists('mb_ord')) {
-    function mb_ord($string, $encoding = null) { return p\Mbstring::mb_ord($string, $encoding); }
-}
-if (!function_exists('mb_chr')) {
-    function mb_chr($codepoint, $encoding = null) { return p\Mbstring::mb_chr($codepoint, $encoding); }
-}
-if (!function_exists('mb_scrub')) {
-    function mb_scrub($string, $encoding = null) { $encoding = null === $encoding ? mb_internal_encoding() : $encoding; return mb_convert_encoding($string, $encoding, $encoding); }
-}
-if (!function_exists('mb_str_split')) {
-    function mb_str_split($string, $length = 1, $encoding = null) { return p\Mbstring::mb_str_split($string, $length, $encoding); }
-}
-
-if (extension_loaded('mbstring')) {
-    return;
-}
-
-if (!defined('MB_CASE_UPPER')) {
-    define('MB_CASE_UPPER', 0);
-}
-if (!defined('MB_CASE_LOWER')) {
-    define('MB_CASE_LOWER', 1);
-}
-if (!defined('MB_CASE_TITLE')) {
-    define('MB_CASE_TITLE', 2);
-}
diff --git a/vendor/symfony/polyfill-mbstring/bootstrap80.php b/vendor/symfony/polyfill-mbstring/bootstrap80.php
deleted file mode 100644
index 82f5ac4d0f..0000000000
--- a/vendor/symfony/polyfill-mbstring/bootstrap80.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Symfony\Polyfill\Mbstring as p;
-
-if (!function_exists('mb_convert_encoding')) {
-    function mb_convert_encoding(array|string|null $string, ?string $to_encoding, array|string|null $from_encoding = null): array|string|false { return p\Mbstring::mb_convert_encoding($string ?? '', (string) $to_encoding, $from_encoding); }
-}
-if (!function_exists('mb_decode_mimeheader')) {
-    function mb_decode_mimeheader(?string $string): string { return p\Mbstring::mb_decode_mimeheader((string) $string); }
-}
-if (!function_exists('mb_encode_mimeheader')) {
-    function mb_encode_mimeheader(?string $string, ?string $charset = null, ?string $transfer_encoding = null, ?string $newline = "\r\n", ?int $indent = 0): string { return p\Mbstring::mb_encode_mimeheader((string) $string, $charset, $transfer_encoding, (string) $newline, (int) $indent); }
-}
-if (!function_exists('mb_decode_numericentity')) {
-    function mb_decode_numericentity(?string $string, array $map, ?string $encoding = null): string { return p\Mbstring::mb_decode_numericentity((string) $string, $map, $encoding); }
-}
-if (!function_exists('mb_encode_numericentity')) {
-    function mb_encode_numericentity(?string $string, array $map, ?string $encoding = null, ?bool $hex = false): string { return p\Mbstring::mb_encode_numericentity((string) $string, $map, $encoding, (bool) $hex); }
-}
-if (!function_exists('mb_convert_case')) {
-    function mb_convert_case(?string $string, ?int $mode, ?string $encoding = null): string { return p\Mbstring::mb_convert_case((string) $string, (int) $mode, $encoding); }
-}
-if (!function_exists('mb_internal_encoding')) {
-    function mb_internal_encoding(?string $encoding = null): string|bool { return p\Mbstring::mb_internal_encoding($encoding); }
-}
-if (!function_exists('mb_language')) {
-    function mb_language(?string $language = null): string|bool { return p\Mbstring::mb_language($language); }
-}
-if (!function_exists('mb_list_encodings')) {
-    function mb_list_encodings(): array { return p\Mbstring::mb_list_encodings(); }
-}
-if (!function_exists('mb_encoding_aliases')) {
-    function mb_encoding_aliases(?string $encoding): array { return p\Mbstring::mb_encoding_aliases((string) $encoding); }
-}
-if (!function_exists('mb_check_encoding')) {
-    function mb_check_encoding(array|string|null $value = null, ?string $encoding = null): bool { return p\Mbstring::mb_check_encoding($value, $encoding); }
-}
-if (!function_exists('mb_detect_encoding')) {
-    function mb_detect_encoding(?string $string, array|string|null $encodings = null, ?bool $strict = false): string|false { return p\Mbstring::mb_detect_encoding((string) $string, $encodings, (bool) $strict); }
-}
-if (!function_exists('mb_detect_order')) {
-    function mb_detect_order(array|string|null $encoding = null): array|bool { return p\Mbstring::mb_detect_order($encoding); }
-}
-if (!function_exists('mb_parse_str')) {
-    function mb_parse_str(?string $string, &$result = []): bool { parse_str((string) $string, $result); return (bool) $result; }
-}
-if (!function_exists('mb_strlen')) {
-    function mb_strlen(?string $string, ?string $encoding = null): int { return p\Mbstring::mb_strlen((string) $string, $encoding); }
-}
-if (!function_exists('mb_strpos')) {
-    function mb_strpos(?string $haystack, ?string $needle, ?int $offset = 0, ?string $encoding = null): int|false { return p\Mbstring::mb_strpos((string) $haystack, (string) $needle, (int) $offset, $encoding); }
-}
-if (!function_exists('mb_strtolower')) {
-    function mb_strtolower(?string $string, ?string $encoding = null): string { return p\Mbstring::mb_strtolower((string) $string, $encoding); }
-}
-if (!function_exists('mb_strtoupper')) {
-    function mb_strtoupper(?string $string, ?string $encoding = null): string { return p\Mbstring::mb_strtoupper((string) $string, $encoding); }
-}
-if (!function_exists('mb_substitute_character')) {
-    function mb_substitute_character(string|int|null $substitute_character = null): string|int|bool { return p\Mbstring::mb_substitute_character($substitute_character); }
-}
-if (!function_exists('mb_substr')) {
-    function mb_substr(?string $string, ?int $start, ?int $length = null, ?string $encoding = null): string { return p\Mbstring::mb_substr((string) $string, (int) $start, $length, $encoding); }
-}
-if (!function_exists('mb_stripos')) {
-    function mb_stripos(?string $haystack, ?string $needle, ?int $offset = 0, ?string $encoding = null): int|false { return p\Mbstring::mb_stripos((string) $haystack, (string) $needle, (int) $offset, $encoding); }
-}
-if (!function_exists('mb_stristr')) {
-    function mb_stristr(?string $haystack, ?string $needle, ?bool $before_needle = false, ?string $encoding = null): string|false { return p\Mbstring::mb_stristr((string) $haystack, (string) $needle, (bool) $before_needle, $encoding); }
-}
-if (!function_exists('mb_strrchr')) {
-    function mb_strrchr(?string $haystack, ?string $needle, ?bool $before_needle = false, ?string $encoding = null): string|false { return p\Mbstring::mb_strrchr((string) $haystack, (string) $needle, (bool) $before_needle, $encoding); }
-}
-if (!function_exists('mb_strrichr')) {
-    function mb_strrichr(?string $haystack, ?string $needle, ?bool $before_needle = false, ?string $encoding = null): string|false { return p\Mbstring::mb_strrichr((string) $haystack, (string) $needle, (bool) $before_needle, $encoding); }
-}
-if (!function_exists('mb_strripos')) {
-    function mb_strripos(?string $haystack, ?string $needle, ?int $offset = 0, ?string $encoding = null): int|false { return p\Mbstring::mb_strripos((string) $haystack, (string) $needle, (int) $offset, $encoding); }
-}
-if (!function_exists('mb_strrpos')) {
-    function mb_strrpos(?string $haystack, ?string $needle, ?int $offset = 0, ?string $encoding = null): int|false { return p\Mbstring::mb_strrpos((string) $haystack, (string) $needle, (int) $offset, $encoding); }
-}
-if (!function_exists('mb_strstr')) {
-    function mb_strstr(?string $haystack, ?string $needle, ?bool $before_needle = false, ?string $encoding = null): string|false { return p\Mbstring::mb_strstr((string) $haystack, (string) $needle, (bool) $before_needle, $encoding); }
-}
-if (!function_exists('mb_get_info')) {
-    function mb_get_info(?string $type = 'all'): array|string|int|false { return p\Mbstring::mb_get_info((string) $type); }
-}
-if (!function_exists('mb_http_output')) {
-    function mb_http_output(?string $encoding = null): string|bool { return p\Mbstring::mb_http_output($encoding); }
-}
-if (!function_exists('mb_strwidth')) {
-    function mb_strwidth(?string $string, ?string $encoding = null): int { return p\Mbstring::mb_strwidth((string) $string, $encoding); }
-}
-if (!function_exists('mb_substr_count')) {
-    function mb_substr_count(?string $haystack, ?string $needle, ?string $encoding = null): int { return p\Mbstring::mb_substr_count((string) $haystack, (string) $needle, $encoding); }
-}
-if (!function_exists('mb_output_handler')) {
-    function mb_output_handler(?string $string, ?int $status): string { return p\Mbstring::mb_output_handler((string) $string, (int) $status); }
-}
-if (!function_exists('mb_http_input')) {
-    function mb_http_input(?string $type = null): array|string|false { return p\Mbstring::mb_http_input($type); }
-}
-
-if (!function_exists('mb_convert_variables')) {
-    function mb_convert_variables(?string $to_encoding, array|string|null $from_encoding, mixed &$var, mixed &...$vars): string|false { return p\Mbstring::mb_convert_variables((string) $to_encoding, $from_encoding ?? '', $var, ...$vars); }
-}
-
-if (!function_exists('mb_ord')) {
-    function mb_ord(?string $string, ?string $encoding = null): int|false { return p\Mbstring::mb_ord((string) $string, $encoding); }
-}
-if (!function_exists('mb_chr')) {
-    function mb_chr(?int $codepoint, ?string $encoding = null): string|false { return p\Mbstring::mb_chr((int) $codepoint, $encoding); }
-}
-if (!function_exists('mb_scrub')) {
-    function mb_scrub(?string $string, ?string $encoding = null): string { $encoding ??= mb_internal_encoding(); return mb_convert_encoding((string) $string, $encoding, $encoding); }
-}
-if (!function_exists('mb_str_split')) {
-    function mb_str_split(?string $string, ?int $length = 1, ?string $encoding = null): array { return p\Mbstring::mb_str_split((string) $string, (int) $length, $encoding); }
-}
-
-if (extension_loaded('mbstring')) {
-    return;
-}
-
-if (!defined('MB_CASE_UPPER')) {
-    define('MB_CASE_UPPER', 0);
-}
-if (!defined('MB_CASE_LOWER')) {
-    define('MB_CASE_LOWER', 1);
-}
-if (!defined('MB_CASE_TITLE')) {
-    define('MB_CASE_TITLE', 2);
-}
diff --git a/vendor/symfony/polyfill-mbstring/composer.json b/vendor/symfony/polyfill-mbstring/composer.json
deleted file mode 100644
index 2ed7a74353..0000000000
--- a/vendor/symfony/polyfill-mbstring/composer.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "name": "symfony/polyfill-mbstring",
-    "type": "library",
-    "description": "Symfony polyfill for the Mbstring extension",
-    "keywords": ["polyfill", "shim", "compatibility", "portable", "mbstring"],
-    "homepage": "https://symfony.com",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Nicolas Grekas",
-            "email": "p@tchwork.com"
-        },
-        {
-            "name": "Symfony Community",
-            "homepage": "https://symfony.com/contributors"
-        }
-    ],
-    "require": {
-        "php": ">=7.1"
-    },
-    "autoload": {
-        "psr-4": { "Symfony\\Polyfill\\Mbstring\\": "" },
-        "files": [ "bootstrap.php" ]
-    },
-    "suggest": {
-        "ext-mbstring": "For best performance"
-    },
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-main": "1.23-dev"
-        },
-        "thanks": {
-            "name": "symfony/polyfill",
-            "url": "https://github.com/symfony/polyfill"
-        }
-    }
-}